From f2fe1ca2cf2dea82e4e4429201eb9af62d04d62b Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Fri, 15 Dec 2023 20:00:56 +0100
Subject: [PATCH 01/24] Added support for C++20 coroutines in class diagrams
 (#221)

---
 README.md                                     |  1 +
 .../json/class_diagram_generator.cc           |  1 +
 .../mermaid/class_diagram_generator.cc        |  3 +
 .../plantuml/class_diagram_generator.cc       |  3 +
 src/class_diagram/model/class_method.cc       |  7 ++
 src/class_diagram/model/class_method.h        | 15 ++++
 .../visitor/translation_unit_visitor.cc       |  1 +
 src/common/clang_utils.cc                     |  6 ++
 src/common/clang_utils.h                      |  8 ++
 tests/CMakeLists.txt                          |  2 +-
 tests/t00069/.clang-uml                       |  9 ++
 tests/t00069/t00069.cc                        | 63 ++++++++++++++
 tests/t00069/test_case.h                      | 87 +++++++++++++++++++
 tests/test_cases.cc                           |  3 +
 tests/test_cases.h                            |  7 ++
 tests/test_cases.yaml                         |  3 +
 16 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 tests/t00069/.clang-uml
 create mode 100644 tests/t00069/t00069.cc
 create mode 100644 tests/t00069/test_case.h

diff --git a/README.md b/README.md
index e37295e3..4fcd8feb 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@ Main features supported so far include:
     * Interactive links to online code or docs for classes, methods and class fields in SVG diagrams - [_example_](https://raw.githubusercontent.com/bkryza/clang-uml/master/docs/test_cases/t00002_class.svg)
     * Support for plain C99/C11 code (struct, units and their relationships) - [_example_](docs/test_cases/t00057.md)
     * C++20 concept constraints - [_example_](docs/test_cases/t00059.md)
+    * C++20 coroutines - [_example_](docs/test_cases/t00069.md)
 * **Sequence diagram generation**
     * Generation of sequence diagram from specific method or function - [_example_](docs/test_cases/t20001.md)
     * Generation of loop and conditional statements - [_example_](docs/test_cases/t20021.md)
diff --git a/src/class_diagram/generators/json/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc
index 53a89c9b..21bbe020 100644
--- a/src/class_diagram/generators/json/class_diagram_generator.cc
+++ b/src/class_diagram/generators/json/class_diagram_generator.cc
@@ -63,6 +63,7 @@ void to_json(nlohmann::json &j, const class_method &c)
     j["is_noexcept"] = c.is_noexcept();
     j["is_constexpr"] = c.is_constexpr();
     j["is_consteval"] = c.is_consteval();
+    j["is_coroutine"] = c.is_coroutine();
     j["is_constructor"] = c.is_constructor();
     j["is_move_assignment"] = c.is_move_assignment();
     j["is_copy_assignment"] = c.is_copy_assignment();
diff --git a/src/class_diagram/generators/mermaid/class_diagram_generator.cc b/src/class_diagram/generators/mermaid/class_diagram_generator.cc
index 0b115042..b14b4483 100644
--- a/src/class_diagram/generators/mermaid/class_diagram_generator.cc
+++ b/src/class_diagram/generators/mermaid/class_diagram_generator.cc
@@ -251,6 +251,9 @@ void generator::generate_method(
     if (m.is_consteval()) {
         method_mods.emplace_back("consteval");
     }
+    if (m.is_coroutine()) {
+        method_mods.emplace_back("coroutine");
+    }
 
     if (!method_mods.empty()) {
         ostr << fmt::format("[{}] ", fmt::join(method_mods, ","));
diff --git a/src/class_diagram/generators/plantuml/class_diagram_generator.cc b/src/class_diagram/generators/plantuml/class_diagram_generator.cc
index afd43db8..35c299e7 100644
--- a/src/class_diagram/generators/plantuml/class_diagram_generator.cc
+++ b/src/class_diagram/generators/plantuml/class_diagram_generator.cc
@@ -338,6 +338,9 @@ void generator::generate_method(
     else if (m.is_deleted())
         ostr << " = deleted";
 
+    if (m.is_coroutine())
+        ostr << " [coroutine]";
+
     ostr << " : " << type;
 
     if (config().generate_links) {
diff --git a/src/class_diagram/model/class_method.cc b/src/class_diagram/model/class_method.cc
index d44ab43e..20f8f72d 100644
--- a/src/class_diagram/model/class_method.cc
+++ b/src/class_diagram/model/class_method.cc
@@ -70,6 +70,13 @@ void class_method::is_consteval(bool is_consteval)
     is_consteval_ = is_consteval;
 }
 
+bool class_method::is_coroutine() const { return is_coroutine_; }
+
+void class_method::is_coroutine(bool is_coroutine)
+{
+    is_coroutine_ = is_coroutine;
+}
+
 bool class_method::is_noexcept() const { return is_noexcept_; }
 
 void class_method::is_noexcept(bool is_noexcept) { is_noexcept_ = is_noexcept; }
diff --git a/src/class_diagram/model/class_method.h b/src/class_diagram/model/class_method.h
index 8f89f5ae..0e188331 100644
--- a/src/class_diagram/model/class_method.h
+++ b/src/class_diagram/model/class_method.h
@@ -152,6 +152,20 @@ public:
      */
     void is_consteval(bool is_consteval);
 
+    /**
+     * @brief Whether the method is a C++20 coroutine.
+     *
+     * @return True, if the method is a coroutine
+     */
+    bool is_coroutine() const;
+
+    /**
+     * @brief Set whether the method is a C++20 coroutine.
+     *
+     * @param is_coroutine True, if the method is a coroutine
+     */
+    void is_coroutine(bool is_coroutine);
+
     /**
      * @brief Whether the method is noexcept.
      *
@@ -262,6 +276,7 @@ private:
     bool is_noexcept_{false};
     bool is_constexpr_{false};
     bool is_consteval_{false};
+    bool is_coroutine_{false};
     bool is_constructor_{false};
     bool is_destructor_{false};
     bool is_move_assignment_{false};
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 2b30b4d5..2a19423e 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -1369,6 +1369,7 @@ void translation_unit_visitor::process_method_properties(
     method.is_move_assignment(mf.isMoveAssignmentOperator());
     method.is_copy_assignment(mf.isCopyAssignmentOperator());
     method.is_noexcept(isNoexceptExceptionSpec(mf.getExceptionSpecType()));
+    method.is_coroutine(common::is_coroutine(mf));
 }
 
 void translation_unit_visitor::
diff --git a/src/common/clang_utils.cc b/src/common/clang_utils.cc
index 22879a3e..44e4e3f7 100644
--- a/src/common/clang_utils.cc
+++ b/src/common/clang_utils.cc
@@ -876,4 +876,10 @@ clang::RawComment *get_expression_raw_comment(const clang::SourceManager &sm,
     return {};
 }
 
+bool is_coroutine(const clang::FunctionDecl &decl)
+{
+    const auto *body = decl.getBody();
+    return clang::isa_and_nonnull<clang::CoroutineBodyStmt>(body);
+}
+
 } // namespace clanguml::common
diff --git a/src/common/clang_utils.h b/src/common/clang_utils.h
index 3dddeeb4..f94c7b4c 100644
--- a/src/common/clang_utils.h
+++ b/src/common/clang_utils.h
@@ -295,4 +295,12 @@ consume_type_context(clang::QualType type);
 clang::RawComment *get_expression_raw_comment(const clang::SourceManager &sm,
     const clang::ASTContext &context, const clang::Stmt *stmt);
 
+/**
+ * Check if function or method declaration is a C++20 coroutine.
+ *
+ * @param decl Function declaration
+ * @return True, if the function is a C++20 coroutine.
+ */
+bool is_coroutine(const clang::FunctionDecl &decl);
+
 } // namespace clanguml::common
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 969967b0..0fcb00f8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml
                                    test_compilation_database_data/*.yml
                                    test_compilation_database_data/*.json)
 
-set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065)
+set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065 t00069)
 
 set(CLANG_UML_TEST_LIBRARIES
         clang-umllib
diff --git a/tests/t00069/.clang-uml b/tests/t00069/.clang-uml
new file mode 100644
index 00000000..8b8d8450
--- /dev/null
+++ b/tests/t00069/.clang-uml
@@ -0,0 +1,9 @@
+diagrams:
+  t00069_class:
+    type: class
+    glob:
+      - t00069.cc
+    include:
+      namespaces:
+        - clanguml::t00069
+    using_namespace: clanguml::t00069
\ No newline at end of file
diff --git a/tests/t00069/t00069.cc b/tests/t00069/t00069.cc
new file mode 100644
index 00000000..606b60b3
--- /dev/null
+++ b/tests/t00069/t00069.cc
@@ -0,0 +1,63 @@
+#include <coroutine>
+#include <optional>
+
+namespace clanguml {
+namespace t00069 {
+
+template <typename T> struct generator {
+    struct promise_type;
+    using handle_type = std::coroutine_handle<promise_type>;
+
+    generator(handle_type h)
+        : h_(h)
+    {
+    }
+
+    ~generator() { h_.destroy(); }
+
+    struct promise_type {
+        T value_;
+        std::exception_ptr exception_;
+
+        generator get_return_object()
+        {
+            return generator(handle_type::from_promise(*this));
+        }
+        std::suspend_always initial_suspend() { return {}; }
+
+        std::suspend_always final_suspend() noexcept { return {}; }
+
+        void unhandled_exception() { exception_ = std::current_exception(); }
+
+        template <std::convertible_to<T> From>
+        std::suspend_always yield_value(From &&from)
+        {
+            value_ = std::forward<From>(from);
+            return {};
+        }
+
+        void return_void() { }
+    };
+
+    handle_type h_;
+
+private:
+    bool full_ = false;
+};
+
+class A {
+public:
+    generator<unsigned long> iota() { co_yield counter_++; }
+
+    generator<unsigned long> seed()
+    {
+        counter_ = 42;
+        co_return;
+    }
+
+private:
+    unsigned long counter_;
+};
+
+} // namespace t00069
+} // namespace clanguml
diff --git a/tests/t00069/test_case.h b/tests/t00069/test_case.h
new file mode 100644
index 00000000..98894ea6
--- /dev/null
+++ b/tests/t00069/test_case.h
@@ -0,0 +1,87 @@
+/**
+ * tests/t00069/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t00069", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00069");
+
+    auto diagram = config.diagrams["t00069_class"];
+
+    REQUIRE(diagram->name == "t00069_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00069_class");
+
+    {
+        auto src = generate_class_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        // Check if all classes exist
+        REQUIRE_THAT(src, IsClass(_A("A")));
+
+        // Check if class templates exist
+        REQUIRE_THAT(src, IsClassTemplate("generator", "T"));
+
+        // Check if all inner classes exist
+        REQUIRE_THAT(src,
+            IsInnerClass(_A("generator<T>"), _A("generator::promise_type")));
+
+        // Check if all methods exist
+        REQUIRE_THAT(src,
+            (IsMethod<Public, Coroutine>("iota", "generator<unsigned long>")));
+        REQUIRE_THAT(src,
+            (IsMethod<Public, Coroutine>("seed", "generator<unsigned long>")));
+
+        // Check if all relationships exist
+        REQUIRE_THAT(
+            src, IsDependency(_A("A"), _A("generator<unsigned long>")));
+        REQUIRE_THAT(src,
+            IsInstantiation(
+                _A("generator<T>"), _A("generator<unsigned long>")));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_class_json(diagram, *model);
+
+        using namespace json;
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_class_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsClass;
+        using mermaid::IsMethod;
+
+        REQUIRE_THAT(src, IsClass(_A("A")));
+        REQUIRE_THAT(src,
+            (IsMethod<Public, Coroutine>("iota", "generator<unsigned long>")));
+        REQUIRE_THAT(src,
+            (IsMethod<Public, Coroutine>("seed", "generator<unsigned long>")));
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 6a2a672b..4b7f95f5 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -404,6 +404,9 @@ using namespace clanguml::test::matchers;
 #include "t00066/test_case.h"
 #include "t00067/test_case.h"
 #include "t00068/test_case.h"
+#if defined(ENABLE_CXX_STD_20_TEST_CASES)
+#include "t00069/test_case.h"
+#endif
 
 ///
 /// Sequence diagram tests
diff --git a/tests/test_cases.h b/tests/test_cases.h
index 0e3a9c99..bf4e9249 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -108,6 +108,8 @@ struct Constexpr { };
 
 struct Consteval { };
 
+struct Coroutine { };
+
 struct Noexcept { };
 
 struct Default { };
@@ -962,6 +964,9 @@ ContainsMatcher IsMethod(std::string const &name,
     if constexpr (has_type<Deleted, Ts...>())
         pattern += " = deleted";
 
+    if constexpr (has_type<Coroutine, Ts...>())
+        pattern += " [coroutine]";
+
     pattern += " : " + type;
 
     return ContainsMatcher(CasedString(pattern, caseSensitivity));
@@ -995,6 +1000,8 @@ ContainsMatcher IsMethod(std::string const &name, std::string type = "void",
         method_mods.push_back("constexpr");
     if constexpr (has_type<Consteval, Ts...>())
         method_mods.push_back("consteval");
+    if constexpr (has_type<Coroutine, Ts...>())
+        method_mods.push_back("coroutine");
 
     pattern += " : ";
 
diff --git a/tests/test_cases.yaml b/tests/test_cases.yaml
index 7b7c584e..c212aa5a 100644
--- a/tests/test_cases.yaml
+++ b/tests/test_cases.yaml
@@ -201,6 +201,9 @@ test_cases:
     - name: t00068
       title: Context filter radius parameter test case
       description:
+    - name: t00069
+      title: Coroutine methods in class diagrams
+      description:
   Sequence diagrams:
     - name: t20001
       title: Basic sequence diagram test case

From ea6892f754033c3560e263b15b8ff39ad954f836 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sun, 17 Dec 2023 20:49:41 +0100
Subject: [PATCH 02/24] Added support for class diagram filtering based on
 C++20 modules (#195)

---
 CMakeLists.txt                                |  3 +-
 Makefile                                      | 25 ++++--
 README.md                                     |  1 +
 .../visitor/translation_unit_visitor.cc       |  9 +++
 src/common/model/diagram_filter.cc            | 39 ++++++++++
 src/common/model/diagram_filter.h             | 15 ++++
 src/common/model/element.h                    | 15 ++++
 .../visitor/translation_unit_visitor.cc       | 10 +++
 src/common/visitor/translation_unit_visitor.h |  3 +
 src/config/config.h                           | 13 ++++
 src/config/schema.h                           |  5 +-
 src/config/yaml_decoders.cc                   |  6 ++
 src/config/yaml_emitters.cc                   |  2 +
 tests/CMakeLists.txt                          | 45 +++++++++--
 tests/t00070/.clang-uml                       | 12 +++
 tests/t00070/src/common.cppm                  | 11 +++
 tests/t00070/src/lib1.cppm                    | 11 +++
 tests/t00070/src/lib2.cppm                    | 11 +++
 tests/t00070/t00070.cc                        | 14 ++++
 tests/t00070/test_case.h                      | 78 +++++++++++++++++++
 tests/test_cases.cc                           |  3 +
 21 files changed, 310 insertions(+), 21 deletions(-)
 create mode 100644 tests/t00070/.clang-uml
 create mode 100644 tests/t00070/src/common.cppm
 create mode 100644 tests/t00070/src/lib1.cppm
 create mode 100644 tests/t00070/src/lib2.cppm
 create mode 100644 tests/t00070/t00070.cc
 create mode 100644 tests/t00070/test_case.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2bcde24..7721ff83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.16)
 
 #
 # Project name
@@ -153,6 +153,7 @@ add_subdirectory(src)
 # Enable testing via CTest
 #
 option(BUILD_TESTS "" ON)
+option(ENABLE_CXX_MODULES_TEST_CASES "" OFF)
 if(BUILD_TESTS)
   enable_testing()
   add_subdirectory(tests)
diff --git a/Makefile b/Makefile
index 9d55dd42..3ab0d8f9 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,9 @@ LLVM_CONFIG_PATH ?=
 CMAKE_PREFIX ?=
 CMAKE_CXX_FLAGS ?=
 CMAKE_EXE_LINKER_FLAGS ?=
+CMAKE_GENERATOR ?= Unix Makefiles
+
+ENABLE_CXX_MODULES_TEST_CASES ?= OFF
 
 GIT_VERSION	?= $(shell git describe --tags --always --abbrev=7)
 PKG_VERSION	?= $(shell git describe --tags --always --abbrev=7 | tr - .)
@@ -49,6 +52,7 @@ clean:
 
 debug/CMakeLists.txt:
 	cmake -S . -B debug \
+		-G"$(CMAKE_GENERATOR)" \
 		-DGIT_VERSION=$(GIT_VERSION) \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_BUILD_TYPE=Debug \
@@ -56,10 +60,12 @@ debug/CMakeLists.txt:
 		-DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \
 		-DLLVM_VERSION=${LLVM_VERSION} \
 		-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
-		-DCMAKE_PREFIX=${CMAKE_PREFIX}
+		-DCMAKE_PREFIX=${CMAKE_PREFIX} \
+		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES)
 
 release/CMakeLists.txt:
 	cmake -S . -B release \
+		-G"$(CMAKE_GENERATOR)" \
 		-DGIT_VERSION=$(GIT_VERSION) \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -67,10 +73,12 @@ release/CMakeLists.txt:
 		-DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \
 		-DLLVM_VERSION=${LLVM_VERSION} \
 		-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
-		-DCMAKE_PREFIX=${CMAKE_PREFIX}
+		-DCMAKE_PREFIX=${CMAKE_PREFIX} \
+		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES)
 
 debug_tidy/CMakeLists.txt:
 	cmake -S . -B debug_tidy \
+		-G"$(CMAKE_GENERATOR)" \
 		-DGIT_VERSION=$(GIT_VERSION) \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_BUILD_TYPE=Debug \
@@ -79,24 +87,25 @@ debug_tidy/CMakeLists.txt:
 		-DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \
 		-DLLVM_VERSION=${LLVM_VERSION} \
 		-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
-		-DCMAKE_PREFIX=${CMAKE_PREFIX}
+		-DCMAKE_PREFIX=${CMAKE_PREFIX} \
+		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES)
 
 debug: debug/CMakeLists.txt
 	echo "Using ${NUMPROC} cores"
-	make -C debug -j$(NUMPROC)
+	cmake --build debug -j$(NUMPROC)
 
 debug_tidy: debug_tidy/CMakeLists.txt
 	echo "Using ${NUMPROC} cores"
-	make -C debug_tidy -j$(NUMPROC)
+	cmake --build debug_tidy -j$(NUMPROC)
 
 release: release/CMakeLists.txt
-	make -C release -j$(NUMPROC)
+	cmake --build release -j$(NUMPROC)
 
 test: debug
-	CTEST_OUTPUT_ON_FAILURE=1 make -C debug test
+	CTEST_OUTPUT_ON_FAILURE=1 ctest --test-dir debug
 
 test_release: release
-	CTEST_OUTPUT_ON_FAILURE=1 make -C release test
+	CTEST_OUTPUT_ON_FAILURE=1 ctest --test-dir release
 
 install: release
 	make -C release install DESTDIR=${DESTDIR}
diff --git a/README.md b/README.md
index 4fcd8feb..93f9359d 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ Main features supported so far include:
     * Support for plain C99/C11 code (struct, units and their relationships) - [_example_](docs/test_cases/t00057.md)
     * C++20 concept constraints - [_example_](docs/test_cases/t00059.md)
     * C++20 coroutines - [_example_](docs/test_cases/t00069.md)
+    * Diagram content filtering based on C++20 modules - [_example_](docs/test_cases/t00070.md)
 * **Sequence diagram generation**
     * Generation of sequence diagram from specific method or function - [_example_](docs/test_cases/t20001.md)
     * Generation of loop and conditional statements - [_example_](docs/test_cases/t20021.md)
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 2a19423e..c1fe98df 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -159,6 +159,7 @@ bool translation_unit_visitor::VisitEnumDecl(clang::EnumDecl *enm)
 
     process_comment(*enm, e);
     set_source_location(*enm, e);
+    set_owning_module(*enm, e);
 
     if (e.skip())
         return true;
@@ -265,6 +266,7 @@ bool translation_unit_visitor::VisitTypeAliasTemplateDecl(
         LOG_DBG("Adding class {} with id {}", name, id);
 
         set_source_location(*cls, *template_specialization_ptr);
+        set_owning_module(*cls, *template_specialization_ptr);
 
         add_class(std::move(template_specialization_ptr));
     }
@@ -677,6 +679,9 @@ bool translation_unit_visitor::VisitCXXRecordDecl(clang::CXXRecordDecl *cls)
 
     LOG_DBG(
         "== getQualifiedNameAsString() = {}", cls->getQualifiedNameAsString());
+    if (cls->getOwningModule() != nullptr)
+        LOG_DBG(
+            "== getOwningModule()->Name = {}", cls->getOwningModule()->Name);
     LOG_DBG("== getID() = {}", cls->getID());
     LOG_DBG("== isTemplateDecl() = {}", cls->isTemplateDecl());
     LOG_DBG("== isTemplated() = {}", cls->isTemplated());
@@ -762,6 +767,7 @@ translation_unit_visitor::create_concept_declaration(clang::ConceptDecl *cpt)
 
     process_comment(*cpt, concept_model);
     set_source_location(*cpt, concept_model);
+    set_owning_module(*cpt, concept_model);
 
     if (concept_model.skip())
         return {};
@@ -802,6 +808,7 @@ std::unique_ptr<class_> translation_unit_visitor::create_record_declaration(
 
     process_comment(*rec, record);
     set_source_location(*rec, record);
+    set_owning_module(*rec, record);
 
     const auto record_full_name = record_ptr->full_name(false);
 
@@ -841,6 +848,7 @@ std::unique_ptr<class_> translation_unit_visitor::create_class_declaration(
 
     process_comment(*cls, c);
     set_source_location(*cls, c);
+    set_owning_module(*cls, c);
 
     if (c.skip())
         return {};
@@ -1835,6 +1843,7 @@ translation_unit_visitor::process_template_specialization(
 
     process_comment(*cls, template_instantiation);
     set_source_location(*cls, template_instantiation);
+    set_owning_module(*cls, template_instantiation);
 
     if (template_instantiation.skip())
         return {};
diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc
index da91b003..493b07db 100644
--- a/src/common/model/diagram_filter.cc
+++ b/src/common/model/diagram_filter.cc
@@ -285,6 +285,39 @@ tvl::value_t namespace_filter::match(const diagram &d, const element &e) const
     return result;
 }
 
+modules_filter::modules_filter(
+    filter_t type, std::vector<common::string_or_regex> modules)
+    : filter_visitor{type}
+    , modules_{std::move(modules)}
+{
+}
+
+tvl::value_t modules_filter::match(const diagram &d, const element &e) const
+{
+    if (modules_.empty())
+        return {};
+
+    if (!e.module().has_value())
+        return {false};
+
+    const auto module_toks = util::split(e.module().value(), ".");
+
+    auto result = tvl::any_of(modules_.begin(), modules_.end(),
+        [&e, &module_toks](const auto &modit) {
+            if (std::holds_alternative<std::string>(modit.value())) {
+                const auto &modit_str = std::get<std::string>(modit.value());
+                const auto modit_toks = util::split(modit_str, ".");
+
+                return e.module() == modit_str ||
+                    util::starts_with(module_toks, modit_toks);
+            }
+
+            return std::get<common::regex>(modit.value()) %= e.module().value();
+        });
+
+    return result;
+}
+
 element_filter::element_filter(
     filter_t type, std::vector<common::string_or_regex> elements)
     : filter_visitor{type}
@@ -887,6 +920,9 @@ void diagram_filter::init_filters(const config::diagram &c)
         add_inclusive_filter(std::make_unique<namespace_filter>(
             filter_t::kInclusive, c.include().namespaces));
 
+        add_inclusive_filter(std::make_unique<modules_filter>(
+            filter_t::kInclusive, c.include().modules));
+
         add_inclusive_filter(std::make_unique<relationship_filter>(
             filter_t::kInclusive, c.include().relationships));
 
@@ -997,6 +1033,9 @@ void diagram_filter::init_filters(const config::diagram &c)
         add_exclusive_filter(std::make_unique<namespace_filter>(
             filter_t::kExclusive, c.exclude().namespaces));
 
+        add_exclusive_filter(std::make_unique<modules_filter>(
+            filter_t::kExclusive, c.exclude().modules));
+
         add_exclusive_filter(std::make_unique<paths_filter>(
             filter_t::kExclusive, c.root_directory(), c.exclude().paths));
 
diff --git a/src/common/model/diagram_filter.h b/src/common/model/diagram_filter.h
index ea51d01b..9344b27b 100644
--- a/src/common/model/diagram_filter.h
+++ b/src/common/model/diagram_filter.h
@@ -154,6 +154,21 @@ private:
     std::vector<common::namespace_or_regex> namespaces_;
 };
 
+/**
+ * Match diagram elements to a set of specified modules or
+ * module regex patterns.
+ */
+struct modules_filter : public filter_visitor {
+    modules_filter(filter_t type, std::vector<common::string_or_regex> modules);
+
+    ~modules_filter() override = default;
+
+    tvl::value_t match(const diagram &d, const element &e) const override;
+
+private:
+    std::vector<common::string_or_regex> modules_;
+};
+
 /**
  * Match element's name to a set of names or regex patterns.
  */
diff --git a/src/common/model/element.h b/src/common/model/element.h
index 21626a35..d94ce76a 100644
--- a/src/common/model/element.h
+++ b/src/common/model/element.h
@@ -87,6 +87,20 @@ public:
      */
     const namespace_ &path() const { return ns_; }
 
+    /**
+     * Set elements owning module.
+     *
+     * @param module C++20 module.
+     */
+    void set_module(const std::string &module) { module_ = module; }
+
+    /**
+     * Return elements owning module, if any.
+     *
+     * @return C++20 module.
+     */
+    std::optional<std::string> module() const { return module_; }
+
     /**
      * Return elements full name.
      *
@@ -120,5 +134,6 @@ public:
 private:
     namespace_ ns_;
     namespace_ using_namespace_;
+    std::optional<std::string> module_;
 };
 } // namespace clanguml::common::model
diff --git a/src/common/visitor/translation_unit_visitor.cc b/src/common/visitor/translation_unit_visitor.cc
index e30deeee..f6741758 100644
--- a/src/common/visitor/translation_unit_visitor.cc
+++ b/src/common/visitor/translation_unit_visitor.cc
@@ -21,6 +21,8 @@
 #include "comment/clang_visitor.h"
 #include "comment/plain_visitor.h"
 
+#include "clang/Basic/Module.h"
+
 namespace clanguml::common::visitor {
 
 translation_unit_visitor::translation_unit_visitor(
@@ -161,4 +163,12 @@ void translation_unit_visitor::set_source_location(
     element.set_location_id(location.getHashValue());
 }
 
+void translation_unit_visitor::set_owning_module(
+    const clang::Decl &decl, clanguml::common::model::element &element)
+{
+    if (const clang::Module *module = decl.getOwningModule();
+        module != nullptr) {
+        element.set_module(module->Name);
+    }
+}
 } // namespace clanguml::common::visitor
\ No newline at end of file
diff --git a/src/common/visitor/translation_unit_visitor.h b/src/common/visitor/translation_unit_visitor.h
index 22139863..9021dc95 100644
--- a/src/common/visitor/translation_unit_visitor.h
+++ b/src/common/visitor/translation_unit_visitor.h
@@ -100,6 +100,9 @@ public:
     void set_source_location(const clang::SourceLocation &location,
         clanguml::common::model::source_location &element);
 
+    void set_owning_module(
+        const clang::Decl &decl, clanguml::common::model::element &element);
+
 protected:
     /**
      * @brief Process comment directives in comment attached to a declaration
diff --git a/src/config/config.h b/src/config/config.h
index 5c219910..7b061b78 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -180,6 +180,19 @@ struct filter {
      */
     std::vector<common::namespace_or_regex> namespaces;
 
+    /*! @brief Modules filter
+     *
+     * Example:
+     *
+     * ```yaml
+     *   include
+     *     modules:
+     *       - app.module1
+     *       - r: ".*internal.*"
+     * ```
+     */
+    std::vector<common::string_or_regex> modules;
+
     /*! @brief Elements filter
      *
      * Example:
diff --git a/src/config/schema.h b/src/config/schema.h
index 238ce590..21827d67 100644
--- a/src/config/schema.h
+++ b/src/config/schema.h
@@ -64,10 +64,6 @@ types:
     regex_t:
         r: string
     regex_or_string_t: [string, regex_t]
-    namespaces_filter_t:
-        namespaces: [regex_or_string_t]
-    elements_filter_t:
-        elements: [regex_or_string_t]
     element_types_filter_t: !variant
         - class
         - enum
@@ -121,6 +117,7 @@ types:
         - context_filter_match_t
     filter_t:
         namespaces: !optional [regex_or_string_t]
+        modules: !optional [regex_or_string_t]
         elements: !optional [regex_or_string_t]
         element_types: !optional [element_types_filter_t]
         relationships: !optional [relationship_filter_t]
diff --git a/src/config/yaml_decoders.cc b/src/config/yaml_decoders.cc
index 999a3d83..c24686ea 100644
--- a/src/config/yaml_decoders.cc
+++ b/src/config/yaml_decoders.cc
@@ -475,6 +475,12 @@ template <> struct convert<filter> {
                 rhs.namespaces.push_back({ns});
         }
 
+        if (node["modules"]) {
+            auto module_list = node["modules"].as<decltype(rhs.modules)>();
+            for (const auto &ns : module_list)
+                rhs.modules.push_back({ns});
+        }
+
         if (node["relationships"])
             rhs.relationships =
                 node["relationships"].as<decltype(rhs.relationships)>();
diff --git a/src/config/yaml_emitters.cc b/src/config/yaml_emitters.cc
index 200e1df4..2bdad164 100644
--- a/src/config/yaml_emitters.cc
+++ b/src/config/yaml_emitters.cc
@@ -122,6 +122,8 @@ YAML::Emitter &operator<<(YAML::Emitter &out, const filter &f)
     out << YAML::BeginMap;
     if (!f.namespaces.empty())
         out << YAML::Key << "namespaces" << YAML::Value << f.namespaces;
+    if (!f.modules.empty())
+        out << YAML::Key << "modules" << YAML::Value << f.modules;
     if (!f.access.empty())
         out << YAML::Key << "access" << YAML::Value << f.access;
     if (!f.context.empty())
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0fcb00f8..982ca588 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,11 +1,30 @@
 
 file(GLOB_RECURSE TEST_CASE_SOURCES t*/*.cc t*/*.c t*/src/*.c)
+file(GLOB_RECURSE TEST_CASE_MODULE_SOURCES t*/src/*.cppm)
 file(GLOB_RECURSE TEST_CASE_CONFIGS t*/.clang-uml)
 file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml
                                    test_compilation_database_data/*.yml
                                    test_compilation_database_data/*.json)
 
 set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065 t00069)
+set(TEST_CASES_REQUIRING_CXX20_MODULES t00070)
+
+if(ENABLE_CXX_MODULES_TEST_CASES)
+    foreach(CXX20_MOD_TC ${TEST_CASES_REQUIRING_CXX20_MODULES})
+        list(APPEND TEST_CASES_REQUIRING_CXX20 ${CXX20_MOD_TC})
+    endforeach()
+    set(CMAKE_CXX_SCAN_FOR_MODULES ON)
+else()
+    foreach(CXX20_MOD_TC ${TEST_CASES_REQUIRING_CXX20_MODULES})
+        list(FILTER TEST_CASE_SOURCES
+                EXCLUDE
+                REGEX ".*${CXX20_MOD_TC}.*")
+        list(FILTER TEST_CASE_CONFIGS
+                EXCLUDE
+                REGEX ".*${CXX20_MOD_TC}.*")
+
+    endforeach()
+endif(ENABLE_CXX_MODULES_TEST_CASES)
 
 set(CLANG_UML_TEST_LIBRARIES
         clang-umllib
@@ -19,6 +38,7 @@ endif(MSVC)
 
 list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_std_20 SUPPORTS_CXX_STD_20)
 
+# Remove test cases which require C++20 if they are not supported here
 if(SUPPORTS_CXX_STD_20 EQUAL -1
         OR ${LLVM_PACKAGE_VERSION} VERSION_LESS "14.0")
     set(ENABLE_CXX_STD_20_TEST_CASES 0)
@@ -34,7 +54,7 @@ else()
     set(ENABLE_CXX_STD_20_TEST_CASES 1)
 endif()
 
-set(TEST_CASES
+set(TEST_NAMES
         test_util
         test_model
         test_cases
@@ -46,15 +66,24 @@ set(TEST_CASES
         test_thread_pool_executor
         test_query_driver_output_extractor)
 
-foreach(TEST_NAME ${TEST_CASES})
-    add_executable(${TEST_NAME}
-            ${TEST_NAME}.cc
-            $<$<STREQUAL:${TEST_NAME},test_cases>:${TEST_CASE_SOURCES}>
-            catch.h)
+foreach(TEST_NAME ${TEST_NAMES})
+    add_executable(${TEST_NAME})
+    if(TEST_NAME STREQUAL "test_cases")
+        if(ENABLE_CXX_MODULES_TEST_CASES)
+            target_sources(${TEST_NAME} PUBLIC FILE_SET CXX_MODULES FILES
+                           ${TEST_CASE_MODULE_SOURCES})
+        endif(ENABLE_CXX_MODULES_TEST_CASES)
+        target_sources(${TEST_NAME} PUBLIC ${TEST_NAME}.cc
+                                           ${TEST_CASE_SOURCES} catch.h)
+    else()
+        target_sources(${TEST_NAME} PUBLIC ${TEST_NAME}.cc catch.h)
+    endif(TEST_NAME STREQUAL "test_cases")
+
     target_compile_features(${TEST_NAME} PRIVATE
             $<IF:${ENABLE_CXX_STD_20_TEST_CASES},cxx_std_20,cxx_std_17>)
     target_compile_definitions(${TEST_NAME} PRIVATE
-            $<$<EQUAL:${ENABLE_CXX_STD_20_TEST_CASES},1>:ENABLE_CXX_STD_20_TEST_CASES>)
+            $<$<EQUAL:${ENABLE_CXX_STD_20_TEST_CASES},1>:ENABLE_CXX_STD_20_TEST_CASES>
+            $<$<BOOL:${ENABLE_CXX_MODULES_TEST_CASES}>:ENABLE_CXX_MODULES_TEST_CASES>)
     target_compile_options(${TEST_NAME} PRIVATE
             $<$<COMPILE_LANGUAGE:CXX>:
             $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
@@ -89,6 +118,6 @@ foreach(TEST_CONFIG_YML ${TEST_CONFIG_YMLS})
             COPYONLY)
 endforeach()
 
-foreach(TEST_NAME ${TEST_CASES})
+foreach(TEST_NAME ${TEST_NAMES})
     add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME})
 endforeach()
diff --git a/tests/t00070/.clang-uml b/tests/t00070/.clang-uml
new file mode 100644
index 00000000..6fa20189
--- /dev/null
+++ b/tests/t00070/.clang-uml
@@ -0,0 +1,12 @@
+diagrams:
+  t00070_class:
+    type: class
+    glob:
+      - t00070.cc
+    include:
+      modules:
+        - t00070
+    exclude:
+      modules:
+        - t00070.lib2
+    using_namespace: clanguml::t00070
\ No newline at end of file
diff --git a/tests/t00070/src/common.cppm b/tests/t00070/src/common.cppm
new file mode 100644
index 00000000..682316c9
--- /dev/null
+++ b/tests/t00070/src/common.cppm
@@ -0,0 +1,11 @@
+export module t00070;
+export import t00070.lib1;
+export import t00070.lib2;
+
+export namespace clanguml::t00070 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
\ No newline at end of file
diff --git a/tests/t00070/src/lib1.cppm b/tests/t00070/src/lib1.cppm
new file mode 100644
index 00000000..102c0aa7
--- /dev/null
+++ b/tests/t00070/src/lib1.cppm
@@ -0,0 +1,11 @@
+export module t00070.lib1;
+
+export namespace clanguml::t00070 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+enum class BBB { bbb1, bbb2 };
+}
\ No newline at end of file
diff --git a/tests/t00070/src/lib2.cppm b/tests/t00070/src/lib2.cppm
new file mode 100644
index 00000000..1d2a8cac
--- /dev/null
+++ b/tests/t00070/src/lib2.cppm
@@ -0,0 +1,11 @@
+export module t00070.lib2;
+
+export namespace clanguml::t00070 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+enum class CCC { ccc1, ccc2 };
+}
\ No newline at end of file
diff --git a/tests/t00070/t00070.cc b/tests/t00070/t00070.cc
new file mode 100644
index 00000000..8d1b6420
--- /dev/null
+++ b/tests/t00070/t00070.cc
@@ -0,0 +1,14 @@
+import t00070.lib1;
+import t00070.lib2;
+
+namespace clanguml {
+namespace t00070 {
+int tmain()
+{
+    B b;
+    C c;
+
+    return 0;
+}
+}
+}
\ No newline at end of file
diff --git a/tests/t00070/test_case.h b/tests/t00070/test_case.h
new file mode 100644
index 00000000..fff287a3
--- /dev/null
+++ b/tests/t00070/test_case.h
@@ -0,0 +1,78 @@
+/**
+ * tests/t00070/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t00070", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00070");
+
+    auto diagram = config.diagrams["t00070_class"];
+
+    REQUIRE(diagram->name == "t00070_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00070_class");
+
+    {
+        auto src = generate_class_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        REQUIRE_THAT(src, !IsClass(_A("A")));
+        REQUIRE_THAT(src, IsClass(_A("B")));
+        REQUIRE_THAT(src, !IsClass(_A("C")));
+
+        REQUIRE_THAT(src, IsClassTemplate("BB", "T"));
+        REQUIRE_THAT(src, !IsClassTemplate("CC", "T"));
+
+        REQUIRE_THAT(src, IsEnum(_A("BBB")));
+        REQUIRE_THAT(src, !IsEnum(_A("CCC")));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_class_json(diagram, *model);
+
+        using namespace json;
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_class_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsClass;
+        using mermaid::IsEnum;
+
+        REQUIRE_THAT(src, !IsClass(_A("A")));
+        REQUIRE_THAT(src, IsClass(_A("B")));
+        REQUIRE_THAT(src, !IsClass(_A("C")));
+
+        REQUIRE_THAT(src, IsClass(_A("BB<T>")));
+        REQUIRE_THAT(src, !IsClass(_A("CC<T>")));
+
+        REQUIRE_THAT(src, IsEnum(_A("BBB")));
+        REQUIRE_THAT(src, !IsEnum(_A("CCC")));
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 4b7f95f5..ebf1ddb9 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -407,6 +407,9 @@ using namespace clanguml::test::matchers;
 #if defined(ENABLE_CXX_STD_20_TEST_CASES)
 #include "t00069/test_case.h"
 #endif
+#if defined(ENABLE_CXX_MODULES_TEST_CASES)
+#include "t00070/test_case.h"
+#endif
 
 ///
 /// Sequence diagram tests

From c51ae5b6eeba731b56090b54f358a5ec41f07174 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Mon, 18 Dec 2023 21:55:18 +0100
Subject: [PATCH 03/24] Added support for C++20 module based packages in class
 diagrams (#101)

---
 .../json/class_diagram_generator.cc           | 11 ++-
 .../plantuml/class_diagram_generator.cc       |  6 +-
 .../visitor/translation_unit_visitor.cc       | 27 +++++++
 src/common/model/diagram_filter.cc            |  5 +-
 src/common/model/path.h                       |  7 +-
 src/config/config.cc                          | 26 +++++++
 src/config/config.h                           | 25 ++++++-
 src/config/schema.h                           |  4 ++
 src/config/yaml_decoders.cc                   |  4 ++
 src/config/yaml_emitters.cc                   |  1 +
 tests/CMakeLists.txt                          |  2 +-
 tests/t00065/test_case.h                      |  2 +-
 tests/t00071/.clang-uml                       | 12 ++++
 tests/t00071/src/lib1.cppm                    | 13 ++++
 tests/t00071/src/lib1mod1.cppm                |  5 ++
 tests/t00071/src/lib1mod2.cppm                |  5 ++
 tests/t00071/src/lib2.cppm                    | 13 ++++
 tests/t00071/src/t00071_mod.cppm              | 11 +++
 tests/t00071/t00071.cc                        | 15 ++++
 tests/t00071/test_case.h                      | 70 +++++++++++++++++++
 tests/test_cases.cc                           |  1 +
 tests/test_cases.yaml                         |  6 ++
 tests/test_config.cc                          | 25 +++++++
 tests/test_config_data/using_module.yml       | 12 ++++
 24 files changed, 296 insertions(+), 12 deletions(-)
 create mode 100644 tests/t00071/.clang-uml
 create mode 100644 tests/t00071/src/lib1.cppm
 create mode 100644 tests/t00071/src/lib1mod1.cppm
 create mode 100644 tests/t00071/src/lib1mod2.cppm
 create mode 100644 tests/t00071/src/lib2.cppm
 create mode 100644 tests/t00071/src/t00071_mod.cppm
 create mode 100644 tests/t00071/t00071.cc
 create mode 100644 tests/t00071/test_case.h
 create mode 100644 tests/test_config_data/using_module.yml

diff --git a/src/class_diagram/generators/json/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc
index 21bbe020..66966d5e 100644
--- a/src/class_diagram/generators/json/class_diagram_generator.cc
+++ b/src/class_diagram/generators/json/class_diagram_generator.cc
@@ -170,10 +170,17 @@ void generator::generate(const package &p, nlohmann::json &parent) const
         if (!uns.starts_with({p.full_name(false)})) {
             LOG_DBG("Generating package {}", p.name());
 
-            if (config().package_type() == config::package_type_t::kDirectory)
+            switch (config().package_type()) {
+            case config::package_type_t::kDirectory:
                 package_object["type"] = "directory";
-            else
+                break;
+            case config::package_type_t::kModule:
+                package_object["type"] = "module";
+                break;
+            case config::package_type_t::kNamespace:
                 package_object["type"] = "namespace";
+                break;
+            }
 
             package_object["name"] = p.name();
             package_object["display_name"] = p.full_name(false);
diff --git a/src/class_diagram/generators/plantuml/class_diagram_generator.cc b/src/class_diagram/generators/plantuml/class_diagram_generator.cc
index 35c299e7..231ac18b 100644
--- a/src/class_diagram/generators/plantuml/class_diagram_generator.cc
+++ b/src/class_diagram/generators/plantuml/class_diagram_generator.cc
@@ -67,7 +67,7 @@ void generator::generate_alias(const class_ &c, std::ostream &ostr) const
         class_type = "abstract";
 
     std::string full_name;
-    if (config().generate_packages())
+    if (config().generate_fully_qualified_name())
         full_name = c.full_name_no_ns();
     else
         full_name = c.full_name();
@@ -89,7 +89,7 @@ void generator::generate_alias(const enum_ &e, std::ostream &ostr) const
 {
     print_debug(e, ostr);
 
-    if (config().generate_packages())
+    if (config().generate_fully_qualified_name())
         ostr << "enum"
              << " \"" << e.name();
     else
@@ -106,7 +106,7 @@ void generator::generate_alias(const concept_ &c, std::ostream &ostr) const
 {
     print_debug(c, ostr);
 
-    if (config().generate_packages())
+    if (config().generate_fully_qualified_name())
         ostr << "class"
              << " \"" << c.name();
     else
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index c1fe98df..489b48b3 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -2150,6 +2150,15 @@ void translation_unit_visitor::add_class(std::unique_ptr<class_> &&c)
 
         diagram().add(p, std::move(c));
     }
+    else if ((config().generate_packages() &&
+                 config().package_type() == config::package_type_t::kModule)) {
+
+        const auto module_path = config().make_module_relative(c->module());
+
+        common::model::path p{module_path, common::model::path_type::kModule};
+
+        diagram().add(p, std::move(c));
+    }
     else {
         diagram().add(c->path(), std::move(c));
     }
@@ -2169,6 +2178,15 @@ void translation_unit_visitor::add_enum(std::unique_ptr<enum_> &&e)
 
         diagram().add(p, std::move(e));
     }
+    else if ((config().generate_packages() &&
+                 config().package_type() == config::package_type_t::kModule)) {
+
+        const auto module_path = config().make_module_relative(e->module());
+
+        common::model::path p{module_path, common::model::path_type::kModule};
+
+        diagram().add(p, std::move(e));
+    }
     else {
         diagram().add(e->path(), std::move(e));
     }
@@ -2188,6 +2206,15 @@ void translation_unit_visitor::add_concept(std::unique_ptr<concept_> &&c)
 
         diagram().add(p, std::move(c));
     }
+    else if ((config().generate_packages() &&
+                 config().package_type() == config::package_type_t::kModule)) {
+
+        const auto module_path = config().make_module_relative(c->module());
+
+        common::model::path p{module_path, common::model::path_type::kModule};
+
+        diagram().add(p, std::move(c));
+    }
     else {
         diagram().add(c->path(), std::move(c));
     }
diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc
index 493b07db..bd501051 100644
--- a/src/common/model/diagram_filter.cc
+++ b/src/common/model/diagram_filter.cc
@@ -292,7 +292,8 @@ modules_filter::modules_filter(
 {
 }
 
-tvl::value_t modules_filter::match(const diagram &d, const element &e) const
+tvl::value_t modules_filter::match(
+    const diagram & /*d*/, const element &e) const
 {
     if (modules_.empty())
         return {};
@@ -300,7 +301,7 @@ tvl::value_t modules_filter::match(const diagram &d, const element &e) const
     if (!e.module().has_value())
         return {false};
 
-    const auto module_toks = util::split(e.module().value(), ".");
+    const auto module_toks = util::split(e.module().value(), "."); // NOLINT
 
     auto result = tvl::any_of(modules_.begin(), modules_.end(),
         [&e, &module_toks](const auto &modit) {
diff --git a/src/common/model/path.h b/src/common/model/path.h
index d9bd4bc8..aa8e9295 100644
--- a/src/common/model/path.h
+++ b/src/common/model/path.h
@@ -32,8 +32,9 @@ namespace clanguml::common::model {
  * a nested set of namespaces or nested set of directories.
  */
 enum class path_type {
-    kNamespace, /*!< Namespace path */
-    kFilesystem /*!< Filesystem path */
+    kNamespace,  /*!< Namespace path */
+    kFilesystem, /*!< Filesystem path */
+    kModule      /*!< Module path */
 };
 
 /**
@@ -54,6 +55,8 @@ class path {
         switch (path_type_) {
         case path_type::kNamespace:
             return "::";
+        case path_type::kModule:
+            return ".";
         case path_type::kFilesystem:
 #ifdef _WIN32
             return "\\";
diff --git a/src/config/config.cc b/src/config/config.cc
index ecfd9722..11207f86 100644
--- a/src/config/config.cc
+++ b/src/config/config.cc
@@ -187,6 +187,7 @@ void inheritable_diagram_options::inherit(
 {
     glob.override(parent.glob);
     using_namespace.override(parent.using_namespace);
+    using_module.override(parent.using_module);
     include_relations_also_as_members.override(
         parent.include_relations_also_as_members);
     include.override(parent.include);
@@ -229,6 +230,12 @@ std::string inheritable_diagram_options::simplify_template_type(
     return full_name;
 }
 
+bool inheritable_diagram_options::generate_fully_qualified_name() const
+{
+    return generate_packages() &&
+        (package_type() == package_type_t::kNamespace);
+}
+
 std::vector<std::string> diagram::get_translation_units() const
 {
     std::vector<std::string> translation_units{};
@@ -264,6 +271,25 @@ std::filesystem::path diagram::make_path_relative(
     return relative(p, root_directory()).lexically_normal().string();
 }
 
+std::vector<std::string> diagram::make_module_relative(
+    const std::optional<std::string> &maybe_module) const
+{
+    if (!maybe_module)
+        return {};
+
+    auto module_path = util::split(maybe_module.value(), ".");
+
+    if (using_module.has_value) {
+        auto using_module_path = util::split(using_module(), ".");
+
+        if (util::starts_with(module_path, using_module_path)) {
+            util::remove_prefix(module_path, using_module_path);
+        }
+    }
+
+    return module_path;
+}
+
 std::optional<std::string> diagram::get_together_group(
     const std::string &full_name) const
 {
diff --git a/src/config/config.h b/src/config/config.h
index 7b061b78..8dc54064 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -87,7 +87,8 @@ std::string to_string(callee_type mt);
 /*! How packages in diagrams should be generated */
 enum class package_type_t {
     kNamespace, /*!< From namespaces */
-    kDirectory  /*!< From directories */
+    kDirectory, /*!< From directories */
+    kModule     /*!< From modules */
 };
 
 std::string to_string(package_type_t mt);
@@ -469,6 +470,18 @@ struct inheritable_diagram_options {
 
     std::string simplify_template_type(std::string full_name) const;
 
+    /**
+     * @brief Whether the diagram element should be fully qualified in diagram
+     *
+     * This method determines whether an elements' name should include
+     * fully qualified namespace name (however relative to using_namespace), or
+     * whether it should just contain it's name. This depends on whether the
+     * diagram has packages and if they are based on namespaces or sth else.
+     *
+     * @return True, if element should include it's namespace
+     */
+    bool generate_fully_qualified_name() const;
+
     /**
      * @brief Get reference to `relative_to` diagram config option
      *
@@ -483,6 +496,7 @@ struct inheritable_diagram_options {
 
     option<std::vector<std::string>> glob{"glob"};
     option<common::model::namespace_> using_namespace{"using_namespace"};
+    option<std::string> using_module{"using_module"};
     option<bool> include_relations_also_as_members{
         "include_relations_also_as_members", true};
     option<filter> include{"include"};
@@ -566,6 +580,15 @@ struct diagram : public inheritable_diagram_options {
     std::filesystem::path make_path_relative(
         const std::filesystem::path &p) const;
 
+    /**
+     * @brief Make module path relative to `using_module` configuration option
+     *
+     * @param p Input path
+     * @return Relative path
+     */
+    std::vector<std::string> make_module_relative(
+        const std::optional<std::string> &maybe_module) const;
+
     /**
      * @brief Returns absolute path of the `relative_to` option
      *
diff --git a/src/config/schema.h b/src/config/schema.h
index 21827d67..bf8e2ea0 100644
--- a/src/config/schema.h
+++ b/src/config/schema.h
@@ -58,6 +58,7 @@ types:
     package_type_t: !variant
         - namespace
         - directory
+        - module
     member_order_t: !variant
         - lexical
         - as_is
@@ -161,6 +162,7 @@ types:
             cmd: !optional string
         relative_to: !optional string
         using_namespace: !optional [string, [string]]
+        using_module: !optional string
         generate_metadata: !optional bool
         title: !optional string
         #
@@ -239,6 +241,7 @@ types:
             cmd: !optional string
         relative_to: !optional string
         using_namespace: !optional [string, [string]]
+        using_module: !optional string
         generate_metadata: !optional bool
         title: !optional string
         #
@@ -318,6 +321,7 @@ root:
         cmd: !optional string
     relative_to: !optional string
     using_namespace: !optional [string, [string]]
+    using_module: !optional string
     generate_metadata: !optional bool
     #
     # Inheritable custom options
diff --git a/src/config/yaml_decoders.cc b/src/config/yaml_decoders.cc
index c24686ea..82c7c0ef 100644
--- a/src/config/yaml_decoders.cc
+++ b/src/config/yaml_decoders.cc
@@ -133,6 +133,8 @@ void get_option<package_type_t>(
             option.set(package_type_t::kNamespace);
         else if (val == "directory")
             option.set(package_type_t::kDirectory);
+        else if (val == "module")
+            option.set(package_type_t::kModule);
         else
             throw std::runtime_error(
                 "Invalid generate_method_arguments value: " + val);
@@ -573,6 +575,7 @@ template <typename T> bool decode_diagram(const Node &node, T &rhs)
     // Decode options common for all diagrams
     get_option(node, rhs.glob);
     get_option(node, rhs.using_namespace);
+    get_option(node, rhs.using_module);
     get_option(node, rhs.include);
     get_option(node, rhs.exclude);
     get_option(node, rhs.puml);
@@ -787,6 +790,7 @@ template <> struct convert<config> {
     {
         get_option(node, rhs.glob);
         get_option(node, rhs.using_namespace);
+        get_option(node, rhs.using_module);
         get_option(node, rhs.output_directory);
         get_option(node, rhs.compilation_database_dir);
         get_option(node, rhs.add_compile_flags);
diff --git a/src/config/yaml_emitters.cc b/src/config/yaml_emitters.cc
index 2bdad164..c850287b 100644
--- a/src/config/yaml_emitters.cc
+++ b/src/config/yaml_emitters.cc
@@ -310,6 +310,7 @@ YAML::Emitter &operator<<(
     out << c.puml;
     out << c.relative_to;
     out << c.using_namespace;
+    out << c.using_module;
     out << c.generate_metadata;
 
     if (const auto *cd = dynamic_cast<const class_diagram *>(&c);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 982ca588..300bde57 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml
                                    test_compilation_database_data/*.json)
 
 set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065 t00069)
-set(TEST_CASES_REQUIRING_CXX20_MODULES t00070)
+set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071)
 
 if(ENABLE_CXX_MODULES_TEST_CASES)
     foreach(CXX20_MOD_TC ${TEST_CASES_REQUIRING_CXX20_MODULES})
diff --git a/tests/t00065/test_case.h b/tests/t00065/test_case.h
index 0a1c0fdf..539d7944 100644
--- a/tests/t00065/test_case.h
+++ b/tests/t00065/test_case.h
@@ -38,7 +38,7 @@ TEST_CASE("t00065", "[test-case][class]")
         // Check if all classes exist
         REQUIRE_THAT(src, IsClass(_A("R")));
         REQUIRE_THAT(src, IsClass(_A("A")));
-        REQUIRE_THAT(src, IsClass(_A("AImpl")));
+        REQUIRE_THAT(src, IsClass(_A("detail::AImpl")));
         REQUIRE_THAT(src, IsEnum(_A("XYZ")));
         REQUIRE_THAT(src, IsEnum(_A("ABC")));
 
diff --git a/tests/t00071/.clang-uml b/tests/t00071/.clang-uml
new file mode 100644
index 00000000..1e063e26
--- /dev/null
+++ b/tests/t00071/.clang-uml
@@ -0,0 +1,12 @@
+diagrams:
+  t00071_class:
+    type: class
+    glob:
+      - t00071.cc
+    include:
+      namespaces:
+        - clanguml::t00071
+    generate_packages: true
+    package_type: module
+    using_namespace: clanguml::t00071
+    using_module: t00071
\ No newline at end of file
diff --git a/tests/t00071/src/lib1.cppm b/tests/t00071/src/lib1.cppm
new file mode 100644
index 00000000..62c833db
--- /dev/null
+++ b/tests/t00071/src/lib1.cppm
@@ -0,0 +1,13 @@
+export module t00071.app.lib1;
+
+export namespace clanguml::t00071 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+}
\ No newline at end of file
diff --git a/tests/t00071/src/lib1mod1.cppm b/tests/t00071/src/lib1mod1.cppm
new file mode 100644
index 00000000..1734e8e7
--- /dev/null
+++ b/tests/t00071/src/lib1mod1.cppm
@@ -0,0 +1,5 @@
+export module t00071.app.lib1.mod1;
+
+export namespace clanguml::t00071 {
+class D { };
+}
\ No newline at end of file
diff --git a/tests/t00071/src/lib1mod2.cppm b/tests/t00071/src/lib1mod2.cppm
new file mode 100644
index 00000000..7bb97560
--- /dev/null
+++ b/tests/t00071/src/lib1mod2.cppm
@@ -0,0 +1,5 @@
+export module t00071.app.lib1.mod2;
+
+export namespace clanguml::t00071 {
+class E { };
+}
\ No newline at end of file
diff --git a/tests/t00071/src/lib2.cppm b/tests/t00071/src/lib2.cppm
new file mode 100644
index 00000000..591f15b5
--- /dev/null
+++ b/tests/t00071/src/lib2.cppm
@@ -0,0 +1,13 @@
+export module t00071.app.lib2;
+
+export namespace clanguml::t00071 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+namespace detail {
+enum class CCC { ccc1, ccc2 };
+}
+}
\ No newline at end of file
diff --git a/tests/t00071/src/t00071_mod.cppm b/tests/t00071/src/t00071_mod.cppm
new file mode 100644
index 00000000..0df8e4bb
--- /dev/null
+++ b/tests/t00071/src/t00071_mod.cppm
@@ -0,0 +1,11 @@
+export module t00071.app;
+export import t00071.app.lib1;
+export import t00071.app.lib2;
+
+export namespace clanguml::t00071 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
\ No newline at end of file
diff --git a/tests/t00071/t00071.cc b/tests/t00071/t00071.cc
new file mode 100644
index 00000000..cfc6f65f
--- /dev/null
+++ b/tests/t00071/t00071.cc
@@ -0,0 +1,15 @@
+import t00071.app;
+import t00071.app.lib1;
+import t00071.app.lib1.mod1;
+import t00071.app.lib1.mod2;
+import t00071.app.lib2;
+
+namespace clanguml {
+namespace t00071 {
+class R {
+    A *a;
+    B *b;
+    C *c;
+};
+}
+}
\ No newline at end of file
diff --git a/tests/t00071/test_case.h b/tests/t00071/test_case.h
new file mode 100644
index 00000000..7d946330
--- /dev/null
+++ b/tests/t00071/test_case.h
@@ -0,0 +1,70 @@
+/**
+ * tests/t00071/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t00071", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00071");
+
+    auto diagram = config.diagrams["t00071_class"];
+
+    REQUIRE(diagram->name == "t00071_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00071_class");
+
+    {
+        auto src = generate_class_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        REQUIRE_THAT(src, IsClass(_A("A")));
+        REQUIRE_THAT(src, IsClass(_A("R")));
+
+        REQUIRE_THAT(src, IsEnum(_A("detail::BBB")));
+        REQUIRE_THAT(src, IsEnum(_A("detail::CCC")));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_class_json(diagram, *model);
+
+        using namespace json;
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_class_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsClass;
+        using mermaid::IsEnum;
+
+        REQUIRE_THAT(src, IsClass(_A("A")));
+        REQUIRE_THAT(src, IsClass(_A("R")));
+
+        REQUIRE_THAT(src, IsEnum(_A("detail::BBB")));
+        REQUIRE_THAT(src, IsEnum(_A("detail::CCC")));
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index ebf1ddb9..8cefa23e 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -409,6 +409,7 @@ using namespace clanguml::test::matchers;
 #endif
 #if defined(ENABLE_CXX_MODULES_TEST_CASES)
 #include "t00070/test_case.h"
+#include "t00071/test_case.h"
 #endif
 
 ///
diff --git a/tests/test_cases.yaml b/tests/test_cases.yaml
index c212aa5a..6ec49260 100644
--- a/tests/test_cases.yaml
+++ b/tests/test_cases.yaml
@@ -204,6 +204,12 @@ test_cases:
     - name: t00069
       title: Coroutine methods in class diagrams
       description:
+    - name: t00070
+      title: Diagram filter based on C++20 modules
+      description:
+    - name: t00071
+      title: Class diagram with C++20 modules generated as packages
+      description:
   Sequence diagrams:
     - name: t20001
       title: Basic sequence diagram test case
diff --git a/tests/test_config.cc b/tests/test_config.cc
index 53d052c5..ee622e3a 100644
--- a/tests/test_config.cc
+++ b/tests/test_config.cc
@@ -377,6 +377,31 @@ TEST_CASE("Test config relative paths handling", "[unit-test]")
             "{}/test_config_data", std::filesystem::current_path().string()));
 }
 
+TEST_CASE("Test using_module relative to", "[unit-test]")
+{
+    auto cfg = clanguml::config::load("./test_config_data/using_module.yml");
+
+    CHECK(cfg.diagrams.size() == 2);
+    auto &def = *cfg.diagrams["class1"];
+    CHECK(def.make_module_relative(std::make_optional<std::string>(
+              "mod1.mod2.mod3")) == std::vector{std::string{"mod3"}});
+    CHECK(def.make_module_relative(std::make_optional<std::string>(
+              "mod1.mod2")) == std::vector<std::string>{});
+    CHECK(def.make_module_relative(
+              std::make_optional<std::string>("modA.modB.modC")) ==
+        std::vector{
+            std::string{"modA"}, std::string{"modB"}, std::string{"modC"}});
+
+    def = *cfg.diagrams["class2"];
+    CHECK(def.make_module_relative(
+              std::make_optional<std::string>("mod1.mod2.mod3")) ==
+        std::vector{std::string{"mod2"}, std::string{"mod3"}});
+    CHECK(def.make_module_relative(
+              std::make_optional<std::string>("modA.modB.modC")) ==
+        std::vector{
+            std::string{"modA"}, std::string{"modB"}, std::string{"modC"}});
+}
+
 TEST_CASE("Test config full clang uml dump", "[unit-test]")
 {
     auto cfg =
diff --git a/tests/test_config_data/using_module.yml b/tests/test_config_data/using_module.yml
new file mode 100644
index 00000000..490a65b9
--- /dev/null
+++ b/tests/test_config_data/using_module.yml
@@ -0,0 +1,12 @@
+diagrams:
+  class1:
+    type: class
+    glob:
+      - test.cc
+    using_module: mod1.mod2
+  class2:
+    type: class
+    relative_to: .
+    glob:
+      - test.cc
+    using_module: mod1

From f09edd8b47b33548b8bdfc1f9e78a917c5c14c55 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Tue, 19 Dec 2023 22:16:18 +0100
Subject: [PATCH 04/24] Added module_access diagram filter (#101)

---
 .../json/class_diagram_generator.cc           | 14 +++++++++
 src/common/model/diagram_filter.cc            | 31 +++++++++++++++++++
 src/common/model/diagram_filter.h             | 14 +++++++++
 src/common/model/element.h                    | 18 +++++++++++
 src/common/model/enums.cc                     | 13 ++++++++
 src/common/model/enums.h                      |  3 ++
 .../visitor/translation_unit_visitor.cc       |  8 ++++-
 src/config/config.h                           | 20 ++++++++++--
 src/config/schema.h                           |  4 +++
 src/config/yaml_decoders.cc                   | 22 +++++++++++++
 src/config/yaml_emitters.cc                   |  8 +++++
 tests/t00070/.clang-uml                       |  2 ++
 tests/t00070/src/lib1.cppm                    |  5 +++
 tests/t00070/t00070.cc                        |  1 +
 tests/t00070/test_case.h                      | 15 +++++++--
 tests/test_cases.h                            | 16 ++++++++++
 16 files changed, 189 insertions(+), 5 deletions(-)

diff --git a/src/class_diagram/generators/json/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc
index 66966d5e..9cfad127 100644
--- a/src/class_diagram/generators/json/class_diagram_generator.cc
+++ b/src/class_diagram/generators/json/class_diagram_generator.cc
@@ -23,6 +23,14 @@
 namespace clanguml::class_diagram::model {
 using nlohmann::json;
 
+void set_module(nlohmann::json &j, const common::model::element &e)
+{
+    if (e.module()) {
+        j["module"]["name"] = e.module().value();
+        j["module"]["is_private"] = e.module_private();
+    }
+}
+
 void to_json(nlohmann::json &j, const class_element &c)
 {
     j["name"] = c.name();
@@ -94,6 +102,8 @@ void to_json(nlohmann::json &j, const class_ &c)
     j["methods"] = c.methods();
     j["bases"] = c.parents();
 
+    set_module(j, c);
+
     j["template_parameters"] = c.template_params();
 }
 
@@ -102,6 +112,8 @@ void to_json(nlohmann::json &j, const enum_ &c)
     j = dynamic_cast<const common::model::element &>(c);
     j["is_nested"] = c.is_nested();
     j["constants"] = c.constants();
+
+    set_module(j, c);
 }
 
 void to_json(nlohmann::json &j, const concept_ &c)
@@ -109,6 +121,8 @@ void to_json(nlohmann::json &j, const concept_ &c)
     j = dynamic_cast<const common::model::element &>(c);
     j["parameters"] = c.requires_parameters();
     j["statements"] = c.requires_statements();
+
+    set_module(j, c);
 }
 
 } // namespace clanguml::class_diagram::model
diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc
index bd501051..2e9b81fe 100644
--- a/src/common/model/diagram_filter.cc
+++ b/src/common/model/diagram_filter.cc
@@ -568,6 +568,31 @@ tvl::value_t access_filter::match(
         [&a](const auto &access) { return a == access; });
 }
 
+module_access_filter::module_access_filter(
+    filter_t type, std::vector<module_access_t> access)
+    : filter_visitor{type}
+    , access_{std::move(access)}
+{
+}
+
+tvl::value_t module_access_filter::match(
+    const diagram & /*d*/, const element &e) const
+{
+    if (!e.module().has_value())
+        return {};
+
+    if (access_.empty())
+        return {};
+
+    return tvl::any_of(
+        access_.begin(), access_.end(), [&e](const auto &access) {
+            if (access == module_access_t::kPublic)
+                return !e.module_private();
+            else
+                return e.module_private();
+        });
+}
+
 context_filter::context_filter(
     filter_t type, std::vector<config::context_config> context)
     : filter_visitor{type}
@@ -924,6 +949,9 @@ void diagram_filter::init_filters(const config::diagram &c)
         add_inclusive_filter(std::make_unique<modules_filter>(
             filter_t::kInclusive, c.include().modules));
 
+        add_inclusive_filter(std::make_unique<module_access_filter>(
+            filter_t::kInclusive, c.include().module_access));
+
         add_inclusive_filter(std::make_unique<relationship_filter>(
             filter_t::kInclusive, c.include().relationships));
 
@@ -1037,6 +1065,9 @@ void diagram_filter::init_filters(const config::diagram &c)
         add_exclusive_filter(std::make_unique<modules_filter>(
             filter_t::kExclusive, c.exclude().modules));
 
+        add_exclusive_filter(std::make_unique<module_access_filter>(
+            filter_t::kExclusive, c.exclude().module_access));
+
         add_exclusive_filter(std::make_unique<paths_filter>(
             filter_t::kExclusive, c.root_directory(), c.exclude().paths));
 
diff --git a/src/common/model/diagram_filter.h b/src/common/model/diagram_filter.h
index 9344b27b..416411c6 100644
--- a/src/common/model/diagram_filter.h
+++ b/src/common/model/diagram_filter.h
@@ -457,6 +457,20 @@ private:
     std::vector<access_t> access_;
 };
 
+/**
+ * Match diagram elements based on module access (public or private).
+ */
+struct module_access_filter : public filter_visitor {
+    module_access_filter(filter_t type, std::vector<module_access_t> access);
+
+    ~module_access_filter() override = default;
+
+    tvl::value_t match(const diagram &d, const element &a) const override;
+
+private:
+    std::vector<module_access_t> access_;
+};
+
 /**
  * Match diagram elements which are in within a 'radius' distance relationship
  * to any of the elements specified in context.
diff --git a/src/common/model/element.h b/src/common/model/element.h
index d94ce76a..0707c246 100644
--- a/src/common/model/element.h
+++ b/src/common/model/element.h
@@ -101,6 +101,23 @@ public:
      */
     std::optional<std::string> module() const { return module_; }
 
+    /**
+     * Set whether the element is in a private module
+     *
+     * @param module C++20 module.
+     */
+    void set_module_private(const bool module_private)
+    {
+        module_private_ = module_private;
+    }
+
+    /**
+     * Check whether the element is in a private module.
+     *
+     * @return C++20 module.
+     */
+    bool module_private() const { return module_private_; }
+
     /**
      * Return elements full name.
      *
@@ -135,5 +152,6 @@ private:
     namespace_ ns_;
     namespace_ using_namespace_;
     std::optional<std::string> module_;
+    bool module_private_{false};
 };
 } // namespace clanguml::common::model
diff --git a/src/common/model/enums.cc b/src/common/model/enums.cc
index 84e352d0..8b553413 100644
--- a/src/common/model/enums.cc
+++ b/src/common/model/enums.cc
@@ -70,6 +70,19 @@ std::string to_string(access_t a)
     }
 }
 
+std::string to_string(module_access_t a)
+{
+    switch (a) {
+    case module_access_t::kPublic:
+        return "public";
+    case module_access_t::kPrivate:
+        return "private";
+    default:
+        assert(false);
+        return "";
+    }
+}
+
 std::string to_string(message_t r)
 {
     switch (r) {
diff --git a/src/common/model/enums.h b/src/common/model/enums.h
index e0810c1d..03d5236e 100644
--- a/src/common/model/enums.h
+++ b/src/common/model/enums.h
@@ -23,6 +23,7 @@ namespace clanguml::common::model {
 
 enum class diagram_t { kClass, kSequence, kPackage, kInclude };
 
+enum class module_access_t { kPublic, kPrivate };
 enum class access_t { kPublic, kProtected, kPrivate, kNone };
 
 enum class relationship_t {
@@ -77,6 +78,8 @@ std::string to_string(relationship_t r);
 
 std::string to_string(access_t r);
 
+std::string to_string(module_access_t r);
+
 std::string to_string(message_t m);
 
 std::string to_string(diagram_t r);
diff --git a/src/common/visitor/translation_unit_visitor.cc b/src/common/visitor/translation_unit_visitor.cc
index f6741758..8c4212e7 100644
--- a/src/common/visitor/translation_unit_visitor.cc
+++ b/src/common/visitor/translation_unit_visitor.cc
@@ -168,7 +168,13 @@ void translation_unit_visitor::set_owning_module(
 {
     if (const clang::Module *module = decl.getOwningModule();
         module != nullptr) {
-        element.set_module(module->Name);
+        std::string module_name = module->Name;
+        if (module->isPrivateModule()) {
+            // Clang just maps private modules names to "<private>"
+            module_name = module->getTopLevelModule()->Name;
+        }
+        element.set_module(module_name);
+        element.set_module_private(module->isPrivateModule());
     }
 }
 } // namespace clanguml::common::visitor
\ No newline at end of file
diff --git a/src/config/config.h b/src/config/config.h
index 8dc54064..22a1da17 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -194,6 +194,22 @@ struct filter {
      */
     std::vector<common::string_or_regex> modules;
 
+    /*! @brief Access type filter
+     *
+     * This filter allows to filter class members methods based on their access:
+     *  - public
+     *  - private
+     *
+     * Example:
+     *
+     * ```yaml
+     *   include:
+     *     module_access:
+     *       - public
+     * ```
+     */
+    std::vector<common::model::module_access_t> module_access;
+
     /*! @brief Elements filter
      *
      * Example:
@@ -245,8 +261,8 @@ struct filter {
      *
      * ```yaml
      *   include:
-     *     relationships:
-     *       - inheritance
+     *     access:
+     *       - public
      * ```
      */
     std::vector<common::model::access_t> access;
diff --git a/src/config/schema.h b/src/config/schema.h
index bf8e2ea0..4f5b9df2 100644
--- a/src/config/schema.h
+++ b/src/config/schema.h
@@ -91,6 +91,9 @@ types:
         - public
         - protected
         - private
+    module_access_filter_t: !variant
+        - public
+        - private
     method_type_filter_t: !variant
         - constructor
         - destructor
@@ -123,6 +126,7 @@ types:
         element_types: !optional [element_types_filter_t]
         relationships: !optional [relationship_filter_t]
         access: !optional [access_filter_t]
+        module_access: !optional [module_access_filter_t]
         subclasses: !optional [regex_or_string_t]
         parents: !optional [regex_or_string_t]
         specializations: !optional [regex_or_string_t]
diff --git a/src/config/yaml_decoders.cc b/src/config/yaml_decoders.cc
index 82c7c0ef..0337832f 100644
--- a/src/config/yaml_decoders.cc
+++ b/src/config/yaml_decoders.cc
@@ -29,6 +29,7 @@ namespace YAML {
 using clanguml::common::namespace_or_regex;
 using clanguml::common::string_or_regex;
 using clanguml::common::model::access_t;
+using clanguml::common::model::module_access_t;
 using clanguml::common::model::relationship_t;
 using clanguml::config::callee_type;
 using clanguml::config::class_diagram;
@@ -241,6 +242,23 @@ template <> struct convert<access_t> {
     }
 };
 
+//
+// config module_access_t decoder
+//
+template <> struct convert<module_access_t> {
+    static bool decode(const Node &node, module_access_t &rhs)
+    {
+        if (node.as<std::string>() == "public")
+            rhs = module_access_t::kPublic;
+        else if (node.as<std::string>() == "private")
+            rhs = module_access_t::kPrivate;
+        else
+            return false;
+
+        return true;
+    }
+};
+
 //
 // config method_type decoder
 //
@@ -483,6 +501,10 @@ template <> struct convert<filter> {
                 rhs.modules.push_back({ns});
         }
 
+        if (node["module_access"])
+            rhs.module_access =
+                node["module_access"].as<decltype(rhs.module_access)>();
+
         if (node["relationships"])
             rhs.relationships =
                 node["relationships"].as<decltype(rhs.relationships)>();
diff --git a/src/config/yaml_emitters.cc b/src/config/yaml_emitters.cc
index c850287b..ddf40344 100644
--- a/src/config/yaml_emitters.cc
+++ b/src/config/yaml_emitters.cc
@@ -69,6 +69,12 @@ YAML::Emitter &operator<<(YAML::Emitter &out, const access_t &a)
     return out;
 }
 
+YAML::Emitter &operator<<(YAML::Emitter &out, const module_access_t &a)
+{
+    out << to_string(a);
+    return out;
+}
+
 YAML::Emitter &operator<<(YAML::Emitter &out, const diagram_t &d)
 {
     out << to_string(d);
@@ -124,6 +130,8 @@ YAML::Emitter &operator<<(YAML::Emitter &out, const filter &f)
         out << YAML::Key << "namespaces" << YAML::Value << f.namespaces;
     if (!f.modules.empty())
         out << YAML::Key << "modules" << YAML::Value << f.modules;
+    if (!f.module_access.empty())
+        out << YAML::Key << "module_access" << YAML::Value << f.module_access;
     if (!f.access.empty())
         out << YAML::Key << "access" << YAML::Value << f.access;
     if (!f.context.empty())
diff --git a/tests/t00070/.clang-uml b/tests/t00070/.clang-uml
index 6fa20189..8a9971a6 100644
--- a/tests/t00070/.clang-uml
+++ b/tests/t00070/.clang-uml
@@ -9,4 +9,6 @@ diagrams:
     exclude:
       modules:
         - t00070.lib2
+      module_access:
+        - private
     using_namespace: clanguml::t00070
\ No newline at end of file
diff --git a/tests/t00070/src/lib1.cppm b/tests/t00070/src/lib1.cppm
index 102c0aa7..4b0530bf 100644
--- a/tests/t00070/src/lib1.cppm
+++ b/tests/t00070/src/lib1.cppm
@@ -8,4 +8,9 @@ template <typename T> class BB {
 };
 
 enum class BBB { bbb1, bbb2 };
+}
+
+module :private;
+namespace clanguml::t00070 {
+class BBBB { };
 }
\ No newline at end of file
diff --git a/tests/t00070/t00070.cc b/tests/t00070/t00070.cc
index 8d1b6420..4035efce 100644
--- a/tests/t00070/t00070.cc
+++ b/tests/t00070/t00070.cc
@@ -1,3 +1,4 @@
+import t00070;
 import t00070.lib1;
 import t00070.lib2;
 
diff --git a/tests/t00070/test_case.h b/tests/t00070/test_case.h
index fff287a3..b7e74754 100644
--- a/tests/t00070/test_case.h
+++ b/tests/t00070/test_case.h
@@ -35,7 +35,7 @@ TEST_CASE("t00070", "[test-case][class]")
         REQUIRE_THAT(src, StartsWith("@startuml"));
         REQUIRE_THAT(src, EndsWith("@enduml\n"));
 
-        REQUIRE_THAT(src, !IsClass(_A("A")));
+        REQUIRE_THAT(src, IsClass(_A("A")));
         REQUIRE_THAT(src, IsClass(_A("B")));
         REQUIRE_THAT(src, !IsClass(_A("C")));
 
@@ -43,6 +43,7 @@ TEST_CASE("t00070", "[test-case][class]")
         REQUIRE_THAT(src, !IsClassTemplate("CC", "T"));
 
         REQUIRE_THAT(src, IsEnum(_A("BBB")));
+        REQUIRE_THAT(src, !IsClass(_A("BBBB")));
         REQUIRE_THAT(src, !IsEnum(_A("CCC")));
 
         save_puml(config.output_directory(), diagram->name + ".puml", src);
@@ -53,6 +54,15 @@ TEST_CASE("t00070", "[test-case][class]")
 
         using namespace json;
 
+        REQUIRE(IsClass(j, "A"));
+        REQUIRE(IsClass(j, "B"));
+        REQUIRE(!IsClass(j, "C"));
+
+        REQUIRE(InPublicModule(j, "A", "t00070"));
+        REQUIRE(InPublicModule(j, "B", "t00070.lib1"));
+
+        REQUIRE(!IsClass(j, "BBBB"));
+
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
 
@@ -63,7 +73,7 @@ TEST_CASE("t00070", "[test-case][class]")
         using mermaid::IsClass;
         using mermaid::IsEnum;
 
-        REQUIRE_THAT(src, !IsClass(_A("A")));
+        REQUIRE_THAT(src, IsClass(_A("A")));
         REQUIRE_THAT(src, IsClass(_A("B")));
         REQUIRE_THAT(src, !IsClass(_A("C")));
 
@@ -71,6 +81,7 @@ TEST_CASE("t00070", "[test-case][class]")
         REQUIRE_THAT(src, !IsClass(_A("CC<T>")));
 
         REQUIRE_THAT(src, IsEnum(_A("BBB")));
+        REQUIRE_THAT(src, !IsClass(_A("BBBB")));
         REQUIRE_THAT(src, !IsEnum(_A("CCC")));
 
         save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
diff --git a/tests/test_cases.h b/tests/test_cases.h
index bf4e9249..0c9860ee 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -1278,6 +1278,22 @@ bool IsClass(const nlohmann::json &j, const std::string &name)
     return e && e->at("type") == "class";
 }
 
+bool InPublicModule(const nlohmann::json &j, const std::string &element,
+    const std::string &module)
+{
+    auto e = get_element(j, expand_name(j, element));
+    return e && e->contains("module") && e->at("module")["name"] == module &&
+        !e->at("module")["is_private"];
+}
+
+bool InPrivateModule(const nlohmann::json &j, const std::string &element,
+    const std::string &module)
+{
+    auto e = get_element(j, expand_name(j, element));
+    return e && e->contains("module") && e->at("module")["name"] == module &&
+        e->at("module")["is_private"];
+}
+
 bool IsAbstractClass(const nlohmann::json &j, const std::string &name)
 {
     auto e = get_element(j, expand_name(j, name));

From a8d646d1bc9263decf9d6b3d672b67aabd6562e0 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Thu, 21 Dec 2023 23:39:59 +0100
Subject: [PATCH 05/24] Added package diagram generation from C++20 modules
 (#101)

---
 src/common/model/element.cc                   |  5 +-
 src/common/model/element.h                    |  4 +-
 src/common/model/package.cc                   |  4 +-
 src/common/model/package.h                    |  3 +-
 src/common/model/path.h                       |  2 +
 src/package_diagram/model/diagram.h           | 63 +++++++++++++++++
 .../visitor/translation_unit_visitor.cc       | 66 ++++++++++++++++-
 tests/CMakeLists.txt                          |  2 +-
 tests/t30012/.clang-uml                       | 10 +++
 tests/t30012/src/lib1.cppm                    | 13 ++++
 tests/t30012/src/lib1mod1.cppm                |  5 ++
 tests/t30012/src/lib1mod2.cppm                |  5 ++
 tests/t30012/src/lib2.cppm                    | 13 ++++
 tests/t30012/src/t30012_mod.cppm              | 11 +++
 tests/t30012/t30012.cc                        | 15 ++++
 tests/t30012/test_case.h                      | 70 +++++++++++++++++++
 tests/test_cases.cc                           |  4 +-
 util/templates/test_cases/test_case.h         |  2 +-
 18 files changed, 285 insertions(+), 12 deletions(-)
 create mode 100644 tests/t30012/.clang-uml
 create mode 100644 tests/t30012/src/lib1.cppm
 create mode 100644 tests/t30012/src/lib1mod1.cppm
 create mode 100644 tests/t30012/src/lib1mod2.cppm
 create mode 100644 tests/t30012/src/lib2.cppm
 create mode 100644 tests/t30012/src/t30012_mod.cppm
 create mode 100644 tests/t30012/t30012.cc
 create mode 100644 tests/t30012/test_case.h

diff --git a/src/common/model/element.cc b/src/common/model/element.cc
index 038e75bb..ceb90e05 100644
--- a/src/common/model/element.cc
+++ b/src/common/model/element.cc
@@ -25,8 +25,9 @@
 
 namespace clanguml::common::model {
 
-element::element(namespace_ using_namespace)
-    : using_namespace_{std::move(using_namespace)}
+element::element(namespace_ using_namespace, path_type pt)
+    : ns_{pt}
+    , using_namespace_{std::move(using_namespace)}
 {
 }
 
diff --git a/src/common/model/element.h b/src/common/model/element.h
index 0707c246..2d94d393 100644
--- a/src/common/model/element.h
+++ b/src/common/model/element.h
@@ -37,7 +37,9 @@ namespace clanguml::common::model {
  */
 class element : public diagram_element {
 public:
-    element(namespace_ using_namespace);
+    element(namespace_ using_namespace, path_type pt = path_type::kNamespace);
+
+    element(path_type pt);
 
     ~element() override = default;
 
diff --git a/src/common/model/package.cc b/src/common/model/package.cc
index 74035dd7..6cdc2b40 100644
--- a/src/common/model/package.cc
+++ b/src/common/model/package.cc
@@ -21,8 +21,8 @@
 #include <sstream>
 
 namespace clanguml::common::model {
-package::package(const common::model::namespace_ &using_namespace)
-    : element{using_namespace}
+package::package(const common::model::namespace_ &using_namespace, path_type pt)
+    : element{using_namespace, pt}
 {
 }
 
diff --git a/src/common/model/package.h b/src/common/model/package.h
index 425d6a87..3ed6f46c 100644
--- a/src/common/model/package.h
+++ b/src/common/model/package.h
@@ -41,7 +41,8 @@ class package : public element,
                 public stylable_element,
                 public nested_trait<element, path> {
 public:
-    package(const common::model::path &using_namespace);
+    package(const common::model::path &using_namespace,
+        path_type pt = path_type::kNamespace);
 
     package(const package &) = delete;
     package(package &&) = default;
diff --git a/src/common/model/path.h b/src/common/model/path.h
index aa8e9295..3cb030eb 100644
--- a/src/common/model/path.h
+++ b/src/common/model/path.h
@@ -386,6 +386,8 @@ public:
      */
     path_type type() const { return path_type_; }
 
+    const container_type &tokens() const { return path_; }
+
 private:
     path_type path_type_;
     container_type path_;
diff --git a/src/package_diagram/model/diagram.h b/src/package_diagram/model/diagram.h
index 459e71ea..f995d86b 100644
--- a/src/package_diagram/model/diagram.h
+++ b/src/package_diagram/model/diagram.h
@@ -135,6 +135,9 @@ public:
         if (parent_path.type() == common::model::path_type::kNamespace) {
             return add_with_namespace_path(std::move(e));
         }
+        else if (parent_path.type() == common::model::path_type::kModule) {
+            return add_with_module_path(parent_path, std::move(e));
+        }
 
         return add_with_filesystem_path(parent_path, std::move(e));
     }
@@ -155,6 +158,17 @@ public:
     inja::json context() const override;
 
 private:
+    /**
+     * @brief Add element using module as diagram path
+     *
+     * @tparam ElementT Element type
+     * @param e Element to add
+     * @return True, if the element was added
+     */
+    template <typename ElementT>
+    bool add_with_module_path(
+        const common::model::path &parent_path, std::unique_ptr<ElementT> &&e);
+
     /**
      * @brief Add element using namespace as diagram path
      *
@@ -237,6 +251,55 @@ bool diagram::add_with_namespace_path(std::unique_ptr<ElementT> &&p)
     return res;
 }
 
+template <typename ElementT>
+bool diagram::add_with_module_path(
+    const common::model::path &parent_path, std::unique_ptr<ElementT> &&p)
+{
+    LOG_DBG("Adding package: {}, {}, {}, [{}]", p->name(), p->full_name(false),
+        parent_path.to_string(), p->id());
+
+    // Make sure all parent modules are already packages in the
+    // model
+    std::string module_path = p->using_namespace().to_string();
+    for (auto it = parent_path.begin(); it != parent_path.end(); it++) {
+        auto pkg = std::make_unique<common::model::package>(
+            p->using_namespace(), common::model::path_type::kModule);
+        pkg->set_name(*it);
+
+        auto ns = common::model::path(
+            parent_path.begin(), it, common::model::path_type::kModule);
+        pkg->set_module(module_path);
+        pkg->set_namespace(ns);
+
+        std::string package_id_path;
+        if (module_path.empty())
+            package_id_path = pkg->name();
+        else
+            package_id_path = module_path + "." + pkg->name();
+
+        pkg->set_id(common::to_id(package_id_path));
+
+        auto p_ref = std::ref(*pkg);
+
+        auto res = add_element(ns, std::move(pkg));
+        if (res)
+            element_view<ElementT>::add(p_ref);
+
+        if (module_path.empty())
+            module_path = *it;
+        else
+            module_path += fmt::format(".{}", *it);
+    }
+
+    auto p_ref = std::ref(*p);
+
+    auto res = add_element(parent_path, std::move(p));
+    if (res)
+        element_view<ElementT>::add(p_ref);
+
+    return res;
+}
+
 template <typename ElementT>
 bool diagram::add_with_filesystem_path(
     const common::model::path &parent_path, std::unique_ptr<ElementT> &&p)
diff --git a/src/package_diagram/visitor/translation_unit_visitor.cc b/src/package_diagram/visitor/translation_unit_visitor.cc
index edabb3d8..e2fd4f7a 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.cc
+++ b/src/package_diagram/visitor/translation_unit_visitor.cc
@@ -21,6 +21,8 @@
 #include "common/clang_utils.h"
 #include "common/model/namespace.h"
 
+#include "clang/Basic/Module.h"
+
 #include <spdlog/spdlog.h>
 
 #include <deque>
@@ -45,7 +47,7 @@ bool translation_unit_visitor::VisitNamespaceDecl(clang::NamespaceDecl *ns)
 {
     assert(ns != nullptr);
 
-    if (config().package_type() == config::package_type_t::kDirectory)
+    if (config().package_type() != config::package_type_t::kNamespace)
         return true;
 
     if (ns->isAnonymousNamespace() || ns->isInline())
@@ -237,6 +239,43 @@ void translation_unit_visitor::add_relationships(
         if (diagram().should_include(*pkg))
             diagram().add(parent_path, std::move(pkg));
     }
+    else if (config().package_type() == config::package_type_t::kModule) {
+        const auto *module = cls->getOwningModule();
+
+        if (module == nullptr) {
+            return;
+        }
+
+        std::string module_path_str = module->Name;
+        if (module->isPrivateModule())
+            module_path_str = module->getTopLevelModule()->Name;
+
+        common::model::path module_path{
+            module_path_str, common::model::path_type::kModule};
+        module_path.pop_back();
+
+        auto relative_module =
+            config().make_module_relative(std::optional{module_path_str});
+
+        common::model::path parent_path{
+            relative_module, common::model::path_type::kModule};
+        auto pkg_name = parent_path.name();
+        parent_path.pop_back();
+
+        auto pkg = std::make_unique<common::model::package>(
+            config().using_module(), common::model::path_type::kModule);
+
+        pkg->set_name(pkg_name);
+        pkg->set_id(get_package_id(cls));
+        // This is for diagram filters
+        pkg->set_module(module_path.to_string());
+        // This is for rendering nested package structure
+        pkg->set_namespace(parent_path);
+        set_source_location(*cls, *pkg);
+
+        if (diagram().should_include(*pkg))
+            diagram().add(parent_path, std::move(pkg));
+    }
 
     auto current_package_id = get_package_id(cls);
 
@@ -284,6 +323,18 @@ common::model::diagram_element::id_t translation_unit_visitor::get_package_id(
 
         return {};
     }
+    else if (config().package_type() == config::package_type_t::kModule) {
+        const auto *module = cls->getOwningModule();
+        if (module != nullptr) {
+            std::string module_path = module->Name;
+            if (module->isPrivateModule()) {
+                module_path = module->getTopLevelModule()->Name;
+            }
+            return common::to_id(module_path);
+        }
+
+        return {};
+    }
 
     auto file =
         source_manager().getFilename(cls->getSourceRange().getBegin()).str();
@@ -578,6 +629,15 @@ bool translation_unit_visitor::find_relationships(const clang::QualType &type,
                     }
                 }
             }
+            else if (config().package_type() ==
+                config::package_type_t::kModule) {
+                const auto *module = cxxrecord_decl->getOwningModule();
+                if (module != nullptr) {
+                    const auto target_id = get_package_id(cxxrecord_decl);
+                    relationships.emplace_back(target_id, relationship_hint);
+                    result = true;
+                }
+            }
             else {
                 if (diagram().should_include(
                         namespace_{common::get_qualified_name(
@@ -591,8 +651,8 @@ bool translation_unit_visitor::find_relationships(const clang::QualType &type,
         }
         else if (const auto *record_decl = type->getAsRecordDecl();
                  record_decl != nullptr) {
-            // This is only possible for plain C translation unit, so we don't
-            // need to consider namespaces here
+            // This is only possible for plain C translation unit, so we
+            // don't need to consider namespaces or modules here
             if (config().package_type() == config::package_type_t::kDirectory) {
                 if (diagram().should_include(
                         namespace_{common::get_qualified_name(*record_decl)})) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 300bde57..85e627ad 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml
                                    test_compilation_database_data/*.json)
 
 set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065 t00069)
-set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071)
+set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071 t30012)
 
 if(ENABLE_CXX_MODULES_TEST_CASES)
     foreach(CXX20_MOD_TC ${TEST_CASES_REQUIRING_CXX20_MODULES})
diff --git a/tests/t30012/.clang-uml b/tests/t30012/.clang-uml
new file mode 100644
index 00000000..7335486c
--- /dev/null
+++ b/tests/t30012/.clang-uml
@@ -0,0 +1,10 @@
+diagrams:
+  t30012_package:
+    type: package
+    glob:
+      - t30012.cc
+    package_type: module
+    include:
+      modules:
+        - t30012
+    using_module: t30012
\ No newline at end of file
diff --git a/tests/t30012/src/lib1.cppm b/tests/t30012/src/lib1.cppm
new file mode 100644
index 00000000..6835aa09
--- /dev/null
+++ b/tests/t30012/src/lib1.cppm
@@ -0,0 +1,13 @@
+export module t30012.app.lib1;
+
+export namespace clanguml::t30012 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+}
\ No newline at end of file
diff --git a/tests/t30012/src/lib1mod1.cppm b/tests/t30012/src/lib1mod1.cppm
new file mode 100644
index 00000000..c3601405
--- /dev/null
+++ b/tests/t30012/src/lib1mod1.cppm
@@ -0,0 +1,5 @@
+export module t30012.app.lib1.mod1;
+
+export namespace clanguml::t30012 {
+class D { };
+}
\ No newline at end of file
diff --git a/tests/t30012/src/lib1mod2.cppm b/tests/t30012/src/lib1mod2.cppm
new file mode 100644
index 00000000..d393ea64
--- /dev/null
+++ b/tests/t30012/src/lib1mod2.cppm
@@ -0,0 +1,5 @@
+export module t30012.app.lib1.mod2;
+
+export namespace clanguml::t30012 {
+class E { };
+}
\ No newline at end of file
diff --git a/tests/t30012/src/lib2.cppm b/tests/t30012/src/lib2.cppm
new file mode 100644
index 00000000..99e1c94b
--- /dev/null
+++ b/tests/t30012/src/lib2.cppm
@@ -0,0 +1,13 @@
+export module t30012.app.lib2;
+
+export namespace clanguml::t30012 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+namespace detail {
+enum class CCC { ccc1, ccc2 };
+}
+}
\ No newline at end of file
diff --git a/tests/t30012/src/t30012_mod.cppm b/tests/t30012/src/t30012_mod.cppm
new file mode 100644
index 00000000..9bcbd77a
--- /dev/null
+++ b/tests/t30012/src/t30012_mod.cppm
@@ -0,0 +1,11 @@
+export module t30012.app;
+export import t30012.app.lib1;
+export import t30012.app.lib2;
+
+export namespace clanguml::t30012 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
\ No newline at end of file
diff --git a/tests/t30012/t30012.cc b/tests/t30012/t30012.cc
new file mode 100644
index 00000000..89f09ca1
--- /dev/null
+++ b/tests/t30012/t30012.cc
@@ -0,0 +1,15 @@
+import t30012.app;
+import t30012.app.lib1;
+import t30012.app.lib1.mod1;
+import t30012.app.lib1.mod2;
+import t30012.app.lib2;
+
+namespace clanguml {
+namespace t30012 {
+class R {
+    A *a;
+    B *b;
+    C *c;
+};
+}
+}
\ No newline at end of file
diff --git a/tests/t30012/test_case.h b/tests/t30012/test_case.h
new file mode 100644
index 00000000..de394bda
--- /dev/null
+++ b/tests/t30012/test_case.h
@@ -0,0 +1,70 @@
+/**
+ * tests/t30012/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t30012", "[test-case][package]")
+{
+    auto [config, db] = load_config("t30012");
+
+    auto diagram = config.diagrams["t30012_package"];
+
+    REQUIRE(diagram->name == "t30012_package");
+
+    auto model = generate_package_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t30012_package");
+
+    {
+        auto src = generate_package_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        // Check if all packages exist
+        REQUIRE_THAT(src, IsPackage("app"));
+        REQUIRE_THAT(src, IsPackage("lib1"));
+        REQUIRE_THAT(src, IsPackage("lib2"));
+        REQUIRE_THAT(src, IsPackage("mod1"));
+        REQUIRE_THAT(src, IsPackage("mod2"));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_package_json(diagram, *model);
+
+        using namespace json;
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_package_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsPackage;
+
+        REQUIRE_THAT(src, IsPackage(_A("app")));
+        REQUIRE_THAT(src, IsPackage(_A("lib1")));
+        REQUIRE_THAT(src, IsPackage(_A("lib2")));
+        REQUIRE_THAT(src, IsPackage(_A("mod1")));
+        REQUIRE_THAT(src, IsPackage(_A("mod2")));
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 8cefa23e..a8bf55b9 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -472,7 +472,9 @@ using namespace clanguml::test::matchers;
 #include "t30009/test_case.h"
 #include "t30010/test_case.h"
 #include "t30011/test_case.h"
-
+#if defined(ENABLE_CXX_MODULES_TEST_CASES)
+#include "t30012/test_case.h"
+#endif
 ///
 /// Include diagram tests
 ///
diff --git a/util/templates/test_cases/test_case.h b/util/templates/test_cases/test_case.h
index 17d2e3d2..23fdafde 100644
--- a/util/templates/test_cases/test_case.h
+++ b/util/templates/test_cases/test_case.h
@@ -50,7 +50,7 @@ TEST_CASE("{{ name }}", "[test-case][{{ type }}]")
     }
 
     {
-        auto src = generate_class_mermaid(diagram, *model);
+        auto src = generate_{{ type }}_mermaid(diagram, *model);
 
         mermaid::AliasMatcher _A(src);
         using mermaid::IsClass;

From 913ccb6bdfcc20b892e9931bf4ad1e2282b0e384 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Fri, 22 Dec 2023 21:23:53 +0100
Subject: [PATCH 06/24] Added test case for package diagram from modules
 dependencies

---
 src/common/model/diagram_filter.cc |   9 +-
 src/util/util.cc                   |  19 +++-
 tests/CMakeLists.txt               |   2 +-
 tests/t30013/.clang-uml            |  10 ++
 tests/t30013/src/app.cppm          |  81 +++++++++++++++
 tests/t30013/src/mod1.cppm         |   5 +
 tests/t30013/src/mod10.cppm        |   5 +
 tests/t30013/src/mod11.cppm        |   5 +
 tests/t30013/src/mod12.cppm        |   5 +
 tests/t30013/src/mod13.cppm        |   5 +
 tests/t30013/src/mod14.cppm        |   5 +
 tests/t30013/src/mod15.cppm        |   5 +
 tests/t30013/src/mod16.cppm        |   5 +
 tests/t30013/src/mod17.cppm        |   5 +
 tests/t30013/src/mod18.cppm        |   5 +
 tests/t30013/src/mod2.cppm         |   7 ++
 tests/t30013/src/mod3.cppm         |   5 +
 tests/t30013/src/mod4.cppm         |   5 +
 tests/t30013/src/mod5.cppm         |   5 +
 tests/t30013/src/mod6.cppm         |   5 +
 tests/t30013/src/mod7.cppm         |   5 +
 tests/t30013/src/mod8.cppm         |   5 +
 tests/t30013/src/mod9.cppm         |   5 +
 tests/t30013/t30013.cc             |  24 +++++
 tests/t30013/test_case.h           | 157 +++++++++++++++++++++++++++++
 tests/test_cases.cc                |   1 +
 tests/test_cases.yaml              |   6 ++
 tests/test_util.cc                 |   3 +-
 28 files changed, 395 insertions(+), 9 deletions(-)
 create mode 100644 tests/t30013/.clang-uml
 create mode 100644 tests/t30013/src/app.cppm
 create mode 100644 tests/t30013/src/mod1.cppm
 create mode 100644 tests/t30013/src/mod10.cppm
 create mode 100644 tests/t30013/src/mod11.cppm
 create mode 100644 tests/t30013/src/mod12.cppm
 create mode 100644 tests/t30013/src/mod13.cppm
 create mode 100644 tests/t30013/src/mod14.cppm
 create mode 100644 tests/t30013/src/mod15.cppm
 create mode 100644 tests/t30013/src/mod16.cppm
 create mode 100644 tests/t30013/src/mod17.cppm
 create mode 100644 tests/t30013/src/mod18.cppm
 create mode 100644 tests/t30013/src/mod2.cppm
 create mode 100644 tests/t30013/src/mod3.cppm
 create mode 100644 tests/t30013/src/mod4.cppm
 create mode 100644 tests/t30013/src/mod5.cppm
 create mode 100644 tests/t30013/src/mod6.cppm
 create mode 100644 tests/t30013/src/mod7.cppm
 create mode 100644 tests/t30013/src/mod8.cppm
 create mode 100644 tests/t30013/src/mod9.cppm
 create mode 100644 tests/t30013/t30013.cc
 create mode 100644 tests/t30013/test_case.h

diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc
index 2e9b81fe..49b3ac0f 100644
--- a/src/common/model/diagram_filter.cc
+++ b/src/common/model/diagram_filter.cc
@@ -301,13 +301,18 @@ tvl::value_t modules_filter::match(
     if (!e.module().has_value())
         return {false};
 
-    const auto module_toks = util::split(e.module().value(), "."); // NOLINT
+    auto module_toks = util::split(e.module().value(), ".", true); // NOLINT
+
+    if (dynamic_cast<const package *>(&e) != nullptr &&
+        e.get_namespace().type() == path_type::kModule) {
+        module_toks.push_back(e.name());
+    }
 
     auto result = tvl::any_of(modules_.begin(), modules_.end(),
         [&e, &module_toks](const auto &modit) {
             if (std::holds_alternative<std::string>(modit.value())) {
                 const auto &modit_str = std::get<std::string>(modit.value());
-                const auto modit_toks = util::split(modit_str, ".");
+                const auto modit_toks = util::split(modit_str, ".", true);
 
                 return e.module() == modit_str ||
                     util::starts_with(module_toks, modit_toks);
diff --git a/src/util/util.cc b/src/util/util.cc
index 4fa36a65..21b4f41c 100644
--- a/src/util/util.cc
+++ b/src/util/util.cc
@@ -216,20 +216,29 @@ std::vector<std::string> split(
 {
     std::vector<std::string> result;
 
-    if (!contains(str, delimiter))
-        result.push_back(str);
+    if (!contains(str, delimiter)) {
+        if (!str.empty())
+            result.push_back(std::move(str));
+        else if (!skip_empty)
+            result.push_back(std::move(str));
+    }
     else
         while (static_cast<unsigned int>(!str.empty()) != 0U) {
             auto index = str.find(delimiter);
             if (index != std::string::npos) {
                 auto tok = str.substr(0, index);
-                if (!tok.empty() || !skip_empty)
+                if (!tok.empty())
                     result.push_back(std::move(tok));
+                else if (!skip_empty)
+                    result.push_back(std::move(tok));
+
                 str = str.substr(index + delimiter.size());
             }
             else {
-                if (!str.empty() || !skip_empty)
-                    result.push_back(str);
+                if (!str.empty())
+                    result.push_back(std::move(str));
+                else if (!skip_empty)
+                    result.push_back(std::move(str));
                 str = "";
             }
         }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 85e627ad..2d105273 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml
                                    test_compilation_database_data/*.json)
 
 set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065 t00069)
-set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071 t30012)
+set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071 t30012 t30013)
 
 if(ENABLE_CXX_MODULES_TEST_CASES)
     foreach(CXX20_MOD_TC ${TEST_CASES_REQUIRING_CXX20_MODULES})
diff --git a/tests/t30013/.clang-uml b/tests/t30013/.clang-uml
new file mode 100644
index 00000000..9eb52e03
--- /dev/null
+++ b/tests/t30013/.clang-uml
@@ -0,0 +1,10 @@
+diagrams:
+  t30013_package:
+    type: package
+    glob:
+      - t30013.cc
+    package_type: module
+    include:
+      modules:
+        - t30013
+    using_module: t30013
\ No newline at end of file
diff --git a/tests/t30013/src/app.cppm b/tests/t30013/src/app.cppm
new file mode 100644
index 00000000..fc41ab3c
--- /dev/null
+++ b/tests/t30013/src/app.cppm
@@ -0,0 +1,81 @@
+module;
+
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+export module t30013.app;
+
+import t30013.mod1;
+import t30013.mod2;
+import t30013.mod3;
+import t30013.mod4;
+import t30013.mod5;
+import t30013.mod6;
+import t30013.mod7;
+import t30013.mod8;
+import t30013.mod9;
+import t30013.mod10;
+import t30013.mod11;
+import t30013.mod12;
+import t30013.mod13;
+import t30013.mod14;
+import t30013.mod15;
+import t30013.mod16;
+import t30013.mod17;
+import t30013.mod18;
+
+export namespace clanguml::t30013 {
+
+class CBA : public CF {
+public:
+    CA *ca_;
+    CB<int> cb_;
+    std::shared_ptr<CC> cc_;
+    std::map<std::string, std::unique_ptr<CD>> *cd_;
+    std::array<CO, 5> co_;
+    static CP *cp_;
+
+    CBA() = default;
+
+    CBA(CN *cn) { }
+
+    friend CR;
+
+    template <typename... Item> CBA(std::tuple<Item...> &items) { }
+
+    void ce(const std::vector<CE> /*ce_*/) { }
+
+    std::shared_ptr<CG> cg() { return {}; }
+
+    template <typename T>
+    void ch(std::map<T, std::shared_ptr<CH>> &ch_)
+    {
+    }
+
+    template <typename T>
+    std::map<T, std::shared_ptr<CI>> ci(T * /*t*/)
+    {
+        return {};
+    }
+
+    S s;
+};
+
+void cj(std::unique_ptr<CJ> /*cj_*/) { }
+
+std::unique_ptr<CK> ck() { return {}; }
+
+template <typename T>
+void cl(std::map<T, std::shared_ptr<CL>> & /*ch_*/)
+{
+}
+
+template <typename T> std::map<T, std::shared_ptr<CM>> cm()
+{
+    return {};
+}
+
+} // namespace clanguml::t30013
\ No newline at end of file
diff --git a/tests/t30013/src/mod1.cppm b/tests/t30013/src/mod1.cppm
new file mode 100644
index 00000000..b8f44f18
--- /dev/null
+++ b/tests/t30013/src/mod1.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod1;
+
+export namespace clanguml::t30013 {
+struct CA { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod10.cppm b/tests/t30013/src/mod10.cppm
new file mode 100644
index 00000000..4d3618e2
--- /dev/null
+++ b/tests/t30013/src/mod10.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod10;
+
+export namespace clanguml::t30013 {
+struct CJ { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod11.cppm b/tests/t30013/src/mod11.cppm
new file mode 100644
index 00000000..d3fe42e2
--- /dev/null
+++ b/tests/t30013/src/mod11.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod11;
+
+export namespace clanguml::t30013 {
+struct CK { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod12.cppm b/tests/t30013/src/mod12.cppm
new file mode 100644
index 00000000..0075f864
--- /dev/null
+++ b/tests/t30013/src/mod12.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod12;
+
+export namespace clanguml::t30013 {
+struct CL { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod13.cppm b/tests/t30013/src/mod13.cppm
new file mode 100644
index 00000000..ffff01c3
--- /dev/null
+++ b/tests/t30013/src/mod13.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod13;
+
+export namespace clanguml::t30013 {
+struct CM { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod14.cppm b/tests/t30013/src/mod14.cppm
new file mode 100644
index 00000000..aaeac2bc
--- /dev/null
+++ b/tests/t30013/src/mod14.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod14;
+
+export namespace clanguml::t30013 {
+struct CN { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod15.cppm b/tests/t30013/src/mod15.cppm
new file mode 100644
index 00000000..8c0bf8d0
--- /dev/null
+++ b/tests/t30013/src/mod15.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod15;
+
+export namespace clanguml::t30013 {
+struct CO { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod16.cppm b/tests/t30013/src/mod16.cppm
new file mode 100644
index 00000000..2dfb91c1
--- /dev/null
+++ b/tests/t30013/src/mod16.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod16;
+
+export namespace clanguml::t30013 {
+struct CP { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod17.cppm b/tests/t30013/src/mod17.cppm
new file mode 100644
index 00000000..89d291b2
--- /dev/null
+++ b/tests/t30013/src/mod17.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod17;
+
+export namespace clanguml::t30013 {
+struct CR { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod18.cppm b/tests/t30013/src/mod18.cppm
new file mode 100644
index 00000000..9897e8c0
--- /dev/null
+++ b/tests/t30013/src/mod18.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod18;
+
+export namespace clanguml::t30013 {
+enum class S { s1, s2, s3 };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod2.cppm b/tests/t30013/src/mod2.cppm
new file mode 100644
index 00000000..d8beca54
--- /dev/null
+++ b/tests/t30013/src/mod2.cppm
@@ -0,0 +1,7 @@
+export module t30013.mod2;
+
+export namespace clanguml::t30013 {
+template <typename T> struct CB {
+    T cb;
+};
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod3.cppm b/tests/t30013/src/mod3.cppm
new file mode 100644
index 00000000..0260cd39
--- /dev/null
+++ b/tests/t30013/src/mod3.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod3;
+
+export namespace clanguml::t30013 {
+struct CC { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod4.cppm b/tests/t30013/src/mod4.cppm
new file mode 100644
index 00000000..a15f917a
--- /dev/null
+++ b/tests/t30013/src/mod4.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod4;
+
+export namespace clanguml::t30013 {
+struct CD { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod5.cppm b/tests/t30013/src/mod5.cppm
new file mode 100644
index 00000000..09abf480
--- /dev/null
+++ b/tests/t30013/src/mod5.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod5;
+
+export namespace clanguml::t30013 {
+struct CE { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod6.cppm b/tests/t30013/src/mod6.cppm
new file mode 100644
index 00000000..3d39d392
--- /dev/null
+++ b/tests/t30013/src/mod6.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod6;
+
+export namespace clanguml::t30013 {
+struct CF { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod7.cppm b/tests/t30013/src/mod7.cppm
new file mode 100644
index 00000000..5a2eb8a4
--- /dev/null
+++ b/tests/t30013/src/mod7.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod7;
+
+export namespace clanguml::t30013 {
+struct CG { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod8.cppm b/tests/t30013/src/mod8.cppm
new file mode 100644
index 00000000..870cb975
--- /dev/null
+++ b/tests/t30013/src/mod8.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod8;
+
+export namespace clanguml::t30013 {
+struct CH { };
+}
\ No newline at end of file
diff --git a/tests/t30013/src/mod9.cppm b/tests/t30013/src/mod9.cppm
new file mode 100644
index 00000000..9cce4809
--- /dev/null
+++ b/tests/t30013/src/mod9.cppm
@@ -0,0 +1,5 @@
+export module t30013.mod9;
+
+export namespace clanguml::t30013 {
+struct CI { };
+}
\ No newline at end of file
diff --git a/tests/t30013/t30013.cc b/tests/t30013/t30013.cc
new file mode 100644
index 00000000..8bba7195
--- /dev/null
+++ b/tests/t30013/t30013.cc
@@ -0,0 +1,24 @@
+import t30013.app;
+import t30013.mod2;
+import t30013.mod3;
+import t30013.mod4;
+import t30013.mod5;
+import t30013.mod6;
+import t30013.mod7;
+import t30013.mod8;
+import t30013.mod9;
+import t30013.mod10;
+import t30013.mod11;
+import t30013.mod12;
+import t30013.mod13;
+import t30013.mod14;
+import t30013.mod15;
+import t30013.mod16;
+import t30013.mod17;
+import t30013.mod18;
+
+namespace clanguml::t30013 {
+class R {
+    CBA cba;
+};
+} // namespace clanguml::t30013
\ No newline at end of file
diff --git a/tests/t30013/test_case.h b/tests/t30013/test_case.h
new file mode 100644
index 00000000..96589efe
--- /dev/null
+++ b/tests/t30013/test_case.h
@@ -0,0 +1,157 @@
+/**
+ * tests/t30013/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t30013", "[test-case][package]")
+{
+    auto [config, db] = load_config("t30013");
+
+    auto diagram = config.diagrams["t30013_package"];
+
+    REQUIRE(diagram->name == "t30013_package");
+
+    auto model = generate_package_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t30013_package");
+
+    {
+        auto src = generate_package_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        // Check if all packages exist
+        REQUIRE_THAT(src, IsPackage("app"));
+        REQUIRE_THAT(src, IsPackage("mod1"));
+        REQUIRE_THAT(src, IsPackage("mod2"));
+        REQUIRE_THAT(src, IsPackage("mod3"));
+        REQUIRE_THAT(src, IsPackage("mod4"));
+        REQUIRE_THAT(src, IsPackage("mod5"));
+        REQUIRE_THAT(src, IsPackage("mod6"));
+        REQUIRE_THAT(src, IsPackage("mod7"));
+        REQUIRE_THAT(src, IsPackage("mod8"));
+        REQUIRE_THAT(src, IsPackage("mod9"));
+        REQUIRE_THAT(src, IsPackage("mod10"));
+        REQUIRE_THAT(src, IsPackage("mod11"));
+        REQUIRE_THAT(src, IsPackage("mod12"));
+        REQUIRE_THAT(src, IsPackage("mod13"));
+        REQUIRE_THAT(src, IsPackage("mod14"));
+        REQUIRE_THAT(src, IsPackage("mod15"));
+        REQUIRE_THAT(src, IsPackage("mod16"));
+        REQUIRE_THAT(src, IsPackage("mod17"));
+        REQUIRE_THAT(src, IsPackage("mod18"));
+
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod1")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod2")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod3")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod4")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod5")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod6")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod7")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod8")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod9")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod10")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod11")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod12")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod13")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod14")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod15")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod16")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod17")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A("mod18")));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_package_json(diagram, *model);
+
+        using namespace json;
+
+        REQUIRE(IsPackage(j, "app"));
+        REQUIRE(IsPackage(j, "mod1"));
+        REQUIRE(IsPackage(j, "mod2"));
+        REQUIRE(IsPackage(j, "mod3"));
+        REQUIRE(IsPackage(j, "mod4"));
+        REQUIRE(IsPackage(j, "mod5"));
+        REQUIRE(IsPackage(j, "mod6"));
+        REQUIRE(IsPackage(j, "mod7"));
+        REQUIRE(IsPackage(j, "mod8"));
+        REQUIRE(IsPackage(j, "mod9"));
+        REQUIRE(IsPackage(j, "mod10"));
+        REQUIRE(IsPackage(j, "mod11"));
+        REQUIRE(IsPackage(j, "mod12"));
+        REQUIRE(IsPackage(j, "mod13"));
+        REQUIRE(IsPackage(j, "mod14"));
+        REQUIRE(IsPackage(j, "mod15"));
+        REQUIRE(IsPackage(j, "mod16"));
+        REQUIRE(IsPackage(j, "mod17"));
+        REQUIRE(IsPackage(j, "mod18"));
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_package_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsPackage;
+        using mermaid::IsPackageDependency;
+
+        REQUIRE_THAT(src, IsPackage(_A("app")));
+        REQUIRE_THAT(src, IsPackage(_A("mod1")));
+        REQUIRE_THAT(src, IsPackage(_A("mod2")));
+        REQUIRE_THAT(src, IsPackage(_A("mod3")));
+        REQUIRE_THAT(src, IsPackage(_A("mod4")));
+        REQUIRE_THAT(src, IsPackage(_A("mod5")));
+        REQUIRE_THAT(src, IsPackage(_A("mod6")));
+        REQUIRE_THAT(src, IsPackage(_A("mod7")));
+        REQUIRE_THAT(src, IsPackage(_A("mod8")));
+        REQUIRE_THAT(src, IsPackage(_A("mod9")));
+        REQUIRE_THAT(src, IsPackage(_A("mod10")));
+        REQUIRE_THAT(src, IsPackage(_A("mod11")));
+        REQUIRE_THAT(src, IsPackage(_A("mod12")));
+        REQUIRE_THAT(src, IsPackage(_A("mod13")));
+        REQUIRE_THAT(src, IsPackage(_A("mod14")));
+        REQUIRE_THAT(src, IsPackage(_A("mod15")));
+        REQUIRE_THAT(src, IsPackage(_A("mod16")));
+        REQUIRE_THAT(src, IsPackage(_A("mod17")));
+        REQUIRE_THAT(src, IsPackage(_A("mod18")));
+
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod1")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod2")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod3")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod4")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod5")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod6")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod7")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod8")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod9")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod10")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod11")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod12")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod13")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod14")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod15")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod16")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod17")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A("mod18")));
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index a8bf55b9..bb5eb37f 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -474,6 +474,7 @@ using namespace clanguml::test::matchers;
 #include "t30011/test_case.h"
 #if defined(ENABLE_CXX_MODULES_TEST_CASES)
 #include "t30012/test_case.h"
+#include "t30013/test_case.h"
 #endif
 ///
 /// Include diagram tests
diff --git a/tests/test_cases.yaml b/tests/test_cases.yaml
index 6ec49260..2500c49c 100644
--- a/tests/test_cases.yaml
+++ b/tests/test_cases.yaml
@@ -359,6 +359,12 @@ test_cases:
     - name: t30011
       title: Package diagram with packages from directory structure for plain C
       description:
+    - name: t30012
+      title: C++20 modules package diagram test
+      description:
+    - name: t30013
+      title: C++20 modules package dependencies diagram test
+      description:
   Include diagrams:
     - name: t40001
       title: Basic include graph diagram test case
diff --git a/tests/test_util.cc b/tests/test_util.cc
index 193e6293..d1e8fcaf 100644
--- a/tests/test_util.cc
+++ b/tests/test_util.cc
@@ -31,7 +31,8 @@ TEST_CASE("Test split", "[unit-test]")
 
     const C empty{};
 
-    CHECK(split("", " ") == C{""});
+    CHECK(split("", " ") == C{});
+    CHECK(split("", ".") == C{});
     CHECK(split("ABCD", " ") == C{"ABCD"});
     CHECK(split("::A", "::") == C{"A"});
     CHECK(split("::", "::") == C{});

From 3671bf9beb6e2c375c9c49e2451a1690289ce930 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Fri, 22 Dec 2023 21:26:34 +0100
Subject: [PATCH 07/24] Fixed modules formatting

---
 .clang-format-include     |  1 +
 tests/t30013/src/app.cppm | 18 ++++--------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.clang-format-include b/.clang-format-include
index d1da7244..838e22f1 100644
--- a/.clang-format-include
+++ b/.clang-format-include
@@ -6,4 +6,5 @@
 + src/**/*.h
 + tests/**/*.cc
 + tests/**/*.h
++ tests/**/*.cppm
 - tests/catch.h
diff --git a/tests/t30013/src/app.cppm b/tests/t30013/src/app.cppm
index fc41ab3c..1793bf79 100644
--- a/tests/t30013/src/app.cppm
+++ b/tests/t30013/src/app.cppm
@@ -50,13 +50,9 @@ public:
 
     std::shared_ptr<CG> cg() { return {}; }
 
-    template <typename T>
-    void ch(std::map<T, std::shared_ptr<CH>> &ch_)
-    {
-    }
+    template <typename T> void ch(std::map<T, std::shared_ptr<CH>> &ch_) { }
 
-    template <typename T>
-    std::map<T, std::shared_ptr<CI>> ci(T * /*t*/)
+    template <typename T> std::map<T, std::shared_ptr<CI>> ci(T * /*t*/)
     {
         return {};
     }
@@ -68,14 +64,8 @@ void cj(std::unique_ptr<CJ> /*cj_*/) { }
 
 std::unique_ptr<CK> ck() { return {}; }
 
-template <typename T>
-void cl(std::map<T, std::shared_ptr<CL>> & /*ch_*/)
-{
-}
+template <typename T> void cl(std::map<T, std::shared_ptr<CL>> & /*ch_*/) { }
 
-template <typename T> std::map<T, std::shared_ptr<CM>> cm()
-{
-    return {};
-}
+template <typename T> std::map<T, std::shared_ptr<CM>> cm() { return {}; }
 
 } // namespace clanguml::t30013
\ No newline at end of file

From bf7b69bcca7d96288e3c62aa0d428e4fadc46f7f Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Fri, 22 Dec 2023 21:44:17 +0100
Subject: [PATCH 08/24] Updated test cases documentation

---
 docs/test_cases.md                          |   5 +
 docs/test_cases/t00002.md                   |  10 +-
 docs/test_cases/t00002_class.svg            | 318 ++++---
 docs/test_cases/t00002_class_mermaid.svg    | 120 +--
 docs/test_cases/t00003.md                   |  23 +-
 docs/test_cases/t00003_class.svg            | 454 +++++----
 docs/test_cases/t00003_class_mermaid.svg    | 141 +--
 docs/test_cases/t00004.md                   |   4 +-
 docs/test_cases/t00004_class.svg            | 498 +++++-----
 docs/test_cases/t00004_class_mermaid.svg    | 103 +-
 docs/test_cases/t00005.md                   |   2 +-
 docs/test_cases/t00005_class.svg            | 498 +++++-----
 docs/test_cases/t00005_class_mermaid.svg    |  83 +-
 docs/test_cases/t00006.md                   |   2 +-
 docs/test_cases/t00006_class.svg            | 666 +++++++------
 docs/test_cases/t00006_class_mermaid.svg    | 101 +-
 docs/test_cases/t00007.md                   |   2 +-
 docs/test_cases/t00007_class.svg            | 138 +--
 docs/test_cases/t00007_class_mermaid.svg    |  41 +-
 docs/test_cases/t00008.md                   |   6 +-
 docs/test_cases/t00008_class.svg            | 376 ++++----
 docs/test_cases/t00008_class_mermaid.svg    |  89 +-
 docs/test_cases/t00009.md                   |   2 +-
 docs/test_cases/t00009_class.svg            | 208 ++--
 docs/test_cases/t00009_class_mermaid.svg    |  51 +-
 docs/test_cases/t00010.md                   |   2 +-
 docs/test_cases/t00010_class.svg            | 192 ++--
 docs/test_cases/t00010_class_mermaid.svg    |  45 +-
 docs/test_cases/t00011.md                   |   4 +-
 docs/test_cases/t00011_class.svg            | 136 +--
 docs/test_cases/t00011_class_mermaid.svg    |  67 +-
 docs/test_cases/t00012.md                   |   2 +-
 docs/test_cases/t00012_class.svg            | 398 ++++----
 docs/test_cases/t00012_class_mermaid.svg    |  65 +-
 docs/test_cases/t00013.md                   |  14 +-
 docs/test_cases/t00013_class.svg            | 614 ++++++------
 docs/test_cases/t00013_class_mermaid.svg    | 147 +--
 docs/test_cases/t00014.md                   |   2 +-
 docs/test_cases/t00014_class.svg            | 908 ++++++++++--------
 docs/test_cases/t00014_class_mermaid.svg    | 133 +--
 docs/test_cases/t00015.md                   |   2 +-
 docs/test_cases/t00015_class.svg            | 106 ++-
 docs/test_cases/t00015_class_mermaid.svg    |  43 +-
 docs/test_cases/t00016.md                   |   2 +-
 docs/test_cases/t00016_class.svg            | 182 ++--
 docs/test_cases/t00016_class_mermaid.svg    |  49 +-
 docs/test_cases/t00017.md                   |   3 +-
 docs/test_cases/t00017_class.svg            | 358 +++----
 docs/test_cases/t00017_class_mermaid.svg    |  93 +-
 docs/test_cases/t00018.md                   |  20 +-
 docs/test_cases/t00018_class.svg            | 258 ++---
 docs/test_cases/t00018_class_mermaid.svg    | 103 +-
 docs/test_cases/t00019.md                   | 169 ++--
 docs/test_cases/t00019_class.svg            | 398 ++++----
 docs/test_cases/t00019_class_mermaid.svg    | 127 +--
 docs/test_cases/t00020.md                   |  16 +-
 docs/test_cases/t00020_class.svg            | 448 +++++----
 docs/test_cases/t00020_class_mermaid.svg    | 181 ++--
 docs/test_cases/t00021.md                   |  15 +-
 docs/test_cases/t00021_class.svg            | 402 ++++----
 docs/test_cases/t00021_class_mermaid.svg    | 169 ++--
 docs/test_cases/t00022.md                   |   9 +-
 docs/test_cases/t00022_class.svg            | 166 ++--
 docs/test_cases/t00022_class_mermaid.svg    |  85 +-
 docs/test_cases/t00023.md                   |   9 +-
 docs/test_cases/t00023_class.svg            | 232 ++---
 docs/test_cases/t00023_class_mermaid.svg    | 109 ++-
 docs/test_cases/t00024.md                   |  12 +-
 docs/test_cases/t00024_class.svg            | 258 ++---
 docs/test_cases/t00024_class_mermaid.svg    | 113 +--
 docs/test_cases/t00025.md                   |   9 +-
 docs/test_cases/t00025_class.svg            | 302 +++---
 docs/test_cases/t00025_class_mermaid.svg    | 103 +-
 docs/test_cases/t00026.md                   |  11 +-
 docs/test_cases/t00026_class.svg            | 372 ++++----
 docs/test_cases/t00026_class_mermaid.svg    | 111 +--
 docs/test_cases/t00027.md                   |   9 +-
 docs/test_cases/t00027_class.svg            | 492 +++++-----
 docs/test_cases/t00027_class_mermaid.svg    | 145 +--
 docs/test_cases/t00028.md                   |   3 +-
 docs/test_cases/t00028_class.svg            | 416 ++++----
 docs/test_cases/t00028_class_mermaid.svg    |  65 +-
 docs/test_cases/t00029.md                   |   2 +-
 docs/test_cases/t00029_class.svg            | 252 ++---
 docs/test_cases/t00029_class_mermaid.svg    |  49 +-
 docs/test_cases/t00030.md                   |   2 +-
 docs/test_cases/t00030_class.svg            | 236 ++---
 docs/test_cases/t00030_class_mermaid.svg    |  63 +-
 docs/test_cases/t00031.md                   |   3 +-
 docs/test_cases/t00031_class.svg            | 263 +++---
 docs/test_cases/t00031_class_mermaid.svg    |  59 +-
 docs/test_cases/t00032.md                   |   5 +-
 docs/test_cases/t00032_class.svg            | 260 ++---
 docs/test_cases/t00032_class_mermaid.svg    |  91 +-
 docs/test_cases/t00033.md                   |   2 +-
 docs/test_cases/t00033_class.svg            | 276 +++---
 docs/test_cases/t00033_class_mermaid.svg    |  57 +-
 docs/test_cases/t00034.md                   |   4 +-
 docs/test_cases/t00034_class.svg            | 230 ++---
 docs/test_cases/t00034_class_mermaid.svg    |  71 +-
 docs/test_cases/t00035.md                   |   2 +-
 docs/test_cases/t00035_class.svg            |  88 +-
 docs/test_cases/t00035_class_mermaid.svg    |  37 +-
 docs/test_cases/t00036.md                   |   2 +-
 docs/test_cases/t00036_class.svg            | 184 ++--
 docs/test_cases/t00036_class_mermaid.svg    |  41 +-
 docs/test_cases/t00037.md                   |   3 +-
 docs/test_cases/t00037_class.svg            | 242 ++---
 docs/test_cases/t00037_class_mermaid.svg    |  53 +-
 docs/test_cases/t00038.md                   |   2 +-
 docs/test_cases/t00038_class.svg            | 324 ++++---
 docs/test_cases/t00038_class_mermaid.svg    |  77 +-
 docs/test_cases/t00039.md                   |   2 +-
 docs/test_cases/t00039_class.svg            | 396 ++++----
 docs/test_cases/t00039_class_mermaid.svg    |  91 +-
 docs/test_cases/t00040.md                   |   5 +-
 docs/test_cases/t00040_class.svg            | 154 +--
 docs/test_cases/t00040_class_mermaid.svg    |  77 +-
 docs/test_cases/t00041.md                   |   3 +-
 docs/test_cases/t00041_class.svg            | 272 +++---
 docs/test_cases/t00041_class_mermaid.svg    |  85 +-
 docs/test_cases/t00042.md                   |   2 +-
 docs/test_cases/t00042_class.svg            | 208 ++--
 docs/test_cases/t00042_class_mermaid.svg    |  49 +-
 docs/test_cases/t00043.md                   |  12 +-
 docs/test_cases/t00043_class.svg            | 400 ++++----
 docs/test_cases/t00043_class_mermaid.svg    | 141 +--
 docs/test_cases/t00044.md                   |   4 +-
 docs/test_cases/t00044_class.svg            | 242 ++---
 docs/test_cases/t00044_class_mermaid.svg    |  65 +-
 docs/test_cases/t00045.md                   |   3 +-
 docs/test_cases/t00045_class.svg            | 366 +++----
 docs/test_cases/t00045_class_mermaid.svg    |  83 +-
 docs/test_cases/t00046.md                   |   3 +-
 docs/test_cases/t00046_class.svg            | 320 ++++---
 docs/test_cases/t00046_class_mermaid.svg    |  75 +-
 docs/test_cases/t00047.md                   |   2 +-
 docs/test_cases/t00047_class.svg            | 106 ++-
 docs/test_cases/t00047_class_mermaid.svg    |  41 +-
 docs/test_cases/t00048.md                   |  68 +-
 docs/test_cases/t00048_class.svg            | 308 +++---
 docs/test_cases/t00048_class_mermaid.svg    |  97 +-
 docs/test_cases/t00049.md                   |   5 +-
 docs/test_cases/t00049_class.svg            | 250 ++---
 docs/test_cases/t00049_class_mermaid.svg    |  81 +-
 docs/test_cases/t00050.md                   |   2 +-
 docs/test_cases/t00050_class.svg            | 384 ++++----
 docs/test_cases/t00050_class_mermaid.svg    |  43 +-
 docs/test_cases/t00051.md                   |  14 +-
 docs/test_cases/t00051_class.svg            | 346 +++----
 docs/test_cases/t00051_class_mermaid.svg    | 125 +--
 docs/test_cases/t00052.md                   |   7 +-
 docs/test_cases/t00052_class.svg            | 228 ++---
 docs/test_cases/t00052_class_mermaid.svg    |  95 +-
 docs/test_cases/t00053.md                   |   2 +-
 docs/test_cases/t00053_class.svg            | 286 +++---
 docs/test_cases/t00053_class_mermaid.svg    |  61 +-
 docs/test_cases/t00054.md                   |   2 +-
 docs/test_cases/t00054_class.svg            | 530 +++++++----
 docs/test_cases/t00054_class_mermaid.svg    |  61 +-
 docs/test_cases/t00055.md                   |   2 +-
 docs/test_cases/t00055_class.svg            | 168 ++--
 docs/test_cases/t00055_class_mermaid.svg    |  47 +-
 docs/test_cases/t00056.md                   |   2 +-
 docs/test_cases/t00056_class.svg            | 564 ++++++-----
 docs/test_cases/t00056_class_mermaid.svg    |  99 +-
 docs/test_cases/t00057.md                   |  16 +-
 docs/test_cases/t00057_class.svg            | 542 ++++++-----
 docs/test_cases/t00057_class_mermaid.svg    |  73 +-
 docs/test_cases/t00058.md                   |   2 +-
 docs/test_cases/t00058_class.svg            | 302 +++---
 docs/test_cases/t00058_class_mermaid.svg    |  59 +-
 docs/test_cases/t00059.md                   |  12 +-
 docs/test_cases/t00059_class.svg            | 484 +++++-----
 docs/test_cases/t00059_class_mermaid.svg    | 163 ++--
 docs/test_cases/t00060.md                   |   2 +-
 docs/test_cases/t00060_class.svg            | 192 ++--
 docs/test_cases/t00060_class_mermaid.svg    |  51 +-
 docs/test_cases/t00061.md                   |  18 +-
 docs/test_cases/t00061_class.svg            |  24 +-
 docs/test_cases/t00061_class_mermaid.svg    |  29 +-
 docs/test_cases/t00062.md                   |   2 +-
 docs/test_cases/t00062_class.svg            | 996 +++++++++++---------
 docs/test_cases/t00062_class_mermaid.svg    | 113 +--
 docs/test_cases/t00063.md                   |   2 +-
 docs/test_cases/t00063_class.svg            |  24 +-
 docs/test_cases/t00063_class_mermaid.svg    |  29 +-
 docs/test_cases/t00064.md                   |   5 +-
 docs/test_cases/t00064_class.svg            | 712 ++++++++------
 docs/test_cases/t00064_class_mermaid.svg    | 141 +--
 docs/test_cases/t00065.md                   |  78 +-
 docs/test_cases/t00065_class.svg            | 530 ++++++-----
 docs/test_cases/t00065_class_mermaid.svg    | 111 +--
 docs/test_cases/t00066.md                   |  22 +-
 docs/test_cases/t00066_class.svg            | 444 +++++----
 docs/test_cases/t00066_class_mermaid.svg    | 137 +--
 docs/test_cases/t00067.md                   |  12 +-
 docs/test_cases/t00067_class.svg            | 304 +++---
 docs/test_cases/t00067_class_mermaid.svg    |  97 +-
 docs/test_cases/t00068.md                   |   2 +-
 docs/test_cases/t00068_r0_class.svg         |  54 +-
 docs/test_cases/t00068_r0_class_mermaid.svg |  34 +-
 docs/test_cases/t00068_r1_class.svg         | 188 ++--
 docs/test_cases/t00068_r1_class_mermaid.svg |  52 +-
 docs/test_cases/t00068_r2_class.svg         | 272 +++---
 docs/test_cases/t00068_r2_class_mermaid.svg |  64 +-
 docs/test_cases/t00069.md                   | 547 +++++++++++
 docs/test_cases/t00069_class.svg            | 165 ++++
 docs/test_cases/t00069_class_mermaid.svg    | 252 +++++
 docs/test_cases/t00070.md                   | 259 +++++
 docs/test_cases/t00070_class.svg            |  72 ++
 docs/test_cases/t00070_class_mermaid.svg    | 164 ++++
 docs/test_cases/t00071.md                   | 534 +++++++++++
 docs/test_cases/t00071_class.svg            | 204 ++++
 docs/test_cases/t00071_class_mermaid.svg    | 346 +++++++
 docs/test_cases/t20001.md                   |   2 +-
 docs/test_cases/t20001_sequence.svg         | 192 ++--
 docs/test_cases/t20001_sequence_mermaid.svg |  45 +-
 docs/test_cases/t20002.md                   |   2 +-
 docs/test_cases/t20002_sequence.svg         |  90 +-
 docs/test_cases/t20002_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20003.md                   |   2 +-
 docs/test_cases/t20003_sequence.svg         |  90 +-
 docs/test_cases/t20003_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20004.md                   |   2 +-
 docs/test_cases/t20004_sequence.svg         | 258 +++--
 docs/test_cases/t20004_sequence_mermaid.svg |  78 +-
 docs/test_cases/t20005.md                   |   2 +-
 docs/test_cases/t20005_sequence.svg         |  90 +-
 docs/test_cases/t20005_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20006.md                   |   2 +-
 docs/test_cases/t20006_sequence.svg         | 344 ++++---
 docs/test_cases/t20006_sequence_mermaid.svg |  86 +-
 docs/test_cases/t20007.md                   |   2 +-
 docs/test_cases/t20007_sequence.svg         | 108 +--
 docs/test_cases/t20007_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20008.md                   |   2 +-
 docs/test_cases/t20008_sequence.svg         | 168 ++--
 docs/test_cases/t20008_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20009.md                   |   2 +-
 docs/test_cases/t20009_sequence.svg         | 168 ++--
 docs/test_cases/t20009_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20010.md                   |   2 +-
 docs/test_cases/t20010_sequence.svg         | 144 ++-
 docs/test_cases/t20010_sequence_mermaid.svg |  38 +-
 docs/test_cases/t20011.md                   |   2 +-
 docs/test_cases/t20011_sequence.svg         | 180 ++--
 docs/test_cases/t20011_sequence_mermaid.svg |  14 +-
 docs/test_cases/t20012.md                   |   2 +-
 docs/test_cases/t20012_sequence.svg         | 460 +++++----
 docs/test_cases/t20012_sequence_mermaid.svg |  70 +-
 docs/test_cases/t20013.md                   |   2 +-
 docs/test_cases/t20013_sequence.svg         | 144 ++-
 docs/test_cases/t20013_sequence_mermaid.svg |  54 +-
 docs/test_cases/t20014.md                   | 120 ++-
 docs/test_cases/t20014_sequence.svg         | 172 ++--
 docs/test_cases/t20014_sequence_mermaid.svg |  62 +-
 docs/test_cases/t20015.md                   |   2 +-
 docs/test_cases/t20015_sequence.svg         |  48 +-
 docs/test_cases/t20015_sequence_mermaid.svg |  10 +-
 docs/test_cases/t20016.md                   |   2 +-
 docs/test_cases/t20016_sequence.svg         | 104 +-
 docs/test_cases/t20016_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20017.md                   |  28 +-
 docs/test_cases/t20017_sequence.svg         | 132 ++-
 docs/test_cases/t20017_sequence_mermaid.svg |  54 +-
 docs/test_cases/t20018.md                   |   2 +-
 docs/test_cases/t20018_sequence.svg         | 192 ++--
 docs/test_cases/t20018_sequence_mermaid.svg |  34 +-
 docs/test_cases/t20019.md                   |   2 +-
 docs/test_cases/t20019_sequence.svg         | 168 ++--
 docs/test_cases/t20019_sequence_mermaid.svg |  38 +-
 docs/test_cases/t20020.md                   |   2 +-
 docs/test_cases/t20020_sequence.svg         | 348 ++++---
 docs/test_cases/t20020_sequence_mermaid.svg |  86 +-
 docs/test_cases/t20021.md                   |   2 +-
 docs/test_cases/t20021_sequence.svg         | 308 +++---
 docs/test_cases/t20021_sequence_mermaid.svg |  86 +-
 docs/test_cases/t20022.md                   |   2 +-
 docs/test_cases/t20022_sequence.svg         |  86 +-
 docs/test_cases/t20022_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20023.md                   |   2 +-
 docs/test_cases/t20023_sequence.svg         | 171 ++--
 docs/test_cases/t20023_sequence_mermaid.svg |  14 +-
 docs/test_cases/t20024.md                   |   2 +-
 docs/test_cases/t20024_sequence.svg         | 292 +++---
 docs/test_cases/t20024_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20025.md                   |   2 +-
 docs/test_cases/t20025_sequence.svg         |  78 +-
 docs/test_cases/t20025_sequence_mermaid.svg |  22 +-
 docs/test_cases/t20026.md                   |   2 +-
 docs/test_cases/t20026_sequence.svg         |  48 +-
 docs/test_cases/t20026_sequence_mermaid.svg |  10 +-
 docs/test_cases/t20027.md                   |   2 +-
 docs/test_cases/t20027_sequence.svg         |  48 +-
 docs/test_cases/t20027_sequence_mermaid.svg |  10 +-
 docs/test_cases/t20028.md                   |   2 +-
 docs/test_cases/t20028_sequence.svg         | 115 ++-
 docs/test_cases/t20028_sequence_mermaid.svg |  38 +-
 docs/test_cases/t20029.md                   |   2 +-
 docs/test_cases/t20029_sequence.svg         | 244 +++--
 docs/test_cases/t20029_sequence_mermaid.svg |  42 +-
 docs/test_cases/t20030.md                   |   2 +-
 docs/test_cases/t20030_sequence.svg         | 258 +++--
 docs/test_cases/t20030_sequence_mermaid.svg |  58 +-
 docs/test_cases/t20031.md                   |   2 +-
 docs/test_cases/t20031_sequence.svg         | 120 ++-
 docs/test_cases/t20031_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20032.md                   |   2 +-
 docs/test_cases/t20032_sequence.svg         | 156 ++-
 docs/test_cases/t20032_sequence_mermaid.svg |  54 +-
 docs/test_cases/t20033.md                   |   2 +-
 docs/test_cases/t20033_sequence.svg         | 407 ++++----
 docs/test_cases/t20033_sequence_mermaid.svg | 142 +--
 docs/test_cases/t20034.md                   |   2 +-
 docs/test_cases/t20034_sequence.svg         | 278 +++---
 docs/test_cases/t20034_sequence_mermaid.svg |  98 +-
 docs/test_cases/t20035.md                   |   2 +-
 docs/test_cases/t20035_sequence.svg         |  74 +-
 docs/test_cases/t20035_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20036.md                   |   2 +-
 docs/test_cases/t20036_sequence.svg         | 238 +++--
 docs/test_cases/t20036_sequence_mermaid.svg |  86 +-
 docs/test_cases/t20037.md                   |   2 +-
 docs/test_cases/t20037_sequence.svg         | 242 +++--
 docs/test_cases/t20037_sequence_mermaid.svg |  90 +-
 docs/test_cases/t20038.md                   |  19 +-
 docs/test_cases/t20038_sequence.svg         | 474 +++++-----
 docs/test_cases/t20038_sequence_mermaid.svg | 150 +--
 docs/test_cases/t30001.md                   |   2 +-
 docs/test_cases/t30001_package.svg          | 139 +--
 docs/test_cases/t30001_package_mermaid.svg  |  15 +-
 docs/test_cases/t30002.md                   |   2 +-
 docs/test_cases/t30002_package.svg          | 316 ++++---
 docs/test_cases/t30002_package_mermaid.svg  |  48 +-
 docs/test_cases/t30003.md                   |   2 +-
 docs/test_cases/t30003_package.svg          |  78 +-
 docs/test_cases/t30003_package_mermaid.svg  |  14 +-
 docs/test_cases/t30004.md                   |   2 +-
 docs/test_cases/t30004_package.svg          |  88 +-
 docs/test_cases/t30004_package_mermaid.svg  |  12 +-
 docs/test_cases/t30005.md                   |   2 +-
 docs/test_cases/t30005_package.svg          | 116 +--
 docs/test_cases/t30005_package_mermaid.svg  |  16 +-
 docs/test_cases/t30006.md                   |   2 +-
 docs/test_cases/t30006_package.svg          |  53 +-
 docs/test_cases/t30006_package_mermaid.svg  |  16 +-
 docs/test_cases/t30007.md                   |   2 +-
 docs/test_cases/t30007_package.svg          |  68 +-
 docs/test_cases/t30007_package_mermaid.svg  |  16 +-
 docs/test_cases/t30008.md                   |   2 +-
 docs/test_cases/t30008_package.svg          | 104 +-
 docs/test_cases/t30008_package_mermaid.svg  |  20 +-
 docs/test_cases/t30009.md                   |   2 +-
 docs/test_cases/t30009_package.svg          |  96 +-
 docs/test_cases/t30009_package_mermaid.svg  |  12 +-
 docs/test_cases/t30010.md                   |  83 +-
 docs/test_cases/t30010_package.svg          |  80 +-
 docs/test_cases/t30010_package_mermaid.svg  |  20 +-
 docs/test_cases/t30011.md                   |  54 +-
 docs/test_cases/t30011_package.svg          |  80 +-
 docs/test_cases/t30011_package_mermaid.svg  |  20 +-
 docs/test_cases/t30012.md                   | 172 ++++
 docs/test_cases/t30012_package.svg          |  34 +
 docs/test_cases/t30012_package_mermaid.svg  |  99 ++
 docs/test_cases/t30013.md                   | 614 ++++++++++++
 docs/test_cases/t30013_package.svg          | 174 ++++
 docs/test_cases/t30013_package_mermaid.svg  | 421 +++++++++
 docs/test_cases/t40001.md                   |  41 +
 docs/test_cases/t40001_include.svg          | 150 +--
 docs/test_cases/t40001_include_mermaid.svg  |  33 +-
 docs/test_cases/t40002.md                   |  88 ++
 docs/test_cases/t40002_include.svg          | 146 +--
 docs/test_cases/t40002_include_mermaid.svg  |  32 +-
 docs/test_cases/t40003.md                   | 110 +++
 docs/test_cases/t40003_include.svg          | 204 ++--
 docs/test_cases/t40003_include_mermaid.svg  |  46 +-
 docs/test_cases/t90000.md                   |   2 +-
 docs/test_cases/t90000_class.svg            |  96 +-
 docs/test_cases/t90000_class_mermaid.svg    |  29 +-
 util/generate_test_cases_docs.py            |  19 +-
 381 files changed, 26178 insertions(+), 19073 deletions(-)
 create mode 100644 docs/test_cases/t00069.md
 create mode 100644 docs/test_cases/t00069_class.svg
 create mode 100644 docs/test_cases/t00069_class_mermaid.svg
 create mode 100644 docs/test_cases/t00070.md
 create mode 100644 docs/test_cases/t00070_class.svg
 create mode 100644 docs/test_cases/t00070_class_mermaid.svg
 create mode 100644 docs/test_cases/t00071.md
 create mode 100644 docs/test_cases/t00071_class.svg
 create mode 100644 docs/test_cases/t00071_class_mermaid.svg
 create mode 100644 docs/test_cases/t30012.md
 create mode 100644 docs/test_cases/t30012_package.svg
 create mode 100644 docs/test_cases/t30012_package_mermaid.svg
 create mode 100644 docs/test_cases/t30013.md
 create mode 100644 docs/test_cases/t30013_package.svg
 create mode 100644 docs/test_cases/t30013_package_mermaid.svg

diff --git a/docs/test_cases.md b/docs/test_cases.md
index 4229cddc..91f72426 100644
--- a/docs/test_cases.md
+++ b/docs/test_cases.md
@@ -73,6 +73,9 @@
  * [t00066](./test_cases/t00066.md) - Class fields and methods without grouping and sorting
  * [t00067](./test_cases/t00067.md) - Class method type filter test case
  * [t00068](./test_cases/t00068.md) - Context filter radius parameter test case
+ * [t00069](./test_cases/t00069.md) - Coroutine methods in class diagrams
+ * [t00070](./test_cases/t00070.md) - Diagram filter based on C++20 modules
+ * [t00071](./test_cases/t00071.md) - Class diagram with C++20 modules generated as packages
 ## Sequence diagrams
  * [t20001](./test_cases/t20001.md) - Basic sequence diagram test case
  * [t20002](./test_cases/t20002.md) - Free function sequence diagram test case
@@ -124,6 +127,8 @@
  * [t30009](./test_cases/t30009.md) - Together layout hint test
  * [t30010](./test_cases/t30010.md) - Package diagram with packages from directory structure
  * [t30011](./test_cases/t30011.md) - Package diagram with packages from directory structure for plain C
+ * [t30012](./test_cases/t30012.md) - C++20 modules package diagram test
+ * [t30013](./test_cases/t30013.md) - C++20 modules package dependencies diagram test
 ## Include diagrams
  * [t40001](./test_cases/t40001.md) - Basic include graph diagram test case
  * [t40002](./test_cases/t40002.md) - Cyclic include graph diagram test case
diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md
index f7be2f21..bb31a89c 100644
--- a/docs/test_cases/t00002.md
+++ b/docs/test_cases/t00002.md
@@ -27,7 +27,7 @@ diagrams:
         - 'note for {{ alias("D") }} "{{ comment("D").text }}"'
 ```
 ## Source code
-File t00002.cc
+File `tests/t00002/t00002.cc`
 ```cpp
 #include <vector>
 
@@ -163,6 +163,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -196,6 +197,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -262,6 +264,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -337,6 +340,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -435,6 +439,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -468,6 +473,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -558,6 +564,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -591,6 +598,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index 9457a489..a72d6f50 100644
--- a/docs/test_cases/t00002_class.svg
+++ b/docs/test_cases/t00002_class.svg
@@ -1,157 +1,183 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="383px" preserveAspectRatio="none" style="width:562px;height:383px;" version="1.1" viewBox="0 0 562 383" width="562px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="422px" preserveAspectRatio="none" style="width:567px;height:422px;background:#FFFFFF;" version="1.1" viewBox="0 0 567 422" width="567px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1l84csvetn9k4" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="250" x="160" y="16.708">Basic class diagram example</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l84csvetn9k4)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="28.9531"/>
-      <ellipse cx="348.25" cy="44.9531" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M348.3594,40.2969 L347.2031,45.375 L349.5313,45.375 L348.3594,40.2969 Z M346.875,38.0625 L349.8594,38.0625 L353.2188,50.4531 L350.7656,50.4531 L350,47.3906 L346.7188,47.3906 L345.9688,50.4531 L343.5313,50.4531 L346.875,38.0625 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.75" y="49.1074">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="60.9531" y2="60.9531"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="198" x="177.75" y="23.0059">Basic class diagram example</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <g id="elem_C_0000987634239855407298">
+        <rect codeLine="3" fill="#F1F1F1" height="85.7998" id="C_0000987634239855407298" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="292" y="44.7999"/>
+        <ellipse cx="350.25" cy="60.7999" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M351.7813,62.7374 L352.1094,63.5343 L351.8281,63.5343 C351.375,63.5343 351.25,63.5656 351.0781,63.6749 C350.7969,63.8156 350.625,64.1124 350.625,64.4093 C350.625,64.7062 350.7656,64.9562 351,65.1281 C351.1719,65.2531 351.4063,65.2999 351.8281,65.2999 L354.1875,65.2999 C354.5469,65.2999 354.7969,65.2687 354.9375,65.1749 C355.2031,65.0343 355.375,64.7218 355.375,64.4093 C355.375,64.1437 355.2344,63.8781 355,63.7062 C354.8125,63.5812 354.6563,63.5499 354.2031,63.5343 L350.8125,55.7062 L347.0938,55.7062 C346.6406,55.7062 346.5,55.7218 346.3281,55.8312 C346.0625,56.0031 345.8906,56.2843 345.8906,56.5812 C345.8906,56.8624 346.0313,57.1281 346.2813,57.2999 C346.4531,57.4249 346.6406,57.4562 347.0938,57.4562 L348.0625,57.4562 L345.4844,63.5343 C344.7344,63.5343 344.3281,63.8312 344.3281,64.4093 C344.3281,65.0187 344.7188,65.2999 345.5156,65.2999 L347.7813,65.2999 C348.1406,65.2999 348.3906,65.2687 348.5313,65.1749 C348.7969,65.0187 348.9688,64.7218 348.9688,64.4093 C348.9688,64.1437 348.8281,63.8781 348.5938,63.7062 C348.4063,63.5656 348.25,63.5343 347.7813,63.5343 L347.4844,63.5343 L347.8281,62.7374 L351.7813,62.7374 Z M351.0156,60.9874 L348.5625,60.9874 L349.7969,58.1124 L351.0156,60.9874 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="9" x="370.75" y="66.7499">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="293" x2="425" y1="76.7999" y2="76.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="298" y="86.7499"/>
+          <ellipse cx="303" cy="91.7499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="108" x="312" y="96.1999">foo_a() = 0 : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="298" y="105.6498"/>
+          <ellipse cx="303" cy="110.6498" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="107" x="312" y="115.0998">foo_c() = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="293" x2="425" y1="122.5998" y2="122.5998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="66.9531"/>
-      <ellipse cx="305" cy="71.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <g id="elem_C_0000594234458687375950">
+        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0000594234458687375950" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="61" y="191.5999"/>
+        <ellipse cx="107.25" cy="207.5999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M102.25,208.7562 C102.25,211.2562 104.3906,213.0687 107.3125,213.0687 C108.5469,213.0687 109.7188,212.7718 110.4688,212.2562 C111.0781,211.8343 111.4063,211.4124 111.4063,211.0062 C111.4063,210.5374 110.9844,210.1312 110.4844,210.1312 C110.25,210.1312 110.0313,210.2093 109.8281,210.4124 C109.3906,210.8499 109.3906,210.8499 109.2188,210.9437 C108.7656,211.1781 108.125,211.3187 107.3594,211.3187 C105.3594,211.3187 104.0781,210.3031 104.0781,208.7249 L104.0781,207.6781 C104.0781,205.9749 105.2969,204.7718 107,204.7718 C107.5781,204.7718 108.1563,204.9124 108.625,205.1624 C109.0938,205.4281 109.2656,205.6156 109.3281,205.9749 C109.4531,206.6468 109.7031,206.8968 110.2344,206.8968 C110.5156,206.8968 110.7969,206.7562 110.9844,206.5374 C111.1094,206.3656 111.1563,206.1937 111.1563,205.7562 L111.1563,204.3968 C111.1563,203.9749 111.1406,203.8343 111.0156,203.6624 C110.8438,203.4124 110.5625,203.2562 110.2344,203.2562 C109.9219,203.2562 109.7188,203.3656 109.5,203.6312 C108.3281,203.1312 107.8906,203.0218 106.9375,203.0218 C104.2656,203.0218 102.25,205.0374 102.25,207.6624 L102.25,208.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="127.75" y="212.2059">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="62" x2="170" y1="223.5999" y2="223.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="67" y="232.4999"/>
+          <ellipse cx="72" cy="237.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="81" y="240.6059">foo_a() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="62" x2="170" y1="248.3999" y2="248.3999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="314" y="75.1636">foo_a() = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
+      <g id="elem_C_0001142499429598587507">
+        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0001142499429598587507" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="304.5" y="191.5999"/>
+        <ellipse cx="349.75" cy="207.5999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M344.75,208.7562 C344.75,211.2562 346.8906,213.0687 349.8125,213.0687 C351.0469,213.0687 352.2188,212.7718 352.9688,212.2562 C353.5781,211.8343 353.9063,211.4124 353.9063,211.0062 C353.9063,210.5374 353.4844,210.1312 352.9844,210.1312 C352.75,210.1312 352.5313,210.2093 352.3281,210.4124 C351.8906,210.8499 351.8906,210.8499 351.7188,210.9437 C351.2656,211.1781 350.625,211.3187 349.8594,211.3187 C347.8594,211.3187 346.5781,210.3031 346.5781,208.7249 L346.5781,207.6781 C346.5781,205.9749 347.7969,204.7718 349.5,204.7718 C350.0781,204.7718 350.6563,204.9124 351.125,205.1624 C351.5938,205.4281 351.7656,205.6156 351.8281,205.9749 C351.9531,206.6468 352.2031,206.8968 352.7344,206.8968 C353.0156,206.8968 353.2969,206.7562 353.4844,206.5374 C353.6094,206.3656 353.6563,206.1937 353.6563,205.7562 L353.6563,204.3968 C353.6563,203.9749 353.6406,203.8343 353.5156,203.6624 C353.3438,203.4124 353.0625,203.2562 352.7344,203.2562 C352.4219,203.2562 352.2188,203.3656 352,203.6312 C350.8281,203.1312 350.3906,203.0218 349.4375,203.0218 C346.7656,203.0218 344.75,205.0374 344.75,207.6624 L344.75,208.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="370.25" y="212.2059">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="305.5" x2="412.5" y1="223.5999" y2="223.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="310.5" y="232.4999"/>
+          <ellipse cx="315.5" cy="237.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="324.5" y="240.6059">foo_c() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="305.5" x2="412.5" y1="248.3999" y2="248.3999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="79.7578"/>
-      <ellipse cx="305" cy="84.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0000060950494980414724">
+        <rect codeLine="19" fill="#F1F1F1" height="98.3998" id="C_0000060950494980414724" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="39.5" y="317.3999"/>
+        <ellipse cx="106.75" cy="333.3999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M101.75,334.5562 C101.75,337.0562 103.8906,338.8687 106.8125,338.8687 C108.0469,338.8687 109.2188,338.5718 109.9688,338.0562 C110.5781,337.6343 110.9063,337.2124 110.9063,336.8062 C110.9063,336.3374 110.4844,335.9312 109.9844,335.9312 C109.75,335.9312 109.5313,336.0093 109.3281,336.2124 C108.8906,336.6499 108.8906,336.6499 108.7188,336.7437 C108.2656,336.9781 107.625,337.1187 106.8594,337.1187 C104.8594,337.1187 103.5781,336.1031 103.5781,334.5249 L103.5781,333.4781 C103.5781,331.7749 104.7969,330.5718 106.5,330.5718 C107.0781,330.5718 107.6563,330.7124 108.125,330.9624 C108.5938,331.2281 108.7656,331.4156 108.8281,331.7749 C108.9531,332.4468 109.2031,332.6968 109.7344,332.6968 C110.0156,332.6968 110.2969,332.5562 110.4844,332.3374 C110.6094,332.1656 110.6563,331.9937 110.6563,331.5562 L110.6563,330.1968 C110.6563,329.7749 110.6406,329.6343 110.5156,329.4624 C110.3438,329.2124 110.0625,329.0562 109.7344,329.0562 C109.4219,329.0562 109.2188,329.1656 109,329.4312 C107.8281,328.9312 107.3906,328.8218 106.4375,328.8218 C103.7656,328.8218 101.75,330.8374 101.75,333.4624 L101.75,334.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="127.25" y="338.0059">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="40.5" x2="191.5" y1="349.3999" y2="349.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="45.5" y="358.2999"/>
+          <ellipse cx="50.5" cy="363.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="59.5" y="366.4059">foo_a() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="45.5" y="375.0998"/>
+          <ellipse cx="50.5" cy="380.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="59.5" y="383.2058">foo_c() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="40.5" x2="191.5" y1="390.9998" y2="390.9998"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="45.5" y="399.8997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="47.5" y="401.8997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="59.5" y="408.0057">as : std::vector&lt;A *&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="314" y="87.9683">foo_c() = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0002237886670308966220">
+        <rect codeLine="26" fill="#F1F1F1" height="98.3998" id="C_0002237886670308966220" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="407.5" y="317.3999"/>
+        <ellipse cx="475.25" cy="333.3999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M470.25,334.5562 C470.25,337.0562 472.3906,338.8687 475.3125,338.8687 C476.5469,338.8687 477.7188,338.5718 478.4688,338.0562 C479.0781,337.6343 479.4063,337.2124 479.4063,336.8062 C479.4063,336.3374 478.9844,335.9312 478.4844,335.9312 C478.25,335.9312 478.0313,336.0093 477.8281,336.2124 C477.3906,336.6499 477.3906,336.6499 477.2188,336.7437 C476.7656,336.9781 476.125,337.1187 475.3594,337.1187 C473.3594,337.1187 472.0781,336.1031 472.0781,334.5249 L472.0781,333.4781 C472.0781,331.7749 473.2969,330.5718 475,330.5718 C475.5781,330.5718 476.1563,330.7124 476.625,330.9624 C477.0938,331.2281 477.2656,331.4156 477.3281,331.7749 C477.4531,332.4468 477.7031,332.6968 478.2344,332.6968 C478.5156,332.6968 478.7969,332.5562 478.9844,332.3374 C479.1094,332.1656 479.1563,331.9937 479.1563,331.5562 L479.1563,330.1968 C479.1563,329.7749 479.1406,329.6343 479.0156,329.4624 C478.8438,329.2124 478.5625,329.0562 478.2344,329.0562 C477.9219,329.0562 477.7188,329.1656 477.5,329.4312 C476.3281,328.9312 475.8906,328.8218 474.9375,328.8218 C472.2656,328.8218 470.25,330.8374 470.25,333.4624 L470.25,334.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="495.75" y="338.0059">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="408.5" x2="559.5" y1="349.3999" y2="349.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="413.5" y="358.2999"/>
+          <ellipse cx="418.5" cy="363.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="427.5" y="366.4059">foo_a() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="413.5" y="375.0998"/>
+          <ellipse cx="418.5" cy="380.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="427.5" y="383.2058">foo_c() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="408.5" x2="559.5" y1="390.9998" y2="390.9998"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="413.5" y="399.8997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="415.5" y="401.8997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="427.5" y="408.0057">as : std::vector&lt;A *&gt;</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="94.5625" y2="94.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l84csvetn9k4)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="163.9531"/>
-      <ellipse cx="111.5" cy="179.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M114.4688,185.5938 Q113.8906,185.8906 113.25,186.0313 Q112.6094,186.1875 111.9063,186.1875 Q109.4063,186.1875 108.0781,184.5469 Q106.7656,182.8906 106.7656,179.7656 Q106.7656,176.6406 108.0781,174.9844 Q109.4063,173.3281 111.9063,173.3281 Q112.6094,173.3281 113.25,173.4844 Q113.9063,173.6406 114.4688,173.9375 L114.4688,176.6563 Q113.8438,176.0781 113.25,175.8125 Q112.6563,175.5313 112.0313,175.5313 Q110.6875,175.5313 110,176.6094 Q109.3125,177.6719 109.3125,179.7656 Q109.3125,181.8594 110,182.9375 Q110.6875,184 112.0313,184 Q112.6563,184 113.25,183.7344 Q113.8438,183.4531 114.4688,182.875 L114.4688,185.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.5" y="184.1074">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="195.9531" y2="195.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="75.5" y="201.9531"/>
-      <ellipse cx="80.5" cy="206.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="89.5" y="210.1636">foo_a() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="216.7578" y2="216.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l84csvetn9k4)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="163.9531"/>
-      <ellipse cx="348.55" cy="179.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M351.5188,185.5938 Q350.9406,185.8906 350.3,186.0313 Q349.6594,186.1875 348.9563,186.1875 Q346.4563,186.1875 345.1281,184.5469 Q343.8156,182.8906 343.8156,179.7656 Q343.8156,176.6406 345.1281,174.9844 Q346.4563,173.3281 348.9563,173.3281 Q349.6594,173.3281 350.3,173.4844 Q350.9563,173.6406 351.5188,173.9375 L351.5188,176.6563 Q350.8938,176.0781 350.3,175.8125 Q349.7063,175.5313 349.0813,175.5313 Q347.7375,175.5313 347.05,176.6094 Q346.3625,177.6719 346.3625,179.7656 Q346.3625,181.8594 347.05,182.9375 Q347.7375,184 349.0813,184 Q349.7063,184 350.3,183.7344 Q350.8938,183.4531 351.5188,182.875 L351.5188,185.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.45" y="184.1074">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="195.9531" y2="195.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="313" y="201.9531"/>
-      <ellipse cx="318" cy="206.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="327" y="210.1636">foo_c() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="216.7578" y2="216.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l84csvetn9k4)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="285.9531"/>
-      <ellipse cx="98.75" cy="301.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M101.7188,307.5938 Q101.1406,307.8906 100.5,308.0313 Q99.8594,308.1875 99.1563,308.1875 Q96.6563,308.1875 95.3281,306.5469 Q94.0156,304.8906 94.0156,301.7656 Q94.0156,298.6406 95.3281,296.9844 Q96.6563,295.3281 99.1563,295.3281 Q99.8594,295.3281 100.5,295.4844 Q101.1563,295.6406 101.7188,295.9375 L101.7188,298.6563 Q101.0938,298.0781 100.5,297.8125 Q99.9063,297.5313 99.2813,297.5313 Q97.9375,297.5313 97.25,298.6094 Q96.5625,299.6719 96.5625,301.7656 Q96.5625,303.8594 97.25,304.9375 Q97.9375,306 99.2813,306 Q99.9063,306 100.5,305.7344 Q101.0938,305.4531 101.7188,304.875 L101.7188,307.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="119.25" y="306.1074">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="317.9531" y2="317.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="323.9531"/>
-      <ellipse cx="44.5" cy="328.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="53.5" y="332.1636">foo_a() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="336.7578"/>
-      <ellipse cx="44.5" cy="341.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="53.5" y="344.9683">foo_c() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="351.5625" y2="351.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="357.5625"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="41.5" y="359.5625"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="53.5" y="365.7729">as : std::vector&lt;A *&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l84csvetn9k4)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="285.9531"/>
-      <ellipse cx="469.25" cy="301.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M472.2188,307.5938 Q471.6406,307.8906 471,308.0313 Q470.3594,308.1875 469.6563,308.1875 Q467.1563,308.1875 465.8281,306.5469 Q464.5156,304.8906 464.5156,301.7656 Q464.5156,298.6406 465.8281,296.9844 Q467.1563,295.3281 469.6563,295.3281 Q470.3594,295.3281 471,295.4844 Q471.6563,295.6406 472.2188,295.9375 L472.2188,298.6563 Q471.5938,298.0781 471,297.8125 Q470.4063,297.5313 469.7813,297.5313 Q468.4375,297.5313 467.75,298.6094 Q467.0625,299.6719 467.0625,301.7656 Q467.0625,303.8594 467.75,304.9375 Q468.4375,306 469.7813,306 Q470.4063,306 471,305.7344 Q471.5938,305.4531 472.2188,304.875 L472.2188,307.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="489.75" y="306.1074">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="317.9531" y2="317.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="323.9531"/>
-      <ellipse cx="414.5" cy="328.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="423.5" y="332.1636">foo_a() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="336.7578"/>
-      <ellipse cx="414.5" cy="341.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="423.5" y="344.9683">foo_c() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="351.5625" y2="351.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="357.5625"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="411.5" y="359.5625"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="423.5" y="365.7729">as : std::vector&lt;A *&gt;</text>
-    </a>
-    <path d="M150,53.4531 L150,78.5859 A0,0 0 0 0 150,78.5859 L259,78.5859 A0,0 0 0 0 259,78.5859 L259,71.4531 L293.74,65.9531 L259,63.4531 L259,63.4531 L249,53.4531 L150,53.4531 A0,0 0 0 0 150,53.4531 " fill="#FBFB77" filter="url(#f1l84csvetn9k4)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M249,53.4531 L249,63.4531 L259,63.4531 L249,53.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="156" y="70.52">This is class A</text>
-    <path d="M6,53.4531 L6,78.5859 A0,0 0 0 0 6,78.5859 L61.94,78.5859 L105.69,163.8331 L69.94,78.5859 L115,78.5859 A0,0 0 0 0 115,78.5859 L115,63.4531 L105,53.4531 L6,53.4531 A0,0 0 0 0 6,53.4531 " fill="#FBFB77" filter="url(#f1l84csvetn9k4)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M105,53.4531 L105,63.4531 L115,63.4531 L105,53.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="12" y="70.52">This is class B</text>
-    <path d="M217,285.9531 L217,324.9531 L181.57,328.9531 L217,332.9531 L217,371.6172 A0,0 0 0 0 217,371.6172 L368,371.6172 A0,0 0 0 0 368,371.6172 L368,295.9531 L358,285.9531 L217,285.9531 A0,0 0 0 0 217,285.9531 " fill="#FBFB77" filter="url(#f1l84csvetn9k4)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M358,285.9531 L358,295.9531 L368,295.9531 L358,285.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="235" y="303.02"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="223" y="318.1528">This is class D</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="130" x="223" y="333.2856">which is a little like B</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="105" x="223" y="348.4185">and a little like C</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="227" y="363.5513"/>
-    <path d="M275.32,103.9131 C250.75,115.3331 227.18,126.5731 215.5,132.9531 C198.38,142.3031 180.15,153.4731 164.22,163.6531 " fill="none" id="C_0000987634239855407298&lt;-C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="272.59,97.4631,293.68,95.4331,278.46,110.1731,272.59,97.4631" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M356.5,123.5031 C356.5,137.3331 356.5,151.5931 356.5,163.5931 " fill="none" id="C_0000987634239855407298&lt;-C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="349.5,123.2031,356.5,103.2031,363.5,123.2031,349.5,123.2031" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M146.15,285.8431 C176.88,252.5231 221.11,204.9431 260.5,163.9531 C278.66,145.0531 299.06,124.3731 316.36,106.9831 " fill="none" id="C_0000060950494980414724-&gt;C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="320.23,103.0931,311.0448,106.6472,316.7016,106.6358,316.713,112.2926,320.23,103.0931" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="263.5" y="192.0195"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="273.5" y="199.02">as</text>
-    <path d="M114.96,245.5631 C113.76,258.8031 112.48,272.9731 111.32,285.7531 " fill="none" id="C_0000594234458687375950&lt;-C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="108.03,244.4731,116.81,225.1931,121.97,245.7431,108.03,244.4731" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M299.39,236.4931 C288.99,243.3231 278.07,250.0931 267.5,255.9531 C238.61,271.9731 229.64,272.4231 199.5,285.9531 C193.73,288.5431 187.77,291.2331 181.78,293.9431 " fill="none" id="C_0001142499429598587507&lt;-C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="295.79,230.4731,316.28,225.0731,303.64,242.0731,295.79,230.4731" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M467.23,285.8831 C458.11,251.9631 443.18,203.5431 423.5,163.9531 C413.76,144.3531 400.46,124.2031 388.29,107.3831 " fill="none" id="C_0002237886670308966220-&gt;C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="385.22,103.1831,387.3048,112.8088,388.1719,107.2188,393.7619,108.0858,385.22,103.1831" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="451.5" y="192.0195"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="461.5" y="199.02">as</text>
-    <path d="M188.64,221.4631 C191.97,222.6531 195.27,223.8231 198.5,224.9531 C281.02,253.8031 304.05,254.1931 385.5,285.9531 C391.39,288.2531 397.44,290.7331 403.49,293.3031 " fill="none" id="C_0000594234458687375950&lt;-C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="185.93,227.9231,169.53,214.5031,190.72,214.7731,185.93,227.9231" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M397.5,240.3431 C410.91,255.0331 425.74,271.2831 438.96,285.7531 " fill="none" id="C_0001142499429598587507&lt;-C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="391.97,244.6731,383.65,225.1931,402.31,235.2331,391.97,244.6731" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="elem_GMN15">
+      <path d="M149,74.8999 L149,100.4999 A0,0 0 0 0 149,100.4999 L257,100.4999 A0,0 0 0 0 257,100.4999 L257,92.8999 L291.82,87.6999 L257,84.8999 L257,84.8999 L247,74.8999 L149,74.8999 A0,0 0 0 0 149,74.8999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M247,74.8999 L247,84.8999 L257,84.8999 L247,74.8999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="87" x="155" y="91.9769">This is class A</text>
+    </g>
+    <g id="elem_GMN18">
+      <path d="M6,74.8999 L6,100.4999 A0,0 0 0 0 6,100.4999 L60.97,100.4999 L102.78,191.2899 L68.97,100.4999 L114,100.4999 A0,0 0 0 0 114,100.4999 L114,84.8999 L104,74.8999 L6,74.8999 A0,0 0 0 0 6,74.8999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M104,74.8999 L104,84.8999 L114,84.8999 L104,74.8999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="87" x="12" y="91.9769">This is class B</text>
+    </g>
+    <g id="elem_GMN21">
+      <path d="M228,322.5999 L228,362.5999 L192.91,366.5999 L228,370.5999 L228,410.6 A0,0 0 0 0 228,410.6 L372,410.6 A0,0 0 0 0 372,410.6 L372,332.5999 L362,322.5999 L228,322.5999 A0,0 0 0 0 228,322.5999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M362,322.5999 L362,332.5999 L372,332.5999 L362,322.5999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="234" y="339.6769">   </text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="87" x="234" y="355.277">This is class D</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="123" x="234" y="370.877">which is a little like B</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="97" x="234" y="386.477">and a little like C</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="234" y="402.077"> </text>
+    </g>
+    <g id="link_C_0000987634239855407298_C_0000594234458687375950">
+      <path codeLine="32" d="M275.8134,130.1859 C238.7334,148.6859 216.01,160.0299 215,160.5999 C198.18,170.0699 180.21,181.0999 164.26,191.2399 " fill="none" id="C_0000987634239855407298-backto-C_0000594234458687375950" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="291.92,122.1499,273.1347,124.817,278.492,135.5547,291.92,122.1499" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000987634239855407298_C_0001142499429598587507">
+      <path codeLine="33" d="M359,148.8299 C359,168.3599 359,173.1999 359,191.2599 " fill="none" id="C_0000987634239855407298-backto-C_0001142499429598587507" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="359,130.8299,353,148.8299,365,148.8299,359,130.8299" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000060950494980414724_C_0000987634239855407298">
+      <path codeLine="34" d="M154.1,317.0699 C182.32,281.6599 222.12,232.8499 259,191.5999 C277.26,171.1699 294.0878,153.5728 312.1278,135.2728 " fill="none" id="C_0000060950494980414724-to-C_0000987634239855407298" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="316.34,130.9999,307.1731,134.6011,312.8299,134.5607,312.8703,140.2174,316.34,130.9999" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="262" y="221.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="272" y="228.5769">as</text>
+    </g>
+    <g id="link_C_0000594234458687375950_C_0000060950494980414724">
+      <path codeLine="35" d="M116,274.5499 C116,292.3699 116,296.9999 116,317.0299 " fill="none" id="C_0000594234458687375950-backto-C_0000060950494980414724" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="116,256.5499,110,274.5499,122,274.5499,116,256.5499" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001142499429598587507_C_0000060950494980414724">
+      <path codeLine="36" d="M299.4477,267.0389 C284.6377,277.1789 282.75,278.0199 267,287.3999 C259.45,291.8899 226.29,309.1099 192.97,326.2399 " fill="none" id="C_0001142499429598587507-backto-C_0000060950494980414724" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="314.3,256.8699,296.058,262.0881,302.8373,271.9897,314.3,256.8699" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002237886670308966220_C_0000987634239855407298">
+      <path codeLine="37" d="M473.6,317.1799 C464.89,281.3899 450.7,232.0599 431,191.5999 C420.69,170.4299 409.8342,153.6366 396.5942,135.7066 " fill="none" id="C_0002237886670308966220-to-C_0000987634239855407298" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="393.03,130.8799,395.1584,140.496,396.0001,134.9022,401.594,135.7438,393.03,130.8799" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="459" y="221.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="469" y="228.5769">as</text>
+    </g>
+    <g id="link_C_0000594234458687375950_C_0002237886670308966220">
+      <path codeLine="38" d="M188.2692,253.0527 C197.1292,256.3827 189.37,253.3799 198,256.3999 C282.51,285.9799 307.21,283.2999 390,317.3999 C395.6,319.7099 401.31,322.2199 407.02,324.8399 " fill="none" id="C_0000594234458687375950-backto-C_0002237886670308966220" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="171.42,246.7199,186.1583,258.6691,190.3801,247.4362,171.42,246.7199" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001142499429598587507_C_0002237886670308966220">
+      <path codeLine="39" d="M399.0085,270.0033 C414.8485,287.8233 423.01,296.9999 440.82,317.0299 " fill="none" id="C_0001142499429598587507-backto-C_0002237886670308966220" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="387.05,256.5499,394.5241,273.9895,403.493,266.0171,387.05,256.5499" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00002_class_mermaid.svg b/docs/test_cases/t00002_class_mermaid.svg
index e9eacc3d..0912a39c 100644
--- a/docs/test_cases/t00002_class_mermaid.svg
+++ b/docs/test_cases/t00002_class_mermaid.svg
@@ -1,67 +1,71 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 643.00390625 581" style="max-width: 643.004px; background-color: white;" width="643.00390625" id="my-svg">
-  <title id="chart-title-my-svg">Basic class diagram example</title>
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 660.78515625 581" style="max-width: 660.785px; background-color: white;" width="660.78515625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M446.5,176.92166101504392L471.439453125,187.2680508458699C496.37890625,197.61444067669595,546.2578125,218.30722033834797,569.7860734108881,233.4869435025073C593.3143343217762,248.66666666666666,590.4919498935523,258.3333333333333,589.0807576794404,263.1666666666667L587.6695654653284,268"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M350.4728594653179,214L347.9552474710983,218.16666666666666C345.4376354768786,222.33333333333334,340.4024114884393,230.66666666666666,337.88479949421964,239.66666666666666C335.3671875,248.66666666666666,335.3671875,258.3333333333333,335.3671875,263.1666666666667L335.3671875,268"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M104.48046875,420.18307505317534L90.25325520833333,412.8192292109795C76.02604166666667,405.45538336878354,47.571614583333336,390.7276916843918,33.344401041666664,371.94717917552924C19.1171875,353.1666666666667,19.1171875,330.3333333333333,19.1171875,307.5C19.1171875,284.6666666666667,19.1171875,261.8333333333333,70.72526041666667,238.30293795491482C122.33333333333333,214.77254257649636,225.54947916666666,190.54508515299275,277.1575520833333,178.43135644124092L328.765625,166.3176277294891"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M517.26953125,328.8916115796672L495.6634114583333,336.74300964972264C474.0572916666667,344.5944077197781,430.8450520833333,360.29720385988907,389.2994791666667,376.71270088837883C347.75390625,393.1281979168687,307.875,410.2563958337375,287.935546875,418.8204947921718L267.99609375,427.38459375060614"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M335.3671875,347L335.3671875,351.8333333333333C335.3671875,356.6666666666667,335.3671875,366.3333333333333,324.138671875,377.67959984632984C312.91015625,389.0258663593263,290.453125,402.0517327186526,279.224609375,408.56466589831575L267.99609375,415.0775990779789"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M461.21233742774564,401L457.6600207731214,396.8333333333333C454.1077041184971,392.6666666666667,447.0030708092486,384.3333333333333,443.4507541546243,368.75C439.8984375,353.1666666666667,439.8984375,330.3333333333333,439.8984375,307.5C439.8984375,284.6666666666667,439.8984375,261.8333333333333,437.38082550578036,246.25C434.8632135115607,230.66666666666666,429.8279895231214,222.33333333333334,427.3103775289017,218.16666666666666L424.7927655346821,214"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M576.13671875,347L576.13671875,351.8333333333333C576.13671875,356.6666666666667,576.13671875,366.3333333333333,573.126497772158,375.3333333333333C570.116276794316,384.3333333333333,564.095834838632,392.6666666666667,561.08561386079,396.8333333333333L558.075392882948,401"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M393.78125,332.9825861983183L410.2161458333333,340.15215516526524C426.6510416666667,347.32172413221224,459.5208333333333,361.6608620661061,476.9795204118497,372.9970976997197C494.4382074903661,384.3333333333333,496.48578998073225,392.6666666666667,497.50958122591527,396.8333333333333L498.5333724710983,401"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M387.6328125,41L387.6328125,45.166666666666664C387.6328125,49.333333333333336,387.6328125,57.666666666666664,387.6328125,66C387.6328125,74.33333333333333,387.6328125,82.66666666666667,387.6328125,86.83333333333333L387.6328125,91"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M576.13671875,169L576.13671875,180.66666666666666C576.13671875,192.33333333333334,576.13671875,215.66666666666666,576.13671875,232.16666666666666C576.13671875,248.66666666666666,576.13671875,258.3333333333333,576.13671875,263.1666666666667L576.13671875,268"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote11" d="M146.09375,351L146.09375,355.1666666666667C146.09375,359.3333333333333,146.09375,367.6666666666667,148.02749427986512,376C149.96123855973025,384.3333333333333,153.8287271194605,392.6666666666667,155.76247139932562,396.8333333333333L157.69621567919074,401"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M474.31429457979715,184.6657693554395L496.8406881914976,193.72147446286624C519.3670818031982,202.777179570293,564.419869026599,220.88858978514648,585.5350704241877,234.7776282259066C606.6502718217762,248.66666666666666,603.8278873935523,258.3333333333333,602.4166951794404,263.1666666666667L601.0055029653284,268"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M345.9667272259796,229.23018082356498L344.9410226883163,230.85848401963747C343.9153181506531,232.48678721571,341.86390907532655,235.74339360785498,340.8382045376633,242.20503013726082C339.8125,248.66666666666666,339.8125,258.3333333333333,339.8125,263.1666666666667L339.8125,268"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M108.92578125,421.27951321691216L93.95768229166667,413.73292768076016C78.98958333333333,406.1863421446081,49.053385416666664,391.0931710723041,34.085286458333336,372.1299188694854C19.1171875,353.1666666666667,19.1171875,330.3333333333333,19.1171875,307.5C19.1171875,284.6666666666667,19.1171875,261.8333333333333,70.12126595331993,238.65748300376916C121.12534440663988,215.481632674205,223.13350131327977,191.96326534840998,274.1375797665997,180.20408168551248L325.14165821991963,168.44489802261495"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M509.1758634081611,335.6819822126829L490.03001638180086,342.40165184390236C470.88416935544075,349.12132147512193,432.5924753027204,362.56066073756097,393.13673244302686,377.9083151236693C353.6809895833333,393.2559695097776,313.0611979166667,410.5119390195552,292.7513020833333,419.139923774444L272.44140625,427.7679085293328"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M339.8125,365L339.8125,366.8333333333333C339.8125,368.6666666666667,339.8125,372.3333333333333,328.583984375,380.67959984632984C317.35546875,389.0258663593263,294.8984375,402.0517327186526,283.669921875,408.56466589831575L272.44140625,415.0775990779789"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M470.74534862716763,401L467.08596760597305,396.8333333333333C463.4265865847785,392.6666666666667,456.1078245423892,384.3333333333333,452.4484435211946,368.75C448.7890625,353.1666666666667,448.7890625,330.3333333333333,448.7890625,307.5C448.7890625,284.6666666666667,448.7890625,261.8333333333333,446.69737674691896,247.0961211568647C444.60569099383787,232.3589089803961,440.4223194876757,225.71781796079222,438.33063373459464,222.39727245099027L436.23894798151355,219.07672694118833"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M589.47265625,365L589.47265625,366.8333333333333C589.47265625,368.6666666666667,589.47265625,372.3333333333333,586.3553709055876,378.3333333333333C583.2380855611754,384.3333333333333,577.0035148723507,392.6666666666667,573.8862295279383,396.8333333333333L570.7689441835261,401"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M419.27660699856824,340.7533726363654L433.3144902071402,346.6278105303045C447.3523734157122,352.5022484242436,475.42813983285606,364.2511242121218,490.4898142866111,374.2922287727276C505.5514887403661,384.3333333333333,507.59907123073225,392.6666666666667,508.62286247591527,396.8333333333333L509.6466537210983,401"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M394.30078125,41L394.30078125,45.166666666666664C394.30078125,49.333333333333336,394.30078125,57.666666666666664,394.30078125,66C394.30078125,74.33333333333333,394.30078125,82.66666666666667,394.30078125,86.83333333333333L394.30078125,91"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M589.47265625,169L589.47265625,180.66666666666666C589.47265625,192.33333333333334,589.47265625,215.66666666666666,589.47265625,232.16666666666666C589.47265625,248.66666666666666,589.47265625,258.3333333333333,589.47265625,263.1666666666667L589.47265625,268"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote11" d="M146.09375,351L146.09375,355.1666666666667C146.09375,359.3333333333333,146.09375,367.6666666666667,148.24162301300578,376C150.38949602601156,384.3333333333333,154.6852420520231,392.6666666666667,156.8331150650289,396.8333333333333L158.98098807803467,401"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -111,7 +115,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(439.8984375, 307.5)" class="edgeLabel">
+        <g transform="translate(448.7890625, 307.5)" class="edgeLabel">
           <g transform="translate(-11.1171875, -9)" class="label">
             <foreignObject height="18" width="22.234375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -169,11 +173,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L7">
+        <a transform="translate(394.30078125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L7">
           <g title="This is class A" id="classId-C_0000987634239855407298-0" class="node default clickable">
-            <rect height="123" width="117.734375" y="-61.5" x="-58.8671875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
+            <rect height="123" width="126.625" y="-61.5" x="-63.3125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.3125" x1="-63.3125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.3125" x1="-63.3125" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -185,24 +189,24 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -51.3671875, 14)" height="18" width="102.734375">
+              <foreignObject transform="translate( -55.8125, 14)" height="18" width="111.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+foo_a() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+foo_a() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -51.3671875, 36)" height="18" width="101.828125">
+              <foreignObject transform="translate( -55.8125, 36)" height="18" width="110.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+foo_c() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+foo_c() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L16">
+        <a transform="translate(589.47265625, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L16">
           <g title="This is class B" id="classId-C_0000594234458687375950-1" class="node default clickable">
-            <rect height="79" width="117.734375" y="-39.5" x="-58.8671875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
+            <rect height="79" width="126.625" y="-39.5" x="-63.3125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.3125" x1="-63.3125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.3125" x1="-63.3125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -214,19 +218,19 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -51.3671875, 14)" height="18" width="102.734375">
+              <foreignObject transform="translate( -55.8125, 14)" height="18" width="111.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_a() : void</span>
+                  <span class="nodeLabel">+foo_a() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L27">
+        <a transform="translate(339.8125, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L27">
           <g title="This is class C - class C has a long comment" id="classId-C_0001142499429598587507-2" class="node default clickable">
-            <rect height="79" width="116.828125" y="-39.5" x="-58.4140625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="58.4140625" x1="-58.4140625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="58.4140625" x1="-58.4140625" class="divider"/>
+            <rect height="79" width="125.71875" y="-39.5" x="-62.859375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="62.859375" x1="-62.859375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="62.859375" x1="-62.859375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -238,15 +242,15 @@
                   <span class="nodeLabel">C</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -50.9140625, 14)" height="18" width="101.828125">
+              <foreignObject transform="translate( -55.359375, 14)" height="18" width="110.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_c() : void</span>
+                  <span class="nodeLabel">+foo_c() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L36">
+        <a transform="translate(190.68359375, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L36">
           <g title="D" id="classId-C_0000060950494980414724-3" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -267,20 +271,20 @@
                   <span class="nodeLabel">-as : std::vector&lt;A *&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.2578125, 14)" height="18" width="102.734375">
+              <foreignObject transform="translate( -74.2578125, 14)" height="18" width="111.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_a() : void</span>
+                  <span class="nodeLabel">+foo_a() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.2578125, 36)" height="18" width="101.828125">
+              <foreignObject transform="translate( -74.2578125, 36)" height="18" width="110.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_c() : void</span>
+                  <span class="nodeLabel">+foo_c() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00002/t00002.cc#L61">
+        <a transform="translate(524.7578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L61">
           <g title="E" id="classId-C_0002237886670308966220-4" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -301,20 +305,20 @@
                   <span class="nodeLabel">-as : std::vector&lt;A *&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.2578125, 14)" height="18" width="102.734375">
+              <foreignObject transform="translate( -74.2578125, 14)" height="18" width="111.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_a() : void</span>
+                  <span class="nodeLabel">+foo_a() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.2578125, 36)" height="18" width="101.828125">
+              <foreignObject transform="translate( -74.2578125, 36)" height="18" width="110.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_c() : void</span>
+                  <span class="nodeLabel">+foo_c() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <g transform="translate(387.6328125, 24.5)" id="note0" class="node undefined">
+        <g transform="translate(394.30078125, 24.5)" id="note0" class="node undefined">
           <rect height="33" width="116.359375" y="-16.5" x="-58.1796875" ry="0" rx="0"/>
           <g transform="translate(-50.6796875, -9)" style="" class="label">
             <rect/>
@@ -325,7 +329,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(576.13671875, 152.5)" id="note1" class="node undefined">
+        <g transform="translate(589.47265625, 152.5)" id="note1" class="node undefined">
           <rect height="33" width="117.25" y="-16.5" x="-58.625" ry="0" rx="0"/>
           <g transform="translate(-51.125, -9)" style="" class="label">
             <rect/>
@@ -350,5 +354,5 @@
       </g>
     </g>
   </g>
-  <text class="classTitleText" y="-25" x="321.501953125">Basic class diagram example</text>
+  <text class="classTitleText" y="-25" x="330.392578125">Basic class diagram example</text>
 </svg>
diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md
index 1c86ff73..5edc1bbf 100644
--- a/docs/test_cases/t00003.md
+++ b/docs/test_cases/t00003.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00003.cc
+File `tests/t00003/t00003.cc`
 ```cpp
 #include <functional>
 #include <string>
@@ -240,6 +240,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -265,6 +266,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -295,6 +297,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -325,6 +328,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": true,
           "is_move_assignment": false,
@@ -355,6 +359,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -380,6 +385,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -405,6 +411,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -430,6 +437,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -455,6 +463,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -480,6 +489,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -505,6 +515,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": true,
@@ -535,6 +546,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": true,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -565,6 +577,7 @@ int A::static_int = 1;
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -590,6 +603,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -620,6 +634,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -654,6 +669,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -685,6 +701,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -720,6 +737,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -750,6 +768,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -775,6 +794,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -800,6 +820,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index 9c902a68..c03a3812 100644
--- a/docs/test_cases/t00003_class.svg
+++ b/docs/test_cases/t00003_class.svg
@@ -1,236 +1,232 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="486px" preserveAspectRatio="none" style="width:347px;height:486px;" version="1.1" viewBox="0 0 347 486" width="347px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="613px" preserveAspectRatio="none" style="width:369px;height:613px;background:#FFFFFF;" version="1.1" viewBox="0 0 369 613" width="369px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1cwwu08bf222z" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cwwu08bf222z)" height="468.9453" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
-      <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
-      <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="53.2104">A() = default : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
-      <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="66.0151">A(int i) : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
-      <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="78.8198">A(A &amp;&amp;) = default : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
-      <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="91.6245">A(const A &amp;) = deleted : void</text>
-    </a>
-    <ellipse cx="18" cy="101.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="27" y="104.4292">A&lt;T&gt;(T t) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
-      <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="117.2339">~A() = default : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="123.8281" y2="123.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="129.8281"/>
-      <ellipse cx="18" cy="134.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="138.0386">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="142.6328"/>
-      <ellipse cx="18" cy="147.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="150.8433">operator=(A &amp; other) noexcept : A &amp;</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="157.4375" y2="157.4375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="163.4375"/>
-      <ellipse cx="18" cy="168.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="171.6479">operator++() : A &amp;</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="178.2422" y2="178.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="184.2422"/>
-      <ellipse cx="18" cy="189.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="192.4526">auto_method() : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="197.0469"/>
-      <ellipse cx="18" cy="202.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="205.2573">basic_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="209.8516"/>
-      <ellipse cx="18" cy="214.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="218.062">const_method() const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="222.6563"/>
-      <ellipse cx="18" cy="227.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="230.8667">create_from_int(int i) : A</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="235.4609"/>
-      <ellipse cx="18" cy="240.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="243.6714">default_int(int i = 12) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="248.2656"/>
-      <ellipse cx="18" cy="253.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="256.4761">default_string(int i, std::string s = "abc") : std::string</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="261.0703"/>
-      <ellipse cx="18" cy="266.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="269.2808">double_int(const int i) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="273.875"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="275.875"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="282.0854">private_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="286.6797"/>
-      <polygon fill="#FFFF44" points="18,286.6797,22,290.6797,18,294.6797,14,290.6797" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="294.8901">protected_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="299.4844"/>
-      <ellipse cx="18" cy="304.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="195" x="27" y="307.6948">size() constexpr const : std::size_t</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="312.2891"/>
-      <ellipse cx="18" cy="317.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="320.4995">static_method() : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="325.0938"/>
-      <ellipse cx="18" cy="330.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="333.3042">sum(const double a, const double b) : int</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="339.8984" y2="339.8984"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="345.8984"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="347.8984"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="354.1089">a_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="358.7031"/>
-      <ellipse cx="18" cy="363.7031" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="366.9136">auto_member : const unsigned long</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="371.5078"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="373.5078"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="379.7183">b_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="384.3125"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="386.3125"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="392.5229">c_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="397.1172"/>
-      <polygon fill="#FFFF44" points="18,397.1172,22,401.1172,18,405.1172,14,401.1172" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="405.3276">compare : std::function&lt;bool (const int)&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="409.9219"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="411.9219"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="418.1323">private_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="422.7266"/>
-      <polygon fill="none" points="18,422.7266,22,426.7266,18,430.7266,14,426.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="430.937">protected_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="435.5313"/>
-      <ellipse cx="18" cy="440.5313" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="443.7417">public_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="448.3359"/>
-      <ellipse cx="18" cy="453.3359" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="456.5464">static_const_int : const int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="461.1406"/>
-      <ellipse cx="18" cy="466.1406" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="469.3511">static_int : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001371951663534295727">
+        <rect codeLine="2" fill="#F1F1F1" height="592.7977" id="C_0001371951663534295727" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="348" x="7" y="7"/>
+        <ellipse cx="172.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M167.25,24.1563 C167.25,26.6563 169.3906,28.4688 172.3125,28.4688 C173.5469,28.4688 174.7188,28.1719 175.4688,27.6563 C176.0781,27.2344 176.4063,26.8125 176.4063,26.4063 C176.4063,25.9375 175.9844,25.5313 175.4844,25.5313 C175.25,25.5313 175.0313,25.6094 174.8281,25.8125 C174.3906,26.25 174.3906,26.25 174.2188,26.3438 C173.7656,26.5781 173.125,26.7188 172.3594,26.7188 C170.3594,26.7188 169.0781,25.7031 169.0781,24.125 L169.0781,23.0781 C169.0781,21.375 170.2969,20.1719 172,20.1719 C172.5781,20.1719 173.1563,20.3125 173.625,20.5625 C174.0938,20.8281 174.2656,21.0156 174.3281,21.375 C174.4531,22.0469 174.7031,22.2969 175.2344,22.2969 C175.5156,22.2969 175.7969,22.1563 175.9844,21.9375 C176.1094,21.7656 176.1563,21.5938 176.1563,21.1563 L176.1563,19.7969 C176.1563,19.375 176.1406,19.2344 176.0156,19.0625 C175.8438,18.8125 175.5625,18.6563 175.2344,18.6563 C174.9219,18.6563 174.7188,18.7656 174.5,19.0313 C173.3281,18.5313 172.8906,18.4219 171.9375,18.4219 C169.2656,18.4219 167.25,20.4375 167.25,23.0625 L167.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.75" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="47.9"/>
+          <ellipse cx="18" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="27" y="56.0059">A() = default : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="64.6999"/>
+          <ellipse cx="18" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="27" y="72.8059">A(int i) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="81.4998"/>
+          <ellipse cx="18" cy="86.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="89.6058">A(A &amp;&amp;) = default : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="98.2997"/>
+          <ellipse cx="18" cy="103.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="180" x="27" y="106.4057">A(const A &amp;) = deleted : void</text>
+        </a>
+        <ellipse cx="18" cy="120.0997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="27" y="123.2057">A&lt;T&gt;(T t) : void</text>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="131.8996"/>
+          <ellipse cx="18" cy="136.8996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124" x="27" y="140.0056">~A() = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="354" y1="147.7996" y2="147.7996"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="156.6995"/>
+          <ellipse cx="18" cy="161.6995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="236" x="27" y="164.8055">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="173.4995"/>
+          <ellipse cx="18" cy="178.4995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="27" y="181.6054">operator=(A &amp; other) noexcept : A &amp;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="354" y1="189.3994" y2="189.3994"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="198.2994"/>
+          <ellipse cx="18" cy="203.2994" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="27" y="206.4054">operator++() : A &amp;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="354" y1="214.1993" y2="214.1993"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.0993"/>
+          <ellipse cx="18" cy="228.0993" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="27" y="231.2053">auto_method() : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="239.8992"/>
+          <ellipse cx="18" cy="244.8992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="27" y="248.0052">basic_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="256.6992"/>
+          <ellipse cx="18" cy="261.6992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="27" y="264.8051">const_method() const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="273.4991"/>
+          <ellipse cx="18" cy="278.4991" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="153" x="27" y="281.6051">create_from_int(int i) : A</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="290.299"/>
+          <ellipse cx="18" cy="295.299" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="27" y="298.405">default_int(int i = 12) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="307.0989"/>
+          <ellipse cx="18" cy="312.0989" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="27" y="315.2049">default_string(int i, std::string s = "abc") : std::string</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="323.8989"/>
+          <ellipse cx="18" cy="328.8989" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="27" y="332.0048">double_int(const int i) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="340.6988"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="342.6988"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="348.8048">private_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="357.4987"/>
+          <polygon fill="#FFFF44" points="18,357.4987,22,361.4987,18,365.4987,14,361.4987" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="164" x="27" y="365.6047">protected_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="374.2986"/>
+          <ellipse cx="18" cy="379.2986" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215" x="27" y="382.4046">size() constexpr const : std::size_t</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="391.0986"/>
+          <ellipse cx="18" cy="396.0986" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="126" x="27" y="399.2046">static_method() : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="407.8985"/>
+          <ellipse cx="18" cy="412.8985" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="258" x="27" y="416.0045">sum(const double a, const double b) : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="423.7985" y2="423.7985"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="432.6984"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="434.6984"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="440.8044">a_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="449.4984"/>
+          <ellipse cx="18" cy="454.4984" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="228" x="27" y="457.6043">auto_member : const unsigned long</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="466.2983"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="468.2983"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="474.4043">b_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="483.0982"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="485.0982"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="27" y="491.2042">c_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="499.8981"/>
+          <polygon fill="#FFFF44" points="18,499.8981,22,503.8981,18,507.8981,14,503.8981" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="255" x="27" y="508.0041">compare : std::function&lt;bool (const int)&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="516.6981"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="518.6981"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="27" y="524.804">private_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="533.498"/>
+          <polygon fill="none" points="18,533.498,22,537.498,18,541.498,14,537.498" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="27" y="541.604">protected_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="550.2979"/>
+          <ellipse cx="18" cy="555.2979" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="27" y="558.4039">public_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="567.0978"/>
+          <ellipse cx="18" cy="572.0978" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="163" x="27" y="575.2038">static_const_int : const int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="583.8978"/>
+          <ellipse cx="18" cy="588.8978" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="83" x="27" y="592.0037">static_int : int</text>
+        </a>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00003_class_mermaid.svg b/docs/test_cases/t00003_class_mermaid.svg
index f2e3c3cb..c2accccb 100644
--- a/docs/test_cases/t00003_class_mermaid.svg
+++ b/docs/test_cases/t00003_class_mermaid.svg
@@ -1,50 +1,55 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 755" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 409.640625 755" style="max-width: 409.641px; background-color: white;" width="409.640625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,11 +57,11 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00003/t00003.cc#L7">
+        <a transform="translate(204.8203125, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L7">
           <g title="A" id="classId-C_0001371951663534295727-0" class="node default clickable">
-            <rect height="739" width="384.75" y="-369.5" x="-192.375" class="outer title-state"/>
-            <line y2="-339.5" y1="-339.5" x2="192.375" x1="-192.375" class="divider"/>
-            <line y2="-103.5" y1="-103.5" x2="192.375" x1="-192.375" class="divider"/>
+            <rect height="739" width="393.640625" y="-369.5" x="-196.8203125" class="outer title-state"/>
+            <line y2="-339.5" y1="-339.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
+            <line y2="-103.5" y1="-103.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -68,159 +73,159 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -328)" height="18" width="53.359375">
+              <foreignObject transform="translate( -189.3203125, -328)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-a_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -306)" height="18" width="263.734375">
+              <foreignObject transform="translate( -189.3203125, -306)" height="18" width="263.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+auto_member : const unsigned long</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -284)" height="18" width="53.359375">
+              <foreignObject transform="translate( -189.3203125, -284)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-b_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -262)" height="18" width="52.46875">
+              <foreignObject transform="translate( -189.3203125, -262)" height="18" width="52.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-c_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -240)" height="18" width="294.390625">
+              <foreignObject transform="translate( -189.3203125, -240)" height="18" width="294.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#compare : std::function&lt;bool (const int)&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -218)" height="18" width="151.171875">
+              <foreignObject transform="translate( -189.3203125, -218)" height="18" width="151.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-private_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -196)" height="18" width="173.421875">
+              <foreignObject transform="translate( -189.3203125, -196)" height="18" width="173.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#protected_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -174)" height="18" width="148.96875">
+              <foreignObject transform="translate( -189.3203125, -174)" height="18" width="148.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+public_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -152)" height="18" width="192.546875">
+              <foreignObject transform="translate( -189.3203125, -152)" height="18" width="192.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_const_int : const int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -130)" height="18" width="102.71875">
+              <foreignObject transform="translate( -189.3203125, -130)" height="18" width="102.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -96)" height="18" width="134.734375">
+              <foreignObject transform="translate( -189.3203125, -96)" height="18" width="143.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A() : [default] void</span>
+                  <span class="nodeLabel">+A() : : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -74)" height="18" width="98.265625">
+              <foreignObject transform="translate( -189.3203125, -74)" height="18" width="107.15625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(int i) : void</span>
+                  <span class="nodeLabel">+A(int i) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -52)" height="18" width="170.3125">
+              <foreignObject transform="translate( -189.3203125, -52)" height="18" width="179.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(A &amp;&amp;) : [default] void</span>
+                  <span class="nodeLabel">+A(A &amp;&amp;) : : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -30)" height="18" width="140.078125">
+              <foreignObject transform="translate( -189.3203125, -30)" height="18" width="148.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(const A &amp;) : void</span>
+                  <span class="nodeLabel">+A(const A &amp;) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -8)" height="18" width="91.734375">
+              <foreignObject transform="translate( -189.3203125, -8)" height="18" width="100.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(T t) : void</span>
+                  <span class="nodeLabel">+A(T t) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 14)" height="18" width="144.078125">
+              <foreignObject transform="translate( -189.3203125, 14)" height="18" width="152.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~A() : [default] void</span>
+                  <span class="nodeLabel">+~A() : : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 36)" height="18" width="202.796875">
+              <foreignObject transform="translate( -189.3203125, 36)" height="18" width="211.6875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(A &amp;&amp; other) : A &amp;</span>
+                  <span class="nodeLabel">+operator=(A &amp;&amp; other) : : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 58)" height="18" width="192.125">
+              <foreignObject transform="translate( -189.3203125, 58)" height="18" width="201.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(A &amp; other) : A &amp;</span>
+                  <span class="nodeLabel">+operator=(A &amp; other) : : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 80)" height="18" width="135.640625">
+              <foreignObject transform="translate( -189.3203125, 80)" height="18" width="144.53125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator++() : A &amp;</span>
+                  <span class="nodeLabel">+operator++() : : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 102)" height="18" width="143.640625">
+              <foreignObject transform="translate( -189.3203125, 102)" height="18" width="152.53125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+auto_method() : int</span>
+                  <span class="nodeLabel">+auto_method() : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 124)" height="18" width="162.3125">
+              <foreignObject transform="translate( -189.3203125, 124)" height="18" width="171.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+basic_method() : void</span>
+                  <span class="nodeLabel">+basic_method() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 146)" height="18" width="214.78125">
+              <foreignObject transform="translate( -189.3203125, 146)" height="18" width="223.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : [const] void</span>
+                  <span class="nodeLabel">+const_method() : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 168)" height="18" width="179.1875">
+              <foreignObject transform="translate( -189.3203125, 168)" height="18" width="188.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+create_from_int(int i) : A</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+create_from_int(int i) : : A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 190)" height="18" width="185">
+              <foreignObject transform="translate( -189.3203125, 190)" height="18" width="193.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_int(int i = 12) : int</span>
+                  <span class="nodeLabel">+default_int(int i = 12) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 212)" height="18" width="369.75">
+              <foreignObject transform="translate( -189.3203125, 212)" height="18" width="378.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : std::string</span>
+                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 234)" height="18" width="191.671875">
+              <foreignObject transform="translate( -189.3203125, 234)" height="18" width="200.5625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+double_int(const int i) : int</span>
+                  <span class="nodeLabel">+double_int(const int i) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 256)" height="18" width="168.96875">
+              <foreignObject transform="translate( -189.3203125, 256)" height="18" width="177.859375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-private_method() : void</span>
+                  <span class="nodeLabel">-private_method() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 278)" height="18" width="191.21875">
+              <foreignObject transform="translate( -189.3203125, 278)" height="18" width="200.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#protected_method() : void</span>
+                  <span class="nodeLabel">#protected_method() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 300)" height="18" width="259.21875">
+              <foreignObject transform="translate( -189.3203125, 300)" height="18" width="268.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : [const,constexpr] std::size_t</span>
+                  <span class="nodeLabel">+size() : : [const,constexpr] std::size_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 322)" height="18" width="149.84375">
+              <foreignObject transform="translate( -189.3203125, 322)" height="18" width="158.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+static_method() : int</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+static_method() : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 344)" height="18" width="297.515625">
+              <foreignObject transform="translate( -189.3203125, 344)" height="18" width="306.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sum(const double a, const double b) : int</span>
+                  <span class="nodeLabel">+sum(const double a, const double b) : : int</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md
index 4b7b036b..f3fe5e83 100644
--- a/docs/test_cases/t00004.md
+++ b/docs/test_cases/t00004.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00004.cc
+File `tests/t00004/t00004.cc`
 ```cpp
 namespace clanguml {
 namespace t00004 {
@@ -137,6 +137,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -162,6 +163,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index f8143353..3672a8d7 100644
--- a/docs/test_cases/t00004_class.svg
+++ b/docs/test_cases/t00004_class.svg
@@ -1,245 +1,297 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="374px" preserveAspectRatio="none" style="width:1071px;height:374px;" version="1.1" viewBox="0 0 1071 374" width="1071px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="397px" preserveAspectRatio="none" style="width:1096px;height:397px;background:#FFFFFF;" version="1.1" viewBox="0 0 1096 397" width="1096px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1m82esu6buy5y" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
-      <ellipse cx="33" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M35.9688,189.6406 Q35.3906,189.9375 34.75,190.0781 Q34.1094,190.2344 33.4063,190.2344 Q30.9063,190.2344 29.5781,188.5938 Q28.2656,186.9375 28.2656,183.8125 Q28.2656,180.6875 29.5781,179.0313 Q30.9063,177.375 33.4063,177.375 Q34.1094,177.375 34.75,177.5313 Q35.4063,177.6875 35.9688,177.9844 L35.9688,180.7031 Q35.3438,180.125 34.75,179.8594 Q34.1563,179.5781 33.5313,179.5781 Q32.1875,179.5781 31.5,180.6563 Q30.8125,181.7188 30.8125,183.8125 Q30.8125,185.9063 31.5,186.9844 Q32.1875,188.0469 33.5313,188.0469 Q34.1563,188.0469 34.75,187.7813 Q35.3438,187.5 35.9688,186.9219 L35.9688,189.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="188.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="200" y2="200"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="208" y2="208"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001232624428734051711">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001232624428734051711" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="20" y="183.2"/>
+        <ellipse cx="35" cy="199.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M30,200.3563 C30,202.8563 32.1406,204.6688 35.0625,204.6688 C36.2969,204.6688 37.4688,204.3719 38.2188,203.8563 C38.8281,203.4344 39.1563,203.0125 39.1563,202.6063 C39.1563,202.1375 38.7344,201.7313 38.2344,201.7313 C38,201.7313 37.7813,201.8094 37.5781,202.0125 C37.1406,202.45 37.1406,202.45 36.9688,202.5438 C36.5156,202.7781 35.875,202.9188 35.1094,202.9188 C33.1094,202.9188 31.8281,201.9031 31.8281,200.325 L31.8281,199.2781 C31.8281,197.575 33.0469,196.3719 34.75,196.3719 C35.3281,196.3719 35.9063,196.5125 36.375,196.7625 C36.8438,197.0281 37.0156,197.2156 37.0781,197.575 C37.2031,198.2469 37.4531,198.4969 37.9844,198.4969 C38.2656,198.4969 38.5469,198.3563 38.7344,198.1375 C38.8594,197.9656 38.9063,197.7938 38.9063,197.3563 L38.9063,195.9969 C38.9063,195.575 38.8906,195.4344 38.7656,195.2625 C38.5938,195.0125 38.3125,194.8563 37.9844,194.8563 C37.6719,194.8563 37.4688,194.9656 37.25,195.2313 C36.0781,194.7313 35.6406,194.6219 34.6875,194.6219 C32.0156,194.6219 30,196.6375 30,199.2625 L30,200.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="49" y="203.806">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="21" x2="60" y1="215.2" y2="215.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="21" x2="60" y1="223.2" y2="223.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
-      <ellipse cx="21" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M25.1094,30 L17.3906,30 L17.3906,17.6094 L25.1094,17.6094 L25.1094,19.7656 L19.8438,19.7656 L19.8438,22.4375 L24.6094,22.4375 L24.6094,24.5938 L19.8438,24.5938 L19.8438,27.8438 L25.1094,27.8438 L25.1094,30 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="35" y="28.1543">B::AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="40" y2="40"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="54.2104">AA_1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="67.0151">AA_2</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="79.8198">AA_3</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="86.4141" y2="86.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <g id="elem_C_0001630205507215126623">
+        <rect codeLine="6" fill="#F1F1F1" height="98.3998" id="C_0001630205507215126623" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="67" x="7" y="7"/>
+        <ellipse cx="22" cy="23" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M20.8594,24.0625 L22.1719,24.0625 L22.1719,24.1094 C22.1719,24.5156 22.1875,24.6719 22.2969,24.8281 C22.4688,25.0781 22.7656,25.25 23.0781,25.25 C23.3594,25.25 23.6563,25.1094 23.8281,24.8906 C23.9531,24.7031 24,24.5625 24,24.1094 L24,22.2656 C24,21.9375 23.9844,21.8281 23.9219,21.6563 C23.8125,21.3594 23.4531,21.1094 23.0781,21.1094 C22.7813,21.1094 22.5156,21.25 22.3438,21.4688 C22.2031,21.6563 22.1719,21.8281 22.1719,22.2656 L22.1719,22.3281 L20.8594,22.3281 L20.8594,20.1563 L24.7031,20.1563 L24.7031,20.9063 C24.7031,21.2969 24.7344,21.4844 24.8438,21.6406 C25.0156,21.8906 25.3125,22.0625 25.625,22.0625 C25.9219,22.0625 26.1875,21.9375 26.375,21.7031 C26.5156,21.5156 26.5469,21.375 26.5469,20.9063 L26.5469,18.4063 L18.8438,18.4063 C18.3906,18.4063 18.2656,18.4219 18.0938,18.5313 C17.8281,18.7031 17.6563,18.9688 17.6563,19.2813 C17.6563,19.5625 17.7813,19.8281 18.0313,20 C18.2188,20.125 18.4063,20.1563 18.8438,20.1563 L19.0313,20.1563 L19.0313,26.25 L18.8438,26.25 C18.4219,26.25 18.2656,26.2813 18.0938,26.375 C17.8281,26.5313 17.6563,26.8125 17.6563,27.1094 C17.6563,27.6875 18.0625,28 18.8438,28 L26.9219,28 L26.9219,25.4688 C26.9219,25.0625 26.8906,24.8906 26.7813,24.7344 C26.6094,24.4688 26.3281,24.3125 26,24.3125 C25.7188,24.3125 25.4375,24.4531 25.25,24.6719 C25.1094,24.8594 25.0781,25.0156 25.0781,25.4688 L25.0781,26.25 L20.8594,26.25 L20.8594,24.0625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="36" y="27.606">B::AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="73" y1="39" y2="39"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="13" y="56.0059">AA_1</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="13" y="72.8059">AA_2</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="13" y="89.6058">AA_3</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="73" y1="97.3998" y2="97.3998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
-      <ellipse cx="232.75" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M235.7188,311.6406 Q235.1406,311.9375 234.5,312.0781 Q233.8594,312.2344 233.1563,312.2344 Q230.6563,312.2344 229.3281,310.5938 Q228.0156,308.9375 228.0156,305.8125 Q228.0156,302.6875 229.3281,301.0313 Q230.6563,299.375 233.1563,299.375 Q233.8594,299.375 234.5,299.5313 Q235.1563,299.6875 235.7188,299.9844 L235.7188,302.7031 Q235.0938,302.125 234.5,301.8594 Q233.9063,301.5781 233.2813,301.5781 Q231.9375,301.5781 231.25,302.6563 Q230.5625,303.7188 230.5625,305.8125 Q230.5625,307.9063 231.25,308.9844 Q231.9375,310.0469 233.2813,310.0469 Q233.9063,310.0469 234.5,309.7813 Q235.0938,309.5 235.7188,308.9219 L235.7188,311.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="253.25" y="310.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="322" y2="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001552274940876611774">
+        <rect codeLine="12" fill="#F1F1F1" height="81.5999" id="C_0001552274940876611774" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="178.5" y="309"/>
+        <ellipse cx="239.75" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M234.75,326.1563 C234.75,328.6563 236.8906,330.4688 239.8125,330.4688 C241.0469,330.4688 242.2188,330.1719 242.9688,329.6563 C243.5781,329.2344 243.9063,328.8125 243.9063,328.4063 C243.9063,327.9375 243.4844,327.5313 242.9844,327.5313 C242.75,327.5313 242.5313,327.6094 242.3281,327.8125 C241.8906,328.25 241.8906,328.25 241.7188,328.3438 C241.2656,328.5781 240.625,328.7188 239.8594,328.7188 C237.8594,328.7188 236.5781,327.7031 236.5781,326.125 L236.5781,325.0781 C236.5781,323.375 237.7969,322.1719 239.5,322.1719 C240.0781,322.1719 240.6563,322.3125 241.125,322.5625 C241.5938,322.8281 241.7656,323.0156 241.8281,323.375 C241.9531,324.0469 242.2031,324.2969 242.7344,324.2969 C243.0156,324.2969 243.2969,324.1563 243.4844,323.9375 C243.6094,323.7656 243.6563,323.5938 243.6563,323.1563 L243.6563,321.7969 C243.6563,321.375 243.6406,321.2344 243.5156,321.0625 C243.3438,320.8125 243.0625,320.6563 242.7344,320.6563 C242.4219,320.6563 242.2188,320.7656 242,321.0313 C240.8281,320.5313 240.3906,320.4219 239.4375,320.4219 C236.7656,320.4219 234.75,322.4375 234.75,325.0625 L234.75,326.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="260.25" y="329.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="179.5" x2="317.5" y1="341" y2="341"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="184.5" y="349.9"/>
+          <ellipse cx="189.5" cy="354.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="198.5" y="358.0059">foo() const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="184.5" y="366.6999"/>
+          <ellipse cx="189.5" cy="371.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="198.5" y="374.8059">foo2() const : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="179.5" x2="317.5" y1="382.5999" y2="382.5999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="328"/>
-      <ellipse cx="187.5" cy="333" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <g id="elem_C_0001742499843727859552">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001742499843727859552" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="67" x="215" y="183.2"/>
+        <ellipse cx="230" cy="199.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M225,200.3563 C225,202.8563 227.1406,204.6688 230.0625,204.6688 C231.2969,204.6688 232.4688,204.3719 233.2188,203.8563 C233.8281,203.4344 234.1563,203.0125 234.1563,202.6063 C234.1563,202.1375 233.7344,201.7313 233.2344,201.7313 C233,201.7313 232.7813,201.8094 232.5781,202.0125 C232.1406,202.45 232.1406,202.45 231.9688,202.5438 C231.5156,202.7781 230.875,202.9188 230.1094,202.9188 C228.1094,202.9188 226.8281,201.9031 226.8281,200.325 L226.8281,199.2781 C226.8281,197.575 228.0469,196.3719 229.75,196.3719 C230.3281,196.3719 230.9063,196.5125 231.375,196.7625 C231.8438,197.0281 232.0156,197.2156 232.0781,197.575 C232.2031,198.2469 232.4531,198.4969 232.9844,198.4969 C233.2656,198.4969 233.5469,198.3563 233.7344,198.1375 C233.8594,197.9656 233.9063,197.7938 233.9063,197.3563 L233.9063,195.9969 C233.9063,195.575 233.8906,195.4344 233.7656,195.2625 C233.5938,195.0125 233.3125,194.8563 232.9844,194.8563 C232.6719,194.8563 232.4688,194.9656 232.25,195.2313 C231.0781,194.7313 230.6406,194.6219 229.6875,194.6219 C227.0156,194.6219 225,196.6375 225,199.2625 L225,200.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="244" y="203.806">A::AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="216" x2="281" y1="215.2" y2="215.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="216" x2="281" y1="223.2" y2="223.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="196.5" y="336.2104">foo() const : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <g id="elem_C_0000590936874508841244">
+        <rect codeLine="22" fill="#F1F1F1" height="98.3998" id="C_0000590936874508841244" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="109" y="7"/>
+        <ellipse cx="124" cy="23" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M122.8594,24.0625 L124.1719,24.0625 L124.1719,24.1094 C124.1719,24.5156 124.1875,24.6719 124.2969,24.8281 C124.4688,25.0781 124.7656,25.25 125.0781,25.25 C125.3594,25.25 125.6563,25.1094 125.8281,24.8906 C125.9531,24.7031 126,24.5625 126,24.1094 L126,22.2656 C126,21.9375 125.9844,21.8281 125.9219,21.6563 C125.8125,21.3594 125.4531,21.1094 125.0781,21.1094 C124.7813,21.1094 124.5156,21.25 124.3438,21.4688 C124.2031,21.6563 124.1719,21.8281 124.1719,22.2656 L124.1719,22.3281 L122.8594,22.3281 L122.8594,20.1563 L126.7031,20.1563 L126.7031,20.9063 C126.7031,21.2969 126.7344,21.4844 126.8438,21.6406 C127.0156,21.8906 127.3125,22.0625 127.625,22.0625 C127.9219,22.0625 128.1875,21.9375 128.375,21.7031 C128.5156,21.5156 128.5469,21.375 128.5469,20.9063 L128.5469,18.4063 L120.8438,18.4063 C120.3906,18.4063 120.2656,18.4219 120.0938,18.5313 C119.8281,18.7031 119.6563,18.9688 119.6563,19.2813 C119.6563,19.5625 119.7813,19.8281 120.0313,20 C120.2188,20.125 120.4063,20.1563 120.8438,20.1563 L121.0313,20.1563 L121.0313,26.25 L120.8438,26.25 C120.4219,26.25 120.2656,26.2813 120.0938,26.375 C119.8281,26.5313 119.6563,26.8125 119.6563,27.1094 C119.6563,27.6875 120.0625,28 120.8438,28 L128.9219,28 L128.9219,25.4688 C128.9219,25.0625 128.8906,24.8906 128.7813,24.7344 C128.6094,24.4688 128.3281,24.3125 128,24.3125 C127.7188,24.3125 127.4375,24.4531 127.25,24.6719 C127.1094,24.8594 127.0781,25.0156 127.0781,25.4688 L127.0781,26.25 L122.8594,26.25 L122.8594,24.0625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="138" y="27.606">A::AA::Lights</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="110" x2="221" y1="39" y2="39"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="115" y="56.0059">Green</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="115" y="72.8059">Yellow</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="26" x="115" y="89.6058">Red</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="110" x2="221" y1="97.3998" y2="97.3998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="340.8047"/>
-      <ellipse cx="187.5" cy="345.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <g id="elem_C_0001430186633004282131">
+        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0001430186633004282131" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="102" x="256.5" y="32.2"/>
+        <ellipse cx="271.5" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M266.5,49.3563 C266.5,51.8563 268.6406,53.6688 271.5625,53.6688 C272.7969,53.6688 273.9688,53.3719 274.7188,52.8563 C275.3281,52.4344 275.6563,52.0125 275.6563,51.6063 C275.6563,51.1375 275.2344,50.7313 274.7344,50.7313 C274.5,50.7313 274.2813,50.8094 274.0781,51.0125 C273.6406,51.45 273.6406,51.45 273.4688,51.5438 C273.0156,51.7781 272.375,51.9188 271.6094,51.9188 C269.6094,51.9188 268.3281,50.9031 268.3281,49.325 L268.3281,48.2781 C268.3281,46.575 269.5469,45.3719 271.25,45.3719 C271.8281,45.3719 272.4063,45.5125 272.875,45.7625 C273.3438,46.0281 273.5156,46.2156 273.5781,46.575 C273.7031,47.2469 273.9531,47.4969 274.4844,47.4969 C274.7656,47.4969 275.0469,47.3563 275.2344,47.1375 C275.3594,46.9656 275.4063,46.7938 275.4063,46.3563 L275.4063,44.9969 C275.4063,44.575 275.3906,44.4344 275.2656,44.2625 C275.0938,44.0125 274.8125,43.8563 274.4844,43.8563 C274.1719,43.8563 273.9688,43.9656 273.75,44.2313 C272.5781,43.7313 272.1406,43.6219 271.1875,43.6219 C268.5156,43.6219 266.5,45.6375 266.5,48.2625 L266.5,49.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="70" x="285.5" y="52.806">A::AA::AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="257.5" x2="357.5" y1="64.2" y2="64.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="257.5" x2="357.5" y1="72.2" y2="72.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="196.5" y="349.0151">foo2() const : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <g id="elem_C_0000287819369330075965">
+        <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0000287819369330075965" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="76" x="428.5" y="32.2"/>
+        <ellipse cx="443.5" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M438.5,49.3563 C438.5,51.8563 440.6406,53.6688 443.5625,53.6688 C444.7969,53.6688 445.9688,53.3719 446.7188,52.8563 C447.3281,52.4344 447.6563,52.0125 447.6563,51.6063 C447.6563,51.1375 447.2344,50.7313 446.7344,50.7313 C446.5,50.7313 446.2813,50.8094 446.0781,51.0125 C445.6406,51.45 445.6406,51.45 445.4688,51.5438 C445.0156,51.7781 444.375,51.9188 443.6094,51.9188 C441.6094,51.9188 440.3281,50.9031 440.3281,49.325 L440.3281,48.2781 C440.3281,46.575 441.5469,45.3719 443.25,45.3719 C443.8281,45.3719 444.4063,45.5125 444.875,45.7625 C445.3438,46.0281 445.5156,46.2156 445.5781,46.575 C445.7031,47.2469 445.9531,47.4969 446.4844,47.4969 C446.7656,47.4969 447.0469,47.3563 447.2344,47.1375 C447.3594,46.9656 447.4063,46.7938 447.4063,46.3563 L447.4063,44.9969 C447.4063,44.575 447.3906,44.4344 447.2656,44.2625 C447.0938,44.0125 446.8125,43.8563 446.4844,43.8563 C446.1719,43.8563 445.9688,43.9656 445.75,44.2313 C444.5781,43.7313 444.1406,43.6219 443.1875,43.6219 C440.5156,43.6219 438.5,45.6375 438.5,48.2625 L438.5,49.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="457.5" y="52.806">C::B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="492.5" y="29.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="493.5" y="43.4001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="429.5" x2="503.5" y1="64.2" y2="64.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="429.5" x2="503.5" y1="72.2" y2="72.2"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="355.6094" y2="355.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
-      <ellipse cx="224" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M226.9688,189.6406 Q226.3906,189.9375 225.75,190.0781 Q225.1094,190.2344 224.4063,190.2344 Q221.9063,190.2344 220.5781,188.5938 Q219.2656,186.9375 219.2656,183.8125 Q219.2656,180.6875 220.5781,179.0313 Q221.9063,177.375 224.4063,177.375 Q225.1094,177.375 225.75,177.5313 Q226.4063,177.6875 226.9688,177.9844 L226.9688,180.7031 Q226.3438,180.125 225.75,179.8594 Q225.1563,179.5781 224.5313,179.5781 Q223.1875,179.5781 222.5,180.6563 Q221.8125,181.7188 221.8125,183.8125 Q221.8125,185.9063 222.5,186.9844 Q223.1875,188.0469 224.5313,188.0469 Q225.1563,188.0469 225.75,187.7813 Q226.3438,187.5 226.9688,186.9219 L226.9688,189.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="238" y="188.1543">A::AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="200" y2="200"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="208" y2="208"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0002278328177727440136">
+        <rect codeLine="36" fill="#F1F1F1" height="81.5999" id="C_0002278328177727440136" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="500" y="309"/>
+        <ellipse cx="540.2" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M535.2,326.1563 C535.2,328.6563 537.3406,330.4688 540.2625,330.4688 C541.4969,330.4688 542.6688,330.1719 543.4188,329.6563 C544.0281,329.2344 544.3563,328.8125 544.3563,328.4063 C544.3563,327.9375 543.9344,327.5313 543.4344,327.5313 C543.2,327.5313 542.9813,327.6094 542.7781,327.8125 C542.3406,328.25 542.3406,328.25 542.1688,328.3438 C541.7156,328.5781 541.075,328.7188 540.3094,328.7188 C538.3094,328.7188 537.0281,327.7031 537.0281,326.125 L537.0281,325.0781 C537.0281,323.375 538.2469,322.1719 539.95,322.1719 C540.5281,322.1719 541.1063,322.3125 541.575,322.5625 C542.0438,322.8281 542.2156,323.0156 542.2781,323.375 C542.4031,324.0469 542.6531,324.2969 543.1844,324.2969 C543.4656,324.2969 543.7469,324.1563 543.9344,323.9375 C544.0594,323.7656 544.1063,323.5938 544.1063,323.1563 L544.1063,321.7969 C544.1063,321.375 544.0906,321.2344 543.9656,321.0625 C543.7938,320.8125 543.5125,320.6563 543.1844,320.6563 C542.8719,320.6563 542.6688,320.7656 542.45,321.0313 C541.2781,320.5313 540.8406,320.4219 539.8875,320.4219 C537.2156,320.4219 535.2,322.4375 535.2,325.0625 L535.2,326.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="559.8" y="329.606">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="603" y="306"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="604" y="320.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="501" x2="608" y1="341" y2="341"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="501" x2="608" y1="349" y2="349"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="506" y="357.9"/>
+          <ellipse cx="511" cy="362.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="520" y="366.0059">b_int : B&lt;int&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="506" y="374.6999"/>
+          <ellipse cx="511" cy="379.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="520" y="382.8059">t : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
-      <ellipse cx="120.5" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M124.6094,30 L116.8906,30 L116.8906,17.6094 L124.6094,17.6094 L124.6094,19.7656 L119.3438,19.7656 L119.3438,22.4375 L124.1094,22.4375 L124.1094,24.5938 L119.3438,24.5938 L119.3438,27.8438 L124.6094,27.8438 L124.6094,30 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="77" x="134.5" y="28.1543">A::AA::Lights</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="40" y2="40"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="111.5" y="54.2104">Green</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="111.5" y="67.0151">Yellow</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="111.5" y="79.8198">Red</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="86.4141" y2="86.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <g id="elem_C_0000623940132897927654">
+        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0000623940132897927654" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="593.5" y="183.2"/>
+        <ellipse cx="608.5" cy="199.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M603.5,200.3563 C603.5,202.8563 605.6406,204.6688 608.5625,204.6688 C609.7969,204.6688 610.9688,204.3719 611.7188,203.8563 C612.3281,203.4344 612.6563,203.0125 612.6563,202.6063 C612.6563,202.1375 612.2344,201.7313 611.7344,201.7313 C611.5,201.7313 611.2813,201.8094 611.0781,202.0125 C610.6406,202.45 610.6406,202.45 610.4688,202.5438 C610.0156,202.7781 609.375,202.9188 608.6094,202.9188 C606.6094,202.9188 605.3281,201.9031 605.3281,200.325 L605.3281,199.2781 C605.3281,197.575 606.5469,196.3719 608.25,196.3719 C608.8281,196.3719 609.4063,196.5125 609.875,196.7625 C610.3438,197.0281 610.5156,197.2156 610.5781,197.575 C610.7031,198.2469 610.9531,198.4969 611.4844,198.4969 C611.7656,198.4969 612.0469,198.3563 612.2344,198.1375 C612.3594,197.9656 612.4063,197.7938 612.4063,197.3563 L612.4063,195.9969 C612.4063,195.575 612.3906,195.4344 612.2656,195.2625 C612.0938,195.0125 611.8125,194.8563 611.4844,194.8563 C611.1719,194.8563 610.9688,194.9656 610.75,195.2313 C609.5781,194.7313 609.1406,194.6219 608.1875,194.6219 C605.5156,194.6219 603.5,196.6375 603.5,199.2625 L603.5,200.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="622.5" y="203.806">C::AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="594.5" x2="660.5" y1="215.2" y2="215.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="594.5" x2="660.5" y1="223.2" y2="223.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
-      <ellipse cx="265" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M267.9688,48.6406 Q267.3906,48.9375 266.75,49.0781 Q266.1094,49.2344 265.4063,49.2344 Q262.9063,49.2344 261.5781,47.5938 Q260.2656,45.9375 260.2656,42.8125 Q260.2656,39.6875 261.5781,38.0313 Q262.9063,36.375 265.4063,36.375 Q266.1094,36.375 266.75,36.5313 Q267.4063,36.6875 267.9688,36.9844 L267.9688,39.7031 Q267.3438,39.125 266.75,38.8594 Q266.1563,38.5781 265.5313,38.5781 Q264.1875,38.5781 263.5,39.6563 Q262.8125,40.7188 262.8125,42.8125 Q262.8125,44.9063 263.5,45.9844 Q264.1875,47.0469 265.5313,47.0469 Q266.1563,47.0469 266.75,46.7813 Q267.3438,46.5 267.9688,45.9219 L267.9688,48.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="279" y="47.1543">A::AA::AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="59" y2="59"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="67" y2="67"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <g id="elem_C_0001597801087286500866">
+        <rect codeLine="46" fill="#F1F1F1" height="48" id="C_0001597801087286500866" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="553" y="32.2"/>
+        <ellipse cx="568" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M563,49.3563 C563,51.8563 565.1406,53.6688 568.0625,53.6688 C569.2969,53.6688 570.4688,53.3719 571.2188,52.8563 C571.8281,52.4344 572.1563,52.0125 572.1563,51.6063 C572.1563,51.1375 571.7344,50.7313 571.2344,50.7313 C571,50.7313 570.7813,50.8094 570.5781,51.0125 C570.1406,51.45 570.1406,51.45 569.9688,51.5438 C569.5156,51.7781 568.875,51.9188 568.1094,51.9188 C566.1094,51.9188 564.8281,50.9031 564.8281,49.325 L564.8281,48.2781 C564.8281,46.575 566.0469,45.3719 567.75,45.3719 C568.3281,45.3719 568.9063,45.5125 569.375,45.7625 C569.8438,46.0281 570.0156,46.2156 570.0781,46.575 C570.2031,47.2469 570.4531,47.4969 570.9844,47.4969 C571.2656,47.4969 571.5469,47.3563 571.7344,47.1375 C571.8594,46.9656 571.9063,46.7938 571.9063,46.3563 L571.9063,44.9969 C571.9063,44.575 571.8906,44.4344 571.7656,44.2625 C571.5938,44.0125 571.3125,43.8563 570.9844,43.8563 C570.6719,43.8563 570.4688,43.9656 570.25,44.2313 C569.0781,43.7313 568.6406,43.6219 567.6875,43.6219 C565.0156,43.6219 563,45.6375 563,48.2625 L563,49.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="582" y="52.806">C::AA::AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="554" x2="655" y1="64.2" y2="64.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="554" x2="655" y1="72.2" y2="72.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
-      <ellipse cx="433" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M435.9688,48.6406 Q435.3906,48.9375 434.75,49.0781 Q434.1094,49.2344 433.4063,49.2344 Q430.9063,49.2344 429.5781,47.5938 Q428.2656,45.9375 428.2656,42.8125 Q428.2656,39.6875 429.5781,38.0313 Q430.9063,36.375 433.4063,36.375 Q434.1094,36.375 434.75,36.5313 Q435.4063,36.6875 435.9688,36.9844 L435.9688,39.7031 Q435.3438,39.125 434.75,38.8594 Q434.1563,38.5781 433.5313,38.5781 Q432.1875,38.5781 431.5,39.6563 Q430.8125,40.7188 430.8125,42.8125 Q430.8125,44.9063 431.5,45.9844 Q432.1875,47.0469 433.5313,47.0469 Q434.1563,47.0469 434.75,46.7813 Q435.3438,46.5 435.9688,45.9219 L435.9688,48.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="447" y="47.1543">C::B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="479" y="24"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="480" y="36.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="59" y2="59"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="67" y2="67"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <g id="elem_C_0000081819202639599734">
+        <rect codeLine="50" fill="#F1F1F1" height="81.5999" id="C_0000081819202639599734" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="106" x="691.5" y="15.4"/>
+        <ellipse cx="706.5" cy="31.4" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M705.3594,32.4625 L706.6719,32.4625 L706.6719,32.5094 C706.6719,32.9156 706.6875,33.0719 706.7969,33.2281 C706.9688,33.4781 707.2656,33.65 707.5781,33.65 C707.8594,33.65 708.1563,33.5094 708.3281,33.2906 C708.4531,33.1031 708.5,32.9625 708.5,32.5094 L708.5,30.6656 C708.5,30.3375 708.4844,30.2281 708.4219,30.0563 C708.3125,29.7594 707.9531,29.5094 707.5781,29.5094 C707.2813,29.5094 707.0156,29.65 706.8438,29.8688 C706.7031,30.0563 706.6719,30.2281 706.6719,30.6656 L706.6719,30.7281 L705.3594,30.7281 L705.3594,28.5563 L709.2031,28.5563 L709.2031,29.3063 C709.2031,29.6969 709.2344,29.8844 709.3438,30.0406 C709.5156,30.2906 709.8125,30.4625 710.125,30.4625 C710.4219,30.4625 710.6875,30.3375 710.875,30.1031 C711.0156,29.9156 711.0469,29.775 711.0469,29.3063 L711.0469,26.8063 L703.3438,26.8063 C702.8906,26.8063 702.7656,26.8219 702.5938,26.9313 C702.3281,27.1031 702.1563,27.3688 702.1563,27.6813 C702.1563,27.9625 702.2813,28.2281 702.5313,28.4 C702.7188,28.525 702.9063,28.5563 703.3438,28.5563 L703.5313,28.5563 L703.5313,34.65 L703.3438,34.65 C702.9219,34.65 702.7656,34.6813 702.5938,34.775 C702.3281,34.9313 702.1563,35.2125 702.1563,35.5094 C702.1563,36.0875 702.5625,36.4 703.3438,36.4 L711.4219,36.4 L711.4219,33.8688 C711.4219,33.4625 711.3906,33.2906 711.2813,33.1344 C711.1094,32.8688 710.8281,32.7125 710.5,32.7125 C710.2188,32.7125 709.9375,32.8531 709.75,33.0719 C709.6094,33.2594 709.5781,33.4156 709.5781,33.8688 L709.5781,34.65 L705.3594,34.65 L705.3594,32.4625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="720.5" y="36.006">C::AA::CCC</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="692.5" x2="796.5" y1="47.4" y2="47.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="697.5" y="64.4059">CCC_1</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="697.5" y="81.2059">CCC_2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="692.5" x2="796.5" y1="88.9999" y2="88.9999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
-      <ellipse cx="529.8" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M532.7688,311.6406 Q532.1906,311.9375 531.55,312.0781 Q530.9094,312.2344 530.2063,312.2344 Q527.7063,312.2344 526.3781,310.5938 Q525.0656,308.9375 525.0656,305.8125 Q525.0656,302.6875 526.3781,301.0313 Q527.7063,299.375 530.2063,299.375 Q530.9094,299.375 531.55,299.5313 Q532.2063,299.6875 532.7688,299.9844 L532.7688,302.7031 Q532.1438,302.125 531.55,301.8594 Q530.9563,301.5781 530.3313,301.5781 Q528.9875,301.5781 528.3,302.6563 Q527.6125,303.7188 527.6125,305.8125 Q527.6125,307.9063 528.3,308.9844 Q528.9875,310.0469 530.3313,310.0469 Q530.9563,310.0469 531.55,309.7813 Q532.1438,309.5 532.7688,308.9219 L532.7688,311.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="549.2" y="310.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="589.5" y="287"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="590.5" y="299.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="330" y2="330"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <g id="elem_C_0001381298335849583950">
+        <rect codeLine="55" fill="#F1F1F1" height="64.7999" id="C_0001381298335849583950" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="376" y="174.8"/>
+        <ellipse cx="391" cy="190.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M386,191.9563 C386,194.4563 388.1406,196.2688 391.0625,196.2688 C392.2969,196.2688 393.4688,195.9719 394.2188,195.4563 C394.8281,195.0344 395.1563,194.6125 395.1563,194.2063 C395.1563,193.7375 394.7344,193.3313 394.2344,193.3313 C394,193.3313 393.7813,193.4094 393.5781,193.6125 C393.1406,194.05 393.1406,194.05 392.9688,194.1438 C392.5156,194.3781 391.875,194.5188 391.1094,194.5188 C389.1094,194.5188 387.8281,193.5031 387.8281,191.925 L387.8281,190.8781 C387.8281,189.175 389.0469,187.9719 390.75,187.9719 C391.3281,187.9719 391.9063,188.1125 392.375,188.3625 C392.8438,188.6281 393.0156,188.8156 393.0781,189.175 C393.2031,189.8469 393.4531,190.0969 393.9844,190.0969 C394.2656,190.0969 394.5469,189.9563 394.7344,189.7375 C394.8594,189.5656 394.9063,189.3938 394.9063,188.9563 L394.9063,187.5969 C394.9063,187.175 394.8906,187.0344 394.7656,186.8625 C394.5938,186.6125 394.3125,186.4563 393.9844,186.4563 C393.6719,186.4563 393.4688,186.5656 393.25,186.8313 C392.0781,186.3313 391.6406,186.2219 390.6875,186.2219 C388.0156,186.2219 386,188.2375 386,190.8625 L386,191.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="405" y="195.406">C::B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="10" x="440" y="171.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="8" x="441" y="186.0001">V</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="377" x2="446" y1="206.8" y2="206.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="377" x2="446" y1="214.8" y2="214.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382" y="223.7"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="384" y="225.7"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="396" y="231.8059">b : V</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="336"/>
-      <ellipse cx="501.5" cy="341" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <g id="elem_C_0002037378936100378699">
+        <rect codeLine="60" fill="#F1F1F1" height="81.5999" id="C_0002037378936100378699" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="70" x="696.5" y="166.4"/>
+        <ellipse cx="711.5" cy="182.4" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M710.3594,183.4625 L711.6719,183.4625 L711.6719,183.5094 C711.6719,183.9156 711.6875,184.0719 711.7969,184.2281 C711.9688,184.4781 712.2656,184.65 712.5781,184.65 C712.8594,184.65 713.1563,184.5094 713.3281,184.2906 C713.4531,184.1031 713.5,183.9625 713.5,183.5094 L713.5,181.6656 C713.5,181.3375 713.4844,181.2281 713.4219,181.0563 C713.3125,180.7594 712.9531,180.5094 712.5781,180.5094 C712.2813,180.5094 712.0156,180.65 711.8438,180.8688 C711.7031,181.0563 711.6719,181.2281 711.6719,181.6656 L711.6719,181.7281 L710.3594,181.7281 L710.3594,179.5563 L714.2031,179.5563 L714.2031,180.3063 C714.2031,180.6969 714.2344,180.8844 714.3438,181.0406 C714.5156,181.2906 714.8125,181.4625 715.125,181.4625 C715.4219,181.4625 715.6875,181.3375 715.875,181.1031 C716.0156,180.9156 716.0469,180.775 716.0469,180.3063 L716.0469,177.8063 L708.3438,177.8063 C707.8906,177.8063 707.7656,177.8219 707.5938,177.9313 C707.3281,178.1031 707.1563,178.3688 707.1563,178.6813 C707.1563,178.9625 707.2813,179.2281 707.5313,179.4 C707.7188,179.525 707.9063,179.5563 708.3438,179.5563 L708.5313,179.5563 L708.5313,185.65 L708.3438,185.65 C707.9219,185.65 707.7656,185.6813 707.5938,185.775 C707.3281,185.9313 707.1563,186.2125 707.1563,186.5094 C707.1563,187.0875 707.5625,187.4 708.3438,187.4 L716.4219,187.4 L716.4219,184.8688 C716.4219,184.4625 716.3906,184.2906 716.2813,184.1344 C716.1094,183.8688 715.8281,183.7125 715.5,183.7125 C715.2188,183.7125 714.9375,183.8531 714.75,184.0719 C714.6094,184.2594 714.5781,184.4156 714.5781,184.8688 L714.5781,185.65 L710.3594,185.65 L710.3594,183.4625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="725.5" y="187.006">C::CC</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="697.5" x2="765.5" y1="198.4" y2="198.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="702.5" y="215.4059">CC_1</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="702.5" y="232.2059">CC_2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="697.5" x2="765.5" y1="239.9999" y2="239.9999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="510.5" y="344.2104">b_int : B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0000612133170877135796">
+        <rect codeLine="65" fill="#F1F1F1" height="48" id="C_0000612133170877135796" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="84" x="918.5" y="183.2"/>
+        <ellipse cx="933.5" cy="199.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M928.5,200.3563 C928.5,202.8563 930.6406,204.6688 933.5625,204.6688 C934.7969,204.6688 935.9688,204.3719 936.7188,203.8563 C937.3281,203.4344 937.6563,203.0125 937.6563,202.6063 C937.6563,202.1375 937.2344,201.7313 936.7344,201.7313 C936.5,201.7313 936.2813,201.8094 936.0781,202.0125 C935.6406,202.45 935.6406,202.45 935.4688,202.5438 C935.0156,202.7781 934.375,202.9188 933.6094,202.9188 C931.6094,202.9188 930.3281,201.9031 930.3281,200.325 L930.3281,199.2781 C930.3281,197.575 931.5469,196.3719 933.25,196.3719 C933.8281,196.3719 934.4063,196.5125 934.875,196.7625 C935.3438,197.0281 935.5156,197.2156 935.5781,197.575 C935.7031,198.2469 935.9531,198.4969 936.4844,198.4969 C936.7656,198.4969 937.0469,198.3563 937.2344,198.1375 C937.3594,197.9656 937.4063,197.7938 937.4063,197.3563 L937.4063,195.9969 C937.4063,195.575 937.3906,195.4344 937.2656,195.2625 C937.0938,195.0125 936.8125,194.8563 936.4844,194.8563 C936.1719,194.8563 935.9688,194.9656 935.75,195.2313 C934.5781,194.7313 934.1406,194.6219 933.1875,194.6219 C930.5156,194.6219 928.5,196.6375 928.5,199.2625 L928.5,200.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="947.5" y="203.806">detail::D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="919.5" x2="1001.5" y1="215.2" y2="215.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="919.5" x2="1001.5" y1="223.2" y2="223.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="348.8047"/>
-      <ellipse cx="501.5" cy="353.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <g id="elem_C_0001572080057917630922">
+        <rect codeLine="69" fill="#F1F1F1" height="98.3998" id="C_0001572080057917630922" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="832.5" y="7"/>
+        <ellipse cx="847.5" cy="23" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M846.3594,24.0625 L847.6719,24.0625 L847.6719,24.1094 C847.6719,24.5156 847.6875,24.6719 847.7969,24.8281 C847.9688,25.0781 848.2656,25.25 848.5781,25.25 C848.8594,25.25 849.1563,25.1094 849.3281,24.8906 C849.4531,24.7031 849.5,24.5625 849.5,24.1094 L849.5,22.2656 C849.5,21.9375 849.4844,21.8281 849.4219,21.6563 C849.3125,21.3594 848.9531,21.1094 848.5781,21.1094 C848.2813,21.1094 848.0156,21.25 847.8438,21.4688 C847.7031,21.6563 847.6719,21.8281 847.6719,22.2656 L847.6719,22.3281 L846.3594,22.3281 L846.3594,20.1563 L850.2031,20.1563 L850.2031,20.9063 C850.2031,21.2969 850.2344,21.4844 850.3438,21.6406 C850.5156,21.8906 850.8125,22.0625 851.125,22.0625 C851.4219,22.0625 851.6875,21.9375 851.875,21.7031 C852.0156,21.5156 852.0469,21.375 852.0469,20.9063 L852.0469,18.4063 L844.3438,18.4063 C843.8906,18.4063 843.7656,18.4219 843.5938,18.5313 C843.3281,18.7031 843.1563,18.9688 843.1563,19.2813 C843.1563,19.5625 843.2813,19.8281 843.5313,20 C843.7188,20.125 843.9063,20.1563 844.3438,20.1563 L844.5313,20.1563 L844.5313,26.25 L844.3438,26.25 C843.9219,26.25 843.7656,26.2813 843.5938,26.375 C843.3281,26.5313 843.1563,26.8125 843.1563,27.1094 C843.1563,27.6875 843.5625,28 844.3438,28 L852.4219,28 L852.4219,25.4688 C852.4219,25.0625 852.3906,24.8906 852.2813,24.7344 C852.1094,24.4688 851.8281,24.3125 851.5,24.3125 C851.2188,24.3125 850.9375,24.4531 850.75,24.6719 C850.6094,24.8594 850.5781,25.0156 850.5781,25.4688 L850.5781,26.25 L846.3594,26.25 L846.3594,24.0625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="861.5" y="27.606">detail::D::AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="833.5" x2="941.5" y1="39" y2="39"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="838.5" y="56.0059">AA_1</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="838.5" y="72.8059">AA_2</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="838.5" y="89.6058">AA_3</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="833.5" x2="941.5" y1="97.3998" y2="97.3998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="510.5" y="357.0151">t : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <g id="elem_C_0000600916232677555492">
+        <rect codeLine="75" fill="#F1F1F1" height="48" id="C_0000600916232677555492" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="977.5" y="32.2"/>
+        <ellipse cx="992.5" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M987.5,49.3563 C987.5,51.8563 989.6406,53.6688 992.5625,53.6688 C993.7969,53.6688 994.9688,53.3719 995.7188,52.8563 C996.3281,52.4344 996.6563,52.0125 996.6563,51.6063 C996.6563,51.1375 996.2344,50.7313 995.7344,50.7313 C995.5,50.7313 995.2813,50.8094 995.0781,51.0125 C994.6406,51.45 994.6406,51.45 994.4688,51.5438 C994.0156,51.7781 993.375,51.9188 992.6094,51.9188 C990.6094,51.9188 989.3281,50.9031 989.3281,49.325 L989.3281,48.2781 C989.3281,46.575 990.5469,45.3719 992.25,45.3719 C992.8281,45.3719 993.4063,45.5125 993.875,45.7625 C994.3438,46.0281 994.5156,46.2156 994.5781,46.575 C994.7031,47.2469 994.9531,47.4969 995.4844,47.4969 C995.7656,47.4969 996.0469,47.3563 996.2344,47.1375 C996.3594,46.9656 996.4063,46.7938 996.4063,46.3563 L996.4063,44.9969 C996.4063,44.575 996.3906,44.4344 996.2656,44.2625 C996.0938,44.0125 995.8125,43.8563 995.4844,43.8563 C995.1719,43.8563 994.9688,43.9656 994.75,44.2313 C993.5781,43.7313 993.1406,43.6219 992.1875,43.6219 C989.5156,43.6219 987.5,45.6375 987.5,48.2625 L987.5,49.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="1006.5" y="52.806">detail::D::DD</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="978.5" x2="1088.5" y1="64.2" y2="64.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="978.5" x2="1088.5" y1="72.2" y2="72.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
-      <ellipse cx="599" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M601.9688,189.6406 Q601.3906,189.9375 600.75,190.0781 Q600.1094,190.2344 599.4063,190.2344 Q596.9063,190.2344 595.5781,188.5938 Q594.2656,186.9375 594.2656,183.8125 Q594.2656,180.6875 595.5781,179.0313 Q596.9063,177.375 599.4063,177.375 Q600.1094,177.375 600.75,177.5313 Q601.4063,177.6875 601.9688,177.9844 L601.9688,180.7031 Q601.3438,180.125 600.75,179.8594 Q600.1563,179.5781 599.5313,179.5781 Q598.1875,179.5781 597.5,180.6563 Q596.8125,181.7188 596.8125,183.8125 Q596.8125,185.9063 597.5,186.9844 Q598.1875,188.0469 599.5313,188.0469 Q600.1563,188.0469 600.75,187.7813 Q601.3438,187.5 601.9688,186.9219 L601.9688,189.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="613" y="188.1543">C::AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="200" y2="200"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="208" y2="208"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
-      <ellipse cx="560" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M562.9688,48.6406 Q562.3906,48.9375 561.75,49.0781 Q561.1094,49.2344 560.4063,49.2344 Q557.9063,49.2344 556.5781,47.5938 Q555.2656,45.9375 555.2656,42.8125 Q555.2656,39.6875 556.5781,38.0313 Q557.9063,36.375 560.4063,36.375 Q561.1094,36.375 561.75,36.5313 Q562.4063,36.6875 562.9688,36.9844 L562.9688,39.7031 Q562.3438,39.125 561.75,38.8594 Q561.1563,38.5781 560.5313,38.5781 Q559.1875,38.5781 558.5,39.6563 Q557.8125,40.7188 557.8125,42.8125 Q557.8125,44.9063 558.5,45.9844 Q559.1875,47.0469 560.5313,47.0469 Q561.1563,47.0469 561.75,46.7813 Q562.3438,46.5 562.9688,45.9219 L562.9688,48.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="574" y="47.1543">C::AA::AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="59" y2="59"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="67" y2="67"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
-      <ellipse cx="691" cy="30" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M695.1094,36 L687.3906,36 L687.3906,23.6094 L695.1094,23.6094 L695.1094,25.7656 L689.8438,25.7656 L689.8438,28.4375 L694.6094,28.4375 L694.6094,30.5938 L689.8438,30.5938 L689.8438,33.8438 L695.1094,33.8438 L695.1094,36 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="705" y="34.1543">C::AA::CCC</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="46" y2="46"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="60.2104">CCC_1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="73.0151">CCC_2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="79.6094" y2="79.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
-      <ellipse cx="381" cy="177.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M383.9688,183.1406 Q383.3906,183.4375 382.75,183.5781 Q382.1094,183.7344 381.4063,183.7344 Q378.9063,183.7344 377.5781,182.0938 Q376.2656,180.4375 376.2656,177.3125 Q376.2656,174.1875 377.5781,172.5313 Q378.9063,170.875 381.4063,170.875 Q382.1094,170.875 382.75,171.0313 Q383.4063,171.1875 383.9688,171.4844 L383.9688,174.2031 Q383.3438,173.625 382.75,173.3594 Q382.1563,173.0781 381.5313,173.0781 Q380.1875,173.0781 379.5,174.1563 Q378.8125,175.2188 378.8125,177.3125 Q378.8125,179.4063 379.5,180.4844 Q380.1875,181.5469 381.5313,181.5469 Q382.1563,181.5469 382.75,181.2813 Q383.3438,181 383.9688,180.4219 L383.9688,183.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="395" y="181.6543">C::B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="427" y="158.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="428" y="170.6387">V</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="201.5" y2="201.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372" y="207.5"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="374" y="209.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="386" y="215.7104">b : V</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
-      <ellipse cx="698" cy="171" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M702.1094,177 L694.3906,177 L694.3906,164.6094 L702.1094,164.6094 L702.1094,166.7656 L696.8438,166.7656 L696.8438,169.4375 L701.6094,169.4375 L701.6094,171.5938 L696.8438,171.5938 L696.8438,174.8438 L702.1094,174.8438 L702.1094,177 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="712" y="175.1543">C::CC</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="187" y2="187"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="201.2104">CC_1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="214.0151">CC_2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="220.6094" y2="220.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
-      <ellipse cx="906" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M908.9688,189.6406 Q908.3906,189.9375 907.75,190.0781 Q907.1094,190.2344 906.4063,190.2344 Q903.9063,190.2344 902.5781,188.5938 Q901.2656,186.9375 901.2656,183.8125 Q901.2656,180.6875 902.5781,179.0313 Q903.9063,177.375 906.4063,177.375 Q907.1094,177.375 907.75,177.5313 Q908.4063,177.6875 908.9688,177.9844 L908.9688,180.7031 Q908.3438,180.125 907.75,179.8594 Q907.1563,179.5781 906.5313,179.5781 Q905.1875,179.5781 904.5,180.6563 Q903.8125,181.7188 903.8125,183.8125 Q903.8125,185.9063 904.5,186.9844 Q905.1875,188.0469 906.5313,188.0469 Q907.1563,188.0469 907.75,187.7813 Q908.3438,187.5 908.9688,186.9219 L908.9688,189.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="920" y="188.1543">detail::D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="200" y2="200"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="208" y2="208"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
-      <ellipse cx="822" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M826.1094,30 L818.3906,30 L818.3906,17.6094 L826.1094,17.6094 L826.1094,19.7656 L820.8438,19.7656 L820.8438,22.4375 L825.6094,22.4375 L825.6094,24.5938 L820.8438,24.5938 L820.8438,27.8438 L826.1094,27.8438 L826.1094,30 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="836" y="28.1543">detail::D::AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="40" y2="40"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="54.2104">AA_1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="67.0151">AA_2</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="79.8198">AA_3</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="86.4141" y2="86.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m82esu6buy5y)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
-      <ellipse cx="965" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M967.9688,48.6406 Q967.3906,48.9375 966.75,49.0781 Q966.1094,49.2344 965.4063,49.2344 Q962.9063,49.2344 961.5781,47.5938 Q960.2656,45.9375 960.2656,42.8125 Q960.2656,39.6875 961.5781,38.0313 Q962.9063,36.375 965.4063,36.375 Q966.1094,36.375 966.75,36.5313 Q967.4063,36.6875 967.9688,36.9844 L967.9688,39.7031 Q967.3438,39.125 966.75,38.8594 Q966.1563,38.5781 965.5313,38.5781 Q964.1875,38.5781 963.5,39.6563 Q962.8125,40.7188 962.8125,42.8125 Q962.8125,44.9063 963.5,45.9844 Q964.1875,47.0469 965.5313,47.0469 Q966.1563,47.0469 966.75,46.7813 Q967.3438,46.5 967.9688,45.9219 L967.9688,48.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="78" x="979" y="47.1543">detail::D::DD</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951" x2="1059" y1="59" y2="59"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951" x2="1059" y1="67" y2="67"/>
-    </a>
-    <path d="M38,94.08 C38,112.65 38,134.33 38,152.47 " fill="none" id="C_0001630205507215126623-&gt;C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="38" cy="159.64" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="38" y1="151.64" y2="167.64"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="30" y1="159.64" y2="159.64"/>
-    <path d="M241,216.17 C241,232.28 241,254.4 241,274.57 " fill="none" id="C_0001742499843727859552-&gt;C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="241" cy="281.83" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="241" y1="273.83" y2="289.83"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="249" x2="233" y1="281.83" y2="281.83"/>
-    <path d="M184.52,94.08 C195.78,113.41 209.01,136.1 219.83,154.66 " fill="none" id="C_0000590936874508841244-&gt;C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="223.3652" cy="160.7262" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="219.3404" x2="227.39" y1="153.8124" y2="167.64"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="230.279" x2="216.4514" y1="156.7014" y2="164.751"/>
-    <path d="M288.46,75.27 C279.7,96.61 266.58,128.62 256.35,153.56 " fill="none" id="C_0001430186633004282131-&gt;C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="253.6041" cy="160.2577" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="256.6382" x2="250.57" y1="152.8554" y2="167.66"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="261.0064" x2="246.2018" y1="163.2918" y2="157.2236"/>
-    <path d="M446.63,75.27 C439.26,93.56 428.74,119.67 419.56,142.46 " fill="none" id="C_0000287819369330075965-&gt;C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="425.91,145.42,411.94,161.36,412.92,140.19,425.91,145.42" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M527.6,277.5 C508.75,218.12 477.58,119.97 463.42,75.36 " fill="none" id="C_0002278328177727440136&lt;-C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="531.54,289.91,533.5388,282.9814,527.9119,278.4716,525.9132,285.4002,531.54,289.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="519" cy="192.5664" 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="526" y="196.5669">b_int</text>
-    <path d="M603.28,216.17 C594.14,232.83 581.46,255.93 570.09,276.65 " fill="none" id="C_0000623940132897927654-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="566.6995" cy="282.8171" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="570.549" x2="562.85" y1="275.8041" y2="289.83"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="573.7124" x2="559.6866" y1="286.6666" y2="278.9676"/>
-    <path d="M596.85,75.27 C600.35,96.41 605.58,128.02 609.69,152.86 " fill="none" id="C_0001597801087286500866-&gt;C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="610.8297" cy="159.768" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="609.5195" x2="612.14" y1="151.8761" y2="167.66"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="618.7217" x2="602.9378" y1="158.4578" y2="161.0783"/>
-    <path d="M695.91,88.16 C679.76,108.94 659.56,134.94 643.51,155.59 " fill="none" id="C_0000081819202639599734-&gt;C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="639.0389" cy="161.3531" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="643.9478" x2="634.13" y1="155.0363" y2="167.67"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="645.3558" x2="632.722" y1="166.262" y2="156.4442"/>
-    <path d="M431.74,222.52 C449.79,239.31 472.8,260.71 493.2,279.68 " fill="none" id="C_0001381298335849583950-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="498.3612" cy="284.4826" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="492.5024" x2="504.22" y1="279.0352" y2="289.93"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="503.8086" x2="492.9138" y1="278.6238" y2="290.3414"/>
-    <path d="M682.65,218.02 C659.95,235.57 628.94,259.54 601.92,280.44 " fill="none" id="C_0002037378936100378699-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="596.1479" cy="284.9054" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="602.4759" x2="589.82" y1="280.0108" y2="289.8"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="601.0425" x2="591.2533" y1="291.2333" y2="278.5775"/>
-    <path d="M882.8,94.08 C892.71,113.22 904.33,135.65 913.9,154.12 " fill="none" id="C_0001572080057917630922-&gt;C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="917.219" cy="160.5372" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="913.538" x2="920.9" y1="153.4343" y2="167.64"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="924.3219" x2="910.1162" y1="156.8562" y2="164.2181"/>
-    <path d="M992.95,75.27 C981.79,96.81 965,129.22 952.03,154.26 " fill="none" id="C_0000600916232677555492-&gt;C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="948.771" cy="160.5572" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="952.452" x2="945.09" y1="153.4543" y2="167.66"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="955.8738" x2="941.6681" y1="164.2381" y2="156.8762"/>
+    <g id="link_C_0001630205507215126623_C_0001232624428734051711">
+      <path codeLine="78" d="M40.5,105.58 C40.5,131.58 40.5,146.44 40.5,167.07 " fill="none" id="C_0001630205507215126623-to-C_0001232624428734051711" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="40.5" cy="175.07" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="40.5" x2="40.5" y1="167.07" y2="183.07"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="48.5" x2="32.5" y1="175.07" y2="175.07"/>
+    </g>
+    <g id="link_C_0001742499843727859552_C_0001552274940876611774">
+      <path codeLine="79" d="M248.5,231.42 C248.5,252.4 248.5,267.73 248.5,292.75 " fill="none" id="C_0001742499843727859552-to-C_0001552274940876611774" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="248.5" cy="300.75" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="248.5" x2="248.5" y1="292.75" y2="308.75"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="256.5" x2="240.5" y1="300.75" y2="300.75"/>
+    </g>
+    <g id="link_C_0000590936874508841244_C_0001742499843727859552">
+      <path codeLine="80" d="M192.45,105.58 C206.93,131.58 216.3348,148.4618 227.8248,169.0918 " fill="none" id="C_0000590936874508841244-to-C_0001742499843727859552" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="231.7174" cy="176.0809" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="227.8248" x2="235.61" y1="169.0918" y2="183.07"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="238.7065" x2="224.7283" y1="172.1883" y2="179.9735"/>
+    </g>
+    <g id="link_C_0001430186633004282131_C_0001742499843727859552">
+      <path codeLine="81" d="M298.28,80.48 C287.2,108.47 274.6026,140.2846 263.5426,168.2046 " fill="none" id="C_0001430186633004282131-to-C_0001742499843727859552" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="260.5963" cy="175.6423" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="263.5426" x2="257.65" y1="168.2046" y2="183.08"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="268.034" x2="253.1586" y1="178.5886" y2="172.696"/>
+    </g>
+    <g id="link_C_0000287819369330075965_C_0001381298335849583950">
+      <path codeLine="82" d="M457.91,80.48 C448.57,105.77 439.8321,129.4433 429.4321,157.6233 " fill="none" id="C_0000287819369330075965-to-C_0001381298335849583950" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="423.2,174.51,435.061,159.7007,423.8032,155.5459,423.2,174.51" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002278328177727440136_C_0000287819369330075965">
+      <path codeLine="83" d="M538.9129,297.1418 C520.2529,235.3118 488.54,130.24 473.55,80.57 " fill="none" id="C_0002278328177727440136-backto-C_0000287819369330075965" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="542.38,308.63,544.4759,301.7302,538.9129,297.1418,536.817,304.0416,542.38,308.63" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="530.5" cy="208" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="537.5" y="211.777">b_int</text>
+    </g>
+    <g id="link_C_0000623940132897927654_C_0002278328177727440136">
+      <path codeLine="84" d="M615.45,231.42 C604.55,252.4 595.6525,269.5298 582.6625,294.5498 " fill="none" id="C_0000623940132897927654-to-C_0002278328177727440136" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="578.9763" cy="301.6499" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="582.6625" x2="575.29" y1="294.5498" y2="308.75"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="586.0764" x2="571.8762" y1="305.3362" y2="297.9636"/>
+    </g>
+    <g id="link_C_0001597801087286500866_C_0000623940132897927654">
+      <path codeLine="85" d="M608.09,80.48 C612.41,108.47 617.179,139.3473 621.489,167.2673 " fill="none" id="C_0001597801087286500866-to-C_0000623940132897927654" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="622.7095" cy="175.1736" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="621.489" x2="623.93" y1="167.2673" y2="183.08"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="630.6159" x2="614.8031" y1="173.9531" y2="176.3941"/>
+    </g>
+    <g id="link_C_0000081819202639599734_C_0000623940132897927654">
+      <path codeLine="86" d="M713.15,97.13 C691.62,124.54 673.6822,147.3966 655.6822,170.3166 " fill="none" id="C_0000081819202639599734-to-C_0000623940132897927654" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="650.7411" cy="176.6083" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="655.6822" x2="645.8" y1="170.3166" y2="182.9"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="657.0328" x2="644.4494" y1="181.5494" y2="171.6672"/>
+    </g>
+    <g id="link_C_0001381298335849583950_C_0002278328177727440136">
+      <path codeLine="87" d="M443.59,239.75 C464.26,260.08 479.9117,275.4617 502.1217,297.3017 " fill="none" id="C_0001381298335849583950-to-C_0002278328177727440136" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="507.8258" cy="302.9109" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="502.1217" x2="513.53" y1="297.3017" y2="308.52"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="513.435" x2="502.2167" y1="297.2067" y2="308.615"/>
+    </g>
+    <g id="link_C_0002037378936100378699_C_0002278328177727440136">
+      <path codeLine="88" d="M696.11,236.31 C669.98,257.07 646.5782,275.6579 617.4482,298.7979 " fill="none" id="C_0002037378936100378699-to-C_0002278328177727440136" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="611.1841" cy="303.774" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="617.4482" x2="604.92" y1="298.7979" y2="308.75"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="616.1601" x2="606.2081" y1="310.0381" y2="297.5099"/>
+    </g>
+    <g id="link_C_0001572080057917630922_C_0000612133170877135796">
+      <path codeLine="89" d="M911.2,105.58 C923.94,131.58 932.019,148.0725 942.129,168.7025 " fill="none" id="C_0001572080057917630922-to-C_0000612133170877135796" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="945.6495" cy="175.8863" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="942.129" x2="949.17" y1="168.7025" y2="183.07"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="952.8333" x2="938.4658" y1="172.3658" y2="179.4067"/>
+    </g>
+    <g id="link_C_0000600916232677555492_C_0000612133170877135796">
+      <path codeLine="90" d="M1022.09,80.48 C1008.38,108.47 992.5358,140.79 978.8658,168.71 " fill="none" id="C_0000600916232677555492-to-C_0000612133170877135796" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="975.3479" cy="175.895" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="978.8658" x2="971.83" y1="168.71" y2="183.08"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="982.5329" x2="968.1629" y1="179.4129" y2="172.3771"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00004_class_mermaid.svg b/docs/test_cases/t00004_class_mermaid.svg
index 51589e80..eaa91c7b 100644
--- a/docs/test_cases/t00004_class_mermaid.svg
+++ b/docs/test_cases/t00004_class_mermaid.svg
@@ -1,68 +1,73 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1237.73828125 525" style="max-width: 1237.74px; background-color: white;" width="1237.73828125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1239.9609375 525" style="max-width: 1239.96px; background-color: white;" width="1239.9609375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M68.875,87L68.875,96.33333333333333C68.875,105.66666666666667,68.875,124.33333333333333,68.875,139.33333333333334C68.875,154.33333333333334,68.875,165.66666666666666,68.875,171.33333333333334L68.875,177"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M212.359375,109L212.359375,114.66666666666667C212.359375,120.33333333333333,212.359375,131.66666666666666,212.359375,150.33333333333334C212.359375,169,212.359375,195,212.359375,208L212.359375,221"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M191.38858173076923,278L182.9266826923077,289.5C174.46478365384618,301,157.54098557692308,324,149.07908653846155,339.6666666666667C140.6171875,355.3333333333333,140.6171875,363.6666666666667,140.6171875,367.8333333333333L140.6171875,372"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M239.23798076923077,278L250.08373397435898,289.5C260.9294871794872,301,282.6209935897436,324,293.46674679487177,347C304.3125,370,304.3125,393,304.3125,404.5L304.3125,416"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M437.0859375,278L437.0859375,289.5C437.0859375,301,437.0859375,324,440.977390491453,345.1666666666667C444.86884348290596,366.3333333333333,452.6517494658119,385.6666666666667,456.5432024572649,395.3333333333333L460.43465544871793,405"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M504.203125,98.1446181413742L493.0169270833333,105.62051511781182C481.8307291666667,113.09641209424946,459.4583333333333,128.04820604712472,448.2721354166667,148.52410302356236C437.0859375,169,437.0859375,195,437.0859375,208L437.0859375,221"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M622.84375,68.07524586983449L700.2057291666666,80.56270489152874C777.5677083333334,93.05016391322299,932.2916666666666,118.02508195661149,1009.6536458333334,143.51254097830574C1087.015625,169,1087.015625,195,1087.015625,208L1087.015625,221"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M1056.8515625,263.19348150303733L1026.0833333333333,277.1612345858644C995.3151041666666,291.12898766869154,933.7786458333334,319.0644938343458,903.0104166666666,344.53224691717287C872.2421875,370,872.2421875,393,872.2421875,404.5L872.2421875,416"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1110.9403245192307,278L1120.5941506410256,289.5C1130.2479767628204,301,1149.5556290064103,324,1159.209455128205,341.5C1168.86328125,359,1168.86328125,371,1168.86328125,377L1168.86328125,383"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M534.8743990384615,109L531.6596554487179,114.66666666666667C528.4449118589744,120.33333333333333,522.0154246794872,131.66666666666666,518.8006810897435,155.08333333333334C515.5859375,178.5,515.5859375,214,515.5859375,248C515.5859375,282,515.5859375,314.5,511.694484508547,340.4166666666667C507.80303151709404,366.3333333333333,500.0201255341881,385.6666666666667,496.1286725427351,395.3333333333333L492.23721955128207,405"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M592.1724759615385,109L595.3872195512821,114.66666666666667C598.6019631410256,120.33333333333333,605.0314503205128,131.66666666666666,608.2461939102565,144.83333333333334C611.4609375,158,611.4609375,173,611.4609375,180.5L611.4609375,188"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M838.6336446005918,87L829.3965267504932,96.33333333333333C820.1594089003944,105.66666666666667,801.6851732001973,124.33333333333333,792.4480553500986,139.33333333333334C783.2109375,154.33333333333334,783.2109375,165.66666666666666,783.2109375,171.33333333333334L783.2109375,177"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M895.0460428994082,87L904.2831607495068,96.33333333333333C913.5202785996056,105.66666666666667,931.9945142998027,124.33333333333333,941.2316321499014,146.66666666666666C950.46875,169,950.46875,195,950.46875,208L950.46875,221"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M68.875,100.5L68.875,107.58333333333333C68.875,114.66666666666667,68.875,128.83333333333334,68.875,141.58333333333334C68.875,154.33333333333334,68.875,165.66666666666666,68.875,171.33333333333334L68.875,177"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M216.8046875,122.5L216.8046875,125.91666666666667C216.8046875,129.33333333333334,216.8046875,136.16666666666666,216.8046875,152.58333333333334C216.8046875,169,216.8046875,195,216.8046875,208L216.8046875,221"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M187.02502436861477,288.75536793025486L179.66082759884566,298.4628066085457C172.29663082907652,308.1702452868366,157.56823728953825,327.5851226434183,150.20404051976914,341.45922798837574C142.83984375,355.3333333333333,142.83984375,363.6666666666667,142.83984375,367.8333333333333L142.83984375,372"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M252.17553801655745,287.9335217836957L261.23547438879785,297.7779348197464C270.2954107610383,307.62234785579716,288.41528350551914,327.31117392789855,297.47521987775957,348.65558696394925C306.53515625,370,306.53515625,393,306.53515625,404.5L306.53515625,416"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M439.30859375,278L439.30859375,289.5C439.30859375,301,439.30859375,324,442.0797258763246,342.38370400806735C444.85085800264915,360.7674080161348,450.3931222552983,374.53481603226965,453.16425438162287,381.418520040337L455.9353865079474,388.3022240484044"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M491.4602667336719,108.14628676523756L482.7683212363933,113.9552389710313C474.0763757391146,119.76419117682504,456.6924847445573,131.3820955884125,448.0005392472787,150.19104779420627C439.30859375,169,439.30859375,195,439.30859375,208L439.30859375,221"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M638.3938980336458,70.22651590329238L713.5346285697048,82.35542991941031C788.6753591057637,94.48434393552826,938.9568201778819,118.74217196776412,1014.097550713941,143.87108598388207C1089.23828125,169,1089.23828125,195,1089.23828125,208L1089.23828125,221"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M1046.7815928755397,268.7739249541037L1018.0621346879498,281.81160412841973C989.3426765003597,294.8492833027358,931.9037601251799,320.9246416513679,903.18430193759,345.46232082568395C874.46484375,370,874.46484375,393,874.46484375,404.5L874.46484375,416"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1121.8428189400033,288.33974899739826L1130.0500053666694,298.11645749783185C1138.2571917933356,307.8931659982655,1154.6715646466678,327.4465829991328,1162.878751073334,343.22329149956636C1171.0859375,359,1171.0859375,371,1171.0859375,377L1171.0859375,383"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M530.4356888973774,120.74206957072454L528.3311730394812,124.45172464227045C526.226657181585,128.16137971381636,522.0176254657925,135.58068985690818,519.9131096078962,157.0403449284541C517.80859375,178.5,517.80859375,214,517.80859375,248C517.80859375,282,517.80859375,314.5,513.917140758547,340.4166666666667C510.02568776709404,366.3333333333333,502.2427817841881,385.6666666666667,498.3513287927351,395.3333333333333L494.45987580128207,405"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M601.0564986026226,120.74206957072454L603.1610144605188,124.45172464227045C605.265530318415,128.16137971381636,609.4745620342075,135.58068985690818,611.5790778921038,146.7903449284541C613.68359375,158,613.68359375,173,613.68359375,180.5L613.68359375,188"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M831.3599453018669,96.59527129852006L823.7055533765557,104.32939274876672C816.0511614512446,112.06351419901337,800.7423776006223,127.53175709950669,793.0879856753112,140.93254521642C785.43359375,154.33333333333334,785.43359375,165.66666666666666,785.43359375,171.33333333333334L785.43359375,177"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M906.7650546981331,96.59527129852006L914.4194466234443,104.32939274876672C922.0738385487554,112.06351419901337,937.3826223993777,127.53175709950669,945.0370143246888,148.26587854975335C952.69140625,169,952.69140625,195,952.69140625,208L952.69140625,221"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -120,7 +125,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(437.0859375, 143)" class="edgeLabel">
+        <g transform="translate(439.30859375, 143)" class="edgeLabel">
           <g transform="translate(-22.0234375, -9)" class="label">
             <foreignObject height="18" width="44.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -210,7 +215,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L4">
+        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L4">
           <g title="B" id="classId-C_0001232624428734051711-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -229,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L6">
+        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L6">
           <g title="B##AA" id="classId-C_0001630205507215126623-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -263,11 +268,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L9">
+        <a transform="translate(216.8046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L9">
           <g title="A" id="classId-C_0001552274940876611774-2" class="node default clickable">
-            <rect height="101" width="160.40625" y="-50.5" x="-80.203125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="80.203125" x1="-80.203125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="80.203125" x1="-80.203125" class="divider"/>
+            <rect height="101" width="169.296875" y="-50.5" x="-84.6484375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="84.6484375" x1="-84.6484375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="84.6484375" x1="-84.6484375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -279,20 +284,20 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -72.703125, 3)" height="18" width="136.515625">
+              <foreignObject transform="translate( -77.1484375, 3)" height="18" width="145.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : [const] void</span>
+                  <span class="nodeLabel">+foo() : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -72.703125, 25)" height="18" width="145.40625">
+              <foreignObject transform="translate( -77.1484375, 25)" height="18" width="154.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo2() : [const] void</span>
+                  <span class="nodeLabel">+foo2() : : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(212.359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L13">
+        <a transform="translate(216.8046875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L13">
           <g title="A##AA" id="classId-C_0001742499843727859552-3" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -311,7 +316,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(140.6171875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L15">
+        <a transform="translate(142.83984375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L15">
           <g title="A##AA##Lights" id="classId-C_0000590936874508841244-4" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -345,7 +350,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.3125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L17">
+        <a transform="translate(306.53515625, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L17">
           <g title="A##AA##AAA" id="classId-C_0001430186633004282131-5" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -364,7 +369,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(437.0859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L33">
+        <a transform="translate(439.30859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0000287819369330075965-6" class="node default clickable">
             <rect height="57" width="87" y="-28.5" x="-43.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.5" x1="-43.5" class="divider"/>
@@ -383,7 +388,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(563.5234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L23">
+        <a transform="translate(565.74609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L23">
           <g title="C" id="classId-C_0002278328177727440136-7" class="node default clickable">
             <rect height="101" width="118.640625" y="-50.5" x="-59.3203125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.3203125" x1="-59.3203125" class="divider"/>
@@ -412,7 +417,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1087.015625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L27">
+        <a transform="translate(1089.23828125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L27">
           <g title="C##AA" id="classId-C_0000623940132897927654-8" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -431,7 +436,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(872.2421875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L28">
+        <a transform="translate(874.46484375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L28">
           <g title="C##AA##AAA" id="classId-C_0001597801087286500866-9" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -450,7 +455,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1168.86328125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L30">
+        <a transform="translate(1171.0859375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L30">
           <g title="C##AA##CCC" id="classId-C_0000081819202639599734-10" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -479,7 +484,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(476.3359375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L33">
+        <a transform="translate(478.55859375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0001381298335849583950-11" class="node default clickable">
             <rect height="79" width="78.125" y="-39.5" x="-39.0625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0625" x1="-39.0625" class="divider"/>
@@ -503,7 +508,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(611.4609375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L39">
+        <a transform="translate(613.68359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L39">
           <g title="C##CC" id="classId-C_0002037378936100378699-12" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -532,7 +537,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(866.83984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L43">
+        <a transform="translate(869.0625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L43">
           <g title="D" id="classId-C_0000612133170877135796-13" class="node default clickable">
             <rect height="57" width="79" y="-28.5" x="-39.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.5" x1="-39.5" class="divider"/>
@@ -551,7 +556,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(783.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L45">
+        <a transform="translate(785.43359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L45">
           <g title="D##AA" id="classId-C_0001572080057917630922-14" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -585,7 +590,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.46875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00004/t00004.cc#L47">
+        <a transform="translate(952.69140625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L47">
           <g title="D##DD" id="classId-C_0000600916232677555492-15" class="node default clickable">
             <rect height="57" width="112.765625" y="-28.5" x="-56.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.3828125" x1="-56.3828125" class="divider"/>
diff --git a/docs/test_cases/t00005.md b/docs/test_cases/t00005.md
index cfcbaf55..873b54cd 100644
--- a/docs/test_cases/t00005.md
+++ b/docs/test_cases/t00005.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00005.cc
+File `tests/t00005/t00005.cc`
 ```cpp
 namespace clanguml {
 namespace t00005 {
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index dff1eb8f..535d9e11 100644
--- a/docs/test_cases/t00005_class.svg
+++ b/docs/test_cases/t00005_class.svg
@@ -1,247 +1,287 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="439px" preserveAspectRatio="none" style="width:812px;height:439px;background:#FFFFFF;" version="1.1" viewBox="0 0 812 439" width="812px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fqrm8prtysnud" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
-      <ellipse cx="21" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,346.6406 Q23.3906,346.9375 22.75,347.0781 Q22.1094,347.2344 21.4063,347.2344 Q18.9063,347.2344 17.5781,345.5938 Q16.2656,343.9375 16.2656,340.8125 Q16.2656,337.6875 17.5781,336.0313 Q18.9063,334.375 21.4063,334.375 Q22.1094,334.375 22.75,334.5313 Q23.4063,334.6875 23.9688,334.9844 L23.9688,337.7031 Q23.3438,337.125 22.75,336.8594 Q22.1563,336.5781 21.5313,336.5781 Q20.1875,336.5781 19.5,337.6563 Q18.8125,338.7188 18.8125,340.8125 Q18.8125,342.9063 19.5,343.9844 Q20.1875,345.0469 21.5313,345.0469 Q22.1563,345.0469 22.75,344.7813 Q23.3438,344.5 23.9688,343.9219 L23.9688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="345.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000096355893895780319">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000096355893895780319" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="384"/>
+        <ellipse cx="22" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,401.1563 C17,403.6563 19.1406,405.4688 22.0625,405.4688 C23.2969,405.4688 24.4688,405.1719 25.2188,404.6563 C25.8281,404.2344 26.1563,403.8125 26.1563,403.4063 C26.1563,402.9375 25.7344,402.5313 25.2344,402.5313 C25,402.5313 24.7813,402.6094 24.5781,402.8125 C24.1406,403.25 24.1406,403.25 23.9688,403.3438 C23.5156,403.5781 22.875,403.7188 22.1094,403.7188 C20.1094,403.7188 18.8281,402.7031 18.8281,401.125 L18.8281,400.0781 C18.8281,398.375 20.0469,397.1719 21.75,397.1719 C22.3281,397.1719 22.9063,397.3125 23.375,397.5625 C23.8438,397.8281 24.0156,398.0156 24.0781,398.375 C24.2031,399.0469 24.4531,399.2969 24.9844,399.2969 C25.2656,399.2969 25.5469,399.1563 25.7344,398.9375 C25.8594,398.7656 25.9063,398.5938 25.9063,398.1563 L25.9063,396.7969 C25.9063,396.375 25.8906,396.2344 25.7656,396.0625 C25.5938,395.8125 25.3125,395.6563 24.9844,395.6563 C24.6719,395.6563 24.4688,395.7656 24.25,396.0313 C23.0781,395.5313 22.6406,395.4219 21.6875,395.4219 C19.0156,395.4219 17,397.4375 17,400.0625 L17,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="404.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
-      <ellipse cx="96" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M98.9688,346.6406 Q98.3906,346.9375 97.75,347.0781 Q97.1094,347.2344 96.4063,347.2344 Q93.9063,347.2344 92.5781,345.5938 Q91.2656,343.9375 91.2656,340.8125 Q91.2656,337.6875 92.5781,336.0313 Q93.9063,334.375 96.4063,334.375 Q97.1094,334.375 97.75,334.5313 Q98.4063,334.6875 98.9688,334.9844 L98.9688,337.7031 Q98.3438,337.125 97.75,336.8594 Q97.1563,336.5781 96.5313,336.5781 Q95.1875,336.5781 94.5,337.6563 Q93.8125,338.7188 93.8125,340.8125 Q93.8125,342.9063 94.5,343.9844 Q95.1875,345.0469 96.5313,345.0469 Q97.1563,345.0469 97.75,344.7813 Q98.3438,344.5 98.9688,343.9219 L98.9688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="345.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001909425857334087541">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0001909425857334087541" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="384"/>
+        <ellipse cx="98" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93,401.1563 C93,403.6563 95.1406,405.4688 98.0625,405.4688 C99.2969,405.4688 100.4688,405.1719 101.2188,404.6563 C101.8281,404.2344 102.1563,403.8125 102.1563,403.4063 C102.1563,402.9375 101.7344,402.5313 101.2344,402.5313 C101,402.5313 100.7813,402.6094 100.5781,402.8125 C100.1406,403.25 100.1406,403.25 99.9688,403.3438 C99.5156,403.5781 98.875,403.7188 98.1094,403.7188 C96.1094,403.7188 94.8281,402.7031 94.8281,401.125 L94.8281,400.0781 C94.8281,398.375 96.0469,397.1719 97.75,397.1719 C98.3281,397.1719 98.9063,397.3125 99.375,397.5625 C99.8438,397.8281 100.0156,398.0156 100.0781,398.375 C100.2031,399.0469 100.4531,399.2969 100.9844,399.2969 C101.2656,399.2969 101.5469,399.1563 101.7344,398.9375 C101.8594,398.7656 101.9063,398.5938 101.9063,398.1563 L101.9063,396.7969 C101.9063,396.375 101.8906,396.2344 101.7656,396.0625 C101.5938,395.8125 101.3125,395.6563 100.9844,395.6563 C100.6719,395.6563 100.4688,395.7656 100.25,396.0313 C99.0781,395.5313 98.6406,395.4219 97.6875,395.4219 C95.0156,395.4219 93,397.4375 93,400.0625 L93,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="404.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
-      <ellipse cx="171" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.9688,346.6406 Q173.3906,346.9375 172.75,347.0781 Q172.1094,347.2344 171.4063,347.2344 Q168.9063,347.2344 167.5781,345.5938 Q166.2656,343.9375 166.2656,340.8125 Q166.2656,337.6875 167.5781,336.0313 Q168.9063,334.375 171.4063,334.375 Q172.1094,334.375 172.75,334.5313 Q173.4063,334.6875 173.9688,334.9844 L173.9688,337.7031 Q173.3438,337.125 172.75,336.8594 Q172.1563,336.5781 171.5313,336.5781 Q170.1875,336.5781 169.5,337.6563 Q168.8125,338.7188 168.8125,340.8125 Q168.8125,342.9063 169.5,343.9844 Q170.1875,345.0469 171.5313,345.0469 Q172.1563,345.0469 172.75,344.7813 Q173.3438,344.5 173.9688,343.9219 L173.9688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="345.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000968176384460064907">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000968176384460064907" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="384"/>
+        <ellipse cx="173.5" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M168.5,401.1563 C168.5,403.6563 170.6406,405.4688 173.5625,405.4688 C174.7969,405.4688 175.9688,405.1719 176.7188,404.6563 C177.3281,404.2344 177.6563,403.8125 177.6563,403.4063 C177.6563,402.9375 177.2344,402.5313 176.7344,402.5313 C176.5,402.5313 176.2813,402.6094 176.0781,402.8125 C175.6406,403.25 175.6406,403.25 175.4688,403.3438 C175.0156,403.5781 174.375,403.7188 173.6094,403.7188 C171.6094,403.7188 170.3281,402.7031 170.3281,401.125 L170.3281,400.0781 C170.3281,398.375 171.5469,397.1719 173.25,397.1719 C173.8281,397.1719 174.4063,397.3125 174.875,397.5625 C175.3438,397.8281 175.5156,398.0156 175.5781,398.375 C175.7031,399.0469 175.9531,399.2969 176.4844,399.2969 C176.7656,399.2969 177.0469,399.1563 177.2344,398.9375 C177.3594,398.7656 177.4063,398.5938 177.4063,398.1563 L177.4063,396.7969 C177.4063,396.375 177.3906,396.2344 177.2656,396.0625 C177.0938,395.8125 176.8125,395.6563 176.4844,395.6563 C176.1719,395.6563 175.9688,395.7656 175.75,396.0313 C174.5781,395.5313 174.1406,395.4219 173.1875,395.4219 C170.5156,395.4219 168.5,397.4375 168.5,400.0625 L168.5,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="404.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
-      <ellipse cx="246.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M249.4688,346.6406 Q248.8906,346.9375 248.25,347.0781 Q247.6094,347.2344 246.9063,347.2344 Q244.4063,347.2344 243.0781,345.5938 Q241.7656,343.9375 241.7656,340.8125 Q241.7656,337.6875 243.0781,336.0313 Q244.4063,334.375 246.9063,334.375 Q247.6094,334.375 248.25,334.5313 Q248.9063,334.6875 249.4688,334.9844 L249.4688,337.7031 Q248.8438,337.125 248.25,336.8594 Q247.6563,336.5781 247.0313,336.5781 Q245.6875,336.5781 245,337.6563 Q244.3125,338.7188 244.3125,340.8125 Q244.3125,342.9063 245,343.9844 Q245.6875,345.0469 247.0313,345.0469 Q247.6563,345.0469 248.25,344.7813 Q248.8438,344.5 249.4688,343.9219 L249.4688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="345.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001735599590836186693">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001735599590836186693" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="235.5" y="384"/>
+        <ellipse cx="250.5" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M245.5,401.1563 C245.5,403.6563 247.6406,405.4688 250.5625,405.4688 C251.7969,405.4688 252.9688,405.1719 253.7188,404.6563 C254.3281,404.2344 254.6563,403.8125 254.6563,403.4063 C254.6563,402.9375 254.2344,402.5313 253.7344,402.5313 C253.5,402.5313 253.2813,402.6094 253.0781,402.8125 C252.6406,403.25 252.6406,403.25 252.4688,403.3438 C252.0156,403.5781 251.375,403.7188 250.6094,403.7188 C248.6094,403.7188 247.3281,402.7031 247.3281,401.125 L247.3281,400.0781 C247.3281,398.375 248.5469,397.1719 250.25,397.1719 C250.8281,397.1719 251.4063,397.3125 251.875,397.5625 C252.3438,397.8281 252.5156,398.0156 252.5781,398.375 C252.7031,399.0469 252.9531,399.2969 253.4844,399.2969 C253.7656,399.2969 254.0469,399.1563 254.2344,398.9375 C254.3594,398.7656 254.4063,398.5938 254.4063,398.1563 L254.4063,396.7969 C254.4063,396.375 254.3906,396.2344 254.2656,396.0625 C254.0938,395.8125 253.8125,395.6563 253.4844,395.6563 C253.1719,395.6563 252.9688,395.7656 252.75,396.0313 C251.5781,395.5313 251.1406,395.4219 250.1875,395.4219 C247.5156,395.4219 245.5,397.4375 245.5,400.0625 L245.5,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="264.5" y="404.606">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
-      <ellipse cx="323" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M325.9688,346.6406 Q325.3906,346.9375 324.75,347.0781 Q324.1094,347.2344 323.4063,347.2344 Q320.9063,347.2344 319.5781,345.5938 Q318.2656,343.9375 318.2656,340.8125 Q318.2656,337.6875 319.5781,336.0313 Q320.9063,334.375 323.4063,334.375 Q324.1094,334.375 324.75,334.5313 Q325.4063,334.6875 325.9688,334.9844 L325.9688,337.7031 Q325.3438,337.125 324.75,336.8594 Q324.1563,336.5781 323.5313,336.5781 Q322.1875,336.5781 321.5,337.6563 Q320.8125,338.7188 320.8125,340.8125 Q320.8125,342.9063 321.5,343.9844 Q322.1875,345.0469 323.5313,345.0469 Q324.1563,345.0469 324.75,344.7813 Q325.3438,344.5 325.9688,343.9219 L325.9688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="345.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0000887960136921844658">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000887960136921844658" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="312" y="384"/>
+        <ellipse cx="327" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M322,401.1563 C322,403.6563 324.1406,405.4688 327.0625,405.4688 C328.2969,405.4688 329.4688,405.1719 330.2188,404.6563 C330.8281,404.2344 331.1563,403.8125 331.1563,403.4063 C331.1563,402.9375 330.7344,402.5313 330.2344,402.5313 C330,402.5313 329.7813,402.6094 329.5781,402.8125 C329.1406,403.25 329.1406,403.25 328.9688,403.3438 C328.5156,403.5781 327.875,403.7188 327.1094,403.7188 C325.1094,403.7188 323.8281,402.7031 323.8281,401.125 L323.8281,400.0781 C323.8281,398.375 325.0469,397.1719 326.75,397.1719 C327.3281,397.1719 327.9063,397.3125 328.375,397.5625 C328.8438,397.8281 329.0156,398.0156 329.0781,398.375 C329.2031,399.0469 329.4531,399.2969 329.9844,399.2969 C330.2656,399.2969 330.5469,399.1563 330.7344,398.9375 C330.8594,398.7656 330.9063,398.5938 330.9063,398.1563 L330.9063,396.7969 C330.9063,396.375 330.8906,396.2344 330.7656,396.0625 C330.5938,395.8125 330.3125,395.6563 329.9844,395.6563 C329.6719,395.6563 329.4688,395.7656 329.25,396.0313 C328.0781,395.5313 327.6406,395.4219 326.6875,395.4219 C324.0156,395.4219 322,397.4375 322,400.0625 L322,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="341" y="404.606">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
-      <ellipse cx="398.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M401.4688,346.6406 Q400.8906,346.9375 400.25,347.0781 Q399.6094,347.2344 398.9063,347.2344 Q396.4063,347.2344 395.0781,345.5938 Q393.7656,343.9375 393.7656,340.8125 Q393.7656,337.6875 395.0781,336.0313 Q396.4063,334.375 398.9063,334.375 Q399.6094,334.375 400.25,334.5313 Q400.9063,334.6875 401.4688,334.9844 L401.4688,337.7031 Q400.8438,337.125 400.25,336.8594 Q399.6563,336.5781 399.0313,336.5781 Q397.6875,336.5781 397,337.6563 Q396.3125,338.7188 396.3125,340.8125 Q396.3125,342.9063 397,343.9844 Q397.6875,345.0469 399.0313,345.0469 Q399.6563,345.0469 400.25,344.7813 Q400.8438,344.5 401.4688,343.9219 L401.4688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="345.1543">F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000772719357856231772">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000772719357856231772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="388" y="384"/>
+        <ellipse cx="403" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M398,401.1563 C398,403.6563 400.1406,405.4688 403.0625,405.4688 C404.2969,405.4688 405.4688,405.1719 406.2188,404.6563 C406.8281,404.2344 407.1563,403.8125 407.1563,403.4063 C407.1563,402.9375 406.7344,402.5313 406.2344,402.5313 C406,402.5313 405.7813,402.6094 405.5781,402.8125 C405.1406,403.25 405.1406,403.25 404.9688,403.3438 C404.5156,403.5781 403.875,403.7188 403.1094,403.7188 C401.1094,403.7188 399.8281,402.7031 399.8281,401.125 L399.8281,400.0781 C399.8281,398.375 401.0469,397.1719 402.75,397.1719 C403.3281,397.1719 403.9063,397.3125 404.375,397.5625 C404.8438,397.8281 405.0156,398.0156 405.0781,398.375 C405.2031,399.0469 405.4531,399.2969 405.9844,399.2969 C406.2656,399.2969 406.5469,399.1563 406.7344,398.9375 C406.8594,398.7656 406.9063,398.5938 406.9063,398.1563 L406.9063,396.7969 C406.9063,396.375 406.8906,396.2344 406.7656,396.0625 C406.5938,395.8125 406.3125,395.6563 405.9844,395.6563 C405.6719,395.6563 405.4688,395.7656 405.25,396.0313 C404.0781,395.5313 403.6406,395.4219 402.6875,395.4219 C400.0156,395.4219 398,397.4375 398,400.0625 L398,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="417" y="404.606">F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="428" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="428" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
-      <ellipse cx="472.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M475.4688,346.6406 Q474.8906,346.9375 474.25,347.0781 Q473.6094,347.2344 472.9063,347.2344 Q470.4063,347.2344 469.0781,345.5938 Q467.7656,343.9375 467.7656,340.8125 Q467.7656,337.6875 469.0781,336.0313 Q470.4063,334.375 472.9063,334.375 Q473.6094,334.375 474.25,334.5313 Q474.9063,334.6875 475.4688,334.9844 L475.4688,337.7031 Q474.8438,337.125 474.25,336.8594 Q473.6563,336.5781 473.0313,336.5781 Q471.6875,336.5781 471,337.6563 Q470.3125,338.7188 470.3125,340.8125 Q470.3125,342.9063 471,343.9844 Q471.6875,345.0469 473.0313,345.0469 Q473.6563,345.0469 474.25,344.7813 Q474.8438,344.5 475.4688,343.9219 L475.4688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="345.1543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0000979147885884736437">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000979147885884736437" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="464" y="384"/>
+        <ellipse cx="479" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M474,401.1563 C474,403.6563 476.1406,405.4688 479.0625,405.4688 C480.2969,405.4688 481.4688,405.1719 482.2188,404.6563 C482.8281,404.2344 483.1563,403.8125 483.1563,403.4063 C483.1563,402.9375 482.7344,402.5313 482.2344,402.5313 C482,402.5313 481.7813,402.6094 481.5781,402.8125 C481.1406,403.25 481.1406,403.25 480.9688,403.3438 C480.5156,403.5781 479.875,403.7188 479.1094,403.7188 C477.1094,403.7188 475.8281,402.7031 475.8281,401.125 L475.8281,400.0781 C475.8281,398.375 477.0469,397.1719 478.75,397.1719 C479.3281,397.1719 479.9063,397.3125 480.375,397.5625 C480.8438,397.8281 481.0156,398.0156 481.0781,398.375 C481.2031,399.0469 481.4531,399.2969 481.9844,399.2969 C482.2656,399.2969 482.5469,399.1563 482.7344,398.9375 C482.8594,398.7656 482.9063,398.5938 482.9063,398.1563 L482.9063,396.7969 C482.9063,396.375 482.8906,396.2344 482.7656,396.0625 C482.5938,395.8125 482.3125,395.6563 481.9844,395.6563 C481.6719,395.6563 481.4688,395.7656 481.25,396.0313 C480.0781,395.5313 479.6406,395.4219 478.6875,395.4219 C476.0156,395.4219 474,397.4375 474,400.0625 L474,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="493" y="404.606">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="506" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="506" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
-      <ellipse cx="548.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M551.4688,346.6406 Q550.8906,346.9375 550.25,347.0781 Q549.6094,347.2344 548.9063,347.2344 Q546.4063,347.2344 545.0781,345.5938 Q543.7656,343.9375 543.7656,340.8125 Q543.7656,337.6875 545.0781,336.0313 Q546.4063,334.375 548.9063,334.375 Q549.6094,334.375 550.25,334.5313 Q550.9063,334.6875 551.4688,334.9844 L551.4688,337.7031 Q550.8438,337.125 550.25,336.8594 Q549.6563,336.5781 549.0313,336.5781 Q547.6875,336.5781 547,337.6563 Q546.3125,338.7188 546.3125,340.8125 Q546.3125,342.9063 547,343.9844 Q547.6875,345.0469 549.0313,345.0469 Q549.6563,345.0469 550.25,344.7813 Q550.8438,344.5 551.4688,343.9219 L551.4688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="345.1543">H</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <g id="elem_C_0001440673301054236675">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001440673301054236675" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="541.5" y="384"/>
+        <ellipse cx="556.5" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M551.5,401.1563 C551.5,403.6563 553.6406,405.4688 556.5625,405.4688 C557.7969,405.4688 558.9688,405.1719 559.7188,404.6563 C560.3281,404.2344 560.6563,403.8125 560.6563,403.4063 C560.6563,402.9375 560.2344,402.5313 559.7344,402.5313 C559.5,402.5313 559.2813,402.6094 559.0781,402.8125 C558.6406,403.25 558.6406,403.25 558.4688,403.3438 C558.0156,403.5781 557.375,403.7188 556.6094,403.7188 C554.6094,403.7188 553.3281,402.7031 553.3281,401.125 L553.3281,400.0781 C553.3281,398.375 554.5469,397.1719 556.25,397.1719 C556.8281,397.1719 557.4063,397.3125 557.875,397.5625 C558.3438,397.8281 558.5156,398.0156 558.5781,398.375 C558.7031,399.0469 558.9531,399.2969 559.4844,399.2969 C559.7656,399.2969 560.0469,399.1563 560.2344,398.9375 C560.3594,398.7656 560.4063,398.5938 560.4063,398.1563 L560.4063,396.7969 C560.4063,396.375 560.3906,396.2344 560.2656,396.0625 C560.0938,395.8125 559.8125,395.6563 559.4844,395.6563 C559.1719,395.6563 558.9688,395.7656 558.75,396.0313 C557.5781,395.5313 557.1406,395.4219 556.1875,395.4219 C553.5156,395.4219 551.5,397.4375 551.5,400.0625 L551.5,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="570.5" y="404.606">H</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="542.5" x2="582.5" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="542.5" x2="582.5" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
-      <ellipse cx="624.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M627.4688,346.6406 Q626.8906,346.9375 626.25,347.0781 Q625.6094,347.2344 624.9063,347.2344 Q622.4063,347.2344 621.0781,345.5938 Q619.7656,343.9375 619.7656,340.8125 Q619.7656,337.6875 621.0781,336.0313 Q622.4063,334.375 624.9063,334.375 Q625.6094,334.375 626.25,334.5313 Q626.9063,334.6875 627.4688,334.9844 L627.4688,337.7031 Q626.8438,337.125 626.25,336.8594 Q625.6563,336.5781 625.0313,336.5781 Q623.6875,336.5781 623,337.6563 Q622.3125,338.7188 622.3125,340.8125 Q622.3125,342.9063 623,343.9844 Q623.6875,345.0469 625.0313,345.0469 Q625.6563,345.0469 626.25,344.7813 Q626.8438,344.5 627.4688,343.9219 L627.4688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="345.1543">I</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <g id="elem_C_0000109681731550086430">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000109681731550086430" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="618.5" y="384"/>
+        <ellipse cx="633.5" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M628.5,401.1563 C628.5,403.6563 630.6406,405.4688 633.5625,405.4688 C634.7969,405.4688 635.9688,405.1719 636.7188,404.6563 C637.3281,404.2344 637.6563,403.8125 637.6563,403.4063 C637.6563,402.9375 637.2344,402.5313 636.7344,402.5313 C636.5,402.5313 636.2813,402.6094 636.0781,402.8125 C635.6406,403.25 635.6406,403.25 635.4688,403.3438 C635.0156,403.5781 634.375,403.7188 633.6094,403.7188 C631.6094,403.7188 630.3281,402.7031 630.3281,401.125 L630.3281,400.0781 C630.3281,398.375 631.5469,397.1719 633.25,397.1719 C633.8281,397.1719 634.4063,397.3125 634.875,397.5625 C635.3438,397.8281 635.5156,398.0156 635.5781,398.375 C635.7031,399.0469 635.9531,399.2969 636.4844,399.2969 C636.7656,399.2969 637.0469,399.1563 637.2344,398.9375 C637.3594,398.7656 637.4063,398.5938 637.4063,398.1563 L637.4063,396.7969 C637.4063,396.375 637.3906,396.2344 637.2656,396.0625 C637.0938,395.8125 636.8125,395.6563 636.4844,395.6563 C636.1719,395.6563 635.9688,395.7656 635.75,396.0313 C634.5781,395.5313 634.1406,395.4219 633.1875,395.4219 C630.5156,395.4219 628.5,397.4375 628.5,400.0625 L628.5,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="647.5" y="404.606">I</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="619.5" x2="653.5" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="619.5" x2="653.5" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
-      <ellipse cx="694.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M697.4688,346.6406 Q696.8906,346.9375 696.25,347.0781 Q695.6094,347.2344 694.9063,347.2344 Q692.4063,347.2344 691.0781,345.5938 Q689.7656,343.9375 689.7656,340.8125 Q689.7656,337.6875 691.0781,336.0313 Q692.4063,334.375 694.9063,334.375 Q695.6094,334.375 696.25,334.5313 Q696.9063,334.6875 697.4688,334.9844 L697.4688,337.7031 Q696.8438,337.125 696.25,336.8594 Q695.6563,336.5781 695.0313,336.5781 Q693.6875,336.5781 693,337.6563 Q692.3125,338.7188 692.3125,340.8125 Q692.3125,342.9063 693,343.9844 Q693.6875,345.0469 695.0313,345.0469 Q695.6563,345.0469 696.25,344.7813 Q696.8438,344.5 697.4688,343.9219 L697.4688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="345.1543">J</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <g id="elem_C_0000338330011969650325">
+        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0000338330011969650325" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="690" y="384"/>
+        <ellipse cx="705" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M700,401.1563 C700,403.6563 702.1406,405.4688 705.0625,405.4688 C706.2969,405.4688 707.4688,405.1719 708.2188,404.6563 C708.8281,404.2344 709.1563,403.8125 709.1563,403.4063 C709.1563,402.9375 708.7344,402.5313 708.2344,402.5313 C708,402.5313 707.7813,402.6094 707.5781,402.8125 C707.1406,403.25 707.1406,403.25 706.9688,403.3438 C706.5156,403.5781 705.875,403.7188 705.1094,403.7188 C703.1094,403.7188 701.8281,402.7031 701.8281,401.125 L701.8281,400.0781 C701.8281,398.375 703.0469,397.1719 704.75,397.1719 C705.3281,397.1719 705.9063,397.3125 706.375,397.5625 C706.8438,397.8281 707.0156,398.0156 707.0781,398.375 C707.2031,399.0469 707.4531,399.2969 707.9844,399.2969 C708.2656,399.2969 708.5469,399.1563 708.7344,398.9375 C708.8594,398.7656 708.9063,398.5938 708.9063,398.1563 L708.9063,396.7969 C708.9063,396.375 708.8906,396.2344 708.7656,396.0625 C708.5938,395.8125 708.3125,395.6563 707.9844,395.6563 C707.6719,395.6563 707.4688,395.7656 707.25,396.0313 C706.0781,395.5313 705.6406,395.4219 704.6875,395.4219 C702.0156,395.4219 700,397.4375 700,400.0625 L700,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="719" y="404.606">J</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="691" x2="728" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="691" x2="728" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
-      <ellipse cx="764.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M767.4688,346.6406 Q766.8906,346.9375 766.25,347.0781 Q765.6094,347.2344 764.9063,347.2344 Q762.4063,347.2344 761.0781,345.5938 Q759.7656,343.9375 759.7656,340.8125 Q759.7656,337.6875 761.0781,336.0313 Q762.4063,334.375 764.9063,334.375 Q765.6094,334.375 766.25,334.5313 Q766.9063,334.6875 767.4688,334.9844 L767.4688,337.7031 Q766.8438,337.125 766.25,336.8594 Q765.6563,336.5781 765.0313,336.5781 Q763.6875,336.5781 763,337.6563 Q762.3125,338.7188 762.3125,340.8125 Q762.3125,342.9063 763,343.9844 Q763.6875,345.0469 765.0313,345.0469 Q765.6563,345.0469 766.25,344.7813 Q766.8438,344.5 767.4688,343.9219 L767.4688,346.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="345.1543">K</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="357" y2="357"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="365" y2="365"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <g id="elem_C_0002179119389830432509">
+        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0002179119389830432509" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="764" y="384"/>
+        <ellipse cx="779" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M774,401.1563 C774,403.6563 776.1406,405.4688 779.0625,405.4688 C780.2969,405.4688 781.4688,405.1719 782.2188,404.6563 C782.8281,404.2344 783.1563,403.8125 783.1563,403.4063 C783.1563,402.9375 782.7344,402.5313 782.2344,402.5313 C782,402.5313 781.7813,402.6094 781.5781,402.8125 C781.1406,403.25 781.1406,403.25 780.9688,403.3438 C780.5156,403.5781 779.875,403.7188 779.1094,403.7188 C777.1094,403.7188 775.8281,402.7031 775.8281,401.125 L775.8281,400.0781 C775.8281,398.375 777.0469,397.1719 778.75,397.1719 C779.3281,397.1719 779.9063,397.3125 780.375,397.5625 C780.8438,397.8281 781.0156,398.0156 781.0781,398.375 C781.2031,399.0469 781.4531,399.2969 781.9844,399.2969 C782.2656,399.2969 782.5469,399.1563 782.7344,398.9375 C782.8594,398.7656 782.9063,398.5938 782.9063,398.1563 L782.9063,396.7969 C782.9063,396.375 782.8906,396.2344 782.7656,396.0625 C782.5938,395.8125 782.3125,395.6563 781.9844,395.6563 C781.6719,395.6563 781.4688,395.7656 781.25,396.0313 C780.0781,395.5313 779.6406,395.4219 778.6875,395.4219 C776.0156,395.4219 774,397.4375 774,400.0625 L774,401.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="793" y="404.606">K</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="765" x2="804" y1="416" y2="416"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="765" x2="804" y1="424" y2="424"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqrm8prtysnud)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
-      <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000630692407373144211">
+        <rect codeLine="46" fill="#F1F1F1" height="299.9989" id="C_0000630692407373144211" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="294" y="7"/>
+        <ellipse cx="399.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M394.25,24.1563 C394.25,26.6563 396.3906,28.4688 399.3125,28.4688 C400.5469,28.4688 401.7188,28.1719 402.4688,27.6563 C403.0781,27.2344 403.4063,26.8125 403.4063,26.4063 C403.4063,25.9375 402.9844,25.5313 402.4844,25.5313 C402.25,25.5313 402.0313,25.6094 401.8281,25.8125 C401.3906,26.25 401.3906,26.25 401.2188,26.3438 C400.7656,26.5781 400.125,26.7188 399.3594,26.7188 C397.3594,26.7188 396.0781,25.7031 396.0781,24.125 L396.0781,23.0781 C396.0781,21.375 397.2969,20.1719 399,20.1719 C399.5781,20.1719 400.1563,20.3125 400.625,20.5625 C401.0938,20.8281 401.2656,21.0156 401.3281,21.375 C401.4531,22.0469 401.7031,22.2969 402.2344,22.2969 C402.5156,22.2969 402.7969,22.1563 402.9844,21.9375 C403.1094,21.7656 403.1563,21.5938 403.1563,21.1563 L403.1563,19.7969 C403.1563,19.375 403.1406,19.2344 403.0156,19.0625 C402.8438,18.8125 402.5625,18.6563 402.2344,18.6563 C401.9219,18.6563 401.7188,18.7656 401.5,19.0313 C400.3281,18.5313 399.8906,18.4219 398.9375,18.4219 C396.2656,18.4219 394.25,20.4375 394.25,23.0625 L394.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="419.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="295" x2="522" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="295" x2="522" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="55.9"/>
+          <ellipse cx="305" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="314" y="64.0059">a : A</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="72.6999"/>
+          <ellipse cx="305" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="314" y="80.8059">b : B *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="89.4998"/>
+          <ellipse cx="305" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="314" y="97.6058">c : C &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="106.2997"/>
+          <ellipse cx="305" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77" x="314" y="114.4057">d : const D *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="123.0997"/>
+          <ellipse cx="305" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="314" y="131.2057">e : const E &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="139.8996"/>
+          <ellipse cx="305" cy="144.8996" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="314" y="148.0056">f : F &amp;&amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="156.6995"/>
+          <ellipse cx="305" cy="161.6995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="314" y="164.8055">g : G **</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="173.4995"/>
+          <ellipse cx="305" cy="178.4995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="314" y="181.6054">h : H ***</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="190.2994"/>
+          <ellipse cx="305" cy="195.2994" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="314" y="198.4054">i : I *&amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="207.0993"/>
+          <ellipse cx="305" cy="212.0993" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="314" y="215.2053">j : volatile J *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="223.8992"/>
+          <ellipse cx="305" cy="228.8992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="314" y="232.0052">k : K *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="240.6992"/>
+          <ellipse cx="305" cy="245.6992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="314" y="248.8051">some_int : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="257.4991"/>
+          <ellipse cx="305" cy="262.4991" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146" x="314" y="265.6051">some_int_pointer : int *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="274.299"/>
+          <ellipse cx="305" cy="279.299" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="314" y="282.405">some_int_pointer_pointer : int **</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="291.0989"/>
+          <ellipse cx="305" cy="296.0989" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="314" y="299.2049">some_int_reference : int &amp;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="54"/>
-      <ellipse cx="308" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="317" y="62.2104">a : A</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="66.8047"/>
-      <ellipse cx="308" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="317" y="75.0151">b : B *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="79.6094"/>
-      <ellipse cx="308" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="317" y="87.8198">c : C &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="92.4141"/>
-      <ellipse cx="308" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="100.6245">d : const D *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="105.2188"/>
-      <ellipse cx="308" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="317" y="113.4292">e : const E &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="118.0234"/>
-      <ellipse cx="308" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="317" y="126.2339">f : F &amp;&amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="130.8281"/>
-      <ellipse cx="308" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="44" x="317" y="139.0386">g : G **</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="143.6328"/>
-      <ellipse cx="308" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="317" y="151.8433">h : H ***</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="156.4375"/>
-      <ellipse cx="308" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="317" y="164.6479">i : I *&amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="169.2422"/>
-      <ellipse cx="308" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="177.4526">j : volatile J *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="182.0469"/>
-      <ellipse cx="308" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="317" y="190.2573">k : K *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="194.8516"/>
-      <ellipse cx="308" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="317" y="203.062">some_int : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="207.6563"/>
-      <ellipse cx="308" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="317" y="215.8667">some_int_pointer : int *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="220.4609"/>
-      <ellipse cx="308" cy="225.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="317" y="228.6714">some_int_pointer_pointer : int **</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="233.2656"/>
-      <ellipse cx="308" cy="238.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="317" y="241.4761">some_int_reference : int &amp;</text>
-    </a>
-    <path d="M285.16,195.65 C219.46,233.13 136.34,281.08 63,325 C57.55,328.26 51.69,331.86 46.28,335.22 " fill="none" id="C_0000630692407373144211&lt;-C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="296.8,189.02,289.6065,188.517,286.3754,194.9637,293.5689,195.4667,296.8,189.02" 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>
-    <path d="M296.95,205.9 C235.22,250.67 162.45,303.44 125.38,330.32 " fill="none" id="C_0000630692407373144211-&gt;C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="121.04,333.47,130.6752,331.4296,125.0892,330.5368,125.9821,324.9509,121.04,333.47" 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>
-    <path d="M296.81,231.45 C260.45,266.53 223.08,302.58 199.72,325.12 " fill="none" id="C_0000630692407373144211-&gt;C_0000968176384460064907" 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>
-    <path d="M320.87,248.11 C302.09,275.35 283.87,301.78 270.89,320.61 " fill="none" id="C_0000630692407373144211-&gt;C_0001735599590836186693" 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>
-    <path d="M362.21,248.11 C353.04,274.89 344.13,300.89 337.71,319.65 " fill="none" id="C_0000630692407373144211-&gt;C_0000887960136921844658" 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>
-    <path d="M403,261.41 C403,285.83 403,308.67 403,324.75 " fill="none" id="C_0000630692407373144211&lt;-C_0000772719357856231772" 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>
-    <path d="M443.79,248.11 C452.96,274.89 461.87,300.89 468.29,319.65 " fill="none" id="C_0000630692407373144211-&gt;C_0000979147885884736437" 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>
-    <path d="M485.13,248.11 C503.91,275.35 522.13,301.78 535.11,320.61 " fill="none" id="C_0000630692407373144211-&gt;C_0001440673301054236675" 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>
-    <path d="M509.1,232.73 C545.65,268.47 583.05,305.04 605.66,327.13 " fill="none" id="C_0000630692407373144211-&gt;C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="609.43,330.82,605.7835,321.671,605.852,327.3275,600.1955,327.3959,609.43,330.82" 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>
-    <path d="M509.14,208.06 C569.83,253.27 640.62,306 675.43,331.93 " fill="none" id="C_0000630692407373144211-&gt;C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="679.49,334.96,674.69,326.36,675.49,331.96,669.89,332.76,679.49,334.96" 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>
-    <path d="M509.24,191.61 C573.84,229.84 657.88,279.89 732,325 C736.26,327.6 740.79,330.38 745.16,333.09 " fill="none" id="C_0000630692407373144211-&gt;C_0002179119389830432509" 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>
+    <g id="link_C_0000630692407373144211_C_0000096355893895780319">
+      <path codeLine="64" d="M283.625,239.6149 C196.425,296.6049 94,363.54 48.24,393.44 " fill="none" id="C_0000630692407373144211-backto-C_0000096355893895780319" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="293.67,233.05,286.4592,232.9841,283.625,239.6149,290.8358,239.6808,293.67,233.05" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="131.5" y="350.077">+a</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0001909425857334087541">
+      <path codeLine="65" d="M293.63,251.78 C230.81,303.07 163.5586,357.9765 128.9286,386.2365 " fill="none" id="C_0000630692407373144211-to-C_0001909425857334087541" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="124.28,390.03,133.7819,387.4388,128.1538,386.8687,128.7239,381.2407,124.28,390.03" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="186.5" y="350.077">+b</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0000968176384460064907">
+      <path codeLine="66" d="M293.66,282.87 C258.18,321.45 226.7907,355.5729 205.0307,379.2429 " fill="none" id="C_0000630692407373144211-to-C_0000968176384460064907" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="200.97,383.66,210.0058,379.7415,204.3539,379.9791,204.1163,374.3272,200.97,383.66" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="242.5" y="350.077">+c</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0001735599590836186693">
+      <path codeLine="67" d="M317.45,307.16 C299.24,336.99 285.3568,359.7292 273.9568,378.3992 " fill="none" id="C_0000630692407373144211-to-C_0001735599590836186693" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="270.83,383.52,278.9341,377.9233,273.4357,379.2526,272.1063,373.7542,270.83,383.52" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="298.5" y="350.077">+d</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0000887960136921844658">
+      <path codeLine="68" d="M362.97,307.16 C353.87,336.99 347.122,359.1115 341.422,377.7815 " fill="none" id="C_0000630692407373144211-to-C_0000887960136921844658" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="339.67,383.52,346.1237,376.0802,341.13,378.7379,338.4723,373.7442,339.67,383.52" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="354.5" y="350.077">+e</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0000772719357856231772">
+      <path codeLine="69" d="M408.5,319.16 C408.5,348.99 408.5,364.85 408.5,383.52 " fill="none" id="C_0000630692407373144211-backto-C_0000772719357856231772" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="408.5,307.16,404.5,313.16,408.5,319.16,412.5,313.16,408.5,307.16" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="409.5" y="350.077">+f</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0000979147885884736437">
+      <path codeLine="70" d="M454.62,307.16 C463.85,336.99 470.6984,359.1175 476.4684,377.7875 " fill="none" id="C_0000630692407373144211-to-C_0000979147885884736437" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="478.24,383.52,479.4042,373.7402,476.7636,378.7429,471.7609,376.1024,478.24,383.52" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="470.5" y="350.077">+g</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0001440673301054236675">
+      <path codeLine="71" d="M500.75,307.16 C519.2,336.99 533.2734,359.7475 544.8234,378.4175 " fill="none" id="C_0000630692407373144211-to-C_0001440673301054236675" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="547.98,383.52,546.6467,373.7618,545.3495,379.2679,539.8434,377.9706,547.98,383.52" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="530.5" y="350.077">+h</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0000109681731550086430">
+      <path codeLine="72" d="M523.17,283.23 C560.21,323.68 593.0977,359.6052 614.3077,382.7652 " fill="none" id="C_0000630692407373144211-to-C_0000109681731550086430" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="618.36,387.19,615.2315,377.8512,614.9831,383.5026,609.3317,383.2543,618.36,387.19" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="588.5" y="350.077">+i</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0000338330011969650325">
+      <path codeLine="73" d="M523.15,252.85 C585.29,304.25 651.4564,358.9861 685.1064,386.8161 " fill="none" id="C_0000630692407373144211-to-C_0000338330011969650325" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="689.73,390.64,685.3439,381.8217,685.877,387.4534,680.2453,387.9865,689.73,390.64" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="645.5" y="350.077">+j</text>
+    </g>
+    <g id="link_C_0000630692407373144211_C_0002179119389830432509">
+      <path codeLine="74" d="M523.36,234.06 C608.88,290.7 713.3273,359.8674 758.5273,389.7974 " fill="none" id="C_0000630692407373144211-to-C_0002179119389830432509" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="763.53,393.11,758.2344,384.806,759.3611,390.3495,753.8176,391.4762,763.53,393.11" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="704.5" y="350.077">+k</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00005_class_mermaid.svg b/docs/test_cases/t00005_class_mermaid.svg
index 4ccee16d..4008b39e 100644
--- a/docs/test_cases/t00005_class_mermaid.svg
+++ b/docs/test_cases/t00005_class_mermaid.svg
@@ -1,66 +1,71 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 796.640625 528" style="max-width: 796.641px; background-color: white;" width="796.640625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M279.40625,274.8828836217502L236.38541666666666,300.5690696847918C193.36458333333334,326.2552557478335,107.32291666666667,377.6276278739167,64.30208333333333,408.980480603625C21.28125,440.3333333333333,21.28125,451.6666666666667,21.28125,457.3333333333333L21.28125,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M279.40625,293.3359334907113L249.14583333333334,315.9466112422594C218.88541666666666,338.5572889938075,158.36458333333334,383.7786444969038,128.10416666666666,412.0559889151186C97.84375,440.3333333333333,97.84375,451.6666666666667,97.84375,457.3333333333333L97.84375,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M279.40625,324.18716577540107L261.90625,341.6559714795009C244.40625,359.12477718360077,209.40625,394.06238859180036,191.90625,417.19786096256684C174.40625,440.3333333333333,174.40625,451.6666666666667,174.40625,457.3333333333333L174.40625,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M279.40625,386.2527359074953L274.6666666666667,393.37727992291275C269.9270833333333,400.50182393833023,260.4479166666667,414.7509119691651,255.70833333333334,427.5421226512492C250.96875,440.3333333333333,250.96875,451.6666666666667,250.96875,457.3333333333333L250.96875,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M338.3285885989011,395L336.45481341575095,400.6666666666667C334.58103823260075,406.3333333333333,330.83348786630035,417.6666666666667,328.9597126831502,429C327.0859375,440.3333333333333,327.0859375,451.6666666666667,327.0859375,457.3333333333333L327.0859375,463"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M402.3125,395L402.3125,400.6666666666667C402.3125,406.3333333333333,402.3125,417.6666666666667,402.3125,429C402.3125,440.3333333333333,402.3125,451.6666666666667,402.3125,457.3333333333333L402.3125,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M467.0539320054945,395L468.94989125457874,400.6666666666667C470.84585050366303,406.3333333333333,474.6377690018315,417.6666666666667,476.5337282509158,429C478.4296875,440.3333333333333,478.4296875,451.6666666666667,478.4296875,457.3333333333333L478.4296875,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M525.21875,384.1035714285714L530.2552083333334,391.58630952380946C535.2916666666666,399.0690476190476,545.3645833333334,414.03452380952376,550.4010416666666,427.18392857142857C555.4375,440.3333333333333,555.4375,451.6666666666667,555.4375,457.3333333333333L555.4375,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M525.21875,325.1493349455865L542.4231770833334,342.45777912132206C559.6276041666666,359.76622329705765,594.0364583333334,394.38311164852877,611.2408854166666,417.35822249093104C628.4453125,440.3333333333333,628.4453125,451.6666666666667,628.4453125,457.3333333333333L628.4453125,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M525.21875,295.38850996852045L554.3697916666666,317.6570916404337C583.5208333333334,339.925673312347,641.8229166666666,384.46283665617347,670.9739583333334,412.3980849947534C700.125,440.3333333333333,700.125,451.6666666666667,700.125,457.3333333333333L700.125,463"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M525.21875,276.45350785340315L566.9088541666666,301.8779232111693C608.5989583333334,327.30233856893545,691.9791666666666,378.1511692844677,733.6692708333334,409.2422513089005C775.359375,440.3333333333333,775.359375,451.6666666666667,775.359375,457.3333333333333L775.359375,463"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M263.95139406036645,284.1104200148062L223.50637005030538,308.25868334567184C183.0613460402443,332.4069466765375,102.17129802012215,380.7034733382687,61.726274010061076,410.518403335801C21.28125,440.3333333333333,21.28125,451.6666666666667,21.28125,457.3333333333333L21.28125,463"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M279.40625,293.3359334907113L249.14583333333334,315.9466112422594C218.88541666666666,338.5572889938075,158.36458333333334,383.7786444969038,128.10416666666666,411.0559889151186C97.84375,438.3333333333333,97.84375,447.6666666666667,97.84375,452.3333333333333L97.84375,457"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M279.40625,324.18716577540107L261.90625,341.6559714795009C244.40625,359.12477718360077,209.40625,394.06238859180036,191.90625,416.19786096256684C174.40625,438.3333333333333,174.40625,447.6666666666667,174.40625,452.3333333333333L174.40625,457"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M279.40625,386.2527359074953L274.6666666666667,393.37727992291275C269.9270833333333,400.50182393833023,260.4479166666667,414.7509119691651,255.70833333333334,426.5421226512492C250.96875,438.3333333333333,250.96875,447.6666666666667,250.96875,452.3333333333333L250.96875,457"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M338.3285885989011,395L336.45481341575095,400.6666666666667C334.58103823260075,406.3333333333333,330.83348786630035,417.6666666666667,328.9597126831502,428C327.0859375,438.3333333333333,327.0859375,447.6666666666667,327.0859375,452.3333333333333L327.0859375,457"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M402.3125,413L402.3125,415.6666666666667C402.3125,418.3333333333333,402.3125,423.6666666666667,402.3125,432C402.3125,440.3333333333333,402.3125,451.6666666666667,402.3125,457.3333333333333L402.3125,463"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M467.0539320054945,395L468.94989125457874,400.6666666666667C470.84585050366303,406.3333333333333,474.6377690018315,417.6666666666667,476.5337282509158,428C478.4296875,438.3333333333333,478.4296875,447.6666666666667,478.4296875,452.3333333333333L478.4296875,457"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M525.21875,384.1035714285714L530.2552083333334,391.58630952380946C535.2916666666666,399.0690476190476,545.3645833333334,414.03452380952376,550.4010416666666,426.18392857142857C555.4375,438.3333333333333,555.4375,447.6666666666667,555.4375,452.3333333333333L555.4375,457"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M525.21875,325.1493349455865L542.4231770833334,342.45777912132206C559.6276041666666,359.76622329705765,594.0364583333334,394.38311164852877,611.2408854166666,416.35822249093104C628.4453125,438.3333333333333,628.4453125,447.6666666666667,628.4453125,452.3333333333333L628.4453125,457"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M525.21875,295.38850996852045L554.3697916666666,317.6570916404337C583.5208333333334,339.925673312347,641.8229166666666,384.46283665617347,670.9739583333334,411.3980849947534C700.125,438.3333333333333,700.125,447.6666666666667,700.125,452.3333333333333L700.125,457"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M525.21875,276.45350785340315L566.9088541666666,301.8779232111693C608.5989583333334,327.30233856893545,691.9791666666666,378.1511692844677,733.6692708333334,408.2422513089005C775.359375,438.3333333333333,775.359375,447.6666666666667,775.359375,452.3333333333333L775.359375,457"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(21.28125, 429)" class="edgeLabel">
@@ -186,7 +191,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L3">
+        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L3">
           <g title="A" id="classId-C_0000096355893895780319-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L5">
+        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L5">
           <g title="B" id="classId-C_0001909425857334087541-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L7">
+        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L7">
           <g title="C" id="classId-C_0000968176384460064907-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,7 +248,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L9">
+        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L9">
           <g title="D" id="classId-C_0001735599590836186693-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,7 +267,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L11">
+        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L11">
           <g title="E" id="classId-C_0000887960136921844658-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,7 +286,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L13">
+        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L13">
           <g title="F" id="classId-C_0000772719357856231772-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,7 +305,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L15">
+        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L15">
           <g title="G" id="classId-C_0000979147885884736437-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,7 +324,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L17">
+        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L17">
           <g title="H" id="classId-C_0001440673301054236675-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,7 +343,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L19">
+        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L19">
           <g title="I" id="classId-C_0000109681731550086430-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,7 +362,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L21">
+        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L21">
           <g title="J" id="classId-C_0000338330011969650325-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,7 +381,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L23">
+        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L23">
           <g title="K" id="classId-C_0002179119389830432509-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,7 +400,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00005/t00005.cc#L25">
+        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L25">
           <g title="R" id="classId-C_0000630692407373144211-11" class="node default clickable">
             <rect height="387" width="245.8125" y="-193.5" x="-122.90625" class="outer title-state"/>
             <line y2="-163.5" y1="-163.5" x2="122.90625" x1="-122.90625" class="divider"/>
@@ -418,7 +423,7 @@
               </foreignObject>
               <foreignObject transform="translate( -115.40625, -130)" height="18" width="42.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+b : B </span>
+                  <span style="font-style:italic;" class="nodeLabel">+b : B</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, -108)" height="18" width="57.359375">
@@ -428,7 +433,7 @@
               </foreignObject>
               <foreignObject transform="translate( -115.40625, -86)" height="18" width="85.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+d : const D </span>
+                  <span style="font-style:italic;" class="nodeLabel">+d : const D</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, -64)" height="18" width="100.0625">
@@ -458,12 +463,12 @@
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 46)" height="18" width="88.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+j : volatile J </span>
+                  <span style="font-style:italic;" class="nodeLabel">+j : volatile J</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 68)" height="18" width="41.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+k : K </span>
+                  <span style="font-style:italic;" class="nodeLabel">+k : K</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 90)" height="18" width="104.5">
@@ -473,7 +478,7 @@
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 112)" height="18" width="162.328125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+some_int_pointer : int </span>
+                  <span style="font-style:italic;" class="nodeLabel">+some_int_pointer : int</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 134)" height="18" width="230.8125">
diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md
index a6bf6f58..60b7e995 100644
--- a/docs/test_cases/t00006.md
+++ b/docs/test_cases/t00006.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00006.cc
+File `tests/t00006/t00006.cc`
 ```cpp
 #include <array>
 #include <map>
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index 554d0cf4..48d68a6b 100644
--- a/docs/test_cases/t00006_class.svg
+++ b/docs/test_cases/t00006_class.svg
@@ -1,324 +1,392 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="531px" preserveAspectRatio="none" style="width:1415px;height:531px;background:#FFFFFF;" version="1.1" viewBox="0 0 1415 531" width="1415px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1muhz7wfjgbei" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
-      <ellipse cx="21" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,320.6406 Q23.3906,320.9375 22.75,321.0781 Q22.1094,321.2344 21.4063,321.2344 Q18.9063,321.2344 17.5781,319.5938 Q16.2656,317.9375 16.2656,314.8125 Q16.2656,311.6875 17.5781,310.0313 Q18.9063,308.375 21.4063,308.375 Q22.1094,308.375 22.75,308.5313 Q23.4063,308.6875 23.9688,308.9844 L23.9688,311.7031 Q23.3438,311.125 22.75,310.8594 Q22.1563,310.5781 21.5313,310.5781 Q20.1875,310.5781 19.5,311.6563 Q18.8125,312.7188 18.8125,314.8125 Q18.8125,316.9063 19.5,317.9844 Q20.1875,319.0469 21.5313,319.0469 Q22.1563,319.0469 22.75,318.7813 Q23.3438,318.5 23.9688,317.9219 L23.9688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="319.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000989095304444672400">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000989095304444672400" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="350.4"/>
+        <ellipse cx="22" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,367.5563 C17,370.0563 19.1406,371.8688 22.0625,371.8688 C23.2969,371.8688 24.4688,371.5719 25.2188,371.0563 C25.8281,370.6344 26.1563,370.2125 26.1563,369.8063 C26.1563,369.3375 25.7344,368.9313 25.2344,368.9313 C25,368.9313 24.7813,369.0094 24.5781,369.2125 C24.1406,369.65 24.1406,369.65 23.9688,369.7438 C23.5156,369.9781 22.875,370.1188 22.1094,370.1188 C20.1094,370.1188 18.8281,369.1031 18.8281,367.525 L18.8281,366.4781 C18.8281,364.775 20.0469,363.5719 21.75,363.5719 C22.3281,363.5719 22.9063,363.7125 23.375,363.9625 C23.8438,364.2281 24.0156,364.4156 24.0781,364.775 C24.2031,365.4469 24.4531,365.6969 24.9844,365.6969 C25.2656,365.6969 25.5469,365.5563 25.7344,365.3375 C25.8594,365.1656 25.9063,364.9938 25.9063,364.5563 L25.9063,363.1969 C25.9063,362.775 25.8906,362.6344 25.7656,362.4625 C25.5938,362.2125 25.3125,362.0563 24.9844,362.0563 C24.6719,362.0563 24.4688,362.1656 24.25,362.4313 C23.0781,361.9313 22.6406,361.8219 21.6875,361.8219 C19.0156,361.8219 17,363.8375 17,366.4625 L17,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="371.006">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
-      <ellipse cx="96" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M98.9688,320.6406 Q98.3906,320.9375 97.75,321.0781 Q97.1094,321.2344 96.4063,321.2344 Q93.9063,321.2344 92.5781,319.5938 Q91.2656,317.9375 91.2656,314.8125 Q91.2656,311.6875 92.5781,310.0313 Q93.9063,308.375 96.4063,308.375 Q97.1094,308.375 97.75,308.5313 Q98.4063,308.6875 98.9688,308.9844 L98.9688,311.7031 Q98.3438,311.125 97.75,310.8594 Q97.1563,310.5781 96.5313,310.5781 Q95.1875,310.5781 94.5,311.6563 Q93.8125,312.7188 93.8125,314.8125 Q93.8125,316.9063 94.5,317.9844 Q95.1875,319.0469 96.5313,319.0469 Q97.1563,319.0469 97.75,318.7813 Q98.3438,318.5 98.9688,317.9219 L98.9688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="319.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000648285260245005311">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000648285260245005311" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="350.4"/>
+        <ellipse cx="98" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93,367.5563 C93,370.0563 95.1406,371.8688 98.0625,371.8688 C99.2969,371.8688 100.4688,371.5719 101.2188,371.0563 C101.8281,370.6344 102.1563,370.2125 102.1563,369.8063 C102.1563,369.3375 101.7344,368.9313 101.2344,368.9313 C101,368.9313 100.7813,369.0094 100.5781,369.2125 C100.1406,369.65 100.1406,369.65 99.9688,369.7438 C99.5156,369.9781 98.875,370.1188 98.1094,370.1188 C96.1094,370.1188 94.8281,369.1031 94.8281,367.525 L94.8281,366.4781 C94.8281,364.775 96.0469,363.5719 97.75,363.5719 C98.3281,363.5719 98.9063,363.7125 99.375,363.9625 C99.8438,364.2281 100.0156,364.4156 100.0781,364.775 C100.2031,365.4469 100.4531,365.6969 100.9844,365.6969 C101.2656,365.6969 101.5469,365.5563 101.7344,365.3375 C101.8594,365.1656 101.9063,364.9938 101.9063,364.5563 L101.9063,363.1969 C101.9063,362.775 101.8906,362.6344 101.7656,362.4625 C101.5938,362.2125 101.3125,362.0563 100.9844,362.0563 C100.6719,362.0563 100.4688,362.1656 100.25,362.4313 C99.0781,361.9313 98.6406,361.8219 97.6875,361.8219 C95.0156,361.8219 93,363.8375 93,366.4625 L93,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="371.006">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
-      <ellipse cx="171" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.9688,320.6406 Q173.3906,320.9375 172.75,321.0781 Q172.1094,321.2344 171.4063,321.2344 Q168.9063,321.2344 167.5781,319.5938 Q166.2656,317.9375 166.2656,314.8125 Q166.2656,311.6875 167.5781,310.0313 Q168.9063,308.375 171.4063,308.375 Q172.1094,308.375 172.75,308.5313 Q173.4063,308.6875 173.9688,308.9844 L173.9688,311.7031 Q173.3438,311.125 172.75,310.8594 Q172.1563,310.5781 171.5313,310.5781 Q170.1875,310.5781 169.5,311.6563 Q168.8125,312.7188 168.8125,314.8125 Q168.8125,316.9063 169.5,317.9844 Q170.1875,319.0469 171.5313,319.0469 Q172.1563,319.0469 172.75,318.7813 Q173.3438,318.5 173.9688,317.9219 L173.9688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="319.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000323304333007297774">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000323304333007297774" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="350.4"/>
+        <ellipse cx="173.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M168.5,367.5563 C168.5,370.0563 170.6406,371.8688 173.5625,371.8688 C174.7969,371.8688 175.9688,371.5719 176.7188,371.0563 C177.3281,370.6344 177.6563,370.2125 177.6563,369.8063 C177.6563,369.3375 177.2344,368.9313 176.7344,368.9313 C176.5,368.9313 176.2813,369.0094 176.0781,369.2125 C175.6406,369.65 175.6406,369.65 175.4688,369.7438 C175.0156,369.9781 174.375,370.1188 173.6094,370.1188 C171.6094,370.1188 170.3281,369.1031 170.3281,367.525 L170.3281,366.4781 C170.3281,364.775 171.5469,363.5719 173.25,363.5719 C173.8281,363.5719 174.4063,363.7125 174.875,363.9625 C175.3438,364.2281 175.5156,364.4156 175.5781,364.775 C175.7031,365.4469 175.9531,365.6969 176.4844,365.6969 C176.7656,365.6969 177.0469,365.5563 177.2344,365.3375 C177.3594,365.1656 177.4063,364.9938 177.4063,364.5563 L177.4063,363.1969 C177.4063,362.775 177.3906,362.6344 177.2656,362.4625 C177.0938,362.2125 176.8125,362.0563 176.4844,362.0563 C176.1719,362.0563 175.9688,362.1656 175.75,362.4313 C174.5781,361.9313 174.1406,361.8219 173.1875,361.8219 C170.5156,361.8219 168.5,363.8375 168.5,366.4625 L168.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="371.006">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
-      <ellipse cx="246.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M249.4688,320.6406 Q248.8906,320.9375 248.25,321.0781 Q247.6094,321.2344 246.9063,321.2344 Q244.4063,321.2344 243.0781,319.5938 Q241.7656,317.9375 241.7656,314.8125 Q241.7656,311.6875 243.0781,310.0313 Q244.4063,308.375 246.9063,308.375 Q247.6094,308.375 248.25,308.5313 Q248.9063,308.6875 249.4688,308.9844 L249.4688,311.7031 Q248.8438,311.125 248.25,310.8594 Q247.6563,310.5781 247.0313,310.5781 Q245.6875,310.5781 245,311.6563 Q244.3125,312.7188 244.3125,314.8125 Q244.3125,316.9063 245,317.9844 Q245.6875,319.0469 247.0313,319.0469 Q247.6563,319.0469 248.25,318.7813 Q248.8438,318.5 249.4688,317.9219 L249.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="319.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001006912399043633492">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001006912399043633492" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="235.5" y="350.4"/>
+        <ellipse cx="250.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M245.5,367.5563 C245.5,370.0563 247.6406,371.8688 250.5625,371.8688 C251.7969,371.8688 252.9688,371.5719 253.7188,371.0563 C254.3281,370.6344 254.6563,370.2125 254.6563,369.8063 C254.6563,369.3375 254.2344,368.9313 253.7344,368.9313 C253.5,368.9313 253.2813,369.0094 253.0781,369.2125 C252.6406,369.65 252.6406,369.65 252.4688,369.7438 C252.0156,369.9781 251.375,370.1188 250.6094,370.1188 C248.6094,370.1188 247.3281,369.1031 247.3281,367.525 L247.3281,366.4781 C247.3281,364.775 248.5469,363.5719 250.25,363.5719 C250.8281,363.5719 251.4063,363.7125 251.875,363.9625 C252.3438,364.2281 252.5156,364.4156 252.5781,364.775 C252.7031,365.4469 252.9531,365.6969 253.4844,365.6969 C253.7656,365.6969 254.0469,365.5563 254.2344,365.3375 C254.3594,365.1656 254.4063,364.9938 254.4063,364.5563 L254.4063,363.1969 C254.4063,362.775 254.3906,362.6344 254.2656,362.4625 C254.0938,362.2125 253.8125,362.0563 253.4844,362.0563 C253.1719,362.0563 252.9688,362.1656 252.75,362.4313 C251.5781,361.9313 251.1406,361.8219 250.1875,361.8219 C247.5156,361.8219 245.5,363.8375 245.5,366.4625 L245.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="264.5" y="371.006">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
-      <ellipse cx="1161" cy="430.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1163.9688,436.1406 Q1163.3906,436.4375 1162.75,436.5781 Q1162.1094,436.7344 1161.4063,436.7344 Q1158.9063,436.7344 1157.5781,435.0938 Q1156.2656,433.4375 1156.2656,430.3125 Q1156.2656,427.1875 1157.5781,425.5313 Q1158.9063,423.875 1161.4063,423.875 Q1162.1094,423.875 1162.75,424.0313 Q1163.4063,424.1875 1163.9688,424.4844 L1163.9688,427.2031 Q1163.3438,426.625 1162.75,426.3594 Q1162.1563,426.0781 1161.5313,426.0781 Q1160.1875,426.0781 1159.5,427.1563 Q1158.8125,428.2188 1158.8125,430.3125 Q1158.8125,432.4063 1159.5,433.4844 Q1160.1875,434.5469 1161.5313,434.5469 Q1162.1563,434.5469 1162.75,434.2813 Q1163.3438,434 1163.9688,433.4219 L1163.9688,436.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1175" y="434.6543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="446.5" y2="446.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="454.5" y2="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001092550394020578978">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001092550394020578978" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1171" y="467.8"/>
+        <ellipse cx="1186" cy="483.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1181,484.9563 C1181,487.4563 1183.1406,489.2688 1186.0625,489.2688 C1187.2969,489.2688 1188.4688,488.9719 1189.2188,488.4563 C1189.8281,488.0344 1190.1563,487.6125 1190.1563,487.2063 C1190.1563,486.7375 1189.7344,486.3313 1189.2344,486.3313 C1189,486.3313 1188.7813,486.4094 1188.5781,486.6125 C1188.1406,487.05 1188.1406,487.05 1187.9688,487.1438 C1187.5156,487.3781 1186.875,487.5188 1186.1094,487.5188 C1184.1094,487.5188 1182.8281,486.5031 1182.8281,484.925 L1182.8281,483.8781 C1182.8281,482.175 1184.0469,480.9719 1185.75,480.9719 C1186.3281,480.9719 1186.9063,481.1125 1187.375,481.3625 C1187.8438,481.6281 1188.0156,481.8156 1188.0781,482.175 C1188.2031,482.8469 1188.4531,483.0969 1188.9844,483.0969 C1189.2656,483.0969 1189.5469,482.9563 1189.7344,482.7375 C1189.8594,482.5656 1189.9063,482.3938 1189.9063,481.9563 L1189.9063,480.5969 C1189.9063,480.175 1189.8906,480.0344 1189.7656,479.8625 C1189.5938,479.6125 1189.3125,479.4563 1188.9844,479.4563 C1188.6719,479.4563 1188.4688,479.5656 1188.25,479.8313 C1187.0781,479.3313 1186.6406,479.2219 1185.6875,479.2219 C1183.0156,479.2219 1181,481.2375 1181,483.8625 L1181,484.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1200" y="488.406">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1172" x2="1211" y1="499.8" y2="499.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1172" x2="1211" y1="507.8" y2="507.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
-      <ellipse cx="322.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M325.4688,320.6406 Q324.8906,320.9375 324.25,321.0781 Q323.6094,321.2344 322.9063,321.2344 Q320.4063,321.2344 319.0781,319.5938 Q317.7656,317.9375 317.7656,314.8125 Q317.7656,311.6875 319.0781,310.0313 Q320.4063,308.375 322.9063,308.375 Q323.6094,308.375 324.25,308.5313 Q324.9063,308.6875 325.4688,308.9844 L325.4688,311.7031 Q324.8438,311.125 324.25,310.8594 Q323.6563,310.5781 323.0313,310.5781 Q321.6875,310.5781 321,311.6563 Q320.3125,312.7188 320.3125,314.8125 Q320.3125,316.9063 321,317.9844 Q321.6875,319.0469 323.0313,319.0469 Q323.6563,319.0469 324.25,318.7813 Q324.8438,318.5 325.4688,317.9219 L325.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="336.5" y="319.1543">F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000965398761810782236">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000965398761810782236" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="312" y="350.4"/>
+        <ellipse cx="327" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M322,367.5563 C322,370.0563 324.1406,371.8688 327.0625,371.8688 C328.2969,371.8688 329.4688,371.5719 330.2188,371.0563 C330.8281,370.6344 331.1563,370.2125 331.1563,369.8063 C331.1563,369.3375 330.7344,368.9313 330.2344,368.9313 C330,368.9313 329.7813,369.0094 329.5781,369.2125 C329.1406,369.65 329.1406,369.65 328.9688,369.7438 C328.5156,369.9781 327.875,370.1188 327.1094,370.1188 C325.1094,370.1188 323.8281,369.1031 323.8281,367.525 L323.8281,366.4781 C323.8281,364.775 325.0469,363.5719 326.75,363.5719 C327.3281,363.5719 327.9063,363.7125 328.375,363.9625 C328.8438,364.2281 329.0156,364.4156 329.0781,364.775 C329.2031,365.4469 329.4531,365.6969 329.9844,365.6969 C330.2656,365.6969 330.5469,365.5563 330.7344,365.3375 C330.8594,365.1656 330.9063,364.9938 330.9063,364.5563 L330.9063,363.1969 C330.9063,362.775 330.8906,362.6344 330.7656,362.4625 C330.5938,362.2125 330.3125,362.0563 329.9844,362.0563 C329.6719,362.0563 329.4688,362.1656 329.25,362.4313 C328.0781,361.9313 327.6406,361.8219 326.6875,361.8219 C324.0156,361.8219 322,363.8375 322,366.4625 L322,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="341" y="371.006">F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
-      <ellipse cx="396.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M399.4688,320.6406 Q398.8906,320.9375 398.25,321.0781 Q397.6094,321.2344 396.9063,321.2344 Q394.4063,321.2344 393.0781,319.5938 Q391.7656,317.9375 391.7656,314.8125 Q391.7656,311.6875 393.0781,310.0313 Q394.4063,308.375 396.9063,308.375 Q397.6094,308.375 398.25,308.5313 Q398.9063,308.6875 399.4688,308.9844 L399.4688,311.7031 Q398.8438,311.125 398.25,310.8594 Q397.6563,310.5781 397.0313,310.5781 Q395.6875,310.5781 395,311.6563 Q394.3125,312.7188 394.3125,314.8125 Q394.3125,316.9063 395,317.9844 Q395.6875,319.0469 397.0313,319.0469 Q397.6563,319.0469 398.25,318.7813 Q398.8438,318.5 399.4688,317.9219 L399.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="410.5" y="319.1543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0001764732000887030464">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0001764732000887030464" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="388" y="350.4"/>
+        <ellipse cx="403" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M398,367.5563 C398,370.0563 400.1406,371.8688 403.0625,371.8688 C404.2969,371.8688 405.4688,371.5719 406.2188,371.0563 C406.8281,370.6344 407.1563,370.2125 407.1563,369.8063 C407.1563,369.3375 406.7344,368.9313 406.2344,368.9313 C406,368.9313 405.7813,369.0094 405.5781,369.2125 C405.1406,369.65 405.1406,369.65 404.9688,369.7438 C404.5156,369.9781 403.875,370.1188 403.1094,370.1188 C401.1094,370.1188 399.8281,369.1031 399.8281,367.525 L399.8281,366.4781 C399.8281,364.775 401.0469,363.5719 402.75,363.5719 C403.3281,363.5719 403.9063,363.7125 404.375,363.9625 C404.8438,364.2281 405.0156,364.4156 405.0781,364.775 C405.2031,365.4469 405.4531,365.6969 405.9844,365.6969 C406.2656,365.6969 406.5469,365.5563 406.7344,365.3375 C406.8594,365.1656 406.9063,364.9938 406.9063,364.5563 L406.9063,363.1969 C406.9063,362.775 406.8906,362.6344 406.7656,362.4625 C406.5938,362.2125 406.3125,362.0563 405.9844,362.0563 C405.6719,362.0563 405.4688,362.1656 405.25,362.4313 C404.0781,361.9313 403.6406,361.8219 402.6875,361.8219 C400.0156,361.8219 398,363.8375 398,366.4625 L398,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="417" y="371.006">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="430" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="430" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
-      <ellipse cx="472.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M475.4688,320.6406 Q474.8906,320.9375 474.25,321.0781 Q473.6094,321.2344 472.9063,321.2344 Q470.4063,321.2344 469.0781,319.5938 Q467.7656,317.9375 467.7656,314.8125 Q467.7656,311.6875 469.0781,310.0313 Q470.4063,308.375 472.9063,308.375 Q473.6094,308.375 474.25,308.5313 Q474.9063,308.6875 475.4688,308.9844 L475.4688,311.7031 Q474.8438,311.125 474.25,310.8594 Q473.6563,310.5781 473.0313,310.5781 Q471.6875,310.5781 471,311.6563 Q470.3125,312.7188 470.3125,314.8125 Q470.3125,316.9063 471,317.9844 Q471.6875,319.0469 473.0313,319.0469 Q473.6563,319.0469 474.25,318.7813 Q474.8438,318.5 475.4688,317.9219 L475.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="319.1543">H</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <g id="elem_C_0001669285599837552146">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001669285599837552146" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="465.5" y="350.4"/>
+        <ellipse cx="480.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M475.5,367.5563 C475.5,370.0563 477.6406,371.8688 480.5625,371.8688 C481.7969,371.8688 482.9688,371.5719 483.7188,371.0563 C484.3281,370.6344 484.6563,370.2125 484.6563,369.8063 C484.6563,369.3375 484.2344,368.9313 483.7344,368.9313 C483.5,368.9313 483.2813,369.0094 483.0781,369.2125 C482.6406,369.65 482.6406,369.65 482.4688,369.7438 C482.0156,369.9781 481.375,370.1188 480.6094,370.1188 C478.6094,370.1188 477.3281,369.1031 477.3281,367.525 L477.3281,366.4781 C477.3281,364.775 478.5469,363.5719 480.25,363.5719 C480.8281,363.5719 481.4063,363.7125 481.875,363.9625 C482.3438,364.2281 482.5156,364.4156 482.5781,364.775 C482.7031,365.4469 482.9531,365.6969 483.4844,365.6969 C483.7656,365.6969 484.0469,365.5563 484.2344,365.3375 C484.3594,365.1656 484.4063,364.9938 484.4063,364.5563 L484.4063,363.1969 C484.4063,362.775 484.3906,362.6344 484.2656,362.4625 C484.0938,362.2125 483.8125,362.0563 483.4844,362.0563 C483.1719,362.0563 482.9688,362.1656 482.75,362.4313 C481.5781,361.9313 481.1406,361.8219 480.1875,361.8219 C477.5156,361.8219 475.5,363.8375 475.5,366.4625 L475.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="494.5" y="371.006">H</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="466.5" x2="506.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="466.5" x2="506.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
-      <ellipse cx="548.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M551.4688,320.6406 Q550.8906,320.9375 550.25,321.0781 Q549.6094,321.2344 548.9063,321.2344 Q546.4063,321.2344 545.0781,319.5938 Q543.7656,317.9375 543.7656,314.8125 Q543.7656,311.6875 545.0781,310.0313 Q546.4063,308.375 548.9063,308.375 Q549.6094,308.375 550.25,308.5313 Q550.9063,308.6875 551.4688,308.9844 L551.4688,311.7031 Q550.8438,311.125 550.25,310.8594 Q549.6563,310.5781 549.0313,310.5781 Q547.6875,310.5781 547,311.6563 Q546.3125,312.7188 546.3125,314.8125 Q546.3125,316.9063 547,317.9844 Q547.6875,319.0469 549.0313,319.0469 Q549.6563,319.0469 550.25,318.7813 Q550.8438,318.5 551.4688,317.9219 L551.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="562.5" y="319.1543">I</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <g id="elem_C_0002234750598599000377">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0002234750598599000377" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="542.5" y="350.4"/>
+        <ellipse cx="557.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M552.5,367.5563 C552.5,370.0563 554.6406,371.8688 557.5625,371.8688 C558.7969,371.8688 559.9688,371.5719 560.7188,371.0563 C561.3281,370.6344 561.6563,370.2125 561.6563,369.8063 C561.6563,369.3375 561.2344,368.9313 560.7344,368.9313 C560.5,368.9313 560.2813,369.0094 560.0781,369.2125 C559.6406,369.65 559.6406,369.65 559.4688,369.7438 C559.0156,369.9781 558.375,370.1188 557.6094,370.1188 C555.6094,370.1188 554.3281,369.1031 554.3281,367.525 L554.3281,366.4781 C554.3281,364.775 555.5469,363.5719 557.25,363.5719 C557.8281,363.5719 558.4063,363.7125 558.875,363.9625 C559.3438,364.2281 559.5156,364.4156 559.5781,364.775 C559.7031,365.4469 559.9531,365.6969 560.4844,365.6969 C560.7656,365.6969 561.0469,365.5563 561.2344,365.3375 C561.3594,365.1656 561.4063,364.9938 561.4063,364.5563 L561.4063,363.1969 C561.4063,362.775 561.3906,362.6344 561.2656,362.4625 C561.0938,362.2125 560.8125,362.0563 560.4844,362.0563 C560.1719,362.0563 559.9688,362.1656 559.75,362.4313 C558.5781,361.9313 558.1406,361.8219 557.1875,361.8219 C554.5156,361.8219 552.5,363.8375 552.5,366.4625 L552.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="571.5" y="371.006">I</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="543.5" x2="577.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="543.5" x2="577.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
-      <ellipse cx="618.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M621.4688,320.6406 Q620.8906,320.9375 620.25,321.0781 Q619.6094,321.2344 618.9063,321.2344 Q616.4063,321.2344 615.0781,319.5938 Q613.7656,317.9375 613.7656,314.8125 Q613.7656,311.6875 615.0781,310.0313 Q616.4063,308.375 618.9063,308.375 Q619.6094,308.375 620.25,308.5313 Q620.9063,308.6875 621.4688,308.9844 L621.4688,311.7031 Q620.8438,311.125 620.25,310.8594 Q619.6563,310.5781 619.0313,310.5781 Q617.6875,310.5781 617,311.6563 Q616.3125,312.7188 616.3125,314.8125 Q616.3125,316.9063 617,317.9844 Q617.6875,319.0469 619.0313,319.0469 Q619.6563,319.0469 620.25,318.7813 Q620.8438,318.5 621.4688,317.9219 L621.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="632.5" y="319.1543">J</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <g id="elem_C_0001335933649375465369">
+        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0001335933649375465369" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="614" y="350.4"/>
+        <ellipse cx="629" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M624,367.5563 C624,370.0563 626.1406,371.8688 629.0625,371.8688 C630.2969,371.8688 631.4688,371.5719 632.2188,371.0563 C632.8281,370.6344 633.1563,370.2125 633.1563,369.8063 C633.1563,369.3375 632.7344,368.9313 632.2344,368.9313 C632,368.9313 631.7813,369.0094 631.5781,369.2125 C631.1406,369.65 631.1406,369.65 630.9688,369.7438 C630.5156,369.9781 629.875,370.1188 629.1094,370.1188 C627.1094,370.1188 625.8281,369.1031 625.8281,367.525 L625.8281,366.4781 C625.8281,364.775 627.0469,363.5719 628.75,363.5719 C629.3281,363.5719 629.9063,363.7125 630.375,363.9625 C630.8438,364.2281 631.0156,364.4156 631.0781,364.775 C631.2031,365.4469 631.4531,365.6969 631.9844,365.6969 C632.2656,365.6969 632.5469,365.5563 632.7344,365.3375 C632.8594,365.1656 632.9063,364.9938 632.9063,364.5563 L632.9063,363.1969 C632.9063,362.775 632.8906,362.6344 632.7656,362.4625 C632.5938,362.2125 632.3125,362.0563 631.9844,362.0563 C631.6719,362.0563 631.4688,362.1656 631.25,362.4313 C630.0781,361.9313 629.6406,361.8219 628.6875,361.8219 C626.0156,361.8219 624,363.8375 624,366.4625 L624,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="643" y="371.006">J</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="652" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="652" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
-      <ellipse cx="688.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M691.4688,320.6406 Q690.8906,320.9375 690.25,321.0781 Q689.6094,321.2344 688.9063,321.2344 Q686.4063,321.2344 685.0781,319.5938 Q683.7656,317.9375 683.7656,314.8125 Q683.7656,311.6875 685.0781,310.0313 Q686.4063,308.375 688.9063,308.375 Q689.6094,308.375 690.25,308.5313 Q690.9063,308.6875 691.4688,308.9844 L691.4688,311.7031 Q690.8438,311.125 690.25,310.8594 Q689.6563,310.5781 689.0313,310.5781 Q687.6875,310.5781 687,311.6563 Q686.3125,312.7188 686.3125,314.8125 Q686.3125,316.9063 687,317.9844 Q687.6875,319.0469 689.0313,319.0469 Q689.6563,319.0469 690.25,318.7813 Q690.8438,318.5 691.4688,317.9219 L691.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="702.5" y="319.1543">K</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <g id="elem_C_0001603190364864080123">
+        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0001603190364864080123" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="688" y="350.4"/>
+        <ellipse cx="703" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M698,367.5563 C698,370.0563 700.1406,371.8688 703.0625,371.8688 C704.2969,371.8688 705.4688,371.5719 706.2188,371.0563 C706.8281,370.6344 707.1563,370.2125 707.1563,369.8063 C707.1563,369.3375 706.7344,368.9313 706.2344,368.9313 C706,368.9313 705.7813,369.0094 705.5781,369.2125 C705.1406,369.65 705.1406,369.65 704.9688,369.7438 C704.5156,369.9781 703.875,370.1188 703.1094,370.1188 C701.1094,370.1188 699.8281,369.1031 699.8281,367.525 L699.8281,366.4781 C699.8281,364.775 701.0469,363.5719 702.75,363.5719 C703.3281,363.5719 703.9063,363.7125 704.375,363.9625 C704.8438,364.2281 705.0156,364.4156 705.0781,364.775 C705.2031,365.4469 705.4531,365.6969 705.9844,365.6969 C706.2656,365.6969 706.5469,365.5563 706.7344,365.3375 C706.8594,365.1656 706.9063,364.9938 706.9063,364.5563 L706.9063,363.1969 C706.9063,362.775 706.8906,362.6344 706.7656,362.4625 C706.5938,362.2125 706.3125,362.0563 705.9844,362.0563 C705.6719,362.0563 705.4688,362.1656 705.25,362.4313 C704.0781,361.9313 703.6406,361.8219 702.6875,361.8219 C700.0156,361.8219 698,363.8375 698,366.4625 L698,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="717" y="371.006">K</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="689" x2="728" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="689" x2="728" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
-      <ellipse cx="763" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M765.9688,320.6406 Q765.3906,320.9375 764.75,321.0781 Q764.1094,321.2344 763.4063,321.2344 Q760.9063,321.2344 759.5781,319.5938 Q758.2656,317.9375 758.2656,314.8125 Q758.2656,311.6875 759.5781,310.0313 Q760.9063,308.375 763.4063,308.375 Q764.1094,308.375 764.75,308.5313 Q765.4063,308.6875 765.9688,308.9844 L765.9688,311.7031 Q765.3438,311.125 764.75,310.8594 Q764.1563,310.5781 763.5313,310.5781 Q762.1875,310.5781 761.5,311.6563 Q760.8125,312.7188 760.8125,314.8125 Q760.8125,316.9063 761.5,317.9844 Q762.1875,319.0469 763.5313,319.0469 Q764.1563,319.0469 764.75,318.7813 Q765.3438,318.5 765.9688,317.9219 L765.9688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="6" x="777" y="319.1543">L</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <g id="elem_C_0000305487238408320046">
+        <rect codeLine="46" fill="#F1F1F1" height="48" id="C_0000305487238408320046" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="764.5" y="350.4"/>
+        <ellipse cx="779.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M774.5,367.5563 C774.5,370.0563 776.6406,371.8688 779.5625,371.8688 C780.7969,371.8688 781.9688,371.5719 782.7188,371.0563 C783.3281,370.6344 783.6563,370.2125 783.6563,369.8063 C783.6563,369.3375 783.2344,368.9313 782.7344,368.9313 C782.5,368.9313 782.2813,369.0094 782.0781,369.2125 C781.6406,369.65 781.6406,369.65 781.4688,369.7438 C781.0156,369.9781 780.375,370.1188 779.6094,370.1188 C777.6094,370.1188 776.3281,369.1031 776.3281,367.525 L776.3281,366.4781 C776.3281,364.775 777.5469,363.5719 779.25,363.5719 C779.8281,363.5719 780.4063,363.7125 780.875,363.9625 C781.3438,364.2281 781.5156,364.4156 781.5781,364.775 C781.7031,365.4469 781.9531,365.6969 782.4844,365.6969 C782.7656,365.6969 783.0469,365.5563 783.2344,365.3375 C783.3594,365.1656 783.4063,364.9938 783.4063,364.5563 L783.4063,363.1969 C783.4063,362.775 783.3906,362.6344 783.2656,362.4625 C783.0938,362.2125 782.8125,362.0563 782.4844,362.0563 C782.1719,362.0563 781.9688,362.1656 781.75,362.4313 C780.5781,361.9313 780.1406,361.8219 779.1875,361.8219 C776.5156,361.8219 774.5,363.8375 774.5,366.4625 L774.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="793.5" y="371.006">L</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="765.5" x2="803.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="765.5" x2="803.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
-      <ellipse cx="836" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M838.9688,320.6406 Q838.3906,320.9375 837.75,321.0781 Q837.1094,321.2344 836.4063,321.2344 Q833.9063,321.2344 832.5781,319.5938 Q831.2656,317.9375 831.2656,314.8125 Q831.2656,311.6875 832.5781,310.0313 Q833.9063,308.375 836.4063,308.375 Q837.1094,308.375 837.75,308.5313 Q838.4063,308.6875 838.9688,308.9844 L838.9688,311.7031 Q838.3438,311.125 837.75,310.8594 Q837.1563,310.5781 836.5313,310.5781 Q835.1875,310.5781 834.5,311.6563 Q833.8125,312.7188 833.8125,314.8125 Q833.8125,316.9063 834.5,317.9844 Q835.1875,319.0469 836.5313,319.0469 Q837.1563,319.0469 837.75,318.7813 Q838.3438,318.5 838.9688,317.9219 L838.9688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="10" x="850" y="319.1543">M</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <g id="elem_C_0001664744512423723275">
+        <rect codeLine="50" fill="#F1F1F1" height="48" id="C_0001664744512423723275" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="839.5" y="350.4"/>
+        <ellipse cx="854.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M849.5,367.5563 C849.5,370.0563 851.6406,371.8688 854.5625,371.8688 C855.7969,371.8688 856.9688,371.5719 857.7188,371.0563 C858.3281,370.6344 858.6563,370.2125 858.6563,369.8063 C858.6563,369.3375 858.2344,368.9313 857.7344,368.9313 C857.5,368.9313 857.2813,369.0094 857.0781,369.2125 C856.6406,369.65 856.6406,369.65 856.4688,369.7438 C856.0156,369.9781 855.375,370.1188 854.6094,370.1188 C852.6094,370.1188 851.3281,369.1031 851.3281,367.525 L851.3281,366.4781 C851.3281,364.775 852.5469,363.5719 854.25,363.5719 C854.8281,363.5719 855.4063,363.7125 855.875,363.9625 C856.3438,364.2281 856.5156,364.4156 856.5781,364.775 C856.7031,365.4469 856.9531,365.6969 857.4844,365.6969 C857.7656,365.6969 858.0469,365.5563 858.2344,365.3375 C858.3594,365.1656 858.4063,364.9938 858.4063,364.5563 L858.4063,363.1969 C858.4063,362.775 858.3906,362.6344 858.2656,362.4625 C858.0938,362.2125 857.8125,362.0563 857.4844,362.0563 C857.1719,362.0563 856.9688,362.1656 856.75,362.4313 C855.5781,361.9313 855.1406,361.8219 854.1875,361.8219 C851.5156,361.8219 849.5,363.8375 849.5,366.4625 L849.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12" x="868.5" y="371.006">M</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="840.5" x2="882.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="840.5" x2="882.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
-      <ellipse cx="913.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M916.4688,320.6406 Q915.8906,320.9375 915.25,321.0781 Q914.6094,321.2344 913.9063,321.2344 Q911.4063,321.2344 910.0781,319.5938 Q908.7656,317.9375 908.7656,314.8125 Q908.7656,311.6875 910.0781,310.0313 Q911.4063,308.375 913.9063,308.375 Q914.6094,308.375 915.25,308.5313 Q915.9063,308.6875 916.4688,308.9844 L916.4688,311.7031 Q915.8438,311.125 915.25,310.8594 Q914.6563,310.5781 914.0313,310.5781 Q912.6875,310.5781 912,311.6563 Q911.3125,312.7188 911.3125,314.8125 Q911.3125,316.9063 912,317.9844 Q912.6875,319.0469 914.0313,319.0469 Q914.6563,319.0469 915.25,318.7813 Q915.8438,318.5 916.4688,317.9219 L916.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="927.5" y="319.1543">N</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <g id="elem_C_0000950210019792152600">
+        <rect codeLine="54" fill="#F1F1F1" height="48" id="C_0000950210019792152600" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="918.5" y="350.4"/>
+        <ellipse cx="933.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M928.5,367.5563 C928.5,370.0563 930.6406,371.8688 933.5625,371.8688 C934.7969,371.8688 935.9688,371.5719 936.7188,371.0563 C937.3281,370.6344 937.6563,370.2125 937.6563,369.8063 C937.6563,369.3375 937.2344,368.9313 936.7344,368.9313 C936.5,368.9313 936.2813,369.0094 936.0781,369.2125 C935.6406,369.65 935.6406,369.65 935.4688,369.7438 C935.0156,369.9781 934.375,370.1188 933.6094,370.1188 C931.6094,370.1188 930.3281,369.1031 930.3281,367.525 L930.3281,366.4781 C930.3281,364.775 931.5469,363.5719 933.25,363.5719 C933.8281,363.5719 934.4063,363.7125 934.875,363.9625 C935.3438,364.2281 935.5156,364.4156 935.5781,364.775 C935.7031,365.4469 935.9531,365.6969 936.4844,365.6969 C936.7656,365.6969 937.0469,365.5563 937.2344,365.3375 C937.3594,365.1656 937.4063,364.9938 937.4063,364.5563 L937.4063,363.1969 C937.4063,362.775 937.3906,362.6344 937.2656,362.4625 C937.0938,362.2125 936.8125,362.0563 936.4844,362.0563 C936.1719,362.0563 935.9688,362.1656 935.75,362.4313 C934.5781,361.9313 934.1406,361.8219 933.1875,361.8219 C930.5156,361.8219 928.5,363.8375 928.5,366.4625 L928.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="947.5" y="371.006">N</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="919.5" x2="959.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="919.5" x2="959.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
-      <ellipse cx="990" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M992.9688,320.6406 Q992.3906,320.9375 991.75,321.0781 Q991.1094,321.2344 990.4063,321.2344 Q987.9063,321.2344 986.5781,319.5938 Q985.2656,317.9375 985.2656,314.8125 Q985.2656,311.6875 986.5781,310.0313 Q987.9063,308.375 990.4063,308.375 Q991.1094,308.375 991.75,308.5313 Q992.4063,308.6875 992.9688,308.9844 L992.9688,311.7031 Q992.3438,311.125 991.75,310.8594 Q991.1563,310.5781 990.5313,310.5781 Q989.1875,310.5781 988.5,311.6563 Q987.8125,312.7188 987.8125,314.8125 Q987.8125,316.9063 988.5,317.9844 Q989.1875,319.0469 990.5313,319.0469 Q991.1563,319.0469 991.75,318.7813 Q992.3438,318.5 992.9688,317.9219 L992.9688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="1004" y="319.1543">NN</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <g id="elem_C_0001662349735899726224">
+        <rect codeLine="58" fill="#F1F1F1" height="48" id="C_0001662349735899726224" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="52" x="995.5" y="350.4"/>
+        <ellipse cx="1010.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1005.5,367.5563 C1005.5,370.0563 1007.6406,371.8688 1010.5625,371.8688 C1011.7969,371.8688 1012.9688,371.5719 1013.7188,371.0563 C1014.3281,370.6344 1014.6563,370.2125 1014.6563,369.8063 C1014.6563,369.3375 1014.2344,368.9313 1013.7344,368.9313 C1013.5,368.9313 1013.2813,369.0094 1013.0781,369.2125 C1012.6406,369.65 1012.6406,369.65 1012.4688,369.7438 C1012.0156,369.9781 1011.375,370.1188 1010.6094,370.1188 C1008.6094,370.1188 1007.3281,369.1031 1007.3281,367.525 L1007.3281,366.4781 C1007.3281,364.775 1008.5469,363.5719 1010.25,363.5719 C1010.8281,363.5719 1011.4063,363.7125 1011.875,363.9625 C1012.3438,364.2281 1012.5156,364.4156 1012.5781,364.775 C1012.7031,365.4469 1012.9531,365.6969 1013.4844,365.6969 C1013.7656,365.6969 1014.0469,365.5563 1014.2344,365.3375 C1014.3594,365.1656 1014.4063,364.9938 1014.4063,364.5563 L1014.4063,363.1969 C1014.4063,362.775 1014.3906,362.6344 1014.2656,362.4625 C1014.0938,362.2125 1013.8125,362.0563 1013.4844,362.0563 C1013.1719,362.0563 1012.9688,362.1656 1012.75,362.4313 C1011.5781,361.9313 1011.1406,361.8219 1010.1875,361.8219 C1007.5156,361.8219 1005.5,363.8375 1005.5,366.4625 L1005.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="1024.5" y="371.006">NN</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="996.5" x2="1046.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="996.5" x2="1046.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
-      <ellipse cx="1075.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1078.4688,320.6406 Q1077.8906,320.9375 1077.25,321.0781 Q1076.6094,321.2344 1075.9063,321.2344 Q1073.4063,321.2344 1072.0781,319.5938 Q1070.7656,317.9375 1070.7656,314.8125 Q1070.7656,311.6875 1072.0781,310.0313 Q1073.4063,308.375 1075.9063,308.375 Q1076.6094,308.375 1077.25,308.5313 Q1077.9063,308.6875 1078.4688,308.9844 L1078.4688,311.7031 Q1077.8438,311.125 1077.25,310.8594 Q1076.6563,310.5781 1076.0313,310.5781 Q1074.6875,310.5781 1074,311.6563 Q1073.3125,312.7188 1073.3125,314.8125 Q1073.3125,316.9063 1074,317.9844 Q1074.6875,319.0469 1076.0313,319.0469 Q1076.6563,319.0469 1077.25,318.7813 Q1077.8438,318.5 1078.4688,317.9219 L1078.4688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1089.5" y="319.1543">NNN</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="331" y2="331"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="339" y2="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <g id="elem_C_0001963145075481599858">
+        <rect codeLine="62" fill="#F1F1F1" height="48" id="C_0001963145075481599858" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="1082.5" y="350.4"/>
+        <ellipse cx="1097.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1092.5,367.5563 C1092.5,370.0563 1094.6406,371.8688 1097.5625,371.8688 C1098.7969,371.8688 1099.9688,371.5719 1100.7188,371.0563 C1101.3281,370.6344 1101.6563,370.2125 1101.6563,369.8063 C1101.6563,369.3375 1101.2344,368.9313 1100.7344,368.9313 C1100.5,368.9313 1100.2813,369.0094 1100.0781,369.2125 C1099.6406,369.65 1099.6406,369.65 1099.4688,369.7438 C1099.0156,369.9781 1098.375,370.1188 1097.6094,370.1188 C1095.6094,370.1188 1094.3281,369.1031 1094.3281,367.525 L1094.3281,366.4781 C1094.3281,364.775 1095.5469,363.5719 1097.25,363.5719 C1097.8281,363.5719 1098.4063,363.7125 1098.875,363.9625 C1099.3438,364.2281 1099.5156,364.4156 1099.5781,364.775 C1099.7031,365.4469 1099.9531,365.6969 1100.4844,365.6969 C1100.7656,365.6969 1101.0469,365.5563 1101.2344,365.3375 C1101.3594,365.1656 1101.4063,364.9938 1101.4063,364.5563 L1101.4063,363.1969 C1101.4063,362.775 1101.3906,362.6344 1101.2656,362.4625 C1101.0938,362.2125 1100.8125,362.0563 1100.4844,362.0563 C1100.1719,362.0563 1099.9688,362.1656 1099.75,362.4313 C1098.5781,361.9313 1098.1406,361.8219 1097.1875,361.8219 C1094.5156,361.8219 1092.5,363.8375 1092.5,366.4625 L1092.5,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="1111.5" y="371.006">NNN</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1083.5" x2="1143.5" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1083.5" x2="1143.5" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
-      <ellipse cx="1236.5" cy="424" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1239.4688,429.6406 Q1238.8906,429.9375 1238.25,430.0781 Q1237.6094,430.2344 1236.9063,430.2344 Q1234.4063,430.2344 1233.0781,428.5938 Q1231.7656,426.9375 1231.7656,423.8125 Q1231.7656,420.6875 1233.0781,419.0313 Q1234.4063,417.375 1236.9063,417.375 Q1237.6094,417.375 1238.25,417.5313 Q1238.9063,417.6875 1239.4688,417.9844 L1239.4688,420.7031 Q1238.8438,420.125 1238.25,419.8594 Q1237.6563,419.5781 1237.0313,419.5781 Q1235.6875,419.5781 1235,420.6563 Q1234.3125,421.7188 1234.3125,423.8125 Q1234.3125,425.9063 1235,426.9844 Q1235.6875,428.0469 1237.0313,428.0469 Q1237.6563,428.0469 1238.25,427.7813 Q1238.8438,427.5 1239.4688,426.9219 L1239.4688,429.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1250.5" y="428.1543">custom_container</text>
-      <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"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="448" y2="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <g id="elem_C_0000916380191954937631">
+        <rect codeLine="66" fill="#F1F1F1" height="64.7999" id="C_0000916380191954937631" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="1247" y="459.4"/>
+        <ellipse cx="1262.45" cy="475.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1257.45,476.5563 C1257.45,479.0563 1259.5906,480.8688 1262.5125,480.8688 C1263.7469,480.8688 1264.9188,480.5719 1265.6688,480.0563 C1266.2781,479.6344 1266.6063,479.2125 1266.6063,478.8063 C1266.6063,478.3375 1266.1844,477.9313 1265.6844,477.9313 C1265.45,477.9313 1265.2313,478.0094 1265.0281,478.2125 C1264.5906,478.65 1264.5906,478.65 1264.4188,478.7438 C1263.9656,478.9781 1263.325,479.1188 1262.5594,479.1188 C1260.5594,479.1188 1259.2781,478.1031 1259.2781,476.525 L1259.2781,475.4781 C1259.2781,473.775 1260.4969,472.5719 1262.2,472.5719 C1262.7781,472.5719 1263.3563,472.7125 1263.825,472.9625 C1264.2938,473.2281 1264.4656,473.4156 1264.5281,473.775 C1264.6531,474.4469 1264.9031,474.6969 1265.4344,474.6969 C1265.7156,474.6969 1265.9969,474.5563 1266.1844,474.3375 C1266.3094,474.1656 1266.3563,473.9938 1266.3563,473.5563 L1266.3563,472.1969 C1266.3563,471.775 1266.3406,471.6344 1266.2156,471.4625 C1266.0438,471.2125 1265.7625,471.0563 1265.4344,471.0563 C1265.1219,471.0563 1264.9188,471.1656 1264.7,471.4313 C1263.5281,470.9313 1263.0906,470.8219 1262.1375,470.8219 C1259.4656,470.8219 1257.45,472.8375 1257.45,475.4625 L1257.45,476.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="1276.55" y="480.006">custom_container</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1398" y="456.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1399" y="470.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1248" x2="1403" y1="491.4" y2="491.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1248" x2="1403" y1="499.4" y2="499.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1253" y="508.3"/>
+          <ellipse cx="1258" cy="513.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="1267" y="516.4059">data : std::vector&lt;T&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1227.5" y="454"/>
-      <ellipse cx="1232.5" cy="459" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <g id="elem_C_0000050153113082434858">
+        <rect codeLine="71" fill="#F1F1F1" height="48" id="C_0000050153113082434858" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="1180" y="350.4"/>
+        <ellipse cx="1195" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1190,367.5563 C1190,370.0563 1192.1406,371.8688 1195.0625,371.8688 C1196.2969,371.8688 1197.4688,371.5719 1198.2188,371.0563 C1198.8281,370.6344 1199.1563,370.2125 1199.1563,369.8063 C1199.1563,369.3375 1198.7344,368.9313 1198.2344,368.9313 C1198,368.9313 1197.7813,369.0094 1197.5781,369.2125 C1197.1406,369.65 1197.1406,369.65 1196.9688,369.7438 C1196.5156,369.9781 1195.875,370.1188 1195.1094,370.1188 C1193.1094,370.1188 1191.8281,369.1031 1191.8281,367.525 L1191.8281,366.4781 C1191.8281,364.775 1193.0469,363.5719 1194.75,363.5719 C1195.3281,363.5719 1195.9063,363.7125 1196.375,363.9625 C1196.8438,364.2281 1197.0156,364.4156 1197.0781,364.775 C1197.2031,365.4469 1197.4531,365.6969 1197.9844,365.6969 C1198.2656,365.6969 1198.5469,365.5563 1198.7344,365.3375 C1198.8594,365.1656 1198.9063,364.9938 1198.9063,364.5563 L1198.9063,363.1969 C1198.9063,362.775 1198.8906,362.6344 1198.7656,362.4625 C1198.5938,362.2125 1198.3125,362.0563 1197.9844,362.0563 C1197.6719,362.0563 1197.4688,362.1656 1197.25,362.4313 C1196.0781,361.9313 1195.6406,361.8219 1194.6875,361.8219 C1192.0156,361.8219 1190,363.8375 1190,366.4625 L1190,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="1209" y="371.006">custom_container</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="10" x="1330" y="347.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="8" x="1331" y="361.6001">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1181" x2="1336" y1="382.4" y2="382.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1181" x2="1336" y1="390.4" y2="390.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="1241.5" y="462.2104">data : std::vector&lt;T&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000303025561016882526">
+        <rect codeLine="75" fill="#F1F1F1" height="266.399" id="C_0000303025561016882526" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="477.5" y="7"/>
+        <ellipse cx="587.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M582.25,24.1563 C582.25,26.6563 584.3906,28.4688 587.3125,28.4688 C588.5469,28.4688 589.7188,28.1719 590.4688,27.6563 C591.0781,27.2344 591.4063,26.8125 591.4063,26.4063 C591.4063,25.9375 590.9844,25.5313 590.4844,25.5313 C590.25,25.5313 590.0313,25.6094 589.8281,25.8125 C589.3906,26.25 589.3906,26.25 589.2188,26.3438 C588.7656,26.5781 588.125,26.7188 587.3594,26.7188 C585.3594,26.7188 584.0781,25.7031 584.0781,24.125 L584.0781,23.0781 C584.0781,21.375 585.2969,20.1719 587,20.1719 C587.5781,20.1719 588.1563,20.3125 588.625,20.5625 C589.0938,20.8281 589.2656,21.0156 589.3281,21.375 C589.4531,22.0469 589.7031,22.2969 590.2344,22.2969 C590.5156,22.2969 590.7969,22.1563 590.9844,21.9375 C591.1094,21.7656 591.1563,21.5938 591.1563,21.1563 L591.1563,19.7969 C591.1563,19.375 591.1406,19.2344 591.0156,19.0625 C590.8438,18.8125 590.5625,18.6563 590.2344,18.6563 C589.9219,18.6563 589.7188,18.7656 589.5,19.0313 C588.3281,18.5313 587.8906,18.4219 586.9375,18.4219 C584.2656,18.4219 582.25,20.4375 582.25,23.0625 L582.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="607.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="714.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="714.5" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="55.9"/>
+          <ellipse cx="488.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="497.5" y="64.0059">a : std::vector&lt;A&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="72.6999"/>
+          <ellipse cx="488.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="497.5" y="80.8059">b : std::vector&lt;B *&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="89.4998"/>
+          <ellipse cx="488.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="497.5" y="97.6058">c : std::map&lt;int,C&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="106.2997"/>
+          <ellipse cx="488.5" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="497.5" y="114.4057">d : std::map&lt;int,D *&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="123.0997"/>
+          <ellipse cx="488.5" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="158" x="497.5" y="131.2057">e : custom_container&lt;E&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="139.8996"/>
+          <ellipse cx="488.5" cy="144.8996" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="497.5" y="148.0056">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="156.6995"/>
+          <ellipse cx="488.5" cy="161.6995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="212" x="497.5" y="164.8055">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="173.4995"/>
+          <ellipse cx="488.5" cy="178.4995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="497.5" y="181.6054">h : std::array&lt;H,10&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="190.2994"/>
+          <ellipse cx="488.5" cy="195.2994" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="497.5" y="198.4054">i : std::array&lt;I *,5&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="207.0993"/>
+          <ellipse cx="488.5" cy="212.0993" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="497.5" y="215.2053">j : J[10]</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="223.8992"/>
+          <ellipse cx="488.5" cy="228.8992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="497.5" y="232.0052">k : K *[20]</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="240.6992"/>
+          <ellipse cx="488.5" cy="245.6992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="497.5" y="248.8051">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="257.4991"/>
+          <ellipse cx="488.5" cy="262.4991" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169" x="497.5" y="265.6051">ns : std::tuple&lt;N,NN,NNN&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
-      <ellipse cx="1170" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1172.9688,320.6406 Q1172.3906,320.9375 1171.75,321.0781 Q1171.1094,321.2344 1170.4063,321.2344 Q1167.9063,321.2344 1166.5781,319.5938 Q1165.2656,317.9375 1165.2656,314.8125 Q1165.2656,311.6875 1166.5781,310.0313 Q1167.9063,308.375 1170.4063,308.375 Q1171.1094,308.375 1171.75,308.5313 Q1172.4063,308.6875 1172.9688,308.9844 L1172.9688,311.7031 Q1172.3438,311.125 1171.75,310.8594 Q1171.1563,310.5781 1170.5313,310.5781 Q1169.1875,310.5781 1168.5,311.6563 Q1167.8125,312.7188 1167.8125,314.8125 Q1167.8125,316.9063 1168.5,317.9844 Q1169.1875,319.0469 1170.5313,319.0469 Q1171.1563,319.0469 1171.75,318.7813 Q1172.3438,318.5 1172.9688,317.9219 L1172.9688,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1184" y="319.1543">custom_container</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1muhz7wfjgbei)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
-      <ellipse cx="577.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M580.7188,29.6406 Q580.1406,29.9375 579.5,30.0781 Q578.8594,30.2344 578.1563,30.2344 Q575.6563,30.2344 574.3281,28.5938 Q573.0156,26.9375 573.0156,23.8125 Q573.0156,20.6875 574.3281,19.0313 Q575.6563,17.375 578.1563,17.375 Q578.8594,17.375 579.5,17.5313 Q580.1563,17.6875 580.7188,17.9844 L580.7188,20.7031 Q580.0938,20.125 579.5,19.8594 Q578.9063,19.5781 578.2813,19.5781 Q576.9375,19.5781 576.25,20.6563 Q575.5625,21.7188 575.5625,23.8125 Q575.5625,25.9063 576.25,26.9844 Q576.9375,28.0469 578.2813,28.0469 Q578.9063,28.0469 579.5,27.7813 Q580.0938,27.5 580.7188,26.9219 L580.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="598.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="54"/>
-      <ellipse cx="482" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="491" y="62.2104">a : std::vector&lt;A&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="66.8047"/>
-      <ellipse cx="482" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="491" y="75.0151">b : std::vector&lt;B *&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="79.6094"/>
-      <ellipse cx="482" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="87.8198">c : std::map&lt;int,C&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="92.4141"/>
-      <ellipse cx="482" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="124" x="491" y="100.6245">d : std::map&lt;int,D *&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="105.2188"/>
-      <ellipse cx="482" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="491" y="113.4292">e : custom_container&lt;E&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="118.0234"/>
-      <ellipse cx="482" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="180" x="491" y="126.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="130.8281"/>
-      <ellipse cx="482" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="491" y="139.0386">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="143.6328"/>
-      <ellipse cx="482" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="491" y="151.8433">h : std::array&lt;H,10&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="156.4375"/>
-      <ellipse cx="482" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="164.6479">i : std::array&lt;I *,5&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="169.2422"/>
-      <ellipse cx="482" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="491" y="177.4526">j : J[10]</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="182.0469"/>
-      <ellipse cx="482" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="491" y="190.2573">k : K *[20]</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="194.8516"/>
-      <ellipse cx="482" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="491" y="203.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="207.6563"/>
-      <ellipse cx="482" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="491" y="215.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text>
-    </a>
-    <path d="M1219.28,347.24 C1208.62,365.3 1193.8,390.41 1182.5,409.56 " fill="none" id="C_0000050153113082434858-&gt;C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <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;"/>
-    <path d="M1246.52,347.24 C1253.75,359.69 1262.94,375.49 1271.6,390.38 " fill="none" id="C_0000050153113082434858-&gt;C_0000916380191954937631" 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;"/>
-    <path d="M458.29,155.44 C376.7,181.33 268.96,216.8 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_0000303025561016882526&lt;-C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="470.89,151.45,463.9642,149.4417,459.4466,155.0623,466.3724,157.0706,470.89,151.45" 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>
-    <path d="M470.77,160.82 C404.5,186.88 319.81,220.66 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_0000303025561016882526-&gt;C_0000648285260245005311" 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>
-    <path d="M458.79,175.2 C386.27,209.78 294.14,255.14 214,299 C208.18,302.18 201.98,305.82 196.32,309.25 " fill="none" id="C_0000303025561016882526&lt;-C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="470.71,169.52,463.5735,168.4851,459.8735,174.6746,467.0099,175.7095,470.71,169.52" 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>
-    <path d="M470.59,187.18 C400.73,230.27 317.51,281.59 276.85,306.67 " fill="none" id="C_0000303025561016882526-&gt;C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="272.58,309.31,282.3425,308.0089,276.8407,306.6935,278.1561,301.1917,272.58,309.31" 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>
-    <path d="M713.81,155.54 C800.34,182.44 917.17,218.99 1020,252 C1068,267.41 1121.94,285.14 1163.53,298.9 " fill="none" id="C_0000303025561016882526&lt;-C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="701.27,151.65,705.813,157.2501,712.7296,155.2105,708.1866,149.6104,701.27,151.65" 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>
-    <path d="M460.61,215.73 C416.52,250.8 371.79,286.38 346.9,306.17 " fill="none" id="C_0000303025561016882526&lt;-C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="470.89,207.55,463.7046,208.1587,461.5029,215.0254,468.6882,214.4168,470.89,207.55" 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>
-    <path d="M491.31,222.02 C467.24,248.96 443.42,275.63 426.44,294.64 " fill="none" id="C_0000303025561016882526-&gt;C_0001764732000887030464" 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>
-    <path d="M524.21,233.86 C511.21,258.66 498.82,282.28 490.15,298.82 " fill="none" id="C_0000303025561016882526&lt;-C_0001669285599837552146" 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>
-    <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_0000303025561016882526-&gt;C_0002234750598599000377" 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>
-    <path d="M606.2,234.87 C610.35,259.3 614.29,282.51 617.06,298.82 " fill="none" id="C_0000303025561016882526&lt;-C_0001335933649375465369" 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>
-    <path d="M641.07,222.02 C654.95,248.74 668.68,275.18 678.54,294.16 " fill="none" id="C_0000303025561016882526-&gt;C_0001603190364864080123" 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>
-    <path d="M688.02,232.11 C711.05,258.33 733.08,283.39 747.99,300.36 " fill="none" id="C_0000303025561016882526&lt;-C_0000305487238408320046" 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>
-    <path d="M711.74,215.61 C727.02,227.83 742.39,240.17 757,252 C778.84,269.68 803.63,290.14 820.77,304.35 " fill="none" id="C_0000303025561016882526&lt;-C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="701.19,207.18,703.3811,214.0501,710.5656,214.6699,708.3744,207.7998,701.19,207.18" 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>
-    <path d="M712.39,189.86 C745.64,209.71 781.34,231.39 814,252 C843.65,270.71 877.25,293.37 898.28,307.74 " fill="none" id="C_0000303025561016882526&lt;-C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="701.21,183.2,704.3166,189.7076,711.5185,189.3429,708.4119,182.8353,701.21,183.2" 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>
-    <path d="M713.07,172.33 C764.72,195.97 824.69,224.35 878,252 C912.03,269.65 950.21,291.98 974.65,306.61 " fill="none" id="C_0000303025561016882526&lt;-C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="701.15,166.9,704.947,173.0305,712.0663,171.8835,708.2693,165.753,701.15,166.9" 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>
-    <path d="M713.66,161.01 C783,186.26 869.88,219.2 946,252 C986.21,269.32 1031.45,291.83 1060.31,306.58 " fill="none" id="C_0000303025561016882526&lt;-C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="701.37,156.54,705.6494,162.344,712.6529,160.6261,708.3735,154.8221,701.37,156.54" 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>
+    <g id="link_C_0000050153113082434858_C_0001092550394020578978">
+      <path codeLine="91" d="M1244.94,398.75 C1233.32,418.77 1219.6731,442.2814 1208.0531,462.2914 " fill="none" id="C_0000050153113082434858-to-C_0001092550394020578978" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1205.04,467.48,1213.0187,461.7058,1207.5509,463.1562,1206.1005,457.6884,1205.04,467.48" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000050153113082434858_C_0000916380191954937631">
+      <path codeLine="92" d="M1272.06,398.75 C1282.15,416.14 1287.0118,424.5037 1298.1018,443.6037 " fill="none" id="C_0000050153113082434858-to-C_0000916380191954937631" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="1307.14,459.17,1303.2905,440.5909,1292.913,446.6164,1307.14,459.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0000989095304444672400">
+      <path codeLine="93" d="M466.188,190.5667 C382.138,222.6267 278.24,262.77 177.5,303.4 C127.43,323.59 113.61,325.91 65.5,350.4 C59.86,353.27 53.94,356.66 48.49,359.94 " fill="none" id="C_0000303025561016882526-backto-C_0000989095304444672400" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="477.4,186.29,470.3684,184.691,466.188,190.5667,473.2196,192.1657,477.4,186.29" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="178.5" y="316.477">+a</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0000648285260245005311">
+      <path codeLine="94" d="M477.35,191.56 C384.51,231.86 253.07,291.23 141.5,350.4 C135.78,353.43 134.8552,353.8467 129.2952,357.2067 " fill="none" id="C_0000303025561016882526-to-C_0000648285260245005311" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="124.16,360.31,133.9316,359.0785,128.4393,357.724,129.7939,352.2317,124.16,360.31" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="228.5" y="316.477">+b</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0000323304333007297774">
+      <path codeLine="95" d="M466.7564,211.8566 C392.1164,252.7566 304.62,301.18 218.5,350.4 C212.77,353.68 206.6,357.28 200.89,360.64 " fill="none" id="C_0000303025561016882526-backto-C_0000323304333007297774" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="477.28,206.09,470.096,205.4654,466.7564,211.8566,473.9404,212.4812,477.28,206.09" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="302.5" y="316.477">+c</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0001006912399043633492">
+      <path codeLine="96" d="M477.11,222.74 C404.01,272.66 322.1444,328.5657 282.7644,355.4657 " fill="none" id="C_0000303025561016882526-to-C_0001006912399043633492" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="277.81,358.85,287.4979,357.0765,281.9387,356.0297,282.9854,350.4706,277.81,358.85" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="358.5" y="316.477">+d</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0000050153113082434858">
+      <path codeLine="97" d="M727.3238,187.0913 C866.6138,235.9413 1080.55,310.98 1191.87,350.03 " fill="none" id="C_0000303025561016882526-backto-C_0000050153113082434858" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="716,183.12,720.3381,188.8803,727.3238,187.0913,722.9857,181.3311,716,183.12" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1100.5" y="316.477">+e</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0000965398761810782236">
+      <path codeLine="98" d="M468.2299,254.0158 C420.9499,295.6058 380.48,331.2 353.37,355.04 " fill="none" id="C_0000303025561016882526-backto-C_0000965398761810782236" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="477.24,246.09,470.093,247.0495,468.2299,254.0158,475.3769,253.0563,477.24,246.09" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="412.5" y="316.477">+f</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0001764732000887030464">
+      <path codeLine="99" d="M489.89,273.58 C466.1,303.11 447.2336,326.5472 432.0836,345.3572 " fill="none" id="C_0000303025561016882526-to-C_0001764732000887030464" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="428.32,350.03,437.0806,345.5298,431.4563,346.136,430.8502,340.5117,428.32,350.03" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="466.5" y="316.477">+g</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0001669285599837552146">
+      <path codeLine="100" d="M528.6523,284.4246 C514.6623,313.9546 506.48,331.22 497.57,350.03 " fill="none" id="C_0000303025561016882526-backto-C_0001669285599837552146" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="533.79,273.58,527.6063,277.2897,528.6523,284.4246,534.836,280.7148,533.79,273.58" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="520.5" y="316.477">+h</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0002234750598599000377">
+      <path codeLine="101" d="M575.98,273.58 C571.4,303.11 567.9604,325.291 565.0404,344.101 " fill="none" id="C_0000303025561016882526-to-C_0002234750598599000377" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="564.12,350.03,569.4533,341.7501,564.887,345.0892,561.5479,340.5229,564.12,350.03" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="572.5" y="316.477">+i</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0001335933649375465369">
+      <path codeLine="102" d="M619.4801,285.4302 C624.1901,314.9602 626.78,331.22 629.78,350.03 " fill="none" id="C_0000303025561016882526-backto-C_0001335933649375465369" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="617.59,273.58,614.585,280.1351,619.4801,285.4302,622.4851,278.8751,617.59,273.58" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="626.5" y="316.477">+j</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0001603190364864080123">
+      <path codeLine="103" d="M660.35,273.58 C674.6,303.11 685.5417,325.8166 694.6217,344.6266 " fill="none" id="C_0000303025561016882526-to-C_0001603190364864080123" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="697.23,350.03,696.9198,340.186,695.0564,345.5272,689.7152,343.6638,697.23,350.03" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="682.5" y="316.477">+k</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0000305487238408320046">
+      <path codeLine="104" d="M711.2313,282.9062 C735.1413,312.4362 750.35,331.22 765.58,350.03 " fill="none" id="C_0000303025561016882526-backto-C_0000305487238408320046" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="703.68,273.58,704.3469,280.7602,711.2313,282.9062,710.5644,275.726,703.68,273.58" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="745.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="752.5" y="316.477">lm</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0001664744512423723275">
+      <path codeLine="105" d="M724.8453,253.6585 C771.5553,294.5885 811.44,329.54 839.04,353.72 " fill="none" id="C_0000303025561016882526-backto-C_0001664744512423723275" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="715.82,245.75,717.6965,252.7127,724.8453,253.6585,722.9688,246.6958,715.82,245.75" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="803.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="810.5" y="316.477">lm</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0000950210019792152600">
+      <path codeLine="106" d="M725.9171,228.8172 C799.9671,278.9472 878.37,332.02 918.19,358.97 " fill="none" id="C_0000303025561016882526-backto-C_0000950210019792152600" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="715.98,222.09,718.7062,228.7659,725.9171,228.8172,723.1909,222.1412,715.98,222.09" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="863.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="870.5" y="316.477">ns</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0001662349735899726224">
+      <path codeLine="107" d="M726.2624,212.0506 C780.5124,241.6706 834.99,271.42 893.5,303.4 C928.62,322.59 969.14,344.76 995.03,358.92 " fill="none" id="C_0000303025561016882526-backto-C_0001662349735899726224" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="715.73,206.3,719.0793,212.6861,726.2624,212.0506,722.913,205.6645,715.73,206.3" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="928.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="935.5" y="316.477">ns</text>
+    </g>
+    <g id="link_C_0000303025561016882526_C_0001963145075481599858">
+      <path codeLine="108" d="M726.5227,198.5481 C821.2727,240.4981 946.17,296.19 1064.5,350.4 C1070.22,353.02 1076.31,355.85 1082.17,358.59 " fill="none" id="C_0000303025561016882526-backto-C_0001963145075481599858" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="715.55,193.69,719.417,199.7766,726.5227,198.5481,722.6557,192.4615,715.55,193.69" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="994.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="1001.5" y="316.477">ns</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00006_class_mermaid.svg b/docs/test_cases/t00006_class_mermaid.svg
index 6476f4a6..76109ab0 100644
--- a/docs/test_cases/t00006_class_mermaid.svg
+++ b/docs/test_cases/t00006_class_mermaid.svg
@@ -1,73 +1,78 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1446.88671875 613" style="max-width: 1446.89px; background-color: white;" width="1446.88671875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1230.6285411799065,476L1224.652039524922,480.1666666666667C1218.6755378699377,484.3333333333333,1206.7225345599688,492.6666666666667,1200.7460329049843,502.8333333333333C1194.76953125,513,1194.76953125,525,1194.76953125,531L1194.76953125,537"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1312.3870838200935,476L1318.363585475078,480.1666666666667C1324.3400871300623,484.3333333333333,1336.2930904400312,492.6666666666667,1342.2695920950157,501C1348.24609375,509.3333333333333,1348.24609375,517.6666666666666,1348.24609375,521.8333333333334L1348.24609375,526"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M456.82421875,227.2368645730771L384.2337239583333,253.53072047756424C311.6432291666667,279.8245763820514,166.46223958333334,332.4122881910257,93.87174479166667,364.37281076217954C21.28125,396.3333333333333,21.28125,407.6666666666667,21.28125,413.3333333333333L21.28125,419"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M456.82421875,234.68405406050766L396.994140625,259.7367117170897C337.1640625,284.7893693736718,217.50390625,334.8946846868359,157.673828125,365.6140090100846C97.84375,396.3333333333333,97.84375,407.6666666666667,97.84375,413.3333333333333L97.84375,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M456.82421875,244.8843375425559L409.7545572916667,268.2369479521299C362.6848958333333,291.58955836170395,268.5455729166667,338.29477918085195,221.47591145833334,367.31405625709266C174.40625,396.3333333333333,174.40625,407.6666666666667,174.40625,413.3333333333333L174.40625,419"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M456.82421875,259.7105464095237L422.5149739583333,280.59212200793644C388.2057291666667,301.47369760634916,319.5872395833333,343.23684880317455,285.2779947916667,369.78509106825396C250.96875,396.3333333333333,250.96875,407.6666666666667,250.96875,413.3333333333333L250.96875,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M720.40234375,219.1586165277627L812.2532552083334,246.7988471064689C904.1041666666666,274.4390776851751,1087.8059895833333,329.71953884258755,1179.6569010416667,363.02643608796046C1271.5078125,396.3333333333333,1271.5078125,407.6666666666667,1271.5078125,413.3333333333333L1271.5078125,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M456.82421875,282.8796913442183L435.126953125,299.8997427868486C413.4296875,316.9197942294789,370.03515625,350.9598971147395,348.337890625,373.6466152240364C326.640625,396.3333333333333,326.640625,407.6666666666667,326.640625,413.3333333333333L326.640625,419"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M456.82421875,325.21888858530025L447.8131510416667,335.18240715441686C438.8020833333333,345.1459257235335,420.7799479166667,365.0729628617667,411.7688802083333,380.70314809755C402.7578125,396.3333333333333,402.7578125,407.6666666666667,402.7578125,413.3333333333333L402.7578125,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M497.77448296836985,351L494.7730066403082,356.6666666666667C491.77153031224657,362.3333333333333,485.7685776561232,373.6666666666667,482.76710132806164,385C479.765625,396.3333333333333,479.765625,407.6666666666667,479.765625,413.3333333333333L479.765625,419"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M558.7031440085158,351L557.7148595904298,356.6666666666667C556.7265751723438,362.3333333333333,554.7500063361719,373.6666666666667,553.761721918086,385C552.7734375,396.3333333333333,552.7734375,407.6666666666667,552.7734375,413.3333333333333L552.7734375,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M618.5234184914842,351L619.5117029095702,356.6666666666667C620.4999873276562,362.3333333333333,622.4765561638281,373.6666666666667,623.464840581914,385C624.453125,396.3333333333333,624.453125,407.6666666666667,624.453125,413.3333333333333L624.453125,419"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M681.3102569951338,351L684.3731308292781,356.6666666666667C687.4360046634225,362.3333333333333,693.5617523317113,373.6666666666667,696.6246261658556,385C699.6875,396.3333333333333,699.6875,407.6666666666667,699.6875,413.3333333333333L699.6875,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M720.40234375,324.5239295500659L729.5618489583334,334.6032746250549C738.7213541666666,344.6826197000439,757.0403645833334,364.841309850022,766.1998697916666,380.58732159167766C775.359375,396.3333333333333,775.359375,407.6666666666667,775.359375,413.3333333333333L775.359375,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M720.40234375,282.3582301016245L742.3209635416666,299.46519175135376C764.2395833333334,316.57215340108297,808.0768229166666,350.7860767005415,829.9954427083334,373.5597050169374C851.9140625,396.3333333333333,851.9140625,407.6666666666667,851.9140625,413.3333333333333L851.9140625,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M720.40234375,258.98044846442207L755.228515625,279.98370705368507C790.0546875,300.98696564294806,859.70703125,342.99348282147406,894.533203125,369.66340807740363C929.359375,396.3333333333333,929.359375,407.6666666666667,929.359375,413.3333333333333L929.359375,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id17" d="M720.40234375,243.5127690219649L768.951171875,267.09397418497076C817.5,290.6751793479766,914.59765625,337.8375896739883,963.146484375,367.08546150366084C1011.6953125,396.3333333333333,1011.6953125,407.6666666666667,1011.6953125,413.3333333333333L1011.6953125,419"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M720.40234375,231.88701122067323L784.599609375,257.4058426838944C848.796875,282.92467414711547,977.19140625,333.96233707355776,1041.388671875,365.14783520344554C1105.5859375,396.3333333333333,1105.5859375,407.6666666666667,1105.5859375,413.3333333333333L1105.5859375,419"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1230.6285411799065,476L1224.652039524922,480.1666666666667C1218.6755378699377,484.3333333333333,1206.7225345599688,492.6666666666667,1200.7460329049843,501.8333333333333C1194.76953125,511,1194.76953125,521,1194.76953125,526L1194.76953125,531"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1312.3870838200935,476L1318.363585475078,480.1666666666667C1324.3400871300623,484.3333333333333,1336.2930904400312,492.6666666666667,1342.2695920950157,498C1348.24609375,503.3333333333333,1348.24609375,505.6666666666667,1348.24609375,506.8333333333333L1348.24609375,508"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M439.9002612954139,233.3670900236914L370.13042607951155,258.6392416864095C300.3605908636093,283.9113933491276,160.82092043180464,334.4556966745638,91.05108521590232,365.3945150039485C21.28125,396.3333333333333,21.28125,407.6666666666667,21.28125,413.3333333333333L21.28125,419"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M456.82421875,234.68405406050766L396.994140625,259.7367117170897C337.1640625,284.7893693736718,217.50390625,334.8946846868359,157.673828125,364.6140090100846C97.84375,394.3333333333333,97.84375,403.6666666666667,97.84375,408.3333333333333L97.84375,413"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M440.69963758880505,252.88420518996335L396.3174063240042,274.90350432496945C351.93517505920335,296.92280345997557,263.17071252960164,340.9614017299878,218.78848126480082,368.64736753166056C174.40625,396.3333333333333,174.40625,407.6666666666667,174.40625,413.3333333333333L174.40625,419"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M456.82421875,259.7105464095237L422.5149739583333,280.59212200793644C388.2057291666667,301.47369760634916,319.5872395833333,343.23684880317455,285.2779947916667,368.78509106825396C250.96875,394.3333333333333,250.96875,403.6666666666667,250.96875,408.3333333333333L250.96875,413"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M737.6388227493442,224.3455030413823L826.6169877077868,251.12125253448525C915.5951526662294,277.8970020275882,1093.5514825831149,331.4485010137941,1182.5296475415573,363.89091717356376C1271.5078125,396.3333333333333,1271.5078125,407.6666666666667,1271.5078125,413.3333333333333L1271.5078125,419"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M442.6616776518023,293.9892561260566L423.32483554316855,309.15771343838054C403.98799343453487,324.3261707507044,365.3143092172674,354.66308537535224,345.9774671086337,375.4982093543428C326.640625,396.3333333333333,326.640625,407.6666666666667,326.640625,413.3333333333333L326.640625,419"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M456.82421875,325.21888858530025L447.8131510416667,335.18240715441686C438.8020833333333,345.1459257235335,420.7799479166667,365.0729628617667,411.7688802083333,379.70314809755C402.7578125,394.3333333333333,402.7578125,403.6666666666667,402.7578125,408.3333333333333L402.7578125,413"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M489.34926730635937,366.9064685285142L487.7519935886328,369.9220571070952C486.15471987090626,372.93764568567616,482.9601724354531,378.9688228428381,481.3628987177265,387.65107808808574C479.765625,396.3333333333333,479.765625,407.6666666666667,479.765625,413.3333333333333L479.765625,419"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M558.7031440085158,351L557.7148595904298,356.6666666666667C556.7265751723438,362.3333333333333,554.7500063361719,373.6666666666667,553.761721918086,384C552.7734375,394.3333333333333,552.7734375,403.6666666666667,552.7734375,408.3333333333333L552.7734375,413"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M621.6159945845262,368.73234257250704L622.0888496537718,371.44361881042255C622.5617047230174,374.154895048338,623.5074148615087,379.57744752416903,623.9802699307544,387.9553904287512C624.453125,396.3333333333333,624.453125,407.6666666666667,624.453125,413.3333333333333L624.453125,419"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M681.3102569951338,351L684.3731308292781,356.6666666666667C687.4360046634225,362.3333333333333,693.5617523317113,373.6666666666667,696.6246261658556,384C699.6875,394.3333333333333,699.6875,403.6666666666667,699.6875,408.3333333333333L699.6875,413"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M732.507895294273,337.84517655659454L739.649808578561,345.7043137971621C746.7917218628487,353.5634510377297,761.0755484314244,369.2817255188649,768.2174617157121,382.8075294260991C775.359375,396.3333333333333,775.359375,407.6666666666667,775.359375,413.3333333333333L775.359375,419"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M734.59210754455,293.43300339297804L754.1457667037917,308.69416949414835C773.6994258630333,323.9553355953187,812.8067441815166,354.4776677976593,832.3604033407584,375.40550056549637C851.9140625,396.3333333333333,851.9140625,407.6666666666667,851.9140625,413.3333333333333L851.9140625,419"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M735.8161752545873,268.276350698643L768.0733752121561,287.73029224886915C800.3305751697249,307.18423379909535,864.8449750848625,346.09211689954765,897.1021750424312,371.2127251164405C929.359375,396.3333333333333,929.359375,407.6666666666667,929.359375,413.3333333333333L929.359375,419"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id17" d="M736.593445283185,251.37713365886302L782.4437564859876,273.64761138238583C828.29406768879,295.9180891059087,919.9946900943951,340.45904455295437,965.8450012971975,368.39618894314384C1011.6953125,396.3333333333333,1011.6953125,407.6666666666667,1011.6953125,413.3333333333333L1011.6953125,419"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M737.1292676808903,238.53607249353038L798.5387126507418,262.946727077942C859.9481576205935,287.3573816623536,982.7670475602968,336.17869083117677,1044.1764925301484,366.25601208225504C1105.5859375,396.3333333333333,1105.5859375,407.6666666666667,1105.5859375,413.3333333333333L1105.5859375,419"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -270,7 +275,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L7">
+        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L7">
           <g title="A" id="classId-C_0000989095304444672400-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -289,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L9">
+        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L9">
           <g title="B" id="classId-C_0000648285260245005311-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -308,7 +313,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L11">
+        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L11">
           <g title="C" id="classId-C_0000323304333007297774-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -327,7 +332,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L13">
+        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L13">
           <g title="D" id="classId-C_0001006912399043633492-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -346,7 +351,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L15">
+        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L15">
           <g title="E" id="classId-C_0001092550394020578978-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -365,7 +370,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L17">
+        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L17">
           <g title="F" id="classId-C_0000965398761810782236-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -384,7 +389,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L19">
+        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L19">
           <g title="G" id="classId-C_0001764732000887030464-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -403,7 +408,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L21">
+        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L21">
           <g title="H" id="classId-C_0001669285599837552146-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -422,7 +427,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L23">
+        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L23">
           <g title="I" id="classId-C_0002234750598599000377-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -441,7 +446,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L25">
+        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L25">
           <g title="J" id="classId-C_0001335933649375465369-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -460,7 +465,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L27">
+        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L27">
           <g title="K" id="classId-C_0001603190364864080123-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -479,7 +484,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L29">
+        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L29">
           <g title="L" id="classId-C_0000305487238408320046-11" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -498,7 +503,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L31">
+        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L31">
           <g title="M" id="classId-C_0001664744512423723275-12" class="node default clickable">
             <rect height="57" width="28.328125" y="-28.5" x="-14.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="14.1640625" x1="-14.1640625" class="divider"/>
@@ -517,7 +522,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L33">
+        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L33">
           <g title="N" id="classId-C_0000950210019792152600-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -536,7 +541,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L35">
+        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L35">
           <g title="NN" id="classId-C_0001662349735899726224-14" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -555,7 +560,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L37">
+        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L37">
           <g title="NNN" id="classId-C_0001963145075481599858-15" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -574,7 +579,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000916380191954937631-16" class="node default clickable">
             <rect height="79" width="181.28125" y="-39.5" x="-90.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="90.640625" x1="-90.640625" class="divider"/>
@@ -598,7 +603,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000050153113082434858-17" class="node default clickable">
             <rect height="57" width="182.171875" y="-28.5" x="-91.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="91.0859375" x1="-91.0859375" class="divider"/>
@@ -617,7 +622,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00006/t00006.cc#L44">
+        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L44">
           <g title="R" id="classId-C_0000303025561016882526-18" class="node default clickable">
             <rect height="343" width="263.578125" y="-171.5" x="-131.7890625" class="outer title-state"/>
             <line y2="-141.5" y1="-141.5" x2="131.7890625" x1="-131.7890625" class="divider"/>
diff --git a/docs/test_cases/t00007.md b/docs/test_cases/t00007.md
index 8f9bb8e3..a7185e9b 100644
--- a/docs/test_cases/t00007.md
+++ b/docs/test_cases/t00007.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00007.cc
+File `tests/t00007/t00007.cc`
 ```cpp
 #include <memory>
 
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index fd6b9057..455aa85b 100644
--- a/docs/test_cases/t00007_class.svg
+++ b/docs/test_cases/t00007_class.svg
@@ -1,75 +1,83 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="237px" preserveAspectRatio="none" style="width:207px;height:237px;background:#FFFFFF;" version="1.1" viewBox="0 0 207 237" width="207px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10mtsk1bz4efo" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10mtsk1bz4efo)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
-      <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="203" y2="203"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="211" y2="211"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000098876622534017019">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000098876622534017019" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="182.4"/>
+        <ellipse cx="22" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,199.5563 C17,202.0563 19.1406,203.8688 22.0625,203.8688 C23.2969,203.8688 24.4688,203.5719 25.2188,203.0563 C25.8281,202.6344 26.1563,202.2125 26.1563,201.8063 C26.1563,201.3375 25.7344,200.9313 25.2344,200.9313 C25,200.9313 24.7813,201.0094 24.5781,201.2125 C24.1406,201.65 24.1406,201.65 23.9688,201.7438 C23.5156,201.9781 22.875,202.1188 22.1094,202.1188 C20.1094,202.1188 18.8281,201.1031 18.8281,199.525 L18.8281,198.4781 C18.8281,196.775 20.0469,195.5719 21.75,195.5719 C22.3281,195.5719 22.9063,195.7125 23.375,195.9625 C23.8438,196.2281 24.0156,196.4156 24.0781,196.775 C24.2031,197.4469 24.4531,197.6969 24.9844,197.6969 C25.2656,197.6969 25.5469,197.5563 25.7344,197.3375 C25.8594,197.1656 25.9063,196.9938 25.9063,196.5563 L25.9063,195.1969 C25.9063,194.775 25.8906,194.6344 25.7656,194.4625 C25.5938,194.2125 25.3125,194.0563 24.9844,194.0563 C24.6719,194.0563 24.4688,194.1656 24.25,194.4313 C23.0781,193.9313 22.6406,193.8219 21.6875,193.8219 C19.0156,193.8219 17,195.8375 17,198.4625 L17,199.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="203.006">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10mtsk1bz4efo)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
-      <ellipse cx="96" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M98.9688,192.6406 Q98.3906,192.9375 97.75,193.0781 Q97.1094,193.2344 96.4063,193.2344 Q93.9063,193.2344 92.5781,191.5938 Q91.2656,189.9375 91.2656,186.8125 Q91.2656,183.6875 92.5781,182.0313 Q93.9063,180.375 96.4063,180.375 Q97.1094,180.375 97.75,180.5313 Q98.4063,180.6875 98.9688,180.9844 L98.9688,183.7031 Q98.3438,183.125 97.75,182.8594 Q97.1563,182.5781 96.5313,182.5781 Q95.1875,182.5781 94.5,183.6563 Q93.8125,184.7188 93.8125,186.8125 Q93.8125,188.9063 94.5,189.9844 Q95.1875,191.0469 96.5313,191.0469 Q97.1563,191.0469 97.75,190.7813 Q98.3438,190.5 98.9688,189.9219 L98.9688,192.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="191.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="203" y2="203"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="211" y2="211"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000696381312773707784">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000696381312773707784" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="182.4"/>
+        <ellipse cx="98" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93,199.5563 C93,202.0563 95.1406,203.8688 98.0625,203.8688 C99.2969,203.8688 100.4688,203.5719 101.2188,203.0563 C101.8281,202.6344 102.1563,202.2125 102.1563,201.8063 C102.1563,201.3375 101.7344,200.9313 101.2344,200.9313 C101,200.9313 100.7813,201.0094 100.5781,201.2125 C100.1406,201.65 100.1406,201.65 99.9688,201.7438 C99.5156,201.9781 98.875,202.1188 98.1094,202.1188 C96.1094,202.1188 94.8281,201.1031 94.8281,199.525 L94.8281,198.4781 C94.8281,196.775 96.0469,195.5719 97.75,195.5719 C98.3281,195.5719 98.9063,195.7125 99.375,195.9625 C99.8438,196.2281 100.0156,196.4156 100.0781,196.775 C100.2031,197.4469 100.4531,197.6969 100.9844,197.6969 C101.2656,197.6969 101.5469,197.5563 101.7344,197.3375 C101.8594,197.1656 101.9063,196.9938 101.9063,196.5563 L101.9063,195.1969 C101.9063,194.775 101.8906,194.6344 101.7656,194.4625 C101.5938,194.2125 101.3125,194.0563 100.9844,194.0563 C100.6719,194.0563 100.4688,194.1656 100.25,194.4313 C99.0781,193.9313 98.6406,193.8219 97.6875,193.8219 C95.0156,193.8219 93,195.8375 93,198.4625 L93,199.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="203.006">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10mtsk1bz4efo)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
-      <ellipse cx="171" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.9688,192.6406 Q173.3906,192.9375 172.75,193.0781 Q172.1094,193.2344 171.4063,193.2344 Q168.9063,193.2344 167.5781,191.5938 Q166.2656,189.9375 166.2656,186.8125 Q166.2656,183.6875 167.5781,182.0313 Q168.9063,180.375 171.4063,180.375 Q172.1094,180.375 172.75,180.5313 Q173.4063,180.6875 173.9688,180.9844 L173.9688,183.7031 Q173.3438,183.125 172.75,182.8594 Q172.1563,182.5781 171.5313,182.5781 Q170.1875,182.5781 169.5,183.6563 Q168.8125,184.7188 168.8125,186.8125 Q168.8125,188.9063 169.5,189.9844 Q170.1875,191.0469 171.5313,191.0469 Q172.1563,191.0469 172.75,190.7813 Q173.3438,190.5 173.9688,189.9219 L173.9688,192.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="191.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="203" y2="203"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="211" y2="211"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000972031178679364068">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000972031178679364068" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="182.4"/>
+        <ellipse cx="173.5" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M168.5,199.5563 C168.5,202.0563 170.6406,203.8688 173.5625,203.8688 C174.7969,203.8688 175.9688,203.5719 176.7188,203.0563 C177.3281,202.6344 177.6563,202.2125 177.6563,201.8063 C177.6563,201.3375 177.2344,200.9313 176.7344,200.9313 C176.5,200.9313 176.2813,201.0094 176.0781,201.2125 C175.6406,201.65 175.6406,201.65 175.4688,201.7438 C175.0156,201.9781 174.375,202.1188 173.6094,202.1188 C171.6094,202.1188 170.3281,201.1031 170.3281,199.525 L170.3281,198.4781 C170.3281,196.775 171.5469,195.5719 173.25,195.5719 C173.8281,195.5719 174.4063,195.7125 174.875,195.9625 C175.3438,196.2281 175.5156,196.4156 175.5781,196.775 C175.7031,197.4469 175.9531,197.6969 176.4844,197.6969 C176.7656,197.6969 177.0469,197.5563 177.2344,197.3375 C177.3594,197.1656 177.4063,196.9938 177.4063,196.5563 L177.4063,195.1969 C177.4063,194.775 177.3906,194.6344 177.2656,194.4625 C177.0938,194.2125 176.8125,194.0563 176.4844,194.0563 C176.1719,194.0563 175.9688,194.1656 175.75,194.4313 C174.5781,193.9313 174.1406,193.8219 173.1875,193.8219 C170.5156,193.8219 168.5,195.8375 168.5,198.4625 L168.5,199.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="203.006">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10mtsk1bz4efo)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
-      <ellipse cx="92.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M95.7188,29.6406 Q95.1406,29.9375 94.5,30.0781 Q93.8594,30.2344 93.1563,30.2344 Q90.6563,30.2344 89.3281,28.5938 Q88.0156,26.9375 88.0156,23.8125 Q88.0156,20.6875 89.3281,19.0313 Q90.6563,17.375 93.1563,17.375 Q93.8594,17.375 94.5,17.5313 Q95.1563,17.6875 95.7188,17.9844 L95.7188,20.7031 Q95.0938,20.125 94.5,19.8594 Q93.9063,19.5781 93.2813,19.5781 Q91.9375,19.5781 91.25,20.6563 Q90.5625,21.7188 90.5625,23.8125 Q90.5625,25.9063 91.25,26.9844 Q91.9375,28.0469 93.2813,28.0469 Q93.9063,28.0469 94.5,27.7813 Q95.0938,27.5 95.7188,26.9219 L95.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000066905874721300157">
+        <rect codeLine="14" fill="#F1F1F1" height="98.3998" id="C_0000066905874721300157" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="167" x="20" y="7"/>
+        <ellipse cx="94.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M89.25,24.1563 C89.25,26.6563 91.3906,28.4688 94.3125,28.4688 C95.5469,28.4688 96.7188,28.1719 97.4688,27.6563 C98.0781,27.2344 98.4063,26.8125 98.4063,26.4063 C98.4063,25.9375 97.9844,25.5313 97.4844,25.5313 C97.25,25.5313 97.0313,25.6094 96.8281,25.8125 C96.3906,26.25 96.3906,26.25 96.2188,26.3438 C95.7656,26.5781 95.125,26.7188 94.3594,26.7188 C92.3594,26.7188 91.0781,25.7031 91.0781,24.125 L91.0781,23.0781 C91.0781,21.375 92.2969,20.1719 94,20.1719 C94.5781,20.1719 95.1563,20.3125 95.625,20.5625 C96.0938,20.8281 96.2656,21.0156 96.3281,21.375 C96.4531,22.0469 96.7031,22.2969 97.2344,22.2969 C97.5156,22.2969 97.7969,22.1563 97.9844,21.9375 C98.1094,21.7656 98.1563,21.5938 98.1563,21.1563 L98.1563,19.7969 C98.1563,19.375 98.1406,19.2344 98.0156,19.0625 C97.8438,18.8125 97.5625,18.6563 97.2344,18.6563 C96.9219,18.6563 96.7188,18.7656 96.5,19.0313 C95.3281,18.5313 94.8906,18.4219 93.9375,18.4219 C91.2656,18.4219 89.25,20.4375 89.25,23.0625 L89.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="114.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="21" x2="186" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="21" x2="186" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="26" y="55.9"/>
+          <ellipse cx="31" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="140" x="40" y="64.0059">a : std::unique_ptr&lt;A&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="26" y="72.6999"/>
+          <ellipse cx="31" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="141" x="40" y="80.8059">b : std::shared_ptr&lt;B&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="26" y="89.4998"/>
+          <ellipse cx="31" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="130" x="40" y="97.6058">c : std::weak_ptr&lt;C&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="54"/>
-      <ellipse cx="32.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="41.5" y="62.2104">a : std::unique_ptr&lt;A&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="66.8047"/>
-      <ellipse cx="32.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="41.5" y="75.0151">b : std::shared_ptr&lt;B&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="79.6094"/>
-      <ellipse cx="32.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="41.5" y="87.8198">c : std::weak_ptr&lt;C&gt;</text>
-    </a>
-    <path d="M72.48,106 C60.66,128.37 47.58,153.14 38.31,170.69 " fill="none" id="C_0000066905874721300157&lt;-C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <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>
-    <path d="M101,94.22 C101,117.28 101,145.22 101,165.66 " fill="none" id="C_0000066905874721300157-&gt;C_0000696381312773707784" 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>
-    <path d="M123.3,94.22 C135.58,117.48 150.49,145.69 161.31,166.18 " fill="none" id="C_0000066905874721300157-&gt;C_0000972031178679364068" 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>
+    <g id="link_C_0000066905874721300157_C_0000098876622534017019">
+      <path codeLine="20" d="M73.1339,116.4076 C59.9739,142.0676 49.9,161.72 39.44,182.12 " fill="none" id="C_0000066905874721300157-backto-C_0000098876622534017019" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="78.61,105.73,72.3127,109.2434,73.1339,116.4076,79.4311,112.8942,78.61,105.73" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="64.5" y="148.477">+a</text>
+    </g>
+    <g id="link_C_0000066905874721300157_C_0000696381312773707784">
+      <path codeLine="21" d="M103.5,105.73 C103.5,131.39 103.5,155.72 103.5,176.12 " fill="none" id="C_0000066905874721300157-to-C_0000696381312773707784" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="103.5,182.12,107.5,173.12,103.5,177.12,99.5,173.12,103.5,182.12" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="104.5" y="148.477">+b</text>
+    </g>
+    <g id="link_C_0000066905874721300157_C_0000972031178679364068">
+      <path codeLine="22" d="M128.39,105.73 C141.55,131.39 154.3624,156.3809 164.8224,176.7809 " fill="none" id="C_0000066905874721300157-to-C_0000972031178679364068" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="167.56,182.12,167.013,172.2863,165.2787,177.6708,159.8942,175.9365,167.56,182.12" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="151.5" y="148.477">+c</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00007_class_mermaid.svg b/docs/test_cases/t00007_class_mermaid.svg
index 5a68b373..861520b8 100644
--- a/docs/test_cases/t00007_class_mermaid.svg
+++ b/docs/test_cases/t00007_class_mermaid.svg
@@ -1,58 +1,63 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 198.671875 264" style="max-width: 198.672px; background-color: white;" width="198.671875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M50.03129090314136,131L45.488315335951135,136.66666666666666C40.94533976876091,142.33333333333334,31.85938863438045,153.66666666666666,27.316413067190226,165C22.7734375,176.33333333333334,22.7734375,187.66666666666666,22.7734375,193.33333333333334L22.7734375,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M99.3359375,131L99.3359375,136.66666666666666C99.3359375,142.33333333333334,99.3359375,153.66666666666666,99.3359375,165C99.3359375,176.33333333333334,99.3359375,187.66666666666666,99.3359375,193.33333333333334L99.3359375,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M148.64058409685865,131L153.1835596640489,136.66666666666666C157.7265352312391,142.33333333333334,166.81248636561955,153.66666666666666,171.3554619328098,165C175.8984375,176.33333333333334,175.8984375,187.66666666666666,175.8984375,193.33333333333334L175.8984375,199"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M38.772214861128596,145.0439740344453L36.10575196760716,148.36997836203776C33.43928907408573,151.6959826896302,28.106363287042864,158.3479913448151,25.43990039352143,167.3406623390742C22.7734375,176.33333333333334,22.7734375,187.66666666666666,22.7734375,193.33333333333334L22.7734375,199"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M99.3359375,131L99.3359375,136.66666666666666C99.3359375,142.33333333333334,99.3359375,153.66666666666666,99.3359375,164C99.3359375,174.33333333333334,99.3359375,183.66666666666666,99.3359375,188.33333333333334L99.3359375,193"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M148.64058409685865,131L153.1835596640489,136.66666666666666C157.7265352312391,142.33333333333334,166.81248636561955,153.66666666666666,171.3554619328098,164C175.8984375,174.33333333333334,175.8984375,183.66666666666666,175.8984375,188.33333333333334L175.8984375,193"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(22.7734375, 165)" class="edgeLabel">
@@ -90,7 +95,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L5">
+        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L5">
           <g title="A" id="classId-C_0000098876622534017019-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +114,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L7">
+        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L7">
           <g title="B" id="classId-C_0000696381312773707784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L9">
+        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L9">
           <g title="C" id="classId-C_0000972031178679364068-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00007/t00007.cc#L11">
+        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L11">
           <g title="R" id="classId-C_0000066905874721300157-3" class="node default clickable">
             <rect height="123" width="182.671875" y="-61.5" x="-91.3359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="91.3359375" x1="-91.3359375" class="divider"/>
diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md
index 9ee1aa14..de097b7a 100644
--- a/docs/test_cases/t00008.md
+++ b/docs/test_cases/t00008.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00008.cc
+File `tests/t00008/t00008.cc`
 ```cpp
 #include <array>
 #include <vector>
@@ -357,6 +357,7 @@ template <> struct E::nested_template<char> {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -387,6 +388,7 @@ template <> struct E::nested_template<char> {
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -456,6 +458,7 @@ template <> struct E::nested_template<char> {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -516,6 +519,7 @@ template <> struct E::nested_template<char> {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index b4261568..643c6dc6 100644
--- a/docs/test_cases/t00008_class.svg
+++ b/docs/test_cases/t00008_class.svg
@@ -1,192 +1,212 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="403px" preserveAspectRatio="none" style="width:1039px;height:403px;" version="1.1" viewBox="0 0 1039 403" width="1039px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="433px" preserveAspectRatio="none" style="width:1048px;height:433px;background:#FFFFFF;" version="1.1" viewBox="0 0 1048 433" width="1048px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1q73lcr2in35e" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q73lcr2in35e)" height="124.8281" id="C_0002293517130897538130" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
-      <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="167" x="51" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="165" x="52" y="17.1387">T,P=T,CMP=nullptr,int N=3</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002293517130897538130">
+        <rect codeLine="2" fill="#F1F1F1" height="148.7996" id="C_0002293517130897538130" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="190" x="7" y="10"/>
+        <ellipse cx="22" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,27.1563 C17,29.6563 19.1406,31.4688 22.0625,31.4688 C23.2969,31.4688 24.4688,31.1719 25.2188,30.6563 C25.8281,30.2344 26.1563,29.8125 26.1563,29.4063 C26.1563,28.9375 25.7344,28.5313 25.2344,28.5313 C25,28.5313 24.7813,28.6094 24.5781,28.8125 C24.1406,29.25 24.1406,29.25 23.9688,29.3438 C23.5156,29.5781 22.875,29.7188 22.1094,29.7188 C20.1094,29.7188 18.8281,28.7031 18.8281,27.125 L18.8281,26.0781 C18.8281,24.375 20.0469,23.1719 21.75,23.1719 C22.3281,23.1719 22.9063,23.3125 23.375,23.5625 C23.8438,23.8281 24.0156,24.0156 24.0781,24.375 C24.2031,25.0469 24.4531,25.2969 24.9844,25.2969 C25.2656,25.2969 25.5469,25.1563 25.7344,24.9375 C25.8594,24.7656 25.9063,24.5938 25.9063,24.1563 L25.9063,22.7969 C25.9063,22.375 25.8906,22.2344 25.7656,22.0625 C25.5938,21.8125 25.3125,21.6563 24.9844,21.6563 C24.6719,21.6563 24.4688,21.7656 24.25,22.0313 C23.0781,21.5313 22.6406,21.4219 21.6875,21.4219 C19.0156,21.4219 17,23.4375 17,26.0625 L17,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="30.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="147" x="53" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="145" x="54" y="21.2001">T,P=T,CMP=nullptr,int N=3</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="196" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="196" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="58.9"/>
+          <ellipse cx="18" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="27" y="67.0059">comparator : CMP</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="75.6999"/>
+          <ellipse cx="18" cy="80.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139" x="27" y="83.8059">ints : std::array&lt;int,N&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="92.4998"/>
+          <ellipse cx="18" cy="97.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="27" y="100.6058">pointer : T *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="109.2997"/>
+          <ellipse cx="18" cy="114.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="27" y="117.4057">reference : T &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="126.0997"/>
+          <ellipse cx="18" cy="131.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="27" y="134.2057">value : T</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="142.8996"/>
+          <ellipse cx="18" cy="147.8996" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="144" x="27" y="151.0056">values : std::vector&lt;P&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
-      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <g id="elem_C_0001677407014842680311">
+        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0001677407014842680311" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="170" x="232" y="52"/>
+        <ellipse cx="286.75" cy="68" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M281.75,69.1563 C281.75,71.6563 283.8906,73.4688 286.8125,73.4688 C288.0469,73.4688 289.2188,73.1719 289.9688,72.6563 C290.5781,72.2344 290.9063,71.8125 290.9063,71.4063 C290.9063,70.9375 290.4844,70.5313 289.9844,70.5313 C289.75,70.5313 289.5313,70.6094 289.3281,70.8125 C288.8906,71.25 288.8906,71.25 288.7188,71.3438 C288.2656,71.5781 287.625,71.7188 286.8594,71.7188 C284.8594,71.7188 283.5781,70.7031 283.5781,69.125 L283.5781,68.0781 C283.5781,66.375 284.7969,65.1719 286.5,65.1719 C287.0781,65.1719 287.6563,65.3125 288.125,65.5625 C288.5938,65.8281 288.7656,66.0156 288.8281,66.375 C288.9531,67.0469 289.2031,67.2969 289.7344,67.2969 C290.0156,67.2969 290.2969,67.1563 290.4844,66.9375 C290.6094,66.7656 290.6563,66.5938 290.6563,66.1563 L290.6563,64.7969 C290.6563,64.375 290.6406,64.2344 290.5156,64.0625 C290.3438,63.8125 290.0625,63.6563 289.7344,63.6563 C289.4219,63.6563 289.2188,63.7656 289,64.0313 C287.8281,63.5313 287.3906,63.4219 286.4375,63.4219 C283.7656,63.4219 281.75,65.4375 281.75,68.0625 L281.75,69.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="307.25" y="72.606">Vector</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="396" y="49"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="397" y="63.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="233" x2="401" y1="84" y2="84"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="233" x2="401" y1="92" y2="92"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="238" y="100.9"/>
+          <ellipse cx="243" cy="105.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="144" x="252" y="109.0059">values : std::vector&lt;T&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="62.2104">comparator : CMP</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001968575752686868237">
+        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0001968575752686868237" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="191" x="479.5" y="361.6"/>
+        <ellipse cx="547.75" cy="377.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M542.75,378.7562 C542.75,381.2562 544.8906,383.0687 547.8125,383.0687 C549.0469,383.0687 550.2188,382.7719 550.9688,382.2562 C551.5781,381.8344 551.9063,381.4125 551.9063,381.0062 C551.9063,380.5375 551.4844,380.1312 550.9844,380.1312 C550.75,380.1312 550.5313,380.2094 550.3281,380.4125 C549.8906,380.85 549.8906,380.85 549.7188,380.9437 C549.2656,381.1781 548.625,381.3187 547.8594,381.3187 C545.8594,381.3187 544.5781,380.3031 544.5781,378.725 L544.5781,377.6781 C544.5781,375.975 545.7969,374.7719 547.5,374.7719 C548.0781,374.7719 548.6563,374.9125 549.125,375.1625 C549.5938,375.4281 549.7656,375.6156 549.8281,375.975 C549.9531,376.6469 550.2031,376.8969 550.7344,376.8969 C551.0156,376.8969 551.2969,376.7562 551.4844,376.5375 C551.6094,376.3656 551.6563,376.1937 551.6563,375.7562 L551.6563,374.3969 C551.6563,373.975 551.6406,373.8344 551.5156,373.6625 C551.3438,373.4125 551.0625,373.2562 550.7344,373.2562 C550.4219,373.2562 550.2188,373.3656 550,373.6312 C548.8281,373.1312 548.3906,373.0219 547.4375,373.0219 C544.7656,373.0219 542.75,375.0375 542.75,377.6625 L542.75,378.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="568.25" y="382.206">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="35" x="638.5" y="358.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="33" x="639.5" y="372.8001">T,C&lt;&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="480.5" x2="669.5" y1="393.6" y2="393.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="480.5" x2="669.5" y1="401.6" y2="401.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="485.5" y="410.5"/>
+          <ellipse cx="490.5" cy="415.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="499.5" y="418.6059">template_template : C&lt;T&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
-      <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001449136415707203971">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001449136415707203971" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="96" x="527" y="244.2"/>
+        <ellipse cx="542" cy="260.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M537,261.3563 C537,263.8563 539.1406,265.6688 542.0625,265.6688 C543.2969,265.6688 544.4688,265.3719 545.2188,264.8563 C545.8281,264.4344 546.1563,264.0125 546.1563,263.6063 C546.1563,263.1375 545.7344,262.7313 545.2344,262.7313 C545,262.7313 544.7813,262.8094 544.5781,263.0125 C544.1406,263.45 544.1406,263.45 543.9688,263.5438 C543.5156,263.7781 542.875,263.9188 542.1094,263.9188 C540.1094,263.9188 538.8281,262.9031 538.8281,261.325 L538.8281,260.2781 C538.8281,258.575 540.0469,257.3719 541.75,257.3719 C542.3281,257.3719 542.9063,257.5125 543.375,257.7625 C543.8438,258.0281 544.0156,258.2156 544.0781,258.575 C544.2031,259.2469 544.4531,259.4969 544.9844,259.4969 C545.2656,259.4969 545.5469,259.3563 545.7344,259.1375 C545.8594,258.9656 545.9063,258.7938 545.9063,258.3563 L545.9063,256.9969 C545.9063,256.575 545.8906,256.4344 545.7656,256.2625 C545.5938,256.0125 545.3125,255.8563 544.9844,255.8563 C544.6719,255.8563 544.4688,255.9656 544.25,256.2313 C543.0781,255.7313 542.6406,255.6219 541.6875,255.6219 C539.0156,255.6219 537,257.6375 537,260.2625 L537,261.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="556" y="264.806">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="53" x="573" y="241.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="51" x="574" y="255.4001">int,Vector</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="528" x2="622" y1="276.2" y2="276.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="528" x2="622" y1="284.2" y2="284.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="26" y="75.0151">ints : std::array&lt;int,N&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001562396858816419857">
+        <rect codeLine="26" fill="#F1F1F1" height="106.3998" id="C_0001562396858816419857" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="277" x="436.5" y="31.2"/>
+        <ellipse cx="565.75" cy="47.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M560.75,48.3562 C560.75,50.8562 562.8906,52.6687 565.8125,52.6687 C567.0469,52.6687 568.2188,52.3719 568.9688,51.8562 C569.5781,51.4344 569.9063,51.0125 569.9063,50.6062 C569.9063,50.1375 569.4844,49.7312 568.9844,49.7312 C568.75,49.7312 568.5313,49.8094 568.3281,50.0125 C567.8906,50.45 567.8906,50.45 567.7188,50.5437 C567.2656,50.7781 566.625,50.9187 565.8594,50.9187 C563.8594,50.9187 562.5781,49.9031 562.5781,48.325 L562.5781,47.2781 C562.5781,45.575 563.7969,44.3719 565.5,44.3719 C566.0781,44.3719 566.6563,44.5125 567.125,44.7625 C567.5938,45.0281 567.7656,45.2156 567.8281,45.575 C567.9531,46.2469 568.2031,46.4969 568.7344,46.4969 C569.0156,46.4969 569.2969,46.3562 569.4844,46.1375 C569.6094,45.9656 569.6563,45.7937 569.6563,45.3562 L569.6563,43.9969 C569.6563,43.575 569.6406,43.4344 569.5156,43.2625 C569.3438,43.0125 569.0625,42.8562 568.7344,42.8562 C568.4219,42.8562 568.2188,42.9656 568,43.2312 C566.8281,42.7312 566.3906,42.6219 565.4375,42.6219 C562.7656,42.6219 560.75,44.6375 560.75,47.2625 L560.75,48.3562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="586.25" y="51.806">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="437.5" x2="712.5" y1="63.2" y2="63.2"/>
+        <ellipse cx="447.5" cy="77.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="251" x="456.5" y="80.2059">D&lt;Items...&gt;(std::tuple&lt;Items...&gt; *) : void</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="437.5" x2="712.5" y1="87.9999" y2="87.9999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="442.5" y="96.8999"/>
+          <ellipse cx="447.5" cy="101.8999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="94" x="456.5" y="105.0059">add(int i) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="437.5" x2="712.5" y1="112.7999" y2="112.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="442.5" y="121.6998"/>
+          <ellipse cx="447.5" cy="126.6998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="456.5" y="129.8058">ints : B&lt;int,Vector&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="79.6094"/>
-      <ellipse cx="17" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001787658457052431115">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0001787658457052431115" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="834.5" y="370"/>
+        <ellipse cx="849.5" cy="386" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M844.5,387.1563 C844.5,389.6563 846.6406,391.4688 849.5625,391.4688 C850.7969,391.4688 851.9688,391.1719 852.7188,390.6563 C853.3281,390.2344 853.6563,389.8125 853.6563,389.4063 C853.6563,388.9375 853.2344,388.5313 852.7344,388.5313 C852.5,388.5313 852.2813,388.6094 852.0781,388.8125 C851.6406,389.25 851.6406,389.25 851.4688,389.3438 C851.0156,389.5781 850.375,389.7188 849.6094,389.7188 C847.6094,389.7188 846.3281,388.7031 846.3281,387.125 L846.3281,386.0781 C846.3281,384.375 847.5469,383.1719 849.25,383.1719 C849.8281,383.1719 850.4063,383.3125 850.875,383.5625 C851.3438,383.8281 851.5156,384.0156 851.5781,384.375 C851.7031,385.0469 851.9531,385.2969 852.4844,385.2969 C852.7656,385.2969 853.0469,385.1563 853.2344,384.9375 C853.3594,384.7656 853.4063,384.5938 853.4063,384.1563 L853.4063,382.7969 C853.4063,382.375 853.3906,382.2344 853.2656,382.0625 C853.0938,381.8125 852.8125,381.6563 852.4844,381.6563 C852.1719,381.6563 851.9688,381.7656 851.75,382.0313 C850.5781,381.5313 850.1406,381.4219 849.1875,381.4219 C846.5156,381.4219 844.5,383.4375 844.5,386.0625 L844.5,387.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="863.5" y="390.606">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="835.5" x2="874.5" y1="402" y2="402"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="835.5" x2="874.5" y1="410" y2="410"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="26" y="87.8198">pointer : T *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <g id="elem_C_0001549419203490064906">
+        <rect codeLine="38" fill="#F1F1F1" height="64.7999" id="C_0001549419203490064906" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="174" x="863" y="235.8"/>
+        <ellipse cx="878" cy="251.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M873,252.9562 C873,255.4562 875.1406,257.2687 878.0625,257.2687 C879.2969,257.2687 880.4688,256.9719 881.2188,256.4562 C881.8281,256.0344 882.1563,255.6125 882.1563,255.2062 C882.1563,254.7375 881.7344,254.3312 881.2344,254.3312 C881,254.3312 880.7813,254.4094 880.5781,254.6125 C880.1406,255.05 880.1406,255.05 879.9688,255.1437 C879.5156,255.3781 878.875,255.5187 878.1094,255.5187 C876.1094,255.5187 874.8281,254.5031 874.8281,252.925 L874.8281,251.8781 C874.8281,250.175 876.0469,248.9719 877.75,248.9719 C878.3281,248.9719 878.9063,249.1125 879.375,249.3625 C879.8438,249.6281 880.0156,249.8156 880.0781,250.175 C880.2031,250.8469 880.4531,251.0969 880.9844,251.0969 C881.2656,251.0969 881.5469,250.9562 881.7344,250.7375 C881.8594,250.5656 881.9063,250.3937 881.9063,249.9562 L881.9063,248.5969 C881.9063,248.175 881.8906,248.0344 881.7656,247.8625 C881.5938,247.6125 881.3125,247.4562 880.9844,247.4562 C880.6719,247.4562 880.4688,247.5656 880.25,247.8312 C879.0781,247.3312 878.6406,247.2219 877.6875,247.2219 C875.0156,247.2219 873,249.2375 873,251.8625 L873,252.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="892" y="256.406">E::nested_template</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="17" x="1023" y="232.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="15" x="1024" y="247.0001">ET</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="864" x2="1036" y1="267.8" y2="267.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="869" y="276.7"/>
+          <ellipse cx="874" cy="281.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="109" x="883" y="284.8059">get(ET * d) : DT *</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="864" x2="1036" y1="292.5999" y2="292.5999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="92.4141"/>
-      <ellipse cx="17" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <g id="elem_C_0000033637089897037832">
+        <rect codeLine="43" fill="#F1F1F1" height="64.7999" id="C_0000033637089897037832" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="748.5" y="52"/>
+        <ellipse cx="777" cy="68" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M772,69.1563 C772,71.6563 774.1406,73.4688 777.0625,73.4688 C778.2969,73.4688 779.4688,73.1719 780.2188,72.6563 C780.8281,72.2344 781.1563,71.8125 781.1563,71.4063 C781.1563,70.9375 780.7344,70.5313 780.2344,70.5313 C780,70.5313 779.7813,70.6094 779.5781,70.8125 C779.1406,71.25 779.1406,71.25 778.9688,71.3438 C778.5156,71.5781 777.875,71.7188 777.1094,71.7188 C775.1094,71.7188 773.8281,70.7031 773.8281,69.125 L773.8281,68.0781 C773.8281,66.375 775.0469,65.1719 776.75,65.1719 C777.3281,65.1719 777.9063,65.3125 778.375,65.5625 C778.8438,65.8281 779.0156,66.0156 779.0781,66.375 C779.2031,67.0469 779.4531,67.2969 779.9844,67.2969 C780.2656,67.2969 780.5469,67.1563 780.7344,66.9375 C780.8594,66.7656 780.9063,66.5938 780.9063,66.1563 L780.9063,64.7969 C780.9063,64.375 780.8906,64.2344 780.7656,64.0625 C780.5938,63.8125 780.3125,63.6563 779.9844,63.6563 C779.6719,63.6563 779.4688,63.7656 779.25,64.0313 C778.0781,63.5313 777.6406,63.4219 776.6875,63.4219 C774.0156,63.4219 772,65.4375 772,68.0625 L772,69.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="794" y="72.606">E::nested_template</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="26" x="938.5" y="49"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="24" x="939.5" y="63.2001">char</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="749.5" x2="960.5" y1="84" y2="84"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="754.5" y="92.9"/>
+          <ellipse cx="759.5" cy="97.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="187" x="768.5" y="101.0059">getDecl(char * c) : DeclType *</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="749.5" x2="960.5" y1="108.7999" y2="108.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="88" x="26" y="100.6245">reference : T &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="105.2188"/>
-      <ellipse cx="17" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="113.4292">value : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="118.0234"/>
-      <ellipse cx="17" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="26" y="126.2339">values : std::vector&lt;P&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q73lcr2in35e)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="250" y="40"/>
-      <ellipse cx="300.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M303.2188,61.6406 Q302.6406,61.9375 302,62.0781 Q301.3594,62.2344 300.6563,62.2344 Q298.1563,62.2344 296.8281,60.5938 Q295.5156,58.9375 295.5156,55.8125 Q295.5156,52.6875 296.8281,51.0313 Q298.1563,49.375 300.6563,49.375 Q301.3594,49.375 302,49.5313 Q302.6563,49.6875 303.2188,49.9844 L303.2188,52.7031 Q302.5938,52.125 302,51.8594 Q301.4063,51.5781 300.7813,51.5781 Q299.4375,51.5781 298.75,52.6563 Q298.0625,53.7188 298.0625,55.8125 Q298.0625,57.9063 298.75,58.9844 Q299.4375,60.0469 300.7813,60.0469 Q301.4063,60.0469 302,59.7813 Q302.5938,59.5 303.2188,58.9219 L303.2188,61.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="320.75" y="60.1543">Vector</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="405" y="37"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="406" y="49.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="72" y2="72"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="80" y2="80"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="86"/>
-      <ellipse cx="261" cy="91" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="270" y="94.2104">values : std::vector&lt;T&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q73lcr2in35e)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="490" y="332"/>
-      <ellipse cx="548.75" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M551.7188,353.6406 Q551.1406,353.9375 550.5,354.0781 Q549.8594,354.2344 549.1563,354.2344 Q546.6563,354.2344 545.3281,352.5938 Q544.0156,350.9375 544.0156,347.8125 Q544.0156,344.6875 545.3281,343.0313 Q546.6563,341.375 549.1563,341.375 Q549.8594,341.375 550.5,341.5313 Q551.1563,341.6875 551.7188,341.9844 L551.7188,344.7031 Q551.0938,344.125 550.5,343.8594 Q549.9063,343.5781 549.2813,343.5781 Q547.9375,343.5781 547.25,344.6563 Q546.5625,345.7188 546.5625,347.8125 Q546.5625,349.9063 547.25,350.9844 Q547.9375,352.0469 549.2813,352.0469 Q549.9063,352.0469 550.5,351.7813 Q551.0938,351.5 551.7188,350.9219 L551.7188,353.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="569.25" y="352.1543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="41" x="629" y="329"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="630" y="341.1387">T,C&lt;&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="364" y2="364"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="372" y2="372"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496" y="378"/>
-      <ellipse cx="501" cy="383" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="510" y="386.2104">template_template : C&lt;T&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q73lcr2in35e)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="526" y="216.5"/>
-      <ellipse cx="541" cy="232.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M543.9688,238.1406 Q543.3906,238.4375 542.75,238.5781 Q542.1094,238.7344 541.4063,238.7344 Q538.9063,238.7344 537.5781,237.0938 Q536.2656,235.4375 536.2656,232.3125 Q536.2656,229.1875 537.5781,227.5313 Q538.9063,225.875 541.4063,225.875 Q542.1094,225.875 542.75,226.0313 Q543.4063,226.1875 543.9688,226.4844 L543.9688,229.2031 Q543.3438,228.625 542.75,228.3594 Q542.1563,228.0781 541.5313,228.0781 Q540.1875,228.0781 539.5,229.1563 Q538.8125,230.2188 538.8125,232.3125 Q538.8125,234.4063 539.5,235.4844 Q540.1875,236.5469 541.5313,236.5469 Q542.1563,236.5469 542.75,236.2813 Q543.3438,236 543.9688,235.4219 L543.9688,238.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="555" y="236.6543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="63" x="571" y="213.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="572" y="225.6387">int,Vector</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="248.5" y2="248.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="256.5" y2="256.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q73lcr2in35e)" height="94.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="446" y="23.5"/>
-      <ellipse cx="569.75" cy="39.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M572.7188,45.1406 Q572.1406,45.4375 571.5,45.5781 Q570.8594,45.7344 570.1563,45.7344 Q567.6563,45.7344 566.3281,44.0938 Q565.0156,42.4375 565.0156,39.3125 Q565.0156,36.1875 566.3281,34.5313 Q567.6563,32.875 570.1563,32.875 Q570.8594,32.875 571.5,33.0313 Q572.1563,33.1875 572.7188,33.4844 L572.7188,36.2031 Q572.0938,35.625 571.5,35.3594 Q570.9063,35.0781 570.2813,35.0781 Q568.9375,35.0781 568.25,36.1563 Q567.5625,37.2188 567.5625,39.3125 Q567.5625,41.4063 568.25,42.4844 Q568.9375,43.5469 570.2813,43.5469 Q570.9063,43.5469 571.5,43.2813 Q572.0938,43 572.7188,42.4219 L572.7188,45.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="590.25" y="43.6543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="710" y1="55.5" y2="55.5"/>
-      <ellipse cx="457" cy="66.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="239" x="466" y="69.7104">D&lt;Items...&gt;(std::tuple&lt;Items...&gt; *) : void</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="447" x2="710" y1="76.3047" y2="76.3047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="82.3047"/>
-      <ellipse cx="457" cy="87.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="466" y="90.5151">add(int i) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="710" y1="97.1094" y2="97.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="103.1094"/>
-      <ellipse cx="457" cy="108.1094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="466" y="111.3198">ints : B&lt;int,Vector&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q73lcr2in35e)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="823.5" y="338.5"/>
-      <ellipse cx="838.5" cy="354.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M841.4688,360.1406 Q840.8906,360.4375 840.25,360.5781 Q839.6094,360.7344 838.9063,360.7344 Q836.4063,360.7344 835.0781,359.0938 Q833.7656,357.4375 833.7656,354.3125 Q833.7656,351.1875 835.0781,349.5313 Q836.4063,347.875 838.9063,347.875 Q839.6094,347.875 840.25,348.0313 Q840.9063,348.1875 841.4688,348.4844 L841.4688,351.2031 Q840.8438,350.625 840.25,350.3594 Q839.6563,350.0781 839.0313,350.0781 Q837.6875,350.0781 837,351.1563 Q836.3125,352.2188 836.3125,354.3125 Q836.3125,356.4063 837,357.4844 Q837.6875,358.5469 839.0313,358.5469 Q839.6563,358.5469 840.25,358.2813 Q840.8438,358 841.4688,357.4219 L841.4688,360.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="852.5" y="358.6543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="370.5" y2="370.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="378.5" y2="378.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q73lcr2in35e)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="852" y="210"/>
-      <ellipse cx="867" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M869.9688,231.6406 Q869.3906,231.9375 868.75,232.0781 Q868.1094,232.2344 867.4063,232.2344 Q864.9063,232.2344 863.5781,230.5938 Q862.2656,228.9375 862.2656,225.8125 Q862.2656,222.6875 863.5781,221.0313 Q864.9063,219.375 867.4063,219.375 Q868.1094,219.375 868.75,219.5313 Q869.4063,219.6875 869.9688,219.9844 L869.9688,222.7031 Q869.3438,222.125 868.75,221.8594 Q868.1563,221.5781 867.5313,221.5781 Q866.1875,221.5781 865.5,222.6563 Q864.8125,223.7188 864.8125,225.8125 Q864.8125,227.9063 865.5,228.9844 Q866.1875,230.0469 867.5313,230.0469 Q868.1563,230.0469 868.75,229.7813 Q869.3438,229.5 869.9688,228.9219 L869.9688,231.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="881" y="230.1543">E::nested_template</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="17" x="1011" y="207"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="15" x="1012" y="219.1387">ET</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="242" y2="242"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="858" y="248"/>
-      <ellipse cx="863" cy="253" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="98" x="872" y="256.2104">get(ET * d) : DT *</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="262.8047" y2="262.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q73lcr2in35e)" height="60.8047" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="746.5" y="40"/>
-      <ellipse cx="765.1" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M768.0688,61.6406 Q767.4906,61.9375 766.85,62.0781 Q766.2094,62.2344 765.5063,62.2344 Q763.0063,62.2344 761.6781,60.5938 Q760.3656,58.9375 760.3656,55.8125 Q760.3656,52.6875 761.6781,51.0313 Q763.0063,49.375 765.5063,49.375 Q766.2094,49.375 766.85,49.5313 Q767.5063,49.6875 768.0688,49.9844 L768.0688,52.7031 Q767.4438,52.125 766.85,51.8594 Q766.2563,51.5781 765.6313,51.5781 Q764.2875,51.5781 763.6,52.6563 Q762.9125,53.7188 762.9125,55.8125 Q762.9125,57.9063 763.6,58.9844 Q764.2875,60.0469 765.6313,60.0469 Q766.2563,60.0469 766.85,59.7813 Q767.4438,59.5 768.0688,58.9219 L768.0688,61.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="779.9" y="60.1543">E::nested_template</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="30" x="913.5" y="37"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="914.5" y="49.1387">char</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="72" y2="72"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="752.5" y="78"/>
-      <ellipse cx="757.5" cy="83" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="168" x="766.5" y="86.2104">getDecl(char * c) : DeclType *</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="92.8047" y2="92.8047"/>
-    <path d="M578.5,264.64 C578.5,277.97 578.5,295.27 578.5,311.55 " fill="none" id="C_0001449136415707203971-&gt;C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="585.5,311.61,578.5,331.61,571.5,311.61,585.5,311.61" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M578.5,131.05 C578.5,160.58 578.5,194.53 578.5,216.46 " fill="none" id="C_0001562396858816419857&lt;-C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="578.5,117.85,574.5,123.85,578.5,129.85,582.5,123.85,578.5,117.85" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="584.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="591.5" y="176.0669">ints</text>
-    <path d="M915.02,271.16 C901.78,287.89 885.16,308.88 871.28,326.42 " fill="none" id="C_0001549419203490064906-&gt;C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="866.9278" cy="331.9193" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="871.8955" x2="861.96" y1="325.6487" y2="338.19"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="873.1984" x2="860.6571" y1="336.8871" y2="326.9516"/>
-    <path d="M840.4,101.25 C836.74,140.24 831.51,210.75 834.5,271 C835.36,288.27 837.13,307.32 838.87,323.47 " fill="none" id="C_0000033637089897037832-&gt;C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="839.6807" cy="330.5307" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="838.7813" x2="840.58" y1="322.5814" y2="338.48"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="847.6299" x2="831.7314" y1="329.6314" y2="331.4301"/>
-    <path d="M860.27,101.15 C874.53,126.38 895.29,163.08 911.83,192.34 " fill="none" id="C_0000033637089897037832-&gt;C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="917.99,189.01,921.74,209.87,905.8,195.9,917.99,189.01" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001449136415707203971_C_0001968575752686868237">
+      <path codeLine="47" d="M575,292.49 C575,311.96 575,321.92 575,343.41 " fill="none" id="C_0001449136415707203971-to-C_0001968575752686868237" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="575,361.41,581,343.41,569,343.41,575,361.41" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001562396858816419857_C_0001449136415707203971">
+      <path codeLine="48" d="M575,149.98 C575,185.01 575,217.33 575,243.91 " fill="none" id="C_0001562396858816419857-backto-C_0001449136415707203971" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="575,137.98,571,143.98,575,149.98,579,143.98,575,137.98" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="581" cy="198.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="588" y="201.877">ints</text>
+    </g>
+    <g id="link_C_0001549419203490064906_C_0001787658457052431115">
+      <path codeLine="49" d="M925.54,301.08 C909.04,322.57 897.4008,337.7468 882.5208,357.1368 " fill="none" id="C_0001549419203490064906-to-C_0001787658457052431115" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="877.6504" cy="363.4834" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="882.5208" x2="872.78" y1="357.1368" y2="369.83"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="883.997" x2="871.3038" y1="368.3538" y2="358.613"/>
+    </g>
+    <g id="link_C_0000033637089897037832_C_0001787658457052431115">
+      <path codeLine="50" d="M851.54,117.13 C847.41,159.12 841.48,235.43 845,300.6 C846.27,324.12 847.2884,335.0021 849.6984,353.6421 " fill="none" id="C_0000033637089897037832-to-C_0001787658457052431115" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="850.7242" cy="361.576" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="849.6984" x2="851.75" y1="353.6421" y2="369.51"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="858.6582" x2="842.7902" y1="360.5502" y2="362.6018"/>
+    </g>
+    <g id="link_C_0000033637089897037832_C_0001549419203490064906">
+      <path codeLine="51" d="M871.55,117.07 C888.93,150.33 907.7735,186.3969 925.1435,219.6369 " fill="none" id="C_0000033637089897037832-to-C_0001549419203490064906" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="933.48,235.59,930.4612,216.858,919.8258,222.4157,933.48,235.59" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00008_class_mermaid.svg b/docs/test_cases/t00008_class_mermaid.svg
index 9d2c9549..7a9afd27 100644
--- a/docs/test_cases/t00008_class_mermaid.svg
+++ b/docs/test_cases/t00008_class_mermaid.svg
@@ -1,60 +1,65 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1075.48046875 481" style="max-width: 1075.48px; background-color: white;" width="1075.48046875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1086.59375 481" style="max-width: 1086.59px; background-color: white;" width="1086.59375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M618.796875,333L618.796875,339C618.796875,345,618.796875,357,618.796875,367.1666666666667C618.796875,377.3333333333333,618.796875,385.6666666666667,618.796875,389.8333333333333L618.796875,394"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M618.796875,164L618.796875,175.16666666666666C618.796875,186.33333333333334,618.796875,208.66666666666666,618.796875,227.33333333333334C618.796875,246,618.796875,261,618.796875,268.5L618.796875,276"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M861.4921875,122.9321591019065L850.1770833333334,140.94346591825544C838.8619791666666,158.95477273460435,816.2317708333334,194.9773863673022,804.9166666666666,225.2386931836511C793.6015625,255.5,793.6015625,280,793.6015625,303C793.6015625,326,793.6015625,347.5,798.8164567183462,362.4166666666667C804.0313509366924,377.3333333333333,814.461139373385,385.6666666666667,819.6760335917312,389.8333333333333L824.8909278100775,394"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M887.1640625,124.18837639324053L897.6998697916666,141.99031366103378C908.2356770833334,159.79225092882703,929.3072916666666,195.39612546441353,939.8430989583334,218.86472939887344C950.37890625,242.33333333333334,950.37890625,253.66666666666666,950.37890625,259.3333333333333L950.37890625,265"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M950.37890625,344L950.37890625,348.1666666666667C950.37890625,352.3333333333333,950.37890625,360.6666666666667,945.4660650839793,369C940.5532239179587,377.3333333333333,930.7275415859173,385.6666666666667,925.8147004198967,389.8333333333333L920.901859253876,394"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M623.2421875,333L623.2421875,339C623.2421875,345,623.2421875,357,623.2421875,364.1666666666667C623.2421875,371.3333333333333,623.2421875,373.6666666666667,623.2421875,374.8333333333333L623.2421875,376"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M623.2421875,182L623.2421875,190.16666666666666C623.2421875,198.33333333333334,623.2421875,214.66666666666666,623.2421875,230.33333333333334C623.2421875,246,623.2421875,261,623.2421875,268.5L623.2421875,276"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M858.7560452999094,134.36355046037843L848.6378502499246,150.4696253836487C838.5196551999396,166.57570030691895,818.2832650999699,198.78785015345946,808.1650700499849,227.14392507672974C798.046875,255.5,798.046875,280,798.046875,303C798.046875,326,798.046875,347.5,803.2617692183462,362.4166666666667C808.4766634366924,377.3333333333333,818.906451873385,385.6666666666667,824.1213460917312,389.8333333333333L829.3362403100775,394"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M898.6323276087663,135.10195872931308L908.3680855073053,151.0849656077609C918.1038434058443,167.06797248620873,937.5753592029222,199.03398624310435,947.311117101461,220.68365978821885C957.046875,242.33333333333334,957.046875,253.66666666666666,957.046875,259.3333333333333L957.046875,265"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M957.046875,344L957.046875,348.1666666666667C957.046875,352.3333333333333,957.046875,360.6666666666667,954.305668334283,367.0921817445679C951.564461668566,373.5176968224692,946.082048337132,378.03539364493844,943.3408416714151,380.294242056173L940.5996350056981,382.55309046740757"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -68,7 +73,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(618.796875, 231)" class="edgeLabel">
+        <g transform="translate(623.2421875, 231)" class="edgeLabel">
           <g transform="translate(-17.125, -9)" class="label">
             <foreignObject height="18" width="34.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -114,7 +119,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L9">
+        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L9">
           <g title="A" id="classId-C_0002293517130897538130-0" class="node default clickable">
             <rect height="189" width="242.171875" y="-94.5" x="-121.0859375" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="121.0859375" x1="-121.0859375" class="divider"/>
@@ -142,7 +147,7 @@
               </foreignObject>
               <foreignObject transform="translate( -113.5859375, -9)" height="18" width="81.375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+pointer : T </span>
+                  <span style="font-style:italic;" class="nodeLabel">+pointer : T</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -113.5859375, 13)" height="18" width="114.59375">
@@ -163,7 +168,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L20">
+        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L20">
           <g title="Vector" id="classId-C_0001677407014842680311-1" class="node default clickable">
             <rect height="79" width="186.203125" y="-39.5" x="-93.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="93.1015625" x1="-93.1015625" class="divider"/>
@@ -187,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L24">
+        <a transform="translate(623.2421875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001968575752686868237-2" class="node default clickable">
             <rect height="79" width="209.328125" y="-39.5" x="-104.6640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="104.6640625" x1="-104.6640625" class="divider"/>
@@ -211,7 +216,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L24">
+        <a transform="translate(623.2421875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001449136415707203971-3" class="node default clickable">
             <rect height="57" width="118.15625" y="-28.5" x="-59.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.078125" x1="-59.078125" class="divider"/>
@@ -230,11 +235,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L28">
+        <a transform="translate(623.2421875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L28">
           <g title="D" id="classId-C_0001562396858816419857-4" class="node default clickable">
-            <rect height="123" width="164.84375" y="-61.5" x="-82.421875" class="outer title-state"/>
-            <line y2="-31.5" y1="-31.5" x2="82.421875" x1="-82.421875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="82.421875" x1="-82.421875" class="divider"/>
+            <rect height="123" width="173.734375" y="-61.5" x="-86.8671875" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="86.8671875" x1="-86.8671875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="86.8671875" x1="-86.8671875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -246,25 +251,25 @@
                   <span class="nodeLabel">D</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.921875, -20)" height="18" width="143.640625">
+              <foreignObject transform="translate( -79.3671875, -20)" height="18" width="143.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+ints : B&lt;int,Vector&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.921875, 14)" height="18" width="149.84375">
+              <foreignObject transform="translate( -79.3671875, 14)" height="18" width="158.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+D(std::tuple *) : void</span>
+                  <span class="nodeLabel">+D(std::tuple *) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.921875, 36)" height="18" width="114.28125">
+              <foreignObject transform="translate( -79.3671875, 36)" height="18" width="123.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+add(int i) : void</span>
+                  <span class="nodeLabel">+add(int i) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L36">
+        <a transform="translate(878.7734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L36">
           <g title="E" id="classId-C_0001787658457052431115-5" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -283,7 +288,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L37">
+        <a transform="translate(878.7734375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L37">
           <g title="E##nested_template" id="classId-C_0001549419203490064906-6" class="node default clickable">
             <rect height="79" width="201.734375" y="-39.5" x="-100.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="100.8671875" x1="-100.8671875" class="divider"/>
@@ -299,19 +304,19 @@
                   <span class="nodeLabel">E::nested_template&lt;ET&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -93.3671875, 14)" height="18" width="131.46875">
+              <foreignObject transform="translate( -93.3671875, 14)" height="18" width="140.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+get(ET * d) : DT *</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+get(ET * d) : : DT *</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00008/t00008.cc#L44">
+        <a transform="translate(957.046875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L44">
           <g title="E##nested_template" id="classId-C_0000033637089897037832-7" class="node default clickable">
-            <rect height="79" width="234.203125" y="-39.5" x="-117.1015625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="117.1015625" x1="-117.1015625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="117.1015625" x1="-117.1015625" class="divider"/>
+            <rect height="79" width="243.09375" y="-39.5" x="-121.546875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="121.546875" x1="-121.546875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="121.546875" x1="-121.546875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -323,9 +328,9 @@
                   <span class="nodeLabel">E::nested_template&lt;char&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -109.6015625, 14)" height="18" width="219.203125">
+              <foreignObject transform="translate( -114.046875, 14)" height="18" width="228.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+getDecl(char * c) : DeclType *</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+getDecl(char * c) : : DeclType *</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00009.md b/docs/test_cases/t00009.md
index e8eabe68..b77d0453 100644
--- a/docs/test_cases/t00009.md
+++ b/docs/test_cases/t00009.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00009.cc
+File `tests/t00009/t00009.cc`
 ```cpp
 #include <string>
 #include <vector>
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index 18770a6e..410bafe7 100644
--- a/docs/test_cases/t00009_class.svg
+++ b/docs/test_cases/t00009_class.svg
@@ -1,107 +1,123 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:410px;height:363px;background:#FFFFFF;" version="1.1" viewBox="0 0 410 363" width="410px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fzsf7up97dver" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzsf7up97dver)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
-      <ellipse cx="142.3" cy="296" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M145.2688,301.6406 Q144.6906,301.9375 144.05,302.0781 Q143.4094,302.2344 142.7063,302.2344 Q140.2063,302.2344 138.8781,300.5938 Q137.5656,298.9375 137.5656,295.8125 Q137.5656,292.6875 138.8781,291.0313 Q140.2063,289.375 142.7063,289.375 Q143.4094,289.375 144.05,289.5313 Q144.7063,289.6875 145.2688,289.9844 L145.2688,292.7031 Q144.6438,292.125 144.05,291.8594 Q143.4563,291.5781 142.8313,291.5781 Q141.4875,291.5781 140.8,292.6563 Q140.1125,293.7188 140.1125,295.8125 Q140.1125,297.9063 140.8,298.9844 Q141.4875,300.0469 142.8313,300.0469 Q143.4563,300.0469 144.05,299.7813 Q144.6438,299.5 145.2688,298.9219 L145.2688,301.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="158.7" y="300.1543">A</text>
-      <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"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="320" y2="320"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000412228989111660105">
+        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000412228989111660105" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="108.5" y="291.4"/>
+        <ellipse cx="136.55" cy="307.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M131.55,308.5563 C131.55,311.0563 133.6906,312.8688 136.6125,312.8688 C137.8469,312.8688 139.0188,312.5719 139.7688,312.0563 C140.3781,311.6344 140.7063,311.2125 140.7063,310.8063 C140.7063,310.3375 140.2844,309.9313 139.7844,309.9313 C139.55,309.9313 139.3313,310.0094 139.1281,310.2125 C138.6906,310.65 138.6906,310.65 138.5188,310.7438 C138.0656,310.9781 137.425,311.1188 136.6594,311.1188 C134.6594,311.1188 133.3781,310.1031 133.3781,308.525 L133.3781,307.4781 C133.3781,305.775 134.5969,304.5719 136.3,304.5719 C136.8781,304.5719 137.4563,304.7125 137.925,304.9625 C138.3938,305.2281 138.5656,305.4156 138.6281,305.775 C138.7531,306.4469 139.0031,306.6969 139.5344,306.6969 C139.8156,306.6969 140.0969,306.5563 140.2844,306.3375 C140.4094,306.1656 140.4563,305.9938 140.4563,305.5563 L140.4563,304.1969 C140.4563,303.775 140.4406,303.6344 140.3156,303.4625 C140.1438,303.2125 139.8625,303.0563 139.5344,303.0563 C139.2219,303.0563 139.0188,303.1656 138.8,303.4313 C137.6281,302.9313 137.1906,302.8219 136.2375,302.8219 C133.5656,302.8219 131.55,304.8375 131.55,307.4625 L131.55,308.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="153.45" y="312.006">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="183.5" y="288.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="184.5" y="302.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="109.5" x2="188.5" y1="323.4" y2="323.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="109.5" x2="188.5" y1="331.4" y2="331.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="114.5" y="340.3"/>
+          <ellipse cx="119.5" cy="345.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="128.5" y="348.4059">value : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122.5" y="326"/>
-      <ellipse cx="127.5" cy="331" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000001894387438043499">
+        <rect codeLine="7" fill="#F1F1F1" height="48" id="C_0000001894387438043499" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="7" y="182.4"/>
+        <ellipse cx="22" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,199.5562 C17,202.0562 19.1406,203.8687 22.0625,203.8687 C23.2969,203.8687 24.4688,203.5719 25.2188,203.0562 C25.8281,202.6344 26.1563,202.2125 26.1563,201.8062 C26.1563,201.3375 25.7344,200.9312 25.2344,200.9312 C25,200.9312 24.7813,201.0094 24.5781,201.2125 C24.1406,201.65 24.1406,201.65 23.9688,201.7437 C23.5156,201.9781 22.875,202.1187 22.1094,202.1187 C20.1094,202.1187 18.8281,201.1031 18.8281,199.525 L18.8281,198.4781 C18.8281,196.775 20.0469,195.5719 21.75,195.5719 C22.3281,195.5719 22.9063,195.7125 23.375,195.9625 C23.8438,196.2281 24.0156,196.4156 24.0781,196.775 C24.2031,197.4469 24.4531,197.6969 24.9844,197.6969 C25.2656,197.6969 25.5469,197.5562 25.7344,197.3375 C25.8594,197.1656 25.9063,196.9937 25.9063,196.5562 L25.9063,195.1969 C25.9063,194.775 25.8906,194.6344 25.7656,194.4625 C25.5938,194.2125 25.3125,194.0562 24.9844,194.0562 C24.6719,194.0562 24.4688,194.1656 24.25,194.4312 C23.0781,193.9312 22.6406,193.8219 21.6875,193.8219 C19.0156,193.8219 17,195.8375 17,198.4625 L17,199.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="203.006">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="53" y="179.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="54" y="193.6001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="64" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="64" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="136.5" y="334.2104">value : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001340793233843139195">
+        <rect codeLine="11" fill="#F1F1F1" height="48" id="C_0001340793233843139195" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="100.5" y="182.4"/>
+        <ellipse cx="115.5" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M110.5,199.5562 C110.5,202.0562 112.6406,203.8687 115.5625,203.8687 C116.7969,203.8687 117.9688,203.5719 118.7188,203.0562 C119.3281,202.6344 119.6563,202.2125 119.6563,201.8062 C119.6563,201.3375 119.2344,200.9312 118.7344,200.9312 C118.5,200.9312 118.2813,201.0094 118.0781,201.2125 C117.6406,201.65 117.6406,201.65 117.4688,201.7437 C117.0156,201.9781 116.375,202.1187 115.6094,202.1187 C113.6094,202.1187 112.3281,201.1031 112.3281,199.525 L112.3281,198.4781 C112.3281,196.775 113.5469,195.5719 115.25,195.5719 C115.8281,195.5719 116.4063,195.7125 116.875,195.9625 C117.3438,196.2281 117.5156,196.4156 117.5781,196.775 C117.7031,197.4469 117.9531,197.6969 118.4844,197.6969 C118.7656,197.6969 119.0469,197.5562 119.2344,197.3375 C119.3594,197.1656 119.4063,196.9937 119.4063,196.5562 L119.4063,195.1969 C119.4063,194.775 119.3906,194.6344 119.2656,194.4625 C119.0938,194.2125 118.8125,194.0562 118.4844,194.0562 C118.1719,194.0562 117.9688,194.1656 117.75,194.4312 C116.5781,193.9312 116.1406,193.8219 115.1875,193.8219 C112.5156,193.8219 110.5,195.8375 110.5,198.4625 L110.5,199.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="129.5" y="203.006">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="146.5" y="179.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="147.5" y="193.6001">std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="101.5" x2="196.5" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="101.5" x2="196.5" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzsf7up97dver)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
-      <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
-      <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"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001370808797762248850">
+        <rect codeLine="15" fill="#F1F1F1" height="48" id="C_0001370808797762248850" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="233" y="182.4"/>
+        <ellipse cx="248" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M243,199.5562 C243,202.0562 245.1406,203.8687 248.0625,203.8687 C249.2969,203.8687 250.4688,203.5719 251.2188,203.0562 C251.8281,202.6344 252.1563,202.2125 252.1563,201.8062 C252.1563,201.3375 251.7344,200.9312 251.2344,200.9312 C251,200.9312 250.7813,201.0094 250.5781,201.2125 C250.1406,201.65 250.1406,201.65 249.9688,201.7437 C249.5156,201.9781 248.875,202.1187 248.1094,202.1187 C246.1094,202.1187 244.8281,201.1031 244.8281,199.525 L244.8281,198.4781 C244.8281,196.775 246.0469,195.5719 247.75,195.5719 C248.3281,195.5719 248.9063,195.7125 249.375,195.9625 C249.8438,196.2281 250.0156,196.4156 250.0781,196.775 C250.2031,197.4469 250.4531,197.6969 250.9844,197.6969 C251.2656,197.6969 251.5469,197.5562 251.7344,197.3375 C251.8594,197.1656 251.9063,196.9937 251.9063,196.5562 L251.9063,195.1969 C251.9063,194.775 251.8906,194.6344 251.7656,194.4625 C251.5938,194.2125 251.3125,194.0562 250.9844,194.0562 C250.6719,194.0562 250.4688,194.1656 250.25,194.4312 C249.0781,193.9312 248.6406,193.8219 247.6875,193.8219 C245.0156,193.8219 243,195.8375 243,198.4625 L243,199.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="262" y="203.006">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="123" x="279" y="179.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="121" x="280" y="193.6001">std::vector&lt;std::string&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="234" x2="398" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="234" x2="398" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzsf7up97dver)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
-      <ellipse cx="116" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M118.9688,192.6406 Q118.3906,192.9375 117.75,193.0781 Q117.1094,193.2344 116.4063,193.2344 Q113.9063,193.2344 112.5781,191.5938 Q111.2656,189.9375 111.2656,186.8125 Q111.2656,183.6875 112.5781,182.0313 Q113.9063,180.375 116.4063,180.375 Q117.1094,180.375 117.75,180.5313 Q118.4063,180.6875 118.9688,180.9844 L118.9688,183.7031 Q118.3438,183.125 117.75,182.8594 Q117.1563,182.5781 116.5313,182.5781 Q115.1875,182.5781 114.5,183.6563 Q113.8125,184.7188 113.8125,186.8125 Q113.8125,188.9063 114.5,189.9844 Q115.1875,191.0469 116.5313,191.0469 Q117.1563,191.0469 117.75,190.7813 Q118.3438,190.5 118.9688,189.9219 L118.9688,192.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="130" y="191.1543">A</text>
-      <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"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000176239714450247310">
+        <rect codeLine="19" fill="#F1F1F1" height="98.3998" id="C_0000176239714450247310" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="267" x="15.5" y="7"/>
+        <ellipse cx="140.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M135.25,24.1563 C135.25,26.6563 137.3906,28.4688 140.3125,28.4688 C141.5469,28.4688 142.7188,28.1719 143.4688,27.6563 C144.0781,27.2344 144.4063,26.8125 144.4063,26.4063 C144.4063,25.9375 143.9844,25.5313 143.4844,25.5313 C143.25,25.5313 143.0313,25.6094 142.8281,25.8125 C142.3906,26.25 142.3906,26.25 142.2188,26.3438 C141.7656,26.5781 141.125,26.7188 140.3594,26.7188 C138.3594,26.7188 137.0781,25.7031 137.0781,24.125 L137.0781,23.0781 C137.0781,21.375 138.2969,20.1719 140,20.1719 C140.5781,20.1719 141.1563,20.3125 141.625,20.5625 C142.0938,20.8281 142.2656,21.0156 142.3281,21.375 C142.4531,22.0469 142.7031,22.2969 143.2344,22.2969 C143.5156,22.2969 143.7969,22.1563 143.9844,21.9375 C144.1094,21.7656 144.1563,21.5938 144.1563,21.1563 L144.1563,19.7969 C144.1563,19.375 144.1406,19.2344 144.0156,19.0625 C143.8438,18.8125 143.5625,18.6563 143.2344,18.6563 C142.9219,18.6563 142.7188,18.7656 142.5,19.0313 C141.3281,18.5313 140.8906,18.4219 139.9375,18.4219 C137.2656,18.4219 135.25,20.4375 135.25,23.0625 L135.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="160.75" y="27.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="16.5" x2="281.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="16.5" x2="281.5" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.5" y="55.9"/>
+          <ellipse cx="26.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="35.5" y="64.0059">aint : A&lt;int&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.5" y="72.6999"/>
+          <ellipse cx="26.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="151" x="35.5" y="80.8059">astring : A&lt;std::string&gt; *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.5" y="89.4998"/>
+          <ellipse cx="26.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="241" x="35.5" y="97.6058">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzsf7up97dver)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
-      <ellipse cx="257" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M259.9688,192.6406 Q259.3906,192.9375 258.75,193.0781 Q258.1094,193.2344 257.4063,193.2344 Q254.9063,193.2344 253.5781,191.5938 Q252.2656,189.9375 252.2656,186.8125 Q252.2656,183.6875 253.5781,182.0313 Q254.9063,180.375 257.4063,180.375 Q258.1094,180.375 258.75,180.5313 Q259.4063,180.6875 259.9688,180.9844 L259.9688,183.7031 Q259.3438,183.125 258.75,182.8594 Q258.1563,182.5781 257.5313,182.5781 Q256.1875,182.5781 255.5,183.6563 Q254.8125,184.7188 254.8125,186.8125 Q254.8125,188.9063 255.5,189.9844 Q256.1875,191.0469 257.5313,191.0469 Q258.1563,191.0469 258.75,190.7813 Q259.3438,190.5 259.9688,189.9219 L259.9688,192.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="191.1543">A</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzsf7up97dver)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
-      <ellipse cx="145.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M148.7188,29.6406 Q148.1406,29.9375 147.5,30.0781 Q146.8594,30.2344 146.1563,30.2344 Q143.6563,30.2344 142.3281,28.5938 Q141.0156,26.9375 141.0156,23.8125 Q141.0156,20.6875 142.3281,19.0313 Q143.6563,17.375 146.1563,17.375 Q146.8594,17.375 147.5,17.5313 Q148.1563,17.6875 148.7188,17.9844 L148.7188,20.7031 Q148.0938,20.125 147.5,19.8594 Q146.9063,19.5781 146.2813,19.5781 Q144.9375,19.5781 144.25,20.6563 Q143.5625,21.7188 143.5625,23.8125 Q143.5625,25.9063 144.25,26.9844 Q144.9375,28.0469 146.2813,28.0469 Q146.9063,28.0469 147.5,27.7813 Q148.0938,27.5 148.7188,26.9219 L148.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.25" y="28.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="54"/>
-      <ellipse cx="36.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="45.5" y="62.2104">aint : A&lt;int&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="66.8047"/>
-      <ellipse cx="36.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="45.5" y="75.0151">astring : A&lt;std::string&gt; *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="79.6094"/>
-      <ellipse cx="36.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="231" x="45.5" y="87.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
-    </a>
-    <path d="M60.16,219.24 C74.1,232.65 92.08,249.94 108.57,265.8 " fill="none" id="C_0000001894387438043499-&gt;C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <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;"/>
-    <path d="M154,219.24 C154,230.87 154,245.42 154,259.43 " fill="none" id="C_0001340793233843139195-&gt;C_0000412228989111660105" 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;"/>
-    <path d="M300.32,219.24 C274.03,235.46 238.51,257.37 209.05,275.54 " fill="none" id="C_0001370808797762248850-&gt;C_0000412228989111660105" 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;"/>
-    <path d="M110.41,104.45 C91.49,127.23 70.29,152.74 55.37,170.69 " fill="none" id="C_0000176239714450247310&lt;-C_0000001894387438043499" 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>
-    <path d="M154,94.22 C154,117.28 154,145.22 154,165.66 " fill="none" id="C_0000176239714450247310-&gt;C_0001340793233843139195" 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>
-    <path d="M208.71,94.22 C239.58,118.04 277.19,147.07 303.87,167.66 " fill="none" id="C_0000176239714450247310-&gt;C_0001370808797762248850" 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>
+    <g id="link_C_0000001894387438043499_C_0000412228989111660105">
+      <path codeLine="25" d="M58.87,230.75 C75.89,248.14 86.724,259.2115 105.434,278.3115 " fill="none" id="C_0000001894387438043499-to-C_0000412228989111660105" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="118.03,291.17,109.7202,274.1128,101.1479,282.5101,118.03,291.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001340793233843139195_C_0000412228989111660105">
+      <path codeLine="26" d="M149,230.75 C149,248.14 149,254.07 149,273.17 " fill="none" id="C_0001340793233843139195-to-C_0000412228989111660105" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="149,291.17,155,273.17,143,273.17,149,291.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001370808797762248850_C_0000412228989111660105">
+      <path codeLine="27" d="M282.21,230.75 C255.52,249.19 232.986,264.7537 204.636,284.3537 " fill="none" id="C_0001370808797762248850-to-C_0000412228989111660105" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="189.83,294.59,208.0481,289.2891,201.2239,279.4184,189.83,294.59" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000176239714450247310_C_0000001894387438043499">
+      <path codeLine="28" d="M104.7229,115.2717 C85.1529,140.9317 69.31,161.72 53.75,182.12 " fill="none" id="C_0000176239714450247310-backto-C_0000001894387438043499" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="112,105.73,105.1809,108.0751,104.7229,115.2717,111.542,112.9265,112,105.73" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="96" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="103" y="148.477">aint</text>
+    </g>
+    <g id="link_C_0000176239714450247310_C_0001340793233843139195">
+      <path codeLine="29" d="M149,105.73 C149,131.39 149,155.72 149,176.12 " fill="none" id="C_0000176239714450247310-to-C_0001340793233843139195" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="149,182.12,153,173.12,149,177.12,145,173.12,149,182.12" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="155" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="162" y="148.477">astring</text>
+    </g>
+    <g id="link_C_0000176239714450247310_C_0001370808797762248850">
+      <path codeLine="30" d="M203.68,105.73 C232.6,131.39 262.2812,157.7387 285.2812,178.1387 " fill="none" id="C_0000176239714450247310-to-C_0001370808797762248850" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="289.77,182.12,285.6911,173.1555,286.0294,178.8022,280.3826,179.1405,289.77,182.12" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="258" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="265" y="148.477">avector</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00009_class_mermaid.svg b/docs/test_cases/t00009_class_mermaid.svg
index ddebcaf1..5bb62d6e 100644
--- a/docs/test_cases/t00009_class_mermaid.svg
+++ b/docs/test_cases/t00009_class_mermaid.svg
@@ -1,61 +1,66 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 530.859375 393" style="max-width: 530.859px; background-color: white;" width="530.859375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M40.3984375,256L40.3984375,260.1666666666667C40.3984375,264.3333333333333,40.3984375,272.6666666666667,57.375,284.40742141763485C74.3515625,296.1481761686031,108.3046875,311.29635233720614,125.28125,318.8704404215077L142.2578125,326.4445285058092"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.96875,256L184.96875,260.1666666666667C184.96875,264.3333333333333,184.96875,272.6666666666667,184.96875,281C184.96875,289.3333333333333,184.96875,297.6666666666667,184.96875,301.8333333333333L184.96875,306"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M410,256L410,260.1666666666667C410,264.3333333333333,410,272.6666666666667,379.61328125,285.5429830347637C349.2265625,298.41929940286076,288.453125,315.83859880572146,258.06640625,324.5482485071518L227.6796875,333.25789820858216"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M91.86849640052355,131L83.29015325043629,136.66666666666666C74.71181010034904,142.33333333333334,57.55512380017452,153.66666666666666,48.97678065008726,165C40.3984375,176.33333333333334,40.3984375,187.66666666666666,40.3984375,193.33333333333334L40.3984375,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M184.96875,131L184.96875,136.66666666666666C184.96875,142.33333333333334,184.96875,153.66666666666666,184.96875,165C184.96875,176.33333333333334,184.96875,187.66666666666666,184.96875,193.33333333333334L184.96875,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M329.8841623036649,131L343.2368019197208,136.66666666666666C356.5894415357766,142.33333333333334,383.2947207678883,153.66666666666666,396.6473603839442,165C410,176.33333333333334,410,187.66666666666666,410,193.33333333333334L410,199"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M40.3984375,256L40.3984375,260.1666666666667C40.3984375,264.3333333333333,40.3984375,272.6666666666667,54.63530201463541,283.1851060127621C68.87216652927081,293.7035453588576,97.34589555854164,306.4070907177152,111.58276007317704,312.758863397144L125.81962458781246,319.1106360765728"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.96875,256L184.96875,260.1666666666667C184.96875,264.3333333333333,184.96875,272.6666666666667,184.96875,278C184.96875,283.3333333333333,184.96875,285.6666666666667,184.96875,286.8333333333333L184.96875,288"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M410,256L410,260.1666666666667C410,264.3333333333333,410,272.6666666666667,382.49715688931127,284.71638682319053C354.9943137786225,296.7661069797144,299.988627557245,312.53221395942876,272.48578444655624,320.415267449286L244.9829413358675,328.29832093914314"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M76.84952080548504,140.92120819636588L70.77434025457087,144.93434016363824C64.69915970365669,148.9474721309106,52.548798601828345,156.9737360654553,46.473618050914176,166.65353469939433C40.3984375,176.33333333333334,40.3984375,187.66666666666666,40.3984375,193.33333333333334L40.3984375,199"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M184.96875,131L184.96875,136.66666666666666C184.96875,142.33333333333334,184.96875,153.66666666666666,184.96875,164C184.96875,174.33333333333334,184.96875,183.66666666666666,184.96875,188.33333333333334L184.96875,193"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M329.8841623036649,131L343.2368019197208,136.66666666666666C356.5894415357766,142.33333333333334,383.2947207678883,153.66666666666666,396.6473603839442,164C410,174.33333333333334,410,183.66666666666666,410,188.33333333333334L410,193"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -126,7 +131,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000412228989111660105-0" class="node default clickable">
             <rect height="79" width="85.421875" y="-39.5" x="-42.7109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.7109375" x1="-42.7109375" class="divider"/>
@@ -150,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7">
+        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000001894387438043499-1" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -169,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001340793233843139195-2" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -188,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L7">
+        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001370808797762248850-3" class="node default clickable">
             <rect height="57" width="225.71875" y="-28.5" x="-112.859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.859375" x1="-112.859375" class="divider"/>
@@ -207,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00009/t00009.cc#L12">
+        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L12">
           <g title="B" id="classId-C_0000176239714450247310-4" class="node default clickable">
             <rect height="123" width="295.59375" y="-61.5" x="-147.796875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="147.796875" x1="-147.796875" class="divider"/>
@@ -230,7 +235,7 @@
               </foreignObject>
               <foreignObject transform="translate( -140.296875, 2)" height="18" width="168.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+astring : A&lt;std::string&gt; </span>
+                  <span style="font-style:italic;" class="nodeLabel">+astring : A&lt;std::string&gt;</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -140.296875, 24)" height="18" width="280.59375">
diff --git a/docs/test_cases/t00010.md b/docs/test_cases/t00010.md
index 624e3571..8e8e006d 100644
--- a/docs/test_cases/t00010.md
+++ b/docs/test_cases/t00010.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00010.cc
+File `tests/t00010/t00010.cc`
 ```cpp
 #include <string>
 #include <vector>
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index 0b253b80..3a91d9be 100644
--- a/docs/test_cases/t00010_class.svg
+++ b/docs/test_cases/t00010_class.svg
@@ -1,101 +1,113 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="597px" preserveAspectRatio="none" style="width:199px;height:597px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 597" width="199px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1gocdy4zmrdyz" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gocdy4zmrdyz)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
-      <ellipse cx="75.3" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M78.2688,523.6406 Q77.6906,523.9375 77.05,524.0781 Q76.4094,524.2344 75.7063,524.2344 Q73.2063,524.2344 71.8781,522.5938 Q70.5656,520.9375 70.5656,517.8125 Q70.5656,514.6875 71.8781,513.0313 Q73.2063,511.375 75.7063,511.375 Q76.4094,511.375 77.05,511.5313 Q77.7063,511.6875 78.2688,511.9844 L78.2688,514.7031 Q77.6438,514.125 77.05,513.8594 Q76.4563,513.5781 75.8313,513.5781 Q74.4875,513.5781 73.8,514.6563 Q73.1125,515.7188 73.1125,517.8125 Q73.1125,519.9063 73.8,520.9844 Q74.4875,522.0469 75.8313,522.0469 Q76.4563,522.0469 77.05,521.7813 Q77.6438,521.5 78.2688,520.9219 L78.2688,523.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.7" y="522.1543">A</text>
-      <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"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="542" y2="542"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002222216618904514099">
+        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0002222216618904514099" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="51" y="508.6"/>
+        <ellipse cx="79.5" cy="524.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M74.5,525.7563 C74.5,528.2563 76.6406,530.0688 79.5625,530.0688 C80.7969,530.0688 81.9688,529.7719 82.7188,529.2563 C83.3281,528.8344 83.6563,528.4125 83.6563,528.0063 C83.6563,527.5375 83.2344,527.1313 82.7344,527.1313 C82.5,527.1313 82.2813,527.2094 82.0781,527.4125 C81.6406,527.85 81.6406,527.85 81.4688,527.9438 C81.0156,528.1781 80.375,528.3188 79.6094,528.3188 C77.6094,528.3188 76.3281,527.3031 76.3281,525.725 L76.3281,524.6781 C76.3281,522.975 77.5469,521.7719 79.25,521.7719 C79.8281,521.7719 80.4063,521.9125 80.875,522.1625 C81.3438,522.4281 81.5156,522.6156 81.5781,522.975 C81.7031,523.6469 81.9531,523.8969 82.4844,523.8969 C82.7656,523.8969 83.0469,523.7563 83.2344,523.5375 C83.3594,523.3656 83.4063,523.1938 83.4063,522.7563 L83.4063,521.3969 C83.4063,520.975 83.3906,520.8344 83.2656,520.6625 C83.0938,520.4125 82.8125,520.2563 82.4844,520.2563 C82.1719,520.2563 81.9688,520.3656 81.75,520.6313 C80.5781,520.1313 80.1406,520.0219 79.1875,520.0219 C76.5156,520.0219 74.5,522.0375 74.5,524.6625 L74.5,525.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="96.5" y="529.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="127" y="505.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="128" y="519.8001">T,P</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="52" x2="143" y1="540.6" y2="540.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="52" x2="143" y1="548.6" y2="548.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="57" y="557.5"/>
+          <ellipse cx="62" cy="562.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="71" y="565.6059">first : T</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="57" y="574.2999"/>
+          <ellipse cx="62" cy="579.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="67" x="71" y="582.4059">second : P</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="548"/>
-      <ellipse cx="60.5" cy="553" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001861520693741915300">
+        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0001861520693741915300" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="44" y="399.6"/>
+        <ellipse cx="59" cy="415.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M54,416.7563 C54,419.2563 56.1406,421.0688 59.0625,421.0688 C60.2969,421.0688 61.4688,420.7719 62.2188,420.2563 C62.8281,419.8344 63.1563,419.4125 63.1563,419.0063 C63.1563,418.5375 62.7344,418.1313 62.2344,418.1313 C62,418.1313 61.7813,418.2094 61.5781,418.4125 C61.1406,418.85 61.1406,418.85 60.9688,418.9438 C60.5156,419.1781 59.875,419.3188 59.1094,419.3188 C57.1094,419.3188 55.8281,418.3031 55.8281,416.725 L55.8281,415.6781 C55.8281,413.975 57.0469,412.7719 58.75,412.7719 C59.3281,412.7719 59.9063,412.9125 60.375,413.1625 C60.8438,413.4281 61.0156,413.6156 61.0781,413.975 C61.2031,414.6469 61.4531,414.8969 61.9844,414.8969 C62.2656,414.8969 62.5469,414.7563 62.7344,414.5375 C62.8594,414.3656 62.9063,414.1938 62.9063,413.7563 L62.9063,412.3969 C62.9063,411.975 62.8906,411.8344 62.7656,411.6625 C62.5938,411.4125 62.3125,411.2563 61.9844,411.2563 C61.6719,411.2563 61.4688,411.3656 61.25,411.6313 C60.0781,411.1313 59.6406,411.0219 58.6875,411.0219 C56.0156,411.0219 54,413.0375 54,415.6625 L54,416.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="73" y="420.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="64" x="90" y="396.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="62" x="91" y="410.8001">T,std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="45" x2="150" y1="431.6" y2="431.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="45" x2="150" y1="439.6" y2="439.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="69.5" y="556.2104">first : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0002303611426082708583">
+        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0002303611426082708583" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="181" x="7" y="257.8"/>
+        <ellipse cx="83.25" cy="273.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M78.25,274.9563 C78.25,277.4563 80.3906,279.2688 83.3125,279.2688 C84.5469,279.2688 85.7188,278.9719 86.4688,278.4563 C87.0781,278.0344 87.4063,277.6125 87.4063,277.2063 C87.4063,276.7375 86.9844,276.3313 86.4844,276.3313 C86.25,276.3313 86.0313,276.4094 85.8281,276.6125 C85.3906,277.05 85.3906,277.05 85.2188,277.1438 C84.7656,277.3781 84.125,277.5188 83.3594,277.5188 C81.3594,277.5188 80.0781,276.5031 80.0781,274.925 L80.0781,273.8781 C80.0781,272.175 81.2969,270.9719 83,270.9719 C83.5781,270.9719 84.1563,271.1125 84.625,271.3625 C85.0938,271.6281 85.2656,271.8156 85.3281,272.175 C85.4531,272.8469 85.7031,273.0969 86.2344,273.0969 C86.5156,273.0969 86.7969,272.9563 86.9844,272.7375 C87.1094,272.5656 87.1563,272.3938 87.1563,271.9563 L87.1563,270.5969 C87.1563,270.175 87.1406,270.0344 87.0156,269.8625 C86.8438,269.6125 86.5625,269.4563 86.2344,269.4563 C85.9219,269.4563 85.7188,269.5656 85.5,269.8313 C84.3281,269.3313 83.8906,269.2219 82.9375,269.2219 C80.2656,269.2219 78.25,271.2375 78.25,273.8625 L78.25,274.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="103.75" y="278.406">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="182" y="254.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="183" y="269.0001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="187" y1="289.8" y2="289.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="187" y1="297.8" y2="297.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="306.7"/>
+          <ellipse cx="18" cy="311.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="27" y="314.8059">astring : A&lt;T,std::string&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="560.8047"/>
-      <ellipse cx="60.5" cy="565.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001498376939480949099">
+        <rect codeLine="17" fill="#F1F1F1" height="48" id="C_0001498376939480949099" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="68.5" y="148.8"/>
+        <ellipse cx="83.5" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M78.5,165.9563 C78.5,168.4563 80.6406,170.2688 83.5625,170.2688 C84.7969,170.2688 85.9688,169.9719 86.7188,169.4563 C87.3281,169.0344 87.6563,168.6125 87.6563,168.2063 C87.6563,167.7375 87.2344,167.3313 86.7344,167.3313 C86.5,167.3313 86.2813,167.4094 86.0781,167.6125 C85.6406,168.05 85.6406,168.05 85.4688,168.1438 C85.0156,168.3781 84.375,168.5188 83.6094,168.5188 C81.6094,168.5188 80.3281,167.5031 80.3281,165.925 L80.3281,164.8781 C80.3281,163.175 81.5469,161.9719 83.25,161.9719 C83.8281,161.9719 84.4063,162.1125 84.875,162.3625 C85.3438,162.6281 85.5156,162.8156 85.5781,163.175 C85.7031,163.8469 85.9531,164.0969 86.4844,164.0969 C86.7656,164.0969 87.0469,163.9563 87.2344,163.7375 C87.3594,163.5656 87.4063,163.3938 87.4063,162.9563 L87.4063,161.5969 C87.4063,161.175 87.3906,161.0344 87.2656,160.8625 C87.0938,160.6125 86.8125,160.4563 86.4844,160.4563 C86.1719,160.4563 85.9688,160.5656 85.75,160.8313 C84.5781,160.3313 84.1406,160.2219 83.1875,160.2219 C80.5156,160.2219 78.5,162.2375 78.5,164.8625 L78.5,165.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="97.5" y="169.406">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="114.5" y="145.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="115.5" y="160.0001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="69.5" x2="125.5" y1="180.8" y2="180.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="69.5" x2="125.5" y1="188.8" y2="188.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="69.5" y="569.0151">second : P</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001880966578968892571">
+        <rect codeLine="21" fill="#F1F1F1" height="64.7999" id="C_0001880966578968892571" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="136" x="29.5" y="7"/>
+        <ellipse cx="88.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M83.25,24.1563 C83.25,26.6563 85.3906,28.4688 88.3125,28.4688 C89.5469,28.4688 90.7188,28.1719 91.4688,27.6563 C92.0781,27.2344 92.4063,26.8125 92.4063,26.4063 C92.4063,25.9375 91.9844,25.5313 91.4844,25.5313 C91.25,25.5313 91.0313,25.6094 90.8281,25.8125 C90.3906,26.25 90.3906,26.25 90.2188,26.3438 C89.7656,26.5781 89.125,26.7188 88.3594,26.7188 C86.3594,26.7188 85.0781,25.7031 85.0781,24.125 L85.0781,23.0781 C85.0781,21.375 86.2969,20.1719 88,20.1719 C88.5781,20.1719 89.1563,20.3125 89.625,20.5625 C90.0938,20.8281 90.2656,21.0156 90.3281,21.375 C90.4531,22.0469 90.7031,22.2969 91.2344,22.2969 C91.5156,22.2969 91.7969,22.1563 91.9844,21.9375 C92.1094,21.7656 92.1563,21.5938 92.1563,21.1563 L92.1563,19.7969 C92.1563,19.375 92.1406,19.2344 92.0156,19.0625 C91.8438,18.8125 91.5625,18.6563 91.2344,18.6563 C90.9219,18.6563 90.7188,18.7656 90.5,19.0313 C89.3281,18.5313 88.8906,18.4219 87.9375,18.4219 C85.2656,18.4219 83.25,20.4375 83.25,23.0625 L83.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="108.75" y="27.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="30.5" x2="164.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="30.5" x2="164.5" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="35.5" y="55.9"/>
+          <ellipse cx="40.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="49.5" y="64.0059">aintstring : B&lt;int&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gocdy4zmrdyz)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
-      <ellipse cx="49" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M51.9688,414.6406 Q51.3906,414.9375 50.75,415.0781 Q50.1094,415.2344 49.4063,415.2344 Q46.9063,415.2344 45.5781,413.5938 Q44.2656,411.9375 44.2656,408.8125 Q44.2656,405.6875 45.5781,404.0313 Q46.9063,402.375 49.4063,402.375 Q50.1094,402.375 50.75,402.5313 Q51.4063,402.6875 51.9688,402.9844 L51.9688,405.7031 Q51.3438,405.125 50.75,404.8594 Q50.1563,404.5781 49.5313,404.5781 Q48.1875,404.5781 47.5,405.6563 Q46.8125,406.7188 46.8125,408.8125 Q46.8125,410.9063 47.5,411.9844 Q48.1875,413.0469 49.5313,413.0469 Q50.1563,413.0469 50.75,412.7813 Q51.3438,412.5 51.9688,411.9219 L51.9688,414.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="63" y="413.1543">A</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gocdy4zmrdyz)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
-      <ellipse cx="78.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M81.7188,276.6406 Q81.1406,276.9375 80.5,277.0781 Q79.8594,277.2344 79.1563,277.2344 Q76.6563,277.2344 75.3281,275.5938 Q74.0156,273.9375 74.0156,270.8125 Q74.0156,267.6875 75.3281,266.0313 Q76.6563,264.375 79.1563,264.375 Q79.8594,264.375 80.5,264.5313 Q81.1563,264.6875 81.7188,264.9844 L81.7188,267.7031 Q81.0938,267.125 80.5,266.8594 Q79.9063,266.5781 79.2813,266.5781 Q77.9375,266.5781 77.25,267.6563 Q76.5625,268.7188 76.5625,270.8125 Q76.5625,272.9063 77.25,273.9844 Q77.9375,275.0469 79.2813,275.0469 Q79.9063,275.0469 80.5,274.7813 Q81.0938,274.5 81.7188,273.9219 L81.7188,276.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="99.25" y="275.1543">B</text>
-      <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"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="295" y2="295"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="301"/>
-      <ellipse cx="17" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="26" y="309.2104">astring : A&lt;T,std::string&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gocdy4zmrdyz)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
-      <ellipse cx="77.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M80.4688,167.6406 Q79.8906,167.9375 79.25,168.0781 Q78.6094,168.2344 77.9063,168.2344 Q75.4063,168.2344 74.0781,166.5938 Q72.7656,164.9375 72.7656,161.8125 Q72.7656,158.6875 74.0781,157.0313 Q75.4063,155.375 77.9063,155.375 Q78.6094,155.375 79.25,155.5313 Q79.9063,155.6875 80.4688,155.9844 L80.4688,158.7031 Q79.8438,158.125 79.25,157.8594 Q78.6563,157.5781 78.0313,157.5781 Q76.6875,157.5781 76,158.6563 Q75.3125,159.7188 75.3125,161.8125 Q75.3125,163.9063 76,164.9844 Q76.6875,166.0469 78.0313,166.0469 Q78.6563,166.0469 79.25,165.7813 Q79.8438,165.5 80.4688,164.9219 L80.4688,167.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.5" y="166.1543">B</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gocdy4zmrdyz)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
-      <ellipse cx="84.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M87.2188,29.6406 Q86.6406,29.9375 86,30.0781 Q85.3594,30.2344 84.6563,30.2344 Q82.1563,30.2344 80.8281,28.5938 Q79.5156,26.9375 79.5156,23.8125 Q79.5156,20.6875 80.8281,19.0313 Q82.1563,17.375 84.6563,17.375 Q85.3594,17.375 86,17.5313 Q86.6563,17.6875 87.2188,17.9844 L87.2188,20.7031 Q86.5938,20.125 86,19.8594 Q85.4063,19.5781 84.7813,19.5781 Q83.4375,19.5781 82.75,20.6563 Q82.0625,21.7188 82.0625,23.8125 Q82.0625,25.9063 82.75,26.9844 Q83.4375,28.0469 84.7813,28.0469 Q85.4063,28.0469 86,27.7813 Q86.5938,27.5 87.2188,26.9219 L87.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="104.75" y="28.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="32.5" y="54"/>
-      <ellipse cx="37.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="46.5" y="62.2104">aintstring : B&lt;int&gt;</text>
-    </a>
-    <path d="M92.5,441.14 C92.5,452.67 92.5,467.17 92.5,481.41 " fill="none" id="C_0001861520693741915300-&gt;C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <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;"/>
-    <path d="M92.5,329.5 C92.5,350.65 92.5,375.32 92.5,392.88 " fill="none" id="C_0002303611426082708583&lt;-C_0001861520693741915300" 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>
-    <path d="M92.5,194.24 C92.5,205.87 92.5,220.42 92.5,234.43 " fill="none" id="C_0001498376939480949099-&gt;C_0002303611426082708583" 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;"/>
-    <path d="M92.5,82.5 C92.5,103.65 92.5,128.32 92.5,145.88 " fill="none" id="C_0001880966578968892571&lt;-C_0001498376939480949099" 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>
+    <g id="link_C_0001861520693741915300_C_0002222216618904514099">
+      <path codeLine="25" d="M97.5,447.89 C97.5,464.84 97.5,470.22 97.5,490.17 " fill="none" id="C_0001861520693741915300-to-C_0002222216618904514099" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="97.5,508.17,103.5,490.17,91.5,490.17,97.5,508.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002303611426082708583_C_0001861520693741915300">
+      <path codeLine="26" d="M97.5,335.01 C97.5,358.55 97.5,378.1 97.5,399.32 " fill="none" id="C_0002303611426082708583-backto-C_0001861520693741915300" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="97.5,323.01,93.5,329.01,97.5,335.01,101.5,329.01,97.5,323.01" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="103.5" cy="361.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="110.5" y="365.677">astring</text>
+    </g>
+    <g id="link_C_0001498376939480949099_C_0002303611426082708583">
+      <path codeLine="27" d="M97.5,197.15 C97.5,214.54 97.5,220.47 97.5,239.57 " fill="none" id="C_0001498376939480949099-to-C_0002303611426082708583" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="97.5,257.57,103.5,239.57,91.5,239.57,97.5,257.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001880966578968892571_C_0001498376939480949099">
+      <path codeLine="28" d="M97.5,84.21 C97.5,107.75 97.5,127.3 97.5,148.52 " fill="none" id="C_0001880966578968892571-backto-C_0001498376939480949099" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="97.5,72.21,93.5,78.21,97.5,84.21,101.5,78.21,97.5,72.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="103.5" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="110.5" y="114.877">aintstring</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00010_class_mermaid.svg b/docs/test_cases/t00010_class_mermaid.svg
index c70fed3e..3b4dca23 100644
--- a/docs/test_cases/t00010_class_mermaid.svg
+++ b/docs/test_cases/t00010_class_mermaid.svg
@@ -1,59 +1,64 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 211.984375 625" style="max-width: 211.984px; background-color: white;" width="211.984375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M105.9921875,466L105.9921875,470.1666666666667C105.9921875,474.3333333333333,105.9921875,482.6666666666667,105.9921875,491C105.9921875,499.3333333333333,105.9921875,507.6666666666667,105.9921875,511.8333333333333L105.9921875,516"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M105.9921875,341L105.9921875,346.6666666666667C105.9921875,352.3333333333333,105.9921875,363.6666666666667,105.9921875,375C105.9921875,386.3333333333333,105.9921875,397.6666666666667,105.9921875,403.3333333333333L105.9921875,409"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M105.9921875,212L105.9921875,216.16666666666666C105.9921875,220.33333333333334,105.9921875,228.66666666666666,105.9921875,237C105.9921875,245.33333333333334,105.9921875,253.66666666666666,105.9921875,257.8333333333333L105.9921875,262"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M105.9921875,87L105.9921875,92.66666666666667C105.9921875,98.33333333333333,105.9921875,109.66666666666667,105.9921875,121C105.9921875,132.33333333333334,105.9921875,143.66666666666666,105.9921875,149.33333333333334L105.9921875,155"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M105.9921875,466L105.9921875,470.1666666666667C105.9921875,474.3333333333333,105.9921875,482.6666666666667,105.9921875,488C105.9921875,493.3333333333333,105.9921875,495.6666666666667,105.9921875,496.8333333333333L105.9921875,498"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M105.9921875,359L105.9921875,361.6666666666667C105.9921875,364.3333333333333,105.9921875,369.6666666666667,105.9921875,378C105.9921875,386.3333333333333,105.9921875,397.6666666666667,105.9921875,403.3333333333333L105.9921875,409"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M105.9921875,212L105.9921875,216.16666666666666C105.9921875,220.33333333333334,105.9921875,228.66666666666666,105.9921875,234C105.9921875,239.33333333333334,105.9921875,241.66666666666666,105.9921875,242.83333333333334L105.9921875,244"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M105.9921875,105L105.9921875,107.66666666666667C105.9921875,110.33333333333333,105.9921875,115.66666666666667,105.9921875,124C105.9921875,132.33333333333334,105.9921875,143.66666666666666,105.9921875,149.33333333333334L105.9921875,155"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -102,7 +107,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0002222216618904514099-0" class="node default clickable">
             <rect height="101" width="99.953125" y="-50.5" x="-49.9765625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9765625" x1="-49.9765625" class="divider"/>
@@ -131,7 +136,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0001861520693741915300-1" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -150,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0002303611426082708583-2" class="node default clickable">
             <rect height="79" width="195.984375" y="-39.5" x="-97.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.9921875" x1="-97.9921875" class="divider"/>
@@ -174,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0001498376939480949099-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -193,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00010/t00010.cc#L18">
+        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L18">
           <g title="C" id="classId-C_0001880966578968892571-4" class="node default clickable">
             <rect height="79" width="148.859375" y="-39.5" x="-74.4296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.4296875" x1="-74.4296875" class="divider"/>
diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md
index 8b361e80..5e8a5007 100644
--- a/docs/test_cases/t00011.md
+++ b/docs/test_cases/t00011.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00011.cc
+File `tests/t00011/t00011.cc`
 ```cpp
 namespace external {
 class C { };
@@ -118,6 +118,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -179,6 +180,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index e2dc0aca..bfc3d35a 100644
--- a/docs/test_cases/t00011_class.svg
+++ b/docs/test_cases/t00011_class.svg
@@ -1,75 +1,79 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:226px;height:230px;" version="1.1" viewBox="0 0 226 230" width="226px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="240px" preserveAspectRatio="none" style="width:228px;height:240px;background:#FFFFFF;" version="1.1" viewBox="0 0 228 240" width="228px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pgx436ph6oj0" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pgx436ph6oj0)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
-      <ellipse cx="31.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M34.3188,29.6406 Q33.7406,29.9375 33.1,30.0781 Q32.4594,30.2344 31.7563,30.2344 Q29.2563,30.2344 27.9281,28.5938 Q26.6156,26.9375 26.6156,23.8125 Q26.6156,20.6875 27.9281,19.0313 Q29.2563,17.375 31.7563,17.375 Q32.4594,17.375 33.1,17.5313 Q33.7563,17.6875 34.3188,17.9844 L34.3188,20.7031 Q33.6938,20.125 33.1,19.8594 Q32.5063,19.5781 31.8813,19.5781 Q30.5375,19.5781 29.85,20.6563 Q29.1625,21.7188 29.1625,23.8125 Q29.1625,25.9063 29.85,26.9844 Q30.5375,28.0469 31.8813,28.0469 Q32.5063,28.0469 33.1,27.7813 Q33.6938,27.5 34.3188,26.9219 L34.3188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="47.65" y="28.1543">D</text>
-      <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"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001150639902748052276">
+        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0001150639902748052276" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="7" y="10"/>
+        <ellipse cx="34.6" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M29.6,27.1563 C29.6,29.6563 31.7406,31.4688 34.6625,31.4688 C35.8969,31.4688 37.0688,31.1719 37.8188,30.6563 C38.4281,30.2344 38.7563,29.8125 38.7563,29.4063 C38.7563,28.9375 38.3344,28.5313 37.8344,28.5313 C37.6,28.5313 37.3813,28.6094 37.1781,28.8125 C36.7406,29.25 36.7406,29.25 36.5688,29.3438 C36.1156,29.5781 35.475,29.7188 34.7094,29.7188 C32.7094,29.7188 31.4281,28.7031 31.4281,27.125 L31.4281,26.0781 C31.4281,24.375 32.6469,23.1719 34.35,23.1719 C34.9281,23.1719 35.5063,23.3125 35.975,23.5625 C36.4438,23.8281 36.6156,24.0156 36.6781,24.375 C36.8031,25.0469 37.0531,25.2969 37.5844,25.2969 C37.8656,25.2969 38.1469,25.1563 38.3344,24.9375 C38.4594,24.7656 38.5063,24.5938 38.5063,24.1563 L38.5063,22.7969 C38.5063,22.375 38.4906,22.2344 38.3656,22.0625 C38.1938,21.8125 37.9125,21.6563 37.5844,21.6563 C37.2719,21.6563 37.0688,21.7656 36.85,22.0313 C35.6781,21.5313 35.2406,21.4219 34.2875,21.4219 C31.6156,21.4219 29.6,23.4375 29.6,26.0625 L29.6,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="51.4" y="30.606">D</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="82" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="83" y="21.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="87" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="87" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="58.9"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="60.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="27" y="67.0059">value : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="56"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001420516952857803719">
+        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001420516952857803719" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="123.5" y="10"/>
+        <ellipse cx="162.35" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M157.35,27.1563 C157.35,29.6563 159.4906,31.4688 162.4125,31.4688 C163.6469,31.4688 164.8188,31.1719 165.5688,30.6563 C166.1781,30.2344 166.5063,29.8125 166.5063,29.4063 C166.5063,28.9375 166.0844,28.5313 165.5844,28.5313 C165.35,28.5313 165.1313,28.6094 164.9281,28.8125 C164.4906,29.25 164.4906,29.25 164.3188,29.3438 C163.8656,29.5781 163.225,29.7188 162.4594,29.7188 C160.4594,29.7188 159.1781,28.7031 159.1781,27.125 L159.1781,26.0781 C159.1781,24.375 160.3969,23.1719 162.1,23.1719 C162.6781,23.1719 163.2563,23.3125 163.725,23.5625 C164.1938,23.8281 164.3656,24.0156 164.4281,24.375 C164.5531,25.0469 164.8031,25.2969 165.3344,25.2969 C165.6156,25.2969 165.8969,25.1563 166.0844,24.9375 C166.2094,24.7656 166.2563,24.5938 166.2563,24.1563 L166.2563,22.7969 C166.2563,22.375 166.2406,22.2344 166.1156,22.0625 C165.9438,21.8125 165.6625,21.6563 165.3344,21.6563 C165.0219,21.6563 164.8188,21.7656 164.6,22.0313 C163.4281,21.5313 162.9906,21.4219 162.0375,21.4219 C159.3656,21.4219 157.35,23.4375 157.35,26.0625 L157.35,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="181.65" y="30.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="216.5" y1="42" y2="42"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="50.9"/>
+          <ellipse cx="134.5" cy="55.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="143.5" y="59.0059">foo() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="216.5" y1="66.7999" y2="66.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="62.2104">value : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001687427603952049829">
+        <rect codeLine="12" fill="#F1F1F1" height="81.5999" id="C_0001687427603952049829" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="123.5" y="151.8"/>
+        <ellipse cx="162.35" cy="167.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M157.35,168.9563 C157.35,171.4563 159.4906,173.2688 162.4125,173.2688 C163.6469,173.2688 164.8188,172.9719 165.5688,172.4563 C166.1781,172.0344 166.5063,171.6125 166.5063,171.2063 C166.5063,170.7375 166.0844,170.3313 165.5844,170.3313 C165.35,170.3313 165.1313,170.4094 164.9281,170.6125 C164.4906,171.05 164.4906,171.05 164.3188,171.1438 C163.8656,171.3781 163.225,171.5188 162.4594,171.5188 C160.4594,171.5188 159.1781,170.5031 159.1781,168.925 L159.1781,167.8781 C159.1781,166.175 160.3969,164.9719 162.1,164.9719 C162.6781,164.9719 163.2563,165.1125 163.725,165.3625 C164.1938,165.6281 164.3656,165.8156 164.4281,166.175 C164.5531,166.8469 164.8031,167.0969 165.3344,167.0969 C165.6156,167.0969 165.8969,166.9563 166.0844,166.7375 C166.2094,166.5656 166.2563,166.3938 166.2563,165.9563 L166.2563,164.5969 C166.2563,164.175 166.2406,164.0344 166.1156,163.8625 C165.9438,163.6125 165.6625,163.4563 165.3344,163.4563 C165.0219,163.4563 164.8188,163.5656 164.6,163.8313 C163.4281,163.3313 162.9906,163.2219 162.0375,163.2219 C159.3656,163.2219 157.35,165.2375 157.35,167.8625 L157.35,168.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="181.65" y="172.406">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="216.5" y1="183.8" y2="183.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="192.7"/>
+          <ellipse cx="134.5" cy="197.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="143.5" y="200.8059">foo() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="216.5" y1="208.5999" y2="208.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="217.4999"/>
+          <ellipse cx="134.5" cy="222.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="143.5" y="225.6059">m_a : A *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pgx436ph6oj0)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
-      <ellipse cx="152.15" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M155.1188,29.6406 Q154.5406,29.9375 153.9,30.0781 Q153.2594,30.2344 152.5563,30.2344 Q150.0563,30.2344 148.7281,28.5938 Q147.4156,26.9375 147.4156,23.8125 Q147.4156,20.6875 148.7281,19.0313 Q150.0563,17.375 152.5563,17.375 Q153.2594,17.375 153.9,17.5313 Q154.5563,17.6875 155.1188,17.9844 L155.1188,20.7031 Q154.4938,20.125 153.9,19.8594 Q153.3063,19.5781 152.6813,19.5781 Q151.3375,19.5781 150.65,20.6563 Q149.9625,21.7188 149.9625,23.8125 Q149.9625,25.9063 150.65,26.9844 Q151.3375,28.0469 152.6813,28.0469 Q153.3063,28.0469 153.9,27.7813 Q154.4938,27.5 155.1188,26.9219 L155.1188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="28.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="46"/>
-      <ellipse cx="127" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="54.2104">foo() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pgx436ph6oj0)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
-      <ellipse cx="152.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M155.1188,167.6406 Q154.5406,167.9375 153.9,168.0781 Q153.2594,168.2344 152.5563,168.2344 Q150.0563,168.2344 148.7281,166.5938 Q147.4156,164.9375 147.4156,161.8125 Q147.4156,158.6875 148.7281,157.0313 Q150.0563,155.375 152.5563,155.375 Q153.2594,155.375 153.9,155.5313 Q154.5563,155.6875 155.1188,155.9844 L155.1188,158.7031 Q154.4938,158.125 153.9,157.8594 Q153.3063,157.5781 152.6813,157.5781 Q151.3375,157.5781 150.65,158.6563 Q149.9625,159.7188 149.9625,161.8125 Q149.9625,163.9063 150.65,164.9844 Q151.3375,166.0469 152.6813,166.0469 Q153.3063,166.0469 153.9,165.7813 Q154.4938,165.5 155.1188,164.9219 L155.1188,167.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="166.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="178" y2="178"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="184"/>
-      <ellipse cx="127" cy="189" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="192.2104">foo() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="204.8047"/>
-      <ellipse cx="127" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="136" y="213.0151">m_a : A *</text>
-    </a>
-    <path d="M116.04,73.01 C105.09,85.59 97.85,100.6 103.5,116 C107.44,126.72 113.97,136.89 121.21,145.9 " fill="none" id="C_0001420516952857803719&lt;-C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="119.54,69.18,110.5057,73.102,116.1575,72.8622,116.3973,78.514,119.54,69.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="109.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="52" x="116.5" y="112.0669">«friend»</text>
-    <path d="M170.13,145.75 C173.19,131.26 175.29,114.39 173.5,99 C172.56,90.88 170.92,82.26 169.08,74.18 " fill="none" id="C_0001687427603952049829-&gt;C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="167.92,69.22,166.0877,78.8969,169.0652,74.0871,173.875,77.0646,167.92,69.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="179.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="186.5" y="112.0669">m_a</text>
+    <g id="link_C_0001420516952857803719_C_0001687427603952049829">
+      <path codeLine="17" d="M127.9244,79.7762 C116.3144,93.2562 111.89,105.14 117.5,121.8 C121,132.18 126.72,142.25 133.14,151.35 " fill="none" id="C_0001420516952857803719-backto-C_0001687427603952049829" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="131.84,75.23,122.9358,79.439,128.577,79.0185,128.9975,84.6597,131.84,75.23" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="123.5" cy="114.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="130.5" y="117.877">«friend»</text>
+    </g>
+    <g id="link_C_0001687427603952049829_C_0001420516952857803719">
+      <path codeLine="18" d="M179.21,151.48 C181.43,136.82 182.86,120.08 181.5,104.8 C180.64,95.09 180.095,90.5229 178.365,81.0229 " fill="none" id="C_0001687427603952049829-to-C_0001420516952857803719" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="177.29,75.12,174.9671,84.691,178.1858,80.0391,182.8377,83.2577,177.29,75.12" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="188.5" cy="114.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="25" x="195.5" y="117.877">m_a</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00011_class_mermaid.svg b/docs/test_cases/t00011_class_mermaid.svg
index 615a4d81..c0fc4ffd 100644
--- a/docs/test_cases/t00011_class_mermaid.svg
+++ b/docs/test_cases/t00011_class_mermaid.svg
@@ -1,60 +1,65 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 252.29296875 264" style="max-width: 252.293px; background-color: white;" width="252.29296875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 256.73828125 264" style="max-width: 256.738px; background-color: white;" width="256.73828125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M170.73551764455783,87L168.0614990787982,92.66666666666667C165.38748051303855,98.33333333333333,160.03944338151928,109.66666666666667,159.69134629011862,121C159.34324919871793,132.33333333333334,163.99509214743588,143.66666666666666,166.32101362179486,149.33333333333334L168.64693509615384,155"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M210.10306490384616,155L212.4289863782051,149.33333333333334C214.75490785256412,143.66666666666666,219.40675080128207,132.33333333333334,219.05865370988138,121C218.71055661848072,109.66666666666667,213.36251948696145,98.33333333333333,210.6885009212018,92.66666666666667L208.01448235544217,87"/>
+        <path marker-start="url(#my-svg_classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M172.62028580978097,92.42619689189787L170.3730246331508,97.18849740991489C168.12576345652064,101.9507979279319,163.63124110326032,111.47539896396596,163.70990140098914,121.90436614864966C163.78856169871793,132.33333333333334,168.44040464743588,143.66666666666666,170.7663261217949,149.33333333333334L173.09224759615384,155"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M214.54837740384616,155L216.8742988782051,149.33333333333334C219.20022035256412,143.66666666666666,223.85206330128207,132.33333333333334,223.9307235990109,121.90436614864966C224.00938389673968,111.47539896396596,219.51486154347936,101.9507979279319,217.26760036684922,97.18849740991489L215.02033919021903,92.42619689189787"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(154.69140625, 121)" class="edgeLabel">
+        <g transform="translate(159.13671875, 121)" class="edgeLabel">
           <g transform="translate(-29.1328125, -9)" class="label">
             <foreignObject height="18" width="58.265625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -65,7 +70,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(224.05859375, 121)" class="edgeLabel">
+        <g transform="translate(228.50390625, 121)" class="edgeLabel">
           <g transform="translate(-20.234375, -9)" class="label">
             <foreignObject height="18" width="40.46875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -78,7 +83,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L10">
+        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L10">
           <g title="D" id="classId-C_0001150639902748052276-0" class="node default clickable">
             <rect height="79" width="81.40625" y="-39.5" x="-40.703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.703125" x1="-40.703125" class="divider"/>
@@ -102,11 +107,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L14">
+        <a transform="translate(193.8203125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L14">
           <g title="A" id="classId-C_0001420516952857803719-1" class="node default clickable">
-            <rect height="79" width="99.9375" y="-39.5" x="-49.96875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <rect height="79" width="108.828125" y="-39.5" x="-54.4140625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -118,19 +123,19 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, 14)" height="18" width="84.9375">
+              <foreignObject transform="translate( -46.9140625, 14)" height="18" width="93.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : void</span>
+                  <span class="nodeLabel">+foo() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00011/t00011.cc#L26">
+        <a transform="translate(193.8203125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L26">
           <g title="B" id="classId-C_0001687427603952049829-2" class="node default clickable">
-            <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <rect height="101" width="108.828125" y="-50.5" x="-54.4140625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -142,14 +147,14 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, -9)" height="18" width="63.890625">
+              <foreignObject transform="translate( -46.9140625, -9)" height="18" width="63.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m_a : A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+m_a : A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, 25)" height="18" width="84.9375">
+              <foreignObject transform="translate( -46.9140625, 25)" height="18" width="93.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : void</span>
+                  <span class="nodeLabel">+foo() : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00012.md b/docs/test_cases/t00012.md
index 4144b325..4b024e4e 100644
--- a/docs/test_cases/t00012.md
+++ b/docs/test_cases/t00012.md
@@ -16,7 +16,7 @@ diagrams:
 
 ```
 ## Source code
-File t00012.cc
+File `tests/t00012/t00012.cc`
 ```cpp
 #include <algorithm>
 #include <array>
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index dac2df08..754f03b0 100644
--- a/docs/test_cases/t00012_class.svg
+++ b/docs/test_cases/t00012_class.svg
@@ -1,197 +1,231 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="413px" preserveAspectRatio="none" style="width:1220px;height:413px;background:#FFFFFF;" version="1.1" viewBox="0 0 1220 413" width="1220px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1zafrgqo5zxb" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
-      <ellipse cx="885.75" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M888.7188,327.6406 Q888.1406,327.9375 887.5,328.0781 Q886.8594,328.2344 886.1563,328.2344 Q883.6563,328.2344 882.3281,326.5938 Q881.0156,324.9375 881.0156,321.8125 Q881.0156,318.6875 882.3281,317.0313 Q883.6563,315.375 886.1563,315.375 Q886.8594,315.375 887.5,315.5313 Q888.1563,315.6875 888.7188,315.9844 L888.7188,318.7031 Q888.0938,318.125 887.5,317.8594 Q886.9063,317.5781 886.2813,317.5781 Q884.9375,317.5781 884.25,318.6563 Q883.5625,319.7188 883.5625,321.8125 Q883.5625,323.9063 884.25,324.9844 Q884.9375,326.0469 886.2813,326.0469 Q886.9063,326.0469 887.5,325.7813 Q888.0938,325.5 888.7188,324.9219 L888.7188,327.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="906.25" y="326.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="38" x="971" y="303"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="972" y="315.1387">T,Ts...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="338" y2="338"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="346" y2="346"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001773299890023132282">
+        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0001773299890023132282" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="193" x="698" y="325"/>
+        <ellipse cx="767.75" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M762.75,342.1563 C762.75,344.6563 764.8906,346.4688 767.8125,346.4688 C769.0469,346.4688 770.2188,346.1719 770.9688,345.6563 C771.5781,345.2344 771.9063,344.8125 771.9063,344.4063 C771.9063,343.9375 771.4844,343.5313 770.9844,343.5313 C770.75,343.5313 770.5313,343.6094 770.3281,343.8125 C769.8906,344.25 769.8906,344.25 769.7188,344.3438 C769.2656,344.5781 768.625,344.7188 767.8594,344.7188 C765.8594,344.7188 764.5781,343.7031 764.5781,342.125 L764.5781,341.0781 C764.5781,339.375 765.7969,338.1719 767.5,338.1719 C768.0781,338.1719 768.6563,338.3125 769.125,338.5625 C769.5938,338.8281 769.7656,339.0156 769.8281,339.375 C769.9531,340.0469 770.2031,340.2969 770.7344,340.2969 C771.0156,340.2969 771.2969,340.1563 771.4844,339.9375 C771.6094,339.7656 771.6563,339.5938 771.6563,339.1563 L771.6563,337.7969 C771.6563,337.375 771.6406,337.2344 771.5156,337.0625 C771.3438,336.8125 771.0625,336.6563 770.7344,336.6563 C770.4219,336.6563 770.2188,336.7656 770,337.0313 C768.8281,336.5313 768.3906,336.4219 767.4375,336.4219 C764.7656,336.4219 762.75,338.4375 762.75,341.0625 L762.75,342.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="788.25" y="345.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="34" x="860" y="322"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="32" x="861" y="336.2001">T,Ts...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="699" x2="890" y1="357" y2="357"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="699" x2="890" y1="365" y2="365"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="704" y="373.9"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="706" y="375.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="718" y="382.0059">value : T</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="704" y="390.6999"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="706" y="392.6999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="718" y="398.8059">values : std::variant&lt;Ts...&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="352"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="354"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0002061171077567279746">
+        <rect codeLine="8" fill="#F1F1F1" height="64.7999" id="C_0002061171077567279746" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="225" x="984" y="333.4"/>
+        <ellipse cx="1068.75" cy="349.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1063.75,350.5563 C1063.75,353.0563 1065.8906,354.8688 1068.8125,354.8688 C1070.0469,354.8688 1071.2188,354.5719 1071.9688,354.0563 C1072.5781,353.6344 1072.9063,353.2125 1072.9063,352.8063 C1072.9063,352.3375 1072.4844,351.9313 1071.9844,351.9313 C1071.75,351.9313 1071.5313,352.0094 1071.3281,352.2125 C1070.8906,352.65 1070.8906,352.65 1070.7188,352.7438 C1070.2656,352.9781 1069.625,353.1188 1068.8594,353.1188 C1066.8594,353.1188 1065.5781,352.1031 1065.5781,350.525 L1065.5781,349.4781 C1065.5781,347.775 1066.7969,346.5719 1068.5,346.5719 C1069.0781,346.5719 1069.6563,346.7125 1070.125,346.9625 C1070.5938,347.2281 1070.7656,347.4156 1070.8281,347.775 C1070.9531,348.4469 1071.2031,348.6969 1071.7344,348.6969 C1072.0156,348.6969 1072.2969,348.5563 1072.4844,348.3375 C1072.6094,348.1656 1072.6563,347.9938 1072.6563,347.5563 L1072.6563,346.1969 C1072.6563,345.775 1072.6406,345.6344 1072.5156,345.4625 C1072.3438,345.2125 1072.0625,345.0563 1071.7344,345.0563 C1071.4219,345.0563 1071.2188,345.1656 1071,345.4313 C1069.8281,344.9313 1069.3906,344.8219 1068.4375,344.8219 C1065.7656,344.8219 1063.75,346.8375 1063.75,349.4625 L1063.75,350.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1089.25" y="354.006">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="36" x="1176" y="330.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="34" x="1177" y="344.6001">int... Is</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="985" x2="1208" y1="365.4" y2="365.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="985" x2="1208" y1="373.4" y2="373.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="990" y="382.3"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="992" y="384.3"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="1004" y="390.4059">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="842" y="360.2104">value : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000627809578407650629">
+        <rect codeLine="13" fill="#F1F1F1" height="64.7999" id="C_0000627809578407650629" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="219" x="103" y="333.4"/>
+        <ellipse cx="179.25" cy="349.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M174.25,350.5563 C174.25,353.0563 176.3906,354.8688 179.3125,354.8688 C180.5469,354.8688 181.7188,354.5719 182.4688,354.0563 C183.0781,353.6344 183.4063,353.2125 183.4063,352.8063 C183.4063,352.3375 182.9844,351.9313 182.4844,351.9313 C182.25,351.9313 182.0313,352.0094 181.8281,352.2125 C181.3906,352.65 181.3906,352.65 181.2188,352.7438 C180.7656,352.9781 180.125,353.1188 179.3594,353.1188 C177.3594,353.1188 176.0781,352.1031 176.0781,350.525 L176.0781,349.4781 C176.0781,347.775 177.2969,346.5719 179,346.5719 C179.5781,346.5719 180.1563,346.7125 180.625,346.9625 C181.0938,347.2281 181.2656,347.4156 181.3281,347.775 C181.4531,348.4469 181.7031,348.6969 182.2344,348.6969 C182.5156,348.6969 182.7969,348.5563 182.9844,348.3375 C183.1094,348.1656 183.1563,347.9938 183.1563,347.5563 L183.1563,346.1969 C183.1563,345.775 183.1406,345.6344 183.0156,345.4625 C182.8438,345.2125 182.5625,345.0563 182.2344,345.0563 C181.9219,345.0563 181.7188,345.1656 181.5,345.4313 C180.3281,344.9313 179.8906,344.8219 178.9375,344.8219 C176.2656,344.8219 174.25,346.8375 174.25,349.4625 L174.25,350.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="199.75" y="354.006">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="279" y="330.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="280" y="344.6001">T,int... Is</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="321" y1="365.4" y2="365.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="321" y1="373.4" y2="373.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="382.3"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="111" y="384.3"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="123" y="390.4059">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="364.8047"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="366.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000286972398942005457">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000286972398942005457" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="655" y="216"/>
+        <ellipse cx="670" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M665,233.1563 C665,235.6563 667.1406,237.4688 670.0625,237.4688 C671.2969,237.4688 672.4688,237.1719 673.2188,236.6563 C673.8281,236.2344 674.1563,235.8125 674.1563,235.4063 C674.1563,234.9375 673.7344,234.5313 673.2344,234.5313 C673,234.5313 672.7813,234.6094 672.5781,234.8125 C672.1406,235.25 672.1406,235.25 671.9688,235.3438 C671.5156,235.5781 670.875,235.7188 670.1094,235.7188 C668.1094,235.7188 666.8281,234.7031 666.8281,233.125 L666.8281,232.0781 C666.8281,230.375 668.0469,229.1719 669.75,229.1719 C670.3281,229.1719 670.9063,229.3125 671.375,229.5625 C671.8438,229.8281 672.0156,230.0156 672.0781,230.375 C672.2031,231.0469 672.4531,231.2969 672.9844,231.2969 C673.2656,231.2969 673.5469,231.1563 673.7344,230.9375 C673.8594,230.7656 673.9063,230.5938 673.9063,230.1563 L673.9063,228.7969 C673.9063,228.375 673.8906,228.2344 673.7656,228.0625 C673.5938,227.8125 673.3125,227.6563 672.9844,227.6563 C672.6719,227.6563 672.4688,227.7656 672.25,228.0313 C671.0781,227.5313 670.6406,227.4219 669.6875,227.4219 C667.0156,227.4219 665,229.4375 665,232.0625 L665,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="684" y="236.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="96" x="701" y="213"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="94" x="702" y="227.2001">int,std::string,float</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="656" x2="793" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="656" x2="793" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="842" y="373.0151">values : std::variant&lt;Ts...&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000299466181098300963">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000299466181098300963" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="829.5" y="216"/>
+        <ellipse cx="844.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M839.5,233.1563 C839.5,235.6563 841.6406,237.4688 844.5625,237.4688 C845.7969,237.4688 846.9688,237.1719 847.7188,236.6563 C848.3281,236.2344 848.6563,235.8125 848.6563,235.4063 C848.6563,234.9375 848.2344,234.5313 847.7344,234.5313 C847.5,234.5313 847.2813,234.6094 847.0781,234.8125 C846.6406,235.25 846.6406,235.25 846.4688,235.3438 C846.0156,235.5781 845.375,235.7188 844.6094,235.7188 C842.6094,235.7188 841.3281,234.7031 841.3281,233.125 L841.3281,232.0781 C841.3281,230.375 842.5469,229.1719 844.25,229.1719 C844.8281,229.1719 845.4063,229.3125 845.875,229.5625 C846.3438,229.8281 846.5156,230.0156 846.5781,230.375 C846.7031,231.0469 846.9531,231.2969 847.4844,231.2969 C847.7656,231.2969 848.0469,231.1563 848.2344,230.9375 C848.3594,230.7656 848.4063,230.5938 848.4063,230.1563 L848.4063,228.7969 C848.4063,228.375 848.3906,228.2344 848.2656,228.0625 C848.0938,227.8125 847.8125,227.6563 847.4844,227.6563 C847.1719,227.6563 846.9688,227.7656 846.75,228.0313 C845.5781,227.5313 845.1406,227.4219 844.1875,227.4219 C841.5156,227.4219 839.5,229.4375 839.5,232.0625 L839.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="858.5" y="236.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="97" x="875.5" y="213"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="95" x="876.5" y="227.2001">int,std::string,bool</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="830.5" x2="968.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="830.5" x2="968.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
-      <ellipse cx="1209.75" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1212.7188,334.1406 Q1212.1406,334.4375 1211.5,334.5781 Q1210.8594,334.7344 1210.1563,334.7344 Q1207.6563,334.7344 1206.3281,333.0938 Q1205.0156,331.4375 1205.0156,328.3125 Q1205.0156,325.1875 1206.3281,323.5313 Q1207.6563,321.875 1210.1563,321.875 Q1210.8594,321.875 1211.5,322.0313 Q1212.1563,322.1875 1212.7188,322.4844 L1212.7188,325.2031 Q1212.0938,324.625 1211.5,324.3594 Q1210.9063,324.0781 1210.2813,324.0781 Q1208.9375,324.0781 1208.25,325.1563 Q1207.5625,326.2188 1207.5625,328.3125 Q1207.5625,330.4063 1208.25,331.4844 Q1208.9375,332.5469 1210.2813,332.5469 Q1210.9063,332.5469 1211.5,332.2813 Q1212.0938,332 1212.7188,331.4219 L1212.7188,334.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1230.25" y="332.6543">B</text>
-      <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"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000489063277971613593">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000489063277971613593" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="72" x="1004.5" y="216"/>
+        <ellipse cx="1019.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1014.5,233.1563 C1014.5,235.6563 1016.6406,237.4688 1019.5625,237.4688 C1020.7969,237.4688 1021.9688,237.1719 1022.7188,236.6563 C1023.3281,236.2344 1023.6563,235.8125 1023.6563,235.4063 C1023.6563,234.9375 1023.2344,234.5313 1022.7344,234.5313 C1022.5,234.5313 1022.2813,234.6094 1022.0781,234.8125 C1021.6406,235.25 1021.6406,235.25 1021.4688,235.3438 C1021.0156,235.5781 1020.375,235.7188 1019.6094,235.7188 C1017.6094,235.7188 1016.3281,234.7031 1016.3281,233.125 L1016.3281,232.0781 C1016.3281,230.375 1017.5469,229.1719 1019.25,229.1719 C1019.8281,229.1719 1020.4063,229.3125 1020.875,229.5625 C1021.3438,229.8281 1021.5156,230.0156 1021.5781,230.375 C1021.7031,231.0469 1021.9531,231.2969 1022.4844,231.2969 C1022.7656,231.2969 1023.0469,231.1563 1023.2344,230.9375 C1023.3594,230.7656 1023.4063,230.5938 1023.4063,230.1563 L1023.4063,228.7969 C1023.4063,228.375 1023.3906,228.2344 1023.2656,228.0625 C1023.0938,227.8125 1022.8125,227.6563 1022.4844,227.6563 C1022.1719,227.6563 1021.9688,227.7656 1021.75,228.0313 C1020.5781,227.5313 1020.1406,227.4219 1019.1875,227.4219 C1016.5156,227.4219 1014.5,229.4375 1014.5,232.0625 L1014.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1033.5" y="236.606">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="29" x="1050.5" y="213"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="27" x="1051.5" y="227.2001">3,2,1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1005.5" x2="1075.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1005.5" x2="1075.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1140" y="358.5"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000014232362483200599">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000014232362483200599" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="1111.5" y="216"/>
+        <ellipse cx="1126.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1121.5,233.1563 C1121.5,235.6563 1123.6406,237.4688 1126.5625,237.4688 C1127.7969,237.4688 1128.9688,237.1719 1129.7188,236.6563 C1130.3281,236.2344 1130.6563,235.8125 1130.6563,235.4063 C1130.6563,234.9375 1130.2344,234.5313 1129.7344,234.5313 C1129.5,234.5313 1129.2813,234.6094 1129.0781,234.8125 C1128.6406,235.25 1128.6406,235.25 1128.4688,235.3438 C1128.0156,235.5781 1127.375,235.7188 1126.6094,235.7188 C1124.6094,235.7188 1123.3281,234.7031 1123.3281,233.125 L1123.3281,232.0781 C1123.3281,230.375 1124.5469,229.1719 1126.25,229.1719 C1126.8281,229.1719 1127.4063,229.3125 1127.875,229.5625 C1128.3438,229.8281 1128.5156,230.0156 1128.5781,230.375 C1128.7031,231.0469 1128.9531,231.2969 1129.4844,231.2969 C1129.7656,231.2969 1130.0469,231.1563 1130.2344,230.9375 C1130.3594,230.7656 1130.4063,230.5938 1130.4063,230.1563 L1130.4063,228.7969 C1130.4063,228.375 1130.3906,228.2344 1130.2656,228.0625 C1130.0938,227.8125 1129.8125,227.6563 1129.4844,227.6563 C1129.1719,227.6563 1128.9688,227.7656 1128.75,228.0313 C1127.5781,227.5313 1127.1406,227.4219 1126.1875,227.4219 C1123.5156,227.4219 1121.5,229.4375 1121.5,232.0625 L1121.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1140.5" y="236.606">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="39" x="1157.5" y="213"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="37" x="1158.5" y="227.2001">1,1,1,1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1112.5" x2="1192.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1112.5" x2="1192.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="1154" y="366.7104">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001478239414632239754">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0001478239414632239754" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="411" x="7" y="216"/>
+        <ellipse cx="22" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,233.1563 C17,235.6563 19.1406,237.4688 22.0625,237.4688 C23.2969,237.4688 24.4688,237.1719 25.2188,236.6563 C25.8281,236.2344 26.1563,235.8125 26.1563,235.4063 C26.1563,234.9375 25.7344,234.5313 25.2344,234.5313 C25,234.5313 24.7813,234.6094 24.5781,234.8125 C24.1406,235.25 24.1406,235.25 23.9688,235.3438 C23.5156,235.5781 22.875,235.7188 22.1094,235.7188 C20.1094,235.7188 18.8281,234.7031 18.8281,233.125 L18.8281,232.0781 C18.8281,230.375 20.0469,229.1719 21.75,229.1719 C22.3281,229.1719 22.9063,229.3125 23.375,229.5625 C23.8438,229.8281 24.0156,230.0156 24.0781,230.375 C24.2031,231.0469 24.4531,231.2969 24.9844,231.2969 C25.2656,231.2969 25.5469,231.1563 25.7344,230.9375 C25.8594,230.7656 25.9063,230.5938 25.9063,230.1563 L25.9063,228.7969 C25.9063,228.375 25.8906,228.2344 25.7656,228.0625 C25.5938,227.8125 25.3125,227.6563 24.9844,227.6563 C24.6719,227.6563 24.4688,227.7656 24.25,228.0313 C23.0781,227.5313 22.6406,227.4219 21.6875,227.4219 C19.0156,227.4219 17,229.4375 17,232.0625 L17,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="36" y="236.606">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="367" x="54" y="213"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="365" x="55" y="227.2001">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:#181818;stroke-width:0.5;" x1="8" x2="417" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="417" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
-      <ellipse cx="216.25" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M219.2188,334.1406 Q218.6406,334.4375 218,334.5781 Q217.3594,334.7344 216.6563,334.7344 Q214.1563,334.7344 212.8281,333.0938 Q211.5156,331.4375 211.5156,328.3125 Q211.5156,325.1875 212.8281,323.5313 Q214.1563,321.875 216.6563,321.875 Q217.3594,321.875 218,322.0313 Q218.6563,322.1875 219.2188,322.4844 L219.2188,325.2031 Q218.5938,324.625 218,324.3594 Q217.4063,324.0781 216.7813,324.0781 Q215.4375,324.0781 214.75,325.1563 Q214.0625,326.2188 214.0625,328.3125 Q214.0625,330.4063 214.75,331.4844 Q215.4375,332.5469 216.7813,332.5469 Q217.4063,332.5469 218,332.2813 Q218.5938,332 219.2188,331.4219 L219.2188,334.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="236.75" y="332.6543">C</text>
-      <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"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000559263385732885469">
+        <rect codeLine="38" fill="#F1F1F1" height="131.9996" id="C_0000559263385732885469" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="513" x="643" y="7"/>
+        <ellipse cx="890.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M885.25,24.1563 C885.25,26.6563 887.3906,28.4688 890.3125,28.4688 C891.5469,28.4688 892.7188,28.1719 893.4688,27.6563 C894.0781,27.2344 894.4063,26.8125 894.4063,26.4063 C894.4063,25.9375 893.9844,25.5313 893.4844,25.5313 C893.25,25.5313 893.0313,25.6094 892.8281,25.8125 C892.3906,26.25 892.3906,26.25 892.2188,26.3438 C891.7656,26.5781 891.125,26.7188 890.3594,26.7188 C888.3594,26.7188 887.0781,25.7031 887.0781,24.125 L887.0781,23.0781 C887.0781,21.375 888.2969,20.1719 890,20.1719 C890.5781,20.1719 891.1563,20.3125 891.625,20.5625 C892.0938,20.8281 892.2656,21.0156 892.3281,21.375 C892.4531,22.0469 892.7031,22.2969 893.2344,22.2969 C893.5156,22.2969 893.7969,22.1563 893.9844,21.9375 C894.1094,21.7656 894.1563,21.5938 894.1563,21.1563 L894.1563,19.7969 C894.1563,19.375 894.1406,19.2344 894.0156,19.0625 C893.8438,18.8125 893.5625,18.6563 893.2344,18.6563 C892.9219,18.6563 892.7188,18.7656 892.5,19.0313 C891.3281,18.5313 890.8906,18.4219 889.9375,18.4219 C887.2656,18.4219 885.25,20.4375 885.25,23.0625 L885.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="910.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="644" x2="1155" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="644" x2="1155" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="55.9"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="57.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="663" y="64.0059">a1 : A&lt;int,std::string,float&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="72.6999"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="74.6999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="663" y="80.8059">a2 : A&lt;int,std::string,bool&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="89.4998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="91.4998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="663" y="97.6058">b1 : B&lt;3,2,1&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="106.2997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="108.2997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="663" y="114.4057">b2 : B&lt;1,1,1,1&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="123.0997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="125.0997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="487" x="663" y="131.2057">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="155.5" y="358.5"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="169.5" y="366.7104">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
-      <ellipse cx="773" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M775.9688,218.6406 Q775.3906,218.9375 774.75,219.0781 Q774.1094,219.2344 773.4063,219.2344 Q770.9063,219.2344 769.5781,217.5938 Q768.2656,215.9375 768.2656,212.8125 Q768.2656,209.6875 769.5781,208.0313 Q770.9063,206.375 773.4063,206.375 Q774.1094,206.375 774.75,206.5313 Q775.4063,206.6875 775.9688,206.9844 L775.9688,209.7031 Q775.3438,209.125 774.75,208.8594 Q774.1563,208.5781 773.5313,208.5781 Q772.1875,208.5781 771.5,209.6563 Q770.8125,210.7188 770.8125,212.8125 Q770.8125,214.9063 771.5,215.9844 Q772.1875,217.0469 773.5313,217.0469 Q774.1563,217.0469 774.75,216.7813 Q775.3438,216.5 775.9688,215.9219 L775.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="787" y="217.1543">A</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
-      <ellipse cx="966.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M969.4688,218.6406 Q968.8906,218.9375 968.25,219.0781 Q967.6094,219.2344 966.9063,219.2344 Q964.4063,219.2344 963.0781,217.5938 Q961.7656,215.9375 961.7656,212.8125 Q961.7656,209.6875 963.0781,208.0313 Q964.4063,206.375 966.9063,206.375 Q967.6094,206.375 968.25,206.5313 Q968.9063,206.6875 969.4688,206.9844 L969.4688,209.7031 Q968.8438,209.125 968.25,208.8594 Q967.6563,208.5781 967.0313,208.5781 Q965.6875,208.5781 965,209.6563 Q964.3125,210.7188 964.3125,212.8125 Q964.3125,214.9063 965,215.9844 Q965.6875,217.0469 967.0313,217.0469 Q967.6563,217.0469 968.25,216.7813 Q968.8438,216.5 969.4688,215.9219 L969.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="980.5" y="217.1543">A</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
-      <ellipse cx="1159" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1161.9688,218.6406 Q1161.3906,218.9375 1160.75,219.0781 Q1160.1094,219.2344 1159.4063,219.2344 Q1156.9063,219.2344 1155.5781,217.5938 Q1154.2656,215.9375 1154.2656,212.8125 Q1154.2656,209.6875 1155.5781,208.0313 Q1156.9063,206.375 1159.4063,206.375 Q1160.1094,206.375 1160.75,206.5313 Q1161.4063,206.6875 1161.9688,206.9844 L1161.9688,209.7031 Q1161.3438,209.125 1160.75,208.8594 Q1160.1563,208.5781 1159.5313,208.5781 Q1158.1875,208.5781 1157.5,209.6563 Q1156.8125,210.7188 1156.8125,212.8125 Q1156.8125,214.9063 1157.5,215.9844 Q1158.1875,217.0469 1159.5313,217.0469 Q1160.1563,217.0469 1160.75,216.7813 Q1161.3438,216.5 1161.9688,215.9219 L1161.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1173" y="217.1543">B</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
-      <ellipse cx="1270" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1272.9688,218.6406 Q1272.3906,218.9375 1271.75,219.0781 Q1271.1094,219.2344 1270.4063,219.2344 Q1267.9063,219.2344 1266.5781,217.5938 Q1265.2656,215.9375 1265.2656,212.8125 Q1265.2656,209.6875 1266.5781,208.0313 Q1267.9063,206.375 1270.4063,206.375 Q1271.1094,206.375 1271.75,206.5313 Q1272.4063,206.6875 1272.9688,206.9844 L1272.9688,209.7031 Q1272.3438,209.125 1271.75,208.8594 Q1271.1563,208.5781 1270.5313,208.5781 Q1269.1875,208.5781 1268.5,209.6563 Q1267.8125,210.7188 1267.8125,212.8125 Q1267.8125,214.9063 1268.5,215.9844 Q1269.1875,217.0469 1270.5313,217.0469 Q1271.1563,217.0469 1271.75,216.7813 Q1272.3438,216.5 1272.9688,215.9219 L1272.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1284" y="217.1543">B</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
-      <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">C</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1zafrgqo5zxb)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
-      <ellipse cx="1021.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1024.7188,29.6406 Q1024.1406,29.9375 1023.5,30.0781 Q1022.8594,30.2344 1022.1563,30.2344 Q1019.6563,30.2344 1018.3281,28.5938 Q1017.0156,26.9375 1017.0156,23.8125 Q1017.0156,20.6875 1018.3281,19.0313 Q1019.6563,17.375 1022.1563,17.375 Q1022.8594,17.375 1023.5,17.5313 Q1024.1563,17.6875 1024.7188,17.9844 L1024.7188,20.7031 Q1024.0938,20.125 1023.5,19.8594 Q1022.9063,19.5781 1022.2813,19.5781 Q1020.9375,19.5781 1020.25,20.6563 Q1019.5625,21.7188 1019.5625,23.8125 Q1019.5625,25.9063 1020.25,26.9844 Q1020.9375,28.0469 1022.2813,28.0469 Q1022.9063,28.0469 1023.5,27.7813 Q1024.0938,27.5 1024.7188,26.9219 L1024.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1042.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="54"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="56"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="62.2104">a1 : A&lt;int,std::string,float&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="66.8047"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="68.8047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="75.0151">a2 : A&lt;int,std::string,bool&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="79.6094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="81.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="87.8198">b1 : B&lt;3,2,1&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="92.4141"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="94.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="100.6245">b2 : B&lt;1,1,1,1&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="105.2188"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="107.2188"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="113.4292">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
-    </a>
-    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f1zafrgqo5zxb)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M712.5,208.5 L712.5,218.5 L722.5,218.5 L712.5,208.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="166" x="541.5" y="225.5669">Long template annotation</text>
-    <path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000286972398942005457-&gt;C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <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;"/>
-    <path d="M1007.63,245.14 C995.06,258.14 978.84,274.92 963.44,290.85 " fill="none" id="C_0000299466181098300963-&gt;C_0001773299890023132282" 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;"/>
-    <path d="M1193.38,245.14 C1200.19,258.99 1209.11,277.13 1217.38,293.96 " fill="none" id="C_0000489063277971613593-&gt;C_0002061171077567279746" 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;"/>
-    <path d="M1287.82,245.14 C1281.12,258.99 1272.35,277.13 1264.22,293.96 " fill="none" id="C_0000014232362483200599-&gt;C_0002061171077567279746" 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;"/>
-    <path d="M253,245.14 C253,258.47 253,275.77 253,292.05 " fill="none" id="C_0001478239414632239754-&gt;C_0000627809578407650629" 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;"/>
-    <path d="M950.89,128.54 C920.8,152.7 888.38,178.73 865.86,196.83 " fill="none" id="C_0000559263385732885469&lt;-C_0000286972398942005457" 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>
-    <path d="M1030,133.26 C1030,155.95 1030,179.72 1030,196.62 " fill="none" id="C_0000559263385732885469&lt;-C_0000299466181098300963" 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>
-    <path d="M1093.21,129.46 C1116.56,153.27 1141.57,178.77 1159.08,196.62 " fill="none" id="C_0000559263385732885469&lt;-C_0000489063277971613593" 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>
-    <path d="M1136.98,126.64 C1179.82,151.33 1226.56,178.26 1258.78,196.83 " fill="none" id="C_0000559263385732885469&lt;-C_0000014232362483200599" 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>
-    <path d="M770.25,116.82 C634.09,143.98 474.14,175.89 368.56,196.95 " fill="none" id="C_0000559263385732885469&lt;-C_0001478239414632239754" 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>
+    <g id="elem_GMN21">
+      <path d="M453,227.2 L453,236 L418.48,240 L453,244 L453,252.8 A0,0 0 0 0 453,252.8 L620,252.8 A0,0 0 0 0 620,252.8 L620,237.2 L610,227.2 L453,227.2 A0,0 0 0 0 453,227.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M610,227.2 L610,237.2 L620,237.2 L610,227.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="146" x="459" y="244.277">Long template annotation</text>
+    </g>
+    <g id="link_C_0000286972398942005457_C_0001773299890023132282">
+      <path codeLine="46" d="M737.67,264.29 C747.25,281.24 751.6106,288.9512 762.8906,308.9012 " fill="none" id="C_0000286972398942005457-to-C_0001773299890023132282" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="771.75,324.57,768.1136,305.9481,757.6677,311.8543,771.75,324.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000299466181098300963_C_0001773299890023132282">
+      <path codeLine="47" d="M879.75,264.29 C865.37,281.24 857.1827,290.8924 840.2627,310.8424 " fill="none" id="C_0000299466181098300963-to-C_0001773299890023132282" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="828.62,324.57,844.8386,314.7233,835.6868,306.9615,828.62,324.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000489063277971613593_C_0002061171077567279746">
+      <path codeLine="48" d="M1051.03,264.29 C1059.84,283.76 1065.072,295.3196 1074.792,316.8096 " fill="none" id="C_0000489063277971613593-to-C_0002061171077567279746" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="1082.21,333.21,1080.2588,314.3369,1069.3252,319.2822,1082.21,333.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000014232362483200599_C_0002061171077567279746">
+      <path codeLine="49" d="M1141.97,264.29 C1133.16,283.76 1127.928,295.3196 1118.208,316.8096 " fill="none" id="C_0000014232362483200599-to-C_0002061171077567279746" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="1110.79,333.21,1123.6748,319.2822,1112.7412,314.3369,1110.79,333.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001478239414632239754_C_0000627809578407650629">
+      <path codeLine="50" d="M212.5,264.29 C212.5,283.76 212.5,293.72 212.5,315.21 " fill="none" id="C_0001478239414632239754-to-C_0000627809578407650629" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="212.5,333.21,218.5,315.21,206.5,315.21,212.5,333.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000559263385732885469_C_0000286972398942005457">
+      <path codeLine="51" d="M821.3498,147.683 C792.7298,174.673 770.13,195.98 749.09,215.81 " fill="none" id="C_0000559263385732885469-backto-C_0000286972398942005457" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="830.08,139.45,822.9705,140.6564,821.3498,147.683,828.4592,146.4766,830.08,139.45" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="799.5" y="175.3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="809.5" y="182.077">a1</text>
+    </g>
+    <g id="link_C_0000559263385732885469_C_0000299466181098300963">
+      <path codeLine="52" d="M899.5,151.21 C899.5,178.24 899.5,195.85 899.5,215.74 " fill="none" id="C_0000559263385732885469-backto-C_0000299466181098300963" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="899.5,139.21,895.5,145.21,899.5,151.21,903.5,145.21,899.5,139.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="902.5" y="175.3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="912.5" y="182.077">a2</text>
+    </g>
+    <g id="link_C_0000559263385732885469_C_0000489063277971613593">
+      <path codeLine="53" d="M963.0242,148.3342 C986.1142,175.3642 1003.63,195.85 1020.63,215.74 " fill="none" id="C_0000559263385732885469-backto-C_0000489063277971613593" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="955.23,139.21,956.0857,146.3702,963.0242,148.3342,962.1685,141.174,955.23,139.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="998.5" y="175.3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="1008.5" y="182.077">b1</text>
+    </g>
+    <g id="link_C_0000559263385732885469_C_0000014232362483200599">
+      <path codeLine="54" d="M1009.9116,146.0048 C1051.1616,172.9048 1086.23,195.78 1116.64,215.62 " fill="none" id="C_0000559263385732885469-backto-C_0000014232362483200599" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="999.86,139.45,1002.7008,146.0779,1009.9116,146.0048,1007.0707,139.3769,999.86,139.45" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="1073.5" y="175.3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="1083.5" y="182.077">b2</text>
+    </g>
+    <g id="link_C_0000559263385732885469_C_0001478239414632239754">
+      <path codeLine="55" d="M631.042,138.4731 C514.992,166.3531 396.48,194.81 310.03,215.58 " fill="none" id="C_0000559263385732885469-backto-C_0001478239414632239754" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="642.71,135.67,635.9416,133.1822,631.042,138.4731,637.8104,140.9609,642.71,135.67" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="497.5" y="175.3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="507.5" y="182.077">c1</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00012_class_mermaid.svg b/docs/test_cases/t00012_class_mermaid.svg
index 76d79a4a..8663f35d 100644
--- a/docs/test_cases/t00012_class_mermaid.svg
+++ b/docs/test_cases/t00012_class_mermaid.svg
@@ -1,65 +1,70 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1342.828125 459" style="max-width: 1342.83px; background-color: white;" width="1342.828125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M101.28125,300L101.28125,304.1666666666667C101.28125,308.3333333333333,101.28125,316.6666666666667,107.8086972268212,325C114.33614445364238,333.3333333333333,127.39103890728477,341.6666666666667,133.91848613410596,345.8333333333333L140.44593336092714,350"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M337.8359375,300L337.8359375,304.1666666666667C337.8359375,308.3333333333333,337.8359375,316.6666666666667,331.30849027317885,325C324.78104304635764,333.3333333333333,311.7261485927152,341.6666666666667,305.19870136589407,345.8333333333333L298.67125413907286,350"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M521.5234375,300L521.5234375,304.1666666666667C521.5234375,308.3333333333333,521.5234375,316.6666666666667,526.9870136589403,326.8333333333333C532.4505898178808,337,543.3777421357617,349,548.841318294702,355L554.3048944536424,361"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M659.0234375,300L659.0234375,304.1666666666667C659.0234375,308.3333333333333,659.0234375,316.6666666666667,653.5598613410597,326.8333333333333C648.0962851821192,337,637.1691328642383,349,631.705556705298,355L626.2419805463576,361"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M1045.46875,300L1045.46875,304.1666666666667C1045.46875,308.3333333333333,1045.46875,316.6666666666667,1045.46875,326.8333333333333C1045.46875,337,1045.46875,349,1045.46875,355L1045.46875,361"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M236.9921875,171.05513004034134L214.37369791666666,177.37927503361777C191.75520833333334,183.70342002689424,146.51822916666666,196.3517100134471,123.89973958333333,208.34252167339022C101.28125,220.33333333333334,101.28125,231.66666666666666,101.28125,237.33333333333334L101.28125,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M390.9880651595745,175L382.1293772163121,180.66666666666666C373.27068927304964,186.33333333333334,355.55331338652485,197.66666666666666,346.6946254432624,209C337.8359375,220.33333333333334,337.8359375,231.66666666666666,337.8359375,237.33333333333334L337.8359375,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M521.5234375,175L521.5234375,180.66666666666666C521.5234375,186.33333333333334,521.5234375,197.66666666666666,521.5234375,209C521.5234375,220.33333333333334,521.5234375,231.66666666666666,521.5234375,237.33333333333334L521.5234375,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M619.2362034574468,175L625.8674091312056,180.66666666666666C632.4986148049645,186.33333333333334,645.7610261524823,197.66666666666666,652.3922318262411,209C659.0234375,220.33333333333334,659.0234375,231.66666666666666,659.0234375,237.33333333333334L659.0234375,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M806.0546875,155.30899127711922L845.95703125,164.25749273093268C885.859375,173.20599418474615,965.6640625,191.1029970923731,1005.56640625,205.71816521285322C1045.46875,220.33333333333334,1045.46875,231.66666666666666,1045.46875,237.33333333333334L1045.46875,243"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M101.28125,300L101.28125,304.1666666666667C101.28125,308.3333333333333,101.28125,316.6666666666667,105.27996766846813,323.3858355657767C109.27868533693625,330.1050044648867,117.27612067387251,335.2100089297734,121.27483834234063,337.76251116221675L125.27355601080875,340.31501339466007"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M337.8359375,300L337.8359375,304.1666666666667C337.8359375,308.3333333333333,337.8359375,316.6666666666667,333.83721983153185,323.3858355657767C329.83850216306377,330.1050044648867,321.8410668261275,335.2100089297734,317.8423491576594,337.76251116221675L313.84363148919124,340.31501339466007"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M521.5234375,300L521.5234375,304.1666666666667C521.5234375,308.3333333333333,521.5234375,316.6666666666667,524.9671680465517,324.61517560627374C528.4108985931034,332.5636845458808,535.2983596862068,340.12736909176164,538.7420902327585,343.90921136470206L542.1858207793102,347.6910536376425"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M659.0234375,300L659.0234375,304.1666666666667C659.0234375,308.3333333333333,659.0234375,316.6666666666667,655.5797069534483,324.61517560627374C652.1359764068966,332.5636845458808,645.2485153137932,340.12736909176164,641.8047847672415,343.90921136470206L638.3610542206898,347.6910536376425"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M1045.46875,300L1045.46875,304.1666666666667C1045.46875,308.3333333333333,1045.46875,316.6666666666667,1045.46875,323.8333333333333C1045.46875,331,1045.46875,337,1045.46875,340L1045.46875,343"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M219.65703899316415,175.9020492934285L199.92774082763677,181.4183744111904C180.19844266210944,186.93469952895234,140.73984633105474,197.96734976447615,121.01054816552737,209.15034154890475C101.28125,220.33333333333334,101.28125,231.66666666666666,101.28125,237.33333333333334L101.28125,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M375.8249315866398,184.69945257472511L369.4934325721999,188.7495438122709C363.16193355775994,192.79963504981674,350.49893552887994,200.89981752490837,344.16743651443994,210.61657542912084C337.8359375,220.33333333333334,337.8359375,231.66666666666666,337.8359375,237.33333333333334L337.8359375,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M521.5234375,193L521.5234375,195.66666666666666C521.5234375,198.33333333333334,521.5234375,203.66666666666666,521.5234375,212C521.5234375,220.33333333333334,521.5234375,231.66666666666666,521.5234375,237.33333333333334L521.5234375,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M632.9203695065175,186.69374189647863L637.2708808387646,190.41145158039885C641.6213921710117,194.1291612643191,650.3224148355058,201.56458063215953,654.672926167753,210.9489569827464C659.0234375,220.33333333333334,659.0234375,231.66666666666666,659.0234375,237.33333333333334L659.0234375,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M823.6184420318964,159.24783968030601L860.5934933599137,167.53986640025502C897.568544687931,175.831893120204,971.5186473439654,192.41594656010201,1008.4936986719828,206.37463994671768C1045.46875,220.33333333333334,1045.46875,231.66666666666666,1045.46875,237.33333333333334L1045.46875,243"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -174,7 +179,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11">
+        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0001773299890023132282-0" class="node default clickable">
             <rect height="101" width="206.203125" y="-50.5" x="-103.1015625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="103.1015625" x1="-103.1015625" class="divider"/>
@@ -203,7 +208,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16">
+        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0002061171077567279746-1" class="node default clickable">
             <rect height="79" width="243.515625" y="-39.5" x="-121.7578125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.7578125" x1="-121.7578125" class="divider"/>
@@ -227,7 +232,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0000627809578407650629-2" class="node default clickable">
             <rect height="79" width="234.625" y="-39.5" x="-117.3125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="117.3125" x1="-117.3125" class="divider"/>
@@ -251,7 +256,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11">
+        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000286972398942005457-3" class="node default clickable">
             <rect height="57" width="186.5625" y="-28.5" x="-93.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.28125" x1="-93.28125" class="divider"/>
@@ -270,7 +275,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L11">
+        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000299466181098300963-4" class="node default clickable">
             <rect height="57" width="186.546875" y="-28.5" x="-93.2734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.2734375" x1="-93.2734375" class="divider"/>
@@ -289,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16">
+        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000489063277971613593-5" class="node default clickable">
             <rect height="57" width="80.828125" y="-28.5" x="-40.4140625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="40.4140625" x1="-40.4140625" class="divider"/>
@@ -308,7 +313,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L16">
+        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000014232362483200599-6" class="node default clickable">
             <rect height="57" width="94.171875" y="-28.5" x="-47.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0859375" x1="-47.0859375" class="divider"/>
@@ -327,7 +332,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0001478239414632239754-7" class="node default clickable">
             <rect height="57" width="578.71875" y="-28.5" x="-289.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="289.359375" x1="-289.359375" class="divider"/>
@@ -346,7 +351,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00012/t00012.cc#L24">
+        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L24">
           <g title="R" id="classId-C_0000559263385732885469-8" class="node default clickable">
             <rect height="167" width="569.0625" y="-83.5" x="-284.53125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="284.53125" x1="-284.53125" class="divider"/>
diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md
index 02ca593a..0163deb8 100644
--- a/docs/test_cases/t00013.md
+++ b/docs/test_cases/t00013.md
@@ -14,7 +14,7 @@ diagrams:
 
 ```
 ## Source code
-File t00013.cc
+File `tests/t00013/t00013.cc`
 ```cpp
 #include <algorithm>
 #include <map>
@@ -300,6 +300,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -579,6 +580,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -609,6 +611,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -639,6 +642,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -669,6 +673,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -699,6 +704,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -729,6 +735,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -759,6 +766,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -789,6 +797,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -819,6 +828,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -849,6 +859,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -873,6 +884,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index e9da2fca..8a68cb28 100644
--- a/docs/test_cases/t00013_class.svg
+++ b/docs/test_cases/t00013_class.svg
@@ -1,301 +1,349 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="518px" preserveAspectRatio="none" style="width:1138px;height:518px;" version="1.1" viewBox="0 0 1138 518" width="1138px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="581px" preserveAspectRatio="none" style="width:1135px;height:581px;background:#FFFFFF;" version="1.1" viewBox="0 0 1135 581" width="1135px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkbtuwj1chub4" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
-      <ellipse cx="176" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M178.9688,462.1406 Q178.3906,462.4375 177.75,462.5781 Q177.1094,462.7344 176.4063,462.7344 Q173.9063,462.7344 172.5781,461.0938 Q171.2656,459.4375 171.2656,456.3125 Q171.2656,453.1875 172.5781,451.5313 Q173.9063,449.875 176.4063,449.875 Q177.1094,449.875 177.75,450.0313 Q178.4063,450.1875 178.9688,450.4844 L178.9688,453.2031 Q178.3438,452.625 177.75,452.3594 Q177.1563,452.0781 176.5313,452.0781 Q175.1875,452.0781 174.5,453.1563 Q173.8125,454.2188 173.8125,456.3125 Q173.8125,458.4063 174.5,459.4844 Q175.1875,460.5469 176.5313,460.5469 Q177.1563,460.5469 177.75,460.2813 Q178.3438,460 178.9688,459.4219 L178.9688,462.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="190" y="460.6543">ABCD::F</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="246" y="437.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="247" y="449.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="472.5" y2="472.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="480.5" y2="480.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000952770730316239752">
+        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000952770730316239752" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="98" x="168" y="501.4"/>
+        <ellipse cx="183" cy="517.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M178,518.5563 C178,521.0563 180.1406,522.8688 183.0625,522.8688 C184.2969,522.8688 185.4688,522.5719 186.2188,522.0563 C186.8281,521.6344 187.1563,521.2125 187.1563,520.8063 C187.1563,520.3375 186.7344,519.9313 186.2344,519.9313 C186,519.9313 185.7813,520.0094 185.5781,520.2125 C185.1406,520.65 185.1406,520.65 184.9688,520.7438 C184.5156,520.9781 183.875,521.1188 183.1094,521.1188 C181.1094,521.1188 179.8281,520.1031 179.8281,518.525 L179.8281,517.4781 C179.8281,515.775 181.0469,514.5719 182.75,514.5719 C183.3281,514.5719 183.9063,514.7125 184.375,514.9625 C184.8438,515.2281 185.0156,515.4156 185.0781,515.775 C185.2031,516.4469 185.4531,516.6969 185.9844,516.6969 C186.2656,516.6969 186.5469,516.5563 186.7344,516.3375 C186.8594,516.1656 186.9063,515.9938 186.9063,515.5563 L186.9063,514.1969 C186.9063,513.775 186.8906,513.6344 186.7656,513.4625 C186.5938,513.2125 186.3125,513.0563 185.9844,513.0563 C185.6719,513.0563 185.4688,513.1656 185.25,513.4313 C184.0781,512.9313 183.6406,512.8219 182.6875,512.8219 C180.0156,512.8219 178,514.8375 178,517.4625 L178,518.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="197" y="522.006">ABCD::F</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="260" y="498.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="261" y="512.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="169" x2="265" y1="533.4" y2="533.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="169" x2="265" y1="541.4" y2="541.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="174" y="550.3"/>
+          <ellipse cx="179" cy="555.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="188" y="558.4059">f : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167" y="486.5"/>
-      <ellipse cx="172" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0002304215469403389354">
+        <rect codeLine="7" fill="#F1F1F1" height="48" id="C_0002304215469403389354" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="243" y="367.2"/>
+        <ellipse cx="258" cy="383.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M253,384.3563 C253,386.8563 255.1406,388.6688 258.0625,388.6688 C259.2969,388.6688 260.4688,388.3719 261.2188,387.8563 C261.8281,387.4344 262.1563,387.0125 262.1563,386.6063 C262.1563,386.1375 261.7344,385.7313 261.2344,385.7313 C261,385.7313 260.7813,385.8094 260.5781,386.0125 C260.1406,386.45 260.1406,386.45 259.9688,386.5438 C259.5156,386.7781 258.875,386.9188 258.1094,386.9188 C256.1094,386.9188 254.8281,385.9031 254.8281,384.325 L254.8281,383.2781 C254.8281,381.575 256.0469,380.3719 257.75,380.3719 C258.3281,380.3719 258.9063,380.5125 259.375,380.7625 C259.8438,381.0281 260.0156,381.2156 260.0781,381.575 C260.2031,382.2469 260.4531,382.4969 260.9844,382.4969 C261.2656,382.4969 261.5469,382.3563 261.7344,382.1375 C261.8594,381.9656 261.9063,381.7938 261.9063,381.3563 L261.9063,379.9969 C261.9063,379.575 261.8906,379.4344 261.7656,379.2625 C261.5938,379.0125 261.3125,378.8563 260.9844,378.8563 C260.6719,378.8563 260.4688,378.9656 260.25,379.2313 C259.0781,378.7313 258.6406,378.6219 257.6875,378.6219 C255.0156,378.6219 253,380.6375 253,383.2625 L253,384.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="272" y="387.806">ABCD::F</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="335" y="364.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="336" y="378.4001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="244" x2="346" y1="399.2" y2="399.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="244" x2="346" y1="407.2" y2="407.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="181" y="494.7104">f : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000519995486237427479">
+        <rect codeLine="11" fill="#F1F1F1" height="64.7999" id="C_0000519995486237427479" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="381.5" y="358.8"/>
+        <ellipse cx="405.5" cy="374.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M400.5,375.9563 C400.5,378.4563 402.6406,380.2688 405.5625,380.2688 C406.7969,380.2688 407.9688,379.9719 408.7188,379.4563 C409.3281,379.0344 409.6563,378.6125 409.6563,378.2063 C409.6563,377.7375 409.2344,377.3313 408.7344,377.3313 C408.5,377.3313 408.2813,377.4094 408.0781,377.6125 C407.6406,378.05 407.6406,378.05 407.4688,378.1438 C407.0156,378.3781 406.375,378.5188 405.6094,378.5188 C403.6094,378.5188 402.3281,377.5031 402.3281,375.925 L402.3281,374.8781 C402.3281,373.175 403.5469,371.9719 405.25,371.9719 C405.8281,371.9719 406.4063,372.1125 406.875,372.3625 C407.3438,372.6281 407.5156,372.8156 407.5781,373.175 C407.7031,373.8469 407.9531,374.0969 408.4844,374.0969 C408.7656,374.0969 409.0469,373.9563 409.2344,373.7375 C409.3594,373.5656 409.4063,373.3938 409.4063,372.9563 L409.4063,371.5969 C409.4063,371.175 409.3906,371.0344 409.2656,370.8625 C409.0938,370.6125 408.8125,370.4563 408.4844,370.4563 C408.1719,370.4563 407.9688,370.5656 407.75,370.8313 C406.5781,370.3313 406.1406,370.2219 405.1875,370.2219 C402.5156,370.2219 400.5,372.2375 400.5,374.8625 L400.5,375.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="421.5" y="379.406">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="382.5" x2="441.5" y1="390.8" y2="390.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="382.5" x2="441.5" y1="398.8" y2="398.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="387.5" y="407.7"/>
+          <ellipse cx="392.5" cy="412.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="401.5" y="415.8059">a : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
-      <ellipse cx="248.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M251.4688,333.6406 Q250.8906,333.9375 250.25,334.0781 Q249.6094,334.2344 248.9063,334.2344 Q246.4063,334.2344 245.0781,332.5938 Q243.7656,330.9375 243.7656,327.8125 Q243.7656,324.6875 245.0781,323.0313 Q246.4063,321.375 248.9063,321.375 Q249.6094,321.375 250.25,321.5313 Q250.9063,321.6875 251.4688,321.9844 L251.4688,324.7031 Q250.8438,324.125 250.25,323.8594 Q249.6563,323.5781 249.0313,323.5781 Q247.6875,323.5781 247,324.6563 Q246.3125,325.7188 246.3125,327.8125 Q246.3125,329.9063 247,330.9844 Q247.6875,332.0469 249.0313,332.0469 Q249.6563,332.0469 250.25,331.7813 Q250.8438,331.5 251.4688,330.9219 L251.4688,333.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="262.5" y="332.1543">ABCD::F</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="318.5" y="309"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="319.5" y="321.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="344" y2="344"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="352" y2="352"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001177487653597650440">
+        <rect codeLine="16" fill="#F1F1F1" height="64.7999" id="C_0001177487653597650440" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="477.5" y="358.8"/>
+        <ellipse cx="501.5" cy="374.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M496.5,375.9563 C496.5,378.4563 498.6406,380.2688 501.5625,380.2688 C502.7969,380.2688 503.9688,379.9719 504.7188,379.4563 C505.3281,379.0344 505.6563,378.6125 505.6563,378.2063 C505.6563,377.7375 505.2344,377.3313 504.7344,377.3313 C504.5,377.3313 504.2813,377.4094 504.0781,377.6125 C503.6406,378.05 503.6406,378.05 503.4688,378.1438 C503.0156,378.3781 502.375,378.5188 501.6094,378.5188 C499.6094,378.5188 498.3281,377.5031 498.3281,375.925 L498.3281,374.8781 C498.3281,373.175 499.5469,371.9719 501.25,371.9719 C501.8281,371.9719 502.4063,372.1125 502.875,372.3625 C503.3438,372.6281 503.5156,372.8156 503.5781,373.175 C503.7031,373.8469 503.9531,374.0969 504.4844,374.0969 C504.7656,374.0969 505.0469,373.9563 505.2344,373.7375 C505.3594,373.5656 505.4063,373.3938 505.4063,372.9563 L505.4063,371.5969 C505.4063,371.175 505.3906,371.0344 505.2656,370.8625 C505.0938,370.6125 504.8125,370.4563 504.4844,370.4563 C504.1719,370.4563 503.9688,370.5656 503.75,370.8313 C502.5781,370.3313 502.1406,370.2219 501.1875,370.2219 C498.5156,370.2219 496.5,372.2375 496.5,374.8625 L496.5,375.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="517.5" y="379.406">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="537.5" y1="390.8" y2="390.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="537.5" y1="398.8" y2="398.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="407.7"/>
+          <ellipse cx="488.5" cy="412.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="497.5" y="415.8059">b : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
-      <ellipse cx="392.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M395.5188,327.1406 Q394.9406,327.4375 394.3,327.5781 Q393.6594,327.7344 392.9563,327.7344 Q390.4563,327.7344 389.1281,326.0938 Q387.8156,324.4375 387.8156,321.3125 Q387.8156,318.1875 389.1281,316.5313 Q390.4563,314.875 392.9563,314.875 Q393.6594,314.875 394.3,315.0313 Q394.9563,315.1875 395.5188,315.4844 L395.5188,318.2031 Q394.8938,317.625 394.3,317.3594 Q393.7063,317.0781 393.0813,317.0781 Q391.7375,317.0781 391.05,318.1563 Q390.3625,319.2188 390.3625,321.3125 Q390.3625,323.4063 391.05,324.4844 Q391.7375,325.5469 393.0813,325.5469 Q393.7063,325.5469 394.3,325.2813 Q394.8938,325 395.5188,324.4219 L395.5188,327.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="408.45" y="325.6543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="337.5" y2="337.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="345.5" y2="345.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001028245818073128358">
+        <rect codeLine="21" fill="#F1F1F1" height="64.7999" id="C_0001028245818073128358" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="60" x="573" y="358.8"/>
+        <ellipse cx="596.1" cy="374.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M591.1,375.9563 C591.1,378.4563 593.2406,380.2688 596.1625,380.2688 C597.3969,380.2688 598.5688,379.9719 599.3188,379.4563 C599.9281,379.0344 600.2563,378.6125 600.2563,378.2063 C600.2563,377.7375 599.8344,377.3313 599.3344,377.3313 C599.1,377.3313 598.8813,377.4094 598.6781,377.6125 C598.2406,378.05 598.2406,378.05 598.0688,378.1438 C597.6156,378.3781 596.975,378.5188 596.2094,378.5188 C594.2094,378.5188 592.9281,377.5031 592.9281,375.925 L592.9281,374.8781 C592.9281,373.175 594.1469,371.9719 595.85,371.9719 C596.4281,371.9719 597.0063,372.1125 597.475,372.3625 C597.9438,372.6281 598.1156,372.8156 598.1781,373.175 C598.3031,373.8469 598.5531,374.0969 599.0844,374.0969 C599.3656,374.0969 599.6469,373.9563 599.8344,373.7375 C599.9594,373.5656 600.0063,373.3938 600.0063,372.9563 L600.0063,371.5969 C600.0063,371.175 599.9906,371.0344 599.8656,370.8625 C599.6938,370.6125 599.4125,370.4563 599.0844,370.4563 C598.7719,370.4563 598.5688,370.5656 598.35,370.8313 C597.1781,370.3313 596.7406,370.2219 595.7875,370.2219 C593.1156,370.2219 591.1,372.2375 591.1,374.8625 L591.1,375.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="611.9" y="379.406">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="574" x2="632" y1="390.8" y2="390.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="574" x2="632" y1="398.8" y2="398.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="579" y="407.7"/>
+          <ellipse cx="584" cy="412.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="593" y="415.8059">c : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="375" y="351.5"/>
-      <ellipse cx="380" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0000409373870621931875">
+        <rect codeLine="26" fill="#F1F1F1" height="81.5999" id="C_0000409373870621931875" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="130" x="7" y="350.4"/>
+        <ellipse cx="62.75" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M57.75,367.5563 C57.75,370.0563 59.8906,371.8688 62.8125,371.8688 C64.0469,371.8688 65.2188,371.5719 65.9688,371.0563 C66.5781,370.6344 66.9063,370.2125 66.9063,369.8063 C66.9063,369.3375 66.4844,368.9313 65.9844,368.9313 C65.75,368.9313 65.5313,369.0094 65.3281,369.2125 C64.8906,369.65 64.8906,369.65 64.7188,369.7438 C64.2656,369.9781 63.625,370.1188 62.8594,370.1188 C60.8594,370.1188 59.5781,369.1031 59.5781,367.525 L59.5781,366.4781 C59.5781,364.775 60.7969,363.5719 62.5,363.5719 C63.0781,363.5719 63.6563,363.7125 64.125,363.9625 C64.5938,364.2281 64.7656,364.4156 64.8281,364.775 C64.9531,365.4469 65.2031,365.6969 65.7344,365.6969 C66.0156,365.6969 66.2969,365.5563 66.4844,365.3375 C66.6094,365.1656 66.6563,364.9938 66.6563,364.5563 L66.6563,363.1969 C66.6563,362.775 66.6406,362.6344 66.5156,362.4625 C66.3438,362.2125 66.0625,362.0563 65.7344,362.0563 C65.4219,362.0563 65.2188,362.1656 65,362.4313 C63.8281,361.9313 63.3906,361.8219 62.4375,361.8219 C59.7656,361.8219 57.75,363.8375 57.75,366.4625 L57.75,367.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="83.25" y="371.006">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="136" y1="382.4" y2="382.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="391.3"/>
+          <ellipse cx="18" cy="396.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="27" y="399.4059">print(R * r) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="136" y1="407.1999" y2="407.1999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="416.0999"/>
+          <ellipse cx="18" cy="421.0999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="27" y="424.2059">d : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="389" y="359.7104">a : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0000864055993755439230">
+        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0000864055993755439230" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="801.5" y="501.4"/>
+        <ellipse cx="817.85" cy="517.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M812.85,518.5563 C812.85,521.0563 814.9906,522.8688 817.9125,522.8688 C819.1469,522.8688 820.3188,522.5719 821.0688,522.0563 C821.6781,521.6344 822.0063,521.2125 822.0063,520.8063 C822.0063,520.3375 821.5844,519.9313 821.0844,519.9313 C820.85,519.9313 820.6313,520.0094 820.4281,520.2125 C819.9906,520.65 819.9906,520.65 819.8188,520.7438 C819.3656,520.9781 818.725,521.1188 817.9594,521.1188 C815.9594,521.1188 814.6781,520.1031 814.6781,518.525 L814.6781,517.4781 C814.6781,515.775 815.8969,514.5719 817.6,514.5719 C818.1781,514.5719 818.7563,514.7125 819.225,514.9625 C819.6938,515.2281 819.8656,515.4156 819.9281,515.775 C820.0531,516.4469 820.3031,516.6969 820.8344,516.6969 C821.1156,516.6969 821.3969,516.5563 821.5844,516.3375 C821.7094,516.1656 821.7563,515.9938 821.7563,515.5563 L821.7563,514.1969 C821.7563,513.775 821.7406,513.6344 821.6156,513.4625 C821.4438,513.2125 821.1625,513.0563 820.8344,513.0563 C820.5219,513.0563 820.3188,513.1656 820.1,513.4313 C818.9281,512.9313 818.4906,512.8219 817.5375,512.8219 C814.8656,512.8219 812.85,514.8375 812.85,517.4625 L812.85,518.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="832.15" y="522.006">E</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="850.5" y="498.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="851.5" y="512.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="802.5" x2="855.5" y1="533.4" y2="533.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="802.5" x2="855.5" y1="541.4" y2="541.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="807.5" y="550.3"/>
+          <ellipse cx="812.5" cy="555.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="821.5" y="558.4059">e : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
-      <ellipse cx="486.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M489.5188,327.1406 Q488.9406,327.4375 488.3,327.5781 Q487.6594,327.7344 486.9563,327.7344 Q484.4563,327.7344 483.1281,326.0938 Q481.8156,324.4375 481.8156,321.3125 Q481.8156,318.1875 483.1281,316.5313 Q484.4563,314.875 486.9563,314.875 Q487.6594,314.875 488.3,315.0313 Q488.9563,315.1875 489.5188,315.4844 L489.5188,318.2031 Q488.8938,317.625 488.3,317.3594 Q487.7063,317.0781 487.0813,317.0781 Q485.7375,317.0781 485.05,318.1563 Q484.3625,319.2188 484.3625,321.3125 Q484.3625,323.4063 485.05,324.4844 Q485.7375,325.5469 487.0813,325.5469 Q487.7063,325.5469 488.3,325.2813 Q488.8938,325 489.5188,324.4219 L489.5188,327.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.45" y="325.6543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="337.5" y2="337.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="345.5" y2="345.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0000205927019127027617">
+        <rect codeLine="37" fill="#F1F1F1" height="81.5999" id="C_0000205927019127027617" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="181" x="943.5" y="493"/>
+        <ellipse cx="1000.25" cy="509" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M995.25,510.1563 C995.25,512.6563 997.3906,514.4688 1000.3125,514.4688 C1001.5469,514.4688 1002.7188,514.1719 1003.4688,513.6563 C1004.0781,513.2344 1004.4063,512.8125 1004.4063,512.4063 C1004.4063,511.9375 1003.9844,511.5313 1003.4844,511.5313 C1003.25,511.5313 1003.0313,511.6094 1002.8281,511.8125 C1002.3906,512.25 1002.3906,512.25 1002.2188,512.3438 C1001.7656,512.5781 1001.125,512.7188 1000.3594,512.7188 C998.3594,512.7188 997.0781,511.7031 997.0781,510.125 L997.0781,509.0781 C997.0781,507.375 998.2969,506.1719 1000,506.1719 C1000.5781,506.1719 1001.1563,506.3125 1001.625,506.5625 C1002.0938,506.8281 1002.2656,507.0156 1002.3281,507.375 C1002.4531,508.0469 1002.7031,508.2969 1003.2344,508.2969 C1003.5156,508.2969 1003.7969,508.1563 1003.9844,507.9375 C1004.1094,507.7656 1004.1563,507.5938 1004.1563,507.1563 L1004.1563,505.7969 C1004.1563,505.375 1004.1406,505.2344 1004.0156,505.0625 C1003.8438,504.8125 1003.5625,504.6563 1003.2344,504.6563 C1002.9219,504.6563 1002.7188,504.7656 1002.5,505.0313 C1001.3281,504.5313 1000.8906,504.4219 999.9375,504.4219 C997.2656,504.4219 995.25,506.4375 995.25,509.0625 L995.25,510.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="1020.75" y="513.606">G</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="1081.5" y="490"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="1082.5" y="504.2001">T,Args...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="944.5" x2="1123.5" y1="525" y2="525"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="944.5" x2="1123.5" y1="533" y2="533"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="949.5" y="541.9"/>
+          <ellipse cx="954.5" cy="546.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="963.5" y="550.0059">args : std::tuple&lt;Args...&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="949.5" y="558.6999"/>
+          <ellipse cx="954.5" cy="563.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="963.5" y="566.8059">g : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="469" y="351.5"/>
-      <ellipse cx="474" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001977486318799565722">
+        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0001977486318799565722" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="800" y="367.2"/>
+        <ellipse cx="815" cy="383.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M810,384.3563 C810,386.8563 812.1406,388.6688 815.0625,388.6688 C816.2969,388.6688 817.4688,388.3719 818.2188,387.8563 C818.8281,387.4344 819.1563,387.0125 819.1563,386.6063 C819.1563,386.1375 818.7344,385.7313 818.2344,385.7313 C818,385.7313 817.7813,385.8094 817.5781,386.0125 C817.1406,386.45 817.1406,386.45 816.9688,386.5438 C816.5156,386.7781 815.875,386.9188 815.1094,386.9188 C813.1094,386.9188 811.8281,385.9031 811.8281,384.325 L811.8281,383.2781 C811.8281,381.575 813.0469,380.3719 814.75,380.3719 C815.3281,380.3719 815.9063,380.5125 816.375,380.7625 C816.8438,381.0281 817.0156,381.2156 817.0781,381.575 C817.2031,382.2469 817.4531,382.4969 817.9844,382.4969 C818.2656,382.4969 818.5469,382.3563 818.7344,382.1375 C818.8594,381.9656 818.9063,381.7938 818.9063,381.3563 L818.9063,379.9969 C818.9063,379.575 818.8906,379.4344 818.7656,379.2625 C818.5938,379.0125 818.3125,378.8563 817.9844,378.8563 C817.6719,378.8563 817.4688,378.9656 817.25,379.2313 C816.0781,378.7313 815.6406,378.6219 814.6875,378.6219 C812.0156,378.6219 810,380.6375 810,383.2625 L810,384.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="829" y="387.806">E</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="846" y="364.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="847" y="378.4001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="801" x2="857" y1="399.2" y2="399.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="801" x2="857" y1="407.2" y2="407.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="483" y="359.7104">b : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0001526733274613822014">
+        <rect codeLine="47" fill="#F1F1F1" height="48" id="C_0001526733274613822014" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="141" x="963.5" y="367.2"/>
+        <ellipse cx="978.5" cy="383.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M973.5,384.3563 C973.5,386.8563 975.6406,388.6688 978.5625,388.6688 C979.7969,388.6688 980.9688,388.3719 981.7188,387.8563 C982.3281,387.4344 982.6563,387.0125 982.6563,386.6063 C982.6563,386.1375 982.2344,385.7313 981.7344,385.7313 C981.5,385.7313 981.2813,385.8094 981.0781,386.0125 C980.6406,386.45 980.6406,386.45 980.4688,386.5438 C980.0156,386.7781 979.375,386.9188 978.6094,386.9188 C976.6094,386.9188 975.3281,385.9031 975.3281,384.325 L975.3281,383.2781 C975.3281,381.575 976.5469,380.3719 978.25,380.3719 C978.8281,380.3719 979.4063,380.5125 979.875,380.7625 C980.3438,381.0281 980.5156,381.2156 980.5781,381.575 C980.7031,382.2469 980.9531,382.4969 981.4844,382.4969 C981.7656,382.4969 982.0469,382.3563 982.2344,382.1375 C982.3594,381.9656 982.4063,381.7938 982.4063,381.3563 L982.4063,379.9969 C982.4063,379.575 982.3906,379.4344 982.2656,379.2625 C982.0938,379.0125 981.8125,378.8563 981.4844,378.8563 C981.1719,378.8563 980.9688,378.9656 980.75,379.2313 C979.5781,378.7313 979.1406,378.6219 978.1875,378.6219 C975.5156,378.6219 973.5,380.6375 973.5,383.2625 L973.5,384.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="992.5" y="387.806">G</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="96" x="1011.5" y="364.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="94" x="1012.5" y="378.4001">int,float,std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="964.5" x2="1103.5" y1="399.2" y2="399.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="964.5" x2="1103.5" y1="407.2" y2="407.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
-      <ellipse cx="580.6" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M583.5688,327.1406 Q582.9906,327.4375 582.35,327.5781 Q581.7094,327.7344 581.0063,327.7344 Q578.5063,327.7344 577.1781,326.0938 Q575.8656,324.4375 575.8656,321.3125 Q575.8656,318.1875 577.1781,316.5313 Q578.5063,314.875 581.0063,314.875 Q581.7094,314.875 582.35,315.0313 Q583.0063,315.1875 583.5688,315.4844 L583.5688,318.2031 Q582.9438,317.625 582.35,317.3594 Q581.7563,317.0781 581.1313,317.0781 Q579.7875,317.0781 579.1,318.1563 Q578.4125,319.2188 578.4125,321.3125 Q578.4125,323.4063 579.1,324.4844 Q579.7875,325.5469 581.1313,325.5469 Q581.7563,325.5469 582.35,325.2813 Q582.9438,325 583.5688,324.4219 L583.5688,327.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="596.4" y="325.6543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="337.5" y2="337.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="345.5" y2="345.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0000531523220915557686">
+        <rect codeLine="51" fill="#F1F1F1" height="48" id="C_0000531523220915557686" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="667.5" y="367.2"/>
+        <ellipse cx="682.5" cy="383.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M677.5,384.3563 C677.5,386.8563 679.6406,388.6688 682.5625,388.6688 C683.7969,388.6688 684.9688,388.3719 685.7188,387.8563 C686.3281,387.4344 686.6563,387.0125 686.6563,386.6063 C686.6563,386.1375 686.2344,385.7313 685.7344,385.7313 C685.5,385.7313 685.2813,385.8094 685.0781,386.0125 C684.6406,386.45 684.6406,386.45 684.4688,386.5438 C684.0156,386.7781 683.375,386.9188 682.6094,386.9188 C680.6094,386.9188 679.3281,385.9031 679.3281,384.325 L679.3281,383.2781 C679.3281,381.575 680.5469,380.3719 682.25,380.3719 C682.8281,380.3719 683.4063,380.5125 683.875,380.7625 C684.3438,381.0281 684.5156,381.2156 684.5781,381.575 C684.7031,382.2469 684.9531,382.4969 685.4844,382.4969 C685.7656,382.4969 686.0469,382.3563 686.2344,382.1375 C686.3594,381.9656 686.4063,381.7938 686.4063,381.3563 L686.4063,379.9969 C686.4063,379.575 686.3906,379.4344 686.2656,379.2625 C686.0938,379.0125 685.8125,378.8563 685.4844,378.8563 C685.1719,378.8563 684.9688,378.9656 684.75,379.2313 C683.5781,378.7313 683.1406,378.6219 682.1875,378.6219 C679.5156,378.6219 677.5,380.6375 677.5,383.2625 L677.5,384.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="696.5" y="387.806">E</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="713.5" y="364.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="714.5" y="378.4001">std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="668.5" x2="763.5" y1="399.2" y2="399.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="668.5" x2="763.5" y1="407.2" y2="407.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="563.5" y="351.5"/>
-      <ellipse cx="568.5" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0002198686676355573844">
+        <rect codeLine="55" fill="#F1F1F1" height="266.399" id="C_0002198686676355573844" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="263" x="376.5" y="7"/>
+        <ellipse cx="498.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M493.75,24.1563 C493.75,26.6563 495.8906,28.4688 498.8125,28.4688 C500.0469,28.4688 501.2188,28.1719 501.9688,27.6563 C502.5781,27.2344 502.9063,26.8125 502.9063,26.4063 C502.9063,25.9375 502.4844,25.5313 501.9844,25.5313 C501.75,25.5313 501.5313,25.6094 501.3281,25.8125 C500.8906,26.25 500.8906,26.25 500.7188,26.3438 C500.2656,26.5781 499.625,26.7188 498.8594,26.7188 C496.8594,26.7188 495.5781,25.7031 495.5781,24.125 L495.5781,23.0781 C495.5781,21.375 496.7969,20.1719 498.5,20.1719 C499.0781,20.1719 499.6563,20.3125 500.125,20.5625 C500.5938,20.8281 500.7656,21.0156 500.8281,21.375 C500.9531,22.0469 501.2031,22.2969 501.7344,22.2969 C502.0156,22.2969 502.2969,22.1563 502.4844,21.9375 C502.6094,21.7656 502.6563,21.5938 502.6563,21.1563 L502.6563,19.7969 C502.6563,19.375 502.6406,19.2344 502.5156,19.0625 C502.3438,18.8125 502.0625,18.6563 501.7344,18.6563 C501.4219,18.6563 501.2188,18.7656 501,19.0313 C499.8281,18.5313 499.3906,18.4219 498.4375,18.4219 C495.7656,18.4219 493.75,20.4375 493.75,23.0625 L493.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="519.25" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="377.5" x2="638.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="47.9"/>
+          <ellipse cx="387.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="396.5" y="56.0059">get_a(A * a) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="64.6999"/>
+          <ellipse cx="387.5" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="396.5" y="72.8059">get_b(B &amp; b) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="81.4998"/>
+          <ellipse cx="387.5" cy="86.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="396.5" y="89.6058">get_c(C c) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="98.2997"/>
+          <ellipse cx="387.5" cy="103.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="396.5" y="106.4057">get_const_b(const B &amp; b) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="115.0997"/>
+          <ellipse cx="387.5" cy="120.0997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="396.5" y="123.2057">get_d(D &amp;&amp; d) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="131.8996"/>
+          <ellipse cx="387.5" cy="136.8996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="396.5" y="140.0056">get_d2(D &amp;&amp; d) : int</text>
+        </a>
+        <ellipse cx="387.5" cy="153.6995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="138" x="396.5" y="156.8055">get_e&lt;T&gt;(E&lt;T&gt; e) : T</text>
+        <ellipse cx="387.5" cy="170.4995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181" x="396.5" y="173.6054">get_f&lt;T&gt;(const F&lt;T&gt; &amp; f) : T</text>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="182.2994"/>
+          <ellipse cx="387.5" cy="187.2994" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="396.5" y="190.4054">get_int_e(const E&lt;int&gt; &amp; e) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="199.0993"/>
+          <ellipse cx="387.5" cy="204.0993" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169" x="396.5" y="207.2053">get_int_e2(E&lt;int&gt; &amp; e) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="215.8992"/>
+          <ellipse cx="387.5" cy="220.8992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="396.5" y="224.0052">get_int_f(const ABCD::F&lt;int&gt; &amp; f) : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="377.5" x2="638.5" y1="231.7992" y2="231.7992"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="240.6992"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="384.5" y="242.6992"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142" x="396.5" y="248.8051">estring : E&lt;std::string&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="257.4991"/>
+          <ellipse cx="387.5" cy="262.4991" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="209" x="396.5" y="265.6051">gintstring : G&lt;int,float,std::string&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="577.5" y="359.7104">c : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
-      <ellipse cx="57.75" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M60.7188,320.6406 Q60.1406,320.9375 59.5,321.0781 Q58.8594,321.2344 58.1563,321.2344 Q55.6563,321.2344 54.3281,319.5938 Q53.0156,317.9375 53.0156,314.8125 Q53.0156,311.6875 54.3281,310.0313 Q55.6563,308.375 58.1563,308.375 Q58.8594,308.375 59.5,308.5313 Q60.1563,308.6875 60.7188,308.9844 L60.7188,311.7031 Q60.0938,311.125 59.5,310.8594 Q58.9063,310.5781 58.2813,310.5781 Q56.9375,310.5781 56.25,311.6563 Q55.5625,312.7188 55.5625,314.8125 Q55.5625,316.9063 56.25,317.9844 Q56.9375,319.0469 58.2813,319.0469 Q58.9063,319.0469 59.5,318.7813 Q60.0938,318.5 60.7188,317.9219 L60.7188,320.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="78.25" y="319.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="331" y2="331"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="337"/>
-      <ellipse cx="17" cy="342" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="95" x="26" y="345.2104">print(R * r) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="351.8047" y2="351.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="357.8047"/>
-      <ellipse cx="17" cy="362.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="366.0151">d : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
-      <ellipse cx="810.95" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M813.9188,462.1406 Q813.3406,462.4375 812.7,462.5781 Q812.0594,462.7344 811.3563,462.7344 Q808.8563,462.7344 807.5281,461.0938 Q806.2156,459.4375 806.2156,456.3125 Q806.2156,453.1875 807.5281,451.5313 Q808.8563,449.875 811.3563,449.875 Q812.0594,449.875 812.7,450.0313 Q813.3563,450.1875 813.9188,450.4844 L813.9188,453.2031 Q813.2938,452.625 812.7,452.3594 Q812.1063,452.0781 811.4813,452.0781 Q810.1375,452.0781 809.45,453.1563 Q808.7625,454.2188 808.7625,456.3125 Q808.7625,458.4063 809.45,459.4844 Q810.1375,460.5469 811.4813,460.5469 Q812.1063,460.5469 812.7,460.2813 Q813.2938,460 813.9188,459.4219 L813.9188,462.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.05" y="460.6543">E</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="841.5" y="437.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="842.5" y="449.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="472.5" y2="472.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="480.5" y2="480.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="486.5"/>
-      <ellipse cx="806.5" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="815.5" y="494.7104">e : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
-      <ellipse cx="1001.75" cy="450" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1004.7188,455.6406 Q1004.1406,455.9375 1003.5,456.0781 Q1002.8594,456.2344 1002.1563,456.2344 Q999.6563,456.2344 998.3281,454.5938 Q997.0156,452.9375 997.0156,449.8125 Q997.0156,446.6875 998.3281,445.0313 Q999.6563,443.375 1002.1563,443.375 Q1002.8594,443.375 1003.5,443.5313 Q1004.1563,443.6875 1004.7188,443.9844 L1004.7188,446.7031 Q1004.0938,446.125 1003.5,445.8594 Q1002.9063,445.5781 1002.2813,445.5781 Q1000.9375,445.5781 1000.25,446.6563 Q999.5625,447.7188 999.5625,449.8125 Q999.5625,451.9063 1000.25,452.9844 Q1000.9375,454.0469 1002.2813,454.0469 Q1002.9063,454.0469 1003.5,453.7813 Q1004.0938,453.5 1004.7188,452.9219 L1004.7188,455.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1022.25" y="454.1543">G</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="52" x="1075.5" y="431"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="1076.5" y="443.1387">T,Args...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="466" y2="466"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="474" y2="474"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="480"/>
-      <ellipse cx="961.5" cy="485" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="970.5" y="488.2104">args : std::tuple&lt;Args...&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="492.8047"/>
-      <ellipse cx="961.5" cy="497.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="970.5" y="501.0151">g : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
-      <ellipse cx="806.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M809.4688,333.6406 Q808.8906,333.9375 808.25,334.0781 Q807.6094,334.2344 806.9063,334.2344 Q804.4063,334.2344 803.0781,332.5938 Q801.7656,330.9375 801.7656,327.8125 Q801.7656,324.6875 803.0781,323.0313 Q804.4063,321.375 806.9063,321.375 Q807.6094,321.375 808.25,321.5313 Q808.9063,321.6875 809.4688,321.9844 L809.4688,324.7031 Q808.8438,324.125 808.25,323.8594 Q807.6563,323.5781 807.0313,323.5781 Q805.6875,323.5781 805,324.6563 Q804.3125,325.7188 804.3125,327.8125 Q804.3125,329.9063 805,330.9844 Q805.6875,332.0469 807.0313,332.0469 Q807.6563,332.0469 808.25,331.7813 Q808.8438,331.5 809.4688,330.9219 L809.4688,333.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="332.1543">E</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="836.5" y="309"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="837.5" y="321.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="344" y2="344"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="352" y2="352"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
-      <ellipse cx="973" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M975.9688,333.6406 Q975.3906,333.9375 974.75,334.0781 Q974.1094,334.2344 973.4063,334.2344 Q970.9063,334.2344 969.5781,332.5938 Q968.2656,330.9375 968.2656,327.8125 Q968.2656,324.6875 969.5781,323.0313 Q970.9063,321.375 973.4063,321.375 Q974.1094,321.375 974.75,321.5313 Q975.4063,321.6875 975.9688,321.9844 L975.9688,324.7031 Q975.3438,324.125 974.75,323.8594 Q974.1563,323.5781 973.5313,323.5781 Q972.1875,323.5781 971.5,324.6563 Q970.8125,325.7188 970.8125,327.8125 Q970.8125,329.9063 971.5,330.9844 Q972.1875,332.0469 973.5313,332.0469 Q974.1563,332.0469 974.75,331.7813 Q975.3438,331.5 975.9688,330.9219 L975.9688,333.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="987" y="332.1543">G</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="116" x="1004" y="309"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="1005" y="321.1387">int,float,std::string</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="344" y2="344"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="352" y2="352"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
-      <ellipse cx="665.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M668.4688,333.6406 Q667.8906,333.9375 667.25,334.0781 Q666.6094,334.2344 665.9063,334.2344 Q663.4063,334.2344 662.0781,332.5938 Q660.7656,330.9375 660.7656,327.8125 Q660.7656,324.6875 662.0781,323.0313 Q663.4063,321.375 665.9063,321.375 Q666.6094,321.375 667.25,321.5313 Q667.9063,321.6875 668.4688,321.9844 L668.4688,324.7031 Q667.8438,324.125 667.25,323.8594 Q666.6563,323.5781 666.0313,323.5781 Q664.6875,323.5781 664,324.6563 Q663.3125,325.7188 663.3125,327.8125 Q663.3125,329.9063 664,330.9844 Q664.6875,332.0469 666.0313,332.0469 Q666.6563,332.0469 667.25,331.7813 Q667.8438,331.5 668.4688,330.9219 L668.4688,333.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="679.5" y="332.1543">E</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="695.5" y="309"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="696.5" y="321.1387">std::string</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="344" y2="344"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="352" y2="352"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkbtuwj1chub4)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
-      <ellipse cx="484.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M487.2188,29.6406 Q486.6406,29.9375 486,30.0781 Q485.3594,30.2344 484.6563,30.2344 Q482.1563,30.2344 480.8281,28.5938 Q479.5156,26.9375 479.5156,23.8125 Q479.5156,20.6875 480.8281,19.0313 Q482.1563,17.375 484.6563,17.375 Q485.3594,17.375 486,17.5313 Q486.6563,17.6875 487.2188,17.9844 L487.2188,20.7031 Q486.5938,20.125 486,19.8594 Q485.4063,19.5781 484.7813,19.5781 Q483.4375,19.5781 482.75,20.6563 Q482.0625,21.7188 482.0625,23.8125 Q482.0625,25.9063 482.75,26.9844 Q483.4375,28.0469 484.7813,28.0469 Q485.4063,28.0469 486,27.7813 Q486.5938,27.5 487.2188,26.9219 L487.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="504.75" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="46"/>
-      <ellipse cx="382.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="391.5" y="54.2104">get_a(A * a) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="58.8047"/>
-      <ellipse cx="382.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="391.5" y="67.0151">get_b(B &amp; b) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="71.6094"/>
-      <ellipse cx="382.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="391.5" y="79.8198">get_c(C c) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="84.4141"/>
-      <ellipse cx="382.5" cy="89.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="391.5" y="92.6245">get_const_b(const B &amp; b) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="97.2188"/>
-      <ellipse cx="382.5" cy="102.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="391.5" y="105.4292">get_d(D &amp;&amp; d) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="110.0234"/>
-      <ellipse cx="382.5" cy="115.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="391.5" y="118.2339">get_d2(D &amp;&amp; d) : int</text>
-    </a>
-    <ellipse cx="382.5" cy="127.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="391.5" y="131.0386">get_e&lt;T&gt;(E&lt;T&gt; e) : T</text>
-    <ellipse cx="382.5" cy="140.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="168" x="391.5" y="143.8433">get_f&lt;T&gt;(const F&lt;T&gt; &amp; f) : T</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="148.4375"/>
-      <ellipse cx="382.5" cy="153.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="184" x="391.5" y="156.6479">get_int_e(const E&lt;int&gt; &amp; e) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="161.2422"/>
-      <ellipse cx="382.5" cy="166.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="391.5" y="169.4526">get_int_e2(E&lt;int&gt; &amp; e) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="174.0469"/>
-      <ellipse cx="382.5" cy="179.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="391.5" y="182.2573">get_int_f(const ABCD::F&lt;int&gt; &amp; f) : int</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="188.8516" y2="188.8516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="194.8516"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="379.5" y="196.8516"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="391.5" y="203.062">estring : E&lt;std::string&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="207.6563"/>
-      <ellipse cx="382.5" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="391.5" y="215.8667">gintstring : G&lt;int,float,std::string&gt;</text>
-    </a>
-    <path d="M270.09,360.17 C260.11,377.41 246.14,401.53 233.84,422.78 " fill="none" id="C_0002304215469403389354-&gt;C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="239.89,426.3,223.81,440.1,227.77,419.28,239.89,426.3" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M115.49,298.63 C132.68,282.78 152.34,264.91 172.5,252 C232.6,213.53 305.37,182.56 366.43,159.94 " fill="none" id="C_0000409373870621931875-&gt;C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="371.17,158.19,361.3418,157.5521,366.479,159.9205,364.1106,165.0577,371.17,158.19" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M371.44,147.45 C299.82,170.53 209.55,205.88 137.5,252 C118.91,263.9 100.75,280.02 86.98,294.88 " fill="none" id="C_0002198686676355573844-&gt;C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="83.58,298.63,92.5908,294.6543,86.9405,294.9277,86.6671,289.2775,83.58,298.63" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M821.5,360.17 C821.5,376.63 821.5,399.36 821.5,419.88 " fill="none" id="C_0001977486318799565722-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="828.5,420.1,821.5,440.1,814.5,420.1,828.5,420.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1037.5,360.17 C1037.5,375.01 1037.5,394.95 1037.5,413.77 " fill="none" id="C_0001526733274613822014-&gt;C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1044.5,413.83,1037.5,433.83,1030.5,413.83,1044.5,413.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M724.05,360.17 C739.99,378.13 762.57,403.57 781.97,425.45 " fill="none" id="C_0000531523220915557686-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="787.37,420.98,795.4,440.59,776.89,430.27,787.37,420.98" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M446.88,222.29 C434.7,250.66 422.4,279.32 413.25,300.64 " fill="none" id="C_0002198686676355573844-&gt;C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="411.23,305.34,418.4519,298.6434,413.1996,300.7443,411.0987,295.492,411.23,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M492.5,222.29 C492.5,250.42 492.5,278.84 492.5,300.1 " fill="none" id="C_0002198686676355573844-&gt;C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="492.5,305.34,496.5,296.34,492.5,300.34,488.5,296.34,492.5,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M538.12,222.29 C550.3,250.66 562.6,279.32 571.75,300.64 " fill="none" id="C_0002198686676355573844-&gt;C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="573.77,305.34,573.9013,295.492,571.8004,300.7443,566.5481,298.6434,573.77,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M613.67,192.38 C663.67,224.55 721.88,262.85 773.5,299 C777.94,302.11 782.56,305.45 787.11,308.78 " fill="none" id="C_0002198686676355573844-&gt;C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="791.25,311.84,786.396,303.2704,787.2312,308.8652,781.6363,309.7005,791.25,311.84" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M391.06,222.29 C360.58,254.23 329.76,286.53 308.97,308.32 " fill="none" id="C_0002198686676355573844-&gt;C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="305.46,311.99,314.5716,308.2511,308.9161,308.3768,308.7904,302.7213,305.46,311.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M613.6,139.54 C701.02,163.54 813.06,210.37 868.5,299 C895.25,341.77 868.51,399.83 845.79,436.1 " fill="none" id="C_0002198686676355573844-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="843.04,440.41,851.2501,434.9699,845.7272,436.1935,844.5036,430.6705,843.04,440.41" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M371.19,164.68 C313.65,194.46 250.07,238.59 215.5,299 C191.5,340.93 194.35,398.53 199.62,435.01 " fill="none" id="C_0002198686676355573844-&gt;C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="200.42,440.24,203.0112,430.7381,199.6629,435.2976,195.1034,431.9494,200.42,440.24" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M626.37,144.32 C715.69,166.35 833.99,201.71 930.5,252 C961.36,268.08 992.3,293.31 1012.91,311.73 " fill="none" id="C_0002198686676355573844&lt;-C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="613.69,141.23,618.5761,146.5334,625.3508,144.0629,620.4647,138.7595,613.69,141.23" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="962.5" 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="60" x="969.5" y="265.0669">gintstring</text>
-    <path d="M604.06,231.79 C633.53,262.38 662.36,292.3 681.33,311.99 " fill="none" id="C_0002198686676355573844&lt;-C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="594.91,222.29,596.1866,229.3872,603.2289,230.9385,601.9523,223.8413,594.91,222.29" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="638.5" y="258.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="648.5" y="265.0669">estring</text>
+    <g id="link_C_0002304215469403389354_C_0000952770730316239752">
+      <path codeLine="71" d="M282.12,415.42 C269.14,438.82 257.7393,459.3483 243.2993,485.3883 " fill="none" id="C_0002304215469403389354-to-C_0000952770730316239752" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="234.57,501.13,248.5465,488.2981,238.052,482.4786,234.57,501.13" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000409373870621931875_C_0002198686676355573844">
+      <path codeLine="72" d="M125.7,350.11 C142.97,334.3 162.41,316.76 182,303.4 C242.42,262.2 309.4636,228.7414 370.8536,201.2614 " fill="none" id="C_0000409373870621931875-to-C_0002198686676355573844" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="376.33,198.81,366.4812,198.8362,371.7664,200.8528,369.7497,206.138,376.33,198.81" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0000409373870621931875">
+      <path codeLine="79" d="M376.39,185.42 C305.18,214.13 217.78,255.14 147,303.4 C127.41,316.76 112.0481,329.899 97.3981,345.709 " fill="none" id="C_0002198686676355573844-to-C_0000409373870621931875" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="93.32,350.11,102.3712,346.2272,96.7184,346.4425,96.5032,340.7897,93.32,350.11" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001977486318799565722_C_0000864055993755439230">
+      <path codeLine="73" d="M829,415.42 C829,438.82 829,457.09 829,483.13 " fill="none" id="C_0001977486318799565722-to-C_0000864055993755439230" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="829,501.13,835,483.13,823,483.13,829,501.13" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001526733274613822014_C_0000205927019127027617">
+      <path codeLine="74" d="M1034,415.42 C1034,436.4 1034,449.73 1034,474.75 " fill="none" id="C_0001526733274613822014-to-C_0000205927019127027617" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="1034,492.75,1040,474.75,1028,474.75,1034,492.75" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000531523220915557686_C_0000864055993755439230">
+      <path codeLine="75" d="M734.66,415.42 C753.47,438.82 771.3466,461.0575 792.2666,487.0975 " fill="none" id="C_0000531523220915557686-to-C_0000864055993755439230" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="803.54,501.13,796.9441,483.3397,787.5891,490.8553,803.54,501.13" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0000519995486237427479">
+      <path codeLine="76" d="M456.91,273.72 C444.64,305.54 434.7973,331.0612 426.2973,353.1212 " fill="none" id="C_0002198686676355573844-to-C_0000519995486237427479" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="424.14,358.72,431.1084,351.76,425.9377,354.0544,423.6434,348.8837,424.14,358.72" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0001177487653597650440">
+      <path codeLine="77" d="M508,273.72 C508,305.54 508,330.66 508,352.72 " fill="none" id="C_0002198686676355573844-to-C_0001177487653597650440" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="508,358.72,512,349.72,508,353.72,504,349.72,508,358.72" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0001028245818073128358">
+      <path codeLine="78" d="M558.56,273.72 C570.7,305.54 580.4304,331.0544 588.8504,353.1144 " fill="none" id="C_0002198686676355573844-to-C_0001028245818073128358" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="590.99,358.72,591.5177,348.8853,589.207,354.0487,584.0436,351.738,590.99,358.72" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0001977486318799565722">
+      <path codeLine="80" d="M639.71,239.63 C685.17,274.17 736.18,313.55 782,350.4 C788.5,355.63 790.814,357.491 797.274,362.941 " fill="none" id="C_0002198686676355573844-to-C_0001977486318799565722" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="801.86,366.81,797.5604,357.9492,798.0384,363.5859,792.4017,364.0639,801.86,366.81" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0002304215469403389354">
+      <path codeLine="81" d="M394.64,273.72 C363.84,309.72 337.7096,340.2701 318.8096,362.3701 " fill="none" id="C_0002198686676355573844-to-C_0002304215469403389354" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="314.91,366.93,323.7994,362.6899,318.1597,363.1301,317.7195,357.4904,314.91,366.93" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0000864055993755439230">
+      <path codeLine="82" d="M639.8,178.37 C723.54,209.58 825.37,263.38 876,350.4 C903.96,398.45 877.1902,458.0012 853.9402,496.0212 " fill="none" id="C_0002198686676355573844-to-C_0000864055993755439230" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="850.81,501.14,858.9178,495.5487,853.4185,496.8744,852.0928,491.375,850.81,501.14" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0000952770730316239752">
+      <path codeLine="83" d="M376.04,205.19 C319.57,239.87 259.12,288.44 226,350.4 C200.59,397.93 204.0593,456.838 209.8593,495.038 " fill="none" id="C_0002198686676355573844-to-C_0000952770730316239752" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="210.76,500.97,213.3637,491.4715,210.0094,496.0267,205.4543,492.6724,210.76,500.97" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0001526733274613822014">
+      <path codeLine="84" d="M651.4122,180.7622 C739.3422,208.0122 843.93,246.88 937,303.4 C965.97,320.99 994.3,347.77 1012.78,366.93 " fill="none" id="C_0002198686676355573844-backto-C_0001526733274613822014" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="639.95,177.21,644.497,182.8068,651.4122,180.7622,646.8652,175.1654,639.95,177.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="967" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="974" y="316.477">gintstring</text>
+    </g>
+    <g id="link_C_0002198686676355573844_C_0000531523220915557686">
+      <path codeLine="85" d="M626.3928,282.9298 C656.4628,318.9298 678.1,344.83 696.56,366.93 " fill="none" id="C_0002198686676355573844-backto-C_0000531523220915557686" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="618.7,273.72,619.4764,280.8892,626.3928,282.9298,625.6163,275.7607,618.7,273.72" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="658" y="309.7"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="668" y="316.477">estring</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00013_class_mermaid.svg b/docs/test_cases/t00013_class_mermaid.svg
index ad396bb6..dfd27b4b 100644
--- a/docs/test_cases/t00013_class_mermaid.svg
+++ b/docs/test_cases/t00013_class_mermaid.svg
@@ -1,70 +1,75 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1083.6953125 808" style="max-width: 1083.7px; background-color: white;" width="1083.6953125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M714.8671875,638L714.8671875,644C714.8671875,650,714.8671875,662,718.639848923841,674C722.4125103476821,686,729.9578331953643,698,733.7304946192053,704L737.5031560430464,710"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M516.4987582781457,109L515.9468818984548,113.16666666666667C515.3950055187638,117.33333333333333,514.2912527593819,125.66666666666667,513.9514204848648,134C513.6115882103478,142.33333333333334,514.0356764206955,150.66666666666666,514.2477205258693,154.83333333333334L514.4597646310433,159"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M39.953125,638L39.953125,644C39.953125,650,39.953125,662,115.8203125,679.8534047919294C191.6875,697.7068095838587,343.421875,721.4136191677175,419.2890625,733.2670239596468L495.15625,745.1204287515762"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M976.3671875,638L976.3671875,644C976.3671875,650,976.3671875,662,976.3671875,672.1666666666666C976.3671875,682.3333333333334,976.3671875,690.6666666666666,976.3671875,694.8333333333334L976.3671875,699"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M523.1875,638L523.1875,644C523.1875,650,523.1875,662,523.1875,674C523.1875,686,523.1875,698,523.1875,704L523.1875,710"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M393.625,402.5494704128877L353.62890625,424.7912253440731C313.6328125,447.03298027525847,233.640625,491.51649013762926,193.64453125,519.4249117354813C153.6484375,547.3333333333334,153.6484375,558.6666666666666,153.6484375,564.3333333333334L153.6484375,570"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M393.625,434.4820594965675L372.54296875,451.4017162471396C351.4609375,468.32137299771165,309.296875,502.1606864988558,288.21484375,524.7470099160946C267.1328125,547.3333333333334,267.1328125,558.6666666666666,267.1328125,564.3333333333334L267.1328125,570"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M403.82730763381994,502L399.88343344484997,507.6666666666667C395.93955925587994,513.3333333333334,388.05181087794,524.6666666666666,384.10793668897,536C380.1640625,547.3333333333334,380.1640625,558.6666666666666,380.1640625,564.3333333333334L380.1640625,570"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M531.9152353689567,159L532.1272794741307,154.83333333333334C532.3393235793045,150.66666666666666,532.7634117896522,142.33333333333334,532.4235795151352,134C532.0837472406181,125.66666666666667,530.9799944812362,117.33333333333333,530.4281181015452,113.16666666666667L529.8762417218543,109"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M393.625,385.5976816374042L334.6796875,410.6647346978368C275.734375,435.7317877582695,157.84375,485.8658938791347,98.8984375,518.4329469395674C39.953125,551,39.953125,566,39.953125,573.5L39.953125,581"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M652.75,469.4040961891176L663.1028645833334,480.50341349093134C673.4557291666666,491.60273079274504,694.1614583333334,513.8013653963725,704.5143229166666,532.4006826981863C714.8671875,551,714.8671875,566,714.8671875,573.5L714.8671875,581"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M603.9171608880779,502L606.5846132400649,507.6666666666667C609.252065592052,513.3333333333334,614.5869702960259,524.6666666666666,617.254422648013,542.5833333333334C619.921875,560.5,619.921875,585,619.921875,608C619.921875,631,619.921875,652.5,608.4713541666666,672.1869918699186C597.0208333333334,691.8739837398374,574.1197916666666,709.7479674796747,562.6692708333334,718.6849593495936L551.21875,727.6219512195122"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M652.75,423.3917357174008L678.9270833333334,442.1597797645007C705.1041666666666,460.92782381160055,757.4583333333334,498.46391190580033,783.6354166666666,529.4819559529002C809.8125,560.5,809.8125,585,809.8125,608C809.8125,631,809.8125,652.5,806.039838576159,669.25C802.2671771523179,686,794.7218543046357,698,790.9491928807947,704L787.1765314569536,710"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M652.75,389.25173685934453L706.6861979166666,413.7097807161204C760.6223958333334,438.16782457289634,868.4947916666666,487.08391228644814,922.4309895833334,519.0419561432241C976.3671875,551,976.3671875,566,976.3671875,573.5L976.3671875,581"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M523.1875,502L523.1875,507.6666666666667C523.1875,513.3333333333334,523.1875,524.6666666666666,523.1875,537.8333333333334C523.1875,551,523.1875,566,523.1875,573.5L523.1875,581"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M714.8671875,638L714.8671875,644C714.8671875,650,714.8671875,662,717.0429602535486,671.4603254982791C719.2187330070971,680.9206509965583,723.5702785141942,687.8413019931164,725.7460512677426,691.3016274913954L727.9218240212912,694.7619529896746"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M516.4987582781457,109L515.9468818984548,113.16666666666667C515.3950055187638,117.33333333333333,514.2912527593819,125.66666666666667,513.9005956714298,133.00129241599993C513.5099385834775,140.33591816533317,513.8323771669551,146.67183633066634,513.9935964586938,149.83979541333292L514.1548157504326,153.0077544959995"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M39.953125,638L39.953125,644C39.953125,650,39.953125,662,112.85627137394931,679.3903063109556C185.75941774789862,696.7806126219111,331.5657104957973,719.5612252438223,404.4688568697466,730.9515315547778L477.37200324369593,742.3418378657334"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M976.3671875,638L976.3671875,644C976.3671875,650,976.3671875,662,976.3671875,669.1666666666666C976.3671875,676.3333333333334,976.3671875,678.6666666666666,976.3671875,679.8333333333334L976.3671875,681"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M523.1875,638L523.1875,644C523.1875,650,523.1875,662,523.1875,671C523.1875,680,523.1875,686,523.1875,689L523.1875,692"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M390.96875,404.0266062028287L351.4153645833333,426.0221718356906C311.8619791666667,448.01773746855247,232.75520833333334,492.0088687342762,193.20182291666666,518.6711010338048C153.6484375,545.3333333333334,153.6484375,554.6666666666666,153.6484375,559.3333333333334L153.6484375,564"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M390.96875,436.61386727688785L370.3294270833333,453.1782227307399C349.6901041666667,469.7425781845919,308.4114583333333,502.87128909229597,287.7721354166667,524.1023112128147C267.1328125,545.3333333333334,267.1328125,554.6666666666666,267.1328125,559.3333333333334L267.1328125,564"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M403.82730763381994,502L399.88343344484997,507.6666666666667C395.93955925587994,513.3333333333334,388.05181087794,524.6666666666666,384.10793668897,535C380.1640625,545.3333333333334,380.1640625,554.6666666666666,380.1640625,559.3333333333334L380.1640625,564"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M531.9152353689567,159L532.1272794741307,154.83333333333334C532.3393235793045,150.66666666666666,532.7634117896522,142.33333333333334,532.5548831182064,134.99134220318743C532.3463544467604,127.64935107304154,531.505208893521,121.29870214608309,531.0846361169012,118.12337768260386L530.6640633402814,114.94805321912463"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M390.96875,386.7272771364827L332.4661458333333,411.6060642804023C273.9635416666667,436.4848514243218,156.95833333333334,486.2424257121609,98.45572916666667,517.6212128560804C39.953125,549,39.953125,562,39.953125,568.5L39.953125,575"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M655.40625,472.25186468310574L665.31640625,482.8765539025881C675.2265625,493.5012431220705,695.046875,514.7506215610352,704.95703125,531.8753107805177C714.8671875,549,714.8671875,562,714.8671875,568.5L714.8671875,575"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M603.9171608880779,502L606.5846132400649,507.6666666666667C609.252065592052,513.3333333333334,614.5869702960259,524.6666666666666,617.254422648013,542.5833333333334C619.921875,560.5,619.921875,585,619.921875,608C619.921875,631,619.921875,652.5,609.2596699501518,671.5717210145157C598.5974649003034,690.6434420290315,577.2730548006069,707.2868840580628,566.6108497507587,715.6086050725786L555.9486447009104,723.9303260870943"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M655.40625,425.29617313563017L681.140625,443.74681094635844C706.875,462.19744875708676,758.34375,499.0987243785434,784.078125,529.7993621892716C809.8125,560.5,809.8125,585,809.8125,608C809.8125,631,809.8125,652.5,806.5721347995899,668.4034418327597C803.3317695991796,684.3068836655193,796.8510391983591,694.6137673310387,793.610673997949,699.7672091637984L790.3703087975387,704.9206509965582"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M671.7995277476867,397.8899835860354L722.5608043730723,420.9083196550295C773.3220809984577,443.92665572402365,874.8446342492289,489.9633278620118,925.6059108746144,520.4816639310059C976.3671875,551,976.3671875,566,976.3671875,573.5L976.3671875,581"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M523.1875,520L523.1875,522.6666666666666C523.1875,525.3333333333334,523.1875,530.6666666666666,523.1875,540.8333333333334C523.1875,551,523.1875,566,523.1875,573.5L523.1875,581"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -234,7 +239,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L7">
+        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0000952770730316239752-0" class="node default clickable">
             <rect height="79" width="110.109375" y="-39.5" x="-55.0546875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
@@ -258,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L7">
+        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0002304215469403389354-1" class="node default clickable">
             <rect height="57" width="119.890625" y="-28.5" x="-59.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.9453125" x1="-59.9453125" class="divider"/>
@@ -277,7 +282,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L14">
+        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L14">
           <g title="A" id="classId-C_0000519995486237427479-2" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -301,7 +306,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L18">
+        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L18">
           <g title="B" id="classId-C_0001177487653597650440-3" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -325,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L22">
+        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L22">
           <g title="C" id="classId-C_0001028245818073128358-4" class="node default clickable">
             <rect height="79" width="62.578125" y="-39.5" x="-31.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.2890625" x1="-31.2890625" class="divider"/>
@@ -349,11 +354,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L28">
+        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L28">
           <g title="D" id="classId-C_0000409373870621931875-5" class="node default clickable">
-            <rect height="101" width="140.8125" y="-50.5" x="-70.40625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="70.40625" x1="-70.40625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="70.40625" x1="-70.40625" class="divider"/>
+            <rect height="101" width="149.703125" y="-50.5" x="-74.8515625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="74.8515625" x1="-74.8515625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="74.8515625" x1="-74.8515625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -365,20 +370,20 @@
                   <span class="nodeLabel">D</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.90625, -9)" height="18" width="48.484375">
+              <foreignObject transform="translate( -67.3515625, -9)" height="18" width="48.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+d : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.90625, 25)" height="18" width="125.8125">
+              <foreignObject transform="translate( -67.3515625, 25)" height="18" width="134.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+print(R * r) : void</span>
+                  <span class="nodeLabel">+print(R * r) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000864055993755439230-6" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -402,7 +407,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0000205927019127027617-7" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -431,7 +436,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33">
+        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0001977486318799565722-8" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -450,7 +455,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0001526733274613822014-9" class="node default clickable">
             <rect height="57" width="187.453125" y="-28.5" x="-93.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.7265625" x1="-93.7265625" class="divider"/>
@@ -469,7 +474,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000531523220915557686-10" class="node default clickable">
             <rect height="57" width="123.46875" y="-28.5" x="-61.734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.734375" x1="-61.734375" class="divider"/>
@@ -488,11 +493,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00013/t00013.cc#L43">
+        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L43">
           <g title="R" id="classId-C_0002198686676355573844-11" class="node default clickable">
-            <rect height="343" width="259.125" y="-171.5" x="-129.5625" class="outer title-state"/>
-            <line y2="-141.5" y1="-141.5" x2="129.5625" x1="-129.5625" class="divider"/>
-            <line y2="-81.5" y1="-81.5" x2="129.5625" x1="-129.5625" class="divider"/>
+            <rect height="343" width="264.4375" y="-171.5" x="-132.21875" class="outer title-state"/>
+            <line y2="-141.5" y1="-141.5" x2="132.21875" x1="-132.21875" class="divider"/>
+            <line y2="-81.5" y1="-81.5" x2="132.21875" x1="-132.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -504,69 +509,69 @@
                   <span class="nodeLabel">R</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, -130)" height="18" width="165.40625">
+              <foreignObject transform="translate( -124.71875, -130)" height="18" width="165.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-estring : E&lt;std::string&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, -108)" height="18" width="244.125">
+              <foreignObject transform="translate( -124.71875, -108)" height="18" width="244.125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+gintstring : G&lt;int,float,std::string&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, -74)" height="18" width="124.078125">
+              <foreignObject transform="translate( -124.71875, -74)" height="18" width="132.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_a(A * a) : int</span>
+                  <span class="nodeLabel">+get_a(A * a) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, -52)" height="18" width="129.40625">
+              <foreignObject transform="translate( -124.71875, -52)" height="18" width="138.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_b(B &amp; b) : int</span>
+                  <span class="nodeLabel">+get_b(B &amp; b) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, -30)" height="18" width="113.375">
+              <foreignObject transform="translate( -124.71875, -30)" height="18" width="122.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_c(C c) : int</span>
+                  <span class="nodeLabel">+get_c(C c) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, -8)" height="18" width="219.234375">
+              <foreignObject transform="translate( -124.71875, -8)" height="18" width="228.125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_const_b(const B &amp; b) : int</span>
+                  <span class="nodeLabel">+get_const_b(const B &amp; b) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, 14)" height="18" width="140.96875">
+              <foreignObject transform="translate( -124.71875, 14)" height="18" width="149.859375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_d(D &amp;&amp; d) : int</span>
+                  <span class="nodeLabel">+get_d(D &amp;&amp; d) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, 36)" height="18" width="149.859375">
+              <foreignObject transform="translate( -124.71875, 36)" height="18" width="158.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_d2(D &amp;&amp; d) : int</span>
+                  <span class="nodeLabel">+get_d2(D &amp;&amp; d) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, 58)" height="18" width="106.875">
+              <foreignObject transform="translate( -124.71875, 58)" height="18" width="115.765625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_e(E e) : T</span>
+                  <span class="nodeLabel">+get_e(E e) : : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, 80)" height="18" width="154.875">
+              <foreignObject transform="translate( -124.71875, 80)" height="18" width="163.765625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_f(const F &amp; f) : T</span>
+                  <span class="nodeLabel">+get_f(const F &amp; f) : : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, 102)" height="18" width="197.890625">
+              <foreignObject transform="translate( -124.71875, 102)" height="18" width="206.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_int_e(const E &amp; e) : int</span>
+                  <span class="nodeLabel">+get_int_e(const E &amp; e) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, 124)" height="18" width="164.109375">
+              <foreignObject transform="translate( -124.71875, 124)" height="18" width="173">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_int_e2(E &amp; e) : int</span>
+                  <span class="nodeLabel">+get_int_e2(E &amp; e) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -122.0625, 146)" height="18" width="240.546875">
+              <foreignObject transform="translate( -124.71875, 146)" height="18" width="249.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_int_f(const ABCD::F &amp; f) : int</span>
+                  <span class="nodeLabel">+get_int_f(const ABCD::F &amp; f) : : int</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00014.md b/docs/test_cases/t00014.md
index 05e676f5..93ed171b 100644
--- a/docs/test_cases/t00014.md
+++ b/docs/test_cases/t00014.md
@@ -18,7 +18,7 @@ diagrams:
         - direction LR
 ```
 ## Source code
-File t00014.cc
+File `tests/t00014/t00014.cc`
 ```cpp
 #include <functional>
 #include <map>
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index 7c9d4b36..60207025 100644
--- a/docs/test_cases/t00014_class.svg
+++ b/docs/test_cases/t00014_class.svg
@@ -1,426 +1,526 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1143px" preserveAspectRatio="none" style="width:1085px;height:1143px;" version="1.1" viewBox="0 0 1085 1143" width="1085px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1134px" preserveAspectRatio="none" style="width:1041px;height:1134px;background:#FFFFFF;" version="1.1" viewBox="0 0 1041 1134" width="1041px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fq9uju03u1ey9" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1009" y="589"/>
-      <ellipse cx="1024" cy="605" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1026.9688,610.6406 Q1026.3906,610.9375 1025.75,611.0781 Q1025.1094,611.2344 1024.4063,611.2344 Q1021.9063,611.2344 1020.5781,609.5938 Q1019.2656,607.9375 1019.2656,604.8125 Q1019.2656,601.6875 1020.5781,600.0313 Q1021.9063,598.375 1024.4063,598.375 Q1025.1094,598.375 1025.75,598.5313 Q1026.4063,598.6875 1026.9688,598.9844 L1026.9688,601.7031 Q1026.3438,601.125 1025.75,600.8594 Q1025.1563,600.5781 1024.5313,600.5781 Q1023.1875,600.5781 1022.5,601.6563 Q1021.8125,602.7188 1021.8125,604.8125 Q1021.8125,606.9063 1022.5,607.9844 Q1023.1875,609.0469 1024.5313,609.0469 Q1025.1563,609.0469 1025.75,608.7813 Q1026.3438,608.5 1026.9688,607.9219 L1026.9688,610.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1038" y="609.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="1054" y="586"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="1055" y="598.1387">T,P</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="621" y2="621"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="629" y2="629"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000765890579167335652">
+        <rect codeLine="3" fill="#F1F1F1" height="81.5999" id="C_0000765890579167335652" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="967" y="573.223"/>
+        <ellipse cx="982" cy="589.223" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M977,590.3793 C977,592.8793 979.1406,594.6918 982.0625,594.6918 C983.2969,594.6918 984.4688,594.3949 985.2188,593.8793 C985.8281,593.4574 986.1563,593.0355 986.1563,592.6293 C986.1563,592.1605 985.7344,591.7543 985.2344,591.7543 C985,591.7543 984.7813,591.8324 984.5781,592.0355 C984.1406,592.473 984.1406,592.473 983.9688,592.5668 C983.5156,592.8011 982.875,592.9418 982.1094,592.9418 C980.1094,592.9418 978.8281,591.9261 978.8281,590.348 L978.8281,589.3011 C978.8281,587.598 980.0469,586.3949 981.75,586.3949 C982.3281,586.3949 982.9063,586.5355 983.375,586.7855 C983.8438,587.0511 984.0156,587.2386 984.0781,587.598 C984.2031,588.2699 984.4531,588.5199 984.9844,588.5199 C985.2656,588.5199 985.5469,588.3793 985.7344,588.1605 C985.8594,587.9886 985.9063,587.8168 985.9063,587.3793 L985.9063,586.0199 C985.9063,585.598 985.8906,585.4574 985.7656,585.2855 C985.5938,585.0355 985.3125,584.8793 984.9844,584.8793 C984.6719,584.8793 984.4688,584.9886 984.25,585.2543 C983.0781,584.7543 982.6406,584.6449 981.6875,584.6449 C979.0156,584.6449 977,586.6605 977,589.2855 L977,590.3793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="996" y="593.829">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="1013" y="570.223"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="1014" y="584.4231">T,P</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="968" x2="1029" y1="605.223" y2="605.223"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="968" x2="1029" y1="613.223" y2="613.223"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="973" y="622.123"/>
+          <ellipse cx="978" cy="627.123" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="987" y="630.2289">p : P</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="973" y="638.9229"/>
+          <ellipse cx="978" cy="643.9229" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="987" y="647.0289">t : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1015" y="635"/>
-      <ellipse cx="1020" cy="640" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000934136012292043506">
+        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0000934136012292043506" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="467" y="45.623"/>
+        <ellipse cx="525.25" cy="61.623" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M520.25,62.7793 C520.25,65.2793 522.3906,67.0918 525.3125,67.0918 C526.5469,67.0918 527.7188,66.7949 528.4688,66.2793 C529.0781,65.8574 529.4063,65.4355 529.4063,65.0293 C529.4063,64.5605 528.9844,64.1543 528.4844,64.1543 C528.25,64.1543 528.0313,64.2324 527.8281,64.4355 C527.3906,64.873 527.3906,64.873 527.2188,64.9668 C526.7656,65.2011 526.125,65.3418 525.3594,65.3418 C523.3594,65.3418 522.0781,64.3261 522.0781,62.748 L522.0781,61.7011 C522.0781,59.998 523.2969,58.7949 525,58.7949 C525.5781,58.7949 526.1563,58.9355 526.625,59.1855 C527.0938,59.4511 527.2656,59.6386 527.3281,59.998 C527.4531,60.6699 527.7031,60.9199 528.2344,60.9199 C528.5156,60.9199 528.7969,60.7793 528.9844,60.5605 C529.1094,60.3886 529.1563,60.2168 529.1563,59.7793 L529.1563,58.4199 C529.1563,57.998 529.1406,57.8574 529.0156,57.6855 C528.8438,57.4355 528.5625,57.2793 528.2344,57.2793 C527.9219,57.2793 527.7188,57.3886 527.5,57.6543 C526.3281,57.1543 525.8906,57.0449 524.9375,57.0449 C522.2656,57.0449 520.25,59.0605 520.25,61.6855 L520.25,62.7793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="545.75" y="66.229">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="468" x2="600" y1="77.623" y2="77.623"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="468" x2="600" y1="85.623" y2="85.623"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="473" y="94.523"/>
+          <ellipse cx="478" cy="99.523" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="487" y="102.6289">value : std::string</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="1029" y="643.2104">p : P</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002186387853087008570">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0002186387853087008570" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="751.5" y="870.023"/>
+        <ellipse cx="766.5" cy="886.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M761.5,887.1793 C761.5,889.6793 763.6406,891.4918 766.5625,891.4918 C767.7969,891.4918 768.9688,891.1949 769.7188,890.6793 C770.3281,890.2574 770.6563,889.8355 770.6563,889.4293 C770.6563,888.9605 770.2344,888.5543 769.7344,888.5543 C769.5,888.5543 769.2813,888.6324 769.0781,888.8355 C768.6406,889.273 768.6406,889.273 768.4688,889.3668 C768.0156,889.6011 767.375,889.7418 766.6094,889.7418 C764.6094,889.7418 763.3281,888.7261 763.3281,887.148 L763.3281,886.1011 C763.3281,884.398 764.5469,883.1949 766.25,883.1949 C766.8281,883.1949 767.4063,883.3355 767.875,883.5855 C768.3438,883.8511 768.5156,884.0386 768.5781,884.398 C768.7031,885.0699 768.9531,885.3199 769.4844,885.3199 C769.7656,885.3199 770.0469,885.1793 770.2344,884.9605 C770.3594,884.7886 770.4063,884.6168 770.4063,884.1793 L770.4063,882.8199 C770.4063,882.398 770.3906,882.2574 770.2656,882.0855 C770.0938,881.8355 769.8125,881.6793 769.4844,881.6793 C769.1719,881.6793 768.9688,881.7886 768.75,882.0543 C767.5781,881.5543 767.1406,881.4449 766.1875,881.4449 C763.5156,881.4449 761.5,883.4605 761.5,886.0855 L761.5,887.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="780.5" y="890.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="64" x="797.5" y="867.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="62" x="798.5" y="881.2231">T,std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="752.5" x2="857.5" y1="902.023" y2="902.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="752.5" x2="857.5" y1="910.023" y2="910.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1015" y="647.8047"/>
-      <ellipse cx="1020" cy="652.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000947292733740993297">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000947292733740993297" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="202" x="704" y="651.023"/>
+        <ellipse cx="719" cy="667.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M714,668.1793 C714,670.6793 716.1406,672.4918 719.0625,672.4918 C720.2969,672.4918 721.4688,672.1949 722.2188,671.6793 C722.8281,671.2574 723.1563,670.8355 723.1563,670.4293 C723.1563,669.9605 722.7344,669.5543 722.2344,669.5543 C722,669.5543 721.7813,669.6324 721.5781,669.8355 C721.1406,670.273 721.1406,670.273 720.9688,670.3668 C720.5156,670.6011 719.875,670.7418 719.1094,670.7418 C717.1094,670.7418 715.8281,669.7261 715.8281,668.148 L715.8281,667.1011 C715.8281,665.398 717.0469,664.1949 718.75,664.1949 C719.3281,664.1949 719.9063,664.3355 720.375,664.5855 C720.8438,664.8511 721.0156,665.0386 721.0781,665.398 C721.2031,666.0699 721.4531,666.3199 721.9844,666.3199 C722.2656,666.3199 722.5469,666.1793 722.7344,665.9605 C722.8594,665.7886 722.9063,665.6168 722.9063,665.1793 L722.9063,663.8199 C722.9063,663.398 722.8906,663.2574 722.7656,663.0855 C722.5938,662.8355 722.3125,662.6793 721.9844,662.6793 C721.6719,662.6793 721.4688,662.7886 721.25,663.0543 C720.0781,662.5543 719.6406,662.4449 718.6875,662.4449 C716.0156,662.4449 714,664.4605 714,667.0855 L714,668.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="733" y="671.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="159" x="750" y="648.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="157" x="751" y="662.2231">T,std::unique_ptr&lt;std::string&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="705" x2="905" y1="683.023" y2="683.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="705" x2="905" y1="691.023" y2="691.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="1029" y="656.0151">t : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001700006390494465667">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001700006390494465667" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="79" x="765.5" y="524.023"/>
+        <ellipse cx="780.5" cy="540.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M775.5,541.1793 C775.5,543.6793 777.6406,545.4918 780.5625,545.4918 C781.7969,545.4918 782.9688,545.1949 783.7188,544.6793 C784.3281,544.2574 784.6563,543.8355 784.6563,543.4293 C784.6563,542.9605 784.2344,542.5543 783.7344,542.5543 C783.5,542.5543 783.2813,542.6324 783.0781,542.8355 C782.6406,543.273 782.6406,543.273 782.4688,543.3668 C782.0156,543.6011 781.375,543.7418 780.6094,543.7418 C778.6094,543.7418 777.3281,542.7261 777.3281,541.148 L777.3281,540.1011 C777.3281,538.398 778.5469,537.1949 780.25,537.1949 C780.8281,537.1949 781.4063,537.3355 781.875,537.5855 C782.3438,537.8511 782.5156,538.0386 782.5781,538.398 C782.7031,539.0699 782.9531,539.3199 783.4844,539.3199 C783.7656,539.3199 784.0469,539.1793 784.2344,538.9605 C784.3594,538.7886 784.4063,538.6168 784.4063,538.1793 L784.4063,536.8199 C784.4063,536.398 784.3906,536.2574 784.2656,536.0855 C784.0938,535.8355 783.8125,535.6793 783.4844,535.6793 C783.1719,535.6793 782.9688,535.7886 782.75,536.0543 C781.5781,535.5543 781.1406,535.4449 780.1875,535.4449 C777.5156,535.4449 775.5,537.4605 775.5,540.0855 L775.5,541.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="794.5" y="544.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="36" x="811.5" y="521.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="34" x="812.5" y="535.2231">long,T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="766.5" x2="843.5" y1="556.023" y2="556.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="766.5" x2="843.5" y1="564.023" y2="564.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="466.5" y="51.5"/>
-      <ellipse cx="521.75" cy="67.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M524.7188,73.1406 Q524.1406,73.4375 523.5,73.5781 Q522.8594,73.7344 522.1563,73.7344 Q519.6563,73.7344 518.3281,72.0938 Q517.0156,70.4375 517.0156,67.3125 Q517.0156,64.1875 518.3281,62.5313 Q519.6563,60.875 522.1563,60.875 Q522.8594,60.875 523.5,61.0313 Q524.1563,61.1875 524.7188,61.4844 L524.7188,64.2031 Q524.0938,63.625 523.5,63.3594 Q522.9063,63.0781 522.2813,63.0781 Q520.9375,63.0781 520.25,64.1563 Q519.5625,65.2188 519.5625,67.3125 Q519.5625,69.4063 520.25,70.4844 Q520.9375,71.5469 522.2813,71.5469 Q522.9063,71.5469 523.5,71.2813 Q524.0938,71 524.7188,70.4219 L524.7188,73.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.25" y="71.6543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="83.5" y2="83.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="91.5" y2="91.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002017665567517853203">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0002017665567517853203" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="758.5" y="270.023"/>
+        <ellipse cx="773.5" cy="286.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M768.5,287.1793 C768.5,289.6793 770.6406,291.4918 773.5625,291.4918 C774.7969,291.4918 775.9688,291.1949 776.7188,290.6793 C777.3281,290.2574 777.6563,289.8355 777.6563,289.4293 C777.6563,288.9605 777.2344,288.5543 776.7344,288.5543 C776.5,288.5543 776.2813,288.6324 776.0781,288.8355 C775.6406,289.273 775.6406,289.273 775.4688,289.3668 C775.0156,289.6011 774.375,289.7418 773.6094,289.7418 C771.6094,289.7418 770.3281,288.7261 770.3281,287.148 L770.3281,286.1011 C770.3281,284.398 771.5469,283.1949 773.25,283.1949 C773.8281,283.1949 774.4063,283.3355 774.875,283.5855 C775.3438,283.8511 775.5156,284.0386 775.5781,284.398 C775.7031,285.0699 775.9531,285.3199 776.4844,285.3199 C776.7656,285.3199 777.0469,285.1793 777.2344,284.9605 C777.3594,284.7886 777.4063,284.6168 777.4063,284.1793 L777.4063,282.8199 C777.4063,282.398 777.3906,282.2574 777.2656,282.0855 C777.0938,281.8355 776.8125,281.6793 776.4844,281.6793 C776.1719,281.6793 775.9688,281.7886 775.75,282.0543 C774.5781,281.5543 774.1406,281.4449 773.1875,281.4449 C770.5156,281.4449 768.5,283.4605 768.5,286.0855 L768.5,287.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="787.5" y="290.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="50" x="804.5" y="267.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="805.5" y="281.2231">double,T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="759.5" x2="850.5" y1="302.023" y2="302.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="759.5" x2="850.5" y1="310.023" y2="310.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="472.5" y="97.5"/>
-      <ellipse cx="477.5" cy="102.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000906557320263235873">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000906557320263235873" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="493.5" y="581.023"/>
+        <ellipse cx="508.5" cy="597.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M503.5,598.1793 C503.5,600.6793 505.6406,602.4918 508.5625,602.4918 C509.7969,602.4918 510.9688,602.1949 511.7188,601.6793 C512.3281,601.2574 512.6563,600.8355 512.6563,600.4293 C512.6563,599.9605 512.2344,599.5543 511.7344,599.5543 C511.5,599.5543 511.2813,599.6324 511.0781,599.8355 C510.6406,600.273 510.6406,600.273 510.4688,600.3668 C510.0156,600.6011 509.375,600.7418 508.6094,600.7418 C506.6094,600.7418 505.3281,599.7261 505.3281,598.148 L505.3281,597.1011 C505.3281,595.398 506.5469,594.1949 508.25,594.1949 C508.8281,594.1949 509.4063,594.3355 509.875,594.5855 C510.3438,594.8511 510.5156,595.0386 510.5781,595.398 C510.7031,596.0699 510.9531,596.3199 511.4844,596.3199 C511.7656,596.3199 512.0469,596.1793 512.2344,595.9605 C512.3594,595.7886 512.4063,595.6168 512.4063,595.1793 L512.4063,593.8199 C512.4063,593.398 512.3906,593.2574 512.2656,593.0855 C512.0938,592.8355 511.8125,592.6793 511.4844,592.6793 C511.1719,592.6793 510.9688,592.7886 510.75,593.0543 C509.5781,592.5543 509.1406,592.4449 508.1875,592.4449 C505.5156,592.4449 503.5,594.4605 503.5,597.0855 L503.5,598.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="522.5" y="601.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="38" x="539.5" y="578.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="36" x="540.5" y="592.2231">long,U</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="494.5" x2="573.5" y1="613.023" y2="613.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="494.5" x2="573.5" y1="621.023" y2="621.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="486.5" y="105.7104">value : std::string</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000378898020828430636">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000378898020828430636" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="96" x="486" y="498.023"/>
+        <ellipse cx="501" cy="514.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M496,515.1793 C496,517.6793 498.1406,519.4918 501.0625,519.4918 C502.2969,519.4918 503.4688,519.1949 504.2188,518.6793 C504.8281,518.2574 505.1563,517.8355 505.1563,517.4293 C505.1563,516.9605 504.7344,516.5543 504.2344,516.5543 C504,516.5543 503.7813,516.6324 503.5781,516.8355 C503.1406,517.273 503.1406,517.273 502.9688,517.3668 C502.5156,517.6011 501.875,517.7418 501.1094,517.7418 C499.1094,517.7418 497.8281,516.7261 497.8281,515.148 L497.8281,514.1011 C497.8281,512.398 499.0469,511.1949 500.75,511.1949 C501.3281,511.1949 501.9063,511.3355 502.375,511.5855 C502.8438,511.8511 503.0156,512.0386 503.0781,512.398 C503.2031,513.0699 503.4531,513.3199 503.9844,513.3199 C504.2656,513.3199 504.5469,513.1793 504.7344,512.9605 C504.8594,512.7886 504.9063,512.6168 504.9063,512.1793 L504.9063,510.8199 C504.9063,510.398 504.8906,510.2574 504.7656,510.0855 C504.5938,509.8355 504.3125,509.6793 503.9844,509.6793 C503.6719,509.6793 503.4688,509.7886 503.25,510.0543 C502.0781,509.5543 501.6406,509.4449 500.6875,509.4449 C498.0156,509.4449 496,511.4605 496,514.0855 L496,515.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="515" y="518.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="53" x="532" y="495.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="51" x="533" y="509.2231">long,bool</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="487" x2="581" y1="530.023" y2="530.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="487" x2="581" y1="538.023" y2="538.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="774" y="870"/>
-      <ellipse cx="789" cy="886" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M791.9688,891.6406 Q791.3906,891.9375 790.75,892.0781 Q790.1094,892.2344 789.4063,892.2344 Q786.9063,892.2344 785.5781,890.5938 Q784.2656,888.9375 784.2656,885.8125 Q784.2656,882.6875 785.5781,881.0313 Q786.9063,879.375 789.4063,879.375 Q790.1094,879.375 790.75,879.5313 Q791.4063,879.6875 791.9688,879.9844 L791.9688,882.7031 Q791.3438,882.125 790.75,881.8594 Q790.1563,881.5781 789.5313,881.5781 Q788.1875,881.5781 787.5,882.6563 Q786.8125,883.7188 786.8125,885.8125 Q786.8125,887.9063 787.5,888.9844 Q788.1875,890.0469 789.5313,890.0469 Q790.1563,890.0469 790.75,889.7813 Q791.3438,889.5 791.9688,888.9219 L791.9688,891.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="803" y="890.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="819" y="867"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="820" y="879.1387">T,std::string</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="902" y2="902"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="910" y2="910"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002082013375525130414">
+        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0002082013375525130414" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="479" y="249.023"/>
+        <ellipse cx="494" cy="265.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M489,266.1793 C489,268.6793 491.1406,270.4918 494.0625,270.4918 C495.2969,270.4918 496.4688,270.1949 497.2188,269.6793 C497.8281,269.2574 498.1563,268.8355 498.1563,268.4293 C498.1563,267.9605 497.7344,267.5543 497.2344,267.5543 C497,267.5543 496.7813,267.6324 496.5781,267.8355 C496.1406,268.273 496.1406,268.273 495.9688,268.3668 C495.5156,268.6011 494.875,268.7418 494.1094,268.7418 C492.1094,268.7418 490.8281,267.7261 490.8281,266.148 L490.8281,265.1011 C490.8281,263.398 492.0469,262.1949 493.75,262.1949 C494.3281,262.1949 494.9063,262.3355 495.375,262.5855 C495.8438,262.8511 496.0156,263.0386 496.0781,263.398 C496.2031,264.0699 496.4531,264.3199 496.9844,264.3199 C497.2656,264.3199 497.5469,264.1793 497.7344,263.9605 C497.8594,263.7886 497.9063,263.6168 497.9063,263.1793 L497.9063,261.8199 C497.9063,261.398 497.8906,261.2574 497.7656,261.0855 C497.5938,260.8355 497.3125,260.6793 496.9844,260.6793 C496.6719,260.6793 496.4688,260.7886 496.25,261.0543 C495.0781,260.5543 494.6406,260.4449 493.6875,260.4449 C491.0156,260.4449 489,262.4605 489,265.0855 L489,266.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="508" y="269.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="67" x="525" y="246.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="65" x="526" y="260.2231">double,bool</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="480" x2="588" y1="281.023" y2="281.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="480" x2="588" y1="289.023" y2="289.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="717" y="653"/>
-      <ellipse cx="732" cy="669" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M734.9688,674.6406 Q734.3906,674.9375 733.75,675.0781 Q733.1094,675.2344 732.4063,675.2344 Q729.9063,675.2344 728.5781,673.5938 Q727.2656,671.9375 727.2656,668.8125 Q727.2656,665.6875 728.5781,664.0313 Q729.9063,662.375 732.4063,662.375 Q733.1094,662.375 733.75,662.5313 Q734.4063,662.6875 734.9688,662.9844 L734.9688,665.7031 Q734.3438,665.125 733.75,664.8594 Q733.1563,664.5781 732.5313,664.5781 Q731.1875,664.5781 730.5,665.6563 Q729.8125,666.7188 729.8125,668.8125 Q729.8125,670.9063 730.5,671.9844 Q731.1875,673.0469 732.5313,673.0469 Q733.1563,673.0469 733.75,672.7813 Q734.3438,672.5 734.9688,671.9219 L734.9688,674.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="746" y="673.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="189" x="762" y="650"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="187" x="763" y="662.1387">T,std::unique_ptr&lt;std::string&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="685" y2="685"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="693" y2="693"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000051978493292659230">
+        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0000051978493292659230" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="95" x="486.5" y="415.023"/>
+        <ellipse cx="501.5" cy="431.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M496.5,432.1793 C496.5,434.6793 498.6406,436.4918 501.5625,436.4918 C502.7969,436.4918 503.9688,436.1949 504.7188,435.6793 C505.3281,435.2574 505.6563,434.8355 505.6563,434.4293 C505.6563,433.9605 505.2344,433.5543 504.7344,433.5543 C504.5,433.5543 504.2813,433.6324 504.0781,433.8355 C503.6406,434.273 503.6406,434.273 503.4688,434.3668 C503.0156,434.6011 502.375,434.7418 501.6094,434.7418 C499.6094,434.7418 498.3281,433.7261 498.3281,432.148 L498.3281,431.1011 C498.3281,429.398 499.5469,428.1949 501.25,428.1949 C501.8281,428.1949 502.4063,428.3355 502.875,428.5855 C503.3438,428.8511 503.5156,429.0386 503.5781,429.398 C503.7031,430.0699 503.9531,430.3199 504.4844,430.3199 C504.7656,430.3199 505.0469,430.1793 505.2344,429.9605 C505.3594,429.7886 505.4063,429.6168 505.4063,429.1793 L505.4063,427.8199 C505.4063,427.398 505.3906,427.2574 505.2656,427.0855 C505.0938,426.8355 504.8125,426.6793 504.4844,426.6793 C504.1719,426.6793 503.9688,426.7886 503.75,427.0543 C502.5781,426.5543 502.1406,426.4449 501.1875,426.4449 C498.5156,426.4449 496.5,428.4605 496.5,431.0855 L496.5,432.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="515.5" y="435.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="52" x="532.5" y="412.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="50" x="533.5" y="426.2231">long,float</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="487.5" x2="580.5" y1="447.023" y2="447.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="487.5" x2="580.5" y1="455.023" y2="455.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="791.5" y="529"/>
-      <ellipse cx="806.5" cy="545" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M809.4688,550.6406 Q808.8906,550.9375 808.25,551.0781 Q807.6094,551.2344 806.9063,551.2344 Q804.4063,551.2344 803.0781,549.5938 Q801.7656,547.9375 801.7656,544.8125 Q801.7656,541.6875 803.0781,540.0313 Q804.4063,538.375 806.9063,538.375 Q807.6094,538.375 808.25,538.5313 Q808.9063,538.6875 809.4688,538.9844 L809.4688,541.7031 Q808.8438,541.125 808.25,540.8594 Q807.6563,540.5781 807.0313,540.5781 Q805.6875,540.5781 805,541.6563 Q804.3125,542.7188 804.3125,544.8125 Q804.3125,546.9063 805,547.9844 Q805.6875,549.0469 807.0313,549.0469 Q807.6563,549.0469 808.25,548.7813 Q808.8438,548.5 809.4688,547.9219 L809.4688,550.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="549.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="40" x="836.5" y="526"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="837.5" y="538.1387">long,T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="561" y2="561"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="569" y2="569"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000197769253782961588">
+        <rect codeLine="46" fill="#F1F1F1" height="48" id="C_0000197769253782961588" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="479.5" y="332.023"/>
+        <ellipse cx="494.5" cy="348.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M489.5,349.1793 C489.5,351.6793 491.6406,353.4918 494.5625,353.4918 C495.7969,353.4918 496.9688,353.1949 497.7188,352.6793 C498.3281,352.2574 498.6563,351.8355 498.6563,351.4293 C498.6563,350.9605 498.2344,350.5543 497.7344,350.5543 C497.5,350.5543 497.2813,350.6324 497.0781,350.8355 C496.6406,351.273 496.6406,351.273 496.4688,351.3668 C496.0156,351.6011 495.375,351.7418 494.6094,351.7418 C492.6094,351.7418 491.3281,350.7261 491.3281,349.148 L491.3281,348.1011 C491.3281,346.398 492.5469,345.1949 494.25,345.1949 C494.8281,345.1949 495.4063,345.3355 495.875,345.5855 C496.3438,345.8511 496.5156,346.0386 496.5781,346.398 C496.7031,347.0699 496.9531,347.3199 497.4844,347.3199 C497.7656,347.3199 498.0469,347.1793 498.2344,346.9605 C498.3594,346.7886 498.4063,346.6168 498.4063,346.1793 L498.4063,344.8199 C498.4063,344.398 498.3906,344.2574 498.2656,344.0855 C498.0938,343.8355 497.8125,343.6793 497.4844,343.6793 C497.1719,343.6793 496.9688,343.7886 496.75,344.0543 C495.5781,343.5543 495.1406,343.4449 494.1875,343.4449 C491.5156,343.4449 489.5,345.4605 489.5,348.0855 L489.5,349.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="508.5" y="352.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="66" x="525.5" y="329.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="64" x="526.5" y="343.2231">double,float</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="480.5" x2="587.5" y1="364.023" y2="364.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="480.5" x2="587.5" y1="372.023" y2="372.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="783.5" y="295"/>
-      <ellipse cx="798.5" cy="311" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M801.4688,316.6406 Q800.8906,316.9375 800.25,317.0781 Q799.6094,317.2344 798.9063,317.2344 Q796.4063,317.2344 795.0781,315.5938 Q793.7656,313.9375 793.7656,310.8125 Q793.7656,307.6875 795.0781,306.0313 Q796.4063,304.375 798.9063,304.375 Q799.6094,304.375 800.25,304.5313 Q800.9063,304.6875 801.4688,304.9844 L801.4688,307.7031 Q800.8438,307.125 800.25,306.8594 Q799.6563,306.5781 799.0313,306.5781 Q797.6875,306.5781 797,307.6563 Q796.3125,308.7188 796.3125,310.8125 Q796.3125,312.9063 797,313.9844 Q797.6875,315.0469 799.0313,315.0469 Q799.6563,315.0469 800.25,314.7813 Q800.8438,314.5 801.4688,313.9219 L801.4688,316.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.5" y="315.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="56" x="828.5" y="292"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="829.5" y="304.1387">double,T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="327" y2="327"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="335" y2="335"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000895940711566401184">
+        <rect codeLine="50" fill="#F1F1F1" height="48" id="C_0000895940711566401184" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="472" y="747.023"/>
+        <ellipse cx="487" cy="763.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M482,764.1793 C482,766.6793 484.1406,768.4918 487.0625,768.4918 C488.2969,768.4918 489.4688,768.1949 490.2188,767.6793 C490.8281,767.2574 491.1563,766.8355 491.1563,766.4293 C491.1563,765.9605 490.7344,765.5543 490.2344,765.5543 C490,765.5543 489.7813,765.6324 489.5781,765.8355 C489.1406,766.273 489.1406,766.273 488.9688,766.3668 C488.5156,766.6011 487.875,766.7418 487.1094,766.7418 C485.1094,766.7418 483.8281,765.7261 483.8281,764.148 L483.8281,763.1011 C483.8281,761.398 485.0469,760.1949 486.75,760.1949 C487.3281,760.1949 487.9063,760.3355 488.375,760.5855 C488.8438,760.8511 489.0156,761.0386 489.0781,761.398 C489.2031,762.0699 489.4531,762.3199 489.9844,762.3199 C490.2656,762.3199 490.5469,762.1793 490.7344,761.9605 C490.8594,761.7886 490.9063,761.6168 490.9063,761.1793 L490.9063,759.8199 C490.9063,759.398 490.8906,759.2574 490.7656,759.0855 C490.5938,758.8355 490.3125,758.6793 489.9844,758.6793 C489.6719,758.6793 489.4688,758.7886 489.25,759.0543 C488.0781,758.5543 487.6406,758.4449 486.6875,758.4449 C484.0156,758.4449 482,760.4605 482,763.0855 L482,764.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="501" y="767.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="81" x="518" y="744.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="519" y="758.2231">bool,std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="473" x2="595" y1="779.023" y2="779.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="473" x2="595" y1="787.023" y2="787.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="488" y="585"/>
-      <ellipse cx="503" cy="601" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M505.9688,606.6406 Q505.3906,606.9375 504.75,607.0781 Q504.1094,607.2344 503.4063,607.2344 Q500.9063,607.2344 499.5781,605.5938 Q498.2656,603.9375 498.2656,600.8125 Q498.2656,597.6875 499.5781,596.0313 Q500.9063,594.375 503.4063,594.375 Q504.1094,594.375 504.75,594.5313 Q505.4063,594.6875 505.9688,594.9844 L505.9688,597.7031 Q505.3438,597.125 504.75,596.8594 Q504.1563,596.5781 503.5313,596.5781 Q502.1875,596.5781 501.5,597.6563 Q500.8125,598.7188 500.8125,600.8125 Q500.8125,602.9063 501.5,603.9844 Q502.1875,605.0469 503.5313,605.0469 Q504.1563,605.0469 504.75,604.7813 Q505.3438,604.5 505.9688,603.9219 L505.9688,606.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="517" y="605.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="42" x="533" y="582"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="534" y="594.1387">long,U</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="617" y2="617"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="625" y2="625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001751732625010742161">
+        <rect codeLine="54" fill="#F1F1F1" height="48" id="C_0001751732625010742161" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="218" x="425" y="664.023"/>
+        <ellipse cx="440" cy="680.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M435,681.1793 C435,683.6793 437.1406,685.4918 440.0625,685.4918 C441.2969,685.4918 442.4688,685.1949 443.2188,684.6793 C443.8281,684.2574 444.1563,683.8355 444.1563,683.4293 C444.1563,682.9605 443.7344,682.5543 443.2344,682.5543 C443,682.5543 442.7813,682.6324 442.5781,682.8355 C442.1406,683.273 442.1406,683.273 441.9688,683.3668 C441.5156,683.6011 440.875,683.7418 440.1094,683.7418 C438.1094,683.7418 436.8281,682.7261 436.8281,681.148 L436.8281,680.1011 C436.8281,678.398 438.0469,677.1949 439.75,677.1949 C440.3281,677.1949 440.9063,677.3355 441.375,677.5855 C441.8438,677.8511 442.0156,678.0386 442.0781,678.398 C442.2031,679.0699 442.4531,679.3199 442.9844,679.3199 C443.2656,679.3199 443.5469,679.1793 443.7344,678.9605 C443.8594,678.7886 443.9063,678.6168 443.9063,678.1793 L443.9063,676.8199 C443.9063,676.398 443.8906,676.2574 443.7656,676.0855 C443.5938,675.8355 443.3125,675.6793 442.9844,675.6793 C442.6719,675.6793 442.4688,675.7886 442.25,676.0543 C441.0781,675.5543 440.6406,675.4449 439.6875,675.4449 C437.0156,675.4449 435,677.4605 435,680.0855 L435,681.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="454" y="684.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="175" x="471" y="661.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="173" x="472" y="675.2231">float,std::unique_ptr&lt;std::string&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="426" x2="642" y1="696.023" y2="696.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="426" x2="642" y1="704.023" y2="704.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="479" y="502"/>
-      <ellipse cx="494" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M496.9688,523.6406 Q496.3906,523.9375 495.75,524.0781 Q495.1094,524.2344 494.4063,524.2344 Q491.9063,524.2344 490.5781,522.5938 Q489.2656,520.9375 489.2656,517.8125 Q489.2656,514.6875 490.5781,513.0313 Q491.9063,511.375 494.4063,511.375 Q495.1094,511.375 495.75,511.5313 Q496.4063,511.6875 496.9688,511.9844 L496.9688,514.7031 Q496.3438,514.125 495.75,513.8594 Q495.1563,513.5781 494.5313,513.5781 Q493.1875,513.5781 492.5,514.6563 Q491.8125,515.7188 491.8125,517.8125 Q491.8125,519.9063 492.5,520.9844 Q493.1875,522.0469 494.5313,522.0469 Q495.1563,522.0469 495.75,521.7813 Q496.3438,521.5 496.9688,520.9219 L496.9688,523.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508" 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="60" x="524" y="499"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="58" x="525" y="511.1387">long,bool</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="534" y2="534"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="542" y2="542"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000887121441210847583">
+        <rect codeLine="58" fill="#F1F1F1" height="48" id="C_0000887121441210847583" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="477.5" y="913.023"/>
+        <ellipse cx="492.5" cy="929.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M487.5,930.1793 C487.5,932.6793 489.6406,934.4918 492.5625,934.4918 C493.7969,934.4918 494.9688,934.1949 495.7188,933.6793 C496.3281,933.2574 496.6563,932.8355 496.6563,932.4293 C496.6563,931.9605 496.2344,931.5543 495.7344,931.5543 C495.5,931.5543 495.2813,931.6324 495.0781,931.8355 C494.6406,932.273 494.6406,932.273 494.4688,932.3668 C494.0156,932.6011 493.375,932.7418 492.6094,932.7418 C490.6094,932.7418 489.3281,931.7261 489.3281,930.148 L489.3281,929.1011 C489.3281,927.398 490.5469,926.1949 492.25,926.1949 C492.8281,926.1949 493.4063,926.3355 493.875,926.5855 C494.3438,926.8511 494.5156,927.0386 494.5781,927.398 C494.7031,928.0699 494.9531,928.3199 495.4844,928.3199 C495.7656,928.3199 496.0469,928.1793 496.2344,927.9605 C496.3594,927.7886 496.4063,927.6168 496.4063,927.1793 L496.4063,925.8199 C496.4063,925.398 496.3906,925.2574 496.2656,925.0855 C496.0938,924.8355 495.8125,924.6793 495.4844,924.6793 C495.1719,924.6793 494.9688,924.7886 494.75,925.0543 C493.5781,924.5543 493.1406,924.4449 492.1875,924.4449 C489.5156,924.4449 487.5,926.4605 487.5,929.0855 L487.5,930.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="506.5" y="933.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="70" x="523.5" y="910.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="68" x="524.5" y="924.2231">int,std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="589.5" y1="945.023" y2="945.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="589.5" y1="953.023" y2="953.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="471" y="253"/>
-      <ellipse cx="486" cy="269" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M488.9688,274.6406 Q488.3906,274.9375 487.75,275.0781 Q487.1094,275.2344 486.4063,275.2344 Q483.9063,275.2344 482.5781,273.5938 Q481.2656,271.9375 481.2656,268.8125 Q481.2656,265.6875 482.5781,264.0313 Q483.9063,262.375 486.4063,262.375 Q487.1094,262.375 487.75,262.5313 Q488.4063,262.6875 488.9688,262.9844 L488.9688,265.7031 Q488.3438,265.125 487.75,264.8594 Q487.1563,264.5781 486.5313,264.5781 Q485.1875,264.5781 484.5,265.6563 Q483.8125,266.7188 483.8125,268.8125 Q483.8125,270.9063 484.5,271.9844 Q485.1875,273.0469 486.5313,273.0469 Q487.1563,273.0469 487.75,272.7813 Q488.3438,272.5 488.9688,271.9219 L488.9688,274.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="500" y="273.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="76" x="516" y="250"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="74" x="517" y="262.1387">double,bool</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="285" y2="285"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="293" y2="293"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001119452495635561975">
+        <rect codeLine="62" fill="#F1F1F1" height="48" id="C_0001119452495635561975" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="152" x="458" y="996.023"/>
+        <ellipse cx="473" cy="1012.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M468,1013.1793 C468,1015.6793 470.1406,1017.4918 473.0625,1017.4918 C474.2969,1017.4918 475.4688,1017.1949 476.2188,1016.6793 C476.8281,1016.2574 477.1563,1015.8355 477.1563,1015.4293 C477.1563,1014.9605 476.7344,1014.5543 476.2344,1014.5543 C476,1014.5543 475.7813,1014.6324 475.5781,1014.8355 C475.1406,1015.273 475.1406,1015.273 474.9688,1015.3668 C474.5156,1015.6011 473.875,1015.7418 473.1094,1015.7418 C471.1094,1015.7418 469.8281,1014.7261 469.8281,1013.148 L469.8281,1012.1011 C469.8281,1010.398 471.0469,1009.1949 472.75,1009.1949 C473.3281,1009.1949 473.9063,1009.3355 474.375,1009.5855 C474.8438,1009.8511 475.0156,1010.0386 475.0781,1010.398 C475.2031,1011.0699 475.4531,1011.3199 475.9844,1011.3199 C476.2656,1011.3199 476.5469,1011.1793 476.7344,1010.9605 C476.8594,1010.7886 476.9063,1010.6168 476.9063,1010.1793 L476.9063,1008.8199 C476.9063,1008.398 476.8906,1008.2574 476.7656,1008.0855 C476.5938,1007.8355 476.3125,1007.6793 475.9844,1007.6793 C475.6719,1007.6793 475.4688,1007.7886 475.25,1008.0543 C474.0781,1007.5543 473.6406,1007.4449 472.6875,1007.4449 C470.0156,1007.4449 468,1009.4605 468,1012.0855 L468,1013.1793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="487" y="1016.629">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="109" x="504" y="993.023"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="107" x="505" y="1007.2231">std::string,std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="459" x2="609" y1="1028.023" y2="1028.023"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="459" x2="609" y1="1036.023" y2="1036.023"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="478.5" y="419"/>
-      <ellipse cx="493.5" cy="435" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M496.4688,440.6406 Q495.8906,440.9375 495.25,441.0781 Q494.6094,441.2344 493.9063,441.2344 Q491.4063,441.2344 490.0781,439.5938 Q488.7656,437.9375 488.7656,434.8125 Q488.7656,431.6875 490.0781,430.0313 Q491.4063,428.375 493.9063,428.375 Q494.6094,428.375 495.25,428.5313 Q495.9063,428.6875 496.4688,428.9844 L496.4688,431.7031 Q495.8438,431.125 495.25,430.8594 Q494.6563,430.5781 494.0313,430.5781 Q492.6875,430.5781 492,431.6563 Q491.3125,432.7188 491.3125,434.8125 Q491.3125,436.9063 492,437.9844 Q492.6875,439.0469 494.0313,439.0469 Q494.6563,439.0469 495.25,438.7813 Q495.8438,438.5 496.4688,437.9219 L496.4688,440.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="507.5" y="439.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="61" x="523.5" y="416"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="524.5" y="428.1387">long,float</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="451" y2="451"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="459" y2="459"/>
+    <g id="elem_C_0000340562099063642390">
+      <rect codeLine="66" fill="#F1F1F1" height="48" id="C_0000340562099063642390" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="472" y="1079.023"/>
+      <ellipse cx="487" cy="1095.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+      <path d="M482,1096.1793 C482,1098.6793 484.1406,1100.4918 487.0625,1100.4918 C488.2969,1100.4918 489.4688,1100.1949 490.2188,1099.6793 C490.8281,1099.2574 491.1563,1098.8355 491.1563,1098.4293 C491.1563,1097.9605 490.7344,1097.5543 490.2344,1097.5543 C490,1097.5543 489.7813,1097.6324 489.5781,1097.8355 C489.1406,1098.273 489.1406,1098.273 488.9688,1098.3668 C488.5156,1098.6011 487.875,1098.7418 487.1094,1098.7418 C485.1094,1098.7418 483.8281,1097.7261 483.8281,1096.148 L483.8281,1095.1011 C483.8281,1093.398 485.0469,1092.1949 486.75,1092.1949 C487.3281,1092.1949 487.9063,1092.3355 488.375,1092.5855 C488.8438,1092.8511 489.0156,1093.0386 489.0781,1093.398 C489.2031,1094.0699 489.4531,1094.3199 489.9844,1094.3199 C490.2656,1094.3199 490.5469,1094.1793 490.7344,1093.9605 C490.8594,1093.7886 490.9063,1093.6168 490.9063,1093.1793 L490.9063,1091.8199 C490.9063,1091.398 490.8906,1091.2574 490.7656,1091.0855 C490.5938,1090.8355 490.3125,1090.6793 489.9844,1090.6793 C489.6719,1090.6793 489.4688,1090.7886 489.25,1091.0543 C488.0781,1090.5543 487.6406,1090.4449 486.6875,1090.4449 C484.0156,1090.4449 482,1092.4605 482,1095.0855 L482,1096.1793 Z " fill="#000000"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="501" y="1099.629">A</text>
+      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="81" x="518" y="1076.023"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="519" y="1090.2231">char,std::string</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="473" x2="595" y1="1111.023" y2="1111.023"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="473" x2="595" y1="1119.023" y2="1119.023"/>
+    </g>
+    <g id="elem_C_0001388877149159894665">
+      <rect codeLine="70" fill="#F1F1F1" height="48" id="C_0001388877149159894665" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="462.5" y="830.023"/>
+      <ellipse cx="477.5" cy="846.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+      <path d="M472.5,847.1793 C472.5,849.6793 474.6406,851.4918 477.5625,851.4918 C478.7969,851.4918 479.9688,851.1949 480.7188,850.6793 C481.3281,850.2574 481.6563,849.8355 481.6563,849.4293 C481.6563,848.9605 481.2344,848.5543 480.7344,848.5543 C480.5,848.5543 480.2813,848.6324 480.0781,848.8355 C479.6406,849.273 479.6406,849.273 479.4688,849.3668 C479.0156,849.6011 478.375,849.7418 477.6094,849.7418 C475.6094,849.7418 474.3281,848.7261 474.3281,847.148 L474.3281,846.1011 C474.3281,844.398 475.5469,843.1949 477.25,843.1949 C477.8281,843.1949 478.4063,843.3355 478.875,843.5855 C479.3438,843.8511 479.5156,844.0386 479.5781,844.398 C479.7031,845.0699 479.9531,845.3199 480.4844,845.3199 C480.7656,845.3199 481.0469,845.1793 481.2344,844.9605 C481.3594,844.7886 481.4063,844.6168 481.4063,844.1793 L481.4063,842.8199 C481.4063,842.398 481.3906,842.2574 481.2656,842.0855 C481.0938,841.8355 480.8125,841.6793 480.4844,841.6793 C480.1719,841.6793 479.9688,841.7886 479.75,842.0543 C478.5781,841.5543 478.1406,841.4449 477.1875,841.4449 C474.5156,841.4449 472.5,843.4605 472.5,846.0855 L472.5,847.1793 Z " fill="#000000"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="491.5" y="850.629">A</text>
+      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="100" x="508.5" y="827.023"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="98" x="509.5" y="841.2231">wchar_t,std::string</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="463.5" x2="604.5" y1="862.023" y2="862.023"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="463.5" x2="604.5" y1="870.023" y2="870.023"/>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001758213171584933144">
+        <rect codeLine="74" fill="#F1F1F1" height="316.7988" id="C_0001758213171584933144" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="271" x="9" y="371.623"/>
+        <ellipse cx="129.75" cy="387.623" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M124.75,388.7793 C124.75,391.2793 126.8906,393.0918 129.8125,393.0918 C131.0469,393.0918 132.2188,392.7949 132.9688,392.2793 C133.5781,391.8574 133.9063,391.4355 133.9063,391.0293 C133.9063,390.5605 133.4844,390.1543 132.9844,390.1543 C132.75,390.1543 132.5313,390.2324 132.3281,390.4355 C131.8906,390.873 131.8906,390.873 131.7188,390.9668 C131.2656,391.2011 130.625,391.3418 129.8594,391.3418 C127.8594,391.3418 126.5781,390.3261 126.5781,388.748 L126.5781,387.7011 C126.5781,385.998 127.7969,384.7949 129.5,384.7949 C130.0781,384.7949 130.6563,384.9355 131.125,385.1855 C131.5938,385.4511 131.7656,385.6386 131.8281,385.998 C131.9531,386.6699 132.2031,386.9199 132.7344,386.9199 C133.0156,386.9199 133.2969,386.7793 133.4844,386.5605 C133.6094,386.3886 133.6563,386.2168 133.6563,385.7793 L133.6563,384.4199 C133.6563,383.998 133.6406,383.8574 133.5156,383.6855 C133.3438,383.4355 133.0625,383.2793 132.7344,383.2793 C132.4219,383.2793 132.2188,383.3886 132,383.6543 C130.8281,383.1543 130.3906,383.0449 129.4375,383.0449 C126.7656,383.0449 124.75,385.0605 124.75,387.6855 L124.75,388.7793 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="150.25" y="392.229">R</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="274" y="368.623"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="275" y="382.8231">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="279" y1="403.623" y2="403.623"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="279" y1="411.623" y2="411.623"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="420.523"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="422.523"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="29" y="428.6289">abool : APtr&lt;bool&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="437.3229"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="439.3229"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="184" x="29" y="445.4289">aboolfloat : AAPtr&lt;bool,float&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="454.1228"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="456.1228"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="29" y="462.2288">afloat : ASharedPtr&lt;float&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="470.9227"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="472.9227"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="479.0287">atfloat : AAPtr&lt;T,float&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="487.7227"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="489.7227"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="29" y="495.8287">bapair : PairPairBA&lt;bool&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="504.5226"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="506.5226"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="192" x="29" y="512.6286">boolstring : A&lt;bool,std::string&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="521.3225"/>
+          <polygon fill="none" points="20,521.3225,24,525.3225,20,529.3225,16,525.3225" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77" x="29" y="529.4285">bs : BVector</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="538.1225"/>
+          <ellipse cx="20" cy="543.1225" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="29" y="546.2284">bs2 : BVector2</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="554.9224"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="556.9224"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="29" y="563.0284">bstringstring : BStringString</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="571.7223"/>
+          <ellipse cx="20" cy="576.7223" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="217" x="29" y="579.8283">cb : SimpleCallback&lt;ACharString&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="588.5222"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="590.5222"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181" x="29" y="596.6282">floatstring : AStringPtr&lt;float&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="605.3222"/>
+          <ellipse cx="20" cy="610.3222" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245" x="29" y="613.4281">gcb : GenericCallback&lt;AWCharString&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="622.1221"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="624.1221"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124" x="29" y="630.2281">intstring : AIntString</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="638.922"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="640.922"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="29" y="647.028">stringstring : AStringString</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="655.7219"/>
+          <ellipse cx="20" cy="660.7219" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="663.8279">vcb : VoidCallback</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="672.5219"/>
+          <ellipse cx="20" cy="677.5219" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="29" y="680.6278">vps : VectorPtr&lt;B&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="470.5" y="336"/>
-      <ellipse cx="485.5" cy="352" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M488.4688,357.6406 Q487.8906,357.9375 487.25,358.0781 Q486.6094,358.2344 485.9063,358.2344 Q483.4063,358.2344 482.0781,356.5938 Q480.7656,354.9375 480.7656,351.8125 Q480.7656,348.6875 482.0781,347.0313 Q483.4063,345.375 485.9063,345.375 Q486.6094,345.375 487.25,345.5313 Q487.9063,345.6875 488.4688,345.9844 L488.4688,348.7031 Q487.8438,348.125 487.25,347.8594 Q486.6563,347.5781 486.0313,347.5781 Q484.6875,347.5781 484,348.6563 Q483.3125,349.7188 483.3125,351.8125 Q483.3125,353.9063 484,354.9844 Q484.6875,356.0469 486.0313,356.0469 Q486.6563,356.0469 487.25,355.7813 Q487.8438,355.5 488.4688,354.9219 L488.4688,357.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="499.5" y="356.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="77" x="515.5" y="333"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="75" x="516.5" y="345.1387">double,float</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="368" y2="368"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="376" y2="376"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="461.5" y="751"/>
-      <ellipse cx="476.5" cy="767" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M479.4688,772.6406 Q478.8906,772.9375 478.25,773.0781 Q477.6094,773.2344 476.9063,773.2344 Q474.4063,773.2344 473.0781,771.5938 Q471.7656,769.9375 471.7656,766.8125 Q471.7656,763.6875 473.0781,762.0313 Q474.4063,760.375 476.9063,760.375 Q477.6094,760.375 478.25,760.5313 Q478.9063,760.6875 479.4688,760.9844 L479.4688,763.7031 Q478.8438,763.125 478.25,762.8594 Q477.6563,762.5781 477.0313,762.5781 Q475.6875,762.5781 475,763.6563 Q474.3125,764.7188 474.3125,766.8125 Q474.3125,768.9063 475,769.9844 Q475.6875,771.0469 477.0313,771.0469 Q477.6563,771.0469 478.25,770.7813 Q478.8438,770.5 479.4688,769.9219 L479.4688,772.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490.5" y="771.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="506.5" y="748"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="507.5" y="760.1387">bool,std::string</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="783" y2="783"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="791" y2="791"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="404" y="668"/>
-      <ellipse cx="419" cy="684" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M421.9688,689.6406 Q421.3906,689.9375 420.75,690.0781 Q420.1094,690.2344 419.4063,690.2344 Q416.9063,690.2344 415.5781,688.5938 Q414.2656,686.9375 414.2656,683.8125 Q414.2656,680.6875 415.5781,679.0313 Q416.9063,677.375 419.4063,677.375 Q420.1094,677.375 420.75,677.5313 Q421.4063,677.6875 421.9688,677.9844 L421.9688,680.7031 Q421.3438,680.125 420.75,679.8594 Q420.1563,679.5781 419.5313,679.5781 Q418.1875,679.5781 417.5,680.6563 Q416.8125,681.7188 416.8125,683.8125 Q416.8125,685.9063 417.5,686.9844 Q418.1875,688.0469 419.5313,688.0469 Q420.1563,688.0469 420.75,687.7813 Q421.3438,687.5 421.9688,686.9219 L421.9688,689.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="433" y="688.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="210" x="449" y="665"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="208" x="450" y="677.1387">float,std::unique_ptr&lt;std::string&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="700" y2="700"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="708" y2="708"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="467" y="917"/>
-      <ellipse cx="482" cy="933" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M484.9688,938.6406 Q484.3906,938.9375 483.75,939.0781 Q483.1094,939.2344 482.4063,939.2344 Q479.9063,939.2344 478.5781,937.5938 Q477.2656,935.9375 477.2656,932.8125 Q477.2656,929.6875 478.5781,928.0313 Q479.9063,926.375 482.4063,926.375 Q483.1094,926.375 483.75,926.5313 Q484.4063,926.6875 484.9688,926.9844 L484.9688,929.7031 Q484.3438,929.125 483.75,928.8594 Q483.1563,928.5781 482.5313,928.5781 Q481.1875,928.5781 480.5,929.6563 Q479.8125,930.7188 479.8125,932.8125 Q479.8125,934.9063 480.5,935.9844 Q481.1875,937.0469 482.5313,937.0469 Q483.1563,937.0469 483.75,936.7813 Q484.3438,936.5 484.9688,935.9219 L484.9688,938.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="496" y="937.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="84" x="512" y="914"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="513" y="926.1387">int,std::string</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="949" y2="949"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="957" y2="957"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="444" y="1000"/>
-      <ellipse cx="459" cy="1016" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M461.9688,1021.6406 Q461.3906,1021.9375 460.75,1022.0781 Q460.1094,1022.2344 459.4063,1022.2344 Q456.9063,1022.2344 455.5781,1020.5938 Q454.2656,1018.9375 454.2656,1015.8125 Q454.2656,1012.6875 455.5781,1011.0313 Q456.9063,1009.375 459.4063,1009.375 Q460.1094,1009.375 460.75,1009.5313 Q461.4063,1009.6875 461.9688,1009.9844 L461.9688,1012.7031 Q461.3438,1012.125 460.75,1011.8594 Q460.1563,1011.5781 459.5313,1011.5781 Q458.1875,1011.5781 457.5,1012.6563 Q456.8125,1013.7188 456.8125,1015.8125 Q456.8125,1017.9063 457.5,1018.9844 Q458.1875,1020.0469 459.5313,1020.0469 Q460.1563,1020.0469 460.75,1019.7813 Q461.3438,1019.5 461.9688,1018.9219 L461.9688,1021.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="473" y="1020.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="130" x="489" y="997"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="128" x="490" y="1009.1387">std::string,std::string</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1032" y2="1032"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1040" y2="1040"/>
-    </a>
-    <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1083"/>
-    <ellipse cx="476" cy="1099" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M478.9688,1104.6406 Q478.3906,1104.9375 477.75,1105.0781 Q477.1094,1105.2344 476.4063,1105.2344 Q473.9063,1105.2344 472.5781,1103.5938 Q471.2656,1101.9375 471.2656,1098.8125 Q471.2656,1095.6875 472.5781,1094.0313 Q473.9063,1092.375 476.4063,1092.375 Q477.1094,1092.375 477.75,1092.5313 Q478.4063,1092.6875 478.9688,1092.9844 L478.9688,1095.7031 Q478.3438,1095.125 477.75,1094.8594 Q477.1563,1094.5781 476.5313,1094.5781 Q475.1875,1094.5781 474.5,1095.6563 Q473.8125,1096.7188 473.8125,1098.8125 Q473.8125,1100.9063 474.5,1101.9844 Q475.1875,1103.0469 476.5313,1103.0469 Q477.1563,1103.0469 477.75,1102.7813 Q478.3438,1102.5 478.9688,1101.9219 L478.9688,1104.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490" y="1103.1543">A</text>
-    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="96" x="506" y="1080"/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="94" x="507" y="1092.1387">char,std::string</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1115" y2="1115"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1123" y2="1123"/>
-    <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="834"/>
-    <ellipse cx="465.5" cy="850" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M468.4688,855.6406 Q467.8906,855.9375 467.25,856.0781 Q466.6094,856.2344 465.9063,856.2344 Q463.4063,856.2344 462.0781,854.5938 Q460.7656,852.9375 460.7656,849.8125 Q460.7656,846.6875 462.0781,845.0313 Q463.4063,843.375 465.9063,843.375 Q466.6094,843.375 467.25,843.5313 Q467.9063,843.6875 468.4688,843.9844 L468.4688,846.7031 Q467.8438,846.125 467.25,845.8594 Q466.6563,845.5781 466.0313,845.5781 Q464.6875,845.5781 464,846.6563 Q463.3125,847.7188 463.3125,849.8125 Q463.3125,851.9063 464,852.9844 Q464.6875,854.0469 466.0313,854.0469 Q466.6563,854.0469 467.25,853.7813 Q467.8438,853.5 468.4688,852.9219 L468.4688,855.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479.5" y="854.1543">A</text>
-    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="117" x="495.5" y="831"/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="115" x="496.5" y="843.1387">wchar_t,std::string</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="866" y2="866"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="874" y2="874"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq9uju03u1ey9)" height="252.875" id="C_0001758213171584933144" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="6" y="407.5"/>
-      <ellipse cx="114.25" cy="423.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M117.2188,429.1406 Q116.6406,429.4375 116,429.5781 Q115.3594,429.7344 114.6563,429.7344 Q112.1563,429.7344 110.8281,428.0938 Q109.5156,426.4375 109.5156,423.3125 Q109.5156,420.1875 110.8281,418.5313 Q112.1563,416.875 114.6563,416.875 Q115.3594,416.875 116,417.0313 Q116.6563,417.1875 117.2188,417.4844 L117.2188,420.2031 Q116.5938,419.625 116,419.3594 Q115.4063,419.0781 114.7813,419.0781 Q113.4375,419.0781 112.75,420.1563 Q112.0625,421.2188 112.0625,423.3125 Q112.0625,425.4063 112.75,426.4844 Q113.4375,427.5469 114.7813,427.5469 Q115.4063,427.5469 116,427.2813 Q116.5938,427 117.2188,426.4219 L117.2188,429.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="134.75" y="427.6543">R</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="244" y="404.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="245" y="416.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="439.5" y2="439.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="447.5" y2="447.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="453.5"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="455.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="26" y="461.7104">abool : APtr&lt;bool&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="466.3047"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="468.3047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="474.5151">aboolfloat : AAPtr&lt;bool,float&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="479.1094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="481.1094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="26" y="487.3198">afloat : ASharedPtr&lt;float&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="491.9141"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="493.9141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="132" x="26" y="500.1245">atfloat : AAPtr&lt;T,float&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="504.7188"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="506.7188"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="26" y="512.9292">bapair : PairPairBA&lt;bool&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="517.5234"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="519.5234"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="26" y="525.7339">boolstring : A&lt;bool,std::string&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="530.3281"/>
-      <polygon fill="none" points="17,530.3281,21,534.3281,17,538.3281,13,534.3281" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="26" y="538.5386">bs : BVector</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="543.1328"/>
-      <ellipse cx="17" cy="548.1328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="84" x="26" y="551.3433">bs2 : BVector2</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="555.9375"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="557.9375"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="26" y="564.1479">bstringstring : BStringString</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="568.7422"/>
-      <ellipse cx="17" cy="573.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="576.9526">cb : SimpleCallback&lt;ACharString&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="581.5469"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="583.5469"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="589.7573">floatstring : AStringPtr&lt;float&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="594.3516"/>
-      <ellipse cx="17" cy="599.3516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="26" y="602.562">gcb : GenericCallback&lt;AWCharString&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="607.1563"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="609.1563"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="26" y="615.3667">intstring : AIntString</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="619.9609"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="621.9609"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="26" y="628.1714">stringstring : AStringString</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="632.7656"/>
-      <ellipse cx="17" cy="637.7656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="640.9761">vcb : VoidCallback</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="645.5703"/>
-      <ellipse cx="17" cy="650.5703" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="26" y="653.7808">vps : VectorPtr&lt;B&gt;</text>
-    </a>
-    <path d="M852.1,869.74 C884.92,826.94 953.84,737.07 998.19,679.23 " fill="none" id="C_0002186387853087008570-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="992.82,674.72,1010.55,663.11,1003.93,683.24,992.82,674.72" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M930.23,652.99 C950.73,647.91 971.56,642.74 989.42,638.3 " fill="none" id="C_0000947292733740993297-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="987.74,631.51,1008.83,633.49,991.11,645.1,987.74,631.51" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M873.61,567.25 C906.96,579.1 954.56,596 990.13,608.64 " fill="none" id="C_0001700006390494465667-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="992.49,602.05,1008.99,615.34,987.8,615.24,992.49,602.05" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M849.63,343.09 C882.46,392.14 957.77,504.65 1002.9,572.07 " fill="none" id="C_0002017665567517853203-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1008.92,568.47,1014.22,588.99,997.28,576.26,1008.92,568.47" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M572.15,601.33 C623.66,591.73 712.28,575.22 771.38,564.2 " fill="none" id="C_0000906557320263235873-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="770.38,557.27,791.32,560.49,772.94,571.03,770.38,557.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M581.3,530.52 C633.59,535.22 715.46,542.57 771.2,547.58 " fill="none" id="C_0000378898020828430636-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="771.87,540.61,791.16,549.38,770.62,554.56,771.87,540.61" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M589.3,285.15 C639.06,292.1 710.69,302.11 763.14,309.45 " fill="none" id="C_0002082013375525130414-&gt;C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="764.44,302.56,783.27,312.26,762.5,316.42,764.44,302.56" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M581.71,458.9 C604.52,466.24 631.72,475.25 656,484 C695.14,498.1 738.66,515.2 772.57,528.85 " fill="none" id="C_0000051978493292659230-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="775.41,522.45,791.32,536.44,770.16,535.42,775.41,522.45" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M589.65,352 C639.45,345.2 710.96,335.45 763.31,328.3 " fill="none" id="C_0000197769253782961588-&gt;C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="762.63,321.33,783.39,325.56,764.52,335.2,762.63,321.33" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M598.58,795.78 C617.32,801.92 637.56,808.9 656,816 C691.6,829.71 730.43,846.74 762.49,861.39 " fill="none" id="C_0000895940711566401184-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="765.77,855.19,781,869.92,759.91,867.91,765.77,855.19" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M656.26,685.75 C669.52,685.09 683.05,684.41 696.42,683.74 " fill="none" id="C_0001751732625010742161-&gt;C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="696.2,676.75,716.52,682.74,696.9,690.73,696.2,676.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M593.26,931.26 C639.95,923.96 704.14,913.92 754.13,906.1 " fill="none" id="C_0000887121441210847583-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="753.06,899.18,773.9,903.01,755.22,913.02,753.06,899.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M608.31,999.92 C624.24,994.43 640.78,988.33 656,982 C694.58,965.94 736.47,945.07 769.64,927.69 " fill="none" id="C_0001119452495635561975-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="766.63,921.36,787.58,918.19,773.19,933.74,766.63,921.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M599.31,1090.15 C618.43,1083.84 638.71,1075.56 656,1065 C713.85,1029.67 767.67,972.08 800.07,933.62 " fill="none" id="C_0000340562099063642390-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="794.67,929.17,812.79,918.19,805.47,938.07,794.67,929.17" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M609.56,867.41 C654,872.74 709.36,879.37 753.67,884.68 " fill="none" id="C_0001388877149159894665-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="754.79,877.76,773.81,887.09,753.12,891.66,754.79,877.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M153.36,394.42 C179,265.78 223.46,88.66 280,47 C334.65,6.73 414.78,28.3 469.27,51.43 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="150.79,407.5,155.8747,402.3867,153.1104,395.7265,148.0257,400.8398,150.79,407.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="303" y="14.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="40" x="313" y="21.0669">bapair</text>
-    <path d="M139.5,394.41 C154.71,297.07 191.51,172.76 280,104 C308.06,82.2 402.1,79.29 466.23,80.02 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="137.58,407.35,142.4142,401.9992,139.3343,395.4789,134.5001,400.8297,137.58,407.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="318.5,70.0664,322.5,74.0664,318.5,78.0664,314.5,74.0664" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="325.5" y="79.0669">bs</text>
-    <path d="M154.98,394.13 C176.27,315.85 214.06,222.02 280,161 C283.56,157.7 393.78,123.47 466.37,101.16 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="151.58,407.06,156.9774,402.2779,154.6391,395.4565,149.2417,400.2385,151.58,407.06" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="314.5" cy="124.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="321.5" y="128.0669">bs2</text>
-    <path d="M168.06,395.16 C191.62,333.59 227.49,264.67 280,218 C312.99,188.68 336.14,208.67 374,186 C389.65,176.63 389.47,169.02 404,158 C425.66,141.58 451.05,125.61 473.27,112.58 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-3" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="163.51,407.37,169.3539,403.1452,167.7018,396.1259,161.8579,400.3507,163.51,407.37" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="315" cy="178.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="322" y="182.0669">vps</text>
-    <path d="M263.37,563.02 C268.97,563.78 274.53,564.44 280,565 C321.56,569.22 332.54,570.14 374,565 C409.66,560.58 448.91,550.65 478.99,541.92 " fill="none" id="C_0001758213171584933144&lt;-C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="250.23,561.11,255.592,565.9317,262.1051,562.8366,256.7431,558.0149,250.23,561.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="303" y="554.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="40" x="313" y="561.0669">bapair</text>
-    <path d="M199.24,396.4 C221.13,365.53 248.08,336.02 280,316 C337.73,279.79 417.38,273.2 470.91,273.6 " fill="none" id="C_0001758213171584933144&lt;-C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="191.71,407.37,198.4038,404.6881,198.5027,397.4777,191.8089,400.1596,191.71,407.37" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="305.5" y="272.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="315.5" y="279.0669">abool</text>
-    <path d="M260.36,401.68 C266.86,396.55 273.42,391.63 280,387 C318.03,360.22 334.46,365.49 374,341 C388.28,332.15 389.14,325.84 404,318 C424.81,307.02 449.1,298.24 470.72,291.67 " fill="none" id="C_0001758213171584933144&lt;-C_0002082013375525130414-1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="250.21,409.89,257.3909,409.2308,259.5443,402.3487,252.3634,403.0079,250.21,409.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="330.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="337.0669">aboolfloat</text>
-    <path d="M263.07,533.5 C300.07,529.73 339.5,522.19 374,508 C389.79,501.5 388.98,492.12 404,484 C427.2,471.45 454.91,461.88 478.34,455.15 " fill="none" id="C_0001758213171584933144&lt;-C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="250.1,534.69,256.4396,538.1266,262.0501,533.5964,255.7105,530.1599,250.1,534.69" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="497.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="504.0669">aboolfloat</text>
-    <path d="M262.87,491.36 C268.64,489.83 274.37,488.37 280,487 C347.83,470.52 427.45,457.54 478.06,450.07 " fill="none" id="C_0001758213171584933144&lt;-C_0000051978493292659230-1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="250.19,494.81,257.03,497.0936,261.7687,491.6582,254.9287,489.3745,250.19,494.81" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="302.5" y="458.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="41" x="312.5" y="465.0669">atfloat</text>
-    <path d="M250.23,458.89 C260.18,453.61 270.18,448.57 280,444 C332.88,419.38 348.73,419.65 404,401 C423.95,394.27 445.74,387.07 465.46,380.61 " fill="none" id="C_0001758213171584933144-&gt;C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="470.43,378.99,460.6313,377.997,465.6795,380.5497,463.1268,385.5978,470.43,378.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="305" y="401.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="36" x="315" y="408.0669">afloat</text>
-    <path d="M260.78,650.18 C267.19,654.96 273.62,659.6 280,664 C319.12,690.99 332.72,691.43 374,715 C387.5,722.71 389.88,726.49 404,733 C422.19,741.39 442.55,748.95 461.47,755.27 " fill="none" id="C_0001758213171584933144&lt;-C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="250.02,642,252.3721,648.8167,259.5691,649.2674,257.217,642.4506,250.02,642" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="653.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="660.0669">boolstring</text>
-    <path d="M262.21,592.56 C306.98,611.61 357.39,632.37 404,650 C420.17,656.12 437.67,662.28 454.31,667.93 " fill="none" id="C_0001758213171584933144&lt;-C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="250.05,587.37,253.9996,593.4033,261.0879,592.0779,257.1383,586.0447,250.05,587.37" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291" y="591.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="301" y="598.0669">floatstring</text>
-    <path d="M172.75,672.79 C196.68,729.99 231.55,793.02 280,837 C313.12,867.07 335.63,850 374,873 C389.13,882.07 388.68,890.25 404,899 C423.38,910.07 446.13,918.8 466.87,925.37 " fill="none" id="C_0001758213171584933144&lt;-C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="167.81,660.68,166.3763,667.7472,172.3485,671.7887,173.7821,664.7215,167.81,660.68" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="297" y="826.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="307" y="833.0669">intstring</text>
-    <path d="M158.7,673.61 C180.97,748.53 218.51,837.62 280,898 C312.04,929.46 339.34,906.46 374,935 C393.13,950.75 384.47,966.74 404,982 C415.81,991.23 429.77,998.49 443.99,1004.18 " fill="none" id="C_0001758213171584933144&lt;-C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="154.99,660.75,152.8161,667.6256,158.3267,672.2768,160.5006,665.4012,154.99,660.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="287" y="887.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="72" x="297" y="894.0669">stringstring</text>
-    <path d="M144.37,673.55 C161.94,767.18 199.54,886.41 280,960 C304.04,981.99 381.65,999.72 443.91,1010.89 " fill="none" id="C_0001758213171584933144&lt;-C_0001119452495635561975-1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="142.03,660.52,139.1542,667.1328,144.1523,672.3308,147.0281,665.718,142.03,660.52" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="283" y="949.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="80" x="293" y="956.0669">bstringstring</text>
-    <path d="M176.19,395.44 C199.88,345.31 233.65,292.79 280,259 C354.44,204.74 647.38,233.04 656,235 C706.56,246.48 759.59,274.39 793.94,294.9 " fill="none" id="C_0001758213171584933144&lt;-C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="170.68,407.44,176.816,403.652,175.6794,396.531,169.5434,400.319,170.68,407.44" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="505.5" y="215.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="41" x="515.5" y="222.0669">atfloat</text>
-    <path d="M142.26,660.51 C158.96,763.5 196.4,907.18 280,1004 C324.81,1055.9 399.94,1082.14 455.97,1095.08 " fill="none" id="C_0001758213171584933144-&gt;C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="460.99,1096.22,453.0921,1090.3359,456.1128,1095.1187,451.33,1098.1394,460.99,1096.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M146.03,660.75 C168.64,808.06 213.61,1037.94 280,1092 C328.39,1131.4 401.2,1131.2 455.61,1123.49 " fill="none" id="C_0001758213171584933144-&gt;C_0000340562099063642390-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="460.81,1122.72,451.324,1120.0712,455.8631,1123.4471,452.4873,1127.9862,460.81,1122.72" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="318.5" cy="1084.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="325.5" y="1088.0669">cb</text>
-    <path d="M224.6,660.83 C241.81,679.32 260.52,697.11 280,712 C316.65,740.01 340.96,723.81 374,756 C395.35,776.81 381.5,796.44 404,816 C415.87,826.32 430.38,834.13 445.26,840.03 " fill="none" id="C_0001758213171584933144-&gt;C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="450.31,841.96,443.3315,835.0101,445.6396,840.1747,440.475,842.4827,450.31,841.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M183.43,660.76 C207.5,704.15 239.63,749.61 280,781 C286.88,786.35 375.65,813.14 445.26,833.64 " fill="none" id="C_0001758213171584933144-&gt;C_0001388877149159894665-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="450.24,835.1,442.7375,828.7194,445.4439,833.6869,440.4764,836.3932,450.24,835.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="314.5" cy="773.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="321.5" y="777.0669">gcb</text>
+    <g id="link_C_0002186387853087008570_C_0000765890579167335652">
+      <path codeLine="93" d="M822.66,869.663 C855.51,821.633 918.7988,729.1006 959.2588,669.9406 " fill="none" id="C_0002186387853087008570-to-C_0000765890579167335652" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="969.42,655.083,954.3062,666.5535,964.2113,673.3277,969.42,655.083" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000947292733740993297_C_0000765890579167335652">
+      <path codeLine="94" d="M882.79,650.563 C912.13,641.213 926.7988,636.5454 949.4688,629.3254 " fill="none" id="C_0000947292733740993297-to-C_0000765890579167335652" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="966.62,623.863,947.648,623.6083,951.2896,635.0424,966.62,623.863" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001700006390494465667_C_0000765890579167335652">
+      <path codeLine="95" d="M844.75,561.383 C880.71,573.773 916.5126,586.1072 949.6726,597.5372 " fill="none" id="C_0001700006390494465667-to-C_0000765890579167335652" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="966.69,603.403,951.6278,591.8648,947.7173,603.2097,966.69,603.403" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002017665567517853203_C_0000765890579167335652">
+      <path codeLine="96" d="M820.55,318.333 C853.15,372.813 923.1052,489.7185 963.5752,557.3285 " fill="none" id="C_0002017665567517853203-to-C_0000765890579167335652" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="972.82,572.773,968.7234,554.2469,958.427,560.4101,972.82,572.773" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000906557320263235873_C_0001700006390494465667">
+      <path codeLine="97" d="M574.98,596.553 C626.21,585.693 696.8109,570.7339 747.5009,559.9939 " fill="none" id="C_0000906557320263235873-to-C_0001700006390494465667" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="765.11,556.263,746.2573,554.1243,748.7446,565.8636,765.11,556.263" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000378898020828430636_C_0001700006390494465667">
+      <path codeLine="98" d="M582.47,526.613 C634.51,531.643 699.0836,537.88 747.3636,542.55 " fill="none" id="C_0000378898020828430636-to-C_0001700006390494465667" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="765.28,544.283,747.9413,536.5779,746.786,548.5221,765.28,544.283" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002082013375525130414_C_0002017665567517853203">
+      <path codeLine="99" d="M589.44,277.273 C639.02,281.143 693.4947,285.3904 740.1947,289.0404 " fill="none" id="C_0002082013375525130414-to-C_0002017665567517853203" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="758.14,290.443,740.6623,283.0587,739.7272,295.0222,758.14,290.443" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000051978493292659230_C_0001700006390494465667">
+      <path codeLine="100" d="M581.93,456.413 C600.95,463.563 623.08,472.043 643,480.023 C684.96,496.843 716.0896,509.9993 748.5996,524.0093 " fill="none" id="C_0000051978493292659230-to-C_0001700006390494465667" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="765.13,531.133,750.9742,518.4992,746.2251,529.5195,765.13,531.133" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000197769253782961588_C_0002017665567517853203">
+      <path codeLine="101" d="M588.79,343.623 C638.47,332.173 693.9099,319.3958 740.8099,308.5858 " fill="none" id="C_0000197769253782961588-to-C_0002017665567517853203" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="758.35,304.543,739.4623,302.7391,742.1575,314.4325,758.35,304.543" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000895940711566401184_C_0002186387853087008570">
+      <path codeLine="102" d="M596.3,792.973 C611.68,798.843 628.05,805.403 643,812.023 C683.01,829.743 711.3365,844.0345 743.2965,861.0745 " fill="none" id="C_0000895940711566401184-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="759.18,869.543,746.1194,855.78,740.4737,866.369,759.18,869.543" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001751732625010742161_C_0000947292733740993297">
+      <path codeLine="103" d="M643.25,682.793 C663.25,681.823 666.0812,681.6969 685.8312,680.7369 " fill="none" id="C_0001751732625010742161-to-C_0000947292733740993297" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="703.81,679.863,685.5399,674.744,686.1225,686.7298,703.81,679.863" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000887121441210847583_C_0002186387853087008570">
+      <path codeLine="104" d="M590.74,928.113 C637.83,920.583 687.0359,912.7256 733.3059,905.3256 " fill="none" id="C_0000887121441210847583-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="751.08,902.483,732.3583,899.4009,734.2534,911.2503,751.08,902.483" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001119452495635561975_C_0002186387853087008570">
+      <path codeLine="105" d="M603.22,995.583 C616.53,990.403 630.3,984.763 643,979.023 C684.05,960.483 713.5544,945.0012 745.6044,927.1512 " fill="none" id="C_0001119452495635561975-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="761.33,918.393,742.685,921.9094,748.5238,932.3931,761.33,918.393" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000340562099063642390_C_0002186387853087008570">
+      <path codeLine="106" d="M596.44,1085.073 C612.3,1079.023 628.87,1071.373 643,1062.023 C703.97,1021.663 748.3672,968.7608 775.4972,932.8108 " fill="none" id="C_0000340562099063642390-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="786.34,918.443,770.7079,929.1965,780.2865,936.4251,786.34,918.443" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001388877149159894665_C_0002186387853087008570">
+      <path codeLine="107" d="M605.68,864.533 C651.29,871.313 691.8356,877.3467 733.4156,883.5267 " fill="none" id="C_0001388877149159894665-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="751.22,886.173,734.2977,877.5919,732.5335,889.4616,751.22,886.173" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000934136012292043506">
+      <path codeLine="108" d="M154.4986,359.2533 C169.0386,247.5233 206.78,117.113 310,43.023 C356.16,9.893 421.58,25.523 469.62,45.303 " fill="none" id="C_0001758213171584933144-backto-C_0000934136012292043506" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="152.95,371.153,157.6908,365.7194,154.4986,359.2533,149.7577,364.687,152.95,371.153" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="331" y="13.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="341" y="20.1">bapair</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000934136012292043506">
+      <path codeLine="121" d="M167.1354,359.4775 C187.2054,265.4675 225.81,164.273 310,100.023 C354.15,66.333 418.4,63.373 466.61,67.353 " fill="none" id="C_0001758213171584933144-backto-C_0000934136012292043506-1" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="164.63,371.213,169.7945,366.1804,167.1354,359.4775,161.9709,364.5101,164.63,371.213" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="344.5,56.323,348.5,60.323,344.5,64.323,340.5,60.323" style="stroke:#B38D22;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="351.5" y="65.1">bs</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000934136012292043506">
+      <path codeLine="122" d="M187.8594,359.8706 C212.8994,286.1506 248.78,213.823 310,157.023 C313.06,154.183 402.09,123.123 466.71,100.803 " fill="none" id="C_0001758213171584933144-backto-C_0000934136012292043506-2" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="184,371.233,189.7172,366.8383,187.8594,359.8706,182.1422,364.2653,184,371.233" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="341" cy="120.323" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="348" y="124.1">bs2</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000934136012292043506">
+      <path codeLine="127" d="M205.7061,360.3202 C231.6261,304.5302 262.45,256.183 310,214.023 C340.2,187.243 360.7,203.313 395,182.023 C410.5,172.403 410.84,165.523 425,154.023 C443.42,139.063 464.6,123.773 483.3,110.873 " fill="none" id="C_0001758213171584933144-backto-C_0000934136012292043506-3" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="200.65,371.203,206.8057,367.447,205.7061,360.3202,199.5505,364.0762,200.65,371.203" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="341" cy="174.323" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="348" y="178.1">vps</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000378898020828430636">
+      <path codeLine="109" d="M292.1661,561.1909 C329.3661,565.8709 357.82,566.173 395,561.023 C425.83,556.753 459.45,547.353 485.79,538.853 " fill="none" id="C_0001758213171584933144-backto-C_0000378898020828430636" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="280.26,559.693,285.7138,564.4107,292.1661,561.1909,286.7124,556.4732,280.26,559.693" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="331" y="550.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="341" y="557.1">bapair</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0002082013375525130414">
+      <path codeLine="110" d="M249.9457,362.1253 C269.8857,339.3553 284.72,327.483 310,312.023 C361.3,280.653 430.94,272.853 478.67,271.653 " fill="none" id="C_0001758213171584933144-backto-C_0002082013375525130414" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="242.04,371.153,249.0021,369.2744,249.9457,362.1253,242.9836,364.0039,242.04,371.153" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="333" y="271.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="343" y="278.1">abool</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0002082013375525130414">
+      <path codeLine="111" d="M289.9065,398.7073 C299.7065,390.9873 300.18,390.963 310,384.023 C345.25,359.103 358.88,360.663 395,337.023 C409.06,327.823 410.32,322.203 425,314.023 C441.73,304.703 461.01,296.623 478.6,290.163 " fill="none" id="C_0001758213171584933144-backto-C_0002082013375525130414-1" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="280.48,406.133,287.6685,405.5623,289.9065,398.7073,282.718,399.278,280.48,406.133" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="320.5" y="326.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="56" x="330.5" y="333.1">aboolfloat</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000051978493292659230">
+      <path codeLine="112" d="M292.3137,528.8215 C330.4637,525.1115 359.34,518.653 395,504.023 C410.8,497.543 410.17,488.493 425,480.023 C444.07,469.133 466.59,460.063 486.11,453.243 " fill="none" id="C_0001758213171584933144-backto-C_0000051978493292659230" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="280.37,529.983,286.729,533.3835,292.3137,528.8215,285.9547,525.421,280.37,529.983" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="320.5" y="493.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="56" x="330.5" y="500.1">aboolfloat</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000051978493292659230">
+      <path codeLine="120" d="M291.9753,487.4608 C301.9753,484.8308 300.33,485.353 310,483.023 C370.42,468.453 440.9,455.163 486.2,447.083 " fill="none" id="C_0001758213171584933144-backto-C_0000051978493292659230-1" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="280.37,490.513,287.1901,492.8553,291.9753,487.4608,285.1553,485.1185,280.37,490.513" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="330.5" y="455.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="340.5" y="462.1">atfloat</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000197769253782961588">
+      <path codeLine="113" d="M280.34,455.263 C290.3,450.293 300.26,445.493 310,441.023 C359.73,418.173 373.86,416.513 425,397.023 C442.62,390.313 456.2502,385.1214 473.5402,378.5614 " fill="none" id="C_0001758213171584933144-to-C_0000197769253782961588" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="479.15,376.433,469.3164,375.8858,474.4752,378.2067,472.1542,383.3655,479.15,376.433" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="332.5" y="398.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="342.5" y="405.1">afloat</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000895940711566401184">
+      <path codeLine="114" d="M290.1194,646.0131 C300.0094,653.3031 300.27,653.303 310,660.023 C346.25,685.063 357.5,687.903 395,711.023 C408.43,719.303 410.88,722.963 425,730.023 C439.71,737.383 456.08,744.233 471.53,750.143 " fill="none" id="C_0001758213171584933144-backto-C_0000895940711566401184" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="280.46,638.893,282.9164,645.6728,290.1194,646.0131,287.6631,639.2332,280.46,638.893" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="320.5" y="649.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="56" x="330.5" y="656.1">boolstring</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0001751732625010742161">
+      <path codeLine="115" d="M291.2424,592.123 C337.0624,611.383 377.61,628.113 425,647.023 C438.69,652.483 453.42,658.193 467.47,663.553 " fill="none" id="C_0001758213171584933144-backto-C_0001751732625010742161" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="280.18,587.473,284.1612,593.4855,291.2424,592.123,287.2612,586.1105,280.18,587.473" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="320" y="592.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="57" x="330" y="599.1">floatstring</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000887121441210847583">
+      <path codeLine="116" d="M211.8967,699.471 C237.6767,750.671 266.56,793.603 310,833.023 C340.38,860.593 360.39,846.993 395,869.023 C410.13,878.653 409.69,886.683 425,896.023 C441.01,905.793 459.73,913.893 477.05,920.243 " fill="none" id="C_0001758213171584933144-backto-C_0000887121441210847583" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="206.5,688.753,205.6257,695.9109,211.8967,699.471,212.771,692.3131,206.5,688.753" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="325.5" y="822.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="335.5" y="829.1">intstring</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0001119452495635561975">
+      <path codeLine="117" d="M192.6845,699.9619 C218.3745,770.1519 253.22,838.023 310,894.023 C339.34,922.953 363.79,904.123 395,931.023 C414.06,947.443 405.56,963.053 425,979.023 C434.69,986.973 446.08,993.493 457.77,998.793 " fill="none" id="C_0001758213171584933144-backto-C_0001119452495635561975" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="188.56,688.693,186.8659,695.7023,192.6845,699.9619,194.3786,692.9526,188.56,688.693" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="316.5" y="883.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="64" x="326.5" y="890.1">stringstring</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0001119452495635561975">
+      <path codeLine="118" d="M173.7603,700.4322 C196.0003,790.3822 234.32,886.793 310,956.023 C350.12,992.723 409.94,1008.513 457.53,1015.243 " fill="none" id="C_0001758213171584933144-backto-C_0001119452495635561975-1" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="170.88,688.783,168.4371,695.5677,173.7603,700.4322,176.2032,693.6475,170.88,688.783" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="313" y="945.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="71" x="323" y="952.1">bstringstring</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0002017665567517853203">
+      <path codeLine="119" d="M218.419,360.9392 C243.359,318.2092 269.62,286.183 310,257.023 C430.35,170.113 497.12,203.503 643,231.023 C683.41,238.643 726.68,256.153 758.17,270.783 " fill="none" id="C_0001758213171584933144-backto-C_0002017665567517853203" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="212.37,371.303,218.8491,368.1374,218.419,360.9392,211.9399,364.1047,212.37,371.303" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="512" y="191.323"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="522" y="198.1">atfloat</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000340562099063642390">
+      <path codeLine="123" d="M167.6,688.663 C188.97,790.333 230.41,919.373 310,1008.023 C352.17,1054.993 415.6518,1078.1076 465.8218,1090.3776 " fill="none" id="C_0001758213171584933144-to-C_0000340562099063642390" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="471.65,1091.803,463.8579,1085.7794,466.7931,1090.6152,461.9574,1093.5504,471.65,1091.803" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0000340562099063642390">
+      <path codeLine="124" d="M171.45,688.713 C198.99,835.683 247.19,1038.893 310,1089.023 C355.02,1124.963 416.9139,1124.7861 465.9339,1117.5761 " fill="none" id="C_0001758213171584933144-to-C_0000340562099063642390-1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="471.87,1116.703,462.3837,1114.0552,466.9232,1117.4306,463.5479,1121.9701,471.87,1116.703" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="344.5" cy="1081.323" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="351.5" y="1085.1">cb</text>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0001388877149159894665">
+      <path codeLine="125" d="M280.28,683.373 C290.01,692.073 299.96,700.373 310,708.023 C343.83,733.813 365.23,721.633 395,752.023 C416.14,773.603 402.65,792.693 425,813.023 C435.61,822.673 443.1953,827.769 456.5853,833.509 " fill="none" id="C_0001758213171584933144-to-C_0001388877149159894665" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="462.1,835.873,455.404,828.6505,457.5045,833.903,452.252,836.0034,462.1,835.873" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001758213171584933144_C_0001388877149159894665">
+      <path codeLine="126" d="M228.93,688.813 C251.75,721.383 278.91,753.003 310,777.023 C316.38,781.953 393.6241,808.0771 456.5041,828.8971 " fill="none" id="C_0001758213171584933144-to-C_0001388877149159894665-1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="462.2,830.783,454.9135,824.1568,457.4534,829.2114,452.3989,831.7513,462.2,830.783" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="341" cy="769.323" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="348" y="773.1">gcb</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00014_class_mermaid.svg b/docs/test_cases/t00014_class_mermaid.svg
index 69548c78..d5b58ad7 100644
--- a/docs/test_cases/t00014_class_mermaid.svg
+++ b/docs/test_cases/t00014_class_mermaid.svg
@@ -1,90 +1,95 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1199.421875 1349.5" style="max-width: 1199.42px; background-color: white;" width="1199.421875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1005.0625,406L1020.5625,406C1036.0625,406,1067.0625,406,1091.2620062426986,468.9166666666667C1115.4615124853972,531.8333333333334,1132.8605249707944,657.6666666666666,1141.560031213493,720.5833333333334L1150.2595374561915,783.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1073.0625,725L1077.2291666666667,725C1081.3958333333333,725,1089.7291666666667,725,1099.1894292335626,734.75C1108.6496918004586,744.5,1119.2368836009175,764,1124.5304795011468,773.75L1129.8240754013761,783.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M983.28125,941L1002.4114583333334,941C1021.5416666666666,941,1059.8020833333333,941,1084.140472887461,931.5833333333334C1108.4788624415887,922.1666666666666,1118.8952248831777,903.3333333333334,1124.103406103972,893.9166666666666L1129.3115873247664,884.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M992.6171875,1262L1010.19140625,1262C1027.765625,1262,1062.9140625,1262,1089.1877874926986,1199.0833333333333C1115.4615124853972,1136.1666666666667,1132.8605249707944,1010.3333333333334,1141.560031213493,947.4166666666666L1150.2595374561915,884.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M648.484375,832L669.6145833333334,832C690.7447916666666,832,733.0052083333334,832,774.0017381020642,845.4166666666666C814.9982678707951,858.8333333333334,854.7309107415903,885.6666666666666,874.5972321769877,899.0833333333334L894.4635536123853,912.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M659.5859375,939L678.8658854166666,939C698.1458333333334,939,736.7057291666666,939,775.1158854166666,939.2370556819466C813.5260416666666,939.474111363893,851.7864583333334,939.9482227277862,870.9166666666666,940.1852784097327L890.046875,940.4223340916792"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M668.921875,1153L686.6458333333334,1153C704.3697916666666,1153,739.8177083333334,1153,777.4079881020642,1166.4166666666667C814.9982678707951,1179.8333333333333,854.7309107415903,1206.6666666666667,874.5972321769877,1220.0833333333333L894.4635536123853,1233.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M659.59375,1046L678.8723958333334,1046C698.1510416666666,1046,736.7083333333334,1046,775.5853608630952,1033.25C814.4623883928571,1020.5,853.6591517857142,995,873.2575334821428,982.25L892.8559151785714,969.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M668.9296875,1260L686.65234375,1260C704.375,1260,739.8203125,1260,775.1171875,1260.2177743356406C810.4140625,1260.4355486712814,845.5625,1260.8710973425625,863.13671875,1261.088871678203L880.7109375,1261.3066460138439"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M682.2578125,190L697.7591145833334,190C713.2604166666666,190,744.2630208333334,190,783.1147913049768,221.25C821.9665617766204,252.5,868.6674985532408,315,892.017966941551,346.25L915.3684353298611,377.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M750.265625,725L754.4322916666666,725C758.5989583333334,725,766.9322916666666,725,775.265625,725C783.5989583333334,725,791.9322916666666,725,796.0989583333334,725L800.265625,725"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M675.1484375,297L691.8346354166666,297C708.5208333333334,297,741.8932291666666,297,778.4457485187309,310.4166666666667C814.9982678707951,323.8333333333333,854.7309107415903,350.6666666666667,874.5972321769877,364.0833333333333L894.4635536123853,377.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M704.921875,404L716.6458333333334,404C728.3697916666666,404,751.8177083333334,404,779.0416666666666,404.19207125223875C806.265625,404.3841425044775,837.265625,404.768285008955,852.765625,404.9603562611937L868.265625,405.15242751343243"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M681.828125,511L697.4010416666666,511C712.9739583333334,511,744.1197916666666,511,779.2910900297619,498.25C814.4623883928571,485.5,853.6591517857142,460,873.2575334821428,447.25L892.8559151785714,434.5"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M695.609375,618L708.8854166666666,618C722.1614583333334,618,748.7135416666666,618,785.2730843406054,587.4166666666666C821.8326270145441,556.8333333333334,868.399629029088,495.6666666666667,891.6831300363601,465.0833333333333L914.9666310436321,434.5"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M241.46374857305938,360L264.6273425608828,302.8333333333333C287.79093654870627,245.66666666666666,334.1181245243531,131.33333333333334,381.9288539288432,80.31360705682302C429.7395833333333,29.29388078031269,479.0338541666667,41.58776156062538,503.6809895833333,47.73470195078173L528.328125,53.88164234093807"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id17" d="M279.74187458277703,769L296.5257809023142,797.3333333333334C313.30968722185133,825.6666666666666,346.87749986092564,882.3333333333334,390.64838534712953,910.6666666666666C434.4192708333333,939,488.3932291666667,939,515.3802083333334,939L542.3671875,939"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M240.49153880866425,769L263.8171677572202,827.25C287.14279670577616,885.5,333.7940546028881,1002,382.55067313477736,1064.2284345330877C431.3072916666667,1126.4568690661754,482.1692708333333,1134.413738132351,507.6002604166667,1138.3921726654387L533.03125,1142.3706071985264"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id19" d="M231.4218624598716,769L256.25910413322634,838.75C281.09634580658104,908.5,330.77082915329055,1048,381.0390604099786,1113.7715654669123C431.3072916666667,1179.5431309338246,482.1692708333333,1171.586261867649,507.6002604166667,1167.6078273345613L533.03125,1163.6293928014736"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id20" d="M260.0938373881432,769L280.1524165734526,809.4166666666666C300.2109957587621,849.8333333333334,340.32815412938106,930.6666666666666,387.3724103980239,975.3049838222096C434.4166666666667,1019.9433009777525,488.3880208333333,1028.386601955505,515.3736979166666,1032.6082524443814L542.359375,1036.8299029332577"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id21" d="M223.83096131380302,769L249.9333531781692,850.8333333333334C276.0357450425353,932.6666666666666,328.2405287712677,1096.3333333333333,379.77260813563385,1178.1666666666667C431.3046875,1260,482.1640625,1260,507.59375,1260L533.0234375,1260"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id22" d="M279.74187458277703,360L296.5257809023142,331.6666666666667C313.30968722185133,303.3333333333333,346.87749986092564,246.66666666666666,386.8697395137962,218.33333333333334C426.8619791666667,190,473.2786458333333,190,496.4869791666667,190L519.6953125,190"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id23" d="M309.203125,673.4575468375828L321.0768229166667,682.0479556979857C332.9505208333333,690.6383645583886,356.6979166666667,707.8191822791943,380.4453125,716.4095911395971C404.1927083333333,725,427.9401041666667,725,439.8138020833333,725L451.6875,725"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id24" d="M309.203125,382.90408860402874L321.0768229166667,368.5867405033573C332.9505208333333,354.2693924026858,356.6979166666667,325.63469620134293,392.96484375,311.3173481006715C429.2317708333333,297,478.0182291666667,297,502.4114583333333,297L526.8046875,297"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id25" d="M309.203125,432.12167206648826L321.0768229166667,421.68472672207355C332.9505208333333,411.24778137765884,356.6979166666667,390.3738906888295,388.0026041666667,382.9767373948611C419.3072916666667,375.57958410089276,458.1692708333333,381.65916820178546,477.6002604166667,384.69896025223187L497.03125,387.7387523026782"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id26" d="M309.203125,482.0181187491196L321.0768229166667,475.5150989575997C332.9505208333333,469.01207916607973,356.6979166666667,456.00603958303986,388.0026041666667,446.066733125798C419.3072916666667,436.1274266685561,458.1692708333333,429.2548533371121,477.6002604166667,425.8185666713901L497.03125,422.3822800056681"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id27" d="M217.6732381184896,769L244.80191718207467,862.9166666666666C271.93059624565973,956.8333333333334,326.1879543728299,1144.6666666666667,390.07184176974823,1238.5833333333333C453.9557291666667,1332.5,527.4661458333334,1332.5,593.26953125,1332.5C659.0729166666666,1332.5,717.1692708333334,1332.5,763.7916666666666,1324.8234546686674C810.4140625,1317.1469093373348,845.5625,1301.7938186746696,863.13671875,1294.117273343337L880.7109375,1286.4407280120045"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M246.5221959786822,769L268.8427153989018,820.9166666666666C291.16323481912144,872.8333333333334,335.80427365956075,976.6666666666666,385.1104701631137,1024.3616828444572C434.4166666666667,1072.0566990222476,488.3880208333333,1063.613398044495,515.3736979166666,1059.3917475556186L542.359375,1055.1700970667423"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id29" d="M247.64385273552503,360L269.77742936293754,309.1666666666667C291.91100599035,258.3333333333333,336.178159245175,156.66666666666666,382.95887128925415,107.73329672665439C429.7395833333333,58.7999267866421,479.0338541666667,62.59985357328421,503.6809895833333,64.49981696660525L528.328125,66.39978035992631"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id30" d="M254.82011366648993,360L275.7576468054083,315.5C296.69517994432664,271,338.57024622216335,182,384.1549147777484,135.15298639648577C429.7395833333333,88.30597279297153,479.0338541666667,83.61194558594303,503.6809895833333,81.26493198242879L528.328125,78.91791837891455"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id31" d="M309.203125,501.7051521341034L321.0768229166667,496.7542934450862C332.9505208333333,491.80343475606895,356.6979166666667,481.90171737803445,391.8515625,481.0678170282549C427.0052083333333,480.2339166784753,473.5651041666667,488.4678333569505,496.8450520833333,492.5847916961882L520.125,496.7017500354258"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id32" d="M309.203125,554.6564833075081L321.0768229166667,553.8804027562568C332.9505208333333,553.1043222050054,356.6979166666667,551.5521611025027,391.8515625,546.6591222120137C427.0052083333333,541.7660833215247,473.5651041666667,533.5321666430494,496.8450520833333,529.4152083038118L520.125,525.2982499645742"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id33" d="M309.203125,574.3435166924919L321.0768229166667,575.1195972437432C332.9505208333333,575.8956777949946,356.6979166666667,577.4478388974973,389.5546875,581.934685354941C422.4114583333333,586.4215318123848,464.3776041666667,593.8430636247698,485.3606770833333,597.5538295309622L506.34375,601.2645954371546"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id34" d="M309.203125,624.2399633751232L321.0768229166667,628.9499694792694C332.9505208333333,633.6599755834155,356.6979166666667,643.0799877917078,389.5546875,644.5073932865298C422.4114583333333,645.9347987813518,464.3776041666667,639.3695975627037,485.3606770833333,636.0869969533796L506.34375,632.8043963440556"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id35" d="M263.2544964677047,360L282.7862991397539,321.8333333333333C302.31810181180316,283.6666666666667,341.38170715590155,207.33333333333334,385.56064524461743,162.57267606631714C429.7395833333333,117.81201879930093,479.0338541666667,104.62403759860187,503.6809895833333,98.03004699825232L528.328125,91.43605639790279"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1005.0625,406L1020.5625,406C1036.0625,406,1067.0625,406,1090.851104698673,465.94493990918755C1114.6397093973458,525.8898798183751,1131.2169187946915,645.7797596367502,1139.5055234933645,705.7246995459377L1147.7941281920373,765.6696394551253"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1073.0625,725L1077.2291666666667,725C1081.3958333333333,725,1089.7291666666667,725,1097.7579993515283,732.11352347008C1105.7868320363898,739.22704694016,1113.5111640727798,753.4540938803199,1117.3733300909748,760.5676173503999L1121.2354961091698,767.68114082048"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M983.28125,941L1002.4114583333334,941C1021.5416666666666,941,1059.8020833333333,941,1082.6885104460423,934.2085580987027C1105.574937558751,927.4171161974054,1113.087375117502,913.8342323948109,1116.8435938968776,907.0427904935136L1120.599812676253,900.2513485922165"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M992.6171875,1262L1010.19140625,1262C1027.765625,1262,1062.9140625,1262,1088.776885948673,1202.0550600908125C1114.6397093973458,1142.1101201816248,1131.2169187946915,1022.2202403632497,1139.5055234933645,962.2753004540622L1147.7941281920373,902.3303605448747"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M648.484375,832L669.6145833333334,832C690.7447916666666,832,733.0052083333334,832,771.5155925500004,843.7376549651132C810.0259767666676,855.4753099302264,844.7863285333351,878.9506198604527,862.1665044166689,890.6882748255658L879.5466803000028,902.425929790679"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M659.5859375,939L678.8658854166666,939C698.1458333333334,939,736.7057291666666,939,772.1161157212528,939.199883454732C807.5265022758389,939.3997669094639,839.7873795516775,939.7995338189279,855.9178181895969,939.9994172736598L872.0482568275163,940.1993007283917"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M668.921875,1153L686.6458333333334,1153C704.3697916666666,1153,739.8177083333334,1153,774.9218425500004,1164.7376549651133C810.0259767666676,1176.4753099302263,844.7863285333351,1199.9506198604527,862.1665044166689,1211.688274825566L879.5466803000028,1223.425929790679"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M659.59375,1046L678.8723958333334,1046C698.1510416666666,1046,736.7083333333334,1046,773.0706781906943,1034.8859618140796C809.4330230480551,1023.7719236281591,843.6004210961104,1001.5438472563181,860.6841201201379,990.4298090703977L877.7678191441656,979.3157708844772"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M668.9296875,1260L686.65234375,1260C704.375,1260,739.8203125,1260,772.1174178045861,1260.180602108426C804.4145231091721,1260.3612042168522,833.5634212183442,1260.7224084337042,848.1378702729303,1260.9030105421305L862.7123193275163,1261.0836126505565"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M682.2578125,190L697.7591145833334,190C713.2604166666666,190,744.2630208333334,190,781.3190776690757,218.8467911997001C818.3751345048181,247.69358239940027,861.4846440096362,305.38716479880054,883.0393987620452,334.2339559985007L904.5941535144542,363.0807471982008"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M750.265625,725L754.4322916666666,725C758.5989583333334,725,766.9322916666666,725,772.265625,725C777.5989583333334,725,779.9322916666666,725,781.0989583333334,725L782.265625,725"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M675.1484375,297L691.8346354166666,297C708.5208333333334,297,741.8932291666666,297,775.9596029666671,308.73765496511317C810.0259767666676,320.47530993022633,844.7863285333351,343.95061986045266,862.1665044166689,355.6882748255659L879.5466803000028,367.42592979067905"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M704.921875,404L716.6458333333334,404C728.3697916666666,404,751.8177083333334,404,776.0418969712528,404.1548990250242C800.2660856091721,404.30979805004836,825.2665462183442,404.61959610009666,837.7667765229303,404.77449512512084L850.2670068275163,404.92939415014496"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M681.828125,511L697.4010416666666,511C712.9739583333334,511,744.1197916666666,511,776.7764073573609,499.88596181407956C809.4330230480551,488.7719236281591,843.6004210961104,466.5438472563181,860.6841201201379,455.42980907039765L877.7678191441656,444.31577088447716"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M695.609375,618L708.8854166666666,618C722.1614583333334,618,748.7135416666666,618,783.455847960115,589.8036421456824C818.1981542535633,561.6072842913649,861.1306835071267,505.21456858272956,882.5969481339083,477.018210728412L904.06321276069,448.82185287409436"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M248.22341237694872,343.3174658622142L270.2603957307906,288.93122155184517C292.2973790846325,234.54497724147612,336.3713457923163,125.77248862073806,383.05546456282474,77.53318470052538C429.7395833333333,29.29388078031269,479.0338541666667,41.58776156062538,503.6809895833333,47.73470195078173L528.328125,53.88164234093807"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id17" d="M288.9158024522113,784.4867377922666L304.1707207935094,810.2389481602222C319.42563913480757,835.9911585281776,349.93547581740376,887.4955792640889,392.17737332536854,913.2477896320444C434.4192708333333,939,488.3932291666667,939,515.3802083333334,939L542.3671875,939"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M247.1829085348524,785.7100440211105L269.39330919571034,841.1750366842589C291.6037098565683,896.6400293474071,336.0245111782842,1007.5700146737036,383.66590142247543,1067.0134418699395C431.3072916666667,1126.4568690661754,482.1692708333333,1134.413738132351,507.6002604166667,1138.3921726654387L533.03125,1142.3706071985264"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id19" d="M237.4600735386465,785.9570046579034L261.2909466988721,852.8808372149196C285.1218198590977,919.8046697719356,332.7835661795488,1053.6523348859678,382.04542892310775,1116.5977329098962C431.3072916666667,1179.5431309338246,482.1692708333333,1171.586261867649,507.6002604166667,1167.6078273345613L533.03125,1163.6293928014736"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id20" d="M268.0958532197089,785.1235152070313L286.8207630997574,822.8529293391927C305.54567297980594,860.5823434713542,342.995492739903,936.041171735677,388.70607970328484,977.9922363567148C434.4166666666667,1019.9433009777525,488.3880208333333,1028.386601955505,515.3736979166666,1032.6082524443814L542.359375,1036.8299029332577"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id21" d="M223.83096131380302,769L249.9333531781692,850.8333333333334C276.0357450425353,932.6666666666666,328.2405287712677,1096.3333333333333,378.77260813563385,1178.1666666666667C429.3046875,1260,478.1640625,1260,502.59375,1260L527.0234375,1260"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id22" d="M288.9158024522113,344.5132622077334L304.1707207935094,318.76105183977785C319.42563913480757,293.0088414718223,349.93547581740376,241.50442073591114,388.3987274920352,215.7522103679556C426.8619791666667,190,473.2786458333333,190,496.4869791666667,190L519.6953125,190"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id23" d="M323.78662470078376,684.008449001722L333.22973933398646,690.8403741681017C342.67285396718916,697.6722993344814,361.55908323359455,711.3361496672406,382.87589578346393,718.1680748336203C404.1927083333333,725,427.9401041666667,725,439.8138020833333,725L451.6875,725"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id24" d="M320.69361509329826,369.04881388947274L330.65223132774855,357.0406782412272C340.61084756219884,345.0325425929818,360.5280800310995,321.0162712964909,394.8799254322164,309.00813564824546C429.2317708333333,297,478.0182291666667,297,502.4114583333333,297L526.8046875,297"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id25" d="M322.7226909025641,420.23801363121567L332.3431278354701,411.781678026013C341.9635647683761,403.3253424208104,361.2044386341881,386.4126712104052,390.2558651504273,380.996127655649C419.3072916666667,375.57958410089276,458.1692708333333,381.65916820178546,477.6002604166667,384.69896025223187L497.03125,387.7387523026782"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id26" d="M324.9904339754749,473.37168160351507L334.2329137295624,468.30973466959585C343.4753934836499,463.2477877356767,361.96035299182495,453.1238938678384,390.6338223292458,444.6256602681972C419.3072916666667,436.1274266685561,458.1692708333333,429.2548533371121,477.6002604166667,425.8185666713901L497.03125,422.3822800056681"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id27" d="M222.66847560222905,786.2929928722892L248.96461508519087,877.3274940602411C275.26075456815266,968.3619952481928,327.85303353407636,1150.4309976240963,390.9043813503715,1241.4654988120483C453.9557291666667,1332.5,527.4661458333334,1332.5,593.26953125,1332.5C659.0729166666666,1332.5,717.1692708333334,1332.5,763.7916666666666,1324.8234546686674C810.4140625,1317.1469093373348,845.5625,1301.7938186746696,863.13671875,1294.117273343337L880.7109375,1286.4407280120045"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M253.63171504185672,785.5364669349398L274.7673146182139,834.6970557791165C295.90291419457117,883.8576446232931,338.1741133472856,982.1788223116465,386.2953900069761,1027.117760666947C434.4166666666667,1072.0566990222476,488.3880208333333,1063.613398044495,515.3736979166666,1059.3917475556186L542.359375,1055.1700970667423"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id29" d="M254.82969387603376,343.4965552958368L275.76563031336144,295.41379607986397C296.70156675068915,247.3310368638912,338.5734396253446,151.1655184319456,384.15651147933903,104.98272260929384C429.7395833333333,58.7999267866421,479.0338541666667,62.59985357328421,503.6809895833333,64.49981696660525L528.328125,66.39978035992631"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id30" d="M262.48336858738014,343.71274964834606L282.14369257281675,301.9272913736217C301.8040165582534,260.1418330988974,341.12466452912673,176.5709165494487,385.43212393123,132.4384446712101C429.7395833333333,88.30597279297153,479.0338541666667,83.61194558594303,503.6809895833333,81.26493198242879L528.328125,78.91791837891455"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id31" d="M309.203125,501.7051521341034L321.0768229166667,496.7542934450862C332.9505208333333,491.80343475606895,356.6979166666667,481.90171737803445,390.8668422198936,480.8936734956528C425.03576777312054,479.8856296132711,469.62622304624097,487.7712592265422,491.9214506828012,491.7140740331777L514.2166783193614,495.65688883981335"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id32" d="M309.203125,554.6564833075081L321.0768229166667,553.8804027562568C332.9505208333333,553.1043222050054,356.6979166666667,551.5521611025027,390.8668422198936,546.8332657446158C425.03576777312054,542.1143703867289,469.62622304624097,534.2287407734577,491.9214506828012,530.2859259668222L514.2166783193614,526.3431111601866"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id33" d="M309.203125,574.3435166924919L321.0768229166667,575.1195972437432C332.9505208333333,575.8956777949946,356.6979166666667,577.4478388974973,388.5699672198936,581.760541822339C420.44201777312054,586.0732447471808,460.43872304624097,593.1464894943615,480.4370756828012,596.6831118679519L500.43542831936145,600.2197342415423"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id34" d="M309.203125,624.2399633751232L321.0768229166667,628.9499694792694C332.9505208333333,633.6599755834155,356.6979166666667,643.0799877917078,388.5667041774065,644.6619538063177C420.4354916881463,646.2439198209277,460.4256708762926,639.9878396418553,480.4207604703658,636.8597995523191L500.415850064439,633.731759462783"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id35" d="M271.4546150804234,343.9763283003756L289.61973131701956,308.48027358364635C307.78484755361563,272.98421886691705,344.11508002680785,201.99210943345852,386.9273316800706,159.90206411637973C429.7395833333333,117.81201879930093,479.0338541666667,104.62403759860187,503.6809895833333,98.03004699825232L528.328125,91.43605639790279"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -474,7 +479,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L21">
+        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000765890579167335652-0" class="node default clickable">
             <rect height="101" width="68.359375" y="-50.5" x="-34.1796875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.1796875" x1="-34.1796875" class="divider"/>
@@ -503,7 +508,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L26">
+        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L26">
           <g title="B" id="classId-C_0000934136012292043506-1" class="node default clickable">
             <rect height="79" width="145.296875" y="-39.5" x="-72.6484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="72.6484375" x1="-72.6484375" class="divider"/>
@@ -527,7 +532,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30">
+        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0002186387853087008570-2" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -546,7 +551,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L31">
+        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31">
           <g title="A" id="classId-C_0000947292733740993297-3" class="node default clickable">
             <rect height="57" width="272.796875" y="-28.5" x="-136.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="136.3984375" x1="-136.3984375" class="divider"/>
@@ -565,7 +570,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L34">
+        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34">
           <g title="A" id="classId-C_0001700006390494465667-4" class="node default clickable">
             <rect height="57" width="93.234375" y="-28.5" x="-46.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="46.6171875" x1="-46.6171875" class="divider"/>
@@ -584,7 +589,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L37">
+        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37">
           <g title="A" id="classId-C_0002017665567517853203-5" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
@@ -603,7 +608,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L41">
+        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41">
           <g title="A" id="classId-C_0000906557320263235873-6" class="node default clickable">
             <rect height="57" width="95.015625" y="-28.5" x="-47.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.5078125" x1="-47.5078125" class="divider"/>
@@ -622,7 +627,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L34">
+        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34">
           <g title="A" id="classId-C_0000378898020828430636-7" class="node default clickable">
             <rect height="57" width="117.21875" y="-28.5" x="-58.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.609375" x1="-58.609375" class="divider"/>
@@ -641,7 +646,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L37">
+        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37">
           <g title="A" id="classId-C_0002082013375525130414-8" class="node default clickable">
             <rect height="57" width="135.890625" y="-28.5" x="-67.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.9453125" x1="-67.9453125" class="divider"/>
@@ -660,7 +665,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L41">
+        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41">
           <g title="A" id="classId-C_0000051978493292659230-9" class="node default clickable">
             <rect height="57" width="117.234375" y="-28.5" x="-58.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -679,7 +684,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L38">
+        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L38">
           <g title="A" id="classId-C_0000197769253782961588-10" class="node default clickable">
             <rect height="57" width="135.90625" y="-28.5" x="-67.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.953125" x1="-67.953125" class="divider"/>
@@ -698,7 +703,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L21">
+        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000895940711566401184-11" class="node default clickable">
             <rect height="57" width="162.5625" y="-28.5" x="-81.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.28125" x1="-81.28125" class="divider"/>
@@ -717,7 +722,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L31">
+        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31">
           <g title="A" id="classId-C_0001751732625010742161-12" class="node default clickable">
             <rect height="57" width="298.578125" y="-28.5" x="-149.2890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.2890625" x1="-149.2890625" class="divider"/>
@@ -736,7 +741,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30">
+        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0000887121441210847583-13" class="node default clickable">
             <rect height="57" width="148.34375" y="-28.5" x="-74.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.171875" x1="-74.171875" class="divider"/>
@@ -755,7 +760,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L30">
+        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0001119452495635561975-14" class="node default clickable">
             <rect height="57" width="207.890625" y="-28.5" x="-103.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="103.9453125" x1="-103.9453125" class="divider"/>
@@ -774,7 +779,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/#L111">
+        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L111">
           <g title="A" id="classId-C_0000340562099063642390-15" class="node default clickable">
             <rect height="57" width="161.703125" y="-28.5" x="-80.8515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="80.8515625" x1="-80.8515625" class="divider"/>
@@ -793,7 +798,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/#L111">
+        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L111">
           <g title="A" id="classId-C_0001388877149159894665-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -812,7 +817,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00014/t00014.cc#L56">
+        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L56">
           <g title="R" id="classId-C_0001758213171584933144-17" class="node default clickable">
             <rect height="409" width="301.203125" y="-204.5" x="-150.6015625" class="outer title-state"/>
             <line y2="-174.5" y1="-174.5" x2="150.6015625" x1="-150.6015625" class="divider"/>
diff --git a/docs/test_cases/t00015.md b/docs/test_cases/t00015.md
index 4a164bc9..395b6ddb 100644
--- a/docs/test_cases/t00015.md
+++ b/docs/test_cases/t00015.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00015.cc
+File `tests/t00015/t00015.cc`
 ```cpp
 namespace clanguml {
 namespace t00015 {
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index 54f7793d..a5b82925 100644
--- a/docs/test_cases/t00015_class.svg
+++ b/docs/test_cases/t00015_class.svg
@@ -1,59 +1,69 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="278px" preserveAspectRatio="none" style="width:372px;height:278px;background:#FFFFFF;" version="1.1" viewBox="0 0 372 278" width="372px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1x08zbirv7bc1" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x08zbirv7bc1)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
-      <ellipse cx="113" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M115.9688,29.6406 Q115.3906,29.9375 114.75,30.0781 Q114.1094,30.2344 113.4063,30.2344 Q110.9063,30.2344 109.5781,28.5938 Q108.2656,26.9375 108.2656,23.8125 Q108.2656,20.6875 109.5781,19.0313 Q110.9063,17.375 113.4063,17.375 Q114.1094,17.375 114.75,17.5313 Q115.4063,17.6875 115.9688,17.9844 L115.9688,20.7031 Q115.3438,20.125 114.75,19.8594 Q114.1563,19.5781 113.5313,19.5781 Q112.1875,19.5781 111.5,20.6563 Q110.8125,21.7188 110.8125,23.8125 Q110.8125,25.9063 111.5,26.9844 Q112.1875,28.0469 113.5313,28.0469 Q114.1563,28.0469 114.75,27.7813 Q115.3438,27.5 115.9688,26.9219 L115.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="127" y="28.1543">ns1::A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001410694888805149453">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001410694888805149453" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="72" x="100" y="7"/>
+        <ellipse cx="115" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M110,24.1563 C110,26.6563 112.1406,28.4688 115.0625,28.4688 C116.2969,28.4688 117.4688,28.1719 118.2188,27.6563 C118.8281,27.2344 119.1563,26.8125 119.1563,26.4063 C119.1563,25.9375 118.7344,25.5313 118.2344,25.5313 C118,25.5313 117.7813,25.6094 117.5781,25.8125 C117.1406,26.25 117.1406,26.25 116.9688,26.3438 C116.5156,26.5781 115.875,26.7188 115.1094,26.7188 C113.1094,26.7188 111.8281,25.7031 111.8281,24.125 L111.8281,23.0781 C111.8281,21.375 113.0469,20.1719 114.75,20.1719 C115.3281,20.1719 115.9063,20.3125 116.375,20.5625 C116.8438,20.8281 117.0156,21.0156 117.0781,21.375 C117.2031,22.0469 117.4531,22.2969 117.9844,22.2969 C118.2656,22.2969 118.5469,22.1563 118.7344,21.9375 C118.8594,21.7656 118.9063,21.5938 118.9063,21.1563 L118.9063,19.7969 C118.9063,19.375 118.8906,19.2344 118.7656,19.0625 C118.5938,18.8125 118.3125,18.6563 117.9844,18.6563 C117.6719,18.6563 117.4688,18.7656 117.25,19.0313 C116.0781,18.5313 115.6406,18.4219 114.6875,18.4219 C112.0156,18.4219 110,20.4375 110,23.0625 L110,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="129" y="27.606">ns1::A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="101" x2="171" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="101" x2="171" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x08zbirv7bc1)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
-      <ellipse cx="219.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M222.4688,29.6406 Q221.8906,29.9375 221.25,30.0781 Q220.6094,30.2344 219.9063,30.2344 Q217.4063,30.2344 216.0781,28.5938 Q214.7656,26.9375 214.7656,23.8125 Q214.7656,20.6875 216.0781,19.0313 Q217.4063,17.375 219.9063,17.375 Q220.6094,17.375 221.25,17.5313 Q221.9063,17.6875 222.4688,17.9844 L222.4688,20.7031 Q221.8438,20.125 221.25,19.8594 Q220.6563,19.5781 220.0313,19.5781 Q218.6875,19.5781 218,20.6563 Q217.3125,21.7188 217.3125,23.8125 Q217.3125,25.9063 218,26.9844 Q218.6875,28.0469 220.0313,28.0469 Q220.6563,28.0469 221.25,27.7813 Q221.8438,27.5 222.4688,26.9219 L222.4688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="233.5" y="28.1543">ns1::ns2_v0_9_0::A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000485552648049088863">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000485552648049088863" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="158" x="207" y="7"/>
+        <ellipse cx="222" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M217,24.1563 C217,26.6563 219.1406,28.4688 222.0625,28.4688 C223.2969,28.4688 224.4688,28.1719 225.2188,27.6563 C225.8281,27.2344 226.1563,26.8125 226.1563,26.4063 C226.1563,25.9375 225.7344,25.5313 225.2344,25.5313 C225,25.5313 224.7813,25.6094 224.5781,25.8125 C224.1406,26.25 224.1406,26.25 223.9688,26.3438 C223.5156,26.5781 222.875,26.7188 222.1094,26.7188 C220.1094,26.7188 218.8281,25.7031 218.8281,24.125 L218.8281,23.0781 C218.8281,21.375 220.0469,20.1719 221.75,20.1719 C222.3281,20.1719 222.9063,20.3125 223.375,20.5625 C223.8438,20.8281 224.0156,21.0156 224.0781,21.375 C224.2031,22.0469 224.4531,22.2969 224.9844,22.2969 C225.2656,22.2969 225.5469,22.1563 225.7344,21.9375 C225.8594,21.7656 225.9063,21.5938 225.9063,21.1563 L225.9063,19.7969 C225.9063,19.375 225.8906,19.2344 225.7656,19.0625 C225.5938,18.8125 225.3125,18.6563 224.9844,18.6563 C224.6719,18.6563 224.4688,18.7656 224.25,19.0313 C223.0781,18.5313 222.6406,18.4219 221.6875,18.4219 C219.0156,18.4219 217,20.4375 217,23.0625 L217,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="236" y="27.606">ns1::ns2_v0_9_0::A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="208" x2="364" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="208" x2="364" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x08zbirv7bc1)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
-      <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="35" y="136.1543">ns1::Anon</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="156" y2="156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <g id="elem_C_0001060731132374575329">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001060731132374575329" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="96" x="7" y="115"/>
+        <ellipse cx="22" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,132.1563 C17,134.6563 19.1406,136.4688 22.0625,136.4688 C23.2969,136.4688 24.4688,136.1719 25.2188,135.6563 C25.8281,135.2344 26.1563,134.8125 26.1563,134.4063 C26.1563,133.9375 25.7344,133.5313 25.2344,133.5313 C25,133.5313 24.7813,133.6094 24.5781,133.8125 C24.1406,134.25 24.1406,134.25 23.9688,134.3438 C23.5156,134.5781 22.875,134.7188 22.1094,134.7188 C20.1094,134.7188 18.8281,133.7031 18.8281,132.125 L18.8281,131.0781 C18.8281,129.375 20.0469,128.1719 21.75,128.1719 C22.3281,128.1719 22.9063,128.3125 23.375,128.5625 C23.8438,128.8281 24.0156,129.0156 24.0781,129.375 C24.2031,130.0469 24.4531,130.2969 24.9844,130.2969 C25.2656,130.2969 25.5469,130.1563 25.7344,129.9375 C25.8594,129.7656 25.9063,129.5938 25.9063,129.1563 L25.9063,127.7969 C25.9063,127.375 25.8906,127.2344 25.7656,127.0625 C25.5938,126.8125 25.3125,126.6563 24.9844,126.6563 C24.6719,126.6563 24.4688,126.7656 24.25,127.0313 C23.0781,126.5313 22.6406,126.4219 21.6875,126.4219 C19.0156,126.4219 17,128.4375 17,131.0625 L17,132.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="36" y="135.606">ns1::Anon</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="102" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="102" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x08zbirv7bc1)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
-      <ellipse cx="151" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M153.9688,137.6406 Q153.3906,137.9375 152.75,138.0781 Q152.1094,138.2344 151.4063,138.2344 Q148.9063,138.2344 147.5781,136.5938 Q146.2656,134.9375 146.2656,131.8125 Q146.2656,128.6875 147.5781,127.0313 Q148.9063,125.375 151.4063,125.375 Q152.1094,125.375 152.75,125.5313 Q153.4063,125.6875 153.9688,125.9844 L153.9688,128.7031 Q153.3438,128.125 152.75,127.8594 Q152.1563,127.5781 151.5313,127.5781 Q150.1875,127.5781 149.5,128.6563 Q148.8125,129.7188 148.8125,131.8125 Q148.8125,133.9063 149.5,134.9844 Q150.1875,136.0469 151.5313,136.0469 Q152.1563,136.0469 152.75,135.7813 Q153.3438,135.5 153.9688,134.9219 L153.9688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="125" x="165" y="136.1543">ns3::ns1::ns2::Anon</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="156" y2="156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <g id="elem_C_0001797521288354158629">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001797521288354158629" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="158" x="138" y="115"/>
+        <ellipse cx="153" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M148,132.1563 C148,134.6563 150.1406,136.4688 153.0625,136.4688 C154.2969,136.4688 155.4688,136.1719 156.2188,135.6563 C156.8281,135.2344 157.1563,134.8125 157.1563,134.4063 C157.1563,133.9375 156.7344,133.5313 156.2344,133.5313 C156,133.5313 155.7813,133.6094 155.5781,133.8125 C155.1406,134.25 155.1406,134.25 154.9688,134.3438 C154.5156,134.5781 153.875,134.7188 153.1094,134.7188 C151.1094,134.7188 149.8281,133.7031 149.8281,132.125 L149.8281,131.0781 C149.8281,129.375 151.0469,128.1719 152.75,128.1719 C153.3281,128.1719 153.9063,128.3125 154.375,128.5625 C154.8438,128.8281 155.0156,129.0156 155.0781,129.375 C155.2031,130.0469 155.4531,130.2969 155.9844,130.2969 C156.2656,130.2969 156.5469,130.1563 156.7344,129.9375 C156.8594,129.7656 156.9063,129.5938 156.9063,129.1563 L156.9063,127.7969 C156.9063,127.375 156.8906,127.2344 156.7656,127.0625 C156.5938,126.8125 156.3125,126.6563 155.9844,126.6563 C155.6719,126.6563 155.4688,126.7656 155.25,127.0313 C154.0781,126.5313 153.6406,126.4219 152.6875,126.4219 C150.0156,126.4219 148,128.4375 148,131.0625 L148,132.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="167" y="135.606">ns3::ns1::ns2::Anon</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="295" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="295" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x08zbirv7bc1)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
-      <ellipse cx="194" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M196.9688,245.6406 Q196.3906,245.9375 195.75,246.0781 Q195.1094,246.2344 194.4063,246.2344 Q191.9063,246.2344 190.5781,244.5938 Q189.2656,242.9375 189.2656,239.8125 Q189.2656,236.6875 190.5781,235.0313 Q191.9063,233.375 194.4063,233.375 Q195.1094,233.375 195.75,233.5313 Q196.4063,233.6875 196.9688,233.9844 L196.9688,236.7031 Q196.3438,236.125 195.75,235.8594 Q195.1563,235.5781 194.5313,235.5781 Q193.1875,235.5781 192.5,236.6563 Q191.8125,237.7188 191.8125,239.8125 Q191.8125,241.9063 192.5,242.9844 Q193.1875,244.0469 194.5313,244.0469 Q195.1563,244.0469 195.75,243.7813 Q196.3438,243.5 196.9688,242.9219 L196.9688,245.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="208" y="244.1543">ns3::B</text>
-      <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"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000870882387819356092">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000870882387819356092" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="72" x="181" y="223"/>
+        <ellipse cx="196" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M191,240.1563 C191,242.6563 193.1406,244.4688 196.0625,244.4688 C197.2969,244.4688 198.4688,244.1719 199.2188,243.6563 C199.8281,243.2344 200.1563,242.8125 200.1563,242.4063 C200.1563,241.9375 199.7344,241.5313 199.2344,241.5313 C199,241.5313 198.7813,241.6094 198.5781,241.8125 C198.1406,242.25 198.1406,242.25 197.9688,242.3438 C197.5156,242.5781 196.875,242.7188 196.1094,242.7188 C194.1094,242.7188 192.8281,241.7031 192.8281,240.125 L192.8281,239.0781 C192.8281,237.375 194.0469,236.1719 195.75,236.1719 C196.3281,236.1719 196.9063,236.3125 197.375,236.5625 C197.8438,236.8281 198.0156,237.0156 198.0781,237.375 C198.2031,238.0469 198.4531,238.2969 198.9844,238.2969 C199.2656,238.2969 199.5469,238.1563 199.7344,237.9375 C199.8594,237.7656 199.9063,237.5938 199.9063,237.1563 L199.9063,235.7969 C199.9063,235.375 199.8906,235.2344 199.7656,235.0625 C199.5938,234.8125 199.3125,234.6563 198.9844,234.6563 C198.6719,234.6563 198.4688,234.7656 198.25,235.0313 C197.0781,234.5313 196.6406,234.4219 195.6875,234.4219 C193.0156,234.4219 191,236.4375 191,239.0625 L191,240.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="210" y="243.606">ns3::B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="182" x2="252" y1="255" y2="255"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="182" x2="252" y1="263" y2="263"/>
+      </g>
     </a>
-    <path d="M103.93,72.18 C92.9,86.8 80.72,102.93 71.1,115.68 " fill="none" id="C_0001410694888805149453&lt;-C_0001060731132374575329" 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;"/>
-    <path d="M163.44,72.18 C174.61,86.8 186.94,102.93 196.68,115.68 " fill="none" id="C_0001410694888805149453&lt;-C_0001797521288354158629" 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;"/>
-    <path d="M214.5,184.02 C214.5,197.58 214.5,212.04 214.5,223.68 " fill="none" id="C_0001797521288354158629&lt;-C_0000870882387819356092" 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;"/>
+    <g id="link_C_0001410694888805149453_C_0001060731132374575329">
+      <path codeLine="21" d="M107.2961,69.5662 C93.7961,87.2462 86.23,97.13 72.73,114.79 " fill="none" id="C_0001410694888805149453-backto-C_0001060731132374575329" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="118.22,55.26,102.5274,65.925,112.0649,73.2075,118.22,55.26" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001410694888805149453_C_0001797521288354158629">
+      <path codeLine="22" d="M164.7039,69.5662 C178.2039,87.2462 185.77,97.13 199.27,114.79 " fill="none" id="C_0001410694888805149453-backto-C_0001797521288354158629" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="153.78,55.26,159.9351,73.2075,169.4726,65.925,153.78,55.26" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001797521288354158629_C_0000870882387819356092">
+      <path codeLine="23" d="M217,181.26 C217,198.94 217,205.13 217,222.79 " fill="none" id="C_0001797521288354158629-backto-C_0000870882387819356092" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="217,163.26,211,181.26,223,181.26,217,163.26" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00015_class_mermaid.svg b/docs/test_cases/t00015_class_mermaid.svg
index a9900acc..23dbeb0b 100644
--- a/docs/test_cases/t00015_class_mermaid.svg
+++ b/docs/test_cases/t00015_class_mermaid.svg
@@ -1,58 +1,63 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 401.91015625 287" style="max-width: 401.91px; background-color: white;" width="401.91015625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M113.83203125,55.50775525943699L104.03580729166667,61.25646271619749C94.23958333333333,67.00517017295799,74.64713541666667,78.50258508647899,64.85091145833333,88.41795920990616C55.0546875,98.33333333333333,55.0546875,106.66666666666667,55.0546875,110.83333333333333L55.0546875,115"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M178.61328125,55.50775525943699L188.40950520833334,61.25646271619749C198.20572916666666,67.00517017295799,217.79817708333334,78.50258508647899,227.59440104166666,88.41795920990616C237.390625,98.33333333333333,237.390625,106.66666666666667,237.390625,110.83333333333333L237.390625,115"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M237.390625,172L237.390625,176.16666666666666C237.390625,180.33333333333334,237.390625,188.66666666666666,237.390625,197C237.390625,205.33333333333334,237.390625,213.66666666666666,237.390625,217.83333333333334L237.390625,222"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M98.30768237624903,64.6178920337158L91.09884989687419,68.84824336142984C83.89001741749935,73.07859468914387,69.47235245874968,81.53929734457193,62.26351997937484,89.93631533895264C55.0546875,98.33333333333333,55.0546875,106.66666666666667,55.0546875,110.83333333333333L55.0546875,115"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M194.13763012375097,64.6178920337158L201.34646260312581,68.84824336142984C208.55529508250063,73.07859468914387,222.97296004125033,81.53929734457193,230.18179252062518,89.93631533895264C237.390625,98.33333333333333,237.390625,106.66666666666667,237.390625,110.83333333333333L237.390625,115"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M237.390625,190L237.390625,191.16666666666666C237.390625,192.33333333333334,237.390625,194.66666666666666,237.390625,200C237.390625,205.33333333333334,237.390625,213.66666666666666,237.390625,217.83333333333334L237.390625,222"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -84,7 +89,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L6">
+        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L6">
           <g title="A" id="classId-C_0001410694888805149453-0" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -103,7 +108,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L10">
+        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L10">
           <g title="A" id="classId-C_0000485552648049088863-1" class="node default clickable">
             <rect height="57" width="165.296875" y="-28.5" x="-82.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.6484375" x1="-82.6484375" class="divider"/>
@@ -122,7 +127,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L14">
+        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L14">
           <g title="Anon" id="classId-C_0001060731132374575329-2" class="node default clickable">
             <rect height="57" width="94.109375" y="-28.5" x="-47.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0546875" x1="-47.0546875" class="divider"/>
@@ -141,7 +146,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L21">
+        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L21">
           <g title="Anon" id="classId-C_0001797521288354158629-3" class="node default clickable">
             <rect height="57" width="170.5625" y="-28.5" x="-85.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.28125" x1="-85.28125" class="divider"/>
@@ -160,7 +165,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00015/t00015.cc#L24">
+        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L24">
           <g title="B" id="classId-C_0000870882387819356092-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
diff --git a/docs/test_cases/t00016.md b/docs/test_cases/t00016.md
index a25ec3d2..756dbe38 100644
--- a/docs/test_cases/t00016.md
+++ b/docs/test_cases/t00016.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00016.cc
+File `tests/t00016/t00016.cc`
 ```cpp
 namespace clanguml {
 namespace t00016 {
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index b6ed1472..c3606a89 100644
--- a/docs/test_cases/t00016_class.svg
+++ b/docs/test_cases/t00016_class.svg
@@ -1,95 +1,111 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:847px;height:200px;" version="1.1" viewBox="0 0 847 200" width="847px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="206px" preserveAspectRatio="none" style="width:835px;height:206px;background:#FFFFFF;" version="1.1" viewBox="0 0 835 206" width="835px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f5ayormszqd7u" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ayormszqd7u)" height="60.8047" id="C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="343.5" y="129"/>
-      <ellipse cx="358.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M361.4688,150.6406 Q360.8906,150.9375 360.25,151.0781 Q359.6094,151.2344 358.9063,151.2344 Q356.4063,151.2344 355.0781,149.5938 Q353.7656,147.9375 353.7656,144.8125 Q353.7656,141.6875 355.0781,140.0313 Q356.4063,138.375 358.9063,138.375 Q359.6094,138.375 360.25,138.5313 Q360.9063,138.6875 361.4688,138.9844 L361.4688,141.7031 Q360.8438,141.125 360.25,140.8594 Q359.6563,140.5781 359.0313,140.5781 Q357.6875,140.5781 357,141.6563 Q356.3125,142.7188 356.3125,144.8125 Q356.3125,146.9063 357,147.9844 Q357.6875,149.0469 359.0313,149.0469 Q359.6563,149.0469 360.25,148.7813 Q360.8438,148.5 361.4688,147.9219 L361.4688,150.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="372.5" y="149.1543">is_numeric</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="65" x="446.5" y="126"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="63" x="447.5" y="138.1387">typename</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="344.5" x2="507.5" y1="161" y2="161"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="344.5" x2="507.5" y1="169" y2="169"/>
-      <ellipse cx="354.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="363.5" y="183.2104">value : enum</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <g id="elem_C_0000932856332558460389">
+        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000932856332558460389" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="159" x="341.5" y="134.8"/>
+        <ellipse cx="356.5" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M351.5,151.9562 C351.5,154.4562 353.6406,156.2687 356.5625,156.2687 C357.7969,156.2687 358.9688,155.9719 359.7188,155.4562 C360.3281,155.0344 360.6563,154.6125 360.6563,154.2062 C360.6563,153.7375 360.2344,153.3312 359.7344,153.3312 C359.5,153.3312 359.2813,153.4094 359.0781,153.6125 C358.6406,154.05 358.6406,154.05 358.4688,154.1437 C358.0156,154.3781 357.375,154.5187 356.6094,154.5187 C354.6094,154.5187 353.3281,153.5031 353.3281,151.925 L353.3281,150.8781 C353.3281,149.175 354.5469,147.9719 356.25,147.9719 C356.8281,147.9719 357.4063,148.1125 357.875,148.3625 C358.3438,148.6281 358.5156,148.8156 358.5781,149.175 C358.7031,149.8469 358.9531,150.0969 359.4844,150.0969 C359.7656,150.0969 360.0469,149.9562 360.2344,149.7375 C360.3594,149.5656 360.4063,149.3937 360.4063,148.9562 L360.4063,147.5969 C360.4063,147.175 360.3906,147.0344 360.2656,146.8625 C360.0938,146.6125 359.8125,146.4562 359.4844,146.4562 C359.1719,146.4562 358.9688,146.5656 358.75,146.8312 C357.5781,146.3312 357.1406,146.2219 356.1875,146.2219 C353.5156,146.2219 351.5,148.2375 351.5,150.8625 L351.5,151.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="370.5" y="155.406">is_numeric</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56" x="447.5" y="131.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54" x="448.5" y="146.0001">typename</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="342.5" x2="499.5" y1="166.8" y2="166.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="342.5" x2="499.5" y1="174.8" y2="174.8"/>
+        <ellipse cx="352.5" cy="188.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="361.5" y="191.8059">value : enum</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ayormszqd7u)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
-      <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="35" y="28.1543">is_numeric</text>
-      <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">float</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="48" y2="48"/>
-      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="26" y="62.2104">value : enum</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <g id="elem_C_0000095618295648274199">
+        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0000095618295648274199" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="128" x="7" y="10"/>
+        <ellipse cx="22" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,27.1563 C17,29.6563 19.1406,31.4688 22.0625,31.4688 C23.2969,31.4688 24.4688,31.1719 25.2188,30.6563 C25.8281,30.2344 26.1563,29.8125 26.1563,29.4063 C26.1563,28.9375 25.7344,28.5313 25.2344,28.5313 C25,28.5313 24.7813,28.6094 24.5781,28.8125 C24.1406,29.25 24.1406,29.25 23.9688,29.3438 C23.5156,29.5781 22.875,29.7188 22.1094,29.7188 C20.1094,29.7188 18.8281,28.7031 18.8281,27.125 L18.8281,26.0781 C18.8281,24.375 20.0469,23.1719 21.75,23.1719 C22.3281,23.1719 22.9063,23.3125 23.375,23.5625 C23.8438,23.8281 24.0156,24.0156 24.0781,24.375 C24.2031,25.0469 24.4531,25.2969 24.9844,25.2969 C25.2656,25.2969 25.5469,25.1563 25.7344,24.9375 C25.8594,24.7656 25.9063,24.5938 25.9063,24.1563 L25.9063,22.7969 C25.9063,22.375 25.8906,22.2344 25.7656,22.0625 C25.5938,21.8125 25.3125,21.6563 24.9844,21.6563 C24.6719,21.6563 24.4688,21.7656 24.25,22.0313 C23.0781,21.5313 22.6406,21.4219 21.6875,21.4219 C19.0156,21.4219 17,23.4375 17,26.0625 L17,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="36" y="30.606">is_numeric</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="25" x="113" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="23" x="114" y="21.2001">float</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="134" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="134" y1="50" y2="50"/>
+        <ellipse cx="18" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="27" y="67.0059">value : enum</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ayormszqd7u)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
-      <ellipse cx="186" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M188.9688,29.6406 Q188.3906,29.9375 187.75,30.0781 Q187.1094,30.2344 186.4063,30.2344 Q183.9063,30.2344 182.5781,28.5938 Q181.2656,26.9375 181.2656,23.8125 Q181.2656,20.6875 182.5781,19.0313 Q183.9063,17.375 186.4063,17.375 Q187.1094,17.375 187.75,17.5313 Q188.4063,17.6875 188.9688,17.9844 L188.9688,20.7031 Q188.3438,20.125 187.75,19.8594 Q187.1563,19.5781 186.5313,19.5781 Q185.1875,19.5781 184.5,20.6563 Q183.8125,21.7188 183.8125,23.8125 Q183.8125,25.9063 184.5,26.9844 Q185.1875,28.0469 186.5313,28.0469 Q187.1563,28.0469 187.75,27.7813 Q188.3438,27.5 188.9688,26.9219 L188.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="28.1543">is_numeric</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="30" x="274" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="275" y="17.1387">char</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="172" x2="300" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="172" x2="300" y1="48" y2="48"/>
-      <ellipse cx="182" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="191" y="62.2104">value : enum</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <g id="elem_C_0000979129381790761728">
+        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0000979129381790761728" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="170.5" y="10"/>
+        <ellipse cx="185.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M180.5,27.1563 C180.5,29.6563 182.6406,31.4688 185.5625,31.4688 C186.7969,31.4688 187.9688,31.1719 188.7188,30.6563 C189.3281,30.2344 189.6563,29.8125 189.6563,29.4063 C189.6563,28.9375 189.2344,28.5313 188.7344,28.5313 C188.5,28.5313 188.2813,28.6094 188.0781,28.8125 C187.6406,29.25 187.6406,29.25 187.4688,29.3438 C187.0156,29.5781 186.375,29.7188 185.6094,29.7188 C183.6094,29.7188 182.3281,28.7031 182.3281,27.125 L182.3281,26.0781 C182.3281,24.375 183.5469,23.1719 185.25,23.1719 C185.8281,23.1719 186.4063,23.3125 186.875,23.5625 C187.3438,23.8281 187.5156,24.0156 187.5781,24.375 C187.7031,25.0469 187.9531,25.2969 188.4844,25.2969 C188.7656,25.2969 189.0469,25.1563 189.2344,24.9375 C189.3594,24.7656 189.4063,24.5938 189.4063,24.1563 L189.4063,22.7969 C189.4063,22.375 189.3906,22.2344 189.2656,22.0625 C189.0938,21.8125 188.8125,21.6563 188.4844,21.6563 C188.1719,21.6563 187.9688,21.7656 187.75,22.0313 C186.5781,21.5313 186.1406,21.4219 185.1875,21.4219 C182.5156,21.4219 180.5,23.4375 180.5,26.0625 L180.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="199.5" y="30.606">is_numeric</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="26" x="276.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="24" x="277.5" y="21.2001">char</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="298.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="298.5" y1="50" y2="50"/>
+        <ellipse cx="181.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="190.5" y="67.0059">value : enum</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ayormszqd7u)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
-      <ellipse cx="351.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M354.4688,29.6406 Q353.8906,29.9375 353.25,30.0781 Q352.6094,30.2344 351.9063,30.2344 Q349.4063,30.2344 348.0781,28.5938 Q346.7656,26.9375 346.7656,23.8125 Q346.7656,20.6875 348.0781,19.0313 Q349.4063,17.375 351.9063,17.375 Q352.6094,17.375 353.25,17.5313 Q353.9063,17.6875 354.4688,17.9844 L354.4688,20.7031 Q353.8438,20.125 353.25,19.8594 Q352.6563,19.5781 352.0313,19.5781 Q350.6875,19.5781 350,20.6563 Q349.3125,21.7188 349.3125,23.8125 Q349.3125,25.9063 350,26.9844 Q350.6875,28.0469 352.0313,28.0469 Q352.6563,28.0469 353.25,27.7813 Q353.8438,27.5 354.4688,26.9219 L354.4688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="365.5" y="28.1543">is_numeric</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="79" x="439.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="77" x="440.5" y="17.1387">unsigned int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="514.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="514.5" y1="48" y2="48"/>
-      <ellipse cx="347.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="356.5" y="62.2104">value : enum</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <g id="elem_C_0002090787690027341836">
+        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0002090787690027341836" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="172" x="335" y="10"/>
+        <ellipse cx="350" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M345,27.1563 C345,29.6563 347.1406,31.4688 350.0625,31.4688 C351.2969,31.4688 352.4688,31.1719 353.2188,30.6563 C353.8281,30.2344 354.1563,29.8125 354.1563,29.4063 C354.1563,28.9375 353.7344,28.5313 353.2344,28.5313 C353,28.5313 352.7813,28.6094 352.5781,28.8125 C352.1406,29.25 352.1406,29.25 351.9688,29.3438 C351.5156,29.5781 350.875,29.7188 350.1094,29.7188 C348.1094,29.7188 346.8281,28.7031 346.8281,27.125 L346.8281,26.0781 C346.8281,24.375 348.0469,23.1719 349.75,23.1719 C350.3281,23.1719 350.9063,23.3125 351.375,23.5625 C351.8438,23.8281 352.0156,24.0156 352.0781,24.375 C352.2031,25.0469 352.4531,25.2969 352.9844,25.2969 C353.2656,25.2969 353.5469,25.1563 353.7344,24.9375 C353.8594,24.7656 353.9063,24.5938 353.9063,24.1563 L353.9063,22.7969 C353.9063,22.375 353.8906,22.2344 353.7656,22.0625 C353.5938,21.8125 353.3125,21.6563 352.9844,21.6563 C352.6719,21.6563 352.4688,21.7656 352.25,22.0313 C351.0781,21.5313 350.6406,21.4219 349.6875,21.4219 C347.0156,21.4219 345,23.4375 345,26.0625 L345,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="364" y="30.606">is_numeric</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="69" x="441" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="67" x="442" y="21.2001">unsigned int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="336" x2="506" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="336" x2="506" y1="50" y2="50"/>
+        <ellipse cx="346" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="355" y="67.0059">value : enum</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ayormszqd7u)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
-      <ellipse cx="566" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M568.9688,29.6406 Q568.3906,29.9375 567.75,30.0781 Q567.1094,30.2344 566.4063,30.2344 Q563.9063,30.2344 562.5781,28.5938 Q561.2656,26.9375 561.2656,23.8125 Q561.2656,20.6875 562.5781,19.0313 Q563.9063,17.375 566.4063,17.375 Q567.1094,17.375 567.75,17.5313 Q568.4063,17.6875 568.9688,17.9844 L568.9688,20.7031 Q568.3438,20.125 567.75,19.8594 Q567.1563,19.5781 566.5313,19.5781 Q565.1875,19.5781 564.5,20.6563 Q563.8125,21.7188 563.8125,23.8125 Q563.8125,25.9063 564.5,26.9844 Q565.1875,28.0469 566.5313,28.0469 Q567.1563,28.0469 567.75,27.7813 Q568.3438,27.5 568.9688,26.9219 L568.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580" y="28.1543">is_numeric</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="654" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="655" y="17.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="552" x2="668" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="552" x2="668" y1="48" y2="48"/>
-      <ellipse cx="562" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="571" y="62.2104">value : enum</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <g id="elem_C_0000500603075237446075">
+        <rect codeLine="22" fill="#F1F1F1" height="64.7999" id="C_0000500603075237446075" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="542" y="10"/>
+        <ellipse cx="557" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M552,27.1563 C552,29.6563 554.1406,31.4688 557.0625,31.4688 C558.2969,31.4688 559.4688,31.1719 560.2188,30.6563 C560.8281,30.2344 561.1563,29.8125 561.1563,29.4063 C561.1563,28.9375 560.7344,28.5313 560.2344,28.5313 C560,28.5313 559.7813,28.6094 559.5781,28.8125 C559.1406,29.25 559.1406,29.25 558.9688,29.3438 C558.5156,29.5781 557.875,29.7188 557.1094,29.7188 C555.1094,29.7188 553.8281,28.7031 553.8281,27.125 L553.8281,26.0781 C553.8281,24.375 555.0469,23.1719 556.75,23.1719 C557.3281,23.1719 557.9063,23.3125 558.375,23.5625 C558.8438,23.8281 559.0156,24.0156 559.0781,24.375 C559.2031,25.0469 559.4531,25.2969 559.9844,25.2969 C560.2656,25.2969 560.5469,25.1563 560.7344,24.9375 C560.8594,24.7656 560.9063,24.5938 560.9063,24.1563 L560.9063,22.7969 C560.9063,22.375 560.8906,22.2344 560.7656,22.0625 C560.5938,21.8125 560.3125,21.6563 559.9844,21.6563 C559.6719,21.6563 559.4688,21.7656 559.25,22.0313 C558.0781,21.5313 557.6406,21.4219 556.6875,21.4219 C554.0156,21.4219 552,23.4375 552,26.0625 L552,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="571" y="30.606">is_numeric</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="648" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="649" y="21.2001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="543" x2="659" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="543" x2="659" y1="50" y2="50"/>
+        <ellipse cx="553" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="562" y="67.0059">value : enum</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5ayormszqd7u)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
-      <ellipse cx="719.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M722.4688,29.6406 Q721.8906,29.9375 721.25,30.0781 Q720.6094,30.2344 719.9063,30.2344 Q717.4063,30.2344 716.0781,28.5938 Q714.7656,26.9375 714.7656,23.8125 Q714.7656,20.6875 716.0781,19.0313 Q717.4063,17.375 719.9063,17.375 Q720.6094,17.375 721.25,17.5313 Q721.9063,17.6875 722.4688,17.9844 L722.4688,20.7031 Q721.8438,20.125 721.25,19.8594 Q720.6563,19.5781 720.0313,19.5781 Q718.6875,19.5781 718,20.6563 Q717.3125,21.7188 717.3125,23.8125 Q717.3125,25.9063 718,26.9844 Q718.6875,28.0469 720.0313,28.0469 Q720.6563,28.0469 721.25,27.7813 Q721.8438,27.5 722.4688,26.9219 L722.4688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="733.5" y="28.1543">is_numeric</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="807.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="808.5" y="17.1387">bool</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="705.5" x2="832.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="705.5" x2="832.5" y1="48" y2="48"/>
-      <ellipse cx="715.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="724.5" y="62.2104">value : enum</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <g id="elem_C_0002111316837513419920">
+        <rect codeLine="27" fill="#F1F1F1" height="64.7999" id="C_0002111316837513419920" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="695.5" y="10"/>
+        <ellipse cx="710.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M705.5,27.1563 C705.5,29.6563 707.6406,31.4688 710.5625,31.4688 C711.7969,31.4688 712.9688,31.1719 713.7188,30.6563 C714.3281,30.2344 714.6563,29.8125 714.6563,29.4063 C714.6563,28.9375 714.2344,28.5313 713.7344,28.5313 C713.5,28.5313 713.2813,28.6094 713.0781,28.8125 C712.6406,29.25 712.6406,29.25 712.4688,29.3438 C712.0156,29.5781 711.375,29.7188 710.6094,29.7188 C708.6094,29.7188 707.3281,28.7031 707.3281,27.125 L707.3281,26.0781 C707.3281,24.375 708.5469,23.1719 710.25,23.1719 C710.8281,23.1719 711.4063,23.3125 711.875,23.5625 C712.3438,23.8281 712.5156,24.0156 712.5781,24.375 C712.7031,25.0469 712.9531,25.2969 713.4844,25.2969 C713.7656,25.2969 714.0469,25.1563 714.2344,24.9375 C714.3594,24.7656 714.4063,24.5938 714.4063,24.1563 L714.4063,22.7969 C714.4063,22.375 714.3906,22.2344 714.2656,22.0625 C714.0938,21.8125 713.8125,21.6563 713.4844,21.6563 C713.1719,21.6563 712.9688,21.7656 712.75,22.0313 C711.5781,21.5313 711.1406,21.4219 710.1875,21.4219 C707.5156,21.4219 705.5,23.4375 705.5,26.0625 L705.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="724.5" y="30.606">is_numeric</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="26" x="801.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="24" x="802.5" y="21.2001">bool</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="696.5" x2="823.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="696.5" x2="823.5" y1="50" y2="50"/>
+        <ellipse cx="706.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="715.5" y="67.0059">value : enum</text>
+      </g>
     </a>
-    <path d="M136.29,63.18 C141.93,65.17 147.56,67.13 153,69 C209.46,88.41 272.82,109.24 324.27,125.91 " fill="none" id="C_0000095618295648274199-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="326.49,119.27,343.36,132.09,322.18,132.59,326.49,119.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M283.45,69.22 C307.12,84.04 336.09,102.19 361.72,118.24 " fill="none" id="C_0000979129381790761728-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="365.59,112.4,378.82,128.95,358.16,124.27,365.59,112.4" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M426,69.22 C426,81.15 426,95.23 426,108.63 " fill="none" id="C_0002090787690027341836-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="433,108.74,426,128.74,419,108.74,433,108.74" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M564.04,69.22 C541.24,83.97 513.34,102.01 488.61,118.01 " fill="none" id="C_0000500603075237446075-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="492.28,123.97,471.69,128.95,484.68,112.21,492.28,123.97" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M704.13,62.94 C698.34,65 692.57,67.04 687,69 C634.55,87.43 576.02,107.54 527.69,124.02 " fill="none" id="C_0002111316837513419920-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="529.88,130.67,508.69,130.5,525.36,117.42,529.88,130.67" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000095618295648274199_C_0000932856332558460389">
+      <path codeLine="31" d="M135.37,68.31 C141.32,70.53 147.27,72.73 153,74.8 C215.98,97.59 270.7682,116.3045 324.2082,134.1645 " fill="none" id="C_0000095618295648274199-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="341.28,139.87,326.11,128.4739,322.3063,139.8551,341.28,139.87" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000979129381790761728_C_0000932856332558460389">
+      <path codeLine="32" d="M282.9,75.02 C310.56,93.29 330.2282,106.2731 357.9182,124.5531 " fill="none" id="C_0000979129381790761728-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="372.94,134.47,361.2238,119.5458,354.6125,129.5604,372.94,134.47" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002090787690027341836_C_0000932856332558460389">
+      <path codeLine="33" d="M421,75.02 C421,93.36 421,98.37 421,116.68 " fill="none" id="C_0002090787690027341836-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="421,134.68,427,116.68,415,116.68,421,134.68" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000500603075237446075_C_0000932856332558460389">
+      <path codeLine="34" d="M554.65,75.02 C527.88,93.29 509.1802,106.0472 482.3802,124.3272 " fill="none" id="C_0000500603075237446075-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="467.51,134.47,485.7612,129.2839,478.9993,119.3704,467.51,134.47" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002111316837513419920_C_0000932856332558460389">
+      <path codeLine="35" d="M695.15,68.4 C689.36,70.58 683.58,72.74 678,74.8 C618.8,96.66 568.5812,114.55 517.7512,132.42 " fill="none" id="C_0002111316837513419920-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="500.77,138.39,519.7411,138.0804,515.7612,126.7597,500.77,138.39" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00016_class_mermaid.svg b/docs/test_cases/t00016_class_mermaid.svg
index 4e03e3ed..39c39051 100644
--- a/docs/test_cases/t00016_class_mermaid.svg
+++ b/docs/test_cases/t00016_class_mermaid.svg
@@ -1,60 +1,65 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1022.859375 224" style="max-width: 1022.86px; background-color: white;" width="1022.859375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M83.9765625,87L83.9765625,91.16666666666667C83.9765625,95.33333333333333,83.9765625,103.66666666666667,140.33463541666666,116.19783708151317C196.69270833333334,128.72900749635969,309.4088541666667,145.45801499271937,365.7669270833333,153.8225187408992L422.125,162.18702248907906"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M285.9375,87L285.9375,91.16666666666667C285.9375,95.33333333333333,285.9375,103.66666666666667,308.6354166666667,114.12679115171055C331.3333333333333,124.58691563675443,376.7291666666667,137.17383127350885,399.4270833333333,143.46728909188607L422.125,149.7607469102633"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M518.5625,87L518.5625,91.16666666666667C518.5625,95.33333333333333,518.5625,103.66666666666667,518.5625,112C518.5625,120.33333333333333,518.5625,128.66666666666666,518.5625,132.83333333333334L518.5625,137"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M744.0625,87L744.0625,91.16666666666667C744.0625,95.33333333333333,744.0625,103.66666666666667,722.5520833333334,113.98598022912047C701.0416666666666,124.30529379157429,658.0208333333334,136.61058758314854,636.5104166666666,142.7632344789357L615,148.91588137472283"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M938.890625,87L938.890625,91.16666666666667C938.890625,95.33333333333333,938.890625,103.66666666666667,884.9088541666666,116.11691944537377C830.9270833333334,128.56717222408088,722.9635416666666,145.13434444816178,668.9817708333334,153.41793056020222L615,161.70151667224266"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M83.9765625,87L83.9765625,91.16666666666667C83.9765625,95.33333333333333,83.9765625,103.66666666666667,137.36714084731958,115.75741003772994C190.75771919463918,127.84815340879322,297.53887588927836,143.69630681758647,350.929454236598,151.6203835219831L404.32003258391757,159.5444602263797"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M285.9375,87L285.9375,91.16666666666667C285.9375,95.33333333333333,285.9375,103.66666666666667,305.744484916316,113.32522168197336C325.5514698326321,122.98377669728005,365.16543966526416,133.9675533945601,384.9724245815803,139.45944174320013L404.7794094978963,144.95133009184013"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M518.5625,87L518.5625,91.16666666666667C518.5625,95.33333333333333,518.5625,103.66666666666667,518.5625,109C518.5625,114.33333333333333,518.5625,116.66666666666667,518.5625,117.83333333333333L518.5625,119"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M744.0625,87L744.0625,91.16666666666667C744.0625,95.33333333333333,744.0625,103.66666666666667,725.4364137163183,113.1609722038321C706.8103274326364,122.65527774099753,669.558154865273,133.3105554819951,650.9320685815911,138.63819435249385L632.3059822979094,143.96583322299264"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M938.890625,87L938.890625,91.16666666666667C938.890625,95.33333333333333,938.890625,103.66666666666667,887.8741448971663,115.66189100273215C836.8576647943327,127.65711533879762,734.8247045886652,143.31423067759525,683.8082244858315,151.14278834699405L632.7917443829979,158.97134601639286"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -114,7 +119,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L4">
+        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L4">
           <g title="is_numeric" id="classId-C_0000932856332558460389-0" class="node default clickable">
             <rect height="79" width="192.875" y="-39.5" x="-96.4375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="96.4375" x1="-96.4375" class="divider"/>
@@ -138,7 +143,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L8">
+        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L8">
           <g title="is_numeric" id="classId-C_0000095618295648274199-1" class="node default clickable">
             <rect height="79" width="151.953125" y="-39.5" x="-75.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.9765625" x1="-75.9765625" class="divider"/>
@@ -162,7 +167,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L12">
+        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L12">
           <g title="is_numeric" id="classId-C_0000979129381790761728-2" class="node default clickable">
             <rect height="79" width="151.96875" y="-39.5" x="-75.984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.984375" x1="-75.984375" class="divider"/>
@@ -186,7 +191,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L16">
+        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L16">
           <g title="is_numeric" id="classId-C_0002090787690027341836-3" class="node default clickable">
             <rect height="79" width="213.28125" y="-39.5" x="-106.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="106.640625" x1="-106.640625" class="divider"/>
@@ -210,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L20">
+        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L20">
           <g title="is_numeric" id="classId-C_0000500603075237446075-4" class="node default clickable">
             <rect height="79" width="137.71875" y="-39.5" x="-68.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.859375" x1="-68.859375" class="divider"/>
@@ -234,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00016/t00016.cc#L24">
+        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L24">
           <g title="is_numeric" id="classId-C_0002111316837513419920-5" class="node default clickable">
             <rect height="79" width="151.9375" y="-39.5" x="-75.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.96875" x1="-75.96875" class="divider"/>
diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md
index 85e1593c..23094b05 100644
--- a/docs/test_cases/t00017.md
+++ b/docs/test_cases/t00017.md
@@ -14,7 +14,7 @@ diagrams:
 
 ```
 ## Source code
-File t00017.cc
+File `tests/t00017/t00017.cc`
 ```cpp
 #include <utility>
 
@@ -523,6 +523,7 @@ private:
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index 014a08a8..27975de0 100644
--- a/docs/test_cases/t00017_class.svg
+++ b/docs/test_cases/t00017_class.svg
@@ -1,177 +1,217 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="271px" preserveAspectRatio="none" style="width:812px;height:271px;background:#FFFFFF;" version="1.1" viewBox="0 0 812 271" width="812px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f8y7xnsehz0b0" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
-      <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000121332093434690887">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000121332093434690887" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="216"/>
+        <ellipse cx="22" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,233.1563 C17,235.6563 19.1406,237.4688 22.0625,237.4688 C23.2969,237.4688 24.4688,237.1719 25.2188,236.6563 C25.8281,236.2344 26.1563,235.8125 26.1563,235.4063 C26.1563,234.9375 25.7344,234.5313 25.2344,234.5313 C25,234.5313 24.7813,234.6094 24.5781,234.8125 C24.1406,235.25 24.1406,235.25 23.9688,235.3438 C23.5156,235.5781 22.875,235.7188 22.1094,235.7188 C20.1094,235.7188 18.8281,234.7031 18.8281,233.125 L18.8281,232.0781 C18.8281,230.375 20.0469,229.1719 21.75,229.1719 C22.3281,229.1719 22.9063,229.3125 23.375,229.5625 C23.8438,229.8281 24.0156,230.0156 24.0781,230.375 C24.2031,231.0469 24.4531,231.2969 24.9844,231.2969 C25.2656,231.2969 25.5469,231.1563 25.7344,230.9375 C25.8594,230.7656 25.9063,230.5938 25.9063,230.1563 L25.9063,228.7969 C25.9063,228.375 25.8906,228.2344 25.7656,228.0625 C25.5938,227.8125 25.3125,227.6563 24.9844,227.6563 C24.6719,227.6563 24.4688,227.7656 24.25,228.0313 C23.0781,227.5313 22.6406,227.4219 21.6875,227.4219 C19.0156,227.4219 17,229.4375 17,232.0625 L17,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="236.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
-      <ellipse cx="96" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M98.9688,218.6406 Q98.3906,218.9375 97.75,219.0781 Q97.1094,219.2344 96.4063,219.2344 Q93.9063,219.2344 92.5781,217.5938 Q91.2656,215.9375 91.2656,212.8125 Q91.2656,209.6875 92.5781,208.0313 Q93.9063,206.375 96.4063,206.375 Q97.1094,206.375 97.75,206.5313 Q98.4063,206.6875 98.9688,206.9844 L98.9688,209.7031 Q98.3438,209.125 97.75,208.8594 Q97.1563,208.5781 96.5313,208.5781 Q95.1875,208.5781 94.5,209.6563 Q93.8125,210.7188 93.8125,212.8125 Q93.8125,214.9063 94.5,215.9844 Q95.1875,217.0469 96.5313,217.0469 Q97.1563,217.0469 97.75,216.7813 Q98.3438,216.5 98.9688,215.9219 L98.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="217.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001424864837456200487">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0001424864837456200487" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="216"/>
+        <ellipse cx="98" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93,233.1563 C93,235.6563 95.1406,237.4688 98.0625,237.4688 C99.2969,237.4688 100.4688,237.1719 101.2188,236.6563 C101.8281,236.2344 102.1563,235.8125 102.1563,235.4063 C102.1563,234.9375 101.7344,234.5313 101.2344,234.5313 C101,234.5313 100.7813,234.6094 100.5781,234.8125 C100.1406,235.25 100.1406,235.25 99.9688,235.3438 C99.5156,235.5781 98.875,235.7188 98.1094,235.7188 C96.1094,235.7188 94.8281,234.7031 94.8281,233.125 L94.8281,232.0781 C94.8281,230.375 96.0469,229.1719 97.75,229.1719 C98.3281,229.1719 98.9063,229.3125 99.375,229.5625 C99.8438,229.8281 100.0156,230.0156 100.0781,230.375 C100.2031,231.0469 100.4531,231.2969 100.9844,231.2969 C101.2656,231.2969 101.5469,231.1563 101.7344,230.9375 C101.8594,230.7656 101.9063,230.5938 101.9063,230.1563 L101.9063,228.7969 C101.9063,228.375 101.8906,228.2344 101.7656,228.0625 C101.5938,227.8125 101.3125,227.6563 100.9844,227.6563 C100.6719,227.6563 100.4688,227.7656 100.25,228.0313 C99.0781,227.5313 98.6406,227.4219 97.6875,227.4219 C95.0156,227.4219 93,229.4375 93,232.0625 L93,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="236.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
-      <ellipse cx="171" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.9688,218.6406 Q173.3906,218.9375 172.75,219.0781 Q172.1094,219.2344 171.4063,219.2344 Q168.9063,219.2344 167.5781,217.5938 Q166.2656,215.9375 166.2656,212.8125 Q166.2656,209.6875 167.5781,208.0313 Q168.9063,206.375 171.4063,206.375 Q172.1094,206.375 172.75,206.5313 Q173.4063,206.6875 173.9688,206.9844 L173.9688,209.7031 Q173.3438,209.125 172.75,208.8594 Q172.1563,208.5781 171.5313,208.5781 Q170.1875,208.5781 169.5,209.6563 Q168.8125,210.7188 168.8125,212.8125 Q168.8125,214.9063 169.5,215.9844 Q170.1875,217.0469 171.5313,217.0469 Q172.1563,217.0469 172.75,216.7813 Q173.3438,216.5 173.9688,215.9219 L173.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="217.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0002151170391844743478">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0002151170391844743478" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="216"/>
+        <ellipse cx="173.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M168.5,233.1563 C168.5,235.6563 170.6406,237.4688 173.5625,237.4688 C174.7969,237.4688 175.9688,237.1719 176.7188,236.6563 C177.3281,236.2344 177.6563,235.8125 177.6563,235.4063 C177.6563,234.9375 177.2344,234.5313 176.7344,234.5313 C176.5,234.5313 176.2813,234.6094 176.0781,234.8125 C175.6406,235.25 175.6406,235.25 175.4688,235.3438 C175.0156,235.5781 174.375,235.7188 173.6094,235.7188 C171.6094,235.7188 170.3281,234.7031 170.3281,233.125 L170.3281,232.0781 C170.3281,230.375 171.5469,229.1719 173.25,229.1719 C173.8281,229.1719 174.4063,229.3125 174.875,229.5625 C175.3438,229.8281 175.5156,230.0156 175.5781,230.375 C175.7031,231.0469 175.9531,231.2969 176.4844,231.2969 C176.7656,231.2969 177.0469,231.1563 177.2344,230.9375 C177.3594,230.7656 177.4063,230.5938 177.4063,230.1563 L177.4063,228.7969 C177.4063,228.375 177.3906,228.2344 177.2656,228.0625 C177.0938,227.8125 176.8125,227.6563 176.4844,227.6563 C176.1719,227.6563 175.9688,227.7656 175.75,228.0313 C174.5781,227.5313 174.1406,227.4219 173.1875,227.4219 C170.5156,227.4219 168.5,229.4375 168.5,232.0625 L168.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="236.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
-      <ellipse cx="246.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M249.4688,218.6406 Q248.8906,218.9375 248.25,219.0781 Q247.6094,219.2344 246.9063,219.2344 Q244.4063,219.2344 243.0781,217.5938 Q241.7656,215.9375 241.7656,212.8125 Q241.7656,209.6875 243.0781,208.0313 Q244.4063,206.375 246.9063,206.375 Q247.6094,206.375 248.25,206.5313 Q248.9063,206.6875 249.4688,206.9844 L249.4688,209.7031 Q248.8438,209.125 248.25,208.8594 Q247.6563,208.5781 247.0313,208.5781 Q245.6875,208.5781 245,209.6563 Q244.3125,210.7188 244.3125,212.8125 Q244.3125,214.9063 245,215.9844 Q245.6875,217.0469 247.0313,217.0469 Q247.6563,217.0469 248.25,216.7813 Q248.8438,216.5 249.4688,215.9219 L249.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="217.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001378112127131766972">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001378112127131766972" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="235.5" y="216"/>
+        <ellipse cx="250.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M245.5,233.1563 C245.5,235.6563 247.6406,237.4688 250.5625,237.4688 C251.7969,237.4688 252.9688,237.1719 253.7188,236.6563 C254.3281,236.2344 254.6563,235.8125 254.6563,235.4063 C254.6563,234.9375 254.2344,234.5313 253.7344,234.5313 C253.5,234.5313 253.2813,234.6094 253.0781,234.8125 C252.6406,235.25 252.6406,235.25 252.4688,235.3438 C252.0156,235.5781 251.375,235.7188 250.6094,235.7188 C248.6094,235.7188 247.3281,234.7031 247.3281,233.125 L247.3281,232.0781 C247.3281,230.375 248.5469,229.1719 250.25,229.1719 C250.8281,229.1719 251.4063,229.3125 251.875,229.5625 C252.3438,229.8281 252.5156,230.0156 252.5781,230.375 C252.7031,231.0469 252.9531,231.2969 253.4844,231.2969 C253.7656,231.2969 254.0469,231.1563 254.2344,230.9375 C254.3594,230.7656 254.4063,230.5938 254.4063,230.1563 L254.4063,228.7969 C254.4063,228.375 254.3906,228.2344 254.2656,228.0625 C254.0938,227.8125 253.8125,227.6563 253.4844,227.6563 C253.1719,227.6563 252.9688,227.7656 252.75,228.0313 C251.5781,227.5313 251.1406,227.4219 250.1875,227.4219 C247.5156,227.4219 245.5,229.4375 245.5,232.0625 L245.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="264.5" y="236.606">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
-      <ellipse cx="323" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M325.9688,218.6406 Q325.3906,218.9375 324.75,219.0781 Q324.1094,219.2344 323.4063,219.2344 Q320.9063,219.2344 319.5781,217.5938 Q318.2656,215.9375 318.2656,212.8125 Q318.2656,209.6875 319.5781,208.0313 Q320.9063,206.375 323.4063,206.375 Q324.1094,206.375 324.75,206.5313 Q325.4063,206.6875 325.9688,206.9844 L325.9688,209.7031 Q325.3438,209.125 324.75,208.8594 Q324.1563,208.5781 323.5313,208.5781 Q322.1875,208.5781 321.5,209.6563 Q320.8125,210.7188 320.8125,212.8125 Q320.8125,214.9063 321.5,215.9844 Q322.1875,217.0469 323.5313,217.0469 Q324.1563,217.0469 324.75,216.7813 Q325.3438,216.5 325.9688,215.9219 L325.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="217.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001535300935831802489">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001535300935831802489" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="312" y="216"/>
+        <ellipse cx="327" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M322,233.1563 C322,235.6563 324.1406,237.4688 327.0625,237.4688 C328.2969,237.4688 329.4688,237.1719 330.2188,236.6563 C330.8281,236.2344 331.1563,235.8125 331.1563,235.4063 C331.1563,234.9375 330.7344,234.5313 330.2344,234.5313 C330,234.5313 329.7813,234.6094 329.5781,234.8125 C329.1406,235.25 329.1406,235.25 328.9688,235.3438 C328.5156,235.5781 327.875,235.7188 327.1094,235.7188 C325.1094,235.7188 323.8281,234.7031 323.8281,233.125 L323.8281,232.0781 C323.8281,230.375 325.0469,229.1719 326.75,229.1719 C327.3281,229.1719 327.9063,229.3125 328.375,229.5625 C328.8438,229.8281 329.0156,230.0156 329.0781,230.375 C329.2031,231.0469 329.4531,231.2969 329.9844,231.2969 C330.2656,231.2969 330.5469,231.1563 330.7344,230.9375 C330.8594,230.7656 330.9063,230.5938 330.9063,230.1563 L330.9063,228.7969 C330.9063,228.375 330.8906,228.2344 330.7656,228.0625 C330.5938,227.8125 330.3125,227.6563 329.9844,227.6563 C329.6719,227.6563 329.4688,227.7656 329.25,228.0313 C328.0781,227.5313 327.6406,227.4219 326.6875,227.4219 C324.0156,227.4219 322,229.4375 322,232.0625 L322,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="341" y="236.606">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
-      <ellipse cx="398.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M401.4688,218.6406 Q400.8906,218.9375 400.25,219.0781 Q399.6094,219.2344 398.9063,219.2344 Q396.4063,219.2344 395.0781,217.5938 Q393.7656,215.9375 393.7656,212.8125 Q393.7656,209.6875 395.0781,208.0313 Q396.4063,206.375 398.9063,206.375 Q399.6094,206.375 400.25,206.5313 Q400.9063,206.6875 401.4688,206.9844 L401.4688,209.7031 Q400.8438,209.125 400.25,208.8594 Q399.6563,208.5781 399.0313,208.5781 Q397.6875,208.5781 397,209.6563 Q396.3125,210.7188 396.3125,212.8125 Q396.3125,214.9063 397,215.9844 Q397.6875,217.0469 399.0313,217.0469 Q399.6563,217.0469 400.25,216.7813 Q400.8438,216.5 401.4688,215.9219 L401.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="217.1543">F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0001803800465279710134">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001803800465279710134" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="388" y="216"/>
+        <ellipse cx="403" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M398,233.1563 C398,235.6563 400.1406,237.4688 403.0625,237.4688 C404.2969,237.4688 405.4688,237.1719 406.2188,236.6563 C406.8281,236.2344 407.1563,235.8125 407.1563,235.4063 C407.1563,234.9375 406.7344,234.5313 406.2344,234.5313 C406,234.5313 405.7813,234.6094 405.5781,234.8125 C405.1406,235.25 405.1406,235.25 404.9688,235.3438 C404.5156,235.5781 403.875,235.7188 403.1094,235.7188 C401.1094,235.7188 399.8281,234.7031 399.8281,233.125 L399.8281,232.0781 C399.8281,230.375 401.0469,229.1719 402.75,229.1719 C403.3281,229.1719 403.9063,229.3125 404.375,229.5625 C404.8438,229.8281 405.0156,230.0156 405.0781,230.375 C405.2031,231.0469 405.4531,231.2969 405.9844,231.2969 C406.2656,231.2969 406.5469,231.1563 406.7344,230.9375 C406.8594,230.7656 406.9063,230.5938 406.9063,230.1563 L406.9063,228.7969 C406.9063,228.375 406.8906,228.2344 406.7656,228.0625 C406.5938,227.8125 406.3125,227.6563 405.9844,227.6563 C405.6719,227.6563 405.4688,227.7656 405.25,228.0313 C404.0781,227.5313 403.6406,227.4219 402.6875,227.4219 C400.0156,227.4219 398,229.4375 398,232.0625 L398,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="417" y="236.606">F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="428" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="428" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
-      <ellipse cx="472.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M475.4688,218.6406 Q474.8906,218.9375 474.25,219.0781 Q473.6094,219.2344 472.9063,219.2344 Q470.4063,219.2344 469.0781,217.5938 Q467.7656,215.9375 467.7656,212.8125 Q467.7656,209.6875 469.0781,208.0313 Q470.4063,206.375 472.9063,206.375 Q473.6094,206.375 474.25,206.5313 Q474.9063,206.6875 475.4688,206.9844 L475.4688,209.7031 Q474.8438,209.125 474.25,208.8594 Q473.6563,208.5781 473.0313,208.5781 Q471.6875,208.5781 471,209.6563 Q470.3125,210.7188 470.3125,212.8125 Q470.3125,214.9063 471,215.9844 Q471.6875,217.0469 473.0313,217.0469 Q473.6563,217.0469 474.25,216.7813 Q474.8438,216.5 475.4688,215.9219 L475.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="217.1543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0001135797791892670246">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0001135797791892670246" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="464" y="216"/>
+        <ellipse cx="479" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M474,233.1563 C474,235.6563 476.1406,237.4688 479.0625,237.4688 C480.2969,237.4688 481.4688,237.1719 482.2188,236.6563 C482.8281,236.2344 483.1563,235.8125 483.1563,235.4063 C483.1563,234.9375 482.7344,234.5313 482.2344,234.5313 C482,234.5313 481.7813,234.6094 481.5781,234.8125 C481.1406,235.25 481.1406,235.25 480.9688,235.3438 C480.5156,235.5781 479.875,235.7188 479.1094,235.7188 C477.1094,235.7188 475.8281,234.7031 475.8281,233.125 L475.8281,232.0781 C475.8281,230.375 477.0469,229.1719 478.75,229.1719 C479.3281,229.1719 479.9063,229.3125 480.375,229.5625 C480.8438,229.8281 481.0156,230.0156 481.0781,230.375 C481.2031,231.0469 481.4531,231.2969 481.9844,231.2969 C482.2656,231.2969 482.5469,231.1563 482.7344,230.9375 C482.8594,230.7656 482.9063,230.5938 482.9063,230.1563 L482.9063,228.7969 C482.9063,228.375 482.8906,228.2344 482.7656,228.0625 C482.5938,227.8125 482.3125,227.6563 481.9844,227.6563 C481.6719,227.6563 481.4688,227.7656 481.25,228.0313 C480.0781,227.5313 479.6406,227.4219 478.6875,227.4219 C476.0156,227.4219 474,229.4375 474,232.0625 L474,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="493" y="236.606">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="506" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="506" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
-      <ellipse cx="548.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M551.4688,218.6406 Q550.8906,218.9375 550.25,219.0781 Q549.6094,219.2344 548.9063,219.2344 Q546.4063,219.2344 545.0781,217.5938 Q543.7656,215.9375 543.7656,212.8125 Q543.7656,209.6875 545.0781,208.0313 Q546.4063,206.375 548.9063,206.375 Q549.6094,206.375 550.25,206.5313 Q550.9063,206.6875 551.4688,206.9844 L551.4688,209.7031 Q550.8438,209.125 550.25,208.8594 Q549.6563,208.5781 549.0313,208.5781 Q547.6875,208.5781 547,209.6563 Q546.3125,210.7188 546.3125,212.8125 Q546.3125,214.9063 547,215.9844 Q547.6875,217.0469 549.0313,217.0469 Q549.6563,217.0469 550.25,216.7813 Q550.8438,216.5 551.4688,215.9219 L551.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="217.1543">H</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <g id="elem_C_0001243547836571712317">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001243547836571712317" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="541.5" y="216"/>
+        <ellipse cx="556.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M551.5,233.1563 C551.5,235.6563 553.6406,237.4688 556.5625,237.4688 C557.7969,237.4688 558.9688,237.1719 559.7188,236.6563 C560.3281,236.2344 560.6563,235.8125 560.6563,235.4063 C560.6563,234.9375 560.2344,234.5313 559.7344,234.5313 C559.5,234.5313 559.2813,234.6094 559.0781,234.8125 C558.6406,235.25 558.6406,235.25 558.4688,235.3438 C558.0156,235.5781 557.375,235.7188 556.6094,235.7188 C554.6094,235.7188 553.3281,234.7031 553.3281,233.125 L553.3281,232.0781 C553.3281,230.375 554.5469,229.1719 556.25,229.1719 C556.8281,229.1719 557.4063,229.3125 557.875,229.5625 C558.3438,229.8281 558.5156,230.0156 558.5781,230.375 C558.7031,231.0469 558.9531,231.2969 559.4844,231.2969 C559.7656,231.2969 560.0469,231.1563 560.2344,230.9375 C560.3594,230.7656 560.4063,230.5938 560.4063,230.1563 L560.4063,228.7969 C560.4063,228.375 560.3906,228.2344 560.2656,228.0625 C560.0938,227.8125 559.8125,227.6563 559.4844,227.6563 C559.1719,227.6563 558.9688,227.7656 558.75,228.0313 C557.5781,227.5313 557.1406,227.4219 556.1875,227.4219 C553.5156,227.4219 551.5,229.4375 551.5,232.0625 L551.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="570.5" y="236.606">H</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="542.5" x2="582.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="542.5" x2="582.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
-      <ellipse cx="624.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M627.4688,218.6406 Q626.8906,218.9375 626.25,219.0781 Q625.6094,219.2344 624.9063,219.2344 Q622.4063,219.2344 621.0781,217.5938 Q619.7656,215.9375 619.7656,212.8125 Q619.7656,209.6875 621.0781,208.0313 Q622.4063,206.375 624.9063,206.375 Q625.6094,206.375 626.25,206.5313 Q626.9063,206.6875 627.4688,206.9844 L627.4688,209.7031 Q626.8438,209.125 626.25,208.8594 Q625.6563,208.5781 625.0313,208.5781 Q623.6875,208.5781 623,209.6563 Q622.3125,210.7188 622.3125,212.8125 Q622.3125,214.9063 623,215.9844 Q623.6875,217.0469 625.0313,217.0469 Q625.6563,217.0469 626.25,216.7813 Q626.8438,216.5 627.4688,215.9219 L627.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="217.1543">I</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <g id="elem_C_0000387733199705628658">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000387733199705628658" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="618.5" y="216"/>
+        <ellipse cx="633.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M628.5,233.1563 C628.5,235.6563 630.6406,237.4688 633.5625,237.4688 C634.7969,237.4688 635.9688,237.1719 636.7188,236.6563 C637.3281,236.2344 637.6563,235.8125 637.6563,235.4063 C637.6563,234.9375 637.2344,234.5313 636.7344,234.5313 C636.5,234.5313 636.2813,234.6094 636.0781,234.8125 C635.6406,235.25 635.6406,235.25 635.4688,235.3438 C635.0156,235.5781 634.375,235.7188 633.6094,235.7188 C631.6094,235.7188 630.3281,234.7031 630.3281,233.125 L630.3281,232.0781 C630.3281,230.375 631.5469,229.1719 633.25,229.1719 C633.8281,229.1719 634.4063,229.3125 634.875,229.5625 C635.3438,229.8281 635.5156,230.0156 635.5781,230.375 C635.7031,231.0469 635.9531,231.2969 636.4844,231.2969 C636.7656,231.2969 637.0469,231.1563 637.2344,230.9375 C637.3594,230.7656 637.4063,230.5938 637.4063,230.1563 L637.4063,228.7969 C637.4063,228.375 637.3906,228.2344 637.2656,228.0625 C637.0938,227.8125 636.8125,227.6563 636.4844,227.6563 C636.1719,227.6563 635.9688,227.7656 635.75,228.0313 C634.5781,227.5313 634.1406,227.4219 633.1875,227.4219 C630.5156,227.4219 628.5,229.4375 628.5,232.0625 L628.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="647.5" y="236.606">I</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="619.5" x2="653.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="619.5" x2="653.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
-      <ellipse cx="694.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M697.4688,218.6406 Q696.8906,218.9375 696.25,219.0781 Q695.6094,219.2344 694.9063,219.2344 Q692.4063,219.2344 691.0781,217.5938 Q689.7656,215.9375 689.7656,212.8125 Q689.7656,209.6875 691.0781,208.0313 Q692.4063,206.375 694.9063,206.375 Q695.6094,206.375 696.25,206.5313 Q696.9063,206.6875 697.4688,206.9844 L697.4688,209.7031 Q696.8438,209.125 696.25,208.8594 Q695.6563,208.5781 695.0313,208.5781 Q693.6875,208.5781 693,209.6563 Q692.3125,210.7188 692.3125,212.8125 Q692.3125,214.9063 693,215.9844 Q693.6875,217.0469 695.0313,217.0469 Q695.6563,217.0469 696.25,216.7813 Q696.8438,216.5 697.4688,215.9219 L697.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="217.1543">J</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <g id="elem_C_0000747991828672433537">
+        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0000747991828672433537" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="690" y="216"/>
+        <ellipse cx="705" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M700,233.1563 C700,235.6563 702.1406,237.4688 705.0625,237.4688 C706.2969,237.4688 707.4688,237.1719 708.2188,236.6563 C708.8281,236.2344 709.1563,235.8125 709.1563,235.4063 C709.1563,234.9375 708.7344,234.5313 708.2344,234.5313 C708,234.5313 707.7813,234.6094 707.5781,234.8125 C707.1406,235.25 707.1406,235.25 706.9688,235.3438 C706.5156,235.5781 705.875,235.7188 705.1094,235.7188 C703.1094,235.7188 701.8281,234.7031 701.8281,233.125 L701.8281,232.0781 C701.8281,230.375 703.0469,229.1719 704.75,229.1719 C705.3281,229.1719 705.9063,229.3125 706.375,229.5625 C706.8438,229.8281 707.0156,230.0156 707.0781,230.375 C707.2031,231.0469 707.4531,231.2969 707.9844,231.2969 C708.2656,231.2969 708.5469,231.1563 708.7344,230.9375 C708.8594,230.7656 708.9063,230.5938 708.9063,230.1563 L708.9063,228.7969 C708.9063,228.375 708.8906,228.2344 708.7656,228.0625 C708.5938,227.8125 708.3125,227.6563 707.9844,227.6563 C707.6719,227.6563 707.4688,227.7656 707.25,228.0313 C706.0781,227.5313 705.6406,227.4219 704.6875,227.4219 C702.0156,227.4219 700,229.4375 700,232.0625 L700,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="719" y="236.606">J</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="691" x2="728" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="691" x2="728" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
-      <ellipse cx="764.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M767.4688,218.6406 Q766.8906,218.9375 766.25,219.0781 Q765.6094,219.2344 764.9063,219.2344 Q762.4063,219.2344 761.0781,217.5938 Q759.7656,215.9375 759.7656,212.8125 Q759.7656,209.6875 761.0781,208.0313 Q762.4063,206.375 764.9063,206.375 Q765.6094,206.375 766.25,206.5313 Q766.9063,206.6875 767.4688,206.9844 L767.4688,209.7031 Q766.8438,209.125 766.25,208.8594 Q765.6563,208.5781 765.0313,208.5781 Q763.6875,208.5781 763,209.6563 Q762.3125,210.7188 762.3125,212.8125 Q762.3125,214.9063 763,215.9844 Q763.6875,217.0469 765.0313,217.0469 Q765.6563,217.0469 766.25,216.7813 Q766.8438,216.5 767.4688,215.9219 L767.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="217.1543">K</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <g id="elem_C_0001783571342994833467">
+        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0001783571342994833467" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="764" y="216"/>
+        <ellipse cx="779" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M774,233.1563 C774,235.6563 776.1406,237.4688 779.0625,237.4688 C780.2969,237.4688 781.4688,237.1719 782.2188,236.6563 C782.8281,236.2344 783.1563,235.8125 783.1563,235.4063 C783.1563,234.9375 782.7344,234.5313 782.2344,234.5313 C782,234.5313 781.7813,234.6094 781.5781,234.8125 C781.1406,235.25 781.1406,235.25 780.9688,235.3438 C780.5156,235.5781 779.875,235.7188 779.1094,235.7188 C777.1094,235.7188 775.8281,234.7031 775.8281,233.125 L775.8281,232.0781 C775.8281,230.375 777.0469,229.1719 778.75,229.1719 C779.3281,229.1719 779.9063,229.3125 780.375,229.5625 C780.8438,229.8281 781.0156,230.0156 781.0781,230.375 C781.2031,231.0469 781.4531,231.2969 781.9844,231.2969 C782.2656,231.2969 782.5469,231.1563 782.7344,230.9375 C782.8594,230.7656 782.9063,230.5938 782.9063,230.1563 L782.9063,228.7969 C782.9063,228.375 782.8906,228.2344 782.7656,228.0625 C782.5938,227.8125 782.3125,227.6563 781.9844,227.6563 C781.6719,227.6563 781.4688,227.7656 781.25,228.0313 C780.0781,227.5313 779.6406,227.4219 778.6875,227.4219 C776.0156,227.4219 774,229.4375 774,232.0625 L774,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="793" y="236.606">K</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="765" x2="804" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="765" x2="804" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8y7xnsehz0b0)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="213.5" y="8"/>
-      <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000287495916564113342">
+        <rect codeLine="46" fill="#F1F1F1" height="131.9996" id="C_0000287495916564113342" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="402" x="207.5" y="7"/>
+        <ellipse cx="399.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M394.25,24.1563 C394.25,26.6563 396.3906,28.4688 399.3125,28.4688 C400.5469,28.4688 401.7188,28.1719 402.4688,27.6563 C403.0781,27.2344 403.4063,26.8125 403.4063,26.4063 C403.4063,25.9375 402.9844,25.5313 402.4844,25.5313 C402.25,25.5313 402.0313,25.6094 401.8281,25.8125 C401.3906,26.25 401.3906,26.25 401.2188,26.3438 C400.7656,26.5781 400.125,26.7188 399.3594,26.7188 C397.3594,26.7188 396.0781,25.7031 396.0781,24.125 L396.0781,23.0781 C396.0781,21.375 397.2969,20.1719 399,20.1719 C399.5781,20.1719 400.1563,20.3125 400.625,20.5625 C401.0938,20.8281 401.2656,21.0156 401.3281,21.375 C401.4531,22.0469 401.7031,22.2969 402.2344,22.2969 C402.5156,22.2969 402.7969,22.1563 402.9844,21.9375 C403.1094,21.7656 403.1563,21.5938 403.1563,21.1563 L403.1563,19.7969 C403.1563,19.375 403.1406,19.2344 403.0156,19.0625 C402.8438,18.8125 402.5625,18.6563 402.2344,18.6563 C401.9219,18.6563 401.7188,18.7656 401.5,19.0313 C400.3281,18.5313 399.8906,18.4219 398.9375,18.4219 C396.2656,18.4219 394.25,20.4375 394.25,23.0625 L394.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="419.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="208.5" x2="608.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="47.9"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="49.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="376" x="227.5" y="56.0059">R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="208.5" x2="608.5" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="72.6999"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="74.6999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="227.5" y="80.8059">some_int : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="89.4998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="91.4998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146" x="227.5" y="97.6058">some_int_pointer : int *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="106.2997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="108.2997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="227.5" y="114.4057">some_int_pointer_pointer : int **</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="123.0997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="125.0997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="227.5" y="131.2057">some_int_reference : int &amp;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="46"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="353" x="233.5" y="54.2104">R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="66.8047"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="68.8047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="233.5" y="75.0151">some_int : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="79.6094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="81.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="233.5" y="87.8198">some_int_pointer : int *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="92.4141"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="94.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="233.5" y="100.6245">some_int_pointer_pointer : int **</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="105.2188"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="107.2188"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="233.5" y="113.4292">some_int_reference : int &amp;</text>
-    </a>
-    <path d="M227.33,124.78 C173.51,145.32 114.85,170.01 63,197 C57.36,199.93 51.44,203.42 46.03,206.78 " fill="none" id="C_0000287495916564113342&lt;-C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="239.82,120.06,232.7927,118.4422,228.5966,124.3067,235.6239,125.9245,239.82,120.06" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="164" y="163.0669">-a</text>
-    <path d="M286.66,120.01 C239.94,142.86 185.91,170.26 138,197 C133.93,199.27 129.67,201.79 125.55,204.29 " fill="none" id="C_0000287495916564113342-&gt;C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="121.15,207,130.9093,205.6752,125.4044,204.3731,126.7064,198.8682,121.15,207" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="226" y="163.0669">-b</text>
-    <path d="M322.33,120.08 C279.51,149.32 229.87,183.22 200.8,203.07 " fill="none" id="C_0000287495916564113342-&gt;C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="196.32,206.13,206.0096,204.3659,200.4514,203.3138,201.5036,197.7556,196.32,206.13" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="277" y="163.0669">-c</text>
-    <path d="M349.34,120.08 C324.54,145.54 296.31,174.52 276.66,194.69 " fill="none" id="C_0000287495916564113342-&gt;C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="272.85,198.6,281.9915,194.9348,276.3352,195.0148,276.2552,189.3585,272.85,198.6" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="320" y="163.0669">-d</text>
-    <path d="M376.35,120.08 C364.57,144.41 351.24,171.96 341.57,191.97 " fill="none" id="C_0000287495916564113342-&gt;C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="339.31,196.62,346.8402,190.272,341.4945,192.1225,339.6441,186.7768,339.31,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="363" y="163.0669">-e</text>
-    <path d="M403,133.26 C403,155.95 403,179.72 403,196.62 " fill="none" id="C_0000287495916564113342&lt;-C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="403,120.08,399,126.08,403,132.08,407,126.08,403,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="9" x="404" y="163.0669">-f</text>
-    <path d="M429.65,120.08 C441.43,144.41 454.76,171.96 464.43,191.97 " fill="none" id="C_0000287495916564113342-&gt;C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="466.69,196.62,466.3559,186.7768,464.5055,192.1225,459.1598,190.272,466.69,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="453" y="163.0669">-g</text>
-    <path d="M456.66,120.08 C481.46,145.54 509.69,174.52 529.34,194.69 " fill="none" id="C_0000287495916564113342-&gt;C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="533.15,198.6,529.7448,189.3585,529.6648,195.0148,524.0085,194.9348,533.15,198.6" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="502" y="163.0669">-h</text>
-    <path d="M482.6,120.08 C526.05,150.15 576.62,185.14 604.91,204.71 " fill="none" id="C_0000287495916564113342-&gt;C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="609.25,207.72,604.1332,199.3046,605.1411,204.871,599.5748,205.8789,609.25,207.72" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="550" y="163.0669">-i</text>
-    <path d="M517.59,120.01 C563.14,142.75 615.64,170.06 662,197 C666.34,199.52 670.88,202.35 675.2,205.15 " fill="none" id="C_0000287495916564113342-&gt;C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="679.43,207.91,674.0946,199.6315,675.2479,205.1695,669.7099,206.3228,679.43,207.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="608" y="163.0669">-j</text>
-    <path d="M559.13,120.02 C614.82,141.62 677.28,168.16 732,197 C736.23,199.23 740.62,201.76 744.84,204.3 " fill="none" id="C_0000287495916564113342-&gt;C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="749.33,207.05,743.7539,198.9317,745.0693,204.4335,739.5675,205.7489,749.33,207.05" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="664" y="163.0669">-k</text>
+    <g id="link_C_0000287495916564113342_C_0000121332093434690887">
+      <path codeLine="54" d="M224.9586,143.8818 C169.6686,166.4318 119.82,188.46 65.5,216 C59.86,218.86 53.93,222.25 48.48,225.53 " fill="none" id="C_0000287495916564113342-backto-C_0000121332093434690887" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="236.07,139.35,229.0037,137.9121,224.9586,143.8818,232.0249,145.3197,236.07,139.35" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="159.5" y="182.077">-a</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0001424864837456200487">
+      <path codeLine="55" d="M282.08,139.4 C237.37,163 186.92,190.2 141.5,216 C135.87,219.2 134.9752,219.6767 129.4152,223.0367 " fill="none" id="C_0000287495916564113342-to-C_0001424864837456200487" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="124.28,226.14,134.0516,224.9085,128.5593,223.554,129.9139,218.0617,124.28,226.14" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="223.5" y="182.077">-b</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0002151170391844743478">
+      <path codeLine="56" d="M317.66,139.45 C274.96,170.22 232.5278,200.7923 205.8278,220.0323 " fill="none" id="C_0000287495916564113342-to-C_0002151170391844743478" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="200.96,223.54,210.6002,221.5236,205.0165,220.6169,205.9232,215.0332,200.96,223.54" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="274.5" y="182.077">-c</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0001378112127131766972">
+      <path codeLine="57" d="M348.43,139.21 C323.53,166.24 300.3149,191.4368 281.9949,211.3268 " fill="none" id="C_0000287495916564113342-to-C_0001378112127131766972" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="277.93,215.74,286.9695,211.8301,281.3174,212.0623,281.0852,206.4102,277.93,215.74" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="320.5" y="182.077">-d</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0001535300935831802489">
+      <path codeLine="58" d="M378.46,139.21 C366.02,166.24 354.8798,190.4002 345.7198,210.2902 " fill="none" id="C_0000287495916564113342-to-C_0001535300935831802489" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="343.21,215.74,350.608,209.2385,345.3015,211.1985,343.3415,205.892,343.21,215.74" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="365.5" y="182.077">-e</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0001803800465279710134">
+      <path codeLine="59" d="M408.5,151.21 C408.5,178.24 408.5,195.85 408.5,215.74 " fill="none" id="C_0000287495916564113342-backto-C_0001803800465279710134" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="408.5,139.21,404.5,145.21,408.5,151.21,412.5,145.21,408.5,139.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="409.5" y="182.077">-f</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0001135797791892670246">
+      <path codeLine="60" d="M438.93,139.21 C451.54,166.24 462.8209,190.4137 472.1109,210.3037 " fill="none" id="C_0000287495916564113342-to-C_0001135797791892670246" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="474.65,215.74,474.4655,205.8929,472.5341,211.2098,467.2172,209.2783,474.65,215.74" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="462.5" y="182.077">-g</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0001243547836571712317">
+      <path codeLine="61" d="M469.36,139.21 C494.76,166.42 518.5066,191.8632 537.0666,211.7532 " fill="none" id="C_0000287495916564113342-to-C_0001243547836571712317" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="541.16,216.14,537.9444,206.8309,537.7488,212.4844,532.0953,212.2888,541.16,216.14" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="514.5" y="182.077">-h</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0000387733199705628658">
+      <path codeLine="62" d="M498.94,139.45 C543.2,171.48 587.5594,203.5823 613.4394,222.3123 " fill="none" id="C_0000287495916564113342-to-C_0000387733199705628658" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="618.3,225.83,613.3543,217.313,614.2495,222.8985,608.6639,223.7938,618.3,225.83" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="564.5" y="182.077">-i</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0000747991828672433537">
+      <path codeLine="63" d="M532.62,139.4 C576.73,163.06 626.57,190.3 671.5,216 C677.52,219.45 678.8813,220.1961 684.7613,223.7661 " fill="none" id="C_0000287495916564113342-to-C_0000747991828672433537" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="689.89,226.88,684.2728,218.79,685.6161,224.2851,680.121,225.6283,689.89,226.88" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="615.5" y="182.077">-j</text>
+    </g>
+    <g id="link_C_0000287495916564113342_C_0001783571342994833467">
+      <path codeLine="64" d="M577.9,139.47 C632.5,162.07 692.76,188.63 746.5,216 C752.13,218.87 752.9192,219.1661 758.3692,222.4461 " fill="none" id="C_0000287495916564113342-to-C_0001783571342994833467" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="763.51,225.54,757.8614,217.4719,759.226,222.9617,753.7362,224.3263,763.51,225.54" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="684.5" y="182.077">-k</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00017_class_mermaid.svg b/docs/test_cases/t00017_class_mermaid.svg
index b7b1f113..adea92c5 100644
--- a/docs/test_cases/t00017_class_mermaid.svg
+++ b/docs/test_cases/t00017_class_mermaid.svg
@@ -1,66 +1,71 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 796.640625 308" style="max-width: 796.641px; background-color: white;" width="796.640625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M179.328125,160.26250717624868L152.98697916666666,168.38542264687388C126.64583333333333,176.5083381174991,73.96354166666667,192.75416905874954,47.622395833333336,206.54375119604143C21.28125,220.33333333333334,21.28125,231.66666666666666,21.28125,237.33333333333334L21.28125,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M185.94534574468085,175L171.2617464539007,180.66666666666666C156.57814716312058,186.33333333333334,127.21094858156027,197.66666666666666,112.52734929078014,209C97.84375,220.33333333333334,97.84375,231.66666666666666,97.84375,237.33333333333334L97.84375,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M240.3535904255319,175L229.36236702127658,180.66666666666666C218.3711436170213,186.33333333333334,196.38869680851064,197.66666666666666,185.3974734042553,209C174.40625,220.33333333333334,174.40625,231.66666666666666,174.40625,237.33333333333334L174.40625,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M294.761835106383,175L287.4629875886525,180.66666666666666C280.164140070922,186.33333333333334,265.56644503546096,197.66666666666666,258.2675975177305,209C250.96875,220.33333333333334,250.96875,231.66666666666666,250.96875,237.33333333333334L250.96875,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M348.85362367021276,175L345.22567597517735,180.66666666666666C341.59772828014184,186.33333333333334,334.3418328900709,197.66666666666666,330.71388519503546,209C327.0859375,220.33333333333334,327.0859375,231.66666666666666,327.0859375,237.33333333333334L327.0859375,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M402.3125,175L402.3125,180.66666666666666C402.3125,186.33333333333334,402.3125,197.66666666666666,402.3125,209C402.3125,220.33333333333334,402.3125,231.66666666666666,402.3125,237.33333333333334L402.3125,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M456.40428856382977,175L460.0751883865248,180.66666666666666C463.74608820921986,186.33333333333334,471.08788785460996,197.66666666666666,474.75878767730495,209C478.4296875,220.33333333333334,478.4296875,231.66666666666666,478.4296875,237.33333333333334L478.4296875,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M511.1289893617021,175L518.5137411347517,180.66666666666666C525.8984929078014,186.33333333333334,540.6679964539007,197.66666666666666,548.0527482269504,209C555.4375,220.33333333333334,555.4375,231.66666666666666,555.4375,237.33333333333334L555.4375,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M563.0111369680851,175L573.916832890071,180.66666666666666C584.8225288120567,186.33333333333334,606.6339206560284,197.66666666666666,617.5396165780143,209C628.4453125,220.33333333333334,628.4453125,231.66666666666666,628.4453125,237.33333333333334L628.4453125,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M613.9494680851064,175L628.3120567375887,180.66666666666666C642.674645390071,186.33333333333334,671.3998226950355,197.66666666666666,685.7624113475177,209C700.125,220.33333333333334,700.125,231.66666666666666,700.125,237.33333333333334L700.125,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M625.296875,161.73424083769635L650.3072916666666,169.61186736474696C675.3177083333334,177.48949389179757,725.3385416666666,193.24474694589878,750.3489583333334,206.78904013961605C775.359375,220.33333333333334,775.359375,231.66666666666666,775.359375,237.33333333333334L775.359375,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M157.68208786076138,166.93757480878676L134.94861488396782,173.9479790073223C112.21514190717426,180.9583832058578,66.74819595358713,194.97919160292892,44.014722976793564,207.65626246813113C21.28125,220.33333333333334,21.28125,231.66666666666666,21.28125,237.33333333333334L21.28125,243"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M185.94534574468085,175L171.2617464539007,180.66666666666666C156.57814716312058,186.33333333333334,127.21094858156027,197.66666666666666,112.52734929078014,208C97.84375,218.33333333333334,97.84375,227.66666666666666,97.84375,232.33333333333334L97.84375,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M240.3535904255319,175L229.36236702127658,180.66666666666666C218.3711436170213,186.33333333333334,196.38869680851064,197.66666666666666,185.3974734042553,208C174.40625,218.33333333333334,174.40625,227.66666666666666,174.40625,232.33333333333334L174.40625,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M294.761835106383,175L287.4629875886525,180.66666666666666C280.164140070922,186.33333333333334,265.56644503546096,197.66666666666666,258.2675975177305,208C250.96875,218.33333333333334,250.96875,227.66666666666666,250.96875,232.33333333333334L250.96875,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M348.85362367021276,175L345.22567597517735,180.66666666666666C341.59772828014184,186.33333333333334,334.3418328900709,197.66666666666666,330.71388519503546,208C327.0859375,218.33333333333334,327.0859375,227.66666666666666,327.0859375,232.33333333333334L327.0859375,237"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M402.3125,193L402.3125,195.66666666666666C402.3125,198.33333333333334,402.3125,203.66666666666666,402.3125,212C402.3125,220.33333333333334,402.3125,231.66666666666666,402.3125,237.33333333333334L402.3125,243"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M456.40428856382977,175L460.0751883865248,180.66666666666666C463.74608820921986,186.33333333333334,471.08788785460996,197.66666666666666,474.75878767730495,208C478.4296875,218.33333333333334,478.4296875,227.66666666666666,478.4296875,232.33333333333334L478.4296875,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M511.1289893617021,175L518.5137411347517,180.66666666666666C525.8984929078014,186.33333333333334,540.6679964539007,197.66666666666666,548.0527482269504,208C555.4375,218.33333333333334,555.4375,227.66666666666666,555.4375,232.33333333333334L555.4375,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M563.0111369680851,175L573.916832890071,180.66666666666666C584.8225288120567,186.33333333333334,606.6339206560284,197.66666666666666,617.5396165780143,208C628.4453125,218.33333333333334,628.4453125,227.66666666666666,628.4453125,232.33333333333334L628.4453125,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M613.9494680851064,175L628.3120567375887,180.66666666666666C642.674645390071,186.33333333333334,671.3998226950355,197.66666666666666,685.7624113475177,208C700.125,218.33333333333334,700.125,227.66666666666666,700.125,232.33333333333334L700.125,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M629.7421875,163.13439790575916L654.01171875,170.77866492146597C678.28125,178.42293193717276,726.8203125,193.7114659685864,751.08984375,206.02239965095987C775.359375,218.33333333333334,775.359375,227.66666666666666,775.359375,232.33333333333334L775.359375,237"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(21.28125, 209)" class="edgeLabel">
@@ -186,7 +191,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L5">
+        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L5">
           <g title="A" id="classId-C_0000121332093434690887-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L7">
+        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L7">
           <g title="B" id="classId-C_0001424864837456200487-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L9">
+        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L9">
           <g title="C" id="classId-C_0002151170391844743478-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,7 +248,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L11">
+        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L11">
           <g title="D" id="classId-C_0001378112127131766972-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,7 +267,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L13">
+        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L13">
           <g title="E" id="classId-C_0001535300935831802489-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,7 +286,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L15">
+        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L15">
           <g title="F" id="classId-C_0001803800465279710134-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,7 +305,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L17">
+        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L17">
           <g title="G" id="classId-C_0001135797791892670246-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,7 +324,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L19">
+        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L19">
           <g title="H" id="classId-C_0001243547836571712317-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,7 +343,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L21">
+        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L21">
           <g title="I" id="classId-C_0000387733199705628658-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,7 +362,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L23">
+        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L23">
           <g title="J" id="classId-C_0000747991828672433537-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,7 +381,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L25">
+        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L25">
           <g title="K" id="classId-C_0001783571342994833467-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,11 +400,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00017/t00017.cc#L27">
+        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L27">
           <g title="R" id="classId-C_0000287495916564113342-11" class="node default clickable">
-            <rect height="167" width="445.96875" y="-83.5" x="-222.984375" class="outer title-state"/>
-            <line y2="-53.5" y1="-53.5" x2="222.984375" x1="-222.984375" class="divider"/>
-            <line y2="50.5" y1="50.5" x2="222.984375" x1="-222.984375" class="divider"/>
+            <rect height="167" width="454.859375" y="-83.5" x="-227.4296875" class="outer title-state"/>
+            <line y2="-53.5" y1="-53.5" x2="227.4296875" x1="-227.4296875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="227.4296875" x1="-227.4296875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -411,29 +416,29 @@
                   <span class="nodeLabel">R</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -215.484375, -42)" height="18" width="100.484375">
+              <foreignObject transform="translate( -219.9296875, -42)" height="18" width="100.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-some_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -215.484375, -20)" height="18" width="158.3125">
+              <foreignObject transform="translate( -219.9296875, -20)" height="18" width="158.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-some_int_pointer : int </span>
+                  <span style="font-style:italic;" class="nodeLabel">-some_int_pointer : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -215.484375, 2)" height="18" width="226.796875">
+              <foreignObject transform="translate( -219.9296875, 2)" height="18" width="226.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
                   <span style="font-style:italic;" class="nodeLabel">-some_int_pointer_pointer : int *</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -215.484375, 24)" height="18" width="192.09375">
+              <foreignObject transform="translate( -219.9296875, 24)" height="18" width="192.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-some_int_reference : int &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -215.484375, 58)" height="18" width="430.96875">
+              <foreignObject transform="translate( -219.9296875, 58)" height="18" width="439.859375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</span>
+                  <span class="nodeLabel">-R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md
index 228c03a7..d9e5d875 100644
--- a/docs/test_cases/t00018.md
+++ b/docs/test_cases/t00018.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00018.h
+File `tests/t00018/t00018.h`
 ```cpp
 #pragma once
 
@@ -51,7 +51,7 @@ public:
 }
 
 ```
-File t00018_impl.h
+File `tests/t00018/t00018_impl.h`
 ```cpp
 #pragma once
 
@@ -74,7 +74,7 @@ public:
 }
 
 ```
-File t00018.cc
+File `tests/t00018/t00018.cc`
 ```cpp
 #include "t00018.h"
 #include "t00018_impl.h"
@@ -100,7 +100,7 @@ widget &widget::operator=(widget &&) = default;
 } // namespace clanguml
 
 ```
-File t00018_impl.cc
+File `tests/t00018/t00018_impl.cc`
 ```cpp
 #include "t00018_impl.h"
 #include "t00018.h"
@@ -170,6 +170,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -200,6 +201,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -230,6 +232,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -296,6 +299,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -321,6 +325,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -346,6 +351,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -371,6 +377,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -401,6 +408,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -426,6 +434,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -456,6 +465,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": true,
           "is_move_assignment": false,
@@ -486,6 +496,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": true,
@@ -516,6 +527,7 @@ void widget::draw(const clanguml::t00018::widget &w)
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": true,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": true,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index d335d19c..a7fbcc88 100644
--- a/docs/test_cases/t00018_class.svg
+++ b/docs/test_cases/t00018_class.svg
@@ -1,136 +1,138 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="395px" preserveAspectRatio="none" style="width:317px;height:395px;" version="1.1" viewBox="0 0 317 395" width="317px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="446px" preserveAspectRatio="none" style="width:333px;height:446px;background:#FFFFFF;" version="1.1" viewBox="0 0 333 446" width="333px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ocmizq0x7ay1" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ocmizq0x7ay1)" height="107.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="40.5" y="8"/>
-      <ellipse cx="114.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M117.7188,29.6406 Q117.1406,29.9375 116.5,30.0781 Q115.8594,30.2344 115.1563,30.2344 Q112.6563,30.2344 111.3281,28.5938 Q110.0156,26.9375 110.0156,23.8125 Q110.0156,20.6875 111.3281,19.0313 Q112.6563,17.375 115.1563,17.375 Q115.8594,17.375 116.5,17.5313 Q117.1563,17.6875 117.7188,17.9844 L117.7188,20.7031 Q117.0938,20.125 116.5,19.8594 Q115.9063,19.5781 115.2813,19.5781 Q113.9375,19.5781 113.25,20.6563 Q112.5625,21.7188 112.5625,23.8125 Q112.5625,25.9063 113.25,26.9844 Q113.9375,28.0469 115.2813,28.0469 Q115.9063,28.0469 116.5,27.7813 Q117.0938,27.5 117.7188,26.9219 L117.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="135.25" y="28.1543">impl::widget</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <g id="elem_C_0000130502639682787993">
+        <rect codeLine="2" fill="#F1F1F1" height="123.1997" id="C_0000130502639682787993" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="249" x="42" y="7"/>
+        <ellipse cx="124.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M119.75,24.1563 C119.75,26.6563 121.8906,28.4688 124.8125,28.4688 C126.0469,28.4688 127.2188,28.1719 127.9688,27.6563 C128.5781,27.2344 128.9063,26.8125 128.9063,26.4063 C128.9063,25.9375 128.4844,25.5313 127.9844,25.5313 C127.75,25.5313 127.5313,25.6094 127.3281,25.8125 C126.8906,26.25 126.8906,26.25 126.7188,26.3438 C126.2656,26.5781 125.625,26.7188 124.8594,26.7188 C122.8594,26.7188 121.5781,25.7031 121.5781,24.125 L121.5781,23.0781 C121.5781,21.375 122.7969,20.1719 124.5,20.1719 C125.0781,20.1719 125.6563,20.3125 126.125,20.5625 C126.5938,20.8281 126.7656,21.0156 126.8281,21.375 C126.9531,22.0469 127.2031,22.2969 127.7344,22.2969 C128.0156,22.2969 128.2969,22.1563 128.4844,21.9375 C128.6094,21.7656 128.6563,21.5938 128.6563,21.1563 L128.6563,19.7969 C128.6563,19.375 128.6406,19.2344 128.5156,19.0625 C128.3438,18.8125 128.0625,18.6563 127.7344,18.6563 C127.4219,18.6563 127.2188,18.7656 127,19.0313 C125.8281,18.5313 125.3906,18.4219 124.4375,18.4219 C121.7656,18.4219 119.75,20.4375 119.75,23.0625 L119.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="145.25" y="27.606">impl::widget</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="43" x2="290" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="48" y="47.9"/>
+          <ellipse cx="53" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="62" y="56.0059">widget(int n) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="43" x2="290" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="48" y="72.6999"/>
+          <ellipse cx="53" cy="77.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="223" x="62" y="80.8059">draw(const widget &amp; w) const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="48" y="89.4998"/>
+          <ellipse cx="53" cy="94.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="185" x="62" y="97.6058">draw(const widget &amp; w) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="43" x2="290" y1="105.3998" y2="105.3998"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="48" y="114.2997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="50" y="116.2997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="62" y="122.4057">n : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="46"/>
-      <ellipse cx="51.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <g id="elem_C_0001005661284373854088">
+        <rect codeLine="11" fill="#F1F1F1" height="231.9993" id="C_0001005661284373854088" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="319" x="7" y="207.2"/>
+        <ellipse cx="141.75" cy="223.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M136.75,224.3563 C136.75,226.8563 138.8906,228.6688 141.8125,228.6688 C143.0469,228.6688 144.2188,228.3719 144.9688,227.8563 C145.5781,227.4344 145.9063,227.0125 145.9063,226.6063 C145.9063,226.1375 145.4844,225.7313 144.9844,225.7313 C144.75,225.7313 144.5313,225.8094 144.3281,226.0125 C143.8906,226.45 143.8906,226.45 143.7188,226.5438 C143.2656,226.7781 142.625,226.9188 141.8594,226.9188 C139.8594,226.9188 138.5781,225.9031 138.5781,224.325 L138.5781,223.2781 C138.5781,221.575 139.7969,220.3719 141.5,220.3719 C142.0781,220.3719 142.6563,220.5125 143.125,220.7625 C143.5938,221.0281 143.7656,221.2156 143.8281,221.575 C143.9531,222.2469 144.2031,222.4969 144.7344,222.4969 C145.0156,222.4969 145.2969,222.3563 145.4844,222.1375 C145.6094,221.9656 145.6563,221.7938 145.6563,221.3563 L145.6563,219.9969 C145.6563,219.575 145.6406,219.4344 145.5156,219.2625 C145.3438,219.0125 145.0625,218.8563 144.7344,218.8563 C144.4219,218.8563 144.2188,218.9656 144,219.2313 C142.8281,218.7313 142.3906,218.6219 141.4375,218.6219 C138.7656,218.6219 136.75,220.6375 136.75,223.2625 L136.75,224.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="162.25" y="227.806">widget</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="325" y1="239.2" y2="239.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="248.1"/>
+          <ellipse cx="18" cy="253.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="27" y="256.2059">widget(int) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="264.8999"/>
+          <ellipse cx="18" cy="269.8999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152" x="27" y="273.0059">widget(widget &amp;&amp;) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="281.6998"/>
+          <ellipse cx="18" cy="286.6998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="244" x="27" y="289.8058">widget(const widget &amp;) = deleted : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="298.4997"/>
+          <ellipse cx="18" cy="303.4997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="27" y="306.6057">~widget() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="325" y1="314.3997" y2="314.3997"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="323.2997"/>
+          <ellipse cx="18" cy="328.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="27" y="331.4057">operator=(widget &amp;&amp;) : widget &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="340.0996"/>
+          <ellipse cx="18" cy="345.0996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="293" x="27" y="348.2056">operator=(const widget &amp;) = deleted : widget &amp;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="325" y1="355.9996" y2="355.9996"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="364.8995"/>
+          <ellipse cx="18" cy="369.8995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="27" y="373.0055">draw() const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="381.6995"/>
+          <ellipse cx="18" cy="386.6995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="27" y="389.8054">draw() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="398.4994"/>
+          <ellipse cx="18" cy="403.4994" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="27" y="406.6054">shown() const : bool</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="325" y1="414.3993" y2="414.3993"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="423.2993"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="425.2993"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="233" x="27" y="431.4053">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="60.5" y="54.2104">widget(int n) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="41.5" x2="270.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="66.8047"/>
-      <ellipse cx="51.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="205" x="60.5" y="75.0151">draw(const widget &amp; w) const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="79.6094"/>
-      <ellipse cx="51.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="60.5" y="87.8198">draw(const widget &amp; w) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="94.4141" y2="94.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="100.4141"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="102.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="60.5" y="108.6245">n : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ocmizq0x7ay1)" height="192.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="6" y="192"/>
-      <ellipse cx="131.25" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M134.2188,213.6406 Q133.6406,213.9375 133,214.0781 Q132.3594,214.2344 131.6563,214.2344 Q129.1563,214.2344 127.8281,212.5938 Q126.5156,210.9375 126.5156,207.8125 Q126.5156,204.6875 127.8281,203.0313 Q129.1563,201.375 131.6563,201.375 Q132.3594,201.375 133,201.5313 Q133.6563,201.6875 134.2188,201.9844 L134.2188,204.7031 Q133.5938,204.125 133,203.8594 Q132.4063,203.5781 131.7813,203.5781 Q130.4375,203.5781 129.75,204.6563 Q129.0625,205.7188 129.0625,207.8125 Q129.0625,209.9063 129.75,210.9844 Q130.4375,212.0469 131.7813,212.0469 Q132.4063,212.0469 133,211.7813 Q133.5938,211.5 134.2188,210.9219 L134.2188,213.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="151.75" y="212.1543">widget</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="224" y2="224"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="230"/>
-      <ellipse cx="17" cy="235" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="238.2104">widget(int) : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="242.8047"/>
-      <ellipse cx="17" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="26" y="251.0151">widget(widget &amp;&amp;) : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="255.6094"/>
-      <ellipse cx="17" cy="260.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="26" y="263.8198">widget(const widget &amp;) = deleted : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="268.4141"/>
-      <ellipse cx="17" cy="273.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="26" y="276.6245">~widget() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="283.2188" y2="283.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="289.2188"/>
-      <ellipse cx="17" cy="294.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="26" y="297.4292">operator=(widget &amp;&amp;) : widget &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="302.0234"/>
-      <ellipse cx="17" cy="307.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="274" x="26" y="310.2339">operator=(const widget &amp;) = deleted : widget &amp;</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="316.8281" y2="316.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.8281"/>
-      <ellipse cx="17" cy="327.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="331.0386">draw() const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.6328"/>
-      <ellipse cx="17" cy="340.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="26" y="343.8433">draw() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="348.4375"/>
-      <ellipse cx="17" cy="353.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="26" y="356.6479">shown() const : bool</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="363.2422" y2="363.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="369.2422"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="371.2422"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="377.4526">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
-    </a>
-    <path d="M150.85,115.27 C150.08,125.14 149.41,135.38 149,145 C148.43,158.51 148.42,172.74 148.76,186.76 " fill="none" id="C_0000130502639682787993-&gt;C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="148.91,191.91,152.6773,182.8102,148.7815,186.9117,144.68,183.0158,148.91,191.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M156,178.29 C156,156.29 156,134.11 156,115.14 " fill="none" id="C_0001005661284373854088&lt;-C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="156,191.57,160,185.57,156,179.57,152,185.57,156,191.57" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="159" y="151.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="169" y="158.0669">pImpl</text>
+    <g id="link_C_0000130502639682787993_C_0001005661284373854088">
+      <path codeLine="26" d="M161.15,130.48 C160.46,140.41 159.87,150.58 159.5,160.2 C158.92,175.25 158.771,185.0912 159.081,200.7212 " fill="none" id="C_0000130502639682787993-to-C_0001005661284373854088" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="159.2,206.72,163.0207,197.6425,159.1009,201.721,155.0223,197.8011,159.2,206.72" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001005661284373854088_C_0000130502639682787993">
+      <path codeLine="27" d="M166.5,194.77 C166.5,168.41 166.5,153.42 166.5,130.43 " fill="none" id="C_0001005661284373854088-backto-C_0000130502639682787993" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="166.5,206.77,170.5,200.77,166.5,194.77,162.5,200.77,166.5,206.77" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="169.5" y="166.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="179.5" y="173.277">pImpl</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00018_class_mermaid.svg b/docs/test_cases/t00018_class_mermaid.svg
index 4658f593..322ffe3d 100644
--- a/docs/test_cases/t00018_class_mermaid.svg
+++ b/docs/test_cases/t00018_class_mermaid.svg
@@ -1,57 +1,62 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 300 506" style="max-width: 300px; background-color: white;" width="300" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 308.890625 506" style="max-width: 308.891px; background-color: white;" width="308.890625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M135.62710900821597,153L134.50371063184664,158.66666666666666C133.38031225547732,164.33333333333334,131.13351550273865,175.66666666666666,130.7036935152582,187C130.2738715277778,198.33333333333334,131.66102430555557,209.66666666666666,132.35460069444446,215.33333333333334L133.04817708333334,221"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M166.95182291666666,221L167.64539930555554,215.33333333333334C168.33897569444443,209.66666666666666,169.7261284722222,198.33333333333334,169.2963064847418,187C168.86648449726135,175.66666666666666,166.61968774452268,164.33333333333334,165.49628936815336,158.66666666666666L164.37289099178403,153"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M140.07242150821597,153L138.94902313184664,158.66666666666666C137.82562475547732,164.33333333333334,135.57882800273865,175.66666666666666,135.02751679828825,186.0074072485858C134.47620559383785,196.34814783050493,135.6203799376757,205.69629566100983,136.19246710959462,210.3703695762623L136.76455428151354,215.04444349151476"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M173.5839413221261,203.1333304745443L173.91305006010506,200.44444206212026C174.24215879808403,197.75555364969622,174.90037627404203,192.3777768248481,174.10608663565168,184.0222217457574C173.31179699726135,175.66666666666666,171.0650002445227,164.33333333333334,169.94160186815336,158.66666666666666L168.81820349178403,153"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -65,7 +70,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(171.11328125, 187)" class="edgeLabel">
+        <g transform="translate(175.55859375, 187)" class="edgeLabel">
           <g transform="translate(-22.2265625, -9)" class="label">
             <foreignObject height="18" width="44.453125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -78,11 +83,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018_impl.h#L9">
+        <a transform="translate(154.4453125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L9">
           <g title="widget" id="classId-C_0000130502639682787993-0" class="node default clickable">
-            <rect height="145" width="284" y="-72.5" x="-142" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="142" x1="-142" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="142" x1="-142" class="divider"/>
+            <rect height="145" width="292.890625" y="-72.5" x="-146.4453125" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="146.4453125" x1="-146.4453125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="146.4453125" x1="-146.4453125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -94,34 +99,34 @@
                   <span class="nodeLabel">impl::widget</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -134.5, -31)" height="18" width="44.46875">
+              <foreignObject transform="translate( -138.9453125, -31)" height="18" width="44.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-n : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -134.5, 3)" height="18" width="139.1875">
+              <foreignObject transform="translate( -138.9453125, 3)" height="18" width="148.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+widget(int n) : void</span>
+                  <span class="nodeLabel">+widget(int n) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -134.5, 25)" height="18" width="269">
+              <foreignObject transform="translate( -138.9453125, 25)" height="18" width="277.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw(const widget &amp; w) : [const] void</span>
+                  <span class="nodeLabel">+draw(const widget &amp; w) : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -134.5, 47)" height="18" width="217.421875">
+              <foreignObject transform="translate( -138.9453125, 47)" height="18" width="226.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw(const widget &amp; w) : void</span>
+                  <span class="nodeLabel">+draw(const widget &amp; w) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00018/t00018.h#L17">
+        <a transform="translate(154.4453125, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L17">
           <g title="widget" id="classId-C_0001005661284373854088-1" class="node default clickable">
-            <rect height="277" width="282.703125" y="-138.5" x="-141.3515625" class="outer title-state"/>
-            <line y2="-108.5" y1="-108.5" x2="141.3515625" x1="-141.3515625" class="divider"/>
-            <line y2="-70.5" y1="-70.5" x2="141.3515625" x1="-141.3515625" class="divider"/>
+            <rect height="277" width="291.59375" y="-138.5" x="-145.796875" class="outer title-state"/>
+            <line y2="-108.5" y1="-108.5" x2="145.796875" x1="-145.796875" class="divider"/>
+            <line y2="-70.5" y1="-70.5" x2="145.796875" x1="-145.796875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -133,54 +138,54 @@
                   <span class="nodeLabel">widget</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, -97)" height="18" width="266.8125">
+              <foreignObject transform="translate( -138.296875, -97)" height="18" width="266.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-pImpl : std::unique_ptr&lt;impl::widget&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, -63)" height="18" width="125.84375">
+              <foreignObject transform="translate( -138.296875, -63)" height="18" width="134.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+widget(int) : void</span>
+                  <span class="nodeLabel">+widget(int) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, -41)" height="18" width="180.984375">
+              <foreignObject transform="translate( -138.296875, -41)" height="18" width="189.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+widget(widget &amp;&amp;) : void</span>
+                  <span class="nodeLabel">+widget(widget &amp;&amp;) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, -19)" height="18" width="213">
+              <foreignObject transform="translate( -138.296875, -19)" height="18" width="221.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+widget(const widget &amp;) : void</span>
+                  <span class="nodeLabel">+widget(const widget &amp;) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, 3)" height="18" width="118.28125">
+              <foreignObject transform="translate( -138.296875, 3)" height="18" width="127.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~widget() : void</span>
+                  <span class="nodeLabel">+~widget() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, 25)" height="18" width="235.6875">
+              <foreignObject transform="translate( -138.296875, 25)" height="18" width="244.578125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(widget &amp;&amp;) : widget &amp;</span>
+                  <span class="nodeLabel">+operator=(widget &amp;&amp;) : : widget &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, 47)" height="18" width="267.703125">
+              <foreignObject transform="translate( -138.296875, 47)" height="18" width="276.59375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(const widget &amp;) : widget &amp;</span>
+                  <span class="nodeLabel">+operator=(const widget &amp;) : : widget &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, 69)" height="18" width="148.953125">
+              <foreignObject transform="translate( -138.296875, 69)" height="18" width="157.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw() : [const] void</span>
+                  <span class="nodeLabel">+draw() : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, 91)" height="18" width="97.375">
+              <foreignObject transform="translate( -138.296875, 91)" height="18" width="106.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw() : void</span>
+                  <span class="nodeLabel">+draw() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.8515625, 113)" height="18" width="161.421875">
+              <foreignObject transform="translate( -138.296875, 113)" height="18" width="170.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+shown() : [const] bool</span>
+                  <span class="nodeLabel">+shown() : : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md
index 5bf5e100..e376b36b 100644
--- a/docs/test_cases/t00019.md
+++ b/docs/test_cases/t00019.md
@@ -14,81 +14,7 @@ diagrams:
 
 ```
 ## Source code
-File t00019_layer1.h
-```cpp
-#pragma once
-
-#include <iostream>
-#include <string>
-
-namespace clanguml {
-namespace t00019 {
-
-template <typename LowerLayer> class Layer1 : public LowerLayer {
-
-    using LowerLayer::LowerLayer;
-
-    int m1() override
-    {
-        std::cout << "m1 called\n";
-        return LowerLayer::m1();
-    }
-
-    std::string m2() override
-    {
-        std::cout << "m2 called\n";
-        return LowerLayer::m2();
-    }
-};
-}
-}
-
-```
-File t00019.cc
-```cpp
-#include "t00019_base.h"
-#include "t00019_layer1.h"
-#include "t00019_layer2.h"
-#include "t00019_layer3.h"
-
-#include <memory>
-
-namespace clanguml {
-namespace t00019 {
-
-class A {
-public:
-    std::unique_ptr<Layer1<Layer2<Layer3<Base>>>> layers;
-};
-}
-}
-
-```
-File t00019_layer2.h
-```cpp
-#pragma once
-
-namespace clanguml {
-namespace t00019 {
-
-template <typename LowerLayer> class Layer2 : public LowerLayer {
-
-    using LowerLayer::LowerLayer;
-
-    using LowerLayer::m1;
-
-    using LowerLayer::m2;
-
-    int all_calls_count() const
-    {
-        return LowerLayer::m1_calls() + LowerLayer::m2_calls();
-    }
-};
-}
-}
-
-```
-File t00019_layer3.h
+File `tests/t00019/t00019_layer3.h`
 ```cpp
 #pragma once
 
@@ -125,7 +51,57 @@ private:
 }
 
 ```
-File t00019_base.h
+File `tests/t00019/t00019_layer1.h`
+```cpp
+#pragma once
+
+#include <iostream>
+#include <string>
+
+namespace clanguml {
+namespace t00019 {
+
+template <typename LowerLayer> class Layer1 : public LowerLayer {
+
+    using LowerLayer::LowerLayer;
+
+    int m1() override
+    {
+        std::cout << "m1 called\n";
+        return LowerLayer::m1();
+    }
+
+    std::string m2() override
+    {
+        std::cout << "m2 called\n";
+        return LowerLayer::m2();
+    }
+};
+}
+}
+
+```
+File `tests/t00019/t00019.cc`
+```cpp
+#include "t00019_base.h"
+#include "t00019_layer1.h"
+#include "t00019_layer2.h"
+#include "t00019_layer3.h"
+
+#include <memory>
+
+namespace clanguml {
+namespace t00019 {
+
+class A {
+public:
+    std::unique_ptr<Layer1<Layer2<Layer3<Base>>>> layers;
+};
+}
+}
+
+```
+File `tests/t00019/t00019_base.h`
 ```cpp
 #pragma once
 
@@ -147,6 +123,30 @@ class Base {
 }
 }
 
+```
+File `tests/t00019/t00019_layer2.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t00019 {
+
+template <typename LowerLayer> class Layer2 : public LowerLayer {
+
+    using LowerLayer::LowerLayer;
+
+    using LowerLayer::m1;
+
+    using LowerLayer::m2;
+
+    int all_calls_count() const
+    {
+        return LowerLayer::m1_calls() + LowerLayer::m2_calls();
+    }
+};
+}
+}
+
 ```
 ## Generated PlantUML diagrams
 ![t00019_class](./t00019_class.svg "Layercake pattern")
@@ -175,6 +175,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -200,6 +201,7 @@ class Base {
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -225,6 +227,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -250,6 +253,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -298,6 +302,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -323,6 +328,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -378,6 +384,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -458,6 +465,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -483,6 +491,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -508,6 +517,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -533,6 +543,7 @@ class Base {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -593,7 +604,7 @@ class Base {
       "source_location": {
         "column": 11,
         "file": "",
-        "line": 242,
+        "line": 277,
         "translation_unit": "t00019.cc"
       },
       "template_parameters": [
@@ -629,7 +640,7 @@ class Base {
       "source_location": {
         "column": 11,
         "file": "",
-        "line": 242,
+        "line": 277,
         "translation_unit": "t00019.cc"
       },
       "template_parameters": [
@@ -672,7 +683,7 @@ class Base {
       "source_location": {
         "column": 11,
         "file": "",
-        "line": 242,
+        "line": 277,
         "translation_unit": "t00019.cc"
       },
       "template_parameters": [
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index bf9dc0b9..a028924b 100644
--- a/docs/test_cases/t00019_class.svg
+++ b/docs/test_cases/t00019_class.svg
@@ -1,198 +1,222 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="693px" preserveAspectRatio="none" style="width:797px;height:693px;" version="1.1" viewBox="0 0 797 693" width="797px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="740px" preserveAspectRatio="none" style="width:822px;height:740px;background:#FFFFFF;" version="1.1" viewBox="0 0 822 740" width="822px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fr79lwr3d2gay" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr79lwr3d2gay)" height="107.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="6" y="8"/>
-      <ellipse cx="97.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M100.7188,29.6406 Q100.1406,29.9375 99.5,30.0781 Q98.8594,30.2344 98.1563,30.2344 Q95.6563,30.2344 94.3281,28.5938 Q93.0156,26.9375 93.0156,23.8125 Q93.0156,20.6875 94.3281,19.0313 Q95.6563,17.375 98.1563,17.375 Q98.8594,17.375 99.5,17.5313 Q100.1563,17.6875 100.7188,17.9844 L100.7188,20.7031 Q100.0938,20.125 99.5,19.8594 Q98.9063,19.5781 98.2813,19.5781 Q96.9375,19.5781 96.25,20.6563 Q95.5625,21.7188 95.5625,23.8125 Q95.5625,25.9063 96.25,26.9844 Q96.9375,28.0469 98.2813,28.0469 Q98.9063,28.0469 99.5,27.7813 Q100.0938,27.5 100.7188,26.9219 L100.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="118.25" y="28.1543">Base</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="228" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <g id="elem_C_0000261668487476634123">
+        <rect codeLine="2" fill="#F1F1F1" height="123.1997" id="C_0000261668487476634123" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="239" x="7" y="7"/>
+        <ellipse cx="106.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M101.25,24.1563 C101.25,26.6563 103.3906,28.4688 106.3125,28.4688 C107.5469,28.4688 108.7188,28.1719 109.4688,27.6563 C110.0781,27.2344 110.4063,26.8125 110.4063,26.4063 C110.4063,25.9375 109.9844,25.5313 109.4844,25.5313 C109.25,25.5313 109.0313,25.6094 108.8281,25.8125 C108.3906,26.25 108.3906,26.25 108.2188,26.3438 C107.7656,26.5781 107.125,26.7188 106.3594,26.7188 C104.3594,26.7188 103.0781,25.7031 103.0781,24.125 L103.0781,23.0781 C103.0781,21.375 104.2969,20.1719 106,20.1719 C106.5781,20.1719 107.1563,20.3125 107.625,20.5625 C108.0938,20.8281 108.2656,21.0156 108.3281,21.375 C108.4531,22.0469 108.7031,22.2969 109.2344,22.2969 C109.5156,22.2969 109.7969,22.1563 109.9844,21.9375 C110.1094,21.7656 110.1563,21.5938 110.1563,21.1563 L110.1563,19.7969 C110.1563,19.375 110.1406,19.2344 110.0156,19.0625 C109.8438,18.8125 109.5625,18.6563 109.2344,18.6563 C108.9219,18.6563 108.7188,18.7656 108.5,19.0313 C107.3281,18.5313 106.8906,18.4219 105.9375,18.4219 C103.2656,18.4219 101.25,20.4375 101.25,23.0625 L101.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="126.75" y="27.606">Base</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="245" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="47.9"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="49.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139" x="27" y="56.0059">Base() = default : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="64.6999"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="66.6999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213" x="27" y="72.8059">~Base() constexpr = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="245" y1="80.5999" y2="80.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="89.4998"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="91.4998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="27" y="97.6058">m1() : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="106.2997"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="108.2997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="27" y="114.4057">m2() : std::string</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="245" y1="122.1997" y2="122.1997"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <g id="elem_C_0000902631298537519271">
+        <rect codeLine="11" fill="#F1F1F1" height="81.5999" id="C_0000902631298537519271" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="145" x="505" y="651.8"/>
+        <ellipse cx="520" cy="667.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M515,668.9563 C515,671.4563 517.1406,673.2688 520.0625,673.2688 C521.2969,673.2688 522.4688,672.9719 523.2188,672.4563 C523.8281,672.0344 524.1563,671.6125 524.1563,671.2063 C524.1563,670.7375 523.7344,670.3313 523.2344,670.3313 C523,670.3313 522.7813,670.4094 522.5781,670.6125 C522.1406,671.05 522.1406,671.05 521.9688,671.1438 C521.5156,671.3781 520.875,671.5188 520.1094,671.5188 C518.1094,671.5188 516.8281,670.5031 516.8281,668.925 L516.8281,667.8781 C516.8281,666.175 518.0469,664.9719 519.75,664.9719 C520.3281,664.9719 520.9063,665.1125 521.375,665.3625 C521.8438,665.6281 522.0156,665.8156 522.0781,666.175 C522.2031,666.8469 522.4531,667.0969 522.9844,667.0969 C523.2656,667.0969 523.5469,666.9563 523.7344,666.7375 C523.8594,666.5656 523.9063,666.3938 523.9063,665.9563 L523.9063,664.5969 C523.9063,664.175 523.8906,664.0344 523.7656,663.8625 C523.5938,663.6125 523.3125,663.4563 522.9844,663.4563 C522.6719,663.4563 522.4688,663.5656 522.25,663.8313 C521.0781,663.3313 520.6406,663.2219 519.6875,663.2219 C517.0156,663.2219 515,665.2375 515,667.8625 L515,668.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="534" y="672.406">Layer1</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="67" x="586" y="648.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="65" x="587" y="663.0001">LowerLayer</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="506" x2="649" y1="683.8" y2="683.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="511" y="692.7"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="513" y="694.7"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="525" y="700.8059">m1() : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="511" y="709.4999"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="513" y="711.4999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="525" y="717.6059">m2() : std::string</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="506" x2="649" y1="725.3999" y2="725.3999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="128" x="26" y="54.2104">Base() = default : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <g id="elem_C_0001115150925302580647">
+        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0001115150925302580647" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="194" x="203.5" y="526"/>
+        <ellipse cx="240.55" cy="542" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M235.55,543.1563 C235.55,545.6563 237.6906,547.4688 240.6125,547.4688 C241.8469,547.4688 243.0188,547.1719 243.7688,546.6563 C244.3781,546.2344 244.7063,545.8125 244.7063,545.4063 C244.7063,544.9375 244.2844,544.5313 243.7844,544.5313 C243.55,544.5313 243.3313,544.6094 243.1281,544.8125 C242.6906,545.25 242.6906,545.25 242.5188,545.3438 C242.0656,545.5781 241.425,545.7188 240.6594,545.7188 C238.6594,545.7188 237.3781,544.7031 237.3781,543.125 L237.3781,542.0781 C237.3781,540.375 238.5969,539.1719 240.3,539.1719 C240.8781,539.1719 241.4563,539.3125 241.925,539.5625 C242.3938,539.8281 242.5656,540.0156 242.6281,540.375 C242.7531,541.0469 243.0031,541.2969 243.5344,541.2969 C243.8156,541.2969 244.0969,541.1563 244.2844,540.9375 C244.4094,540.7656 244.4563,540.5938 244.4563,540.1563 L244.4563,538.7969 C244.4563,538.375 244.4406,538.2344 244.3156,538.0625 C244.1438,537.8125 243.8625,537.6563 243.5344,537.6563 C243.2219,537.6563 243.0188,537.7656 242.8,538.0313 C241.6281,537.5313 241.1906,537.4219 240.2375,537.4219 C237.5656,537.4219 235.55,539.4375 235.55,542.0625 L235.55,543.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="259.45" y="546.606">Layer2</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="67" x="333.5" y="523"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="65" x="334.5" y="537.2001">LowerLayer</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="204.5" x2="396.5" y1="558" y2="558"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="209.5" y="566.9"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="211.5" y="568.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="168" x="223.5" y="575.0059">all_calls_count() const : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="204.5" x2="396.5" y1="582.7999" y2="582.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <g id="elem_C_0001853410560073854945">
+        <rect codeLine="22" fill="#F1F1F1" height="148.7996" id="C_0001853410560073854945" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="28" y="300.2"/>
+        <ellipse cx="48.4" cy="316.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M43.4,317.3563 C43.4,319.8563 45.5406,321.6688 48.4625,321.6688 C49.6969,321.6688 50.8688,321.3719 51.6188,320.8563 C52.2281,320.4344 52.5563,320.0125 52.5563,319.6063 C52.5563,319.1375 52.1344,318.7313 51.6344,318.7313 C51.4,318.7313 51.1813,318.8094 50.9781,319.0125 C50.5406,319.45 50.5406,319.45 50.3688,319.5438 C49.9156,319.7781 49.275,319.9188 48.5094,319.9188 C46.5094,319.9188 45.2281,318.9031 45.2281,317.325 L45.2281,316.2781 C45.2281,314.575 46.4469,313.3719 48.15,313.3719 C48.7281,313.3719 49.3063,313.5125 49.775,313.7625 C50.2438,314.0281 50.4156,314.2156 50.4781,314.575 C50.6031,315.2469 50.8531,315.4969 51.3844,315.4969 C51.6656,315.4969 51.9469,315.3563 52.1344,315.1375 C52.2594,314.9656 52.3063,314.7938 52.3063,314.3563 L52.3063,312.9969 C52.3063,312.575 52.2906,312.4344 52.1656,312.2625 C51.9938,312.0125 51.7125,311.8563 51.3844,311.8563 C51.0719,311.8563 50.8688,311.9656 50.65,312.2313 C49.4781,311.7313 49.0406,311.6219 48.0875,311.6219 C45.4156,311.6219 43.4,313.6375 43.4,316.2625 L43.4,317.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="63.6" y="320.806">Layer3</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="67" x="121" y="297.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="65" x="122" y="311.4001">LowerLayer</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="29" x2="184" y1="332.2" y2="332.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="341.1"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="343.1"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="48" y="349.2059">m1() : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="357.8999"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="359.8999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="48" y="366.0059">m1_calls() const : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="374.6998"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="376.6998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="48" y="382.8058">m2() : std::string</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="391.4997"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="393.4997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="48" y="399.6057">m2_calls() const : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="29" x2="184" y1="407.3997" y2="407.3997"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="416.2997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="418.2997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="48" y="424.4057">m_m1_calls : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="433.0996"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="435.0996"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="48" y="441.2056">m_m2_calls : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="67.0151">~Base() constexpr = default : void</text>
+    <g id="elem_C_0000972890420743280319">
+      <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0000972890420743280319" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="72.5" y="191.2"/>
+      <ellipse cx="87.5" cy="207.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+      <path d="M82.5,208.3562 C82.5,210.8562 84.6406,212.6687 87.5625,212.6687 C88.7969,212.6687 89.9688,212.3719 90.7188,211.8562 C91.3281,211.4344 91.6563,211.0125 91.6563,210.6062 C91.6563,210.1375 91.2344,209.7312 90.7344,209.7312 C90.5,209.7312 90.2813,209.8094 90.0781,210.0125 C89.6406,210.45 89.6406,210.45 89.4688,210.5437 C89.0156,210.7781 88.375,210.9187 87.6094,210.9187 C85.6094,210.9187 84.3281,209.9031 84.3281,208.325 L84.3281,207.2781 C84.3281,205.575 85.5469,204.3719 87.25,204.3719 C87.8281,204.3719 88.4063,204.5125 88.875,204.7625 C89.3438,205.0281 89.5156,205.2156 89.5781,205.575 C89.7031,206.2469 89.9531,206.4969 90.4844,206.4969 C90.7656,206.4969 91.0469,206.3562 91.2344,206.1375 C91.3594,205.9656 91.4063,205.7937 91.4063,205.3562 L91.4063,203.9969 C91.4063,203.575 91.3906,203.4344 91.2656,203.2625 C91.0938,203.0125 90.8125,202.8562 90.4844,202.8562 C90.1719,202.8562 89.9688,202.9656 89.75,203.2312 C88.5781,202.7312 88.1406,202.6219 87.1875,202.6219 C84.5156,202.6219 82.5,204.6375 82.5,207.2625 L82.5,208.3562 Z " fill="#000000"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="101.5" y="211.806">Layer3</text>
+      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="30" x="153.5" y="188.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="28" x="154.5" y="202.4001">Base</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="73.5" x2="179.5" y1="223.2" y2="223.2"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="73.5" x2="179.5" y1="231.2" y2="231.2"/>
+    </g>
+    <g id="elem_C_0000129784999866998870">
+      <rect codeLine="36" fill="#F1F1F1" height="48" id="C_0000129784999866998870" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="160" x="220.5" y="350.6"/>
+      <ellipse cx="235.5" cy="366.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+      <path d="M230.5,367.7562 C230.5,370.2562 232.6406,372.0687 235.5625,372.0687 C236.7969,372.0687 237.9688,371.7719 238.7188,371.2562 C239.3281,370.8344 239.6563,370.4125 239.6563,370.0062 C239.6563,369.5375 239.2344,369.1312 238.7344,369.1312 C238.5,369.1312 238.2813,369.2094 238.0781,369.4125 C237.6406,369.85 237.6406,369.85 237.4688,369.9437 C237.0156,370.1781 236.375,370.3187 235.6094,370.3187 C233.6094,370.3187 232.3281,369.3031 232.3281,367.725 L232.3281,366.6781 C232.3281,364.975 233.5469,363.7719 235.25,363.7719 C235.8281,363.7719 236.4063,363.9125 236.875,364.1625 C237.3438,364.4281 237.5156,364.6156 237.5781,364.975 C237.7031,365.6469 237.9531,365.8969 238.4844,365.8969 C238.7656,365.8969 239.0469,365.7562 239.2344,365.5375 C239.3594,365.3656 239.4063,365.1937 239.4063,364.7562 L239.4063,363.3969 C239.4063,362.975 239.3906,362.8344 239.2656,362.6625 C239.0938,362.4125 238.8125,362.2562 238.4844,362.2562 C238.1719,362.2562 237.9688,362.3656 237.75,362.6312 C236.5781,362.1312 236.1406,362.0219 235.1875,362.0219 C232.5156,362.0219 230.5,364.0375 230.5,366.6625 L230.5,367.7562 Z " fill="#000000"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="249.5" y="371.206">Layer2</text>
+      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="82" x="301.5" y="347.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="80" x="302.5" y="361.8001">Layer3&lt;Base&gt;</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="221.5" x2="379.5" y1="382.6" y2="382.6"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="221.5" x2="379.5" y1="390.6" y2="390.6"/>
+    </g>
+    <g id="elem_C_0000659076058325663708">
+      <rect codeLine="40" fill="#F1F1F1" height="48" id="C_0000659076058325663708" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="471.5" y="534.4"/>
+      <ellipse cx="486.5" cy="550.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+      <path d="M481.5,551.5563 C481.5,554.0563 483.6406,555.8688 486.5625,555.8688 C487.7969,555.8688 488.9688,555.5719 489.7188,555.0563 C490.3281,554.6344 490.6563,554.2125 490.6563,553.8063 C490.6563,553.3375 490.2344,552.9313 489.7344,552.9313 C489.5,552.9313 489.2813,553.0094 489.0781,553.2125 C488.6406,553.65 488.6406,553.65 488.4688,553.7438 C488.0156,553.9781 487.375,554.1188 486.6094,554.1188 C484.6094,554.1188 483.3281,553.1031 483.3281,551.525 L483.3281,550.4781 C483.3281,548.775 484.5469,547.5719 486.25,547.5719 C486.8281,547.5719 487.4063,547.7125 487.875,547.9625 C488.3438,548.2281 488.5156,548.4156 488.5781,548.775 C488.7031,549.4469 488.9531,549.6969 489.4844,549.6969 C489.7656,549.6969 490.0469,549.5563 490.2344,549.3375 C490.3594,549.1656 490.4063,548.9938 490.4063,548.5563 L490.4063,547.1969 C490.4063,546.775 490.3906,546.6344 490.2656,546.4625 C490.0938,546.2125 489.8125,546.0563 489.4844,546.0563 C489.1719,546.0563 488.9688,546.1656 488.75,546.4313 C487.5781,545.9313 487.1406,545.8219 486.1875,545.8219 C483.5156,545.8219 481.5,547.8375 481.5,550.4625 L481.5,551.5563 Z " fill="#000000"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="500.5" y="555.006">Layer1</text>
+      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="134" x="552.5" y="531.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="132" x="553.5" y="545.6001">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="472.5" x2="682.5" y1="566.4" y2="566.4"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="472.5" x2="682.5" y1="574.4" y2="574.4"/>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001015164998787089197">
+        <rect codeLine="44" fill="#F1F1F1" height="64.7999" id="C_0001015164998787089197" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="399" x="416" y="342.2"/>
+        <ellipse cx="606.75" cy="358.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M601.75,359.3563 C601.75,361.8563 603.8906,363.6688 606.8125,363.6688 C608.0469,363.6688 609.2188,363.3719 609.9688,362.8563 C610.5781,362.4344 610.9063,362.0125 610.9063,361.6063 C610.9063,361.1375 610.4844,360.7313 609.9844,360.7313 C609.75,360.7313 609.5313,360.8094 609.3281,361.0125 C608.8906,361.45 608.8906,361.45 608.7188,361.5438 C608.2656,361.7781 607.625,361.9188 606.8594,361.9188 C604.8594,361.9188 603.5781,360.9031 603.5781,359.325 L603.5781,358.2781 C603.5781,356.575 604.7969,355.3719 606.5,355.3719 C607.0781,355.3719 607.6563,355.5125 608.125,355.7625 C608.5938,356.0281 608.7656,356.2156 608.8281,356.575 C608.9531,357.2469 609.2031,357.4969 609.7344,357.4969 C610.0156,357.4969 610.2969,357.3563 610.4844,357.1375 C610.6094,356.9656 610.6563,356.7938 610.6563,356.3563 L610.6563,354.9969 C610.6563,354.575 610.6406,354.4344 610.5156,354.2625 C610.3438,354.0125 610.0625,353.8563 609.7344,353.8563 C609.4219,353.8563 609.2188,353.9656 609,354.2313 C607.8281,353.7313 607.3906,353.6219 606.4375,353.6219 C603.7656,353.6219 601.75,355.6375 601.75,358.2625 L601.75,359.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="627.25" y="362.806">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="417" x2="814" y1="374.2" y2="374.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="417" x2="814" y1="382.2" y2="382.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="422" y="391.1"/>
+          <ellipse cx="427" cy="396.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="373" x="436" y="399.2059">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="228" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="79.6094"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="81.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="87.8198">m1() : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="92.4141"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="94.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="100.6245">m2() : std::string</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="228" y1="107.2188" y2="107.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr79lwr3d2gay)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="491.5" y="609"/>
-      <ellipse cx="506.5" cy="625" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M509.4688,630.6406 Q508.8906,630.9375 508.25,631.0781 Q507.6094,631.2344 506.9063,631.2344 Q504.4063,631.2344 503.0781,629.5938 Q501.7656,627.9375 501.7656,624.8125 Q501.7656,621.6875 503.0781,620.0313 Q504.4063,618.375 506.9063,618.375 Q507.6094,618.375 508.25,618.5313 Q508.9063,618.6875 509.4688,618.9844 L509.4688,621.7031 Q508.8438,621.125 508.25,620.8594 Q507.6563,620.5781 507.0313,620.5781 Q505.6875,620.5781 505,621.6563 Q504.3125,622.7188 504.3125,624.8125 Q504.3125,626.9063 505,627.9844 Q505.6875,629.0469 507.0313,629.0469 Q507.6563,629.0469 508.25,628.7813 Q508.8438,628.5 509.4688,627.9219 L509.4688,630.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="520.5" y="629.1543">Layer1</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="569.5" y="606"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="570.5" y="618.1387">LowerLayer</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="640.5" y1="641" y2="641"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="497.5" y="647"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="499.5" y="649"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="511.5" y="655.2104">m1() : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="497.5" y="659.8047"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="499.5" y="661.8047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="511.5" y="668.0151">m2() : std::string</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="640.5" y1="674.6094" y2="674.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr79lwr3d2gay)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="204" y="487"/>
-      <ellipse cx="231.15" cy="503" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M234.1188,508.6406 Q233.5406,508.9375 232.9,509.0781 Q232.2594,509.2344 231.5563,509.2344 Q229.0563,509.2344 227.7281,507.5938 Q226.4156,505.9375 226.4156,502.8125 Q226.4156,499.6875 227.7281,498.0313 Q229.0563,496.375 231.5563,496.375 Q232.2594,496.375 232.9,496.5313 Q233.5563,496.6875 234.1188,496.9844 L234.1188,499.7031 Q233.4938,499.125 232.9,498.8594 Q232.3063,498.5781 231.6813,498.5781 Q230.3375,498.5781 229.65,499.6563 Q228.9625,500.7188 228.9625,502.8125 Q228.9625,504.9063 229.65,505.9844 Q230.3375,507.0469 231.6813,507.0469 Q232.3063,507.0469 232.9,506.7813 Q233.4938,506.5 234.1188,505.9219 L234.1188,508.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="247.85" y="507.1543">Layer2</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="309" y="484"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="310" y="496.1387">LowerLayer</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="380" y1="519" y2="519"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="210" y="525"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="212" y="527"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="533.2104">all_calls_count() const : int</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="380" y1="539.8047" y2="539.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr79lwr3d2gay)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="22.5" y="285"/>
-      <ellipse cx="37.5" cy="301" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M40.4688,306.6406 Q39.8906,306.9375 39.25,307.0781 Q38.6094,307.2344 37.9063,307.2344 Q35.4063,307.2344 34.0781,305.5938 Q32.7656,303.9375 32.7656,300.8125 Q32.7656,297.6875 34.0781,296.0313 Q35.4063,294.375 37.9063,294.375 Q38.6094,294.375 39.25,294.5313 Q39.9063,294.6875 40.4688,294.9844 L40.4688,297.7031 Q39.8438,297.125 39.25,296.8594 Q38.6563,296.5781 38.0313,296.5781 Q36.6875,296.5781 36,297.6563 Q35.3125,298.7188 35.3125,300.8125 Q35.3125,302.9063 36,303.9844 Q36.6875,305.0469 38.0313,305.0469 Q38.6563,305.0469 39.25,304.7813 Q39.8438,304.5 40.4688,303.9219 L40.4688,306.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="51.5" y="305.1543">Layer3</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="100.5" y="282"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="101.5" y="294.1387">LowerLayer</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.5" x2="171.5" y1="317" y2="317"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="323"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="325"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="42.5" y="331.2104">m1() : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="335.8047"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="337.8047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="42.5" y="344.0151">m1_calls() const : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="348.6094"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="350.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="42.5" y="356.8198">m2() : std::string</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="361.4141"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="363.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="42.5" y="369.6245">m2_calls() const : int</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.5" x2="171.5" y1="376.2188" y2="376.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="382.2188"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="384.2188"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="42.5" y="390.4292">m_m1_calls : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="395.0234"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="397.0234"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="42.5" y="403.2339">m_m2_calls : int</text>
-    </a>
-    <rect fill="#FEFECE" filter="url(#fr79lwr3d2gay)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="64" y="176"/>
-    <ellipse cx="79" cy="192" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M81.9688,197.6406 Q81.3906,197.9375 80.75,198.0781 Q80.1094,198.2344 79.4063,198.2344 Q76.9063,198.2344 75.5781,196.5938 Q74.2656,194.9375 74.2656,191.8125 Q74.2656,188.6875 75.5781,187.0313 Q76.9063,185.375 79.4063,185.375 Q80.1094,185.375 80.75,185.5313 Q81.4063,185.6875 81.9688,185.9844 L81.9688,188.7031 Q81.3438,188.125 80.75,187.8594 Q80.1563,187.5781 79.5313,187.5781 Q78.1875,187.5781 77.5,188.6563 Q76.8125,189.7188 76.8125,191.8125 Q76.8125,193.9063 77.5,194.9844 Q78.1875,196.0469 79.5313,196.0469 Q80.1563,196.0469 80.75,195.7813 Q81.3438,195.5 81.9688,194.9219 L81.9688,197.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="93" y="196.1543">Layer3</text>
-    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="32" x="142" y="173"/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="143" y="185.1387">Base</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="65" x2="170" y1="208" y2="208"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="65" x2="170" y1="216" y2="216"/>
-    <rect fill="#FEFECE" filter="url(#fr79lwr3d2gay)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="207.5" y="323.5"/>
-    <ellipse cx="222.5" cy="339.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M225.4688,345.1406 Q224.8906,345.4375 224.25,345.5781 Q223.6094,345.7344 222.9063,345.7344 Q220.4063,345.7344 219.0781,344.0938 Q217.7656,342.4375 217.7656,339.3125 Q217.7656,336.1875 219.0781,334.5313 Q220.4063,332.875 222.9063,332.875 Q223.6094,332.875 224.25,333.0313 Q224.9063,333.1875 225.4688,333.4844 L225.4688,336.2031 Q224.8438,335.625 224.25,335.3594 Q223.6563,335.0781 223.0313,335.0781 Q221.6875,335.0781 221,336.1563 Q220.3125,337.2188 220.3125,339.3125 Q220.3125,341.4063 221,342.4844 Q221.6875,343.5469 223.0313,343.5469 Q223.6563,343.5469 224.25,343.2813 Q224.8438,343 225.4688,342.4219 L225.4688,345.1406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="236.5" y="343.6543">Layer2</text>
-    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="285.5" y="320.5"/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="286.5" y="332.6387">Layer3&lt;Base&gt;</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="208.5" x2="376.5" y1="355.5" y2="355.5"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="208.5" x2="376.5" y1="363.5" y2="363.5"/>
-    <rect fill="#FEFECE" filter="url(#fr79lwr3d2gay)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="450" y="493.5"/>
-    <ellipse cx="465" cy="509.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M467.9688,515.1406 Q467.3906,515.4375 466.75,515.5781 Q466.1094,515.7344 465.4063,515.7344 Q462.9063,515.7344 461.5781,514.0938 Q460.2656,512.4375 460.2656,509.3125 Q460.2656,506.1875 461.5781,504.5313 Q462.9063,502.875 465.4063,502.875 Q466.1094,502.875 466.75,503.0313 Q467.4063,503.1875 467.9688,503.4844 L467.9688,506.2031 Q467.3438,505.625 466.75,505.3594 Q466.1563,505.0781 465.5313,505.0781 Q464.1875,505.0781 463.5,506.1563 Q462.8125,507.2188 462.8125,509.3125 Q462.8125,511.4063 463.5,512.4844 Q464.1875,513.5469 465.5313,513.5469 Q466.1563,513.5469 466.75,513.2813 Q467.3438,513 467.9688,512.4219 L467.9688,515.1406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="479" y="513.6543">Layer1</text>
-    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="158" x="528" y="490.5"/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="529" y="502.6387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="682" y1="525.5" y2="525.5"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="682" y1="533.5" y2="533.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr79lwr3d2gay)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="412.5" y="317"/>
-      <ellipse cx="591.25" cy="333" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M594.2188,338.6406 Q593.6406,338.9375 593,339.0781 Q592.3594,339.2344 591.6563,339.2344 Q589.1563,339.2344 587.8281,337.5938 Q586.5156,335.9375 586.5156,332.8125 Q586.5156,329.6875 587.8281,328.0313 Q589.1563,326.375 591.6563,326.375 Q592.3594,326.375 593,326.5313 Q593.6563,326.6875 594.2188,326.9844 L594.2188,329.7031 Q593.5938,329.125 593,328.8594 Q592.4063,328.5781 591.7813,328.5781 Q590.4375,328.5781 589.75,329.6563 Q589.0625,330.7188 589.0625,332.8125 Q589.0625,334.9063 589.75,335.9844 Q590.4375,337.0469 591.7813,337.0469 Q592.4063,337.0469 593,336.7813 Q593.5938,336.5 594.2188,335.9219 L594.2188,338.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="611.75" y="337.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="413.5" x2="785.5" y1="349" y2="349"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="413.5" x2="785.5" y1="357" y2="357"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="418.5" y="363"/>
-      <ellipse cx="423.5" cy="368" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="348" x="432.5" y="371.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
-    </a>
-    <path d="M114.33,224.05 C112.76,235.48 110.76,250.03 108.69,265.08 " fill="none" id="C_0000972890420743280319-&gt;C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="115.62,266.08,105.96,284.94,101.75,264.18,115.62,266.08" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M117.5,135.31 C117.5,150.07 117.5,164.54 117.5,175.95 " fill="none" id="C_0000261668487476634123&lt;-C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="110.5,135.27,117.5,115.27,124.5,135.27,110.5,135.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M292.5,371.51 C292.5,395.89 292.5,435.16 292.5,466.69 " fill="none" id="C_0000129784999866998870-&gt;C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="299.5,466.99,292.5,486.99,285.5,466.99,299.5,466.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M161.05,237.21 C193.46,264.15 236.73,300.13 264.61,323.31 " fill="none" id="C_0000972890420743280319&lt;-C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="156.13,242.22,145.23,224.05,165.08,231.46,156.13,242.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M566.5,541.7 C566.5,554.84 566.5,571.9 566.5,588.35 " fill="none" id="C_0000659076058325663708-&gt;C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="573.5,588.53,566.5,608.53,559.5,588.53,573.5,588.53" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M347.13,381.99 C400.86,414.94 481.47,464.36 528.55,493.23 " fill="none" id="C_0000129784999866998870&lt;-C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="343.42,387.93,330.02,371.51,350.73,375.99,343.42,387.93" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M591.09,391.31 C584.72,423.76 576.2,467.11 571.05,493.36 " fill="none" id="C_0001015164998787089197&lt;-C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="593.68,378.15,588.6008,383.2688,591.3723,389.926,596.4515,384.8072,593.68,378.15" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="587.5" cy="449.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="594.5" y="453.0669">layers</text>
+    <g id="link_C_0000972890420743280319_C_0001853410560073854945">
+      <path codeLine="48" d="M123.55,239.43 C121.51,255.5 120.9218,260.0027 118.1518,281.8727 " fill="none" id="C_0000972890420743280319-to-C_0001853410560073854945" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="115.89,299.73,124.1042,282.6266,112.1993,281.1187,115.89,299.73" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000261668487476634123_C_0000972890420743280319">
+      <path codeLine="49" d="M126.5,148.51 C126.5,169.81 126.5,174.46 126.5,190.83 " fill="none" id="C_0000261668487476634123-backto-C_0000972890420743280319" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="126.5,130.51,120.5,148.51,132.5,148.51,126.5,130.51" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000129784999866998870_C_0001115150925302580647">
+      <path codeLine="50" d="M300.5,399 C300.5,431.22 300.5,471.37 300.5,507.54 " fill="none" id="C_0000129784999866998870-to-C_0001115150925302580647" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="300.5,525.54,306.5,507.54,294.5,507.54,300.5,525.54" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000972890420743280319_C_0000129784999866998870">
+      <path codeLine="51" d="M165.521,251.5027 C198.421,281.2527 241.77,320.48 274.72,350.28 " fill="none" id="C_0000972890420743280319-backto-C_0000129784999866998870" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="152.17,239.43,161.4968,255.9531,169.5452,247.0524,152.17,239.43" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000659076058325663708_C_0000902631298537519271">
+      <path codeLine="52" d="M577.5,582.73 C577.5,601.71 577.5,610.92 577.5,633.4 " fill="none" id="C_0000659076058325663708-to-C_0000902631298537519271" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="577.5,651.4,583.5,633.4,571.5,633.4,577.5,651.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000129784999866998870_C_0000659076058325663708">
+      <path codeLine="53" d="M344.2063,409.8749 C363.3863,424.7149 374.89,433.07 398.5,449 C444.57,480.1 499.51,512.74 536.26,533.98 " fill="none" id="C_0000129784999866998870-backto-C_0000659076058325663708" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="329.97,398.86,340.5346,414.6203,347.8779,405.1295,329.97,398.86" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001015164998787089197_C_0000659076058325663708">
+      <path codeLine="54" d="M606.4244,419.0161 C598.8544,455.2261 589.1,501.92 582.36,534.17 " fill="none" id="C_0001015164998787089197-backto-C_0000659076058325663708" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="608.88,407.27,603.7368,412.3245,606.4244,419.0161,611.5675,413.9616,608.88,407.27" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="599.5" cy="488.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="606.5" y="492.077">layers</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00019_class_mermaid.svg b/docs/test_cases/t00019_class_mermaid.svg
index 0291df78..d5c02ec1 100644
--- a/docs/test_cases/t00019_class_mermaid.svg
+++ b/docs/test_cases/t00019_class_mermaid.svg
@@ -1,62 +1,67 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 929.953125 805" style="max-width: 929.953px; background-color: white;" width="929.953125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 938.84375 805" style="max-width: 938.844px; background-color: white;" width="938.84375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M151.640625,259.63803885045235L142.36197916666666,263.865032375377C133.08333333333334,268.09202590030156,114.52604166666667,276.5460129501508,105.24739583333333,284.93967314174205C95.96875,293.3333333333333,95.96875,301.6666666666667,95.96875,305.8333333333333L95.96875,310"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M213.40625,153L213.40625,157.16666666666666C213.40625,161.33333333333334,213.40625,169.66666666666666,213.40625,178C213.40625,186.33333333333334,213.40625,194.66666666666666,213.40625,198.83333333333334L213.40625,203"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M328.62585116731515,433L327.328834306096,449.6666666666667C326.03181744487676,466.3333333333333,323.4377837224384,499.6666666666667,322.1407668612192,522C320.84375,544.3333333333334,320.84375,555.6666666666666,320.84375,561.3333333333334L320.84375,567"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M275.171875,259.63803885045235L284.4505208333333,263.865032375377C293.7291666666667,268.09202590030156,312.2864583333333,276.5460129501508,321.5651041666667,295.93967314174205C330.84375,315.3333333333333,330.84375,345.6666666666667,330.84375,360.8333333333333L330.84375,376"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M676.84375,635L676.84375,641C676.84375,647,676.84375,659,676.84375,669.1666666666666C676.84375,679.3333333333334,676.84375,687.6666666666666,676.84375,691.8333333333334L676.84375,696"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M366.6619497811284,433L387.608265442607,449.6666666666667C408.5545811040856,466.3333333333333,450.4472124270428,499.6666666666667,490.2204572977051,523.8333333333334C529.9937021683673,548,567.6475605867347,563,586.4744897959184,570.5L605.301419005102,578"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M699.8515625,444L699.8515625,458.8333333333333C699.8515625,473.6666666666667,699.8515625,503.3333333333333,697.5038265306122,525.6666666666666C695.1560905612245,548,690.460618622449,563,688.1128826530612,570.5L685.7651466836735,578"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M158.30859375,259.11538210426664L148.65950520833334,263.42948508688886C139.01041666666666,267.7435880695111,119.71223958333333,276.37179403475557,110.06315104166667,281.85256368404447C100.4140625,287.3333333333333,100.4140625,289.6666666666667,100.4140625,290.8333333333333L100.4140625,292"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M220.07421875,171L220.07421875,172.16666666666666C220.07421875,173.33333333333334,220.07421875,175.66666666666666,220.07421875,181C220.07421875,186.33333333333334,220.07421875,194.66666666666666,220.07421875,198.83333333333334L220.07421875,203"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M337.51647616731515,433L336.219459306096,449.6666666666667C334.92244244487676,466.3333333333333,332.3284087224384,499.6666666666667,331.0313918612192,519C329.734375,538.3333333333334,329.734375,543.6666666666666,329.734375,546.3333333333334L329.734375,549"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M298.2722189167969,266.46228937043225L305.1825782639974,269.55190780869356C312.0929376111979,272.6415262469548,325.913656305599,278.82076312347743,332.82401565279946,297.0770482284054C339.734375,315.3333333333333,339.734375,345.6666666666667,339.734375,360.8333333333333L339.734375,376"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M685.734375,635L685.734375,641C685.734375,647,685.734375,659,685.734375,666.1666666666666C685.734375,673.3333333333334,685.734375,675.6666666666666,685.734375,676.8333333333334L685.734375,678"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M389.6378130241424,444.2074111032627L408.23658897845206,459.0061759193856C426.8353649327616,473.8049407355085,464.03291684138077,503.40247036775423,501.4586220048741,525.7012351838771C538.8843271683673,548,576.5381855867347,563,595.3651147959184,570.5L614.192044005102,578"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M708.7421875,462L708.7421875,473.8333333333333C708.7421875,485.6666666666667,708.7421875,509.3333333333333,706.3944515306122,528.6666666666666C704.0467155612245,548,699.351243622449,563,697.0035076530612,570.5L694.6557716836735,578"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -119,7 +124,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(699.8515625, 533)" class="edgeLabel">
+        <g transform="translate(708.7421875, 533)" class="edgeLabel">
           <g transform="translate(-26.015625, -9)" class="label">
             <foreignObject height="18" width="52.03125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -132,11 +137,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_base.h#L8">
+        <a transform="translate(220.07421875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L8">
           <g title="Base" id="classId-C_0000261668487476634123-0" class="node default clickable">
-            <rect height="145" width="254.671875" y="-72.5" x="-127.3359375" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
+            <rect height="145" width="263.5625" y="-72.5" x="-131.78125" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="131.78125" x1="-131.78125" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="131.78125" x1="-131.78125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -148,30 +153,30 @@
                   <span class="nodeLabel">Base</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -119.8359375, -19)" height="18" width="156.515625">
+              <foreignObject transform="translate( -124.28125, -19)" height="18" width="165.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-Base() : [default] void</span>
+                  <span class="nodeLabel">-Base() : : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -119.8359375, 3)" height="18" width="239.671875">
+              <foreignObject transform="translate( -124.28125, 3)" height="18" width="248.5625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-~Base() : [default,constexpr] void</span>
+                  <span class="nodeLabel">-~Base() : : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -119.8359375, 25)" height="18" width="68.453125">
+              <foreignObject transform="translate( -124.28125, 25)" height="18" width="77.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1() : int</span>
+                  <span class="nodeLabel">-m1() : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -119.8359375, 47)" height="18" width="120.90625">
+              <foreignObject transform="translate( -124.28125, 47)" height="18" width="129.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2() : std::string</span>
+                  <span class="nodeLabel">-m2() : : std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer1.h#L9">
+        <a transform="translate(685.734375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L9">
           <g title="Layer1" id="classId-C_0000902631298537519271-1" class="node default clickable">
             <rect height="101" width="175.09375" y="-50.5" x="-87.546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="87.546875" x1="-87.546875" class="divider"/>
@@ -187,24 +192,24 @@
                   <span class="nodeLabel">Layer1&lt;LowerLayer&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 3)" height="18" width="68.453125">
+              <foreignObject transform="translate( -80.046875, 3)" height="18" width="77.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1() : int</span>
+                  <span class="nodeLabel">-m1() : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 25)" height="18" width="120.90625">
+              <foreignObject transform="translate( -80.046875, 25)" height="18" width="129.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2() : std::string</span>
+                  <span class="nodeLabel">-m2() : : std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer2.h#L6">
+        <a transform="translate(329.734375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L6">
           <g title="Layer2" id="classId-C_0001115150925302580647-2" class="node default clickable">
-            <rect height="79" width="217.75" y="-39.5" x="-108.875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="108.875" x1="-108.875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="108.875" x1="-108.875" class="divider"/>
+            <rect height="79" width="226.640625" y="-39.5" x="-113.3203125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="113.3203125" x1="-113.3203125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="113.3203125" x1="-113.3203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -216,19 +221,19 @@
                   <span class="nodeLabel">Layer2&lt;LowerLayer&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -101.375, 14)" height="18" width="202.75">
+              <foreignObject transform="translate( -105.8203125, 14)" height="18" width="211.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-all_calls_count() : [const] int</span>
+                  <span class="nodeLabel">-all_calls_count() : : [const] int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019_layer3.h#L8">
+        <a transform="translate(100.4140625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L8">
           <g title="Layer3" id="classId-C_0001853410560073854945-3" class="node default clickable">
-            <rect height="189" width="175.9375" y="-94.5" x="-87.96875" class="outer title-state"/>
-            <line y2="-64.5" y1="-64.5" x2="87.96875" x1="-87.96875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="87.96875" x1="-87.96875" class="divider"/>
+            <rect height="189" width="184.828125" y="-94.5" x="-92.4140625" class="outer title-state"/>
+            <line y2="-64.5" y1="-64.5" x2="92.4140625" x1="-92.4140625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="92.4140625" x1="-92.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -240,40 +245,40 @@
                   <span class="nodeLabel">Layer3&lt;LowerLayer&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.46875, -53)" height="18" width="120.921875">
+              <foreignObject transform="translate( -84.9140625, -53)" height="18" width="120.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_m1_calls : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.46875, -31)" height="18" width="120.921875">
+              <foreignObject transform="translate( -84.9140625, -31)" height="18" width="120.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_m2_calls : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.46875, 3)" height="18" width="68.453125">
+              <foreignObject transform="translate( -84.9140625, 3)" height="18" width="77.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1() : int</span>
+                  <span class="nodeLabel">-m1() : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.46875, 25)" height="18" width="160.9375">
+              <foreignObject transform="translate( -84.9140625, 25)" height="18" width="169.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1_calls() : [const] int</span>
+                  <span class="nodeLabel">-m1_calls() : : [const] int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.46875, 47)" height="18" width="120.90625">
+              <foreignObject transform="translate( -84.9140625, 47)" height="18" width="129.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2() : std::string</span>
+                  <span class="nodeLabel">-m2() : : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.46875, 69)" height="18" width="160.9375">
+              <foreignObject transform="translate( -84.9140625, 69)" height="18" width="169.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2_calls() : [const] int</span>
+                  <span class="nodeLabel">-m2_calls() : : [const] int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/#L242">
+        <a transform="translate(220.07421875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L277">
           <g title="Layer3" id="classId-C_0000972890420743280319-4" class="node default clickable">
             <rect height="57" width="123.53125" y="-28.5" x="-61.765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.765625" x1="-61.765625" class="divider"/>
@@ -292,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/#L242">
+        <a transform="translate(339.734375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L277">
           <g title="Layer2" id="classId-C_0000129784999866998870-5" class="node default clickable">
             <rect height="57" width="193.8125" y="-28.5" x="-96.90625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="96.90625" x1="-96.90625" class="divider"/>
@@ -311,7 +316,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/#L242">
+        <a transform="translate(685.734375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L277">
           <g title="Layer1" id="classId-C_0000659076058325663708-6" class="node default clickable">
             <rect height="57" width="264.09375" y="-28.5" x="-132.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="132.046875" x1="-132.046875" class="divider"/>
@@ -330,7 +335,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00019/t00019.cc#L11">
+        <a transform="translate(708.7421875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L11">
           <g title="A" id="classId-C_0001015164998787089197-7" class="node default clickable">
             <rect height="79" width="444.203125" y="-39.5" x="-222.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="222.1015625" x1="-222.1015625" class="divider"/>
diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md
index fe541264..80829fbb 100644
--- a/docs/test_cases/t00020.md
+++ b/docs/test_cases/t00020.md
@@ -19,7 +19,7 @@ diagrams:
 
 ```
 ## Source code
-File t00020.cc
+File `tests/t00020/t00020.cc`
 ```cpp
 #include <memory>
 
@@ -120,6 +120,7 @@ public:
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -145,6 +146,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -205,6 +207,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -265,6 +268,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -318,6 +322,7 @@ public:
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -343,6 +348,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -403,6 +409,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -463,6 +470,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -516,6 +524,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -541,6 +550,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -596,6 +606,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -621,6 +632,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -676,6 +688,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -701,6 +714,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 90172649..4f36cd93 100644
--- a/docs/test_cases/t00020_class.svg
+++ b/docs/test_cases/t00020_class.svg
@@ -1,217 +1,261 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="886px" preserveAspectRatio="none" style="width:763px;height:886px;" version="1.1" viewBox="0 0 763 886" width="763px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="935px" preserveAspectRatio="none" style="width:812px;height:935px;background:#FFFFFF;" version="1.1" viewBox="0 0 812 935" width="812px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13pjv6cf5uqjm" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="81.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="280.5" y="142"/>
-      <ellipse cx="370.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M370.3594,153.3438 L369.2031,158.4219 L371.5313,158.4219 L370.3594,153.3438 Z M368.875,151.1094 L371.8594,151.1094 L375.2188,163.5 L372.7656,163.5 L372,160.4375 L368.7188,160.4375 L367.9688,163.5 L365.5313,163.5 L368.875,151.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="390.75" y="162.1543">ProductA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="174" y2="174"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <g id="elem_C_0000425267229659464944">
+        <rect codeLine="2" fill="#F1F1F1" height="91.6998" id="C_0000425267229659464944" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="265" x="311.82" y="152.8"/>
+        <ellipse cx="411.07" cy="168.8" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M412.6013,170.7375 L412.9294,171.5344 L412.6481,171.5344 C412.195,171.5344 412.07,171.5656 411.8981,171.675 C411.6169,171.8156 411.445,172.1125 411.445,172.4094 C411.445,172.7062 411.5856,172.9562 411.82,173.1281 C411.9919,173.2531 412.2263,173.3 412.6481,173.3 L415.0075,173.3 C415.3669,173.3 415.6169,173.2687 415.7575,173.175 C416.0231,173.0344 416.195,172.7219 416.195,172.4094 C416.195,172.1437 416.0544,171.8781 415.82,171.7062 C415.6325,171.5812 415.4763,171.55 415.0231,171.5344 L411.6325,163.7062 L407.9138,163.7062 C407.4606,163.7062 407.32,163.7219 407.1481,163.8312 C406.8825,164.0031 406.7106,164.2844 406.7106,164.5812 C406.7106,164.8625 406.8513,165.1281 407.1013,165.3 C407.2731,165.425 407.4606,165.4562 407.9138,165.4562 L408.8825,165.4562 L406.3044,171.5344 C405.5544,171.5344 405.1481,171.8312 405.1481,172.4094 C405.1481,173.0187 405.5388,173.3 406.3356,173.3 L408.6013,173.3 C408.9606,173.3 409.2106,173.2687 409.3513,173.175 C409.6169,173.0187 409.7888,172.7219 409.7888,172.4094 C409.7888,172.1437 409.6481,171.8781 409.4138,171.7062 C409.2263,171.5656 409.07,171.5344 408.6013,171.5344 L408.3044,171.5344 L408.6481,170.7375 L412.6013,170.7375 Z M411.8356,168.9875 L409.3825,168.9875 L410.6169,166.1125 L411.8356,168.9875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="58" x="431.57" y="174.75">ProductA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="312.82" x2="575.82" y1="184.8" y2="184.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="317.82" y="193.7"/>
+          <ellipse cx="322.82" cy="198.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="239" x="331.82" y="201.8059">~ProductA() constexpr = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="312.82" x2="575.82" y1="209.5999" y2="209.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="317.82" y="219.5499"/>
+          <ellipse cx="322.82" cy="224.5499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="182" x="331.82" y="228.9999">sell(int price) const = 0 : bool</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="312.82" x2="575.82" y1="236.4998" y2="236.4998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="180"/>
-      <ellipse cx="291.5" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <g id="elem_C_0001756496029797864207">
+        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0001756496029797864207" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="207.32" y="304.5"/>
+        <ellipse cx="262.07" cy="320.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M257.07,321.6563 C257.07,324.1563 259.2106,325.9688 262.1325,325.9688 C263.3669,325.9688 264.5388,325.6719 265.2888,325.1563 C265.8981,324.7344 266.2263,324.3125 266.2263,323.9063 C266.2263,323.4375 265.8044,323.0313 265.3044,323.0313 C265.07,323.0313 264.8513,323.1094 264.6481,323.3125 C264.2106,323.75 264.2106,323.75 264.0388,323.8438 C263.5856,324.0781 262.945,324.2188 262.1794,324.2188 C260.1794,324.2188 258.8981,323.2031 258.8981,321.625 L258.8981,320.5781 C258.8981,318.875 260.1169,317.6719 261.82,317.6719 C262.3981,317.6719 262.9763,317.8125 263.445,318.0625 C263.9138,318.3281 264.0856,318.5156 264.1481,318.875 C264.2731,319.5469 264.5231,319.7969 265.0544,319.7969 C265.3356,319.7969 265.6169,319.6563 265.8044,319.4375 C265.9294,319.2656 265.9763,319.0938 265.9763,318.6563 L265.9763,317.2969 C265.9763,316.875 265.9606,316.7344 265.8356,316.5625 C265.6638,316.3125 265.3825,316.1563 265.0544,316.1563 C264.7419,316.1563 264.5388,316.2656 264.32,316.5313 C263.1481,316.0313 262.7106,315.9219 261.7575,315.9219 C259.0856,315.9219 257.07,317.9375 257.07,320.5625 L257.07,321.6563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="282.57" y="325.106">ProductA1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="208.32" x2="390.32" y1="336.5" y2="336.5"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.32" y="345.4"/>
+          <ellipse cx="218.32" cy="350.4" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="158" x="227.32" y="353.5059">sell(int price) const : bool</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="208.32" x2="390.32" y1="361.2999" y2="361.2999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="300.5" y="188.2104">~ProductA() constexpr = default : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <g id="elem_C_0001531708592885216981">
+        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0001531708592885216981" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="568.32" y="437.7"/>
+        <ellipse cx="623.07" cy="453.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M618.07,454.8563 C618.07,457.3563 620.2106,459.1688 623.1325,459.1688 C624.3669,459.1688 625.5388,458.8719 626.2888,458.3563 C626.8981,457.9344 627.2263,457.5125 627.2263,457.1063 C627.2263,456.6375 626.8044,456.2313 626.3044,456.2313 C626.07,456.2313 625.8513,456.3094 625.6481,456.5125 C625.2106,456.95 625.2106,456.95 625.0388,457.0438 C624.5856,457.2781 623.945,457.4188 623.1794,457.4188 C621.1794,457.4188 619.8981,456.4031 619.8981,454.825 L619.8981,453.7781 C619.8981,452.075 621.1169,450.8719 622.82,450.8719 C623.3981,450.8719 623.9763,451.0125 624.445,451.2625 C624.9138,451.5281 625.0856,451.7156 625.1481,452.075 C625.2731,452.7469 625.5231,452.9969 626.0544,452.9969 C626.3356,452.9969 626.6169,452.8563 626.8044,452.6375 C626.9294,452.4656 626.9763,452.2938 626.9763,451.8563 L626.9763,450.4969 C626.9763,450.075 626.9606,449.9344 626.8356,449.7625 C626.6638,449.5125 626.3825,449.3563 626.0544,449.3563 C625.7419,449.3563 625.5388,449.4656 625.32,449.7313 C624.1481,449.2313 623.7106,449.1219 622.7575,449.1219 C620.0856,449.1219 618.07,451.1375 618.07,453.7625 L618.07,454.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="643.57" y="458.306">ProductA2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="569.32" x2="751.32" y1="469.7" y2="469.7"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="574.32" y="478.6"/>
+          <ellipse cx="579.32" cy="483.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="158" x="588.32" y="486.7059">sell(int price) const : bool</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="569.32" x2="751.32" y1="494.4999" y2="494.4999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="281.5" x2="523.5" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="200.8047"/>
-      <ellipse cx="291.5" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <g id="elem_C_0002235759006374865842">
+        <rect codeLine="19" fill="#F1F1F1" height="91.6998" id="C_0002235759006374865842" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="265" x="15.82" y="570.9"/>
+        <ellipse cx="115.07" cy="586.9" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M116.6013,588.8375 L116.9294,589.6344 L116.6481,589.6344 C116.195,589.6344 116.07,589.6656 115.8981,589.775 C115.6169,589.9156 115.445,590.2125 115.445,590.5094 C115.445,590.8063 115.5856,591.0563 115.82,591.2281 C115.9919,591.3531 116.2263,591.4 116.6481,591.4 L119.0075,591.4 C119.3669,591.4 119.6169,591.3688 119.7575,591.275 C120.0231,591.1344 120.195,590.8219 120.195,590.5094 C120.195,590.2438 120.0544,589.9781 119.82,589.8063 C119.6325,589.6813 119.4763,589.65 119.0231,589.6344 L115.6325,581.8063 L111.9138,581.8063 C111.4606,581.8063 111.32,581.8219 111.1481,581.9313 C110.8825,582.1031 110.7106,582.3844 110.7106,582.6813 C110.7106,582.9625 110.8513,583.2281 111.1013,583.4 C111.2731,583.525 111.4606,583.5563 111.9138,583.5563 L112.8825,583.5563 L110.3044,589.6344 C109.5544,589.6344 109.1481,589.9313 109.1481,590.5094 C109.1481,591.1188 109.5388,591.4 110.3356,591.4 L112.6013,591.4 C112.9606,591.4 113.2106,591.3688 113.3513,591.275 C113.6169,591.1188 113.7888,590.8219 113.7888,590.5094 C113.7888,590.2438 113.6481,589.9781 113.4138,589.8063 C113.2263,589.6656 113.07,589.6344 112.6013,589.6344 L112.3044,589.6344 L112.6481,588.8375 L116.6013,588.8375 Z M115.8356,587.0875 L113.3825,587.0875 L114.6169,584.2125 L115.8356,587.0875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="58" x="135.57" y="592.85">ProductB</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="16.82" x2="279.82" y1="602.9" y2="602.9"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.82" y="611.8"/>
+          <ellipse cx="26.82" cy="616.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="239" x="35.82" y="619.9059">~ProductB() constexpr = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="16.82" x2="279.82" y1="627.6999" y2="627.6999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.82" y="637.6499"/>
+          <ellipse cx="26.82" cy="642.6499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="184" x="35.82" y="647.0999">buy(int price) const = 0 : bool</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="16.82" x2="279.82" y1="654.5998" y2="654.5998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="300.5" y="209.0151">sell(int price) const = 0 : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <g id="elem_C_0001465493024233223845">
+        <rect codeLine="26" fill="#F1F1F1" height="64.7999" id="C_0001465493024233223845" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="186" x="276.32" y="722.6"/>
+        <ellipse cx="332.07" cy="738.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M327.07,739.7563 C327.07,742.2563 329.2106,744.0688 332.1325,744.0688 C333.3669,744.0688 334.5388,743.7719 335.2888,743.2563 C335.8981,742.8344 336.2263,742.4125 336.2263,742.0063 C336.2263,741.5375 335.8044,741.1313 335.3044,741.1313 C335.07,741.1313 334.8513,741.2094 334.6481,741.4125 C334.2106,741.85 334.2106,741.85 334.0388,741.9438 C333.5856,742.1781 332.945,742.3188 332.1794,742.3188 C330.1794,742.3188 328.8981,741.3031 328.8981,739.725 L328.8981,738.6781 C328.8981,736.975 330.1169,735.7719 331.82,735.7719 C332.3981,735.7719 332.9763,735.9125 333.445,736.1625 C333.9138,736.4281 334.0856,736.6156 334.1481,736.975 C334.2731,737.6469 334.5231,737.8969 335.0544,737.8969 C335.3356,737.8969 335.6169,737.7563 335.8044,737.5375 C335.9294,737.3656 335.9763,737.1938 335.9763,736.7563 L335.9763,735.3969 C335.9763,734.975 335.9606,734.8344 335.8356,734.6625 C335.6638,734.4125 335.3825,734.2563 335.0544,734.2563 C334.7419,734.2563 334.5388,734.3656 334.32,734.6313 C333.1481,734.1313 332.7106,734.0219 331.7575,734.0219 C329.0856,734.0219 327.07,736.0375 327.07,738.6625 L327.07,739.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="352.57" y="743.206">ProductB1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="277.32" x2="461.32" y1="754.6" y2="754.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="282.32" y="763.5"/>
+          <ellipse cx="287.32" cy="768.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="296.32" y="771.6059">buy(int price) const : bool</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="277.32" x2="461.32" y1="779.3999" y2="779.3999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="215.6094" y2="215.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="178" y="284"/>
-      <ellipse cx="226.75" cy="300" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M229.7188,305.6406 Q229.1406,305.9375 228.5,306.0781 Q227.8594,306.2344 227.1563,306.2344 Q224.6563,306.2344 223.3281,304.5938 Q222.0156,302.9375 222.0156,299.8125 Q222.0156,296.6875 223.3281,295.0313 Q224.6563,293.375 227.1563,293.375 Q227.8594,293.375 228.5,293.5313 Q229.1563,293.6875 229.7188,293.9844 L229.7188,296.7031 Q229.0938,296.125 228.5,295.8594 Q227.9063,295.5781 227.2813,295.5781 Q225.9375,295.5781 225.25,296.6563 Q224.5625,297.7188 224.5625,299.8125 Q224.5625,301.9063 225.25,302.9844 Q225.9375,304.0469 227.2813,304.0469 Q227.9063,304.0469 228.5,303.7813 Q229.0938,303.5 229.7188,302.9219 L229.7188,305.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="247.25" y="304.1543">ProductA1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="316" y2="316"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <g id="elem_C_0002154665562370057871">
+        <rect codeLine="31" fill="#F1F1F1" height="64.7999" id="C_0002154665562370057871" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="186" x="55.32" y="722.6"/>
+        <ellipse cx="111.07" cy="738.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M106.07,739.7563 C106.07,742.2563 108.2106,744.0688 111.1325,744.0688 C112.3669,744.0688 113.5388,743.7719 114.2888,743.2563 C114.8981,742.8344 115.2263,742.4125 115.2263,742.0063 C115.2263,741.5375 114.8044,741.1313 114.3044,741.1313 C114.07,741.1313 113.8513,741.2094 113.6481,741.4125 C113.2106,741.85 113.2106,741.85 113.0388,741.9438 C112.5856,742.1781 111.945,742.3188 111.1794,742.3188 C109.1794,742.3188 107.8981,741.3031 107.8981,739.725 L107.8981,738.6781 C107.8981,736.975 109.1169,735.7719 110.82,735.7719 C111.3981,735.7719 111.9763,735.9125 112.445,736.1625 C112.9138,736.4281 113.0856,736.6156 113.1481,736.975 C113.2731,737.6469 113.5231,737.8969 114.0544,737.8969 C114.3356,737.8969 114.6169,737.7563 114.8044,737.5375 C114.9294,737.3656 114.9763,737.1938 114.9763,736.7563 L114.9763,735.3969 C114.9763,734.975 114.9606,734.8344 114.8356,734.6625 C114.6638,734.4125 114.3825,734.2563 114.0544,734.2563 C113.7419,734.2563 113.5388,734.3656 113.32,734.6313 C112.1481,734.1313 111.7106,734.0219 110.7575,734.0219 C108.0856,734.0219 106.07,736.0375 106.07,738.6625 L106.07,739.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="131.57" y="743.206">ProductB2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="56.32" x2="240.32" y1="754.6" y2="754.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="61.32" y="763.5"/>
+          <ellipse cx="66.32" cy="768.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="75.32" y="771.6059">buy(int price) const : bool</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="56.32" x2="240.32" y1="779.3999" y2="779.3999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="184" y="322"/>
-      <ellipse cx="189" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <g id="elem_C_0001705546469218961425">
+        <rect codeLine="36" fill="#F1F1F1" height="85.7998" id="C_0001705546469218961425" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="330" x="134.32" y="7"/>
+        <ellipse cx="245.07" cy="23" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M246.6013,24.9375 L246.9294,25.7344 L246.6481,25.7344 C246.195,25.7344 246.07,25.7656 245.8981,25.875 C245.6169,26.0156 245.445,26.3125 245.445,26.6094 C245.445,26.9063 245.5856,27.1563 245.82,27.3281 C245.9919,27.4531 246.2263,27.5 246.6481,27.5 L249.0075,27.5 C249.3669,27.5 249.6169,27.4688 249.7575,27.375 C250.0231,27.2344 250.195,26.9219 250.195,26.6094 C250.195,26.3438 250.0544,26.0781 249.82,25.9063 C249.6325,25.7813 249.4763,25.75 249.0231,25.7344 L245.6325,17.9063 L241.9138,17.9063 C241.4606,17.9063 241.32,17.9219 241.1481,18.0313 C240.8825,18.2031 240.7106,18.4844 240.7106,18.7813 C240.7106,19.0625 240.8513,19.3281 241.1013,19.5 C241.2731,19.625 241.4606,19.6563 241.9138,19.6563 L242.8825,19.6563 L240.3044,25.7344 C239.5544,25.7344 239.1481,26.0313 239.1481,26.6094 C239.1481,27.2188 239.5388,27.5 240.3356,27.5 L242.6013,27.5 C242.9606,27.5 243.2106,27.4688 243.3513,27.375 C243.6169,27.2188 243.7888,26.9219 243.7888,26.6094 C243.7888,26.3438 243.6481,26.0781 243.4138,25.9063 C243.2263,25.7656 243.07,25.7344 242.6013,25.7344 L242.3044,25.7344 L242.6481,24.9375 L246.6013,24.9375 Z M245.8356,23.1875 L243.3825,23.1875 L244.6169,20.3125 L245.8356,23.1875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="100" x="265.57" y="28.95">AbstractFactory</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="135.32" x2="463.32" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="140.32" y="48.95"/>
+          <ellipse cx="145.32" cy="53.95" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="304" x="154.32" y="58.3999">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="140.32" y="67.8499"/>
+          <ellipse cx="145.32" cy="72.8499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="304" x="154.32" y="77.2999">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="135.32" x2="463.32" y1="84.7998" y2="84.7998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="198" y="330.2104">sell(int price) const : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <g id="elem_C_0000692346848484854107">
+        <rect codeLine="42" fill="#F1F1F1" height="81.5999" id="C_0000692346848484854107" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="306" x="146.32" y="429.3"/>
+        <ellipse cx="267.07" cy="445.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M262.07,446.4563 C262.07,448.9563 264.2106,450.7688 267.1325,450.7688 C268.3669,450.7688 269.5388,450.4719 270.2888,449.9563 C270.8981,449.5344 271.2263,449.1125 271.2263,448.7063 C271.2263,448.2375 270.8044,447.8313 270.3044,447.8313 C270.07,447.8313 269.8513,447.9094 269.6481,448.1125 C269.2106,448.55 269.2106,448.55 269.0388,448.6438 C268.5856,448.8781 267.945,449.0188 267.1794,449.0188 C265.1794,449.0188 263.8981,448.0031 263.8981,446.425 L263.8981,445.3781 C263.8981,443.675 265.1169,442.4719 266.82,442.4719 C267.3981,442.4719 267.9763,442.6125 268.445,442.8625 C268.9138,443.1281 269.0856,443.3156 269.1481,443.675 C269.2731,444.3469 269.5231,444.5969 270.0544,444.5969 C270.3356,444.5969 270.6169,444.4563 270.8044,444.2375 C270.9294,444.0656 270.9763,443.8938 270.9763,443.4563 L270.9763,442.0969 C270.9763,441.675 270.9606,441.5344 270.8356,441.3625 C270.6638,441.1125 270.3825,440.9563 270.0544,440.9563 C269.7419,440.9563 269.5388,441.0656 269.32,441.3313 C268.1481,440.8313 267.7106,440.7219 266.7575,440.7219 C264.0856,440.7219 262.07,442.7375 262.07,445.3625 L262.07,446.4563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="287.57" y="449.906">Factory1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="147.32" x2="451.32" y1="461.3" y2="461.3"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="152.32" y="470.2"/>
+          <ellipse cx="157.32" cy="475.2" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="166.32" y="478.3059">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="152.32" y="486.9999"/>
+          <ellipse cx="157.32" cy="491.9999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="166.32" y="495.1059">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="147.32" x2="451.32" y1="502.8999" y2="502.8999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="336.8047" y2="336.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="527" y="411.5"/>
-      <ellipse cx="575.75" cy="427.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M578.7188,433.1406 Q578.1406,433.4375 577.5,433.5781 Q576.8594,433.7344 576.1563,433.7344 Q573.6563,433.7344 572.3281,432.0938 Q571.0156,430.4375 571.0156,427.3125 Q571.0156,424.1875 572.3281,422.5313 Q573.6563,420.875 576.1563,420.875 Q576.8594,420.875 577.5,421.0313 Q578.1563,421.1875 578.7188,421.4844 L578.7188,424.2031 Q578.0938,423.625 577.5,423.3594 Q576.9063,423.0781 576.2813,423.0781 Q574.9375,423.0781 574.25,424.1563 Q573.5625,425.2188 573.5625,427.3125 Q573.5625,429.4063 574.25,430.4844 Q574.9375,431.5469 576.2813,431.5469 Q576.9063,431.5469 577.5,431.2813 Q578.0938,431 578.7188,430.4219 L578.7188,433.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="596.25" y="431.6543">ProductA2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="443.5" y2="443.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <g id="elem_C_0001566325870805013023">
+        <rect codeLine="48" fill="#F1F1F1" height="81.5999" id="C_0001566325870805013023" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="306" x="362.32" y="847.4"/>
+        <ellipse cx="483.07" cy="863.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M478.07,864.5563 C478.07,867.0563 480.2106,868.8688 483.1325,868.8688 C484.3669,868.8688 485.5388,868.5719 486.2888,868.0563 C486.8981,867.6344 487.2263,867.2125 487.2263,866.8063 C487.2263,866.3375 486.8044,865.9313 486.3044,865.9313 C486.07,865.9313 485.8513,866.0094 485.6481,866.2125 C485.2106,866.65 485.2106,866.65 485.0388,866.7438 C484.5856,866.9781 483.945,867.1188 483.1794,867.1188 C481.1794,867.1188 479.8981,866.1031 479.8981,864.525 L479.8981,863.4781 C479.8981,861.775 481.1169,860.5719 482.82,860.5719 C483.3981,860.5719 483.9763,860.7125 484.445,860.9625 C484.9138,861.2281 485.0856,861.4156 485.1481,861.775 C485.2731,862.4469 485.5231,862.6969 486.0544,862.6969 C486.3356,862.6969 486.6169,862.5563 486.8044,862.3375 C486.9294,862.1656 486.9763,861.9938 486.9763,861.5563 L486.9763,860.1969 C486.9763,859.775 486.9606,859.6344 486.8356,859.4625 C486.6638,859.2125 486.3825,859.0563 486.0544,859.0563 C485.7419,859.0563 485.5388,859.1656 485.32,859.4313 C484.1481,858.9313 483.7106,858.8219 482.7575,858.8219 C480.0856,858.8219 478.07,860.8375 478.07,863.4625 L478.07,864.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="503.57" y="868.006">Factory2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="363.32" x2="667.32" y1="879.4" y2="879.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="368.32" y="888.3"/>
+          <ellipse cx="373.32" cy="893.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="382.32" y="896.4059">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="368.32" y="905.0999"/>
+          <ellipse cx="373.32" cy="910.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="382.32" y="913.2059">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="363.32" x2="667.32" y1="920.9999" y2="920.9999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="533" y="449.5"/>
-      <ellipse cx="538" cy="454.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="547" y="457.7104">sell(int price) const : bool</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="464.3047" y2="464.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="81.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="539"/>
-      <ellipse cx="96.25" cy="555" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M96.3594,550.3438 L95.2031,555.4219 L97.5313,555.4219 L96.3594,550.3438 Z M94.875,548.1094 L97.8594,548.1094 L101.2188,560.5 L98.7656,560.5 L98,557.4375 L94.7188,557.4375 L93.9688,560.5 L91.5313,560.5 L94.875,548.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="116.75" y="559.1543">ProductB</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="571" y2="571"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="577"/>
-      <ellipse cx="17" cy="582" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="26" y="585.2104">~ProductB() constexpr = default : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="250" y1="591.8047" y2="591.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="597.8047"/>
-      <ellipse cx="17" cy="602.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="606.0151">buy(int price) const = 0 : bool</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="612.6094" y2="612.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="249" y="681"/>
-      <ellipse cx="297.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M300.7188,702.6406 Q300.1406,702.9375 299.5,703.0781 Q298.8594,703.2344 298.1563,703.2344 Q295.6563,703.2344 294.3281,701.5938 Q293.0156,699.9375 293.0156,696.8125 Q293.0156,693.6875 294.3281,692.0313 Q295.6563,690.375 298.1563,690.375 Q298.8594,690.375 299.5,690.5313 Q300.1563,690.6875 300.7188,690.9844 L300.7188,693.7031 Q300.0938,693.125 299.5,692.8594 Q298.9063,692.5781 298.2813,692.5781 Q296.9375,692.5781 296.25,693.6563 Q295.5625,694.7188 295.5625,696.8125 Q295.5625,698.9063 296.25,699.9844 Q296.9375,701.0469 298.2813,701.0469 Q298.9063,701.0469 299.5,700.7813 Q300.0938,700.5 300.7188,699.9219 L300.7188,702.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="318.25" y="701.1543">ProductB1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="713" y2="713"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="255" y="719"/>
-      <ellipse cx="260" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="269" y="727.2104">buy(int price) const : bool</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="733.8047" y2="733.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="43" y="681"/>
-      <ellipse cx="91.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M94.7188,702.6406 Q94.1406,702.9375 93.5,703.0781 Q92.8594,703.2344 92.1563,703.2344 Q89.6563,703.2344 88.3281,701.5938 Q87.0156,699.9375 87.0156,696.8125 Q87.0156,693.6875 88.3281,692.0313 Q89.6563,690.375 92.1563,690.375 Q92.8594,690.375 93.5,690.5313 Q94.1563,690.6875 94.7188,690.9844 L94.7188,693.7031 Q94.0938,693.125 93.5,692.8594 Q92.9063,692.5781 92.2813,692.5781 Q90.9375,692.5781 90.25,693.6563 Q89.5625,694.7188 89.5625,696.8125 Q89.5625,698.9063 90.25,699.9844 Q90.9375,701.0469 92.2813,701.0469 Q92.9063,701.0469 93.5,700.7813 Q94.0938,700.5 94.7188,699.9219 L94.7188,702.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="112.25" y="701.1543">ProductB2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="713" y2="713"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="719"/>
-      <ellipse cx="54" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="63" y="727.2104">buy(int price) const : bool</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="733.8047" y2="733.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="112.5" y="8"/>
-      <ellipse cx="209.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M209.8594,19.3438 L208.7031,24.4219 L211.0313,24.4219 L209.8594,19.3438 Z M208.375,17.1094 L211.3594,17.1094 L214.7188,29.5 L212.2656,29.5 L211.5,26.4375 L208.2188,26.4375 L207.4688,29.5 L205.0313,29.5 L208.375,17.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="230.25" y="28.1543">AbstractFactory</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="46"/>
-      <ellipse cx="123.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="54.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="58.8047"/>
-      <ellipse cx="123.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="67.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="123.5" y="405"/>
-      <ellipse cx="232.25" cy="421" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M235.2188,426.6406 Q234.6406,426.9375 234,427.0781 Q233.3594,427.2344 232.6563,427.2344 Q230.1563,427.2344 228.8281,425.5938 Q227.5156,423.9375 227.5156,420.8125 Q227.5156,417.6875 228.8281,416.0313 Q230.1563,414.375 232.6563,414.375 Q233.3594,414.375 234,414.5313 Q234.6563,414.6875 235.2188,414.9844 L235.2188,417.7031 Q234.5938,417.125 234,416.8594 Q233.4063,416.5781 232.7813,416.5781 Q231.4375,416.5781 230.75,417.6563 Q230.0625,418.7188 230.0625,420.8125 Q230.0625,422.9063 230.75,423.9844 Q231.4375,425.0469 232.7813,425.0469 Q233.4063,425.0469 234,424.7813 Q234.5938,424.5 235.2188,423.9219 L235.2188,426.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="252.75" y="425.1543">Factory1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="437" y2="437"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="443"/>
-      <ellipse cx="134.5" cy="448" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="143.5" y="451.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="455.8047"/>
-      <ellipse cx="134.5" cy="460.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="143.5" y="464.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="470.6094" y2="470.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13pjv6cf5uqjm)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="333.5" y="802"/>
-      <ellipse cx="442.25" cy="818" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M445.2188,823.6406 Q444.6406,823.9375 444,824.0781 Q443.3594,824.2344 442.6563,824.2344 Q440.1563,824.2344 438.8281,822.5938 Q437.5156,820.9375 437.5156,817.8125 Q437.5156,814.6875 438.8281,813.0313 Q440.1563,811.375 442.6563,811.375 Q443.3594,811.375 444,811.5313 Q444.6563,811.6875 445.2188,811.9844 L445.2188,814.7031 Q444.5938,814.125 444,813.8594 Q443.4063,813.5781 442.7813,813.5781 Q441.4375,813.5781 440.75,814.6563 Q440.0625,815.7188 440.0625,817.8125 Q440.0625,819.9063 440.75,820.9844 Q441.4375,822.0469 442.7813,822.0469 Q443.4063,822.0469 444,821.7813 Q444.5938,821.5 445.2188,820.9219 L445.2188,823.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="462.75" y="822.1543">Factory2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="834" y2="834"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="840"/>
-      <ellipse cx="344.5" cy="845" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="353.5" y="848.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="852.8047"/>
-      <ellipse cx="344.5" cy="857.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="353.5" y="861.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="867.6094" y2="867.6094"/>
-    <path d="M344.48,238.05 C327.61,253.77 309.81,270.35 295.21,283.96 " fill="none" id="C_0000425267229659464944&lt;-C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="339.88,232.78,359.28,224.26,349.42,243.02,339.88,232.78" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M458.18,238.52 C472.11,252.92 486.71,268.72 499.5,284 C534.96,326.36 571.51,379.11 593.1,411.4 " fill="none" id="C_0000425267229659464944&lt;-C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="453.03,243.27,444.02,224.09,463.02,233.46,453.03,243.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M209.28,631.78 C235.74,648.42 264.25,666.34 287.38,680.88 " fill="none" id="C_0002235759006374865842&lt;-C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="205.48,637.66,192.27,621.09,212.93,625.81,205.48,637.66" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M128.5,641.55 C128.5,655.26 128.5,669.22 128.5,680.96 " fill="none" id="C_0002235759006374865842&lt;-C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="121.5,641.26,128.5,621.26,135.5,641.26,121.5,641.26" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M300.38,82.09 C318.03,99.35 339.3,120.16 357.85,138.31 " fill="none" id="C_0001705546469218961425-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="361.52,141.91,357.8918,132.7538,357.9489,138.4104,352.2924,138.4675,361.52,141.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M205.31,82.14 C184.51,97.98 162.92,118.38 149.5,142 C74.94,273.3 90.18,328.89 106.5,479 C108.47,497.1 112.38,516.72 116.37,533.75 " fill="none" id="C_0001705546469218961425-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="117.61,538.94,119.3884,529.253,116.4377,534.0794,111.6114,531.1287,117.61,538.94" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M313.81,404.81 C332.99,388.57 353.38,367.91 366.5,345 C386.91,309.38 395.75,263.18 399.58,229.41 " fill="none" id="C_0000692346848484854107-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="400.15,224.1,395.1967,232.6126,399.6072,229.0705,403.1494,233.481,400.15,224.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M227.68,479.09 C210.54,496.35 189.88,517.16 171.86,535.31 " fill="none" id="C_0000692346848484854107-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="168.3,538.91,177.478,535.3373,171.8212,535.3602,171.7983,529.7034,168.3,538.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M221.83,98.4 C179.15,158.85 123.85,260.73 160.5,345 C170.79,368.65 190.09,389.11 209.23,404.99 " fill="none" id="C_0001705546469218961425&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="216.27,94.14,233.73,82.13,227.57,102.41,216.27,94.14" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M473.5,801.82 C473.5,752.08 473.5,659.75 473.5,581 C473.5,441 473.5,441 473.5,441 C473.5,364.32 443.77,279.26 422.79,228.78 " fill="none" id="C_0001566325870805013023-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="420.78,224,420.56,233.8464,422.7081,228.6133,427.9413,230.7614,420.78,224" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M333.44,826.93 C216.81,814.45 63.82,789.4 25.5,742 C-4.69,704.65 32.17,658.08 69.93,624.64 " fill="none" id="C_0001566325870805013023-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="74.05,621.04,64.6428,623.9562,70.2871,624.3325,69.9108,629.9768,74.05,621.04" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M434.59,68.78 C575.25,98.26 751.5,164.86 751.5,313.5 C751.5,313.5 751.5,313.5 751.5,581 C751.5,686.99 641.2,761.42 559.56,802 " fill="none" id="C_0001705546469218961425&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="432.81,75.56,414.56,64.78,435.55,61.84,432.81,75.56" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M263.5,350.38 C263.5,367.31 263.5,387.65 263.5,404.76 " fill="none" id="C_0001756496029797864207&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="263.5,345.24,259.5,354.24,263.5,350.24,267.5,354.24,263.5,345.24" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M325.25,675.67 C311.75,624.79 286.76,530.64 273.08,479.08 " fill="none" id="C_0001465493024233223845&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="326.6,680.75,328.1496,671.0238,325.3135,675.9184,320.4189,673.0823,326.6,680.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M600.38,477.43 C574.28,551.62 512.92,725.99 486.25,801.77 " fill="none" id="C_0001531708592885216981&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="602.05,472.69,595.2725,479.836,600.3792,477.4026,602.8126,482.5093,602.05,472.69" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M214.77,743.88 C263.21,761.5 323.86,783.56 374.26,801.9 " fill="none" id="C_0002154665562370057871&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="209.82,742.08,216.9045,748.9218,214.5173,743.7933,219.6458,741.4061,209.82,742.08" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000425267229659464944_C_0001756496029797864207">
+      <path codeLine="53" d="M383.3207,256.9642 C362.5307,276.4942 351.8,286.59 332.94,304.31 " fill="none" id="C_0000425267229659464944-backto-C_0001756496029797864207" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="396.44,244.64,379.2127,252.5911,387.4288,261.3372,396.44,244.64" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000425267229659464944_C_0001531708592885216981">
+      <path codeLine="54" d="M500.6252,257.8789 C517.6852,276.0089 524.74,284.26 541.32,304.5 C577.74,348.97 616.03,403.54 639.04,437.32 " fill="none" id="C_0000425267229659464944-backto-C_0001531708592885216981" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="488.29,244.77,496.2556,261.9906,504.9948,253.7671,488.29,244.77" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002235759006374865842_C_0001465493024233223845">
+      <path codeLine="55" d="M236.9232,672.3746 C268.4632,691.8146 289.26,704.64 317.88,722.29 " fill="none" id="C_0002235759006374865842-backto-C_0001465493024233223845" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="221.6,662.93,233.775,677.4823,240.0714,667.2669,221.6,662.93" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002235759006374865842_C_0002154665562370057871">
+      <path codeLine="56" d="M148.32,680.74 C148.32,700.27 148.32,704.69 148.32,722.41 " fill="none" id="C_0002235759006374865842-backto-C_0002154665562370057871" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="148.32,662.74,142.32,680.74,154.32,680.74,148.32,662.74" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001705546469218961425_C_0000425267229659464944">
+      <path codeLine="57" d="M340.87,92.95 C359.28,111.59 376.7522,129.2727 395.5022,148.2427 " fill="none" id="C_0001705546469218961425-to-C_0000425267229659464944" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="399.72,152.51,396.2381,143.2971,396.2051,148.9539,390.5484,148.9209,399.72,152.51" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001705546469218961425_C_0002235759006374865842">
+      <path codeLine="58" d="M232.67,93.29 C212.22,109.51 191.63,129.72 178.32,152.8 C98.07,291.95 114.94,350.91 129.32,510.9 C131.09,530.62 133.5485,546.2815 137.1485,564.6915 " fill="none" id="C_0001705546469218961425-to-C_0002235759006374865842" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="138.3,570.58,140.4984,560.9796,137.3404,565.6729,132.6472,562.5149,138.3,570.58" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000692346848484854107_C_0000425267229659464944">
+      <path codeLine="59" d="M356.69,429 C376.17,412.63 396.28,392.14 409.32,369.3 C431.24,330.91 439.0043,286.6478 442.0943,250.8278 " fill="none" id="C_0000692346848484854107-to-C_0000425267229659464944" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="442.61,244.85,437.8513,253.4729,442.1803,249.8315,445.8217,254.1605,442.61,244.85" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000692346848484854107_C_0002235759006374865842">
+      <path codeLine="60" d="M257.26,511.39 C238.06,529.78 219.5837,547.4904 199.8037,566.4304 " fill="none" id="C_0000692346848484854107-to-C_0002235759006374865842" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="195.47,570.58,204.7369,567.2447,199.0814,567.122,199.2041,561.4665,195.47,570.58" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001705546469218961425_C_0000692346848484854107">
+      <path codeLine="61" d="M253.736,107.6345 C207.396,169.4745 146.74,273.18 189.32,369.3 C199.66,392.64 218.45,412.85 237.61,428.87 " fill="none" id="C_0001705546469218961425-backto-C_0000692346848484854107" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="264.53,93.23,248.9345,104.0365,258.5375,111.2325,264.53,93.23" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001566325870805013023_C_0000425267229659464944">
+      <path codeLine="62" d="M515.32,847.03 C515.32,794.37 515.32,699.15 515.32,617.75 C515.32,469.1 515.32,469.1 515.32,469.1 C515.32,388.07 487.1391,303.2946 466.1291,250.5146 " fill="none" id="C_0001566325870805013023-to-C_0000425267229659464944" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="463.91,244.94,463.5222,254.7812,465.7592,249.5855,470.955,251.8225,463.91,244.94" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001566325870805013023_C_0002235759006374865842">
+      <path codeLine="63" d="M361.96,875.75 C238.37,862.96 78.73,837.14 38.32,787.4 C6,747.62 41.7995,701.9738 82.4195,666.7038 " fill="none" id="C_0001566325870805013023-to-C_0002235759006374865842" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="86.95,662.77,77.5317,665.6504,83.1746,666.0482,82.7768,671.691,86.95,662.77" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001705546469218961425_C_0001566325870805013023">
+      <path codeLine="64" d="M482.2622,77.8264 C629.8822,108.9764 805.32,176.47 805.32,335.9 C805.32,335.9 805.32,335.9 805.32,617.75 C805.32,726.51 694.5,803.77 609.88,846.92 " fill="none" id="C_0001705546469218961425-backto-C_0001566325870805013023" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="464.65,74.11,481.0234,83.6971,483.501,71.9557,464.65,74.11" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001756496029797864207_C_0000692346848484854107">
+      <path codeLine="65" d="M299.32,375.66 C299.32,393.56 299.32,410.08 299.32,429.17 " fill="none" id="C_0001756496029797864207-backto-C_0000692346848484854107" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="299.32,369.66,295.32,378.66,299.32,374.66,303.32,378.66,299.32,369.66" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001465493024233223845_C_0000692346848484854107">
+      <path codeLine="66" d="M360.0183,716.3958 C347.2083,664.6458 323.32,568.08 309.27,511.33 " fill="none" id="C_0001465493024233223845-backto-C_0000692346848484854107" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="361.46,722.22,363.1803,712.5225,360.2586,717.3665,355.4146,714.4448,361.46,722.22" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001531708592885216981_C_0001566325870805013023">
+      <path codeLine="67" d="M647.326,508.386 C621.326,583.016 558.12,764.37 529.35,846.94 " fill="none" id="C_0001531708592885216981-backto-C_0001566325870805013023" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="649.3,502.72,642.5617,509.903,647.655,507.4417,650.1164,512.535,649.3,502.72" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002154665562370057871_C_0001566325870805013023">
+      <path codeLine="68" d="M242.81,789.7792 C292.56,807.5592 349.43,827.9 402.6,846.9 " fill="none" id="C_0002154665562370057871-backto-C_0001566325870805013023" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="237.16,787.76,244.2889,794.5555,241.8683,789.4427,246.9812,787.0222,237.16,787.76" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00020_class_mermaid.svg b/docs/test_cases/t00020_class_mermaid.svg
index 3262b989..5e5b2c89 100644
--- a/docs/test_cases/t00020_class_mermaid.svg
+++ b/docs/test_cases/t00020_class_mermaid.svg
@@ -1,67 +1,72 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1061.28125 592" style="max-width: 1061.28px; background-color: white;" width="1061.28125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1094.62109375 592" style="max-width: 1094.62px; background-color: white;" width="1094.62109375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M193.484375,449.0144309438429L180.08723958333334,454.1786924532025C166.69010416666666,459.3429539625619,139.89583333333334,469.67147698128093,126.49869791666667,479.0024051573071C113.1015625,488.3333333333333,113.1015625,496.6666666666667,113.1015625,500.8333333333333L113.1015625,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M362.95651192196533,455L364.68120785163774,459.1666666666667C366.4059037813102,463.3333333333333,369.85529564065513,471.6666666666667,371.57999157032754,480C373.3046875,488.3333333333333,373.3046875,496.6666666666667,373.3046875,500.8333333333333L373.3046875,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M715.671875,448.794968269931L702.1263020833334,453.99580689160916C688.5807291666666,459.19664551328736,661.4895833333334,469.59832275664365,647.9440104166666,478.9658280449885C634.3984375,488.3333333333333,634.3984375,496.6666666666667,634.3984375,500.8333333333333L634.3984375,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M885.7772308526012,455L887.5448277938343,459.1666666666667C889.3124247350675,463.3333333333333,892.8476186175336,471.6666666666667,894.6152155587669,480C896.3828125,488.3333333333333,896.3828125,496.6666666666667,896.3828125,500.8333333333333L896.3828125,505"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M320.2578125,110.64550553379145L288.3658854166667,118.2045879448262C256.4739583333333,125.76367035586095,192.69010416666666,140.88183517793047,160.79817708333334,161.0242509222986C128.90625,181.16666666666666,128.90625,206.33333333333334,128.90625,231.5C128.90625,256.6666666666667,128.90625,281.8333333333333,139.66927083333334,298.8798938826467C150.43229166666666,315.92645443196005,171.95833333333334,324.8529088639201,182.72135416666666,329.3161360799001L193.484375,333.77936329588016"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M568.0048320086705,131L573.0287662572255,135.16666666666666C578.0527005057803,139.33333333333334,588.1005690028902,147.66666666666666,593.1245032514452,164.41666666666666C598.1484375,181.16666666666666,598.1484375,206.33333333333334,598.1484375,231.5C598.1484375,256.6666666666667,598.1484375,281.8333333333333,617.7356770833334,300.89484322569723C637.3229166666666,319.95635311806114,676.4973958333334,332.91270623612235,696.0846354166666,339.3908827951529L715.671875,345.8690593541835"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M353.3046875,282L353.3046875,286.1666666666667C353.3046875,290.3333333333333,353.3046875,298.6666666666667,352.54338270712907,307C351.7820779142582,315.3333333333333,350.25946832851633,323.6666666666667,349.4981635356455,327.8333333333333L348.7368587427746,332"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M526.8984375,258.82263843648207L577.9140625,266.8521986970684C628.9296875,274.8817589576547,730.9609375,290.94087947882736,783.2624638728324,303.13710640608036C835.5639902456647,315.3333333333333,838.1357929913296,323.6666666666667,839.4216943641619,327.8333333333333L840.7075957369942,332"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M393.9251716040462,131L387.1550909200385,135.16666666666666C380.38501023603084,139.33333333333334,366.8448488680154,147.66666666666666,360.0747681840077,156C353.3046875,164.33333333333334,353.3046875,172.66666666666666,353.3046875,176.83333333333334L353.3046875,181"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M706.09375,265.4686557191164L670.7200520833334,272.390546432597C635.3463541666666,279.31243714607757,564.5989583333334,293.1562185730388,521.6938749397881,304.2447759531861C478.78879154624275,315.3333333333333,463.72602059248555,323.6666666666667,456.1946351156069,327.8333333333333L448.6632496387283,332"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M879.6875,282L879.6875,286.1666666666667C879.6875,290.3333333333333,879.6875,298.6666666666667,878.7241088631985,307C877.7607177263968,315.3333333333333,875.8339354527939,323.6666666666667,874.8705443159923,327.8333333333333L873.9071531791908,332"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M667.4453125,108.41773138680219L702.8190104166666,116.34810948900183C738.1927083333334,124.27848759120145,808.9401041666666,140.13924379560072,844.3138020833334,152.23628856446703C879.6875,164.33333333333334,879.6875,172.66666666666666,879.6875,176.83333333333334L879.6875,181"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M183.2948258278622,455.3871718571809L172.33683402321853,459.4893098809841C161.37884221857482,463.59144790478723,139.4628586092874,471.79572395239364,128.5048668046437,480.0645286428635C117.546875,488.3333333333333,117.546875,496.6666666666667,117.546875,500.8333333333333L117.546875,505"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M382.8941460304957,471.4779629891419L383.51855919207975,472.8983024909516C384.14297235366377,474.31864199276123,385.3917986768319,477.1593209963806,386.016211838416,482.74632716485695C386.640625,488.3333333333333,386.640625,496.6666666666667,386.640625,500.8333333333333L386.640625,505"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M723.2556297239986,455.1525123421932L712.1505247699988,459.293760285161C701.045419815999,463.43500822812877,678.8352099079995,471.7175041140644,667.7301049539998,480.0254187236989C656.625,488.3333333333333,656.625,496.6666666666667,656.625,500.8333333333333L656.625,505"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M923.6374867075972,471.41508638492735L924.2812389229977,472.8459053207728C924.9249911383981,474.27672425661825,926.2124955691992,477.1383621283091,926.8562477845995,482.7358477308212C927.5,488.3333333333333,927.5,496.6666666666667,927.5,500.8333333333333L927.5,505"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M333.59375,110.45207279450717L300.5904947916667,118.04339399542265C267.5872395833333,125.6347151963381,201.58072916666666,140.81735759816905,168.57747395833334,160.99201213241787C135.57421875,181.16666666666666,135.57421875,206.33333333333334,135.57421875,231.5C135.57421875,256.6666666666667,135.57421875,281.8333333333333,145.41070156435057,298.4105622154763C155.24718437870112,314.9877910976192,174.92015000740227,322.9755821952385,184.75663282175285,326.9694777440481L194.5931156361034,330.9633732928577"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M587.3663520592486,131L592.4973506743738,135.16666666666666C597.628349289499,139.33333333333334,607.8903465197495,147.66666666666666,613.0213451348748,164.41666666666666C618.15234375,181.16666666666666,618.15234375,206.33333333333334,618.15234375,231.5C618.15234375,256.6666666666667,618.15234375,281.8333333333333,637.5280062717978,300.6141918852524C656.9036687935957,319.3950504371715,695.6549938371913,331.790100874343,715.0306563589892,337.9876260929288L734.406318880787,344.1851513115145"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M366.640625,282L366.640625,286.1666666666667C366.640625,290.3333333333333,366.640625,298.6666666666667,365.9762807109617,306.0210342946471C365.31193642192346,313.3754019226276,363.983247843847,319.7508038452552,363.3189035548087,322.938504806569L362.65455926577044,326.12620576788277"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M544.6796875,258.7643209152709L597.1770833333334,266.80360076272575C649.6744791666666,274.8428806101806,754.6692708333334,290.9214403050903,808.2425695978251,302.1789822770315C861.8158683623169,313.4365242489727,863.9676742246338,319.8730484979454,865.0435771557923,323.09131062243176L866.1194800869506,326.3095727469181"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M393.0877604795467,140.22206562694427L388.67990456628894,142.8517213557869C384.2720486530311,145.48137708462951,375.45633682651555,150.74068854231476,371.04848091325783,157.53701093782405C366.640625,164.33333333333334,366.640625,172.66666666666666,366.640625,176.83333333333334L366.640625,181"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M730.54296875,265.3631456715772L694.0579427083334,272.30262139298094C657.5729166666666,279.24209711438476,584.6028645833334,293.1210485571924,541.1486093434798,303.75847581250576C497.6943541036264,314.39590306781923,483.75589570725265,321.7918061356384,476.7866665090658,325.48975766954806L469.817437310879,329.18770920345764"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M908.58203125,282L908.58203125,286.1666666666667C908.58203125,290.3333333333333,908.58203125,298.6666666666667,907.843910908901,306.0257038085862C907.1057905678022,313.38474095050566,905.6295498856043,319.7694819010113,904.8914295445053,322.9618523762642L904.1533092034065,326.154222851517"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M707.2591464108872,112.12932658383458L740.8129605507393,119.44110548652883C774.3667746905916,126.75288438922307,841.4744029702957,141.37644219461154,875.0282171101479,152.8548877639724C908.58203125,164.33333333333334,908.58203125,172.66666666666666,908.58203125,176.83333333333334L908.58203125,181"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -186,11 +191,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(337.5, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L6">
+        <a transform="translate(348.61328125, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L6">
           <g title="ProductA" id="classId-C_0000425267229659464944-0" class="node default clickable">
-            <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="144.015625" x1="-144.015625" class="divider"/>
+            <rect height="123" width="296.921875" y="-61.5" x="-148.4609375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="148.4609375" x1="-148.4609375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="148.4609375" x1="-148.4609375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -202,24 +207,24 @@
                   <span class="nodeLabel">ProductA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.515625, 14)" height="18" width="273.03125">
+              <foreignObject transform="translate( -140.9609375, 14)" height="18" width="281.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~ProductA() : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~ProductA() : : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.515625, 36)" height="18" width="195.203125">
+              <foreignObject transform="translate( -140.9609375, 36)" height="18" width="204.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+sell(int price) : [const] bool</span>
+                  <span style="font-style:italic;" class="nodeLabel">+sell(int price) : : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(113.1015625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L12">
+        <a transform="translate(117.546875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L12">
           <g title="ProductA1" id="classId-C_0001756496029797864207-1" class="node default clickable">
-            <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
+            <rect height="79" width="219.09375" y="-39.5" x="-109.546875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="109.546875" x1="-109.546875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="109.546875" x1="-109.546875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -231,19 +236,19 @@
                   <span class="nodeLabel">ProductA1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -97.6015625, 14)" height="18" width="195.203125">
+              <foreignObject transform="translate( -102.046875, 14)" height="18" width="204.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sell(int price) : [const] bool</span>
+                  <span class="nodeLabel">+sell(int price) : : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(373.3046875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L17">
+        <a transform="translate(386.640625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L17">
           <g title="ProductA2" id="classId-C_0001531708592885216981-2" class="node default clickable">
-            <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
+            <rect height="79" width="219.09375" y="-39.5" x="-109.546875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="109.546875" x1="-109.546875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="109.546875" x1="-109.546875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -255,19 +260,19 @@
                   <span class="nodeLabel">ProductA2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -97.6015625, 14)" height="18" width="195.203125">
+              <foreignObject transform="translate( -102.046875, 14)" height="18" width="204.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sell(int price) : [const] bool</span>
+                  <span class="nodeLabel">+sell(int price) : : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(859.6875, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L22">
+        <a transform="translate(888.58203125, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L22">
           <g title="ProductB" id="classId-C_0002235759006374865842-3" class="node default clickable">
-            <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="144.015625" x1="-144.015625" class="divider"/>
+            <rect height="123" width="296.921875" y="-61.5" x="-148.4609375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="148.4609375" x1="-148.4609375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="148.4609375" x1="-148.4609375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -279,24 +284,24 @@
                   <span class="nodeLabel">ProductB</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.515625, 14)" height="18" width="273.03125">
+              <foreignObject transform="translate( -140.9609375, 14)" height="18" width="281.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~ProductB() : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~ProductB() : : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.515625, 36)" height="18" width="196.984375">
+              <foreignObject transform="translate( -140.9609375, 36)" height="18" width="205.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+buy(int price) : [const] bool</span>
+                  <span style="font-style:italic;" class="nodeLabel">+buy(int price) : : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(634.3984375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L28">
+        <a transform="translate(656.625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L28">
           <g title="ProductB1" id="classId-C_0001465493024233223845-4" class="node default clickable">
-            <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
+            <rect height="79" width="220.875" y="-39.5" x="-110.4375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="110.4375" x1="-110.4375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="110.4375" x1="-110.4375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -308,19 +313,19 @@
                   <span class="nodeLabel">ProductB1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -98.4921875, 14)" height="18" width="196.984375">
+              <foreignObject transform="translate( -102.9375, 14)" height="18" width="205.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+buy(int price) : [const] bool</span>
+                  <span class="nodeLabel">+buy(int price) : : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(896.3828125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L33">
+        <a transform="translate(927.5, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L33">
           <g title="ProductB2" id="classId-C_0002154665562370057871-5" class="node default clickable">
-            <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
+            <rect height="79" width="220.875" y="-39.5" x="-110.4375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="110.4375" x1="-110.4375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="110.4375" x1="-110.4375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -332,19 +337,19 @@
                   <span class="nodeLabel">ProductB2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -98.4921875, 14)" height="18" width="196.984375">
+              <foreignObject transform="translate( -102.9375, 14)" height="18" width="205.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+buy(int price) : [const] bool</span>
+                  <span class="nodeLabel">+buy(int price) : : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(493.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L38">
+        <a transform="translate(511.6328125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L38">
           <g title="AbstractFactory" id="classId-C_0001705546469218961425-6" class="node default clickable">
-            <rect height="123" width="347.1875" y="-61.5" x="-173.59375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="173.59375" x1="-173.59375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <rect height="123" width="356.078125" y="-61.5" x="-178.0390625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -356,24 +361,24 @@
                   <span class="nodeLabel">AbstractFactory</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -166.09375, 14)" height="18" width="332.1875">
+              <foreignObject transform="translate( -170.5390625, 14)" height="18" width="341.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+make_a() : : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -166.09375, 36)" height="18" width="332.1875">
+              <foreignObject transform="translate( -170.5390625, 36)" height="18" width="341.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+make_b() : : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(353.3046875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L44">
+        <a transform="translate(366.640625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L44">
           <g title="Factory1" id="classId-C_0000692346848484854107-7" class="node default clickable">
-            <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <rect height="101" width="356.078125" y="-50.5" x="-178.0390625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -385,24 +390,24 @@
                   <span class="nodeLabel">Factory1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -166.09375, 3)" height="18" width="332.1875">
+              <foreignObject transform="translate( -170.5390625, 3)" height="18" width="341.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
+                  <span class="nodeLabel">+make_a() : : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -166.09375, 25)" height="18" width="332.1875">
+              <foreignObject transform="translate( -170.5390625, 25)" height="18" width="341.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
+                  <span class="nodeLabel">+make_b() : : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(879.6875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00020/t00020.cc#L57">
+        <a transform="translate(908.58203125, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L57">
           <g title="Factory2" id="classId-C_0001566325870805013023-8" class="node default clickable">
-            <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <rect height="101" width="356.078125" y="-50.5" x="-178.0390625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -414,14 +419,14 @@
                   <span class="nodeLabel">Factory2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -166.09375, 3)" height="18" width="332.1875">
+              <foreignObject transform="translate( -170.5390625, 3)" height="18" width="341.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
+                  <span class="nodeLabel">+make_a() : : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -166.09375, 25)" height="18" width="332.1875">
+              <foreignObject transform="translate( -170.5390625, 25)" height="18" width="341.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
+                  <span class="nodeLabel">+make_b() : : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md
index 07b7c92a..9cce1b0a 100644
--- a/docs/test_cases/t00021.md
+++ b/docs/test_cases/t00021.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00021.cc
+File `tests/t00021/t00021.cc`
 ```cpp
 #include <memory>
 
@@ -94,6 +94,7 @@ public:
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -119,6 +120,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -149,6 +151,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -209,6 +212,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -239,6 +243,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -299,6 +304,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -329,6 +335,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -389,6 +396,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -419,6 +427,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -472,6 +481,7 @@ public:
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -497,6 +507,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -557,6 +568,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -617,6 +629,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index 49fd0d61..0002d50e 100644
--- a/docs/test_cases/t00021_class.svg
+++ b/docs/test_cases/t00021_class.svg
@@ -1,194 +1,234 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="509px" preserveAspectRatio="none" style="width:990px;height:509px;" version="1.1" viewBox="0 0 990 509" width="990px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="542px" preserveAspectRatio="none" style="width:1049px;height:542px;background:#FFFFFF;" version="1.1" viewBox="0 0 1049 542" width="1049px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbl6s7fls5pux" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbl6s7fls5pux)" height="94.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="150"/>
-      <ellipse cx="469.25" cy="166" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M469.3594,161.3438 L468.2031,166.4219 L470.5313,166.4219 L469.3594,161.3438 Z M467.875,159.1094 L470.8594,159.1094 L474.2188,171.5 L471.7656,171.5 L471,168.4375 L467.7188,168.4375 L466.9688,171.5 L464.5313,171.5 L467.875,159.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="489.75" y="170.1543">Visitor</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="182" y2="182"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <g id="elem_C_0001668671110672744395">
+        <rect codeLine="2" fill="#F1F1F1" height="110.5998" id="C_0001668671110672744395" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="268" x="390.5" y="158.7"/>
+        <ellipse cx="500.75" cy="174.7" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M502.2813,176.6375 L502.6094,177.4344 L502.3281,177.4344 C501.875,177.4344 501.75,177.4656 501.5781,177.575 C501.2969,177.7156 501.125,178.0125 501.125,178.3094 C501.125,178.6063 501.2656,178.8563 501.5,179.0281 C501.6719,179.1531 501.9063,179.2 502.3281,179.2 L504.6875,179.2 C505.0469,179.2 505.2969,179.1688 505.4375,179.075 C505.7031,178.9344 505.875,178.6219 505.875,178.3094 C505.875,178.0438 505.7344,177.7781 505.5,177.6063 C505.3125,177.4813 505.1563,177.45 504.7031,177.4344 L501.3125,169.6063 L497.5938,169.6063 C497.1406,169.6063 497,169.6219 496.8281,169.7313 C496.5625,169.9031 496.3906,170.1844 496.3906,170.4813 C496.3906,170.7625 496.5313,171.0281 496.7813,171.2 C496.9531,171.325 497.1406,171.3563 497.5938,171.3563 L498.5625,171.3563 L495.9844,177.4344 C495.2344,177.4344 494.8281,177.7313 494.8281,178.3094 C494.8281,178.9188 495.2188,179.2 496.0156,179.2 L498.2813,179.2 C498.6406,179.2 498.8906,179.1688 499.0313,179.075 C499.2969,178.9188 499.4688,178.6219 499.4688,178.3094 C499.4688,178.0438 499.3281,177.7781 499.0938,177.6063 C498.9063,177.4656 498.75,177.4344 498.2813,177.4344 L497.9844,177.4344 L498.3281,176.6375 L502.2813,176.6375 Z M501.5156,174.8875 L499.0625,174.8875 L500.2969,172.0125 L501.5156,174.8875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="39" x="521.25" y="180.65">Visitor</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="391.5" x2="657.5" y1="190.7" y2="190.7"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="396.5" y="199.6"/>
+          <ellipse cx="401.5" cy="204.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="220" x="410.5" y="207.7059">~Visitor() constexpr = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="391.5" x2="657.5" y1="215.4999" y2="215.4999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="396.5" y="225.4499"/>
+          <ellipse cx="401.5" cy="230.4499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="242" x="410.5" y="234.8999">visit_A(const A &amp; item) const = 0 : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="396.5" y="244.3498"/>
+          <ellipse cx="401.5" cy="249.3498" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="242" x="410.5" y="253.7998">visit_B(const B &amp; item) const = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="391.5" x2="657.5" y1="261.2998" y2="261.2998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="188"/>
-      <ellipse cx="379" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <g id="elem_C_0001028369219400401946">
+        <rect codeLine="10" fill="#F1F1F1" height="81.5999" id="C_0001028369219400401946" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="123.5" y="329.3"/>
+        <ellipse cx="217.75" cy="345.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M212.75,346.4563 C212.75,348.9563 214.8906,350.7688 217.8125,350.7688 C219.0469,350.7688 220.2188,350.4719 220.9688,349.9563 C221.5781,349.5344 221.9063,349.1125 221.9063,348.7063 C221.9063,348.2375 221.4844,347.8313 220.9844,347.8313 C220.75,347.8313 220.5313,347.9094 220.3281,348.1125 C219.8906,348.55 219.8906,348.55 219.7188,348.6438 C219.2656,348.8781 218.625,349.0188 217.8594,349.0188 C215.8594,349.0188 214.5781,348.0031 214.5781,346.425 L214.5781,345.3781 C214.5781,343.675 215.7969,342.4719 217.5,342.4719 C218.0781,342.4719 218.6563,342.6125 219.125,342.8625 C219.5938,343.1281 219.7656,343.3156 219.8281,343.675 C219.9531,344.3469 220.2031,344.5969 220.7344,344.5969 C221.0156,344.5969 221.2969,344.4563 221.4844,344.2375 C221.6094,344.0656 221.6563,343.8938 221.6563,343.4563 L221.6563,342.0969 C221.6563,341.675 221.6406,341.5344 221.5156,341.3625 C221.3438,341.1125 221.0625,340.9563 220.7344,340.9563 C220.4219,340.9563 220.2188,341.0656 220,341.3313 C218.8281,340.8313 218.3906,340.7219 217.4375,340.7219 C214.7656,340.7219 212.75,342.7375 212.75,345.3625 L212.75,346.4563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="238.25" y="349.906">Visitor1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="366.5" y1="361.3" y2="361.3"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="370.2"/>
+          <ellipse cx="134.5" cy="375.2" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="143.5" y="378.3059">visit_A(const A &amp; item) const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="386.9999"/>
+          <ellipse cx="134.5" cy="391.9999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="143.5" y="395.1059">visit_B(const B &amp; item) const : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="366.5" y1="402.8999" y2="402.8999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="388" y="196.2104">~Visitor() constexpr = default : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <g id="elem_C_0001710373315476287130">
+        <rect codeLine="16" fill="#F1F1F1" height="81.5999" id="C_0001710373315476287130" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="402.5" y="329.3"/>
+        <ellipse cx="496.75" cy="345.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M491.75,346.4563 C491.75,348.9563 493.8906,350.7688 496.8125,350.7688 C498.0469,350.7688 499.2188,350.4719 499.9688,349.9563 C500.5781,349.5344 500.9063,349.1125 500.9063,348.7063 C500.9063,348.2375 500.4844,347.8313 499.9844,347.8313 C499.75,347.8313 499.5313,347.9094 499.3281,348.1125 C498.8906,348.55 498.8906,348.55 498.7188,348.6438 C498.2656,348.8781 497.625,349.0188 496.8594,349.0188 C494.8594,349.0188 493.5781,348.0031 493.5781,346.425 L493.5781,345.3781 C493.5781,343.675 494.7969,342.4719 496.5,342.4719 C497.0781,342.4719 497.6563,342.6125 498.125,342.8625 C498.5938,343.1281 498.7656,343.3156 498.8281,343.675 C498.9531,344.3469 499.2031,344.5969 499.7344,344.5969 C500.0156,344.5969 500.2969,344.4563 500.4844,344.2375 C500.6094,344.0656 500.6563,343.8938 500.6563,343.4563 L500.6563,342.0969 C500.6563,341.675 500.6406,341.5344 500.5156,341.3625 C500.3438,341.1125 500.0625,340.9563 499.7344,340.9563 C499.4219,340.9563 499.2188,341.0656 499,341.3313 C497.8281,340.8313 497.3906,340.7219 496.4375,340.7219 C493.7656,340.7219 491.75,342.7375 491.75,345.3625 L491.75,346.4563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="517.25" y="349.906">Visitor2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="403.5" x2="645.5" y1="361.3" y2="361.3"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="408.5" y="370.2"/>
+          <ellipse cx="413.5" cy="375.2" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="422.5" y="378.3059">visit_A(const A &amp; item) const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="408.5" y="386.9999"/>
+          <ellipse cx="413.5" cy="391.9999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="422.5" y="395.1059">visit_B(const B &amp; item) const : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="403.5" x2="645.5" y1="402.8999" y2="402.8999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="369" x2="616" y1="202.8047" y2="202.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="208.8047"/>
-      <ellipse cx="379" cy="213.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <g id="elem_C_0001399026228179178025">
+        <rect codeLine="22" fill="#F1F1F1" height="81.5999" id="C_0001399026228179178025" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="681.5" y="329.3"/>
+        <ellipse cx="775.75" cy="345.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M770.75,346.4563 C770.75,348.9563 772.8906,350.7688 775.8125,350.7688 C777.0469,350.7688 778.2188,350.4719 778.9688,349.9563 C779.5781,349.5344 779.9063,349.1125 779.9063,348.7063 C779.9063,348.2375 779.4844,347.8313 778.9844,347.8313 C778.75,347.8313 778.5313,347.9094 778.3281,348.1125 C777.8906,348.55 777.8906,348.55 777.7188,348.6438 C777.2656,348.8781 776.625,349.0188 775.8594,349.0188 C773.8594,349.0188 772.5781,348.0031 772.5781,346.425 L772.5781,345.3781 C772.5781,343.675 773.7969,342.4719 775.5,342.4719 C776.0781,342.4719 776.6563,342.6125 777.125,342.8625 C777.5938,343.1281 777.7656,343.3156 777.8281,343.675 C777.9531,344.3469 778.2031,344.5969 778.7344,344.5969 C779.0156,344.5969 779.2969,344.4563 779.4844,344.2375 C779.6094,344.0656 779.6563,343.8938 779.6563,343.4563 L779.6563,342.0969 C779.6563,341.675 779.6406,341.5344 779.5156,341.3625 C779.3438,341.1125 779.0625,340.9563 778.7344,340.9563 C778.4219,340.9563 778.2188,341.0656 778,341.3313 C776.8281,340.8313 776.3906,340.7219 775.4375,340.7219 C772.7656,340.7219 770.75,342.7375 770.75,345.3625 L770.75,346.4563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="796.25" y="349.906">Visitor3</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="682.5" x2="924.5" y1="361.3" y2="361.3"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="687.5" y="370.2"/>
+          <ellipse cx="692.5" cy="375.2" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="701.5" y="378.3059">visit_A(const A &amp; item) const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="687.5" y="386.9999"/>
+          <ellipse cx="692.5" cy="391.9999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="701.5" y="395.1059">visit_B(const B &amp; item) const : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="682.5" x2="924.5" y1="402.8999" y2="402.8999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="217.0151">visit_A(const A &amp; item) const = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <g id="elem_C_0001491568826758947722">
+        <rect codeLine="28" fill="#F1F1F1" height="91.6998" id="C_0001491568826758947722" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="309" x="370" y="7"/>
+        <ellipse cx="506.25" cy="23" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M507.7813,24.9375 L508.1094,25.7344 L507.8281,25.7344 C507.375,25.7344 507.25,25.7656 507.0781,25.875 C506.7969,26.0156 506.625,26.3125 506.625,26.6094 C506.625,26.9063 506.7656,27.1563 507,27.3281 C507.1719,27.4531 507.4063,27.5 507.8281,27.5 L510.1875,27.5 C510.5469,27.5 510.7969,27.4688 510.9375,27.375 C511.2031,27.2344 511.375,26.9219 511.375,26.6094 C511.375,26.3438 511.2344,26.0781 511,25.9063 C510.8125,25.7813 510.6563,25.75 510.2031,25.7344 L506.8125,17.9063 L503.0938,17.9063 C502.6406,17.9063 502.5,17.9219 502.3281,18.0313 C502.0625,18.2031 501.8906,18.4844 501.8906,18.7813 C501.8906,19.0625 502.0313,19.3281 502.2813,19.5 C502.4531,19.625 502.6406,19.6563 503.0938,19.6563 L504.0625,19.6563 L501.4844,25.7344 C500.7344,25.7344 500.3281,26.0313 500.3281,26.6094 C500.3281,27.2188 500.7188,27.5 501.5156,27.5 L503.7813,27.5 C504.1406,27.5 504.3906,27.4688 504.5313,27.375 C504.7969,27.2188 504.9688,26.9219 504.9688,26.6094 C504.9688,26.3438 504.8281,26.0781 504.5938,25.9063 C504.4063,25.7656 504.25,25.7344 503.7813,25.7344 L503.4844,25.7344 L503.8281,24.9375 L507.7813,24.9375 Z M507.0156,23.1875 L504.5625,23.1875 L505.7969,20.3125 L507.0156,23.1875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="28" x="526.75" y="28.95">Item</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="371" x2="678" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="376" y="47.9"/>
+          <ellipse cx="381" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="209" x="390" y="56.0059">~Item() constexpr = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="371" x2="678" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="376" y="73.7499"/>
+          <ellipse cx="381" cy="78.7499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="283" x="390" y="83.1999">accept(const Visitor &amp; visitor) const = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="371" x2="678" y1="90.6998" y2="90.6998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="221.6094"/>
-      <ellipse cx="379" cy="226.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001494142745564026823">
+        <rect codeLine="35" fill="#F1F1F1" height="64.7999" id="C_0001494142745564026823" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="285" x="7" y="470.9"/>
+        <ellipse cx="140.75" cy="486.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M135.75,488.0563 C135.75,490.5563 137.8906,492.3688 140.8125,492.3688 C142.0469,492.3688 143.2188,492.0719 143.9688,491.5563 C144.5781,491.1344 144.9063,490.7125 144.9063,490.3063 C144.9063,489.8375 144.4844,489.4313 143.9844,489.4313 C143.75,489.4313 143.5313,489.5094 143.3281,489.7125 C142.8906,490.15 142.8906,490.15 142.7188,490.2438 C142.2656,490.4781 141.625,490.6188 140.8594,490.6188 C138.8594,490.6188 137.5781,489.6031 137.5781,488.025 L137.5781,486.9781 C137.5781,485.275 138.7969,484.0719 140.5,484.0719 C141.0781,484.0719 141.6563,484.2125 142.125,484.4625 C142.5938,484.7281 142.7656,484.9156 142.8281,485.275 C142.9531,485.9469 143.2031,486.1969 143.7344,486.1969 C144.0156,486.1969 144.2969,486.0563 144.4844,485.8375 C144.6094,485.6656 144.6563,485.4938 144.6563,485.0563 L144.6563,483.6969 C144.6563,483.275 144.6406,483.1344 144.5156,482.9625 C144.3438,482.7125 144.0625,482.5563 143.7344,482.5563 C143.4219,482.5563 143.2188,482.6656 143,482.9313 C141.8281,482.4313 141.3906,482.3219 140.4375,482.3219 C137.7656,482.3219 135.75,484.3375 135.75,486.9625 L135.75,488.0563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="161.25" y="491.506">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="291" y1="502.9" y2="502.9"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="511.8"/>
+          <ellipse cx="18" cy="516.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="259" x="27" y="519.9059">accept(const Visitor &amp; visitor) const : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="291" y1="527.6999" y2="527.6999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="229.8198">visit_B(const B &amp; item) const = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001452948650450999568">
+        <rect codeLine="40" fill="#F1F1F1" height="64.7999" id="C_0001452948650450999568" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="285" x="757" y="470.9"/>
+        <ellipse cx="890.75" cy="486.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M885.75,488.0563 C885.75,490.5563 887.8906,492.3688 890.8125,492.3688 C892.0469,492.3688 893.2188,492.0719 893.9688,491.5563 C894.5781,491.1344 894.9063,490.7125 894.9063,490.3063 C894.9063,489.8375 894.4844,489.4313 893.9844,489.4313 C893.75,489.4313 893.5313,489.5094 893.3281,489.7125 C892.8906,490.15 892.8906,490.15 892.7188,490.2438 C892.2656,490.4781 891.625,490.6188 890.8594,490.6188 C888.8594,490.6188 887.5781,489.6031 887.5781,488.025 L887.5781,486.9781 C887.5781,485.275 888.7969,484.0719 890.5,484.0719 C891.0781,484.0719 891.6563,484.2125 892.125,484.4625 C892.5938,484.7281 892.7656,484.9156 892.8281,485.275 C892.9531,485.9469 893.2031,486.1969 893.7344,486.1969 C894.0156,486.1969 894.2969,486.0563 894.4844,485.8375 C894.6094,485.6656 894.6563,485.4938 894.6563,485.0563 L894.6563,483.6969 C894.6563,483.275 894.6406,483.1344 894.5156,482.9625 C894.3438,482.7125 894.0625,482.5563 893.7344,482.5563 C893.4219,482.5563 893.2188,482.6656 893,482.9313 C891.8281,482.4313 891.3906,482.3219 890.4375,482.3219 C887.7656,482.3219 885.75,484.3375 885.75,486.9625 L885.75,488.0563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="911.25" y="491.506">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="758" x2="1041" y1="502.9" y2="502.9"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="763" y="511.8"/>
+          <ellipse cx="768" cy="516.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="259" x="777" y="519.9059">accept(const Visitor &amp; visitor) const : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="758" x2="1041" y1="527.6999" y2="527.6999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="236.4141" y2="236.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbl6s7fls5pux)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="304"/>
-      <ellipse cx="202.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M205.7188,325.6406 Q205.1406,325.9375 204.5,326.0781 Q203.8594,326.2344 203.1563,326.2344 Q200.6563,326.2344 199.3281,324.5938 Q198.0156,322.9375 198.0156,319.8125 Q198.0156,316.6875 199.3281,315.0313 Q200.6563,313.375 203.1563,313.375 Q203.8594,313.375 204.5,313.5313 Q205.1563,313.6875 205.7188,313.9844 L205.7188,316.7031 Q205.0938,316.125 204.5,315.8594 Q203.9063,315.5781 203.2813,315.5781 Q201.9375,315.5781 201.25,316.6563 Q200.5625,317.7188 200.5625,319.8125 Q200.5625,321.9063 201.25,322.9844 Q201.9375,324.0469 203.2813,324.0469 Q203.9063,324.0469 204.5,323.7813 Q205.0938,323.5 205.7188,322.9219 L205.7188,325.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="223.25" y="324.1543">Visitor1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="336" y2="336"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="342"/>
-      <ellipse cx="128" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="137" y="350.2104">visit_A(const A &amp; item) const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="354.8047"/>
-      <ellipse cx="128" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="137" y="363.0151">visit_B(const B &amp; item) const : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbl6s7fls5pux)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="304"/>
-      <ellipse cx="464.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M467.7188,325.6406 Q467.1406,325.9375 466.5,326.0781 Q465.8594,326.2344 465.1563,326.2344 Q462.6563,326.2344 461.3281,324.5938 Q460.0156,322.9375 460.0156,319.8125 Q460.0156,316.6875 461.3281,315.0313 Q462.6563,313.375 465.1563,313.375 Q465.8594,313.375 466.5,313.5313 Q467.1563,313.6875 467.7188,313.9844 L467.7188,316.7031 Q467.0938,316.125 466.5,315.8594 Q465.9063,315.5781 465.2813,315.5781 Q463.9375,315.5781 463.25,316.6563 Q462.5625,317.7188 462.5625,319.8125 Q462.5625,321.9063 463.25,322.9844 Q463.9375,324.0469 465.2813,324.0469 Q465.9063,324.0469 466.5,323.7813 Q467.0938,323.5 467.7188,322.9219 L467.7188,325.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="485.25" y="324.1543">Visitor2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="336" y2="336"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="342"/>
-      <ellipse cx="390" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="399" y="350.2104">visit_A(const A &amp; item) const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="354.8047"/>
-      <ellipse cx="390" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="399" y="363.0151">visit_B(const B &amp; item) const : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbl6s7fls5pux)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="304"/>
-      <ellipse cx="726.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M729.7188,325.6406 Q729.1406,325.9375 728.5,326.0781 Q727.8594,326.2344 727.1563,326.2344 Q724.6563,326.2344 723.3281,324.5938 Q722.0156,322.9375 722.0156,319.8125 Q722.0156,316.6875 723.3281,315.0313 Q724.6563,313.375 727.1563,313.375 Q727.8594,313.375 728.5,313.5313 Q729.1563,313.6875 729.7188,313.9844 L729.7188,316.7031 Q729.0938,316.125 728.5,315.8594 Q727.9063,315.5781 727.2813,315.5781 Q725.9375,315.5781 725.25,316.6563 Q724.5625,317.7188 724.5625,319.8125 Q724.5625,321.9063 725.25,322.9844 Q725.9375,324.0469 727.2813,324.0469 Q727.9063,324.0469 728.5,323.7813 Q729.0938,323.5 729.7188,322.9219 L729.7188,325.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="747.25" y="324.1543">Visitor3</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="336" y2="336"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="342"/>
-      <ellipse cx="652" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="661" y="350.2104">visit_A(const A &amp; item) const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="354.8047"/>
-      <ellipse cx="652" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="661" y="363.0151">visit_B(const B &amp; item) const : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbl6s7fls5pux)" height="81.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
-      <ellipse cx="474.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M474.3594,19.3438 L473.2031,24.4219 L475.5313,24.4219 L474.3594,19.3438 Z M472.875,17.1094 L475.8594,17.1094 L479.2188,29.5 L476.7656,29.5 L476,26.4375 L472.7188,26.4375 L471.9688,29.5 L469.5313,29.5 L472.875,17.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="494.75" y="28.1543">Item</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="46"/>
-      <ellipse cx="360" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="193" x="369" y="54.2104">~Item() constexpr = default : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="350" x2="635" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="66.8047"/>
-      <ellipse cx="360" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="261" x="369" y="75.0151">accept(const Visitor &amp; visitor) const = 0 : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbl6s7fls5pux)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="438"/>
-      <ellipse cx="130.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M133.2188,459.6406 Q132.6406,459.9375 132,460.0781 Q131.3594,460.2344 130.6563,460.2344 Q128.1563,460.2344 126.8281,458.5938 Q125.5156,456.9375 125.5156,453.8125 Q125.5156,450.6875 126.8281,449.0313 Q128.1563,447.375 130.6563,447.375 Q131.3594,447.375 132,447.5313 Q132.6563,447.6875 133.2188,447.9844 L133.2188,450.7031 Q132.5938,450.125 132,449.8594 Q131.4063,449.5781 130.7813,449.5781 Q129.4375,449.5781 128.75,450.6563 Q128.0625,451.7188 128.0625,453.8125 Q128.0625,455.9063 128.75,456.9844 Q129.4375,458.0469 130.7813,458.0469 Q131.4063,458.0469 132,457.7813 Q132.5938,457.5 133.2188,456.9219 L133.2188,459.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="150.75" y="458.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="470" y2="470"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="476"/>
-      <ellipse cx="17" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="26" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="490.8047" y2="490.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbl6s7fls5pux)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="438"/>
-      <ellipse cx="838.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M841.2188,459.6406 Q840.6406,459.9375 840,460.0781 Q839.3594,460.2344 838.6563,460.2344 Q836.1563,460.2344 834.8281,458.5938 Q833.5156,456.9375 833.5156,453.8125 Q833.5156,450.6875 834.8281,449.0313 Q836.1563,447.375 838.6563,447.375 Q839.3594,447.375 840,447.5313 Q840.6563,447.6875 841.2188,447.9844 L841.2188,450.7031 Q840.5938,450.125 840,449.8594 Q839.4063,449.5781 838.7813,449.5781 Q837.4375,449.5781 836.75,450.6563 Q836.0625,451.7188 836.0625,453.8125 Q836.0625,455.9063 836.75,456.9844 Q837.4375,458.0469 838.7813,458.0469 Q839.4063,458.0469 840,457.7813 Q840.5938,457.5 841.2188,456.9219 L841.2188,459.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="858.75" y="458.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="470" y2="470"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="720" y="476"/>
-      <ellipse cx="725" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="734" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="490.8047" y2="490.8047"/>
-    <path d="M367.78,212.91 C259.99,229.31 116.66,259.4 82.5,304 C53.51,341.84 77.4,397.97 102.9,433.63 " fill="none" id="C_0001668671110672744395-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="106.02,437.88,103.9189,428.2579,103.0613,433.8493,97.4699,432.9918,106.02,437.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M130.77,437.88 C114.43,402.56 87.33,343.38 117.5,304 C148.16,263.97 266.75,235.63 362.59,218.39 " fill="none" id="C_0001494142745564026823-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="367.72,217.48,358.161,215.1081,362.7964,218.3506,359.5539,222.9859,367.72,217.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M617.1,217.3 C714.14,234.43 837.18,263.12 868.5,304 C897.37,341.69 873.79,397.51 857.14,433.19 " fill="none" id="C_0001668671110672744395-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="854.94,437.88,862.3718,431.4172,857.0552,433.3494,855.1229,428.0328,854.94,437.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M879.69,437.88 C906.57,402.56 933.67,343.38 903.5,304 C869.79,259.99 729.8,230.11 622.31,213.57 " fill="none" id="C_0001452948650450999568-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="617.22,212.8,625.5106,218.1166,622.1624,213.5571,626.7219,210.2088,617.22,212.8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M203.89,378.3 C191.17,395.65 176.03,416.31 163.52,433.37 " fill="none" id="C_0001028369219400401946-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="160.4,437.62,168.9501,432.7318,163.3587,433.5893,162.5011,427.9979,160.4,437.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M344.31,373.91 C350.11,375.34 355.87,376.71 361.5,378 C477.83,404.67 611.25,428.83 708.68,445.3 " fill="none" id="C_0001028369219400401946-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="713.87,446.18,705.6577,440.7433,708.9392,445.3511,704.3314,448.6325,713.87,446.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M389.49,253.83 C358.5,270.63 325.3,288.62 297.31,303.79 " fill="none" id="C_0001668671110672744395&lt;-C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="386.52,247.48,407.44,244.1,393.19,259.79,386.52,247.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M390.58,378.13 C338.74,396.51 276.35,418.63 226.61,436.26 " fill="none" id="C_0001710373315476287130-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="221.83,437.96,231.65,438.7132,226.541,436.2847,228.9695,431.1756,221.83,437.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M594.42,378.13 C646.26,396.51 708.65,418.63 758.39,436.26 " fill="none" id="C_0001710373315476287130-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="763.17,437.96,756.0305,431.1756,758.459,436.2847,753.35,438.7132,763.17,437.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M492.5,264.22 C492.5,277.76 492.5,291.54 492.5,303.56 " fill="none" id="C_0001668671110672744395&lt;-C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="485.5,264.1,492.5,244.1,499.5,264.1,485.5,264.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M640.69,373.91 C634.89,375.34 629.13,376.71 623.5,378 C507.17,404.67 373.75,428.83 276.32,445.3 " fill="none" id="C_0001399026228179178025-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="271.13,446.18,280.6686,448.6325,276.0608,445.3511,279.3423,440.7433,271.13,446.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M781.11,378.3 C793.83,395.65 808.97,416.31 821.48,433.37 " fill="none" id="C_0001399026228179178025-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="824.6,437.62,822.4989,427.9979,821.6413,433.5893,816.0499,432.7318,824.6,437.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M595.51,253.83 C626.5,270.63 659.7,288.62 687.69,303.79 " fill="none" id="C_0001668671110672744395&lt;-C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="591.81,259.79,577.56,244.1,598.48,247.48,591.81,259.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M492.5,90.28 C492.5,107.03 492.5,126.68 492.5,144.47 " fill="none" id="C_0001491568826758947722-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="492.5,149.92,496.5,140.92,492.5,144.92,488.5,140.92,492.5,149.92" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M345.55,97.58 C250.88,136.76 135.26,202.59 78.5,304 C53.84,348.06 86.89,404.22 112.84,437.93 " fill="none" id="C_0001491568826758947722&lt;-C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="343.01,91.06,364.18,90.1,348.23,104.05,343.01,91.06" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M654.92,97.14 C754.72,135.45 874.58,200.46 934.5,304 C950.97,332.47 946.96,347.56 934.5,378 C924.84,401.6 905.63,422.32 887.62,437.86 " fill="none" id="C_0001491568826758947722&lt;-C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="652.2,103.6,635.89,90.07,657.08,90.48,652.2,103.6" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001668671110672744395_C_0001494142745564026823">
+      <path codeLine="44" d="M390.2,231.61 C275.79,249.52 124.66,281.96 88.5,329.3 C56.62,371.05 82.5916,428.5867 111.1916,465.9267 " fill="none" id="C_0001668671110672744395-to-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="114.84,470.69,112.543,461.1128,111.7997,466.7206,106.1919,465.9773,114.84,470.69" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001494142745564026823_C_0001668671110672744395">
+      <path codeLine="56" d="M139.68,470.69 C121.24,433.35 91.62,371.05 123.5,329.3 C156.71,285.82 281.0152,255.9646 384.2952,237.3446 " fill="none" id="C_0001494142745564026823-to-C_0001668671110672744395" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="390.2,236.28,380.6331,233.9403,385.2793,237.1671,382.0525,241.8134,390.2,236.28" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001668671110672744395_C_0001452948650450999568">
+      <path codeLine="45" d="M658.82,236.14 C762.41,254.74 893.21,285.71 926.5,329.3 C958.38,371.05 931.4502,427.9869 912.7202,465.3269 " fill="none" id="C_0001668671110672744395-to-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="910.03,470.69,917.6407,464.4388,912.2718,466.2207,910.4899,460.8519,910.03,470.69" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001452948650450999568_C_0001668671110672744395">
+      <path codeLine="58" d="M934.87,470.69 C963.76,433.35 993.38,371.05 961.5,329.3 C925.26,281.85 779.4185,250.2833 664.6785,232.4133 " fill="none" id="C_0001452948650450999568-to-C_0001668671110672744395" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="658.75,231.49,667.0272,236.8273,663.6904,232.2594,668.2583,228.9226,658.75,231.49" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001028369219400401946_C_0001494142745564026823">
+      <path codeLine="46" d="M216.18,411.18 C202.17,430.32 189.1917,448.0468 176.1017,465.9468 " fill="none" id="C_0001028369219400401946-to-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="172.56,470.79,181.1014,465.8864,175.5114,466.754,174.6438,461.1641,172.56,470.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001028369219400401946_C_0001452948650450999568">
+      <path codeLine="47" d="M367.73,406.86 C373.39,408.27 379,409.63 384.5,410.9 C509.25,439.75 646.884,463.6109 750.684,480.0609 " fill="none" id="C_0001028369219400401946-to-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="756.61,481,748.347,475.6406,751.6716,480.2174,747.0948,483.542,756.61,481" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001668671110672744395_C_0001028369219400401946">
+      <path codeLine="48" d="M409.5948,278.4647 C374.3548,297.9347 351.11,310.77 318.46,328.8 " fill="none" id="C_0001668671110672744395-backto-C_0001028369219400401946" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="425.35,269.76,406.6932,273.213,412.4963,283.7165,425.35,269.76" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001710373315476287130_C_0001494142745564026823">
+      <path codeLine="49" d="M409.44,411.36 C355.18,430.34 297.0335,450.6889 246.2035,468.4689 " fill="none" id="C_0001710373315476287130-to-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="240.54,470.45,250.356,471.2541,245.2596,468.7991,247.7146,463.7027,240.54,470.45" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001710373315476287130_C_0001452948650450999568">
+      <path codeLine="50" d="M639.56,411.36 C693.82,430.34 751.9665,450.6889 802.7965,468.4689 " fill="none" id="C_0001710373315476287130-to-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="808.46,470.45,801.2854,463.7027,803.7404,468.7991,798.644,471.2541,808.46,470.45" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001668671110672744395_C_0001710373315476287130">
+      <path codeLine="51" d="M524.5,287.76 C524.5,307.32 524.5,310.96 524.5,329.04 " fill="none" id="C_0001668671110672744395-backto-C_0001710373315476287130" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="524.5,269.76,518.5,287.76,530.5,287.76,524.5,269.76" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001399026228179178025_C_0001494142745564026823">
+      <path codeLine="52" d="M681.27,406.86 C675.61,408.27 670,409.63 664.5,410.9 C539.75,439.75 402.116,463.6109 298.316,480.0609 " fill="none" id="C_0001399026228179178025-to-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="292.39,481,301.9052,483.542,297.3284,480.2174,300.653,475.6406,292.39,481" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001399026228179178025_C_0001452948650450999568">
+      <path codeLine="53" d="M832.82,411.18 C846.83,430.32 859.8083,448.0468 872.8983,465.9468 " fill="none" id="C_0001399026228179178025-to-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="876.44,470.79,874.3562,461.1641,873.4886,466.754,867.8986,465.8864,876.44,470.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001668671110672744395_C_0001399026228179178025">
+      <path codeLine="54" d="M639.4052,278.4647 C674.6452,297.9347 697.89,310.77 730.54,328.8 " fill="none" id="C_0001668671110672744395-backto-C_0001399026228179178025" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="623.65,269.76,636.5037,283.7165,642.3068,273.213,623.65,269.76" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001491568826758947722_C_0001668671110672744395">
+      <path codeLine="55" d="M524.5,99.03 C524.5,117.5 524.5,133.04 524.5,152.38 " fill="none" id="C_0001491568826758947722-to-C_0001668671110672744395" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="524.5,158.38,528.5,149.38,524.5,153.38,520.5,149.38,524.5,158.38" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001491568826758947722_C_0001494142745564026823">
+      <path codeLine="57" d="M368.6948,105.9231 C265.2448,147.7931 148.13,214.39 84.5,329.3 C66.93,361.03 73.47,376.35 84.5,410.9 C91.55,432.97 106.09,454.27 119.63,470.75 " fill="none" id="C_0001491568826758947722-backto-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="385.38,99.17,366.4438,100.3614,370.9458,111.4848,385.38,99.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001491568826758947722_C_0001452948650450999568">
+      <path codeLine="59" d="M695.5763,105.5104 C804.4863,146.5004 925.64,212.37 992.5,329.3 C1010.5,360.78 1006.52,377.45 992.5,410.9 C982.61,434.49 963.33,455.06 944.88,470.69 " fill="none" id="C_0001491568826758947722-backto-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="678.73,99.17,693.4629,111.1258,697.6898,99.8949,678.73,99.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00021_class_mermaid.svg b/docs/test_cases/t00021_class_mermaid.svg
index 708ac9cb..a8fb772c 100644
--- a/docs/test_cases/t00021_class_mermaid.svg
+++ b/docs/test_cases/t00021_class_mermaid.svg
@@ -1,71 +1,76 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-35 0 1246.9453125 614" style="max-width: 1246.95px; background-color: white;" width="1246.9453125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-35 0 1278.0625 614" style="max-width: 1278.06px; background-color: white;" width="1278.0625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M532.3203125,272.99368043449107L439.1002604166667,285.99473369540925C345.8802083333333,298.9957869563274,159.44010416666666,324.9978934781637,66.22005208333333,350.5822800724152C-27,376.1666666666667,-27,401.3333333333333,-27,426.5C-27,451.6666666666667,-27,476.8333333333333,-13.125746931524546,493.5833333333333C0.7485061369509083,510.3333333333333,28.497012273901817,518.6666666666666,42.37126534237727,522.8333333333334L56.245518410852725,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M811.8671875,292.48736086898214L846.8294270833334,302.23946739081845C881.7916666666666,311.99157391265476,951.7161458333334,331.4957869563274,986.6783854166666,353.83122681149706C1021.640625,376.1666666666667,1021.640625,401.3333333333333,1021.640625,426.5C1021.640625,451.6666666666667,1021.640625,476.8333333333333,1022.9326146640827,493.5833333333333C1024.2246043281655,510.3333333333333,1026.8085836563307,518.6666666666666,1028.1005733204136,522.8333333333334L1029.3925629844962,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M147.7734375,477L147.7734375,481.1666666666667C147.7734375,485.3333333333333,147.7734375,493.6666666666667,150.35741682816538,502C152.94139615633074,510.3333333333333,158.1093548126615,518.6666666666666,160.69333414082686,522.8333333333334L163.27731346899225,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M287.546875,438.30588646593543L413.2291666666667,448.9215720549462C538.9114583333334,459.53725764395693,790.2760416666666,480.76862882197844,915.9583333333334,495.55098107765593C1041.640625,510.3333333333333,1041.640625,518.6666666666666,1041.640625,522.8333333333334L1041.640625,527"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M532.3203125,279.49157391265476L468.2291666666667,291.4096449272123C404.1380208333333,303.32771594176984,275.9557291666667,327.1638579708849,211.86458333333334,343.2485956521091C147.7734375,359.3333333333333,147.7734375,367.6666666666667,147.7734375,371.8333333333333L147.7734375,376"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M357.546875,465.2745755170583L335.482421875,471.39547959754856C313.41796875,477.5163836780389,269.2890625,489.75819183901945,244.8094466650517,500.04576258617635C220.32983083010336,510.3333333333333,215.49950541020675,518.6666666666666,213.08434270025842,522.8333333333334L210.66917999031008,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M637.09375,445.2001855107776L707.8515625,454.6668212589813C778.609375,464.1334570071851,920.125,483.0667285035925,989.5908228359173,496.7000309184629C1059.0566456718345,510.3333333333333,1056.4726663436693,518.6666666666666,1055.1806766795864,522.8333333333334L1053.8886870155038,527"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M542.1340144230769,326L534.6650641025641,330.1666666666667C527.1961137820513,334.3333333333333,512.2582131410256,342.6666666666667,504.7892628205129,351C497.3203125,359.3333333333333,497.3203125,367.6666666666667,497.3203125,371.8333333333333L497.3203125,376"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M707.09375,444.0382602881126L630.1048177083334,453.6985502400939C553.1158854166666,463.3588401920751,399.1380208333333,482.6794200960376,318.4419361676357,496.5063767146855C237.74585150193798,510.3333333333333,230.33154675387595,518.6666666666666,226.62439437984494,522.8333333333334L222.91724200581396,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M986.640625,471.4492695750557L1002.4739583333334,476.5410579792131C1018.3072916666666,481.63284638337046,1049.9739583333333,491.81642319168526,1063.2233123385013,501.07487826250934C1076.4726663436693,510.3333333333333,1071.3047076873384,518.6666666666666,1068.720728359173,522.8333333333334L1066.1367490310076,527"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M802.0534855769231,326L809.5224358974359,330.1666666666667C816.9913862179487,334.3333333333333,831.9292868589743,342.6666666666667,839.3982371794872,351C846.8671875,359.3333333333333,846.8671875,367.6666666666667,846.8671875,371.8333333333333L846.8671875,376"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M672.09375,131L672.09375,135.16666666666666C672.09375,139.33333333333334,672.09375,147.66666666666666,672.09375,156C672.09375,164.33333333333334,672.09375,172.66666666666666,672.09375,176.83333333333334L672.09375,181"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M350.078125,544.884857967835L403.7473958333333,537.7373816398625C457.4166666666667,530.58990531189,564.7552083333334,516.294952655945,618.4244791666666,496.5641429946392C672.09375,476.8333333333333,672.09375,451.6666666666667,672.09375,426.5C672.09375,401.3333333333333,672.09375,376.1666666666667,672.09375,359.4166666666667C672.09375,342.6666666666667,672.09375,334.3333333333333,672.09375,330.1666666666667L672.09375,326"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M509.7890625,109.66444280541774L478.58203125,117.38703567118144C447.375,125.10962853694515,384.9609375,140.55481426847257,353.75390625,164.52740713423628C322.546875,188.5,322.546875,221,322.546875,253.5C322.546875,286,322.546875,318.5,322.546875,347.3333333333333C322.546875,376.1666666666667,322.546875,401.3333333333333,322.546875,426.5C322.546875,451.6666666666667,322.546875,476.8333333333333,313.8405805878553,493.5833333333333C305.1342861757106,510.3333333333333,287.7216973514212,518.6666666666666,279.0154029392765,522.8333333333334L270.3091085271318,527"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1090.6328730620155,527L1095.8008317183462,522.8333333333334C1100.968790374677,518.6666666666666,1111.3047076873384,510.3333333333333,1116.4726663436693,493.5833333333333C1121.640625,476.8333333333333,1121.640625,451.6666666666667,1121.640625,426.5C1121.640625,401.3333333333333,1121.640625,376.1666666666667,1070.01171875,352.38579501349733C1018.3828125,328.6049233603281,915.125,306.20984672065623,863.49609375,295.01230840082025L811.8671875,283.8147700809843"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M834.3984375,102.1841057073224L878.9388020833334,111.15342142276866C923.4791666666666,120.12273713821493,1012.5598958333334,138.06136856910746,1057.1002604166667,163.28068428455373C1101.640625,188.5,1101.640625,221,1101.640625,253.5C1101.640625,286,1101.640625,318.5,1101.640625,347.3333333333333C1101.640625,376.1666666666667,1101.640625,401.3333333333333,1101.640625,426.5C1101.640625,451.6666666666667,1101.640625,476.8333333333333,1097.764656007752,493.5833333333333C1093.8886870155038,510.3333333333333,1086.1367490310079,518.6666666666666,1082.2607800387598,522.8333333333334L1078.3848110465117,527"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M545.65625,273.1147558849172L450.2135416666667,286.0956299040977C354.7708333333333,299.07650392327815,163.88541666666666,325.0382519616391,68.44270833333333,350.60245931415284C-27,376.1666666666667,-27,401.3333333333333,-27,426.5C-27,451.6666666666667,-27,476.8333333333333,-13.797919228905092,493.30107075954476C-0.5958384578101814,509.7688081857562,25.808323084379637,517.5376163715124,39.01040385547454,521.4220204643906L52.212484626569456,525.3064245572687"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M834.09375,292.72951176983435L869.796875,302.4412598081953C905.5,312.15300784655625,976.90625,331.5765039232781,1012.609375,353.87158529497236C1048.3125,376.1666666666667,1048.3125,401.3333333333333,1048.3125,426.5C1048.3125,451.6666666666667,1048.3125,476.8333333333333,1049.3083233436862,492.6281969500546C1050.3041466873724,508.4230605667758,1052.2957933747448,514.8461211335517,1053.291616718431,518.0576514169396L1054.2874400621172,521.2691817003275"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M152.21875,477L152.21875,481.1666666666667C152.21875,485.3333333333333,152.21875,493.6666666666667,154.27569448873456,501.1501563214178C156.3326389774691,508.6336459761689,160.4465279549382,515.2672919523378,162.50347244367276,518.5841149404223L164.56041693240732,521.9009379285068"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M296.4375,438.38580931263857L425.0833333333333,448.9881744271988C553.7291666666666,459.59053954175903,811.0208333333334,480.79526977087954,939.6666666666666,494.56430155210643C1068.3125,508.3333333333333,1068.3125,514.6666666666666,1068.3125,517.8333333333334L1068.3125,521"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M527.945111132795,282.86479240137635L465.3240509439958,294.22066033448027C402.70299075519665,305.57652826758425,277.4608703775983,328.2882641337921,214.83981018879913,343.8107987335627C152.21875,359.3333333333333,152.21875,367.6666666666667,152.21875,371.8333333333333L152.21875,376"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M366.4375,465.55099467637996L344.0026041666667,471.62582889698325C321.5677083333333,477.70066311758666,276.6979166666667,489.85033155879336,252.2275781608848,499.23968544482767C227.75723965510292,508.629039330862,223.68635431020581,515.258078661724,221.65091163775728,518.572598327155L219.6154689653087,521.887117992586"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M654.875,445.349472545307L727.1145833333334,454.79122712108915C799.3541666666666,464.2329816968713,943.8333333333334,483.11649084843566,1015.0770933229805,495.76977570760573C1086.3208533126276,508.4230605667758,1084.3292066252552,514.8461211335517,1083.333383281569,518.0576514169396L1082.3375599378828,521.2691817003275"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M540.7981820976892,334.6019480131142L535.7745267480743,337.3349566775952C530.7508713984595,340.06796534207615,520.7035606992298,345.5339826710381,515.6799053496148,352.4336580021857C510.65625,359.3333333333333,510.65625,367.6666666666667,510.65625,371.8333333333333L510.65625,376"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M724.875,444.13991899759526L646.0338541666666,453.7832658313294C567.1927083333334,463.4266126650635,409.5104166666667,482.7133063325318,327.49725195544835,495.7889189402919C245.4840872442301,508.86453154805196,239.14004948846022,515.7290630961039,235.96803061057525,519.1613288701299L232.79601173269032,522.5935946441558"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1013.3125,472.01698236446765L1029.1458333333333,477.0141519703897C1044.9791666666667,482.01132157631173,1076.6458333333333,492.00566078815586,1090.422222177932,500.3196533821624C1104.198611022531,508.6336459761689,1100.0847220450617,515.2672919523378,1098.0277775563272,518.5841149404223L1095.9708330675926,521.9009379285068"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M838.9518179023108,334.6019480131142L843.9754732519258,337.3349566775952C848.9991286015405,340.06796534207615,859.0464393007702,345.5339826710381,864.0700946503852,352.4336580021857C869.09375,359.3333333333333,869.09375,367.6666666666667,869.09375,371.8333333333333L869.09375,376"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M689.875,131L689.875,135.16666666666666C689.875,139.33333333333334,689.875,147.66666666666666,689.875,155C689.875,162.33333333333334,689.875,168.66666666666666,689.875,171.83333333333334L689.875,175"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M358.96875,544.8879434850863L414.1197916666667,537.7399529042386C469.2708333333333,530.5919623233909,579.5729166666666,516.2959811616955,634.7239583333334,496.5646572475144C689.875,476.8333333333333,689.875,451.6666666666667,689.875,426.5C689.875,401.3333333333333,689.875,376.1666666666667,689.875,360.4166666666667C689.875,344.6666666666667,689.875,338.3333333333333,689.875,335.1666666666667L689.875,332"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M505.62730429629374,113.96361130844454L476.5956702469114,120.96967609037046C447.5640361975291,127.97574087229636,389.5007680987646,141.9878704361482,360.4691340493823,165.24393521807409C331.4375,188.5,331.4375,221,331.4375,253.5C331.4375,286,331.4375,318.5,331.4375,347.3333333333333C331.4375,376.1666666666667,331.4375,401.3333333333333,331.4375,426.5C331.4375,451.6666666666667,331.4375,476.8333333333333,322.44404069767444,493.5833333333333C313.4505813953488,510.3333333333333,295.4636627906977,518.6666666666666,286.4702034883721,522.8333333333334L277.4767441860465,527"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1117.3047480620155,527L1122.4727067183462,522.8333333333334C1127.640665374677,518.6666666666666,1137.9765826873384,510.3333333333333,1143.1445413436693,493.5833333333333C1148.3125,476.8333333333333,1148.3125,451.6666666666667,1148.3125,426.5C1148.3125,401.3333333333333,1148.3125,376.1666666666667,1096.9208315846283,352.65340794437907C1045.5291631692567,329.1401492220914,942.7458263385133,307.2802984441828,891.3541579231415,296.3503730552285L839.9624895077699,285.4204476662742"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M874.2845904515291,105.88244806627459L916.6225753762742,114.23537338856215C958.9605603010194,122.58829871084974,1043.6365301505095,139.29414935542488,1085.9745150752549,163.89707467771242C1128.3125,188.5,1128.3125,221,1128.3125,253.5C1128.3125,286,1128.3125,318.5,1128.3125,347.3333333333333C1128.3125,376.1666666666667,1128.3125,401.3333333333333,1128.3125,426.5C1128.3125,451.6666666666667,1128.3125,476.8333333333333,1124.436531007752,493.5833333333333C1120.5605620155038,510.3333333333333,1112.8086240310079,518.6666666666666,1108.9326550387598,522.8333333333334L1105.0566860465117,527"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -236,11 +241,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L9">
+        <a transform="translate(689.875, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L9">
           <g title="Visitor" id="classId-C_0001668671110672744395-0" class="node default clickable">
-            <rect height="145" width="279.546875" y="-72.5" x="-139.7734375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <rect height="145" width="288.4375" y="-72.5" x="-144.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="144.21875" x1="-144.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="144.21875" x1="-144.21875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -65)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -252,29 +257,29 @@
                   <span class="nodeLabel">Visitor</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="251.390625">
+              <foreignObject transform="translate( -136.71875, 3)" height="18" width="260.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Visitor() : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~Visitor() : : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="263.359375">
+              <foreignObject transform="translate( -136.71875, 25)" height="18" width="272.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+visit_A(const A &amp; item) : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 47)" height="18" width="264.546875">
+              <foreignObject transform="translate( -136.71875, 47)" height="18" width="273.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+visit_B(const B &amp; item) : : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L16">
+        <a transform="translate(152.21875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L16">
           <g title="Visitor1" id="classId-C_0001028369219400401946-1" class="node default clickable">
-            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <rect height="101" width="288.4375" y="-50.5" x="-144.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="144.21875" x1="-144.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="144.21875" x1="-144.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -286,24 +291,24 @@
                   <span class="nodeLabel">Visitor1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
+              <foreignObject transform="translate( -136.71875, 3)" height="18" width="271.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
+              <foreignObject transform="translate( -136.71875, 25)" height="18" width="273.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L22">
+        <a transform="translate(510.65625, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L22">
           <g title="Visitor2" id="classId-C_0001710373315476287130-2" class="node default clickable">
-            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <rect height="101" width="288.4375" y="-50.5" x="-144.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="144.21875" x1="-144.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="144.21875" x1="-144.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -315,24 +320,24 @@
                   <span class="nodeLabel">Visitor2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
+              <foreignObject transform="translate( -136.71875, 3)" height="18" width="271.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
+              <foreignObject transform="translate( -136.71875, 25)" height="18" width="273.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L28">
+        <a transform="translate(869.09375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L28">
           <g title="Visitor3" id="classId-C_0001399026228179178025-3" class="node default clickable">
-            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <rect height="101" width="288.4375" y="-50.5" x="-144.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="144.21875" x1="-144.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="144.21875" x1="-144.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -344,24 +349,24 @@
                   <span class="nodeLabel">Visitor3</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
+              <foreignObject transform="translate( -136.71875, 3)" height="18" width="271.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
+              <foreignObject transform="translate( -136.71875, 25)" height="18" width="273.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L34">
+        <a transform="translate(689.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L34">
           <g title="Item" id="classId-C_0001491568826758947722-4" class="node default clickable">
-            <rect height="123" width="324.609375" y="-61.5" x="-162.3046875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <rect height="123" width="333.5" y="-61.5" x="-166.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="166.75" x1="-166.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="166.75" x1="-166.75" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -373,24 +378,24 @@
                   <span class="nodeLabel">Item</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="238.34375">
+              <foreignObject transform="translate( -159.25, 14)" height="18" width="247.234375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Item() : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~Item() : : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -154.8046875, 36)" height="18" width="309.609375">
+              <foreignObject transform="translate( -159.25, 36)" height="18" width="318.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+accept(const Visitor &amp; visitor) : : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L40">
+        <a transform="translate(192.21875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L40">
           <g title="A" id="classId-C_0001494142745564026823-5" class="node default clickable">
-            <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <rect height="79" width="333.5" y="-39.5" x="-166.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="166.75" x1="-166.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="166.75" x1="-166.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -402,19 +407,19 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="309.609375">
+              <foreignObject transform="translate( -159.25, 14)" height="18" width="318.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
+                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00021/t00021.cc#L45">
+        <a transform="translate(1068.3125, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L45">
           <g title="B" id="classId-C_0001452948650450999568-6" class="node default clickable">
-            <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <rect height="79" width="333.5" y="-39.5" x="-166.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="166.75" x1="-166.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="166.75" x1="-166.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -426,9 +431,9 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="309.609375">
+              <foreignObject transform="translate( -159.25, 14)" height="18" width="318.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
+                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : : [const] void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md
index e452784b..ed51033b 100644
--- a/docs/test_cases/t00022.md
+++ b/docs/test_cases/t00022.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00022.cc
+File `tests/t00022/t00022.cc`
 ```cpp
 #include <memory>
 
@@ -75,6 +75,7 @@ protected:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -100,6 +101,7 @@ protected:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -125,6 +127,7 @@ protected:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -180,6 +183,7 @@ protected:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -205,6 +209,7 @@ protected:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -260,6 +265,7 @@ protected:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -285,6 +291,7 @@ protected:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index 42e7b34e..c76e6ef0 100644
--- a/docs/test_cases/t00022_class.svg
+++ b/docs/test_cases/t00022_class.svg
@@ -1,90 +1,94 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="258px" preserveAspectRatio="none" style="width:311px;height:258px;background:#FFFFFF;" version="1.1" viewBox="0 0 311 258" width="311px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1huz9a3162j" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1huz9a3162j)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
-      <ellipse cx="134.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M134.3594,19.3438 L133.2031,24.4219 L135.5313,24.4219 L134.3594,19.3438 Z M132.875,17.1094 L135.8594,17.1094 L139.2188,29.5 L136.7656,29.5 L136,26.4375 L132.7188,26.4375 L131.9688,29.5 L129.5313,29.5 L132.875,17.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="154.75" y="28.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002012435893382068755">
+        <rect codeLine="2" fill="#F1F1F1" height="102.5998" id="C_0002012435893382068755" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="185" x="63.5" y="7"/>
+        <ellipse cx="147.25" cy="23" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M148.7813,24.9375 L149.1094,25.7344 L148.8281,25.7344 C148.375,25.7344 148.25,25.7656 148.0781,25.875 C147.7969,26.0156 147.625,26.3125 147.625,26.6094 C147.625,26.9063 147.7656,27.1563 148,27.3281 C148.1719,27.4531 148.4063,27.5 148.8281,27.5 L151.1875,27.5 C151.5469,27.5 151.7969,27.4688 151.9375,27.375 C152.2031,27.2344 152.375,26.9219 152.375,26.6094 C152.375,26.3438 152.2344,26.0781 152,25.9063 C151.8125,25.7813 151.6563,25.75 151.2031,25.7344 L147.8125,17.9063 L144.0938,17.9063 C143.6406,17.9063 143.5,17.9219 143.3281,18.0313 C143.0625,18.2031 142.8906,18.4844 142.8906,18.7813 C142.8906,19.0625 143.0313,19.3281 143.2813,19.5 C143.4531,19.625 143.6406,19.6563 144.0938,19.6563 L145.0625,19.6563 L142.4844,25.7344 C141.7344,25.7344 141.3281,26.0313 141.3281,26.6094 C141.3281,27.2188 141.7188,27.5 142.5156,27.5 L144.7813,27.5 C145.1406,27.5 145.3906,27.4688 145.5313,27.375 C145.7969,27.2188 145.9688,26.9219 145.9688,26.6094 C145.9688,26.3438 145.8281,26.0781 145.5938,25.9063 C145.4063,25.7656 145.25,25.7344 144.7813,25.7344 L144.4844,25.7344 L144.8281,24.9375 L148.7813,24.9375 Z M148.0156,23.1875 L145.5625,23.1875 L146.7969,20.3125 L148.0156,23.1875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="9" x="167.75" y="28.95">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="64.5" x2="247.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="48.95"/>
+          <polygon fill="#FFFF44" points="74.5,48.95,78.5,52.95,74.5,56.95,70.5,52.95" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="128" x="83.5" y="58.3999">method1() = 0 : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="67.8499"/>
+          <polygon fill="#FFFF44" points="74.5,67.8499,78.5,71.8499,74.5,75.8499,70.5,71.8499" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="128" x="83.5" y="77.2999">method2() = 0 : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="85.6998"/>
+          <ellipse cx="74.5" cy="90.6998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="83.5" y="93.8058">template_method() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="64.5" x2="247.5" y1="101.5998" y2="101.5998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="46"/>
-      <polygon fill="#FFFF44" points="69.5,46,73.5,50,69.5,54,65.5,50" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <g id="elem_C_0002282061426381077447">
+        <rect codeLine="9" fill="#F1F1F1" height="81.5999" id="C_0002282061426381077447" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="130" x="9" y="169.6"/>
+        <ellipse cx="61.25" cy="185.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M56.25,186.7563 C56.25,189.2563 58.3906,191.0688 61.3125,191.0688 C62.5469,191.0688 63.7188,190.7719 64.4688,190.2563 C65.0781,189.8344 65.4063,189.4125 65.4063,189.0063 C65.4063,188.5375 64.9844,188.1313 64.4844,188.1313 C64.25,188.1313 64.0313,188.2094 63.8281,188.4125 C63.3906,188.85 63.3906,188.85 63.2188,188.9438 C62.7656,189.1781 62.125,189.3188 61.3594,189.3188 C59.3594,189.3188 58.0781,188.3031 58.0781,186.725 L58.0781,185.6781 C58.0781,183.975 59.2969,182.7719 61,182.7719 C61.5781,182.7719 62.1563,182.9125 62.625,183.1625 C63.0938,183.4281 63.2656,183.6156 63.3281,183.975 C63.4531,184.6469 63.7031,184.8969 64.2344,184.8969 C64.5156,184.8969 64.7969,184.7563 64.9844,184.5375 C65.1094,184.3656 65.1563,184.1938 65.1563,183.7563 L65.1563,182.3969 C65.1563,181.975 65.1406,181.8344 65.0156,181.6625 C64.8438,181.4125 64.5625,181.2563 64.2344,181.2563 C63.9219,181.2563 63.7188,181.3656 63.5,181.6313 C62.3281,181.1313 61.8906,181.0219 60.9375,181.0219 C58.2656,181.0219 56.25,183.0375 56.25,185.6625 L56.25,186.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="81.75" y="190.206">A1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="138" y1="201.6" y2="201.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="210.5"/>
+          <polygon fill="#FFFF44" points="20,210.5,24,214.5,20,218.5,16,214.5" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="29" y="218.6059">method1() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="227.2999"/>
+          <polygon fill="#FFFF44" points="20,227.2999,24,231.2999,20,235.2999,16,231.2999" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="29" y="235.4059">method2() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="138" y1="243.1999" y2="243.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="54.2104">method1() = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <g id="elem_C_0000158819862916671538">
+        <rect codeLine="15" fill="#F1F1F1" height="81.5999" id="C_0000158819862916671538" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="130" x="174" y="169.6"/>
+        <ellipse cx="226.25" cy="185.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M221.25,186.7563 C221.25,189.2563 223.3906,191.0688 226.3125,191.0688 C227.5469,191.0688 228.7188,190.7719 229.4688,190.2563 C230.0781,189.8344 230.4063,189.4125 230.4063,189.0063 C230.4063,188.5375 229.9844,188.1313 229.4844,188.1313 C229.25,188.1313 229.0313,188.2094 228.8281,188.4125 C228.3906,188.85 228.3906,188.85 228.2188,188.9438 C227.7656,189.1781 227.125,189.3188 226.3594,189.3188 C224.3594,189.3188 223.0781,188.3031 223.0781,186.725 L223.0781,185.6781 C223.0781,183.975 224.2969,182.7719 226,182.7719 C226.5781,182.7719 227.1563,182.9125 227.625,183.1625 C228.0938,183.4281 228.2656,183.6156 228.3281,183.975 C228.4531,184.6469 228.7031,184.8969 229.2344,184.8969 C229.5156,184.8969 229.7969,184.7563 229.9844,184.5375 C230.1094,184.3656 230.1563,184.1938 230.1563,183.7563 L230.1563,182.3969 C230.1563,181.975 230.1406,181.8344 230.0156,181.6625 C229.8438,181.4125 229.5625,181.2563 229.2344,181.2563 C228.9219,181.2563 228.7188,181.3656 228.5,181.6313 C227.3281,181.1313 226.8906,181.0219 225.9375,181.0219 C223.2656,181.0219 221.25,183.0375 221.25,185.6625 L221.25,186.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="246.75" y="190.206">A2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="175" x2="303" y1="201.6" y2="201.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="180" y="210.5"/>
+          <polygon fill="#FFFF44" points="185,210.5,189,214.5,185,218.5,181,214.5" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="194" y="218.6059">method1() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="180" y="227.2999"/>
+          <polygon fill="#FFFF44" points="185,227.2999,189,231.2999,185,235.2999,181,231.2999" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="194" y="235.4059">method2() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="175" x2="303" y1="243.1999" y2="243.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="58.8047"/>
-      <polygon fill="#FFFF44" points="69.5,58.8047,73.5,62.8047,69.5,66.8047,65.5,62.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="67.0151">method2() = 0 : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="71.6094"/>
-      <ellipse cx="69.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="78.5" y="79.8198">template_method() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="86.4141" y2="86.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1huz9a3162j)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
-      <ellipse cx="53.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M56.2188,175.6406 Q55.6406,175.9375 55,176.0781 Q54.3594,176.2344 53.6563,176.2344 Q51.1563,176.2344 49.8281,174.5938 Q48.5156,172.9375 48.5156,169.8125 Q48.5156,166.6875 49.8281,165.0313 Q51.1563,163.375 53.6563,163.375 Q54.3594,163.375 55,163.5313 Q55.6563,163.6875 56.2188,163.9844 L56.2188,166.7031 Q55.5938,166.125 55,165.8594 Q54.4063,165.5781 53.7813,165.5781 Q52.4375,165.5781 51.75,166.6563 Q51.0625,167.7188 51.0625,169.8125 Q51.0625,171.9063 51.75,172.9844 Q52.4375,174.0469 53.7813,174.0469 Q54.4063,174.0469 55,173.7813 Q55.5938,173.5 56.2188,172.9219 L56.2188,175.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="73.75" y="174.1543">A1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="186" y2="186"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="192"/>
-      <polygon fill="#FFFF44" points="17,192,21,196,17,200,13,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="200.2104">method1() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="204.8047"/>
-      <polygon fill="#FFFF44" points="17,204.8047,21,208.8047,17,212.8047,13,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="213.0151">method2() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="219.6094" y2="219.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1huz9a3162j)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
-      <ellipse cx="207.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M210.2188,175.6406 Q209.6406,175.9375 209,176.0781 Q208.3594,176.2344 207.6563,176.2344 Q205.1563,176.2344 203.8281,174.5938 Q202.5156,172.9375 202.5156,169.8125 Q202.5156,166.6875 203.8281,165.0313 Q205.1563,163.375 207.6563,163.375 Q208.3594,163.375 209,163.5313 Q209.6563,163.6875 210.2188,163.9844 L210.2188,166.7031 Q209.5938,166.125 209,165.8594 Q208.4063,165.5781 207.7813,165.5781 Q206.4375,165.5781 205.75,166.6563 Q205.0625,167.7188 205.0625,169.8125 Q205.0625,171.9063 205.75,172.9844 Q206.4375,174.0469 207.7813,174.0469 Q208.4063,174.0469 209,173.7813 Q209.5938,173.5 210.2188,172.9219 L210.2188,175.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="227.75" y="174.1543">A2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="186" y2="186"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="192"/>
-      <polygon fill="#FFFF44" points="171,192,175,196,171,200,167,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="200.2104">method1() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="204.8047"/>
-      <polygon fill="#FFFF44" points="171,204.8047,175,208.8047,171,212.8047,167,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="213.0151">method2() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="219.6094" y2="219.6094"/>
-    <path d="M109.15,111.76 C101.19,126.04 92.92,140.85 85.76,153.7 " fill="none" id="C_0002012435893382068755&lt;-C_0002282061426381077447" 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;"/>
-    <path d="M175.85,111.76 C183.81,126.04 192.08,140.85 199.24,153.7 " fill="none" id="C_0002012435893382068755&lt;-C_0000158819862916671538" 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;"/>
+    <g id="link_C_0002012435893382068755_C_0002282061426381077447">
+      <path codeLine="20" d="M119.8398,125.4962 C109.2298,144.9162 105.9,151.01 95.89,169.33 " fill="none" id="C_0002012435893382068755-backto-C_0002282061426381077447" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="128.47,109.7,114.5744,122.6195,125.1052,128.3729,128.47,109.7" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002012435893382068755_C_0000158819862916671538">
+      <path codeLine="21" d="M192.5813,125.4516 C203.3213,144.8716 206.71,151.01 216.84,169.33 " fill="none" id="C_0002012435893382068755-backto-C_0000158819862916671538" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="183.87,109.7,187.3307,128.3554,197.8318,122.5479,183.87,109.7" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00022_class_mermaid.svg b/docs/test_cases/t00022_class_mermaid.svg
index c4cfc462..e25823f5 100644
--- a/docs/test_cases/t00022_class_mermaid.svg
+++ b/docs/test_cases/t00022_class_mermaid.svg
@@ -1,57 +1,62 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 345.03125 312" style="max-width: 345.031px; background-color: white;" width="345.03125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 362.8125 312" style="max-width: 362.812px; background-color: white;" width="362.8125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M102.0546875,153L98.00520833333333,157.16666666666666C93.95572916666667,161.33333333333334,85.85677083333333,169.66666666666666,81.80729166666667,178C77.7578125,186.33333333333334,77.7578125,194.66666666666666,77.7578125,198.83333333333334L77.7578125,203"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M242.9765625,153L247.02604166666666,157.16666666666666C251.07552083333334,161.33333333333334,259.1744791666667,169.66666666666666,263.2239583333333,178C267.2734375,186.33333333333334,267.2734375,194.66666666666666,267.2734375,198.83333333333334L267.2734375,203"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M94.802180011649,165.61724629505596L92.70233750970749,167.68103857921332C90.602495007766,169.74483086337065,86.402810003883,173.87241543168534,84.3029675019415,180.10287438250933C82.203125,186.33333333333334,82.203125,194.66666666666666,82.203125,198.83333333333334L82.203125,203"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M268.010319988351,165.61724629505596L270.1101624902925,167.68103857921332C272.210004992234,169.74483086337065,276.40968999611704,173.87241543168534,278.5095324980585,180.10287438250933C280.609375,186.33333333333334,280.609375,194.66666666666666,280.609375,198.83333333333334L280.609375,203"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -74,11 +79,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L6">
+        <a transform="translate(181.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L6">
           <g title="A" id="classId-C_0002012435893382068755-0" class="node default clickable">
-            <rect height="145" width="201.328125" y="-72.5" x="-100.6640625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="100.6640625" x1="-100.6640625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="100.6640625" x1="-100.6640625" class="divider"/>
+            <rect height="145" width="210.21875" y="-72.5" x="-105.109375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="105.109375" x1="-105.109375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="105.109375" x1="-105.109375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -65)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -90,29 +95,29 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -93.1640625, 3)" height="18" width="124.515625">
+              <foreignObject transform="translate( -97.609375, 3)" height="18" width="133.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">#method1() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">#method1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -93.1640625, 25)" height="18" width="124.515625">
+              <foreignObject transform="translate( -97.609375, 25)" height="18" width="133.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">#method2() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">#method2() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -93.1640625, 47)" height="18" width="186.328125">
+              <foreignObject transform="translate( -97.609375, 47)" height="18" width="195.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+template_method() : void</span>
+                  <span class="nodeLabel">+template_method() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L19">
+        <a transform="translate(82.203125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L19">
           <g title="A1" id="classId-C_0002282061426381077447-1" class="node default clickable">
-            <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
+            <rect height="101" width="148.40625" y="-50.5" x="-74.203125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="74.203125" x1="-74.203125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="74.203125" x1="-74.203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -124,24 +129,24 @@
                   <span class="nodeLabel">A1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.2578125, 3)" height="18" width="124.515625">
+              <foreignObject transform="translate( -66.703125, 3)" height="18" width="133.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#method1() : void</span>
+                  <span class="nodeLabel">#method1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.2578125, 25)" height="18" width="124.515625">
+              <foreignObject transform="translate( -66.703125, 25)" height="18" width="133.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#method2() : void</span>
+                  <span class="nodeLabel">#method2() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00022/t00022.cc#L25">
+        <a transform="translate(280.609375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L25">
           <g title="A2" id="classId-C_0000158819862916671538-2" class="node default clickable">
-            <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
+            <rect height="101" width="148.40625" y="-50.5" x="-74.203125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="74.203125" x1="-74.203125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="74.203125" x1="-74.203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -153,14 +158,14 @@
                   <span class="nodeLabel">A2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.2578125, 3)" height="18" width="124.515625">
+              <foreignObject transform="translate( -66.703125, 3)" height="18" width="133.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#method1() : void</span>
+                  <span class="nodeLabel">#method1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.2578125, 25)" height="18" width="124.515625">
+              <foreignObject transform="translate( -66.703125, 25)" height="18" width="133.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#method2() : void</span>
+                  <span class="nodeLabel">#method2() : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md
index d828ee4c..9b9afebd 100644
--- a/docs/test_cases/t00023.md
+++ b/docs/test_cases/t00023.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00023.cc
+File `tests/t00023/t00023.cc`
 ```cpp
 #include <memory>
 
@@ -84,6 +84,7 @@ private:
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -109,6 +110,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -164,6 +166,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -219,6 +222,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -274,6 +278,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -335,6 +340,7 @@ private:
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -365,6 +371,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index b0c24c95..cd26f024 100644
--- a/docs/test_cases/t00023_class.svg
+++ b/docs/test_cases/t00023_class.svg
@@ -1,121 +1,133 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="393px" preserveAspectRatio="none" style="width:456px;height:393px;" version="1.1" viewBox="0 0 456 393" width="456px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="414px" preserveAspectRatio="none" style="width:483px;height:414px;background:#FFFFFF;" version="1.1" viewBox="0 0 483 414" width="483px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f53ikv61ifvnn" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f53ikv61ifvnn)" height="81.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="104.5" y="179"/>
-      <ellipse cx="194.25" cy="195" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M194.3594,190.3438 L193.2031,195.4219 L195.5313,195.4219 L194.3594,190.3438 Z M192.875,188.1094 L195.8594,188.1094 L199.2188,200.5 L196.7656,200.5 L196,197.4375 L192.7188,197.4375 L191.9688,200.5 L189.5313,200.5 L192.875,188.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.75" y="199.1543">Strategy</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="211" y2="211"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <g id="elem_C_0001469857696438841976">
+        <rect codeLine="2" fill="#F1F1F1" height="91.6998" id="C_0001469857696438841976" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="260" x="111.5" y="190.4"/>
+        <ellipse cx="210.75" cy="206.4" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M212.2813,208.3375 L212.6094,209.1344 L212.3281,209.1344 C211.875,209.1344 211.75,209.1656 211.5781,209.275 C211.2969,209.4156 211.125,209.7125 211.125,210.0094 C211.125,210.3062 211.2656,210.5562 211.5,210.7281 C211.6719,210.8531 211.9063,210.9 212.3281,210.9 L214.6875,210.9 C215.0469,210.9 215.2969,210.8687 215.4375,210.775 C215.7031,210.6344 215.875,210.3219 215.875,210.0094 C215.875,209.7437 215.7344,209.4781 215.5,209.3062 C215.3125,209.1812 215.1563,209.15 214.7031,209.1344 L211.3125,201.3062 L207.5938,201.3062 C207.1406,201.3062 207,201.3219 206.8281,201.4312 C206.5625,201.6031 206.3906,201.8844 206.3906,202.1812 C206.3906,202.4625 206.5313,202.7281 206.7813,202.9 C206.9531,203.025 207.1406,203.0562 207.5938,203.0562 L208.5625,203.0562 L205.9844,209.1344 C205.2344,209.1344 204.8281,209.4312 204.8281,210.0094 C204.8281,210.6187 205.2188,210.9 206.0156,210.9 L208.2813,210.9 C208.6406,210.9 208.8906,210.8687 209.0313,210.775 C209.2969,210.6187 209.4688,210.3219 209.4688,210.0094 C209.4688,209.7437 209.3281,209.4781 209.0938,209.3062 C208.9063,209.1656 208.75,209.1344 208.2813,209.1344 L207.9844,209.1344 L208.3281,208.3375 L212.2813,208.3375 Z M211.5156,206.5875 L209.0625,206.5875 L210.2969,203.7125 L211.5156,206.5875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="53" x="231.25" y="212.35">Strategy</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="112.5" x2="370.5" y1="222.4" y2="222.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="117.5" y="231.3"/>
+          <ellipse cx="122.5" cy="236.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="234" x="131.5" y="239.4059">~Strategy() constexpr = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="112.5" x2="370.5" y1="247.1999" y2="247.1999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="117.5" y="257.1499"/>
+          <ellipse cx="122.5" cy="262.1499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="131" x="131.5" y="266.5999">algorithm() = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="112.5" x2="370.5" y1="274.0998" y2="274.0998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="217"/>
-      <ellipse cx="115.5" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <g id="elem_C_0001245533075819635385">
+        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0001245533075819635385" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="133" x="7" y="343.1"/>
+        <ellipse cx="39.55" cy="359.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M34.55,360.2562 C34.55,362.7562 36.6906,364.5687 39.6125,364.5687 C40.8469,364.5687 42.0188,364.2719 42.7688,363.7562 C43.3781,363.3344 43.7063,362.9125 43.7063,362.5062 C43.7063,362.0375 43.2844,361.6312 42.7844,361.6312 C42.55,361.6312 42.3313,361.7094 42.1281,361.9125 C41.6906,362.35 41.6906,362.35 41.5188,362.4437 C41.0656,362.6781 40.425,362.8187 39.6594,362.8187 C37.6594,362.8187 36.3781,361.8031 36.3781,360.225 L36.3781,359.1781 C36.3781,357.475 37.5969,356.2719 39.3,356.2719 C39.8781,356.2719 40.4563,356.4125 40.925,356.6625 C41.3938,356.9281 41.5656,357.1156 41.6281,357.475 C41.7531,358.1469 42.0031,358.3969 42.5344,358.3969 C42.8156,358.3969 43.0969,358.2562 43.2844,358.0375 C43.4094,357.8656 43.4563,357.6937 43.4563,357.2562 L43.4563,355.8969 C43.4563,355.475 43.4406,355.3344 43.3156,355.1625 C43.1438,354.9125 42.8625,354.7562 42.5344,354.7562 C42.2219,354.7562 42.0188,354.8656 41.8,355.1312 C40.6281,354.6312 40.1906,354.5219 39.2375,354.5219 C36.5656,354.5219 34.55,356.5375 34.55,359.1625 L34.55,360.2562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="57.45" y="363.706">StrategyA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="139" y1="375.1" y2="375.1"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="384"/>
+          <ellipse cx="18" cy="389" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="27" y="392.1059">algorithm() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="139" y1="399.8999" y2="399.8999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="124.5" y="225.2104">~Strategy() constexpr = default : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <g id="elem_C_0000000264986406899645">
+        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0000000264986406899645" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="133" x="175" y="343.1"/>
+        <ellipse cx="207.55" cy="359.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M202.55,360.2562 C202.55,362.7562 204.6906,364.5687 207.6125,364.5687 C208.8469,364.5687 210.0188,364.2719 210.7688,363.7562 C211.3781,363.3344 211.7063,362.9125 211.7063,362.5062 C211.7063,362.0375 211.2844,361.6312 210.7844,361.6312 C210.55,361.6312 210.3313,361.7094 210.1281,361.9125 C209.6906,362.35 209.6906,362.35 209.5188,362.4437 C209.0656,362.6781 208.425,362.8187 207.6594,362.8187 C205.6594,362.8187 204.3781,361.8031 204.3781,360.225 L204.3781,359.1781 C204.3781,357.475 205.5969,356.2719 207.3,356.2719 C207.8781,356.2719 208.4563,356.4125 208.925,356.6625 C209.3938,356.9281 209.5656,357.1156 209.6281,357.475 C209.7531,358.1469 210.0031,358.3969 210.5344,358.3969 C210.8156,358.3969 211.0969,358.2562 211.2844,358.0375 C211.4094,357.8656 211.4563,357.6937 211.4563,357.2562 L211.4563,355.8969 C211.4563,355.475 211.4406,355.3344 211.3156,355.1625 C211.1438,354.9125 210.8625,354.7562 210.5344,354.7562 C210.2219,354.7562 210.0188,354.8656 209.8,355.1312 C208.6281,354.6312 208.1906,354.5219 207.2375,354.5219 C204.5656,354.5219 202.55,356.5375 202.55,359.1625 L202.55,360.2562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="225.45" y="363.706">StrategyB</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="176" x2="307" y1="375.1" y2="375.1"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="181" y="384"/>
+          <ellipse cx="186" cy="389" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="195" y="392.1059">algorithm() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="176" x2="307" y1="399.8999" y2="399.8999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="105.5" x2="345.5" y1="231.8047" y2="231.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="237.8047"/>
-      <ellipse cx="115.5" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <g id="elem_C_0000174795176193483089">
+        <rect codeLine="19" fill="#F1F1F1" height="64.7999" id="C_0000174795176193483089" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="133" x="343" y="343.1"/>
+        <ellipse cx="375.1" cy="359.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M370.1,360.2562 C370.1,362.7562 372.2406,364.5687 375.1625,364.5687 C376.3969,364.5687 377.5688,364.2719 378.3188,363.7562 C378.9281,363.3344 379.2563,362.9125 379.2563,362.5062 C379.2563,362.0375 378.8344,361.6312 378.3344,361.6312 C378.1,361.6312 377.8813,361.7094 377.6781,361.9125 C377.2406,362.35 377.2406,362.35 377.0688,362.4437 C376.6156,362.6781 375.975,362.8187 375.2094,362.8187 C373.2094,362.8187 371.9281,361.8031 371.9281,360.225 L371.9281,359.1781 C371.9281,357.475 373.1469,356.2719 374.85,356.2719 C375.4281,356.2719 376.0063,356.4125 376.475,356.6625 C376.9438,356.9281 377.1156,357.1156 377.1781,357.475 C377.3031,358.1469 377.5531,358.3969 378.0844,358.3969 C378.3656,358.3969 378.6469,358.2562 378.8344,358.0375 C378.9594,357.8656 379.0063,357.6937 379.0063,357.2562 L379.0063,355.8969 C379.0063,355.475 378.9906,355.3344 378.8656,355.1625 C378.6938,354.9125 378.4125,354.7562 378.0844,354.7562 C377.7719,354.7562 377.5688,354.8656 377.35,355.1312 C376.1781,354.6312 375.7406,354.5219 374.7875,354.5219 C372.1156,354.5219 370.1,356.5375 370.1,359.1625 L370.1,360.2562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="392.9" y="363.706">StrategyC</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="344" x2="475" y1="375.1" y2="375.1"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="349" y="384"/>
+          <ellipse cx="354" cy="389" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="363" y="392.1059">algorithm() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="344" x2="475" y1="399.8999" y2="399.8999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="124.5" y="246.0151">algorithm() = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <g id="elem_C_0002038594012979479050">
+        <rect codeLine="24" fill="#F1F1F1" height="106.3998" id="C_0002038594012979479050" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="342" x="70.5" y="7"/>
+        <ellipse cx="212.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M207.75,24.1563 C207.75,26.6563 209.8906,28.4688 212.8125,28.4688 C214.0469,28.4688 215.2188,28.1719 215.9688,27.6563 C216.5781,27.2344 216.9063,26.8125 216.9063,26.4063 C216.9063,25.9375 216.4844,25.5313 215.9844,25.5313 C215.75,25.5313 215.5313,25.6094 215.3281,25.8125 C214.8906,26.25 214.8906,26.25 214.7188,26.3438 C214.2656,26.5781 213.625,26.7188 212.8594,26.7188 C210.8594,26.7188 209.5781,25.7031 209.5781,24.125 L209.5781,23.0781 C209.5781,21.375 210.7969,20.1719 212.5,20.1719 C213.0781,20.1719 213.6563,20.3125 214.125,20.5625 C214.5938,20.8281 214.7656,21.0156 214.8281,21.375 C214.9531,22.0469 215.2031,22.2969 215.7344,22.2969 C216.0156,22.2969 216.2969,22.1563 216.4844,21.9375 C216.6094,21.7656 216.6563,21.5938 216.6563,21.1563 L216.6563,19.7969 C216.6563,19.375 216.6406,19.2344 216.5156,19.0625 C216.3438,18.8125 216.0625,18.6563 215.7344,18.6563 C215.4219,18.6563 215.2188,18.7656 215,19.0313 C213.8281,18.5313 213.3906,18.4219 212.4375,18.4219 C209.7656,18.4219 207.75,20.4375 207.75,23.0625 L207.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="233.25" y="27.606">Context</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="71.5" x2="411.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="76.5" y="47.9"/>
+          <ellipse cx="81.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="316" x="90.5" y="56.0059">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="71.5" x2="411.5" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="76.5" y="72.6999"/>
+          <ellipse cx="81.5" cy="77.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="90.5" y="80.8059">apply() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="71.5" x2="411.5" y1="88.5999" y2="88.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="76.5" y="97.4998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="78.5" y="99.4998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="247" x="90.5" y="105.6058">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="252.6094" y2="252.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f53ikv61ifvnn)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="322"/>
-      <ellipse cx="34.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M37.4688,343.6406 Q36.8906,343.9375 36.25,344.0781 Q35.6094,344.2344 34.9063,344.2344 Q32.4063,344.2344 31.0781,342.5938 Q29.7656,340.9375 29.7656,337.8125 Q29.7656,334.6875 31.0781,333.0313 Q32.4063,331.375 34.9063,331.375 Q35.6094,331.375 36.25,331.5313 Q36.9063,331.6875 37.4688,331.9844 L37.4688,334.7031 Q36.8438,334.125 36.25,333.8594 Q35.6563,333.5781 35.0313,333.5781 Q33.6875,333.5781 33,334.6563 Q32.3125,335.7188 32.3125,337.8125 Q32.3125,339.9063 33,340.9844 Q33.6875,342.0469 35.0313,342.0469 Q35.6563,342.0469 36.25,341.7813 Q36.8438,341.5 37.4688,340.9219 L37.4688,343.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="342.1543">StrategyA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="354" y2="354"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="360"/>
-      <ellipse cx="17" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="368.2104">algorithm() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f53ikv61ifvnn)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="322"/>
-      <ellipse cx="192.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M195.4688,343.6406 Q194.8906,343.9375 194.25,344.0781 Q193.6094,344.2344 192.9063,344.2344 Q190.4063,344.2344 189.0781,342.5938 Q187.7656,340.9375 187.7656,337.8125 Q187.7656,334.6875 189.0781,333.0313 Q190.4063,331.375 192.9063,331.375 Q193.6094,331.375 194.25,331.5313 Q194.9063,331.6875 195.4688,331.9844 L195.4688,334.7031 Q194.8438,334.125 194.25,333.8594 Q193.6563,333.5781 193.0313,333.5781 Q191.6875,333.5781 191,334.6563 Q190.3125,335.7188 190.3125,337.8125 Q190.3125,339.9063 191,340.9844 Q191.6875,342.0469 193.0313,342.0469 Q193.6563,342.0469 194.25,341.7813 Q194.8438,341.5 195.4688,340.9219 L195.4688,343.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="342.1543">StrategyB</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="354" y2="354"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="170" y="360"/>
-      <ellipse cx="175" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184" y="368.2104">algorithm() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f53ikv61ifvnn)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="322"/>
-      <ellipse cx="350.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M353.4688,343.6406 Q352.8906,343.9375 352.25,344.0781 Q351.6094,344.2344 350.9063,344.2344 Q348.4063,344.2344 347.0781,342.5938 Q345.7656,340.9375 345.7656,337.8125 Q345.7656,334.6875 347.0781,333.0313 Q348.4063,331.375 350.9063,331.375 Q351.6094,331.375 352.25,331.5313 Q352.9063,331.6875 353.4688,331.9844 L353.4688,334.7031 Q352.8438,334.125 352.25,333.8594 Q351.6563,333.5781 351.0313,333.5781 Q349.6875,333.5781 349,334.6563 Q348.3125,335.7188 348.3125,337.8125 Q348.3125,339.9063 349,340.9844 Q349.6875,342.0469 351.0313,342.0469 Q351.6563,342.0469 352.25,341.7813 Q352.8438,341.5 353.4688,340.9219 L353.4688,343.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="342.1543">StrategyC</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="354" y2="354"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="328" y="360"/>
-      <ellipse cx="333" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="342" y="368.2104">algorithm() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f53ikv61ifvnn)" height="94.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
-      <ellipse cx="197.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M200.2188,29.6406 Q199.6406,29.9375 199,30.0781 Q198.3594,30.2344 197.6563,30.2344 Q195.1563,30.2344 193.8281,28.5938 Q192.5156,26.9375 192.5156,23.8125 Q192.5156,20.6875 193.8281,19.0313 Q195.1563,17.375 197.6563,17.375 Q198.3594,17.375 199,17.5313 Q199.6563,17.6875 200.2188,17.9844 L200.2188,20.7031 Q199.5938,20.125 199,19.8594 Q198.4063,19.5781 197.7813,19.5781 Q196.4375,19.5781 195.75,20.6563 Q195.0625,21.7188 195.0625,23.8125 Q195.0625,25.9063 195.75,26.9844 Q196.4375,28.0469 197.7813,28.0469 Q198.4063,28.0469 199,27.7813 Q199.5938,27.5 200.2188,26.9219 L200.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="217.75" y="28.1543">Context</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="46"/>
-      <ellipse cx="79" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="289" x="88" y="54.2104">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="69" x2="382" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="66.8047"/>
-      <ellipse cx="79" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="88" y="75.0151">apply() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="87.6094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="89.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="95.8198">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
-    </a>
-    <path d="M161.3,274.03 C141.49,290.39 120.4,307.81 103.24,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="156.93,268.56,176.81,261.22,165.84,279.35,156.93,268.56" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M225.5,281.37 C225.5,295.49 225.5,309.91 225.5,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="218.5,281.22,225.5,261.22,232.5,281.22,218.5,281.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M289.7,274.03 C309.51,290.39 330.6,307.81 347.76,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="285.16,279.35,274.19,261.22,294.07,268.56,285.16,279.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M225.5,115.44 C225.5,136.58 225.5,159.86 225.5,178.98 " fill="none" id="C_0002038594012979479050&lt;-C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="225.5,102.27,221.5,108.27,225.5,114.27,229.5,108.27,225.5,102.27" 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="138.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="238.5" y="145.0669">m_strategy</text>
+    <g id="link_C_0001469857696438841976_C_0001245533075819635385">
+      <path codeLine="31" d="M172.0826,293.9607 C148.0026,313.6407 134.3,324.82 112.45,342.68 " fill="none" id="C_0001469857696438841976-backto-C_0001245533075819635385" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="186.02,282.57,168.2857,289.3149,175.8795,298.6065,186.02,282.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001469857696438841976_C_0000000264986406899645">
+      <path codeLine="32" d="M241.5,300.57 C241.5,320.25 241.5,324.82 241.5,342.68 " fill="none" id="C_0001469857696438841976-backto-C_0000000264986406899645" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="241.5,282.57,235.5,300.57,247.5,300.57,241.5,282.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001469857696438841976_C_0000174795176193483089">
+      <path codeLine="33" d="M310.9174,293.9607 C334.9974,313.6407 348.7,324.82 370.55,342.68 " fill="none" id="C_0001469857696438841976-backto-C_0000174795176193483089" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="296.98,282.57,307.1205,298.6065,314.7143,289.3149,296.98,282.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002038594012979479050_C_0001469857696438841976">
+      <path codeLine="34" d="M241.5,125.89 C241.5,150.21 241.5,166.78 241.5,190.09 " fill="none" id="C_0002038594012979479050-backto-C_0001469857696438841976" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="241.5,113.89,237.5,119.89,241.5,125.89,245.5,119.89,241.5,113.89" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="244.5" y="149.7"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="65" x="254.5" y="156.477">m_strategy</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00023_class_mermaid.svg b/docs/test_cases/t00023_class_mermaid.svg
index 5205390e..48aa8304 100644
--- a/docs/test_cases/t00023_class_mermaid.svg
+++ b/docs/test_cases/t00023_class_mermaid.svg
@@ -1,59 +1,64 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 546.5 459" style="max-width: 546.5px; background-color: white;" width="546.5" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 573.171875 459" style="max-width: 573.172px; background-color: white;" width="573.171875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M135.67485549132948,322L126.35404624277457,326.1666666666667C117.03323699421965,330.3333333333333,98.39161849710983,338.6666666666667,89.07080924855491,347C79.75,355.3333333333333,79.75,363.6666666666667,79.75,367.8333333333333L79.75,372"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M273.25,322L273.25,326.1666666666667C273.25,330.3333333333333,273.25,338.6666666666667,273.25,347C273.25,355.3333333333333,273.25,363.6666666666667,273.25,367.8333333333333L273.25,372"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M410.8251445086705,322L420.14595375722547,326.1666666666667C429.46676300578036,330.3333333333333,448.10838150289015,338.6666666666667,457.4291907514451,347C466.75,355.3333333333333,466.75,363.6666666666667,466.75,367.8333333333333L466.75,372"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M273.25,131L273.25,136.66666666666666C273.25,142.33333333333334,273.25,153.66666666666666,273.25,165C273.25,176.33333333333334,273.25,187.66666666666666,273.25,193.33333333333334L273.25,199"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M126.13803837451695,329.0740422727302L119.14758406209747,332.0617018939418C112.15712974967796,335.04936151515346,98.17622112483899,341.02468075757673,91.1857668124195,348.1790070454551C84.1953125,355.3333333333333,84.1953125,363.6666666666667,84.1953125,367.8333333333333L84.1953125,372"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M286.5859375,340L286.5859375,341.1666666666667C286.5859375,342.3333333333333,286.5859375,344.6666666666667,286.5859375,350C286.5859375,355.3333333333333,286.5859375,363.6666666666667,286.5859375,367.8333333333333L286.5859375,372"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M447.03383662548305,329.0740422727302L454.02429093790255,332.0617018939418C461.014745250322,335.04936151515346,474.995653875161,341.02468075757673,481.98610818758056,348.1790070454551C488.9765625,355.3333333333333,488.9765625,363.6666666666667,488.9765625,367.8333333333333L488.9765625,372"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M286.5859375,149L286.5859375,151.66666666666666C286.5859375,154.33333333333334,286.5859375,159.66666666666666,286.5859375,168C286.5859375,176.33333333333334,286.5859375,187.66666666666666,286.5859375,193.33333333333334L286.5859375,199"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -83,7 +88,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(273.25, 165)" class="edgeLabel">
+        <g transform="translate(286.5859375, 165)" class="edgeLabel">
           <g transform="translate(-42.234375, -9)" class="label">
             <foreignObject height="18" width="84.46875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -96,11 +101,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L6">
+        <a transform="translate(286.5859375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L6">
           <g title="Strategy" id="classId-C_0001469857696438841976-0" class="node default clickable">
-            <rect height="123" width="281.8125" y="-61.5" x="-140.90625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="140.90625" x1="-140.90625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="140.90625" x1="-140.90625" class="divider"/>
+            <rect height="123" width="290.703125" y="-61.5" x="-145.3515625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="145.3515625" x1="-145.3515625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="145.3515625" x1="-145.3515625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -112,24 +117,24 @@
                   <span class="nodeLabel">Strategy</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.40625, 14)" height="18" width="266.8125">
+              <foreignObject transform="translate( -137.8515625, 14)" height="18" width="275.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Strategy() : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~Strategy() : : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -133.40625, 36)" height="18" width="128.5">
+              <foreignObject transform="translate( -137.8515625, 36)" height="18" width="137.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+algorithm() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+algorithm() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L12">
+        <a transform="translate(84.1953125, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L12">
           <g title="StrategyA" id="classId-C_0001245533075819635385-1" class="node default clickable">
-            <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
+            <rect height="79" width="152.390625" y="-39.5" x="-76.1953125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -141,19 +146,19 @@
                   <span class="nodeLabel">StrategyA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -64.25, 14)" height="18" width="128.5">
+              <foreignObject transform="translate( -68.6953125, 14)" height="18" width="137.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+algorithm() : void</span>
+                  <span class="nodeLabel">+algorithm() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L17">
+        <a transform="translate(286.5859375, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L17">
           <g title="StrategyB" id="classId-C_0000000264986406899645-2" class="node default clickable">
-            <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
+            <rect height="79" width="152.390625" y="-39.5" x="-76.1953125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -165,19 +170,19 @@
                   <span class="nodeLabel">StrategyB</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -64.25, 14)" height="18" width="128.5">
+              <foreignObject transform="translate( -68.6953125, 14)" height="18" width="137.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+algorithm() : void</span>
+                  <span class="nodeLabel">+algorithm() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L22">
+        <a transform="translate(488.9765625, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L22">
           <g title="StrategyC" id="classId-C_0000174795176193483089-3" class="node default clickable">
-            <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
+            <rect height="79" width="152.390625" y="-39.5" x="-76.1953125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -189,19 +194,19 @@
                   <span class="nodeLabel">StrategyC</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -64.25, 14)" height="18" width="128.5">
+              <foreignObject transform="translate( -68.6953125, 14)" height="18" width="137.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+algorithm() : void</span>
+                  <span class="nodeLabel">+algorithm() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00023/t00023.cc#L27">
+        <a transform="translate(286.5859375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L27">
           <g title="Context" id="classId-C_0002038594012979479050-4" class="node default clickable">
-            <rect height="123" width="300.046875" y="-61.5" x="-150.0234375" class="outer title-state"/>
-            <line y2="-31.5" y1="-31.5" x2="150.0234375" x1="-150.0234375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="150.0234375" x1="-150.0234375" class="divider"/>
+            <rect height="123" width="308.9375" y="-61.5" x="-154.46875" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="154.46875" x1="-154.46875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="154.46875" x1="-154.46875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -213,19 +218,19 @@
                   <span class="nodeLabel">Context</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -142.5234375, -20)" height="18" width="281.9375">
+              <foreignObject transform="translate( -146.96875, -20)" height="18" width="281.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_strategy : std::unique_ptr&lt;Strategy&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -142.5234375, 14)" height="18" width="285.046875">
+              <foreignObject transform="translate( -146.96875, 14)" height="18" width="293.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Context(std::unique_ptr strategy) : void</span>
+                  <span class="nodeLabel">+Context(std::unique_ptr strategy) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -142.5234375, 36)" height="18" width="100.9375">
+              <foreignObject transform="translate( -146.96875, 36)" height="18" width="109.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+apply() : void</span>
+                  <span class="nodeLabel">+apply() : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md
index ab0e7efc..adc1e13a 100644
--- a/docs/test_cases/t00024.md
+++ b/docs/test_cases/t00024.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00024.cc
+File `tests/t00024/t00024.cc`
 ```cpp
 #include <memory>
 
@@ -83,6 +83,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -108,6 +109,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -133,6 +135,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -188,6 +191,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -213,6 +217,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -268,6 +273,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -293,6 +299,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -361,6 +368,7 @@ private:
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -391,6 +399,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -416,6 +425,7 @@ private:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index f9b7dbad..27d5b4bf 100644
--- a/docs/test_cases/t00024_class.svg
+++ b/docs/test_cases/t00024_class.svg
@@ -1,134 +1,144 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="297px" preserveAspectRatio="none" style="width:542px;height:297px;" version="1.1" viewBox="0 0 542 297" width="542px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="326px" preserveAspectRatio="none" style="width:577px;height:326px;background:#FFFFFF;" version="1.1" viewBox="0 0 577 326" width="577px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fdo5hl5rye18e" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdo5hl5rye18e)" height="94.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="136.5" y="8"/>
-      <ellipse cx="181.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M181.8594,19.3438 L180.7031,24.4219 L183.0313,24.4219 L181.8594,19.3438 Z M180.375,17.1094 L183.3594,17.1094 L186.7188,29.5 L184.2656,29.5 L183.5,26.4375 L180.2188,26.4375 L179.4688,29.5 L177.0313,29.5 L180.375,17.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="202.25" y="28.1543">Target</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <g id="elem_C_0001116408959993110019">
+        <rect codeLine="2" fill="#F1F1F1" height="112.6998" id="C_0001116408959993110019" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="148" x="129" y="7"/>
+        <ellipse cx="177.75" cy="23" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M179.2813,24.9375 L179.6094,25.7344 L179.3281,25.7344 C178.875,25.7344 178.75,25.7656 178.5781,25.875 C178.2969,26.0156 178.125,26.3125 178.125,26.6094 C178.125,26.9063 178.2656,27.1563 178.5,27.3281 C178.6719,27.4531 178.9063,27.5 179.3281,27.5 L181.6875,27.5 C182.0469,27.5 182.2969,27.4688 182.4375,27.375 C182.7031,27.2344 182.875,26.9219 182.875,26.6094 C182.875,26.3438 182.7344,26.0781 182.5,25.9063 C182.3125,25.7813 182.1563,25.75 181.7031,25.7344 L178.3125,17.9063 L174.5938,17.9063 C174.1406,17.9063 174,17.9219 173.8281,18.0313 C173.5625,18.2031 173.3906,18.4844 173.3906,18.7813 C173.3906,19.0625 173.5313,19.3281 173.7813,19.5 C173.9531,19.625 174.1406,19.6563 174.5938,19.6563 L175.5625,19.6563 L172.9844,25.7344 C172.2344,25.7344 171.8281,26.0313 171.8281,26.6094 C171.8281,27.2188 172.2188,27.5 173.0156,27.5 L175.2813,27.5 C175.6406,27.5 175.8906,27.4688 176.0313,27.375 C176.2969,27.2188 176.4688,26.9219 176.4688,26.6094 C176.4688,26.3438 176.3281,26.0781 176.0938,25.9063 C175.9063,25.7656 175.75,25.7344 175.2813,25.7344 L174.9844,25.7344 L175.3281,24.9375 L179.2813,24.9375 Z M178.5156,23.1875 L176.0625,23.1875 L177.2969,20.3125 L178.5156,23.1875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="42" x="198.25" y="28.95">Target</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="130" x2="276" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="135" y="48.95"/>
+          <ellipse cx="140" cy="53.95" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="122" x="149" y="58.3999">~Target() = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="130" x2="276" y1="65.8999" y2="65.8999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="135" y="75.8499"/>
+          <ellipse cx="140" cy="80.8499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="149" y="85.2999">m1() = 0 : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="135" y="94.7498"/>
+          <ellipse cx="140" cy="99.7498" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="149" y="104.1998">m2() = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="130" x2="276" y1="111.6998" y2="111.6998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="46"/>
-      <ellipse cx="147.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <g id="elem_C_0000669517069151826610">
+        <rect codeLine="10" fill="#F1F1F1" height="81.5999" id="C_0000669517069151826610" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="7" y="217.5"/>
+        <ellipse cx="27.4" cy="233.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M22.4,234.6562 C22.4,237.1562 24.5406,238.9687 27.4625,238.9687 C28.6969,238.9687 29.8688,238.6719 30.6188,238.1562 C31.2281,237.7344 31.5563,237.3125 31.5563,236.9062 C31.5563,236.4375 31.1344,236.0312 30.6344,236.0312 C30.4,236.0312 30.1813,236.1094 29.9781,236.3125 C29.5406,236.75 29.5406,236.75 29.3688,236.8437 C28.9156,237.0781 28.275,237.2187 27.5094,237.2187 C25.5094,237.2187 24.2281,236.2031 24.2281,234.625 L24.2281,233.5781 C24.2281,231.875 25.4469,230.6719 27.15,230.6719 C27.7281,230.6719 28.3063,230.8125 28.775,231.0625 C29.2438,231.3281 29.4156,231.5156 29.4781,231.875 C29.6031,232.5469 29.8531,232.7969 30.3844,232.7969 C30.6656,232.7969 30.9469,232.6562 31.1344,232.4375 C31.2594,232.2656 31.3063,232.0937 31.3063,231.6562 L31.3063,230.2969 C31.3063,229.875 31.2906,229.7344 31.1656,229.5625 C30.9938,229.3125 30.7125,229.1562 30.3844,229.1562 C30.0719,229.1562 29.8688,229.2656 29.65,229.5312 C28.4781,229.0312 28.0406,228.9219 27.0875,228.9219 C24.4156,228.9219 22.4,230.9375 22.4,233.5625 L22.4,234.6562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="42.6" y="238.106">Target1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="249.5" y2="249.5"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="258.4"/>
+          <ellipse cx="18" cy="263.4" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="266.5059">m1() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="275.1999"/>
+          <ellipse cx="18" cy="280.1999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="283.3059">m2() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="291.0999" y2="291.0999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="156.5" y="54.2104">~Target() = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <g id="elem_C_0001210513233906695933">
+        <rect codeLine="16" fill="#F1F1F1" height="81.5999" id="C_0001210513233906695933" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="136" y="217.5"/>
+        <ellipse cx="156.4" cy="233.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M151.4,234.6562 C151.4,237.1562 153.5406,238.9687 156.4625,238.9687 C157.6969,238.9687 158.8688,238.6719 159.6188,238.1562 C160.2281,237.7344 160.5563,237.3125 160.5563,236.9062 C160.5563,236.4375 160.1344,236.0312 159.6344,236.0312 C159.4,236.0312 159.1813,236.1094 158.9781,236.3125 C158.5406,236.75 158.5406,236.75 158.3688,236.8437 C157.9156,237.0781 157.275,237.2187 156.5094,237.2187 C154.5094,237.2187 153.2281,236.2031 153.2281,234.625 L153.2281,233.5781 C153.2281,231.875 154.4469,230.6719 156.15,230.6719 C156.7281,230.6719 157.3063,230.8125 157.775,231.0625 C158.2438,231.3281 158.4156,231.5156 158.4781,231.875 C158.6031,232.5469 158.8531,232.7969 159.3844,232.7969 C159.6656,232.7969 159.9469,232.6562 160.1344,232.4375 C160.2594,232.2656 160.3063,232.0937 160.3063,231.6562 L160.3063,230.2969 C160.3063,229.875 160.2906,229.7344 160.1656,229.5625 C159.9938,229.3125 159.7125,229.1562 159.3844,229.1562 C159.0719,229.1562 158.8688,229.2656 158.65,229.5312 C157.4781,229.0312 157.0406,228.9219 156.0875,228.9219 C153.4156,228.9219 151.4,230.9375 151.4,233.5625 L151.4,234.6562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="171.6" y="238.106">Target2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="229" y1="249.5" y2="249.5"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="258.4"/>
+          <ellipse cx="147" cy="263.4" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="266.5059">m1() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="275.1999"/>
+          <ellipse cx="147" cy="280.1999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="283.3059">m2() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="229" y1="291.0999" y2="291.0999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="137.5" x2="275.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="66.8047"/>
-      <ellipse cx="147.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <g id="elem_C_0000594707401639991215">
+        <rect codeLine="22" fill="#F1F1F1" height="123.1997" id="C_0000594707401639991215" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="305" x="265.5" y="196.7"/>
+        <ellipse cx="395.75" cy="212.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M390.75,213.8563 C390.75,216.3563 392.8906,218.1688 395.8125,218.1688 C397.0469,218.1688 398.2188,217.8719 398.9688,217.3563 C399.5781,216.9344 399.9063,216.5125 399.9063,216.1063 C399.9063,215.6375 399.4844,215.2313 398.9844,215.2313 C398.75,215.2313 398.5313,215.3094 398.3281,215.5125 C397.8906,215.95 397.8906,215.95 397.7188,216.0438 C397.2656,216.2781 396.625,216.4188 395.8594,216.4188 C393.8594,216.4188 392.5781,215.4031 392.5781,213.825 L392.5781,212.7781 C392.5781,211.075 393.7969,209.8719 395.5,209.8719 C396.0781,209.8719 396.6563,210.0125 397.125,210.2625 C397.5938,210.5281 397.7656,210.7156 397.8281,211.075 C397.9531,211.7469 398.2031,211.9969 398.7344,211.9969 C399.0156,211.9969 399.2969,211.8563 399.4844,211.6375 C399.6094,211.4656 399.6563,211.2938 399.6563,210.8563 L399.6563,209.4969 C399.6563,209.075 399.6406,208.9344 399.5156,208.7625 C399.3438,208.5125 399.0625,208.3563 398.7344,208.3563 C398.4219,208.3563 398.2188,208.4656 398,208.7313 C396.8281,208.2313 396.3906,208.1219 395.4375,208.1219 C392.7656,208.1219 390.75,210.1375 390.75,212.7625 L390.75,213.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="416.25" y="217.306">Proxy</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="266.5" x2="569.5" y1="228.7" y2="228.7"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="271.5" y="237.6"/>
+          <ellipse cx="276.5" cy="242.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="279" x="285.5" y="245.7059">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="266.5" x2="569.5" y1="253.4999" y2="253.4999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="271.5" y="262.3999"/>
+          <ellipse cx="276.5" cy="267.3999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="285.5" y="270.5059">m1() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="271.5" y="279.1998"/>
+          <ellipse cx="276.5" cy="284.1998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="285.5" y="287.3058">m2() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="266.5" x2="569.5" y1="295.0998" y2="295.0998"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="271.5" y="303.9997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="273.5" y="305.9997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="223" x="285.5" y="312.1057">m_target : std::shared_ptr&lt;Target&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="75.0151">m1() = 0 : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="79.6094"/>
-      <ellipse cx="147.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="87.8198">m2() = 0 : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="94.4141" y2="94.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdo5hl5rye18e)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="195.5"/>
-      <ellipse cx="23.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M26.6688,217.1406 Q26.0906,217.4375 25.45,217.5781 Q24.8094,217.7344 24.1063,217.7344 Q21.6063,217.7344 20.2781,216.0938 Q18.9656,214.4375 18.9656,211.3125 Q18.9656,208.1875 20.2781,206.5313 Q21.6063,204.875 24.1063,204.875 Q24.8094,204.875 25.45,205.0313 Q26.1063,205.1875 26.6688,205.4844 L26.6688,208.2031 Q26.0438,207.625 25.45,207.3594 Q24.8563,207.0781 24.2313,207.0781 Q22.8875,207.0781 22.2,208.1563 Q21.5125,209.2188 21.5125,211.3125 Q21.5125,213.4063 22.2,214.4844 Q22.8875,215.5469 24.2313,215.5469 Q24.8563,215.5469 25.45,215.2813 Q26.0438,215 26.6688,214.4219 L26.6688,217.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="215.6543">Target1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="227.5" y2="227.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="233.5"/>
-      <ellipse cx="17" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="241.7104">m1() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="246.3047"/>
-      <ellipse cx="17" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="254.5151">m2() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="261.1094" y2="261.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdo5hl5rye18e)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="195.5"/>
-      <ellipse cx="145.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M148.6688,217.1406 Q148.0906,217.4375 147.45,217.5781 Q146.8094,217.7344 146.1063,217.7344 Q143.6063,217.7344 142.2781,216.0938 Q140.9656,214.4375 140.9656,211.3125 Q140.9656,208.1875 142.2781,206.5313 Q143.6063,204.875 146.1063,204.875 Q146.8094,204.875 147.45,205.0313 Q148.1063,205.1875 148.6688,205.4844 L148.6688,208.2031 Q148.0438,207.625 147.45,207.3594 Q146.8563,207.0781 146.2313,207.0781 Q144.8875,207.0781 144.2,208.1563 Q143.5125,209.2188 143.5125,211.3125 Q143.5125,213.4063 144.2,214.4844 Q144.8875,215.5469 146.2313,215.5469 Q146.8563,215.5469 147.45,215.2813 Q148.0438,215 148.6688,214.4219 L148.6688,217.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="215.6543">Target2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="227.5" y2="227.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="233.5"/>
-      <ellipse cx="139" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="241.7104">m1() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="246.3047"/>
-      <ellipse cx="139" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="254.5151">m2() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="261.1094" y2="261.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdo5hl5rye18e)" height="107.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="179"/>
-      <ellipse cx="369.75" cy="195" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M372.7188,200.6406 Q372.1406,200.9375 371.5,201.0781 Q370.8594,201.2344 370.1563,201.2344 Q367.6563,201.2344 366.3281,199.5938 Q365.0156,197.9375 365.0156,194.8125 Q365.0156,191.6875 366.3281,190.0313 Q367.6563,188.375 370.1563,188.375 Q370.8594,188.375 371.5,188.5313 Q372.1563,188.6875 372.7188,188.9844 L372.7188,191.7031 Q372.0938,191.125 371.5,190.8594 Q370.9063,190.5781 370.2813,190.5781 Q368.9375,190.5781 368.25,191.6563 Q367.5625,192.7188 367.5625,194.8125 Q367.5625,196.9063 368.25,197.9844 Q368.9375,199.0469 370.2813,199.0469 Q370.9063,199.0469 371.5,198.7813 Q372.0938,198.5 372.7188,197.9219 L372.7188,200.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="199.1543">Proxy</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="211" y2="211"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="217"/>
-      <ellipse cx="261" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="255" x="270" y="225.2104">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="251" x2="530" y1="231.8047" y2="231.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="237.8047"/>
-      <ellipse cx="261" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="246.0151">m1() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="250.6094"/>
-      <ellipse cx="261" cy="255.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="258.8198">m2() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="265.4141" y2="265.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="271.4141"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="273.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="279.6245">m_target : std::shared_ptr&lt;Target&gt;</text>
-    </a>
-    <path d="M151.91,117.02 C128.52,143.17 102,172.81 81.81,195.39 " fill="none" id="C_0001116408959993110019&lt;-C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="146.7,112.35,165.25,102.11,157.13,121.68,146.7,112.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M193.37,121.82 C188.4,146.74 182.93,174.19 178.7,195.39 " fill="none" id="C_0001116408959993110019&lt;-C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="186.53,120.36,197.3,102.11,200.26,123.09,186.53,120.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M335.33,178.87 C311.02,155.69 282.6,128.58 258.65,105.74 " fill="none" id="C_0000594707401639991215-&gt;C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="254.84,102.11,258.5789,111.2216,258.4532,105.5661,264.1087,105.4404,254.84,102.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="301.5" y="138.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="59" x="311.5" y="145.0669">m_target</text>
-    <path d="M250.78,118.21 C259.47,128.93 268.89,139.62 278.5,149 C289.13,159.38 301.11,169.53 313.19,178.96 " fill="none" id="C_0001116408959993110019&lt;-C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="244.99,122.17,238.2,102.1,256.03,113.56,244.99,122.17" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001116408959993110019_C_0000669517069151826610">
+      <path codeLine="30" d="M148.8977,134.4061 C124.9177,165.4561 106.63,189.14 84.94,217.24 " fill="none" id="C_0001116408959993110019-backto-C_0000669517069151826610" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="159.9,120.16,144.149,130.7386,153.6464,138.0735,159.9,120.16" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001116408959993110019_C_0001210513233906695933">
+      <path codeLine="31" d="M195.3633,138.064 C192.1433,169.114 190.06,189.14 187.15,217.24 " fill="none" id="C_0001116408959993110019-backto-C_0001210513233906695933" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="197.22,120.16,189.3953,137.4451,201.3313,138.6829,197.22,120.16" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000594707401639991215_C_0001116408959993110019">
+      <path codeLine="32" d="M364.85,196.2 C350.21,180.49 333.96,163.99 318,149.7 C305.31,138.34 295.9527,130.5862 282.0527,119.9962 " fill="none" id="C_0000594707401639991215-to-C_0001116408959993110019" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="277.28,116.36,282.0149,124.996,281.2572,119.3901,286.8631,118.6325,277.28,116.36" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="338" y="156"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="51" x="348" y="162.777">m_target</text>
+    </g>
+    <g id="link_C_0001116408959993110019_C_0000594707401639991215">
+      <path codeLine="33" d="M276.1517,132.3734 C292.6217,147.5634 297.31,151.74 314,166.7 C324.79,176.37 336.29,186.53 347.55,196.41 " fill="none" id="C_0001116408959993110019-backto-C_0000594707401639991215" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="262.92,120.17,272.0839,136.7839,280.2195,127.9628,262.92,120.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00024_class_mermaid.svg b/docs/test_cases/t00024_class_mermaid.svg
index c9fa5109..7e9583fb 100644
--- a/docs/test_cases/t00024_class_mermaid.svg
+++ b/docs/test_cases/t00024_class_mermaid.svg
@@ -1,59 +1,64 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 586.515625 374" style="max-width: 586.516px; background-color: white;" width="586.515625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 613.1875 374" style="max-width: 613.188px; background-color: white;" width="613.1875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M151.9765625,124.39027845627749L136.30729166666666,134.8252320468979C120.63802083333333,145.26018563751833,89.29947916666667,166.13009281875915,73.63020833333333,185.8983797427129C57.9609375,205.66666666666666,57.9609375,224.33333333333334,57.9609375,233.66666666666666L57.9609375,243"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M211.07530076291079,153L210.543219385759,158.66666666666666C210.0111380086072,164.33333333333334,208.94697525430357,175.66666666666666,208.4148938771518,190.66666666666666C207.8828125,205.66666666666666,207.8828125,224.33333333333334,207.8828125,233.66666666666666L207.8828125,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M461.6397447183099,221L463.08259976525824,215.33333333333334C464.5254548122066,209.66666666666666,467.4111649061033,198.33333333333334,437.76938453638496,179.55125764750792C408.1276041666667,160.7691819616825,345.9583333333333,134.538363923365,314.8736979166667,121.42295490420626L283.7890625,108.30754588504752"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M283.7890625,140.16093366093367L292.4127604166667,147.96744471744472C301.0364583333333,155.77395577395578,318.2838541666667,171.3869778869779,332.6353249706573,184.8601556101556C346.9867957746479,198.33333333333334,358.4423415492958,209.66666666666666,364.17011443661977,215.33333333333334L369.8978873239437,221"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M145.64356762080973,134.48745308187347L131.77068135067478,143.23954423489457C117.89779508053982,151.99163538791564,90.15202254026991,169.49581769395783,76.27913627013496,187.58124218031222C62.40625,205.66666666666666,62.40625,224.33333333333334,62.40625,233.66666666666666L62.40625,243"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M222.7284991519119,170.92117153213803L222.47687429325993,173.6009762767817C222.22524943460795,176.28078102142535,221.721999717304,181.64039051071268,221.47037485865198,193.65352858868968C221.21875,205.66666666666666,221.21875,224.33333333333334,221.21875,233.66666666666666L221.21875,243"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M483.8663072183099,221L485.30916226525824,215.33333333333334C486.7520173122066,209.66666666666666,489.6377274061033,198.33333333333334,460.18110130043965,180.07295939628645C430.724475194776,161.81258545923959,368.92551288955195,136.62517091847914,338.02603173693996,124.03146364809895L307.1265505843279,111.43775637771873"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M315.1349580451977,153.69847376965285L321.4978817043314,159.24872814137737C327.86080536346515,164.7989825131019,340.5866526817326,175.89949125655096,352.9138760278772,187.11641229494217C365.24109937402187,198.33333333333334,377.1696987480438,209.66666666666666,383.13399843505476,215.33333333333334L389.0982981220657,221"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -74,7 +79,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(470.296875, 187)" class="edgeLabel">
+        <g transform="translate(492.5234375, 187)" class="edgeLabel">
           <g transform="translate(-34.234375, -9)" class="label">
             <foreignObject height="18" width="68.46875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -96,11 +101,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L6">
+        <a transform="translate(231.21875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L6">
           <g title="Target" id="classId-C_0001116408959993110019-0" class="node default clickable">
-            <rect height="145" width="131.8125" y="-72.5" x="-65.90625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="65.90625" x1="-65.90625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="65.90625" x1="-65.90625" class="divider"/>
+            <rect height="145" width="140.703125" y="-72.5" x="-70.3515625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="70.3515625" x1="-70.3515625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="70.3515625" x1="-70.3515625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -65)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -112,29 +117,29 @@
                   <span class="nodeLabel">Target</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -58.40625, 3)" height="18" width="116.8125">
+              <foreignObject transform="translate( -62.8515625, 3)" height="18" width="125.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+~Target() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+~Target() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -58.40625, 25)" height="18" width="84.921875">
+              <foreignObject transform="translate( -62.8515625, 25)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m1() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+m1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -58.40625, 47)" height="18" width="84.921875">
+              <foreignObject transform="translate( -62.8515625, 47)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m2() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+m2() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L14">
+        <a transform="translate(62.40625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L14">
           <g title="Target1" id="classId-C_0000669517069151826610-1" class="node default clickable">
-            <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
+            <rect height="101" width="108.8125" y="-50.5" x="-54.40625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="54.40625" x1="-54.40625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="54.40625" x1="-54.40625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -146,24 +151,24 @@
                   <span class="nodeLabel">Target1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.4609375, 3)" height="18" width="84.921875">
+              <foreignObject transform="translate( -46.90625, 3)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : void</span>
+                  <span class="nodeLabel">+m1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.4609375, 25)" height="18" width="84.921875">
+              <foreignObject transform="translate( -46.90625, 25)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : void</span>
+                  <span class="nodeLabel">+m2() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L20">
+        <a transform="translate(221.21875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L20">
           <g title="Target2" id="classId-C_0001210513233906695933-2" class="node default clickable">
-            <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
+            <rect height="101" width="108.8125" y="-50.5" x="-54.40625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="54.40625" x1="-54.40625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="54.40625" x1="-54.40625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -175,24 +180,24 @@
                   <span class="nodeLabel">Target2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.4609375, 3)" height="18" width="84.921875">
+              <foreignObject transform="translate( -46.90625, 3)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : void</span>
+                  <span class="nodeLabel">+m1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.4609375, 25)" height="18" width="84.921875">
+              <foreignObject transform="translate( -46.90625, 25)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : void</span>
+                  <span class="nodeLabel">+m2() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00024/t00024.cc#L26">
+        <a transform="translate(465.40625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L26">
           <g title="Proxy" id="classId-C_0000594707401639991215-3" class="node default clickable">
-            <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
+            <rect height="145" width="279.5625" y="-72.5" x="-139.78125" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="139.78125" x1="-139.78125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.78125" x1="-139.78125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -204,24 +209,24 @@
                   <span class="nodeLabel">Proxy</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.8359375, -31)" height="18" width="251.6875">
+              <foreignObject transform="translate( -132.28125, -31)" height="18" width="251.6875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_target : std::shared_ptr&lt;Target&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.8359375, 3)" height="18" width="255.671875">
+              <foreignObject transform="translate( -132.28125, 3)" height="18" width="264.5625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Proxy(std::shared_ptr target) : void</span>
+                  <span class="nodeLabel">+Proxy(std::shared_ptr target) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.8359375, 25)" height="18" width="84.921875">
+              <foreignObject transform="translate( -132.28125, 25)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : void</span>
+                  <span class="nodeLabel">+m1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.8359375, 47)" height="18" width="84.921875">
+              <foreignObject transform="translate( -132.28125, 47)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : void</span>
+                  <span class="nodeLabel">+m2() : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md
index c3e29106..473ac3d2 100644
--- a/docs/test_cases/t00025.md
+++ b/docs/test_cases/t00025.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00025.cc
+File `tests/t00025/t00025.cc`
 ```cpp
 #include <memory>
 
@@ -81,6 +81,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -106,6 +107,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -154,6 +156,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -179,6 +182,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -240,6 +244,7 @@ public:
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -270,6 +275,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -295,6 +301,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index 046ea65c..b6270f3d 100644
--- a/docs/test_cases/t00025_class.svg
+++ b/docs/test_cases/t00025_class.svg
@@ -1,154 +1,172 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="386px" preserveAspectRatio="none" style="width:512px;height:386px;" version="1.1" viewBox="0 0 512 386" width="512px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="404px" preserveAspectRatio="none" style="width:544px;height:404px;background:#FFFFFF;" version="1.1" viewBox="0 0 544 404" width="544px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnbotju54rsdf" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnbotju54rsdf)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="284.5"/>
-      <ellipse cx="23.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M26.6688,306.1406 Q26.0906,306.4375 25.45,306.5781 Q24.8094,306.7344 24.1063,306.7344 Q21.6063,306.7344 20.2781,305.0938 Q18.9656,303.4375 18.9656,300.3125 Q18.9656,297.1875 20.2781,295.5313 Q21.6063,293.875 24.1063,293.875 Q24.8094,293.875 25.45,294.0313 Q26.1063,294.1875 26.6688,294.4844 L26.6688,297.2031 Q26.0438,296.625 25.45,296.3594 Q24.8563,296.0781 24.2313,296.0781 Q22.8875,296.0781 22.2,297.1563 Q21.5125,298.2188 21.5125,300.3125 Q21.5125,302.4063 22.2,303.4844 Q22.8875,304.5469 24.2313,304.5469 Q24.8563,304.5469 25.45,304.2813 Q26.0438,304 26.6688,303.4219 L26.6688,306.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="304.6543">Target1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="316.5" y2="316.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <g id="elem_C_0001573849034571194138">
+        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0001573849034571194138" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="7" y="295.4"/>
+        <ellipse cx="27.4" cy="311.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M22.4,312.5563 C22.4,315.0563 24.5406,316.8688 27.4625,316.8688 C28.6969,316.8688 29.8688,316.5719 30.6188,316.0563 C31.2281,315.6344 31.5563,315.2125 31.5563,314.8063 C31.5563,314.3375 31.1344,313.9313 30.6344,313.9313 C30.4,313.9313 30.1813,314.0094 29.9781,314.2125 C29.5406,314.65 29.5406,314.65 29.3688,314.7438 C28.9156,314.9781 28.275,315.1188 27.5094,315.1188 C25.5094,315.1188 24.2281,314.1031 24.2281,312.525 L24.2281,311.4781 C24.2281,309.775 25.4469,308.5719 27.15,308.5719 C27.7281,308.5719 28.3063,308.7125 28.775,308.9625 C29.2438,309.2281 29.4156,309.4156 29.4781,309.775 C29.6031,310.4469 29.8531,310.6969 30.3844,310.6969 C30.6656,310.6969 30.9469,310.5563 31.1344,310.3375 C31.2594,310.1656 31.3063,309.9938 31.3063,309.5563 L31.3063,308.1969 C31.3063,307.775 31.2906,307.6344 31.1656,307.4625 C30.9938,307.2125 30.7125,307.0563 30.3844,307.0563 C30.0719,307.0563 29.8688,307.1656 29.65,307.4313 C28.4781,306.9313 28.0406,306.8219 27.0875,306.8219 C24.4156,306.8219 22.4,308.8375 22.4,311.4625 L22.4,312.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="42.6" y="316.006">Target1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="327.4" y2="327.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="336.3"/>
+          <ellipse cx="18" cy="341.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="344.4059">m1() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="353.0999"/>
+          <ellipse cx="18" cy="358.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="361.2059">m2() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="368.9999" y2="368.9999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.5"/>
-      <ellipse cx="17" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <g id="elem_C_0000751896409461834669">
+        <rect codeLine="8" fill="#F1F1F1" height="81.5999" id="C_0000751896409461834669" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="443" y="295.4"/>
+        <ellipse cx="463.4" cy="311.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M458.4,312.5563 C458.4,315.0563 460.5406,316.8688 463.4625,316.8688 C464.6969,316.8688 465.8688,316.5719 466.6188,316.0563 C467.2281,315.6344 467.5563,315.2125 467.5563,314.8063 C467.5563,314.3375 467.1344,313.9313 466.6344,313.9313 C466.4,313.9313 466.1813,314.0094 465.9781,314.2125 C465.5406,314.65 465.5406,314.65 465.3688,314.7438 C464.9156,314.9781 464.275,315.1188 463.5094,315.1188 C461.5094,315.1188 460.2281,314.1031 460.2281,312.525 L460.2281,311.4781 C460.2281,309.775 461.4469,308.5719 463.15,308.5719 C463.7281,308.5719 464.3063,308.7125 464.775,308.9625 C465.2438,309.2281 465.4156,309.4156 465.4781,309.775 C465.6031,310.4469 465.8531,310.6969 466.3844,310.6969 C466.6656,310.6969 466.9469,310.5563 467.1344,310.3375 C467.2594,310.1656 467.3063,309.9938 467.3063,309.5563 L467.3063,308.1969 C467.3063,307.775 467.2906,307.6344 467.1656,307.4625 C466.9938,307.2125 466.7125,307.0563 466.3844,307.0563 C466.0719,307.0563 465.8688,307.1656 465.65,307.4313 C464.4781,306.9313 464.0406,306.8219 463.0875,306.8219 C460.4156,306.8219 458.4,308.8375 458.4,311.4625 L458.4,312.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="478.6" y="316.006">Target2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="444" x2="536" y1="327.4" y2="327.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="449" y="336.3"/>
+          <ellipse cx="454" cy="341.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="463" y="344.4059">m1() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="449" y="353.0999"/>
+          <ellipse cx="454" cy="358.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="463" y="361.2059">m2() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="444" x2="536" y1="368.9999" y2="368.9999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="330.7104">m1() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <g id="elem_C_0001483353300536405088">
+        <rect codeLine="14" fill="#F1F1F1" height="123.1997" id="C_0001483353300536405088" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="272" x="136" y="274.6"/>
+        <ellipse cx="244.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M239.25,291.7563 C239.25,294.2563 241.3906,296.0688 244.3125,296.0688 C245.5469,296.0688 246.7188,295.7719 247.4688,295.2563 C248.0781,294.8344 248.4063,294.4125 248.4063,294.0063 C248.4063,293.5375 247.9844,293.1313 247.4844,293.1313 C247.25,293.1313 247.0313,293.2094 246.8281,293.4125 C246.3906,293.85 246.3906,293.85 246.2188,293.9438 C245.7656,294.1781 245.125,294.3188 244.3594,294.3188 C242.3594,294.3188 241.0781,293.3031 241.0781,291.725 L241.0781,290.6781 C241.0781,288.975 242.2969,287.7719 244,287.7719 C244.5781,287.7719 245.1563,287.9125 245.625,288.1625 C246.0938,288.4281 246.2656,288.6156 246.3281,288.975 C246.4531,289.6469 246.7031,289.8969 247.2344,289.8969 C247.5156,289.8969 247.7969,289.7563 247.9844,289.5375 C248.1094,289.3656 248.1563,289.1938 248.1563,288.7563 L248.1563,287.3969 C248.1563,286.975 248.1406,286.8344 248.0156,286.6625 C247.8438,286.4125 247.5625,286.2563 247.2344,286.2563 C246.9219,286.2563 246.7188,286.3656 246.5,286.6313 C245.3281,286.1313 244.8906,286.0219 243.9375,286.0219 C241.2656,286.0219 239.25,288.0375 239.25,290.6625 L239.25,291.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="264.75" y="295.206">Proxy</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="402" y="271.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="403" y="285.8001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="407" y1="306.6" y2="306.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="315.5"/>
+          <ellipse cx="147" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="246" x="156" y="323.6059">Proxy(std::shared_ptr&lt;T&gt; target) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="137" x2="407" y1="331.3999" y2="331.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="340.2999"/>
+          <ellipse cx="147" cy="345.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="348.4059">m1() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="357.0998"/>
+          <ellipse cx="147" cy="362.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="365.2058">m2() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="407" y1="372.9998" y2="372.9998"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="381.8997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="144" y="383.8997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="190" x="156" y="390.0057">m_target : std::shared_ptr&lt;T&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.3047"/>
-      <ellipse cx="17" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <g id="elem_C_0001644966842838139424">
+        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0001644966842838139424" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="141" y="165.6"/>
+        <ellipse cx="156" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M151,182.7563 C151,185.2563 153.1406,187.0688 156.0625,187.0688 C157.2969,187.0688 158.4688,186.7719 159.2188,186.2563 C159.8281,185.8344 160.1563,185.4125 160.1563,185.0063 C160.1563,184.5375 159.7344,184.1313 159.2344,184.1313 C159,184.1313 158.7813,184.2094 158.5781,184.4125 C158.1406,184.85 158.1406,184.85 157.9688,184.9438 C157.5156,185.1781 156.875,185.3188 156.1094,185.3188 C154.1094,185.3188 152.8281,184.3031 152.8281,182.725 L152.8281,181.6781 C152.8281,179.975 154.0469,178.7719 155.75,178.7719 C156.3281,178.7719 156.9063,178.9125 157.375,179.1625 C157.8438,179.4281 158.0156,179.6156 158.0781,179.975 C158.2031,180.6469 158.4531,180.8969 158.9844,180.8969 C159.2656,180.8969 159.5469,180.7563 159.7344,180.5375 C159.8594,180.3656 159.9063,180.1938 159.9063,179.7563 L159.9063,178.3969 C159.9063,177.975 159.8906,177.8344 159.7656,177.6625 C159.5938,177.4125 159.3125,177.2563 158.9844,177.2563 C158.6719,177.2563 158.4688,177.3656 158.25,177.6313 C157.0781,177.1313 156.6406,177.0219 155.6875,177.0219 C153.0156,177.0219 151,179.0375 151,181.6625 L151,182.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="170" y="186.206">Proxy</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="44" x="214" y="162.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="215" y="176.8001">Target1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="142" x2="254" y1="197.6" y2="197.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="142" x2="254" y1="205.6" y2="205.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="343.5151">m2() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <g id="elem_C_0001190103100236298763">
+        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0001190103100236298763" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="290" y="165.6"/>
+        <ellipse cx="305" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M300,182.7563 C300,185.2563 302.1406,187.0688 305.0625,187.0688 C306.2969,187.0688 307.4688,186.7719 308.2188,186.2563 C308.8281,185.8344 309.1563,185.4125 309.1563,185.0063 C309.1563,184.5375 308.7344,184.1313 308.2344,184.1313 C308,184.1313 307.7813,184.2094 307.5781,184.4125 C307.1406,184.85 307.1406,184.85 306.9688,184.9438 C306.5156,185.1781 305.875,185.3188 305.1094,185.3188 C303.1094,185.3188 301.8281,184.3031 301.8281,182.725 L301.8281,181.6781 C301.8281,179.975 303.0469,178.7719 304.75,178.7719 C305.3281,178.7719 305.9063,178.9125 306.375,179.1625 C306.8438,179.4281 307.0156,179.6156 307.0781,179.975 C307.2031,180.6469 307.4531,180.8969 307.9844,180.8969 C308.2656,180.8969 308.5469,180.7563 308.7344,180.5375 C308.8594,180.3656 308.9063,180.1938 308.9063,179.7563 L308.9063,178.3969 C308.9063,177.975 308.8906,177.8344 308.7656,177.6625 C308.5938,177.4125 308.3125,177.2563 307.9844,177.2563 C307.6719,177.2563 307.4688,177.3656 307.25,177.6313 C306.0781,177.1313 305.6406,177.0219 304.6875,177.0219 C302.0156,177.0219 300,179.0375 300,181.6625 L300,182.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="319" y="186.206">Proxy</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="44" x="363" y="162.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="364" y="176.8001">Target2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="291" x2="403" y1="197.6" y2="197.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="291" x2="403" y1="205.6" y2="205.6"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="350.1094" y2="350.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnbotju54rsdf)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="284.5"/>
-      <ellipse cx="431.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M434.6688,306.1406 Q434.0906,306.4375 433.45,306.5781 Q432.8094,306.7344 432.1063,306.7344 Q429.6063,306.7344 428.2781,305.0938 Q426.9656,303.4375 426.9656,300.3125 Q426.9656,297.1875 428.2781,295.5313 Q429.6063,293.875 432.1063,293.875 Q432.8094,293.875 433.45,294.0313 Q434.1063,294.1875 434.6688,294.4844 L434.6688,297.2031 Q434.0438,296.625 433.45,296.3594 Q432.8563,296.0781 432.2313,296.0781 Q430.8875,296.0781 430.2,297.1563 Q429.5125,298.2188 429.5125,300.3125 Q429.5125,302.4063 430.2,303.4844 Q430.8875,304.5469 432.2313,304.5469 Q432.8563,304.5469 433.45,304.2813 Q434.0438,304 434.6688,303.4219 L434.6688,306.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="446.3" y="304.6543">Target2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="316.5" y2="316.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <g id="elem_C_0001906317303950647748">
+        <rect codeLine="31" fill="#F1F1F1" height="81.5999" id="C_0001906317303950647748" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="183" x="180.5" y="7"/>
+        <ellipse cx="228.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M223.75,24.1563 C223.75,26.6563 225.8906,28.4688 228.8125,28.4688 C230.0469,28.4688 231.2188,28.1719 231.9688,27.6563 C232.5781,27.2344 232.9063,26.8125 232.9063,26.4063 C232.9063,25.9375 232.4844,25.5313 231.9844,25.5313 C231.75,25.5313 231.5313,25.6094 231.3281,25.8125 C230.8906,26.25 230.8906,26.25 230.7188,26.3438 C230.2656,26.5781 229.625,26.7188 228.8594,26.7188 C226.8594,26.7188 225.5781,25.7031 225.5781,24.125 L225.5781,23.0781 C225.5781,21.375 226.7969,20.1719 228.5,20.1719 C229.0781,20.1719 229.6563,20.3125 230.125,20.5625 C230.5938,20.8281 230.7656,21.0156 230.8281,21.375 C230.9531,22.0469 231.2031,22.2969 231.7344,22.2969 C232.0156,22.2969 232.2969,22.1563 232.4844,21.9375 C232.6094,21.7656 232.6563,21.5938 232.6563,21.1563 L232.6563,19.7969 C232.6563,19.375 232.6406,19.2344 232.5156,19.0625 C232.3438,18.8125 232.0625,18.6563 231.7344,18.6563 C231.4219,18.6563 231.2188,18.7656 231,19.0313 C229.8281,18.5313 229.3906,18.4219 228.4375,18.4219 C225.7656,18.4219 223.75,20.4375 223.75,23.0625 L223.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="249.25" y="27.606">ProxyHolder</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="181.5" x2="362.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="181.5" x2="362.5" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="186.5" y="55.9"/>
+          <ellipse cx="191.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="200.5" y="64.0059">proxy1 : Proxy&lt;Target1&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="186.5" y="72.6999"/>
+          <ellipse cx="191.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="200.5" y="80.8059">proxy2 : Proxy&lt;Target2&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="322.5"/>
-      <ellipse cx="425" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="330.7104">m1() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="335.3047"/>
-      <ellipse cx="425" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="343.5151">m2() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="350.1094" y2="350.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnbotju54rsdf)" height="107.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="251" x="128" y="268"/>
-      <ellipse cx="227.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M230.2188,289.6406 Q229.6406,289.9375 229,290.0781 Q228.3594,290.2344 227.6563,290.2344 Q225.1563,290.2344 223.8281,288.5938 Q222.5156,286.9375 222.5156,283.8125 Q222.5156,280.6875 223.8281,279.0313 Q225.1563,277.375 227.6563,277.375 Q228.3594,277.375 229,277.5313 Q229.6563,277.6875 230.2188,277.9844 L230.2188,280.7031 Q229.5938,280.125 229,279.8594 Q228.4063,279.5781 227.7813,279.5781 Q226.4375,279.5781 225.75,280.6563 Q225.0625,281.7188 225.0625,283.8125 Q225.0625,285.9063 225.75,286.9844 Q226.4375,288.0469 227.7813,288.0469 Q228.4063,288.0469 229,287.7813 Q229.5938,287.5 230.2188,286.9219 L230.2188,289.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="247.75" y="288.1543">Proxy</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="306"/>
-      <ellipse cx="139" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="148" y="314.2104">Proxy(std::shared_ptr&lt;T&gt; target) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="129" x2="378" y1="320.8047" y2="320.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="326.8047"/>
-      <ellipse cx="139" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="335.0151">m1() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="339.6094"/>
-      <ellipse cx="139" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="347.8198">m2() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="354.4141" y2="354.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="360.4141"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136" y="362.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148" y="368.6245">m_target : std::shared_ptr&lt;T&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnbotju54rsdf)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="90.5" y="159"/>
-      <ellipse cx="105.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M108.4688,180.6406 Q107.8906,180.9375 107.25,181.0781 Q106.6094,181.2344 105.9063,181.2344 Q103.4063,181.2344 102.0781,179.5938 Q100.7656,177.9375 100.7656,174.8125 Q100.7656,171.6875 102.0781,170.0313 Q103.4063,168.375 105.9063,168.375 Q106.6094,168.375 107.25,168.5313 Q107.9063,168.6875 108.4688,168.9844 L108.4688,171.7031 Q107.8438,171.125 107.25,170.8594 Q106.6563,170.5781 106.0313,170.5781 Q104.6875,170.5781 104,171.6563 Q103.3125,172.7188 103.3125,174.8125 Q103.3125,176.9063 104,177.9844 Q104.6875,179.0469 106.0313,179.0469 Q106.6563,179.0469 107.25,178.7813 Q107.8438,178.5 108.4688,177.9219 L108.4688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="119.5" y="179.1543">Proxy</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnbotju54rsdf)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="243.5" y="159"/>
-      <ellipse cx="258.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M261.4688,180.6406 Q260.8906,180.9375 260.25,181.0781 Q259.6094,181.2344 258.9063,181.2344 Q256.4063,181.2344 255.0781,179.5938 Q253.7656,177.9375 253.7656,174.8125 Q253.7656,171.6875 255.0781,170.0313 Q256.4063,168.375 258.9063,168.375 Q259.6094,168.375 260.25,168.5313 Q260.9063,168.6875 261.4688,168.9844 L261.4688,171.7031 Q260.8438,171.125 260.25,170.8594 Q259.6563,170.5781 259.0313,170.5781 Q257.6875,170.5781 257,171.6563 Q256.3125,172.7188 256.3125,174.8125 Q256.3125,176.9063 257,177.9844 Q257.6875,179.0469 259.0313,179.0469 Q259.6563,179.0469 260.25,178.7813 Q260.8438,178.5 261.4688,177.9219 L261.4688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="272.5" y="179.1543">Proxy</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnbotju54rsdf)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="141" y="8"/>
-      <ellipse cx="184.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M187.3188,29.6406 Q186.7406,29.9375 186.1,30.0781 Q185.4594,30.2344 184.7563,30.2344 Q182.2563,30.2344 180.9281,28.5938 Q179.6156,26.9375 179.6156,23.8125 Q179.6156,20.6875 180.9281,19.0313 Q182.2563,17.375 184.7563,17.375 Q185.4594,17.375 186.1,17.5313 Q186.7563,17.6875 187.3188,17.9844 L187.3188,20.7031 Q186.6938,20.125 186.1,19.8594 Q185.5063,19.5781 184.8813,19.5781 Q183.5375,19.5781 182.85,20.6563 Q182.1625,21.7188 182.1625,23.8125 Q182.1625,25.9063 182.85,26.9844 Q183.5375,28.0469 184.8813,28.0469 Q185.5063,28.0469 186.1,27.7813 Q186.6938,27.5 187.3188,26.9219 L187.3188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="204.65" y="28.1543">ProxyHolder</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="147" y="54"/>
-      <ellipse cx="152" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="161" y="62.2104">proxy1 : Proxy&lt;Target1&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="147" y="66.8047"/>
-      <ellipse cx="152" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="161" y="75.0151">proxy2 : Proxy&lt;Target2&gt;</text>
-    </a>
-    <path d="M132.54,207.16 C117.89,227.14 96.41,256.47 78.96,280.29 " fill="none" id="C_0001644966842838139424-&gt;C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="75.97,284.37,84.5201,279.4818,78.9287,280.3393,78.0711,274.7479,75.97,284.37" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M167.14,207.16 C176.66,219.65 188.96,235.79 201.28,251.96 " fill="none" id="C_0001644966842838139424-&gt;C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="206.94,247.84,213.49,267.99,195.81,256.33,206.94,247.84" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M328.79,207.16 C351.68,227.31 385.35,256.96 412.51,280.88 " fill="none" id="C_0001190103100236298763-&gt;C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="416.47,284.37,412.3646,275.4176,412.7196,281.0633,407.0739,281.4183,416.47,284.37" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M294.19,207.16 C289.98,218.87 284.63,233.79 279.19,248.93 " fill="none" id="C_0001190103100236298763-&gt;C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="285.69,251.53,272.35,267.99,272.52,246.8,285.69,251.53" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <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_0001906317303950647748&lt;-C_0001644966842838139424" 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>
-    <path d="M252.45,93.59 C264.91,115.61 279.15,140.76 289.25,158.6 " fill="none" id="C_0001906317303950647748&lt;-C_0001190103100236298763" 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>
+    <g id="link_C_0001644966842838139424_C_0001573849034571194138">
+      <path codeLine="36" d="M174.86,213.83 C153.08,235.71 124.2337,264.6784 98.1837,290.8384 " fill="none" id="C_0001644966842838139424-to-C_0001573849034571194138" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="93.95,295.09,103.1349,291.5351,97.4781,291.547,97.4662,285.8902,93.95,295.09" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001644966842838139424_C_0001483353300536405088">
+      <path codeLine="37" d="M209.89,213.83 C218.26,230.2 221.6874,236.8976 232.6174,258.2476 " fill="none" id="C_0001644966842838139424-to-C_0001483353300536405088" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="240.82,274.27,237.9582,255.5134,227.2766,260.9818,240.82,274.27" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001190103100236298763_C_0000751896409461834669">
+      <path codeLine="38" d="M369.98,213.83 C391.61,235.71 420.2411,264.6638 446.1111,290.8238 " fill="none" id="C_0001190103100236298763-to-C_0000751896409461834669" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="450.33,295.09,446.8458,285.878,446.8142,291.5348,441.1575,291.5033,450.33,295.09" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001190103100236298763_C_0001483353300536405088">
+      <path codeLine="39" d="M334.95,213.83 C326.46,230.2 322.9714,236.9434 311.8914,258.2934 " fill="none" id="C_0001190103100236298763-to-C_0001483353300536405088" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="303.6,274.27,317.2169,261.0572,306.5658,255.5296,303.6,274.27" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001906317303950647748_C_0001644966842838139424">
+      <path codeLine="40" d="M245.1791,99.4674 C232.1191,124.1574 221.42,144.35 210.42,165.15 " fill="none" id="C_0001906317303950647748-backto-C_0001644966842838139424" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="250.79,88.86,244.4487,92.2934,245.1791,99.4674,251.5204,96.034,250.79,88.86" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="241" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="248" y="131.677">proxy1</text>
+    </g>
+    <g id="link_C_0001906317303950647748_C_0001190103100236298763">
+      <path codeLine="41" d="M299.1644,99.4336 C312.4144,124.1236 323.26,144.35 334.42,165.15 " fill="none" id="C_0001906317303950647748-backto-C_0001190103100236298763" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="293.49,88.86,292.8027,96.0383,299.1644,99.4336,299.8517,92.2553,293.49,88.86" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="324" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="331" y="131.677">proxy2</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00025_class_mermaid.svg b/docs/test_cases/t00025_class_mermaid.svg
index 6e09d9c2..b0775ddf 100644
--- a/docs/test_cases/t00025_class_mermaid.svg
+++ b/docs/test_cases/t00025_class_mermaid.svg
@@ -1,61 +1,66 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 601.359375 437" style="max-width: 601.359px; background-color: white;" width="601.359375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 619.140625 437" style="max-width: 619.141px; background-color: white;" width="619.140625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M70.05570969626169,234L69.27689349688474,238.16666666666666C68.49807729750779,242.33333333333334,66.9404448987539,250.66666666666666,66.16162869937695,262.6666666666667C65.3828125,274.6666666666667,65.3828125,290.3333333333333,65.3828125,298.1666666666667L65.3828125,306"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M138.05534462616822,234L147.21799552180684,238.16666666666666C156.3806464174455,242.33333333333334,174.70594820872273,250.66666666666666,188.46895968128445,259C202.23197115384616,267.3333333333333,211.4326923076923,275.6666666666667,216.0330528846154,279.8333333333333L220.63341346153845,284"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M531.3036653037383,234L532.0824815031152,238.16666666666666C532.8612977024922,242.33333333333334,534.4189301012461,250.66666666666666,535.1977463006231,262.6666666666667C535.9765625,274.6666666666667,535.9765625,290.3333333333333,535.9765625,298.1666666666667L535.9765625,306"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M463.3040303738318,234L454.14137947819313,238.16666666666666C444.97872858255454,242.33333333333334,426.65342679127724,250.66666666666666,412.8904153187155,259C399.1274038461538,267.3333333333333,389.9266826923077,275.6666666666667,385.3263221153846,279.8333333333333L380.72596153846155,284"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M201.3515625,95.75407448505445L180.35677083333334,103.62839540421203C159.36197916666666,111.50271632336963,117.37239583333333,127.25135816168482,96.37760416666667,140.79234574750907C75.3828125,154.33333333333334,75.3828125,165.66666666666666,75.3828125,171.33333333333334L75.3828125,177"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M400.0078125,95.75407448505445L421.0026041666667,103.62839540421203C441.9973958333333,111.50271632336963,483.9869791666667,127.25135816168482,504.9817708333333,140.79234574750907C525.9765625,154.33333333333334,525.9765625,165.66666666666666,525.9765625,171.33333333333334L525.9765625,177"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M70.05570969626169,234L69.27689349688474,238.16666666666666C68.49807729750779,242.33333333333334,66.9404448987539,250.66666666666666,66.16162869937695,261.6666666666667C65.3828125,272.6666666666667,65.3828125,286.3333333333333,65.3828125,293.1666666666667L65.3828125,300"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M140.42340829439252,234L149.93226732866043,238.16666666666666C159.44112636292834,242.33333333333334,178.45884443146417,250.66666666666666,190.4944898251218,257.0311514100816C202.53013521877946,263.39563615349647,207.58370793755887,267.79127230699294,210.1104942969486,269.98909038374114L212.6372806563383,272.1869084604894"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M549.0849153037383,234L549.8637315031152,238.16666666666666C550.6425477024922,242.33333333333334,552.2001801012461,250.66666666666666,552.9789963006231,261.6666666666667C553.7578125,272.6666666666667,553.7578125,286.3333333333333,553.7578125,293.1666666666667L553.7578125,300"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M478.7172167056075,234L469.20835767133957,238.16666666666666C459.69949863707166,242.33333333333334,440.68178056853577,250.66666666666666,428.6461351748782,257.0311514100816C416.61048978122056,263.39563615349647,411.5569170624411,267.79127230699294,409.0301307030514,269.98909038374114L406.5033443436617,272.1869084604894"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M193.31065405319333,100.44904142516216L173.65601379432778,107.5408678543018C154.00137353546222,114.63269428344144,114.69209301773111,128.8163471417207,95.03745275886554,141.574840237527C75.3828125,154.33333333333334,75.3828125,165.66666666666666,75.3828125,171.33333333333334L75.3828125,177"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M425.82997094680667,100.44904142516216L445.48461120567225,107.5408678543018C465.13925146453784,114.63269428344144,504.4485319822689,128.8163471417207,524.1031722411344,141.574840237527C543.7578125,154.33333333333334,543.7578125,165.66666666666666,543.7578125,171.33333333333334L543.7578125,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -113,7 +118,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(525.9765625, 143)" class="edgeLabel">
+        <g transform="translate(543.7578125, 143)" class="edgeLabel">
           <g transform="translate(-28.6875, -9)" class="label">
             <foreignObject height="18" width="57.375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -126,11 +131,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L6">
+        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L6">
           <g title="Target1" id="classId-C_0001573849034571194138-0" class="node default clickable">
-            <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
+            <rect height="101" width="108.8125" y="-50.5" x="-54.40625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="54.40625" x1="-54.40625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="54.40625" x1="-54.40625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -142,24 +147,24 @@
                   <span class="nodeLabel">Target1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.4609375, 3)" height="18" width="84.921875">
+              <foreignObject transform="translate( -46.90625, 3)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : void</span>
+                  <span class="nodeLabel">+m1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.4609375, 25)" height="18" width="84.921875">
+              <foreignObject transform="translate( -46.90625, 25)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : void</span>
+                  <span class="nodeLabel">+m2() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L12">
+        <a transform="translate(553.7578125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L12">
           <g title="Target2" id="classId-C_0000751896409461834669-1" class="node default clickable">
-            <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
+            <rect height="101" width="108.8125" y="-50.5" x="-54.40625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="54.40625" x1="-54.40625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="54.40625" x1="-54.40625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -171,24 +176,24 @@
                   <span class="nodeLabel">Target2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.4609375, 3)" height="18" width="84.921875">
+              <foreignObject transform="translate( -46.90625, 3)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : void</span>
+                  <span class="nodeLabel">+m1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.4609375, 25)" height="18" width="84.921875">
+              <foreignObject transform="translate( -46.90625, 25)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : void</span>
+                  <span class="nodeLabel">+m2() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18">
+        <a transform="translate(309.5703125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001483353300536405088-2" class="node default clickable">
-            <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
+            <rect height="145" width="279.5625" y="-72.5" x="-139.78125" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="139.78125" x1="-139.78125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.78125" x1="-139.78125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -200,30 +205,30 @@
                   <span class="nodeLabel">Proxy&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.8359375, -31)" height="18" width="217">
+              <foreignObject transform="translate( -132.28125, -31)" height="18" width="217">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_target : std::shared_ptr&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.8359375, 3)" height="18" width="255.671875">
+              <foreignObject transform="translate( -132.28125, 3)" height="18" width="264.5625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Proxy(std::shared_ptr target) : void</span>
+                  <span class="nodeLabel">+Proxy(std::shared_ptr target) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.8359375, 25)" height="18" width="84.921875">
+              <foreignObject transform="translate( -132.28125, 25)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : void</span>
+                  <span class="nodeLabel">+m1() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.8359375, 47)" height="18" width="84.921875">
+              <foreignObject transform="translate( -132.28125, 47)" height="18" width="93.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : void</span>
+                  <span class="nodeLabel">+m2() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18">
+        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001644966842838139424-3" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -242,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L18">
+        <a transform="translate(543.7578125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001190103100236298763-4" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -261,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00025/t00025.cc#L31">
+        <a transform="translate(309.5703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L31">
           <g title="ProxyHolder" id="classId-C_0001906317303950647748-5" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md
index 2a62b904..bfecdf4d 100644
--- a/docs/test_cases/t00026.md
+++ b/docs/test_cases/t00026.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00026.cc
+File `tests/t00026/t00026.cc`
 ```cpp
 #include <iostream>
 #include <memory>
@@ -115,6 +115,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -145,6 +146,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -213,6 +215,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -243,6 +246,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -268,6 +272,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -298,6 +303,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -323,6 +329,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -396,6 +403,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -426,6 +434,7 @@ struct StringMemento {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index cd8ff6e8..3c7eadb6 100644
--- a/docs/test_cases/t00026_class.svg
+++ b/docs/test_cases/t00026_class.svg
@@ -1,189 +1,207 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="583px" preserveAspectRatio="none" style="width:690px;height:583px;" version="1.1" viewBox="0 0 690 583" width="690px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="621px" preserveAspectRatio="none" style="width:745px;height:621px;background:#FFFFFF;" version="1.1" viewBox="0 0 745 621" width="745px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7ghujh6t4n6h" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7ghujh6t4n6h)" height="94.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="324" y="478"/>
-      <ellipse cx="366.45" cy="494" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M369.4188,499.6406 Q368.8406,499.9375 368.2,500.0781 Q367.5594,500.2344 366.8563,500.2344 Q364.3563,500.2344 363.0281,498.5938 Q361.7156,496.9375 361.7156,493.8125 Q361.7156,490.6875 363.0281,489.0313 Q364.3563,487.375 366.8563,487.375 Q367.5594,487.375 368.2,487.5313 Q368.8563,487.6875 369.4188,487.9844 L369.4188,490.7031 Q368.7938,490.125 368.2,489.8594 Q367.6063,489.5781 366.9813,489.5781 Q365.6375,489.5781 364.95,490.6563 Q364.2625,491.7188 364.2625,493.8125 Q364.2625,495.9063 364.95,496.9844 Q365.6375,498.0469 366.9813,498.0469 Q367.6063,498.0469 368.2,497.7813 Q368.7938,497.5 369.4188,496.9219 L369.4188,499.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="386.55" y="498.1543">Memento</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="480" y="475"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="481" y="487.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="510" y2="510"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <g id="elem_C_0001241204213727905390">
+        <rect codeLine="2" fill="#F1F1F1" height="106.3998" id="C_0001241204213727905390" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="176" x="352.5" y="508.4"/>
+        <ellipse cx="400.75" cy="524.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M395.75,525.5563 C395.75,528.0563 397.8906,529.8688 400.8125,529.8688 C402.0469,529.8688 403.2188,529.5719 403.9688,529.0563 C404.5781,528.6344 404.9063,528.2125 404.9063,527.8063 C404.9063,527.3375 404.4844,526.9313 403.9844,526.9313 C403.75,526.9313 403.5313,527.0094 403.3281,527.2125 C402.8906,527.65 402.8906,527.65 402.7188,527.7438 C402.2656,527.9781 401.625,528.1188 400.8594,528.1188 C398.8594,528.1188 397.5781,527.1031 397.5781,525.525 L397.5781,524.4781 C397.5781,522.775 398.7969,521.5719 400.5,521.5719 C401.0781,521.5719 401.6563,521.7125 402.125,521.9625 C402.5938,522.2281 402.7656,522.4156 402.8281,522.775 C402.9531,523.4469 403.2031,523.6969 403.7344,523.6969 C404.0156,523.6969 404.2969,523.5563 404.4844,523.3375 C404.6094,523.1656 404.6563,522.9938 404.6563,522.5563 L404.6563,521.1969 C404.6563,520.775 404.6406,520.6344 404.5156,520.4625 C404.3438,520.2125 404.0625,520.0563 403.7344,520.0563 C403.4219,520.0563 403.2188,520.1656 403,520.4313 C401.8281,519.9313 401.3906,519.8219 400.4375,519.8219 C397.7656,519.8219 395.75,521.8375 395.75,524.4625 L395.75,525.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="421.25" y="529.006">Memento</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="522.5" y="505.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="523.5" y="519.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="353.5" x2="527.5" y1="540.4" y2="540.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="358.5" y="549.3"/>
+          <ellipse cx="363.5" cy="554.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="372.5" y="557.4059">Memento(T &amp;&amp; v) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="353.5" x2="527.5" y1="565.1999" y2="565.1999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="358.5" y="574.0999"/>
+          <ellipse cx="363.5" cy="579.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="372.5" y="582.2059">value() const : T</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="353.5" x2="527.5" y1="589.9999" y2="589.9999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="358.5" y="598.8998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="360.5" y="600.8998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="372.5" y="607.0058">m_value : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="516"/>
-      <ellipse cx="335" cy="521" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <g id="elem_C_0001324770803720816727">
+        <rect codeLine="10" fill="#F1F1F1" height="156.7996" id="C_0001324770803720816727" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="271" x="463" y="274.6"/>
+        <ellipse cx="557.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M552.25,291.7562 C552.25,294.2562 554.3906,296.0687 557.3125,296.0687 C558.5469,296.0687 559.7188,295.7719 560.4688,295.2562 C561.0781,294.8344 561.4063,294.4125 561.4063,294.0062 C561.4063,293.5375 560.9844,293.1312 560.4844,293.1312 C560.25,293.1312 560.0313,293.2094 559.8281,293.4125 C559.3906,293.85 559.3906,293.85 559.2188,293.9437 C558.7656,294.1781 558.125,294.3187 557.3594,294.3187 C555.3594,294.3187 554.0781,293.3031 554.0781,291.725 L554.0781,290.6781 C554.0781,288.975 555.2969,287.7719 557,287.7719 C557.5781,287.7719 558.1563,287.9125 558.625,288.1625 C559.0938,288.4281 559.2656,288.6156 559.3281,288.975 C559.4531,289.6469 559.7031,289.8969 560.2344,289.8969 C560.5156,289.8969 560.7969,289.7562 560.9844,289.5375 C561.1094,289.3656 561.1563,289.1937 561.1563,288.7562 L561.1563,287.3969 C561.1563,286.975 561.1406,286.8344 561.0156,286.6625 C560.8438,286.4125 560.5625,286.2562 560.2344,286.2562 C559.9219,286.2562 559.7188,286.3656 559.5,286.6312 C558.3281,286.1312 557.8906,286.0219 556.9375,286.0219 C554.2656,286.0219 552.25,288.0375 552.25,290.6625 L552.25,291.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="577.75" y="295.206">Originator</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="728" y="271.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="729" y="285.8001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="464" x2="733" y1="306.6" y2="306.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="315.5"/>
+          <ellipse cx="474" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="483" y="323.6059">Originator(T &amp;&amp; v) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="464" x2="733" y1="331.3999" y2="331.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="340.2999"/>
+          <ellipse cx="474" cy="345.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="483" y="348.4059">load(const Memento&lt;T&gt; &amp; m) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="357.0998"/>
+          <ellipse cx="474" cy="362.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245" x="483" y="365.2058">memoize_value() const : Memento&lt;T&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="373.8997"/>
+          <ellipse cx="474" cy="378.8997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="483" y="382.0057">print() const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="390.6997"/>
+          <ellipse cx="474" cy="395.6997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109" x="483" y="398.8057">set(T &amp;&amp; v) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="464" x2="733" y1="406.5996" y2="406.5996"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="415.4996"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="471" y="417.4996"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="483" y="423.6056">m_value : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="344" y="524.2104">Memento(T &amp;&amp; v) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <g id="elem_C_0002032715387182792204">
+        <rect codeLine="21" fill="#F1F1F1" height="98.3998" id="C_0002032715387182792204" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="421" x="7" y="303.8"/>
+        <ellipse cx="176.25" cy="319.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M171.25,320.9562 C171.25,323.4562 173.3906,325.2687 176.3125,325.2687 C177.5469,325.2687 178.7188,324.9719 179.4688,324.4562 C180.0781,324.0344 180.4063,323.6125 180.4063,323.2062 C180.4063,322.7375 179.9844,322.3312 179.4844,322.3312 C179.25,322.3312 179.0313,322.4094 178.8281,322.6125 C178.3906,323.05 178.3906,323.05 178.2188,323.1437 C177.7656,323.3781 177.125,323.5187 176.3594,323.5187 C174.3594,323.5187 173.0781,322.5031 173.0781,320.925 L173.0781,319.8781 C173.0781,318.175 174.2969,316.9719 176,316.9719 C176.5781,316.9719 177.1563,317.1125 177.625,317.3625 C178.0938,317.6281 178.2656,317.8156 178.3281,318.175 C178.4531,318.8469 178.7031,319.0969 179.2344,319.0969 C179.5156,319.0969 179.7969,318.9562 179.9844,318.7375 C180.1094,318.5656 180.1563,318.3937 180.1563,317.9562 L180.1563,316.5969 C180.1563,316.175 180.1406,316.0344 180.0156,315.8625 C179.8438,315.6125 179.5625,315.4562 179.2344,315.4562 C178.9219,315.4562 178.7188,315.5656 178.5,315.8312 C177.3281,315.3312 176.8906,315.2219 175.9375,315.2219 C173.2656,315.2219 171.25,317.2375 171.25,319.8625 L171.25,320.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="196.75" y="324.406">Caretaker</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="422" y="300.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="423" y="315.0001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="427" y1="335.8" y2="335.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="344.7"/>
+          <ellipse cx="18" cy="349.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="361" x="27" y="352.8059">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="361.4999"/>
+          <ellipse cx="18" cy="366.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="27" y="369.6059">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="427" y1="377.3999" y2="377.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="386.2998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="388.2998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="27" y="394.4058">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="325" x2="485" y1="530.8047" y2="530.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="536.8047"/>
-      <ellipse cx="335" cy="541.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <g id="elem_C_0001708482137721157489">
+        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0001708482137721157489" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="151" x="288" y="165.6"/>
+        <ellipse cx="303" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M298,182.7562 C298,185.2562 300.1406,187.0687 303.0625,187.0687 C304.2969,187.0687 305.4688,186.7719 306.2188,186.2562 C306.8281,185.8344 307.1563,185.4125 307.1563,185.0062 C307.1563,184.5375 306.7344,184.1312 306.2344,184.1312 C306,184.1312 305.7813,184.2094 305.5781,184.4125 C305.1406,184.85 305.1406,184.85 304.9688,184.9437 C304.5156,185.1781 303.875,185.3187 303.1094,185.3187 C301.1094,185.3187 299.8281,184.3031 299.8281,182.725 L299.8281,181.6781 C299.8281,179.975 301.0469,178.7719 302.75,178.7719 C303.3281,178.7719 303.9063,178.9125 304.375,179.1625 C304.8438,179.4281 305.0156,179.6156 305.0781,179.975 C305.2031,180.6469 305.4531,180.8969 305.9844,180.8969 C306.2656,180.8969 306.5469,180.7562 306.7344,180.5375 C306.8594,180.3656 306.9063,180.1937 306.9063,179.7562 L306.9063,178.3969 C306.9063,177.975 306.8906,177.8344 306.7656,177.6625 C306.5938,177.4125 306.3125,177.2562 305.9844,177.2562 C305.6719,177.2562 305.4688,177.3656 305.25,177.6312 C304.0781,177.1312 303.6406,177.0219 302.6875,177.0219 C300.0156,177.0219 298,179.0375 298,181.6625 L298,182.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="317" y="186.206">Caretaker</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="388" y="162.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="389" y="176.8001">std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="289" x2="438" y1="197.6" y2="197.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="289" x2="438" y1="205.6" y2="205.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="344" y="545.0151">value() const : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <g id="elem_C_0001014247960805363560">
+        <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0001014247960805363560" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="151" x="498" y="165.6"/>
+        <ellipse cx="513" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M508,182.7562 C508,185.2562 510.1406,187.0687 513.0625,187.0687 C514.2969,187.0687 515.4688,186.7719 516.2188,186.2562 C516.8281,185.8344 517.1563,185.4125 517.1563,185.0062 C517.1563,184.5375 516.7344,184.1312 516.2344,184.1312 C516,184.1312 515.7813,184.2094 515.5781,184.4125 C515.1406,184.85 515.1406,184.85 514.9688,184.9437 C514.5156,185.1781 513.875,185.3187 513.1094,185.3187 C511.1094,185.3187 509.8281,184.3031 509.8281,182.725 L509.8281,181.6781 C509.8281,179.975 511.0469,178.7719 512.75,178.7719 C513.3281,178.7719 513.9063,178.9125 514.375,179.1625 C514.8438,179.4281 515.0156,179.6156 515.0781,179.975 C515.2031,180.6469 515.4531,180.8969 515.9844,180.8969 C516.2656,180.8969 516.5469,180.7562 516.7344,180.5375 C516.8594,180.3656 516.9063,180.1937 516.9063,179.7562 L516.9063,178.3969 C516.9063,177.975 516.8906,177.8344 516.7656,177.6625 C516.5938,177.4125 516.3125,177.2562 515.9844,177.2562 C515.6719,177.2562 515.4688,177.3656 515.25,177.6312 C514.0781,177.1312 513.6406,177.0219 512.6875,177.0219 C510.0156,177.0219 508,179.0375 508,181.6625 L508,182.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="527" y="186.206">Originator</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="598" y="162.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="599" y="176.8001">std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="499" x2="648" y1="197.6" y2="197.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="499" x2="648" y1="205.6" y2="205.6"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="551.6094" y2="551.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="557.6094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="332" y="559.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <g id="elem_C_0000851750942915129289">
+        <rect codeLine="36" fill="#F1F1F1" height="81.5999" id="C_0000851750942915129289" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="239" x="337" y="7"/>
+        <ellipse cx="403.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M398.75,24.1563 C398.75,26.6563 400.8906,28.4688 403.8125,28.4688 C405.0469,28.4688 406.2188,28.1719 406.9688,27.6563 C407.5781,27.2344 407.9063,26.8125 407.9063,26.4063 C407.9063,25.9375 407.4844,25.5313 406.9844,25.5313 C406.75,25.5313 406.5313,25.6094 406.3281,25.8125 C405.8906,26.25 405.8906,26.25 405.7188,26.3438 C405.2656,26.5781 404.625,26.7188 403.8594,26.7188 C401.8594,26.7188 400.5781,25.7031 400.5781,24.125 L400.5781,23.0781 C400.5781,21.375 401.7969,20.1719 403.5,20.1719 C404.0781,20.1719 404.6563,20.3125 405.125,20.5625 C405.5938,20.8281 405.7656,21.0156 405.8281,21.375 C405.9531,22.0469 406.2031,22.2969 406.7344,22.2969 C407.0156,22.2969 407.2969,22.1563 407.4844,21.9375 C407.6094,21.7656 407.6563,21.5938 407.6563,21.1563 L407.6563,19.7969 C407.6563,19.375 407.6406,19.2344 407.5156,19.0625 C407.3438,18.8125 407.0625,18.6563 406.7344,18.6563 C406.4219,18.6563 406.2188,18.7656 406,19.0313 C404.8281,18.5313 404.3906,18.4219 403.4375,18.4219 C400.7656,18.4219 398.75,20.4375 398.75,23.0625 L398.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="424.25" y="27.606">StringMemento</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="338" x2="575" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="338" x2="575" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="343" y="55.9"/>
+          <ellipse cx="348" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213" x="357" y="64.0059">caretaker : Caretaker&lt;std::string&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="343" y="72.6999"/>
+          <ellipse cx="348" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213" x="357" y="80.8059">originator : Originator&lt;std::string&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="344" y="565.8198">m_value : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7ghujh6t4n6h)" height="132.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
-      <ellipse cx="513.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M516.2188,289.6406 Q515.6406,289.9375 515,290.0781 Q514.3594,290.2344 513.6563,290.2344 Q511.1563,290.2344 509.8281,288.5938 Q508.5156,286.9375 508.5156,283.8125 Q508.5156,280.6875 509.8281,279.0313 Q511.1563,277.375 513.6563,277.375 Q514.3594,277.375 515,277.5313 Q515.6563,277.6875 516.2188,277.9844 L516.2188,280.7031 Q515.5938,280.125 515,279.8594 Q514.4063,279.5781 513.7813,279.5781 Q512.4375,279.5781 511.75,280.6563 Q511.0625,281.7188 511.0625,283.8125 Q511.0625,285.9063 511.75,286.9844 Q512.4375,288.0469 513.7813,288.0469 Q514.4063,288.0469 515,287.7813 Q515.5938,287.5 516.2188,286.9219 L516.2188,289.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="533.75" y="288.1543">Originator</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="306"/>
-      <ellipse cx="442.5" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="451.5" y="314.2104">Originator(T &amp;&amp; v) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="326.8047"/>
-      <ellipse cx="442.5" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="451.5" y="335.0151">load(const Memento&lt;T&gt; &amp; m) : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="339.6094"/>
-      <ellipse cx="442.5" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="451.5" y="347.8198">memoize_value() const : Memento&lt;T&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="352.4141"/>
-      <ellipse cx="442.5" cy="357.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="104" x="451.5" y="360.6245">print() const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="365.2188"/>
-      <ellipse cx="442.5" cy="370.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="451.5" y="373.4292">set(T &amp;&amp; v) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="380.0234" y2="380.0234"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="386.0234"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="388.0234"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="394.2339">m_value : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7ghujh6t4n6h)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="291.5"/>
-      <ellipse cx="160.25" cy="307.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M163.2188,313.1406 Q162.6406,313.4375 162,313.5781 Q161.3594,313.7344 160.6563,313.7344 Q158.1563,313.7344 156.8281,312.0938 Q155.5156,310.4375 155.5156,307.3125 Q155.5156,304.1875 156.8281,302.5313 Q158.1563,300.875 160.6563,300.875 Q161.3594,300.875 162,301.0313 Q162.6563,301.1875 163.2188,301.4844 L163.2188,304.2031 Q162.5938,303.625 162,303.3594 Q161.4063,303.0781 160.7813,303.0781 Q159.4375,303.0781 158.75,304.1563 Q158.0625,305.2188 158.0625,307.3125 Q158.0625,309.4063 158.75,310.4844 Q159.4375,311.5469 160.7813,311.5469 Q161.4063,311.5469 162,311.2813 Q162.5938,311 163.2188,310.4219 L163.2188,313.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="311.6543">Caretaker</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="390" y="288.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="300.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="323.5" y2="323.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="329.5"/>
-      <ellipse cx="17" cy="334.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="339" x="26" y="337.7104">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="342.3047"/>
-      <ellipse cx="17" cy="347.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="259" x="26" y="350.5151">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="357.1094" y2="357.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="363.1094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="365.1094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="371.3198">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7ghujh6t4n6h)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
-      <ellipse cx="254" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M256.9688,180.6406 Q256.3906,180.9375 255.75,181.0781 Q255.1094,181.2344 254.4063,181.2344 Q251.9063,181.2344 250.5781,179.5938 Q249.2656,177.9375 249.2656,174.8125 Q249.2656,171.6875 250.5781,170.0313 Q251.9063,168.375 254.4063,168.375 Q255.1094,168.375 255.75,168.5313 Q256.4063,168.6875 256.9688,168.9844 L256.9688,171.7031 Q256.3438,171.125 255.75,170.8594 Q255.1563,170.5781 254.5313,170.5781 Q253.1875,170.5781 252.5,171.6563 Q251.8125,172.7188 251.8125,174.8125 Q251.8125,176.9063 252.5,177.9844 Q253.1875,179.0469 254.5313,179.0469 Q255.1563,179.0469 255.75,178.7813 Q256.3438,178.5 256.9688,177.9219 L256.9688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="268" y="179.1543">Caretaker</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7ghujh6t4n6h)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
-      <ellipse cx="469" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M471.9688,180.6406 Q471.3906,180.9375 470.75,181.0781 Q470.1094,181.2344 469.4063,181.2344 Q466.9063,181.2344 465.5781,179.5938 Q464.2656,177.9375 464.2656,174.8125 Q464.2656,171.6875 465.5781,170.0313 Q466.9063,168.375 469.4063,168.375 Q470.1094,168.375 470.75,168.5313 Q471.4063,168.6875 471.9688,168.9844 L471.9688,171.7031 Q471.3438,171.125 470.75,170.8594 Q470.1563,170.5781 469.5313,170.5781 Q468.1875,170.5781 467.5,171.6563 Q466.8125,172.7188 466.8125,174.8125 Q466.8125,176.9063 467.5,177.9844 Q468.1875,179.0469 469.5313,179.0469 Q470.1563,179.0469 470.75,178.7813 Q471.3438,178.5 471.9688,177.9219 L471.9688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="483" y="179.1543">Originator</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7ghujh6t4n6h)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
-      <ellipse cx="364.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M367.2188,29.6406 Q366.6406,29.9375 366,30.0781 Q365.3594,30.2344 364.6563,30.2344 Q362.1563,30.2344 360.8281,28.5938 Q359.5156,26.9375 359.5156,23.8125 Q359.5156,20.6875 360.8281,19.0313 Q362.1563,17.375 364.6563,17.375 Q365.3594,17.375 366,17.5313 Q366.6563,17.6875 367.2188,17.9844 L367.2188,20.7031 Q366.5938,20.125 366,19.8594 Q365.4063,19.5781 364.7813,19.5781 Q363.4375,19.5781 362.75,20.6563 Q362.0625,21.7188 362.0625,23.8125 Q362.0625,25.9063 362.75,26.9844 Q363.4375,28.0469 364.7813,28.0469 Q365.4063,28.0469 366,27.7813 Q366.5938,27.5 367.2188,26.9219 L367.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="384.75" y="28.1543">StringMemento</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="54"/>
-      <ellipse cx="313.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="322.5" y="62.2104">caretaker : Caretaker&lt;std::string&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="66.8047"/>
-      <ellipse cx="313.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="322.5" y="75.0151">originator : Originator&lt;std::string&gt;</text>
-    </a>
-    <path d="M502.1,401.16 C483.28,424.97 462.34,451.46 444.73,473.73 " fill="none" id="C_0001324770803720816727-&gt;C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="441.49,477.84,450.2052,473.2526,444.5873,473.9149,443.925,468.2969,441.49,477.84" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M256.25,386.55 C287.03,414.99 325.06,450.14 354.96,477.77 " fill="none" id="C_0002032715387182792204&lt;-C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="246.53,377.57,248.2235,384.5794,255.3451,385.7121,253.6516,378.7027,246.53,377.57" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="325" y="437.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="335" y="444.0669">m_mementos</text>
-    <path d="M300.82,207.03 C286.43,225.27 265.68,251.55 246.82,275.44 " fill="none" id="C_0001708482137721157489-&gt;C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="252.06,280.11,234.17,291.47,241.07,271.44,252.06,280.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M537.08,207.03 C538.6,218.36 540.53,232.81 542.54,247.85 " fill="none" id="C_0001014247960805363560-&gt;C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="549.49,247.02,545.21,267.77,535.62,248.87,549.49,247.02" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M382.71,92.68 C366.85,114.91 348.59,140.52 335.69,158.6 " fill="none" id="C_0000851750942915129289&lt;-C_0001708482137721157489" 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>
-    <path d="M455.98,92.08 C475.38,114.44 497.86,140.35 513.7,158.6 " fill="none" id="C_0000851750942915129289&lt;-C_0001014247960805363560" 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>
+    <g id="link_C_0001324770803720816727_C_0001241204213727905390">
+      <path codeLine="41" d="M538.99,431.81 C519.48,457.32 501.9359,480.2748 484.2159,503.4348 " fill="none" id="C_0001324770803720816727-to-C_0001241204213727905390" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="480.57,508.2,489.2157,503.4828,483.6083,504.229,482.8621,498.6216,480.57,508.2" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002032715387182792204_C_0001241204213727905390">
+      <path codeLine="42" d="M278.8729,410.8553 C313.1229,442.5853 348.98,475.81 383.99,508.25 " fill="none" id="C_0002032715387182792204-backto-C_0001241204213727905390" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="270.07,402.7,271.7531,409.7119,278.8729,410.8553,277.1899,403.8433,270.07,402.7" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="352.5" y="467.7"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="79" x="362.5" y="474.477">m_mementos</text>
+    </g>
+    <g id="link_C_0001708482137721157489_C_0002032715387182792204">
+      <path codeLine="43" d="M342.27,214.07 C321.15,237.41 300.206,260.5719 273.436,290.1619 " fill="none" id="C_0001708482137721157489-to-C_0002032715387182792204" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="261.36,303.51,277.8853,294.1873,268.9866,286.1366,261.36,303.51" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001014247960805363560_C_0001324770803720816727">
+      <path codeLine="44" d="M577.14,214.07 C579.61,230.07 580.2965,234.4619 583.6865,256.3619 " fill="none" id="C_0001014247960805363560-to-C_0001324770803720816727" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="586.44,274.15,589.6159,255.444,577.7571,257.2797,586.44,274.15" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000851750942915129289_C_0001708482137721157489">
+      <path codeLine="45" d="M423.2048,98.8521 C406.7848,123.5421 392.93,144.36 379.1,165.15 " fill="none" id="C_0000851750942915129289-backto-C_0001708482137721157489" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="429.85,88.86,423.1967,91.641,423.2048,98.8521,429.8581,96.0711,429.85,88.86" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="416.5" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="423.5" y="131.677">caretaker</text>
+    </g>
+    <g id="link_C_0000851750942915129289_C_0001014247960805363560">
+      <path codeLine="46" d="M497.7309,98.0631 C518.3909,122.7531 536.47,144.36 553.87,165.15 " fill="none" id="C_0000851750942915129289-backto-C_0001014247960805363560" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="490.03,88.86,490.8128,96.0285,497.7309,98.0631,496.9481,90.8946,490.03,88.86" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="534.5" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="541.5" y="131.677">originator</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00026_class_mermaid.svg b/docs/test_cases/t00026_class_mermaid.svg
index 7b427346..3a16234c 100644
--- a/docs/test_cases/t00026_class_mermaid.svg
+++ b/docs/test_cases/t00026_class_mermaid.svg
@@ -1,61 +1,66 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 834.5625 672" style="max-width: 834.562px; background-color: white;" width="834.5625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 843.453125 672" style="max-width: 843.453px; background-color: white;" width="843.453125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M161.5625,473L161.5625,478.6666666666667C161.5625,484.3333333333333,161.5625,495.6666666666667,181.74348958333334,510.2090768990909C201.92447916666666,524.7514871315152,242.28645833333334,542.5029742630304,262.4674479166667,551.378717828788L282.6484375,560.2544613945456"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M595.84375,440L595.84375,451.1666666666667C595.84375,462.3333333333333,595.84375,484.6666666666667,575.6627604166666,504.7090768990909C555.4817708333334,524.7514871315152,515.1197916666666,542.5029742630304,494.9388020833333,551.378717828788L474.7578125,560.2544613945456"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M595.84375,234L595.84375,238.16666666666666C595.84375,242.33333333333334,595.84375,250.66666666666666,595.84375,264.5C595.84375,278.3333333333333,595.84375,297.6666666666667,595.84375,307.3333333333333L595.84375,317"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M161.5625,234L161.5625,238.16666666666666C161.5625,242.33333333333334,161.5625,250.66666666666666,161.5625,259C161.5625,267.3333333333333,161.5625,275.6666666666667,161.5625,279.8333333333333L161.5625,284"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M508.4735576923077,109L523.0352564102565,114.66666666666667C537.5969551282051,120.33333333333333,566.7203525641025,131.66666666666666,581.2820512820513,143C595.84375,154.33333333333334,595.84375,165.66666666666666,595.84375,171.33333333333334L595.84375,177"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M248.93269230769232,109L234.37099358974362,114.66666666666667C219.8092948717949,120.33333333333333,190.68589743589746,131.66666666666666,176.12419871794873,143C161.5625,154.33333333333334,161.5625,165.66666666666666,161.5625,171.33333333333334L161.5625,177"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M166.0078125,473L166.0078125,478.6666666666667C166.0078125,484.3333333333333,166.0078125,495.6666666666667,184.9014799492206,509.55870829635745C203.79514739844117,523.4507499260482,241.58248229688238,539.9014998520964,260.476149746103,548.1268748151205L279.36981719532355,556.3522497781446"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M604.734375,458L604.734375,466.1666666666667C604.734375,474.3333333333333,604.734375,490.6666666666667,584.923828125,507.4578725715405C565.11328125,524.2490784764144,525.4921875,541.4981569528287,505.681640625,550.1226961910359L485.87109375,558.747235429243"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M604.734375,234L604.734375,238.16666666666666C604.734375,242.33333333333334,604.734375,250.66666666666666,604.734375,261.5C604.734375,272.3333333333333,604.734375,285.6666666666667,604.734375,292.3333333333333L604.734375,299"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M166.0078125,234L166.0078125,238.16666666666666C166.0078125,242.33333333333334,166.0078125,250.66666666666666,166.0078125,256C166.0078125,261.3333333333333,166.0078125,263.6666666666667,166.0078125,264.8333333333333L166.0078125,266"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M533.2667556145851,115.47026118657878L545.1780255121542,120.05855098881564C557.0892954097234,124.64684079105253,580.9118352048617,133.82342039552626,592.8231051024309,144.0783768644298C604.734375,154.33333333333334,604.734375,165.66666666666666,604.734375,171.33333333333334L604.734375,177"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M237.47543188541493,115.47026118657878L225.56416198784578,120.05855098881564C213.65289209027662,124.64684079105253,189.83035229513834,133.82342039552626,177.91908239756916,144.0783768644298C166.0078125,154.33333333333334,166.0078125,165.66666666666666,166.0078125,171.33333333333334L166.0078125,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -69,7 +74,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(595.84375, 507)" class="edgeLabel">
+        <g transform="translate(604.734375, 507)" class="edgeLabel">
           <g transform="translate(-51.125, -9)" class="label">
             <foreignObject height="18" width="102.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -102,7 +107,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(595.84375, 143)" class="edgeLabel">
+        <g transform="translate(604.734375, 143)" class="edgeLabel">
           <g transform="translate(-38.0234375, -9)" class="label">
             <foreignObject height="18" width="76.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -113,7 +118,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(161.5625, 143)" class="edgeLabel">
+        <g transform="translate(166.0078125, 143)" class="edgeLabel">
           <g transform="translate(-38.0234375, -9)" class="label">
             <foreignObject height="18" width="76.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -126,11 +131,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L8">
+        <a transform="translate(385.37109375, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L8">
           <g title="Memento" id="classId-C_0001241204213727905390-0" class="node default clickable">
-            <rect height="123" width="192.109375" y="-61.5" x="-96.0546875" class="outer title-state"/>
-            <line y2="-31.5" y1="-31.5" x2="96.0546875" x1="-96.0546875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="96.0546875" x1="-96.0546875" class="divider"/>
+            <rect height="123" width="201" y="-61.5" x="-100.5" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="100.5" x1="-100.5" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="100.5" x1="-100.5" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -142,29 +147,29 @@
                   <span class="nodeLabel">Memento&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -88.5546875, -20)" height="18" width="88.625">
+              <foreignObject transform="translate( -93, -20)" height="18" width="88.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_value : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -88.5546875, 14)" height="18" width="177.109375">
+              <foreignObject transform="translate( -93, 14)" height="18" width="186">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Memento(T &amp;&amp; v) : void</span>
+                  <span class="nodeLabel">+Memento(T &amp;&amp; v) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -88.5546875, 36)" height="18" width="132.65625">
+              <foreignObject transform="translate( -93, 36)" height="18" width="141.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+value() : [const] T</span>
+                  <span class="nodeLabel">+value() : : [const] T</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L21">
+        <a transform="translate(166.0078125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001324770803720816727-1" class="node default clickable">
-            <rect height="189" width="307.125" y="-94.5" x="-153.5625" class="outer title-state"/>
-            <line y2="-64.5" y1="-64.5" x2="153.5625" x1="-153.5625" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="153.5625" x1="-153.5625" class="divider"/>
+            <rect height="189" width="316.015625" y="-94.5" x="-158.0078125" class="outer title-state"/>
+            <line y2="-64.5" y1="-64.5" x2="158.0078125" x1="-158.0078125" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="158.0078125" x1="-158.0078125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -176,40 +181,40 @@
                   <span class="nodeLabel">Originator&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.0625, -53)" height="18" width="88.625">
+              <foreignObject transform="translate( -150.5078125, -53)" height="18" width="88.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_value : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.0625, -19)" height="18" width="180.65625">
+              <foreignObject transform="translate( -150.5078125, -19)" height="18" width="189.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Originator(T &amp;&amp; v) : void</span>
+                  <span class="nodeLabel">+Originator(T &amp;&amp; v) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.0625, 3)" height="18" width="235.21875">
+              <foreignObject transform="translate( -150.5078125, 3)" height="18" width="244.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+load(const Memento &amp; m) : void</span>
+                  <span class="nodeLabel">+load(const Memento &amp; m) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.0625, 25)" height="18" width="292.125">
+              <foreignObject transform="translate( -150.5078125, 25)" height="18" width="301.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+memoize_value() : [const] Memento&lt;T&gt;</span>
+                  <span class="nodeLabel">+memoize_value() : : [const] Memento&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.0625, 47)" height="18" width="145.390625">
+              <foreignObject transform="translate( -150.5078125, 47)" height="18" width="154.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+print() : [const] void</span>
+                  <span class="nodeLabel">+print() : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.0625, 69)" height="18" width="131.75">
+              <foreignObject transform="translate( -150.5078125, 69)" height="18" width="140.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+set(T &amp;&amp; v) : void</span>
+                  <span class="nodeLabel">+set(T &amp;&amp; v) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L40">
+        <a transform="translate(604.734375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0002032715387182792204-2" class="node default clickable">
             <rect height="123" width="461.4375" y="-61.5" x="-230.71875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="230.71875" x1="-230.71875" class="divider"/>
@@ -230,20 +235,20 @@
                   <span class="nodeLabel">-m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -223.21875, 14)" height="18" width="386.375">
+              <foreignObject transform="translate( -223.21875, 14)" height="18" width="395.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+set_state(const std::string &amp; s, Memento &amp;&amp; m) : void</span>
+                  <span class="nodeLabel">+set_state(const std::string &amp; s, Memento &amp;&amp; m) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -223.21875, 36)" height="18" width="318.8125">
+              <foreignObject transform="translate( -223.21875, 36)" height="18" width="327.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</span>
+                  <span class="nodeLabel">+state(const std::string &amp; n) : : Memento&lt;T&gt; &amp;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L40">
+        <a transform="translate(604.734375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0001708482137721157489-3" class="node default clickable">
             <rect height="57" width="186.625" y="-28.5" x="-93.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.3125" x1="-93.3125" class="divider"/>
@@ -262,7 +267,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L21">
+        <a transform="translate(166.0078125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001014247960805363560-4" class="node default clickable">
             <rect height="57" width="190.125" y="-28.5" x="-95.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.0625" x1="-95.0625" class="divider"/>
@@ -281,7 +286,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00026/t00026.cc#L53">
+        <a transform="translate(385.37109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L53">
           <g title="StringMemento" id="classId-C_0000851750942915129289-5" class="node default clickable">
             <rect height="101" width="262.6875" y="-50.5" x="-131.34375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="131.34375" x1="-131.34375" class="divider"/>
diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md
index 7f2e86bf..fb7f645b 100644
--- a/docs/test_cases/t00027.md
+++ b/docs/test_cases/t00027.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00027.cc
+File `tests/t00027/t00027.cc`
 ```cpp
 #include <memory>
 #include <tuple>
@@ -99,6 +99,7 @@ struct Window {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -124,6 +125,7 @@ struct Window {
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -207,6 +209,7 @@ struct Window {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -297,6 +300,7 @@ struct Window {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -352,6 +356,7 @@ struct Window {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -407,6 +412,7 @@ struct Window {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -469,6 +475,7 @@ struct Window {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index eb4237c3..f0685bf4 100644
--- a/docs/test_cases/t00027_class.svg
+++ b/docs/test_cases/t00027_class.svg
@@ -1,243 +1,287 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="398px" preserveAspectRatio="none" style="width:1289px;height:398px;" version="1.1" viewBox="0 0 1289 398" width="1289px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="423px" preserveAspectRatio="none" style="width:1307px;height:423px;background:#FFFFFF;" version="1.1" viewBox="0 0 1307 423" width="1307px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1vsm11pcfceju" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="81.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="310.5" y="184"/>
-      <ellipse cx="401.25" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M401.3594,195.3438 L400.2031,200.4219 L402.5313,200.4219 L401.3594,195.3438 Z M399.875,193.1094 L402.8594,193.1094 L406.2188,205.5 L403.7656,205.5 L403,202.4375 L399.7188,202.4375 L398.9688,205.5 L396.5313,205.5 L399.875,193.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="421.75" y="204.1543">Shape</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="216" y2="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <g id="elem_C_0001593092483959332221">
+        <rect codeLine="2" fill="#F1F1F1" height="91.6998" id="C_0001593092483959332221" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="248" x="304.5" y="199.2"/>
+        <ellipse cx="403.75" cy="215.2" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M405.2813,217.1375 L405.6094,217.9344 L405.3281,217.9344 C404.875,217.9344 404.75,217.9656 404.5781,218.075 C404.2969,218.2156 404.125,218.5125 404.125,218.8094 C404.125,219.1063 404.2656,219.3563 404.5,219.5281 C404.6719,219.6531 404.9063,219.7 405.3281,219.7 L407.6875,219.7 C408.0469,219.7 408.2969,219.6688 408.4375,219.575 C408.7031,219.4344 408.875,219.1219 408.875,218.8094 C408.875,218.5438 408.7344,218.2781 408.5,218.1063 C408.3125,217.9813 408.1563,217.95 407.7031,217.9344 L404.3125,210.1063 L400.5938,210.1063 C400.1406,210.1063 400,210.1219 399.8281,210.2313 C399.5625,210.4031 399.3906,210.6844 399.3906,210.9813 C399.3906,211.2625 399.5313,211.5281 399.7813,211.7 C399.9531,211.825 400.1406,211.8563 400.5938,211.8563 L401.5625,211.8563 L398.9844,217.9344 C398.2344,217.9344 397.8281,218.2313 397.8281,218.8094 C397.8281,219.4188 398.2188,219.7 399.0156,219.7 L401.2813,219.7 C401.6406,219.7 401.8906,219.6688 402.0313,219.575 C402.2969,219.4188 402.4688,219.1219 402.4688,218.8094 C402.4688,218.5438 402.3281,218.2781 402.0938,218.1063 C401.9063,217.9656 401.75,217.9344 401.2813,217.9344 L400.9844,217.9344 L401.3281,217.1375 L405.2813,217.1375 Z M404.5156,215.3875 L402.0625,215.3875 L403.2969,212.5125 L404.5156,215.3875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="41" x="424.25" y="221.15">Shape</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="305.5" x2="551.5" y1="231.2" y2="231.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="310.5" y="240.1"/>
+          <ellipse cx="315.5" cy="245.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="324.5" y="248.2059">~Shape() constexpr = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="305.5" x2="551.5" y1="255.9999" y2="255.9999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="310.5" y="265.9499"/>
+          <ellipse cx="315.5" cy="270.9499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="116" x="324.5" y="275.3999">display() = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="305.5" x2="551.5" y1="282.8998" y2="282.8998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="222"/>
-      <ellipse cx="321.5" cy="227" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <g id="elem_C_0001568932879061562228">
+        <rect codeLine="9" fill="#F1F1F1" height="48" id="C_0001568932879061562228" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="772" y="40.6"/>
+        <ellipse cx="787" cy="56.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M782,57.7562 C782,60.2562 784.1406,62.0687 787.0625,62.0687 C788.2969,62.0687 789.4688,61.7719 790.2188,61.2562 C790.8281,60.8344 791.1563,60.4125 791.1563,60.0062 C791.1563,59.5375 790.7344,59.1312 790.2344,59.1312 C790,59.1312 789.7813,59.2094 789.5781,59.4125 C789.1406,59.85 789.1406,59.85 788.9688,59.9437 C788.5156,60.1781 787.875,60.3187 787.1094,60.3187 C785.1094,60.3187 783.8281,59.3031 783.8281,57.725 L783.8281,56.6781 C783.8281,54.975 785.0469,53.7719 786.75,53.7719 C787.3281,53.7719 787.9063,53.9125 788.375,54.1625 C788.8438,54.4281 789.0156,54.6156 789.0781,54.975 C789.2031,55.6469 789.4531,55.8969 789.9844,55.8969 C790.2656,55.8969 790.5469,55.7562 790.7344,55.5375 C790.8594,55.3656 790.9063,55.1937 790.9063,54.7562 L790.9063,53.3969 C790.9063,52.975 790.8906,52.8344 790.7656,52.6625 C790.5938,52.4125 790.3125,52.2562 789.9844,52.2562 C789.6719,52.2562 789.4688,52.3656 789.25,52.6312 C788.0781,52.1312 787.6406,52.0219 786.6875,52.0219 C784.0156,52.0219 782,54.0375 782,56.6625 L782,57.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="801" y="61.206">Line</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="773" x2="830" y1="72.6" y2="72.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="773" x2="830" y1="80.6" y2="80.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="330.5" y="230.2104">~Shape() constexpr = default : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <g id="elem_C_0000142374082478337852">
+        <rect codeLine="13" fill="#F1F1F1" height="64.7999" id="C_0000142374082478337852" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="143.5" y="351.9"/>
+        <ellipse cx="169.75" cy="367.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M164.75,369.0563 C164.75,371.5563 166.8906,373.3688 169.8125,373.3688 C171.0469,373.3688 172.2188,373.0719 172.9688,372.5563 C173.5781,372.1344 173.9063,371.7125 173.9063,371.3063 C173.9063,370.8375 173.4844,370.4313 172.9844,370.4313 C172.75,370.4313 172.5313,370.5094 172.3281,370.7125 C171.8906,371.15 171.8906,371.15 171.7188,371.2438 C171.2656,371.4781 170.625,371.6188 169.8594,371.6188 C167.8594,371.6188 166.5781,370.6031 166.5781,369.025 L166.5781,367.9781 C166.5781,366.275 167.7969,365.0719 169.5,365.0719 C170.0781,365.0719 170.6563,365.2125 171.125,365.4625 C171.5938,365.7281 171.7656,365.9156 171.8281,366.275 C171.9531,366.9469 172.2031,367.1969 172.7344,367.1969 C173.0156,367.1969 173.2969,367.0563 173.4844,366.8375 C173.6094,366.6656 173.6563,366.4938 173.6563,366.0563 L173.6563,364.6969 C173.6563,364.275 173.6406,364.1344 173.5156,363.9625 C173.3438,363.7125 173.0625,363.5563 172.7344,363.5563 C172.4219,363.5563 172.2188,363.6656 172,363.9313 C170.8281,363.4313 170.3906,363.3219 169.4375,363.3219 C166.7656,363.3219 164.75,365.3375 164.75,367.9625 L164.75,369.0563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="186.25" y="372.506">Line</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="232.5" y="348.9"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="233.5" y="363.1001">T&lt;&gt;...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="144.5" x2="260.5" y1="383.9" y2="383.9"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="149.5" y="392.8"/>
+          <ellipse cx="154.5" cy="397.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="163.5" y="400.9059">display() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="144.5" x2="260.5" y1="408.6999" y2="408.6999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="311.5" x2="539.5" y1="236.8047" y2="236.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="242.8047"/>
-      <ellipse cx="321.5" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <g id="elem_C_0001833467466291294724">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001833467466291294724" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="60" x="951.5" y="40.6"/>
+        <ellipse cx="966.5" cy="56.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M961.5,57.7562 C961.5,60.2562 963.6406,62.0687 966.5625,62.0687 C967.7969,62.0687 968.9688,61.7719 969.7188,61.2562 C970.3281,60.8344 970.6563,60.4125 970.6563,60.0062 C970.6563,59.5375 970.2344,59.1312 969.7344,59.1312 C969.5,59.1312 969.2813,59.2094 969.0781,59.4125 C968.6406,59.85 968.6406,59.85 968.4688,59.9437 C968.0156,60.1781 967.375,60.3187 966.6094,60.3187 C964.6094,60.3187 963.3281,59.3031 963.3281,57.725 L963.3281,56.6781 C963.3281,54.975 964.5469,53.7719 966.25,53.7719 C966.8281,53.7719 967.4063,53.9125 967.875,54.1625 C968.3438,54.4281 968.5156,54.6156 968.5781,54.975 C968.7031,55.6469 968.9531,55.8969 969.4844,55.8969 C969.7656,55.8969 970.0469,55.7562 970.2344,55.5375 C970.3594,55.3656 970.4063,55.1937 970.4063,54.7562 L970.4063,53.3969 C970.4063,52.975 970.3906,52.8344 970.2656,52.6625 C970.0938,52.4125 969.8125,52.2562 969.4844,52.2562 C969.1719,52.2562 968.9688,52.3656 968.75,52.6312 C967.5781,52.1312 967.1406,52.0219 966.1875,52.0219 C963.5156,52.0219 961.5,54.0375 961.5,56.6625 L961.5,57.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="980.5" y="61.206">Text</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="952.5" x2="1010.5" y1="72.6" y2="72.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="952.5" x2="1010.5" y1="80.6" y2="80.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="330.5" y="251.0151">display() = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <g id="elem_C_0001114634647721878603">
+        <rect codeLine="22" fill="#F1F1F1" height="64.7999" id="C_0001114634647721878603" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="595.5" y="351.9"/>
+        <ellipse cx="621.3" cy="367.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M616.3,369.0563 C616.3,371.5563 618.4406,373.3688 621.3625,373.3688 C622.5969,373.3688 623.7688,373.0719 624.5188,372.5563 C625.1281,372.1344 625.4563,371.7125 625.4563,371.3063 C625.4563,370.8375 625.0344,370.4313 624.5344,370.4313 C624.3,370.4313 624.0813,370.5094 623.8781,370.7125 C623.4406,371.15 623.4406,371.15 623.2688,371.2438 C622.8156,371.4781 622.175,371.6188 621.4094,371.6188 C619.4094,371.6188 618.1281,370.6031 618.1281,369.025 L618.1281,367.9781 C618.1281,366.275 619.3469,365.0719 621.05,365.0719 C621.6281,365.0719 622.2063,365.2125 622.675,365.4625 C623.1438,365.7281 623.3156,365.9156 623.3781,366.275 C623.5031,366.9469 623.7531,367.1969 624.2844,367.1969 C624.5656,367.1969 624.8469,367.0563 625.0344,366.8375 C625.1594,366.6656 625.2063,366.4938 625.2063,366.0563 L625.2063,364.6969 C625.2063,364.275 625.1906,364.1344 625.0656,363.9625 C624.8938,363.7125 624.6125,363.5563 624.2844,363.5563 C623.9719,363.5563 623.7688,363.6656 623.55,363.9313 C622.3781,363.4313 621.9406,363.3219 620.9875,363.3219 C618.3156,363.3219 616.3,365.3375 616.3,367.9625 L616.3,369.0563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="637.7" y="372.506">Text</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="684.5" y="348.9"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="685.5" y="363.1001">T&lt;&gt;...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="596.5" x2="712.5" y1="383.9" y2="383.9"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="601.5" y="392.8"/>
+          <ellipse cx="606.5" cy="397.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="615.5" y="400.9059">display() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="596.5" x2="712.5" y1="408.6999" y2="408.6999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="257.6094" y2="257.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="764" y="33.5"/>
-      <ellipse cx="779" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M781.9688,55.1406 Q781.3906,55.4375 780.75,55.5781 Q780.1094,55.7344 779.4063,55.7344 Q776.9063,55.7344 775.5781,54.0938 Q774.2656,52.4375 774.2656,49.3125 Q774.2656,46.1875 775.5781,44.5313 Q776.9063,42.875 779.4063,42.875 Q780.1094,42.875 780.75,43.0313 Q781.4063,43.1875 781.9688,43.4844 L781.9688,46.2031 Q781.3438,45.625 780.75,45.3594 Q780.1563,45.0781 779.5313,45.0781 Q778.1875,45.0781 777.5,46.1563 Q776.8125,47.2188 776.8125,49.3125 Q776.8125,51.4063 777.5,52.4844 Q778.1875,53.5469 779.5313,53.5469 Q780.1563,53.5469 780.75,53.2813 Q781.3438,53 781.9688,52.4219 L781.9688,55.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="793" y="53.6543">Line</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="65.5" y2="65.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="73.5" y2="73.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <g id="elem_C_0002049188825706164566">
+        <rect codeLine="27" fill="#F1F1F1" height="66.8999" id="C_0002049188825706164566" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="142" x="1089.5" y="31.15"/>
+        <ellipse cx="1107.2" cy="47.15" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1108.7313,49.0875 L1109.0594,49.8844 L1108.7781,49.8844 C1108.325,49.8844 1108.2,49.9156 1108.0281,50.025 C1107.7469,50.1656 1107.575,50.4625 1107.575,50.7594 C1107.575,51.0562 1107.7156,51.3062 1107.95,51.4781 C1108.1219,51.6031 1108.3563,51.65 1108.7781,51.65 L1111.1375,51.65 C1111.4969,51.65 1111.7469,51.6187 1111.8875,51.525 C1112.1531,51.3844 1112.325,51.0719 1112.325,50.7594 C1112.325,50.4937 1112.1844,50.2281 1111.95,50.0562 C1111.7625,49.9312 1111.6063,49.9 1111.1531,49.8844 L1107.7625,42.0562 L1104.0438,42.0562 C1103.5906,42.0562 1103.45,42.0719 1103.2781,42.1812 C1103.0125,42.3531 1102.8406,42.6344 1102.8406,42.9312 C1102.8406,43.2125 1102.9813,43.4781 1103.2313,43.65 C1103.4031,43.775 1103.5906,43.8062 1104.0438,43.8062 L1105.0125,43.8062 L1102.4344,49.8844 C1101.6844,49.8844 1101.2781,50.1812 1101.2781,50.7594 C1101.2781,51.3687 1101.6688,51.65 1102.4656,51.65 L1104.7313,51.65 C1105.0906,51.65 1105.3406,51.6187 1105.4813,51.525 C1105.7469,51.3687 1105.9188,51.0719 1105.9188,50.7594 C1105.9188,50.4937 1105.7781,50.2281 1105.5438,50.0562 C1105.3563,49.9156 1105.2,49.8844 1104.7313,49.8844 L1104.4344,49.8844 L1104.7781,49.0875 L1108.7313,49.0875 Z M1107.9656,47.3375 L1105.5125,47.3375 L1106.7469,44.4625 L1107.9656,47.3375 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="104" x="1121.8" y="53.1">ShapeDecorator</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1090.5" x2="1230.5" y1="63.15" y2="63.15"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1095.5" y="73.1"/>
+          <ellipse cx="1100.5" cy="78.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="116" x="1109.5" y="82.5499">display() = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1090.5" x2="1230.5" y1="90.0499" y2="90.0499"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="327"/>
-      <ellipse cx="169.05" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M172.0188,348.6406 Q171.4406,348.9375 170.8,349.0781 Q170.1594,349.2344 169.4563,349.2344 Q166.9563,349.2344 165.6281,347.5938 Q164.3156,345.9375 164.3156,342.8125 Q164.3156,339.6875 165.6281,338.0313 Q166.9563,336.375 169.4563,336.375 Q170.1594,336.375 170.8,336.5313 Q171.4563,336.6875 172.0188,336.9844 L172.0188,339.7031 Q171.3938,339.125 170.8,338.8594 Q170.2063,338.5781 169.5813,338.5781 Q168.2375,338.5781 167.55,339.6563 Q166.8625,340.7188 166.8625,342.8125 Q166.8625,344.9063 167.55,345.9844 Q168.2375,347.0469 169.5813,347.0469 Q170.2063,347.0469 170.8,346.7813 Q171.3938,346.5 172.0188,345.9219 L172.0188,348.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="183.95" y="347.1543">Line</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="41" x="221" y="324"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="222" y="336.1387">T&lt;&gt;...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="359" y2="359"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <g id="elem_C_0001473536569433029444">
+        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0001473536569433029444" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="1025.5" y="212.65"/>
+        <ellipse cx="1058.95" cy="228.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1053.95,229.8062 C1053.95,232.3062 1056.0906,234.1187 1059.0125,234.1187 C1060.2469,234.1187 1061.4188,233.8219 1062.1688,233.3062 C1062.7781,232.8844 1063.1063,232.4625 1063.1063,232.0562 C1063.1063,231.5875 1062.6844,231.1812 1062.1844,231.1812 C1061.95,231.1812 1061.7313,231.2594 1061.5281,231.4625 C1061.0906,231.9 1061.0906,231.9 1060.9188,231.9937 C1060.4656,232.2281 1059.825,232.3687 1059.0594,232.3687 C1057.0594,232.3687 1055.7781,231.3531 1055.7781,229.775 L1055.7781,228.7281 C1055.7781,227.025 1056.9969,225.8219 1058.7,225.8219 C1059.2781,225.8219 1059.8563,225.9625 1060.325,226.2125 C1060.7938,226.4781 1060.9656,226.6656 1061.0281,227.025 C1061.1531,227.6969 1061.4031,227.9469 1061.9344,227.9469 C1062.2156,227.9469 1062.4969,227.8062 1062.6844,227.5875 C1062.8094,227.4156 1062.8563,227.2437 1062.8563,226.8062 L1062.8563,225.4469 C1062.8563,225.025 1062.8406,224.8844 1062.7156,224.7125 C1062.5438,224.4625 1062.2625,224.3062 1061.9344,224.3062 C1061.6219,224.3062 1061.4188,224.4156 1061.2,224.6812 C1060.0281,224.1812 1059.5906,224.0719 1058.6375,224.0719 C1055.9656,224.0719 1053.95,226.0875 1053.95,228.7125 L1053.95,229.8062 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="1077.05" y="233.256">Color</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1137.5" y="209.65"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1138.5" y="223.8501">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1026.5" x2="1142.5" y1="244.65" y2="244.65"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1031.5" y="253.55"/>
+          <ellipse cx="1036.5" cy="258.55" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="1045.5" y="261.6559">display() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1026.5" x2="1142.5" y1="269.4499" y2="269.4499"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="156" y="365"/>
-      <ellipse cx="161" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <g id="elem_C_0002049455532387561338">
+        <rect codeLine="37" fill="#F1F1F1" height="64.7999" id="C_0002049455532387561338" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="1178.5" y="212.65"/>
+        <ellipse cx="1207.45" cy="228.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1202.45,229.8062 C1202.45,232.3062 1204.5906,234.1187 1207.5125,234.1187 C1208.7469,234.1187 1209.9188,233.8219 1210.6688,233.3062 C1211.2781,232.8844 1211.6063,232.4625 1211.6063,232.0562 C1211.6063,231.5875 1211.1844,231.1812 1210.6844,231.1812 C1210.45,231.1812 1210.2313,231.2594 1210.0281,231.4625 C1209.5906,231.9 1209.5906,231.9 1209.4188,231.9937 C1208.9656,232.2281 1208.325,232.3687 1207.5594,232.3687 C1205.5594,232.3687 1204.2781,231.3531 1204.2781,229.775 L1204.2781,228.7281 C1204.2781,227.025 1205.4969,225.8219 1207.2,225.8219 C1207.7781,225.8219 1208.3563,225.9625 1208.825,226.2125 C1209.2938,226.4781 1209.4656,226.6656 1209.5281,227.025 C1209.6531,227.6969 1209.9031,227.9469 1210.4344,227.9469 C1210.7156,227.9469 1210.9969,227.8062 1211.1844,227.5875 C1211.3094,227.4156 1211.3563,227.2437 1211.3563,226.8062 L1211.3563,225.4469 C1211.3563,225.025 1211.3406,224.8844 1211.2156,224.7125 C1211.0438,224.4625 1210.7625,224.3062 1210.4344,224.3062 C1210.1219,224.3062 1209.9188,224.4156 1209.7,224.6812 C1208.5281,224.1812 1208.0906,224.0719 1207.1375,224.0719 C1204.4656,224.0719 1202.45,226.0875 1202.45,228.7125 L1202.45,229.8062 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="1224.55" y="233.256">Weight</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1290.5" y="209.65"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1291.5" y="223.8501">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1179.5" x2="1295.5" y1="244.65" y2="244.65"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1184.5" y="253.55"/>
+          <ellipse cx="1189.5" cy="258.55" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="1198.5" y="261.6559">display() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1179.5" x2="1295.5" y1="269.4499" y2="269.4499"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="170" y="373.2104">display() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <g id="elem_C_0002082936326417164202">
+        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0002082936326417164202" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="135.5" y="221.05"/>
+        <ellipse cx="150.5" cy="237.05" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M145.5,238.2062 C145.5,240.7062 147.6406,242.5187 150.5625,242.5187 C151.7969,242.5187 152.9688,242.2219 153.7188,241.7062 C154.3281,241.2844 154.6563,240.8625 154.6563,240.4562 C154.6563,239.9875 154.2344,239.5812 153.7344,239.5812 C153.5,239.5812 153.2813,239.6594 153.0781,239.8625 C152.6406,240.3 152.6406,240.3 152.4688,240.3937 C152.0156,240.6281 151.375,240.7687 150.6094,240.7687 C148.6094,240.7687 147.3281,239.7531 147.3281,238.175 L147.3281,237.1281 C147.3281,235.425 148.5469,234.2219 150.25,234.2219 C150.8281,234.2219 151.4063,234.3625 151.875,234.6125 C152.3438,234.8781 152.5156,235.0656 152.5781,235.425 C152.7031,236.0969 152.9531,236.3469 153.4844,236.3469 C153.7656,236.3469 154.0469,236.2062 154.2344,235.9875 C154.3594,235.8156 154.4063,235.6437 154.4063,235.2062 L154.4063,233.8469 C154.4063,233.425 154.3906,233.2844 154.2656,233.1125 C154.0938,232.8625 153.8125,232.7062 153.4844,232.7062 C153.1719,232.7062 152.9688,232.8156 152.75,233.0812 C151.5781,232.5812 151.1406,232.4719 150.1875,232.4719 C147.5156,232.4719 145.5,234.4875 145.5,237.1125 L145.5,238.2062 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="164.5" y="241.656">Line</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="73" x="199.5" y="218.05"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="71" x="200.5" y="232.2501">Color,Weight</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="136.5" x2="268.5" y1="253.05" y2="253.05"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="136.5" x2="268.5" y1="261.05" y2="261.05"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="379.8047" y2="379.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="943.5" y="33.5"/>
-      <ellipse cx="958.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M961.4688,55.1406 Q960.8906,55.4375 960.25,55.5781 Q959.6094,55.7344 958.9063,55.7344 Q956.4063,55.7344 955.0781,54.0938 Q953.7656,52.4375 953.7656,49.3125 Q953.7656,46.1875 955.0781,44.5313 Q956.4063,42.875 958.9063,42.875 Q959.6094,42.875 960.25,43.0313 Q960.9063,43.1875 961.4688,43.4844 L961.4688,46.2031 Q960.8438,45.625 960.25,45.3594 Q959.6563,45.0781 959.0313,45.0781 Q957.6875,45.0781 957,46.1563 Q956.3125,47.2188 956.3125,49.3125 Q956.3125,51.4063 957,52.4844 Q957.6875,53.5469 959.0313,53.5469 Q959.6563,53.5469 960.25,53.2813 Q960.8438,53 961.4688,52.4219 L961.4688,55.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="972.5" y="53.6543">Text</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="65.5" y2="65.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="73.5" y2="73.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <g id="elem_C_0000675132943535054947">
+        <rect codeLine="46" fill="#F1F1F1" height="48" id="C_0000675132943535054947" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="7" y="221.05"/>
+        <ellipse cx="22" cy="237.05" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,238.2062 C17,240.7062 19.1406,242.5187 22.0625,242.5187 C23.2969,242.5187 24.4688,242.2219 25.2188,241.7062 C25.8281,241.2844 26.1563,240.8625 26.1563,240.4562 C26.1563,239.9875 25.7344,239.5812 25.2344,239.5812 C25,239.5812 24.7813,239.6594 24.5781,239.8625 C24.1406,240.3 24.1406,240.3 23.9688,240.3937 C23.5156,240.6281 22.875,240.7687 22.1094,240.7687 C20.1094,240.7687 18.8281,239.7531 18.8281,238.175 L18.8281,237.1281 C18.8281,235.425 20.0469,234.2219 21.75,234.2219 C22.3281,234.2219 22.9063,234.3625 23.375,234.6125 C23.8438,234.8781 24.0156,235.0656 24.0781,235.425 C24.2031,236.0969 24.4531,236.3469 24.9844,236.3469 C25.2656,236.3469 25.5469,236.2062 25.7344,235.9875 C25.8594,235.8156 25.9063,235.6437 25.9063,235.2062 L25.9063,233.8469 C25.9063,233.425 25.8906,233.2844 25.7656,233.1125 C25.5938,232.8625 25.3125,232.7062 24.9844,232.7062 C24.6719,232.7062 24.4688,232.8156 24.25,233.0812 C23.0781,232.5812 22.6406,232.4719 21.6875,232.4719 C19.0156,232.4719 17,234.4875 17,237.1125 L17,238.2062 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="36" y="241.656">Line</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="71" y="218.05"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="72" y="232.2501">Color</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="99" y1="253.05" y2="253.05"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="99" y1="261.05" y2="261.05"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="592" y="327"/>
-      <ellipse cx="610.6" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M613.5688,348.6406 Q612.9906,348.9375 612.35,349.0781 Q611.7094,349.2344 611.0063,349.2344 Q608.5063,349.2344 607.1781,347.5938 Q605.8656,345.9375 605.8656,342.8125 Q605.8656,339.6875 607.1781,338.0313 Q608.5063,336.375 611.0063,336.375 Q611.7094,336.375 612.35,336.5313 Q613.0063,336.6875 613.5688,336.9844 L613.5688,339.7031 Q612.9438,339.125 612.35,338.8594 Q611.7563,338.5781 611.1313,338.5781 Q609.7875,338.5781 609.1,339.6563 Q608.4125,340.7188 608.4125,342.8125 Q608.4125,344.9063 609.1,345.9844 Q609.7875,347.0469 611.1313,347.0469 Q611.7563,347.0469 612.35,346.7813 Q612.9438,346.5 613.5688,345.9219 L613.5688,348.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="625.4" y="347.1543">Text</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="41" x="663" y="324"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="664" y="336.1387">T&lt;&gt;...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="359" y2="359"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <g id="elem_C_0001678874302644303776">
+        <rect codeLine="50" fill="#F1F1F1" height="48" id="C_0001678874302644303776" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="587" y="221.05"/>
+        <ellipse cx="602" cy="237.05" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M597,238.2062 C597,240.7062 599.1406,242.5187 602.0625,242.5187 C603.2969,242.5187 604.4688,242.2219 605.2188,241.7062 C605.8281,241.2844 606.1563,240.8625 606.1563,240.4562 C606.1563,239.9875 605.7344,239.5812 605.2344,239.5812 C605,239.5812 604.7813,239.6594 604.5781,239.8625 C604.1406,240.3 604.1406,240.3 603.9688,240.3937 C603.5156,240.6281 602.875,240.7687 602.1094,240.7687 C600.1094,240.7687 598.8281,239.7531 598.8281,238.175 L598.8281,237.1281 C598.8281,235.425 600.0469,234.2219 601.75,234.2219 C602.3281,234.2219 602.9063,234.3625 603.375,234.6125 C603.8438,234.8781 604.0156,235.0656 604.0781,235.425 C604.2031,236.0969 604.4531,236.3469 604.9844,236.3469 C605.2656,236.3469 605.5469,236.2062 605.7344,235.9875 C605.8594,235.8156 605.9063,235.6437 605.9063,235.2062 L605.9063,233.8469 C605.9063,233.425 605.8906,233.2844 605.7656,233.1125 C605.5938,232.8625 605.3125,232.7062 604.9844,232.7062 C604.6719,232.7062 604.4688,232.8156 604.25,233.0812 C603.0781,232.5812 602.6406,232.4719 601.6875,232.4719 C599.0156,232.4719 597,234.4875 597,237.1125 L597,238.2062 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="616" y="241.656">Text</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="73" x="652" y="218.05"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="71" x="653" y="232.2501">Color,Weight</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="588" x2="721" y1="253.05" y2="253.05"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="588" x2="721" y1="261.05" y2="261.05"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598" y="365"/>
-      <ellipse cx="603" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <g id="elem_C_0001887786688778664182">
+        <rect codeLine="54" fill="#F1F1F1" height="48" id="C_0001887786688778664182" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="757.5" y="221.05"/>
+        <ellipse cx="772.5" cy="237.05" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M767.5,238.2062 C767.5,240.7062 769.6406,242.5187 772.5625,242.5187 C773.7969,242.5187 774.9688,242.2219 775.7188,241.7062 C776.3281,241.2844 776.6563,240.8625 776.6563,240.4562 C776.6563,239.9875 776.2344,239.5812 775.7344,239.5812 C775.5,239.5812 775.2813,239.6594 775.0781,239.8625 C774.6406,240.3 774.6406,240.3 774.4688,240.3937 C774.0156,240.6281 773.375,240.7687 772.6094,240.7687 C770.6094,240.7687 769.3281,239.7531 769.3281,238.175 L769.3281,237.1281 C769.3281,235.425 770.5469,234.2219 772.25,234.2219 C772.8281,234.2219 773.4063,234.3625 773.875,234.6125 C774.3438,234.8781 774.5156,235.0656 774.5781,235.425 C774.7031,236.0969 774.9531,236.3469 775.4844,236.3469 C775.7656,236.3469 776.0469,236.2062 776.2344,235.9875 C776.3594,235.8156 776.4063,235.6437 776.4063,235.2062 L776.4063,233.8469 C776.4063,233.425 776.3906,233.2844 776.2656,233.1125 C776.0938,232.8625 775.8125,232.7062 775.4844,232.7062 C775.1719,232.7062 774.9688,232.8156 774.75,233.0812 C773.5781,232.5812 773.1406,232.4719 772.1875,232.4719 C769.5156,232.4719 767.5,234.4875 767.5,237.1125 L767.5,238.2062 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="786.5" y="241.656">Text</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="822.5" y="218.05"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="823.5" y="232.2501">Color</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="758.5" x2="850.5" y1="253.05" y2="253.05"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="758.5" x2="850.5" y1="261.05" y2="261.05"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="612" y="373.2104">display() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <g id="elem_C_0001373544984027721472">
+        <rect codeLine="58" fill="#F1F1F1" height="115.1997" id="C_0001373544984027721472" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="205" x="359" y="7"/>
+        <ellipse cx="432.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M427.25,24.1563 C427.25,26.6563 429.3906,28.4688 432.3125,28.4688 C433.5469,28.4688 434.7188,28.1719 435.4688,27.6563 C436.0781,27.2344 436.4063,26.8125 436.4063,26.4063 C436.4063,25.9375 435.9844,25.5313 435.4844,25.5313 C435.25,25.5313 435.0313,25.6094 434.8281,25.8125 C434.3906,26.25 434.3906,26.25 434.2188,26.3438 C433.7656,26.5781 433.125,26.7188 432.3594,26.7188 C430.3594,26.7188 429.0781,25.7031 429.0781,24.125 L429.0781,23.0781 C429.0781,21.375 430.2969,20.1719 432,20.1719 C432.5781,20.1719 433.1563,20.3125 433.625,20.5625 C434.0938,20.8281 434.2656,21.0156 434.3281,21.375 C434.4531,22.0469 434.7031,22.2969 435.2344,22.2969 C435.5156,22.2969 435.7969,22.1563 435.9844,21.9375 C436.1094,21.7656 436.1563,21.5938 436.1563,21.1563 L436.1563,19.7969 C436.1563,19.375 436.1406,19.2344 436.0156,19.0625 C435.8438,18.8125 435.5625,18.6563 435.2344,18.6563 C434.9219,18.6563 434.7188,18.7656 434.5,19.0313 C433.3281,18.5313 432.8906,18.4219 431.9375,18.4219 C429.2656,18.4219 427.25,20.4375 427.25,23.0625 L427.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="452.75" y="27.606">Window</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="360" x2="563" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="360" x2="563" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="365" y="55.9"/>
+          <ellipse cx="370" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="179" x="379" y="64.0059">border : Line&lt;Color,Weight&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="365" y="72.6999"/>
+          <ellipse cx="370" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="379" y="80.8059">description : Text&lt;Color&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="365" y="89.4998"/>
+          <ellipse cx="370" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="379" y="97.6058">divider : Line&lt;Color&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="365" y="106.2997"/>
+          <ellipse cx="370" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="379" y="114.4057">title : Text&lt;Color,Weight&gt;</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="379.8047" y2="379.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1081" y="27"/>
-      <ellipse cx="1096" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1096.1094,38.3438 L1094.9531,43.4219 L1097.2813,43.4219 L1096.1094,38.3438 Z M1094.625,36.1094 L1097.6094,36.1094 L1100.9688,48.5 L1098.5156,48.5 L1097.75,45.4375 L1094.4688,45.4375 L1093.7188,48.5 L1091.2813,48.5 L1094.625,36.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1110" y="47.1543">ShapeDecorator</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="59" y2="59"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1087" y="65"/>
-      <ellipse cx="1092" cy="70" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="1101" y="73.2104">display() = 0 : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="79.8047" y2="79.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1022" y="194.5"/>
-      <ellipse cx="1052.3" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1055.2688,216.1406 Q1054.6906,216.4375 1054.05,216.5781 Q1053.4094,216.7344 1052.7063,216.7344 Q1050.2063,216.7344 1048.8781,215.0938 Q1047.5656,213.4375 1047.5656,210.3125 Q1047.5656,207.1875 1048.8781,205.5313 Q1050.2063,203.875 1052.7063,203.875 Q1053.4094,203.875 1054.05,204.0313 Q1054.7063,204.1875 1055.2688,204.4844 L1055.2688,207.2031 Q1054.6438,206.625 1054.05,206.3594 Q1053.4563,206.0781 1052.8313,206.0781 Q1051.4875,206.0781 1050.8,207.1563 Q1050.1125,208.2188 1050.1125,210.3125 Q1050.1125,212.4063 1050.8,213.4844 Q1051.4875,214.5469 1052.8313,214.5469 Q1053.4563,214.5469 1054.05,214.2813 Q1054.6438,214 1055.2688,213.4219 L1055.2688,216.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1069.7" y="214.6543">Color</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1125" y="191.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1126" y="203.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="226.5" y2="226.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1028" y="232.5"/>
-      <ellipse cx="1033" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1042" y="240.7104">display() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="247.3047" y2="247.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1166" y="194.5"/>
-      <ellipse cx="1191.35" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1194.3188,216.1406 Q1193.7406,216.4375 1193.1,216.5781 Q1192.4594,216.7344 1191.7563,216.7344 Q1189.2563,216.7344 1187.9281,215.0938 Q1186.6156,213.4375 1186.6156,210.3125 Q1186.6156,207.1875 1187.9281,205.5313 Q1189.2563,203.875 1191.7563,203.875 Q1192.4594,203.875 1193.1,204.0313 Q1193.7563,204.1875 1194.3188,204.4844 L1194.3188,207.2031 Q1193.6938,206.625 1193.1,206.3594 Q1192.5063,206.0781 1191.8813,206.0781 Q1190.5375,206.0781 1189.85,207.1563 Q1189.1625,208.2188 1189.1625,210.3125 Q1189.1625,212.4063 1189.85,213.4844 Q1190.5375,214.5469 1191.8813,214.5469 Q1192.5063,214.5469 1193.1,214.2813 Q1193.6938,214 1194.3188,213.4219 L1194.3188,216.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1207.65" y="214.6543">Weight</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1269" y="191.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1270" y="203.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="226.5" y2="226.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1172" y="232.5"/>
-      <ellipse cx="1177" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1186" y="240.7104">display() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="247.3047" y2="247.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="201"/>
-      <ellipse cx="149" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M151.9688,222.6406 Q151.3906,222.9375 150.75,223.0781 Q150.1094,223.2344 149.4063,223.2344 Q146.9063,223.2344 145.5781,221.5938 Q144.2656,219.9375 144.2656,216.8125 Q144.2656,213.6875 145.5781,212.0313 Q146.9063,210.375 149.4063,210.375 Q150.1094,210.375 150.75,210.5313 Q151.4063,210.6875 151.9688,210.9844 L151.9688,213.7031 Q151.3438,213.125 150.75,212.8594 Q150.1563,212.5781 149.5313,212.5781 Q148.1875,212.5781 147.5,213.6563 Q146.8125,214.7188 146.8125,216.8125 Q146.8125,218.9063 147.5,219.9844 Q148.1875,221.0469 149.5313,221.0469 Q150.1563,221.0469 150.75,220.7813 Q151.3438,220.5 151.9688,219.9219 L151.9688,222.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="221.1543">Line</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="196" y="198"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="197" y="210.1387">Color,Weight</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="233" y2="233"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="241" y2="241"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="201"/>
-      <ellipse cx="21" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,222.6406 Q23.3906,222.9375 22.75,223.0781 Q22.1094,223.2344 21.4063,223.2344 Q18.9063,223.2344 17.5781,221.5938 Q16.2656,219.9375 16.2656,216.8125 Q16.2656,213.6875 17.5781,212.0313 Q18.9063,210.375 21.4063,210.375 Q22.1094,210.375 22.75,210.5313 Q23.4063,210.6875 23.9688,210.9844 L23.9688,213.7031 Q23.3438,213.125 22.75,212.8594 Q22.1563,212.5781 21.5313,212.5781 Q20.1875,212.5781 19.5,213.6563 Q18.8125,214.7188 18.8125,216.8125 Q18.8125,218.9063 19.5,219.9844 Q20.1875,221.0469 21.5313,221.0469 Q22.1563,221.0469 22.75,220.7813 Q23.3438,220.5 23.9688,219.9219 L23.9688,222.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="221.1543">Line</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="68" y="198"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="69" y="210.1387">Color</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="233" y2="233"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="241" y2="241"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="575.5" y="201"/>
-      <ellipse cx="590.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M593.4688,222.6406 Q592.8906,222.9375 592.25,223.0781 Q591.6094,223.2344 590.9063,223.2344 Q588.4063,223.2344 587.0781,221.5938 Q585.7656,219.9375 585.7656,216.8125 Q585.7656,213.6875 587.0781,212.0313 Q588.4063,210.375 590.9063,210.375 Q591.6094,210.375 592.25,210.5313 Q592.9063,210.6875 593.4688,210.9844 L593.4688,213.7031 Q592.8438,213.125 592.25,212.8594 Q591.6563,212.5781 591.0313,212.5781 Q589.6875,212.5781 589,213.6563 Q588.3125,214.7188 588.3125,216.8125 Q588.3125,218.9063 589,219.9844 Q589.6875,221.0469 591.0313,221.0469 Q591.6563,221.0469 592.25,220.7813 Q592.8438,220.5 593.4688,219.9219 L593.4688,222.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="604.5" y="221.1543">Text</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="638.5" y="198"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="639.5" y="210.1387">Color,Weight</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="233" y2="233"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="241" y2="241"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="752.5" y="201"/>
-      <ellipse cx="767.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M770.4688,222.6406 Q769.8906,222.9375 769.25,223.0781 Q768.6094,223.2344 767.9063,223.2344 Q765.4063,223.2344 764.0781,221.5938 Q762.7656,219.9375 762.7656,216.8125 Q762.7656,213.6875 764.0781,212.0313 Q765.4063,210.375 767.9063,210.375 Q768.6094,210.375 769.25,210.5313 Q769.9063,210.6875 770.4688,210.9844 L770.4688,213.7031 Q769.8438,213.125 769.25,212.8594 Q768.6563,212.5781 768.0313,212.5781 Q766.6875,212.5781 766,213.6563 Q765.3125,214.7188 765.3125,216.8125 Q765.3125,218.9063 766,219.9844 Q766.6875,221.0469 768.0313,221.0469 Q768.6563,221.0469 769.25,220.7813 Q769.8438,220.5 770.4688,219.9219 L770.4688,222.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="781.5" y="221.1543">Text</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="815.5" y="198"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="816.5" y="210.1387">Color</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="233" y2="233"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="241" y2="241"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vsm11pcfceju)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="366.5" y="8"/>
-      <ellipse cx="432.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M435.7188,29.6406 Q435.1406,29.9375 434.5,30.0781 Q433.8594,30.2344 433.1563,30.2344 Q430.6563,30.2344 429.3281,28.5938 Q428.0156,26.9375 428.0156,23.8125 Q428.0156,20.6875 429.3281,19.0313 Q430.6563,17.375 433.1563,17.375 Q433.8594,17.375 434.5,17.5313 Q435.1563,17.6875 435.7188,17.9844 L435.7188,20.7031 Q435.0938,20.125 434.5,19.8594 Q433.9063,19.5781 433.2813,19.5781 Q431.9375,19.5781 431.25,20.6563 Q430.5625,21.7188 430.5625,23.8125 Q430.5625,25.9063 431.25,26.9844 Q431.9375,28.0469 433.2813,28.0469 Q433.9063,28.0469 434.5,27.7813 Q435.0938,27.5 435.7188,26.9219 L435.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="453.25" y="28.1543">Window</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="54"/>
-      <ellipse cx="377.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="386.5" y="62.2104">border : Line&lt;Color,Weight&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="66.8047"/>
-      <ellipse cx="377.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="386.5" y="75.0151">description : Text&lt;Color&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="79.6094"/>
-      <ellipse cx="377.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="386.5" y="87.8198">divider : Line&lt;Color&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="92.4141"/>
-      <ellipse cx="377.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="386.5" y="100.6245">title : Text&lt;Color,Weight&gt;</text>
-    </a>
-    <path d="M340.09,276.44 C311.19,293.5 279.87,311.99 254.63,326.9 " fill="none" id="C_0001593092483959332221&lt;-C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="336.91,270.18,357.69,266.04,344.03,282.24,336.91,270.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M510.91,276.44 C539.81,293.5 571.13,311.99 596.37,326.9 " fill="none" id="C_0001593092483959332221&lt;-C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="506.97,282.24,493.31,266.04,514.09,270.18,506.97,282.24" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1127.63,106.48 C1115.27,134.89 1100,169.98 1089.38,194.39 " fill="none" id="C_0002049188825706164566&lt;-C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="1121.23,103.64,1135.63,88.09,1134.07,109.22,1121.23,103.64" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1169.37,106.48 C1181.73,134.89 1197,169.98 1207.62,194.39 " fill="none" id="C_0002049188825706164566&lt;-C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="1162.93,109.22,1161.37,88.09,1175.77,103.64,1162.93,109.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M204.5,249.03 C204.5,265.02 204.5,286.94 204.5,306.81 " fill="none" id="C_0002082936326417164202-&gt;C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="211.5,306.82,204.5,326.82,197.5,306.82,211.5,306.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M79.32,249.03 C100.12,266.88 129.52,292.12 154.6,313.66 " fill="none" id="C_0000675132943535054947-&gt;C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="159.32,308.48,169.93,326.82,150.2,319.1,159.32,308.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M646.5,249.03 C646.5,265.02 646.5,286.94 646.5,306.81 " fill="none" id="C_0001678874302644303776-&gt;C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="653.5,306.82,646.5,326.82,639.5,306.82,653.5,306.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M772.5,249.03 C751.57,266.88 721.98,292.12 696.73,313.66 " fill="none" id="C_0001887786688778664182-&gt;C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="701.06,319.17,681.3,326.82,691.97,308.52,701.06,319.17" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M374.27,114.25 C328.47,143.86 274.65,178.65 240.08,201 " fill="none" id="C_0001373544984027721472&lt;-C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="385.42,107.04,378.2097,106.9346,375.3392,113.5497,382.5495,113.6551,385.42,107.04" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="338.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="345.5" y="150.0669">border</text>
-    <path d="M353.7,91.06 C284.55,113.69 193.4,146.45 116.5,184 C106.49,188.89 96.07,194.94 86.62,200.84 " fill="none" id="C_0001373544984027721472&lt;-C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="366.35,86.96,359.4084,85.0071,354.9358,90.6637,361.8775,92.6166,366.35,86.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="224.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="231.5" y="150.0669">divider</text>
-    <path d="M525.06,115.94 C557.91,145.18 596.01,179.08 620.65,201 " fill="none" id="C_0001373544984027721472&lt;-C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="515.05,107.04,516.8738,114.0167,524.0153,115.0165,522.1915,108.0398,515.05,107.04" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="571.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="578.5" y="150.0669">title</text>
-    <path d="M566.91,103.61 C618.27,126.3 680.35,155.07 734.5,184 C744.2,189.18 754.44,195.21 763.86,200.99 " fill="none" id="C_0001373544984027721472&lt;-C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="554.77,98.28,558.648,104.3596,565.7514,103.1182,561.8734,97.0386,554.77,98.28" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="674.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="681.5" y="150.0669">description</text>
+    <g id="link_C_0001593092483959332221_C_0000142374082478337852">
+      <path codeLine="65" d="M338.4856,300.7146 C306.0856,320.3946 284.3,333.62 254.89,351.48 " fill="none" id="C_0001593092483959332221-backto-C_0000142374082478337852" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="353.87,291.37,335.3708,295.5865,341.6005,305.8427,353.87,291.37" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001593092483959332221_C_0001114634647721878603">
+      <path codeLine="66" d="M518.5144,300.7146 C550.9144,320.3946 572.7,333.62 602.11,351.48 " fill="none" id="C_0001593092483959332221-backto-C_0001114634647721878603" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="503.13,291.37,515.3995,305.8427,521.6292,295.5865,503.13,291.37" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002049188825706164566_C_0001473536569433029444">
+      <path codeLine="67" d="M1139.5076,114.8909 C1125.6676,147.3909 1111.64,180.32 1097.97,212.43 " fill="none" id="C_0002049188825706164566-backto-C_0001473536569433029444" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="1146.56,98.33,1133.9873,112.5401,1145.0279,117.2417,1146.56,98.33" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002049188825706164566_C_0002049455532387561338">
+      <path codeLine="68" d="M1181.7541,114.8559 C1195.7841,147.3559 1210,180.32 1223.85,212.43 " fill="none" id="C_0002049188825706164566-backto-C_0002049455532387561338" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="1174.62,98.33,1176.2455,117.2339,1187.2627,112.4778,1174.62,98.33" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002082936326417164202_C_0000142374082478337852">
+      <path codeLine="69" d="M202.5,269.33 C202.5,291.97 202.5,308.52 202.5,333.65 " fill="none" id="C_0002082936326417164202-to-C_0000142374082478337852" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="202.5,351.65,208.5,333.65,196.5,333.65,202.5,351.65" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000675132943535054947_C_0000142374082478337852">
+      <path codeLine="70" d="M78.78,269.33 C103.35,291.97 127.6211,314.3245 154.9011,339.4545 " fill="none" id="C_0000675132943535054947-to-C_0000142374082478337852" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="168.14,351.65,158.9663,335.0415,150.8359,343.8674,168.14,351.65" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001678874302644303776_C_0001114634647721878603">
+      <path codeLine="71" d="M654.5,269.33 C654.5,291.97 654.5,308.52 654.5,333.65 " fill="none" id="C_0001678874302644303776-to-C_0001114634647721878603" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="654.5,351.65,660.5,333.65,648.5,333.65,654.5,351.65" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001887786688778664182_C_0001114634647721878603">
+      <path codeLine="72" d="M779.05,269.33 C754.31,291.97 729.8288,314.3679 702.3688,339.4979 " fill="none" id="C_0001887786688778664182-to-C_0001114634647721878603" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="689.09,351.65,706.4195,343.9242,698.3181,335.0716,689.09,351.65" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001373544984027721472_C_0002082936326417164202">
+      <path codeLine="73" d="M368.9593,129.3596 C320.6993,162.6196 272.28,195.97 236.3,220.76 " fill="none" id="C_0001373544984027721472-backto-C_0002082936326417164202" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="378.84,122.55,371.6298,122.6612,368.9593,129.3596,376.1695,129.2484,378.84,122.55" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="338.5" cy="161.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="345.5" y="165.277">border</text>
+    </g>
+    <g id="link_C_0001373544984027721472_C_0000675132943535054947">
+      <path codeLine="74" d="M347.237,102.5563 C277.637,126.5863 195.99,158.1 118.5,199.2 C106.87,205.37 94.83,213.22 84.31,220.62 " fill="none" id="C_0001373544984027721472-backto-C_0000675132943535054947" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="358.58,98.64,351.6031,96.8171,347.237,102.5563,354.2139,104.3791,358.58,98.64" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="216.5" cy="161.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="38" x="223.5" y="165.277">divider</text>
+    </g>
+    <g id="link_C_0001373544984027721472_C_0001678874302644303776">
+      <path codeLine="75" d="M531.9096,130.6981 C567.8696,163.9581 602.5,195.97 629.31,220.76 " fill="none" id="C_0001373544984027721472-backto-C_0001678874302644303776" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="523.1,122.55,524.7887,129.5606,531.9096,130.6981,530.2208,123.6875,523.1,122.55" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="576.5" cy="161.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="583.5" y="165.277">title</text>
+    </g>
+    <g id="link_C_0001373544984027721472_C_0001887786688778664182">
+      <path codeLine="76" d="M575.3942,115.418 C628.6742,139.768 683.23,166.54 739.5,199.2 C750.65,205.67 762.37,213.44 772.75,220.67 " fill="none" id="C_0001373544984027721472-backto-C_0001887786688778664182" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="564.48,110.43,568.2744,116.5621,575.3942,115.418,571.5998,109.2859,564.48,110.43" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="686.5" cy="161.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="693.5" y="165.277">description</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00027_class_mermaid.svg b/docs/test_cases/t00027_class_mermaid.svg
index c0e56f14..3d24f677 100644
--- a/docs/test_cases/t00027_class_mermaid.svg
+++ b/docs/test_cases/t00027_class_mermaid.svg
@@ -1,67 +1,72 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1383.734375 481" style="max-width: 1383.73px; background-color: white;" width="1383.734375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1410.40625 481" style="max-width: 1410.41px; background-color: white;" width="1410.40625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M135.13236091040463,344L134.65066534200386,348.1666666666667C134.1689697736031,352.3333333333333,133.20557863680153,360.6666666666667,227.3853414017341,374.4984953417429C321.5651041666667,388.33032401681913,510.8880208333333,407.6606480336384,605.5494791666666,417.325810042048L700.2109375,426.9909720504576"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M276.484375,321.0959361204882L304.25390625,329.0799467670735C332.0234375,337.0639574136588,387.5625,353.0319787068294,520.3033854166666,370.7779067203299C653.0442708333334,388.5238347338304,862.9869791666666,408.04766946766085,967.9583333333334,417.80958683457607L1072.9296875,427.57150420149134"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M436.9010416666667,131L429.1232638888889,140.33333333333334C421.34548611111114,149.66666666666666,405.7899305555556,168.33333333333334,398.0121527777778,187C390.234375,205.66666666666666,390.234375,224.33333333333334,390.234375,233.66666666666666L390.234375,243"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M521.0677083333334,131L528.8454861111112,140.33333333333334C536.6232638888889,149.66666666666666,552.1788194444445,168.33333333333334,559.9565972222223,187C567.734375,205.66666666666666,567.734375,224.33333333333334,567.734375,233.66666666666666L567.734375,243"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M763.9609375,311L763.9609375,320.6666666666667C763.9609375,330.3333333333333,763.9609375,349.6666666666667,763.9609375,363.5C763.9609375,377.3333333333333,763.9609375,385.6666666666667,763.9609375,389.8333333333333L763.9609375,394"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M950.6171875,311L950.6171875,320.6666666666667C950.6171875,330.3333333333333,950.6171875,349.6666666666667,930.1328125,366.4118114850159C909.6484375,383.1569563033651,868.6796875,397.3139126067303,848.1953125,404.39239075841283L827.7109375,411.4708689100954"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1136.6796875,311L1136.6796875,320.6666666666667C1136.6796875,330.3333333333333,1136.6796875,349.6666666666667,1136.6796875,363.5C1136.6796875,377.3333333333333,1136.6796875,385.6666666666667,1136.6796875,389.8333333333333L1136.6796875,394"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1322.1484375,311L1322.1484375,320.6666666666667C1322.1484375,330.3333333333333,1322.1484375,349.6666666666667,1301.8619791666667,366.3883038472339C1281.5755208333333,383.10994102780114,1241.0026041666667,397.21988205560234,1220.7161458333333,404.2748525695029L1200.4296875,411.32982308340354"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M931.5625,123.18032122905028L903.62890625,133.8169343575419C875.6953125,144.4535474860335,819.828125,165.72677374301676,791.89453125,187.53005353817503C763.9609375,209.33333333333334,763.9609375,231.66666666666666,763.9609375,242.83333333333334L763.9609375,254"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M980.317304870892,153L975.3672853090767,158.66666666666666C970.4172657472614,164.33333333333334,960.5172266236308,175.66666666666666,955.5672070618153,192.5C950.6171875,209.33333333333334,950.6171875,231.66666666666666,950.6171875,242.83333333333334L950.6171875,254"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M1106.979570129108,153L1111.9295896909232,158.66666666666666C1116.8796092527386,164.33333333333334,1126.7796483763693,175.66666666666666,1131.7296679381845,192.5C1136.6796875,209.33333333333334,1136.6796875,231.66666666666666,1136.6796875,242.83333333333334L1136.6796875,254"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M1155.734375,123.36230644075404L1183.4700520833333,133.96858870062837C1211.2057291666667,144.5748709605027,1266.6770833333333,165.78743548025133,1294.4127604166667,187.56038440679234C1322.1484375,209.33333333333334,1322.1484375,231.66666666666666,1322.1484375,242.83333333333334L1322.1484375,254"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M137.51051644471434,361.880907753221L137.37334703726194,363.06742312768415C137.23617762980956,364.2539385021473,136.96183881490478,366.62696925107366,234.44966940745238,377.44244346909454C331.9375,388.2579176871154,527.1875,407.5158353742309,624.8125,417.1447942177886L722.4375,426.7737530613464"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M302.7206011993314,325.76296867160823L328.7105270411095,332.9691405596735C354.70045288288765,340.1753124477388,406.6803045664438,354.5876562238694,538.7529126998885,371.50351514249434C670.8255208333334,388.4193740611194,882.9908854166666,407.83874812223877,989.0735677083334,417.54843515279845L1095.15625,427.2581221833582"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M440.72077475584746,144.5458880483098L434.52903104653956,151.62157337359147C428.33728733723166,158.69725869887318,415.95379991861586,172.84862934943658,409.7620562093079,189.25764800805163C403.5703125,205.66666666666666,403.5703125,224.33333333333334,403.5703125,233.66666666666666L403.5703125,243"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M552.8104752441526,144.5458880483098L559.0022189534606,151.62157337359147C565.1939626627684,158.69725869887318,577.5774500813842,172.84862934943658,583.7691937906922,189.25764800805163C589.9609375,205.66666666666666,589.9609375,224.33333333333334,589.9609375,233.66666666666666L589.9609375,243"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M790.6328125,311L790.6328125,320.6666666666667C790.6328125,330.3333333333333,790.6328125,349.6666666666667,790.6328125,360.5C790.6328125,371.3333333333333,790.6328125,373.6666666666667,790.6328125,374.8333333333333L790.6328125,376"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M977.2890625,311L977.2890625,320.6666666666667C977.2890625,330.3333333333333,977.2890625,349.6666666666667,960.3810556163503,365.1759796095518C943.4730487327006,380.685292552437,909.6570349654012,392.37058510487395,892.7490280817515,398.2132313810924L875.8410211981018,404.0558776573109"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1163.3515625,311L1163.3515625,320.6666666666667C1163.3515625,330.3333333333333,1163.3515625,349.6666666666667,1163.3515625,360.5C1163.3515625,371.3333333333333,1163.3515625,373.6666666666667,1163.3515625,374.8333333333333L1163.3515625,376"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1348.8203125,311L1348.8203125,320.6666666666667C1348.8203125,330.3333333333333,1348.8203125,349.6666666666667,1332.1082814965011,365.14523425856027C1315.396250493002,380.62380185045384,1281.9721884860044,392.24760370090763,1265.2601574825055,398.05950462613464L1248.5481264790064,403.87140555136153"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M941.412643169267,129.5857359864959L916.2826713910558,139.15477998874658C891.1526996128447,148.72382399099726,840.8927560564224,167.86191199549864,815.7627842782111,188.59762266441598C790.6328125,209.33333333333334,790.6328125,231.66666666666666,790.6328125,242.83333333333334L790.6328125,254"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M995.1473655021362,166.5562322367215L992.1709816684469,169.9635268639346C989.1945978347575,173.37082149114767,983.2418301673788,180.18541074557382,980.2654463336894,194.75937203945355C977.2890625,209.33333333333334,977.2890625,231.66666666666666,977.2890625,242.83333333333334L977.2890625,254"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M1145.4932594978638,166.5562322367215L1148.4696433315532,169.9635268639346C1151.4460271652426,173.37082149114767,1157.3987948326212,180.18541074557382,1160.3751786663106,194.75937203945355C1163.3515625,209.33333333333334,1163.3515625,231.66666666666666,1163.3515625,242.83333333333334L1163.3515625,254"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M1199.218886861951,129.79155536641932L1224.1524578016258,139.32629613868275C1249.0860287413007,148.8610369109462,1298.9531706206503,167.9305184554731,1323.8867415603252,188.63192589440322C1348.8203125,209.33333333333334,1348.8203125,231.66666666666666,1348.8203125,242.83333333333334L1348.8203125,254"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -144,7 +149,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(763.9609375, 187)" class="edgeLabel">
+        <g transform="translate(790.6328125, 187)" class="edgeLabel">
           <g transform="translate(-27.796875, -9)" class="label">
             <foreignObject height="18" width="55.59375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -155,7 +160,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(950.6171875, 187)" class="edgeLabel">
+        <g transform="translate(977.2890625, 187)" class="edgeLabel">
           <g transform="translate(-28.2421875, -9)" class="label">
             <foreignObject height="18" width="56.484375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -166,7 +171,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1136.6796875, 187)" class="edgeLabel">
+        <g transform="translate(1163.3515625, 187)" class="edgeLabel">
           <g transform="translate(-17.125, -9)" class="label">
             <foreignObject height="18" width="34.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -177,7 +182,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1322.1484375, 187)" class="edgeLabel">
+        <g transform="translate(1348.8203125, 187)" class="edgeLabel">
           <g transform="translate(-43.359375, -9)" class="label">
             <foreignObject height="18" width="86.71875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -190,11 +195,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L8">
+        <a transform="translate(146.6875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L8">
           <g title="Shape" id="classId-C_0001593092483959332221-0" class="node default clickable">
-            <rect height="123" width="268.484375" y="-61.5" x="-134.2421875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
+            <rect height="123" width="277.375" y="-61.5" x="-138.6875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="138.6875" x1="-138.6875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="138.6875" x1="-138.6875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -206,20 +211,20 @@
                   <span class="nodeLabel">Shape</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -126.7421875, 14)" height="18" width="253.484375">
+              <foreignObject transform="translate( -131.1875, 14)" height="18" width="262.375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Shape() : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~Shape() : : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -126.7421875, 36)" height="18" width="112.5">
+              <foreignObject transform="translate( -131.1875, 36)" height="18" width="121.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+display() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+display() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15">
+        <a transform="translate(256.8046875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0001568932879061562228-1" class="node default clickable">
             <rect height="57" width="47.890625" y="-28.5" x="-23.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.9453125" x1="-23.9453125" class="divider"/>
@@ -238,11 +243,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15">
+        <a transform="translate(790.6328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000142374082478337852-2" class="node default clickable">
-            <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
+            <rect height="79" width="136.390625" y="-39.5" x="-68.1953125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -254,15 +259,15 @@
                   <span class="nodeLabel">Line&lt;T&lt;&gt;...&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -56.25, 14)" height="18" width="112.5">
+              <foreignObject transform="translate( -60.6953125, 14)" height="18" width="121.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+display() : void</span>
+                  <span class="nodeLabel">+display() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25">
+        <a transform="translate(354.109375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001833467466291294724-3" class="node default clickable">
             <rect height="57" width="46.71875" y="-28.5" x="-23.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.359375" x1="-23.359375" class="divider"/>
@@ -281,11 +286,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1163.3515625, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001114634647721878603-4" class="node default clickable">
-            <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
+            <rect height="79" width="136.390625" y="-39.5" x="-68.1953125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -297,15 +302,15 @@
                   <span class="nodeLabel">Text&lt;T&lt;&gt;...&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -56.25, 14)" height="18" width="112.5">
+              <foreignObject transform="translate( -60.6953125, 14)" height="18" width="121.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+display() : void</span>
+                  <span class="nodeLabel">+display() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L34">
+        <a transform="translate(496.765625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L34">
           <g title="ShapeDecorator" id="classId-C_0002049188825706164566-5" class="node default clickable">
             <rect height="101" width="138.59375" y="-50.5" x="-69.296875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="69.296875" x1="-69.296875" class="divider"/>
@@ -321,19 +326,19 @@
                   <span class="nodeLabel">ShapeDecorator</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -61.796875, 25)" height="18" width="112.5">
+              <foreignObject transform="translate( -61.796875, 25)" height="18" width="121.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+display() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+display() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L38">
+        <a transform="translate(403.5703125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L38">
           <g title="Color" id="classId-C_0001473536569433029444-6" class="node default clickable">
-            <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
+            <rect height="79" width="136.390625" y="-39.5" x="-68.1953125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -345,19 +350,19 @@
                   <span class="nodeLabel">Color&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -56.25, 14)" height="18" width="112.5">
+              <foreignObject transform="translate( -60.6953125, 14)" height="18" width="121.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+display() : void</span>
+                  <span class="nodeLabel">+display() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L43">
+        <a transform="translate(589.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L43">
           <g title="Weight" id="classId-C_0002049455532387561338-7" class="node default clickable">
-            <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
+            <rect height="79" width="136.390625" y="-39.5" x="-68.1953125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -369,15 +374,15 @@
                   <span class="nodeLabel">Weight&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -56.25, 14)" height="18" width="112.5">
+              <foreignObject transform="translate( -60.6953125, 14)" height="18" width="121.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+display() : void</span>
+                  <span class="nodeLabel">+display() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15">
+        <a transform="translate(790.6328125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0002082936326417164202-8" class="node default clickable">
             <rect height="57" width="164.953125" y="-28.5" x="-82.4765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.4765625" x1="-82.4765625" class="divider"/>
@@ -396,7 +401,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L15">
+        <a transform="translate(977.2890625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000675132943535054947-9" class="node default clickable">
             <rect height="57" width="108.359375" y="-28.5" x="-54.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="54.1796875" x1="-54.1796875" class="divider"/>
@@ -415,7 +420,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1163.3515625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001678874302644303776-10" class="node default clickable">
             <rect height="57" width="163.765625" y="-28.5" x="-81.8828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.8828125" x1="-81.8828125" class="divider"/>
@@ -434,7 +439,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1348.8203125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001887786688778664182-11" class="node default clickable">
             <rect height="57" width="107.171875" y="-28.5" x="-53.5859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="53.5859375" x1="-53.5859375" class="divider"/>
@@ -453,7 +458,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00027/t00027.cc#L48">
+        <a transform="translate(1070.3203125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L48">
           <g title="Window" id="classId-C_0001373544984027721472-12" class="node default clickable">
             <rect height="145" width="224.171875" y="-72.5" x="-112.0859375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="112.0859375" x1="-112.0859375" class="divider"/>
diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md
index e974c36d..3eea0c92 100644
--- a/docs/test_cases/t00028.md
+++ b/docs/test_cases/t00028.md
@@ -19,7 +19,7 @@ diagrams:
 
 ```
 ## Source code
-File t00028.cc
+File `tests/t00028/t00028.cc`
 ```cpp
 #include <memory>
 #include <vector>
@@ -421,6 +421,7 @@ class R {
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index 71839075..3f5d3d01 100644
--- a/docs/test_cases/t00028_class.svg
+++ b/docs/test_cases/t00028_class.svg
@@ -1,203 +1,243 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="410px" preserveAspectRatio="none" style="width:1066px;height:410px;" version="1.1" viewBox="0 0 1066 410" width="1066px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="439px" preserveAspectRatio="none" style="width:1034px;height:439px;background:#FFFFFF;" version="1.1" viewBox="0 0 1034 439" width="1034px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lpbnd9epnads" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="63.5" y="226.5"/>
-      <ellipse cx="78.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M81.4688,248.1406 Q80.8906,248.4375 80.25,248.5781 Q79.6094,248.7344 78.9063,248.7344 Q76.4063,248.7344 75.0781,247.0938 Q73.7656,245.4375 73.7656,242.3125 Q73.7656,239.1875 75.0781,237.5313 Q76.4063,235.875 78.9063,235.875 Q79.6094,235.875 80.25,236.0313 Q80.9063,236.1875 81.4688,236.4844 L81.4688,239.2031 Q80.8438,238.625 80.25,238.3594 Q79.6563,238.0781 79.0313,238.0781 Q77.6875,238.0781 77,239.1563 Q76.3125,240.2188 76.3125,242.3125 Q76.3125,244.4063 77,245.4844 Q77.6875,246.5469 79.0313,246.5469 Q79.6563,246.5469 80.25,246.2813 Q80.8438,246 81.4688,245.4219 L81.4688,248.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="92.5" y="246.6543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="258.5" y2="258.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="266.5" y2="266.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001519850480962783588">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001519850480962783588" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="84.5" y="254"/>
+        <ellipse cx="99.5" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M94.5,271.1563 C94.5,273.6563 96.6406,275.4688 99.5625,275.4688 C100.7969,275.4688 101.9688,275.1719 102.7188,274.6563 C103.3281,274.2344 103.6563,273.8125 103.6563,273.4063 C103.6563,272.9375 103.2344,272.5313 102.7344,272.5313 C102.5,272.5313 102.2813,272.6094 102.0781,272.8125 C101.6406,273.25 101.6406,273.25 101.4688,273.3438 C101.0156,273.5781 100.375,273.7188 99.6094,273.7188 C97.6094,273.7188 96.3281,272.7031 96.3281,271.125 L96.3281,270.0781 C96.3281,268.375 97.5469,267.1719 99.25,267.1719 C99.8281,267.1719 100.4063,267.3125 100.875,267.5625 C101.3438,267.8281 101.5156,268.0156 101.5781,268.375 C101.7031,269.0469 101.9531,269.2969 102.4844,269.2969 C102.7656,269.2969 103.0469,269.1563 103.2344,268.9375 C103.3594,268.7656 103.4063,268.5938 103.4063,268.1563 L103.4063,266.7969 C103.4063,266.375 103.3906,266.2344 103.2656,266.0625 C103.0938,265.8125 102.8125,265.6563 102.4844,265.6563 C102.1719,265.6563 101.9688,265.7656 101.75,266.0313 C100.5781,265.5313 100.1406,265.4219 99.1875,265.4219 C96.5156,265.4219 94.5,267.4375 94.5,270.0625 L94.5,271.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="113.5" y="274.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="124.5" y1="286" y2="286"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="124.5" y1="294" y2="294"/>
+      </g>
     </a>
-    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L55.25,89.6328 L80,226.42 L63.25,89.6328 L109,89.6328 A0,0 0 0 0 109,89.6328 L109,74.5 L99,64.5 L6,64.5 A0,0 0 0 0 6,64.5 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M99,64.5 L99,74.5 L109,74.5 L99,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="12" y="81.5669">A class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="707.5" y="226.5"/>
-      <ellipse cx="722.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M725.4688,248.1406 Q724.8906,248.4375 724.25,248.5781 Q723.6094,248.7344 722.9063,248.7344 Q720.4063,248.7344 719.0781,247.0938 Q717.7656,245.4375 717.7656,242.3125 Q717.7656,239.1875 719.0781,237.5313 Q720.4063,235.875 722.9063,235.875 Q723.6094,235.875 724.25,236.0313 Q724.9063,236.1875 725.4688,236.4844 L725.4688,239.2031 Q724.8438,238.625 724.25,238.3594 Q723.6563,238.0781 723.0313,238.0781 Q721.6875,238.0781 721,239.1563 Q720.3125,240.2188 720.3125,242.3125 Q720.3125,244.4063 721,245.4844 Q721.6875,246.5469 723.0313,246.5469 Q723.6563,246.5469 724.25,246.2813 Q724.8438,246 725.4688,245.4219 L725.4688,248.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="736.5" y="246.6543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="258.5" y2="258.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="266.5" y2="266.5"/>
+    <g id="elem_GMN3">
+      <path d="M6,77 L6,102.6 A0,0 0 0 0 6,102.6 L54.28,102.6 L98.76,253.77 L62.28,102.6 L104,102.6 A0,0 0 0 0 104,102.6 L104,87 L94,77 L6,77 A0,0 0 0 0 6,77 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M94,77 L94,87 L104,87 L94,77 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="12" y="94.077">A class note.</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001980597091567213070">
+        <rect codeLine="9" fill="#F1F1F1" height="48" id="C_0001980597091567213070" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="689.5" y="254"/>
+        <ellipse cx="704.5" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M699.5,271.1563 C699.5,273.6563 701.6406,275.4688 704.5625,275.4688 C705.7969,275.4688 706.9688,275.1719 707.7188,274.6563 C708.3281,274.2344 708.6563,273.8125 708.6563,273.4063 C708.6563,272.9375 708.2344,272.5313 707.7344,272.5313 C707.5,272.5313 707.2813,272.6094 707.0781,272.8125 C706.6406,273.25 706.6406,273.25 706.4688,273.3438 C706.0156,273.5781 705.375,273.7188 704.6094,273.7188 C702.6094,273.7188 701.3281,272.7031 701.3281,271.125 L701.3281,270.0781 C701.3281,268.375 702.5469,267.1719 704.25,267.1719 C704.8281,267.1719 705.4063,267.3125 705.875,267.5625 C706.3438,267.8281 706.5156,268.0156 706.5781,268.375 C706.7031,269.0469 706.9531,269.2969 707.4844,269.2969 C707.7656,269.2969 708.0469,269.1563 708.2344,268.9375 C708.3594,268.7656 708.4063,268.5938 708.4063,268.1563 L708.4063,266.7969 C708.4063,266.375 708.3906,266.2344 708.2656,266.0625 C708.0938,265.8125 707.8125,265.6563 707.4844,265.6563 C707.1719,265.6563 706.9688,265.7656 706.75,266.0313 C705.5781,265.5313 705.1406,265.4219 704.1875,265.4219 C701.5156,265.4219 699.5,267.4375 699.5,270.0625 L699.5,271.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="718.5" y="274.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="690.5" x2="729.5" y1="286" y2="286"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="690.5" x2="729.5" y1="294" y2="294"/>
+      </g>
     </a>
-    <path d="M569,238 L569,263.1328 A0,0 0 0 0 569,263.1328 L672,263.1328 A0,0 0 0 0 672,263.1328 L672,256 L707.24,250.5 L672,248 L672,248 L662,238 L569,238 A0,0 0 0 0 569,238 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M662,238 L662,248 L672,248 L662,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="575" y="255.0669">B class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="269.5" y="226.5"/>
-      <ellipse cx="284.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M287.4688,248.1406 Q286.8906,248.4375 286.25,248.5781 Q285.6094,248.7344 284.9063,248.7344 Q282.4063,248.7344 281.0781,247.0938 Q279.7656,245.4375 279.7656,242.3125 Q279.7656,239.1875 281.0781,237.5313 Q282.4063,235.875 284.9063,235.875 Q285.6094,235.875 286.25,236.0313 Q286.9063,236.1875 287.4688,236.4844 L287.4688,239.2031 Q286.8438,238.625 286.25,238.3594 Q285.6563,238.0781 285.0313,238.0781 Q283.6875,238.0781 283,239.1563 Q282.3125,240.2188 282.3125,242.3125 Q282.3125,244.4063 283,245.4844 Q283.6875,246.5469 285.0313,246.5469 Q285.6563,246.5469 286.25,246.2813 Q286.8438,246 287.4688,245.4219 L287.4688,248.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="298.5" y="246.6543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="258.5" y2="258.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="266.5" y2="266.5"/>
+    <g id="elem_GMN7">
+      <path d="M557,265.2 L557,290.8 A0,0 0 0 0 557,290.8 L655,290.8 A0,0 0 0 0 655,290.8 L655,283.2 L689.01,278 L655,275.2 L655,275.2 L645,265.2 L557,265.2 A0,0 0 0 0 557,265.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M645,265.2 L645,275.2 L655,275.2 L645,265.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="563" y="282.277">B class note.</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000984577258575112753">
+        <rect codeLine="16" fill="#F1F1F1" height="48" id="C_0000984577258575112753" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="259" y="254"/>
+        <ellipse cx="274" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M269,271.1563 C269,273.6563 271.1406,275.4688 274.0625,275.4688 C275.2969,275.4688 276.4688,275.1719 277.2188,274.6563 C277.8281,274.2344 278.1563,273.8125 278.1563,273.4063 C278.1563,272.9375 277.7344,272.5313 277.2344,272.5313 C277,272.5313 276.7813,272.6094 276.5781,272.8125 C276.1406,273.25 276.1406,273.25 275.9688,273.3438 C275.5156,273.5781 274.875,273.7188 274.1094,273.7188 C272.1094,273.7188 270.8281,272.7031 270.8281,271.125 L270.8281,270.0781 C270.8281,268.375 272.0469,267.1719 273.75,267.1719 C274.3281,267.1719 274.9063,267.3125 275.375,267.5625 C275.8438,267.8281 276.0156,268.0156 276.0781,268.375 C276.2031,269.0469 276.4531,269.2969 276.9844,269.2969 C277.2656,269.2969 277.5469,269.1563 277.7344,268.9375 C277.8594,268.7656 277.9063,268.5938 277.9063,268.1563 L277.9063,266.7969 C277.9063,266.375 277.8906,266.2344 277.7656,266.0625 C277.5938,265.8125 277.3125,265.6563 276.9844,265.6563 C276.6719,265.6563 276.4688,265.7656 276.25,266.0313 C275.0781,265.5313 274.6406,265.4219 273.6875,265.4219 C271.0156,265.4219 269,267.4375 269,270.0625 L269,271.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="288" y="274.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="260" x2="300" y1="286" y2="286"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="260" x2="300" y1="294" y2="294"/>
+      </g>
     </a>
-    <path d="M182,357 L182,382.1328 A0,0 0 0 0 182,382.1328 L285,382.1328 A0,0 0 0 0 285,382.1328 L285,367 L275,357 L243.08,357 L278.44,274.62 L235.08,357 L182,357 A0,0 0 0 0 182,357 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M275,357 L275,367 L285,367 L275,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="188" y="374.0669">C class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="872" y="226.5"/>
-      <ellipse cx="887" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M889.9688,248.1406 Q889.3906,248.4375 888.75,248.5781 Q888.1094,248.7344 887.4063,248.7344 Q884.9063,248.7344 883.5781,247.0938 Q882.2656,245.4375 882.2656,242.3125 Q882.2656,239.1875 883.5781,237.5313 Q884.9063,235.875 887.4063,235.875 Q888.1094,235.875 888.75,236.0313 Q889.4063,236.1875 889.9688,236.4844 L889.9688,239.2031 Q889.3438,238.625 888.75,238.3594 Q888.1563,238.0781 887.5313,238.0781 Q886.1875,238.0781 885.5,239.1563 Q884.8125,240.2188 884.8125,242.3125 Q884.8125,244.4063 885.5,245.4844 Q886.1875,246.5469 887.5313,246.5469 Q888.1563,246.5469 888.75,246.2813 Q889.3438,246 889.9688,245.4219 L889.9688,248.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="901" y="246.6543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="258.5" y2="258.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="266.5" y2="266.5"/>
+    <g id="elem_GMN11">
+      <path d="M180,387 L180,412.6 A0,0 0 0 0 180,412.6 L278,412.6 A0,0 0 0 0 278,412.6 L278,397 L268,387 L238.11,387 L270.05,302.38 L230.11,387 L180,387 A0,0 0 0 0 180,387 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M268,387 L268,397 L278,397 L268,387 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="186" y="404.077">C class note.</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001263778658518784070">
+        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0001263778658518784070" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="852" y="254"/>
+        <ellipse cx="867" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M862,271.1563 C862,273.6563 864.1406,275.4688 867.0625,275.4688 C868.2969,275.4688 869.4688,275.1719 870.2188,274.6563 C870.8281,274.2344 871.1563,273.8125 871.1563,273.4063 C871.1563,272.9375 870.7344,272.5313 870.2344,272.5313 C870,272.5313 869.7813,272.6094 869.5781,272.8125 C869.1406,273.25 869.1406,273.25 868.9688,273.3438 C868.5156,273.5781 867.875,273.7188 867.1094,273.7188 C865.1094,273.7188 863.8281,272.7031 863.8281,271.125 L863.8281,270.0781 C863.8281,268.375 865.0469,267.1719 866.75,267.1719 C867.3281,267.1719 867.9063,267.3125 868.375,267.5625 C868.8438,267.8281 869.0156,268.0156 869.0781,268.375 C869.2031,269.0469 869.4531,269.2969 869.9844,269.2969 C870.2656,269.2969 870.5469,269.1563 870.7344,268.9375 C870.8594,268.7656 870.9063,268.5938 870.9063,268.1563 L870.9063,266.7969 C870.9063,266.375 870.8906,266.2344 870.7656,266.0625 C870.5938,265.8125 870.3125,265.6563 869.9844,265.6563 C869.6719,265.6563 869.4688,265.7656 869.25,266.0313 C868.0781,265.5313 867.6406,265.4219 866.6875,265.4219 C864.0156,265.4219 862,267.4375 862,270.0625 L862,271.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="881" y="274.606">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="853" x2="893" y1="286" y2="286"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="853" x2="893" y1="294" y2="294"/>
+      </g>
     </a>
-    <path d="M782.5,223 L782.5,278.3984 A0,0 0 0 0 782.5,278.3984 L836.5,278.3984 A0,0 0 0 0 836.5,278.3984 L836.5,254.5 L871.59,250.5 L836.5,246.5 L836.5,233 L826.5,223 L782.5,223 A0,0 0 0 0 782.5,223 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M826.5,223 L826.5,233 L836.5,233 L826.5,223 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="788.5" y="240.0669">D</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="788.5" y="255.1997">class</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="788.5" y="270.3325">note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="519.5" y="339"/>
-      <ellipse cx="548.45" cy="355" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M551.4188,360.6406 Q550.8406,360.9375 550.2,361.0781 Q549.5594,361.2344 548.8563,361.2344 Q546.3563,361.2344 545.0281,359.5938 Q543.7156,357.9375 543.7156,354.8125 Q543.7156,351.6875 545.0281,350.0313 Q546.3563,348.375 548.8563,348.375 Q549.5594,348.375 550.2,348.5313 Q550.8563,348.6875 551.4188,348.9844 L551.4188,351.7031 Q550.7938,351.125 550.2,350.8594 Q549.6063,350.5781 548.9813,350.5781 Q547.6375,350.5781 546.95,351.6563 Q546.2625,352.7188 546.2625,354.8125 Q546.2625,356.9063 546.95,357.9844 Q547.6375,359.0469 548.9813,359.0469 Q549.6063,359.0469 550.2,358.7813 Q550.7938,358.5 551.4188,357.9219 L551.4188,360.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="565.55" y="359.1543">E</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="595.5" y="336"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="596.5" y="348.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="371" y2="371"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="379" y2="379"/>
+    <g id="elem_GMN15">
+      <path d="M765,249.6 L765,306.4 A0,0 0 0 0 765,306.4 L817,306.4 A0,0 0 0 0 817,306.4 L817,282 L851.66,278 L817,274 L817,259.6 L807,249.6 L765,249.6 A0,0 0 0 0 765,249.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M807,249.6 L807,259.6 L817,259.6 L807,249.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="9" x="771" y="266.677">D</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="771" y="282.277">class</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="771" y="297.877">note.</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001014136565447389473">
+        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0001014136565447389473" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="88" x="500" y="367.4"/>
+        <ellipse cx="531.2" cy="383.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M526.2,384.5563 C526.2,387.0563 528.3406,388.8688 531.2625,388.8688 C532.4969,388.8688 533.6688,388.5719 534.4188,388.0563 C535.0281,387.6344 535.3563,387.2125 535.3563,386.8063 C535.3563,386.3375 534.9344,385.9313 534.4344,385.9313 C534.2,385.9313 533.9813,386.0094 533.7781,386.2125 C533.3406,386.65 533.3406,386.65 533.1688,386.7438 C532.7156,386.9781 532.075,387.1188 531.3094,387.1188 C529.3094,387.1188 528.0281,386.1031 528.0281,384.525 L528.0281,383.4781 C528.0281,381.775 529.2469,380.5719 530.95,380.5719 C531.5281,380.5719 532.1063,380.7125 532.575,380.9625 C533.0438,381.2281 533.2156,381.4156 533.2781,381.775 C533.4031,382.4469 533.6531,382.6969 534.1844,382.6969 C534.4656,382.6969 534.7469,382.5563 534.9344,382.3375 C535.0594,382.1656 535.1063,381.9938 535.1063,381.5563 L535.1063,380.1969 C535.1063,379.775 535.0906,379.6344 534.9656,379.4625 C534.7938,379.2125 534.5125,379.0563 534.1844,379.0563 C533.8719,379.0563 533.6688,379.1656 533.45,379.4313 C532.2781,378.9313 531.8406,378.8219 530.8875,378.8219 C528.2156,378.8219 526.2,380.8375 526.2,383.4625 L526.2,384.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="548.8" y="388.006">E</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="582" y="364.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="583" y="378.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="501" x2="587" y1="399.4" y2="399.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="501" x2="587" y1="407.4" y2="407.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="506" y="416.3"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="508" y="418.3"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="520" y="424.4059">param : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="525.5" y="385"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="527.5" y="387"/>
+    <g id="elem_GMN19">
+      <path d="M313,387 L313,412.6 A0,0 0 0 0 313,412.6 L465,412.6 A0,0 0 0 0 465,412.6 L465,405 L499.73,399.8 L465,397 L465,397 L455,387 L313,387 A0,0 0 0 0 313,387 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M455,387 L455,397 L465,397 L455,387 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="131" x="319" y="404.077">E template class note.</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0000764713728396057122">
+        <rect codeLine="40" fill="#F1F1F1" height="48" id="C_0000764713728396057122" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="385.5" y="254"/>
+        <ellipse cx="400.5" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M395.5,271.1563 C395.5,273.6563 397.6406,275.4688 400.5625,275.4688 C401.7969,275.4688 402.9688,275.1719 403.7188,274.6563 C404.3281,274.2344 404.6563,273.8125 404.6563,273.4063 C404.6563,272.9375 404.2344,272.5313 403.7344,272.5313 C403.5,272.5313 403.2813,272.6094 403.0781,272.8125 C402.6406,273.25 402.6406,273.25 402.4688,273.3438 C402.0156,273.5781 401.375,273.7188 400.6094,273.7188 C398.6094,273.7188 397.3281,272.7031 397.3281,271.125 L397.3281,270.0781 C397.3281,268.375 398.5469,267.1719 400.25,267.1719 C400.8281,267.1719 401.4063,267.3125 401.875,267.5625 C402.3438,267.8281 402.5156,268.0156 402.5781,268.375 C402.7031,269.0469 402.9531,269.2969 403.4844,269.2969 C403.7656,269.2969 404.0469,269.1563 404.2344,268.9375 C404.3594,268.7656 404.4063,268.5938 404.4063,268.1563 L404.4063,266.7969 C404.4063,266.375 404.3906,266.2344 404.2656,266.0625 C404.0938,265.8125 403.8125,265.6563 403.4844,265.6563 C403.1719,265.6563 402.9688,265.7656 402.75,266.0313 C401.5781,265.5313 401.1406,265.4219 400.1875,265.4219 C397.5156,265.4219 395.5,267.4375 395.5,270.0625 L395.5,271.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="414.5" y="274.606">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="386.5" x2="427.5" y1="286" y2="286"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="386.5" x2="427.5" y1="294" y2="294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="539.5" y="393.2104">param : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000589227897266388677">
+        <rect codeLine="44" fill="#F1F1F1" height="98.3998" id="C_0000589227897266388677" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="45" x="955.5" y="40.6"/>
+        <ellipse cx="972.3" cy="56.6" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M971.1594,57.6625 L972.4719,57.6625 L972.4719,57.7094 C972.4719,58.1156 972.4875,58.2719 972.5969,58.4281 C972.7688,58.6781 973.0656,58.85 973.3781,58.85 C973.6594,58.85 973.9563,58.7094 974.1281,58.4906 C974.2531,58.3031 974.3,58.1625 974.3,57.7094 L974.3,55.8656 C974.3,55.5375 974.2844,55.4281 974.2219,55.2562 C974.1125,54.9594 973.7531,54.7094 973.3781,54.7094 C973.0813,54.7094 972.8156,54.85 972.6438,55.0687 C972.5031,55.2562 972.4719,55.4281 972.4719,55.8656 L972.4719,55.9281 L971.1594,55.9281 L971.1594,53.7562 L975.0031,53.7562 L975.0031,54.5062 C975.0031,54.8969 975.0344,55.0844 975.1438,55.2406 C975.3156,55.4906 975.6125,55.6625 975.925,55.6625 C976.2219,55.6625 976.4875,55.5375 976.675,55.3031 C976.8156,55.1156 976.8469,54.975 976.8469,54.5062 L976.8469,52.0062 L969.1438,52.0062 C968.6906,52.0062 968.5656,52.0219 968.3938,52.1312 C968.1281,52.3031 967.9563,52.5687 967.9563,52.8812 C967.9563,53.1625 968.0813,53.4281 968.3313,53.6 C968.5188,53.725 968.7063,53.7562 969.1438,53.7562 L969.3313,53.7562 L969.3313,59.85 L969.1438,59.85 C968.7219,59.85 968.5656,59.8812 968.3938,59.975 C968.1281,60.1312 967.9563,60.4125 967.9563,60.7094 C967.9563,61.2875 968.3625,61.6 969.1438,61.6 L977.2219,61.6 L977.2219,59.0687 C977.2219,58.6625 977.1906,58.4906 977.0813,58.3344 C976.9094,58.0687 976.6281,57.9125 976.3,57.9125 C976.0188,57.9125 975.7375,58.0531 975.55,58.2719 C975.4094,58.4594 975.3781,58.6156 975.3781,59.0687 L975.3781,59.85 L971.1594,59.85 L971.1594,57.6625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="986.7" y="61.206">F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="956.5" x2="999.5" y1="72.6" y2="72.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="961.5" y="89.6059">one</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="22" x="961.5" y="106.4059">two</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="961.5" y="123.2058">three</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="956.5" x2="999.5" y1="130.9998" y2="130.9998"/>
+      </g>
     </a>
-    <path d="M320.5,357 L320.5,382.1328 A0,0 0 0 0 320.5,382.1328 L484.5,382.1328 A0,0 0 0 0 484.5,382.1328 L484.5,375 L519.28,369.5 L484.5,367 L484.5,367 L474.5,357 L320.5,357 A0,0 0 0 0 320.5,357 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M474.5,357 L474.5,367 L484.5,367 L474.5,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="326.5" y="374.0669">E template class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="397" y="226.5"/>
-      <ellipse cx="412" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M414.9688,248.1406 Q414.3906,248.4375 413.75,248.5781 Q413.1094,248.7344 412.4063,248.7344 Q409.9063,248.7344 408.5781,247.0938 Q407.2656,245.4375 407.2656,242.3125 Q407.2656,239.1875 408.5781,237.5313 Q409.9063,235.875 412.4063,235.875 Q413.1094,235.875 413.75,236.0313 Q414.4063,236.1875 414.9688,236.4844 L414.9688,239.2031 Q414.3438,238.625 413.75,238.3594 Q413.1563,238.0781 412.5313,238.0781 Q411.1875,238.0781 410.5,239.1563 Q409.8125,240.2188 409.8125,242.3125 Q409.8125,244.4063 410.5,245.4844 Q411.1875,246.5469 412.5313,246.5469 Q413.1563,246.5469 413.75,246.2813 Q414.3438,246 414.9688,245.4219 L414.9688,248.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="426" y="246.6543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="258.5" y2="258.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="266.5" y2="266.5"/>
+    <g id="elem_GMN24">
+      <path d="M929,265.2 L929,290.8 A0,0 0 0 0 929,290.8 L1027,290.8 A0,0 0 0 0 1027,290.8 L1027,275.2 L1017,265.2 L982,265.2 L978,139.24 L974,265.2 L929,265.2 A0,0 0 0 0 929,265.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M1017,265.2 L1017,275.2 L1027,275.2 L1017,265.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="935" y="282.277">F enum note.</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001949673179441298667">
+        <rect codeLine="53" fill="#F1F1F1" height="48" id="C_0001949673179441298667" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="464" y="254"/>
+        <ellipse cx="479" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M474,271.1563 C474,273.6563 476.1406,275.4688 479.0625,275.4688 C480.2969,275.4688 481.4688,275.1719 482.2188,274.6563 C482.8281,274.2344 483.1563,273.8125 483.1563,273.4063 C483.1563,272.9375 482.7344,272.5313 482.2344,272.5313 C482,272.5313 481.7813,272.6094 481.5781,272.8125 C481.1406,273.25 481.1406,273.25 480.9688,273.3438 C480.5156,273.5781 479.875,273.7188 479.1094,273.7188 C477.1094,273.7188 475.8281,272.7031 475.8281,271.125 L475.8281,270.0781 C475.8281,268.375 477.0469,267.1719 478.75,267.1719 C479.3281,267.1719 479.9063,267.3125 480.375,267.5625 C480.8438,267.8281 481.0156,268.0156 481.0781,268.375 C481.2031,269.0469 481.4531,269.2969 481.9844,269.2969 C482.2656,269.2969 482.5469,269.1563 482.7344,268.9375 C482.8594,268.7656 482.9063,268.5938 482.9063,268.1563 L482.9063,266.7969 C482.9063,266.375 482.8906,266.2344 482.7656,266.0625 C482.5938,265.8125 482.3125,265.6563 481.9844,265.6563 C481.6719,265.6563 481.4688,265.7656 481.25,266.0313 C480.0781,265.5313 479.6406,265.4219 478.6875,265.4219 C476.0156,265.4219 474,267.4375 474,270.0625 L474,271.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="493" y="274.606">E</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="510" y="251"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="511" y="265.2001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="521" y1="286" y2="286"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="521" y1="294" y2="294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="980.5" y="34"/>
-      <ellipse cx="996.85" cy="50" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1000.9594,56 L993.2406,56 L993.2406,43.6094 L1000.9594,43.6094 L1000.9594,45.7656 L995.6938,45.7656 L995.6938,48.4375 L1000.4594,48.4375 L1000.4594,50.5938 L995.6938,50.5938 L995.6938,53.8438 L1000.9594,53.8438 L1000.9594,56 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1011.15" y="54.1543">F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="981.5" x2="1021.5" y1="66" y2="66"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="986.5" y="80.2104">one</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="986.5" y="93.0151">two</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="986.5" y="105.8198">three</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="981.5" x2="1021.5" y1="112.4141" y2="112.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001189142882239313116">
+        <rect codeLine="57" fill="#F1F1F1" height="165.5995" id="C_0001189142882239313116" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="266" x="360" y="7"/>
+        <ellipse cx="483.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M478.75,24.1563 C478.75,26.6563 480.8906,28.4688 483.8125,28.4688 C485.0469,28.4688 486.2188,28.1719 486.9688,27.6563 C487.5781,27.2344 487.9063,26.8125 487.9063,26.4063 C487.9063,25.9375 487.4844,25.5313 486.9844,25.5313 C486.75,25.5313 486.5313,25.6094 486.3281,25.8125 C485.8906,26.25 485.8906,26.25 485.7188,26.3438 C485.2656,26.5781 484.625,26.7188 483.8594,26.7188 C481.8594,26.7188 480.5781,25.7031 480.5781,24.125 L480.5781,23.0781 C480.5781,21.375 481.7969,20.1719 483.5,20.1719 C484.0781,20.1719 484.6563,20.3125 485.125,20.5625 C485.5938,20.8281 485.7656,21.0156 485.8281,21.375 C485.9531,22.0469 486.2031,22.2969 486.7344,22.2969 C487.0156,22.2969 487.2969,22.1563 487.4844,21.9375 C487.6094,21.7656 487.6563,21.5938 487.6563,21.1563 L487.6563,19.7969 C487.6563,19.375 487.6406,19.2344 487.5156,19.0625 C487.3438,18.8125 487.0625,18.6563 486.7344,18.6563 C486.4219,18.6563 486.2188,18.7656 486,19.0313 C484.8281,18.5313 484.3906,18.4219 483.4375,18.4219 C480.7656,18.4219 478.75,20.4375 478.75,23.0625 L478.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="504.25" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="361" x2="625" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="47.9"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="49.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="380" y="56.0059">R(C &amp; c) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="361" x2="625" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="72.6999"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="74.6999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="380" y="80.8059">aaa : A</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="89.4998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="91.4998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="380" y="97.6058">bbb : B *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="106.2997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="108.2997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="380" y="114.4057">ccc : C &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="123.0997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="125.0997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="240" x="380" y="131.2057">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="139.8996"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="141.8996"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="380" y="148.0056">eee : E&lt;int&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="156.6995"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="158.6995"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="380" y="164.8055">ggg : G **</text>
+        </a>
+      </g>
     </a>
-    <path d="M948.5,238 L948.5,263.1328 A0,0 0 0 0 948.5,263.1328 L1054.5,263.1328 A0,0 0 0 0 1054.5,263.1328 L1054.5,248 L1044.5,238 L1005.5,238 L1001.5,120.39 L997.5,238 L948.5,238 A0,0 0 0 0 948.5,238 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1044.5,238 L1044.5,248 L1054.5,248 L1044.5,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="954.5" y="255.0669">F enum note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="473.5" y="226.5"/>
-      <ellipse cx="488.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M491.4688,248.1406 Q490.8906,248.4375 490.25,248.5781 Q489.6094,248.7344 488.9063,248.7344 Q486.4063,248.7344 485.0781,247.0938 Q483.7656,245.4375 483.7656,242.3125 Q483.7656,239.1875 485.0781,237.5313 Q486.4063,235.875 488.9063,235.875 Q489.6094,235.875 490.25,236.0313 Q490.9063,236.1875 491.4688,236.4844 L491.4688,239.2031 Q490.8438,238.625 490.25,238.3594 Q489.6563,238.0781 489.0313,238.0781 Q487.6875,238.0781 487,239.1563 Q486.3125,240.2188 486.3125,242.3125 Q486.3125,244.4063 487,245.4844 Q487.6875,246.5469 489.0313,246.5469 Q489.6563,246.5469 490.25,246.2813 Q490.8438,246 491.4688,245.4219 L491.4688,248.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.5" y="246.6543">E</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="518.5" y="223.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="519.5" y="235.6387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="258.5" y2="258.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="266.5" y2="266.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lpbnd9epnads)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="377.5" y="8"/>
-      <ellipse cx="495.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M498.2188,29.6406 Q497.6406,29.9375 497,30.0781 Q496.3594,30.2344 495.6563,30.2344 Q493.1563,30.2344 491.8281,28.5938 Q490.5156,26.9375 490.5156,23.8125 Q490.5156,20.6875 491.8281,19.0313 Q493.1563,17.375 495.6563,17.375 Q496.3594,17.375 497,17.5313 Q497.6563,17.6875 498.2188,17.9844 L498.2188,20.7031 Q497.5938,20.125 497,19.8594 Q496.4063,19.5781 495.7813,19.5781 Q494.4375,19.5781 493.75,20.6563 Q493.0625,21.7188 493.0625,23.8125 Q493.0625,25.9063 493.75,26.9844 Q494.4375,28.0469 495.7813,28.0469 Q496.4063,28.0469 497,27.7813 Q497.5938,27.5 498.2188,26.9219 L498.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="515.75" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="46"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="397.5" y="54.2104">R(C &amp; c) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="66.8047"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="68.8047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="397.5" y="75.0151">aaa : A</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="79.6094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="81.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="397.5" y="87.8198">bbb : B *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="92.4141"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="94.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="397.5" y="100.6245">ccc : C &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="105.2188"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="107.2188"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="397.5" y="113.4292">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="118.0234"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="120.0234"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="397.5" y="126.2339">eee : E&lt;int&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="130.8281"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="132.8281"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="397.5" y="139.0386">ggg : G **</text>
-    </a>
-    <path d="M664.5,64.5 L664.5,73 L629.79,77 L664.5,81 L664.5,89.6328 A0,0 0 0 0 664.5,89.6328 L766.5,89.6328 A0,0 0 0 0 766.5,89.6328 L766.5,74.5 L756.5,64.5 L664.5,64.5 A0,0 0 0 0 664.5,64.5 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M756.5,64.5 L756.5,74.5 L766.5,74.5 L756.5,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="670.5" y="81.5669">R class note.</text>
-    <path d="M144.5,42 L144.5,67.1328 A0,0 0 0 0 144.5,67.1328 L342.5,67.1328 A0,0 0 0 0 342.5,67.1328 L342.5,60 L381.5,71.207 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M332.5,42 L332.5,52 L342.5,52 L332.5,42 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="177" x="150.5" y="59.0669">R contains an instance of A.</text>
-    <path d="M144.5,77.1328 L144.5,102.2656 A0,0 0 0 0 144.5,102.2656 L263.5,102.2656 A0,0 0 0 0 263.5,102.2656 L263.5,95.1328 L381.5,96.8164 L263.5,87.1328 L263.5,87.1328 L253.5,77.1328 L144.5,77.1328 A0,0 0 0 0 144.5,77.1328 " fill="#FBFB77" filter="url(#f1lpbnd9epnads)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M253.5,77.1328 L253.5,87.1328 L263.5,87.1328 L253.5,77.1328 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="150.5" y="94.1997">Reference to C.</text>
-    <path d="M514.76,274.62 C521.16,287.75 529.42,304.71 537.16,320.59 " fill="none" id="C_0001949673179441298667-&gt;C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="543.55,317.72,546.01,338.76,530.96,323.85,543.55,317.72" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M365.3,143.53 C363.36,144.36 361.42,145.19 359.5,146 C265.23,185.85 149.8,226.61 103.81,242.53 " fill="none" id="C_0001189142882239313116&lt;-C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="377.33,138.3,370.2322,137.0269,366.327,143.0891,373.4249,144.3622,377.33,138.3" 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="182.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="297.5" y="189.0669">aaa</text>
-    <path d="M592.35,146.03 C632.47,176.74 676.73,210.63 703.31,230.98 " fill="none" id="C_0001189142882239313116-&gt;C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="707.42,234.13,702.689,225.4918,703.4442,231.0981,697.8379,231.8532,707.42,234.13" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="652.5" y="182.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="662.5" y="189.0669">bbb</text>
-    <path d="M418.61,146.03 C380.73,176.39 338.98,209.85 313.5,230.27 " fill="none" id="C_0001189142882239313116-&gt;C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="309.55,233.43,319.0732,230.9185,313.4502,230.3013,314.0673,224.6782,309.55,233.43" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="380.5" y="182.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="390.5" y="189.0669">ccc</text>
-    <path d="M641.51,143.88 C643.18,144.59 644.85,145.3 646.5,146 C736.91,184.22 766.27,177.98 853.5,223 C859.61,226.15 865.91,230.09 871.62,233.96 " fill="none" id="C_0001189142882239313116&lt;-C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="629.55,138.68,633.4551,144.7422,640.553,143.4691,636.6478,137.4069,629.55,138.68" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="787.5" y="182.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="797.5" y="189.0669">ddd</text>
-    <path d="M503.5,159.39 C503.5,183.89 503.5,208.87 503.5,226.29 " fill="none" id="C_0001189142882239313116&lt;-C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="503.5,146.27,499.5,152.27,503.5,158.27,507.5,152.27,503.5,146.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="506.5" y="182.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="516.5" y="189.0669">eee</text>
-    <path d="M469.26,146.27 C456.02,172.67 441.63,201.38 431.39,221.81 " fill="none" id="C_0001189142882239313116-&gt;C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="429.14,226.29,436.7506,220.0387,431.3818,221.8207,429.5998,216.4519,429.14,226.29" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="456.5" y="182.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="466.5" y="189.0669">ggg</text>
+    <g id="elem_GMN29">
+      <path d="M661,77 L661,85.8 L626.08,89.8 L661,93.8 L661,102.6 A0,0 0 0 0 661,102.6 L759,102.6 A0,0 0 0 0 759,102.6 L759,87 L749,77 L661,77 A0,0 0 0 0 661,77 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M749,77 L749,87 L759,87 L749,77 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="667" y="94.077">R class note.</text>
+    </g>
+    <path d="M139,54.2 L139,79.8 A0,0 0 0 0 139,79.8 L325,79.8 A0,0 0 0 0 325,79.8 L325,72.2 L364,76.1999 L325,64.2 L325,64.2 L315,54.2 L139,54.2 A0,0 0 0 0 139,54.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M315,54.2 L315,64.2 L325,64.2 L315,54.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="165" x="145" y="71.277">R contains an instance of A.</text>
+    <path d="M139,89.8 L139,115.4 A0,0 0 0 0 139,115.4 L251,115.4 A0,0 0 0 0 251,115.4 L251,107.8 L364,109.7997 L251,99.8 L251,99.8 L241,89.8 L139,89.8 A0,0 0 0 0 139,89.8 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M241,89.8 L241,99.8 L251,99.8 L241,89.8 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="91" x="145" y="106.877">Reference to C.</text>
+    <g id="link_C_0001949673179441298667_C_0001014136565447389473">
+      <path codeLine="73" d="M502.95,302.38 C510.84,320.9 514.8748,330.4003 523.5448,350.7503 " fill="none" id="C_0001949673179441298667-to-C_0001014136565447389473" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="530.6,367.31,529.0647,348.3985,518.0249,353.102,530.6,367.31" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001189142882239313116_C_0001519850480962783588">
+      <path codeLine="74" d="M348.8061,169.2845 C342.9061,172.2745 347.76,169.78 342,172.6 C263.47,211.09 167.46,251.36 125.87,268.48 " fill="none" id="C_0001189142882239313116-backto-C_0001519850480962783588" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="359.51,163.86,352.3498,163.0043,348.8061,169.2845,355.9662,170.1403,359.51,163.86" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="281" y="208.9"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="291" y="215.677">aaa</text>
+    </g>
+    <g id="link_C_0001189142882239313116_C_0001980597091567213070">
+      <path codeLine="75" d="M588.81,173.01 C626.28,205.16 661.2361,235.1633 684.5961,255.2033 " fill="none" id="C_0001189142882239313116-to-C_0001980597091567213070" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="689.15,259.11,684.9236,250.2141,685.3551,255.8544,679.7147,256.2859,689.15,259.11" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="643" y="208.9"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="653" y="215.677">bbb</text>
+    </g>
+    <g id="link_C_0001189142882239313116_C_0000984577258575112753">
+      <path codeLine="76" d="M398.96,173.01 C362.62,204.77 328.8476,234.3015 305.8276,254.4215 " fill="none" id="C_0001189142882239313116-to-C_0000984577258575112753" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="301.31,258.37,310.7188,255.459,305.0747,255.0796,305.4541,249.4354,301.31,258.37" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="365" y="208.9"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="375" y="215.677">ccc</text>
+    </g>
+    <g id="link_C_0001189142882239313116_C_0001263778658518784070">
+      <path codeLine="77" d="M637.1448,169.4029 C643.0648,172.3329 638.2,169.87 644,172.6 C726.41,211.47 753.98,206.02 834,249.6 C839.96,252.85 846.1,256.82 851.7,260.73 " fill="none" id="C_0001189142882239313116-backto-C_0001263778658518784070" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="626.39,164.08,629.9931,170.3264,637.1448,169.4029,633.5417,163.1565,626.39,164.08" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="770" y="208.9"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="780" y="215.677">ddd</text>
+    </g>
+    <g id="link_C_0001189142882239313116_C_0001949673179441298667">
+      <path codeLine="78" d="M493,185.01 C493,214.43 493,233.33 493,253.72 " fill="none" id="C_0001189142882239313116-backto-C_0001949673179441298667" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="493,173.01,489,179.01,493,185.01,497,179.01,493,173.01" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="496" y="208.9"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="506" y="215.677">eee</text>
+    </g>
+    <g id="link_C_0001189142882239313116_C_0000764713728396057122">
+      <path codeLine="79" d="M455.03,173.01 C441.44,202.43 429.6864,227.8832 420.2664,248.2732 " fill="none" id="C_0001189142882239313116-to-C_0000764713728396057122" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="417.75,253.72,425.1558,247.2274,419.847,249.181,417.8934,243.8722,417.75,253.72" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="443" y="208.9"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="453" y="215.677">ggg</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00028_class_mermaid.svg b/docs/test_cases/t00028_class_mermaid.svg
index 6ed95962..f5be132f 100644
--- a/docs/test_cases/t00028_class_mermaid.svg
+++ b/docs/test_cases/t00028_class_mermaid.svg
@@ -1,62 +1,67 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1386.984375 564" style="max-width: 1386.98px; background-color: white;" width="1386.984375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1347.03125,427L1347.03125,431.1666666666667C1347.03125,435.3333333333333,1347.03125,443.6666666666667,1338.7513020833333,453.5190398957554C1330.4713541666667,463.3714131248441,1313.9114583333333,474.7428262496881,1305.6315104166667,480.4285328121102L1297.3515625,486.11423937453213"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M649.5625,238.28613472858078L593.083984375,254.571778940484C536.60546875,270.8574231523872,423.6484375,303.4287115761936,356.3697916666667,328.3592146271249C289.0911458333333,353.2897176780563,267.4908854166667,370.5794353561125,256.6907552083333,379.22429419514066L245.890625,387.8691530341688"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M649.5625,258.2871845077485L619.1848958333334,271.23932042312373C588.8072916666666,284.191456338499,528.0520833333334,310.0957281692495,489.8020833333333,331.17840457864315C451.5520833333333,352.26108098803684,435.8072916666667,368.5221619760737,427.9348958333333,376.65270247009204L420.0625,384.7832429641105"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.890610999104,302L725.3678268742533,307.6666666666667C721.8450427494026,313.3333333333333,714.7994744997013,324.6666666666667,695.6575497498507,339.45699621530184C676.515625,354.247325763937,645.27734375,372.4946515278741,629.658203125,381.61831440984264L614.0390625,390.74197729181117"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M922.9926495295699,302L929.8955673163082,307.6666666666667C936.7984851030466,313.3333333333333,950.6043206765233,324.6666666666667,955.8745301299282,336C961.1447395833334,347.3333333333333,957.8793229166668,358.6666666666667,956.2466145833333,364.3333333333333L954.61390625,370"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M939.390625,233.0855401756048L1007.3307291666666,250.2379501463373C1075.2708333333333,267.39036011706986,1211.1510416666667,301.69518005853496,1279.0911458333333,324.51425669593414C1347.03125,347.3333333333333,1347.03125,358.6666666666667,1347.03125,364.3333333333333L1347.03125,370"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M939.390625,282.7241086304565L954.3138020833334,291.60342385871377C969.2369791666666,300.482739086971,999.0833333333334,318.2413695434855,1014.0065104166666,332.7873514384094C1028.9296875,347.3333333333333,1028.9296875,358.6666666666667,1028.9296875,364.3333333333333L1028.9296875,370"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1347.03125,427L1347.03125,431.1666666666667C1347.03125,435.3333333333333,1347.03125,443.6666666666667,1341.224369743343,451.82082425897244C1335.4174894866862,459.97498185127824,1323.8037289733722,467.94996370255654,1317.9968487167155,471.93745462819567L1312.1899684600585,475.92494555383485"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M632.2671669638494,243.2732636790528L578.6712068448745,258.727719732544C525.0752467258995,274.1821757860352,417.8833264879498,305.0910878930176,353.48723616064154,329.19040278553695C289.0911458333333,353.2897176780563,267.4908854166667,370.5794353561125,256.6907552083333,379.22429419514066L245.890625,387.8691530341688"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M649.5625,258.2871845077485L619.1848958333334,271.23932042312373C588.8072916666666,284.191456338499,528.0520833333334,310.0957281692495,490.4976932207672,330.459984865311C452.94330310820106,350.8242415613725,438.5897312164021,365.64848312274506,431.41294527050263,373.0606039034313L424.23615932460314,380.47272468411757"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.890610999104,302L725.3678268742533,307.6666666666667C721.8450427494026,313.3333333333333,714.7994744997013,324.6666666666667,696.5210277924547,338.9526097861221C678.2425810852079,353.2385529055775,648.731255920416,370.4771058111549,633.97559333802,379.09638226394355L619.219930755624,387.7156587167323"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M936.9052675859521,313.4209920242171L941.4894156966267,317.18416002018097C946.0735638073014,320.94732801614475,955.2418600286506,328.4736640080724,958.193299805992,337.90349867070285C961.1447395833334,347.3333333333333,957.8793229166668,358.6666666666667,956.2466145833333,364.3333333333333L954.61390625,370"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M956.8430260636914,237.49163789490964L1021.8743967197428,253.90969824575802C1086.9057673757943,270.32775859660643,1216.9685086878972,303.16387929830324,1281.9998793439486,325.2486063158183C1347.03125,347.3333333333333,1347.03125,358.6666666666667,1347.03125,364.3333333333333L1347.03125,370"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M939.390625,282.7241086304565L954.3138020833334,291.60342385871377C969.2369791666666,300.482739086971,999.0833333333334,318.2413695434855,1014.0065104166666,331.7873514384094C1028.9296875,345.3333333333333,1028.9296875,354.6666666666667,1028.9296875,359.3333333333333L1028.9296875,364"/>
         <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote8" d="M232.609375,213L232.609375,233.5C232.609375,254,232.609375,295,232.609375,321.1666666666667C232.609375,347.3333333333333,232.609375,358.6666666666667,232.609375,364.3333333333333L232.609375,370"/>
         <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M388.7734375,213L388.7734375,233.5C388.7734375,254,388.7734375,295,390.4061458333333,321.1666666666667C392.0388541666666,347.3333333333333,395.3042708333333,358.6666666666667,396.9369791666666,364.3333333333333L398.5696875,370"/>
         <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M545.8203125,213L545.8203125,233.5C545.8203125,254,545.8203125,295,552.7630208333334,323.39841676147137C559.7057291666666,351.79683352294273,573.5911458333334,367.59366704588547,580.5338541666666,375.4920838073569L587.4765625,383.3905005688282"/>
@@ -218,7 +223,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L8">
+        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L8">
           <g title="A" id="classId-C_0001519850480962783588-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -237,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L11">
+        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L11">
           <g title="B" id="classId-C_0001980597091567213070-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -256,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L16">
+        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L16">
           <g title="C" id="classId-C_0000984577258575112753-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -275,7 +280,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L22">
+        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L22">
           <g title="D" id="classId-C_0001263778658518784070-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -294,7 +299,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001014136565447389473-4" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -318,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L30">
+        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L30">
           <g title="G" id="classId-C_0000764713728396057122-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -337,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L33">
+        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L33">
           <g title="F" id="classId-C_0000589227897266388677-6" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -371,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001949673179441298667-7" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -390,7 +395,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00028/t00028.cc#L36">
+        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L36">
           <g title="R" id="classId-C_0001189142882239313116-8" class="node default clickable">
             <rect height="211" width="289.828125" y="-105.5" x="-144.9140625" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="144.9140625" x1="-144.9140625" class="divider"/>
@@ -413,7 +418,7 @@
               </foreignObject>
               <foreignObject transform="translate( -137.4140625, -42)" height="18" width="56.03125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-bbb : B </span>
+                  <span style="font-style:italic;" class="nodeLabel">-bbb : B</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -137.4140625, -20)" height="18" width="69.34375">
@@ -436,9 +441,9 @@
                   <span style="font-style:italic;" class="nodeLabel">-ggg : G *</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -137.4140625, 80)" height="18" width="109.34375">
+              <foreignObject transform="translate( -137.4140625, 80)" height="18" width="118.234375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-R(C &amp; c) : void</span>
+                  <span class="nodeLabel">-R(C &amp; c) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00029.md b/docs/test_cases/t00029.md
index 298ecac3..caa23a4e 100644
--- a/docs/test_cases/t00029.md
+++ b/docs/test_cases/t00029.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00029.cc
+File `tests/t00029/t00029.cc`
 ```cpp
 #include <memory>
 #include <vector>
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index ea5edcd4..0b9c73e3 100644
--- a/docs/test_cases/t00029_class.svg
+++ b/docs/test_cases/t00029_class.svg
@@ -1,133 +1,149 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="268px" preserveAspectRatio="none" style="width:501px;height:268px;" version="1.1" viewBox="0 0 501 268" width="501px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="287px" preserveAspectRatio="none" style="width:522px;height:287px;background:#FFFFFF;" version="1.1" viewBox="0 0 522 287" width="522px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f651wiek1zh94" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="27"/>
-      <ellipse cx="22" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M24.9688,48.6406 Q24.3906,48.9375 23.75,49.0781 Q23.1094,49.2344 22.4063,49.2344 Q19.9063,49.2344 18.5781,47.5938 Q17.2656,45.9375 17.2656,42.8125 Q17.2656,39.6875 18.5781,38.0313 Q19.9063,36.375 22.4063,36.375 Q23.1094,36.375 23.75,36.5313 Q24.4063,36.6875 24.9688,36.9844 L24.9688,39.7031 Q24.3438,39.125 23.75,38.8594 Q23.1563,38.5781 22.5313,38.5781 Q21.1875,38.5781 20.5,39.6563 Q19.8125,40.7188 19.8125,42.8125 Q19.8125,44.9063 20.5,45.9844 Q21.1875,47.0469 22.5313,47.0469 Q23.1563,47.0469 23.75,46.7813 Q24.3438,46.5 24.9688,45.9219 L24.9688,48.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="47.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="59" y2="59"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="67" y2="67"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001970994826766369014">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001970994826766369014" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="9" y="32.2"/>
+        <ellipse cx="24" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M19,49.3563 C19,51.8563 21.1406,53.6688 24.0625,53.6688 C25.2969,53.6688 26.4688,53.3719 27.2188,52.8563 C27.8281,52.4344 28.1563,52.0125 28.1563,51.6063 C28.1563,51.1375 27.7344,50.7313 27.2344,50.7313 C27,50.7313 26.7813,50.8094 26.5781,51.0125 C26.1406,51.45 26.1406,51.45 25.9688,51.5438 C25.5156,51.7781 24.875,51.9188 24.1094,51.9188 C22.1094,51.9188 20.8281,50.9031 20.8281,49.325 L20.8281,48.2781 C20.8281,46.575 22.0469,45.3719 23.75,45.3719 C24.3281,45.3719 24.9063,45.5125 25.375,45.7625 C25.8438,46.0281 26.0156,46.2156 26.0781,46.575 C26.2031,47.2469 26.4531,47.4969 26.9844,47.4969 C27.2656,47.4969 27.5469,47.3563 27.7344,47.1375 C27.8594,46.9656 27.9063,46.7938 27.9063,46.3563 L27.9063,44.9969 C27.9063,44.575 27.8906,44.4344 27.7656,44.2625 C27.5938,44.0125 27.3125,43.8563 26.9844,43.8563 C26.6719,43.8563 26.4688,43.9656 26.25,44.2313 C25.0781,43.7313 24.6406,43.6219 23.6875,43.6219 C21.0156,43.6219 19,45.6375 19,48.2625 L19,49.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="38" y="52.806">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="49" y1="64.2" y2="64.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="49" y1="72.2" y2="72.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="82" y="20.5"/>
-      <ellipse cx="110.95" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M113.9188,42.1406 Q113.3406,42.4375 112.7,42.5781 Q112.0594,42.7344 111.3563,42.7344 Q108.8563,42.7344 107.5281,41.0938 Q106.2156,39.4375 106.2156,36.3125 Q106.2156,33.1875 107.5281,31.5313 Q108.8563,29.875 111.3563,29.875 Q112.0594,29.875 112.7,30.0313 Q113.3563,30.1875 113.9188,30.4844 L113.9188,33.2031 Q113.2938,32.625 112.7,32.3594 Q112.1063,32.0781 111.4813,32.0781 Q110.1375,32.0781 109.45,33.1563 Q108.7625,34.2188 108.7625,36.3125 Q108.7625,38.4063 109.45,39.4844 Q110.1375,40.5469 111.4813,40.5469 Q112.1063,40.5469 112.7,40.2813 Q113.2938,40 113.9188,39.4219 L113.9188,42.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="128.05" 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="158" y="17.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="159" y="29.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="83" x2="163" y1="52.5" y2="52.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="83" x2="163" y1="60.5" y2="60.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000543766389270348470">
+        <rect codeLine="6" fill="#F1F1F1" height="64.7999" id="C_0000543766389270348470" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="88" x="84.5" y="23.8"/>
+        <ellipse cx="115.25" cy="39.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M110.25,40.9563 C110.25,43.4563 112.3906,45.2688 115.3125,45.2688 C116.5469,45.2688 117.7188,44.9719 118.4688,44.4563 C119.0781,44.0344 119.4063,43.6125 119.4063,43.2063 C119.4063,42.7375 118.9844,42.3313 118.4844,42.3313 C118.25,42.3313 118.0313,42.4094 117.8281,42.6125 C117.3906,43.05 117.3906,43.05 117.2188,43.1438 C116.7656,43.3781 116.125,43.5188 115.3594,43.5188 C113.3594,43.5188 112.0781,42.5031 112.0781,40.925 L112.0781,39.8781 C112.0781,38.175 113.2969,36.9719 115,36.9719 C115.5781,36.9719 116.1563,37.1125 116.625,37.3625 C117.0938,37.6281 117.2656,37.8156 117.3281,38.175 C117.4531,38.8469 117.7031,39.0969 118.2344,39.0969 C118.5156,39.0969 118.7969,38.9563 118.9844,38.7375 C119.1094,38.5656 119.1563,38.3938 119.1563,37.9563 L119.1563,36.5969 C119.1563,36.175 119.1406,36.0344 119.0156,35.8625 C118.8438,35.6125 118.5625,35.4563 118.2344,35.4563 C117.9219,35.4563 117.7188,35.5656 117.5,35.8313 C116.3281,35.3313 115.8906,35.2219 114.9375,35.2219 C112.2656,35.2219 110.25,37.2375 110.25,39.8625 L110.25,40.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="132.75" y="44.406">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="166.5" y="20.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="167.5" y="35.0001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="171.5" y1="55.8" y2="55.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="171.5" y1="63.8" y2="63.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="90.5" y="72.7"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="92.5" y="74.7"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="104.5" y="80.8059">param : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="88" y="66.5"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="90" y="68.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001496914969429483234">
+        <rect codeLine="11" fill="#F1F1F1" height="64.7999" id="C_0001496914969429483234" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="88" x="207.5" y="23.8"/>
+        <ellipse cx="243.2" cy="39.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M238.2,40.9563 C238.2,43.4563 240.3406,45.2688 243.2625,45.2688 C244.4969,45.2688 245.6688,44.9719 246.4188,44.4563 C247.0281,44.0344 247.3563,43.6125 247.3563,43.2063 C247.3563,42.7375 246.9344,42.3313 246.4344,42.3313 C246.2,42.3313 245.9813,42.4094 245.7781,42.6125 C245.3406,43.05 245.3406,43.05 245.1688,43.1438 C244.7156,43.3781 244.075,43.5188 243.3094,43.5188 C241.3094,43.5188 240.0281,42.5031 240.0281,40.925 L240.0281,39.8781 C240.0281,38.175 241.2469,36.9719 242.95,36.9719 C243.5281,36.9719 244.1063,37.1125 244.575,37.3625 C245.0438,37.6281 245.2156,37.8156 245.2781,38.175 C245.4031,38.8469 245.6531,39.0969 246.1844,39.0969 C246.4656,39.0969 246.7469,38.9563 246.9344,38.7375 C247.0594,38.5656 247.1063,38.3938 247.1063,37.9563 L247.1063,36.5969 C247.1063,36.175 247.0906,36.0344 246.9656,35.8625 C246.7938,35.6125 246.5125,35.4563 246.1844,35.4563 C245.8719,35.4563 245.6688,35.5656 245.45,35.8313 C244.2781,35.3313 243.8406,35.2219 242.8875,35.2219 C240.2156,35.2219 238.2,37.2375 238.2,39.8625 L238.2,40.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="261.8" y="44.406">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="208.5" x2="294.5" y1="55.8" y2="55.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="208.5" x2="294.5" y1="63.8" y2="63.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="72.7"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="74.7"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="227.5" y="80.8059">param : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="102" y="74.7104">param : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001936873082456592219">
+        <rect codeLine="16" fill="#F1F1F1" height="98.3998" id="C_0001936873082456592219" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="45" x="7" y="182.4"/>
+        <ellipse cx="23.8" cy="198.4" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M22.6594,199.4625 L23.9719,199.4625 L23.9719,199.5094 C23.9719,199.9156 23.9875,200.0719 24.0969,200.2281 C24.2688,200.4781 24.5656,200.65 24.8781,200.65 C25.1594,200.65 25.4563,200.5094 25.6281,200.2906 C25.7531,200.1031 25.8,199.9625 25.8,199.5094 L25.8,197.6656 C25.8,197.3375 25.7844,197.2281 25.7219,197.0563 C25.6125,196.7594 25.2531,196.5094 24.8781,196.5094 C24.5813,196.5094 24.3156,196.65 24.1438,196.8688 C24.0031,197.0563 23.9719,197.2281 23.9719,197.6656 L23.9719,197.7281 L22.6594,197.7281 L22.6594,195.5563 L26.5031,195.5563 L26.5031,196.3063 C26.5031,196.6969 26.5344,196.8844 26.6438,197.0406 C26.8156,197.2906 27.1125,197.4625 27.425,197.4625 C27.7219,197.4625 27.9875,197.3375 28.175,197.1031 C28.3156,196.9156 28.3469,196.775 28.3469,196.3063 L28.3469,193.8063 L20.6438,193.8063 C20.1906,193.8063 20.0656,193.8219 19.8938,193.9313 C19.6281,194.1031 19.4563,194.3688 19.4563,194.6813 C19.4563,194.9625 19.5813,195.2281 19.8313,195.4 C20.0188,195.525 20.2063,195.5563 20.6438,195.5563 L20.8313,195.5563 L20.8313,201.65 L20.6438,201.65 C20.2219,201.65 20.0656,201.6813 19.8938,201.775 C19.6281,201.9313 19.4563,202.2125 19.4563,202.5094 C19.4563,203.0875 19.8625,203.4 20.6438,203.4 L28.7219,203.4 L28.7219,200.8688 C28.7219,200.4625 28.6906,200.2906 28.5813,200.1344 C28.4094,199.8688 28.1281,199.7125 27.8,199.7125 C27.5188,199.7125 27.2375,199.8531 27.05,200.0719 C26.9094,200.2594 26.8781,200.4156 26.8781,200.8688 L26.8781,201.65 L22.6594,201.65 L22.6594,199.4625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="38.2" y="203.006">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="51" y1="214.4" y2="214.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="13" y="231.4059">one</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="22" x="13" y="248.2059">two</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="13" y="265.0058">three</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="51" y1="272.7998" y2="272.7998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="60.8047" id="C_0001496914969429483234" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="199" y="20.5"/>
-      <ellipse cx="232.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M235.4188,42.1406 Q234.8406,42.4375 234.2,42.5781 Q233.5594,42.7344 232.8563,42.7344 Q230.3563,42.7344 229.0281,41.0938 Q227.7156,39.4375 227.7156,36.3125 Q227.7156,33.1875 229.0281,31.5313 Q230.3563,29.875 232.8563,29.875 Q233.5594,29.875 234.2,30.0313 Q234.8563,30.1875 235.4188,30.4844 L235.4188,33.2031 Q234.7938,32.625 234.2,32.3594 Q233.6063,32.0781 232.9813,32.0781 Q231.6375,32.0781 230.95,33.1563 Q230.2625,34.2188 230.2625,36.3125 Q230.2625,38.4063 230.95,39.4844 Q231.6375,40.5469 232.9813,40.5469 Q233.6063,40.5469 234.2,40.2813 Q234.7938,40 235.4188,39.4219 L235.4188,42.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="250.55" y="40.6543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="200" x2="280" y1="52.5" y2="52.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="200" x2="280" y1="60.5" y2="60.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <g id="elem_C_0001980718063838190763">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001980718063838190763" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="354" y="207.6"/>
+        <ellipse cx="369" cy="223.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M364,224.7563 C364,227.2563 366.1406,229.0688 369.0625,229.0688 C370.2969,229.0688 371.4688,228.7719 372.2188,228.2563 C372.8281,227.8344 373.1563,227.4125 373.1563,227.0063 C373.1563,226.5375 372.7344,226.1313 372.2344,226.1313 C372,226.1313 371.7813,226.2094 371.5781,226.4125 C371.1406,226.85 371.1406,226.85 370.9688,226.9438 C370.5156,227.1781 369.875,227.3188 369.1094,227.3188 C367.1094,227.3188 365.8281,226.3031 365.8281,224.725 L365.8281,223.6781 C365.8281,221.975 367.0469,220.7719 368.75,220.7719 C369.3281,220.7719 369.9063,220.9125 370.375,221.1625 C370.8438,221.4281 371.0156,221.6156 371.0781,221.975 C371.2031,222.6469 371.4531,222.8969 371.9844,222.8969 C372.2656,222.8969 372.5469,222.7563 372.7344,222.5375 C372.8594,222.3656 372.9063,222.1938 372.9063,221.7563 L372.9063,220.3969 C372.9063,219.975 372.8906,219.8344 372.7656,219.6625 C372.5938,219.4125 372.3125,219.2563 371.9844,219.2563 C371.6719,219.2563 371.4688,219.3656 371.25,219.6313 C370.0781,219.1313 369.6406,219.0219 368.6875,219.0219 C366.0156,219.0219 364,221.0375 364,223.6625 L364,224.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="383" y="228.206">G1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="355" x2="404" y1="239.6" y2="239.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="355" x2="404" y1="247.6" y2="247.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="205" y="66.5"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="207" y="68.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <g id="elem_C_0002204627213593766591">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0002204627213593766591" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="87" y="207.6"/>
+        <ellipse cx="102" cy="223.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M97,224.7563 C97,227.2563 99.1406,229.0688 102.0625,229.0688 C103.2969,229.0688 104.4688,228.7719 105.2188,228.2563 C105.8281,227.8344 106.1563,227.4125 106.1563,227.0063 C106.1563,226.5375 105.7344,226.1313 105.2344,226.1313 C105,226.1313 104.7813,226.2094 104.5781,226.4125 C104.1406,226.85 104.1406,226.85 103.9688,226.9438 C103.5156,227.1781 102.875,227.3188 102.1094,227.3188 C100.1094,227.3188 98.8281,226.3031 98.8281,224.725 L98.8281,223.6781 C98.8281,221.975 100.0469,220.7719 101.75,220.7719 C102.3281,220.7719 102.9063,220.9125 103.375,221.1625 C103.8438,221.4281 104.0156,221.6156 104.0781,221.975 C104.2031,222.6469 104.4531,222.8969 104.9844,222.8969 C105.2656,222.8969 105.5469,222.7563 105.7344,222.5375 C105.8594,222.3656 105.9063,222.1938 105.9063,221.7563 L105.9063,220.3969 C105.9063,219.975 105.8906,219.8344 105.7656,219.6625 C105.5938,219.4125 105.3125,219.2563 104.9844,219.2563 C104.6719,219.2563 104.4688,219.3656 104.25,219.6313 C103.0781,219.1313 102.6406,219.0219 101.6875,219.0219 C99.0156,219.0219 97,221.0375 97,223.6625 L97,224.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="116" y="228.206">G2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="88" x2="137" y1="239.6" y2="239.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="88" x2="137" y1="247.6" y2="247.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="219" y="74.7104">param : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <g id="elem_C_0000767180516665070631">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000767180516665070631" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="173" y="207.6"/>
+        <ellipse cx="188" cy="223.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M183,224.7563 C183,227.2563 185.1406,229.0688 188.0625,229.0688 C189.2969,229.0688 190.4688,228.7719 191.2188,228.2563 C191.8281,227.8344 192.1563,227.4125 192.1563,227.0063 C192.1563,226.5375 191.7344,226.1313 191.2344,226.1313 C191,226.1313 190.7813,226.2094 190.5781,226.4125 C190.1406,226.85 190.1406,226.85 189.9688,226.9438 C189.5156,227.1781 188.875,227.3188 188.1094,227.3188 C186.1094,227.3188 184.8281,226.3031 184.8281,224.725 L184.8281,223.6781 C184.8281,221.975 186.0469,220.7719 187.75,220.7719 C188.3281,220.7719 188.9063,220.9125 189.375,221.1625 C189.8438,221.4281 190.0156,221.6156 190.0781,221.975 C190.2031,222.6469 190.4531,222.8969 190.9844,222.8969 C191.2656,222.8969 191.5469,222.7563 191.7344,222.5375 C191.8594,222.3656 191.9063,222.1938 191.9063,221.7563 L191.9063,220.3969 C191.9063,219.975 191.8906,219.8344 191.7656,219.6625 C191.5938,219.4125 191.3125,219.2563 190.9844,219.2563 C190.6719,219.2563 190.4688,219.3656 190.25,219.6313 C189.0781,219.1313 188.6406,219.0219 187.6875,219.0219 C185.0156,219.0219 183,221.0375 183,223.6625 L183,224.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="202" y="228.206">G3</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="174" x2="223" y1="239.6" y2="239.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="174" x2="223" y1="247.6" y2="247.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="6" y="171"/>
-      <ellipse cx="21.9" cy="187" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M26.0094,193 L18.2906,193 L18.2906,180.6094 L26.0094,180.6094 L26.0094,182.7656 L20.7438,182.7656 L20.7438,185.4375 L25.5094,185.4375 L25.5094,187.5938 L20.7438,187.5938 L20.7438,190.8438 L26.0094,190.8438 L26.0094,193 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36.1" y="191.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="47" y1="203" y2="203"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="12" y="217.2104">one</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="12" y="230.0151">two</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="12" y="242.8198">three</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="47" y1="249.4141" y2="249.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <g id="elem_C_0000715074622924270214">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000715074622924270214" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="440" y="207.6"/>
+        <ellipse cx="455" cy="223.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M450,224.7563 C450,227.2563 452.1406,229.0688 455.0625,229.0688 C456.2969,229.0688 457.4688,228.7719 458.2188,228.2563 C458.8281,227.8344 459.1563,227.4125 459.1563,227.0063 C459.1563,226.5375 458.7344,226.1313 458.2344,226.1313 C458,226.1313 457.7813,226.2094 457.5781,226.4125 C457.1406,226.85 457.1406,226.85 456.9688,226.9438 C456.5156,227.1781 455.875,227.3188 455.1094,227.3188 C453.1094,227.3188 451.8281,226.3031 451.8281,224.725 L451.8281,223.6781 C451.8281,221.975 453.0469,220.7719 454.75,220.7719 C455.3281,220.7719 455.9063,220.9125 456.375,221.1625 C456.8438,221.4281 457.0156,221.6156 457.0781,221.975 C457.2031,222.6469 457.4531,222.8969 457.9844,222.8969 C458.2656,222.8969 458.5469,222.7563 458.7344,222.5375 C458.8594,222.3656 458.9063,222.1938 458.9063,221.7563 L458.9063,220.3969 C458.9063,219.975 458.8906,219.8344 458.7656,219.6625 C458.5938,219.4125 458.3125,219.2563 457.9844,219.2563 C457.6719,219.2563 457.4688,219.3656 457.25,219.6313 C456.0781,219.1313 455.6406,219.0219 454.6875,219.0219 C452.0156,219.0219 450,221.0375 450,223.6625 L450,224.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="469" y="228.206">G4</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="441" x2="490" y1="239.6" y2="239.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="441" x2="490" y1="247.6" y2="247.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="336.5" y="190"/>
-      <ellipse cx="351.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M354.4688,211.6406 Q353.8906,211.9375 353.25,212.0781 Q352.6094,212.2344 351.9063,212.2344 Q349.4063,212.2344 348.0781,210.5938 Q346.7656,208.9375 346.7656,205.8125 Q346.7656,202.6875 348.0781,201.0313 Q349.4063,199.375 351.9063,199.375 Q352.6094,199.375 353.25,199.5313 Q353.9063,199.6875 354.4688,199.9844 L354.4688,202.7031 Q353.8438,202.125 353.25,201.8594 Q352.6563,201.5781 352.0313,201.5781 Q350.6875,201.5781 350,202.6563 Q349.3125,203.7188 349.3125,205.8125 Q349.3125,207.9063 350,208.9844 Q350.6875,210.0469 352.0313,210.0469 Q352.6563,210.0469 353.25,209.7813 Q353.8438,209.5 354.4688,208.9219 L354.4688,211.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="365.5" y="210.1543">G1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="384.5" y1="222" y2="222"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="384.5" y1="230" y2="230"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000348749731659902910">
+        <rect codeLine="38" fill="#F1F1F1" height="98.3998" id="C_0000348749731659902910" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="185" x="330" y="7"/>
+        <ellipse cx="413.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M408.25,24.1563 C408.25,26.6563 410.3906,28.4688 413.3125,28.4688 C414.5469,28.4688 415.7188,28.1719 416.4688,27.6563 C417.0781,27.2344 417.4063,26.8125 417.4063,26.4063 C417.4063,25.9375 416.9844,25.5313 416.4844,25.5313 C416.25,25.5313 416.0313,25.6094 415.8281,25.8125 C415.3906,26.25 415.3906,26.25 415.2188,26.3438 C414.7656,26.5781 414.125,26.7188 413.3594,26.7188 C411.3594,26.7188 410.0781,25.7031 410.0781,24.125 L410.0781,23.0781 C410.0781,21.375 411.2969,20.1719 413,20.1719 C413.5781,20.1719 414.1563,20.3125 414.625,20.5625 C415.0938,20.8281 415.2656,21.0156 415.3281,21.375 C415.4531,22.0469 415.7031,22.2969 416.2344,22.2969 C416.5156,22.2969 416.7969,22.1563 416.9844,21.9375 C417.1094,21.7656 417.1563,21.5938 417.1563,21.1563 L417.1563,19.7969 C417.1563,19.375 417.1406,19.2344 417.0156,19.0625 C416.8438,18.8125 416.5625,18.6563 416.2344,18.6563 C415.9219,18.6563 415.7188,18.7656 415.5,19.0313 C414.3281,18.5313 413.8906,18.4219 412.9375,18.4219 C410.2656,18.4219 408.25,20.4375 408.25,23.0625 L408.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="433.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="331" x2="514" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="331" x2="514" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="336" y="55.9"/>
+          <ellipse cx="341" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="350" y="64.0059">g1 : G1</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="336" y="72.6999"/>
+          <ellipse cx="341" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="350" y="80.8059">g3 : G3 &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="336" y="89.4998"/>
+          <ellipse cx="341" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="350" y="97.6058">g4 : std::shared_ptr&lt;G4&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="83.5" y="190"/>
-      <ellipse cx="98.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M101.4688,211.6406 Q100.8906,211.9375 100.25,212.0781 Q99.6094,212.2344 98.9063,212.2344 Q96.4063,212.2344 95.0781,210.5938 Q93.7656,208.9375 93.7656,205.8125 Q93.7656,202.6875 95.0781,201.0313 Q96.4063,199.375 98.9063,199.375 Q99.6094,199.375 100.25,199.5313 Q100.9063,199.6875 101.4688,199.9844 L101.4688,202.7031 Q100.8438,202.125 100.25,201.8594 Q99.6563,201.5781 99.0313,201.5781 Q97.6875,201.5781 97,202.6563 Q96.3125,203.7188 96.3125,205.8125 Q96.3125,207.9063 97,208.9844 Q97.6875,210.0469 99.0313,210.0469 Q99.6563,210.0469 100.25,209.7813 Q100.8438,209.5 101.4688,208.9219 L101.4688,211.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="112.5" y="210.1543">G2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="84.5" x2="131.5" y1="222" y2="222"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="84.5" x2="131.5" y1="230" y2="230"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="167.5" y="190"/>
-      <ellipse cx="182.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M185.4688,211.6406 Q184.8906,211.9375 184.25,212.0781 Q183.6094,212.2344 182.9063,212.2344 Q180.4063,212.2344 179.0781,210.5938 Q177.7656,208.9375 177.7656,205.8125 Q177.7656,202.6875 179.0781,201.0313 Q180.4063,199.375 182.9063,199.375 Q183.6094,199.375 184.25,199.5313 Q184.9063,199.6875 185.4688,199.9844 L185.4688,202.7031 Q184.8438,202.125 184.25,201.8594 Q183.6563,201.5781 183.0313,201.5781 Q181.6875,201.5781 181,202.6563 Q180.3125,203.7188 180.3125,205.8125 Q180.3125,207.9063 181,208.9844 Q181.6875,210.0469 183.0313,210.0469 Q183.6563,210.0469 184.25,209.7813 Q184.8438,209.5 185.4688,208.9219 L185.4688,211.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="196.5" y="210.1543">G3</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="168.5" x2="215.5" y1="222" y2="222"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="168.5" x2="215.5" y1="230" y2="230"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="420.5" y="190"/>
-      <ellipse cx="435.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M438.4688,211.6406 Q437.8906,211.9375 437.25,212.0781 Q436.6094,212.2344 435.9063,212.2344 Q433.4063,212.2344 432.0781,210.5938 Q430.7656,208.9375 430.7656,205.8125 Q430.7656,202.6875 432.0781,201.0313 Q433.4063,199.375 435.9063,199.375 Q436.6094,199.375 437.25,199.5313 Q437.9063,199.6875 438.4688,199.9844 L438.4688,202.7031 Q437.8438,202.125 437.25,201.8594 Q436.6563,201.5781 436.0313,201.5781 Q434.6875,201.5781 434,202.6563 Q433.3125,203.7188 433.3125,205.8125 Q433.3125,207.9063 434,208.9844 Q434.6875,210.0469 436.0313,210.0469 Q436.6563,210.0469 437.25,209.7813 Q437.8438,209.5 438.4688,208.9219 L438.4688,211.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="449.5" y="210.1543">G4</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="421.5" x2="468.5" y1="222" y2="222"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="421.5" x2="468.5" y1="230" y2="230"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f651wiek1zh94)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="316" 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="317" x2="489" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="317" x2="489" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="54"/>
-      <ellipse cx="327" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="336" y="62.2104">g1 : G1</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="66.8047"/>
-      <ellipse cx="327" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="336" y="75.0151">g3 : G3 &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="79.6094"/>
-      <ellipse cx="327" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="336" y="87.8198">g4 : std::shared_ptr&lt;G4&gt;</text>
-    </a>
-    <path d="M377.56,106.71 C375.45,112.47 373.54,118.3 372,124 C366.05,145.94 363.31,171.8 362.05,189.98 " fill="none" id="C_0000348749731659902910&lt;-C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="382.43,94.31,376.5162,98.4364,378.0507,105.4824,383.9645,101.3559,382.43,94.31" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="378" 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="385" y="137.0669">g1</text>
-    <path d="M414.04,94.3 C421.51,122.95 431.17,160 437.7,185.03 " fill="none" id="C_0000348749731659902910-&gt;C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="438.97,189.87,440.5803,180.1537,437.7137,185.0304,432.837,182.1638,438.97,189.87" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="432" 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="439" y="137.0669">g4</text>
+    <g id="link_C_0000348749731659902910_C_0001980718063838190763">
+      <path codeLine="44" d="M399.677,116.9141 C396.307,126.6841 397,125.62 394.5,135.4 C388.33,159.56 384.26,187.84 381.94,207.27 " fill="none" id="C_0000348749731659902910-backto-C_0001980718063838190763" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="403.59,105.57,397.8522,109.9377,399.677,116.9141,405.4149,112.5464,403.59,105.57" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="400.5" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="407.5" y="148.477">g1</text>
+    </g>
+    <g id="link_C_0000348749731659902910_C_0000715074622924270214">
+      <path codeLine="45" d="M434.48,105.5 C442.73,138.77 451.8759,175.6664 458.3059,201.5964 " fill="none" id="C_0000348749731659902910-to-C_0000715074622924270214" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="459.75,207.42,461.4662,197.7218,458.5466,202.567,453.7014,199.6473,459.75,207.42" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="451.5" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="458.5" y="148.477">g4</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00029_class_mermaid.svg b/docs/test_cases/t00029_class_mermaid.svg
index ddeeabb3..4529e08a 100644
--- a/docs/test_cases/t00029_class_mermaid.svg
+++ b/docs/test_cases/t00029_class_mermaid.svg
@@ -1,57 +1,62 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 916.234375 286" style="max-width: 916.234px; background-color: white;" width="916.234375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M782.1869498239437,142L779.1466769366198,149.5C776.1064040492957,157,770.0258582746479,172,766.985585387324,185.16666666666666C763.9453125,198.33333333333334,763.9453125,209.66666666666666,763.9453125,215.33333333333334L763.9453125,221"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M832.0474251760563,142L835.0876980633802,149.5C838.1279709507043,157,844.2085167253521,172,847.248789612676,185.16666666666666C850.2890625,198.33333333333334,850.2890625,209.66666666666666,850.2890625,215.33333333333334L850.2890625,221"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M775.4247691533425,158.68151409729188L773.5115263777853,163.40126174774323C771.5982836022282,168.1210093981946,767.7717980511142,177.56050469909732,765.858555275557,187.94691901621533C763.9453125,198.33333333333334,763.9453125,209.66666666666666,763.9453125,215.33333333333334L763.9453125,221"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M832.0474251760563,142L835.0876980633802,149.5C838.1279709507043,157,844.2085167253521,172,847.248789612676,184.16666666666666C850.2890625,196.33333333333334,850.2890625,205.66666666666666,850.2890625,210.33333333333334L850.2890625,215"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(763.9453125, 187)" class="edgeLabel">
@@ -78,7 +83,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L7">
+        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L7">
           <g title="A" id="classId-C_0001970994826766369014-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -97,7 +102,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L12">
+        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L12">
           <g title="C" id="classId-C_0000543766389270348470-1" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -121,7 +126,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.3125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L17">
+        <a transform="translate(267.3125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L17">
           <g title="D" id="classId-C_0001496914969429483234-2" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -145,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(422.4375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L21">
+        <a transform="translate(422.4375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L21">
           <g title="E" id="classId-C_0001936873082456592219-3" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -179,7 +184,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L26">
+        <a transform="translate(763.9453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L26">
           <g title="G1" id="classId-C_0001980718063838190763-4" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -198,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(551.484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L28">
+        <a transform="translate(551.484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L28">
           <g title="G2" id="classId-C_0002204627213593766591-5" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -217,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(637.828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L30">
+        <a transform="translate(637.828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L30">
           <g title="G3" id="classId-C_0000767180516665070631-6" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -236,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(850.2890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L32">
+        <a transform="translate(850.2890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L32">
           <g title="G4" id="classId-C_0000715074622924270214-7" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -255,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(807.1171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00029/t00029.cc#L34">
+        <a transform="translate(807.1171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L34">
           <g title="R" id="classId-C_0000348749731659902910-8" class="node default clickable">
             <rect height="123" width="202.234375" y="-61.5" x="-101.1171875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="101.1171875" x1="-101.1171875" class="divider"/>
diff --git a/docs/test_cases/t00030.md b/docs/test_cases/t00030.md
index 1eead785..f7b750b7 100644
--- a/docs/test_cases/t00030.md
+++ b/docs/test_cases/t00030.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00030.cc
+File `tests/t00030/t00030.cc`
 ```cpp
 #include <memory>
 #include <vector>
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index b5d3a3b6..73fc0628 100644
--- a/docs/test_cases/t00030_class.svg
+++ b/docs/test_cases/t00030_class.svg
@@ -1,122 +1,138 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:366px;height:256px;" version="1.1" viewBox="0 0 366 256" width="366px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="271px" preserveAspectRatio="none" style="width:360px;height:271px;background:#FFFFFF;" version="1.1" viewBox="0 0 360 271" width="360px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13z0hmuox0opi" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13z0hmuox0opi)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
-      <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000064769484767514424">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000064769484767514424" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="216"/>
+        <ellipse cx="22" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,233.1563 C17,235.6563 19.1406,237.4688 22.0625,237.4688 C23.2969,237.4688 24.4688,237.1719 25.2188,236.6563 C25.8281,236.2344 26.1563,235.8125 26.1563,235.4063 C26.1563,234.9375 25.7344,234.5313 25.2344,234.5313 C25,234.5313 24.7813,234.6094 24.5781,234.8125 C24.1406,235.25 24.1406,235.25 23.9688,235.3438 C23.5156,235.5781 22.875,235.7188 22.1094,235.7188 C20.1094,235.7188 18.8281,234.7031 18.8281,233.125 L18.8281,232.0781 C18.8281,230.375 20.0469,229.1719 21.75,229.1719 C22.3281,229.1719 22.9063,229.3125 23.375,229.5625 C23.8438,229.8281 24.0156,230.0156 24.0781,230.375 C24.2031,231.0469 24.4531,231.2969 24.9844,231.2969 C25.2656,231.2969 25.5469,231.1563 25.7344,230.9375 C25.8594,230.7656 25.9063,230.5938 25.9063,230.1563 L25.9063,228.7969 C25.9063,228.375 25.8906,228.2344 25.7656,228.0625 C25.5938,227.8125 25.3125,227.6563 24.9844,227.6563 C24.6719,227.6563 24.4688,227.7656 24.25,228.0313 C23.0781,227.5313 22.6406,227.4219 21.6875,227.4219 C19.0156,227.4219 17,229.4375 17,232.0625 L17,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="236.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13z0hmuox0opi)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
-      <ellipse cx="99" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M101.9688,218.6406 Q101.3906,218.9375 100.75,219.0781 Q100.1094,219.2344 99.4063,219.2344 Q96.9063,219.2344 95.5781,217.5938 Q94.2656,215.9375 94.2656,212.8125 Q94.2656,209.6875 95.5781,208.0313 Q96.9063,206.375 99.4063,206.375 Q100.1094,206.375 100.75,206.5313 Q101.4063,206.6875 101.9688,206.9844 L101.9688,209.7031 Q101.3438,209.125 100.75,208.8594 Q100.1563,208.5781 99.5313,208.5781 Q98.1875,208.5781 97.5,209.6563 Q96.8125,210.7188 96.8125,212.8125 Q96.8125,214.9063 97.5,215.9844 Q98.1875,217.0469 99.5313,217.0469 Q100.1563,217.0469 100.75,216.7813 Q101.3438,216.5 101.9688,215.9219 L101.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="217.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000156923198106222307">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000156923198106222307" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="216"/>
+        <ellipse cx="98" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93,233.1563 C93,235.6563 95.1406,237.4688 98.0625,237.4688 C99.2969,237.4688 100.4688,237.1719 101.2188,236.6563 C101.8281,236.2344 102.1563,235.8125 102.1563,235.4063 C102.1563,234.9375 101.7344,234.5313 101.2344,234.5313 C101,234.5313 100.7813,234.6094 100.5781,234.8125 C100.1406,235.25 100.1406,235.25 99.9688,235.3438 C99.5156,235.5781 98.875,235.7188 98.1094,235.7188 C96.1094,235.7188 94.8281,234.7031 94.8281,233.125 L94.8281,232.0781 C94.8281,230.375 96.0469,229.1719 97.75,229.1719 C98.3281,229.1719 98.9063,229.3125 99.375,229.5625 C99.8438,229.8281 100.0156,230.0156 100.0781,230.375 C100.2031,231.0469 100.4531,231.2969 100.9844,231.2969 C101.2656,231.2969 101.5469,231.1563 101.7344,230.9375 C101.8594,230.7656 101.9063,230.5938 101.9063,230.1563 L101.9063,228.7969 C101.9063,228.375 101.8906,228.2344 101.7656,228.0625 C101.5938,227.8125 101.3125,227.6563 100.9844,227.6563 C100.6719,227.6563 100.4688,227.7656 100.25,228.0313 C99.0781,227.5313 98.6406,227.4219 97.6875,227.4219 C95.0156,227.4219 93,229.4375 93,232.0625 L93,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="236.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13z0hmuox0opi)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
-      <ellipse cx="176" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M178.9688,218.6406 Q178.3906,218.9375 177.75,219.0781 Q177.1094,219.2344 176.4063,219.2344 Q173.9063,219.2344 172.5781,217.5938 Q171.2656,215.9375 171.2656,212.8125 Q171.2656,209.6875 172.5781,208.0313 Q173.9063,206.375 176.4063,206.375 Q177.1094,206.375 177.75,206.5313 Q178.4063,206.6875 178.9688,206.9844 L178.9688,209.7031 Q178.3438,209.125 177.75,208.8594 Q177.1563,208.5781 176.5313,208.5781 Q175.1875,208.5781 174.5,209.6563 Q173.8125,210.7188 173.8125,212.8125 Q173.8125,214.9063 174.5,215.9844 Q175.1875,217.0469 176.5313,217.0469 Q177.1563,217.0469 177.75,216.7813 Q178.3438,216.5 178.9688,215.9219 L178.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190" y="217.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001651557398557662399">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001651557398557662399" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="216"/>
+        <ellipse cx="173.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M168.5,233.1563 C168.5,235.6563 170.6406,237.4688 173.5625,237.4688 C174.7969,237.4688 175.9688,237.1719 176.7188,236.6563 C177.3281,236.2344 177.6563,235.8125 177.6563,235.4063 C177.6563,234.9375 177.2344,234.5313 176.7344,234.5313 C176.5,234.5313 176.2813,234.6094 176.0781,234.8125 C175.6406,235.25 175.6406,235.25 175.4688,235.3438 C175.0156,235.5781 174.375,235.7188 173.6094,235.7188 C171.6094,235.7188 170.3281,234.7031 170.3281,233.125 L170.3281,232.0781 C170.3281,230.375 171.5469,229.1719 173.25,229.1719 C173.8281,229.1719 174.4063,229.3125 174.875,229.5625 C175.3438,229.8281 175.5156,230.0156 175.5781,230.375 C175.7031,231.0469 175.9531,231.2969 176.4844,231.2969 C176.7656,231.2969 177.0469,231.1563 177.2344,230.9375 C177.3594,230.7656 177.4063,230.5938 177.4063,230.1563 L177.4063,228.7969 C177.4063,228.375 177.3906,228.2344 177.2656,228.0625 C177.0938,227.8125 176.8125,227.6563 176.4844,227.6563 C176.1719,227.6563 175.9688,227.7656 175.75,228.0313 C174.5781,227.5313 174.1406,227.4219 173.1875,227.4219 C170.5156,227.4219 168.5,229.4375 168.5,232.0625 L168.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="236.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13z0hmuox0opi)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
-      <ellipse cx="251.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M254.4688,218.6406 Q253.8906,218.9375 253.25,219.0781 Q252.6094,219.2344 251.9063,219.2344 Q249.4063,219.2344 248.0781,217.5938 Q246.7656,215.9375 246.7656,212.8125 Q246.7656,209.6875 248.0781,208.0313 Q249.4063,206.375 251.9063,206.375 Q252.6094,206.375 253.25,206.5313 Q253.9063,206.6875 254.4688,206.9844 L254.4688,209.7031 Q253.8438,209.125 253.25,208.8594 Q252.6563,208.5781 252.0313,208.5781 Q250.6875,208.5781 250,209.6563 Q249.3125,210.7188 249.3125,212.8125 Q249.3125,214.9063 250,215.9844 Q250.6875,217.0469 252.0313,217.0469 Q252.6563,217.0469 253.25,216.7813 Q253.8438,216.5 254.4688,215.9219 L254.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="265.5" y="217.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001089781072752262158">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001089781072752262158" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="235.5" y="216"/>
+        <ellipse cx="250.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M245.5,233.1563 C245.5,235.6563 247.6406,237.4688 250.5625,237.4688 C251.7969,237.4688 252.9688,237.1719 253.7188,236.6563 C254.3281,236.2344 254.6563,235.8125 254.6563,235.4063 C254.6563,234.9375 254.2344,234.5313 253.7344,234.5313 C253.5,234.5313 253.2813,234.6094 253.0781,234.8125 C252.6406,235.25 252.6406,235.25 252.4688,235.3438 C252.0156,235.5781 251.375,235.7188 250.6094,235.7188 C248.6094,235.7188 247.3281,234.7031 247.3281,233.125 L247.3281,232.0781 C247.3281,230.375 248.5469,229.1719 250.25,229.1719 C250.8281,229.1719 251.4063,229.3125 251.875,229.5625 C252.3438,229.8281 252.5156,230.0156 252.5781,230.375 C252.7031,231.0469 252.9531,231.2969 253.4844,231.2969 C253.7656,231.2969 254.0469,231.1563 254.2344,230.9375 C254.3594,230.7656 254.4063,230.5938 254.4063,230.1563 L254.4063,228.7969 C254.4063,228.375 254.3906,228.2344 254.2656,228.0625 C254.0938,227.8125 253.8125,227.6563 253.4844,227.6563 C253.1719,227.6563 252.9688,227.7656 252.75,228.0313 C251.5781,227.5313 251.1406,227.4219 250.1875,227.4219 C247.5156,227.4219 245.5,229.4375 245.5,232.0625 L245.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="264.5" y="236.606">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13z0hmuox0opi)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
-      <ellipse cx="330" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M332.9688,218.6406 Q332.3906,218.9375 331.75,219.0781 Q331.1094,219.2344 330.4063,219.2344 Q327.9063,219.2344 326.5781,217.5938 Q325.2656,215.9375 325.2656,212.8125 Q325.2656,209.6875 326.5781,208.0313 Q327.9063,206.375 330.4063,206.375 Q331.1094,206.375 331.75,206.5313 Q332.4063,206.6875 332.9688,206.9844 L332.9688,209.7031 Q332.3438,209.125 331.75,208.8594 Q331.1563,208.5781 330.5313,208.5781 Q329.1875,208.5781 328.5,209.6563 Q327.8125,210.7188 327.8125,212.8125 Q327.8125,214.9063 328.5,215.9844 Q329.1875,217.0469 330.5313,217.0469 Q331.1563,217.0469 331.75,216.7813 Q332.3438,216.5 332.9688,215.9219 L332.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="344" y="217.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0000425964641881054607">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000425964641881054607" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="312" y="216"/>
+        <ellipse cx="327" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M322,233.1563 C322,235.6563 324.1406,237.4688 327.0625,237.4688 C328.2969,237.4688 329.4688,237.1719 330.2188,236.6563 C330.8281,236.2344 331.1563,235.8125 331.1563,235.4063 C331.1563,234.9375 330.7344,234.5313 330.2344,234.5313 C330,234.5313 329.7813,234.6094 329.5781,234.8125 C329.1406,235.25 329.1406,235.25 328.9688,235.3438 C328.5156,235.5781 327.875,235.7188 327.1094,235.7188 C325.1094,235.7188 323.8281,234.7031 323.8281,233.125 L323.8281,232.0781 C323.8281,230.375 325.0469,229.1719 326.75,229.1719 C327.3281,229.1719 327.9063,229.3125 328.375,229.5625 C328.8438,229.8281 329.0156,230.0156 329.0781,230.375 C329.2031,231.0469 329.4531,231.2969 329.9844,231.2969 C330.2656,231.2969 330.5469,231.1563 330.7344,230.9375 C330.8594,230.7656 330.9063,230.5938 330.9063,230.1563 L330.9063,228.7969 C330.9063,228.375 330.8906,228.2344 330.7656,228.0625 C330.5938,227.8125 330.3125,227.6563 329.9844,227.6563 C329.6719,227.6563 329.4688,227.7656 329.25,228.0313 C328.0781,227.5313 327.6406,227.4219 326.6875,227.4219 C324.0156,227.4219 322,229.4375 322,232.0625 L322,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="341" y="236.606">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13z0hmuox0opi)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
-      <ellipse cx="173.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M176.7188,29.6406 Q176.1406,29.9375 175.5,30.0781 Q174.8594,30.2344 174.1563,30.2344 Q171.6563,30.2344 170.3281,28.5938 Q169.0156,26.9375 169.0156,23.8125 Q169.0156,20.6875 170.3281,19.0313 Q171.6563,17.375 174.1563,17.375 Q174.8594,17.375 175.5,17.5313 Q176.1563,17.6875 176.7188,17.9844 L176.7188,20.7031 Q176.0938,20.125 175.5,19.8594 Q174.9063,19.5781 174.2813,19.5781 Q172.9375,19.5781 172.25,20.6563 Q171.5625,21.7188 171.5625,23.8125 Q171.5625,25.9063 172.25,26.9844 Q172.9375,28.0469 174.2813,28.0469 Q174.9063,28.0469 175.5,27.7813 Q176.0938,27.5 176.7188,26.9219 L176.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="194.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000263468735940481091">
+        <rect codeLine="22" fill="#F1F1F1" height="131.9996" id="C_0000263468735940481091" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="103" y="7"/>
+        <ellipse cx="170.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M165.25,24.1563 C165.25,26.6563 167.3906,28.4688 170.3125,28.4688 C171.5469,28.4688 172.7188,28.1719 173.4688,27.6563 C174.0781,27.2344 174.4063,26.8125 174.4063,26.4063 C174.4063,25.9375 173.9844,25.5313 173.4844,25.5313 C173.25,25.5313 173.0313,25.6094 172.8281,25.8125 C172.3906,26.25 172.3906,26.25 172.2188,26.3438 C171.7656,26.5781 171.125,26.7188 170.3594,26.7188 C168.3594,26.7188 167.0781,25.7031 167.0781,24.125 L167.0781,23.0781 C167.0781,21.375 168.2969,20.1719 170,20.1719 C170.5781,20.1719 171.1563,20.3125 171.625,20.5625 C172.0938,20.8281 172.2656,21.0156 172.3281,21.375 C172.4531,22.0469 172.7031,22.2969 173.2344,22.2969 C173.5156,22.2969 173.7969,22.1563 173.9844,21.9375 C174.1094,21.7656 174.1563,21.5938 174.1563,21.1563 L174.1563,19.7969 C174.1563,19.375 174.1406,19.2344 174.0156,19.0625 C173.8438,18.8125 173.5625,18.6563 173.2344,18.6563 C172.9219,18.6563 172.7188,18.7656 172.5,19.0313 C171.3281,18.5313 170.8906,18.4219 169.9375,18.4219 C167.2656,18.4219 165.25,20.4375 165.25,23.0625 L165.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="190.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="255" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="255" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="55.9"/>
+          <ellipse cx="114" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="123" y="64.0059">aaa : A</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="72.6999"/>
+          <ellipse cx="114" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="123" y="80.8059">bbb : std::vector&lt;B&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="89.4998"/>
+          <ellipse cx="114" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="123" y="97.6058">ccc : std::vector&lt;C&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="106.2997"/>
+          <ellipse cx="114" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="123" y="114.4057">ddd : D</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="123.0997"/>
+          <ellipse cx="114" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="123" y="131.2057">eee : E *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="54"/>
-      <ellipse cx="120" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="129" y="62.2104">aaa : A</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="66.8047"/>
-      <ellipse cx="120" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="129" y="75.0151">bbb : std::vector&lt;B&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="79.6094"/>
-      <ellipse cx="120" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="117" x="129" y="87.8198">ccc : std::vector&lt;C&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="92.4141"/>
-      <ellipse cx="120" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="129" y="100.6245">ddd : D</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="105.2188"/>
-      <ellipse cx="120" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="129" y="113.4292">eee : E *</text>
-    </a>
-    <path d="M111.59,120.19 C100.65,129.74 89.75,139.87 80,150 C67.26,163.23 54.64,179.38 44.8,192.83 " fill="none" id="C_0000263468735940481091-&gt;C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="41.84,196.91,50.3591,191.9679,44.7732,192.8608,43.8804,187.2748,41.84,196.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="86" cy="159.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="93" y="163.0669">aaa</text>
-    <path d="M142.39,131.84 C139.12,137.93 135.94,144.04 133,150 C125.44,165.34 118.08,183.15 112.67,196.97 " fill="none" id="C_0000263468735940481091&lt;-C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="148.79,120.22,142.3933,123.549,143.006,130.734,149.4027,127.405,148.79,120.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="139" cy="159.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="146" y="163.0669">bbb</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="119.28" y="140.0594">0..1</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="88.9448" y="185.9743">1..*</text>
-    <path d="M179.08,133.13 C178.86,144.44 178.79,156.05 179,167 C179.18,176.76 179.56,187.52 179.93,196.79 " fill="none" id="C_0000263468735940481091&lt;-C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="179.41,120.05,175.2595,125.9469,179.1065,132.0462,183.257,126.1493,179.41,120.05" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="185" cy="159.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="192" y="163.0669">ccc</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="153.5407" y="140.2662">0..1</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="152.5808" y="185.7482">1..5</text>
-    <path d="M208.65,120.08 C220.43,144.41 233.76,171.96 243.43,191.97 " fill="none" id="C_0000263468735940481091-&gt;C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="245.69,196.62,245.3559,186.7768,243.5055,192.1225,238.1598,190.272,245.69,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="237" cy="159.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="244" y="163.0669">ddd</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="233.9582" y="185.9323">1</text>
-    <path d="M256.17,129.39 C263.35,136.2 270.4,143.15 277,150 C291.34,164.89 306.19,182.88 317.28,196.88 " fill="none" id="C_0000263468735940481091&lt;-C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="246.34,120.2,247.9895,127.2199,255.1039,128.3972,253.4543,121.3773,246.34,120.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="298" cy="159.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="305" y="163.0669">eee</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="303.7143" y="185.8613">1</text>
+    <g id="link_C_0000263468735940481091_C_0000064769484767514424">
+      <path codeLine="30" d="M113.25,139.46 C103.8,149.23 94.3,159.28 85.5,169 C71.83,184.09 60.9788,197.0813 49.8388,210.8813 " fill="none" id="C_0000263468735940481091-to-C_0000064769484767514424" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="46.07,215.55,54.8356,211.0595,49.2106,211.6594,48.6107,206.0345,46.07,215.55" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="91.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="98.5" y="182.077">aaa</text>
+    </g>
+    <g id="link_C_0000263468735940481091_C_0000156923198106222307">
+      <path codeLine="31" d="M144.1299,150.2849 C139.5499,160.2049 139.91,159.42 135.5,169 C128.35,184.54 120.35,202.04 114.14,215.65 " fill="none" id="C_0000263468735940481091-backto-C_0000156923198106222307" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="149.16,139.39,143.0133,143.1607,144.1299,150.2849,150.2766,146.5141,149.16,139.39" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="141.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="148.5" y="182.077">bbb</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="122.8968" y="159.1179">0..1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="20" x="94.304" y="204.6423">1..*</text>
+    </g>
+    <g id="link_C_0000263468735940481091_C_0001651557398557662399">
+      <path codeLine="32" d="M178.4158,151.4396 C178.2958,166.7196 178.36,170.93 178.5,186 C178.59,195.66 178.78,206.32 178.96,215.52 " fill="none" id="C_0000263468735940481091-backto-C_0001651557398557662399" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="178.51,139.44,174.463,145.4084,178.4158,151.4396,182.4628,145.4712,178.51,139.44" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="184.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="191.5" y="182.077">ccc</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="155.2735" y="159.173">0..1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="154.0029" y="204.479">1..5</text>
+    </g>
+    <g id="link_C_0000263468735940481091_C_0001089781072752262158">
+      <path codeLine="33" d="M209.93,139.21 C222.54,166.24 233.8209,190.4137 243.1109,210.3037 " fill="none" id="C_0000263468735940481091-to-C_0001089781072752262158" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="245.65,215.74,245.4655,205.8929,243.5341,211.2098,238.2172,209.2783,245.65,215.74" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="238.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="245.5" y="182.077">ddd</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="234.7934" y="204.3621">1</text>
+    </g>
+    <g id="link_C_0000263468735940481091_C_0000425964641881054607">
+      <path codeLine="34" d="M255.7295,147.8405 C265.3695,157.6305 266.6,159.19 275.5,169 C289.19,184.09 303.68,201.9 314.62,215.78 " fill="none" id="C_0000263468735940481091-backto-C_0000425964641881054607" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="247.31,139.29,248.6696,146.3718,255.7295,147.8405,254.3699,140.7588,247.31,139.29" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="295.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="302.5" y="182.077">eee</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="301.8741" y="204.4129">1</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00030_class_mermaid.svg b/docs/test_cases/t00030_class_mermaid.svg
index 4fb9158c..74a57f33 100644
--- a/docs/test_cases/t00030_class_mermaid.svg
+++ b/docs/test_cases/t00030_class_mermaid.svg
@@ -1,60 +1,65 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 358.4279479980469 308" style="max-width: 358.428px; background-color: white;" width="358.4279479980469" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M95.375,155.78329081632654L83.81640625,164.6527423469388C72.2578125,173.52219387755102,49.140625,191.26109693877552,37.58203125,205.79721513605443C26.0234375,220.33333333333334,26.0234375,231.66666666666666,26.0234375,237.33333333333334L26.0234375,243"/>
-        <path marker-start="url(#classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M124.74019281914894,175L121.04781693262412,180.66666666666666C117.3554410460993,186.33333333333334,109.97068927304964,197.66666666666666,106.27831338652481,209C102.5859375,220.33333333333334,102.5859375,231.66666666666666,102.5859375,237.33333333333334L102.5859375,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M179.1484375,175L179.1484375,180.66666666666666C179.1484375,186.33333333333334,179.1484375,197.66666666666666,179.1484375,209C179.1484375,220.33333333333334,179.1484375,231.66666666666666,179.1484375,237.33333333333334L179.1484375,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M233.55668218085106,175L237.2490580673759,180.66666666666666C240.9414339539007,186.33333333333334,248.32618572695037,197.66666666666666,252.01856161347519,209C255.7109375,220.33333333333334,255.7109375,231.66666666666666,255.7109375,237.33333333333334L255.7109375,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M262.921875,155.9707823773218L274.40625,164.80898531443484C285.890625,173.64718825154787,308.859375,191.32359412577395,320.34375,205.82846372955365C331.828125,220.33333333333334,331.828125,231.66666666666666,331.828125,237.33333333333334L331.828125,243"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M95.375,155.78329081632654L83.81640625,164.6527423469388C72.2578125,173.52219387755102,49.140625,191.26109693877552,37.58203125,204.79721513605443C26.0234375,218.33333333333334,26.0234375,227.66666666666666,26.0234375,232.33333333333334L26.0234375,237"/>
+        <path marker-start="url(#my-svg_classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M114.91349099713536,190.0809791227637L112.8588987476128,193.23414926896976C110.80430649809023,196.38731941517577,106.69512199904511,202.6936597075879,104.64052974952256,211.51349652046062C102.5859375,220.33333333333334,102.5859375,231.66666666666666,102.5859375,237.33333333333334L102.5859375,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M179.1484375,193L179.1484375,195.66666666666666C179.1484375,198.33333333333334,179.1484375,203.66666666666666,179.1484375,212C179.1484375,220.33333333333334,179.1484375,231.66666666666666,179.1484375,237.33333333333334L179.1484375,243"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M233.55668218085106,175L237.2490580673759,180.66666666666666C240.9414339539007,186.33333333333334,248.32618572695037,197.66666666666666,252.01856161347519,208C255.7109375,218.33333333333334,255.7109375,227.66666666666666,255.7109375,232.33333333333334L255.7109375,237"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M277.1866643455093,166.94875053760734L286.2935744545911,173.95729211467278C295.4004845636729,180.96583369173823,313.61430478183644,194.9829168458691,322.72121489091825,207.6581250896012C331.828125,220.33333333333334,331.828125,231.66666666666666,331.828125,237.33333333333334L331.828125,243"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(26.0234375, 209)" class="edgeLabel">
@@ -79,7 +84,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(102.61897233433264, 181.47314485100895)" class="edgeTerminals">
+        <g transform="translate(102.61897272808127, 181.47314847121535)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner">
             <foreignObject style="width: 36px; height: 12px;">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -88,7 +93,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(112.85706003335923, 220.81611325920693)" class="edgeTerminals">
+        <g transform="translate(112.85706231246161, 220.81611634952438)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner"/>
           <foreignObject style="width: 36px; height: 12px;">
             <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -107,7 +112,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(164.1484375, 192.5)" class="edgeTerminals">
+        <g transform="translate(164.14843875000003, 192.50000107142858)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner">
             <foreignObject style="width: 36px; height: 12px;">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -116,7 +121,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(189.1484375, 220.5)" class="edgeTerminals">
+        <g transform="translate(189.14843874999997, 220.50000107142858)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner"/>
           <foreignObject style="width: 36px; height: 12px;">
             <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -135,7 +140,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(265.4361321543585, 220.34605456730625)" class="edgeTerminals">
+        <g transform="translate(265.4361323461854, 220.346055802515)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner"/>
           <foreignObject style="width: 9px; height: 12px;">
             <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -154,7 +159,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(341.42795009741303, 220.35168030193194)" class="edgeTerminals">
+        <g transform="translate(341.42795177924654, 220.35168031829014)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner"/>
           <foreignObject style="width: 9px; height: 12px;">
             <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -164,7 +169,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L7">
+        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L7">
           <g title="A" id="classId-C_0000064769484767514424-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -183,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L9">
+        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L9">
           <g title="B" id="classId-C_0000156923198106222307-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -202,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L11">
+        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L11">
           <g title="C" id="classId-C_0001651557398557662399-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -221,7 +226,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L13">
+        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L13">
           <g title="D" id="classId-C_0001089781072752262158-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -240,7 +245,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L15">
+        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L15">
           <g title="E" id="classId-C_0000425964641881054607-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -259,7 +264,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00030/t00030.cc#L17">
+        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L17">
           <g title="R" id="classId-C_0000263468735940481091-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
@@ -297,7 +302,7 @@
               </foreignObject>
               <foreignObject transform="translate( -76.2734375, 46)" height="18" width="60.046875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+eee : E </span>
+                  <span style="font-style:italic;" class="nodeLabel">+eee : E</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md
index 206097d3..3d4b3846 100644
--- a/docs/test_cases/t00031.md
+++ b/docs/test_cases/t00031.md
@@ -14,7 +14,7 @@ diagrams:
 
 ```
 ## Source code
-File t00031.cc
+File `tests/t00031/t00031.cc`
 ```cpp
 #include <memory>
 #include <vector>
@@ -294,6 +294,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index 21448be6..42a52250 100644
--- a/docs/test_cases/t00031_class.svg
+++ b/docs/test_cases/t00031_class.svg
@@ -1,140 +1,159 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="415px" preserveAspectRatio="none" style="width:353px;height:415px;" version="1.1" viewBox="0 0 353 415" width="353px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="447px" preserveAspectRatio="none" style="width:344px;height:447px;background:#FFFFFF;" version="1.1" viewBox="0 0 344 447" width="344px" zoomAndPan="magnify">
   <defs>
-    <linearGradient id="gxy6e3eeqerx70" x1="0%" x2="100%" y1="50%" y2="50%">
+    <linearGradient id="gxnv4lsmfylvj0" 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="fxy6e3eeqerx7" 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="gxy6e3eeqerx71" x1="0%" x2="100%" y1="0%" y2="100%">
+    <linearGradient id="gxnv4lsmfylvj1" x1="0%" x2="100%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#0000FF"/>
       <stop offset="100%" stop-color="#FF0000"/>
     </linearGradient>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="url(#gxy6e3eeqerx70)" filter="url(#fxy6e3eeqerx7)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
-      <rect fill="url(#gxy6e3eeqerx71)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
-      <ellipse cx="21" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,237.6406 Q23.3906,237.9375 22.75,238.0781 Q22.1094,238.2344 21.4063,238.2344 Q18.9063,238.2344 17.5781,236.5938 Q16.2656,234.9375 16.2656,231.8125 Q16.2656,228.6875 17.5781,227.0313 Q18.9063,225.375 21.4063,225.375 Q22.1094,225.375 22.75,225.5313 Q23.4063,225.6875 23.9688,225.9844 L23.9688,228.7031 Q23.3438,228.125 22.75,227.8594 Q22.1563,227.5781 21.5313,227.5781 Q20.1875,227.5781 19.5,228.6563 Q18.8125,229.7188 18.8125,231.8125 Q18.8125,233.9063 19.5,234.9844 Q20.1875,236.0469 21.5313,236.0469 Q22.1563,236.0469 22.75,235.7813 Q23.3438,235.5 23.9688,234.9219 L23.9688,237.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="236.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="248" y2="248"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="256" y2="256"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000847775539502907247">
+        <rect codeLine="2" fill="url(#gxnv4lsmfylvj0)" height="48" id="C_0000847775539502907247" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="241.2"/>
+        <rect fill="url(#gxnv4lsmfylvj1)" height="32" rx="2.5" ry="2.5" style="stroke:url(#gxnv4lsmfylvj1);stroke-width:0.5;" width="41" x="7" y="241.2"/>
+        <rect fill="url(#gxnv4lsmfylvj1)" height="2.5" style="stroke:url(#gxnv4lsmfylvj1);stroke-width:0.5;" width="41" x="7" y="270.7"/>
+        <rect codeLine="2" fill="none" height="48" id="C_0000847775539502907247" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="241.2"/>
+        <ellipse cx="22" cy="257.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,258.3563 C17,260.8563 19.1406,262.6688 22.0625,262.6688 C23.2969,262.6688 24.4688,262.3719 25.2188,261.8563 C25.8281,261.4344 26.1563,261.0125 26.1563,260.6063 C26.1563,260.1375 25.7344,259.7313 25.2344,259.7313 C25,259.7313 24.7813,259.8094 24.5781,260.0125 C24.1406,260.45 24.1406,260.45 23.9688,260.5438 C23.5156,260.7781 22.875,260.9188 22.1094,260.9188 C20.1094,260.9188 18.8281,259.9031 18.8281,258.325 L18.8281,257.2781 C18.8281,255.575 20.0469,254.3719 21.75,254.3719 C22.3281,254.3719 22.9063,254.5125 23.375,254.7625 C23.8438,255.0281 24.0156,255.2156 24.0781,255.575 C24.2031,256.2469 24.4531,256.4969 24.9844,256.4969 C25.2656,256.4969 25.5469,256.3563 25.7344,256.1375 C25.8594,255.9656 25.9063,255.7938 25.9063,255.3563 L25.9063,253.9969 C25.9063,253.575 25.8906,253.4344 25.7656,253.2625 C25.5938,253.0125 25.3125,252.8563 24.9844,252.8563 C24.6719,252.8563 24.4688,252.9656 24.25,253.2313 C23.0781,252.7313 22.6406,252.6219 21.6875,252.6219 C19.0156,252.6219 17,254.6375 17,257.2625 L17,258.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="261.806">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="273.2" y2="273.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="281.2" y2="281.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxy6e3eeqerx7)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="103" y="197"/>
-      <ellipse cx="118.9" cy="213" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
-      <path d="M123.0094,219 L115.2906,219 L115.2906,206.6094 L123.0094,206.6094 L123.0094,208.7656 L117.7438,208.7656 L117.7438,211.4375 L122.5094,211.4375 L122.5094,213.5938 L117.7438,213.5938 L117.7438,216.8438 L123.0094,216.8438 L123.0094,219 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="133.1" y="217.1543">B</text>
-      <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="104" x2="144" y1="229" y2="229"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="109" y="243.2104">one</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="109" y="256.0151">two</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="109" y="268.8198">three</text>
-      <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="104" x2="144" y1="275.4141" y2="275.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001441796358326382179">
+        <rect codeLine="6" fill="#F1F1F1" height="98.3998" id="C_0001441796358326382179" rx="2.5" ry="2.5" style="stroke:#0000FF;stroke-width:1.0;stroke-dasharray:1.0,3.0;" width="45" x="101" y="216"/>
+        <ellipse cx="117.8" cy="232" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M116.6594,233.0625 L117.9719,233.0625 L117.9719,233.1094 C117.9719,233.5156 117.9875,233.6719 118.0969,233.8281 C118.2688,234.0781 118.5656,234.25 118.8781,234.25 C119.1594,234.25 119.4563,234.1094 119.6281,233.8906 C119.7531,233.7031 119.8,233.5625 119.8,233.1094 L119.8,231.2656 C119.8,230.9375 119.7844,230.8281 119.7219,230.6563 C119.6125,230.3594 119.2531,230.1094 118.8781,230.1094 C118.5813,230.1094 118.3156,230.25 118.1438,230.4688 C118.0031,230.6563 117.9719,230.8281 117.9719,231.2656 L117.9719,231.3281 L116.6594,231.3281 L116.6594,229.1563 L120.5031,229.1563 L120.5031,229.9063 C120.5031,230.2969 120.5344,230.4844 120.6438,230.6406 C120.8156,230.8906 121.1125,231.0625 121.425,231.0625 C121.7219,231.0625 121.9875,230.9375 122.175,230.7031 C122.3156,230.5156 122.3469,230.375 122.3469,229.9063 L122.3469,227.4063 L114.6438,227.4063 C114.1906,227.4063 114.0656,227.4219 113.8938,227.5313 C113.6281,227.7031 113.4563,227.9688 113.4563,228.2813 C113.4563,228.5625 113.5813,228.8281 113.8313,229 C114.0188,229.125 114.2063,229.1563 114.6438,229.1563 L114.8313,229.1563 L114.8313,235.25 L114.6438,235.25 C114.2219,235.25 114.0656,235.2813 113.8938,235.375 C113.6281,235.5313 113.4563,235.8125 113.4563,236.1094 C113.4563,236.6875 113.8625,237 114.6438,237 L122.7219,237 L122.7219,234.4688 C122.7219,234.0625 122.6906,233.8906 122.5813,233.7344 C122.4094,233.4688 122.1281,233.3125 121.8,233.3125 C121.5188,233.3125 121.2375,233.4531 121.05,233.6719 C120.9094,233.8594 120.8781,234.0156 120.8781,234.4688 L120.8781,235.25 L116.6594,235.25 L116.6594,233.0625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="132.2" y="236.606">B</text>
+        <line style="stroke:#0000FF;stroke-width:1.0;stroke-dasharray:1.0,3.0;" x1="102" x2="145" y1="248" y2="248"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="107" y="265.0059">one</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="22" x="107" y="281.8059">two</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="107" y="298.6058">three</text>
+        <line style="stroke:#0000FF;stroke-width:1.0;stroke-dasharray:1.0,3.0;" x1="102" x2="145" y1="306.3998" y2="306.3998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FFC0CB" filter="url(#fxy6e3eeqerx7)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
-      <rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
-      <ellipse cx="298.2" cy="360" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/>
-      <path d="M301.1688,365.6406 Q300.5906,365.9375 299.95,366.0781 Q299.3094,366.2344 298.6063,366.2344 Q296.1063,366.2344 294.7781,364.5938 Q293.4656,362.9375 293.4656,359.8125 Q293.4656,356.6875 294.7781,355.0313 Q296.1063,353.375 298.6063,353.375 Q299.3094,353.375 299.95,353.5313 Q300.6063,353.6875 301.1688,353.9844 L301.1688,356.7031 Q300.5438,356.125 299.95,355.8594 Q299.3563,355.5781 298.7313,355.5781 Q297.3875,355.5781 296.7,356.6563 Q296.0125,357.7188 296.0125,359.8125 Q296.0125,361.9063 296.7,362.9844 Q297.3875,364.0469 298.7313,364.0469 Q299.3563,364.0469 299.95,363.7813 Q300.5438,363.5 301.1688,362.9219 L301.1688,365.6406 Z "/>
-      <text fill="#FF0000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="312.8" y="364.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="331.5" y="341"/>
-      <text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="332.5" y="353.1387">T</text>
-      <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="376" y2="376"/>
-      <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="384" y2="384"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000116209144733282955">
+        <rect codeLine="12" fill="#FFC0CB" height="64.7999" id="C_0000116209144733282955" rx="2.5" ry="2.5" style="stroke:#FF0000;stroke-width:2.0;" width="59" x="274" y="375.4"/>
+        <ellipse cx="291.7" cy="391.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M286.7,392.5563 C286.7,395.0563 288.8406,396.8688 291.7625,396.8688 C292.9969,396.8688 294.1688,396.5719 294.9188,396.0563 C295.5281,395.6344 295.8563,395.2125 295.8563,394.8063 C295.8563,394.3375 295.4344,393.9313 294.9344,393.9313 C294.7,393.9313 294.4813,394.0094 294.2781,394.2125 C293.8406,394.65 293.8406,394.65 293.6688,394.7438 C293.2156,394.9781 292.575,395.1188 291.8094,395.1188 C289.8094,395.1188 288.5281,394.1031 288.5281,392.525 L288.5281,391.4781 C288.5281,389.775 289.7469,388.5719 291.45,388.5719 C292.0281,388.5719 292.6063,388.7125 293.075,388.9625 C293.5438,389.2281 293.7156,389.4156 293.7781,389.775 C293.9031,390.4469 294.1531,390.6969 294.6844,390.6969 C294.9656,390.6969 295.2469,390.5563 295.4344,390.3375 C295.5594,390.1656 295.6063,389.9938 295.6063,389.5563 L295.6063,388.1969 C295.6063,387.775 295.5906,387.6344 295.4656,387.4625 C295.2938,387.2125 295.0125,387.0563 294.6844,387.0563 C294.3719,387.0563 294.1688,387.1656 293.95,387.4313 C292.7781,386.9313 292.3406,386.8219 291.3875,386.8219 C288.7156,386.8219 286.7,388.8375 286.7,391.4625 L286.7,392.5563 Z " fill="#000000"/>
+        <text fill="#FF0000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="306.3" y="396.006">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="327" y="372.4"/>
+        <text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="328" y="386.6001">T</text>
+        <line style="stroke:#FF0000;stroke-width:0.5;" x1="275" x2="332" y1="407.4" y2="407.4"/>
+        <line style="stroke:#FF0000;stroke-width:0.5;" x1="275" x2="332" y1="415.4" y2="415.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+          <rect fill="#FFC0CB" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="280" y="424.3"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="282" y="426.3"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+          <text fill="#FF0000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="294" y="432.4059">ttt : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
-      <rect fill="#FFC0CB" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="390"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="288.5" y="392"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0002266534344475505157">
+        <rect codeLine="17" fill="#F1F1F1" height="48" id="C_0002266534344475505157" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="197.5" y="241.2"/>
+        <ellipse cx="212.5" cy="257.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M207.5,258.3563 C207.5,260.8563 209.6406,262.6688 212.5625,262.6688 C213.7969,262.6688 214.9688,262.3719 215.7188,261.8563 C216.3281,261.4344 216.6563,261.0125 216.6563,260.6063 C216.6563,260.1375 216.2344,259.7313 215.7344,259.7313 C215.5,259.7313 215.2813,259.8094 215.0781,260.0125 C214.6406,260.45 214.6406,260.45 214.4688,260.5438 C214.0156,260.7781 213.375,260.9188 212.6094,260.9188 C210.6094,260.9188 209.3281,259.9031 209.3281,258.325 L209.3281,257.2781 C209.3281,255.575 210.5469,254.3719 212.25,254.3719 C212.8281,254.3719 213.4063,254.5125 213.875,254.7625 C214.3438,255.0281 214.5156,255.2156 214.5781,255.575 C214.7031,256.2469 214.9531,256.4969 215.4844,256.4969 C215.7656,256.4969 216.0469,256.3563 216.2344,256.1375 C216.3594,255.9656 216.4063,255.7938 216.4063,255.3563 L216.4063,253.9969 C216.4063,253.575 216.3906,253.4344 216.2656,253.2625 C216.0938,253.0125 215.8125,252.8563 215.4844,252.8563 C215.1719,252.8563 214.9688,252.9656 214.75,253.2313 C213.5781,252.7313 213.1406,252.6219 212.1875,252.6219 C209.5156,252.6219 207.5,254.6375 207.5,257.2625 L207.5,258.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="226.5" y="261.806">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="198.5" x2="238.5" y1="273.2" y2="273.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="198.5" x2="238.5" y1="281.2" y2="281.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
-      <text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="300.5" y="398.2104">ttt : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000208700529175860645">
+        <rect codeLine="21" fill="#F1F1F1" height="48" id="C_0000208700529175860645" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="274" y="241.2"/>
+        <ellipse cx="289" cy="257.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M284,258.3563 C284,260.8563 286.1406,262.6688 289.0625,262.6688 C290.2969,262.6688 291.4688,262.3719 292.2188,261.8563 C292.8281,261.4344 293.1563,261.0125 293.1563,260.6063 C293.1563,260.1375 292.7344,259.7313 292.2344,259.7313 C292,259.7313 291.7813,259.8094 291.5781,260.0125 C291.1406,260.45 291.1406,260.45 290.9688,260.5438 C290.5156,260.7781 289.875,260.9188 289.1094,260.9188 C287.1094,260.9188 285.8281,259.9031 285.8281,258.325 L285.8281,257.2781 C285.8281,255.575 287.0469,254.3719 288.75,254.3719 C289.3281,254.3719 289.9063,254.5125 290.375,254.7625 C290.8438,255.0281 291.0156,255.2156 291.0781,255.575 C291.2031,256.2469 291.4531,256.4969 291.9844,256.4969 C292.2656,256.4969 292.5469,256.3563 292.7344,256.1375 C292.8594,255.9656 292.9063,255.7938 292.9063,255.3563 L292.9063,253.9969 C292.9063,253.575 292.8906,253.4344 292.7656,253.2625 C292.5938,253.0125 292.3125,252.8563 291.9844,252.8563 C291.6719,252.8563 291.4688,252.9656 291.25,253.2313 C290.0781,252.7313 289.6406,252.6219 288.6875,252.6219 C286.0156,252.6219 284,254.6375 284,257.2625 L284,258.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="303" y="261.806">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="321" y="238.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="322" y="252.4001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="275" x2="332" y1="273.2" y2="273.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="275" x2="332" y1="281.2" y2="281.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxy6e3eeqerx7)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="202.5" y="216"/>
-      <ellipse cx="217.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M220.4688,237.6406 Q219.8906,237.9375 219.25,238.0781 Q218.6094,238.2344 217.9063,238.2344 Q215.4063,238.2344 214.0781,236.5938 Q212.7656,234.9375 212.7656,231.8125 Q212.7656,228.6875 214.0781,227.0313 Q215.4063,225.375 217.9063,225.375 Q218.6094,225.375 219.25,225.5313 Q219.9063,225.6875 220.4688,225.9844 L220.4688,228.7031 Q219.8438,228.125 219.25,227.8594 Q218.6563,227.5781 218.0313,227.5781 Q216.6875,227.5781 216,228.6563 Q215.3125,229.7188 215.3125,231.8125 Q215.3125,233.9063 216,234.9844 Q216.6875,236.0469 218.0313,236.0469 Q218.6563,236.0469 219.25,235.7813 Q219.8438,235.5 220.4688,234.9219 L220.4688,237.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="231.5" y="236.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="248" y2="248"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="256" y2="256"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000484712092364868032">
+        <rect codeLine="25" fill="#F1F1F1" height="131.9996" id="C_0000484712092364868032" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="67" y="7"/>
+        <ellipse cx="134.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M129.25,24.1563 C129.25,26.6563 131.3906,28.4688 134.3125,28.4688 C135.5469,28.4688 136.7188,28.1719 137.4688,27.6563 C138.0781,27.2344 138.4063,26.8125 138.4063,26.4063 C138.4063,25.9375 137.9844,25.5313 137.4844,25.5313 C137.25,25.5313 137.0313,25.6094 136.8281,25.8125 C136.3906,26.25 136.3906,26.25 136.2188,26.3438 C135.7656,26.5781 135.125,26.7188 134.3594,26.7188 C132.3594,26.7188 131.0781,25.7031 131.0781,24.125 L131.0781,23.0781 C131.0781,21.375 132.2969,20.1719 134,20.1719 C134.5781,20.1719 135.1563,20.3125 135.625,20.5625 C136.0938,20.8281 136.2656,21.0156 136.3281,21.375 C136.4531,22.0469 136.7031,22.2969 137.2344,22.2969 C137.5156,22.2969 137.7969,22.1563 137.9844,21.9375 C138.1094,21.7656 138.1563,21.5938 138.1563,21.1563 L138.1563,19.7969 C138.1563,19.375 138.1406,19.2344 138.0156,19.0625 C137.8438,18.8125 137.5625,18.6563 137.2344,18.6563 C136.9219,18.6563 136.7188,18.7656 136.5,19.0313 C135.3281,18.5313 134.8906,18.4219 133.9375,18.4219 C131.2656,18.4219 129.25,20.4375 129.25,23.0625 L129.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="154.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="68" x2="219" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="47.9"/>
+          <ellipse cx="78" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109" x="87" y="56.0059">add_b(B b) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="68" x2="219" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="72.6999"/>
+          <ellipse cx="78" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="87" y="80.8059">aaa : A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="89.4998"/>
+          <ellipse cx="78" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="87" y="97.6058">bbb : std::vector&lt;B&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="106.2997"/>
+          <ellipse cx="78" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="87" y="114.4057">ccc : C&lt;int&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="123.0997"/>
+          <ellipse cx="78" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="87" y="131.2057">ddd : D *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxy6e3eeqerx7)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="279" y="216"/>
-      <ellipse cx="294" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M296.9688,237.6406 Q296.3906,237.9375 295.75,238.0781 Q295.1094,238.2344 294.4063,238.2344 Q291.9063,238.2344 290.5781,236.5938 Q289.2656,234.9375 289.2656,231.8125 Q289.2656,228.6875 290.5781,227.0313 Q291.9063,225.375 294.4063,225.375 Q295.1094,225.375 295.75,225.5313 Q296.4063,225.6875 296.9688,225.9844 L296.9688,228.7031 Q296.3438,228.125 295.75,227.8594 Q295.1563,227.5781 294.5313,227.5781 Q293.1875,227.5781 292.5,228.6563 Q291.8125,229.7188 291.8125,231.8125 Q291.8125,233.9063 292.5,234.9844 Q293.1875,236.0469 294.5313,236.0469 Q295.1563,236.0469 295.75,235.7813 Q296.3438,235.5 296.9688,234.9219 L296.9688,237.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="308" y="236.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="324" y="213"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="325" y="225.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="248" y2="248"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="256" y2="256"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxy6e3eeqerx7)" height="112.0234" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="72" y="8"/>
-      <ellipse cx="136.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M139.7188,29.6406 Q139.1406,29.9375 138.5,30.0781 Q137.8594,30.2344 137.1563,30.2344 Q134.6563,30.2344 133.3281,28.5938 Q132.0156,26.9375 132.0156,23.8125 Q132.0156,20.6875 133.3281,19.0313 Q134.6563,17.375 137.1563,17.375 Q137.8594,17.375 138.5,17.5313 Q139.1563,17.6875 139.7188,17.9844 L139.7188,20.7031 Q139.0938,20.125 138.5,19.8594 Q137.9063,19.5781 137.2813,19.5781 Q135.9375,19.5781 135.25,20.6563 Q134.5625,21.7188 134.5625,23.8125 Q134.5625,25.9063 135.25,26.9844 Q135.9375,28.0469 137.2813,28.0469 Q137.9063,28.0469 138.5,27.7813 Q139.0938,27.5 139.7188,26.9219 L139.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="46"/>
-      <ellipse cx="83" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="92" y="54.2104">add_b(B b) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="66.8047"/>
-      <ellipse cx="83" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="92" y="75.0151">aaa : A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="79.6094"/>
-      <ellipse cx="83" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="92" y="87.8198">bbb : std::vector&lt;B&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="92.4141"/>
-      <ellipse cx="83" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="92" y="100.6245">ccc : C&lt;int&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="105.2188"/>
-      <ellipse cx="83" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="92" y="113.4292">ddd : D *</text>
-    </a>
-    <path d="M309,264.08 C309,280.48 309,303.13 309,323.57 " fill="none" id="C_0000208700529175860645-&gt;C_0000116209144733282955" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="316,323.71,309,343.71,302,323.71,316,323.71" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M117.89,120.22 C114.21,129.93 111.01,140.11 109,150 C106.25,163.54 107.17,178.31 109.57,191.86 " fill="none" id="C_0000484712092364868032-&gt;C_0001441796358326382179" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="110.51,196.79,112.7425,187.1975,109.5679,191.8796,104.8858,188.7049,110.51,196.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M136.77,133.2 C134.17,154.72 131.38,177.86 129.07,196.99 " fill="none" id="C_0000484712092364868032&lt;-C_0001441796358326382179" style="stroke: #008000; stroke-width: 4.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#008000" points="138.36,120.05,133.6698,125.5274,136.9219,131.9635,141.6121,126.4861,138.36,120.05" style="stroke: #008000; stroke-width: 4.0;"/>
-    <ellipse cx="141" cy="159.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="148" y="163.0669">bbb</text>
-    <path d="M85.02,120.44 C76.66,129.81 68.66,139.81 62,150 C49.66,168.87 40.31,192.65 34.24,210.88 " fill="none" id="C_0000484712092364868032-&gt;C_0000847775539502907247" style="stroke: #FF0000; stroke-width: 2.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#FF0000" points="32.61,215.87,39.2178,208.5668,34.1697,211.1195,31.617,206.0713,32.61,215.87" style="stroke: #FF0000; stroke-width: 2.0;"/>
-    <ellipse cx="68" cy="159.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="75" y="163.0669">aaa</text>
-    <path d="M214.95,129.47 C221.84,136.29 228.63,143.21 235,150 C255.08,171.39 276.32,197.33 290.88,215.67 " fill="none" id="C_0000484712092364868032&lt;-C_0000208700529175860645" style="stroke: #0000FF; stroke-width: 8.0; stroke-dasharray: 1.0,3.0;"/>
-    <polygon fill="#FFFFFF" points="205.53,120.26,207.021,127.3153,214.107,128.6526,212.616,121.5973,205.53,120.26" style="stroke: #0000FF; stroke-width: 8.0;"/>
-    <ellipse cx="256" cy="159.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="263" y="163.0669">ccc</text>
-    <path d="M169.68,120.05 C183.24,150.3 199.47,186.52 210.44,210.98 " fill="none" id="C_0000484712092364868032-&gt;C_0002266534344475505157" style="stroke: #0000FF; stroke-width: 16.0;"/>
-    <polygon fill="#0000FF" points="212.56,215.71,212.5285,205.8612,210.5147,211.1475,205.2285,209.1336,212.56,215.71" style="stroke: #0000FF; stroke-width: 16.0;"/>
-    <ellipse cx="195" cy="159.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="202" y="163.0669">ddd</text>
+    <g id="link_C_0000208700529175860645_C_0000116209144733282955">
+      <path codeLine="33" d="M303.5,289.42 C303.5,312.82 303.5,331.09 303.5,357.13 " fill="none" id="C_0000208700529175860645-to-C_0000116209144733282955" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="303.5,375.13,309.5,357.13,297.5,357.13,303.5,375.13" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000484712092364868032_C_0001441796358326382179">
+      <path codeLine="34" d="M115.26,139.3 C112.05,149.1 109.29,159.2 107.5,169 C104.72,184.17 104.9159,194.8306 107.6959,209.8206 " fill="none" id="C_0000484712092364868032-to-C_0001441796358326382179" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="108.79,215.72,111.0818,206.1415,107.8783,210.8038,103.2159,207.6003,108.79,215.72" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000484712092364868032_C_0001441796358326382179">
+      <path codeLine="36" d="M135.3613,151.3938 C132.7213,176.4238 131.03,192.58 128.59,215.75 " fill="none" id="C_0000484712092364868032-backto-C_0001441796358326382179" style="stroke:#008000;stroke-width:4.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#008000" points="136.62,139.46,132.0127,145.0073,135.3613,151.3938,139.9686,145.8465,136.62,139.46" style="stroke:#008000;stroke-width:4.0;"/>
+      <ellipse cx="139.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="146.5" y="182.077">bbb</text>
+    </g>
+    <g id="link_C_0000484712092364868032_C_0000847775539502907247">
+      <path codeLine="35" d="M83.68,139.35 C76.36,148.93 69.39,158.96 63.5,169 C50,192.01 41.6365,215.2568 35.6165,235.1668 " fill="none" id="C_0000484712092364868032-to-C_0000847775539502907247" style="stroke:#FF0000;stroke-width:2.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#FF0000" points="33.88,240.91,40.3136,233.4529,35.3271,236.124,32.656,231.1375,33.88,240.91" style="stroke:#FF0000;stroke-width:2.0;"/>
+      <ellipse cx="69.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="76.5" y="182.077">aaa</text>
+    </g>
+    <g id="link_C_0000484712092364868032_C_0000208700529175860645">
+      <path codeLine="37" d="M210.9613,148.4653 C219.6013,158.2753 220.39,159.34 228.5,169 C248.66,193.01 270.76,221.32 285.71,240.79 " fill="none" id="C_0000484712092364868032-backto-C_0000208700529175860645" style="stroke:#0000FF;stroke-width:8.0;stroke-dasharray:1.0,3.0;"/>
+      <polygon fill="none" points="203.03,139.46,203.9939,146.6064,210.9613,148.4653,209.9974,141.3189,203.03,139.46" style="stroke:#0000FF;stroke-width:8.0;"/>
+      <ellipse cx="247.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="254.5" y="182.077">ccc</text>
+    </g>
+    <g id="link_C_0000484712092364868032_C_0002266534344475505157">
+      <path codeLine="38" d="M169.31,139.46 C183.21,174.7 197.29,210.3979 207.19,235.5179 " fill="none" id="C_0000484712092364868032-to-C_0002266534344475505157" style="stroke:#0000FF;stroke-width:16.0;"/>
+      <polygon fill="#0000FF" points="209.39,241.1,209.8115,231.2602,207.5567,236.4482,202.3686,234.1934,209.39,241.1" style="stroke:#0000FF;stroke-width:16.0;"/>
+      <ellipse cx="191.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="198.5" y="182.077">ddd</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00031_class_mermaid.svg b/docs/test_cases/t00031_class_mermaid.svg
index 400df57f..360b468d 100644
--- a/docs/test_cases/t00031_class_mermaid.svg
+++ b/docs/test_cases/t00031_class_mermaid.svg
@@ -1,61 +1,66 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 410.4140625 525" style="max-width: 410.414px; background-color: white;" width="410.4140625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M370.015625,344L370.015625,355.5C370.015625,367,370.015625,390,370.015625,405.6666666666667C370.015625,421.3333333333333,370.015625,429.6666666666667,370.015625,433.8333333333333L370.015625,438"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M129.4291722074468,175L125.70985704787233,180.66666666666666C121.99054188829787,186.33333333333334,114.55191156914894,197.66666666666666,113.12407968422235,209C111.69624779929579,220.33333333333334,116.27921434859155,231.66666666666666,118.57069762323944,237.33333333333334L120.86218089788733,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M100.4609375,153.71680410843908L88.0546875,162.9306700903659C75.6484375,172.1445360722927,50.8359375,190.57226803614637,38.4296875,212.7861340180732C26.0234375,235,26.0234375,261,26.0234375,274L26.0234375,287"/>
-        <path marker-start="url(#classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M184.234375,175L184.234375,180.66666666666666C184.234375,186.33333333333334,184.234375,197.66666666666666,182.42238849765258,209C180.61040199530518,220.33333333333334,176.98642899061034,231.66666666666666,175.1744424882629,237.33333333333334L173.3624559859155,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M268.0078125,144.4837047939445L285.0091145833333,155.23642066162043C302.0104166666667,165.98913652929633,336.0130208333333,187.49456826464817,353.0143229166667,211.2472841323241C370.015625,235,370.015625,261,370.015625,274L370.015625,287"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M248.2639960106383,175L252.6093195921986,180.66666666666666C256.9546431737588,186.33333333333334,265.64529033687944,197.66666666666666,269.9906139184397,216.33333333333334C274.3359375,235,274.3359375,261,274.3359375,274L274.3359375,287"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M370.015625,344L370.015625,355.5C370.015625,367,370.015625,390,370.015625,402.6666666666667C370.015625,415.3333333333333,370.015625,417.6666666666667,370.015625,418.8333333333333L370.015625,420"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M129.4291722074468,175L125.70985704787233,180.66666666666666C121.99054188829787,186.33333333333334,114.55191156914894,197.66666666666666,112.74919163622992,208.0729299101619C110.94647170331093,218.47919315365712,114.7796621566219,227.9583863073142,116.69625738327737,232.6979828841428L118.61285260993284,237.43757946097134"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M100.4609375,153.71680410843908L88.0546875,162.9306700903659C75.6484375,172.1445360722927,50.8359375,190.57226803614637,38.4296875,211.7861340180732C26.0234375,233,26.0234375,257,26.0234375,269L26.0234375,281"/>
+        <path marker-start="url(#my-svg_classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M184.234375,193L184.234375,195.66666666666666C184.234375,198.33333333333334,184.234375,203.66666666666666,182.42238849765258,212C180.61040199530518,220.33333333333334,176.98642899061034,231.66666666666666,175.1744424882629,237.33333333333334L173.3624559859155,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M283.220529132409,154.10520429568678L297.6863784436742,163.2543369130723C312.15222775493936,172.40346953045787,341.08392637746965,190.70173476522893,355.5497756887348,212.85086738261444C370.015625,235,370.015625,261,370.015625,274L370.015625,287"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M248.2639960106383,175L252.6093195921986,180.66666666666666C256.9546431737588,186.33333333333334,265.64529033687944,197.66666666666666,269.9906139184397,215.33333333333334C274.3359375,233,274.3359375,257,274.3359375,269L274.3359375,281"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -126,7 +131,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L8">
+        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L8">
           <g title="A" id="classId-C_0000847775539502907247-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -145,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L11">
+        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L11">
           <g title="B" id="classId-C_0001441796358326382179-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -179,7 +184,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000116209144733282955-2" class="node default clickable">
             <rect height="79" width="56.484375" y="-39.5" x="-28.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.2421875" x1="-28.2421875" class="divider"/>
@@ -203,7 +208,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L18">
+        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L18">
           <g title="D" id="classId-C_0002266534344475505157-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +227,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000208700529175860645-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -241,7 +246,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00031/t00031.cc#L20">
+        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L20">
           <g title="R" id="classId-C_0000484712092364868032-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
@@ -259,7 +264,7 @@
               </foreignObject>
               <foreignObject transform="translate( -76.2734375, -42)" height="18" width="59.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+aaa : A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+aaa : A</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -76.2734375, -20)" height="18" width="152.546875">
@@ -274,12 +279,12 @@
               </foreignObject>
               <foreignObject transform="translate( -76.2734375, 24)" height="18" width="60.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ddd : D </span>
+                  <span style="font-style:italic;" class="nodeLabel">+ddd : D</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -76.2734375, 58)" height="18" width="131.203125">
+              <foreignObject transform="translate( -76.2734375, 58)" height="18" width="140.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+add_b(B b) : void</span>
+                  <span class="nodeLabel">+add_b(B b) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md
index 8cdb6f9a..8c155730 100644
--- a/docs/test_cases/t00032.md
+++ b/docs/test_cases/t00032.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00032.cc
+File `tests/t00032/t00032.cc`
 ```cpp
 #include <memory>
 #include <vector>
@@ -124,6 +124,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -172,6 +173,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -220,6 +222,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index c3ffb2dc..8b17c560 100644
--- a/docs/test_cases/t00032_class.svg
+++ b/docs/test_cases/t00032_class.svg
@@ -1,132 +1,156 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="326px" preserveAspectRatio="none" style="width:850px;height:326px;" version="1.1" viewBox="0 0 850 326" width="850px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="329px" preserveAspectRatio="none" style="width:909px;height:329px;background:#FFFFFF;" version="1.1" viewBox="0 0 909 329" width="909px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ncj5hbhrc87z" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ncj5hbhrc87z)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="144.5" y="146"/>
-      <ellipse cx="159.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M162.4688,167.6406 Q161.8906,167.9375 161.25,168.0781 Q160.6094,168.2344 159.9063,168.2344 Q157.4063,168.2344 156.0781,166.5938 Q154.7656,164.9375 154.7656,161.8125 Q154.7656,158.6875 156.0781,157.0313 Q157.4063,155.375 159.9063,155.375 Q160.6094,155.375 161.25,155.5313 Q161.9063,155.6875 162.4688,155.9844 L162.4688,158.7031 Q161.8438,158.125 161.25,157.8594 Q160.6563,157.5781 160.0313,157.5781 Q158.6875,157.5781 158,158.6563 Q157.3125,159.7188 157.3125,161.8125 Q157.3125,163.9063 158,164.9844 Q158.6875,166.0469 160.0313,166.0469 Q160.6563,166.0469 161.25,165.7813 Q161.8438,165.5 162.4688,164.9219 L162.4688,167.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="173.5" y="166.1543">Base</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="178" y2="178"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="186" y2="186"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <g id="elem_C_0001619396229227632210">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001619396229227632210" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="64" x="168.5" y="148.8"/>
+        <ellipse cx="183.5" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M178.5,165.9563 C178.5,168.4563 180.6406,170.2688 183.5625,170.2688 C184.7969,170.2688 185.9688,169.9719 186.7188,169.4563 C187.3281,169.0344 187.6563,168.6125 187.6563,168.2063 C187.6563,167.7375 187.2344,167.3313 186.7344,167.3313 C186.5,167.3313 186.2813,167.4094 186.0781,167.6125 C185.6406,168.05 185.6406,168.05 185.4688,168.1438 C185.0156,168.3781 184.375,168.5188 183.6094,168.5188 C181.6094,168.5188 180.3281,167.5031 180.3281,165.925 L180.3281,164.8781 C180.3281,163.175 181.5469,161.9719 183.25,161.9719 C183.8281,161.9719 184.4063,162.1125 184.875,162.3625 C185.3438,162.6281 185.5156,162.8156 185.5781,163.175 C185.7031,163.8469 185.9531,164.0969 186.4844,164.0969 C186.7656,164.0969 187.0469,163.9563 187.2344,163.7375 C187.3594,163.5656 187.4063,163.3938 187.4063,162.9563 L187.4063,161.5969 C187.4063,161.175 187.3906,161.0344 187.2656,160.8625 C187.0938,160.6125 186.8125,160.4563 186.4844,160.4563 C186.1719,160.4563 185.9688,160.5656 185.75,160.8313 C184.5781,160.3313 184.1406,160.2219 183.1875,160.2219 C180.5156,160.2219 178.5,162.2375 178.5,164.8625 L178.5,165.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="197.5" y="169.406">Base</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="169.5" x2="231.5" y1="180.8" y2="180.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="169.5" x2="231.5" y1="188.8" y2="188.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ncj5hbhrc87z)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="6" y="14.5"/>
-      <ellipse cx="21" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,36.1406 Q23.3906,36.4375 22.75,36.5781 Q22.1094,36.7344 21.4063,36.7344 Q18.9063,36.7344 17.5781,35.0938 Q16.2656,33.4375 16.2656,30.3125 Q16.2656,27.1875 17.5781,25.5313 Q18.9063,23.875 21.4063,23.875 Q22.1094,23.875 22.75,24.0313 Q23.4063,24.1875 23.9688,24.4844 L23.9688,27.2031 Q23.3438,26.625 22.75,26.3594 Q22.1563,26.0781 21.5313,26.0781 Q20.1875,26.0781 19.5,27.1563 Q18.8125,28.2188 18.8125,30.3125 Q18.8125,32.4063 19.5,33.4844 Q20.1875,34.5469 21.5313,34.5469 Q22.1563,34.5469 22.75,34.2813 Q23.3438,34 23.9688,33.4219 L23.9688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="35" y="34.6543">TBase</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="54.5" y2="54.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
+      <g id="elem_C_0000543776954602127752">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000543776954602127752" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="73" x="7" y="15.4"/>
+        <ellipse cx="22" cy="31.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,32.5563 C17,35.0563 19.1406,36.8688 22.0625,36.8688 C23.2969,36.8688 24.4688,36.5719 25.2188,36.0563 C25.8281,35.6344 26.1563,35.2125 26.1563,34.8063 C26.1563,34.3375 25.7344,33.9313 25.2344,33.9313 C25,33.9313 24.7813,34.0094 24.5781,34.2125 C24.1406,34.65 24.1406,34.65 23.9688,34.7438 C23.5156,34.9781 22.875,35.1188 22.1094,35.1188 C20.1094,35.1188 18.8281,34.1031 18.8281,32.525 L18.8281,31.4781 C18.8281,29.775 20.0469,28.5719 21.75,28.5719 C22.3281,28.5719 22.9063,28.7125 23.375,28.9625 C23.8438,29.2281 24.0156,29.4156 24.0781,29.775 C24.2031,30.4469 24.4531,30.6969 24.9844,30.6969 C25.2656,30.6969 25.5469,30.5563 25.7344,30.3375 C25.8594,30.1656 25.9063,29.9938 25.9063,29.5563 L25.9063,28.1969 C25.9063,27.775 25.8906,27.6344 25.7656,27.4625 C25.5938,27.2125 25.3125,27.0563 24.9844,27.0563 C24.6719,27.0563 24.4688,27.1656 24.25,27.4313 C23.0781,26.9313 22.6406,26.8219 21.6875,26.8219 C19.0156,26.8219 17,28.8375 17,31.4625 L17,32.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="36" y="36.006">TBase</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="79" y1="47.4" y2="47.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="79" y1="55.4" y2="55.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ncj5hbhrc87z)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="111" y="8"/>
-      <ellipse cx="165.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M168.7188,29.6406 Q168.1406,29.9375 167.5,30.0781 Q166.8594,30.2344 166.1563,30.2344 Q163.6563,30.2344 162.3281,28.5938 Q161.0156,26.9375 161.0156,23.8125 Q161.0156,20.6875 162.3281,19.0313 Q163.6563,17.375 166.1563,17.375 Q166.8594,17.375 167.5,17.5313 Q168.1563,17.6875 168.7188,17.9844 L168.7188,20.7031 Q168.0938,20.125 167.5,19.8594 Q166.9063,19.5781 166.2813,19.5781 Q164.9375,19.5781 164.25,20.6563 Q163.5625,21.7188 163.5625,23.8125 Q163.5625,25.9063 164.25,26.9844 Q164.9375,28.0469 166.2813,28.0469 Q166.9063,28.0469 167.5,27.7813 Q168.0938,27.5 168.7188,26.9219 L168.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="186.25" y="28.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000687909853333071234">
+        <rect codeLine="10" fill="#F1F1F1" height="64.7999" id="C_0000687909853333071234" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="115.5" y="7"/>
+        <ellipse cx="175.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M170.75,24.1563 C170.75,26.6563 172.8906,28.4688 175.8125,28.4688 C177.0469,28.4688 178.2188,28.1719 178.9688,27.6563 C179.5781,27.2344 179.9063,26.8125 179.9063,26.4063 C179.9063,25.9375 179.4844,25.5313 178.9844,25.5313 C178.75,25.5313 178.5313,25.6094 178.3281,25.8125 C177.8906,26.25 177.8906,26.25 177.7188,26.3438 C177.2656,26.5781 176.625,26.7188 175.8594,26.7188 C173.8594,26.7188 172.5781,25.7031 172.5781,24.125 L172.5781,23.0781 C172.5781,21.375 173.7969,20.1719 175.5,20.1719 C176.0781,20.1719 176.6563,20.3125 177.125,20.5625 C177.5938,20.8281 177.7656,21.0156 177.8281,21.375 C177.9531,22.0469 178.2031,22.2969 178.7344,22.2969 C179.0156,22.2969 179.2969,22.1563 179.4844,21.9375 C179.6094,21.7656 179.6563,21.5938 179.6563,21.1563 L179.6563,19.7969 C179.6563,19.375 179.6406,19.2344 179.5156,19.0625 C179.3438,18.8125 179.0625,18.6563 178.7344,18.6563 C178.4219,18.6563 178.2188,18.7656 178,19.0313 C176.8281,18.5313 176.3906,18.4219 175.4375,18.4219 C172.7656,18.4219 170.75,20.4375 170.75,23.0625 L170.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="196.25" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="116.5" x2="252.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="121.5" y="47.9"/>
+          <ellipse cx="126.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="135.5" y="56.0059">operator()() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="116.5" x2="252.5" y1="63.7999" y2="63.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
-      <ellipse cx="122" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000737235057776029746">
+        <rect codeLine="15" fill="#F1F1F1" height="64.7999" id="C_0000737235057776029746" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="288.5" y="7"/>
+        <ellipse cx="348.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M343.75,24.1563 C343.75,26.6563 345.8906,28.4688 348.8125,28.4688 C350.0469,28.4688 351.2188,28.1719 351.9688,27.6563 C352.5781,27.2344 352.9063,26.8125 352.9063,26.4063 C352.9063,25.9375 352.4844,25.5313 351.9844,25.5313 C351.75,25.5313 351.5313,25.6094 351.3281,25.8125 C350.8906,26.25 350.8906,26.25 350.7188,26.3438 C350.2656,26.5781 349.625,26.7188 348.8594,26.7188 C346.8594,26.7188 345.5781,25.7031 345.5781,24.125 L345.5781,23.0781 C345.5781,21.375 346.7969,20.1719 348.5,20.1719 C349.0781,20.1719 349.6563,20.3125 350.125,20.5625 C350.5938,20.8281 350.7656,21.0156 350.8281,21.375 C350.9531,22.0469 351.2031,22.2969 351.7344,22.2969 C352.0156,22.2969 352.2969,22.1563 352.4844,21.9375 C352.6094,21.7656 352.6563,21.5938 352.6563,21.1563 L352.6563,19.7969 C352.6563,19.375 352.6406,19.2344 352.5156,19.0625 C352.3438,18.8125 352.0625,18.6563 351.7344,18.6563 C351.4219,18.6563 351.2188,18.7656 351,19.0313 C349.8281,18.5313 349.3906,18.4219 348.4375,18.4219 C345.7656,18.4219 343.75,20.4375 343.75,23.0625 L343.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="369.25" y="27.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="289.5" x2="425.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="294.5" y="47.9"/>
+          <ellipse cx="299.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="308.5" y="56.0059">operator()() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="289.5" x2="425.5" y1="63.7999" y2="63.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="131" y="54.2104">operator()() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001497964256865073382">
+        <rect codeLine="20" fill="#F1F1F1" height="64.7999" id="C_0001497964256865073382" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="461.5" y="7"/>
+        <ellipse cx="521.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M516.25,24.1563 C516.25,26.6563 518.3906,28.4688 521.3125,28.4688 C522.5469,28.4688 523.7188,28.1719 524.4688,27.6563 C525.0781,27.2344 525.4063,26.8125 525.4063,26.4063 C525.4063,25.9375 524.9844,25.5313 524.4844,25.5313 C524.25,25.5313 524.0313,25.6094 523.8281,25.8125 C523.3906,26.25 523.3906,26.25 523.2188,26.3438 C522.7656,26.5781 522.125,26.7188 521.3594,26.7188 C519.3594,26.7188 518.0781,25.7031 518.0781,24.125 L518.0781,23.0781 C518.0781,21.375 519.2969,20.1719 521,20.1719 C521.5781,20.1719 522.1563,20.3125 522.625,20.5625 C523.0938,20.8281 523.2656,21.0156 523.3281,21.375 C523.4531,22.0469 523.7031,22.2969 524.2344,22.2969 C524.5156,22.2969 524.7969,22.1563 524.9844,21.9375 C525.1094,21.7656 525.1563,21.5938 525.1563,21.1563 L525.1563,19.7969 C525.1563,19.375 525.1406,19.2344 525.0156,19.0625 C524.8438,18.8125 524.5625,18.6563 524.2344,18.6563 C523.9219,18.6563 523.7188,18.7656 523.5,19.0313 C522.3281,18.5313 521.8906,18.4219 520.9375,18.4219 C518.2656,18.4219 516.25,20.4375 516.25,23.0625 L516.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="541.75" y="27.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="462.5" x2="598.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="467.5" y="47.9"/>
+          <ellipse cx="472.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="481.5" y="56.0059">operator()() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="462.5" x2="598.5" y1="63.7999" y2="63.7999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ncj5hbhrc87z)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="272" y="8"/>
-      <ellipse cx="326.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M329.7188,29.6406 Q329.1406,29.9375 328.5,30.0781 Q327.8594,30.2344 327.1563,30.2344 Q324.6563,30.2344 323.3281,28.5938 Q322.0156,26.9375 322.0156,23.8125 Q322.0156,20.6875 323.3281,19.0313 Q324.6563,17.375 327.1563,17.375 Q327.8594,17.375 328.5,17.5313 Q329.1563,17.6875 329.7188,17.9844 L329.7188,20.7031 Q329.0938,20.125 328.5,19.8594 Q327.9063,19.5781 327.2813,19.5781 Q325.9375,19.5781 325.25,20.6563 Q324.5625,21.7188 324.5625,23.8125 Q324.5625,25.9063 325.25,26.9844 Q325.9375,28.0469 327.2813,28.0469 Q327.9063,28.0469 328.5,27.7813 Q329.0938,27.5 329.7188,26.9219 L329.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="347.25" y="28.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <g id="elem_C_0001463422997970691679">
+        <rect codeLine="25" fill="#F1F1F1" height="64.7999" id="C_0001463422997970691679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="136" x="152.5" y="257.8"/>
+        <ellipse cx="167.5" cy="273.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M162.5,274.9563 C162.5,277.4563 164.6406,279.2688 167.5625,279.2688 C168.7969,279.2688 169.9688,278.9719 170.7188,278.4563 C171.3281,278.0344 171.6563,277.6125 171.6563,277.2063 C171.6563,276.7375 171.2344,276.3313 170.7344,276.3313 C170.5,276.3313 170.2813,276.4094 170.0781,276.6125 C169.6406,277.05 169.6406,277.05 169.4688,277.1438 C169.0156,277.3781 168.375,277.5188 167.6094,277.5188 C165.6094,277.5188 164.3281,276.5031 164.3281,274.925 L164.3281,273.8781 C164.3281,272.175 165.5469,270.9719 167.25,270.9719 C167.8281,270.9719 168.4063,271.1125 168.875,271.3625 C169.3438,271.6281 169.5156,271.8156 169.5781,272.175 C169.7031,272.8469 169.9531,273.0969 170.4844,273.0969 C170.7656,273.0969 171.0469,272.9563 171.2344,272.7375 C171.3594,272.5656 171.4063,272.3938 171.4063,271.9563 L171.4063,270.5969 C171.4063,270.175 171.3906,270.0344 171.2656,269.8625 C171.0938,269.6125 170.8125,269.4563 170.4844,269.4563 C170.1719,269.4563 169.9688,269.5656 169.75,269.8313 C168.5781,269.3313 168.1406,269.2219 167.1875,269.2219 C164.5156,269.2219 162.5,271.2375 162.5,273.8625 L162.5,274.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="181.5" y="278.406">Overload</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="44" x="247.5" y="254.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="248.5" y="269.0001">T,L,Ts...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="153.5" x2="287.5" y1="289.8" y2="289.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="153.5" x2="287.5" y1="297.8" y2="297.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="158.5" y="306.7"/>
+          <ellipse cx="163.5" cy="311.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="172.5" y="314.8059">counter : L</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="278" y="46"/>
-      <ellipse cx="283" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <g id="elem_C_0001706455047176879286">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001706455047176879286" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="179" x="268" y="148.8"/>
+        <ellipse cx="283" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M278,165.9563 C278,168.4563 280.1406,170.2688 283.0625,170.2688 C284.2969,170.2688 285.4688,169.9719 286.2188,169.4563 C286.8281,169.0344 287.1563,168.6125 287.1563,168.2063 C287.1563,167.7375 286.7344,167.3313 286.2344,167.3313 C286,167.3313 285.7813,167.4094 285.5781,167.6125 C285.1406,168.05 285.1406,168.05 284.9688,168.1438 C284.5156,168.3781 283.875,168.5188 283.1094,168.5188 C281.1094,168.5188 279.8281,167.5031 279.8281,165.925 L279.8281,164.8781 C279.8281,163.175 281.0469,161.9719 282.75,161.9719 C283.3281,161.9719 283.9063,162.1125 284.375,162.3625 C284.8438,162.6281 285.0156,162.8156 285.0781,163.175 C285.2031,163.8469 285.4531,164.0969 285.9844,164.0969 C286.2656,164.0969 286.5469,163.9563 286.7344,163.7375 C286.8594,163.5656 286.9063,163.3938 286.9063,162.9563 L286.9063,161.5969 C286.9063,161.175 286.8906,161.0344 286.7656,160.8625 C286.5938,160.6125 286.3125,160.4563 285.9844,160.4563 C285.6719,160.4563 285.4688,160.5656 285.25,160.8313 C284.0781,160.3313 283.6406,160.2219 282.6875,160.2219 C280.0156,160.2219 278,162.2375 278,164.8625 L278,165.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="297" y="169.406">Overload</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="87" x="363" y="145.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="85" x="364" y="160.0001">TBase,int,A,B,C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="269" x2="446" y1="180.8" y2="180.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="269" x2="446" y1="188.8" y2="188.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="292" y="54.2104">operator()() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000085539867332573320">
+        <rect codeLine="34" fill="#F1F1F1" height="64.7999" id="C_0000085539867332573320" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="267" x="635" y="7"/>
+        <ellipse cx="759.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M754.25,24.1563 C754.25,26.6563 756.3906,28.4688 759.3125,28.4688 C760.5469,28.4688 761.7188,28.1719 762.4688,27.6563 C763.0781,27.2344 763.4063,26.8125 763.4063,26.4063 C763.4063,25.9375 762.9844,25.5313 762.4844,25.5313 C762.25,25.5313 762.0313,25.6094 761.8281,25.8125 C761.3906,26.25 761.3906,26.25 761.2188,26.3438 C760.7656,26.5781 760.125,26.7188 759.3594,26.7188 C757.3594,26.7188 756.0781,25.7031 756.0781,24.125 L756.0781,23.0781 C756.0781,21.375 757.2969,20.1719 759,20.1719 C759.5781,20.1719 760.1563,20.3125 760.625,20.5625 C761.0938,20.8281 761.2656,21.0156 761.3281,21.375 C761.4531,22.0469 761.7031,22.2969 762.2344,22.2969 C762.5156,22.2969 762.7969,22.1563 762.9844,21.9375 C763.1094,21.7656 763.1563,21.5938 763.1563,21.1563 L763.1563,19.7969 C763.1563,19.375 763.1406,19.2344 763.0156,19.0625 C762.8438,18.8125 762.5625,18.6563 762.2344,18.6563 C761.9219,18.6563 761.7188,18.7656 761.5,19.0313 C760.3281,18.5313 759.8906,18.4219 758.9375,18.4219 C756.2656,18.4219 754.25,20.4375 754.25,23.0625 L754.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="779.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="636" x2="901" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="636" x2="901" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="641" y="55.9"/>
+          <ellipse cx="646" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="241" x="655" y="64.0059">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ncj5hbhrc87z)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="433" y="8"/>
-      <ellipse cx="487.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M490.7188,29.6406 Q490.1406,29.9375 489.5,30.0781 Q488.8594,30.2344 488.1563,30.2344 Q485.6563,30.2344 484.3281,28.5938 Q483.0156,26.9375 483.0156,23.8125 Q483.0156,20.6875 484.3281,19.0313 Q485.6563,17.375 488.1563,17.375 Q488.8594,17.375 489.5,17.5313 Q490.1563,17.6875 490.7188,17.9844 L490.7188,20.7031 Q490.0938,20.125 489.5,19.8594 Q488.9063,19.5781 488.2813,19.5781 Q486.9375,19.5781 486.25,20.6563 Q485.5625,21.7188 485.5625,23.8125 Q485.5625,25.9063 486.25,26.9844 Q486.9375,28.0469 488.2813,28.0469 Q488.9063,28.0469 489.5,27.7813 Q490.0938,27.5 490.7188,26.9219 L490.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508.25" y="28.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="439" y="46"/>
-      <ellipse cx="444" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="453" y="54.2104">operator()() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ncj5hbhrc87z)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="127" y="255"/>
-      <ellipse cx="142" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M144.9688,276.6406 Q144.3906,276.9375 143.75,277.0781 Q143.1094,277.2344 142.4063,277.2344 Q139.9063,277.2344 138.5781,275.5938 Q137.2656,273.9375 137.2656,270.8125 Q137.2656,267.6875 138.5781,266.0313 Q139.9063,264.375 142.4063,264.375 Q143.1094,264.375 143.75,264.5313 Q144.4063,264.6875 144.9688,264.9844 L144.9688,267.7031 Q144.3438,267.125 143.75,266.8594 Q143.1563,266.5781 142.5313,266.5781 Q141.1875,266.5781 140.5,267.6563 Q139.8125,268.7188 139.8125,270.8125 Q139.8125,272.9063 140.5,273.9844 Q141.1875,275.0469 142.5313,275.0469 Q143.1563,275.0469 143.75,274.7813 Q144.3438,274.5 144.9688,273.9219 L144.9688,276.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="156" y="275.1543">Overload</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="49" x="219" y="252"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="220" y="264.1387">T,L,Ts...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="287" y2="287"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="295" y2="295"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133" y="301"/>
-      <ellipse cx="138" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="147" y="309.2104">counter : L</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ncj5hbhrc87z)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="243" y="146"/>
-      <ellipse cx="258" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M260.9688,167.6406 Q260.3906,167.9375 259.75,168.0781 Q259.1094,168.2344 258.4063,168.2344 Q255.9063,168.2344 254.5781,166.5938 Q253.2656,164.9375 253.2656,161.8125 Q253.2656,158.6875 254.5781,157.0313 Q255.9063,155.375 258.4063,155.375 Q259.1094,155.375 259.75,155.5313 Q260.4063,155.6875 260.9688,155.9844 L260.9688,158.7031 Q260.3438,158.125 259.75,157.8594 Q259.1563,157.5781 258.5313,157.5781 Q257.1875,157.5781 256.5,158.6563 Q255.8125,159.7188 255.8125,161.8125 Q255.8125,163.9063 256.5,164.9844 Q257.1875,166.0469 258.5313,166.0469 Q259.1563,166.0469 259.75,165.7813 Q260.3438,165.5 260.9688,164.9219 L260.9688,167.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="272" y="166.1543">Overload</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="335" y="143"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="336" y="155.1387">TBase,int,A,B,C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="178" y2="178"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="186" y2="186"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ncj5hbhrc87z)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="594.5" y="8"/>
-      <ellipse cx="708.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M711.7188,29.6406 Q711.1406,29.9375 710.5,30.0781 Q709.8594,30.2344 709.1563,30.2344 Q706.6563,30.2344 705.3281,28.5938 Q704.0156,26.9375 704.0156,23.8125 Q704.0156,20.6875 705.3281,19.0313 Q706.6563,17.375 709.1563,17.375 Q709.8594,17.375 710.5,17.5313 Q711.1563,17.6875 711.7188,17.9844 L711.7188,20.7031 Q711.0938,20.125 710.5,19.8594 Q709.9063,19.5781 709.2813,19.5781 Q707.9375,19.5781 707.25,20.6563 Q706.5625,21.7188 706.5625,23.8125 Q706.5625,25.9063 707.25,26.9844 Q707.9375,28.0469 709.2813,28.0469 Q709.9063,28.0469 710.5,27.7813 Q711.0938,27.5 711.7188,26.9219 L711.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="729.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="600.5" y="54"/>
-      <ellipse cx="605.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="614.5" y="62.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
-    </a>
-    <path d="M183.61,214.17 C186,227.73 188.58,242.4 190.77,254.81 " fill="none" id="C_0001619396229227632210&lt;-C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="176.67,215.15,180.1,194.24,190.46,212.72,176.67,215.15" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M306.54,194.24 C289.7,207.99 267.85,225.83 248.04,242.01 " fill="none" id="C_0001706455047176879286-&gt;C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="252.28,247.58,232.37,254.81,243.43,236.73,252.28,247.58" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M94.55,69.21 C164.27,102.83 227.9,128.45 273.41,145.99 " fill="none" id="C_0000543776954602127752&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="91.11,75.32,76.21,60.25,97.25,62.74,91.11,75.32" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M226.7,81.89 C253.17,103.18 284.21,128.15 306.26,145.88 " fill="none" id="C_0000687909853333071234&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="222.13,87.2,210.94,69.21,230.91,76.29,222.13,87.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M335,89.25 C335,108.74 335,130.16 335,145.88 " fill="none" id="C_0000737235057776029746&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="328,89.21,335,69.21,342,89.21,328,89.21" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M443.3,81.89 C416.83,103.18 385.79,128.15 363.74,145.88 " fill="none" id="C_0001497964256865073382&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="439.09,76.29,459.06,69.21,447.87,87.2,439.09,76.29" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M617.49,73.23 C550.04,96.1 462.67,125.72 403.07,145.93 " fill="none" id="C_0000085539867332573320&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="629.84,69.05,622.8738,67.1865,618.4744,72.9001,625.4406,74.7636,629.84,69.05" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="543" 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="550" y="112.0669">overload</text>
+    <g id="link_C_0001619396229227632210_C_0001463422997970691679">
+      <path codeLine="38" d="M207.6199,214.8863 C210.6299,232.2763 211.71,238.47 215.02,257.57 " fill="none" id="C_0001619396229227632210-backto-C_0001463422997970691679" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="204.55,197.15,201.7078,215.9096,213.532,213.863,204.55,197.15" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001706455047176879286_C_0001463422997970691679">
+      <path codeLine="39" d="M329.78,197.15 C309.21,214.47 294.7075,226.6944 272.0775,245.7544 " fill="none" id="C_0001706455047176879286-to-C_0001463422997970691679" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="258.31,257.35,275.9426,250.3436,268.2123,241.1653,258.31,257.35" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000543776954602127752_C_0001706455047176879286">
+      <path codeLine="40" d="M95.9961,71.5592 C101.6861,74.7192 91.83,69.08 97.5,71.8 C160.19,101.85 234.46,129.68 287.53,148.31 " fill="none" id="C_0000543776954602127752-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="80.26,62.82,93.0831,76.8046,98.9092,66.3138,80.26,62.82" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000687909853333071234_C_0001706455047176879286">
+      <path codeLine="41" d="M240.714,83.0974 C271.614,106.5674 298.64,127.09 326.58,148.32 " fill="none" id="C_0000687909853333071234-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="226.38,72.21,237.0849,87.8754,244.3432,78.3194,226.38,72.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000737235057776029746_C_0001706455047176879286">
+      <path codeLine="42" d="M357.5,90.21 C357.5,113.75 357.5,127.3 357.5,148.52 " fill="none" id="C_0000737235057776029746-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="357.5,72.21,351.5,90.21,363.5,90.21,357.5,72.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001497964256865073382_C_0001706455047176879286">
+      <path codeLine="43" d="M474.286,83.0974 C443.386,106.5674 416.36,127.09 388.42,148.32 " fill="none" id="C_0001497964256865073382-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="488.62,72.21,470.6568,78.3194,477.9151,87.8754,488.62,72.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000085539867332573320_C_0001706455047176879286">
+      <path codeLine="44" d="M657.3198,75.9439 C583.8998,99.4139 497.16,127.15 430.86,148.35 " fill="none" id="C_0000085539867332573320-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="668.75,72.29,661.8169,70.3069,657.3198,75.9439,664.2529,77.927,668.75,72.29" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="581.5" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="49" x="588.5" y="114.877">overload</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00032_class_mermaid.svg b/docs/test_cases/t00032_class_mermaid.svg
index abc5a971..b4c58c30 100644
--- a/docs/test_cases/t00032_class_mermaid.svg
+++ b/docs/test_cases/t00032_class_mermaid.svg
@@ -1,62 +1,67 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1043.375 349" style="max-width: 1043.38px; background-color: white;" width="1043.375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1046 349" style="max-width: 1046px; background-color: white;" width="1046" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M216.8046875,212L216.8046875,216.16666666666666C216.8046875,220.33333333333334,216.8046875,228.66666666666666,222.88208575581393,237C228.9594840116279,245.33333333333334,241.11428052325581,253.66666666666666,247.19167877906975,257.8333333333333L253.2690770348837,262"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M404.9609375,212L404.9609375,216.16666666666666C404.9609375,220.33333333333334,404.9609375,228.66666666666666,398.88353924418607,237C392.80614098837214,245.33333333333334,380.6513444767442,253.66666666666666,374.5739462209303,257.8333333333333L368.4965479651163,262"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M39.515625,76L39.515625,83.5C39.515625,91,39.515625,106,81.83463541666667,120.7375758029231C124.15364583333333,135.47515160584618,208.79166666666666,149.95030321169236,251.11067708333334,157.18787901461545L293.4296875,164.42545481753854"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M199.0078125,87L199.0078125,92.66666666666667C199.0078125,98.33333333333333,199.0078125,109.66666666666667,217.68089583333335,121C236.35397916666668,132.33333333333334,273.70014583333335,143.66666666666666,292.3732291666667,149.33333333333334L311.0463125,155"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M404.9609375,87L404.9609375,92.66666666666667C404.9609375,98.33333333333333,404.9609375,109.66666666666667,404.9609375,121C404.9609375,132.33333333333334,404.9609375,143.66666666666666,404.9609375,149.33333333333334L404.9609375,155"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M610.9140625,87L610.9140625,92.66666666666667C610.9140625,98.33333333333333,610.9140625,109.66666666666667,592.2409791666666,121C573.5678958333333,132.33333333333334,536.2217291666667,143.66666666666666,517.5486458333334,149.33333333333334L498.8755625,155"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M887.1328125,87L887.1328125,92.66666666666667C887.1328125,98.33333333333333,887.1328125,109.66666666666667,825.359375,123.3405192434406C763.5859375,137.0143718202145,640.0390625,153.02874364042904,578.265625,161.0359295505363L516.4921875,169.04311546064358"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M218.1171875,230L218.1171875,231.16666666666666C218.1171875,232.33333333333334,218.1171875,234.66666666666666,224.19458575581393,240C230.2719840116279,245.33333333333334,242.42678052325581,253.66666666666666,248.50417877906975,257.8333333333333L254.5815770348837,262"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M406.2734375,212L406.2734375,216.16666666666666C406.2734375,220.33333333333334,406.2734375,228.66666666666666,402.67035722264677,235.3036066076921C399.06727694529354,241.94054654871752,391.86111639058714,246.88109309743504,388.2580361132339,249.3513663717938L384.65495583588074,251.82163964615253"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M39.515625,94L39.515625,98.5C39.515625,103,39.515625,112,82.05338541666667,123.74895267511629C124.59114583333333,135.49790535023254,209.66666666666666,149.99581070046509,252.20442708333334,157.24476337558136L294.7421875,164.49371605069763"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M199.4453125,105L199.4453125,107.66666666666667C199.4453125,110.33333333333333,199.4453125,115.66666666666667,218.19772916666668,124C236.95014583333332,132.33333333333334,274.45497916666665,143.66666666666666,293.20739583333335,149.33333333333334L311.9598125,155"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M406.2734375,105L406.2734375,107.66666666666667C406.2734375,110.33333333333333,406.2734375,115.66666666666667,406.2734375,124C406.2734375,132.33333333333334,406.2734375,143.66666666666666,406.2734375,149.33333333333334L406.2734375,155"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M613.1015625,105L613.1015625,107.66666666666667C613.1015625,110.33333333333333,613.1015625,115.66666666666667,594.3491458333333,124C575.5967291666667,132.33333333333334,538.0918958333333,143.66666666666666,519.3394791666666,149.33333333333334L500.5870625,155"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M889.7578125,105L889.7578125,107.66666666666667C889.7578125,110.33333333333333,889.7578125,115.66666666666667,827.765625,126.34706018593327C765.7734375,137.02745370519986,641.7890625,153.05490741039975,579.796875,161.0686342629997L517.8046875,169.08236111559964"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -115,7 +120,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(887.1328125, 121)" class="edgeLabel">
+        <g transform="translate(889.7578125, 121)" class="edgeLabel">
           <g transform="translate(-35.359375, -9)" class="label">
             <foreignObject height="18" width="70.71875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -128,7 +133,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(216.8046875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L7">
+        <a transform="translate(218.1171875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L7">
           <g title="Base" id="classId-C_0001619396229227632210-0" class="node default clickable">
             <rect height="57" width="53.25" y="-28.5" x="-26.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="26.625" x1="-26.625" class="divider"/>
@@ -147,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L9">
+        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L9">
           <g title="TBase" id="classId-C_0000543776954602127752-1" class="node default clickable">
             <rect height="57" width="63.03125" y="-28.5" x="-31.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.515625" x1="-31.515625" class="divider"/>
@@ -166,11 +171,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(199.0078125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L11">
+        <a transform="translate(199.4453125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L11">
           <g title="A" id="classId-C_0000687909853333071234-2" class="node default clickable">
-            <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
+            <rect height="79" width="156.828125" y="-39.5" x="-78.4140625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -182,19 +187,19 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -70.4765625, 14)" height="18" width="140.953125">
+              <foreignObject transform="translate( -70.9140625, 14)" height="18" width="141.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator() : ) : void</span>
+                  <span class="nodeLabel">+operator()() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(404.9609375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L15">
+        <a transform="translate(406.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L15">
           <g title="B" id="classId-C_0000737235057776029746-3" class="node default clickable">
-            <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
+            <rect height="79" width="156.828125" y="-39.5" x="-78.4140625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -206,19 +211,19 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -70.4765625, 14)" height="18" width="140.953125">
+              <foreignObject transform="translate( -70.9140625, 14)" height="18" width="141.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator() : ) : void</span>
+                  <span class="nodeLabel">+operator()() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(610.9140625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L19">
+        <a transform="translate(613.1015625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L19">
           <g title="C" id="classId-C_0001497964256865073382-4" class="node default clickable">
-            <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
+            <rect height="79" width="156.828125" y="-39.5" x="-78.4140625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -230,15 +235,15 @@
                   <span class="nodeLabel">C</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -70.4765625, 14)" height="18" width="140.953125">
+              <foreignObject transform="translate( -70.9140625, 14)" height="18" width="141.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator() : ) : void</span>
+                  <span class="nodeLabel">+operator()() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(310.8828125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L24">
+        <a transform="translate(312.1953125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001463422997970691679-5" class="node default clickable">
             <rect height="79" width="160.53125" y="-39.5" x="-80.265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="80.265625" x1="-80.265625" class="divider"/>
@@ -262,7 +267,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(404.9609375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L24">
+        <a transform="translate(406.2734375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001706455047176879286-6" class="node default clickable">
             <rect height="57" width="223.0625" y="-28.5" x="-111.53125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.53125" x1="-111.53125" class="divider"/>
@@ -281,7 +286,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(887.1328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00032/t00032.cc#L31">
+        <a transform="translate(889.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L31">
           <g title="R" id="classId-C_0000085539867332573320-7" class="node default clickable">
             <rect height="79" width="296.484375" y="-39.5" x="-148.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="148.2421875" x1="-148.2421875" class="divider"/>
diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md
index fc7eeb48..3ab036b7 100644
--- a/docs/test_cases/t00033.md
+++ b/docs/test_cases/t00033.md
@@ -13,7 +13,7 @@ diagrams:
 
 ```
 ## Source code
-File t00033.cc
+File `tests/t00033/t00033.cc`
 ```cpp
 #include <memory>
 #include <vector>
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 3380b19c..66fb15cd 100644
--- a/docs/test_cases/t00033_class.svg
+++ b/docs/test_cases/t00033_class.svg
@@ -1,140 +1,164 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="581px" preserveAspectRatio="none" style="width:435px;height:581px;background:#FFFFFF;" version="1.1" viewBox="0 0 435 581" width="435px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f103yc12cbvapu" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f103yc12cbvapu)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
-      <ellipse cx="98.25" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M101.2188,276.6406 Q100.6406,276.9375 100,277.0781 Q99.3594,277.2344 98.6563,277.2344 Q96.1563,277.2344 94.8281,275.5938 Q93.5156,273.9375 93.5156,270.8125 Q93.5156,267.6875 94.8281,266.0313 Q96.1563,264.375 98.6563,264.375 Q99.3594,264.375 100,264.5313 Q100.6563,264.6875 101.2188,264.9844 L101.2188,267.7031 Q100.5938,267.125 100,266.8594 Q99.4063,266.5781 98.7813,266.5781 Q97.4375,266.5781 96.75,267.6563 Q96.0625,268.7188 96.0625,270.8125 Q96.0625,272.9063 96.75,273.9844 Q97.4375,275.0469 98.7813,275.0469 Q99.4063,275.0469 100,274.7813 Q100.5938,274.5 101.2188,273.9219 L101.2188,276.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.75" y="275.1543">A</text>
-      <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"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="295" y2="295"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002036031998980633871">
+        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0002036031998980633871" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="80.5" y="257.8"/>
+        <ellipse cx="104.05" cy="273.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M99.05,274.9563 C99.05,277.4563 101.1906,279.2688 104.1125,279.2688 C105.3469,279.2688 106.5188,278.9719 107.2688,278.4563 C107.8781,278.0344 108.2063,277.6125 108.2063,277.2063 C108.2063,276.7375 107.7844,276.3313 107.2844,276.3313 C107.05,276.3313 106.8313,276.4094 106.6281,276.6125 C106.1906,277.05 106.1906,277.05 106.0188,277.1438 C105.5656,277.3781 104.925,277.5188 104.1594,277.5188 C102.1594,277.5188 100.8781,276.5031 100.8781,274.925 L100.8781,273.8781 C100.8781,272.175 102.0969,270.9719 103.8,270.9719 C104.3781,270.9719 104.9563,271.1125 105.425,271.3625 C105.8938,271.6281 106.0656,271.8156 106.1281,272.175 C106.2531,272.8469 106.5031,273.0969 107.0344,273.0969 C107.3156,273.0969 107.5969,272.9563 107.7844,272.7375 C107.9094,272.5656 107.9563,272.3938 107.9563,271.9563 L107.9563,270.5969 C107.9563,270.175 107.9406,270.0344 107.8156,269.8625 C107.6438,269.6125 107.3625,269.4563 107.0344,269.4563 C106.7219,269.4563 106.5188,269.5656 106.3,269.8313 C105.1281,269.3313 104.6906,269.2219 103.7375,269.2219 C101.0656,269.2219 99.05,271.2375 99.05,273.8625 L99.05,274.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="119.95" y="278.406">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="145.5" y="254.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="146.5" y="269.0001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="81.5" x2="150.5" y1="289.8" y2="289.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="81.5" x2="150.5" y1="297.8" y2="297.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="86.5" y="306.7"/>
+          <ellipse cx="91.5" cy="311.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="100.5" y="314.8059">aaa : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="82.5" y="301"/>
-      <ellipse cx="87.5" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000765515233845859023">
+        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0000765515233845859023" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="203.5" y="383.6"/>
+        <ellipse cx="227.05" cy="399.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M222.05,400.7563 C222.05,403.2563 224.1906,405.0688 227.1125,405.0688 C228.3469,405.0688 229.5188,404.7719 230.2688,404.2563 C230.8781,403.8344 231.2063,403.4125 231.2063,403.0063 C231.2063,402.5375 230.7844,402.1313 230.2844,402.1313 C230.05,402.1313 229.8313,402.2094 229.6281,402.4125 C229.1906,402.85 229.1906,402.85 229.0188,402.9438 C228.5656,403.1781 227.925,403.3188 227.1594,403.3188 C225.1594,403.3188 223.8781,402.3031 223.8781,400.725 L223.8781,399.6781 C223.8781,397.975 225.0969,396.7719 226.8,396.7719 C227.3781,396.7719 227.9563,396.9125 228.425,397.1625 C228.8938,397.4281 229.0656,397.6156 229.1281,397.975 C229.2531,398.6469 229.5031,398.8969 230.0344,398.8969 C230.3156,398.8969 230.5969,398.7563 230.7844,398.5375 C230.9094,398.3656 230.9563,398.1938 230.9563,397.7563 L230.9563,396.3969 C230.9563,395.975 230.9406,395.8344 230.8156,395.6625 C230.6438,395.4125 230.3625,395.2563 230.0344,395.2563 C229.7219,395.2563 229.5188,395.3656 229.3,395.6313 C228.1281,395.1313 227.6906,395.0219 226.7375,395.0219 C224.0656,395.0219 222.05,397.0375 222.05,399.6625 L222.05,400.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="242.95" y="404.206">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="268.5" y="380.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="269.5" y="394.8001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="204.5" x2="273.5" y1="415.6" y2="415.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="204.5" x2="273.5" y1="423.6" y2="423.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="209.5" y="432.5"/>
+          <ellipse cx="214.5" cy="437.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="223.5" y="440.6059">bbb : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="96.5" y="309.2104">aaa : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001436835384265552869">
+        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0001436835384265552869" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="249" y="509.4"/>
+        <ellipse cx="270.75" cy="525.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M265.75,526.5563 C265.75,529.0563 267.8906,530.8688 270.8125,530.8688 C272.0469,530.8688 273.2188,530.5719 273.9688,530.0563 C274.5781,529.6344 274.9063,529.2125 274.9063,528.8063 C274.9063,528.3375 274.4844,527.9313 273.9844,527.9313 C273.75,527.9313 273.5313,528.0094 273.3281,528.2125 C272.8906,528.65 272.8906,528.65 272.7188,528.7438 C272.2656,528.9781 271.625,529.1188 270.8594,529.1188 C268.8594,529.1188 267.5781,528.1031 267.5781,526.525 L267.5781,525.4781 C267.5781,523.775 268.7969,522.5719 270.5,522.5719 C271.0781,522.5719 271.6563,522.7125 272.125,522.9625 C272.5938,523.2281 272.7656,523.4156 272.8281,523.775 C272.9531,524.4469 273.2031,524.6969 273.7344,524.6969 C274.0156,524.6969 274.2969,524.5563 274.4844,524.3375 C274.6094,524.1656 274.6563,523.9938 274.6563,523.5563 L274.6563,522.1969 C274.6563,521.775 274.6406,521.6344 274.5156,521.4625 C274.3438,521.2125 274.0625,521.0563 273.7344,521.0563 C273.4219,521.0563 273.2188,521.1656 273,521.4313 C271.8281,520.9313 271.3906,520.8219 270.4375,520.8219 C267.7656,520.8219 265.75,522.8375 265.75,525.4625 L265.75,526.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="286.25" y="530.006">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="311" y="506.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="312" y="520.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="250" x2="316" y1="541.4" y2="541.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="250" x2="316" y1="549.4" y2="549.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="255" y="558.3"/>
+          <ellipse cx="260" cy="563.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="269" y="566.4059">ccc : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f103yc12cbvapu)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
-      <ellipse cx="230.25" cy="393" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M233.2188,398.6406 Q232.6406,398.9375 232,399.0781 Q231.3594,399.2344 230.6563,399.2344 Q228.1563,399.2344 226.8281,397.5938 Q225.5156,395.9375 225.5156,392.8125 Q225.5156,389.6875 226.8281,388.0313 Q228.1563,386.375 230.6563,386.375 Q231.3594,386.375 232,386.5313 Q232.6563,386.6875 233.2188,386.9844 L233.2188,389.7031 Q232.5938,389.125 232,388.8594 Q231.4063,388.5781 230.7813,388.5781 Q229.4375,388.5781 228.75,389.6563 Q228.0625,390.7188 228.0625,392.8125 Q228.0625,394.9063 228.75,395.9844 Q229.4375,397.0469 230.7813,397.0469 Q231.4063,397.0469 232,396.7813 Q232.5938,396.5 233.2188,395.9219 L233.2188,398.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="245.75" y="397.1543">B</text>
-      <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"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="417" y2="417"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0002199581366769423637">
+        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0002199581366769423637" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="77" x="351.5" y="509.4"/>
+        <ellipse cx="382.25" cy="525.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M377.25,526.5563 C377.25,529.0563 379.3906,530.8688 382.3125,530.8688 C383.5469,530.8688 384.7188,530.5719 385.4688,530.0563 C386.0781,529.6344 386.4063,529.2125 386.4063,528.8063 C386.4063,528.3375 385.9844,527.9313 385.4844,527.9313 C385.25,527.9313 385.0313,528.0094 384.8281,528.2125 C384.3906,528.65 384.3906,528.65 384.2188,528.7438 C383.7656,528.9781 383.125,529.1188 382.3594,529.1188 C380.3594,529.1188 379.0781,528.1031 379.0781,526.525 L379.0781,525.4781 C379.0781,523.775 380.2969,522.5719 382,522.5719 C382.5781,522.5719 383.1563,522.7125 383.625,522.9625 C384.0938,523.2281 384.2656,523.4156 384.3281,523.775 C384.4531,524.4469 384.7031,524.6969 385.2344,524.6969 C385.5156,524.6969 385.7969,524.5563 385.9844,524.3375 C386.1094,524.1656 386.1563,523.9938 386.1563,523.5563 L386.1563,522.1969 C386.1563,521.775 386.1406,521.6344 386.0156,521.4625 C385.8438,521.2125 385.5625,521.0563 385.2344,521.0563 C384.9219,521.0563 384.7188,521.1656 384.5,521.4313 C383.3281,520.9313 382.8906,520.8219 381.9375,520.8219 C379.2656,520.8219 377.25,522.8375 377.25,525.4625 L377.25,526.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="399.75" y="530.006">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="352.5" x2="427.5" y1="541.4" y2="541.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="352.5" x2="427.5" y1="549.4" y2="549.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="357.5" y="558.3"/>
+          <ellipse cx="362.5" cy="563.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="371.5" y="566.4059">ddd : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="214.5" y="423"/>
-      <ellipse cx="219.5" cy="428" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001609446044604054241">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001609446044604054241" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="309.5" y="392"/>
+        <ellipse cx="324.5" cy="408" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M319.5,409.1563 C319.5,411.6563 321.6406,413.4688 324.5625,413.4688 C325.7969,413.4688 326.9688,413.1719 327.7188,412.6563 C328.3281,412.2344 328.6563,411.8125 328.6563,411.4063 C328.6563,410.9375 328.2344,410.5313 327.7344,410.5313 C327.5,410.5313 327.2813,410.6094 327.0781,410.8125 C326.6406,411.25 326.6406,411.25 326.4688,411.3438 C326.0156,411.5781 325.375,411.7188 324.6094,411.7188 C322.6094,411.7188 321.3281,410.7031 321.3281,409.125 L321.3281,408.0781 C321.3281,406.375 322.5469,405.1719 324.25,405.1719 C324.8281,405.1719 325.4063,405.3125 325.875,405.5625 C326.3438,405.8281 326.5156,406.0156 326.5781,406.375 C326.7031,407.0469 326.9531,407.2969 327.4844,407.2969 C327.7656,407.2969 328.0469,407.1563 328.2344,406.9375 C328.3594,406.7656 328.4063,406.5938 328.4063,406.1563 L328.4063,404.7969 C328.4063,404.375 328.3906,404.2344 328.2656,404.0625 C328.0938,403.8125 327.8125,403.6563 327.4844,403.6563 C327.1719,403.6563 326.9688,403.7656 326.75,404.0313 C325.5781,403.5313 325.1406,403.4219 324.1875,403.4219 C321.5156,403.4219 319.5,405.4375 319.5,408.0625 L319.5,409.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="338.5" y="412.606">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="11" x="356.5" y="389"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="9" x="357.5" y="403.2001">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="310.5" x2="363.5" y1="424" y2="424"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="310.5" x2="363.5" y1="432" y2="432"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="228.5" y="431.2104">bbb : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000384927316081978893">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000384927316081978893" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="172" x="187" y="266.2"/>
+        <ellipse cx="202" cy="282.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M197,283.3563 C197,285.8563 199.1406,287.6688 202.0625,287.6688 C203.2969,287.6688 204.4688,287.3719 205.2188,286.8563 C205.8281,286.4344 206.1563,286.0125 206.1563,285.6063 C206.1563,285.1375 205.7344,284.7313 205.2344,284.7313 C205,284.7313 204.7813,284.8094 204.5781,285.0125 C204.1406,285.45 204.1406,285.45 203.9688,285.5438 C203.5156,285.7781 202.875,285.9188 202.1094,285.9188 C200.1094,285.9188 198.8281,284.9031 198.8281,283.325 L198.8281,282.2781 C198.8281,280.575 200.0469,279.3719 201.75,279.3719 C202.3281,279.3719 202.9063,279.5125 203.375,279.7625 C203.8438,280.0281 204.0156,280.2156 204.0781,280.575 C204.2031,281.2469 204.4531,281.4969 204.9844,281.4969 C205.2656,281.4969 205.5469,281.3563 205.7344,281.1375 C205.8594,280.9656 205.9063,280.7938 205.9063,280.3563 L205.9063,278.9969 C205.9063,278.575 205.8906,278.4344 205.7656,278.2625 C205.5938,278.0125 205.3125,277.8563 204.9844,277.8563 C204.6719,277.8563 204.4688,277.9656 204.25,278.2313 C203.0781,277.7313 202.6406,277.6219 201.6875,277.6219 C199.0156,277.6219 197,279.6375 197,282.2625 L197,283.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="216" y="286.806">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="129" x="233" y="263.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="127" x="234" y="277.4001">std::unique_ptr&lt;C&lt;D&gt;&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="188" x2="358" y1="298.2" y2="298.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="188" x2="358" y1="306.2" y2="306.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f103yc12cbvapu)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
-      <ellipse cx="273.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M276.3688,520.6406 Q275.7906,520.9375 275.15,521.0781 Q274.5094,521.2344 273.8063,521.2344 Q271.3063,521.2344 269.9781,519.5938 Q268.6656,517.9375 268.6656,514.8125 Q268.6656,511.6875 269.9781,510.0313 Q271.3063,508.375 273.8063,508.375 Q274.5094,508.375 275.15,508.5313 Q275.8063,508.6875 276.3688,508.9844 L276.3688,511.7031 Q275.7438,511.125 275.15,510.8594 Q274.5563,510.5781 273.9313,510.5781 Q272.5875,510.5781 271.9,511.6563 Q271.2125,512.7188 271.2125,514.8125 Q271.2125,516.9063 271.9,517.9844 Q272.5875,519.0469 273.9313,519.0469 Q274.5563,519.0469 275.15,518.7813 Q275.7438,518.5 276.3688,517.9219 L276.3688,520.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="288.6" y="519.1543">C</text>
-      <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"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="539" y2="539"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001747493965420341251">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001747493965420341251" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="194" x="39" y="148.8"/>
+        <ellipse cx="54" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M49,165.9563 C49,168.4563 51.1406,170.2688 54.0625,170.2688 C55.2969,170.2688 56.4688,169.9719 57.2188,169.4563 C57.8281,169.0344 58.1563,168.6125 58.1563,168.2063 C58.1563,167.7375 57.7344,167.3313 57.2344,167.3313 C57,167.3313 56.7813,167.4094 56.5781,167.6125 C56.1406,168.05 56.1406,168.05 55.9688,168.1438 C55.5156,168.3781 54.875,168.5188 54.1094,168.5188 C52.1094,168.5188 50.8281,167.5031 50.8281,165.925 L50.8281,164.8781 C50.8281,163.175 52.0469,161.9719 53.75,161.9719 C54.3281,161.9719 54.9063,162.1125 55.375,162.3625 C55.8438,162.6281 56.0156,162.8156 56.0781,163.175 C56.2031,163.8469 56.4531,164.0969 56.9844,164.0969 C57.2656,164.0969 57.5469,163.9563 57.7344,163.7375 C57.8594,163.5656 57.9063,163.3938 57.9063,162.9563 L57.9063,161.5969 C57.9063,161.175 57.8906,161.0344 57.7656,160.8625 C57.5938,160.6125 57.3125,160.4563 56.9844,160.4563 C56.6719,160.4563 56.4688,160.5656 56.25,160.8313 C55.0781,160.3313 54.6406,160.2219 53.6875,160.2219 C51.0156,160.2219 49,162.2375 49,164.8625 L49,165.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="68" y="169.406">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="151" x="85" y="145.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="149" x="86" y="160.0001">B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="232" y1="180.8" y2="180.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="232" y1="188.8" y2="188.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="259" y="545"/>
-      <ellipse cx="264" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001866392706312766470">
+        <rect codeLine="34" fill="#F1F1F1" height="64.7999" id="C_0001866392706312766470" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="258" x="7" y="7"/>
+        <ellipse cx="126.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M121.75,24.1563 C121.75,26.6563 123.8906,28.4688 126.8125,28.4688 C128.0469,28.4688 129.2188,28.1719 129.9688,27.6563 C130.5781,27.2344 130.9063,26.8125 130.9063,26.4063 C130.9063,25.9375 130.4844,25.5313 129.9844,25.5313 C129.75,25.5313 129.5313,25.6094 129.3281,25.8125 C128.8906,26.25 128.8906,26.25 128.7188,26.3438 C128.2656,26.5781 127.625,26.7188 126.8594,26.7188 C124.8594,26.7188 123.5781,25.7031 123.5781,24.125 L123.5781,23.0781 C123.5781,21.375 124.7969,20.1719 126.5,20.1719 C127.0781,20.1719 127.6563,20.3125 128.125,20.5625 C128.5938,20.8281 128.7656,21.0156 128.8281,21.375 C128.9531,22.0469 129.2031,22.2969 129.7344,22.2969 C130.0156,22.2969 130.2969,22.1563 130.4844,21.9375 C130.6094,21.7656 130.6563,21.5938 130.6563,21.1563 L130.6563,19.7969 C130.6563,19.375 130.6406,19.2344 130.5156,19.0625 C130.3438,18.8125 130.0625,18.6563 129.7344,18.6563 C129.4219,18.6563 129.2188,18.7656 129,19.0313 C127.8281,18.5313 127.3906,18.4219 126.4375,18.4219 C123.7656,18.4219 121.75,20.4375 121.75,23.0625 L121.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="147.25" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="264" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="264" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="55.9"/>
+          <ellipse cx="18" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="27" y="64.0059">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="273" y="553.2104">ccc : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f103yc12cbvapu)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
-      <ellipse cx="380.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M383.3688,520.6406 Q382.7906,520.9375 382.15,521.0781 Q381.5094,521.2344 380.8063,521.2344 Q378.3063,521.2344 376.9781,519.5938 Q375.6656,517.9375 375.6656,514.8125 Q375.6656,511.6875 376.9781,510.0313 Q378.3063,508.375 380.8063,508.375 Q381.5094,508.375 382.15,508.5313 Q382.8063,508.6875 383.3688,508.9844 L383.3688,511.7031 Q382.7438,511.125 382.15,510.8594 Q381.5563,510.5781 380.9313,510.5781 Q379.5875,510.5781 378.9,511.6563 Q378.2125,512.7188 378.2125,514.8125 Q378.2125,516.9063 378.9,517.9844 Q379.5875,519.0469 380.9313,519.0469 Q381.5563,519.0469 382.15,518.7813 Q382.7438,518.5 383.3688,517.9219 L383.3688,520.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="397.6" y="519.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="531" y2="531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="539" y2="539"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="357" y="545"/>
-      <ellipse cx="362" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="371" y="553.2104">ddd : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f103yc12cbvapu)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
-      <ellipse cx="325" cy="399.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M327.9688,405.1406 Q327.3906,405.4375 326.75,405.5781 Q326.1094,405.7344 325.4063,405.7344 Q322.9063,405.7344 321.5781,404.0938 Q320.2656,402.4375 320.2656,399.3125 Q320.2656,396.1875 321.5781,394.5313 Q322.9063,392.875 325.4063,392.875 Q326.1094,392.875 326.75,393.0313 Q327.4063,393.1875 327.9688,393.4844 L327.9688,396.2031 Q327.3438,395.625 326.75,395.3594 Q326.1563,395.0781 325.5313,395.0781 Q324.1875,395.0781 323.5,396.1563 Q322.8125,397.2188 322.8125,399.3125 Q322.8125,401.4063 323.5,402.4844 Q324.1875,403.5469 325.5313,403.5469 Q326.1563,403.5469 326.75,403.2813 Q327.3438,403 327.9688,402.4219 L327.9688,405.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339" y="403.6543">C</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f103yc12cbvapu)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
-      <ellipse cx="193" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M195.9688,283.1406 Q195.3906,283.4375 194.75,283.5781 Q194.1094,283.7344 193.4063,283.7344 Q190.9063,283.7344 189.5781,282.0938 Q188.2656,280.4375 188.2656,277.3125 Q188.2656,274.1875 189.5781,272.5313 Q190.9063,270.875 193.4063,270.875 Q194.1094,270.875 194.75,271.0313 Q195.4063,271.1875 195.9688,271.4844 L195.9688,274.2031 Q195.3438,273.625 194.75,273.3594 Q194.1563,273.0781 193.5313,273.0781 Q192.1875,273.0781 191.5,274.1563 Q190.8125,275.2188 190.8125,277.3125 Q190.8125,279.4063 191.5,280.4844 Q192.1875,281.5469 193.5313,281.5469 Q194.1563,281.5469 194.75,281.2813 Q195.3438,281 195.9688,280.4219 L195.9688,283.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="281.6543">B</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f103yc12cbvapu)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
-      <ellipse cx="33" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M35.9688,167.6406 Q35.3906,167.9375 34.75,168.0781 Q34.1094,168.2344 33.4063,168.2344 Q30.9063,168.2344 29.5781,166.5938 Q28.2656,164.9375 28.2656,161.8125 Q28.2656,158.6875 29.5781,157.0313 Q30.9063,155.375 33.4063,155.375 Q34.1094,155.375 34.75,155.5313 Q35.4063,155.6875 35.9688,155.9844 L35.9688,158.7031 Q35.3438,158.125 34.75,157.8594 Q34.1563,157.5781 33.5313,157.5781 Q32.1875,157.5781 31.5,158.6563 Q30.8125,159.7188 30.8125,161.8125 Q30.8125,163.9063 31.5,164.9844 Q32.1875,166.0469 33.5313,166.0469 Q34.1563,166.0469 34.75,165.7813 Q35.3438,165.5 35.9688,164.9219 L35.9688,167.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="166.1543">A</text>
-      <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"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f103yc12cbvapu)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
-      <ellipse cx="121.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M124.2188,29.6406 Q123.6406,29.9375 123,30.0781 Q122.3594,30.2344 121.6563,30.2344 Q119.1563,30.2344 117.8281,28.5938 Q116.5156,26.9375 116.5156,23.8125 Q116.5156,20.6875 117.8281,19.0313 Q119.1563,17.375 121.6563,17.375 Q122.3594,17.375 123,17.5313 Q123.6563,17.6875 124.2188,17.9844 L124.2188,20.7031 Q123.5938,20.125 123,19.8594 Q122.4063,19.5781 121.7813,19.5781 Q120.4375,19.5781 119.75,20.6563 Q119.0625,21.7188 119.0625,23.8125 Q119.0625,25.9063 119.75,26.9844 Q120.4375,28.0469 121.7813,28.0469 Q122.4063,28.0469 123,27.7813 Q123.5938,27.5 124.2188,26.9219 L124.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="141.75" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
-      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="221" x="26" y="62.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
-    </a>
-    <path d="M346.33,431.64 C353.84,449.29 364.29,473.9 372.79,493.89 " fill="none" id="C_0001609446044604054241-&gt;C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <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;"/>
-    <path d="M326.47,431.64 C320.5,445.42 312.69,463.44 305.44,480.19 " fill="none" id="C_0001609446044604054241-&gt;C_0001436835384265552869" 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;"/>
-    <path d="M287.26,309.64 C297.3,329.39 311.77,357.85 322.43,378.81 " fill="none" id="C_0000384927316081978893-&gt;C_0001609446044604054241" 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;"/>
-    <path d="M268.94,309.64 C265.12,323.12 260.16,340.66 255.5,357.1 " fill="none" id="C_0000384927316081978893-&gt;C_0000765515233845859023" 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;"/>
-    <path d="M159.4,194.24 C183.29,212.82 216.79,238.86 241.66,258.2 " fill="none" id="C_0001747493965420341251-&gt;C_0000384927316081978893" 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;"/>
-    <path d="M125.4,194.24 C123.33,206.01 120.73,220.77 118.24,234.92 " fill="none" id="C_0001747493965420341251-&gt;C_0002036031998980633871" 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;"/>
-    <path d="M129.5,82.5 C129.5,103.65 129.5,128.32 129.5,145.88 " fill="none" id="C_0001866392706312766470&lt;-C_0001747493965420341251" 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>
+    <g id="link_C_0001609446044604054241_C_0002199581366769423637">
+      <path codeLine="38" d="M346.97,440.29 C355.3,459.76 364.9087,482.2042 374.1087,503.6942 " fill="none" id="C_0001609446044604054241-to-C_0002199581366769423637" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="376.47,509.21,376.6052,499.3621,374.5022,504.6135,369.2508,502.5105,376.47,509.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001609446044604054241_C_0001436835384265552869">
+      <path codeLine="39" d="M326.84,440.29 C318.35,459.76 313.3442,471.2202 303.9742,492.7102 " fill="none" id="C_0001609446044604054241-to-C_0001436835384265552869" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="296.78,509.21,309.4741,495.1083,298.4743,490.3121,296.78,509.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000384927316081978893_C_0001609446044604054241">
+      <path codeLine="40" d="M285.04,314.49 C296.48,336.62 310.8337,364.3906 322.2637,386.4906 " fill="none" id="C_0000384927316081978893-to-C_0001609446044604054241" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="325.02,391.82,324.4384,381.9883,322.723,387.3788,317.3326,385.6634,325.02,391.82" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000384927316081978893_C_0000765515233845859023">
+      <path codeLine="41" d="M266.6,314.49 C261.26,333.96 258.3455,344.5623 252.4455,366.0523 " fill="none" id="C_0000384927316081978893-to-C_0000765515233845859023" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="247.68,383.41,258.2314,367.6408,246.6596,364.4638,247.68,383.41" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001747493965420341251_C_0000384927316081978893">
+      <path codeLine="42" d="M163.72,197.15 C187.49,217.17 216.9707,242.005 240.7307,262.015 " fill="none" id="C_0001747493965420341251-to-C_0000384927316081978893" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="245.32,265.88,241.0127,257.023,241.4956,262.6592,235.8594,263.1421,245.32,265.88" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001747493965420341251_C_0002036031998980633871">
+      <path codeLine="43" d="M131.95,197.15 C128.94,214.54 127.8636,220.7344 124.5536,239.8344 " fill="none" id="C_0001747493965420341251-to-C_0002036031998980633871" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="121.48,257.57,130.4654,240.8589,118.6417,238.8098,121.48,257.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001866392706312766470_C_0001747493965420341251">
+      <path codeLine="44" d="M136,84.21 C136,107.75 136,127.3 136,148.52 " fill="none" id="C_0001866392706312766470-backto-C_0001747493965420341251" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="136,72.21,132,78.21,136,84.21,140,78.21,136,72.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="142" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="149" y="114.877">abc</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00033_class_mermaid.svg b/docs/test_cases/t00033_class_mermaid.svg
index fcc00a91..36c07cd7 100644
--- a/docs/test_cases/t00033_class_mermaid.svg
+++ b/docs/test_cases/t00033_class_mermaid.svg
@@ -1,62 +1,67 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 415.41796875 607" style="max-width: 415.418px; background-color: white;" width="415.41796875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M280.83148619186045,459L274.9604832848837,465C269.08948037790697,471,257.3474745639535,483,251.47647165697674,493.1666666666667C245.60546875,503.3333333333333,245.60546875,511.6666666666667,245.60546875,515.8333333333334L245.60546875,520"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M336.60601380813955,459L342.47701671511624,465C348.34801962209303,471,360.0900254360465,483,365.9610283430232,493.1666666666667C371.83203125,503.3333333333333,371.83203125,511.6666666666667,371.83203125,515.8333333333334L371.83203125,520"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M276.53415697674416,330L281.8982558139535,336C287.26235465116275,342,297.9905523255814,354,303.35465116279073,366C308.71875,378,308.71875,390,308.71875,396L308.71875,402"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M225.57521802325581,330L220.21111918604652,336C214.84702034883722,342,204.11882267441862,354,198.7547238372093,364.1666666666667C193.390625,374.3333333333333,193.390625,382.6666666666667,193.390625,386.8333333333333L193.390625,391"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M204.68713492990653,212L212.41506035825546,216.16666666666666C220.14298578660433,220.33333333333334,235.59883664330218,228.66666666666666,243.32676207165107,238.83333333333334C251.0546875,249,251.0546875,261,251.0546875,267L251.0546875,273"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M98.96911507009347,212L91.24118964174455,216.16666666666666C83.51326421339564,220.33333333333334,68.05741335669782,228.66666666666666,60.32948792834892,237C52.6015625,245.33333333333334,52.6015625,253.66666666666666,52.6015625,257.8333333333333L52.6015625,262"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M151.828125,87L151.828125,92.66666666666667C151.828125,98.33333333333333,151.828125,109.66666666666667,151.828125,121C151.828125,132.33333333333334,151.828125,143.66666666666666,151.828125,149.33333333333334L151.828125,155"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M280.83148619186045,459L274.9604832848837,465C269.08948037790697,471,257.3474745639535,483,251.47647165697674,492.1666666666667C245.60546875,501.3333333333333,245.60546875,507.6666666666667,245.60546875,510.8333333333333L245.60546875,514"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M336.60601380813955,459L342.47701671511624,465C348.34801962209303,471,360.0900254360465,483,365.9610283430232,490.1666666666667C371.83203125,497.3333333333333,371.83203125,499.6666666666667,371.83203125,500.8333333333333L371.83203125,502"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M276.53415697674416,330L281.8982558139535,336C287.26235465116275,342,297.9905523255814,354,303.35465116279073,365C308.71875,376,308.71875,386,308.71875,391L308.71875,396"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M225.57521802325581,330L220.21111918604652,336C214.84702034883722,342,204.11882267441862,354,198.7547238372093,361.1666666666667C193.390625,368.3333333333333,193.390625,370.6666666666667,193.390625,371.8333333333333L193.390625,373"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M204.68713492990653,212L212.41506035825546,216.16666666666666C220.14298578660433,220.33333333333334,235.59883664330218,228.66666666666666,243.32676207165107,237.83333333333334C251.0546875,247,251.0546875,257,251.0546875,262L251.0546875,267"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M98.96911507009347,212L91.24118964174455,216.16666666666666C83.51326421339564,220.33333333333334,68.05741335669782,228.66666666666666,60.32948792834892,234C52.6015625,239.33333333333334,52.6015625,241.66666666666666,52.6015625,242.83333333333334L52.6015625,244"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M151.828125,105L151.828125,107.66666666666667C151.828125,110.33333333333333,151.828125,115.66666666666667,151.828125,124C151.828125,132.33333333333334,151.828125,143.66666666666666,151.828125,149.33333333333334L151.828125,155"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -138,7 +143,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7">
+        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0002036031998980633871-0" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -162,7 +167,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L11">
+        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L11">
           <g title="B" id="classId-C_0000765515233845859023-1" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -186,7 +191,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L15">
+        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L15">
           <g title="C" id="classId-C_0001436835384265552869-2" class="node default clickable">
             <rect height="79" width="71.171875" y="-39.5" x="-35.5859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.5859375" x1="-35.5859375" class="divider"/>
@@ -210,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L19">
+        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L19">
           <g title="D" id="classId-C_0002199581366769423637-3" class="node default clickable">
             <rect height="79" width="81.28125" y="-39.5" x="-40.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.640625" x1="-40.640625" class="divider"/>
@@ -234,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7">
+        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7">
           <g title="C" id="classId-C_0001609446044604054241-4" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -253,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7">
+        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7">
           <g title="B" id="classId-C_0000384927316081978893-5" class="node default clickable">
             <rect height="57" width="223.046875" y="-28.5" x="-111.5234375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.5234375" x1="-111.5234375" class="divider"/>
@@ -272,7 +277,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L7">
+        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0001747493965420341251-6" class="node default clickable">
             <rect height="57" width="253.296875" y="-28.5" x="-126.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="126.6484375" x1="-126.6484375" class="divider"/>
@@ -291,7 +296,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00033/t00033.cc#L23">
+        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L23">
           <g title="R" id="classId-C_0001866392706312766470-7" class="node default clickable">
             <rect height="79" width="287.65625" y="-39.5" x="-143.828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="143.828125" x1="-143.828125" class="divider"/>
diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md
index 4c37dd94..61fb8c94 100644
--- a/docs/test_cases/t00034.md
+++ b/docs/test_cases/t00034.md
@@ -16,7 +16,7 @@ diagrams:
 
 ```
 ## Source code
-File t00034.cc
+File `tests/t00034/t00034.cc`
 ```cpp
 #include <type_traits>
 
@@ -98,6 +98,7 @@ struct R {
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -128,6 +129,7 @@ struct R {
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index 77e5c0a2..cc6a2cfe 100644
--- a/docs/test_cases/t00034_class.svg
+++ b/docs/test_cases/t00034_class.svg
@@ -1,119 +1,137 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="243px" preserveAspectRatio="none" style="width:788px;height:243px;" version="1.1" viewBox="0 0 788 243" width="788px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="254px" preserveAspectRatio="none" style="width:818px;height:254px;background:#FFFFFF;" version="1.1" viewBox="0 0 818 254" width="818px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1x8ta1l73a3te" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x8ta1l73a3te)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="305" x="6" y="159"/>
-      <ellipse cx="140.75" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M143.7188,180.6406 Q143.1406,180.9375 142.5,181.0781 Q141.8594,181.2344 141.1563,181.2344 Q138.6563,181.2344 137.3281,179.5938 Q136.0156,177.9375 136.0156,174.8125 Q136.0156,171.6875 137.3281,170.0313 Q138.6563,168.375 141.1563,168.375 Q141.8594,168.375 142.5,168.5313 Q143.1563,168.6875 143.7188,168.9844 L143.7188,171.7031 Q143.0938,171.125 142.5,170.8594 Q141.9063,170.5781 141.2813,170.5781 Q139.9375,170.5781 139.25,171.6563 Q138.5625,172.7188 138.5625,174.8125 Q138.5625,176.9063 139.25,177.9844 Q139.9375,179.0469 141.2813,179.0469 Q141.9063,179.0469 142.5,178.7813 Q143.0938,178.5 143.7188,177.9219 L143.7188,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="161.25" y="179.1543">Void</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="191" y2="191"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
+      <g id="elem_C_0001704456490210873213">
+        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0001704456490210873213" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="328" x="7" y="165.6"/>
+        <ellipse cx="152.75" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M147.75,182.7563 C147.75,185.2563 149.8906,187.0688 152.8125,187.0688 C154.0469,187.0688 155.2188,186.7719 155.9688,186.2563 C156.5781,185.8344 156.9063,185.4125 156.9063,185.0063 C156.9063,184.5375 156.4844,184.1313 155.9844,184.1313 C155.75,184.1313 155.5313,184.2094 155.3281,184.4125 C154.8906,184.85 154.8906,184.85 154.7188,184.9438 C154.2656,185.1781 153.625,185.3188 152.8594,185.3188 C150.8594,185.3188 149.5781,184.3031 149.5781,182.725 L149.5781,181.6781 C149.5781,179.975 150.7969,178.7719 152.5,178.7719 C153.0781,178.7719 153.6563,178.9125 154.125,179.1625 C154.5938,179.4281 154.7656,179.6156 154.8281,179.975 C154.9531,180.6469 155.2031,180.8969 155.7344,180.8969 C156.0156,180.8969 156.2969,180.7563 156.4844,180.5375 C156.6094,180.3656 156.6563,180.1938 156.6563,179.7563 L156.6563,178.3969 C156.6563,177.975 156.6406,177.8344 156.5156,177.6625 C156.3438,177.4125 156.0625,177.2563 155.7344,177.2563 C155.4219,177.2563 155.2188,177.3656 155,177.6313 C153.8281,177.1313 153.3906,177.0219 152.4375,177.0219 C149.7656,177.0219 147.75,179.0375 147.75,181.6625 L147.75,182.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="173.25" y="186.206">Void</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="334" y1="197.6" y2="197.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="206.5"/>
+          <ellipse cx="18" cy="211.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="298" x="27" y="214.6059">operator!=(const Void &amp;) constexpr const : bool</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.2999"/>
+          <ellipse cx="18" cy="228.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="302" x="27" y="231.4059">operator==(const Void &amp;) constexpr const : bool</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="334" y1="239.1999" y2="239.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="197"/>
-      <ellipse cx="17" cy="202" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <g id="elem_C_0000867472442996685316">
+        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0000867472442996685316" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="91" x="518.5" y="182.4"/>
+        <ellipse cx="533.5" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M528.5,199.5562 C528.5,202.0562 530.6406,203.8687 533.5625,203.8687 C534.7969,203.8687 535.9688,203.5719 536.7188,203.0562 C537.3281,202.6344 537.6563,202.2125 537.6563,201.8062 C537.6563,201.3375 537.2344,200.9312 536.7344,200.9312 C536.5,200.9312 536.2813,201.0094 536.0781,201.2125 C535.6406,201.65 535.6406,201.65 535.4688,201.7437 C535.0156,201.9781 534.375,202.1187 533.6094,202.1187 C531.6094,202.1187 530.3281,201.1031 530.3281,199.525 L530.3281,198.4781 C530.3281,196.775 531.5469,195.5719 533.25,195.5719 C533.8281,195.5719 534.4063,195.7125 534.875,195.9625 C535.3438,196.2281 535.5156,196.4156 535.5781,196.775 C535.7031,197.4469 535.9531,197.6969 536.4844,197.6969 C536.7656,197.6969 537.0469,197.5562 537.2344,197.3375 C537.3594,197.1656 537.4063,196.9937 537.4063,196.5562 L537.4063,195.1969 C537.4063,194.775 537.3906,194.6344 537.2656,194.4625 C537.0938,194.2125 536.8125,194.0562 536.4844,194.0562 C536.1719,194.0562 535.9688,194.1656 535.75,194.4312 C534.5781,193.9312 534.1406,193.8219 533.1875,193.8219 C530.5156,193.8219 528.5,195.8375 528.5,198.4625 L528.5,199.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="547.5" y="203.006">lift_void</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="603.5" y="179.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="604.5" y="193.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="519.5" x2="608.5" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="519.5" x2="608.5" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="273" x="26" y="205.2104">operator!=(const Void &amp;) constexpr const : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <g id="elem_C_0000126450862226197239">
+        <rect codeLine="12" fill="#F1F1F1" height="48" id="C_0000126450862226197239" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="510.5" y="23.8"/>
+        <ellipse cx="525.5" cy="39.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M520.5,40.9562 C520.5,43.4562 522.6406,45.2687 525.5625,45.2687 C526.7969,45.2687 527.9688,44.9719 528.7188,44.4562 C529.3281,44.0344 529.6563,43.6125 529.6563,43.2062 C529.6563,42.7375 529.2344,42.3312 528.7344,42.3312 C528.5,42.3312 528.2813,42.4094 528.0781,42.6125 C527.6406,43.05 527.6406,43.05 527.4688,43.1437 C527.0156,43.3781 526.375,43.5187 525.6094,43.5187 C523.6094,43.5187 522.3281,42.5031 522.3281,40.925 L522.3281,39.8781 C522.3281,38.175 523.5469,36.9719 525.25,36.9719 C525.8281,36.9719 526.4063,37.1125 526.875,37.3625 C527.3438,37.6281 527.5156,37.8156 527.5781,38.175 C527.7031,38.8469 527.9531,39.0969 528.4844,39.0969 C528.7656,39.0969 529.0469,38.9562 529.2344,38.7375 C529.3594,38.5656 529.4063,38.3937 529.4063,37.9562 L529.4063,36.5969 C529.4063,36.175 529.3906,36.0344 529.2656,35.8625 C529.0938,35.6125 528.8125,35.4562 528.4844,35.4562 C528.1719,35.4562 527.9688,35.5656 527.75,35.8312 C526.5781,35.3312 526.1406,35.2219 525.1875,35.2219 C522.5156,35.2219 520.5,37.2375 520.5,39.8625 L520.5,40.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="539.5" y="44.406">lift_void</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="25" x="595.5" y="20.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="23" x="596.5" y="35.0001">void</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="511.5" x2="616.5" y1="55.8" y2="55.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="511.5" x2="616.5" y1="63.8" y2="63.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="209.8047"/>
-      <ellipse cx="17" cy="214.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <g id="elem_C_0001578745816100337706">
+        <rect codeLine="16" fill="#F1F1F1" height="48" id="C_0001578745816100337706" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="106" x="370" y="182.4"/>
+        <ellipse cx="385" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M380,199.5562 C380,202.0562 382.1406,203.8687 385.0625,203.8687 C386.2969,203.8687 387.4688,203.5719 388.2188,203.0562 C388.8281,202.6344 389.1563,202.2125 389.1563,201.8062 C389.1563,201.3375 388.7344,200.9312 388.2344,200.9312 C388,200.9312 387.7813,201.0094 387.5781,201.2125 C387.1406,201.65 387.1406,201.65 386.9688,201.7437 C386.5156,201.9781 385.875,202.1187 385.1094,202.1187 C383.1094,202.1187 381.8281,201.1031 381.8281,199.525 L381.8281,198.4781 C381.8281,196.775 383.0469,195.5719 384.75,195.5719 C385.3281,195.5719 385.9063,195.7125 386.375,195.9625 C386.8438,196.2281 387.0156,196.4156 387.0781,196.775 C387.2031,197.4469 387.4531,197.6969 387.9844,197.6969 C388.2656,197.6969 388.5469,197.5562 388.7344,197.3375 C388.8594,197.1656 388.9063,196.9937 388.9063,196.5562 L388.9063,195.1969 C388.9063,194.775 388.8906,194.6344 388.7656,194.4625 C388.5938,194.2125 388.3125,194.0562 387.9844,194.0562 C387.6719,194.0562 387.4688,194.1656 387.25,194.4312 C386.0781,193.9312 385.6406,193.8219 384.6875,193.8219 C382.0156,193.8219 380,195.8375 380,198.4625 L380,199.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="399" y="203.006">drop_void</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="470" y="179.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="471" y="193.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="371" x2="475" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="371" x2="475" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="279" x="26" y="218.0151">operator==(const Void &amp;) constexpr const : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <g id="elem_C_0001849836134504075115">
+        <rect codeLine="20" fill="#F1F1F1" height="48" id="C_0001849836134504075115" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="231" y="23.8"/>
+        <ellipse cx="246" cy="39.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M241,40.9562 C241,43.4562 243.1406,45.2687 246.0625,45.2687 C247.2969,45.2687 248.4688,44.9719 249.2188,44.4562 C249.8281,44.0344 250.1563,43.6125 250.1563,43.2062 C250.1563,42.7375 249.7344,42.3312 249.2344,42.3312 C249,42.3312 248.7813,42.4094 248.5781,42.6125 C248.1406,43.05 248.1406,43.05 247.9688,43.1437 C247.5156,43.3781 246.875,43.5187 246.1094,43.5187 C244.1094,43.5187 242.8281,42.5031 242.8281,40.925 L242.8281,39.8781 C242.8281,38.175 244.0469,36.9719 245.75,36.9719 C246.3281,36.9719 246.9063,37.1125 247.375,37.3625 C247.8438,37.6281 248.0156,37.8156 248.0781,38.175 C248.2031,38.8469 248.4531,39.0969 248.9844,39.0969 C249.2656,39.0969 249.5469,38.9562 249.7344,38.7375 C249.8594,38.5656 249.9063,38.3937 249.9063,37.9562 L249.9063,36.5969 C249.9063,36.175 249.8906,36.0344 249.7656,35.8625 C249.5938,35.6125 249.3125,35.4562 248.9844,35.4562 C248.6719,35.4562 248.4688,35.5656 248.25,35.8312 C247.0781,35.3312 246.6406,35.2219 245.6875,35.2219 C243.0156,35.2219 241,37.2375 241,39.8625 L241,40.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="260" y="44.406">drop_void</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="27" x="331" y="20.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="25" x="332" y="35.0001">Void</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="232" x2="354" y1="55.8" y2="55.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="232" x2="354" y1="63.8" y2="63.8"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="224.6094" y2="224.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x8ta1l73a3te)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="493" y="172"/>
-      <ellipse cx="508" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M510.9688,193.6406 Q510.3906,193.9375 509.75,194.0781 Q509.1094,194.2344 508.4063,194.2344 Q505.9063,194.2344 504.5781,192.5938 Q503.2656,190.9375 503.2656,187.8125 Q503.2656,184.6875 504.5781,183.0313 Q505.9063,181.375 508.4063,181.375 Q509.1094,181.375 509.75,181.5313 Q510.4063,181.6875 510.9688,181.9844 L510.9688,184.7031 Q510.3438,184.125 509.75,183.8594 Q509.1563,183.5781 508.5313,183.5781 Q507.1875,183.5781 506.5,184.6563 Q505.8125,185.7188 505.8125,187.8125 Q505.8125,189.9063 506.5,190.9844 Q507.1875,192.0469 508.5313,192.0469 Q509.1563,192.0469 509.75,191.7813 Q510.3438,191.5 510.9688,190.9219 L510.9688,193.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="522" y="192.1543">lift_void</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="576" y="169"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="577" y="181.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="204" y2="204"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="212" y2="212"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001383912907884688827">
+        <rect codeLine="24" fill="#F1F1F1" height="48" id="C_0001383912907884688827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="711.5" y="182.4"/>
+        <ellipse cx="726.5" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M721.5,199.5562 C721.5,202.0562 723.6406,203.8687 726.5625,203.8687 C727.7969,203.8687 728.9688,203.5719 729.7188,203.0562 C730.3281,202.6344 730.6563,202.2125 730.6563,201.8062 C730.6563,201.3375 730.2344,200.9312 729.7344,200.9312 C729.5,200.9312 729.2813,201.0094 729.0781,201.2125 C728.6406,201.65 728.6406,201.65 728.4688,201.7437 C728.0156,201.9781 727.375,202.1187 726.6094,202.1187 C724.6094,202.1187 723.3281,201.1031 723.3281,199.525 L723.3281,198.4781 C723.3281,196.775 724.5469,195.5719 726.25,195.5719 C726.8281,195.5719 727.4063,195.7125 727.875,195.9625 C728.3438,196.2281 728.5156,196.4156 728.5781,196.775 C728.7031,197.4469 728.9531,197.6969 729.4844,197.6969 C729.7656,197.6969 730.0469,197.5562 730.2344,197.3375 C730.3594,197.1656 730.4063,196.9937 730.4063,196.5562 L730.4063,195.1969 C730.4063,194.775 730.3906,194.6344 730.2656,194.4625 C730.0938,194.2125 729.8125,194.0562 729.4844,194.0562 C729.1719,194.0562 728.9688,194.1656 728.75,194.4312 C727.5781,193.9312 727.1406,193.8219 726.1875,193.8219 C723.5156,193.8219 721.5,195.8375 721.5,198.4625 L721.5,199.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="740.5" y="203.006">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="712.5" x2="751.5" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="712.5" x2="751.5" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x8ta1l73a3te)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="484" y="21"/>
-      <ellipse cx="499" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M501.9688,42.6406 Q501.3906,42.9375 500.75,43.0781 Q500.1094,43.2344 499.4063,43.2344 Q496.9063,43.2344 495.5781,41.5938 Q494.2656,39.9375 494.2656,36.8125 Q494.2656,33.6875 495.5781,32.0313 Q496.9063,30.375 499.4063,30.375 Q500.1094,30.375 500.75,30.5313 Q501.4063,30.6875 501.9688,30.9844 L501.9688,33.7031 Q501.3438,33.125 500.75,32.8594 Q500.1563,32.5781 499.5313,32.5781 Q498.1875,32.5781 497.5,33.6563 Q496.8125,34.7188 496.8125,36.8125 Q496.8125,38.9063 497.5,39.9844 Q498.1875,41.0469 499.5313,41.0469 Q500.1563,41.0469 500.75,40.7813 Q501.3438,40.5 501.9688,39.9219 L501.9688,42.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="513" y="41.1543">lift_void</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="567" y="18"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="568" y="30.1387">void</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="53" y2="53"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="61" y2="61"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001713991735741265309">
+        <rect codeLine="28" fill="#F1F1F1" height="81.5999" id="C_0001713991735741265309" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="159" x="652.5" y="7"/>
+        <ellipse cx="722.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M717.75,24.1563 C717.75,26.6563 719.8906,28.4688 722.8125,28.4688 C724.0469,28.4688 725.2188,28.1719 725.9688,27.6563 C726.5781,27.2344 726.9063,26.8125 726.9063,26.4063 C726.9063,25.9375 726.4844,25.5313 725.9844,25.5313 C725.75,25.5313 725.5313,25.6094 725.3281,25.8125 C724.8906,26.25 724.8906,26.25 724.7188,26.3438 C724.2656,26.5781 723.625,26.7188 722.8594,26.7188 C720.8594,26.7188 719.5781,25.7031 719.5781,24.125 L719.5781,23.0781 C719.5781,21.375 720.7969,20.1719 722.5,20.1719 C723.0781,20.1719 723.6563,20.3125 724.125,20.5625 C724.5938,20.8281 724.7656,21.0156 724.8281,21.375 C724.9531,22.0469 725.2031,22.2969 725.7344,22.2969 C726.0156,22.2969 726.2969,22.1563 726.4844,21.9375 C726.6094,21.7656 726.6563,21.5938 726.6563,21.1563 L726.6563,19.7969 C726.6563,19.375 726.6406,19.2344 726.5156,19.0625 C726.3438,18.8125 726.0625,18.6563 725.7344,18.6563 C725.4219,18.6563 725.2188,18.7656 725,19.0313 C723.8281,18.5313 723.3906,18.4219 722.4375,18.4219 C719.7656,18.4219 717.75,20.4375 717.75,23.0625 L717.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="743.25" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="653.5" x2="810.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="653.5" x2="810.5" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="658.5" y="55.9"/>
+          <ellipse cx="663.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="672.5" y="64.0059">la : lift_void_t&lt;A&gt; *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="658.5" y="72.6999"/>
+          <ellipse cx="663.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="672.5" y="80.8059">lv : lift_void_t&lt;void&gt; *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x8ta1l73a3te)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="346" y="172"/>
-      <ellipse cx="361" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M363.9688,193.6406 Q363.3906,193.9375 362.75,194.0781 Q362.1094,194.2344 361.4063,194.2344 Q358.9063,194.2344 357.5781,192.5938 Q356.2656,190.9375 356.2656,187.8125 Q356.2656,184.6875 357.5781,183.0313 Q358.9063,181.375 361.4063,181.375 Q362.1094,181.375 362.75,181.5313 Q363.4063,181.6875 363.9688,181.9844 L363.9688,184.7031 Q363.3438,184.125 362.75,183.8594 Q362.1563,183.5781 361.5313,183.5781 Q360.1875,183.5781 359.5,184.6563 Q358.8125,185.7188 358.8125,187.8125 Q358.8125,189.9063 359.5,190.9844 Q360.1875,192.0469 361.5313,192.0469 Q362.1563,192.0469 362.75,191.7813 Q363.3438,191.5 363.9688,190.9219 L363.9688,193.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="375" y="192.1543">drop_void</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="443" y="169"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="444" y="181.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="204" y2="204"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="212" y2="212"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x8ta1l73a3te)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="212" y="21"/>
-      <ellipse cx="227" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M229.9688,42.6406 Q229.3906,42.9375 228.75,43.0781 Q228.1094,43.2344 227.4063,43.2344 Q224.9063,43.2344 223.5781,41.5938 Q222.2656,39.9375 222.2656,36.8125 Q222.2656,33.6875 223.5781,32.0313 Q224.9063,30.375 227.4063,30.375 Q228.1094,30.375 228.75,30.5313 Q229.4063,30.6875 229.9688,30.9844 L229.9688,33.7031 Q229.3438,33.125 228.75,32.8594 Q228.1563,32.5781 227.5313,32.5781 Q226.1875,32.5781 225.5,33.6563 Q224.8125,34.7188 224.8125,36.8125 Q224.8125,38.9063 225.5,39.9844 Q226.1875,41.0469 227.5313,41.0469 Q228.1563,41.0469 228.75,40.7813 Q229.3438,40.5 229.9688,39.9219 L229.9688,42.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="241" y="41.1543">drop_void</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="309" y="18"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="310" y="30.1387">Void</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="53" y2="53"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="61" y2="61"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x8ta1l73a3te)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="681.5" y="172"/>
-      <ellipse cx="696.5" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M699.4688,193.6406 Q698.8906,193.9375 698.25,194.0781 Q697.6094,194.2344 696.9063,194.2344 Q694.4063,194.2344 693.0781,192.5938 Q691.7656,190.9375 691.7656,187.8125 Q691.7656,184.6875 693.0781,183.0313 Q694.4063,181.375 696.9063,181.375 Q697.6094,181.375 698.25,181.5313 Q698.9063,181.6875 699.4688,181.9844 L699.4688,184.7031 Q698.8438,184.125 698.25,183.8594 Q697.6563,183.5781 697.0313,183.5781 Q695.6875,183.5781 695,184.6563 Q694.3125,185.7188 694.3125,187.8125 Q694.3125,189.9063 695,190.9844 Q695.6875,192.0469 697.0313,192.0469 Q697.6563,192.0469 698.25,191.7813 Q698.8438,191.5 699.4688,190.9219 L699.4688,193.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="710.5" y="192.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="204" y2="204"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="212" y2="212"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x8ta1l73a3te)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="626" y="8"/>
-      <ellipse cx="693.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M696.2188,29.6406 Q695.6406,29.9375 695,30.0781 Q694.3594,30.2344 693.6563,30.2344 Q691.1563,30.2344 689.8281,28.5938 Q688.5156,26.9375 688.5156,23.8125 Q688.5156,20.6875 689.8281,19.0313 Q691.1563,17.375 693.6563,17.375 Q694.3594,17.375 695,17.5313 Q695.6563,17.6875 696.2188,17.9844 L696.2188,20.7031 Q695.5938,20.125 695,19.8594 Q694.4063,19.5781 693.7813,19.5781 Q692.4375,19.5781 691.75,20.6563 Q691.0625,21.7188 691.0625,23.8125 Q691.0625,25.9063 691.75,26.9844 Q692.4375,28.0469 693.7813,28.0469 Q694.4063,28.0469 695,27.7813 Q695.5938,27.5 696.2188,26.9219 L696.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="713.75" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="632" y="54"/>
-      <ellipse cx="637" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="646" y="62.2104">la : lift_void_t&lt;A&gt; *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="632" y="66.8047"/>
-      <ellipse cx="637" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="125" x="646" y="75.0151">lv : lift_void_t&lt;void&gt; *</text>
-    </a>
-    <path d="M537.5,69.28 C537.5,91.26 537.5,124.76 537.5,151.66 " fill="none" id="C_0000126450862226197239-&gt;C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="544.5,151.88,537.5,171.88,530.5,151.88,544.5,151.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M255.53,69.28 C237.89,92.14 210.63,127.46 189.48,154.85 " fill="none" id="C_0001849836134504075115-&gt;C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="186.41,158.84,195.0777,154.1633,189.4668,154.8833,188.7469,149.2724,186.41,158.84" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M292.88,69.28 C312.26,92.57 342.41,128.81 365.38,156.4 " fill="none" id="C_0001849836134504075115-&gt;C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="370.85,152.03,378.26,171.88,360.09,160.99,370.85,152.03" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M677.51,82.35 C672.56,91.64 668.08,101.88 665.5,112 C660.6,131.2 669.27,151.63 679.33,167.42 " fill="none" id="C_0001713991735741265309-&gt;C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="682.19,171.74,680.5644,162.0262,679.433,167.5688,673.8904,166.4374,682.19,171.74" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="671.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="678.5" y="125.0669">la</text>
-    <path d="M701.5,82.07 C701.5,108.01 701.5,142.52 701.5,166.53 " fill="none" id="C_0001713991735741265309-&gt;C_0001383912907884688827-1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="701.5,171.79,705.5,162.79,701.5,166.79,697.5,162.79,701.5,171.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="707.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="714.5" y="125.0669">la</text>
+    <g id="link_C_0000126450862226197239_C_0000867472442996685316">
+      <path codeLine="33" d="M564,72.24 C564,101.85 564,134.49 564,164.05 " fill="none" id="C_0000126450862226197239-to-C_0000867472442996685316" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="564,182.05,570,164.05,558,164.05,564,182.05" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001849836134504075115_C_0001704456490210873213">
+      <path codeLine="34" d="M274.74,72.24 C255.59,96.82 228.8475,131.1469 205.8875,160.6169 " fill="none" id="C_0001849836134504075115-to-C_0001704456490210873213" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="202.2,165.35,210.8867,160.7087,205.2729,161.4058,204.5759,155.792,202.2,165.35" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001849836134504075115_C_0001578745816100337706">
+      <path codeLine="35" d="M312.46,72.24 C337.04,101.85 367.5825,138.6405 392.1225,168.2005 " fill="none" id="C_0001849836134504075115-to-C_0001578745816100337706" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="403.62,182.05,396.739,164.368,387.506,172.033,403.62,182.05" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001713991735741265309_C_0001383912907884688827">
+      <path codeLine="36" d="M707.94,88.93 C703.42,98.35 699.37,108.57 697,118.6 C691.72,140.89 699.6213,159.922 710.7013,177.052 " fill="none" id="C_0001713991735741265309-to-C_0001383912907884688827" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="713.96,182.09,712.4307,172.3606,711.2445,177.8917,705.7134,176.7055,713.96,182.09" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="703" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="10" x="710" y="131.677">la</text>
+    </g>
+    <g id="link_C_0001713991735741265309_C_0001383912907884688827">
+      <path codeLine="37" d="M732,88.72 C732,118.26 732,151.49 732,176.09 " fill="none" id="C_0001713991735741265309-to-C_0001383912907884688827-1" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="732,182.09,736,173.09,732,177.09,728,173.09,732,182.09" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="738" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="10" x="745" y="131.677">la</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00034_class_mermaid.svg b/docs/test_cases/t00034_class_mermaid.svg
index d1a177cf..7f4426a8 100644
--- a/docs/test_cases/t00034_class_mermaid.svg
+++ b/docs/test_cases/t00034_class_mermaid.svg
@@ -1,59 +1,64 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 910.58203125 286" style="max-width: 910.582px; background-color: white;" width="910.58203125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 919.47265625 286" style="max-width: 919.473px; background-color: white;" width="919.47265625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M71.9609375,87L71.9609375,96.33333333333333C71.9609375,105.66666666666667,71.9609375,124.33333333333333,71.9609375,143C71.9609375,161.66666666666666,71.9609375,180.33333333333334,71.9609375,189.66666666666666L71.9609375,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M458.04377773668637,87L441.69663769723866,96.33333333333333C425.3494976577909,105.66666666666667,392.6552175788955,124.33333333333333,376.30807753944777,139.33333333333334C359.9609375,154.33333333333334,359.9609375,165.66666666666666,359.9609375,171.33333333333334L359.9609375,177"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M557.8780972633136,87L574.2252373027613,96.33333333333333C590.572377342209,105.66666666666667,623.2666574211045,124.33333333333333,639.6137974605523,143C655.9609375,161.66666666666666,655.9609375,180.33333333333334,655.9609375,189.66666666666666L655.9609375,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M820.14453125,109L820.14453125,114.66666666666667C820.14453125,120.33333333333333,820.14453125,131.66666666666666,820.14453125,146.66666666666666C820.14453125,161.66666666666666,820.14453125,180.33333333333334,820.14453125,189.66666666666666L820.14453125,199"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M71.9609375,87L71.9609375,96.33333333333333C71.9609375,105.66666666666667,71.9609375,124.33333333333333,71.9609375,140C71.9609375,155.66666666666666,71.9609375,168.33333333333334,71.9609375,174.66666666666666L71.9609375,181"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M463.9620931952663,87L447.36945266272187,96.33333333333333C430.7768121301776,105.66666666666667,397.59153106508876,124.33333333333333,380.9988905325444,138.33333333333334C364.40625,152.33333333333334,364.40625,161.66666666666666,364.40625,166.33333333333334L364.40625,171"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M565.2957193047338,87L581.8883598372781,96.33333333333333C598.4810003698225,105.66666666666667,631.6662814349112,124.33333333333333,648.2589219674556,140C664.8515625,155.66666666666666,664.8515625,168.33333333333334,664.8515625,174.66666666666666L664.8515625,181"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M829.03515625,109L829.03515625,114.66666666666667C829.03515625,120.33333333333333,829.03515625,131.66666666666666,829.03515625,145.66666666666666C829.03515625,159.66666666666666,829.03515625,176.33333333333334,829.03515625,184.66666666666666L829.03515625,193"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -89,7 +94,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(820.14453125, 143)" class="edgeLabel">
+        <g transform="translate(829.03515625, 143)" class="edgeLabel">
           <g transform="translate(-10.8984375, -9)" class="label">
             <foreignObject height="18" width="21.796875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -102,11 +107,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(359.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L9">
+        <a transform="translate(364.40625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L9">
           <g title="Void" id="classId-C_0001704456490210873213-0" class="node default clickable">
-            <rect height="101" width="371.203125" y="-50.5" x="-185.6015625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="185.6015625" x1="-185.6015625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="185.6015625" x1="-185.6015625" class="divider"/>
+            <rect height="101" width="380.09375" y="-50.5" x="-190.046875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="190.046875" x1="-190.046875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="190.046875" x1="-190.046875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -118,20 +123,20 @@
                   <span class="nodeLabel">Void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -178.1015625, 3)" height="18" width="351.3125">
+              <foreignObject transform="translate( -182.546875, 3)" height="18" width="360.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator!=(const Void &amp;) : [const,constexpr] bool</span>
+                  <span class="nodeLabel">+operator!=(const Void &amp;) : : [const,constexpr] bool</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -178.1015625, 25)" height="18" width="356.203125">
+              <foreignObject transform="translate( -182.546875, 25)" height="18" width="365.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator==(const Void &amp;) : [const,constexpr] bool</span>
+                  <span class="nodeLabel">+operator==(const Void &amp;) : : [const,constexpr] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L16">
+        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L16">
           <g title="lift_void" id="classId-C_0000867472442996685316-1" class="node default clickable">
             <rect height="57" width="104.796875" y="-28.5" x="-52.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.3984375" x1="-52.3984375" class="divider"/>
@@ -150,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L20">
+        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L20">
           <g title="lift_void" id="classId-C_0000126450862226197239-2" class="node default clickable">
             <rect height="57" width="127.921875" y="-28.5" x="-63.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.9609375" x1="-63.9609375" class="divider"/>
@@ -169,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(655.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L33">
+        <a transform="translate(664.8515625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L33">
           <g title="drop_void" id="classId-C_0001578745816100337706-3" class="node default clickable">
             <rect height="57" width="120.796875" y="-28.5" x="-60.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.3984375" x1="-60.3984375" class="divider"/>
@@ -188,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(507.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L37">
+        <a transform="translate(514.62890625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L37">
           <g title="drop_void" id="classId-C_0001849836134504075115-4" class="node default clickable">
             <rect height="57" width="144.5" y="-28.5" x="-72.25" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.25" x1="-72.25" class="divider"/>
@@ -207,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(820.14453125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L43">
+        <a transform="translate(829.03515625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L43">
           <g title="A" id="classId-C_0001383912907884688827-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -226,7 +231,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(820.14453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00034/t00034.cc#L45">
+        <a transform="translate(829.03515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L45">
           <g title="R" id="classId-C_0001713991735741265309-6" class="node default clickable">
             <rect height="101" width="164.875" y="-50.5" x="-82.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="82.4375" x1="-82.4375" class="divider"/>
@@ -244,12 +249,12 @@
               </foreignObject>
               <foreignObject transform="translate( -74.9375, -9)" height="18" width="132.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+la : lift_void_t&lt;A&gt; </span>
+                  <span style="font-style:italic;" class="nodeLabel">+la : lift_void_t&lt;A&gt;</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -74.9375, 13)" height="18" width="149.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+lv : lift_void_t&lt;void&gt; </span>
+                  <span style="font-style:italic;" class="nodeLabel">+lv : lift_void_t&lt;void&gt;</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00035.md b/docs/test_cases/t00035.md
index 135a60d1..ce6fb517 100644
--- a/docs/test_cases/t00035.md
+++ b/docs/test_cases/t00035.md
@@ -19,7 +19,7 @@ diagrams:
 
 ```
 ## Source code
-File t00035.cc
+File `tests/t00035/t00035.cc`
 ```cpp
 namespace clanguml {
 namespace t00035 {
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index 764ae082..2e7431bd 100644
--- a/docs/test_cases/t00035_class.svg
+++ b/docs/test_cases/t00035_class.svg
@@ -1,53 +1,57 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="278px" preserveAspectRatio="none" style="width:280px;height:278px;background:#FFFFFF;" version="1.1" viewBox="0 0 280 278" width="280px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1xax7cip51l0l" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xax7cip51l0l)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
-      <ellipse cx="121" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M123.9688,29.6406 Q123.3906,29.9375 122.75,30.0781 Q122.1094,30.2344 121.4063,30.2344 Q118.9063,30.2344 117.5781,28.5938 Q116.2656,26.9375 116.2656,23.8125 Q116.2656,20.6875 117.5781,19.0313 Q118.9063,17.375 121.4063,17.375 Q122.1094,17.375 122.75,17.5313 Q123.4063,17.6875 123.9688,17.9844 L123.9688,20.7031 Q123.3438,20.125 122.75,19.8594 Q122.1563,19.5781 121.5313,19.5781 Q120.1875,19.5781 119.5,20.6563 Q118.8125,21.7188 118.8125,23.8125 Q118.8125,25.9063 119.5,26.9844 Q120.1875,28.0469 121.5313,28.0469 Q122.1563,28.0469 122.75,27.7813 Q123.3438,27.5 123.9688,26.9219 L123.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="135" y="28.1543">Top</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
+      <g id="elem_C_0002241062883697294772">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0002241062883697294772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="57" x="107.5" y="7"/>
+        <ellipse cx="122.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M117.5,24.1563 C117.5,26.6563 119.6406,28.4688 122.5625,28.4688 C123.7969,28.4688 124.9688,28.1719 125.7188,27.6563 C126.3281,27.2344 126.6563,26.8125 126.6563,26.4063 C126.6563,25.9375 126.2344,25.5313 125.7344,25.5313 C125.5,25.5313 125.2813,25.6094 125.0781,25.8125 C124.6406,26.25 124.6406,26.25 124.4688,26.3438 C124.0156,26.5781 123.375,26.7188 122.6094,26.7188 C120.6094,26.7188 119.3281,25.7031 119.3281,24.125 L119.3281,23.0781 C119.3281,21.375 120.5469,20.1719 122.25,20.1719 C122.8281,20.1719 123.4063,20.3125 123.875,20.5625 C124.3438,20.8281 124.5156,21.0156 124.5781,21.375 C124.7031,22.0469 124.9531,22.2969 125.4844,22.2969 C125.7656,22.2969 126.0469,22.1563 126.2344,21.9375 C126.3594,21.7656 126.4063,21.5938 126.4063,21.1563 L126.4063,19.7969 C126.4063,19.375 126.3906,19.2344 126.2656,19.0625 C126.0938,18.8125 125.8125,18.6563 125.4844,18.6563 C125.1719,18.6563 124.9688,18.7656 124.75,19.0313 C123.5781,18.5313 123.1406,18.4219 122.1875,18.4219 C119.5156,18.4219 117.5,20.4375 117.5,23.0625 L117.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="136.5" y="27.606">Top</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="108.5" x2="163.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="108.5" x2="163.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xax7cip51l0l)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
-      <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="35" y="136.1543">Left</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="156" y2="156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
+      <g id="elem_C_0000242562856080127946">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000242562856080127946" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="56" x="7" y="115"/>
+        <ellipse cx="22" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,132.1563 C17,134.6563 19.1406,136.4688 22.0625,136.4688 C23.2969,136.4688 24.4688,136.1719 25.2188,135.6563 C25.8281,135.2344 26.1563,134.8125 26.1563,134.4063 C26.1563,133.9375 25.7344,133.5313 25.2344,133.5313 C25,133.5313 24.7813,133.6094 24.5781,133.8125 C24.1406,134.25 24.1406,134.25 23.9688,134.3438 C23.5156,134.5781 22.875,134.7188 22.1094,134.7188 C20.1094,134.7188 18.8281,133.7031 18.8281,132.125 L18.8281,131.0781 C18.8281,129.375 20.0469,128.1719 21.75,128.1719 C22.3281,128.1719 22.9063,128.3125 23.375,128.5625 C23.8438,128.8281 24.0156,129.0156 24.0781,129.375 C24.2031,130.0469 24.4531,130.2969 24.9844,130.2969 C25.2656,130.2969 25.5469,130.1563 25.7344,129.9375 C25.8594,129.7656 25.9063,129.5938 25.9063,129.1563 L25.9063,127.7969 C25.9063,127.375 25.8906,127.2344 25.7656,127.0625 C25.5938,126.8125 25.3125,126.6563 24.9844,126.6563 C24.6719,126.6563 24.4688,126.7656 24.25,127.0313 C23.0781,126.5313 22.6406,126.4219 21.6875,126.4219 C19.0156,126.4219 17,128.4375 17,131.0625 L17,132.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="36" y="135.606">Left</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="62" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="62" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xax7cip51l0l)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
-      <ellipse cx="111.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M114.4688,137.6406 Q113.8906,137.9375 113.25,138.0781 Q112.6094,138.2344 111.9063,138.2344 Q109.4063,138.2344 108.0781,136.5938 Q106.7656,134.9375 106.7656,131.8125 Q106.7656,128.6875 108.0781,127.0313 Q109.4063,125.375 111.9063,125.375 Q112.6094,125.375 113.25,125.5313 Q113.9063,125.6875 114.4688,125.9844 L114.4688,128.7031 Q113.8438,128.125 113.25,127.8594 Q112.6563,127.5781 112.0313,127.5781 Q110.6875,127.5781 110,128.6563 Q109.3125,129.7188 109.3125,131.8125 Q109.3125,133.9063 110,134.9844 Q110.6875,136.0469 112.0313,136.0469 Q112.6563,136.0469 113.25,135.7813 Q113.8438,135.5 114.4688,134.9219 L114.4688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="125.5" y="136.1543">Center</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="156" y2="156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
+      <g id="elem_C_0001933304541849408421">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001933304541849408421" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="75" x="98.5" y="115"/>
+        <ellipse cx="113.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M108.5,132.1563 C108.5,134.6563 110.6406,136.4688 113.5625,136.4688 C114.7969,136.4688 115.9688,136.1719 116.7188,135.6563 C117.3281,135.2344 117.6563,134.8125 117.6563,134.4063 C117.6563,133.9375 117.2344,133.5313 116.7344,133.5313 C116.5,133.5313 116.2813,133.6094 116.0781,133.8125 C115.6406,134.25 115.6406,134.25 115.4688,134.3438 C115.0156,134.5781 114.375,134.7188 113.6094,134.7188 C111.6094,134.7188 110.3281,133.7031 110.3281,132.125 L110.3281,131.0781 C110.3281,129.375 111.5469,128.1719 113.25,128.1719 C113.8281,128.1719 114.4063,128.3125 114.875,128.5625 C115.3438,128.8281 115.5156,129.0156 115.5781,129.375 C115.7031,130.0469 115.9531,130.2969 116.4844,130.2969 C116.7656,130.2969 117.0469,130.1563 117.2344,129.9375 C117.3594,129.7656 117.4063,129.5938 117.4063,129.1563 L117.4063,127.7969 C117.4063,127.375 117.3906,127.2344 117.2656,127.0625 C117.0938,126.8125 116.8125,126.6563 116.4844,126.6563 C116.1719,126.6563 115.9688,126.7656 115.75,127.0313 C114.5781,126.5313 114.1406,126.4219 113.1875,126.4219 C110.5156,126.4219 108.5,128.4375 108.5,131.0625 L108.5,132.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="127.5" y="135.606">Center</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="99.5" x2="172.5" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="99.5" x2="172.5" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xax7cip51l0l)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
-      <ellipse cx="110" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M112.9688,245.6406 Q112.3906,245.9375 111.75,246.0781 Q111.1094,246.2344 110.4063,246.2344 Q107.9063,246.2344 106.5781,244.5938 Q105.2656,242.9375 105.2656,239.8125 Q105.2656,236.6875 106.5781,235.0313 Q107.9063,233.375 110.4063,233.375 Q111.1094,233.375 111.75,233.5313 Q112.4063,233.6875 112.9688,233.9844 L112.9688,236.7031 Q112.3438,236.125 111.75,235.8594 Q111.1563,235.5781 110.5313,235.5781 Q109.1875,235.5781 108.5,236.6563 Q107.8125,237.7188 107.8125,239.8125 Q107.8125,241.9063 108.5,242.9844 Q109.1875,244.0469 110.5313,244.0469 Q111.1563,244.0469 111.75,243.7813 Q112.3438,243.5 112.9688,242.9219 L112.9688,245.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="124" y="244.1543">Bottom</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="256" y2="256"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="264" y2="264"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
+      <g id="elem_C_0001646691079607377420">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001646691079607377420" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="77" x="97.5" y="223"/>
+        <ellipse cx="112.5" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M107.5,240.1563 C107.5,242.6563 109.6406,244.4688 112.5625,244.4688 C113.7969,244.4688 114.9688,244.1719 115.7188,243.6563 C116.3281,243.2344 116.6563,242.8125 116.6563,242.4063 C116.6563,241.9375 116.2344,241.5313 115.7344,241.5313 C115.5,241.5313 115.2813,241.6094 115.0781,241.8125 C114.6406,242.25 114.6406,242.25 114.4688,242.3438 C114.0156,242.5781 113.375,242.7188 112.6094,242.7188 C110.6094,242.7188 109.3281,241.7031 109.3281,240.125 L109.3281,239.0781 C109.3281,237.375 110.5469,236.1719 112.25,236.1719 C112.8281,236.1719 113.4063,236.3125 113.875,236.5625 C114.3438,236.8281 114.5156,237.0156 114.5781,237.375 C114.7031,238.0469 114.9531,238.2969 115.4844,238.2969 C115.7656,238.2969 116.0469,238.1563 116.2344,237.9375 C116.3594,237.7656 116.4063,237.5938 116.4063,237.1563 L116.4063,235.7969 C116.4063,235.375 116.3906,235.2344 116.2656,235.0625 C116.0938,234.8125 115.8125,234.6563 115.4844,234.6563 C115.1719,234.6563 114.9688,234.7656 114.75,235.0313 C113.5781,234.5313 113.1406,234.4219 112.1875,234.4219 C109.5156,234.4219 107.5,236.4375 107.5,239.0625 L107.5,240.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="126.5" y="243.606">Bottom</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="98.5" x2="173.5" y1="255" y2="255"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="98.5" x2="173.5" y1="263" y2="263"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xax7cip51l0l)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
-      <ellipse cx="220.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M223.4688,137.6406 Q222.8906,137.9375 222.25,138.0781 Q221.6094,138.2344 220.9063,138.2344 Q218.4063,138.2344 217.0781,136.5938 Q215.7656,134.9375 215.7656,131.8125 Q215.7656,128.6875 217.0781,127.0313 Q218.4063,125.375 220.9063,125.375 Q221.6094,125.375 222.25,125.5313 Q222.9063,125.6875 223.4688,125.9844 L223.4688,128.7031 Q222.8438,128.125 222.25,127.8594 Q221.6563,127.5781 221.0313,127.5781 Q219.6875,127.5781 219,128.6563 Q218.3125,129.7188 218.3125,131.8125 Q218.3125,133.9063 219,134.9844 Q219.6875,136.0469 221.0313,136.0469 Q221.6563,136.0469 222.25,135.7813 Q222.8438,135.5 223.4688,134.9219 L223.4688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="234.5" y="136.1543">Right</text>
-      <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"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
+      <g id="elem_C_0000200121820090372322">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000200121820090372322" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="65" x="208.5" y="115"/>
+        <ellipse cx="223.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M218.5,132.1563 C218.5,134.6563 220.6406,136.4688 223.5625,136.4688 C224.7969,136.4688 225.9688,136.1719 226.7188,135.6563 C227.3281,135.2344 227.6563,134.8125 227.6563,134.4063 C227.6563,133.9375 227.2344,133.5313 226.7344,133.5313 C226.5,133.5313 226.2813,133.6094 226.0781,133.8125 C225.6406,134.25 225.6406,134.25 225.4688,134.3438 C225.0156,134.5781 224.375,134.7188 223.6094,134.7188 C221.6094,134.7188 220.3281,133.7031 220.3281,132.125 L220.3281,131.0781 C220.3281,129.375 221.5469,128.1719 223.25,128.1719 C223.8281,128.1719 224.4063,128.3125 224.875,128.5625 C225.3438,128.8281 225.5156,129.0156 225.5781,129.375 C225.7031,130.0469 225.9531,130.2969 226.4844,130.2969 C226.7656,130.2969 227.0469,130.1563 227.2344,129.9375 C227.3594,129.7656 227.4063,129.5938 227.4063,129.1563 L227.4063,127.7969 C227.4063,127.375 227.3906,127.2344 227.2656,127.0625 C227.0938,126.8125 226.8125,126.6563 226.4844,126.6563 C226.1719,126.6563 225.9688,126.7656 225.75,127.0313 C224.5781,126.5313 224.1406,126.4219 223.1875,126.4219 C220.5156,126.4219 218.5,128.4375 218.5,131.0625 L218.5,132.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="237.5" y="135.606">Right</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="209.5" x2="272.5" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="209.5" x2="272.5" y1="155" y2="155"/>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00035_class_mermaid.svg b/docs/test_cases/t00035_class_mermaid.svg
index 5efbb922..c5c6d420 100644
--- a/docs/test_cases/t00035_class_mermaid.svg
+++ b/docs/test_cases/t00035_class_mermaid.svg
@@ -1,50 +1,55 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 496.015625 73" style="max-width: 496.016px; background-color: white;" width="496.015625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,7 +57,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L4">
+        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L4">
           <g title="Top" id="classId-C_0002241062883697294772-0" class="node default clickable">
             <rect height="57" width="43.140625" y="-28.5" x="-21.5703125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="21.5703125" x1="-21.5703125" class="divider"/>
@@ -71,7 +76,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L6">
+        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L6">
           <g title="Left" id="classId-C_0000242562856080127946-1" class="node default clickable">
             <rect height="57" width="44.328125" y="-28.5" x="-22.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="22.1640625" x1="-22.1640625" class="divider"/>
@@ -90,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L8">
+        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L8">
           <g title="Center" id="classId-C_0001933304541849408421-2" class="node default clickable">
             <rect height="57" width="65.6875" y="-28.5" x="-32.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.84375" x1="-32.84375" class="divider"/>
@@ -109,7 +114,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L10">
+        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L10">
           <g title="Bottom" id="classId-C_0001646691079607377420-3" class="node default clickable">
             <rect height="57" width="70.984375" y="-28.5" x="-35.4921875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.4921875" x1="-35.4921875" class="divider"/>
@@ -128,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00035/t00035.cc#L12">
+        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L12">
           <g title="Right" id="classId-C_0000200121820090372322-4" class="node default clickable">
             <rect height="57" width="55.875" y="-28.5" x="-27.9375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.9375" x1="-27.9375" class="divider"/>
diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md
index 956a311f..222d1ff4 100644
--- a/docs/test_cases/t00036.md
+++ b/docs/test_cases/t00036.md
@@ -16,7 +16,7 @@ diagrams:
         - clanguml::t00036::ns2::ns22::D
 ```
 ## Source code
-File t00036.cc
+File `tests/t00036/t00036.cc`
 ```cpp
 namespace clanguml {
 namespace t00036 {
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index 3aead8f9..f5ed74e2 100644
--- a/docs/test_cases/t00036_class.svg
+++ b/docs/test_cases/t00036_class.svg
@@ -1,94 +1,112 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="525px" preserveAspectRatio="none" style="width:476px;height:525px;" version="1.1" viewBox="0 0 476 525" width="476px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="507px" preserveAspectRatio="none" style="width:455px;height:507px;background:#FFFFFF;" version="1.1" viewBox="0 0 455 507" width="455px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1l4y65kfjfjvr" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1l4y65kfjfjvr)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.7969" y2="46.7969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1l4y65kfjfjvr)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="102" x2="154" y1="89.7969" y2="89.7969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="106" y="82.4951">ns11</text>
-    <polygon fill="#FFFFFF" filter="url(#f1l4y65kfjfjvr)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="126" x2="188" y1="132.7969" y2="132.7969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="130" y="125.4951">ns111</text>
-    <polygon fill="#FFFFFF" filter="url(#f1l4y65kfjfjvr)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="334" x2="376" y1="96.2969" y2="96.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="338" y="88.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1l4y65kfjfjvr)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="358" x2="410" y1="139.2969" y2="139.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="362" y="131.9951">ns22</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l4y65kfjfjvr)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
-      <ellipse cx="56.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M60.7594,161 L53.0406,161 L53.0406,148.6094 L60.7594,148.6094 L60.7594,150.7656 L55.4938,150.7656 L55.4938,153.4375 L60.2594,153.4375 L60.2594,155.5938 L55.4938,155.5938 L55.4938,158.8438 L60.7594,158.8438 L60.7594,161 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="71.35" y="159.1543">E</text>
-      <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"/>
+    <g id="cluster_C_0001715359870528941578">
+      <path d="M8.5,6.294 L34.5,6.294 A3.75,3.75 0 0 1 37,8.794 L44,29.0939 L299.5,29.0939 A2.5,2.5 0 0 1 302,31.5939 L302,497.994 A2.5,2.5 0 0 1 299.5,500.494 L8.5,500.494 A2.5,2.5 0 0 1 6,497.994 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="44" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="10" y="21.2999">ns1</text>
+    </g>
+    <g id="cluster_C_0000262695575877387930">
+      <path d="M90.5,49.294 L124.5,49.294 A3.75,3.75 0 0 1 127,51.794 L134,72.0939 L275.5,72.0939 A2.5,2.5 0 0 1 278,74.5939 L278,473.994 A2.5,2.5 0 0 1 275.5,476.494 L90.5,476.494 A2.5,2.5 0 0 1 88,473.994 L88,51.794 A2.5,2.5 0 0 1 90.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="88" x2="134" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="33" x="92" y="64.2999">ns11</text>
+    </g>
+    <g id="cluster_C_0000389054211045973300">
+      <path d="M114.5,92.294 L156.5,92.294 A3.75,3.75 0 0 1 159,94.794 L166,115.0939 L251.5,115.0939 A2.5,2.5 0 0 1 254,117.5939 L254,205.594 A2.5,2.5 0 0 1 251.5,208.094 L114.5,208.094 A2.5,2.5 0 0 1 112,205.594 L112,94.794 A2.5,2.5 0 0 1 114.5,92.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="112" x2="166" y1="115.0939" y2="115.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="41" x="116" y="107.2999">ns111</text>
+    </g>
+    <g id="cluster_C_0001286548696863286737">
+      <path d="M328.5,57.694 L354.5,57.694 A3.75,3.75 0 0 1 357,60.194 L364,80.4939 L445.5,80.4939 A2.5,2.5 0 0 1 448,82.9939 L448,221.194 A2.5,2.5 0 0 1 445.5,223.694 L328.5,223.694 A2.5,2.5 0 0 1 326,221.194 L326,60.194 A2.5,2.5 0 0 1 328.5,57.694 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="326" x2="364" y1="80.4939" y2="80.4939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="330" y="72.6999">ns2</text>
+    </g>
+    <g id="cluster_C_0000561406084501129272">
+      <path d="M352.5,100.694 L386.5,100.694 A3.75,3.75 0 0 1 389,103.194 L396,123.4939 L421.5,123.4939 A2.5,2.5 0 0 1 424,125.9939 L424,197.194 A2.5,2.5 0 0 1 421.5,199.694 L352.5,199.694 A2.5,2.5 0 0 1 350,197.194 L350,103.194 A2.5,2.5 0 0 1 352.5,100.694 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="350" x2="396" y1="123.4939" y2="123.4939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="33" x="354" y="115.6999">ns22</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0002144761953049158478">
+        <rect codeLine="3" fill="#F1F1F1" height="81.5999" id="C_0002144761953049158478" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="21.5" y="118.894"/>
+        <ellipse cx="41" cy="134.894" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M39.8594,135.9565 L41.1719,135.9565 L41.1719,136.0034 C41.1719,136.4096 41.1875,136.5659 41.2969,136.7221 C41.4688,136.9721 41.7656,137.144 42.0781,137.144 C42.3594,137.144 42.6563,137.0034 42.8281,136.7846 C42.9531,136.5971 43,136.4565 43,136.0034 L43,134.1596 C43,133.8315 42.9844,133.7221 42.9219,133.5502 C42.8125,133.2534 42.4531,133.0034 42.0781,133.0034 C41.7813,133.0034 41.5156,133.144 41.3438,133.3627 C41.2031,133.5502 41.1719,133.7221 41.1719,134.1596 L41.1719,134.2221 L39.8594,134.2221 L39.8594,132.0502 L43.7031,132.0502 L43.7031,132.8002 C43.7031,133.1909 43.7344,133.3784 43.8438,133.5346 C44.0156,133.7846 44.3125,133.9565 44.625,133.9565 C44.9219,133.9565 45.1875,133.8315 45.375,133.5971 C45.5156,133.4096 45.5469,133.269 45.5469,132.8002 L45.5469,130.3002 L37.8438,130.3002 C37.3906,130.3002 37.2656,130.3159 37.0938,130.4252 C36.8281,130.5971 36.6563,130.8627 36.6563,131.1752 C36.6563,131.4565 36.7813,131.7221 37.0313,131.894 C37.2188,132.019 37.4063,132.0502 37.8438,132.0502 L38.0313,132.0502 L38.0313,138.144 L37.8438,138.144 C37.4219,138.144 37.2656,138.1752 37.0938,138.269 C36.8281,138.4252 36.6563,138.7065 36.6563,139.0034 C36.6563,139.5815 37.0625,139.894 37.8438,139.894 L45.9219,139.894 L45.9219,137.3627 C45.9219,136.9565 45.8906,136.7846 45.7813,136.6284 C45.6094,136.3627 45.3281,136.2065 45,136.2065 C44.7188,136.2065 44.4375,136.3471 44.25,136.5659 C44.1094,136.7534 44.0781,136.9096 44.0781,137.3627 L44.0781,138.144 L39.8594,138.144 L39.8594,135.9565 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="56" y="139.5">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="71.5" y1="150.894" y2="150.894"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="27.5" y="167.8999">blue</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="27.5" y="184.6999">yellow</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="71.5" y1="192.4938" y2="192.4938"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l4y65kfjfjvr)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
-      <ellipse cx="183.45" cy="428" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M186.4188,433.6406 Q185.8406,433.9375 185.2,434.0781 Q184.5594,434.2344 183.8563,434.2344 Q181.3563,434.2344 180.0281,432.5938 Q178.7156,430.9375 178.7156,427.8125 Q178.7156,424.6875 180.0281,423.0313 Q181.3563,421.375 183.8563,421.375 Q184.5594,421.375 185.2,421.5313 Q185.8563,421.6875 186.4188,421.9844 L186.4188,424.7031 Q185.7938,424.125 185.2,423.8594 Q184.6063,423.5781 183.9813,423.5781 Q182.6375,423.5781 181.95,424.6563 Q181.2625,425.7188 181.2625,427.8125 Q181.2625,429.9063 181.95,430.9844 Q182.6375,432.0469 183.9813,432.0469 Q184.6063,432.0469 185.2,431.7813 Q185.7938,431.5 186.4188,430.9219 L186.4188,433.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="432.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="214" y="409"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="215" y="421.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="444" y2="444"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="452" y2="452"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000571573305652194946">
+        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0000571573305652194946" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="155.5" y="395.694"/>
+        <ellipse cx="171.85" cy="411.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M166.85,412.8502 C166.85,415.3502 168.9906,417.1627 171.9125,417.1627 C173.1469,417.1627 174.3188,416.8659 175.0688,416.3502 C175.6781,415.9284 176.0063,415.5065 176.0063,415.1002 C176.0063,414.6315 175.5844,414.2252 175.0844,414.2252 C174.85,414.2252 174.6313,414.3034 174.4281,414.5065 C173.9906,414.944 173.9906,414.944 173.8188,415.0377 C173.3656,415.2721 172.725,415.4127 171.9594,415.4127 C169.9594,415.4127 168.6781,414.3971 168.6781,412.819 L168.6781,411.7721 C168.6781,410.069 169.8969,408.8659 171.6,408.8659 C172.1781,408.8659 172.7563,409.0065 173.225,409.2565 C173.6938,409.5221 173.8656,409.7096 173.9281,410.069 C174.0531,410.7409 174.3031,410.9909 174.8344,410.9909 C175.1156,410.9909 175.3969,410.8502 175.5844,410.6315 C175.7094,410.4596 175.7563,410.2877 175.7563,409.8502 L175.7563,408.4909 C175.7563,408.069 175.7406,407.9284 175.6156,407.7565 C175.4438,407.5065 175.1625,407.3502 174.8344,407.3502 C174.5219,407.3502 174.3188,407.4596 174.1,407.7252 C172.9281,407.2252 172.4906,407.1159 171.5375,407.1159 C168.8656,407.1159 166.85,409.1315 166.85,411.7565 L166.85,412.8502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="186.15" y="416.3">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="204.5" y="392.694"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="205.5" y="406.8941">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="156.5" x2="209.5" y1="427.694" y2="427.694"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="156.5" x2="209.5" y1="435.694" y2="435.694"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="161.5" y="444.5939"/>
+          <ellipse cx="166.5" cy="449.5939" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="175.5" y="452.6999">a : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="174" y="458"/>
-      <ellipse cx="179" cy="463" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001832710427462319797">
+        <rect codeLine="21" fill="#F1F1F1" height="48" id="C_0001832710427462319797" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="154" y="286.694"/>
+        <ellipse cx="169" cy="302.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M164,303.8502 C164,306.3502 166.1406,308.1627 169.0625,308.1627 C170.2969,308.1627 171.4688,307.8659 172.2188,307.3502 C172.8281,306.9284 173.1563,306.5065 173.1563,306.1002 C173.1563,305.6315 172.7344,305.2252 172.2344,305.2252 C172,305.2252 171.7813,305.3034 171.5781,305.5065 C171.1406,305.944 171.1406,305.944 170.9688,306.0377 C170.5156,306.2721 169.875,306.4127 169.1094,306.4127 C167.1094,306.4127 165.8281,305.3971 165.8281,303.819 L165.8281,302.7721 C165.8281,301.069 167.0469,299.8659 168.75,299.8659 C169.3281,299.8659 169.9063,300.0065 170.375,300.2565 C170.8438,300.5221 171.0156,300.7096 171.0781,301.069 C171.2031,301.7409 171.4531,301.9909 171.9844,301.9909 C172.2656,301.9909 172.5469,301.8502 172.7344,301.6315 C172.8594,301.4596 172.9063,301.2877 172.9063,300.8502 L172.9063,299.4909 C172.9063,299.069 172.8906,298.9284 172.7656,298.7565 C172.5938,298.5065 172.3125,298.3502 171.9844,298.3502 C171.6719,298.3502 171.4688,298.4596 171.25,298.7252 C170.0781,298.2252 169.6406,298.1159 168.6875,298.1159 C166.0156,298.1159 164,300.1315 164,302.7565 L164,303.8502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="183" y="307.3">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="200" y="283.694"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="201" y="297.8941">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="155" x2="211" y1="318.694" y2="318.694"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="155" x2="211" y1="326.694" y2="326.694"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="466.2104">a : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001964031933563607376">
+        <rect codeLine="15" fill="#F1F1F1" height="64.7999" id="C_0001964031933563607376" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="128.5" y="127.294"/>
+        <ellipse cx="174.25" cy="143.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M169.25,144.4502 C169.25,146.9502 171.3906,148.7627 174.3125,148.7627 C175.5469,148.7627 176.7188,148.4659 177.4688,147.9502 C178.0781,147.5284 178.4063,147.1065 178.4063,146.7002 C178.4063,146.2315 177.9844,145.8252 177.4844,145.8252 C177.25,145.8252 177.0313,145.9034 176.8281,146.1065 C176.3906,146.544 176.3906,146.544 176.2188,146.6377 C175.7656,146.8721 175.125,147.0127 174.3594,147.0127 C172.3594,147.0127 171.0781,145.9971 171.0781,144.419 L171.0781,143.3721 C171.0781,141.669 172.2969,140.4659 174,140.4659 C174.5781,140.4659 175.1563,140.6065 175.625,140.8565 C176.0938,141.1221 176.2656,141.3096 176.3281,141.669 C176.4531,142.3409 176.7031,142.5909 177.2344,142.5909 C177.5156,142.5909 177.7969,142.4502 177.9844,142.2315 C178.1094,142.0596 178.1563,141.8877 178.1563,141.4502 L178.1563,140.0909 C178.1563,139.669 178.1406,139.5284 178.0156,139.3565 C177.8438,139.1065 177.5625,138.9502 177.2344,138.9502 C176.9219,138.9502 176.7188,139.0596 176.5,139.3252 C175.3281,138.8252 174.8906,138.7159 173.9375,138.7159 C171.2656,138.7159 169.25,140.7315 169.25,143.3565 L169.25,144.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="194.75" y="147.9">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="129.5" x2="236.5" y1="159.294" y2="159.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="129.5" x2="236.5" y1="167.294" y2="167.294"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="134.5" y="176.1939"/>
+          <ellipse cx="139.5" cy="181.1939" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="148.5" y="184.2999">a_int : A&lt;int&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l4y65kfjfjvr)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
-      <ellipse cx="179" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M181.9688,324.6406 Q181.3906,324.9375 180.75,325.0781 Q180.1094,325.2344 179.4063,325.2344 Q176.9063,325.2344 175.5781,323.5938 Q174.2656,321.9375 174.2656,318.8125 Q174.2656,315.6875 175.5781,314.0313 Q176.9063,312.375 179.4063,312.375 Q180.1094,312.375 180.75,312.5313 Q181.4063,312.6875 181.9688,312.9844 L181.9688,315.7031 Q181.3438,315.125 180.75,314.8594 Q180.1563,314.5781 179.5313,314.5781 Q178.1875,314.5781 177.5,315.6563 Q176.8125,316.7188 176.8125,318.8125 Q176.8125,320.9063 177.5,321.9844 Q178.1875,323.0469 179.5313,323.0469 Q180.1563,323.0469 180.75,322.7813 Q181.3438,322.5 181.9688,321.9219 L181.9688,324.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="323.1543">A</text>
-      <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"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0002038956882066165590">
+        <rect codeLine="29" fill="#F1F1F1" height="48" id="C_0002038956882066165590" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="366" y="135.694"/>
+        <ellipse cx="381" cy="151.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M376,152.8502 C376,155.3502 378.1406,157.1627 381.0625,157.1627 C382.2969,157.1627 383.4688,156.8659 384.2188,156.3502 C384.8281,155.9284 385.1563,155.5065 385.1563,155.1002 C385.1563,154.6315 384.7344,154.2252 384.2344,154.2252 C384,154.2252 383.7813,154.3034 383.5781,154.5065 C383.1406,154.944 383.1406,154.944 382.9688,155.0377 C382.5156,155.2721 381.875,155.4127 381.1094,155.4127 C379.1094,155.4127 377.8281,154.3971 377.8281,152.819 L377.8281,151.7721 C377.8281,150.069 379.0469,148.8659 380.75,148.8659 C381.3281,148.8659 381.9063,149.0065 382.375,149.2565 C382.8438,149.5221 383.0156,149.7096 383.0781,150.069 C383.2031,150.7409 383.4531,150.9909 383.9844,150.9909 C384.2656,150.9909 384.5469,150.8502 384.7344,150.6315 C384.8594,150.4596 384.9063,150.2877 384.9063,149.8502 L384.9063,148.4909 C384.9063,148.069 384.8906,147.9284 384.7656,147.7565 C384.5938,147.5065 384.3125,147.3502 383.9844,147.3502 C383.6719,147.3502 383.4688,147.4596 383.25,147.7252 C382.0781,147.2252 381.6406,147.1159 380.6875,147.1159 C378.0156,147.1159 376,149.1315 376,151.7565 L376,152.8502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="395" y="156.3">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="367" x2="407" y1="167.694" y2="167.694"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="367" x2="407" y1="175.694" y2="175.694"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l4y65kfjfjvr)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
-      <ellipse cx="185.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M188.7688,167.1406 Q188.1906,167.4375 187.55,167.5781 Q186.9094,167.7344 186.2063,167.7344 Q183.7063,167.7344 182.3781,166.0938 Q181.0656,164.4375 181.0656,161.3125 Q181.0656,158.1875 182.3781,156.5313 Q183.7063,154.875 186.2063,154.875 Q186.9094,154.875 187.55,155.0313 Q188.2063,155.1875 188.7688,155.4844 L188.7688,158.2031 Q188.1438,157.625 187.55,157.3594 Q186.9563,157.0781 186.3313,157.0781 Q184.9875,157.0781 184.3,158.1563 Q183.6125,159.2188 183.6125,161.3125 Q183.6125,163.4063 184.3,164.4844 Q184.9875,165.5469 186.3313,165.5469 Q186.9563,165.5469 187.55,165.2813 Q188.1438,165 188.7688,164.4219 L188.7688,167.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="206.2" y="165.6543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="177.5" y2="177.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="185.5" y2="185.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="148" y="191.5"/>
-      <ellipse cx="153" cy="196.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="199.7104">a_int : A&lt;int&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l4y65kfjfjvr)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
-      <ellipse cx="389" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M391.9688,173.6406 Q391.3906,173.9375 390.75,174.0781 Q390.1094,174.2344 389.4063,174.2344 Q386.9063,174.2344 385.5781,172.5938 Q384.2656,170.9375 384.2656,167.8125 Q384.2656,164.6875 385.5781,163.0313 Q386.9063,161.375 389.4063,161.375 Q390.1094,161.375 390.75,161.5313 Q391.4063,161.6875 391.9688,161.9844 L391.9688,164.7031 Q391.3438,164.125 390.75,163.8594 Q390.1563,163.5781 389.5313,163.5781 Q388.1875,163.5781 387.5,164.6563 Q386.8125,165.7188 386.8125,167.8125 Q386.8125,169.9063 387.5,170.9844 Q388.1875,172.0469 389.5313,172.0469 Q390.1563,172.0469 390.75,171.7813 Q391.3438,171.5 391.9688,170.9219 L391.9688,173.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="172.1543">C</text>
-      <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"/>
-    </a>
-    <path d="M194,220.15 C194,247.03 194,280.58 194,302.61 " fill="none" id="C_0001964031933563607376&lt;-C_0001832710427462319797" 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>
-    <path d="M194,351.24 C194,362.87 194,377.42 194,391.43 " fill="none" id="C_0001832710427462319797-&gt;C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="201,391.81,194,411.81,187,391.81,201,391.81" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001964031933563607376_C_0001832710427462319797">
+      <path codeLine="34" d="M183,204.294 C183,232.484 183,261.104 183,286.424 " fill="none" id="C_0001964031933563607376-backto-C_0001832710427462319797" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="183,192.294,179,198.294,183,204.294,187,198.294,183,192.294" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="189" cy="248.994" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="196" y="252.771">a_int</text>
+    </g>
+    <g id="link_C_0001832710427462319797_C_0000571573305652194946">
+      <path codeLine="35" d="M183,335.044 C183,352.434 183,358.364 183,377.464 " fill="none" id="C_0001832710427462319797-to-C_0000571573305652194946" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="183,395.464,189,377.464,177,377.464,183,395.464" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00036_class_mermaid.svg b/docs/test_cases/t00036_class_mermaid.svg
index eb6aed9a..74486438 100644
--- a/docs/test_cases/t00036_class_mermaid.svg
+++ b/docs/test_cases/t00036_class_mermaid.svg
@@ -1,57 +1,62 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 514.9375 393" style="max-width: 514.938px; background-color: white;" width="514.9375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M262.390625,109L262.390625,118.33333333333333C262.390625,127.66666666666667,262.390625,146.33333333333334,262.390625,161.33333333333334C262.390625,176.33333333333334,262.390625,187.66666666666666,262.390625,193.33333333333334L262.390625,199"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M262.390625,256L262.390625,260.1666666666667C262.390625,264.3333333333333,262.390625,272.6666666666667,262.390625,281C262.390625,289.3333333333333,262.390625,297.6666666666667,262.390625,301.8333333333333L262.390625,306"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M262.390625,127L262.390625,133.33333333333334C262.390625,139.66666666666666,262.390625,152.33333333333334,262.390625,164.33333333333334C262.390625,176.33333333333334,262.390625,187.66666666666666,262.390625,193.33333333333334L262.390625,199"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M262.390625,256L262.390625,260.1666666666667C262.390625,264.3333333333333,262.390625,272.6666666666667,262.390625,278C262.390625,283.3333333333333,262.390625,285.6666666666667,262.390625,286.8333333333333L262.390625,288"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(262.390625, 165)" class="edgeLabel">
@@ -78,7 +83,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L6">
+        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L6">
           <g title="E" id="classId-C_0002144761953049158478-0" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -107,7 +112,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0000571573305652194946-1" class="node default clickable">
             <rect height="79" width="139.484375" y="-39.5" x="-69.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.7421875" x1="-69.7421875" class="divider"/>
@@ -131,7 +136,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L16">
+        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L16">
           <g title="B" id="classId-C_0001964031933563607376-2" class="node default clickable">
             <rect height="79" width="165.28125" y="-39.5" x="-82.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="82.640625" x1="-82.640625" class="divider"/>
@@ -155,7 +160,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0001832710427462319797-3" class="node default clickable">
             <rect height="57" width="149.265625" y="-28.5" x="-74.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6328125" x1="-74.6328125" class="divider"/>
@@ -174,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00036/t00036.cc#L28">
+        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L28">
           <g title="C" id="classId-C_0002038956882066165590-4" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
diff --git a/docs/test_cases/t00037.md b/docs/test_cases/t00037.md
index 63199dca..098da27f 100644
--- a/docs/test_cases/t00037.md
+++ b/docs/test_cases/t00037.md
@@ -13,7 +13,7 @@ diagrams:
         - clanguml::t00037
 ```
 ## Source code
-File t00037.cc
+File `tests/t00037/t00037.cc`
 ```cpp
 namespace clanguml {
 namespace t00037 {
@@ -255,6 +255,7 @@ struct A {
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg
index c06624ec..886be4f8 100644
--- a/docs/test_cases/t00037_class.svg
+++ b/docs/test_cases/t00037_class.svg
@@ -1,127 +1,135 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="420px" preserveAspectRatio="none" style="width:284px;height:420px;" version="1.1" viewBox="0 0 284 420" width="284px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="446px" preserveAspectRatio="none" style="width:287px;height:446px;background:#FFFFFF;" version="1.1" viewBox="0 0 287 446" width="287px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f15yt7s51af5uo" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15yt7s51af5uo)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
-      <ellipse cx="137.25" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M140.2188,180.6406 Q139.6406,180.9375 139,181.0781 Q138.3594,181.2344 137.6563,181.2344 Q135.1563,181.2344 133.8281,179.5938 Q132.5156,177.9375 132.5156,174.8125 Q132.5156,171.6875 133.8281,170.0313 Q135.1563,168.375 137.6563,168.375 Q138.3594,168.375 139,168.5313 Q139.6563,168.6875 140.2188,168.9844 L140.2188,171.7031 Q139.5938,171.125 139,170.8594 Q138.4063,170.5781 137.7813,170.5781 Q136.4375,170.5781 135.75,171.6563 Q135.0625,172.7188 135.0625,174.8125 Q135.0625,176.9063 135.75,177.9844 Q136.4375,179.0469 137.7813,179.0469 Q138.4063,179.0469 139,178.7813 Q139.5938,178.5 140.2188,177.9219 L140.2188,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="15" x="157.75" y="179.1543">ST</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="191" y2="191"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="199" y2="199"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
+      <g id="elem_C_0000011203041379038775">
+        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0000011203041379038775" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="252" x="28" y="165.6"/>
+        <ellipse cx="140.75" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M135.75,182.7562 C135.75,185.2562 137.8906,187.0687 140.8125,187.0687 C142.0469,187.0687 143.2188,186.7719 143.9688,186.2562 C144.5781,185.8344 144.9063,185.4125 144.9063,185.0062 C144.9063,184.5375 144.4844,184.1312 143.9844,184.1312 C143.75,184.1312 143.5313,184.2094 143.3281,184.4125 C142.8906,184.85 142.8906,184.85 142.7188,184.9437 C142.2656,185.1781 141.625,185.3187 140.8594,185.3187 C138.8594,185.3187 137.5781,184.3031 137.5781,182.725 L137.5781,181.6781 C137.5781,179.975 138.7969,178.7719 140.5,178.7719 C141.0781,178.7719 141.6563,178.9125 142.125,179.1625 C142.5938,179.4281 142.7656,179.6156 142.8281,179.975 C142.9531,180.6469 143.2031,180.8969 143.7344,180.8969 C144.0156,180.8969 144.2969,180.7562 144.4844,180.5375 C144.6094,180.3656 144.6563,180.1937 144.6563,179.7562 L144.6563,178.3969 C144.6563,177.975 144.6406,177.8344 144.5156,177.6625 C144.3438,177.4125 144.0625,177.2562 143.7344,177.2562 C143.4219,177.2562 143.2188,177.3656 143,177.6312 C141.8281,177.1312 141.3906,177.0219 140.4375,177.0219 C137.7656,177.0219 135.75,179.0375 135.75,181.6625 L135.75,182.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="161.25" y="186.206">ST</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="29" x2="279" y1="197.6" y2="197.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="29" x2="279" y1="205.6" y2="205.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="214.5"/>
+          <ellipse cx="39" cy="219.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="226" x="48" y="222.6059">dimensions : ST::(anonymous_662)</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="231.2999"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="233.2999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="184" x="48" y="239.4059">units : ST::(anonymous_792)</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="205"/>
-      <ellipse cx="46" cy="210" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
+      <g id="elem_C_0001980820317972901050">
+        <rect codeLine="8" fill="#F1F1F1" height="115.1997" id="C_0001980820317972901050" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="7" y="324.2"/>
+        <ellipse cx="22" cy="340.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,341.3563 C17,343.8563 19.1406,345.6688 22.0625,345.6688 C23.2969,345.6688 24.4688,345.3719 25.2188,344.8563 C25.8281,344.4344 26.1563,344.0125 26.1563,343.6063 C26.1563,343.1375 25.7344,342.7313 25.2344,342.7313 C25,342.7313 24.7813,342.8094 24.5781,343.0125 C24.1406,343.45 24.1406,343.45 23.9688,343.5438 C23.5156,343.7781 22.875,343.9188 22.1094,343.9188 C20.1094,343.9188 18.8281,342.9031 18.8281,341.325 L18.8281,340.2781 C18.8281,338.575 20.0469,337.3719 21.75,337.3719 C22.3281,337.3719 22.9063,337.5125 23.375,337.7625 C23.8438,338.0281 24.0156,338.2156 24.0781,338.575 C24.2031,339.2469 24.4531,339.4969 24.9844,339.4969 C25.2656,339.4969 25.5469,339.3563 25.7344,339.1375 C25.8594,338.9656 25.9063,338.7938 25.9063,338.3563 L25.9063,336.9969 C25.9063,336.575 25.8906,336.4344 25.7656,336.2625 C25.5938,336.0125 25.3125,335.8563 24.9844,335.8563 C24.6719,335.8563 24.4688,335.9656 24.25,336.2313 C23.0781,335.7313 22.6406,335.6219 21.6875,335.6219 C19.0156,335.6219 17,337.6375 17,340.2625 L17,341.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="36" y="344.806">ST::(dimensions)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="146" y1="356.2" y2="356.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="146" y1="364.2" y2="364.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="373.1"/>
+          <ellipse cx="18" cy="378.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59" x="27" y="381.2059">t : double</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="389.8999"/>
+          <ellipse cx="18" cy="394.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="27" y="398.0059">x : double</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="406.6998"/>
+          <ellipse cx="18" cy="411.6998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="27" y="414.8058">y : double</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="423.4997"/>
+          <ellipse cx="18" cy="428.4997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="27" y="431.6057">z : double</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="202" x="55" y="213.2104">dimensions : ST::(anonymous_662)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
+      <g id="elem_C_0001811145508890403377">
+        <rect codeLine="16" fill="#F1F1F1" height="81.5999" id="C_0001811145508890403377" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="98" x="182" y="341"/>
+        <ellipse cx="197" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M192,358.1563 C192,360.6563 194.1406,362.4688 197.0625,362.4688 C198.2969,362.4688 199.4688,362.1719 200.2188,361.6563 C200.8281,361.2344 201.1563,360.8125 201.1563,360.4063 C201.1563,359.9375 200.7344,359.5313 200.2344,359.5313 C200,359.5313 199.7813,359.6094 199.5781,359.8125 C199.1406,360.25 199.1406,360.25 198.9688,360.3438 C198.5156,360.5781 197.875,360.7188 197.1094,360.7188 C195.1094,360.7188 193.8281,359.7031 193.8281,358.125 L193.8281,357.0781 C193.8281,355.375 195.0469,354.1719 196.75,354.1719 C197.3281,354.1719 197.9063,354.3125 198.375,354.5625 C198.8438,354.8281 199.0156,355.0156 199.0781,355.375 C199.2031,356.0469 199.4531,356.2969 199.9844,356.2969 C200.2656,356.2969 200.5469,356.1563 200.7344,355.9375 C200.8594,355.7656 200.9063,355.5938 200.9063,355.1563 L200.9063,353.7969 C200.9063,353.375 200.8906,353.2344 200.7656,353.0625 C200.5938,352.8125 200.3125,352.6563 199.9844,352.6563 C199.6719,352.6563 199.4688,352.7656 199.25,353.0313 C198.0781,352.5313 197.6406,352.4219 196.6875,352.4219 C194.0156,352.4219 192,354.4375 192,357.0625 L192,358.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="211" y="361.606">ST::(units)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="183" x2="279" y1="373" y2="373"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="183" x2="279" y1="381" y2="381"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="188" y="389.9"/>
+          <ellipse cx="193" cy="394.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="202" y="398.0059">c : double</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="188" y="406.6999"/>
+          <ellipse cx="193" cy="411.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="202" y="414.8059">h : double</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="217.8047"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="43" y="219.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001322794181774144954">
+        <rect codeLine="22" fill="#F1F1F1" height="81.5999" id="C_0001322794181774144954" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="112.5" y="7"/>
+        <ellipse cx="146.4" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M141.4,24.1563 C141.4,26.6563 143.5406,28.4688 146.4625,28.4688 C147.6969,28.4688 148.8688,28.1719 149.6188,27.6563 C150.2281,27.2344 150.5563,26.8125 150.5563,26.4063 C150.5563,25.9375 150.1344,25.5313 149.6344,25.5313 C149.4,25.5313 149.1813,25.6094 148.9781,25.8125 C148.5406,26.25 148.5406,26.25 148.3688,26.3438 C147.9156,26.5781 147.275,26.7188 146.5094,26.7188 C144.5094,26.7188 143.2281,25.7031 143.2281,24.125 L143.2281,23.0781 C143.2281,21.375 144.4469,20.1719 146.15,20.1719 C146.7281,20.1719 147.3063,20.3125 147.775,20.5625 C148.2438,20.8281 148.4156,21.0156 148.4781,21.375 C148.6031,22.0469 148.8531,22.2969 149.3844,22.2969 C149.6656,22.2969 149.9469,22.1563 150.1344,21.9375 C150.2594,21.7656 150.3063,21.5938 150.3063,21.1563 L150.3063,19.7969 C150.3063,19.375 150.2906,19.2344 150.1656,19.0625 C149.9938,18.8125 149.7125,18.6563 149.3844,18.6563 C149.0719,18.6563 148.8688,18.7656 148.65,19.0313 C147.4781,18.5313 147.0406,18.4219 146.0875,18.4219 C143.4156,18.4219 141.4,20.4375 141.4,23.0625 L141.4,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="164.6" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="113.5" x2="194.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="118.5" y="47.9"/>
+          <ellipse cx="123.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="132.5" y="56.0059">A() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="113.5" x2="194.5" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="118.5" y="72.6999"/>
+          <ellipse cx="123.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="132.5" y="80.8059">st : ST</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="164" x="55" y="226.0151">units : ST::(anonymous_792)</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15yt7s51af5uo)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
-      <ellipse cx="21" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,331.6406 Q23.3906,331.9375 22.75,332.0781 Q22.1094,332.2344 21.4063,332.2344 Q18.9063,332.2344 17.5781,330.5938 Q16.2656,328.9375 16.2656,325.8125 Q16.2656,322.6875 17.5781,321.0313 Q18.9063,319.375 21.4063,319.375 Q22.1094,319.375 22.75,319.5313 Q23.4063,319.6875 23.9688,319.9844 L23.9688,322.7031 Q23.3438,322.125 22.75,321.8594 Q22.1563,321.5781 21.5313,321.5781 Q20.1875,321.5781 19.5,322.6563 Q18.8125,323.7188 18.8125,325.8125 Q18.8125,327.9063 19.5,328.9844 Q20.1875,330.0469 21.5313,330.0469 Q22.1563,330.0469 22.75,329.7813 Q23.3438,329.5 23.9688,328.9219 L23.9688,331.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="104" x="35" y="330.1543">ST::(dimensions)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="342" y2="342"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="350" y2="350"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="356"/>
-      <ellipse cx="17" cy="361" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="26" y="364.2104">t : double</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="368.8047"/>
-      <ellipse cx="17" cy="373.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="377.0151">x : double</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="381.6094"/>
-      <ellipse cx="17" cy="386.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="389.8198">y : double</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="394.4141"/>
-      <ellipse cx="17" cy="399.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="402.6245">z : double</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15yt7s51af5uo)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
-      <ellipse cx="192" cy="338.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M194.9688,344.1406 Q194.3906,344.4375 193.75,344.5781 Q193.1094,344.7344 192.4063,344.7344 Q189.9063,344.7344 188.5781,343.0938 Q187.2656,341.4375 187.2656,338.3125 Q187.2656,335.1875 188.5781,333.5313 Q189.9063,331.875 192.4063,331.875 Q193.1094,331.875 193.75,332.0313 Q194.4063,332.1875 194.9688,332.4844 L194.9688,335.2031 Q194.3438,334.625 193.75,334.3594 Q193.1563,334.0781 192.5313,334.0781 Q191.1875,334.0781 190.5,335.1563 Q189.8125,336.2188 189.8125,338.3125 Q189.8125,340.4063 190.5,341.4844 Q191.1875,342.5469 192.5313,342.5469 Q193.1563,342.5469 193.75,342.2813 Q194.3438,342 194.9688,341.4219 L194.9688,344.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="206" y="342.6543">ST::(units)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="354.5" y2="354.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="362.5" y2="362.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="368.5"/>
-      <ellipse cx="188" cy="373.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="197" y="376.7104">c : double</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="381.3047"/>
-      <ellipse cx="188" cy="386.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="197" y="389.5151">h : double</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15yt7s51af5uo)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
-      <ellipse cx="142.2" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M145.1688,29.6406 Q144.5906,29.9375 143.95,30.0781 Q143.3094,30.2344 142.6063,30.2344 Q140.1063,30.2344 138.7781,28.5938 Q137.4656,26.9375 137.4656,23.8125 Q137.4656,20.6875 138.7781,19.0313 Q140.1063,17.375 142.6063,17.375 Q143.3094,17.375 143.95,17.5313 Q144.6063,17.6875 145.1688,17.9844 L145.1688,20.7031 Q144.5438,20.125 143.95,19.8594 Q143.3563,19.5781 142.7313,19.5781 Q141.3875,19.5781 140.7,20.6563 Q140.0125,21.7188 140.0125,23.8125 Q140.0125,25.9063 140.7,26.9844 Q141.3875,28.0469 142.7313,28.0469 Q143.3563,28.0469 143.95,27.7813 Q144.5438,27.5 145.1688,26.9219 L145.1688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="159.8" y="28.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
-      <ellipse cx="122" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="131" y="54.2104">A() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="66.8047"/>
-      <ellipse cx="122" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="131" y="75.0151">st : ST</text>
-    </a>
-    <path d="M106.32,243.96 C102.05,250.09 98.15,256.5 95,263 C87.97,277.51 83.26,294.41 80.13,309.92 " fill="none" id="C_0000011203041379038775&lt;-C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="114.29,233.28,107.4974,235.7009,107.1196,242.9021,113.9121,240.4812,114.29,233.28" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="101" cy="272.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="73" x="108" y="276.0669">dimensions</text>
-    <path d="M176.66,244.73 C179.92,250.82 183.11,257.02 186,263 C195.26,282.2 204.34,304.18 211.4,322.22 " fill="none" id="C_0000011203041379038775&lt;-C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="170.37,233.23,169.7435,240.4138,176.1338,243.7552,176.7603,236.5713,170.37,233.23" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="196" y="269.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="206" y="276.0669">units</text>
-    <path d="M149,95.19 C149,115.93 149,139.64 149,158.75 " fill="none" id="C_0001322794181774144954&lt;-C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="149,82.07,145,88.07,149,94.07,153,88.07,149,82.07" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="155" 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="12" x="162" y="125.0669">st</text>
+    <g id="link_C_0000011203041379038775_C_0001980820317972901050">
+      <path codeLine="27" d="M118.1777,257.6621 C112.1177,267.0821 112.67,267.21 108,277.2 C101.17,291.83 95.43,308.32 90.82,323.77 " fill="none" id="C_0000011203041379038775-backto-C_0001980820317972901050" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="124.67,247.57,118.0598,250.4519,118.1777,257.6621,124.7878,254.7801,124.67,247.57" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="114" cy="286.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="66" x="121" y="290.277">dimensions</text>
+    </g>
+    <g id="link_C_0000011203041379038775_C_0001811145508890403377">
+      <path codeLine="28" d="M182.7645,258.0828 C187.9345,267.6728 187.52,267.41 192,277.2 C201.44,297.82 210.46,321.44 217.45,340.92 " fill="none" id="C_0000011203041379038775-backto-C_0001811145508890403377" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="177.07,247.52,176.3963,254.6996,182.7645,258.0828,183.4382,250.9033,177.07,247.52" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="203" y="283.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="213" y="290.277">units</text>
+    </g>
+    <g id="link_C_0001322794181774144954_C_0000011203041379038775">
+      <path codeLine="29" d="M154,100.72 C154,124.19 154,141.77 154,165.28 " fill="none" id="C_0001322794181774144954-backto-C_0000011203041379038775" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="154,88.72,150,94.72,154,100.72,158,94.72,154,88.72" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="160" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="167" y="131.677">st</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00037_class_mermaid.svg b/docs/test_cases/t00037_class_mermaid.svg
index 78bf339a..e4134f43 100644
--- a/docs/test_cases/t00037_class_mermaid.svg
+++ b/docs/test_cases/t00037_class_mermaid.svg
@@ -1,58 +1,63 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 310.14453125 499" style="max-width: 310.145px; background-color: white;" width="310.14453125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M113.9971801035503,278L108.32186883629193,283.6666666666667C102.64655756903353,289.3333333333333,91.29593503451677,300.6666666666667,85.6206237672584,312C79.9453125,323.3333333333333,79.9453125,334.6666666666667,79.9453125,340.3333333333333L79.9453125,346"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M215.1512573964497,278L220.82656866370806,283.6666666666667C226.50187993096645,289.3333333333333,237.8525024654832,300.6666666666667,243.5278137327416,315.6666666666667C249.203125,330.6666666666667,249.203125,349.3333333333333,249.203125,358.6666666666667L249.203125,368"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M164.57421875,109L164.57421875,114.66666666666667C164.57421875,120.33333333333333,164.57421875,131.66666666666666,164.57421875,143C164.57421875,154.33333333333334,164.57421875,165.66666666666666,164.57421875,171.33333333333334L164.57421875,177"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M101.25956080587927,290.71821743121257L97.70718608823273,294.2651811926771C94.15481137058619,297.81214495414173,87.0500619352931,304.90607247707084,83.49768721764654,314.1197029052021C79.9453125,323.3333333333333,79.9453125,334.6666666666667,79.9453125,340.3333333333333L79.9453125,346"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M227.88887669412074,290.71821743121257L231.4412514117673,294.2651811926771C234.99362612941385,297.81214495414173,242.0983755647069,304.90607247707084,245.65075028235344,317.78636957186876C249.203125,330.6666666666667,249.203125,349.3333333333333,249.203125,358.6666666666667L249.203125,368"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M164.57421875,127L164.57421875,129.66666666666666C164.57421875,132.33333333333334,164.57421875,137.66666666666666,164.57421875,146C164.57421875,154.33333333333334,164.57421875,165.66666666666666,164.57421875,171.33333333333334L164.57421875,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(79.9453125, 312)" class="edgeLabel">
@@ -90,7 +95,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L4">
+        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L4">
           <g title="ST" id="classId-C_0000011203041379038775-0" class="node default clickable">
             <rect height="101" width="275.140625" y="-50.5" x="-137.5703125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="137.5703125" x1="-137.5703125" class="divider"/>
@@ -119,7 +124,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L6">
+        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L6">
           <g title="ST##(dimensions)" id="classId-C_0001980820317972901050-1" class="node default clickable">
             <rect height="145" width="143.890625" y="-72.5" x="-71.9453125" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="71.9453125" x1="-71.9453125" class="divider"/>
@@ -158,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L14">
+        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L14">
           <g title="ST##(units)" id="classId-C_0001811145508890403377-2" class="node default clickable">
             <rect height="101" width="94.625" y="-50.5" x="-47.3125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="47.3125" x1="-47.3125" class="divider"/>
@@ -187,11 +192,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00037/t00037.cc#L20">
+        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L20">
           <g title="A" id="classId-C_0001322794181774144954-3" class="node default clickable">
-            <rect height="101" width="88.359375" y="-50.5" x="-44.1796875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
+            <rect height="101" width="97.25" y="-50.5" x="-48.625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="48.625" x1="-48.625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="48.625" x1="-48.625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -203,14 +208,14 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -36.6796875, -9)" height="18" width="55.578125">
+              <foreignObject transform="translate( -41.125, -9)" height="18" width="55.578125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+st : ST</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -36.6796875, 25)" height="18" width="73.359375">
+              <foreignObject transform="translate( -41.125, 25)" height="18" width="82.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A() : void</span>
+                  <span class="nodeLabel">+A() : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00038.md b/docs/test_cases/t00038.md
index e7e758ff..fd0e2441 100644
--- a/docs/test_cases/t00038.md
+++ b/docs/test_cases/t00038.md
@@ -14,7 +14,7 @@ diagrams:
         - thirdparty::ns1
 ```
 ## Source code
-File t00038.cc
+File `tests/t00038/t00038.cc`
 ```cpp
 #include <map>
 #include <string>
diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index e5ecdc20..e18885ad 100644
--- a/docs/test_cases/t00038_class.svg
+++ b/docs/test_cases/t00038_class.svg
@@ -1,158 +1,202 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="321px" preserveAspectRatio="none" style="width:2230px;height:321px;" version="1.1" viewBox="0 0 2230 321" width="2230px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="328px" preserveAspectRatio="none" style="width:1930px;height:328px;background:#FFFFFF;" version="1.1" viewBox="0 0 1930 328" width="1930px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f67ipnzqslrct" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
-      <ellipse cx="202" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M206.1094,246 L198.3906,246 L198.3906,233.6094 L206.1094,233.6094 L206.1094,235.7656 L200.8438,235.7656 L200.8438,238.4375 L205.6094,238.4375 L205.6094,240.5938 L200.8438,240.5938 L200.8438,243.8438 L206.1094,243.8438 L206.1094,246 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="142" x="216" y="244.1543">thirdparty::ns1::color_t</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="188" x2="360" y1="256" y2="256"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="19" x="193" y="270.2104">red</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="193" y="283.0151">green</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="193" y="295.8198">blue</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="188" x2="360" y1="302.4141" y2="302.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
+      <g id="elem_C_0000566782399856868761">
+        <rect codeLine="2" fill="#F1F1F1" height="98.3998" id="C_0000566782399856868761" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="174" x="150.5" y="223"/>
+        <ellipse cx="165.5" cy="239" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M164.3594,240.0625 L165.6719,240.0625 L165.6719,240.1094 C165.6719,240.5156 165.6875,240.6719 165.7969,240.8281 C165.9688,241.0781 166.2656,241.25 166.5781,241.25 C166.8594,241.25 167.1563,241.1094 167.3281,240.8906 C167.4531,240.7031 167.5,240.5625 167.5,240.1094 L167.5,238.2656 C167.5,237.9375 167.4844,237.8281 167.4219,237.6562 C167.3125,237.3594 166.9531,237.1094 166.5781,237.1094 C166.2813,237.1094 166.0156,237.25 165.8438,237.4687 C165.7031,237.6562 165.6719,237.8281 165.6719,238.2656 L165.6719,238.3281 L164.3594,238.3281 L164.3594,236.1562 L168.2031,236.1562 L168.2031,236.9062 C168.2031,237.2969 168.2344,237.4844 168.3438,237.6406 C168.5156,237.8906 168.8125,238.0625 169.125,238.0625 C169.4219,238.0625 169.6875,237.9375 169.875,237.7031 C170.0156,237.5156 170.0469,237.375 170.0469,236.9062 L170.0469,234.4062 L162.3438,234.4062 C161.8906,234.4062 161.7656,234.4219 161.5938,234.5312 C161.3281,234.7031 161.1563,234.9687 161.1563,235.2812 C161.1563,235.5625 161.2813,235.8281 161.5313,236 C161.7188,236.125 161.9063,236.1562 162.3438,236.1562 L162.5313,236.1562 L162.5313,242.25 L162.3438,242.25 C161.9219,242.25 161.7656,242.2812 161.5938,242.375 C161.3281,242.5312 161.1563,242.8125 161.1563,243.1094 C161.1563,243.6875 161.5625,244 162.3438,244 L170.4219,244 L170.4219,241.4687 C170.4219,241.0625 170.3906,240.8906 170.2813,240.7344 C170.1094,240.4687 169.8281,240.3125 169.5,240.3125 C169.2188,240.3125 168.9375,240.4531 168.75,240.6719 C168.6094,240.8594 168.5781,241.0156 168.5781,241.4687 L168.5781,242.25 L164.3594,242.25 L164.3594,240.0625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142" x="179.5" y="243.606">thirdparty::ns1::color_t</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="323.5" y1="255" y2="255"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="21" x="156.5" y="272.0059">red</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="156.5" y="288.8059">green</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="156.5" y="305.6058">blue</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="323.5" y1="313.3998" y2="313.3998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="204" y="8"/>
-      <ellipse cx="219" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M221.9688,29.6406 Q221.3906,29.9375 220.75,30.0781 Q220.1094,30.2344 219.4063,30.2344 Q216.9063,30.2344 215.5781,28.5938 Q214.2656,26.9375 214.2656,23.8125 Q214.2656,20.6875 215.5781,19.0313 Q216.9063,17.375 219.4063,17.375 Q220.1094,17.375 220.75,17.5313 Q221.4063,17.6875 221.9688,17.9844 L221.9688,20.7031 Q221.3438,20.125 220.75,19.8594 Q220.1563,19.5781 219.5313,19.5781 Q218.1875,19.5781 217.5,20.6563 Q216.8125,21.7188 216.8125,23.8125 Q216.8125,25.9063 217.5,26.9844 Q218.1875,28.0469 219.5313,28.0469 Q220.1563,28.0469 220.75,27.7813 Q221.3438,27.5 221.9688,26.9219 L221.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="108" x="233" y="28.1543">thirdparty::ns1::E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001642222718760881014">
+        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0001642222718760881014" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="167.5" y="7"/>
+        <ellipse cx="182.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M177.5,24.1563 C177.5,26.6563 179.6406,28.4688 182.5625,28.4688 C183.7969,28.4688 184.9688,28.1719 185.7188,27.6563 C186.3281,27.2344 186.6563,26.8125 186.6563,26.4063 C186.6563,25.9375 186.2344,25.5313 185.7344,25.5313 C185.5,25.5313 185.2813,25.6094 185.0781,25.8125 C184.6406,26.25 184.6406,26.25 184.4688,26.3438 C184.0156,26.5781 183.375,26.7188 182.6094,26.7188 C180.6094,26.7188 179.3281,25.7031 179.3281,24.125 L179.3281,23.0781 C179.3281,21.375 180.5469,20.1719 182.25,20.1719 C182.8281,20.1719 183.4063,20.3125 183.875,20.5625 C184.3438,20.8281 184.5156,21.0156 184.5781,21.375 C184.7031,22.0469 184.9531,22.2969 185.4844,22.2969 C185.7656,22.2969 186.0469,22.1563 186.2344,21.9375 C186.3594,21.7656 186.4063,21.5938 186.4063,21.1563 L186.4063,19.7969 C186.4063,19.375 186.3906,19.2344 186.2656,19.0625 C186.0938,18.8125 185.8125,18.6563 185.4844,18.6563 C185.1719,18.6563 184.9688,18.7656 184.75,19.0313 C183.5781,18.5313 183.1406,18.4219 182.1875,18.4219 C179.5156,18.4219 177.5,20.4375 177.5,23.0625 L177.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="196.5" y="27.606">thirdparty::ns1::E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="168.5" x2="306.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="168.5" x2="306.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
-      <ellipse cx="1266" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1270.1094,246 L1262.3906,246 L1262.3906,233.6094 L1270.1094,233.6094 L1270.1094,235.7656 L1264.8438,235.7656 L1264.8438,238.4375 L1269.6094,238.4375 L1269.6094,240.5938 L1264.8438,240.5938 L1264.8438,243.8438 L1270.1094,243.8438 L1270.1094,246 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="1280" y="244.1543">property_t</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1252" x2="1346" y1="256" y2="256"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="1257" y="270.2104">property_a</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="1257" y="283.0151">property_b</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="1257" y="295.8198">property_c</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1252" x2="1346" y1="302.4141" y2="302.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
+      <g id="elem_C_0000007376951310260829">
+        <rect codeLine="12" fill="#F1F1F1" height="98.3998" id="C_0000007376951310260829" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="1083" y="223"/>
+        <ellipse cx="1098" cy="239" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1096.8594,240.0625 L1098.1719,240.0625 L1098.1719,240.1094 C1098.1719,240.5156 1098.1875,240.6719 1098.2969,240.8281 C1098.4688,241.0781 1098.7656,241.25 1099.0781,241.25 C1099.3594,241.25 1099.6563,241.1094 1099.8281,240.8906 C1099.9531,240.7031 1100,240.5625 1100,240.1094 L1100,238.2656 C1100,237.9375 1099.9844,237.8281 1099.9219,237.6562 C1099.8125,237.3594 1099.4531,237.1094 1099.0781,237.1094 C1098.7813,237.1094 1098.5156,237.25 1098.3438,237.4687 C1098.2031,237.6562 1098.1719,237.8281 1098.1719,238.2656 L1098.1719,238.3281 L1096.8594,238.3281 L1096.8594,236.1562 L1100.7031,236.1562 L1100.7031,236.9062 C1100.7031,237.2969 1100.7344,237.4844 1100.8438,237.6406 C1101.0156,237.8906 1101.3125,238.0625 1101.625,238.0625 C1101.9219,238.0625 1102.1875,237.9375 1102.375,237.7031 C1102.5156,237.5156 1102.5469,237.375 1102.5469,236.9062 L1102.5469,234.4062 L1094.8438,234.4062 C1094.3906,234.4062 1094.2656,234.4219 1094.0938,234.5312 C1093.8281,234.7031 1093.6563,234.9687 1093.6563,235.2812 C1093.6563,235.5625 1093.7813,235.8281 1094.0313,236 C1094.2188,236.125 1094.4063,236.1562 1094.8438,236.1562 L1095.0313,236.1562 L1095.0313,242.25 L1094.8438,242.25 C1094.4219,242.25 1094.2656,242.2812 1094.0938,242.375 C1093.8281,242.5312 1093.6563,242.8125 1093.6563,243.1094 C1093.6563,243.6875 1094.0625,244 1094.8438,244 L1102.9219,244 L1102.9219,241.4687 C1102.9219,241.0625 1102.8906,240.8906 1102.7813,240.7344 C1102.6094,240.4687 1102.3281,240.3125 1102,240.3125 C1101.7188,240.3125 1101.4375,240.4531 1101.25,240.6719 C1101.1094,240.8594 1101.0781,241.0156 1101.0781,241.4687 L1101.0781,242.25 L1096.8594,242.25 L1096.8594,240.0625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="65" x="1112" y="243.606">property_t</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1084" x2="1179" y1="255" y2="255"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="1089" y="272.0059">property_a</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="1089" y="288.8059">property_b</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="1089" y="305.6058">property_c</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1084" x2="1179" y1="313.3998" y2="313.3998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
-      <ellipse cx="787" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M789.9688,29.6406 Q789.3906,29.9375 788.75,30.0781 Q788.1094,30.2344 787.4063,30.2344 Q784.9063,30.2344 783.5781,28.5938 Q782.2656,26.9375 782.2656,23.8125 Q782.2656,20.6875 783.5781,19.0313 Q784.9063,17.375 787.4063,17.375 Q788.1094,17.375 788.75,17.5313 Q789.4063,17.6875 789.9688,17.9844 L789.9688,20.7031 Q789.3438,20.125 788.75,19.8594 Q788.1563,19.5781 787.5313,19.5781 Q786.1875,19.5781 785.5,20.6563 Q784.8125,21.7188 784.8125,23.8125 Q784.8125,25.9063 785.5,26.9844 Q786.1875,28.0469 787.5313,28.0469 Q788.1563,28.0469 788.75,27.7813 Q789.3438,27.5 789.9688,26.9219 L789.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="801" y="28.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000790040432414172612">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000790040432414172612" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="669" y="7"/>
+        <ellipse cx="684" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M679,24.1563 C679,26.6563 681.1406,28.4688 684.0625,28.4688 C685.2969,28.4688 686.4688,28.1719 687.2188,27.6563 C687.8281,27.2344 688.1563,26.8125 688.1563,26.4063 C688.1563,25.9375 687.7344,25.5313 687.2344,25.5313 C687,25.5313 686.7813,25.6094 686.5781,25.8125 C686.1406,26.25 686.1406,26.25 685.9688,26.3438 C685.5156,26.5781 684.875,26.7188 684.1094,26.7188 C682.1094,26.7188 680.8281,25.7031 680.8281,24.125 L680.8281,23.0781 C680.8281,21.375 682.0469,20.1719 683.75,20.1719 C684.3281,20.1719 684.9063,20.3125 685.375,20.5625 C685.8438,20.8281 686.0156,21.0156 686.0781,21.375 C686.2031,22.0469 686.4531,22.2969 686.9844,22.2969 C687.2656,22.2969 687.5469,22.1563 687.7344,21.9375 C687.8594,21.7656 687.9063,21.5938 687.9063,21.1563 L687.9063,19.7969 C687.9063,19.375 687.8906,19.2344 687.7656,19.0625 C687.5938,18.8125 687.3125,18.6563 686.9844,18.6563 C686.6719,18.6563 686.4688,18.7656 686.25,19.0313 C685.0781,18.5313 684.6406,18.4219 683.6875,18.4219 C681.0156,18.4219 679,20.4375 679,23.0625 L679,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="698" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="670" x2="709" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="670" x2="709" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
-      <ellipse cx="1294" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1296.9688,29.6406 Q1296.3906,29.9375 1295.75,30.0781 Q1295.1094,30.2344 1294.4063,30.2344 Q1291.9063,30.2344 1290.5781,28.5938 Q1289.2656,26.9375 1289.2656,23.8125 Q1289.2656,20.6875 1290.5781,19.0313 Q1291.9063,17.375 1294.4063,17.375 Q1295.1094,17.375 1295.75,17.5313 Q1296.4063,17.6875 1296.9688,17.9844 L1296.9688,20.7031 Q1296.3438,20.125 1295.75,19.8594 Q1295.1563,19.5781 1294.5313,19.5781 Q1293.1875,19.5781 1292.5,20.6563 Q1291.8125,21.7188 1291.8125,23.8125 Q1291.8125,25.9063 1292.5,26.9844 Q1293.1875,28.0469 1294.5313,28.0469 Q1295.1563,28.0469 1295.75,27.7813 Q1296.3438,27.5 1296.9688,26.9219 L1296.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1308" y="28.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001295970068907562690">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001295970068907562690" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1111" y="7"/>
+        <ellipse cx="1126" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1121,24.1563 C1121,26.6563 1123.1406,28.4688 1126.0625,28.4688 C1127.2969,28.4688 1128.4688,28.1719 1129.2188,27.6563 C1129.8281,27.2344 1130.1563,26.8125 1130.1563,26.4063 C1130.1563,25.9375 1129.7344,25.5313 1129.2344,25.5313 C1129,25.5313 1128.7813,25.6094 1128.5781,25.8125 C1128.1406,26.25 1128.1406,26.25 1127.9688,26.3438 C1127.5156,26.5781 1126.875,26.7188 1126.1094,26.7188 C1124.1094,26.7188 1122.8281,25.7031 1122.8281,24.125 L1122.8281,23.0781 C1122.8281,21.375 1124.0469,20.1719 1125.75,20.1719 C1126.3281,20.1719 1126.9063,20.3125 1127.375,20.5625 C1127.8438,20.8281 1128.0156,21.0156 1128.0781,21.375 C1128.2031,22.0469 1128.4531,22.2969 1128.9844,22.2969 C1129.2656,22.2969 1129.5469,22.1563 1129.7344,21.9375 C1129.8594,21.7656 1129.9063,21.5938 1129.9063,21.1563 L1129.9063,19.7969 C1129.9063,19.375 1129.8906,19.2344 1129.7656,19.0625 C1129.5938,18.8125 1129.3125,18.6563 1128.9844,18.6563 C1128.6719,18.6563 1128.4688,18.7656 1128.25,19.0313 C1127.0781,18.5313 1126.6406,18.4219 1125.6875,18.4219 C1123.0156,18.4219 1121,20.4375 1121,23.0625 L1121,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1140" y="27.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1112" x2="1151" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1112" x2="1151" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
-      <ellipse cx="1899" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1901.9688,29.6406 Q1901.3906,29.9375 1900.75,30.0781 Q1900.1094,30.2344 1899.4063,30.2344 Q1896.9063,30.2344 1895.5781,28.5938 Q1894.2656,26.9375 1894.2656,23.8125 Q1894.2656,20.6875 1895.5781,19.0313 Q1896.9063,17.375 1899.4063,17.375 Q1900.1094,17.375 1900.75,17.5313 Q1901.4063,17.6875 1901.9688,17.9844 L1901.9688,20.7031 Q1901.3438,20.125 1900.75,19.8594 Q1900.1563,19.5781 1899.5313,19.5781 Q1898.1875,19.5781 1897.5,20.6563 Q1896.8125,21.7188 1896.8125,23.8125 Q1896.8125,25.9063 1897.5,26.9844 Q1898.1875,28.0469 1899.5313,28.0469 Q1900.1563,28.0469 1900.75,27.7813 Q1901.3438,27.5 1901.9688,26.9219 L1901.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1913" y="28.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000154510361779680983">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000154510361779680983" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="1632.5" y="7"/>
+        <ellipse cx="1647.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1642.5,24.1563 C1642.5,26.6563 1644.6406,28.4688 1647.5625,28.4688 C1648.7969,28.4688 1649.9688,28.1719 1650.7188,27.6563 C1651.3281,27.2344 1651.6563,26.8125 1651.6563,26.4063 C1651.6563,25.9375 1651.2344,25.5313 1650.7344,25.5313 C1650.5,25.5313 1650.2813,25.6094 1650.0781,25.8125 C1649.6406,26.25 1649.6406,26.25 1649.4688,26.3438 C1649.0156,26.5781 1648.375,26.7188 1647.6094,26.7188 C1645.6094,26.7188 1644.3281,25.7031 1644.3281,24.125 L1644.3281,23.0781 C1644.3281,21.375 1645.5469,20.1719 1647.25,20.1719 C1647.8281,20.1719 1648.4063,20.3125 1648.875,20.5625 C1649.3438,20.8281 1649.5156,21.0156 1649.5781,21.375 C1649.7031,22.0469 1649.9531,22.2969 1650.4844,22.2969 C1650.7656,22.2969 1651.0469,22.1563 1651.2344,21.9375 C1651.3594,21.7656 1651.4063,21.5938 1651.4063,21.1563 L1651.4063,19.7969 C1651.4063,19.375 1651.3906,19.2344 1651.2656,19.0625 C1651.0938,18.8125 1650.8125,18.6563 1650.4844,18.6563 C1650.1719,18.6563 1649.9688,18.7656 1649.75,19.0313 C1648.5781,18.5313 1648.1406,18.4219 1647.1875,18.4219 C1644.5156,18.4219 1642.5,20.4375 1642.5,23.0625 L1642.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1661.5" y="27.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1633.5" x2="1673.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1633.5" x2="1673.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
-      <ellipse cx="1884.4" cy="252.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1887.3688,258.1406 Q1886.7906,258.4375 1886.15,258.5781 Q1885.5094,258.7344 1884.8063,258.7344 Q1882.3063,258.7344 1880.9781,257.0938 Q1879.6656,255.4375 1879.6656,252.3125 Q1879.6656,249.1875 1880.9781,247.5313 Q1882.3063,245.875 1884.8063,245.875 Q1885.5094,245.875 1886.15,246.0313 Q1886.8063,246.1875 1887.3688,246.4844 L1887.3688,249.2031 Q1886.7438,248.625 1886.15,248.3594 Q1885.5563,248.0781 1884.9313,248.0781 Q1883.5875,248.0781 1882.9,249.1563 Q1882.2125,250.2188 1882.2125,252.3125 Q1882.2125,254.4063 1882.9,255.4844 Q1883.5875,256.5469 1884.9313,256.5469 Q1885.5563,256.5469 1886.15,256.2813 Q1886.7438,256 1887.3688,255.4219 L1887.3688,258.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1903.6" y="256.6543">key_t</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="268.5" y2="268.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="276.5" y2="276.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
+      <g id="elem_C_0000137163683637529037">
+        <rect codeLine="30" fill="#F1F1F1" height="64.7999" id="C_0000137163683637529037" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="122" x="1592.5" y="239.8"/>
+        <ellipse cx="1632.7" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1627.7,256.9562 C1627.7,259.4562 1629.8406,261.2687 1632.7625,261.2687 C1633.9969,261.2687 1635.1688,260.9719 1635.9188,260.4562 C1636.5281,260.0344 1636.8563,259.6125 1636.8563,259.2062 C1636.8563,258.7375 1636.4344,258.3312 1635.9344,258.3312 C1635.7,258.3312 1635.4813,258.4094 1635.2781,258.6125 C1634.8406,259.05 1634.8406,259.05 1634.6688,259.1437 C1634.2156,259.3781 1633.575,259.5187 1632.8094,259.5187 C1630.8094,259.5187 1629.5281,258.5031 1629.5281,256.925 L1629.5281,255.8781 C1629.5281,254.175 1630.7469,252.9719 1632.45,252.9719 C1633.0281,252.9719 1633.6063,253.1125 1634.075,253.3625 C1634.5438,253.6281 1634.7156,253.8156 1634.7781,254.175 C1634.9031,254.8469 1635.1531,255.0969 1635.6844,255.0969 C1635.9656,255.0969 1636.2469,254.9562 1636.4344,254.7375 C1636.5594,254.5656 1636.6063,254.3937 1636.6063,253.9562 L1636.6063,252.5969 C1636.6063,252.175 1636.5906,252.0344 1636.4656,251.8625 C1636.2938,251.6125 1636.0125,251.4562 1635.6844,251.4562 C1635.3719,251.4562 1635.1688,251.5656 1634.95,251.8312 C1633.7781,251.3312 1633.3406,251.2219 1632.3875,251.2219 C1629.7156,251.2219 1627.7,253.2375 1627.7,255.8625 L1627.7,256.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="1652.3" y="260.406">key_t</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1593.5" x2="1713.5" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1593.5" x2="1713.5" y1="279.8" y2="279.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1598.5" y="288.7"/>
+          <ellipse cx="1603.5" cy="293.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="96" x="1612.5" y="296.8059">key : std::string</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1852" y="282.5"/>
-      <ellipse cx="1857" cy="287.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <g id="elem_C_0001917560728132448300">
+        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0001917560728132448300" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="815" y="248.2"/>
+        <ellipse cx="830" cy="264.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M825,265.3563 C825,267.8563 827.1406,269.6688 830.0625,269.6688 C831.2969,269.6688 832.4688,269.3719 833.2188,268.8563 C833.8281,268.4344 834.1563,268.0125 834.1563,267.6063 C834.1563,267.1375 833.7344,266.7313 833.2344,266.7313 C833,266.7313 832.7813,266.8094 832.5781,267.0125 C832.1406,267.45 832.1406,267.45 831.9688,267.5438 C831.5156,267.7781 830.875,267.9188 830.1094,267.9188 C828.1094,267.9188 826.8281,266.9031 826.8281,265.325 L826.8281,264.2781 C826.8281,262.575 828.0469,261.3719 829.75,261.3719 C830.3281,261.3719 830.9063,261.5125 831.375,261.7625 C831.8438,262.0281 832.0156,262.2156 832.0781,262.575 C832.2031,263.2469 832.4531,263.4969 832.9844,263.4969 C833.2656,263.4969 833.5469,263.3563 833.7344,263.1375 C833.8594,262.9656 833.9063,262.7938 833.9063,262.3563 L833.9063,260.9969 C833.9063,260.575 833.8906,260.4344 833.7656,260.2625 C833.5938,260.0125 833.3125,259.8563 832.9844,259.8563 C832.6719,259.8563 832.4688,259.9656 832.25,260.2313 C831.0781,259.7313 830.6406,259.6219 829.6875,259.6219 C827.0156,259.6219 825,261.6375 825,264.2625 L825,265.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="844" y="268.806">map</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="880" y="245.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="881" y="259.4001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="816" x2="885" y1="280.2" y2="280.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="816" x2="885" y1="288.2" y2="288.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="1866" y="290.7104">key : std::string</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <g id="elem_C_0001664022047310891203">
+        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001664022047310891203" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="461" x="7" y="115"/>
+        <ellipse cx="22" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,132.1562 C17,134.6562 19.1406,136.4687 22.0625,136.4687 C23.2969,136.4687 24.4688,136.1719 25.2188,135.6562 C25.8281,135.2344 26.1563,134.8125 26.1563,134.4062 C26.1563,133.9375 25.7344,133.5312 25.2344,133.5312 C25,133.5312 24.7813,133.6094 24.5781,133.8125 C24.1406,134.25 24.1406,134.25 23.9688,134.3437 C23.5156,134.5781 22.875,134.7187 22.1094,134.7187 C20.1094,134.7187 18.8281,133.7031 18.8281,132.125 L18.8281,131.0781 C18.8281,129.375 20.0469,128.1719 21.75,128.1719 C22.3281,128.1719 22.9063,128.3125 23.375,128.5625 C23.8438,128.8281 24.0156,129.0156 24.0781,129.375 C24.2031,130.0469 24.4531,130.2969 24.9844,130.2969 C25.2656,130.2969 25.5469,130.1562 25.7344,129.9375 C25.8594,129.7656 25.9063,129.5937 25.9063,129.1562 L25.9063,127.7969 C25.9063,127.375 25.8906,127.2344 25.7656,127.0625 C25.5938,126.8125 25.3125,126.6562 24.9844,126.6562 C24.6719,126.6562 24.4688,126.7656 24.25,127.0312 C23.0781,126.5312 22.6406,126.4219 21.6875,126.4219 C19.0156,126.4219 17,128.4375 17,131.0625 L17,132.1562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="36" y="135.606">map</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="399" x="72" y="112"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="397" x="73" y="126.2001">std::integral_constant&lt;thirdparty::ns1::color_t,thirdparty::ns1::color_t::red&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="467" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="467" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
-      <ellipse cx="966" cy="259" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M968.9688,264.6406 Q968.3906,264.9375 967.75,265.0781 Q967.1094,265.2344 966.4063,265.2344 Q963.9063,265.2344 962.5781,263.5938 Q961.2656,261.9375 961.2656,258.8125 Q961.2656,255.6875 962.5781,254.0313 Q963.9063,252.375 966.4063,252.375 Q967.1094,252.375 967.75,252.5313 Q968.4063,252.6875 968.9688,252.9844 L968.9688,255.7031 Q968.3438,255.125 967.75,254.8594 Q967.1563,254.5781 966.5313,254.5781 Q965.1875,254.5781 964.5,255.6563 Q963.8125,256.7188 963.8125,258.8125 Q963.8125,260.9063 964.5,261.9844 Q965.1875,263.0469 966.5313,263.0469 Q967.1563,263.0469 967.75,262.7813 Q968.3438,262.5 968.9688,261.9219 L968.9688,264.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="980" y="263.1543">map</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1015" y="240"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1016" y="252.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="275" y2="275"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="283" y2="283"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <g id="elem_C_0000307700801045535833">
+        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0000307700801045535833" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="372" x="503.5" y="115"/>
+        <ellipse cx="518.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M513.5,132.1562 C513.5,134.6562 515.6406,136.4687 518.5625,136.4687 C519.7969,136.4687 520.9688,136.1719 521.7188,135.6562 C522.3281,135.2344 522.6563,134.8125 522.6563,134.4062 C522.6563,133.9375 522.2344,133.5312 521.7344,133.5312 C521.5,133.5312 521.2813,133.6094 521.0781,133.8125 C520.6406,134.25 520.6406,134.25 520.4688,134.3437 C520.0156,134.5781 519.375,134.7187 518.6094,134.7187 C516.6094,134.7187 515.3281,133.7031 515.3281,132.125 L515.3281,131.0781 C515.3281,129.375 516.5469,128.1719 518.25,128.1719 C518.8281,128.1719 519.4063,128.3125 519.875,128.5625 C520.3438,128.8281 520.5156,129.0156 520.5781,129.375 C520.7031,130.0469 520.9531,130.2969 521.4844,130.2969 C521.7656,130.2969 522.0469,130.1562 522.2344,129.9375 C522.3594,129.7656 522.4063,129.5937 522.4063,129.1562 L522.4063,127.7969 C522.4063,127.375 522.3906,127.2344 522.2656,127.0625 C522.0938,126.8125 521.8125,126.6562 521.4844,126.6562 C521.1719,126.6562 520.9688,126.7656 520.75,127.0312 C519.5781,126.5312 519.1406,126.4219 518.1875,126.4219 C515.5156,126.4219 513.5,128.4375 513.5,131.0625 L513.5,132.1562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="532.5" y="135.606">map</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="310" x="568.5" y="112"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="308" x="569.5" y="126.2001">std::integral_constant&lt;property_t,property_t::property_a&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="504.5" x2="874.5" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="504.5" x2="874.5" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
-      <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="35" y="136.1543">map</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="475" x="70" y="113"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="473" x="71" y="125.1387">std::integral_constant&lt;thirdparty::ns1::color_t,thirdparty::ns1::color_t::red&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="156" y2="156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <g id="elem_C_0000548231528417484191">
+        <rect codeLine="47" fill="#F1F1F1" height="48" id="C_0000548231528417484191" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="441" x="911" y="115"/>
+        <ellipse cx="926" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M921,132.1562 C921,134.6562 923.1406,136.4687 926.0625,136.4687 C927.2969,136.4687 928.4688,136.1719 929.2188,135.6562 C929.8281,135.2344 930.1563,134.8125 930.1563,134.4062 C930.1563,133.9375 929.7344,133.5312 929.2344,133.5312 C929,133.5312 928.7813,133.6094 928.5781,133.8125 C928.1406,134.25 928.1406,134.25 927.9688,134.3437 C927.5156,134.5781 926.875,134.7187 926.1094,134.7187 C924.1094,134.7187 922.8281,133.7031 922.8281,132.125 L922.8281,131.0781 C922.8281,129.375 924.0469,128.1719 925.75,128.1719 C926.3281,128.1719 926.9063,128.3125 927.375,128.5625 C927.8438,128.8281 928.0156,129.0156 928.0781,129.375 C928.2031,130.0469 928.4531,130.2969 928.9844,130.2969 C929.2656,130.2969 929.5469,130.1562 929.7344,129.9375 C929.8594,129.7656 929.9063,129.5937 929.9063,129.1562 L929.9063,127.7969 C929.9063,127.375 929.8906,127.2344 929.7656,127.0625 C929.5938,126.8125 929.3125,126.6562 928.9844,126.6562 C928.6719,126.6562 928.4688,126.7656 928.25,127.0312 C927.0781,126.5312 926.6406,126.4219 925.6875,126.4219 C923.0156,126.4219 921,128.4375 921,131.0625 L921,132.1562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="940" y="135.606">map</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="379" x="976" y="112"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="377" x="977" y="126.2001">std::vector&lt;std::integral_constant&lt;property_t,property_t::property_b&gt;&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="912" x2="1351" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="912" x2="1351" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
-      <ellipse cx="592.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M595.4688,137.6406 Q594.8906,137.9375 594.25,138.0781 Q593.6094,138.2344 592.9063,138.2344 Q590.4063,138.2344 589.0781,136.5938 Q587.7656,134.9375 587.7656,131.8125 Q587.7656,128.6875 589.0781,127.0313 Q590.4063,125.375 592.9063,125.375 Q593.6094,125.375 594.25,125.5313 Q594.9063,125.6875 595.4688,125.9844 L595.4688,128.7031 Q594.8438,128.125 594.25,127.8594 Q593.6563,127.5781 593.0313,127.5781 Q591.6875,127.5781 591,128.6563 Q590.3125,129.7188 590.3125,131.8125 Q590.3125,133.9063 591,134.9844 Q591.6875,136.0469 593.0313,136.0469 Q593.6563,136.0469 594.25,135.7813 Q594.8438,135.5 595.4688,134.9219 L595.4688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="606.5" y="136.1543">map</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="368" x="641.5" y="113"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="366" x="642.5" y="125.1387">std::integral_constant&lt;property_t,property_t::property_a&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="156" y2="156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <g id="elem_C_0001510200402118706005">
+        <rect codeLine="51" fill="#F1F1F1" height="48" id="C_0001510200402118706005" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="532" x="1387.5" y="115"/>
+        <ellipse cx="1402.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1397.5,132.1562 C1397.5,134.6562 1399.6406,136.4687 1402.5625,136.4687 C1403.7969,136.4687 1404.9688,136.1719 1405.7188,135.6562 C1406.3281,135.2344 1406.6563,134.8125 1406.6563,134.4062 C1406.6563,133.9375 1406.2344,133.5312 1405.7344,133.5312 C1405.5,133.5312 1405.2813,133.6094 1405.0781,133.8125 C1404.6406,134.25 1404.6406,134.25 1404.4688,134.3437 C1404.0156,134.5781 1403.375,134.7187 1402.6094,134.7187 C1400.6094,134.7187 1399.3281,133.7031 1399.3281,132.125 L1399.3281,131.0781 C1399.3281,129.375 1400.5469,128.1719 1402.25,128.1719 C1402.8281,128.1719 1403.4063,128.3125 1403.875,128.5625 C1404.3438,128.8281 1404.5156,129.0156 1404.5781,129.375 C1404.7031,130.0469 1404.9531,130.2969 1405.4844,130.2969 C1405.7656,130.2969 1406.0469,130.1562 1406.2344,129.9375 C1406.3594,129.7656 1406.4063,129.5937 1406.4063,129.1562 L1406.4063,127.7969 C1406.4063,127.375 1406.3906,127.2344 1406.2656,127.0625 C1406.0938,126.8125 1405.8125,126.6562 1405.4844,126.6562 C1405.1719,126.6562 1404.9688,126.7656 1404.75,127.0312 C1403.5781,126.5312 1403.1406,126.4219 1402.1875,126.4219 C1399.5156,126.4219 1397.5,128.4375 1397.5,131.0625 L1397.5,132.1562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="1416.5" y="135.606">map</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="470" x="1452.5" y="112"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="468" x="1453.5" y="126.2001">std::map&lt;key_t,std::vector&lt;std::integral_constant&lt;property_t,property_t::property_c&gt;&gt;&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1388.5" x2="1918.5" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1388.5" x2="1918.5" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
-      <ellipse cx="1056.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1059.4688,137.6406 Q1058.8906,137.9375 1058.25,138.0781 Q1057.6094,138.2344 1056.9063,138.2344 Q1054.4063,138.2344 1053.0781,136.5938 Q1051.7656,134.9375 1051.7656,131.8125 Q1051.7656,128.6875 1053.0781,127.0313 Q1054.4063,125.375 1056.9063,125.375 Q1057.6094,125.375 1058.25,125.5313 Q1058.9063,125.6875 1059.4688,125.9844 L1059.4688,128.7031 Q1058.8438,128.125 1058.25,127.8594 Q1057.6563,127.5781 1057.0313,127.5781 Q1055.6875,127.5781 1055,128.6563 Q1054.3125,129.7188 1054.3125,131.8125 Q1054.3125,133.9063 1055,134.9844 Q1055.6875,136.0469 1057.0313,136.0469 Q1057.6563,136.0469 1058.25,135.7813 Q1058.8438,135.5 1059.4688,134.9219 L1059.4688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1070.5" y="136.1543">map</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="454" x="1105.5" y="113"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="452" x="1106.5" y="125.1387">std::vector&lt;std::integral_constant&lt;property_t,property_t::property_b&gt;&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="156" y2="156"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f67ipnzqslrct)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
-      <ellipse cx="1606.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1609.4688,137.6406 Q1608.8906,137.9375 1608.25,138.0781 Q1607.6094,138.2344 1606.9063,138.2344 Q1604.4063,138.2344 1603.0781,136.5938 Q1601.7656,134.9375 1601.7656,131.8125 Q1601.7656,128.6875 1603.0781,127.0313 Q1604.4063,125.375 1606.9063,125.375 Q1607.6094,125.375 1608.25,125.5313 Q1608.9063,125.6875 1609.4688,125.9844 L1609.4688,128.7031 Q1608.8438,128.125 1608.25,127.8594 Q1607.6563,127.5781 1607.0313,127.5781 Q1605.6875,127.5781 1605,128.6563 Q1604.3125,129.7188 1604.3125,131.8125 Q1604.3125,133.9063 1605,134.9844 Q1605.6875,136.0469 1607.0313,136.0469 Q1607.6563,136.0469 1608.25,135.7813 Q1608.8438,135.5 1609.4688,134.9219 L1609.4688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1620.5" y="136.1543">map</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="564" x="1655.5" y="113"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="562" x="1656.5" y="125.1387">std::map&lt;key_t,std::vector&lt;std::integral_constant&lt;property_t,property_t::property_c&gt;&gt;&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1592.5" x2="2215.5" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1592.5" x2="2215.5" y1="156" y2="156"/>
-    </a>
-    <path d="M274,164.22 C274,179.51 274,200.09 274,218.73 " fill="none" id="C_0001664022047310891203-&gt;C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="274,223.94,278,214.94,274,218.94,270,214.94,274,223.94" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M405.42,164.07 C562.83,191.71 819.25,236.73 931.02,256.35 " fill="none" id="C_0001664022047310891203-&gt;C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="932.27,249.46,950.76,259.81,929.85,263.25,932.27,249.46" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M274,76.02 C274,89.58 274,104.04 274,115.68 " fill="none" id="C_0001642222718760881014&lt;-C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="267,76,274,56,281,76,267,76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M885.58,164.07 C991.48,190.18 1160.32,231.81 1245.76,252.87 " fill="none" id="C_0000307700801045535833-&gt;C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1250.76,254.11,1242.9821,248.0681,1245.9059,252.9108,1241.0633,255.8346,1250.76,254.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M828.04,164.22 C857.76,183.37 900.32,210.8 933.78,232.35 " fill="none" id="C_0000307700801045535833-&gt;C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="937.79,226.61,950.81,243.33,930.21,238.38,937.79,226.61" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M792,76.02 C792,89.58 792,104.04 792,115.68 " fill="none" id="C_0000790040432414172612&lt;-C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="785,76,792,56,799,76,785,76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1299,164.22 C1299,179.51 1299,200.09 1299,218.73 " fill="none" id="C_0000548231528417484191-&gt;C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1299,223.94,1303,214.94,1299,218.94,1295,214.94,1299,223.94" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1241.23,164.07 C1183.68,187.05 1096.03,222.06 1039.89,244.48 " fill="none" id="C_0000548231528417484191-&gt;C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1042.26,251.07,1021.09,251.99,1037.07,238.07,1042.26,251.07" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1299,76.02 C1299,89.58 1299,104.04 1299,115.68 " fill="none" id="C_0001295970068907562690&lt;-C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="1292,76,1299,56,1306,76,1292,76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1904,164.22 C1904,183.04 1904,209.86 1904,231.25 " fill="none" id="C_0001510200402118706005-&gt;C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1904,236.28,1908,227.28,1904,231.28,1900,227.28,1904,236.28" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1792.33,164.07 C1661.51,191.1 1450.22,234.76 1352.15,255.02 " fill="none" id="C_0001510200402118706005-&gt;C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1347,256.08,1356.6252,258.1671,1351.8956,255.0637,1354.999,250.3341,1347,256.08" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1698.79,164.02 C1566.02,179.51 1389.54,201.21 1234,224 C1167.46,233.75 1091.23,246.97 1041.05,255.95 " fill="none" id="C_0001510200402118706005-&gt;C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1042.17,262.87,1021.24,259.52,1039.68,249.09,1042.17,262.87" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1904,76.02 C1904,89.58 1904,104.04 1904,115.68 " fill="none" id="C_0000154510361779680983&lt;-C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="1897,76,1904,56,1911,76,1897,76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001664022047310891203_C_0000566782399856868761">
+      <path codeLine="54" d="M237.5,163.46 C237.5,179.89 237.5,196.45 237.5,216.68 " fill="none" id="C_0001664022047310891203-to-C_0000566782399856868761" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="237.5,222.68,241.5,213.68,237.5,217.68,233.5,213.68,237.5,222.68" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001664022047310891203_C_0001917560728132448300">
+      <path codeLine="55" d="M347.09,163.46 C487.94,193.6 707.3985,240.5736 797.0785,259.7636 " fill="none" id="C_0001664022047310891203-to-C_0001917560728132448300" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="814.68,263.53,798.3339,253.8964,795.823,265.6307,814.68,263.53" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001642222718760881014_C_0001664022047310891203">
+      <path codeLine="56" d="M237.5,73.26 C237.5,90.94 237.5,97.13 237.5,114.79 " fill="none" id="C_0001642222718760881014-backto-C_0001664022047310891203" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="237.5,55.26,231.5,73.26,243.5,73.26,237.5,55.26" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000307700801045535833_C_0000007376951310260829">
+      <path codeLine="57" d="M768.52,163.46 C859.65,190.51 1000.888,232.4327 1076.828,254.9727 " fill="none" id="C_0000307700801045535833-to-C_0000007376951310260829" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1082.58,256.68,1075.0902,250.2845,1077.7867,255.2573,1072.8139,257.9538,1082.58,256.68" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000307700801045535833_C_0001917560728132448300">
+      <path codeLine="58" d="M718.28,163.46 C747.5,187.26 778.5184,212.5367 807.7384,236.3567 " fill="none" id="C_0000307700801045535833-to-C_0001917560728132448300" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="821.69,247.73,811.5295,231.7062,803.9473,241.0072,821.69,247.73" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000790040432414172612_C_0000307700801045535833">
+      <path codeLine="59" d="M689.5,73.26 C689.5,90.94 689.5,97.13 689.5,114.79 " fill="none" id="C_0000790040432414172612-backto-C_0000307700801045535833" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="689.5,55.26,683.5,73.26,695.5,73.26,689.5,55.26" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000548231528417484191_C_0000007376951310260829">
+      <path codeLine="60" d="M1131.5,163.46 C1131.5,179.89 1131.5,196.45 1131.5,216.68 " fill="none" id="C_0000548231528417484191-to-C_0000007376951310260829" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1131.5,222.68,1135.5,213.68,1131.5,217.68,1127.5,213.68,1131.5,222.68" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000548231528417484191_C_0001917560728132448300">
+      <path codeLine="61" d="M1081.26,163.46 C1025.22,189.62 952.2701,223.6855 902.7901,246.7855 " fill="none" id="C_0000548231528417484191-to-C_0001917560728132448300" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="886.48,254.4,905.3283,252.2222,900.252,241.3488,886.48,254.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001295970068907562690_C_0000548231528417484191">
+      <path codeLine="62" d="M1131.5,73.26 C1131.5,90.94 1131.5,97.13 1131.5,114.79 " fill="none" id="C_0001295970068907562690-backto-C_0000548231528417484191" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="1131.5,55.26,1125.5,73.26,1137.5,73.26,1131.5,55.26" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001510200402118706005_C_0000137163683637529037">
+      <path codeLine="63" d="M1653.5,163.46 C1653.5,184.68 1653.5,210.12 1653.5,233.57 " fill="none" id="C_0001510200402118706005-to-C_0000137163683637529037" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1653.5,239.57,1657.5,230.57,1653.5,234.57,1649.5,230.57,1653.5,239.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001510200402118706005_C_0000007376951310260829">
+      <path codeLine="64" d="M1560.18,163.46 C1448.89,191.43 1272.879,235.6674 1186.229,257.4474 " fill="none" id="C_0001510200402118706005-to-C_0000007376951310260829" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1180.41,258.91,1190.1136,260.5954,1185.2592,257.6911,1188.1634,252.8367,1180.41,258.91" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001510200402118706005_C_0001917560728132448300">
+      <path codeLine="65" d="M1458.88,163.48 C1344.04,178.33 1196.08,199.19 1065.5,223 C1002.09,234.56 946.4934,247.5085 903.9434,257.9285 " fill="none" id="C_0001510200402118706005-to-C_0001917560728132448300" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="886.46,262.21,905.3705,263.7563,902.5162,252.1007,886.46,262.21" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000154510361779680983_C_0001510200402118706005">
+      <path codeLine="66" d="M1653.5,73.26 C1653.5,90.94 1653.5,97.13 1653.5,114.79 " fill="none" id="C_0000154510361779680983-backto-C_0001510200402118706005" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="1653.5,55.26,1647.5,73.26,1659.5,73.26,1653.5,55.26" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00038_class_mermaid.svg b/docs/test_cases/t00038_class_mermaid.svg
index 28561545..295655d0 100644
--- a/docs/test_cases/t00038_class_mermaid.svg
+++ b/docs/test_cases/t00038_class_mermaid.svg
@@ -1,68 +1,73 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2676.328125 375" style="max-width: 2676.33px; background-color: white;" width="2676.328125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M326.21977219626166,172L325.4409559968847,176.16666666666666C324.6621397975078,180.33333333333334,323.10450739875387,188.66666666666666,322.32569119937693,197C321.546875,205.33333333333334,321.546875,213.66666666666666,321.546875,217.83333333333334L321.546875,222"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M540.6523072429907,172L571.2232768691589,176.16666666666666C601.7942464953271,180.33333333333334,662.9361857476636,188.66666666666666,703.1867827776779,204.33333333333334C743.4373798076923,220,762.7966346153847,243,772.4762620192308,254.5L782.1558894230769,266"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M331.546875,65L331.546875,69.16666666666667C331.546875,73.33333333333333,331.546875,81.66666666666667,331.546875,90C331.546875,98.33333333333333,331.546875,106.66666666666667,331.546875,110.83333333333333L331.546875,115"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1214.4375,163.57497064714414L1285.109375,169.1458088726201C1355.78125,174.7166470980961,1497.125,185.85832354904804,1654.3645833333333,205.9744388492184C1811.6041666666667,226.0905541493888,1984.7395833333333,255.18110829877753,2071.3072916666665,269.72638537347194L2157.875,284.2716624481663"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M844.8666764018692,172L828.0685845015577,176.16666666666666C811.2704926012461,180.33333333333334,777.674308800623,188.66666666666666,768.1968699451833,204.33333333333334C758.7194310897436,220,773.3607371794873,243,780.6813902243589,254.5L788.0020432692307,266"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M959.765625,65L959.765625,69.16666666666667C959.765625,73.33333333333333,959.765625,81.66666666666667,959.765625,90C959.765625,98.33333333333333,959.765625,106.66666666666667,959.765625,110.83333333333333L959.765625,115"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1805.6283221378505,172L1840.0437840732086,176.16666666666666C1874.459246008567,180.33333333333334,1943.2901698792837,188.66666666666666,2001.9979495229752,204.29591627754567C2060.7057291666665,219.9251658884247,2109.2903645833335,242.85033177684934,2133.5826822916665,254.3129147210617L2157.875,265.77549766527403"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1331.1187207943926,172L1296.1614339953273,176.16666666666666C1261.2041471962618,180.33333333333334,1191.2895735981308,188.66666666666666,1110.1571565907323,207.11518626831392C1029.0247395833333,225.56370586996118,936.6744791666666,254.12741173992242,890.4993489583334,268.409264674903L844.32421875,282.69111760988363"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1570.2265625,65L1570.2265625,69.16666666666667C1570.2265625,73.33333333333333,1570.2265625,81.66666666666667,1570.2265625,90C1570.2265625,98.33333333333333,1570.2265625,106.66666666666667,1570.2265625,110.83333333333333L1570.2265625,115"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M2402.0325642523367,172L2417.363074376947,176.16666666666666C2432.693584501558,180.33333333333334,2463.354604750779,188.66666666666666,2478.6851148753894,202.5C2494.015625,216.33333333333334,2494.015625,235.66666666666666,2494.015625,245.33333333333334L2494.015625,255"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M2297.171875,172L2297.171875,176.16666666666666C2297.171875,180.33333333333334,2297.171875,188.66666666666666,2293.820512820513,197C2290.469150641026,205.33333333333334,2283.7664262820513,213.66666666666666,2280.4150641025644,217.83333333333334L2277.063701923077,222"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1926.015625,165.79239006977122L1839.4173177083333,170.99365839147603C1752.8190104166667,176.19492671318082,1579.6223958333333,186.59746335659042,1399.3404947916667,207.0151829511361C1219.05859375,227.4329025456817,1031.69140625,257.8658050913634,938.0078125,273.0822563642043L844.32421875,288.29870763704514"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M2297.171875,65L2297.171875,69.16666666666667C2297.171875,73.33333333333333,2297.171875,81.66666666666667,2297.171875,90C2297.171875,98.33333333333333,2297.171875,106.66666666666667,2297.171875,110.83333333333333L2297.171875,115"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M326.21977219626166,172L325.4409559968847,176.16666666666666C324.6621397975078,180.33333333333334,323.10450739875387,188.66666666666666,322.32569119937693,196C321.546875,203.33333333333334,321.546875,209.66666666666666,321.546875,212.83333333333334L321.546875,216"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M540.6523072429907,172L571.2232768691589,176.16666666666666C601.7942464953271,180.33333333333334,662.9361857476636,188.66666666666666,701.2549107769914,202.03814912003727C739.5736358063192,215.40963157340795,755.0691466126385,233.81926314681587,762.816902015798,243.02407893351983L770.5646574189576,252.2288947202238"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M331.546875,83L331.546875,84.16666666666667C331.546875,85.33333333333333,331.546875,87.66666666666667,331.546875,93C331.546875,98.33333333333333,331.546875,106.66666666666667,331.546875,110.83333333333333L331.546875,115"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1214.4375,163.57497064714414L1285.109375,169.1458088726201C1355.78125,174.7166470980961,1497.125,185.85832354904804,1653.378407007849,205.80873955816824C1809.6318140156982,225.75915556728842,1980.7948780313966,254.51831113457683,2066.376410039246,268.89788891822104L2151.957942047095,283.27746670186525"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M844.8666764018692,172L828.0685845015577,176.16666666666666C811.2704926012461,180.33333333333334,777.674308800623,188.66666666666666,766.5858564095187,201.80259522204938C755.4974040184143,214.9385237774321,766.9166830368284,232.87704755486413,772.6263225460356,241.84630944358017L778.3359620552426,250.8155713322962"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M959.765625,83L959.765625,84.16666666666667C959.765625,85.33333333333333,959.765625,87.66666666666667,959.765625,93C959.765625,98.33333333333333,959.765625,106.66666666666667,959.765625,110.83333333333333L959.765625,115"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1805.6283221378505,172L1840.0437840732086,176.16666666666666C1874.459246008567,180.33333333333334,1943.2901698792837,188.66666666666666,2001.0935745713061,203.86917754389992C2058.8969792633284,219.0716884211332,2105.672864776657,241.14337684226632,2129.0608075333216,252.1792210528329L2152.4487502899856,263.2150652633995"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1331.1187207943926,172L1296.1614339953273,176.16666666666666C1261.2041471962618,180.33333333333334,1191.2895735981308,188.66666666666666,1113.0231973998364,206.22872697395792C1034.7568212015415,223.79078728124918,948.1386424030828,250.5815745624983,904.8295530038536,263.9769682031229L861.5204636046243,277.37236184374746"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1570.2265625,83L1570.2265625,84.16666666666667C1570.2265625,85.33333333333333,1570.2265625,87.66666666666667,1570.2265625,93C1570.2265625,98.33333333333333,1570.2265625,106.66666666666667,1570.2265625,110.83333333333333L1570.2265625,115"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M2402.0325642523367,172L2417.363074376947,176.16666666666666C2432.693584501558,180.33333333333334,2463.354604750779,188.66666666666666,2478.6851148753894,201.5C2494.015625,214.33333333333334,2494.015625,231.66666666666666,2494.015625,240.33333333333334L2494.015625,249"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M2297.171875,172L2297.171875,176.16666666666666C2297.171875,180.33333333333334,2297.171875,188.66666666666666,2294.447261575591,196.22077859500143C2291.722648151182,203.7748905233362,2286.273421302364,210.54978104667236,2283.548807877955,213.93722630834046L2280.824194453546,217.32467157000855"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1926.015625,165.79239006977122L1839.4173177083333,170.99365839147603C1752.8190104166667,176.19492671318082,1579.6223958333333,186.59746335659042,1402.3016886811304,206.53421439810745C1224.9809815289275,226.47096543962448,1043.5361818078552,255.94193087924893,952.813781947319,270.67741359906114L862.0913820867826,285.4128963188734"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M2297.171875,83L2297.171875,84.16666666666667C2297.171875,85.33333333333333,2297.171875,87.66666666666667,2297.171875,93C2297.171875,98.33333333333333,2297.171875,106.66666666666667,2297.171875,110.83333333333333L2297.171875,115"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -202,7 +207,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L8">
+        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L8">
           <g title="color_t" id="classId-C_0000566782399856868761-0" class="node default clickable">
             <rect height="145" width="191.90625" y="-72.5" x="-95.953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="95.953125" x1="-95.953125" class="divider"/>
@@ -236,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L10">
+        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L10">
           <g title="E" id="classId-C_0001642222718760881014-1" class="node default clickable">
             <rect height="57" width="149.234375" y="-28.5" x="-74.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6171875" x1="-74.6171875" class="divider"/>
@@ -255,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L20">
+        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L20">
           <g title="property_t" id="classId-C_0000007376951310260829-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -289,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L22">
+        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L22">
           <g title="A" id="classId-C_0000790040432414172612-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -308,7 +313,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L23">
+        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L23">
           <g title="B" id="classId-C_0001295970068907562690-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -327,7 +332,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L24">
+        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L24">
           <g title="C" id="classId-C_0000154510361779680983-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -346,7 +351,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L26">
+        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L26">
           <g title="key_t" id="classId-C_0000137163683637529037-6" class="node default clickable">
             <rect height="79" width="131.9375" y="-39.5" x="-65.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.96875" x1="-65.96875" class="divider"/>
@@ -370,7 +375,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L30">
+        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L30">
           <g title="map" id="classId-C_0001917560728132448300-7" class="node default clickable">
             <rect height="57" width="76.359375" y="-28.5" x="-38.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.1796875" x1="-38.1796875" class="divider"/>
@@ -389,7 +394,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L34">
+        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L34">
           <g title="map" id="classId-C_0001664022047310891203-8" class="node default clickable">
             <rect height="57" width="647.09375" y="-28.5" x="-323.546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="323.546875" x1="-323.546875" class="divider"/>
@@ -408,7 +413,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L37">
+        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L37">
           <g title="map" id="classId-C_0000307700801045535833-9" class="node default clickable">
             <rect height="57" width="509.34375" y="-28.5" x="-254.671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="254.671875" x1="-254.671875" class="divider"/>
@@ -427,7 +432,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L41">
+        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L41">
           <g title="map" id="classId-C_0000548231528417484191-10" class="node default clickable">
             <rect height="57" width="611.578125" y="-28.5" x="-305.7890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="305.7890625" x1="-305.7890625" class="divider"/>
@@ -446,7 +451,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00038/t00038.cc#L46">
+        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L46">
           <g title="map" id="classId-C_0001510200402118706005-11" class="node default clickable">
             <rect height="57" width="742.3125" y="-28.5" x="-371.15625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="371.15625" x1="-371.15625" class="divider"/>
diff --git a/docs/test_cases/t00039.md b/docs/test_cases/t00039.md
index 8419df21..93ee3eb8 100644
--- a/docs/test_cases/t00039.md
+++ b/docs/test_cases/t00039.md
@@ -24,7 +24,7 @@ diagrams:
         - clanguml::t00039::ns3::detail
 ```
 ## Source code
-File t00039.cc
+File `tests/t00039/t00039.cc`
 ```cpp
 #include <string>
 
diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg
index 229f8cd5..c7908bc0 100644
--- a/docs/test_cases/t00039_class.svg
+++ b/docs/test_cases/t00039_class.svg
@@ -1,194 +1,242 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="430px" preserveAspectRatio="none" style="width:622px;height:430px;" version="1.1" viewBox="0 0 622 430" width="622px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="439px" preserveAspectRatio="none" style="width:633px;height:439px;background:#FFFFFF;" version="1.1" viewBox="0 0 633 439" width="633px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1txs7517z09fy" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
-      <ellipse cx="31.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M34.4688,36.1406 Q33.8906,36.4375 33.25,36.5781 Q32.6094,36.7344 31.9063,36.7344 Q29.4063,36.7344 28.0781,35.0938 Q26.7656,33.4375 26.7656,30.3125 Q26.7656,27.1875 28.0781,25.5313 Q29.4063,23.875 31.9063,23.875 Q32.6094,23.875 33.25,24.0313 Q33.9063,24.1875 34.4688,24.4844 L34.4688,27.2031 Q33.8438,26.625 33.25,26.3594 Q32.6563,26.0781 32.0313,26.0781 Q30.6875,26.0781 30,27.1563 Q29.3125,28.2188 29.3125,30.3125 Q29.3125,32.4063 30,33.4844 Q30.6875,34.5469 32.0313,34.5469 Q32.6563,34.5469 33.25,34.2813 Q33.8438,34 34.4688,33.4219 L34.4688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="45.5" y="34.6543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="54.5" y2="54.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000241234977032861936">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000241234977032861936" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="19" y="18.4"/>
+        <ellipse cx="34" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M29,35.5562 C29,38.0562 31.1406,39.8687 34.0625,39.8687 C35.2969,39.8687 36.4688,39.5719 37.2188,39.0562 C37.8281,38.6344 38.1563,38.2125 38.1563,37.8062 C38.1563,37.3375 37.7344,36.9312 37.2344,36.9312 C37,36.9312 36.7813,37.0094 36.5781,37.2125 C36.1406,37.65 36.1406,37.65 35.9688,37.7437 C35.5156,37.9781 34.875,38.1187 34.1094,38.1187 C32.1094,38.1187 30.8281,37.1031 30.8281,35.525 L30.8281,34.4781 C30.8281,32.775 32.0469,31.5719 33.75,31.5719 C34.3281,31.5719 34.9063,31.7125 35.375,31.9625 C35.8438,32.2281 36.0156,32.4156 36.0781,32.775 C36.2031,33.4469 36.4531,33.6969 36.9844,33.6969 C37.2656,33.6969 37.5469,33.5562 37.7344,33.3375 C37.8594,33.1656 37.9063,32.9937 37.9063,32.5562 L37.9063,31.1969 C37.9063,30.775 37.8906,30.6344 37.7656,30.4625 C37.5938,30.2125 37.3125,30.0562 36.9844,30.0562 C36.6719,30.0562 36.4688,30.1656 36.25,30.4312 C35.0781,29.9312 34.6406,29.8219 33.6875,29.8219 C31.0156,29.8219 29,31.8375 29,34.4625 L29,35.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="48" y="39.006">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="20" x2="60" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="20" x2="60" y1="58.4" y2="58.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
-      <ellipse cx="113" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M115.9688,36.1406 Q115.3906,36.4375 114.75,36.5781 Q114.1094,36.7344 113.4063,36.7344 Q110.9063,36.7344 109.5781,35.0938 Q108.2656,33.4375 108.2656,30.3125 Q108.2656,27.1875 109.5781,25.5313 Q110.9063,23.875 113.4063,23.875 Q114.1094,23.875 114.75,24.0313 Q115.4063,24.1875 115.9688,24.4844 L115.9688,27.2031 Q115.3438,26.625 114.75,26.3594 Q114.1563,26.0781 113.5313,26.0781 Q112.1875,26.0781 111.5,27.1563 Q110.8125,28.2188 110.8125,30.3125 Q110.8125,32.4063 111.5,33.4844 Q112.1875,34.5469 113.5313,34.5469 Q114.1563,34.5469 114.75,34.2813 Q115.3438,34 115.9688,33.4219 L115.9688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="127" y="34.6543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="54.5" y2="54.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001975187139659616784">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0001975187139659616784" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="103" y="18.4"/>
+        <ellipse cx="118" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M113,35.5562 C113,38.0562 115.1406,39.8687 118.0625,39.8687 C119.2969,39.8687 120.4688,39.5719 121.2188,39.0562 C121.8281,38.6344 122.1563,38.2125 122.1563,37.8062 C122.1563,37.3375 121.7344,36.9312 121.2344,36.9312 C121,36.9312 120.7813,37.0094 120.5781,37.2125 C120.1406,37.65 120.1406,37.65 119.9688,37.7437 C119.5156,37.9781 118.875,38.1187 118.1094,38.1187 C116.1094,38.1187 114.8281,37.1031 114.8281,35.525 L114.8281,34.4781 C114.8281,32.775 116.0469,31.5719 117.75,31.5719 C118.3281,31.5719 118.9063,31.7125 119.375,31.9625 C119.8438,32.2281 120.0156,32.4156 120.0781,32.775 C120.2031,33.4469 120.4531,33.6969 120.9844,33.6969 C121.2656,33.6969 121.5469,33.5562 121.7344,33.3375 C121.8594,33.1656 121.9063,32.9937 121.9063,32.5562 L121.9063,31.1969 C121.9063,30.775 121.8906,30.6344 121.7656,30.4625 C121.5938,30.2125 121.3125,30.0562 120.9844,30.0562 C120.6719,30.0562 120.4688,30.1656 120.25,30.4312 C119.0781,29.9312 118.6406,29.8219 117.6875,29.8219 C115.0156,29.8219 113,31.8375 113,34.4625 L113,35.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="132" y="39.006">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="144" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="144" y1="58.4" y2="58.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
-      <ellipse cx="195.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M198.4688,36.1406 Q197.8906,36.4375 197.25,36.5781 Q196.6094,36.7344 195.9063,36.7344 Q193.4063,36.7344 192.0781,35.0938 Q190.7656,33.4375 190.7656,30.3125 Q190.7656,27.1875 192.0781,25.5313 Q193.4063,23.875 195.9063,23.875 Q196.6094,23.875 197.25,24.0313 Q197.9063,24.1875 198.4688,24.4844 L198.4688,27.2031 Q197.8438,26.625 197.25,26.3594 Q196.6563,26.0781 196.0313,26.0781 Q194.6875,26.0781 194,27.1563 Q193.3125,28.2188 193.3125,30.3125 Q193.3125,32.4063 194,33.4844 Q194.6875,34.5469 196.0313,34.5469 Q196.6563,34.5469 197.25,34.2813 Q197.8438,34 198.4688,33.4219 L198.4688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="209.5" y="34.6543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="54.5" y2="54.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001959131184346890363">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001959131184346890363" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="187.5" y="18.4"/>
+        <ellipse cx="202.5" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M197.5,35.5562 C197.5,38.0562 199.6406,39.8687 202.5625,39.8687 C203.7969,39.8687 204.9688,39.5719 205.7188,39.0562 C206.3281,38.6344 206.6563,38.2125 206.6563,37.8062 C206.6563,37.3375 206.2344,36.9312 205.7344,36.9312 C205.5,36.9312 205.2813,37.0094 205.0781,37.2125 C204.6406,37.65 204.6406,37.65 204.4688,37.7437 C204.0156,37.9781 203.375,38.1187 202.6094,38.1187 C200.6094,38.1187 199.3281,37.1031 199.3281,35.525 L199.3281,34.4781 C199.3281,32.775 200.5469,31.5719 202.25,31.5719 C202.8281,31.5719 203.4063,31.7125 203.875,31.9625 C204.3438,32.2281 204.5156,32.4156 204.5781,32.775 C204.7031,33.4469 204.9531,33.6969 205.4844,33.6969 C205.7656,33.6969 206.0469,33.5562 206.2344,33.3375 C206.3594,33.1656 206.4063,32.9937 206.4063,32.5562 L206.4063,31.1969 C206.4063,30.775 206.3906,30.6344 206.2656,30.4625 C206.0938,30.2125 205.8125,30.0562 205.4844,30.0562 C205.1719,30.0562 204.9688,30.1656 204.75,30.4312 C203.5781,29.9312 203.1406,29.8219 202.1875,29.8219 C199.5156,29.8219 197.5,31.8375 197.5,34.4625 L197.5,35.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="216.5" y="39.006">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="188.5" x2="227.5" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="188.5" x2="227.5" y1="58.4" y2="58.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
-      <ellipse cx="21" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,157.1406 Q23.3906,157.4375 22.75,157.5781 Q22.1094,157.7344 21.4063,157.7344 Q18.9063,157.7344 17.5781,156.0938 Q16.2656,154.4375 16.2656,151.3125 Q16.2656,148.1875 17.5781,146.5313 Q18.9063,144.875 21.4063,144.875 Q22.1094,144.875 22.75,145.0313 Q23.4063,145.1875 23.9688,145.4844 L23.9688,148.2031 Q23.3438,147.625 22.75,147.3594 Q22.1563,147.0781 21.5313,147.0781 Q20.1875,147.0781 19.5,148.1563 Q18.8125,149.2188 18.8125,151.3125 Q18.8125,153.4063 19.5,154.4844 Q20.1875,155.5469 21.5313,155.5469 Q22.1563,155.5469 22.75,155.2813 Q23.3438,155 23.9688,154.4219 L23.9688,157.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="155.6543">CD</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="167.5" y2="167.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="175.5" y2="175.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
+      <g id="elem_C_0000850483622527996929">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0000850483622527996929" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="52" x="7" y="143.2"/>
+        <ellipse cx="22" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,160.3563 C17,162.8563 19.1406,164.6688 22.0625,164.6688 C23.2969,164.6688 24.4688,164.3719 25.2188,163.8563 C25.8281,163.4344 26.1563,163.0125 26.1563,162.6063 C26.1563,162.1375 25.7344,161.7313 25.2344,161.7313 C25,161.7313 24.7813,161.8094 24.5781,162.0125 C24.1406,162.45 24.1406,162.45 23.9688,162.5438 C23.5156,162.7781 22.875,162.9188 22.1094,162.9188 C20.1094,162.9188 18.8281,161.9031 18.8281,160.325 L18.8281,159.2781 C18.8281,157.575 20.0469,156.3719 21.75,156.3719 C22.3281,156.3719 22.9063,156.5125 23.375,156.7625 C23.8438,157.0281 24.0156,157.2156 24.0781,157.575 C24.2031,158.2469 24.4531,158.4969 24.9844,158.4969 C25.2656,158.4969 25.5469,158.3563 25.7344,158.1375 C25.8594,157.9656 25.9063,157.7938 25.9063,157.3563 L25.9063,155.9969 C25.9063,155.575 25.8906,155.4344 25.7656,155.2625 C25.5938,155.0125 25.3125,154.8563 24.9844,154.8563 C24.6719,154.8563 24.4688,154.9656 24.25,155.2313 C23.0781,154.7313 22.6406,154.6219 21.6875,154.6219 C19.0156,154.6219 17,156.6375 17,159.2625 L17,160.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="36" y="163.806">CD</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="58" y1="175.2" y2="175.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="58" y1="183.2" y2="183.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
-      <ellipse cx="197" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M199.9688,157.1406 Q199.3906,157.4375 198.75,157.5781 Q198.1094,157.7344 197.4063,157.7344 Q194.9063,157.7344 193.5781,156.0938 Q192.2656,154.4375 192.2656,151.3125 Q192.2656,148.1875 193.5781,146.5313 Q194.9063,144.875 197.4063,144.875 Q198.1094,144.875 198.75,145.0313 Q199.4063,145.1875 199.9688,145.4844 L199.9688,148.2031 Q199.3438,147.625 198.75,147.3594 Q198.1563,147.0781 197.5313,147.0781 Q196.1875,147.0781 195.5,148.1563 Q194.8125,149.2188 194.8125,151.3125 Q194.8125,153.4063 195.5,154.4844 Q196.1875,155.5469 197.5313,155.5469 Q198.1563,155.5469 198.75,155.2813 Q199.3438,155 199.9688,154.4219 L199.9688,157.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="211" y="155.6543">DE</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="167.5" y2="167.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="175.5" y2="175.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
+      <g id="elem_C_0001316022308303681160">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001316022308303681160" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="189.5" y="143.2"/>
+        <ellipse cx="204.5" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M199.5,160.3563 C199.5,162.8563 201.6406,164.6688 204.5625,164.6688 C205.7969,164.6688 206.9688,164.3719 207.7188,163.8563 C208.3281,163.4344 208.6563,163.0125 208.6563,162.6063 C208.6563,162.1375 208.2344,161.7313 207.7344,161.7313 C207.5,161.7313 207.2813,161.8094 207.0781,162.0125 C206.6406,162.45 206.6406,162.45 206.4688,162.5438 C206.0156,162.7781 205.375,162.9188 204.6094,162.9188 C202.6094,162.9188 201.3281,161.9031 201.3281,160.325 L201.3281,159.2781 C201.3281,157.575 202.5469,156.3719 204.25,156.3719 C204.8281,156.3719 205.4063,156.5125 205.875,156.7625 C206.3438,157.0281 206.5156,157.2156 206.5781,157.575 C206.7031,158.2469 206.9531,158.4969 207.4844,158.4969 C207.7656,158.4969 208.0469,158.3563 208.2344,158.1375 C208.3594,157.9656 208.4063,157.7938 208.4063,157.3563 L208.4063,155.9969 C208.4063,155.575 208.3906,155.4344 208.2656,155.2625 C208.0938,155.0125 207.8125,154.8563 207.4844,154.8563 C207.1719,154.8563 206.9688,154.9656 206.75,155.2313 C205.5781,154.7313 205.1406,154.6219 204.1875,154.6219 C201.5156,154.6219 199.5,156.6375 199.5,159.2625 L199.5,160.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="218.5" y="163.806">DE</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="190.5" x2="239.5" y1="175.2" y2="175.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="190.5" x2="239.5" y1="183.2" y2="183.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
-      <ellipse cx="105" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M107.9688,157.1406 Q107.3906,157.4375 106.75,157.5781 Q106.1094,157.7344 105.4063,157.7344 Q102.9063,157.7344 101.5781,156.0938 Q100.2656,154.4375 100.2656,151.3125 Q100.2656,148.1875 101.5781,146.5313 Q102.9063,144.875 105.4063,144.875 Q106.1094,144.875 106.75,145.0313 Q107.4063,145.1875 107.9688,145.4844 L107.9688,148.2031 Q107.3438,147.625 106.75,147.3594 Q106.1563,147.0781 105.5313,147.0781 Q104.1875,147.0781 103.5,148.1563 Q102.8125,149.2188 102.8125,151.3125 Q102.8125,153.4063 103.5,154.4844 Q104.1875,155.5469 105.5313,155.5469 Q106.1563,155.5469 106.75,155.2813 Q107.3438,155 107.9688,154.4219 L107.9688,157.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="119" y="155.6543">CDE</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="167.5" y2="167.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="175.5" y2="175.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
+      <g id="elem_C_0001877487144594774465">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001877487144594774465" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="93.5" y="143.2"/>
+        <ellipse cx="108.5" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M103.5,160.3563 C103.5,162.8563 105.6406,164.6688 108.5625,164.6688 C109.7969,164.6688 110.9688,164.3719 111.7188,163.8563 C112.3281,163.4344 112.6563,163.0125 112.6563,162.6063 C112.6563,162.1375 112.2344,161.7313 111.7344,161.7313 C111.5,161.7313 111.2813,161.8094 111.0781,162.0125 C110.6406,162.45 110.6406,162.45 110.4688,162.5438 C110.0156,162.7781 109.375,162.9188 108.6094,162.9188 C106.6094,162.9188 105.3281,161.9031 105.3281,160.325 L105.3281,159.2781 C105.3281,157.575 106.5469,156.3719 108.25,156.3719 C108.8281,156.3719 109.4063,156.5125 109.875,156.7625 C110.3438,157.0281 110.5156,157.2156 110.5781,157.575 C110.7031,158.2469 110.9531,158.4969 111.4844,158.4969 C111.7656,158.4969 112.0469,158.3563 112.2344,158.1375 C112.3594,157.9656 112.4063,157.7938 112.4063,157.3563 L112.4063,155.9969 C112.4063,155.575 112.3906,155.4344 112.2656,155.2625 C112.0938,155.0125 111.8125,154.8563 111.4844,154.8563 C111.1719,154.8563 110.9688,154.9656 110.75,155.2313 C109.5781,154.7313 109.1406,154.6219 108.1875,154.6219 C105.5156,154.6219 103.5,156.6375 103.5,159.2625 L103.5,160.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="122.5" y="163.806">CDE</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="94.5" x2="153.5" y1="175.2" y2="175.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="94.5" x2="153.5" y1="183.2" y2="183.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
-      <ellipse cx="285.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M288.4688,36.1406 Q287.8906,36.4375 287.25,36.5781 Q286.6094,36.7344 285.9063,36.7344 Q283.4063,36.7344 282.0781,35.0938 Q280.7656,33.4375 280.7656,30.3125 Q280.7656,27.1875 282.0781,25.5313 Q283.4063,23.875 285.9063,23.875 Q286.6094,23.875 287.25,24.0313 Q287.9063,24.1875 288.4688,24.4844 L288.4688,27.2031 Q287.8438,26.625 287.25,26.3594 Q286.6563,26.0781 286.0313,26.0781 Q284.6875,26.0781 284,27.1563 Q283.3125,28.2188 283.3125,30.3125 Q283.3125,32.4063 284,33.4844 Q284.6875,34.5469 286.0313,34.5469 Q286.6563,34.5469 287.25,34.2813 Q287.8438,34 288.4688,33.4219 L288.4688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.5" y="34.6543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="54.5" y2="54.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001051171525946759825">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0001051171525946759825" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="279.5" y="18.4"/>
+        <ellipse cx="294.5" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M289.5,35.5562 C289.5,38.0562 291.6406,39.8687 294.5625,39.8687 C295.7969,39.8687 296.9688,39.5719 297.7188,39.0562 C298.3281,38.6344 298.6563,38.2125 298.6563,37.8062 C298.6563,37.3375 298.2344,36.9312 297.7344,36.9312 C297.5,36.9312 297.2813,37.0094 297.0781,37.2125 C296.6406,37.65 296.6406,37.65 296.4688,37.7437 C296.0156,37.9781 295.375,38.1187 294.6094,38.1187 C292.6094,38.1187 291.3281,37.1031 291.3281,35.525 L291.3281,34.4781 C291.3281,32.775 292.5469,31.5719 294.25,31.5719 C294.8281,31.5719 295.4063,31.7125 295.875,31.9625 C296.3438,32.2281 296.5156,32.4156 296.5781,32.775 C296.7031,33.4469 296.9531,33.6969 297.4844,33.6969 C297.7656,33.6969 298.0469,33.5562 298.2344,33.3375 C298.3594,33.1656 298.4063,32.9937 298.4063,32.5562 L298.4063,31.1969 C298.4063,30.775 298.3906,30.6344 298.2656,30.4625 C298.0938,30.2125 297.8125,30.0562 297.4844,30.0562 C297.1719,30.0562 296.9688,30.1656 296.75,30.4312 C295.5781,29.9312 295.1406,29.8219 294.1875,29.8219 C291.5156,29.8219 289.5,31.8375 289.5,34.4625 L289.5,35.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="308.5" y="39.006">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="280.5" x2="319.5" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="280.5" x2="319.5" y1="58.4" y2="58.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
-      <ellipse cx="281.5" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M284.4688,157.1406 Q283.8906,157.4375 283.25,157.5781 Q282.6094,157.7344 281.9063,157.7344 Q279.4063,157.7344 278.0781,156.0938 Q276.7656,154.4375 276.7656,151.3125 Q276.7656,148.1875 278.0781,146.5313 Q279.4063,144.875 281.9063,144.875 Q282.6094,144.875 283.25,145.0313 Q283.9063,145.1875 284.4688,145.4844 L284.4688,148.2031 Q283.8438,147.625 283.25,147.3594 Q282.6563,147.0781 282.0313,147.0781 Q280.6875,147.0781 280,148.1563 Q279.3125,149.2188 279.3125,151.3125 Q279.3125,153.4063 280,154.4844 Q280.6875,155.5469 282.0313,155.5469 Q282.6563,155.5469 283.25,155.2813 Q283.8438,155 284.4688,154.4219 L284.4688,157.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="295.5" y="155.6543">AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="167.5" y2="167.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="175.5" y2="175.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <g id="elem_C_0001761969273600680013">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001761969273600680013" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="275" y="143.2"/>
+        <ellipse cx="290" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M285,160.3563 C285,162.8563 287.1406,164.6688 290.0625,164.6688 C291.2969,164.6688 292.4688,164.3719 293.2188,163.8563 C293.8281,163.4344 294.1563,163.0125 294.1563,162.6063 C294.1563,162.1375 293.7344,161.7313 293.2344,161.7313 C293,161.7313 292.7813,161.8094 292.5781,162.0125 C292.1406,162.45 292.1406,162.45 291.9688,162.5438 C291.5156,162.7781 290.875,162.9188 290.1094,162.9188 C288.1094,162.9188 286.8281,161.9031 286.8281,160.325 L286.8281,159.2781 C286.8281,157.575 288.0469,156.3719 289.75,156.3719 C290.3281,156.3719 290.9063,156.5125 291.375,156.7625 C291.8438,157.0281 292.0156,157.2156 292.0781,157.575 C292.2031,158.2469 292.4531,158.4969 292.9844,158.4969 C293.2656,158.4969 293.5469,158.3563 293.7344,158.1375 C293.8594,157.9656 293.9063,157.7938 293.9063,157.3563 L293.9063,155.9969 C293.9063,155.575 293.8906,155.4344 293.7656,155.2625 C293.5938,155.0125 293.3125,154.8563 292.9844,154.8563 C292.6719,154.8563 292.4688,154.9656 292.25,155.2313 C291.0781,154.7313 290.6406,154.6219 289.6875,154.6219 C287.0156,154.6219 285,156.6375 285,159.2625 L285,160.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="304" y="163.806">AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="276" x2="324" y1="175.2" y2="175.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="276" x2="324" y1="183.2" y2="183.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
-      <ellipse cx="277.15" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M280.1188,271.6406 Q279.5406,271.9375 278.9,272.0781 Q278.2594,272.2344 277.5563,272.2344 Q275.0563,272.2344 273.7281,270.5938 Q272.4156,268.9375 272.4156,265.8125 Q272.4156,262.6875 273.7281,261.0313 Q275.0563,259.375 277.5563,259.375 Q278.2594,259.375 278.9,259.5313 Q279.5563,259.6875 280.1188,259.9844 L280.1188,262.7031 Q279.4938,262.125 278.9,261.8594 Q278.3063,261.5781 277.6813,261.5781 Q276.3375,261.5781 275.65,262.6563 Q274.9625,263.7188 274.9625,265.8125 Q274.9625,267.9063 275.65,268.9844 Q276.3375,270.0469 277.6813,270.0469 Q278.3063,270.0469 278.9,269.7813 Q279.4938,269.5 280.1188,268.9219 L280.1188,271.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="291.85" y="270.1543">AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="282" y2="282"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="290" y2="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <g id="elem_C_0002158483243842147804">
+        <rect codeLine="34" fill="#F1F1F1" height="64.7999" id="C_0002158483243842147804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="64" x="268" y="259.6"/>
+        <ellipse cx="285.25" cy="275.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M280.25,276.7562 C280.25,279.2562 282.3906,281.0687 285.3125,281.0687 C286.5469,281.0687 287.7188,280.7719 288.4688,280.2562 C289.0781,279.8344 289.4063,279.4125 289.4063,279.0062 C289.4063,278.5375 288.9844,278.1312 288.4844,278.1312 C288.25,278.1312 288.0313,278.2094 287.8281,278.4125 C287.3906,278.85 287.3906,278.85 287.2188,278.9437 C286.7656,279.1781 286.125,279.3187 285.3594,279.3187 C283.3594,279.3187 282.0781,278.3031 282.0781,276.725 L282.0781,275.6781 C282.0781,273.975 283.2969,272.7719 285,272.7719 C285.5781,272.7719 286.1563,272.9125 286.625,273.1625 C287.0938,273.4281 287.2656,273.6156 287.3281,273.975 C287.4531,274.6469 287.7031,274.8969 288.2344,274.8969 C288.5156,274.8969 288.7969,274.7562 288.9844,274.5375 C289.1094,274.3656 289.1563,274.1937 289.1563,273.7562 L289.1563,272.3969 C289.1563,271.975 289.1406,271.8344 289.0156,271.6625 C288.8438,271.4125 288.5625,271.2562 288.2344,271.2562 C287.9219,271.2562 287.7188,271.3656 287.5,271.6312 C286.3281,271.1312 285.8906,271.0219 284.9375,271.0219 C282.2656,271.0219 280.25,273.0375 280.25,275.6625 L280.25,276.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="299.75" y="280.206">AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="269" x2="331" y1="291.6" y2="291.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="269" x2="331" y1="299.6" y2="299.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="274" y="308.5"/>
+          <ellipse cx="279" cy="313.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="288" y="316.6059">b : B *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="265" y="296"/>
-      <ellipse cx="270" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <g id="elem_C_0001857294881176816154">
+        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001857294881176816154" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="99" x="250.5" y="384.4"/>
+        <ellipse cx="265.5" cy="400.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M260.5,401.5563 C260.5,404.0563 262.6406,405.8688 265.5625,405.8688 C266.7969,405.8688 267.9688,405.5719 268.7188,405.0563 C269.3281,404.6344 269.6563,404.2125 269.6563,403.8063 C269.6563,403.3375 269.2344,402.9313 268.7344,402.9313 C268.5,402.9313 268.2813,403.0094 268.0781,403.2125 C267.6406,403.65 267.6406,403.65 267.4688,403.7438 C267.0156,403.9781 266.375,404.1188 265.6094,404.1188 C263.6094,404.1188 262.3281,403.1031 262.3281,401.525 L262.3281,400.4781 C262.3281,398.775 263.5469,397.5719 265.25,397.5719 C265.8281,397.5719 266.4063,397.7125 266.875,397.9625 C267.3438,398.2281 267.5156,398.4156 267.5781,398.775 C267.7031,399.4469 267.9531,399.6969 268.4844,399.6969 C268.7656,399.6969 269.0469,399.5563 269.2344,399.3375 C269.3594,399.1656 269.4063,398.9938 269.4063,398.5563 L269.4063,397.1969 C269.4063,396.775 269.3906,396.6344 269.2656,396.4625 C269.0938,396.2125 268.8125,396.0563 268.4844,396.0563 C268.1719,396.0563 267.9688,396.1656 267.75,396.4313 C266.5781,395.9313 266.1406,395.8219 265.1875,395.8219 C262.5156,395.8219 260.5,397.8375 260.5,400.4625 L260.5,401.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="67" x="279.5" y="405.006">ns2::AAAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="251.5" x2="348.5" y1="416.4" y2="416.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="251.5" x2="348.5" y1="424.4" y2="424.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="279" y="304.2104">b : B *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000955785395599769805">
+        <rect codeLine="43" fill="#F1F1F1" height="64.7999" id="C_0000955785395599769805" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="458.5" y="10"/>
+        <ellipse cx="473.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M468.5,27.1563 C468.5,29.6563 470.6406,31.4688 473.5625,31.4688 C474.7969,31.4688 475.9688,31.1719 476.7188,30.6563 C477.3281,30.2344 477.6563,29.8125 477.6563,29.4063 C477.6563,28.9375 477.2344,28.5313 476.7344,28.5313 C476.5,28.5313 476.2813,28.6094 476.0781,28.8125 C475.6406,29.25 475.6406,29.25 475.4688,29.3438 C475.0156,29.5781 474.375,29.7188 473.6094,29.7188 C471.6094,29.7188 470.3281,28.7031 470.3281,27.125 L470.3281,26.0781 C470.3281,24.375 471.5469,23.1719 473.25,23.1719 C473.8281,23.1719 474.4063,23.3125 474.875,23.5625 C475.3438,23.8281 475.5156,24.0156 475.5781,24.375 C475.7031,25.0469 475.9531,25.2969 476.4844,25.2969 C476.7656,25.2969 477.0469,25.1563 477.2344,24.9375 C477.3594,24.7656 477.4063,24.5938 477.4063,24.1563 L477.4063,22.7969 C477.4063,22.375 477.3906,22.2344 477.2656,22.0625 C477.0938,21.8125 476.8125,21.6563 476.4844,21.6563 C476.1719,21.6563 475.9688,21.7656 475.75,22.0313 C474.5781,21.5313 474.1406,21.4219 473.1875,21.4219 C470.5156,21.4219 468.5,23.4375 468.5,26.0625 L468.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="487.5" y="30.606">ns3::F</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="535.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="536.5" y="21.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="459.5" x2="540.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="459.5" x2="540.5" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="464.5" y="58.9"/>
+          <ellipse cx="469.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="478.5" y="67.0059">t : T *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
-      <ellipse cx="258" cy="387" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M260.9688,392.6406 Q260.3906,392.9375 259.75,393.0781 Q259.1094,393.2344 258.4063,393.2344 Q255.9063,393.2344 254.5781,391.5938 Q253.2656,389.9375 253.2656,386.8125 Q253.2656,383.6875 254.5781,382.0313 Q255.9063,380.375 258.4063,380.375 Q259.1094,380.375 259.75,380.5313 Q260.4063,380.6875 260.9688,380.9844 L260.9688,383.7031 Q260.3438,383.125 259.75,382.8594 Q259.1563,382.5781 258.5313,382.5781 Q257.1875,382.5781 256.5,383.6563 Q255.8125,384.7188 255.8125,386.8125 Q255.8125,388.9063 256.5,389.9844 Q257.1875,391.0469 258.5313,391.0469 Q259.1563,391.0469 259.75,390.7813 Q260.3438,390.5 260.9688,389.9219 L260.9688,392.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="272" y="391.1543">ns2::AAAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="403" y2="403"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="411" y2="411"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
+      <g id="elem_C_0001321996888067531304">
+        <rect codeLine="48" fill="#F1F1F1" height="64.7999" id="C_0001321996888067531304" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="377.5" y="134.8"/>
+        <ellipse cx="392.5" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M387.5,151.9562 C387.5,154.4562 389.6406,156.2687 392.5625,156.2687 C393.7969,156.2687 394.9688,155.9719 395.7188,155.4562 C396.3281,155.0344 396.6563,154.6125 396.6563,154.2062 C396.6563,153.7375 396.2344,153.3312 395.7344,153.3312 C395.5,153.3312 395.2813,153.4094 395.0781,153.6125 C394.6406,154.05 394.6406,154.05 394.4688,154.1437 C394.0156,154.3781 393.375,154.5187 392.6094,154.5187 C390.6094,154.5187 389.3281,153.5031 389.3281,151.925 L389.3281,150.8781 C389.3281,149.175 390.5469,147.9719 392.25,147.9719 C392.8281,147.9719 393.4063,148.1125 393.875,148.3625 C394.3438,148.6281 394.5156,148.8156 394.5781,149.175 C394.7031,149.8469 394.9531,150.0969 395.4844,150.0969 C395.7656,150.0969 396.0469,149.9562 396.2344,149.7375 C396.3594,149.5656 396.4063,149.3937 396.4063,148.9562 L396.4063,147.5969 C396.4063,147.175 396.3906,147.0344 396.2656,146.8625 C396.0938,146.6125 395.8125,146.4562 395.4844,146.4562 C395.1719,146.4562 394.9688,146.5656 394.75,146.8312 C393.5781,146.3312 393.1406,146.2219 392.1875,146.2219 C389.5156,146.2219 387.5,148.2375 387.5,150.8625 L387.5,151.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="406.5" y="155.406">ns3::FF</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="22" x="463.5" y="131.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="20" x="464.5" y="146.0001">T,M</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="378.5" x2="481.5" y1="166.8" y2="166.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="378.5" x2="481.5" y1="174.8" y2="174.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="383.5" y="183.7"/>
+          <ellipse cx="388.5" cy="188.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="397.5" y="191.8059">m : M *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
-      <ellipse cx="462" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M464.9688,29.6406 Q464.3906,29.9375 463.75,30.0781 Q463.1094,30.2344 462.4063,30.2344 Q459.9063,30.2344 458.5781,28.5938 Q457.2656,26.9375 457.2656,23.8125 Q457.2656,20.6875 458.5781,19.0313 Q459.9063,17.375 462.4063,17.375 Q463.1094,17.375 463.75,17.5313 Q464.4063,17.6875 464.9688,17.9844 L464.9688,20.7031 Q464.3438,20.125 463.75,19.8594 Q463.1563,19.5781 462.5313,19.5781 Q461.1875,19.5781 460.5,20.6563 Q459.8125,21.7188 459.8125,23.8125 Q459.8125,25.9063 460.5,26.9844 Q461.1875,28.0469 462.5313,28.0469 Q463.1563,28.0469 463.75,27.7813 Q464.3438,27.5 464.9688,26.9219 L464.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="476" y="28.1543">ns3::F</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="522" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="523" y="17.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
+      <g id="elem_C_0002008055732881129924">
+        <rect codeLine="53" fill="#F1F1F1" height="64.7999" id="C_0002008055732881129924" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="517.5" y="134.8"/>
+        <ellipse cx="532.5" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M527.5,151.9562 C527.5,154.4562 529.6406,156.2687 532.5625,156.2687 C533.7969,156.2687 534.9688,155.9719 535.7188,155.4562 C536.3281,155.0344 536.6563,154.6125 536.6563,154.2062 C536.6563,153.7375 536.2344,153.3312 535.7344,153.3312 C535.5,153.3312 535.2813,153.4094 535.0781,153.6125 C534.6406,154.05 534.6406,154.05 534.4688,154.1437 C534.0156,154.3781 533.375,154.5187 532.6094,154.5187 C530.6094,154.5187 529.3281,153.5031 529.3281,151.925 L529.3281,150.8781 C529.3281,149.175 530.5469,147.9719 532.25,147.9719 C532.8281,147.9719 533.4063,148.1125 533.875,148.3625 C534.3438,148.6281 534.5156,148.8156 534.5781,149.175 C534.7031,149.8469 534.9531,150.0969 535.4844,150.0969 C535.7656,150.0969 536.0469,149.9562 536.2344,149.7375 C536.3594,149.5656 536.4063,149.3937 536.4063,148.9562 L536.4063,147.5969 C536.4063,147.175 536.3906,147.0344 536.2656,146.8625 C536.0938,146.6125 535.8125,146.4562 535.4844,146.4562 C535.1719,146.4562 534.9688,146.5656 534.75,146.8312 C533.5781,146.3312 533.1406,146.2219 532.1875,146.2219 C529.5156,146.2219 527.5,148.2375 527.5,150.8625 L527.5,151.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="546.5" y="155.406">ns3::FE</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="22" x="603.5" y="131.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="20" x="604.5" y="146.0001">T,M</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="518.5" x2="621.5" y1="166.8" y2="166.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="518.5" x2="621.5" y1="174.8" y2="174.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="523.5" y="183.7"/>
+          <ellipse cx="528.5" cy="188.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="537.5" y="191.8059">m : M *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="453" y="54"/>
-      <ellipse cx="458" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
+      <g id="elem_C_0001617455840736919039">
+        <rect codeLine="58" fill="#F1F1F1" height="64.7999" id="C_0001617455840736919039" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="126" x="367" y="259.6"/>
+        <ellipse cx="382" cy="275.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M377,276.7562 C377,279.2562 379.1406,281.0687 382.0625,281.0687 C383.2969,281.0687 384.4688,280.7719 385.2188,280.2562 C385.8281,279.8344 386.1563,279.4125 386.1563,279.0062 C386.1563,278.5375 385.7344,278.1312 385.2344,278.1312 C385,278.1312 384.7813,278.2094 384.5781,278.4125 C384.1406,278.85 384.1406,278.85 383.9688,278.9437 C383.5156,279.1781 382.875,279.3187 382.1094,279.3187 C380.1094,279.3187 378.8281,278.3031 378.8281,276.725 L378.8281,275.6781 C378.8281,273.975 380.0469,272.7719 381.75,272.7719 C382.3281,272.7719 382.9063,272.9125 383.375,273.1625 C383.8438,273.4281 384.0156,273.6156 384.0781,273.975 C384.2031,274.6469 384.4531,274.8969 384.9844,274.8969 C385.2656,274.8969 385.5469,274.7562 385.7344,274.5375 C385.8594,274.3656 385.9063,274.1937 385.9063,273.7562 L385.9063,272.3969 C385.9063,271.975 385.8906,271.8344 385.7656,271.6625 C385.5938,271.4125 385.3125,271.2562 384.9844,271.2562 C384.6719,271.2562 384.4688,271.3656 384.25,271.6312 C383.0781,271.1312 382.6406,271.0219 381.6875,271.0219 C379.0156,271.0219 377,273.0375 377,275.6625 L377,276.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="396" y="280.206">ns3::FFF</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="34" x="462" y="256.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="32" x="463" y="270.8001">T,M,N</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="368" x2="492" y1="291.6" y2="291.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="368" x2="492" y1="299.6" y2="299.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="373" y="308.5"/>
+          <ellipse cx="378" cy="313.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="387" y="316.6059">n : N *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="467" y="62.2104">t : T *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
-      <ellipse cx="382.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M385.4688,150.6406 Q384.8906,150.9375 384.25,151.0781 Q383.6094,151.2344 382.9063,151.2344 Q380.4063,151.2344 379.0781,149.5938 Q377.7656,147.9375 377.7656,144.8125 Q377.7656,141.6875 379.0781,140.0313 Q380.4063,138.375 382.9063,138.375 Q383.6094,138.375 384.25,138.5313 Q384.9063,138.6875 385.4688,138.9844 L385.4688,141.7031 Q384.8438,141.125 384.25,140.8594 Q383.6563,140.5781 383.0313,140.5781 Q381.6875,140.5781 381,141.6563 Q380.3125,142.7188 380.3125,144.8125 Q380.3125,146.9063 381,147.9844 Q381.6875,149.0469 383.0313,149.0469 Q383.6563,149.0469 384.25,148.7813 Q384.8438,148.5 385.4688,147.9219 L385.4688,150.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="396.5" y="149.1543">ns3::FF</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="23" x="449.5" y="126"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="450.5" y="138.1387">T,M</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="161" y2="161"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="169" y2="169"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="373.5" y="175"/>
-      <ellipse cx="378.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="387.5" y="183.2104">m : M *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
-      <ellipse cx="520" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M522.9688,150.6406 Q522.3906,150.9375 521.75,151.0781 Q521.1094,151.2344 520.4063,151.2344 Q517.9063,151.2344 516.5781,149.5938 Q515.2656,147.9375 515.2656,144.8125 Q515.2656,141.6875 516.5781,140.0313 Q517.9063,138.375 520.4063,138.375 Q521.1094,138.375 521.75,138.5313 Q522.4063,138.6875 522.9688,138.9844 L522.9688,141.7031 Q522.3438,141.125 521.75,140.8594 Q521.1563,140.5781 520.5313,140.5781 Q519.1875,140.5781 518.5,141.6563 Q517.8125,142.7188 517.8125,144.8125 Q517.8125,146.9063 518.5,147.9844 Q519.1875,149.0469 520.5313,149.0469 Q521.1563,149.0469 521.75,148.7813 Q522.3438,148.5 522.9688,147.9219 L522.9688,150.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="534" y="149.1543">ns3::FE</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="23" x="588" y="126"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="589" y="138.1387">T,M</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="161" y2="161"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="169" y2="169"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="511" y="175"/>
-      <ellipse cx="516" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="525" y="183.2104">m : M *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1txs7517z09fy)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
-      <ellipse cx="372.5" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M375.4688,271.6406 Q374.8906,271.9375 374.25,272.0781 Q373.6094,272.2344 372.9063,272.2344 Q370.4063,272.2344 369.0781,270.5938 Q367.7656,268.9375 367.7656,265.8125 Q367.7656,262.6875 369.0781,261.0313 Q370.4063,259.375 372.9063,259.375 Q373.6094,259.375 374.25,259.5313 Q374.9063,259.6875 375.4688,259.9844 L375.4688,262.7031 Q374.8438,262.125 374.25,261.8594 Q373.6563,261.5781 373.0313,261.5781 Q371.6875,261.5781 371,262.6563 Q370.3125,263.7188 370.3125,265.8125 Q370.3125,267.9063 371,268.9844 Q371.6875,270.0469 373.0313,270.0469 Q373.6563,270.0469 374.25,269.7813 Q374.8438,269.5 375.4688,268.9219 L375.4688,271.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="386.5" y="270.1543">ns3::FFF</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="36" x="446.5" y="247"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="34" x="447.5" y="259.1387">T,M,N</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="282" y2="282"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="290" y2="290"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="296"/>
-      <ellipse cx="368.5" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="377.5" y="304.2104">n : N *</text>
-    </a>
-    <path d="M34.31,82.88 C33.42,100.62 32.42,120.44 31.67,135.33 " fill="none" id="C_0000241234977032861936&lt;-C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="27.33,82.35,35.33,62.73,41.31,83.05,27.33,82.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M89.42,78.82 C75.58,97.54 59.49,119.29 47.63,135.33 " fill="none" id="C_0001975187139659616784&lt;-C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="83.8,74.65,101.32,62.73,95.06,82.97,83.8,74.65" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M147.58,78.82 C161.42,97.54 177.51,119.29 189.37,135.33 " fill="none" id="C_0001975187139659616784&lt;-C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="141.94,82.97,135.68,62.73,153.2,74.65,141.94,82.97" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M202.69,82.88 C203.58,100.62 204.58,120.44 205.33,135.33 " fill="none" id="C_0001959131184346890363&lt;-C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="195.69,83.05,201.67,62.73,209.67,82.35,195.69,83.05" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M63.99,79.4 C76.8,97.99 91.6,119.46 102.54,135.33 " fill="none" id="C_0000241234977032861936&lt;-C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="58.09,83.17,52.51,62.73,69.62,75.22,58.09,83.17" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M118.5,82.88 C118.5,100.62 118.5,120.44 118.5,135.33 " fill="none" id="C_0001975187139659616784&lt;-C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="111.5,82.73,118.5,62.73,125.5,82.73,111.5,82.73" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M173.01,79.4 C160.2,97.99 145.4,119.46 134.46,135.33 " fill="none" id="C_0001959131184346890363&lt;-C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="167.38,75.22,184.49,62.73,178.91,83.17,167.38,75.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M290.5,82.88 C290.5,100.62 290.5,120.44 290.5,135.33 " fill="none" id="C_0001051171525946759825&lt;-C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="283.5,82.73,290.5,62.73,297.5,82.73,283.5,82.73" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M290.5,203.9 C290.5,219.22 290.5,236.09 290.5,249.99 " fill="none" id="C_0001761969273600680013&lt;-C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="283.5,203.73,290.5,183.73,297.5,203.73,283.5,203.73" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M290.5,331.11 C290.5,344.88 290.5,359.18 290.5,370.67 " fill="none" id="C_0002158483243842147804&lt;-C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="283.5,331.06,290.5,311.06,297.5,331.06,283.5,331.06" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M459.99,86.94 C451.81,101.05 443.08,116.1 435.75,128.74 " fill="none" id="C_0000955785395599769805&lt;-C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="454.18,83.01,470.27,69.22,466.29,90.03,454.18,83.01" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M515.01,86.94 C523.19,101.05 531.92,116.1 539.25,128.74 " fill="none" id="C_0000955785395599769805&lt;-C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="508.71,90.03,504.73,69.22,520.82,83.01,508.71,90.03" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M418.5,210.33 C418.5,223.73 418.5,237.81 418.5,249.74 " fill="none" id="C_0001321996888067531304&lt;-C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="411.5,210.22,418.5,190.22,425.5,210.22,411.5,210.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000241234977032861936_C_0000850483622527996929">
+      <path codeLine="62" d="M37.6419,84.7606 C36.3919,106.6106 35.57,121.08 34.33,142.9 " fill="none" id="C_0000241234977032861936-backto-C_0000850483622527996929" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="38.67,66.79,31.6517,84.4179,43.6321,85.1033,38.67,66.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001975187139659616784_C_0000850483622527996929">
+      <path codeLine="63" d="M95.9538,81.2525 C79.7638,103.1025 66.44,121.08 50.27,142.9 " fill="none" id="C_0001975187139659616784-backto-C_0000850483622527996929" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="106.67,66.79,91.133,77.6805,100.7747,84.8246,106.67,66.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001975187139659616784_C_0001316022308303681160">
+      <path codeLine="64" d="M152.0462,81.2525 C168.2362,103.1025 181.56,121.08 197.73,142.9 " fill="none" id="C_0001975187139659616784-backto-C_0001316022308303681160" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="141.33,66.79,147.2253,84.8246,156.867,77.6805,141.33,66.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001959131184346890363_C_0001316022308303681160">
+      <path codeLine="65" d="M210.3581,84.7606 C211.6081,106.6106 212.43,121.08 213.67,142.9 " fill="none" id="C_0001959131184346890363-backto-C_0001316022308303681160" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="209.33,66.79,204.3679,85.1033,216.3483,84.4179,209.33,66.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000241234977032861936_C_0001877487144594774465">
+      <path codeLine="66" d="M66.1597,81.6487 C81.0997,103.4987 93.13,121.08 108.06,142.9 " fill="none" id="C_0000241234977032861936-backto-C_0001877487144594774465" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="56,66.79,61.2068,85.0353,71.1126,78.2621,56,66.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001975187139659616784_C_0001877487144594774465">
+      <path codeLine="67" d="M124,84.79 C124,106.64 124,121.08 124,142.9 " fill="none" id="C_0001975187139659616784-backto-C_0001877487144594774465" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="124,66.79,118,84.79,130,84.79,124,66.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001959131184346890363_C_0001877487144594774465">
+      <path codeLine="68" d="M181.8403,81.6487 C166.9003,103.4987 154.87,121.08 139.94,142.9 " fill="none" id="C_0001959131184346890363-backto-C_0001877487144594774465" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="192,66.79,176.8874,78.2621,186.7932,85.0353,192,66.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001051171525946759825_C_0001761969273600680013">
+      <path codeLine="69" d="M300,84.79 C300,106.64 300,121.08 300,142.9 " fill="none" id="C_0001051171525946759825-backto-C_0001761969273600680013" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="300,66.79,294,84.79,306,84.79,300,66.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001761969273600680013_C_0002158483243842147804">
+      <path codeLine="70" d="M300,209.59 C300,228.79 300,238.18 300,259.35 " fill="none" id="C_0001761969273600680013-backto-C_0002158483243842147804" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="300,191.59,294,209.59,306,209.59,300,191.59" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002158483243842147804_C_0001857294881176816154">
+      <path codeLine="71" d="M300,342.87 C300,361.64 300,366.98 300,384.05 " fill="none" id="C_0002158483243842147804-backto-C_0001857294881176816154" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="300,324.87,294,342.87,306,342.87,300,324.87" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000955785395599769805_C_0001321996888067531304">
+      <path codeLine="72" d="M473.0588,90.6594 C462.6088,108.9994 458.41,116.37 447.97,134.68 " fill="none" id="C_0000955785395599769805-backto-C_0001321996888067531304" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="481.97,75.02,467.8457,87.689,478.2719,93.6298,481.97,75.02" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000955785395599769805_C_0002008055732881129924">
+      <path codeLine="73" d="M526.9412,90.6594 C537.3912,108.9994 541.59,116.37 552.03,134.68 " fill="none" id="C_0000955785395599769805-backto-C_0002008055732881129924" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="518.03,75.02,521.7281,93.6298,532.1543,87.689,518.03,75.02" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001321996888067531304_C_0001617455840736919039">
+      <path codeLine="74" d="M430,217.82 C430,236.16 430,241.17 430,259.48 " fill="none" id="C_0001321996888067531304-backto-C_0001617455840736919039" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="430,199.82,424,217.82,436,217.82,430,199.82" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00039_class_mermaid.svg b/docs/test_cases/t00039_class_mermaid.svg
index 403290f4..1b7fa36d 100644
--- a/docs/test_cases/t00039_class_mermaid.svg
+++ b/docs/test_cases/t00039_class_mermaid.svg
@@ -1,68 +1,73 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 689.1796875 460" style="max-width: 689.18px; background-color: white;" width="689.1796875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M23.323037790697676,76L22.537427325581394,82C21.751816860465116,88,20.18059593023256,100,20.180595930232556,112C20.18059593023256,124,21.751816860465116,136,22.537427325581394,142L23.323037790697676,148"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M95.890625,65.83305467313158L90.31640625,73.52754556094298C84.7421875,81.2220364487544,73.59375,96.61101822437719,64.72738008720931,110.30550911218859C55.8610101744186,124,49.27670784883721,136,45.98455668604652,142L42.692405523255815,148"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M105.44022529069767,76L104.65461482558139,82C103.86900436046511,88,102.29778343023254,100,102.95912063953487,112C103.6204578488372,124,106.51435319767442,136,107.96130087209303,142L109.40824854651163,148"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M188.0078125,63.403579200120056L181.470703125,71.50298266676671C174.93359375,79.60238613341336,161.859375,95.80119306670669,152.29864643895348,109.90059653335334C142.73791787790697,124,136.69067950581396,136,133.66706031976744,142L130.64344113372093,148"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M40.3359375,53.544152909075876L61.744140625,63.286794090896564C83.15234375,73.02943527271725,125.96875,92.51471763635863,151.28938045058138,108.2573588181793C176.61001090116278,124,184.4348655523256,136,188.34729287790697,142L192.25972020348837,148"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M122.453125,58.2600215887346L133.50846354166666,67.21668465727883C144.56380208333334,76.17334772582306,166.67447916666666,94.08667386291154,179.78177991763565,109.04333693145577C192.88908066860463,124,196.9930050872093,136,199.04496729651166,142L201.09692950581396,148"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M213.6796875,62.44795119542986L220.771484375,70.70662599619155C227.86328125,78.96530079695323,242.046875,95.48265039847662,244.91665152616278,109.7413251992383C247.7864280523256,124,239.34238735465115,136,235.12036700581393,142L230.89834665697674,148"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M304.2890625,76L304.2890625,82C304.2890625,88,304.2890625,100,304.2890625,112C304.2890625,124,304.2890625,136,304.2890625,142L304.2890625,148"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M304.2890625,205L304.2890625,211C304.2890625,217,304.2890625,229,304.2890625,239.16666666666666C304.2890625,249.33333333333334,304.2890625,257.6666666666667,304.2890625,261.8333333333333L304.2890625,266"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M304.2890625,345L304.2890625,349.1666666666667C304.2890625,353.3333333333333,304.2890625,361.6666666666667,304.2890625,370C304.2890625,378.3333333333333,304.2890625,386.6666666666667,304.2890625,390.8333333333333L304.2890625,395"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M496.9765625,80.91146801168038L489.8841145833333,86.09289000973365C482.7916666666667,91.27431200778692,468.6067708333333,101.63715600389345,461.5143229166667,110.9852446686134C454.421875,120.33333333333333,454.421875,128.66666666666666,454.421875,132.83333333333334L454.421875,137"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M588.4453125,84.65271081373609L594.0559895833334,89.21059234478008C599.6666666666666,93.76847387582406,610.8880208333334,102.88423693791204,616.4986979166666,111.60878513562268C622.109375,120.33333333333333,622.109375,128.66666666666666,622.109375,132.83333333333334L622.109375,137"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M454.421875,216L454.421875,220.16666666666666C454.421875,224.33333333333334,454.421875,232.66666666666666,454.421875,241C454.421875,249.33333333333334,454.421875,257.6666666666667,454.421875,261.8333333333333L454.421875,266"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M20.98615303708822,93.84766006086926L20.59002336424018,96.87305005072437C20.193893691392145,99.8984400405795,19.40163434569607,105.94922002028976,19.791115137964315,114.97461001014487C20.18059593023256,124,21.751816860465116,136,22.537427325581394,142L23.323037790697676,148"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M85.33053300050025,80.40990127869418L81.51632958375022,85.67491773224515C77.70212616700017,90.93993418579612,70.07371933350008,101.46996709289806,62.96736475395935,112.73498354644903C55.8610101744186,124,49.27670784883721,136,45.98455668604652,142L42.692405523255815,148"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M103.10334053708822,93.84766006086926L102.70721086424017,96.87305005072437C102.31108119139215,99.8984400405795,101.51882184569608,105.94922002028976,102.56963984726663,114.97461001014487C103.6204578488372,124,106.51435319767442,136,107.96130087209303,142L109.40824854651163,148"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M176.70268159604018,77.41050660209984L172.0497607050335,83.17542216841655C167.39683981402678,88.94033773473323,158.0909980320134,100.47016886736662,150.41445795496017,112.23508443368331C142.73791787790697,124,136.69067950581396,136,133.66706031976744,142L130.64344113372093,148"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M56.71917680603348,60.999987526423524L75.39684004669456,69.49998960535294C94.07450328735565,77.99999168428235,131.42982976867782,94.99999584214117,154.01992033492033,109.49999792107059C176.61001090116278,124,184.4348655523256,136,188.34729287790697,142L192.25972020348837,148"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M136.43913694045324,69.59101757326745L145.16347349204435,76.6591813110562C153.88781004363548,83.72734504884497,171.33648314681773,97.86367252442248,182.1127819077112,110.93183626221123C192.88908066860463,124,196.9930050872093,136,199.04496729651166,142L201.09692950581396,148"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M225.40625518329028,76.10399785503131L230.54362411107525,82.08666487919275C235.68099303886018,88.06933190335421,245.9557308944301,100.0346659516771,246.87107947337782,112.01733297583856C247.7864280523256,124,239.34238735465115,136,235.12036700581393,142L230.89834665697674,148"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M304.2890625,94L304.2890625,97C304.2890625,100,304.2890625,106,304.2890625,115C304.2890625,124,304.2890625,136,304.2890625,142L304.2890625,148"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M304.2890625,223L304.2890625,226C304.2890625,229,304.2890625,235,304.2890625,242.16666666666666C304.2890625,249.33333333333334,304.2890625,257.6666666666667,304.2890625,261.8333333333333L304.2890625,266"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M304.2890625,363L304.2890625,364.1666666666667C304.2890625,365.3333333333333,304.2890625,367.6666666666667,304.2890625,373C304.2890625,378.3333333333333,304.2890625,386.6666666666667,304.2890625,390.8333333333333L304.2890625,395"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M482.44203787588896,91.52973500545623L477.77201072990744,94.94144583788018C473.1019835839259,98.35315667030416,463.761929291963,105.17657833515209,459.0919021459815,112.75495583424271C454.421875,120.33333333333333,454.421875,128.66666666666666,454.421875,132.83333333333334L454.421875,137"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M602.4163315893176,96.0021877006205L605.698505491098,98.66848975051708C608.9806793928784,101.33479180041365,615.5450271964392,106.66739590020683,618.8272010982196,113.50036461677009C622.109375,120.33333333333333,622.109375,128.66666666666666,622.109375,132.83333333333334L622.109375,137"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M454.421875,234L454.421875,235.16666666666666C454.421875,236.33333333333334,454.421875,238.66666666666666,454.421875,244C454.421875,249.33333333333334,454.421875,257.6666666666667,454.421875,261.8333333333333L454.421875,266"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -184,7 +189,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L6">
+        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L6">
           <g title="C" id="classId-C_0000241234977032861936-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -203,7 +208,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L8">
+        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L8">
           <g title="D" id="classId-C_0001975187139659616784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +227,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L10">
+        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L10">
           <g title="E" id="classId-C_0001959131184346890363-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -241,7 +246,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L16">
+        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L16">
           <g title="CD" id="classId-C_0000850483622527996929-3" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -260,7 +265,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L18">
+        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L18">
           <g title="DE" id="classId-C_0001316022308303681160-4" class="node default clickable">
             <rect height="57" width="37.234375" y="-28.5" x="-18.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.6171875" x1="-18.6171875" class="divider"/>
@@ -279,7 +284,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L20">
+        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L20">
           <g title="CDE" id="classId-C_0001877487144594774465-5" class="node default clickable">
             <rect height="57" width="48.78125" y="-28.5" x="-24.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.390625" x1="-24.390625" class="divider"/>
@@ -298,7 +303,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L22">
+        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L22">
           <g title="A" id="classId-C_0001051171525946759825-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -317,7 +322,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L24">
+        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L24">
           <g title="AA" id="classId-C_0001761969273600680013-7" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -336,7 +341,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L26">
+        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L26">
           <g title="AAA" id="classId-C_0002158483243842147804-8" class="node default clickable">
             <rect height="79" width="57.25" y="-39.5" x="-28.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.625" x1="-28.625" class="divider"/>
@@ -354,13 +359,13 @@
               </foreignObject>
               <foreignObject transform="translate( -21.125, 2)" height="18" width="42.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+b : B </span>
+                  <span style="font-style:italic;" class="nodeLabel">+b : B</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L31">
+        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L31">
           <g title="AAAA" id="classId-C_0001857294881176816154-9" class="node default clickable">
             <rect height="57" width="99.453125" y="-28.5" x="-49.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="49.7265625" x1="-49.7265625" class="divider"/>
@@ -379,7 +384,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L39">
+        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L39">
           <g title="F" id="classId-C_0000955785395599769805-10" class="node default clickable">
             <rect height="79" width="91.46875" y="-39.5" x="-45.734375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="45.734375" x1="-45.734375" class="divider"/>
@@ -397,13 +402,13 @@
               </foreignObject>
               <foreignObject transform="translate( -38.234375, 2)" height="18" width="36.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+t : T </span>
+                  <span style="font-style:italic;" class="nodeLabel">+t : T</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L43">
+        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L43">
           <g title="FF" id="classId-C_0001321996888067531304-11" class="node default clickable">
             <rect height="79" width="117.234375" y="-39.5" x="-58.6171875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -421,13 +426,13 @@
               </foreignObject>
               <foreignObject transform="translate( -51.1171875, 2)" height="18" width="49.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m : M </span>
+                  <span style="font-style:italic;" class="nodeLabel">+m : M</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L47">
+        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L47">
           <g title="FE" id="classId-C_0002008055732881129924-12" class="node default clickable">
             <rect height="79" width="118.140625" y="-39.5" x="-59.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="59.0703125" x1="-59.0703125" class="divider"/>
@@ -445,13 +450,13 @@
               </foreignObject>
               <foreignObject transform="translate( -51.5703125, 2)" height="18" width="49.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m : M </span>
+                  <span style="font-style:italic;" class="nodeLabel">+m : M</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00039/t00039.cc#L51">
+        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L51">
           <g title="FFF" id="classId-C_0001617455840736919039-13" class="node default clickable">
             <rect height="79" width="143.015625" y="-39.5" x="-71.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.5078125" x1="-71.5078125" class="divider"/>
@@ -469,7 +474,7 @@
               </foreignObject>
               <foreignObject transform="translate( -64.0078125, 2)" height="18" width="43.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+n : N </span>
+                  <span style="font-style:italic;" class="nodeLabel">+n : N</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00040.md b/docs/test_cases/t00040.md
index c3826184..e056f27a 100644
--- a/docs/test_cases/t00040.md
+++ b/docs/test_cases/t00040.md
@@ -21,7 +21,7 @@ diagrams:
         - clanguml::t00040::B
 ```
 ## Source code
-File t00040.cc
+File `tests/t00040/t00040.cc`
 ```cpp
 namespace clanguml::t00040 {
 
@@ -112,6 +112,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -221,6 +222,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -269,6 +271,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg
index aab8e213..10544533 100644
--- a/docs/test_cases/t00040_class.svg
+++ b/docs/test_cases/t00040_class.svg
@@ -1,84 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="334px" preserveAspectRatio="none" style="width:265px;height:334px;" version="1.1" viewBox="0 0 265 334" width="265px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="345px" preserveAspectRatio="none" style="width:279px;height:345px;background:#FFFFFF;" version="1.1" viewBox="0 0 279 345" width="279px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fe81jgmh5llj0" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe81jgmh5llj0)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
-      <ellipse cx="50.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M53.9188,29.6406 Q53.3406,29.9375 52.7,30.0781 Q52.0594,30.2344 51.3563,30.2344 Q48.8563,30.2344 47.5281,28.5938 Q46.2156,26.9375 46.2156,23.8125 Q46.2156,20.6875 47.5281,19.0313 Q48.8563,17.375 51.3563,17.375 Q52.0594,17.375 52.7,17.5313 Q53.3563,17.6875 53.9188,17.9844 L53.9188,20.7031 Q53.2938,20.125 52.7,19.8594 Q52.1063,19.5781 51.4813,19.5781 Q50.1375,19.5781 49.45,20.6563 Q48.7625,21.7188 48.7625,23.8125 Q48.7625,25.9063 49.45,26.9844 Q50.1375,28.0469 51.4813,28.0469 Q52.1063,28.0469 52.7,27.7813 Q53.2938,27.5 53.9188,26.9219 L53.9188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="70.05" y="28.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000307580006083737677">
+        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0000307580006083737677" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="99" x="15" y="7"/>
+        <ellipse cx="56.1" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M51.1,24.1563 C51.1,26.6563 53.2406,28.4688 56.1625,28.4688 C57.3969,28.4688 58.5688,28.1719 59.3188,27.6563 C59.9281,27.2344 60.2563,26.8125 60.2563,26.4063 C60.2563,25.9375 59.8344,25.5313 59.3344,25.5313 C59.1,25.5313 58.8813,25.6094 58.6781,25.8125 C58.2406,26.25 58.2406,26.25 58.0688,26.3438 C57.6156,26.5781 56.975,26.7188 56.2094,26.7188 C54.2094,26.7188 52.9281,25.7031 52.9281,24.125 L52.9281,23.0781 C52.9281,21.375 54.1469,20.1719 55.85,20.1719 C56.4281,20.1719 57.0063,20.3125 57.475,20.5625 C57.9438,20.8281 58.1156,21.0156 58.1781,21.375 C58.3031,22.0469 58.5531,22.2969 59.0844,22.2969 C59.3656,22.2969 59.6469,22.1563 59.8344,21.9375 C59.9594,21.7656 60.0063,21.5938 60.0063,21.1563 L60.0063,19.7969 C60.0063,19.375 59.9906,19.2344 59.8656,19.0625 C59.6938,18.8125 59.4125,18.6563 59.0844,18.6563 C58.7719,18.6563 58.5688,18.7656 58.35,19.0313 C57.1781,18.5313 56.7406,18.4219 55.7875,18.4219 C53.1156,18.4219 51.1,20.4375 51.1,23.0625 L51.1,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="75.9" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="16" x2="113" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21" y="47.9"/>
+          <ellipse cx="26" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="73" x="35" y="56.0059">get_a() : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="16" x2="113" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21" y="72.6999"/>
+          <polygon fill="none" points="26,72.6999,30,76.6999,26,80.6999,22,76.6999" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="35" y="80.8059">ii_ : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
-      <ellipse cx="24" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <g id="elem_C_0000534115812779766127">
+        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0000534115812779766127" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="39.5" y="148.6"/>
+        <ellipse cx="54.5" cy="164.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M49.5,165.7563 C49.5,168.2563 51.6406,170.0688 54.5625,170.0688 C55.7969,170.0688 56.9688,169.7719 57.7188,169.2563 C58.3281,168.8344 58.6563,168.4125 58.6563,168.0063 C58.6563,167.5375 58.2344,167.1313 57.7344,167.1313 C57.5,167.1313 57.2813,167.2094 57.0781,167.4125 C56.6406,167.85 56.6406,167.85 56.4688,167.9438 C56.0156,168.1781 55.375,168.3188 54.6094,168.3188 C52.6094,168.3188 51.3281,167.3031 51.3281,165.725 L51.3281,164.6781 C51.3281,162.975 52.5469,161.7719 54.25,161.7719 C54.8281,161.7719 55.4063,161.9125 55.875,162.1625 C56.3438,162.4281 56.5156,162.6156 56.5781,162.975 C56.7031,163.6469 56.9531,163.8969 57.4844,163.8969 C57.7656,163.8969 58.0469,163.7563 58.2344,163.5375 C58.3594,163.3656 58.4063,163.1938 58.4063,162.7563 L58.4063,161.3969 C58.4063,160.975 58.3906,160.8344 58.2656,160.6625 C58.0938,160.4125 57.8125,160.2563 57.4844,160.2563 C57.1719,160.2563 56.9688,160.3656 56.75,160.6313 C55.5781,160.1313 55.1406,160.0219 54.1875,160.0219 C51.5156,160.0219 49.5,162.0375 49.5,164.6625 L49.5,165.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="68.5" y="169.206">AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="40.5" x2="88.5" y1="180.6" y2="180.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="40.5" x2="88.5" y1="188.6" y2="188.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="54.2104">get_a() : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <g id="elem_C_0000745371908432158369">
+        <rect codeLine="12" fill="#F1F1F1" height="81.5999" id="C_0000745371908432158369" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="115" x="7" y="256.6"/>
+        <ellipse cx="47.2" cy="272.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M42.2,273.7562 C42.2,276.2562 44.3406,278.0687 47.2625,278.0687 C48.4969,278.0687 49.6688,277.7719 50.4188,277.2562 C51.0281,276.8344 51.3563,276.4125 51.3563,276.0062 C51.3563,275.5375 50.9344,275.1312 50.4344,275.1312 C50.2,275.1312 49.9813,275.2094 49.7781,275.4125 C49.3406,275.85 49.3406,275.85 49.1688,275.9437 C48.7156,276.1781 48.075,276.3187 47.3094,276.3187 C45.3094,276.3187 44.0281,275.3031 44.0281,273.725 L44.0281,272.6781 C44.0281,270.975 45.2469,269.7719 46.95,269.7719 C47.5281,269.7719 48.1063,269.9125 48.575,270.1625 C49.0438,270.4281 49.2156,270.6156 49.2781,270.975 C49.4031,271.6469 49.6531,271.8969 50.1844,271.8969 C50.4656,271.8969 50.7469,271.7562 50.9344,271.5375 C51.0594,271.3656 51.1063,271.1937 51.1063,270.7562 L51.1063,269.3969 C51.1063,268.975 51.0906,268.8344 50.9656,268.6625 C50.7938,268.4125 50.5125,268.2562 50.1844,268.2562 C49.8719,268.2562 49.6688,268.3656 49.45,268.6312 C48.2781,268.1312 47.8406,268.0219 46.8875,268.0219 C44.2156,268.0219 42.2,270.0375 42.2,272.6625 L42.2,273.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="66.8" y="277.206">AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="121" y1="288.6" y2="288.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="297.5"/>
+          <ellipse cx="18" cy="302.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="27" y="305.6059">get_aaa() : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="121" y1="313.3999" y2="313.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="322.2999"/>
+          <ellipse cx="18" cy="327.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="27" y="330.4059">b : B *</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="66.8047"/>
-      <polygon fill="none" points="24,66.8047,28,70.8047,24,74.8047,20,70.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001539035020975101539">
+        <rect codeLine="18" fill="#F1F1F1" height="64.7999" id="C_0001539035020975101539" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="148.5" y="15.4"/>
+        <ellipse cx="201.25" cy="31.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M196.25,32.5562 C196.25,35.0562 198.3906,36.8687 201.3125,36.8687 C202.5469,36.8687 203.7188,36.5719 204.4688,36.0562 C205.0781,35.6344 205.4063,35.2125 205.4063,34.8062 C205.4063,34.3375 204.9844,33.9312 204.4844,33.9312 C204.25,33.9312 204.0313,34.0094 203.8281,34.2125 C203.3906,34.65 203.3906,34.65 203.2188,34.7437 C202.7656,34.9781 202.125,35.1187 201.3594,35.1187 C199.3594,35.1187 198.0781,34.1031 198.0781,32.525 L198.0781,31.4781 C198.0781,29.775 199.2969,28.5719 201,28.5719 C201.5781,28.5719 202.1563,28.7125 202.625,28.9625 C203.0938,29.2281 203.2656,29.4156 203.3281,29.775 C203.4531,30.4469 203.7031,30.6969 204.2344,30.6969 C204.5156,30.6969 204.7969,30.5562 204.9844,30.3375 C205.1094,30.1656 205.1563,29.9937 205.1563,29.5562 L205.1563,28.1969 C205.1563,27.775 205.1406,27.6344 205.0156,27.4625 C204.8438,27.2125 204.5625,27.0562 204.2344,27.0562 C203.9219,27.0562 203.7188,27.1656 203.5,27.4312 C202.3281,26.9312 201.8906,26.8219 200.9375,26.8219 C198.2656,26.8219 196.25,28.8375 196.25,31.4625 L196.25,32.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="221.75" y="36.006">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="149.5" x2="271.5" y1="47.4" y2="47.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="154.5" y="56.3"/>
+          <ellipse cx="159.5" cy="61.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="168.5" y="64.4059">foo(A * a) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="149.5" x2="271.5" y1="72.1999" y2="72.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="33" y="75.0151">ii_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe81jgmh5llj0)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
-      <ellipse cx="49.5" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M52.4688,163.6406 Q51.8906,163.9375 51.25,164.0781 Q50.6094,164.2344 49.9063,164.2344 Q47.4063,164.2344 46.0781,162.5938 Q44.7656,160.9375 44.7656,157.8125 Q44.7656,154.6875 46.0781,153.0313 Q47.4063,151.375 49.9063,151.375 Q50.6094,151.375 51.25,151.5313 Q51.9063,151.6875 52.4688,151.9844 L52.4688,154.7031 Q51.8438,154.125 51.25,153.8594 Q50.6563,153.5781 50.0313,153.5781 Q48.6875,153.5781 48,154.6563 Q47.3125,155.7188 47.3125,157.8125 Q47.3125,159.9063 48,160.9844 Q48.6875,162.0469 50.0313,162.0469 Q50.6563,162.0469 51.25,161.7813 Q51.8438,161.5 52.4688,160.9219 L52.4688,163.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="63.5" y="162.1543">AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="174" y2="174"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="182" y2="182"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe81jgmh5llj0)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
-      <ellipse cx="43.05" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M46.0188,271.6406 Q45.4406,271.9375 44.8,272.0781 Q44.1594,272.2344 43.4563,272.2344 Q40.9563,272.2344 39.6281,270.5938 Q38.3156,268.9375 38.3156,265.8125 Q38.3156,262.6875 39.6281,261.0313 Q40.9563,259.375 43.4563,259.375 Q44.1594,259.375 44.8,259.5313 Q45.4563,259.6875 46.0188,259.9844 L46.0188,262.7031 Q45.3938,262.125 44.8,261.8594 Q44.2063,261.5781 43.5813,261.5781 Q42.2375,261.5781 41.55,262.6563 Q40.8625,263.7188 40.8625,265.8125 Q40.8625,267.9063 41.55,268.9844 Q42.2375,270.0469 43.5813,270.0469 Q44.2063,270.0469 44.8,269.7813 Q45.3938,269.5 46.0188,268.9219 L46.0188,271.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="61.95" y="270.1543">AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="282" y2="282"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="288"/>
-      <ellipse cx="17" cy="293" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="26" y="296.2104">get_aaa() : int</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="302.8047" y2="302.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="308.8047"/>
-      <ellipse cx="17" cy="313.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="26" y="317.0151">b : B *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe81jgmh5llj0)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
-      <ellipse cx="188.25" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M191.2188,36.1406 Q190.6406,36.4375 190,36.5781 Q189.3594,36.7344 188.6563,36.7344 Q186.1563,36.7344 184.8281,35.0938 Q183.5156,33.4375 183.5156,30.3125 Q183.5156,27.1875 184.8281,25.5313 Q186.1563,23.875 188.6563,23.875 Q189.3594,23.875 190,24.0313 Q190.6563,24.1875 191.2188,24.4844 L191.2188,27.2031 Q190.5938,26.625 190,26.3594 Q189.4063,26.0781 188.7813,26.0781 Q187.4375,26.0781 186.75,27.1563 Q186.0625,28.2188 186.0625,30.3125 Q186.0625,32.4063 186.75,33.4844 Q187.4375,34.5469 188.7813,34.5469 Q189.4063,34.5469 190,34.2813 Q190.5938,34 191.2188,33.4219 L191.2188,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="208.75" y="34.6543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="46.5" y2="46.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="145" y="52.5"/>
-      <ellipse cx="150" cy="57.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="159" y="60.7104">foo(A * a) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="67.3047" y2="67.3047"/>
-    <path d="M58.5,102.07 C58.5,116.12 58.5,130.43 58.5,141.85 " fill="none" id="C_0000307580006083737677&lt;-C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="51.5,102.03,58.5,82.03,65.5,102.03,51.5,102.03" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M58.5,210.43 C58.5,223.33 58.5,237.32 58.5,249.71 " fill="none" id="C_0000534115812779766127&lt;-C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="51.5,210.23,58.5,190.23,65.5,210.23,51.5,210.23" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000307580006083737677_C_0000534115812779766127">
+      <path codeLine="22" d="M64.5,107.01 C64.5,126.6 64.5,131.46 64.5,148.16 " fill="none" id="C_0000307580006083737677-backto-C_0000534115812779766127" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="64.5,89.01,58.5,107.01,70.5,107.01,64.5,89.01" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000534115812779766127_C_0000745371908432158369">
+      <path codeLine="23" d="M64.5,214.99 C64.5,231.69 64.5,236.58 64.5,256.18 " fill="none" id="C_0000534115812779766127-backto-C_0000745371908432158369" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="64.5,196.99,58.5,214.99,70.5,214.99,64.5,196.99" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00040_class_mermaid.svg b/docs/test_cases/t00040_class_mermaid.svg
index 8613ef7c..80686e75 100644
--- a/docs/test_cases/t00040_class_mermaid.svg
+++ b/docs/test_cases/t00040_class_mermaid.svg
@@ -1,57 +1,62 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 313.9140625 375" style="max-width: 313.914px; background-color: white;" width="313.9140625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 331.6953125 375" style="max-width: 331.695px; background-color: white;" width="331.6953125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M69.5390625,109L69.5390625,113.16666666666667C69.5390625,117.33333333333333,69.5390625,125.66666666666667,69.5390625,134C69.5390625,142.33333333333334,69.5390625,150.66666666666666,69.5390625,154.83333333333334L69.5390625,159"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M69.5390625,216L69.5390625,220.16666666666666C69.5390625,224.33333333333334,69.5390625,232.66666666666666,69.5390625,241C69.5390625,249.33333333333334,69.5390625,257.6666666666667,69.5390625,261.8333333333333L69.5390625,266"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M73.984375,127L73.984375,128.16666666666666C73.984375,129.33333333333334,73.984375,131.66666666666666,73.984375,137C73.984375,142.33333333333334,73.984375,150.66666666666666,73.984375,154.83333333333334L73.984375,159"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M73.984375,234L73.984375,235.16666666666666C73.984375,236.33333333333334,73.984375,238.66666666666666,73.984375,244C73.984375,249.33333333333334,73.984375,257.6666666666667,73.984375,261.8333333333333L73.984375,266"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -74,11 +79,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(69.5390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L5">
+        <a transform="translate(73.984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L5">
           <g title="A" id="classId-C_0000307580006083737677-0" class="node default clickable">
-            <rect height="101" width="105.28125" y="-50.5" x="-52.640625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="52.640625" x1="-52.640625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="52.640625" x1="-52.640625" class="divider"/>
+            <rect height="101" width="114.171875" y="-50.5" x="-57.0859375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="57.0859375" x1="-57.0859375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="57.0859375" x1="-57.0859375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -90,20 +95,20 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -45.140625, -9)" height="18" width="55.140625">
+              <foreignObject transform="translate( -49.5859375, -9)" height="18" width="55.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#ii_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -45.140625, 25)" height="18" width="90.28125">
+              <foreignObject transform="translate( -49.5859375, 25)" height="18" width="99.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_a() : int</span>
+                  <span class="nodeLabel">+get_a() : : int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(69.5390625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L18">
+        <a transform="translate(73.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L18">
           <g title="AA" id="classId-C_0000534115812779766127-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -122,11 +127,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.5390625, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L22">
+        <a transform="translate(73.984375, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L22">
           <g title="AAA" id="classId-C_0000745371908432158369-2" class="node default clickable">
-            <rect height="101" width="123.078125" y="-50.5" x="-61.5390625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="61.5390625" x1="-61.5390625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="61.5390625" x1="-61.5390625" class="divider"/>
+            <rect height="101" width="131.96875" y="-50.5" x="-65.984375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="65.984375" x1="-65.984375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="65.984375" x1="-65.984375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -138,24 +143,24 @@
                   <span class="nodeLabel">AAA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.0390625, -9)" height="18" width="42.25">
+              <foreignObject transform="translate( -58.484375, -9)" height="18" width="42.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+b : B </span>
+                  <span style="font-style:italic;" class="nodeLabel">+b : B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.0390625, 25)" height="18" width="108.078125">
+              <foreignObject transform="translate( -58.484375, 25)" height="18" width="116.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_aaa() : int</span>
+                  <span class="nodeLabel">+get_aaa() : : int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(239.046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00040/t00040.cc#L31">
+        <a transform="translate(252.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L31">
           <g title="R" id="classId-C_0001539035020975101539-3" class="node default clickable">
-            <rect height="79" width="133.734375" y="-39.5" x="-66.8671875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="66.8671875" x1="-66.8671875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="66.8671875" x1="-66.8671875" class="divider"/>
+            <rect height="79" width="142.625" y="-39.5" x="-71.3125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="71.3125" x1="-71.3125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="71.3125" x1="-71.3125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -167,9 +172,9 @@
                   <span class="nodeLabel">R</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -59.3671875, 14)" height="18" width="118.734375">
+              <foreignObject transform="translate( -63.8125, 14)" height="18" width="127.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo(A * a) : void</span>
+                  <span class="nodeLabel">+foo(A * a) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00041.md b/docs/test_cases/t00041.md
index 970ddd93..b722a0d3 100644
--- a/docs/test_cases/t00041.md
+++ b/docs/test_cases/t00041.md
@@ -22,7 +22,7 @@ diagrams:
         - dependency
 ```
 ## Source code
-File t00041.cc
+File `tests/t00041/t00041.cc`
 ```cpp
 namespace clanguml::t00041 {
 
@@ -243,6 +243,7 @@ struct NM : public N { };
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg
index 5ecbe97f..d180aeb3 100644
--- a/docs/test_cases/t00041_class.svg
+++ b/docs/test_cases/t00041_class.svg
@@ -1,138 +1,164 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="381px" preserveAspectRatio="none" style="width:427px;height:381px;" version="1.1" viewBox="0 0 427 381" width="427px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="396px" preserveAspectRatio="none" style="width:411px;height:396px;background:#FFFFFF;" version="1.1" viewBox="0 0 411 396" width="411px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1q9u3os51q3r4" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="57" y="14.5"/>
-      <ellipse cx="72" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M74.9688,36.1406 Q74.3906,36.4375 73.75,36.5781 Q73.1094,36.7344 72.4063,36.7344 Q69.9063,36.7344 68.5781,35.0938 Q67.2656,33.4375 67.2656,30.3125 Q67.2656,27.1875 68.5781,25.5313 Q69.9063,23.875 72.4063,23.875 Q73.1094,23.875 73.75,24.0313 Q74.4063,24.1875 74.9688,24.4844 L74.9688,27.2031 Q74.3438,26.625 73.75,26.3594 Q73.1563,26.0781 72.5313,26.0781 Q71.1875,26.0781 70.5,27.1563 Q69.8125,28.2188 69.8125,30.3125 Q69.8125,32.4063 70.5,33.4844 Q71.1875,34.5469 72.5313,34.5469 Q73.1563,34.5469 73.75,34.2813 Q74.3438,34 74.9688,33.4219 L74.9688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="86" y="34.6543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="54.5" y2="54.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000775317088453163919">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000775317088453163919" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="35.5" y="15.4"/>
+        <ellipse cx="50.5" cy="31.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M45.5,32.5562 C45.5,35.0562 47.6406,36.8687 50.5625,36.8687 C51.7969,36.8687 52.9688,36.5719 53.7188,36.0562 C54.3281,35.6344 54.6563,35.2125 54.6563,34.8062 C54.6563,34.3375 54.2344,33.9312 53.7344,33.9312 C53.5,33.9312 53.2813,34.0094 53.0781,34.2125 C52.6406,34.65 52.6406,34.65 52.4688,34.7437 C52.0156,34.9781 51.375,35.1187 50.6094,35.1187 C48.6094,35.1187 47.3281,34.1031 47.3281,32.525 L47.3281,31.4781 C47.3281,29.775 48.5469,28.5719 50.25,28.5719 C50.8281,28.5719 51.4063,28.7125 51.875,28.9625 C52.3438,29.2281 52.5156,29.4156 52.5781,29.775 C52.7031,30.4469 52.9531,30.6969 53.4844,30.6969 C53.7656,30.6969 54.0469,30.5562 54.2344,30.3375 C54.3594,30.1656 54.4063,29.9937 54.4063,29.5562 L54.4063,28.1969 C54.4063,27.775 54.3906,27.6344 54.2656,27.4625 C54.0938,27.2125 53.8125,27.0562 53.4844,27.0562 C53.1719,27.0562 52.9688,27.1656 52.75,27.4312 C51.5781,26.9312 51.1406,26.8219 50.1875,26.8219 C47.5156,26.8219 45.5,28.8375 45.5,31.4625 L45.5,32.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="64.5" y="36.006">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="36.5" x2="76.5" y1="47.4" y2="47.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="36.5" x2="76.5" y1="55.4" y2="55.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="132" y="8"/>
-      <ellipse cx="160.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M163.9188,29.6406 Q163.3406,29.9375 162.7,30.0781 Q162.0594,30.2344 161.3563,30.2344 Q158.8563,30.2344 157.5281,28.5938 Q156.2156,26.9375 156.2156,23.8125 Q156.2156,20.6875 157.5281,19.0313 Q158.8563,17.375 161.3563,17.375 Q162.0594,17.375 162.7,17.5313 Q163.3563,17.6875 163.9188,17.9844 L163.9188,20.7031 Q163.2938,20.125 162.7,19.8594 Q162.1063,19.5781 161.4813,19.5781 Q160.1375,19.5781 159.45,20.6563 Q158.7625,21.7188 158.7625,23.8125 Q158.7625,25.9063 159.45,26.9844 Q160.1375,28.0469 161.4813,28.0469 Q162.1063,28.0469 162.7,27.7813 Q163.2938,27.5 163.9188,26.9219 L163.9188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="178.05" y="28.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001798851434286108347">
+        <rect codeLine="6" fill="#F1F1F1" height="64.7999" id="C_0001798851434286108347" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="77" x="112" y="7"/>
+        <ellipse cx="142.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M137.75,24.1563 C137.75,26.6563 139.8906,28.4688 142.8125,28.4688 C144.0469,28.4688 145.2188,28.1719 145.9688,27.6563 C146.5781,27.2344 146.9063,26.8125 146.9063,26.4063 C146.9063,25.9375 146.4844,25.5313 145.9844,25.5313 C145.75,25.5313 145.5313,25.6094 145.3281,25.8125 C144.8906,26.25 144.8906,26.25 144.7188,26.3438 C144.2656,26.5781 143.625,26.7188 142.8594,26.7188 C140.8594,26.7188 139.5781,25.7031 139.5781,24.125 L139.5781,23.0781 C139.5781,21.375 140.7969,20.1719 142.5,20.1719 C143.0781,20.1719 143.6563,20.3125 144.125,20.5625 C144.5938,20.8281 144.7656,21.0156 144.8281,21.375 C144.9531,22.0469 145.2031,22.2969 145.7344,22.2969 C146.0156,22.2969 146.2969,22.1563 146.4844,21.9375 C146.6094,21.7656 146.6563,21.5938 146.6563,21.1563 L146.6563,19.7969 C146.6563,19.375 146.6406,19.2344 146.5156,19.0625 C146.3438,18.8125 146.0625,18.6563 145.7344,18.6563 C145.4219,18.6563 145.2188,18.7656 145,19.0313 C143.8281,18.5313 143.3906,18.4219 142.4375,18.4219 C139.7656,18.4219 137.75,20.4375 137.75,23.0625 L137.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="160.25" y="27.606">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="113" x2="188" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="113" x2="188" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="118" y="55.9"/>
+          <ellipse cx="123" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="132" y="64.0059">rr : RR *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="54"/>
-      <ellipse cx="143" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0002158730167547707264">
+        <rect codeLine="11" fill="#F1F1F1" height="48" id="C_0002158730167547707264" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="341"/>
+        <ellipse cx="22" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,358.1563 C17,360.6563 19.1406,362.4688 22.0625,362.4688 C23.2969,362.4688 24.4688,362.1719 25.2188,361.6563 C25.8281,361.2344 26.1563,360.8125 26.1563,360.4063 C26.1563,359.9375 25.7344,359.5313 25.2344,359.5313 C25,359.5313 24.7813,359.6094 24.5781,359.8125 C24.1406,360.25 24.1406,360.25 23.9688,360.3438 C23.5156,360.5781 22.875,360.7188 22.1094,360.7188 C20.1094,360.7188 18.8281,359.7031 18.8281,358.125 L18.8281,357.0781 C18.8281,355.375 20.0469,354.1719 21.75,354.1719 C22.3281,354.1719 22.9063,354.3125 23.375,354.5625 C23.8438,354.8281 24.0156,355.0156 24.0781,355.375 C24.2031,356.0469 24.4531,356.2969 24.9844,356.2969 C25.2656,356.2969 25.5469,356.1563 25.7344,355.9375 C25.8594,355.7656 25.9063,355.5938 25.9063,355.1563 L25.9063,353.7969 C25.9063,353.375 25.8906,353.2344 25.7656,353.0625 C25.5938,352.8125 25.3125,352.6563 24.9844,352.6563 C24.6719,352.6563 24.4688,352.7656 24.25,353.0313 C23.0781,352.5313 22.6406,352.4219 21.6875,352.4219 C19.0156,352.4219 17,354.4375 17,357.0625 L17,358.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="361.606">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="373" y2="373"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="381" y2="381"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="152" y="62.2104">rr : RR *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000430600213408545846">
+        <rect codeLine="15" fill="#F1F1F1" height="48" id="C_0000430600213408545846" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="341"/>
+        <ellipse cx="98" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93,358.1563 C93,360.6563 95.1406,362.4688 98.0625,362.4688 C99.2969,362.4688 100.4688,362.1719 101.2188,361.6563 C101.8281,361.2344 102.1563,360.8125 102.1563,360.4063 C102.1563,359.9375 101.7344,359.5313 101.2344,359.5313 C101,359.5313 100.7813,359.6094 100.5781,359.8125 C100.1406,360.25 100.1406,360.25 99.9688,360.3438 C99.5156,360.5781 98.875,360.7188 98.1094,360.7188 C96.1094,360.7188 94.8281,359.7031 94.8281,358.125 L94.8281,357.0781 C94.8281,355.375 96.0469,354.1719 97.75,354.1719 C98.3281,354.1719 98.9063,354.3125 99.375,354.5625 C99.8438,354.8281 100.0156,355.0156 100.0781,355.375 C100.2031,356.0469 100.4531,356.2969 100.9844,356.2969 C101.2656,356.2969 101.5469,356.1563 101.7344,355.9375 C101.8594,355.7656 101.9063,355.5938 101.9063,355.1563 L101.9063,353.7969 C101.9063,353.375 101.8906,353.2344 101.7656,353.0625 C101.5938,352.8125 101.3125,352.6563 100.9844,352.6563 C100.6719,352.6563 100.4688,352.7656 100.25,353.0313 C99.0781,352.5313 98.6406,352.4219 97.6875,352.4219 C95.0156,352.4219 93,354.4375 93,357.0625 L93,358.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="361.606">F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="373" y2="373"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="381" y2="381"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="322"/>
-      <ellipse cx="21" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,343.6406 Q23.3906,343.9375 22.75,344.0781 Q22.1094,344.2344 21.4063,344.2344 Q18.9063,344.2344 17.5781,342.5938 Q16.2656,340.9375 16.2656,337.8125 Q16.2656,334.6875 17.5781,333.0313 Q18.9063,331.375 21.4063,331.375 Q22.1094,331.375 22.75,331.5313 Q23.4063,331.6875 23.9688,331.9844 L23.9688,334.7031 Q23.3438,334.125 22.75,333.8594 Q22.1563,333.5781 21.5313,333.5781 Q20.1875,333.5781 19.5,334.6563 Q18.8125,335.7188 18.8125,337.8125 Q18.8125,339.9063 19.5,340.9844 Q20.1875,342.0469 21.5313,342.0469 Q22.1563,342.0469 22.75,341.7813 Q23.3438,341.5 23.9688,340.9219 L23.9688,343.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="342.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="354" y2="354"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="362" y2="362"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <g id="elem_C_0000175608867682236642">
+        <rect codeLine="19" fill="#F1F1F1" height="115.1997" id="C_0000175608867682236642" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="125" x="41" y="148.8"/>
+        <ellipse cx="89.25" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M84.25,165.9563 C84.25,168.4563 86.3906,170.2688 89.3125,170.2688 C90.5469,170.2688 91.7188,169.9719 92.4688,169.4563 C93.0781,169.0344 93.4063,168.6125 93.4063,168.2063 C93.4063,167.7375 92.9844,167.3313 92.4844,167.3313 C92.25,167.3313 92.0313,167.4094 91.8281,167.6125 C91.3906,168.05 91.3906,168.05 91.2188,168.1438 C90.7656,168.3781 90.125,168.5188 89.3594,168.5188 C87.3594,168.5188 86.0781,167.5031 86.0781,165.925 L86.0781,164.8781 C86.0781,163.175 87.2969,161.9719 89,161.9719 C89.5781,161.9719 90.1563,162.1125 90.625,162.3625 C91.0938,162.6281 91.2656,162.8156 91.3281,163.175 C91.4531,163.8469 91.7031,164.0969 92.2344,164.0969 C92.5156,164.0969 92.7969,163.9563 92.9844,163.7375 C93.1094,163.5656 93.1563,163.3938 93.1563,162.9563 L93.1563,161.5969 C93.1563,161.175 93.1406,161.0344 93.0156,160.8625 C92.8438,160.6125 92.5625,160.4563 92.2344,160.4563 C91.9219,160.4563 91.7188,160.5656 91.5,160.8313 C90.3281,160.3313 89.8906,160.2219 88.9375,160.2219 C86.2656,160.2219 84.25,162.2375 84.25,164.8625 L84.25,165.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="109.75" y="169.406">RR</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="42" x2="165" y1="180.8" y2="180.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="47" y="189.7"/>
+          <ellipse cx="52" cy="194.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="61" y="197.8059">foo(H * h) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="42" x2="165" y1="205.5999" y2="205.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="47" y="214.4999"/>
+          <ellipse cx="52" cy="219.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="61" y="222.6059">e : E *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="47" y="231.2998"/>
+          <ellipse cx="52" cy="236.2998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="61" y="239.4058">f : F *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="47" y="248.0997"/>
+          <ellipse cx="52" cy="253.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="61" y="256.2057">g : detail::G *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="322"/>
-      <ellipse cx="96.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M99.4688,343.6406 Q98.8906,343.9375 98.25,344.0781 Q97.6094,344.2344 96.9063,344.2344 Q94.4063,344.2344 93.0781,342.5938 Q91.7656,340.9375 91.7656,337.8125 Q91.7656,334.6875 93.0781,333.0313 Q94.4063,331.375 96.9063,331.375 Q97.6094,331.375 98.25,331.5313 Q98.9063,331.6875 99.4688,331.9844 L99.4688,334.7031 Q98.8438,334.125 98.25,333.8594 Q97.6563,333.5781 97.0313,333.5781 Q95.6875,333.5781 95,334.6563 Q94.3125,335.7188 94.3125,337.8125 Q94.3125,339.9063 95,340.9844 Q95.6875,342.0469 97.0313,342.0469 Q97.6563,342.0469 98.25,341.7813 Q98.8438,341.5 99.4688,340.9219 L99.4688,343.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="110.5" y="342.1543">F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="354" y2="354"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="362" y2="362"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
+      <g id="elem_C_0000819254010294444715">
+        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0000819254010294444715" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="158.5" y="341"/>
+        <ellipse cx="173.5" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M168.5,358.1563 C168.5,360.6563 170.6406,362.4688 173.5625,362.4688 C174.7969,362.4688 175.9688,362.1719 176.7188,361.6563 C177.3281,361.2344 177.6563,360.8125 177.6563,360.4063 C177.6563,359.9375 177.2344,359.5313 176.7344,359.5313 C176.5,359.5313 176.2813,359.6094 176.0781,359.8125 C175.6406,360.25 175.6406,360.25 175.4688,360.3438 C175.0156,360.5781 174.375,360.7188 173.6094,360.7188 C171.6094,360.7188 170.3281,359.7031 170.3281,358.125 L170.3281,357.0781 C170.3281,355.375 171.5469,354.1719 173.25,354.1719 C173.8281,354.1719 174.4063,354.3125 174.875,354.5625 C175.3438,354.8281 175.5156,355.0156 175.5781,355.375 C175.7031,356.0469 175.9531,356.2969 176.4844,356.2969 C176.7656,356.2969 177.0469,356.1563 177.2344,355.9375 C177.3594,355.7656 177.4063,355.5938 177.4063,355.1563 L177.4063,353.7969 C177.4063,353.375 177.3906,353.2344 177.2656,353.0625 C177.0938,352.8125 176.8125,352.6563 176.4844,352.6563 C176.1719,352.6563 175.9688,352.7656 175.75,353.0313 C174.5781,352.5313 174.1406,352.4219 173.1875,352.4219 C170.5156,352.4219 168.5,354.4375 168.5,357.0625 L168.5,358.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="187.5" y="361.606">RRR</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="219.5" y1="373" y2="373"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="219.5" y1="381" y2="381"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="99.2188" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="43" y="146"/>
-      <ellipse cx="88.75" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M91.7188,167.6406 Q91.1406,167.9375 90.5,168.0781 Q89.8594,168.2344 89.1563,168.2344 Q86.6563,168.2344 85.3281,166.5938 Q84.0156,164.9375 84.0156,161.8125 Q84.0156,158.6875 85.3281,157.0313 Q86.6563,155.375 89.1563,155.375 Q89.8594,155.375 90.5,155.5313 Q91.1563,155.6875 91.7188,155.9844 L91.7188,158.7031 Q91.0938,158.125 90.5,157.8594 Q89.9063,157.5781 89.2813,157.5781 Q87.9375,157.5781 87.25,158.6563 Q86.5625,159.7188 86.5625,161.8125 Q86.5625,163.9063 87.25,164.9844 Q87.9375,166.0469 89.2813,166.0469 Q89.9063,166.0469 90.5,165.7813 Q91.0938,165.5 91.7188,164.9219 L91.7188,167.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="109.25" y="166.1543">RR</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="178" y2="178"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <g id="elem_C_0000220253364661036147">
+        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0000220253364661036147" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="73" x="275" y="15.4"/>
+        <ellipse cx="290" cy="31.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M285,32.5562 C285,35.0562 287.1406,36.8687 290.0625,36.8687 C291.2969,36.8687 292.4688,36.5719 293.2188,36.0562 C293.8281,35.6344 294.1563,35.2125 294.1563,34.8062 C294.1563,34.3375 293.7344,33.9312 293.2344,33.9312 C293,33.9312 292.7813,34.0094 292.5781,34.2125 C292.1406,34.65 292.1406,34.65 291.9688,34.7437 C291.5156,34.9781 290.875,35.1187 290.1094,35.1187 C288.1094,35.1187 286.8281,34.1031 286.8281,32.525 L286.8281,31.4781 C286.8281,29.775 288.0469,28.5719 289.75,28.5719 C290.3281,28.5719 290.9063,28.7125 291.375,28.9625 C291.8438,29.2281 292.0156,29.4156 292.0781,29.775 C292.2031,30.4469 292.4531,30.6969 292.9844,30.6969 C293.2656,30.6969 293.5469,30.5562 293.7344,30.3375 C293.8594,30.1656 293.9063,29.9937 293.9063,29.5562 L293.9063,28.1969 C293.9063,27.775 293.8906,27.6344 293.7656,27.4625 C293.5938,27.2125 293.3125,27.0562 292.9844,27.0562 C292.6719,27.0562 292.4688,27.1656 292.25,27.4312 C291.0781,26.9312 290.6406,26.8219 289.6875,26.8219 C287.0156,26.8219 285,28.8375 285,31.4625 L285,32.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="304" y="36.006">ns1::N</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="276" x2="347" y1="47.4" y2="47.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="276" x2="347" y1="55.4" y2="55.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="184"/>
-      <ellipse cx="54" cy="189" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <g id="elem_C_0000618038667214398895">
+        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0000618038667214398895" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="201" y="182.4"/>
+        <ellipse cx="216" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M211,199.5563 C211,202.0563 213.1406,203.8688 216.0625,203.8688 C217.2969,203.8688 218.4688,203.5719 219.2188,203.0563 C219.8281,202.6344 220.1563,202.2125 220.1563,201.8063 C220.1563,201.3375 219.7344,200.9313 219.2344,200.9313 C219,200.9313 218.7813,201.0094 218.5781,201.2125 C218.1406,201.65 218.1406,201.65 217.9688,201.7438 C217.5156,201.9781 216.875,202.1188 216.1094,202.1188 C214.1094,202.1188 212.8281,201.1031 212.8281,199.525 L212.8281,198.4781 C212.8281,196.775 214.0469,195.5719 215.75,195.5719 C216.3281,195.5719 216.9063,195.7125 217.375,195.9625 C217.8438,196.2281 218.0156,196.4156 218.0781,196.775 C218.2031,197.4469 218.4531,197.6969 218.9844,197.6969 C219.2656,197.6969 219.5469,197.5563 219.7344,197.3375 C219.8594,197.1656 219.9063,196.9938 219.9063,196.5563 L219.9063,195.1969 C219.9063,194.775 219.8906,194.6344 219.7656,194.4625 C219.5938,194.2125 219.3125,194.0563 218.9844,194.0563 C218.6719,194.0563 218.4688,194.1656 218.25,194.4313 C217.0781,193.9313 216.6406,193.8219 215.6875,193.8219 C213.0156,193.8219 211,195.8375 211,198.4625 L211,199.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="230" y="203.006">ns1::NN</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="202" x2="283" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="202" x2="283" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="63" y="192.2104">foo(H * h) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
+      <g id="elem_C_0001206750351408617127">
+        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001206750351408617127" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="85" x="319" y="182.4"/>
+        <ellipse cx="334" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M329,199.5563 C329,202.0563 331.1406,203.8688 334.0625,203.8688 C335.2969,203.8688 336.4688,203.5719 337.2188,203.0563 C337.8281,202.6344 338.1563,202.2125 338.1563,201.8063 C338.1563,201.3375 337.7344,200.9313 337.2344,200.9313 C337,200.9313 336.7813,201.0094 336.5781,201.2125 C336.1406,201.65 336.1406,201.65 335.9688,201.7438 C335.5156,201.9781 334.875,202.1188 334.1094,202.1188 C332.1094,202.1188 330.8281,201.1031 330.8281,199.525 L330.8281,198.4781 C330.8281,196.775 332.0469,195.5719 333.75,195.5719 C334.3281,195.5719 334.9063,195.7125 335.375,195.9625 C335.8438,196.2281 336.0156,196.4156 336.0781,196.775 C336.2031,197.4469 336.4531,197.6969 336.9844,197.6969 C337.2656,197.6969 337.5469,197.5563 337.7344,197.3375 C337.8594,197.1656 337.9063,196.9938 337.9063,196.5563 L337.9063,195.1969 C337.9063,194.775 337.8906,194.6344 337.7656,194.4625 C337.5938,194.2125 337.3125,194.0563 336.9844,194.0563 C336.6719,194.0563 336.4688,194.1656 336.25,194.4313 C335.0781,193.9313 334.6406,193.8219 333.6875,193.8219 C331.0156,193.8219 329,195.8375 329,198.4625 L329,199.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53" x="348" y="203.006">ns1::NM</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="320" x2="403" y1="214.4" y2="214.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="320" x2="403" y1="222.4" y2="222.4"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="198.8047" y2="198.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="204.8047"/>
-      <ellipse cx="54" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="63" y="213.0151">e : E *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="217.6094"/>
-      <ellipse cx="54" cy="222.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="63" y="225.8198">f : F *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="230.4141"/>
-      <ellipse cx="54" cy="235.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="77" x="63" y="238.6245">g : detail::G *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="322"/>
-      <ellipse cx="171" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.9688,343.6406 Q173.3906,343.9375 172.75,344.0781 Q172.1094,344.2344 171.4063,344.2344 Q168.9063,344.2344 167.5781,342.5938 Q166.2656,340.9375 166.2656,337.8125 Q166.2656,334.6875 167.5781,333.0313 Q168.9063,331.375 171.4063,331.375 Q172.1094,331.375 172.75,331.5313 Q173.4063,331.6875 173.9688,331.9844 L173.9688,334.7031 Q173.3438,334.125 172.75,333.8594 Q172.1563,333.5781 171.5313,333.5781 Q170.1875,333.5781 169.5,334.6563 Q168.8125,335.7188 168.8125,337.8125 Q168.8125,339.9063 169.5,340.9844 Q170.1875,342.0469 171.5313,342.0469 Q172.1563,342.0469 172.75,341.7813 Q173.3438,341.5 173.9688,340.9219 L173.9688,343.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="185" y="342.1543">RRR</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="354" y2="354"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="362" y2="362"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="289" y="14.5"/>
-      <ellipse cx="304" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M306.9688,36.1406 Q306.3906,36.4375 305.75,36.5781 Q305.1094,36.7344 304.4063,36.7344 Q301.9063,36.7344 300.5781,35.0938 Q299.2656,33.4375 299.2656,30.3125 Q299.2656,27.1875 300.5781,25.5313 Q301.9063,23.875 304.4063,23.875 Q305.1094,23.875 305.75,24.0313 Q306.4063,24.1875 306.9688,24.4844 L306.9688,27.2031 Q306.3438,26.625 305.75,26.3594 Q305.1563,26.0781 304.5313,26.0781 Q303.1875,26.0781 302.5,27.1563 Q301.8125,28.2188 301.8125,30.3125 Q301.8125,32.4063 302.5,33.4844 Q303.1875,34.5469 304.5313,34.5469 Q305.1563,34.5469 305.75,34.2813 Q306.3438,34 306.9688,33.4219 L306.9688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="40" x="318" y="34.6543">ns1::N</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="54.5" y2="54.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="217.5" y="171.5"/>
-      <ellipse cx="232.5" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M235.4688,193.1406 Q234.8906,193.4375 234.25,193.5781 Q233.6094,193.7344 232.9063,193.7344 Q230.4063,193.7344 229.0781,192.0938 Q227.7656,190.4375 227.7656,187.3125 Q227.7656,184.1875 229.0781,182.5313 Q230.4063,180.875 232.9063,180.875 Q233.6094,180.875 234.25,181.0313 Q234.9063,181.1875 235.4688,181.4844 L235.4688,184.2031 Q234.8438,183.625 234.25,183.3594 Q233.6563,183.0781 233.0313,183.0781 Q231.6875,183.0781 231,184.1563 Q230.3125,185.2188 230.3125,187.3125 Q230.3125,189.4063 231,190.4844 Q231.6875,191.5469 233.0313,191.5469 Q233.6563,191.5469 234.25,191.2813 Q234.8438,191 235.4688,190.4219 L235.4688,193.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="246.5" y="191.6543">ns1::NN</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="203.5" y2="203.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="211.5" y2="211.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q9u3os51q3r4)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="334" y="171.5"/>
-      <ellipse cx="349" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M351.9688,193.1406 Q351.3906,193.4375 350.75,193.5781 Q350.1094,193.7344 349.4063,193.7344 Q346.9063,193.7344 345.5781,192.0938 Q344.2656,190.4375 344.2656,187.3125 Q344.2656,184.1875 345.5781,182.5313 Q346.9063,180.875 349.4063,180.875 Q350.1094,180.875 350.75,181.0313 Q351.4063,181.1875 351.9688,181.4844 L351.9688,184.2031 Q351.3438,183.625 350.75,183.3594 Q350.1563,183.0781 349.5313,183.0781 Q348.1875,183.0781 347.5,184.1563 Q346.8125,185.2188 346.8125,187.3125 Q346.8125,189.4063 347.5,190.4844 Q348.1875,191.5469 349.5313,191.5469 Q350.1563,191.5469 350.75,191.2813 Q351.3438,191 351.9688,190.4219 L351.9688,193.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="50" x="363" y="191.6543">ns1::NM</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="335" x2="415" y1="203.5" y2="203.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="335" x2="415" y1="211.5" y2="211.5"/>
-    </a>
-    <path d="M155.24,69.02 C146.45,89.36 134.51,116.97 124.08,141.11 " fill="none" id="C_0001798851434286108347-&gt;C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="122.01,145.89,129.2569,139.2205,123.9968,141.3017,121.9157,136.0416,122.01,145.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="147" 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="10" x="154" y="112.0669">rr</text>
-    <path d="M76.44,245.12 C64.42,268.93 50.37,296.74 40.16,316.96 " fill="none" id="C_0000175608867682236642-&gt;C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="37.78,321.67,45.4065,315.4381,40.0332,317.2065,38.2649,311.8331,37.78,321.67" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="63" y="288.0669">+e</text>
-    <path d="M101,245.12 C101,268.73 101,296.27 101,316.45 " fill="none" id="C_0000175608867682236642-&gt;C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="101,321.67,105,312.67,101,316.67,97,312.67,101,321.67" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="102" y="288.0669">+f</text>
-    <path d="M83.67,82.58 C86.71,102.2 90.32,125.52 93.46,145.78 " fill="none" id="C_0000775317088453163919&lt;-C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="76.74,83.54,80.59,62.71,90.57,81.4,76.74,83.54" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M138.08,262.83 C149.84,283.88 162.08,305.78 170.96,321.67 " fill="none" id="C_0000175608867682236642&lt;-C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="131.82,266,128.18,245.12,144.05,259.17,131.82,266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M307.01,81.11 C294.49,110.07 278.27,147.62 267.99,171.39 " fill="none" id="C_0000220253364661036147&lt;-C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="300.61,78.29,314.97,62.71,313.46,83.84,300.61,78.29" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M338.69,81.95 C348,110.79 359.95,147.84 367.55,171.39 " fill="none" id="C_0000220253364661036147&lt;-C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="331.96,83.89,332.49,62.71,345.29,79.59,331.96,83.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001798851434286108347_C_0000175608867682236642">
+      <path codeLine="42" d="M141.44,72.21 C135.28,93.85 128.5936,117.2995 121.3136,142.8595 " fill="none" id="C_0001798851434286108347-to-C_0000175608867682236642" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="119.67,148.63,125.9823,141.0699,121.0396,143.8212,118.2883,138.8785,119.67,148.63" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="139.5" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="146.5" y="114.877">rr</text>
+    </g>
+    <g id="link_C_0000175608867682236642_C_0002158730167547707264">
+      <path codeLine="43" d="M75.85,264.38 C63.03,290.79 51.1286,315.3016 41.3786,335.4016 " fill="none" id="C_0000175608867682236642-to-C_0002158730167547707264" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="38.76,340.8,46.2869,334.4481,40.9422,336.3013,39.089,330.9566,38.76,340.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="62.5" y="307.077">+e</text>
+    </g>
+    <g id="link_C_0000175608867682236642_C_0000430600213408545846">
+      <path codeLine="44" d="M103.5,264.38 C103.5,290.79 103.5,314.7 103.5,334.8 " fill="none" id="C_0000175608867682236642-to-C_0000430600213408545846" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="103.5,340.8,107.5,331.8,103.5,335.8,99.5,331.8,103.5,340.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="104.5" y="307.077">+f</text>
+    </g>
+    <g id="link_C_0000775317088453163919_C_0000175608867682236642">
+      <path codeLine="45" d="M68.0614,81.0013 C74.3114,102.9413 79,119.38 87.28,148.44 " fill="none" id="C_0000775317088453163919-backto-C_0000175608867682236642" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="63.13,63.69,62.291,82.6451,73.8319,79.3575,63.13,63.69" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000175608867682236642_C_0000819254010294444715">
+      <path codeLine="46" d="M143.4574,280.1558 C157.9674,306.5658 165.72,320.7 176.76,340.8 " fill="none" id="C_0000175608867682236642-backto-C_0000819254010294444715" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="134.79,264.38,138.1988,283.0449,148.716,277.2667,134.79,264.38" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000220253364661036147_C_0000618038667214398895">
+      <path codeLine="47" d="M294.8174,80.2972 C281.7074,111.6572 265.45,150.53 252.3,181.96 " fill="none" id="C_0000220253364661036147-backto-C_0000618038667214398895" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="301.76,63.69,289.2816,77.983,300.3531,82.6114,301.76,63.69" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000220253364661036147_C_0001206750351408617127">
+      <path codeLine="48" d="M323.7786,80.9169 C333.2786,112.2769 344.87,150.53 354.4,181.96 " fill="none" id="C_0000220253364661036147-backto-C_0001206750351408617127" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="318.56,63.69,318.0363,82.6564,329.5209,79.1774,318.56,63.69" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00041_class_mermaid.svg b/docs/test_cases/t00041_class_mermaid.svg
index d952a32e..8fcc6158 100644
--- a/docs/test_cases/t00041_class_mermaid.svg
+++ b/docs/test_cases/t00041_class_mermaid.svg
@@ -1,62 +1,67 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 442.8125 433" style="max-width: 442.812px; background-color: white;" width="442.8125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 445.03515625 433" style="max-width: 445.035px; background-color: white;" width="445.03515625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M43.7265625,87L43.7265625,92.66666666666667C43.7265625,98.33333333333333,43.7265625,109.66666666666667,47.39168867370892,121C51.05681484741783,132.33333333333334,58.38706719483568,143.66666666666666,62.0521933685446,149.33333333333334L65.71731954225352,155"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M73.81187646713616,300L70.7794283059468,305.6666666666667C67.74698014475744,311.3333333333333,61.68208382237872,322.6666666666667,58.64963566118936,334C55.6171875,345.3333333333333,55.6171875,356.6666666666667,55.6171875,362.3333333333333L55.6171875,368"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M125.02244718309859,300L125.99266431924883,305.6666666666667C126.96288145539906,311.3333333333333,128.90331572769955,322.6666666666667,129.87353286384976,334C130.84375,345.3333333333333,130.84375,356.6666666666667,130.84375,362.3333333333333L130.84375,368"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M142.734375,76L142.734375,83.5C142.734375,91,142.734375,106,141.1314798513302,119.16666666666667C139.5285847026604,132.33333333333334,136.32279440532082,143.66666666666666,134.71989925665102,149.33333333333334L133.11700410798122,155"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M180.359375,295.91751240832656L186.64453125,302.2645936736055C192.9296875,308.6116749388844,205.5,321.30583746944217,211.78515625,333.31958540138777C218.0703125,345.3333333333333,218.0703125,356.6666666666667,218.0703125,362.3333333333333L218.0703125,368"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M337.3671875,71.01863857374391L325.89453125,79.34886547811993C314.421875,87.67909238249594,291.4765625,104.33954619124798,280.00390625,125.669773095624C268.53125,147,268.53125,173,268.53125,186L268.53125,199"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M379.8394451530612,76L382.492506377551,83.5C385.1455676020408,91,390.4516900510204,106,393.1047512755102,126.5C395.7578125,147,395.7578125,173,395.7578125,186L395.7578125,199"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M43.7265625,87L43.7265625,92.66666666666667C43.7265625,98.33333333333333,43.7265625,109.66666666666667,46.74286752036577,120.15235121058224C49.75917254073155,130.6380357544978,55.79178258146308,140.27607150899559,58.80808760182885,145.0950893862445L61.82439262219462,149.91410726349338"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M73.10229606807512,300L70.18811130672927,305.6666666666667C67.27392654538342,311.3333333333333,61.44555702269171,322.6666666666667,58.53137226134586,333C55.6171875,343.3333333333333,55.6171875,352.6666666666667,55.6171875,357.3333333333333L55.6171875,362"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M124.31286678403755,300L125.40134732003129,305.6666666666667C126.48982785602504,311.3333333333333,128.66678892801252,322.6666666666667,129.75526946400626,333C130.84375,343.3333333333333,130.84375,352.6666666666667,130.84375,357.3333333333333L130.84375,362"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M142.734375,94L142.734375,98.5C142.734375,103,142.734375,112,141.0132164514867,122.16666666666667C139.2920579029734,132.33333333333334,135.8497408059468,143.66666666666666,134.1285822574335,149.33333333333334L132.4074237089202,155"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M195.38009330391532,311.5591781419069L199.16179650326276,315.2993151182557C202.9434997026102,319.0394520946046,210.50690610130513,326.5197260473023,214.28860930065255,335.9265296903178C218.0703125,345.3333333333333,218.0703125,356.6666666666667,218.0703125,362.3333333333333L218.0703125,368"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M325.0244318776587,81.59449678899335L315.97934427304887,88.16208065749447C306.9342566684391,94.72966452599557,288.8440814592196,107.86483226299778,279.79899385460976,127.4324161314989C270.75390625,147,270.75390625,173,270.75390625,186L270.75390625,199"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M388.0649387201049,92.96955933856586L389.7175270584207,97.64129944880489C391.3701153967366,102.3130395590439,394.6752920733683,111.65651977952196,396.32788041168413,129.32825988976097C397.98046875,147,397.98046875,173,397.98046875,186L397.98046875,199"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(43.7265625, 121)" class="edgeLabel">
@@ -130,7 +135,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L9">
+        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L9">
           <g title="R" id="classId-C_0000775317088453163919-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -149,7 +154,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L13">
+        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L13">
           <g title="D" id="classId-C_0001798851434286108347-1" class="node default clickable">
             <rect height="79" width="71.453125" y="-39.5" x="-35.7265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.7265625" x1="-35.7265625" class="divider"/>
@@ -167,13 +172,13 @@
               </foreignObject>
               <foreignObject transform="translate( -28.2265625, 2)" height="18" width="56.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+rr : RR </span>
+                  <span style="font-style:italic;" class="nodeLabel">+rr : RR</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L17">
+        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L17">
           <g title="E" id="classId-C_0002158730167547707264-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -192,7 +197,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L19">
+        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L19">
           <g title="F" id="classId-C_0000430600213408545846-3" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -211,11 +216,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(112.609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L27">
+        <a transform="translate(110.38671875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L27">
           <g title="RR" id="classId-C_0000175608867682236642-4" class="node default clickable">
-            <rect height="145" width="135.5" y="-72.5" x="-67.75" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="67.75" x1="-67.75" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="67.75" x1="-67.75" class="divider"/>
+            <rect height="145" width="144.390625" y="-72.5" x="-72.1953125" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="72.1953125" x1="-72.1953125" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="72.1953125" x1="-72.1953125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -227,30 +232,30 @@
                   <span class="nodeLabel">RR</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.25, -31)" height="18" width="42.25">
+              <foreignObject transform="translate( -64.6953125, -31)" height="18" width="42.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+e : E </span>
+                  <span style="font-style:italic;" class="nodeLabel">+e : E</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.25, -9)" height="18" width="36.90625">
+              <foreignObject transform="translate( -64.6953125, -9)" height="18" width="36.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+f : F </span>
+                  <span style="font-style:italic;" class="nodeLabel">+f : F</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.25, 13)" height="18" width="91.171875">
+              <foreignObject transform="translate( -64.6953125, 13)" height="18" width="91.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+g : detail::G </span>
+                  <span style="font-style:italic;" class="nodeLabel">+g : detail::G</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.25, 47)" height="18" width="120.5">
+              <foreignObject transform="translate( -64.6953125, 47)" height="18" width="129.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo(H * h) : void</span>
+                  <span class="nodeLabel">+foo(H * h) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L35">
+        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L35">
           <g title="RRR" id="classId-C_0000819254010294444715-5" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -269,7 +274,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(369.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L38">
+        <a transform="translate(371.98046875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L38">
           <g title="N" id="classId-C_0000220253364661036147-6" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -288,7 +293,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.53125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L40">
+        <a transform="translate(270.75390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L40">
           <g title="NN" id="classId-C_0000618038667214398895-7" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -307,7 +312,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(395.7578125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00041/t00041.cc#L42">
+        <a transform="translate(397.98046875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L42">
           <g title="NM" id="classId-C_0001206750351408617127-8" class="node default clickable">
             <rect height="57" width="78.109375" y="-28.5" x="-39.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.0546875" x1="-39.0546875" class="divider"/>
diff --git a/docs/test_cases/t00042.md b/docs/test_cases/t00042.md
index d3f37dca..33b62d25 100644
--- a/docs/test_cases/t00042.md
+++ b/docs/test_cases/t00042.md
@@ -21,7 +21,7 @@ diagrams:
         - std
 ```
 ## Source code
-File t00042.cc
+File `tests/t00042/t00042.cc`
 ```cpp
 #include <string>
 
diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg
index 0cb9049f..717a876a 100644
--- a/docs/test_cases/t00042_class.svg
+++ b/docs/test_cases/t00042_class.svg
@@ -1,109 +1,123 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:489px;height:213px;" version="1.1" viewBox="0 0 489 213" width="489px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="223px" preserveAspectRatio="none" style="width:468px;height:223px;background:#FFFFFF;" version="1.1" viewBox="0 0 468 223" width="468px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fopnlcdgrolw" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopnlcdgrolw)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
-      <ellipse cx="152.45" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M155.4188,157.1406 Q154.8406,157.4375 154.2,157.5781 Q153.5594,157.7344 152.8563,157.7344 Q150.3563,157.7344 149.0281,156.0938 Q147.7156,154.4375 147.7156,151.3125 Q147.7156,148.1875 149.0281,146.5313 Q150.3563,144.875 152.8563,144.875 Q153.5594,144.875 154.2,145.0313 Q154.8563,145.1875 155.4188,145.4844 L155.4188,148.2031 Q154.7938,147.625 154.2,147.3594 Q153.6063,147.0781 152.9813,147.0781 Q151.6375,147.0781 150.95,148.1563 Q150.2625,149.2188 150.2625,151.3125 Q150.2625,153.4063 150.95,154.4844 Q151.6375,155.5469 152.9813,155.5469 Q153.6063,155.5469 154.2,155.2813 Q154.7938,155 155.4188,154.4219 L155.4188,157.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.55" y="155.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="183" y="132.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="184" y="144.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="167.5" y2="167.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="175.5" y2="175.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000462160951579835462">
+        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000462160951579835462" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="137" y="143.2"/>
+        <ellipse cx="153.35" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M148.35,160.3563 C148.35,162.8563 150.4906,164.6688 153.4125,164.6688 C154.6469,164.6688 155.8188,164.3719 156.5688,163.8563 C157.1781,163.4344 157.5063,163.0125 157.5063,162.6063 C157.5063,162.1375 157.0844,161.7313 156.5844,161.7313 C156.35,161.7313 156.1313,161.8094 155.9281,162.0125 C155.4906,162.45 155.4906,162.45 155.3188,162.5438 C154.8656,162.7781 154.225,162.9188 153.4594,162.9188 C151.4594,162.9188 150.1781,161.9031 150.1781,160.325 L150.1781,159.2781 C150.1781,157.575 151.3969,156.3719 153.1,156.3719 C153.6781,156.3719 154.2563,156.5125 154.725,156.7625 C155.1938,157.0281 155.3656,157.2156 155.4281,157.575 C155.5531,158.2469 155.8031,158.4969 156.3344,158.4969 C156.6156,158.4969 156.8969,158.3563 157.0844,158.1375 C157.2094,157.9656 157.2563,157.7938 157.2563,157.3563 L157.2563,155.9969 C157.2563,155.575 157.2406,155.4344 157.1156,155.2625 C156.9438,155.0125 156.6625,154.8563 156.3344,154.8563 C156.0219,154.8563 155.8188,154.9656 155.6,155.2313 C154.4281,154.7313 153.9906,154.6219 153.0375,154.6219 C150.3656,154.6219 148.35,156.6375 148.35,159.2625 L148.35,160.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="167.65" y="163.806">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="186" y="140.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="187" y="154.4001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="138" x2="191" y1="175.2" y2="175.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="138" x2="191" y1="183.2" y2="183.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="143" y="192.1"/>
+          <ellipse cx="148" cy="197.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="157" y="200.2059">a : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="181.5"/>
-      <ellipse cx="148" cy="186.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001422802342059669545">
+        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001422802342059669545" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="7" y="10"/>
+        <ellipse cx="27.85" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M22.85,27.1563 C22.85,29.6563 24.9906,31.4688 27.9125,31.4688 C29.1469,31.4688 30.3188,31.1719 31.0688,30.6563 C31.6781,30.2344 32.0063,29.8125 32.0063,29.4063 C32.0063,28.9375 31.5844,28.5313 31.0844,28.5313 C30.85,28.5313 30.6313,28.6094 30.4281,28.8125 C29.9906,29.25 29.9906,29.25 29.8188,29.3438 C29.3656,29.5781 28.725,29.7188 27.9594,29.7188 C25.9594,29.7188 24.6781,28.7031 24.6781,27.125 L24.6781,26.0781 C24.6781,24.375 25.8969,23.1719 27.6,23.1719 C28.1781,23.1719 28.7563,23.3125 29.225,23.5625 C29.6938,23.8281 29.8656,24.0156 29.9281,24.375 C30.0531,25.0469 30.3031,25.2969 30.8344,25.2969 C31.1156,25.2969 31.3969,25.1563 31.5844,24.9375 C31.7094,24.7656 31.7563,24.5938 31.7563,24.1563 L31.7563,22.7969 C31.7563,22.375 31.7406,22.2344 31.6156,22.0625 C31.4438,21.8125 31.1625,21.6563 30.8344,21.6563 C30.5219,21.6563 30.3188,21.7656 30.1,22.0313 C28.9281,21.5313 28.4906,21.4219 27.5375,21.4219 C24.8656,21.4219 22.85,23.4375 22.85,26.0625 L22.85,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="43.15" y="30.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="25" x="66" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="23" x="67" y="21.2001">void</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="87" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="87" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="58.9"/>
+          <ellipse cx="18" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="27" y="67.0059">a : void *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="157" y="189.7104">a : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001414456934388678010">
+        <rect codeLine="12" fill="#F1F1F1" height="81.5999" id="C_0001414456934388678010" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="384" y="134.8"/>
+        <ellipse cx="399" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M394,151.9563 C394,154.4563 396.1406,156.2688 399.0625,156.2688 C400.2969,156.2688 401.4688,155.9719 402.2188,155.4563 C402.8281,155.0344 403.1563,154.6125 403.1563,154.2063 C403.1563,153.7375 402.7344,153.3313 402.2344,153.3313 C402,153.3313 401.7813,153.4094 401.5781,153.6125 C401.1406,154.05 401.1406,154.05 400.9688,154.1438 C400.5156,154.3781 399.875,154.5188 399.1094,154.5188 C397.1094,154.5188 395.8281,153.5031 395.8281,151.925 L395.8281,150.8781 C395.8281,149.175 397.0469,147.9719 398.75,147.9719 C399.3281,147.9719 399.9063,148.1125 400.375,148.3625 C400.8438,148.6281 401.0156,148.8156 401.0781,149.175 C401.2031,149.8469 401.4531,150.0969 401.9844,150.0969 C402.2656,150.0969 402.5469,149.9563 402.7344,149.7375 C402.8594,149.5656 402.9063,149.3938 402.9063,148.9563 L402.9063,147.5969 C402.9063,147.175 402.8906,147.0344 402.7656,146.8625 C402.5938,146.6125 402.3125,146.4563 401.9844,146.4563 C401.6719,146.4563 401.4688,146.5656 401.25,146.8313 C400.0781,146.3313 399.6406,146.2219 398.6875,146.2219 C396.0156,146.2219 394,148.2375 394,150.8625 L394,151.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="413" y="155.406">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="430" y="131.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="431" y="146.0001">T,K</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="385" x2="446" y1="166.8" y2="166.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="385" x2="446" y1="174.8" y2="174.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="390" y="183.7"/>
+          <ellipse cx="395" cy="188.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="404" y="191.8059">b : T</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="390" y="200.4999"/>
+          <ellipse cx="395" cy="205.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="404" y="208.6059">bb : K</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopnlcdgrolw)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
-      <ellipse cx="25.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M28.0188,29.6406 Q27.4406,29.9375 26.8,30.0781 Q26.1594,30.2344 25.4563,30.2344 Q22.9563,30.2344 21.6281,28.5938 Q20.3156,26.9375 20.3156,23.8125 Q20.3156,20.6875 21.6281,19.0313 Q22.9563,17.375 25.4563,17.375 Q26.1594,17.375 26.8,17.5313 Q27.4563,17.6875 28.0188,17.9844 L28.0188,20.7031 Q27.3938,20.125 26.8,19.8594 Q26.2063,19.5781 25.5813,19.5781 Q24.2375,19.5781 23.55,20.6563 Q22.8625,21.7188 22.8625,23.8125 Q22.8625,25.9063 23.55,26.9844 Q24.2375,28.0469 25.5813,28.0469 Q26.2063,28.0469 26.8,27.7813 Q27.3938,27.5 28.0188,26.9219 L28.0188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.95" y="28.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="60" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="61" y="17.1387">void</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000364538479078826988">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000364538479078826988" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="123" y="18.4"/>
+        <ellipse cx="138" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M133,35.5563 C133,38.0563 135.1406,39.8688 138.0625,39.8688 C139.2969,39.8688 140.4688,39.5719 141.2188,39.0563 C141.8281,38.6344 142.1563,38.2125 142.1563,37.8063 C142.1563,37.3375 141.7344,36.9313 141.2344,36.9313 C141,36.9313 140.7813,37.0094 140.5781,37.2125 C140.1406,37.65 140.1406,37.65 139.9688,37.7438 C139.5156,37.9781 138.875,38.1188 138.1094,38.1188 C136.1094,38.1188 134.8281,37.1031 134.8281,35.525 L134.8281,34.4781 C134.8281,32.775 136.0469,31.5719 137.75,31.5719 C138.3281,31.5719 138.9063,31.7125 139.375,31.9625 C139.8438,32.2281 140.0156,32.4156 140.0781,32.775 C140.2031,33.4469 140.4531,33.6969 140.9844,33.6969 C141.2656,33.6969 141.5469,33.5563 141.7344,33.3375 C141.8594,33.1656 141.9063,32.9938 141.9063,32.5563 L141.9063,31.1969 C141.9063,30.775 141.8906,30.6344 141.7656,30.4625 C141.5938,30.2125 141.3125,30.0563 140.9844,30.0563 C140.6719,30.0563 140.4688,30.1656 140.25,30.4313 C139.0781,29.9313 138.6406,29.8219 137.6875,29.8219 C135.0156,29.8219 133,31.8375 133,34.4625 L133,35.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="152" y="39.006">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="40" x="169" y="15.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="38" x="170" y="29.6001">double</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124" x2="205" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124" x2="205" y1="58.4" y2="58.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
-      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000496773262538580186">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000496773262538580186" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="241" y="18.4"/>
+        <ellipse cx="256" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M251,35.5563 C251,38.0563 253.1406,39.8688 256.0625,39.8688 C257.2969,39.8688 258.4688,39.5719 259.2188,39.0563 C259.8281,38.6344 260.1563,38.2125 260.1563,37.8063 C260.1563,37.3375 259.7344,36.9313 259.2344,36.9313 C259,36.9313 258.7813,37.0094 258.5781,37.2125 C258.1406,37.65 258.1406,37.65 257.9688,37.7438 C257.5156,37.9781 256.875,38.1188 256.1094,38.1188 C254.1094,38.1188 252.8281,37.1031 252.8281,35.525 L252.8281,34.4781 C252.8281,32.775 254.0469,31.5719 255.75,31.5719 C256.3281,31.5719 256.9063,31.7125 257.375,31.9625 C257.8438,32.2281 258.0156,32.4156 258.0781,32.775 C258.2031,33.4469 258.4531,33.6969 258.9844,33.6969 C259.2656,33.6969 259.5469,33.5563 259.7344,33.3375 C259.8594,33.1656 259.9063,32.9938 259.9063,32.5563 L259.9063,31.1969 C259.9063,30.775 259.8906,30.6344 259.7656,30.4625 C259.5938,30.2125 259.3125,30.0563 258.9844,30.0563 C258.6719,30.0563 258.4688,30.1656 258.25,30.4313 C257.0781,29.9313 256.6406,29.8219 255.6875,29.8219 C253.0156,29.8219 251,31.8375 251,34.4625 L251,35.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="270" y="39.006">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="287" y="15.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="288" y="29.6001">std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="242" x2="337" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="242" x2="337" y1="58.4" y2="58.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="62.2104">a : void *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001833471931530161359">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0001833471931530161359" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="84" x="373.5" y="18.4"/>
+        <ellipse cx="388.5" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M383.5,35.5563 C383.5,38.0563 385.6406,39.8688 388.5625,39.8688 C389.7969,39.8688 390.9688,39.5719 391.7188,39.0563 C392.3281,38.6344 392.6563,38.2125 392.6563,37.8063 C392.6563,37.3375 392.2344,36.9313 391.7344,36.9313 C391.5,36.9313 391.2813,37.0094 391.0781,37.2125 C390.6406,37.65 390.6406,37.65 390.4688,37.7438 C390.0156,37.9781 389.375,38.1188 388.6094,38.1188 C386.6094,38.1188 385.3281,37.1031 385.3281,35.525 L385.3281,34.4781 C385.3281,32.775 386.5469,31.5719 388.25,31.5719 C388.8281,31.5719 389.4063,31.7125 389.875,31.9625 C390.3438,32.2281 390.5156,32.4156 390.5781,32.775 C390.7031,33.4469 390.9531,33.6969 391.4844,33.6969 C391.7656,33.6969 392.0469,33.5563 392.2344,33.3375 C392.3594,33.1656 392.4063,32.9938 392.4063,32.5563 L392.4063,31.1969 C392.4063,30.775 392.3906,30.6344 392.2656,30.4625 C392.0938,30.2125 391.8125,30.0563 391.4844,30.0563 C391.1719,30.0563 390.9688,30.1656 390.75,30.4313 C389.5781,29.9313 389.1406,29.8219 388.1875,29.8219 C385.5156,29.8219 383.5,31.8375 383.5,34.4625 L383.5,35.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="402.5" y="39.006">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="41" x="419.5" y="15.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="39" x="420.5" y="29.6001">int,float</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="374.5" x2="456.5" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="374.5" x2="456.5" y1="58.4" y2="58.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopnlcdgrolw)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
-      <ellipse cx="412.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M415.4688,150.6406 Q414.8906,150.9375 414.25,151.0781 Q413.6094,151.2344 412.9063,151.2344 Q410.4063,151.2344 409.0781,149.5938 Q407.7656,147.9375 407.7656,144.8125 Q407.7656,141.6875 409.0781,140.0313 Q410.4063,138.375 412.9063,138.375 Q413.6094,138.375 414.25,138.5313 Q414.9063,138.6875 415.4688,138.9844 L415.4688,141.7031 Q414.8438,141.125 414.25,140.8594 Q413.6563,140.5781 413.0313,140.5781 Q411.6875,140.5781 411,141.6563 Q410.3125,142.7188 410.3125,144.8125 Q410.3125,146.9063 411,147.9844 Q411.6875,149.0469 413.0313,149.0469 Q413.6563,149.0469 414.25,148.7813 Q414.8438,148.5 415.4688,147.9219 L415.4688,150.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="426.5" y="149.1543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="21" x="442.5" y="126"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="19" x="443.5" y="138.1387">T,K</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="161" y2="161"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="169" y2="169"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="175"/>
-      <ellipse cx="408.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="417.5" y="183.2104">b : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="187.8047"/>
-      <ellipse cx="408.5" cy="192.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="417.5" y="196.0151">bb : K</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopnlcdgrolw)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
-      <ellipse cx="134.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M137.4688,36.1406 Q136.8906,36.4375 136.25,36.5781 Q135.6094,36.7344 134.9063,36.7344 Q132.4063,36.7344 131.0781,35.0938 Q129.7656,33.4375 129.7656,30.3125 Q129.7656,27.1875 131.0781,25.5313 Q132.4063,23.875 134.9063,23.875 Q135.6094,23.875 136.25,24.0313 Q136.9063,24.1875 137.4688,24.4844 L137.4688,27.2031 Q136.8438,26.625 136.25,26.3594 Q135.6563,26.0781 135.0313,26.0781 Q133.6875,26.0781 133,27.1563 Q132.3125,28.2188 132.3125,30.3125 Q132.3125,32.4063 133,33.4844 Q133.6875,34.5469 135.0313,34.5469 Q135.6563,34.5469 136.25,34.2813 Q136.8438,34 137.4688,33.4219 L137.4688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="148.5" y="34.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="45" x="164.5" y="11.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="165.5" y="23.6387">double</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="54.5" y2="54.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopnlcdgrolw)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
-      <ellipse cx="257" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M259.9688,36.1406 Q259.3906,36.4375 258.75,36.5781 Q258.1094,36.7344 257.4063,36.7344 Q254.9063,36.7344 253.5781,35.0938 Q252.2656,33.4375 252.2656,30.3125 Q252.2656,27.1875 253.5781,25.5313 Q254.9063,23.875 257.4063,23.875 Q258.1094,23.875 258.75,24.0313 Q259.4063,24.1875 259.9688,24.4844 L259.9688,27.2031 Q259.3438,26.625 258.75,26.3594 Q258.1563,26.0781 257.5313,26.0781 Q256.1875,26.0781 255.5,27.1563 Q254.8125,28.2188 254.8125,30.3125 Q254.8125,32.4063 255.5,33.4844 Q256.1875,34.5469 257.5313,34.5469 Q258.1563,34.5469 258.75,34.2813 Q259.3438,34 259.9688,33.4219 L259.9688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="34.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="287" y="11.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="288" y="23.6387">std::string</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="54.5" y2="54.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopnlcdgrolw)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
-      <ellipse cx="398" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M400.9688,36.1406 Q400.3906,36.4375 399.75,36.5781 Q399.1094,36.7344 398.4063,36.7344 Q395.9063,36.7344 394.5781,35.0938 Q393.2656,33.4375 393.2656,30.3125 Q393.2656,27.1875 394.5781,25.5313 Q395.9063,23.875 398.4063,23.875 Q399.1094,23.875 399.75,24.0313 Q400.4063,24.1875 400.9688,24.4844 L400.9688,27.2031 Q400.3438,26.625 399.75,26.3594 Q399.1563,26.0781 398.5313,26.0781 Q397.1875,26.0781 396.5,27.1563 Q395.8125,28.2188 395.8125,30.3125 Q395.8125,32.4063 396.5,33.4844 Q397.1875,34.5469 398.5313,34.5469 Q399.1563,34.5469 399.75,34.2813 Q400.3438,34 400.9688,33.4219 L400.9688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="412" y="34.6543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="50" x="428" y="11.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="48" x="429" y="23.6387">int,float</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384" x2="474" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384" x2="474" y1="54.5" y2="54.5"/>
-    </a>
-    <path d="M72.96,69.24 C87.93,85.16 106.63,105.05 123.1,122.57 " fill="none" id="C_0001422802342059669545-&gt;C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="128.25,117.83,136.85,137.19,118.05,127.42,128.25,117.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M163,62.52 C163,77.27 163,96.99 163,115.2 " fill="none" id="C_0000364538479078826988-&gt;C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="170,115.48,163,135.48,156,115.48,170,115.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M270.79,62.52 C252.13,80.26 225.91,105.19 204,126.02 " fill="none" id="C_0000496773262538580186-&gt;C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="208.64,131.27,189.32,139.98,198.99,121.12,208.64,131.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M429,62.52 C429,75.55 429,92.48 429,108.8 " fill="none" id="C_0001833471931530161359-&gt;C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="436,108.82,429,128.82,422,108.82,436,108.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001422802342059669545_C_0000462160951579835462">
+      <path codeLine="29" d="M75.82,75.16 C94.35,95.94 106.4725,109.5235 124.8625,130.1535 " fill="none" id="C_0001422802342059669545-to-C_0000462160951579835462" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="136.84,143.59,129.3413,126.161,120.3836,134.146,136.84,143.59" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000364538479078826988_C_0000462160951579835462">
+      <path codeLine="30" d="M164.5,66.86 C164.5,88.08 164.5,101.52 164.5,124.97 " fill="none" id="C_0000364538479078826988-to-C_0000462160951579835462" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="164.5,142.97,170.5,124.97,158.5,124.97,164.5,142.97" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000496773262538580186_C_0000462160951579835462">
+      <path codeLine="31" d="M267.15,66.86 C246.23,88.82 227.2957,108.6874 204.7557,132.3474 " fill="none" id="C_0000496773262538580186-to-C_0000462160951579835462" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="192.34,145.38,209.0999,136.4859,200.4115,128.2088,192.34,145.38" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001833471931530161359_C_0001414456934388678010">
+      <path codeLine="32" d="M415.5,66.86 C415.5,85.58 415.5,94.24 415.5,116.36 " fill="none" id="C_0001833471931530161359-to-C_0001414456934388678010" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="415.5,134.36,421.5,116.36,409.5,116.36,415.5,134.36" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00042_class_mermaid.svg b/docs/test_cases/t00042_class_mermaid.svg
index bff212c9..7066f0dd 100644
--- a/docs/test_cases/t00042_class_mermaid.svg
+++ b/docs/test_cases/t00042_class_mermaid.svg
@@ -1,59 +1,64 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 569.1875 246" style="max-width: 569.188px; background-color: white;" width="569.1875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M47.0703125,87L47.0703125,91.16666666666667C47.0703125,95.33333333333333,47.0703125,103.66666666666667,65.38411458333333,117.85908438603447C83.69791666666667,132.0515021054023,120.32552083333333,152.10300421080458,138.63932291666666,162.12875526350572L156.953125,172.1545063162069"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.984375,76L184.984375,82C184.984375,88,184.984375,100,184.984375,112C184.984375,124,184.984375,136,184.984375,142L184.984375,148"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M346,76L346,82C346,88,346,100,323.8359375,116.39269771955361C301.671875,132.78539543910722,257.34375,153.57079087821447,235.1796875,163.96348859776808L213.015625,174.3561863173217"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M509.6796875,76L509.6796875,82C509.6796875,88,509.6796875,100,509.6796875,110.16666666666667C509.6796875,120.33333333333333,509.6796875,128.66666666666666,509.6796875,132.83333333333334L509.6796875,137"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M47.0703125,87L47.0703125,91.16666666666667C47.0703125,95.33333333333333,47.0703125,103.66666666666667,62.75262992984673,116.41849821420563C78.43494735969345,129.17032976174463,109.79958221938692,146.34065952348922,125.48189964923364,154.92582440436152L141.16421707908037,163.51098928523385"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.984375,76L184.984375,82C184.984375,88,184.984375,100,184.984375,109C184.984375,118,184.984375,124,184.984375,127L184.984375,130"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M346,76L346,82C346,88,346,100,326.55215917689395,115.11906519720993C307.10431835378785,130.23813039441987,268.20863670757575,148.47626078883977,248.76079588446967,157.59532598604972L229.31295506136362,166.71439118325966"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M509.6796875,76L509.6796875,82C509.6796875,88,509.6796875,100,509.6796875,107.16666666666667C509.6796875,114.33333333333333,509.6796875,116.66666666666667,509.6796875,117.83333333333333L509.6796875,119"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -102,7 +107,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000462160951579835462-0" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -126,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L9">
+        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L9">
           <g title="A" id="classId-C_0001422802342059669545-1" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -144,13 +149,13 @@
               </foreignObject>
               <foreignObject transform="translate( -31.5703125, 2)" height="18" width="60.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+a : void </span>
+                  <span style="font-style:italic;" class="nodeLabel">+a : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001414456934388678010-2" class="node default clickable">
             <rect height="101" width="69.25" y="-50.5" x="-34.625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.625" x1="-34.625" class="divider"/>
@@ -179,7 +184,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000364538479078826988-3" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -198,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L5">
+        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000496773262538580186-4" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -217,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001833471931530161359-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
diff --git a/docs/test_cases/t00043.md b/docs/test_cases/t00043.md
index e2557d36..3c402377 100644
--- a/docs/test_cases/t00043.md
+++ b/docs/test_cases/t00043.md
@@ -17,7 +17,7 @@ diagrams:
         - dependency
 ```
 ## Source code
-File t00043.cc
+File `tests/t00043/t00043.cc`
 ```cpp
 namespace clanguml::t00043 {
 
@@ -127,6 +127,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -180,6 +181,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -233,6 +235,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -286,6 +289,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -316,6 +320,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -369,6 +374,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -473,6 +479,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -503,6 +510,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -556,6 +564,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -609,6 +618,7 @@ struct J {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg
index 86acef31..259b5c5e 100644
--- a/docs/test_cases/t00043_class.svg
+++ b/docs/test_cases/t00043_class.svg
@@ -1,197 +1,237 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="645px" preserveAspectRatio="none" style="width:512px;height:645px;" version="1.1" viewBox="0 0 512 645" width="512px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="645px" preserveAspectRatio="none" style="width:508px;height:645px;background:#FFFFFF;" version="1.1" viewBox="0 0 508 645" width="508px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ffa0h6rd7e8g6" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#ffa0h6rd7e8g6)" points="22,24,122,24,129,46.2969,304,46.2969,304,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#ffa0h6rd7e8g6)" points="328,24,446,24,453,46.2969,490,46.2969,490,518.5,328,518.5,328,24" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="328" x2="453" y1="46.2969" y2="46.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="332" y="38.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="144" y="569"/>
-      <ellipse cx="159" cy="585" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M161.9688,590.6406 Q161.3906,590.9375 160.75,591.0781 Q160.1094,591.2344 159.4063,591.2344 Q156.9063,591.2344 155.5781,589.5938 Q154.2656,587.9375 154.2656,584.8125 Q154.2656,581.6875 155.5781,580.0313 Q156.9063,578.375 159.4063,578.375 Q160.1094,578.375 160.75,578.5313 Q161.4063,578.6875 161.9688,578.9844 L161.9688,581.7031 Q161.3438,581.125 160.75,580.8594 Q160.1563,580.5781 159.5313,580.5781 Q158.1875,580.5781 157.5,581.6563 Q156.8125,582.7188 156.8125,584.8125 Q156.8125,586.9063 157.5,587.9844 Q158.1875,589.0469 159.5313,589.0469 Q160.1563,589.0469 160.75,588.7813 Q161.3438,588.5 161.9688,587.9219 L161.9688,590.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="173" y="589.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="601" y2="601"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="609" y2="609"/>
+    <g id="cluster_C_0000304447182504144601">
+      <path d="M8.5,6.294 L91.5,6.294 A3.75,3.75 0 0 1 94,8.794 L101,29.0939 L302.5,29.0939 A2.5,2.5 0 0 1 305,31.5939 L305,635.594 A2.5,2.5 0 0 1 302.5,638.094 L8.5,638.094 A2.5,2.5 0 0 1 6,635.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="101" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="10" y="21.2999">dependants</text>
+    </g>
+    <g id="cluster_C_0001483444584386955509">
+      <path d="M331.5,6.294 L429.5,6.294 A3.75,3.75 0 0 1 432,8.794 L439,29.0939 L498.5,29.0939 A2.5,2.5 0 0 1 501,31.5939 L501,519.194 A2.5,2.5 0 0 1 498.5,521.694 L331.5,521.694 A2.5,2.5 0 0 1 329,519.194 L329,8.794 A2.5,2.5 0 0 1 331.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="329" x2="439" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="97" x="333" y="21.2999">dependencies</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001454679300998460550">
+        <rect codeLine="3" fill="#F1F1F1" height="48" id="C_0001454679300998460550" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="136.5" y="574.094"/>
+        <ellipse cx="151.5" cy="590.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M146.5,591.2502 C146.5,593.7502 148.6406,595.5627 151.5625,595.5627 C152.7969,595.5627 153.9688,595.2659 154.7188,594.7502 C155.3281,594.3284 155.6563,593.9065 155.6563,593.5002 C155.6563,593.0315 155.2344,592.6252 154.7344,592.6252 C154.5,592.6252 154.2813,592.7034 154.0781,592.9065 C153.6406,593.344 153.6406,593.344 153.4688,593.4377 C153.0156,593.6721 152.375,593.8127 151.6094,593.8127 C149.6094,593.8127 148.3281,592.7971 148.3281,591.219 L148.3281,590.1721 C148.3281,588.469 149.5469,587.2659 151.25,587.2659 C151.8281,587.2659 152.4063,587.4065 152.875,587.6565 C153.3438,587.9221 153.5156,588.1096 153.5781,588.469 C153.7031,589.1409 153.9531,589.3909 154.4844,589.3909 C154.7656,589.3909 155.0469,589.2502 155.2344,589.0315 C155.3594,588.8596 155.4063,588.6877 155.4063,588.2502 L155.4063,586.8909 C155.4063,586.469 155.3906,586.3284 155.2656,586.1565 C155.0938,585.9065 154.8125,585.7502 154.4844,585.7502 C154.1719,585.7502 153.9688,585.8596 153.75,586.1252 C152.5781,585.6252 152.1406,585.5159 151.1875,585.5159 C148.5156,585.5159 146.5,587.5315 146.5,590.1565 L146.5,591.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="165.5" y="594.7">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="137.5" x2="176.5" y1="606.094" y2="606.094"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="137.5" x2="176.5" y1="614.094" y2="614.094"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="184" y="448"/>
-      <ellipse cx="227.8" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M230.7688,469.6406 Q230.1906,469.9375 229.55,470.0781 Q228.9094,470.2344 228.2063,470.2344 Q225.7063,470.2344 224.3781,468.5938 Q223.0656,466.9375 223.0656,463.8125 Q223.0656,460.6875 224.3781,459.0313 Q225.7063,457.375 228.2063,457.375 Q228.9094,457.375 229.55,457.5313 Q230.2063,457.6875 230.7688,457.9844 L230.7688,460.7031 Q230.1438,460.125 229.55,459.8594 Q228.9563,459.5781 228.3313,459.5781 Q226.9875,459.5781 226.3,460.6563 Q225.6125,461.7188 225.6125,463.8125 Q225.6125,465.9063 226.3,466.9844 Q226.9875,468.0469 228.3313,468.0469 Q228.9563,468.0469 229.55,467.7813 Q230.1438,467.5 230.7688,466.9219 L230.7688,469.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="248.2" y="468.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="480" y2="480"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001972977265990430931">
+        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001972977265990430931" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="177" y="449.294"/>
+        <ellipse cx="224.25" cy="465.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M219.25,466.4502 C219.25,468.9502 221.3906,470.7627 224.3125,470.7627 C225.5469,470.7627 226.7188,470.4659 227.4688,469.9502 C228.0781,469.5284 228.4063,469.1065 228.4063,468.7002 C228.4063,468.2315 227.9844,467.8252 227.4844,467.8252 C227.25,467.8252 227.0313,467.9034 226.8281,468.1065 C226.3906,468.544 226.3906,468.544 226.2188,468.6377 C225.7656,468.8721 225.125,469.0127 224.3594,469.0127 C222.3594,469.0127 221.0781,467.9971 221.0781,466.419 L221.0781,465.3721 C221.0781,463.669 222.2969,462.4659 224,462.4659 C224.5781,462.4659 225.1563,462.6065 225.625,462.8565 C226.0938,463.1221 226.2656,463.3096 226.3281,463.669 C226.4531,464.3409 226.7031,464.5909 227.2344,464.5909 C227.5156,464.5909 227.7969,464.4502 227.9844,464.2315 C228.1094,464.0596 228.1563,463.8877 228.1563,463.4502 L228.1563,462.0909 C228.1563,461.669 228.1406,461.5284 228.0156,461.3565 C227.8438,461.1065 227.5625,460.9502 227.2344,460.9502 C226.9219,460.9502 226.7188,461.0596 226.5,461.3252 C225.3281,460.8252 224.8906,460.7159 223.9375,460.7159 C221.2656,460.7159 219.25,462.7315 219.25,465.3565 L219.25,466.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="244.75" y="469.9">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="178" x2="288" y1="481.294" y2="481.294"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="183" y="490.1939"/>
+          <ellipse cx="188" cy="495.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="86" x="197" y="498.2999">b(A * a) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="178" x2="288" y1="506.0939" y2="506.0939"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="190" y="486"/>
-      <ellipse cx="195" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <g id="elem_C_0001906291555025945295">
+        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0001906291555025945295" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="22" y="449.294"/>
+        <ellipse cx="68.75" cy="465.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M63.75,466.4502 C63.75,468.9502 65.8906,470.7627 68.8125,470.7627 C70.0469,470.7627 71.2188,470.4659 71.9688,469.9502 C72.5781,469.5284 72.9063,469.1065 72.9063,468.7002 C72.9063,468.2315 72.4844,467.8252 71.9844,467.8252 C71.75,467.8252 71.5313,467.9034 71.3281,468.1065 C70.8906,468.544 70.8906,468.544 70.7188,468.6377 C70.2656,468.8721 69.625,469.0127 68.8594,469.0127 C66.8594,469.0127 65.5781,467.9971 65.5781,466.419 L65.5781,465.3721 C65.5781,463.669 66.7969,462.4659 68.5,462.4659 C69.0781,462.4659 69.6563,462.6065 70.125,462.8565 C70.5938,463.1221 70.7656,463.3096 70.8281,463.669 C70.9531,464.3409 71.2031,464.5909 71.7344,464.5909 C72.0156,464.5909 72.2969,464.4502 72.4844,464.2315 C72.6094,464.0596 72.6563,463.8877 72.6563,463.4502 L72.6563,462.0909 C72.6563,461.669 72.6406,461.5284 72.5156,461.3565 C72.3438,461.1065 72.0625,460.9502 71.7344,460.9502 C71.4219,460.9502 71.2188,461.0596 71,461.3252 C69.8281,460.8252 69.3906,460.7159 68.4375,460.7159 C65.7656,460.7159 63.75,462.7315 63.75,465.3565 L63.75,466.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="89.25" y="469.9">BB</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="23" x2="141" y1="481.294" y2="481.294"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="28" y="490.1939"/>
+          <ellipse cx="33" cy="495.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="94" x="42" y="498.2999">bb(A * a) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="23" x2="141" y1="506.0939" y2="506.0939"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="204" y="494.2104">b(A * a) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000823759225351121534">
+        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0000823759225351121534" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="111" x="162.5" y="316.094"/>
+        <ellipse cx="208.75" cy="332.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M203.75,333.2502 C203.75,335.7502 205.8906,337.5627 208.8125,337.5627 C210.0469,337.5627 211.2188,337.2659 211.9688,336.7502 C212.5781,336.3284 212.9063,335.9065 212.9063,335.5002 C212.9063,335.0315 212.4844,334.6252 211.9844,334.6252 C211.75,334.6252 211.5313,334.7034 211.3281,334.9065 C210.8906,335.344 210.8906,335.344 210.7188,335.4377 C210.2656,335.6721 209.625,335.8127 208.8594,335.8127 C206.8594,335.8127 205.5781,334.7971 205.5781,333.219 L205.5781,332.1721 C205.5781,330.469 206.7969,329.2659 208.5,329.2659 C209.0781,329.2659 209.6563,329.4065 210.125,329.6565 C210.5938,329.9221 210.7656,330.1096 210.8281,330.469 C210.9531,331.1409 211.2031,331.3909 211.7344,331.3909 C212.0156,331.3909 212.2969,331.2502 212.4844,331.0315 C212.6094,330.8596 212.6563,330.6877 212.6563,330.2502 L212.6563,328.8909 C212.6563,328.469 212.6406,328.3284 212.5156,328.1565 C212.3438,327.9065 212.0625,327.7502 211.7344,327.7502 C211.4219,327.7502 211.2188,327.8596 211,328.1252 C209.8281,327.6252 209.3906,327.5159 208.4375,327.5159 C205.7656,327.5159 203.75,329.5315 203.75,332.1565 L203.75,333.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="229.25" y="336.7">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="163.5" x2="272.5" y1="348.094" y2="348.094"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="168.5" y="356.9939"/>
+          <ellipse cx="173.5" cy="361.9939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="182.5" y="365.0999">c(B * b) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="163.5" x2="272.5" y1="372.8939" y2="372.8939"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="500.8047" y2="500.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="111" x="37.5" y="448"/>
-      <ellipse cx="80.85" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M83.8188,469.6406 Q83.2406,469.9375 82.6,470.0781 Q81.9594,470.2344 81.2563,470.2344 Q78.7563,470.2344 77.4281,468.5938 Q76.1156,466.9375 76.1156,463.8125 Q76.1156,460.6875 77.4281,459.0313 Q78.7563,457.375 81.2563,457.375 Q81.9594,457.375 82.6,457.5313 Q83.2563,457.6875 83.8188,457.9844 L83.8188,460.7031 Q83.1938,460.125 82.6,459.8594 Q82.0063,459.5781 81.3813,459.5781 Q80.0375,459.5781 79.35,460.6563 Q78.6625,461.7188 78.6625,463.8125 Q78.6625,465.9063 79.35,466.9844 Q80.0375,468.0469 81.3813,468.0469 Q82.0063,468.0469 82.6,467.7813 Q83.1938,467.5 83.8188,466.9219 L83.8188,469.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="101.15" y="468.1543">BB</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="480" y2="480"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0002277976215348279426">
+        <rect codeLine="22" fill="#F1F1F1" height="81.5999" id="C_0002277976215348279426" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="63.5" y="166.094"/>
+        <ellipse cx="122.75" cy="182.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M117.75,183.2502 C117.75,185.7502 119.8906,187.5627 122.8125,187.5627 C124.0469,187.5627 125.2188,187.2659 125.9688,186.7502 C126.5781,186.3284 126.9063,185.9065 126.9063,185.5002 C126.9063,185.0315 126.4844,184.6252 125.9844,184.6252 C125.75,184.6252 125.5313,184.7034 125.3281,184.9065 C124.8906,185.344 124.8906,185.344 124.7188,185.4377 C124.2656,185.6721 123.625,185.8127 122.8594,185.8127 C120.8594,185.8127 119.5781,184.7971 119.5781,183.219 L119.5781,182.1721 C119.5781,180.469 120.7969,179.2659 122.5,179.2659 C123.0781,179.2659 123.6563,179.4065 124.125,179.6565 C124.5938,179.9221 124.7656,180.1096 124.8281,180.469 C124.9531,181.1409 125.2031,181.3909 125.7344,181.3909 C126.0156,181.3909 126.2969,181.2502 126.4844,181.0315 C126.6094,180.8596 126.6563,180.6877 126.6563,180.2502 L126.6563,178.8909 C126.6563,178.469 126.6406,178.3284 126.5156,178.1565 C126.3438,177.9065 126.0625,177.7502 125.7344,177.7502 C125.4219,177.7502 125.2188,177.8596 125,178.1252 C123.8281,177.6252 123.3906,177.5159 122.4375,177.5159 C119.7656,177.5159 117.75,179.5315 117.75,182.1565 L117.75,183.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="143.25" y="186.7">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="64.5" x2="199.5" y1="198.094" y2="198.094"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="206.9939"/>
+          <ellipse cx="74.5" cy="211.9939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="86" x="83.5" y="215.0999">d(C * c) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="223.7939"/>
+          <ellipse cx="74.5" cy="228.7939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="83.5" y="231.8999">dd(BB * bb) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="64.5" x2="199.5" y1="239.6938" y2="239.6938"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="43.5" y="486"/>
-      <ellipse cx="48.5" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001694685540293810116">
+        <rect codeLine="28" fill="#F1F1F1" height="64.7999" id="C_0001694685540293810116" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="75.5" y="41.294"/>
+        <ellipse cx="123.25" cy="57.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M118.25,58.4502 C118.25,60.9502 120.3906,62.7627 123.3125,62.7627 C124.5469,62.7627 125.7188,62.4659 126.4688,61.9502 C127.0781,61.5284 127.4063,61.1065 127.4063,60.7002 C127.4063,60.2315 126.9844,59.8252 126.4844,59.8252 C126.25,59.8252 126.0313,59.9034 125.8281,60.1065 C125.3906,60.544 125.3906,60.544 125.2188,60.6377 C124.7656,60.8721 124.125,61.0127 123.3594,61.0127 C121.3594,61.0127 120.0781,59.9971 120.0781,58.419 L120.0781,57.3721 C120.0781,55.669 121.2969,54.4659 123,54.4659 C123.5781,54.4659 124.1563,54.6065 124.625,54.8565 C125.0938,55.1221 125.2656,55.3096 125.3281,55.669 C125.4531,56.3409 125.7031,56.5909 126.2344,56.5909 C126.5156,56.5909 126.7969,56.4502 126.9844,56.2315 C127.1094,56.0596 127.1563,55.8877 127.1563,55.4502 L127.1563,54.0909 C127.1563,53.669 127.1406,53.5284 127.0156,53.3565 C126.8438,53.1065 126.5625,52.9502 126.2344,52.9502 C125.9219,52.9502 125.7188,53.0596 125.5,53.3252 C124.3281,52.8252 123.8906,52.7159 122.9375,52.7159 C120.2656,52.7159 118.25,54.7315 118.25,57.3565 L118.25,58.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="143.75" y="61.9">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="76.5" x2="187.5" y1="73.294" y2="73.294"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="81.5" y="82.1939"/>
+          <ellipse cx="86.5" cy="87.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="95.5" y="90.2999">e(D * d) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="76.5" x2="187.5" y1="98.0939" y2="98.0939"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="57.5" y="494.2104">bb(A * a) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0000736400571183204899">
+        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0000736400571183204899" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="348.5" y="457.694"/>
+        <ellipse cx="363.5" cy="473.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M358.5,474.8502 C358.5,477.3502 360.6406,479.1627 363.5625,479.1627 C364.7969,479.1627 365.9688,478.8659 366.7188,478.3502 C367.3281,477.9284 367.6563,477.5065 367.6563,477.1002 C367.6563,476.6315 367.2344,476.2252 366.7344,476.2252 C366.5,476.2252 366.2813,476.3034 366.0781,476.5065 C365.6406,476.944 365.6406,476.944 365.4688,477.0377 C365.0156,477.2721 364.375,477.4127 363.6094,477.4127 C361.6094,477.4127 360.3281,476.3971 360.3281,474.819 L360.3281,473.7721 C360.3281,472.069 361.5469,470.8659 363.25,470.8659 C363.8281,470.8659 364.4063,471.0065 364.875,471.2565 C365.3438,471.5221 365.5156,471.7096 365.5781,472.069 C365.7031,472.7409 365.9531,472.9909 366.4844,472.9909 C366.7656,472.9909 367.0469,472.8502 367.2344,472.6315 C367.3594,472.4596 367.4063,472.2877 367.4063,471.8502 L367.4063,470.4909 C367.4063,470.069 367.3906,469.9284 367.2656,469.7565 C367.0938,469.5065 366.8125,469.3502 366.4844,469.3502 C366.1719,469.3502 365.9688,469.4596 365.75,469.7252 C364.5781,469.2252 364.1406,469.1159 363.1875,469.1159 C360.5156,469.1159 358.5,471.1315 358.5,473.7565 L358.5,474.8502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="377.5" y="478.3">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="349.5" x2="390.5" y1="489.694" y2="489.694"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="349.5" x2="390.5" y1="497.694" y2="497.694"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="500.8047" y2="500.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="170" y="320.5"/>
-      <ellipse cx="213.8" cy="336.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M216.7688,342.1406 Q216.1906,342.4375 215.55,342.5781 Q214.9094,342.7344 214.2063,342.7344 Q211.7063,342.7344 210.3781,341.0938 Q209.0656,339.4375 209.0656,336.3125 Q209.0656,333.1875 210.3781,331.5313 Q211.7063,329.875 214.2063,329.875 Q214.9094,329.875 215.55,330.0313 Q216.2063,330.1875 216.7688,330.4844 L216.7688,333.2031 Q216.1438,332.625 215.55,332.3594 Q214.9563,332.0781 214.3313,332.0781 Q212.9875,332.0781 212.3,333.1563 Q211.6125,334.2188 211.6125,336.3125 Q211.6125,338.4063 212.3,339.4844 Q212.9875,340.5469 214.3313,340.5469 Q214.9563,340.5469 215.55,340.2813 Q216.1438,340 216.7688,339.4219 L216.7688,342.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="234.2" y="340.6543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="352.5" y2="352.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
+      <g id="elem_C_0001522297681294871411">
+        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001522297681294871411" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="426" y="457.694"/>
+        <ellipse cx="441" cy="473.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M436,474.8502 C436,477.3502 438.1406,479.1627 441.0625,479.1627 C442.2969,479.1627 443.4688,478.8659 444.2188,478.3502 C444.8281,477.9284 445.1563,477.5065 445.1563,477.1002 C445.1563,476.6315 444.7344,476.2252 444.2344,476.2252 C444,476.2252 443.7813,476.3034 443.5781,476.5065 C443.1406,476.944 443.1406,476.944 442.9688,477.0377 C442.5156,477.2721 441.875,477.4127 441.1094,477.4127 C439.1094,477.4127 437.8281,476.3971 437.8281,474.819 L437.8281,473.7721 C437.8281,472.069 439.0469,470.8659 440.75,470.8659 C441.3281,470.8659 441.9063,471.0065 442.375,471.2565 C442.8438,471.5221 443.0156,471.7096 443.0781,472.069 C443.2031,472.7409 443.4531,472.9909 443.9844,472.9909 C444.2656,472.9909 444.5469,472.8502 444.7344,472.6315 C444.8594,472.4596 444.9063,472.2877 444.9063,471.8502 L444.9063,470.4909 C444.9063,470.069 444.8906,469.9284 444.7656,469.7565 C444.5938,469.5065 444.3125,469.3502 443.9844,469.3502 C443.6719,469.3502 443.4688,469.4596 443.25,469.7252 C442.0781,469.2252 441.6406,469.1159 440.6875,469.1159 C438.0156,469.1159 436,471.1315 436,473.7565 L436,474.8502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="22" x="455" y="478.3">GG</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="427" x2="479" y1="489.694" y2="489.694"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="427" x2="479" y1="497.694" y2="497.694"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="176" y="358.5"/>
-      <ellipse cx="181" cy="363.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <g id="elem_C_0001534191494825314170">
+        <rect codeLine="43" fill="#F1F1F1" height="81.5999" id="C_0001534191494825314170" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="141" x="344.5" y="307.694"/>
+        <ellipse cx="405.75" cy="323.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M400.75,324.8502 C400.75,327.3502 402.8906,329.1627 405.8125,329.1627 C407.0469,329.1627 408.2188,328.8659 408.9688,328.3502 C409.5781,327.9284 409.9063,327.5065 409.9063,327.1002 C409.9063,326.6315 409.4844,326.2252 408.9844,326.2252 C408.75,326.2252 408.5313,326.3034 408.3281,326.5065 C407.8906,326.944 407.8906,326.944 407.7188,327.0377 C407.2656,327.2721 406.625,327.4127 405.8594,327.4127 C403.8594,327.4127 402.5781,326.3971 402.5781,324.819 L402.5781,323.7721 C402.5781,322.069 403.7969,320.8659 405.5,320.8659 C406.0781,320.8659 406.6563,321.0065 407.125,321.2565 C407.5938,321.5221 407.7656,321.7096 407.8281,322.069 C407.9531,322.7409 408.2031,322.9909 408.7344,322.9909 C409.0156,322.9909 409.2969,322.8502 409.4844,322.6315 C409.6094,322.4596 409.6563,322.2877 409.6563,321.8502 L409.6563,320.4909 C409.6563,320.069 409.6406,319.9284 409.5156,319.7565 C409.3438,319.5065 409.0625,319.3502 408.7344,319.3502 C408.4219,319.3502 408.2188,319.4596 408,319.7252 C406.8281,319.2252 406.3906,319.1159 405.4375,319.1159 C402.7656,319.1159 400.75,321.1315 400.75,323.7565 L400.75,324.8502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="426.25" y="328.3">H</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="345.5" x2="484.5" y1="339.694" y2="339.694"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="350.5" y="348.5939"/>
+          <ellipse cx="355.5" cy="353.5939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="364.5" y="356.6999">h(G * g) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="350.5" y="365.3939"/>
+          <ellipse cx="355.5" cy="370.3939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="364.5" y="373.4999">hh(GG * gg) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="345.5" x2="484.5" y1="381.2938" y2="381.2938"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="190" y="366.7104">c(B * b) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <g id="elem_C_0000097422543769740359">
+        <rect codeLine="49" fill="#F1F1F1" height="64.7999" id="C_0000097422543769740359" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="361" y="174.494"/>
+        <ellipse cx="408.75" cy="190.494" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M403.75,191.6502 C403.75,194.1502 405.8906,195.9627 408.8125,195.9627 C410.0469,195.9627 411.2188,195.6659 411.9688,195.1502 C412.5781,194.7284 412.9063,194.3065 412.9063,193.9002 C412.9063,193.4315 412.4844,193.0252 411.9844,193.0252 C411.75,193.0252 411.5313,193.1034 411.3281,193.3065 C410.8906,193.744 410.8906,193.744 410.7188,193.8377 C410.2656,194.0721 409.625,194.2127 408.8594,194.2127 C406.8594,194.2127 405.5781,193.1971 405.5781,191.619 L405.5781,190.5721 C405.5781,188.869 406.7969,187.6659 408.5,187.6659 C409.0781,187.6659 409.6563,187.8065 410.125,188.0565 C410.5938,188.3221 410.7656,188.5096 410.8281,188.869 C410.9531,189.5409 411.2031,189.7909 411.7344,189.7909 C412.0156,189.7909 412.2969,189.6502 412.4844,189.4315 C412.6094,189.2596 412.6563,189.0877 412.6563,188.6502 L412.6563,187.2909 C412.6563,186.869 412.6406,186.7284 412.5156,186.5565 C412.3438,186.3065 412.0625,186.1502 411.7344,186.1502 C411.4219,186.1502 411.2188,186.2596 411,186.5252 C409.8281,186.0252 409.3906,185.9159 408.4375,185.9159 C405.7656,185.9159 403.75,187.9315 403.75,190.5565 L403.75,191.6502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="429.25" y="195.1">I</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="468" y1="206.494" y2="206.494"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="215.3939"/>
+          <ellipse cx="372" cy="220.3939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="381" y="223.4999">i(H * h) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="468" y1="231.2939" y2="231.2939"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="373.3047" y2="373.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="77.5" y="180"/>
-      <ellipse cx="132.25" cy="196" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M135.2188,201.6406 Q134.6406,201.9375 134,202.0781 Q133.3594,202.2344 132.6563,202.2344 Q130.1563,202.2344 128.8281,200.5938 Q127.5156,198.9375 127.5156,195.8125 Q127.5156,192.6875 128.8281,191.0313 Q130.1563,189.375 132.6563,189.375 Q133.3594,189.375 134,189.5313 Q134.6563,189.6875 135.2188,189.9844 L135.2188,192.7031 Q134.5938,192.125 134,191.8594 Q133.4063,191.5781 132.7813,191.5781 Q131.4375,191.5781 130.75,192.6563 Q130.0625,193.7188 130.0625,195.8125 Q130.0625,197.9063 130.75,198.9844 Q131.4375,200.0469 132.7813,200.0469 Q133.4063,200.0469 134,199.7813 Q134.5938,199.5 135.2188,198.9219 L135.2188,201.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="152.75" y="200.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="212" y2="212"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <g id="elem_C_0001498530043106438011">
+        <rect codeLine="54" fill="#F1F1F1" height="64.7999" id="C_0001498530043106438011" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="366.5" y="41.294"/>
+        <ellipse cx="407.6" cy="57.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M402.6,58.4502 C402.6,60.9502 404.7406,62.7627 407.6625,62.7627 C408.8969,62.7627 410.0688,62.4659 410.8188,61.9502 C411.4281,61.5284 411.7563,61.1065 411.7563,60.7002 C411.7563,60.2315 411.3344,59.8252 410.8344,59.8252 C410.6,59.8252 410.3813,59.9034 410.1781,60.1065 C409.7406,60.544 409.7406,60.544 409.5688,60.6377 C409.1156,60.8721 408.475,61.0127 407.7094,61.0127 C405.7094,61.0127 404.4281,59.9971 404.4281,58.419 L404.4281,57.3721 C404.4281,55.669 405.6469,54.4659 407.35,54.4659 C407.9281,54.4659 408.5063,54.6065 408.975,54.8565 C409.4438,55.1221 409.6156,55.3096 409.6781,55.669 C409.8031,56.3409 410.0531,56.5909 410.5844,56.5909 C410.8656,56.5909 411.1469,56.4502 411.3344,56.2315 C411.4594,56.0596 411.5063,55.8877 411.5063,55.4502 L411.5063,54.0909 C411.5063,53.669 411.4906,53.5284 411.3656,53.3565 C411.1938,53.1065 410.9125,52.9502 410.5844,52.9502 C410.2719,52.9502 410.0688,53.0596 409.85,53.3252 C408.6781,52.8252 408.2406,52.7159 407.2875,52.7159 C404.6156,52.7159 402.6,54.7315 402.6,57.3565 L402.6,58.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="427.4" y="61.9">J</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="367.5" x2="462.5" y1="73.294" y2="73.294"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="372.5" y="82.1939"/>
+          <ellipse cx="377.5" cy="87.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="386.5" y="90.2999">i(I * i) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="367.5" x2="462.5" y1="98.0939" y2="98.0939"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="218"/>
-      <ellipse cx="88.5" cy="223" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="97.5" y="226.2104">d(C * c) : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="230.8047"/>
-      <ellipse cx="88.5" cy="235.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="97.5" y="239.0151">dd(BB * bb) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="245.6094" y2="245.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="88.5" y="59"/>
-      <ellipse cx="132.75" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M135.7188,80.6406 Q135.1406,80.9375 134.5,81.0781 Q133.8594,81.2344 133.1563,81.2344 Q130.6563,81.2344 129.3281,79.5938 Q128.0156,77.9375 128.0156,74.8125 Q128.0156,71.6875 129.3281,70.0313 Q130.6563,68.375 133.1563,68.375 Q133.8594,68.375 134.5,68.5313 Q135.1563,68.6875 135.7188,68.9844 L135.7188,71.7031 Q135.0938,71.125 134.5,70.8594 Q133.9063,70.5781 133.2813,70.5781 Q131.9375,70.5781 131.25,71.6563 Q130.5625,72.7188 130.5625,74.8125 Q130.5625,76.9063 131.25,77.9844 Q131.9375,79.0469 133.2813,79.0469 Q133.9063,79.0469 134.5,78.7813 Q135.0938,78.5 135.7188,77.9219 L135.7188,80.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="153.25" y="79.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="91" y2="91"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="94.5" y="97"/>
-      <ellipse cx="99.5" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="108.5" y="105.2104">e(D * d) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="111.8047" y2="111.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="345.5" y="454.5"/>
-      <ellipse cx="360.5" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M363.4688,476.1406 Q362.8906,476.4375 362.25,476.5781 Q361.6094,476.7344 360.9063,476.7344 Q358.4063,476.7344 357.0781,475.0938 Q355.7656,473.4375 355.7656,470.3125 Q355.7656,467.1875 357.0781,465.5313 Q358.4063,463.875 360.9063,463.875 Q361.6094,463.875 362.25,464.0313 Q362.9063,464.1875 363.4688,464.4844 L363.4688,467.2031 Q362.8438,466.625 362.25,466.3594 Q361.6563,466.0781 361.0313,466.0781 Q359.6875,466.0781 359,467.1563 Q358.3125,468.2188 358.3125,470.3125 Q358.3125,472.4063 359,473.4844 Q359.6875,474.5469 361.0313,474.5469 Q361.6563,474.5469 362.25,474.2813 Q362.8438,474 363.4688,473.4219 L363.4688,476.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="374.5" y="474.6543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="486.5" y2="486.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="494.5" y2="494.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="422" y="454.5"/>
-      <ellipse cx="437" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M439.9688,476.1406 Q439.3906,476.4375 438.75,476.5781 Q438.1094,476.7344 437.4063,476.7344 Q434.9063,476.7344 433.5781,475.0938 Q432.2656,473.4375 432.2656,470.3125 Q432.2656,467.1875 433.5781,465.5313 Q434.9063,463.875 437.4063,463.875 Q438.1094,463.875 438.75,464.0313 Q439.4063,464.1875 439.9688,464.4844 L439.9688,467.2031 Q439.3438,466.625 438.75,466.3594 Q438.1563,466.0781 437.5313,466.0781 Q436.1875,466.0781 435.5,467.1563 Q434.8125,468.2188 434.8125,470.3125 Q434.8125,472.4063 435.5,473.4844 Q436.1875,474.5469 437.5313,474.5469 Q438.1563,474.5469 438.75,474.2813 Q439.3438,474 439.9688,473.4219 L439.9688,476.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="451" y="474.6543">GG</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="486.5" y2="486.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="494.5" y2="494.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="344.5" y="314"/>
-      <ellipse cx="400.25" cy="330" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M403.2188,335.6406 Q402.6406,335.9375 402,336.0781 Q401.3594,336.2344 400.6563,336.2344 Q398.1563,336.2344 396.8281,334.5938 Q395.5156,332.9375 395.5156,329.8125 Q395.5156,326.6875 396.8281,325.0313 Q398.1563,323.375 400.6563,323.375 Q401.3594,323.375 402,323.5313 Q402.6563,323.6875 403.2188,323.9844 L403.2188,326.7031 Q402.5938,326.125 402,325.8594 Q401.4063,325.5781 400.7813,325.5781 Q399.4375,325.5781 398.75,326.6563 Q398.0625,327.7188 398.0625,329.8125 Q398.0625,331.9063 398.75,332.9844 Q399.4375,334.0469 400.7813,334.0469 Q401.4063,334.0469 402,333.7813 Q402.5938,333.5 403.2188,332.9219 L403.2188,335.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="420.75" y="334.1543">H</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="346" y2="346"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="352"/>
-      <ellipse cx="355.5" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="80" x="364.5" y="360.2104">h(G * g) : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="364.8047"/>
-      <ellipse cx="355.5" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="364.5" y="373.0151">hh(GG * gg) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="379.6094" y2="379.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="358.5" y="186.5"/>
-      <ellipse cx="403.25" cy="202.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M406.2188,208.1406 Q405.6406,208.4375 405,208.5781 Q404.3594,208.7344 403.6563,208.7344 Q401.1563,208.7344 399.8281,207.0938 Q398.5156,205.4375 398.5156,202.3125 Q398.5156,199.1875 399.8281,197.5313 Q401.1563,195.875 403.6563,195.875 Q404.3594,195.875 405,196.0313 Q405.6563,196.1875 406.2188,196.4844 L406.2188,199.2031 Q405.5938,198.625 405,198.3594 Q404.4063,198.0781 403.7813,198.0781 Q402.4375,198.0781 401.75,199.1563 Q401.0625,200.2188 401.0625,202.3125 Q401.0625,204.4063 401.75,205.4844 Q402.4375,206.5469 403.7813,206.5469 Q404.4063,206.5469 405,206.2813 Q405.5938,206 406.2188,205.4219 L406.2188,208.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.75" y="206.6543">I</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="218.5" y2="218.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="364.5" y="224.5"/>
-      <ellipse cx="369.5" cy="229.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="378.5" y="232.7104">i(H * h) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="239.3047" y2="239.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffa0h6rd7e8g6)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="363" y="59"/>
-      <ellipse cx="403.65" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M406.6188,80.6406 Q406.0406,80.9375 405.4,81.0781 Q404.7594,81.2344 404.0563,81.2344 Q401.5563,81.2344 400.2281,79.5938 Q398.9156,77.9375 398.9156,74.8125 Q398.9156,71.6875 400.2281,70.0313 Q401.5563,68.375 404.0563,68.375 Q404.7594,68.375 405.4,68.5313 Q406.0563,68.6875 406.6188,68.9844 L406.6188,71.7031 Q405.9938,71.125 405.4,70.8594 Q404.8063,70.5781 404.1813,70.5781 Q402.8375,70.5781 402.15,71.6563 Q401.4625,72.7188 401.4625,74.8125 Q401.4625,76.9063 402.15,77.9844 Q402.8375,79.0469 404.1813,79.0469 Q404.8063,79.0469 405.4,78.7813 Q405.9938,78.5 406.6188,77.9219 L406.6188,80.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.35" y="79.1543">J</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="91" y2="91"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="369" y="97"/>
-      <ellipse cx="374" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="383" y="105.2104">i(I * i) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="111.8047" y2="111.8047"/>
-    <path d="M217.08,509.06 C206.19,526.08 192.58,547.34 181.87,564.08 " fill="none" id="C_0001972977265990430931-&gt;C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="178.93,568.67,187.1532,563.2497,181.6273,564.4599,180.4171,558.9341,178.93,568.67" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M111.65,509.06 C122.4,526.08 135.81,547.34 146.38,564.08 " fill="none" id="C_0001906291555025945295-&gt;C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="149.28,568.67,147.8784,558.9214,146.6197,564.4364,141.1047,563.1778,149.28,568.67" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M225.32,381.74 C227.36,400.03 229.98,423.54 232.12,442.69 " fill="none" id="C_0000823759225351121534-&gt;C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="232.71,447.97,235.6828,438.5805,232.1531,443.0011,227.7325,439.4715,232.71,447.97" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M163.13,254.07 C174.88,273.21 189.24,296.61 200.84,315.51 " fill="none" id="C_0002277976215348279426-&gt;C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="203.72,320.21,202.4335,310.4455,201.1099,315.9454,195.61,314.6217,203.72,320.21" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M134.33,254.08 C125.09,304.03 108.51,393.65 99.41,442.83 " fill="none" id="C_0002277976215348279426-&gt;C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="98.5,447.76,104.0787,439.6435,99.4145,442.8443,96.2137,438.1802,98.5,447.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M141,120.24 C141,136.4 141,156.64 141,174.35 " fill="none" id="C_0001694685540293810116-&gt;C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="141,179.76,145,170.76,141,174.76,137,170.76,141,179.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M396.56,388.3 C389.9,407.75 381.81,431.36 375.63,449.4 " fill="none" id="C_0001534191494825314170-&gt;C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="373.94,454.33,380.6332,447.105,375.5554,449.5981,373.0622,444.5203,373.94,454.33" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M419.99,388.3 C425.88,407.75 433.03,431.36 438.49,449.4 " fill="none" id="C_0001534191494825314170-&gt;C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="439.99,454.33,441.2218,444.5585,438.5467,449.5428,433.5623,446.8677,439.99,454.33" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M409,247.62 C409,265.63 409,288.88 409,308.67 " fill="none" id="C_0000097422543769740359-&gt;C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="409,313.89,413,304.89,409,308.89,405,304.89,409,313.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M409,120.24 C409,138.53 409,162.04 409,181.19 " fill="none" id="C_0001498530043106438011-&gt;C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="409,186.47,413,177.47,409,181.47,405,177.47,409,186.47" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001972977265990430931_C_0001454679300998460550">
+      <path codeLine="59" d="M211.83,514.564 C199.36,533.334 187.1701,551.6763 175.8301,568.7463 " fill="none" id="C_0001972977265990430931-to-C_0001454679300998460550" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="172.51,573.744,180.8219,568.4608,175.2767,569.5792,174.1583,564.034,172.51,573.744" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001906291555025945295_C_0001454679300998460550">
+      <path codeLine="60" d="M102.89,514.564 C115.2,533.334 127.2106,551.6561 138.4006,568.7261 " fill="none" id="C_0001906291555025945295-to-C_0001454679300998460550" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="141.69,573.744,140.1011,564.0241,138.9488,569.5624,133.4106,568.41,141.69,573.744" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000823759225351121534_C_0001972977265990430931">
+      <path codeLine="61" d="M221.63,381.254 C223.99,401.884 226.369,422.6928 228.719,443.2628 " fill="none" id="C_0000823759225351121534-to-C_0001972977265990430931" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="229.4,449.224,232.3526,439.8281,228.8325,444.2563,224.4043,440.7362,229.4,449.224" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002277976215348279426_C_0000823759225351121534">
+      <path codeLine="62" d="M156.64,247.894 C169.95,269.494 182.9824,290.6559 195.3924,310.7959 " fill="none" id="C_0002277976215348279426-to-C_0000823759225351121534" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="198.54,315.904,197.2241,306.1434,195.917,311.6472,190.4133,310.3402,198.54,315.904" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002277976215348279426_C_0001906291555025945295">
+      <path codeLine="63" d="M124.62,248.144 C114.63,302.684 98.0611,393.0622 88.9311,442.9022 " fill="none" id="C_0002277976215348279426-to-C_0001906291555025945295" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="87.85,448.804,93.4062,440.672,88.7509,443.8858,85.5372,439.2305,87.85,448.804" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001694685540293810116_C_0002277976215348279426">
+      <path codeLine="64" d="M132,106.454 C132,124.354 132,140.874 132,159.964 " fill="none" id="C_0001694685540293810116-to-C_0002277976215348279426" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="132,165.964,136,156.964,132,160.964,128,156.964,132,165.964" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001534191494825314170_C_0000736400571183204899">
+      <path codeLine="65" d="M401.25,389.574 C393.65,411.724 386.4272,432.8087 379.9872,451.5787 " fill="none" id="C_0001534191494825314170-to-C_0000736400571183204899" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="378.04,457.254,384.7443,450.0392,379.6627,452.5246,377.1773,447.443,378.04,457.254" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001534191494825314170_C_0001522297681294871411">
+      <path codeLine="66" d="M426.61,389.574 C433.02,411.724 439.0998,432.7211 444.5398,451.4911 " fill="none" id="C_0001534191494825314170-to-C_0001522297681294871411" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="446.21,457.254,447.5466,447.4962,444.8182,452.4516,439.8628,449.7232,446.21,457.254" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000097422543769740359_C_0001534191494825314170">
+      <path codeLine="67" d="M415,239.574 C415,259.684 415,279.884 415,301.434 " fill="none" id="C_0000097422543769740359-to-C_0001534191494825314170" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="415,307.434,419,298.434,415,302.434,411,298.434,415,307.434" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001498530043106438011_C_0000097422543769740359">
+      <path codeLine="68" d="M415,106.454 C415,127.084 415,147.854 415,168.424 " fill="none" id="C_0001498530043106438011-to-C_0000097422543769740359" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="415,174.424,419,165.424,415,169.424,411,165.424,415,174.424" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00043_class_mermaid.svg b/docs/test_cases/t00043_class_mermaid.svg
index fd971ff0..7c66978f 100644
--- a/docs/test_cases/t00043_class_mermaid.svg
+++ b/docs/test_cases/t00043_class_mermaid.svg
@@ -1,65 +1,70 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 733.625 633" style="max-width: 733.625px; background-color: white;" width="733.625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 735.90625 633" style="max-width: 735.906px; background-color: white;" width="735.90625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M71.5,518L71.5,522.1666666666666C71.5,526.3333333333334,71.5,534.6666666666666,78.61764992211839,543C85.73529984423676,551.3333333333334,99.97059968847351,559.6666666666666,107.0882496105919,563.8333333333334L114.20589953271028,568"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M254.28125,518L254.28125,522.1666666666666C254.28125,526.3333333333334,254.28125,534.6666666666666,247.16360007788163,543C240.04595015576322,551.3333333333334,225.81065031152647,559.6666666666666,218.6930003894081,563.8333333333334L211.57535046728972,568"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M71.5,378L71.5,384C71.5,390,71.5,402,71.5,412.1666666666667C71.5,422.3333333333333,71.5,430.6666666666667,71.5,434.8333333333333L71.5,439"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M101.76179635761589,238L96.71816363134657,242.16666666666666C91.67453090507725,246.33333333333334,81.58726545253863,254.66666666666666,76.54363272626931,264.8333333333333C71.5,275,71.5,287,71.5,293L71.5,299"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M224.01945364238412,238L229.06308636865344,242.16666666666666C234.10671909492274,246.33333333333334,244.19398454746138,254.66666666666666,249.2376172737307,271.4166666666667C254.28125,288.1666666666667,254.28125,313.3333333333333,254.28125,338.5C254.28125,363.6666666666667,254.28125,388.8333333333333,254.28125,405.5833333333333C254.28125,422.3333333333333,254.28125,430.6666666666667,254.28125,434.8333333333333L254.28125,439"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M162.890625,87L162.890625,91.16666666666667C162.890625,95.33333333333333,162.890625,103.66666666666667,162.890625,112C162.890625,120.33333333333333,162.890625,128.66666666666666,162.890625,132.83333333333334L162.890625,137"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M479.25206953642385,389L473.7048496136865,393.1666666666667C468.15762969094925,397.3333333333333,457.0631898454746,405.6666666666667,451.51596992273727,415.8333333333333C445.96875,426,445.96875,438,445.96875,444L445.96875,450"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M613.7166804635762,389L619.2639003863135,393.1666666666667C624.8111203090508,397.3333333333333,635.9055601545255,405.6666666666667,641.4527800772627,415.8333333333333C647,426,647,438,647,444L647,450"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M546.484375,227L546.484375,233C546.484375,239,546.484375,251,546.484375,261.1666666666667C546.484375,271.3333333333333,546.484375,279.6666666666667,546.484375,283.8333333333333L546.484375,288"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M546.484375,87L546.484375,91.16666666666667C546.484375,95.33333333333333,546.484375,103.66666666666667,546.484375,113.83333333333333C546.484375,124,546.484375,136,546.484375,142L546.484375,148"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M72.640625,518L72.640625,522.1666666666666C72.640625,526.3333333333334,72.640625,534.6666666666666,78.93832487529801,542.4971383410676C85.23602475059602,550.3276100154686,97.83142450119203,557.6552200309374,104.12912437649004,561.3190250386716L110.42682425178806,564.982830046406"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M256.5625,518L256.5625,522.1666666666666C256.5625,526.3333333333334,256.5625,534.6666666666666,250.264800124702,542.4971383410676C243.96710024940398,550.3276100154686,231.37170049880797,557.6552200309374,225.07400062350996,561.3190250386716L218.77630074821195,564.982830046406"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M72.640625,378L72.640625,384C72.640625,390,72.640625,402,72.640625,411.1666666666667C72.640625,420.3333333333333,72.640625,426.6666666666667,72.640625,429.8333333333333L72.640625,433"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M103.09126655629139,238L98.01615963024283,242.16666666666666C92.94105270419425,246.33333333333334,82.79083885209712,254.66666666666666,77.71573192604856,263.8333333333333C72.640625,273,72.640625,283,72.640625,288L72.640625,293"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M226.11185844370863,238L231.1869653697572,242.16666666666666C236.26207229580575,246.33333333333334,246.41228614790285,254.66666666666666,251.48739307395144,271.4166666666667C256.5625,288.1666666666667,256.5625,313.3333333333333,256.5625,338.5C256.5625,363.6666666666667,256.5625,388.8333333333333,256.5625,404.5833333333333C256.5625,420.3333333333333,256.5625,426.6666666666667,256.5625,429.8333333333333L256.5625,433"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M164.6015625,87L164.6015625,91.16666666666667C164.6015625,95.33333333333333,164.6015625,103.66666666666667,164.6015625,111C164.6015625,118.33333333333333,164.6015625,124.66666666666667,164.6015625,127.83333333333333L164.6015625,131"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M481.53331953642385,389L475.9860996136865,393.1666666666667C470.43887969094925,397.3333333333333,459.3444398454746,405.6666666666667,453.79721992273727,414.8333333333333C448.25,424,448.25,434,448.25,439L448.25,444"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M615.9979304635762,389L621.5451503863135,393.1666666666667C627.0923703090508,397.3333333333333,638.1868101545255,405.6666666666667,643.7340300772627,414.8333333333333C649.28125,424,649.28125,434,649.28125,439L649.28125,444"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M548.765625,227L548.765625,233C548.765625,239,548.765625,251,548.765625,260.1666666666667C548.765625,269.3333333333333,548.765625,275.6666666666667,548.765625,278.8333333333333L548.765625,282"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M548.765625,87L548.765625,91.16666666666667C548.765625,95.33333333333333,548.765625,103.66666666666667,548.765625,112.83333333333333C548.765625,122,548.765625,132,548.765625,137L548.765625,142"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -174,7 +179,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(162.890625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L4">
+        <a transform="translate(164.6015625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L4">
           <g title="A" id="classId-C_0001454679300998460550-0" class="node default clickable">
             <rect height="57" width="127" y="-28.5" x="-63.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -193,11 +198,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.5, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L6">
+        <a transform="translate(72.640625, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L6">
           <g title="B" id="classId-C_0001972977265990430931-1" class="node default clickable">
-            <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.5" x1="-63.5" class="divider"/>
+            <rect height="79" width="129.28125" y="-39.5" x="-64.640625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="64.640625" x1="-64.640625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="64.640625" x1="-64.640625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -209,15 +214,15 @@
                   <span class="nodeLabel">dependants::B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -56, 14)" height="18" width="105.390625">
+              <foreignObject transform="translate( -57.140625, 14)" height="18" width="114.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+b(A * a) : void</span>
+                  <span class="nodeLabel">+b(A * a) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(254.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L10">
+        <a transform="translate(256.5625, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L10">
           <g title="BB" id="classId-C_0001906291555025945295-2" class="node default clickable">
             <rect height="79" width="138.5625" y="-39.5" x="-69.28125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.28125" x1="-69.28125" class="divider"/>
@@ -233,19 +238,19 @@
                   <span class="nodeLabel">dependants::BB</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -61.78125, 14)" height="18" width="114.296875">
+              <foreignObject transform="translate( -61.78125, 14)" height="18" width="123.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+bb(A * a) : void</span>
+                  <span class="nodeLabel">+bb(A * a) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(71.5, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L14">
+        <a transform="translate(72.640625, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L14">
           <g title="C" id="classId-C_0000823759225351121534-3" class="node default clickable">
-            <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.5" x1="-63.5" class="divider"/>
+            <rect height="79" width="129.265625" y="-39.5" x="-64.6328125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="64.6328125" x1="-64.6328125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="64.6328125" x1="-64.6328125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -257,19 +262,19 @@
                   <span class="nodeLabel">dependants::C</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -56, 14)" height="18" width="105.375">
+              <foreignObject transform="translate( -57.1328125, 14)" height="18" width="114.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+c(B * b) : void</span>
+                  <span class="nodeLabel">+c(B * b) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(162.890625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L18">
+        <a transform="translate(164.6015625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L18">
           <g title="D" id="classId-C_0002277976215348279426-4" class="node default clickable">
-            <rect height="101" width="149.75" y="-50.5" x="-74.875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="74.875" x1="-74.875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="74.875" x1="-74.875" class="divider"/>
+            <rect height="101" width="158.640625" y="-50.5" x="-79.3203125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="79.3203125" x1="-79.3203125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="79.3203125" x1="-79.3203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -281,24 +286,24 @@
                   <span class="nodeLabel">dependants::D</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -67.375, 3)" height="18" width="106.265625">
+              <foreignObject transform="translate( -71.8203125, 3)" height="18" width="115.15625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+d(C * c) : void</span>
+                  <span class="nodeLabel">+d(C * c) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -67.375, 25)" height="18" width="134.75">
+              <foreignObject transform="translate( -71.8203125, 25)" height="18" width="143.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+dd(BB * bb) : void</span>
+                  <span class="nodeLabel">+dd(BB * bb) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(162.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L23">
+        <a transform="translate(164.6015625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L23">
           <g title="E" id="classId-C_0001694685540293810116-5" class="node default clickable">
-            <rect height="79" width="126.125" y="-39.5" x="-63.0625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.0625" x1="-63.0625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.0625" x1="-63.0625" class="divider"/>
+            <rect height="79" width="131.046875" y="-39.5" x="-65.5234375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="65.5234375" x1="-65.5234375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="65.5234375" x1="-65.5234375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -310,15 +315,15 @@
                   <span class="nodeLabel">dependants::E</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -55.5625, 14)" height="18" width="107.15625">
+              <foreignObject transform="translate( -58.0234375, 14)" height="18" width="116.046875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+e(D * d) : void</span>
+                  <span class="nodeLabel">+e(D * d) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(445.96875, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L32">
+        <a transform="translate(448.25, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L32">
           <g title="G" id="classId-C_0000736400571183204899-6" class="node default clickable">
             <rect height="57" width="144.8125" y="-28.5" x="-72.40625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.40625" x1="-72.40625" class="divider"/>
@@ -337,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(647, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L34">
+        <a transform="translate(649.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L34">
           <g title="GG" id="classId-C_0001522297681294871411-7" class="node default clickable">
             <rect height="57" width="157.25" y="-28.5" x="-78.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="78.625" x1="-78.625" class="divider"/>
@@ -356,11 +361,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L36">
+        <a transform="translate(548.765625, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L36">
           <g title="H" id="classId-C_0001534191494825314170-8" class="node default clickable">
-            <rect height="101" width="153.296875" y="-50.5" x="-76.6484375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="76.6484375" x1="-76.6484375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="76.6484375" x1="-76.6484375" class="divider"/>
+            <rect height="101" width="162.1875" y="-50.5" x="-81.09375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="81.09375" x1="-81.09375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="81.09375" x1="-81.09375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -372,20 +377,20 @@
                   <span class="nodeLabel">dependencies::H</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -69.1484375, 3)" height="18" width="108.046875">
+              <foreignObject transform="translate( -73.59375, 3)" height="18" width="116.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+h(G * g) : void</span>
+                  <span class="nodeLabel">+h(G * g) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -69.1484375, 25)" height="18" width="138.296875">
+              <foreignObject transform="translate( -73.59375, 25)" height="18" width="147.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+hh(GG * gg) : void</span>
+                  <span class="nodeLabel">+hh(GG * gg) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L45">
+        <a transform="translate(548.765625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L45">
           <g title="I" id="classId-C_0000097422543769740359-9" class="node default clickable">
             <rect height="79" width="136.8125" y="-39.5" x="-68.40625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.40625" x1="-68.40625" class="divider"/>
@@ -401,15 +406,15 @@
                   <span class="nodeLabel">dependencies::I</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.90625, 14)" height="18" width="101.8125">
+              <foreignObject transform="translate( -60.90625, 14)" height="18" width="110.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+i(H * h) : void</span>
+                  <span class="nodeLabel">+i(H * h) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00043/t00043.cc#L49">
+        <a transform="translate(548.765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L49">
           <g title="J" id="classId-C_0001498530043106438011-10" class="node default clickable">
             <rect height="79" width="141.265625" y="-39.5" x="-70.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="70.6328125" x1="-70.6328125" class="divider"/>
@@ -425,9 +430,9 @@
                   <span class="nodeLabel">dependencies::J</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -63.1328125, 14)" height="18" width="89.359375">
+              <foreignObject transform="translate( -63.1328125, 14)" height="18" width="98.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+i(I * i) : void</span>
+                  <span class="nodeLabel">+i(I * i) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00044.md b/docs/test_cases/t00044.md
index 96c0e5ce..4cf62d1c 100644
--- a/docs/test_cases/t00044.md
+++ b/docs/test_cases/t00044.md
@@ -13,7 +13,7 @@ diagrams:
         - clanguml::t00044
 ```
 ## Source code
-File t00044.cc
+File `tests/t00044/t00044.cc`
 ```cpp
 // Inspired by skypjack/entt signal handlers
 namespace clanguml::t00044 {
@@ -141,6 +141,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -171,6 +172,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg
index 5eea494f..169ae58c 100644
--- a/docs/test_cases/t00044_class.svg
+++ b/docs/test_cases/t00044_class.svg
@@ -1,123 +1,145 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="594px" preserveAspectRatio="none" style="width:517px;height:594px;" version="1.1" viewBox="0 0 517 594" width="517px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="605px" preserveAspectRatio="none" style="width:483px;height:605px;background:#FFFFFF;" version="1.1" viewBox="0 0 483 605" width="483px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1e98ohzi15mhh" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L9" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e98ohzi15mhh)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="248" y="426"/>
-      <ellipse cx="263" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M265.9688,447.6406 Q265.3906,447.9375 264.75,448.0781 Q264.1094,448.2344 263.4063,448.2344 Q260.9063,448.2344 259.5781,446.5938 Q258.2656,444.9375 258.2656,441.8125 Q258.2656,438.6875 259.5781,437.0313 Q260.9063,435.375 263.4063,435.375 Q264.1094,435.375 264.75,435.5313 Q265.4063,435.6875 265.9688,435.9844 L265.9688,438.7031 Q265.3438,438.125 264.75,437.8594 Q264.1563,437.5781 263.5313,437.5781 Q262.1875,437.5781 261.5,438.6563 Q260.8125,439.7188 260.8125,441.8125 Q260.8125,443.9063 261.5,444.9844 Q262.1875,446.0469 263.5313,446.0469 Q264.1563,446.0469 264.75,445.7813 Q265.3438,445.5 265.9688,444.9219 L265.9688,447.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="277" y="446.1543">signal_handler</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="84" x="376" y="423"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="377" y="435.1387">Ret(Args...),A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="458" y2="458"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="466" y2="466"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <g id="elem_C_0001591729735727316875">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001591729735727316875" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="201" x="230.5" y="441.2"/>
+        <ellipse cx="245.5" cy="457.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M240.5,458.3563 C240.5,460.8563 242.6406,462.6688 245.5625,462.6688 C246.7969,462.6688 247.9688,462.3719 248.7188,461.8563 C249.3281,461.4344 249.6563,461.0125 249.6563,460.6063 C249.6563,460.1375 249.2344,459.7313 248.7344,459.7313 C248.5,459.7313 248.2813,459.8094 248.0781,460.0125 C247.6406,460.45 247.6406,460.45 247.4688,460.5438 C247.0156,460.7781 246.375,460.9188 245.6094,460.9188 C243.6094,460.9188 242.3281,459.9031 242.3281,458.325 L242.3281,457.2781 C242.3281,455.575 243.5469,454.3719 245.25,454.3719 C245.8281,454.3719 246.4063,454.5125 246.875,454.7625 C247.3438,455.0281 247.5156,455.2156 247.5781,455.575 C247.7031,456.2469 247.9531,456.4969 248.4844,456.4969 C248.7656,456.4969 249.0469,456.3563 249.2344,456.1375 C249.3594,455.9656 249.4063,455.7938 249.4063,455.3563 L249.4063,453.9969 C249.4063,453.575 249.3906,453.4344 249.2656,453.2625 C249.0938,453.0125 248.8125,452.8563 248.4844,452.8563 C248.1719,452.8563 247.9688,452.9656 247.75,453.2313 C246.5781,452.7313 246.1406,452.6219 245.1875,452.6219 C242.5156,452.6219 240.5,454.6375 240.5,457.2625 L240.5,458.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="259.5" y="461.806">signal_handler</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="74" x="360.5" y="438.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="72" x="361.5" y="452.4001">Ret(Args...),A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="231.5" x2="430.5" y1="473.2" y2="473.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="231.5" x2="430.5" y1="481.2" y2="481.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e98ohzi15mhh)" height="94.4141" id="C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="6" y="255"/>
-      <ellipse cx="21" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,276.6406 Q23.3906,276.9375 22.75,277.0781 Q22.1094,277.2344 21.4063,277.2344 Q18.9063,277.2344 17.5781,275.5938 Q16.2656,273.9375 16.2656,270.8125 Q16.2656,267.6875 17.5781,266.0313 Q18.9063,264.375 21.4063,264.375 Q22.1094,264.375 22.75,264.5313 Q23.4063,264.6875 23.9688,264.9844 L23.9688,267.7031 Q23.3438,267.125 22.75,266.8594 Q22.1563,266.5781 21.5313,266.5781 Q20.1875,266.5781 19.5,267.6563 Q18.8125,268.7188 18.8125,270.8125 Q18.8125,272.9063 19.5,273.9844 Q20.1875,275.0469 21.5313,275.0469 Q22.1563,275.0469 22.75,274.7813 Q23.3438,274.5 23.9688,273.9219 L23.9688,276.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="275.1543">sink</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="194" x="68" y="252"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="192" x="69" y="264.1387">signal_handler&lt;Ret(Args...),A&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="287" y2="287"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <g id="elem_C_0000559574389062594251">
+        <rect codeLine="6" fill="#F1F1F1" height="106.3998" id="C_0000559574389062594251" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="7" y="257.8"/>
+        <ellipse cx="22.45" cy="273.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17.45,274.9563 C17.45,277.4563 19.5906,279.2688 22.5125,279.2688 C23.7469,279.2688 24.9188,278.9719 25.6688,278.4563 C26.2781,278.0344 26.6063,277.6125 26.6063,277.2063 C26.6063,276.7375 26.1844,276.3313 25.6844,276.3313 C25.45,276.3313 25.2313,276.4094 25.0281,276.6125 C24.5906,277.05 24.5906,277.05 24.4188,277.1438 C23.9656,277.3781 23.325,277.5188 22.5594,277.5188 C20.5594,277.5188 19.2781,276.5031 19.2781,274.925 L19.2781,273.8781 C19.2781,272.175 20.4969,270.9719 22.2,270.9719 C22.7781,270.9719 23.3563,271.1125 23.825,271.3625 C24.2938,271.6281 24.4656,271.8156 24.5281,272.175 C24.6531,272.8469 24.9031,273.0969 25.4344,273.0969 C25.7156,273.0969 25.9969,272.9563 26.1844,272.7375 C26.3094,272.5656 26.3563,272.3938 26.3563,271.9563 L26.3563,270.5969 C26.3563,270.175 26.3406,270.0344 26.2156,269.8625 C26.0438,269.6125 25.7625,269.4563 25.4344,269.4563 C25.1219,269.4563 24.9188,269.5656 24.7,269.8313 C23.5281,269.3313 23.0906,269.2219 22.1375,269.2219 C19.4656,269.2219 17.45,271.2375 17.45,273.8625 L17.45,274.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="36.55" y="278.406">sink</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="170" x="70" y="254.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="168" x="71" y="269.0001">signal_handler&lt;Ret(Args...),A&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="236" y1="289.8" y2="289.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="298.7"/>
+          <ellipse cx="18" cy="303.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="154" x="27" y="306.8059">sink(signal_t &amp; sh) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="236" y1="314.5999" y2="314.5999"/>
+        <ellipse cx="18" cy="328.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="27" y="331.6059">get_signal&lt;CastTo&gt;() : CastTo *</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="236" y1="339.3999" y2="339.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="348.2998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="350.2998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="27" y="356.4058">signal : signal_t *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
-      <ellipse cx="17" cy="298" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <g id="elem_C_0000103559998624864011">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0000103559998624864011" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="200" x="272" y="287"/>
+        <ellipse cx="287" cy="303" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M282,304.1563 C282,306.6563 284.1406,308.4688 287.0625,308.4688 C288.2969,308.4688 289.4688,308.1719 290.2188,307.6563 C290.8281,307.2344 291.1563,306.8125 291.1563,306.4063 C291.1563,305.9375 290.7344,305.5313 290.2344,305.5313 C290,305.5313 289.7813,305.6094 289.5781,305.8125 C289.1406,306.25 289.1406,306.25 288.9688,306.3438 C288.5156,306.5781 287.875,306.7188 287.1094,306.7188 C285.1094,306.7188 283.8281,305.7031 283.8281,304.125 L283.8281,303.0781 C283.8281,301.375 285.0469,300.1719 286.75,300.1719 C287.3281,300.1719 287.9063,300.3125 288.375,300.5625 C288.8438,300.8281 289.0156,301.0156 289.0781,301.375 C289.2031,302.0469 289.4531,302.2969 289.9844,302.2969 C290.2656,302.2969 290.5469,302.1563 290.7344,301.9375 C290.8594,301.7656 290.9063,301.5938 290.9063,301.1563 L290.9063,299.7969 C290.9063,299.375 290.8906,299.2344 290.7656,299.0625 C290.5938,298.8125 290.3125,298.6563 289.9844,298.6563 C289.6719,298.6563 289.4688,298.7656 289.25,299.0313 C288.0781,298.5313 287.6406,298.4219 286.6875,298.4219 C284.0156,298.4219 282,300.4375 282,303.0625 L282,304.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="301" y="307.606">signal_handler</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="73" x="402" y="284"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="71" x="403" y="298.2001">void(int),bool</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="273" x2="471" y1="319" y2="319"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="273" x2="471" y1="327" y2="327"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="26" y="301.2104">sink(signal_t &amp; sh) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <g id="elem_C_0001718007222067272862">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001718007222067272862" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="228" x="132" y="148.8"/>
+        <ellipse cx="147" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M142,165.9563 C142,168.4563 144.1406,170.2688 147.0625,170.2688 C148.2969,170.2688 149.4688,169.9719 150.2188,169.4563 C150.8281,169.0344 151.1563,168.6125 151.1563,168.2063 C151.1563,167.7375 150.7344,167.3313 150.2344,167.3313 C150,167.3313 149.7813,167.4094 149.5781,167.6125 C149.1406,168.05 149.1406,168.05 148.9688,168.1438 C148.5156,168.3781 147.875,168.5188 147.1094,168.5188 C145.1094,168.5188 143.8281,167.5031 143.8281,165.925 L143.8281,164.8781 C143.8281,163.175 145.0469,161.9719 146.75,161.9719 C147.3281,161.9719 147.9063,162.1125 148.375,162.3625 C148.8438,162.6281 149.0156,162.8156 149.0781,163.175 C149.2031,163.8469 149.4531,164.0969 149.9844,164.0969 C150.2656,164.0969 150.5469,163.9563 150.7344,163.7375 C150.8594,163.5656 150.9063,163.3938 150.9063,162.9563 L150.9063,161.5969 C150.9063,161.175 150.8906,161.0344 150.7656,160.8625 C150.5938,160.6125 150.3125,160.4563 149.9844,160.4563 C149.6719,160.4563 149.4688,160.5656 149.25,160.8313 C148.0781,160.3313 147.6406,160.2219 146.6875,160.2219 C144.0156,160.2219 142,162.2375 142,164.8625 L142,165.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="161" y="169.406">sink</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="169" x="194" y="145.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="167" x="195" y="160.0001">signal_handler&lt;void(int),bool&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="133" x2="359" y1="180.8" y2="180.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="133" x2="359" y1="188.8" y2="188.8"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="258" y1="307.8047" y2="307.8047"/>
-    <ellipse cx="17" cy="318.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="26" y="322.0151">get_signal&lt;CastTo&gt;() : CastTo *</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="328.6094" y2="328.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="334.6094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="336.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001644484569399365272">
+        <rect codeLine="22" fill="#F1F1F1" height="64.7999" id="C_0001644484569399365272" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="307" x="92.5" y="7"/>
+        <ellipse cx="236.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M231.75,24.1563 C231.75,26.6563 233.8906,28.4688 236.8125,28.4688 C238.0469,28.4688 239.2188,28.1719 239.9688,27.6563 C240.5781,27.2344 240.9063,26.8125 240.9063,26.4063 C240.9063,25.9375 240.4844,25.5313 239.9844,25.5313 C239.75,25.5313 239.5313,25.6094 239.3281,25.8125 C238.8906,26.25 238.8906,26.25 238.7188,26.3438 C238.2656,26.5781 237.625,26.7188 236.8594,26.7188 C234.8594,26.7188 233.5781,25.7031 233.5781,24.125 L233.5781,23.0781 C233.5781,21.375 234.7969,20.1719 236.5,20.1719 C237.0781,20.1719 237.6563,20.3125 238.125,20.5625 C238.5938,20.8281 238.7656,21.0156 238.8281,21.375 C238.9531,22.0469 239.2031,22.2969 239.7344,22.2969 C240.0156,22.2969 240.2969,22.1563 240.4844,21.9375 C240.6094,21.7656 240.6563,21.5938 240.6563,21.1563 L240.6563,19.7969 C240.6563,19.375 240.6406,19.2344 240.5156,19.0625 C240.3438,18.8125 240.0625,18.6563 239.7344,18.6563 C239.4219,18.6563 239.2188,18.7656 239,19.0313 C237.8281,18.5313 237.3906,18.4219 236.4375,18.4219 C233.7656,18.4219 231.75,20.4375 231.75,23.0625 L231.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="257.25" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="93.5" x2="398.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="93.5" x2="398.5" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="98.5" y="55.9"/>
+          <ellipse cx="103.5" cy="60.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="112.5" y="64.0059">sink1 : sink&lt;signal_handler&lt;void (int),bool&gt;&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="26" y="342.8198">signal : signal_t *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <g id="elem_C_0000276594465967577895">
+        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0000276594465967577895" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="147" x="257.5" y="550.2"/>
+        <ellipse cx="272.5" cy="566.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M267.5,567.3563 C267.5,569.8563 269.6406,571.6688 272.5625,571.6688 C273.7969,571.6688 274.9688,571.3719 275.7188,570.8563 C276.3281,570.4344 276.6563,570.0125 276.6563,569.6063 C276.6563,569.1375 276.2344,568.7313 275.7344,568.7313 C275.5,568.7313 275.2813,568.8094 275.0781,569.0125 C274.6406,569.45 274.6406,569.45 274.4688,569.5438 C274.0156,569.7781 273.375,569.9188 272.6094,569.9188 C270.6094,569.9188 269.3281,568.9031 269.3281,567.325 L269.3281,566.2781 C269.3281,564.575 270.5469,563.3719 272.25,563.3719 C272.8281,563.3719 273.4063,563.5125 273.875,563.7625 C274.3438,564.0281 274.5156,564.2156 274.5781,564.575 C274.7031,565.2469 274.9531,565.4969 275.4844,565.4969 C275.7656,565.4969 276.0469,565.3563 276.2344,565.1375 C276.3594,564.9656 276.4063,564.7938 276.4063,564.3563 L276.4063,562.9969 C276.4063,562.575 276.3906,562.4344 276.2656,562.2625 C276.0938,562.0125 275.8125,561.8563 275.4844,561.8563 C275.1719,561.8563 274.9688,561.9656 274.75,562.2313 C273.5781,561.7313 273.1406,561.6219 272.1875,561.6219 C269.5156,561.6219 267.5,563.6375 267.5,566.2625 L267.5,567.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="286.5" y="570.806">signal_handler</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="387.5" y="547.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="388.5" y="561.4001">T,A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="258.5" x2="403.5" y1="582.2" y2="582.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="258.5" x2="403.5" y1="590.2" y2="590.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e98ohzi15mhh)" height="48" id="C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="294" y="278"/>
-      <ellipse cx="309" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M311.9688,299.6406 Q311.3906,299.9375 310.75,300.0781 Q310.1094,300.2344 309.4063,300.2344 Q306.9063,300.2344 305.5781,298.5938 Q304.2656,296.9375 304.2656,293.8125 Q304.2656,290.6875 305.5781,289.0313 Q306.9063,287.375 309.4063,287.375 Q310.1094,287.375 310.75,287.5313 Q311.4063,287.6875 311.9688,287.9844 L311.9688,290.7031 Q311.3438,290.125 310.75,289.8594 Q310.1563,289.5781 309.5313,289.5781 Q308.1875,289.5781 307.5,290.6563 Q306.8125,291.7188 306.8125,293.8125 Q306.8125,295.9063 307.5,296.9844 Q308.1875,298.0469 309.5313,298.0469 Q310.1563,298.0469 310.75,297.7813 Q311.3438,297.5 311.9688,296.9219 L311.9688,299.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="323" y="298.1543">signal_handler</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="84" x="422" y="275"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="423" y="287.1387">void(int),bool</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="310" y2="310"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="318" y2="318"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <g id="elem_C_0001759724482769288325">
+        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0001759724482769288325" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="88" y="441.2"/>
+        <ellipse cx="103" cy="457.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M98,458.3563 C98,460.8563 100.1406,462.6688 103.0625,462.6688 C104.2969,462.6688 105.4688,462.3719 106.2188,461.8563 C106.8281,461.4344 107.1563,461.0125 107.1563,460.6063 C107.1563,460.1375 106.7344,459.7313 106.2344,459.7313 C106,459.7313 105.7813,459.8094 105.5781,460.0125 C105.1406,460.45 105.1406,460.45 104.9688,460.5438 C104.5156,460.7781 103.875,460.9188 103.1094,460.9188 C101.1094,460.9188 99.8281,459.9031 99.8281,458.325 L99.8281,457.2781 C99.8281,455.575 101.0469,454.3719 102.75,454.3719 C103.3281,454.3719 103.9063,454.5125 104.375,454.7625 C104.8438,455.0281 105.0156,455.2156 105.0781,455.575 C105.2031,456.2469 105.4531,456.4969 105.9844,456.4969 C106.2656,456.4969 106.5469,456.3563 106.7344,456.1375 C106.8594,455.9656 106.9063,455.7938 106.9063,455.3563 L106.9063,453.9969 C106.9063,453.575 106.8906,453.4344 106.7656,453.2625 C106.5938,453.0125 106.3125,452.8563 105.9844,452.8563 C105.6719,452.8563 105.4688,452.9656 105.25,453.2313 C104.0781,452.7313 103.6406,452.6219 102.6875,452.6219 C100.0156,452.6219 98,454.6375 98,457.2625 L98,458.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="117" y="461.806">sink</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="150" y="438.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="151" y="452.4001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="89" x2="155" y1="473.2" y2="473.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="89" x2="155" y1="481.2" y2="481.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e98ohzi15mhh)" height="48" id="C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="138" y="146"/>
-      <ellipse cx="153" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M155.9688,167.6406 Q155.3906,167.9375 154.75,168.0781 Q154.1094,168.2344 153.4063,168.2344 Q150.9063,168.2344 149.5781,166.5938 Q148.2656,164.9375 148.2656,161.8125 Q148.2656,158.6875 149.5781,157.0313 Q150.9063,155.375 153.4063,155.375 Q154.1094,155.375 154.75,155.5313 Q155.4063,155.6875 155.9688,155.9844 L155.9688,158.7031 Q155.3438,158.125 154.75,157.8594 Q154.1563,157.5781 153.5313,157.5781 Q152.1875,157.5781 151.5,158.6563 Q150.8125,159.7188 150.8125,161.8125 Q150.8125,163.9063 151.5,164.9844 Q152.1875,166.0469 153.5313,166.0469 Q154.1563,166.0469 154.75,165.7813 Q155.3438,165.5 155.9688,164.9219 L155.9688,167.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="167" y="166.1543">sink</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="194" x="200" y="143"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="192" x="201" y="155.1387">signal_handler&lt;void(int),bool&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="178" y2="178"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="186" y2="186"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e98ohzi15mhh)" height="60.8047" id="C_0001644484569399365272" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="121" y="8"/>
-      <ellipse cx="256.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M259.2188,29.6406 Q258.6406,29.9375 258,30.0781 Q257.3594,30.2344 256.6563,30.2344 Q254.1563,30.2344 252.8281,28.5938 Q251.5156,26.9375 251.5156,23.8125 Q251.5156,20.6875 252.8281,19.0313 Q254.1563,17.375 256.6563,17.375 Q257.3594,17.375 258,17.5313 Q258.6563,17.6875 259.2188,17.9844 L259.2188,20.7031 Q258.5938,20.125 258,19.8594 Q257.4063,19.5781 256.7813,19.5781 Q255.4375,19.5781 254.75,20.6563 Q254.0625,21.7188 254.0625,23.8125 Q254.0625,25.9063 254.75,26.9844 Q255.4375,28.0469 256.7813,28.0469 Q257.4063,28.0469 258,27.7813 Q258.5938,27.5 259.2188,26.9219 L259.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="276.75" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="127" y="54"/>
-      <ellipse cx="132" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="261" x="141" y="62.2104">sink1 : sink&lt;signal_handler&lt;void (int),bool&gt;&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e98ohzi15mhh)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="279.5" y="535"/>
-      <ellipse cx="294.5" cy="551" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M297.4688,556.6406 Q296.8906,556.9375 296.25,557.0781 Q295.6094,557.2344 294.9063,557.2344 Q292.4063,557.2344 291.0781,555.5938 Q289.7656,553.9375 289.7656,550.8125 Q289.7656,547.6875 291.0781,546.0313 Q292.4063,544.375 294.9063,544.375 Q295.6094,544.375 296.25,544.5313 Q296.9063,544.6875 297.4688,544.9844 L297.4688,547.7031 Q296.8438,547.125 296.25,546.8594 Q295.6563,546.5781 295.0313,546.5781 Q293.6875,546.5781 293,547.6563 Q292.3125,548.7188 292.3125,550.8125 Q292.3125,552.9063 293,553.9844 Q293.6875,555.0469 295.0313,555.0469 Q295.6563,555.0469 296.25,554.7813 Q296.8438,554.5 297.4688,553.9219 L297.4688,556.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="308.5" y="555.1543">signal_handler</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="21" x="407.5" y="532"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="19" x="408.5" y="544.1387">T,A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="567" y2="567"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="575" y2="575"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e98ohzi15mhh)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="98.5" y="426"/>
-      <ellipse cx="113.5" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M116.4688,447.6406 Q115.8906,447.9375 115.25,448.0781 Q114.6094,448.2344 113.9063,448.2344 Q111.4063,448.2344 110.0781,446.5938 Q108.7656,444.9375 108.7656,441.8125 Q108.7656,438.6875 110.0781,437.0313 Q111.4063,435.375 113.9063,435.375 Q114.6094,435.375 115.25,435.5313 Q115.9063,435.6875 116.4688,435.9844 L116.4688,438.7031 Q115.8438,438.125 115.25,437.8594 Q114.6563,437.5781 114.0313,437.5781 Q112.6875,437.5781 112,438.6563 Q111.3125,439.7188 111.3125,441.8125 Q111.3125,443.9063 112,444.9844 Q112.6875,446.0469 114.0313,446.0469 Q114.6563,446.0469 115.25,445.7813 Q115.8438,445.5 116.4688,444.9219 L116.4688,447.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="127.5" y="446.1543">sink</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="160.5" y="423"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="161.5" y="435.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99.5" x2="165.5" y1="458" y2="458"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99.5" x2="165.5" y1="466" y2="466"/>
-    </a>
-    <path d="M352.5,474.22 C352.5,486 352.5,500.69 352.5,514.48 " fill="none" id="C_0001591729735727316875-&gt;C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="359.5,514.83,352.5,534.83,345.5,514.83,359.5,514.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M202.11,349.2 C238.82,373.56 282.51,402.55 313.31,422.99 " fill="none" id="C_0000559574389062594251-&gt;C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="317.76,425.95,312.4574,417.6504,313.5888,423.193,308.0462,424.3244,317.76,425.95" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="272.5" y="385.0664"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="282.5" y="392.0669">signal</text>
-    <path d="M132.5,349.2 C132.5,367.27 132.5,387.89 132.5,405.68 " fill="none" id="C_0000559574389062594251-&gt;C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="139.5,405.95,132.5,425.95,125.5,405.95,139.5,405.95" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M391.21,326.13 C384.41,347.71 374.11,380.41 365.84,406.65 " fill="none" id="C_0000103559998624864011-&gt;C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="372.44,409,359.75,425.97,359.09,404.79,372.44,409" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M288.46,194.24 C311.61,216.7 346.65,250.7 370.95,274.27 " fill="none" id="C_0001718007222067272862-&gt;C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="374.75,277.96,371.0848,268.8185,371.1648,274.4748,365.5085,274.5548,374.75,277.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M240.9,194.24 C227.71,207.23 210.6,224.08 193.88,240.55 " fill="none" id="C_0001718007222067272862-&gt;C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="198.57,245.76,179.41,254.8,188.74,235.78,198.57,245.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M264.5,82.5 C264.5,103.65 264.5,128.32 264.5,145.88 " fill="none" id="C_0001644484569399365272&lt;-C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="264.5,69.21,260.5,75.21,264.5,81.21,268.5,75.21,264.5,69.21" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="270.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="33" x="277.5" y="112.0669">sink1</text>
+    <g id="link_C_0001591729735727316875_C_0000276594465967577895">
+      <path codeLine="34" d="M331,489.68 C331,507.52 331,513.95 331,531.77 " fill="none" id="C_0001591729735727316875-to-C_0000276594465967577895" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="331,549.77,337,531.77,325,531.77,331,549.77" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000559574389062594251_C_0001591729735727316875">
+      <path codeLine="35" d="M194.22,364.59 C229.85,390.54 266.19,416.9976 293.98,437.2376 " fill="none" id="C_0000559574389062594251-to-C_0001591729735727316875" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="298.83,440.77,293.9099,432.2381,294.7883,437.8264,289.2001,438.7048,298.83,440.77" style="stroke:#181818;stroke-width:1.0;"/>
+      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="261" y="400.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="271" y="407.277">signal</text>
+    </g>
+    <g id="link_C_0000559574389062594251_C_0001759724482769288325">
+      <path codeLine="36" d="M122,364.38 C122,390.35 122,402.41 122,422.7 " fill="none" id="C_0000559574389062594251-to-C_0001759724482769288325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="122,440.7,128,422.7,116,422.7,122,440.7" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000103559998624864011_C_0001591729735727316875">
+      <path codeLine="37" d="M365.68,335.45 C357.98,364.05 349.7121,394.7296 342.0021,423.3496 " fill="none" id="C_0000103559998624864011-to-C_0001591729735727316875" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="337.32,440.73,347.7956,424.9103,336.2087,421.7889,337.32,440.73" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001718007222067272862_C_0000103559998624864011">
+      <path codeLine="38" d="M267.66,197.21 C290.88,222.31 323.4354,257.5057 346.5454,282.4857 " fill="none" id="C_0001718007222067272862-to-C_0000103559998624864011" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="350.62,286.89,347.4443,277.5672,347.2245,283.2198,341.5719,283,350.62,286.89" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001718007222067272862_C_0000559574389062594251">
+      <path codeLine="39" d="M224.68,197.21 C209.59,213.79 200.8467,223.3889 181.8767,244.2289 " fill="none" id="C_0001718007222067272862-to-C_0000559574389062594251" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="169.76,257.54,186.3137,248.2678,177.4397,240.19,169.76,257.54" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001644484569399365272_C_0001718007222067272862">
+      <path codeLine="40" d="M246,84.21 C246,107.75 246,127.3 246,148.52 " fill="none" id="C_0001644484569399365272-backto-C_0001718007222067272862" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="246,72.21,242,78.21,246,84.21,250,78.21,246,72.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="252" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="259" y="114.877">sink1</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00044_class_mermaid.svg b/docs/test_cases/t00044_class_mermaid.svg
index d98a99da..44861534 100644
--- a/docs/test_cases/t00044_class_mermaid.svg
+++ b/docs/test_cases/t00044_class_mermaid.svg
@@ -1,62 +1,67 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 613.46875 625" style="max-width: 613.469px; background-color: white;" width="613.46875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M153.74609375,510L153.74609375,514.1666666666666C153.74609375,518.3333333333334,153.74609375,526.6666666666666,153.74609375,535C153.74609375,543.3333333333334,153.74609375,551.6666666666666,153.74609375,555.8333333333334L153.74609375,560"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M365.4854180301047,385L357.17339523342054,390.6666666666667C348.8613724367365,396.3333333333333,332.23732684336824,407.6666666666667,309.2493457133508,419C286.2613645833333,430.3333333333333,256.9094479166667,441.6666666666667,242.23348958333335,447.3333333333333L227.55753125,453"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M469.72449689136124,385L471.017158867801,390.6666666666667C472.30982084424085,396.3333333333333,474.8951447971204,407.6666666666667,476.18780677356017,419C477.48046875,430.3333333333333,477.48046875,441.6666666666667,477.48046875,447.3333333333333L477.48046875,453"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M131.9609375,352L131.9609375,363.1666666666667C131.9609375,374.3333333333333,131.9609375,396.6666666666667,133.936125,413.5C135.9113125,430.3333333333333,139.8616875,441.6666666666667,141.836875,447.3333333333333L143.8120625,453"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M207.5998101635514,212L194.99333138629285,216.16666666666666C182.38685260903426,220.33333333333334,157.17389505451715,228.66666666666666,144.56741627725856,242.5C131.9609375,256.3333333333333,131.9609375,275.6666666666667,131.9609375,285.3333333333333L131.9609375,295"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M380.0564398364486,212L392.6629186137072,216.16666666666666C405.2693973909657,220.33333333333334,430.4823549454829,228.66666666666666,443.0888337227414,237C455.6953125,245.33333333333334,455.6953125,253.66666666666666,455.6953125,257.8333333333333L455.6953125,262"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M293.828125,87L293.828125,92.66666666666667C293.828125,98.33333333333333,293.828125,109.66666666666667,293.828125,121C293.828125,132.33333333333334,293.828125,143.66666666666666,293.828125,149.33333333333334L293.828125,155"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M153.74609375,510L153.74609375,514.1666666666666C153.74609375,518.3333333333334,153.74609375,526.6666666666666,153.74609375,532C153.74609375,537.3333333333334,153.74609375,539.6666666666666,153.74609375,540.8333333333334L153.74609375,542"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M365.4854180301047,385L357.17339523342054,390.6666666666667C348.8613724367365,396.3333333333333,332.23732684336824,407.6666666666667,310.1822205412821,418.63979928454796C288.1271142391959,429.61293190242924,260.6409472283919,440.2258638048586,246.89786372298985,445.53232975607324L233.1547802175878,450.8387957072879"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M469.72449689136124,385L471.017158867801,390.6666666666667C472.30982084424085,396.3333333333333,474.8951447971204,407.6666666666667,476.18780677356017,416C477.48046875,424.3333333333333,477.48046875,429.6666666666667,477.48046875,432.3333333333333L477.48046875,435"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M131.9609375,352L131.9609375,363.1666666666667C131.9609375,374.3333333333333,131.9609375,396.6666666666667,132.9487023441578,410.66715752313513C133.93646718831562,424.6676483796037,135.91199687663124,430.33529675920744,136.89976172078903,433.16912094900925L137.88752656494685,436.0029451388111"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M207.5998101635514,212L194.99333138629285,216.16666666666666C182.38685260903426,220.33333333333334,157.17389505451715,228.66666666666666,144.56741627725856,241.5C131.9609375,254.33333333333334,131.9609375,271.6666666666667,131.9609375,280.3333333333333L131.9609375,289"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M380.0564398364486,212L392.6629186137072,216.16666666666666C405.2693973909657,220.33333333333334,430.4823549454829,228.66666666666666,443.0888337227414,234C455.6953125,239.33333333333334,455.6953125,241.66666666666666,455.6953125,242.83333333333334L455.6953125,244"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M293.828125,105L293.828125,107.66666666666667C293.828125,110.33333333333333,293.828125,115.66666666666667,293.828125,124C293.828125,132.33333333333334,293.828125,143.66666666666666,293.828125,149.33333333333334L293.828125,155"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -138,7 +143,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L9">
+        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9">
           <g title="signal_handler" id="classId-C_0001591729735727316875-0" class="node default clickable">
             <rect height="57" width="248.84375" y="-28.5" x="-124.421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="124.421875" x1="-124.421875" class="divider"/>
@@ -157,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L9">
+        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9">
           <g title="sink" id="classId-C_0000559574389062594251-1" class="node default clickable">
             <rect height="123" width="299.546875" y="-61.5" x="-149.7734375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="149.7734375" x1="-149.7734375" class="divider"/>
@@ -175,23 +180,23 @@
               </foreignObject>
               <foreignObject transform="translate( -142.2734375, -20)" height="18" width="115.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-signal : signal_t </span>
+                  <span style="font-style:italic;" class="nodeLabel">-signal : signal_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -142.2734375, 14)" height="18" width="182.75">
+              <foreignObject transform="translate( -142.2734375, 14)" height="18" width="191.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sink(signal_t &amp; sh) : void</span>
+                  <span class="nodeLabel">+sink(signal_t &amp; sh) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -142.2734375, 36)" height="18" width="156.390625">
+              <foreignObject transform="translate( -142.2734375, 36)" height="18" width="165.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+get_signal() : CastTo</span>
+                  <span style="font-style:italic;" class="nodeLabel">+get_signal() : : CastTo</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4">
+        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4">
           <g title="signal_handler" id="classId-C_0000103559998624864011-2" class="node default clickable">
             <rect height="57" width="247.921875" y="-28.5" x="-123.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="123.9609375" x1="-123.9609375" class="divider"/>
@@ -210,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4">
+        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001718007222067272862-3" class="node default clickable">
             <rect height="57" width="298.625" y="-28.5" x="-149.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.3125" x1="-149.3125" class="divider"/>
@@ -229,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L33">
+        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L33">
           <g title="R" id="classId-C_0001644484569399365272-4" class="node default clickable">
             <rect height="79" width="340.984375" y="-39.5" x="-170.4921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="170.4921875" x1="-170.4921875" class="divider"/>
@@ -253,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L6">
+        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L6">
           <g title="signal_handler" id="classId-C_0000276594465967577895-5" class="node default clickable">
             <rect height="57" width="170.609375" y="-28.5" x="-85.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.3046875" x1="-85.3046875" class="divider"/>
@@ -272,7 +277,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00044/t00044.cc#L4">
+        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001759724482769288325-6" class="node default clickable">
             <rect height="57" width="75.484375" y="-28.5" x="-37.7421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="37.7421875" x1="-37.7421875" class="divider"/>
diff --git a/docs/test_cases/t00045.md b/docs/test_cases/t00045.md
index f5372bcc..0f47adf1 100644
--- a/docs/test_cases/t00045.md
+++ b/docs/test_cases/t00045.md
@@ -11,7 +11,7 @@ diagrams:
         - std
 ```
 ## Source code
-File t00045.cc
+File `tests/t00045/t00045.cc`
 ```cpp
 class A { };
 
@@ -424,6 +424,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg
index f13e9bbf..75abbfb1 100644
--- a/docs/test_cases/t00045_class.svg
+++ b/docs/test_cases/t00045_class.svg
@@ -1,182 +1,220 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="365px" preserveAspectRatio="none" style="width:670px;height:365px;" version="1.1" viewBox="0 0 670 365" width="670px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:667px;height:380px;background:#FFFFFF;" version="1.1" viewBox="0 0 667 380" width="667px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1h4ik1ficyxdh" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
-      <ellipse cx="52" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M54.9688,218.6406 Q54.3906,218.9375 53.75,219.0781 Q53.1094,219.2344 52.4063,219.2344 Q49.9063,219.2344 48.5781,217.5938 Q47.2656,215.9375 47.2656,212.8125 Q47.2656,209.6875 48.5781,208.0313 Q49.9063,206.375 52.4063,206.375 Q53.1094,206.375 53.75,206.5313 Q54.4063,206.6875 54.9688,206.9844 L54.9688,209.7031 Q54.3438,209.125 53.75,208.8594 Q53.1563,208.5781 52.5313,208.5781 Q51.1875,208.5781 50.5,209.6563 Q49.8125,210.7188 49.8125,212.8125 Q49.8125,214.9063 50.5,215.9844 Q51.1875,217.0469 52.5313,217.0469 Q53.1563,217.0469 53.75,216.7813 Q54.3438,216.5 54.9688,215.9219 L54.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="66" y="217.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000864916647665253425">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000864916647665253425" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="38" y="216"/>
+        <ellipse cx="53" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M48,233.1563 C48,235.6563 50.1406,237.4688 53.0625,237.4688 C54.2969,237.4688 55.4688,237.1719 56.2188,236.6563 C56.8281,236.2344 57.1563,235.8125 57.1563,235.4063 C57.1563,234.9375 56.7344,234.5313 56.2344,234.5313 C56,234.5313 55.7813,234.6094 55.5781,234.8125 C55.1406,235.25 55.1406,235.25 54.9688,235.3438 C54.5156,235.5781 53.875,235.7188 53.1094,235.7188 C51.1094,235.7188 49.8281,234.7031 49.8281,233.125 L49.8281,232.0781 C49.8281,230.375 51.0469,229.1719 52.75,229.1719 C53.3281,229.1719 53.9063,229.3125 54.375,229.5625 C54.8438,229.8281 55.0156,230.0156 55.0781,230.375 C55.2031,231.0469 55.4531,231.2969 55.9844,231.2969 C56.2656,231.2969 56.5469,231.1563 56.7344,230.9375 C56.8594,230.7656 56.9063,230.5938 56.9063,230.1563 L56.9063,228.7969 C56.9063,228.375 56.8906,228.2344 56.7656,228.0625 C56.5938,227.8125 56.3125,227.6563 55.9844,227.6563 C55.6719,227.6563 55.4688,227.7656 55.25,228.0313 C54.0781,227.5313 53.6406,227.4219 52.6875,227.4219 C50.0156,227.4219 48,229.4375 48,232.0625 L48,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="67" y="236.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="39" x2="78" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="39" x2="78" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
-      <ellipse cx="127" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M129.9688,218.6406 Q129.3906,218.9375 128.75,219.0781 Q128.1094,219.2344 127.4063,219.2344 Q124.9063,219.2344 123.5781,217.5938 Q122.2656,215.9375 122.2656,212.8125 Q122.2656,209.6875 123.5781,208.0313 Q124.9063,206.375 127.4063,206.375 Q128.1094,206.375 128.75,206.5313 Q129.4063,206.6875 129.9688,206.9844 L129.9688,209.7031 Q129.3438,209.125 128.75,208.8594 Q128.1563,208.5781 127.5313,208.5781 Q126.1875,208.5781 125.5,209.6563 Q124.8125,210.7188 124.8125,212.8125 Q124.8125,214.9063 125.5,215.9844 Q126.1875,217.0469 127.5313,217.0469 Q128.1563,217.0469 128.75,216.7813 Q129.3438,216.5 129.9688,215.9219 L129.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="141" y="217.1543">AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <g id="elem_C_0000386872828559902182">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000386872828559902182" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="113.5" y="216"/>
+        <ellipse cx="128.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M123.5,233.1563 C123.5,235.6563 125.6406,237.4688 128.5625,237.4688 C129.7969,237.4688 130.9688,237.1719 131.7188,236.6563 C132.3281,236.2344 132.6563,235.8125 132.6563,235.4063 C132.6563,234.9375 132.2344,234.5313 131.7344,234.5313 C131.5,234.5313 131.2813,234.6094 131.0781,234.8125 C130.6406,235.25 130.6406,235.25 130.4688,235.3438 C130.0156,235.5781 129.375,235.7188 128.6094,235.7188 C126.6094,235.7188 125.3281,234.7031 125.3281,233.125 L125.3281,232.0781 C125.3281,230.375 126.5469,229.1719 128.25,229.1719 C128.8281,229.1719 129.4063,229.3125 129.875,229.5625 C130.3438,229.8281 130.5156,230.0156 130.5781,230.375 C130.7031,231.0469 130.9531,231.2969 131.4844,231.2969 C131.7656,231.2969 132.0469,231.1563 132.2344,230.9375 C132.3594,230.7656 132.4063,230.5938 132.4063,230.1563 L132.4063,228.7969 C132.4063,228.375 132.3906,228.2344 132.2656,228.0625 C132.0938,227.8125 131.8125,227.6563 131.4844,227.6563 C131.1719,227.6563 130.9688,227.7656 130.75,228.0313 C129.5781,227.5313 129.1406,227.4219 128.1875,227.4219 C125.5156,227.4219 123.5,229.4375 123.5,232.0625 L123.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="142.5" y="236.606">AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="114.5" x2="162.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="114.5" x2="162.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
-      <ellipse cx="210" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M212.9688,218.6406 Q212.3906,218.9375 211.75,219.0781 Q211.1094,219.2344 210.4063,219.2344 Q207.9063,219.2344 206.5781,217.5938 Q205.2656,215.9375 205.2656,212.8125 Q205.2656,209.6875 206.5781,208.0313 Q207.9063,206.375 210.4063,206.375 Q211.1094,206.375 211.75,206.5313 Q212.4063,206.6875 212.9688,206.9844 L212.9688,209.7031 Q212.3438,209.125 211.75,208.8594 Q211.1563,208.5781 210.5313,208.5781 Q209.1875,208.5781 208.5,209.6563 Q207.8125,210.7188 207.8125,212.8125 Q207.8125,214.9063 208.5,215.9844 Q209.1875,217.0469 210.5313,217.0469 Q211.1563,217.0469 211.75,216.7813 Q212.3438,216.5 212.9688,215.9219 L212.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="224" y="217.1543">AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <g id="elem_C_0000054164402597771463">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000054164402597771463" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="198" y="216"/>
+        <ellipse cx="213" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M208,233.1563 C208,235.6563 210.1406,237.4688 213.0625,237.4688 C214.2969,237.4688 215.4688,237.1719 216.2188,236.6563 C216.8281,236.2344 217.1563,235.8125 217.1563,235.4063 C217.1563,234.9375 216.7344,234.5313 216.2344,234.5313 C216,234.5313 215.7813,234.6094 215.5781,234.8125 C215.1406,235.25 215.1406,235.25 214.9688,235.3438 C214.5156,235.5781 213.875,235.7188 213.1094,235.7188 C211.1094,235.7188 209.8281,234.7031 209.8281,233.125 L209.8281,232.0781 C209.8281,230.375 211.0469,229.1719 212.75,229.1719 C213.3281,229.1719 213.9063,229.3125 214.375,229.5625 C214.8438,229.8281 215.0156,230.0156 215.0781,230.375 C215.2031,231.0469 215.4531,231.2969 215.9844,231.2969 C216.2656,231.2969 216.5469,231.1563 216.7344,230.9375 C216.8594,230.7656 216.9063,230.5938 216.9063,230.1563 L216.9063,228.7969 C216.9063,228.375 216.8906,228.2344 216.7656,228.0625 C216.5938,227.8125 216.3125,227.6563 215.9844,227.6563 C215.6719,227.6563 215.4688,227.7656 215.25,228.0313 C214.0781,227.5313 213.6406,227.4219 212.6875,227.4219 C210.0156,227.4219 208,229.4375 208,232.0625 L208,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="227" y="236.606">AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="199" x2="256" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="199" x2="256" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
-      <ellipse cx="409.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M412.4688,55.1406 Q411.8906,55.4375 411.25,55.5781 Q410.6094,55.7344 409.9063,55.7344 Q407.4063,55.7344 406.0781,54.0938 Q404.7656,52.4375 404.7656,49.3125 Q404.7656,46.1875 406.0781,44.5313 Q407.4063,42.875 409.9063,42.875 Q410.6094,42.875 411.25,43.0313 Q411.9063,43.1875 412.4688,43.4844 L412.4688,46.2031 Q411.8438,45.625 411.25,45.3594 Q410.6563,45.0781 410.0313,45.0781 Q408.6875,45.0781 408,46.1563 Q407.3125,47.2188 407.3125,49.3125 Q407.3125,51.4063 408,52.4844 Q408.6875,53.5469 410.0313,53.5469 Q410.6563,53.5469 411.25,53.2813 Q411.8438,53 412.4688,52.4219 L412.4688,55.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="423.5" y="53.6543">AAAA</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="463.5" y="30.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="464.5" y="42.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="65.5" y2="65.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="73.5" y2="73.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <g id="elem_C_0000375905626569465019">
+        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0000375905626569465019" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="79" x="406" y="40.6"/>
+        <ellipse cx="421" cy="56.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M416,57.7563 C416,60.2563 418.1406,62.0688 421.0625,62.0688 C422.2969,62.0688 423.4688,61.7719 424.2188,61.2563 C424.8281,60.8344 425.1563,60.4125 425.1563,60.0063 C425.1563,59.5375 424.7344,59.1313 424.2344,59.1313 C424,59.1313 423.7813,59.2094 423.5781,59.4125 C423.1406,59.85 423.1406,59.85 422.9688,59.9438 C422.5156,60.1781 421.875,60.3188 421.1094,60.3188 C419.1094,60.3188 417.8281,59.3031 417.8281,57.725 L417.8281,56.6781 C417.8281,54.975 419.0469,53.7719 420.75,53.7719 C421.3281,53.7719 421.9063,53.9125 422.375,54.1625 C422.8438,54.4281 423.0156,54.6156 423.0781,54.975 C423.2031,55.6469 423.4531,55.8969 423.9844,55.8969 C424.2656,55.8969 424.5469,55.7563 424.7344,55.5375 C424.8594,55.3656 424.9063,55.1938 424.9063,54.7563 L424.9063,53.3969 C424.9063,52.975 424.8906,52.8344 424.7656,52.6625 C424.5938,52.4125 424.3125,52.2563 423.9844,52.2563 C423.6719,52.2563 423.4688,52.3656 423.25,52.6313 C422.0781,52.1313 421.6406,52.0219 420.6875,52.0219 C418.0156,52.0219 416,54.0375 416,56.6625 L416,57.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="435" y="61.206">AAAA</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="479" y="37.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="480" y="51.8001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="407" x2="484" y1="72.6" y2="72.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="407" x2="484" y1="80.6" y2="80.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="412" y="89.5"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="414" y="91.5"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="426" y="97.6059">t : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="79.5"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="402.5" y="81.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000619642232943663499">
+        <rect codeLine="19" fill="#F1F1F1" height="48" id="C_0000619642232943663499" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="72" x="291.5" y="216"/>
+        <ellipse cx="306.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M301.5,233.1563 C301.5,235.6563 303.6406,237.4688 306.5625,237.4688 C307.7969,237.4688 308.9688,237.1719 309.7188,236.6563 C310.3281,236.2344 310.6563,235.8125 310.6563,235.4063 C310.6563,234.9375 310.2344,234.5313 309.7344,234.5313 C309.5,234.5313 309.2813,234.6094 309.0781,234.8125 C308.6406,235.25 308.6406,235.25 308.4688,235.3438 C308.0156,235.5781 307.375,235.7188 306.6094,235.7188 C304.6094,235.7188 303.3281,234.7031 303.3281,233.125 L303.3281,232.0781 C303.3281,230.375 304.5469,229.1719 306.25,229.1719 C306.8281,229.1719 307.4063,229.3125 307.875,229.5625 C308.3438,229.8281 308.5156,230.0156 308.5781,230.375 C308.7031,231.0469 308.9531,231.2969 309.4844,231.2969 C309.7656,231.2969 310.0469,231.1563 310.2344,230.9375 C310.3594,230.7656 310.4063,230.5938 310.4063,230.1563 L310.4063,228.7969 C310.4063,228.375 310.3906,228.2344 310.2656,228.0625 C310.0938,227.8125 309.8125,227.6563 309.4844,227.6563 C309.1719,227.6563 308.9688,227.7656 308.75,228.0313 C307.5781,227.5313 307.1406,227.4219 306.1875,227.4219 C303.5156,227.4219 301.5,229.4375 301.5,232.0625 L301.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="320.5" y="236.606">ns1::A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="292.5" x2="362.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="292.5" x2="362.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="414.5" y="87.7104">t : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002207007194029669343">
+        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0002207007194029669343" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="420" y="216"/>
+        <ellipse cx="435" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M430,233.1563 C430,235.6563 432.1406,237.4688 435.0625,237.4688 C436.2969,237.4688 437.4688,237.1719 438.2188,236.6563 C438.8281,236.2344 439.1563,235.8125 439.1563,235.4063 C439.1563,234.9375 438.7344,234.5313 438.2344,234.5313 C438,234.5313 437.7813,234.6094 437.5781,234.8125 C437.1406,235.25 437.1406,235.25 436.9688,235.3438 C436.5156,235.5781 435.875,235.7188 435.1094,235.7188 C433.1094,235.7188 431.8281,234.7031 431.8281,233.125 L431.8281,232.0781 C431.8281,230.375 433.0469,229.1719 434.75,229.1719 C435.3281,229.1719 435.9063,229.3125 436.375,229.5625 C436.8438,229.8281 437.0156,230.0156 437.0781,230.375 C437.2031,231.0469 437.4531,231.2969 437.9844,231.2969 C438.2656,231.2969 438.5469,231.1563 438.7344,230.9375 C438.8594,230.7656 438.9063,230.5938 438.9063,230.1563 L438.9063,228.7969 C438.9063,228.375 438.8906,228.2344 438.7656,228.0625 C438.5938,227.8125 438.3125,227.6563 437.9844,227.6563 C437.6719,227.6563 437.4688,227.7656 437.25,228.0313 C436.0781,227.5313 435.6406,227.4219 434.6875,227.4219 C432.0156,227.4219 430,229.4375 430,232.0625 L430,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="449" y="236.606">ns1::ns2::A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="421" x2="522" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="421" x2="522" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
-      <ellipse cx="304.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M307.4688,218.6406 Q306.8906,218.9375 306.25,219.0781 Q305.6094,219.2344 304.9063,219.2344 Q302.4063,219.2344 301.0781,217.5938 Q299.7656,215.9375 299.7656,212.8125 Q299.7656,209.6875 301.0781,208.0313 Q302.4063,206.375 304.9063,206.375 Q305.6094,206.375 306.25,206.5313 Q306.9063,206.6875 307.4688,206.9844 L307.4688,209.7031 Q306.8438,209.125 306.25,208.8594 Q305.6563,208.5781 305.0313,208.5781 Q303.6875,208.5781 303,209.6563 Q302.3125,210.7188 302.3125,212.8125 Q302.3125,214.9063 303,215.9844 Q303.6875,217.0469 305.0313,217.0469 Q305.6563,217.0469 306.25,216.7813 Q306.8438,216.5 307.4688,215.9219 L307.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="318.5" y="217.1543">ns1::A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000204051985124373077">
+        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0000204051985124373077" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="418" y="325"/>
+        <ellipse cx="433" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M428,342.1563 C428,344.6563 430.1406,346.4688 433.0625,346.4688 C434.2969,346.4688 435.4688,346.1719 436.2188,345.6563 C436.8281,345.2344 437.1563,344.8125 437.1563,344.4063 C437.1563,343.9375 436.7344,343.5313 436.2344,343.5313 C436,343.5313 435.7813,343.6094 435.5781,343.8125 C435.1406,344.25 435.1406,344.25 434.9688,344.3438 C434.5156,344.5781 433.875,344.7188 433.1094,344.7188 C431.1094,344.7188 429.8281,343.7031 429.8281,342.125 L429.8281,341.0781 C429.8281,339.375 431.0469,338.1719 432.75,338.1719 C433.3281,338.1719 433.9063,338.3125 434.375,338.5625 C434.8438,338.8281 435.0156,339.0156 435.0781,339.375 C435.2031,340.0469 435.4531,340.2969 435.9844,340.2969 C436.2656,340.2969 436.5469,340.1563 436.7344,339.9375 C436.8594,339.7656 436.9063,339.5938 436.9063,339.1563 L436.9063,337.7969 C436.9063,337.375 436.8906,337.2344 436.7656,337.0625 C436.5938,336.8125 436.3125,336.6563 435.9844,336.6563 C435.6719,336.6563 435.4688,336.7656 435.25,337.0313 C434.0781,336.5313 433.6406,336.4219 432.6875,336.4219 C430.0156,336.4219 428,338.4375 428,341.0625 L428,342.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="447" y="345.606">ns1::ns2::B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="419" x2="520" y1="357" y2="357"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="419" x2="520" y1="365" y2="365"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
-      <ellipse cx="438" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M440.9688,218.6406 Q440.3906,218.9375 439.75,219.0781 Q439.1094,219.2344 438.4063,219.2344 Q435.9063,219.2344 434.5781,217.5938 Q433.2656,215.9375 433.2656,212.8125 Q433.2656,209.6875 434.5781,208.0313 Q435.9063,206.375 438.4063,206.375 Q439.1094,206.375 439.75,206.5313 Q440.4063,206.6875 440.9688,206.9844 L440.9688,209.7031 Q440.3438,209.125 439.75,208.8594 Q439.1563,208.5781 438.5313,208.5781 Q437.1875,208.5781 436.5,209.6563 Q435.8125,210.7188 435.8125,212.8125 Q435.8125,214.9063 436.5,215.9844 Q437.1875,217.0469 438.5313,217.0469 Q439.1563,217.0469 439.75,216.7813 Q440.3438,216.5 440.9688,215.9219 L440.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="452" y="217.1543">ns1::ns2::A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001837009554564742531">
+        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0001837009554564742531" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="275.5" y="325"/>
+        <ellipse cx="290.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M285.5,342.1563 C285.5,344.6563 287.6406,346.4688 290.5625,346.4688 C291.7969,346.4688 292.9688,346.1719 293.7188,345.6563 C294.3281,345.2344 294.6563,344.8125 294.6563,344.4063 C294.6563,343.9375 294.2344,343.5313 293.7344,343.5313 C293.5,343.5313 293.2813,343.6094 293.0781,343.8125 C292.6406,344.25 292.6406,344.25 292.4688,344.3438 C292.0156,344.5781 291.375,344.7188 290.6094,344.7188 C288.6094,344.7188 287.3281,343.7031 287.3281,342.125 L287.3281,341.0781 C287.3281,339.375 288.5469,338.1719 290.25,338.1719 C290.8281,338.1719 291.4063,338.3125 291.875,338.5625 C292.3438,338.8281 292.5156,339.0156 292.5781,339.375 C292.7031,340.0469 292.9531,340.2969 293.4844,340.2969 C293.7656,340.2969 294.0469,340.1563 294.2344,339.9375 C294.3594,339.7656 294.4063,339.5938 294.4063,339.1563 L294.4063,337.7969 C294.4063,337.375 294.3906,337.2344 294.2656,337.0625 C294.0938,336.8125 293.8125,336.6563 293.4844,336.6563 C293.1719,336.6563 292.9688,336.7656 292.75,337.0313 C291.5781,336.5313 291.1406,336.4219 290.1875,336.4219 C287.5156,336.4219 285.5,338.4375 285.5,341.0625 L285.5,342.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="304.5" y="345.606">ns1::ns2::C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="276.5" x2="378.5" y1="357" y2="357"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="276.5" x2="378.5" y1="365" y2="365"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
-      <ellipse cx="434" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M436.9688,327.6406 Q436.3906,327.9375 435.75,328.0781 Q435.1094,328.2344 434.4063,328.2344 Q431.9063,328.2344 430.5781,326.5938 Q429.2656,324.9375 429.2656,321.8125 Q429.2656,318.6875 430.5781,317.0313 Q431.9063,315.375 434.4063,315.375 Q435.1094,315.375 435.75,315.5313 Q436.4063,315.6875 436.9688,315.9844 L436.9688,318.7031 Q436.3438,318.125 435.75,317.8594 Q435.1563,317.5781 434.5313,317.5781 Q433.1875,317.5781 432.5,318.6563 Q431.8125,319.7188 431.8125,321.8125 Q431.8125,323.9063 432.5,324.9844 Q433.1875,326.0469 434.5313,326.0469 Q435.1563,326.0469 435.75,325.7813 Q436.3438,325.5 436.9688,324.9219 L436.9688,327.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="448" y="326.1543">ns1::ns2::B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="338" y2="338"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="346" y2="346"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0002029929560931799980">
+        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0002029929560931799980" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="556.5" y="325"/>
+        <ellipse cx="571.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M566.5,342.1563 C566.5,344.6563 568.6406,346.4688 571.5625,346.4688 C572.7969,346.4688 573.9688,346.1719 574.7188,345.6563 C575.3281,345.2344 575.6563,344.8125 575.6563,344.4063 C575.6563,343.9375 575.2344,343.5313 574.7344,343.5313 C574.5,343.5313 574.2813,343.6094 574.0781,343.8125 C573.6406,344.25 573.6406,344.25 573.4688,344.3438 C573.0156,344.5781 572.375,344.7188 571.6094,344.7188 C569.6094,344.7188 568.3281,343.7031 568.3281,342.125 L568.3281,341.0781 C568.3281,339.375 569.5469,338.1719 571.25,338.1719 C571.8281,338.1719 572.4063,338.3125 572.875,338.5625 C573.3438,338.8281 573.5156,339.0156 573.5781,339.375 C573.7031,340.0469 573.9531,340.2969 574.4844,340.2969 C574.7656,340.2969 575.0469,340.1563 575.2344,339.9375 C575.3594,339.7656 575.4063,339.5938 575.4063,339.1563 L575.4063,337.7969 C575.4063,337.375 575.3906,337.2344 575.2656,337.0625 C575.0938,336.8125 574.8125,336.6563 574.4844,336.6563 C574.1719,336.6563 573.9688,336.7656 573.75,337.0313 C572.5781,336.5313 572.1406,336.4219 571.1875,336.4219 C568.5156,336.4219 566.5,338.4375 566.5,341.0625 L566.5,342.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="585.5" y="345.606">ns1::ns2::D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="557.5" x2="659.5" y1="357" y2="357"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="557.5" x2="659.5" y1="365" y2="365"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
-      <ellipse cx="289" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M291.9688,327.6406 Q291.3906,327.9375 290.75,328.0781 Q290.1094,328.2344 289.4063,328.2344 Q286.9063,328.2344 285.5781,326.5938 Q284.2656,324.9375 284.2656,321.8125 Q284.2656,318.6875 285.5781,317.0313 Q286.9063,315.375 289.4063,315.375 Q290.1094,315.375 290.75,315.5313 Q291.4063,315.6875 291.9688,315.9844 L291.9688,318.7031 Q291.3438,318.125 290.75,317.8594 Q290.1563,317.5781 289.5313,317.5781 Q288.1875,317.5781 287.5,318.6563 Q286.8125,319.7188 286.8125,321.8125 Q286.8125,323.9063 287.5,324.9844 Q288.1875,326.0469 289.5313,326.0469 Q290.1563,326.0469 290.75,325.7813 Q291.3438,325.5 291.9688,324.9219 L291.9688,327.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="303" y="326.1543">ns1::ns2::C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="338" y2="338"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="346" y2="346"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0002305358535757579772">
+        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0002305358535757579772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="7" y="325"/>
+        <ellipse cx="22" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,342.1563 C17,344.6563 19.1406,346.4688 22.0625,346.4688 C23.2969,346.4688 24.4688,346.1719 25.2188,345.6563 C25.8281,345.2344 26.1563,344.8125 26.1563,344.4063 C26.1563,343.9375 25.7344,343.5313 25.2344,343.5313 C25,343.5313 24.7813,343.6094 24.5781,343.8125 C24.1406,344.25 24.1406,344.25 23.9688,344.3438 C23.5156,344.5781 22.875,344.7188 22.1094,344.7188 C20.1094,344.7188 18.8281,343.7031 18.8281,342.125 L18.8281,341.0781 C18.8281,339.375 20.0469,338.1719 21.75,338.1719 C22.3281,338.1719 22.9063,338.3125 23.375,338.5625 C23.8438,338.8281 24.0156,339.0156 24.0781,339.375 C24.2031,340.0469 24.4531,340.2969 24.9844,340.2969 C25.2656,340.2969 25.5469,340.1563 25.7344,339.9375 C25.8594,339.7656 25.9063,339.5938 25.9063,339.1563 L25.9063,337.7969 C25.9063,337.375 25.8906,337.2344 25.7656,337.0625 C25.5938,336.8125 25.3125,336.6563 24.9844,336.6563 C24.6719,336.6563 24.4688,336.7656 24.25,337.0313 C23.0781,336.5313 22.6406,336.4219 21.6875,336.4219 C19.0156,336.4219 17,338.4375 17,341.0625 L17,342.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="36" y="345.606">ns1::ns2::E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="109" y1="357" y2="357"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="109" y1="365" y2="365"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
-      <ellipse cx="571.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M574.4688,327.6406 Q573.8906,327.9375 573.25,328.0781 Q572.6094,328.2344 571.9063,328.2344 Q569.4063,328.2344 568.0781,326.5938 Q566.7656,324.9375 566.7656,321.8125 Q566.7656,318.6875 568.0781,317.0313 Q569.4063,315.375 571.9063,315.375 Q572.6094,315.375 573.25,315.5313 Q573.9063,315.6875 574.4688,315.9844 L574.4688,318.7031 Q573.8438,318.125 573.25,317.8594 Q572.6563,317.5781 572.0313,317.5781 Q570.6875,317.5781 570,318.6563 Q569.3125,319.7188 569.3125,321.8125 Q569.3125,323.9063 570,324.9844 Q570.6875,326.0469 572.0313,326.0469 Q572.6563,326.0469 573.25,325.7813 Q573.8438,325.5 574.4688,324.9219 L574.4688,327.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="585.5" y="326.1543">ns1::ns2::D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="338" y2="338"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="346" y2="346"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <g id="elem_C_0001731264248793686366">
+        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0001731264248793686366" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="121" x="520" y="49"/>
+        <ellipse cx="535" cy="65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M530,66.1563 C530,68.6563 532.1406,70.4688 535.0625,70.4688 C536.2969,70.4688 537.4688,70.1719 538.2188,69.6563 C538.8281,69.2344 539.1563,68.8125 539.1563,68.4063 C539.1563,67.9375 538.7344,67.5313 538.2344,67.5313 C538,67.5313 537.7813,67.6094 537.5781,67.8125 C537.1406,68.25 537.1406,68.25 536.9688,68.3438 C536.5156,68.5781 535.875,68.7188 535.1094,68.7188 C533.1094,68.7188 531.8281,67.7031 531.8281,66.125 L531.8281,65.0781 C531.8281,63.375 533.0469,62.1719 534.75,62.1719 C535.3281,62.1719 535.9063,62.3125 536.375,62.5625 C536.8438,62.8281 537.0156,63.0156 537.0781,63.375 C537.2031,64.0469 537.4531,64.2969 537.9844,64.2969 C538.2656,64.2969 538.5469,64.1563 538.7344,63.9375 C538.8594,63.7656 538.9063,63.5938 538.9063,63.1563 L538.9063,61.7969 C538.9063,61.375 538.8906,61.2344 538.7656,61.0625 C538.5938,60.8125 538.3125,60.6563 537.9844,60.6563 C537.6719,60.6563 537.4688,60.7656 537.25,61.0313 C536.0781,60.5313 535.6406,60.4219 534.6875,60.4219 C532.0156,60.4219 530,62.4375 530,65.0625 L530,66.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="549" y="69.606">ns1::ns2::AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="521" x2="640" y1="81" y2="81"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="521" x2="640" y1="89" y2="89"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
-      <ellipse cx="21" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,327.6406 Q23.3906,327.9375 22.75,328.0781 Q22.1094,328.2344 21.4063,328.2344 Q18.9063,328.2344 17.5781,326.5938 Q16.2656,324.9375 16.2656,321.8125 Q16.2656,318.6875 17.5781,317.0313 Q18.9063,315.375 21.4063,315.375 Q22.1094,315.375 22.75,315.5313 Q23.4063,315.6875 23.9688,315.9844 L23.9688,318.7031 Q23.3438,318.125 22.75,317.8594 Q22.1563,317.5781 21.5313,317.5781 Q20.1875,317.5781 19.5,318.6563 Q18.8125,319.7188 18.8125,321.8125 Q18.8125,323.9063 19.5,324.9844 Q20.1875,326.0469 21.5313,326.0469 Q22.1563,326.0469 22.75,325.7813 Q23.3438,325.5 23.9688,324.9219 L23.9688,327.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="35" y="326.1543">ns1::ns2::E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="338" y2="338"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="346" y2="346"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000974430595320588991">
+        <rect codeLine="47" fill="#F1F1F1" height="131.9996" id="C_0000974430595320588991" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="188" x="183.5" y="7"/>
+        <ellipse cx="237.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M232.25,24.1563 C232.25,26.6563 234.3906,28.4688 237.3125,28.4688 C238.5469,28.4688 239.7188,28.1719 240.4688,27.6563 C241.0781,27.2344 241.4063,26.8125 241.4063,26.4063 C241.4063,25.9375 240.9844,25.5313 240.4844,25.5313 C240.25,25.5313 240.0313,25.6094 239.8281,25.8125 C239.3906,26.25 239.3906,26.25 239.2188,26.3438 C238.7656,26.5781 238.125,26.7188 237.3594,26.7188 C235.3594,26.7188 234.0781,25.7031 234.0781,24.125 L234.0781,23.0781 C234.0781,21.375 235.2969,20.1719 237,20.1719 C237.5781,20.1719 238.1563,20.3125 238.625,20.5625 C239.0938,20.8281 239.2656,21.0156 239.3281,21.375 C239.4531,22.0469 239.7031,22.2969 240.2344,22.2969 C240.5156,22.2969 240.7969,22.1563 240.9844,21.9375 C241.1094,21.7656 241.1563,21.5938 241.1563,21.1563 L241.1563,19.7969 C241.1563,19.375 241.1406,19.2344 241.0156,19.0625 C240.8438,18.8125 240.5625,18.6563 240.2344,18.6563 C239.9219,18.6563 239.7188,18.7656 239.5,19.0313 C238.3281,18.5313 237.8906,18.4219 236.9375,18.4219 C234.2656,18.4219 232.25,20.4375 232.25,23.0625 L232.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="257.75" y="27.606">ns1::ns2::R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="184.5" x2="370.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="47.9"/>
+          <ellipse cx="194.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="203.5" y="56.0059">foo(AA &amp; aa) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="184.5" x2="370.5" y1="63.7999" y2="63.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="72.6999"/>
+          <ellipse cx="194.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="203.5" y="80.8059">a : A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="89.4998"/>
+          <ellipse cx="194.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="203.5" y="97.6058">ns1_a : ns1::A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="106.2997"/>
+          <ellipse cx="194.5" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="203.5" y="114.4057">ns1_ns2_a : ns1::ns2::A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="123.0997"/>
+          <ellipse cx="194.5" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="203.5" y="131.2057">root_a : ::A *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
-      <ellipse cx="520" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M522.9688,61.6406 Q522.3906,61.9375 521.75,62.0781 Q521.1094,62.2344 520.4063,62.2344 Q517.9063,62.2344 516.5781,60.5938 Q515.2656,58.9375 515.2656,55.8125 Q515.2656,52.6875 516.5781,51.0313 Q517.9063,49.375 520.4063,49.375 Q521.1094,49.375 521.75,49.5313 Q522.4063,49.6875 522.9688,49.9844 L522.9688,52.7031 Q522.3438,52.125 521.75,51.8594 Q521.1563,51.5781 520.5313,51.5781 Q519.1875,51.5781 518.5,52.6563 Q517.8125,53.7188 517.8125,55.8125 Q517.8125,57.9063 518.5,58.9844 Q519.1875,60.0469 520.5313,60.0469 Q521.1563,60.0469 521.75,59.7813 Q522.3438,59.5 522.9688,58.9219 L522.9688,61.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="534" y="60.1543">ns1::ns2::AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="72" y2="72"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="80" y2="80"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4ik1ficyxdh)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
-      <ellipse cx="232.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M235.7188,29.6406 Q235.1406,29.9375 234.5,30.0781 Q233.8594,30.2344 233.1563,30.2344 Q230.6563,30.2344 229.3281,28.5938 Q228.0156,26.9375 228.0156,23.8125 Q228.0156,20.6875 229.3281,19.0313 Q230.6563,17.375 233.1563,17.375 Q233.8594,17.375 234.5,17.5313 Q235.1563,17.6875 235.7188,17.9844 L235.7188,20.7031 Q235.0938,20.125 234.5,19.8594 Q233.9063,19.5781 233.2813,19.5781 Q231.9375,19.5781 231.25,20.6563 Q230.5625,21.7188 230.5625,23.8125 Q230.5625,25.9063 231.25,26.9844 Q231.9375,28.0469 233.2813,28.0469 Q233.9063,28.0469 234.5,27.7813 Q235.0938,27.5 235.7188,26.9219 L235.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="253.25" y="28.1543">ns1::ns2::R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="46"/>
-      <ellipse cx="196" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="205" y="54.2104">foo(AA &amp; aa) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="66.8047"/>
-      <ellipse cx="196" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="205" y="75.0151">a : A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="79.6094"/>
-      <ellipse cx="196" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="205" y="87.8198">ns1_a : ns1::A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="92.4141"/>
-      <ellipse cx="196" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="205" y="100.6245">ns1_ns2_a : ns1::ns2::A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="105.2188"/>
-      <ellipse cx="196" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="205" y="113.4292">root_a : ::A *</text>
-    </a>
-    <path d="M472.37,265.58 C471.86,279.36 471.31,294.06 470.87,305.83 " fill="none" id="C_0002207007194029669343&lt;-C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="465.39,264.94,473.13,245.22,479.38,265.46,465.39,264.94" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M325,265.58 C325,279.36 325,294.06 325,305.83 " fill="none" id="C_0000619642232943663499&lt;-C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="318,265.22,325,245.22,332,265.22,318,265.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M518.87,257.83 C538.69,273.66 561.43,291.82 578.98,305.83 " fill="none" id="C_0002207007194029669343&lt;-C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="514.34,263.17,503.08,245.22,523.07,252.23,514.34,263.17" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M57,265.58 C57,279.36 57,294.06 57,305.83 " fill="none" id="C_0000864916647665253425&lt;-C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="50,265.22,57,245.22,64,265.22,50,265.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M223.67,120.08 C202.05,144.72 177.54,172.66 159.94,192.72 " fill="none" id="C_0000974430595320588991-&gt;C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="156.51,196.62,165.4546,192.4976,159.8096,192.8633,159.4439,187.2183,156.51,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M343.79,120.08 C376.4,145.11 413.46,173.55 439.68,193.67 " fill="none" id="C_0000974430595320588991-&gt;C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="443.8,196.83,439.0887,188.1811,439.831,193.789,434.2231,194.5314,443.8,196.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="403" y="163.0669">+a</text>
-    <path d="M359.33,111.09 C395.41,130.23 429.32,148.42 431,150 C443.59,161.86 453.91,178.2 461.27,192.1 " fill="none" id="C_0000974430595320588991-&gt;C_0002207007194029669343-1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="463.66,196.72,463.0746,186.8886,461.3613,192.2797,455.9702,190.5664,463.66,196.72" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="451" cy="159.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="68" x="458" y="163.0669">ns1_ns2_a</text>
-    <path d="M290.84,120.08 C299.12,144.31 308.5,171.73 315.33,191.71 " fill="none" id="C_0000974430595320588991-&gt;C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="317.01,196.62,317.8968,186.8111,315.399,191.8867,310.3234,189.3888,317.01,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="312" cy="159.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="319" y="163.0669">ns1_a</text>
-    <path d="M184.71,107.93 C163.02,120.24 140.43,134.56 121,150 C105.34,162.44 90.14,178.83 78.48,192.62 " fill="none" id="C_0000974430595320588991-&gt;C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="74.98,196.81,83.8225,192.4729,78.1879,192.9747,77.6861,187.3402,74.98,196.81" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="127" cy="159.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="41" x="134" y="163.0669">root_a</text>
-    <path d="M226.66,124.8 C222.31,132.93 218.57,141.43 216,150 C211.44,165.21 213.32,183.02 216.27,196.87 " fill="none" id="C_0000974430595320588991&lt;-C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="229.14,120.32,221.2874,126.2645,226.7227,124.6968,228.2904,130.1321,229.14,120.32" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="222" cy="159.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="52" x="229" y="163.0669">«friend»</text>
+    <g id="link_C_0002207007194029669343_C_0000204051985124373077">
+      <path codeLine="55" d="M470.7271,282.4769 C470.3971,300.3169 470.27,306.75 469.94,324.57 " fill="none" id="C_0002207007194029669343-backto-C_0000204051985124373077" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="471.06,264.48,464.7281,282.366,476.7261,282.5879,471.06,264.48" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000619642232943663499_C_0001837009554564742531">
+      <path codeLine="56" d="M327.5,282.48 C327.5,300.32 327.5,306.75 327.5,324.57 " fill="none" id="C_0000619642232943663499-backto-C_0001837009554564742531" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="327.5,264.48,321.5,282.48,333.5,282.48,327.5,264.48" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002207007194029669343_C_0002029929560931799980">
+      <path codeLine="57" d="M515.7556,275.5601 C538.5956,293.4001 555.68,306.75 578.5,324.57 " fill="none" id="C_0002207007194029669343-backto-C_0002029929560931799980" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="501.57,264.48,512.0622,280.2887,519.449,270.8316,501.57,264.48" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000864916647665253425_C_0002305358535757579772">
+      <path codeLine="58" d="M58.5,282.48 C58.5,300.32 58.5,306.75 58.5,324.57 " fill="none" id="C_0000864916647665253425-backto-C_0002305358535757579772" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="58.5,264.48,52.5,282.48,64.5,282.48,58.5,264.48" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0000386872828559902182">
+      <path codeLine="59" d="M222.56,139.21 C199.8,166.24 178.7162,191.2617 161.9562,211.1517 " fill="none" id="C_0000974430595320588991-to-C_0000386872828559902182" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="158.09,215.74,166.9482,211.4351,161.3119,211.9164,160.8305,206.2801,158.09,215.74" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0002207007194029669343">
+      <path codeLine="60" d="M354.45,139.45 C386.19,166.44 416.3491,192.0932 439.6691,211.9232 " fill="none" id="C_0000974430595320588991-to-C_0002207007194029669343" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="444.24,215.81,439.9749,206.9326,440.4309,212.571,434.7925,213.027,444.24,215.81" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="409.5" y="182.077">+a</text>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0002207007194029669343">
+      <path codeLine="62" d="M371.99,130.23 C403.1,148.99 430.59,165.94 433.5,169 C446.27,182.42 453.6709,195.4793 460.1209,210.1193 " fill="none" id="C_0000974430595320588991-to-C_0002207007194029669343-1" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="462.54,215.61,462.5719,205.7612,460.5241,211.0344,455.2509,208.9866,462.54,215.61" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="451.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="458.5" y="182.077">ns1_ns2_a</text>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0000619642232943663499">
+      <path codeLine="61" d="M297.26,139.21 C305.45,166.24 312.6792,190.1081 318.7092,209.9981 " fill="none" id="C_0000974430595320588991-to-C_0000619642232943663499" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="320.45,215.74,321.6668,205.9666,318.9994,210.9551,314.0109,208.2876,320.45,215.74" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="316.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="323.5" y="182.077">ns1_a</text>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0000864916647665253425">
+      <path codeLine="63" d="M183.35,127.74 C163.6,140.4 143.36,154.47 125.5,169 C108.27,183.01 94.9809,196.7009 82.2909,211.0109 " fill="none" id="C_0000974430595320588991-to-C_0000864916647665253425" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="78.31,215.5,87.2741,211.4203,81.6274,211.7591,81.2886,206.1124,78.31,215.5" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="131.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="138.5" y="182.077">root_a</text>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0000054164402597771463">
+      <path codeLine="64" d="M246.1882,145.1061 C242.5182,154.8661 241.21,159.3 238.5,169 C234.23,184.28 231.47,201.94 229.78,215.69 " fill="none" id="C_0000974430595320588991-backto-C_0000054164402597771463" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="248.3,139.49,241.3883,146.5063,246.5402,144.1701,248.8764,149.322,248.3,139.49" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="244.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="251.5" y="182.077">«friend»</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00045_class_mermaid.svg b/docs/test_cases/t00045_class_mermaid.svg
index ad7e8a41..af6e347f 100644
--- a/docs/test_cases/t00045_class_mermaid.svg
+++ b/docs/test_cases/t00045_class_mermaid.svg
@@ -1,65 +1,70 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 787.625 415" style="max-width: 787.625px; background-color: white;" width="787.625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M205.45443925233644,300L199.49588687694703,304.1666666666667C193.53733450155764,308.3333333333333,181.6202297507788,316.6666666666667,175.66167737538942,325C169.703125,333.3333333333333,169.703125,341.6666666666667,169.703125,345.8333333333333L169.703125,350"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M575.9921875,300L575.9921875,304.1666666666667C575.9921875,308.3333333333333,575.9921875,316.6666666666667,575.9921875,325C575.9921875,333.3333333333333,575.9921875,341.6666666666667,575.9921875,345.8333333333333L575.9921875,350"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M295.4512631425234,300L302.65014116043614,304.1666666666667C309.8490191783489,308.3333333333333,324.2467752141745,316.6666666666667,331.44565323208724,325C338.64453125,333.3333333333333,338.64453125,341.6666666666667,338.64453125,345.8333333333333L338.64453125,350"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.5625,300L728.5625,304.1666666666667C728.5625,308.3333333333333,728.5625,316.6666666666667,728.5625,325C728.5625,333.3333333333333,728.5625,341.6666666666667,728.5625,345.8333333333333L728.5625,350"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M388.45917553191487,175L386.1951462765957,180.66666666666666C383.9311170212766,186.33333333333334,379.40305851063823,197.66666666666666,377.13902925531914,209C374.875,220.33333333333334,374.875,231.66666666666666,374.875,237.33333333333334L374.875,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M323.8125,145.79935719153482L304.8001302083333,156.33279765961234C285.7877604166667,166.86623812768988,247.76302083333334,187.93311906384494,232.0575052083333,204.13322619858914C216.35198958333334,220.33333333333334,222.9656979166667,231.66666666666666,226.27255208333335,237.33333333333334L229.57940625,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M519.828125,166.19532279314888L529.1888020833334,173.32943566095742C538.5494791666666,180.46354852876593,557.2708333333334,194.73177426438295,566.6315104166666,207.53255379885817C575.9921875,220.33333333333334,575.9921875,231.66666666666666,575.9921875,237.33333333333334L575.9921875,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M323.8125,174.26692214829166L316.9576822916667,180.0557684569097C310.1028645833333,185.84461476552778,296.3932291666667,197.42230738276388,286.23155729166666,208.87782035804858C276.0698854166667,220.33333333333334,269.45617708333333,231.66666666666666,266.1493229166667,237.33333333333334L262.84246875,243"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M519.828125,129.04266102946795L554.6171875,142.3688841912233C589.40625,155.69510735297862,658.984375,182.3475536764893,693.7734375,201.34044350491135C728.5625,220.33333333333334,728.5625,231.66666666666666,728.5625,237.33333333333334L728.5625,243"/>
-        <path marker-start="url(#classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M455.18144946808513,175L457.4454787234043,180.66666666666666C459.7095079787234,186.33333333333334,464.23756648936177,197.66666666666666,466.50159574468086,209C468.765625,220.33333333333334,468.765625,231.66666666666666,468.765625,237.33333333333334L468.765625,243"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M190.70324205961373,310.3151433039687L187.20322254967812,312.7626194199739C183.70320303974248,315.2100955359791,176.70316401987125,320.10504776798956,173.20314450993564,326.71919055066144C169.703125,333.3333333333333,169.703125,341.6666666666667,169.703125,345.8333333333333L169.703125,350"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M575.9921875,318L575.9921875,319.1666666666667C575.9921875,320.3333333333333,575.9921875,322.6666666666667,575.9921875,328C575.9921875,333.3333333333333,575.9921875,341.6666666666667,575.9921875,345.8333333333333L575.9921875,350"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M311.0299728861911,309.01686213283494L315.63239928015923,311.6807184440291C320.2348256741274,314.3445747552233,329.4396784620637,319.67228737761167,334.0421048560318,326.5028103554725C338.64453125,333.3333333333333,338.64453125,341.6666666666667,338.64453125,345.8333333333333L338.64453125,350"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.5625,318L728.5625,319.1666666666667C728.5625,320.3333333333333,728.5625,322.6666666666667,728.5625,328C728.5625,333.3333333333333,728.5625,341.6666666666667,728.5625,345.8333333333333L728.5625,350"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M388.45917553191487,175L386.1951462765957,180.66666666666666C383.9311170212766,186.33333333333334,379.40305851063823,197.66666666666666,377.13902925531914,208C374.875,218.33333333333334,374.875,227.66666666666666,374.875,232.33333333333334L374.875,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M323.8125,145.79935719153482L304.8001302083333,156.33279765961234C285.7877604166667,166.86623812768988,247.76302083333334,187.93311906384494,231.55348651213956,203.26953345583445C215.34395219094577,218.60594784782396,220.94962313189157,228.21189569564794,223.75245860236444,233.0148696195599L226.5552940728373,237.81784354347187"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M519.828125,166.19532279314888L529.1888020833334,173.32943566095742C538.5494791666666,180.46354852876593,557.2708333333334,194.73177426438295,566.6315104166666,206.53255379885817C575.9921875,218.33333333333334,575.9921875,227.66666666666666,575.9921875,232.33333333333334L575.9921875,237"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M323.8125,174.26692214829166L316.9576822916667,180.0557684569097C310.1028645833333,185.84461476552778,296.3932291666667,197.42230738276388,286.73557598786044,208.01412761529392C277.0779228090542,218.60594784782396,271.47225186810846,228.21189569564794,268.6694163976356,233.0148696195599L265.8665809271627,237.81784354347187"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M519.828125,129.04266102946795L554.6171875,142.3688841912233C589.40625,155.69510735297862,658.984375,182.3475536764893,693.7734375,200.34044350491135C728.5625,218.33333333333334,728.5625,227.66666666666666,728.5625,232.33333333333334L728.5625,237"/>
+        <path marker-start="url(#my-svg_classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M457.4075577980547,180.57175391624935L459.3005689983789,185.30979493020777C461.19358019870316,190.04783594416622,464.9796025993516,199.52391797208313,466.8726137996758,209.9286256527082C468.765625,220.33333333333334,468.765625,231.66666666666666,468.765625,237.33333333333334L468.765625,243"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -166,7 +171,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L1">
+        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L1">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -185,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L3">
+        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L3">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -204,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L5">
+        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L5">
           <g title="AAA" id="classId-C_0000054164402597771463-2" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -223,7 +228,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L7">
+        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L7">
           <g title="AAAA" id="classId-C_0000375905626569465019-3" class="node default clickable">
             <rect height="79" width="89.6875" y="-39.5" x="-44.84375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.84375" x1="-44.84375" class="divider"/>
@@ -247,7 +252,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L13">
+        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L13">
           <g title="A" id="classId-C_0000619642232943663499-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -266,7 +271,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L17">
+        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L17">
           <g title="A" id="classId-C_0002207007194029669343-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -285,7 +290,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L19">
+        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L19">
           <g title="B" id="classId-C_0000204051985124373077-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -304,7 +309,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L21">
+        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L21">
           <g title="C" id="classId-C_0001837009554564742531-7" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -323,7 +328,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L23">
+        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L23">
           <g title="D" id="classId-C_0002029929560931799980-8" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -342,7 +347,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L25">
+        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L25">
           <g title="E" id="classId-C_0002305358535757579772-9" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -361,7 +366,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L27">
+        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L27">
           <g title="AAA" id="classId-C_0001731264248793686366-10" class="node default clickable">
             <rect height="57" width="126.125" y="-28.5" x="-63.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.0625" x1="-63.0625" class="divider"/>
@@ -380,7 +385,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00045/t00045.cc#L29">
+        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L29">
           <g title="R" id="classId-C_0000974430595320588991-11" class="node default clickable">
             <rect height="167" width="196.015625" y="-83.5" x="-98.0078125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="98.0078125" x1="-98.0078125" class="divider"/>
@@ -398,27 +403,27 @@
               </foreignObject>
               <foreignObject transform="translate( -90.5078125, -42)" height="18" width="41.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+a : A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+a : A</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -90.5078125, -20)" height="18" width="111.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ns1_a : ns1::A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+ns1_a : ns1::A</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -90.5078125, 2)" height="18" width="181.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ns1_ns2_a : ns1::ns2::A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+ns1_ns2_a : ns1::ns2::A</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -90.5078125, 24)" height="18" width="87.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+root_a : ::A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+root_a : ::A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -90.5078125, 58)" height="18" width="142.75">
+              <foreignObject transform="translate( -90.5078125, 58)" height="18" width="151.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo(AA &amp; aa) : void</span>
+                  <span class="nodeLabel">+foo(AA &amp; aa) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00046.md b/docs/test_cases/t00046.md
index 8db7f304..75993b5f 100644
--- a/docs/test_cases/t00046.md
+++ b/docs/test_cases/t00046.md
@@ -12,7 +12,7 @@ diagrams:
         - std
 ```
 ## Source code
-File t00046.cc
+File `tests/t00046/t00046.cc`
 ```cpp
 #include <cstdint>
 #include <vector>
@@ -349,6 +349,7 @@ public:
                   "is_constexpr": false,
                   "is_constructor": false,
                   "is_copy_assignment": false,
+                  "is_coroutine": false,
                   "is_defaulted": false,
                   "is_deleted": false,
                   "is_move_assignment": false,
diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg
index 3d5f5f35..a3161785 100644
--- a/docs/test_cases/t00046_class.svg
+++ b/docs/test_cases/t00046_class.svg
@@ -1,158 +1,192 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="616px" preserveAspectRatio="none" style="width:586px;height:616px;" version="1.1" viewBox="0 0 586 616" width="586px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="617px" preserveAspectRatio="none" style="width:580px;height:617px;background:#FFFFFF;" version="1.1" viewBox="0 0 580 617" width="580px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f18ayqos9sdz4j" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f18ayqos9sdz4j)" points="22,24,57,24,64,46.2969,436,46.2969,436,604,22,604,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f18ayqos9sdz4j)" points="46,170,81,170,88,192.2969,412,192.2969,412,580,46,580,46,170" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="88" y1="192.2969" y2="192.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="50" y="184.9951">ns2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="108" y="59"/>
-      <ellipse cx="123" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M125.9688,80.6406 Q125.3906,80.9375 124.75,81.0781 Q124.1094,81.2344 123.4063,81.2344 Q120.9063,81.2344 119.5781,79.5938 Q118.2656,77.9375 118.2656,74.8125 Q118.2656,71.6875 119.5781,70.0313 Q120.9063,68.375 123.4063,68.375 Q124.1094,68.375 124.75,68.5313 Q125.4063,68.6875 125.9688,68.9844 L125.9688,71.7031 Q125.3438,71.125 124.75,70.8594 Q124.1563,70.5781 123.5313,70.5781 Q122.1875,70.5781 121.5,71.6563 Q120.8125,72.7188 120.8125,74.8125 Q120.8125,76.9063 121.5,77.9844 Q122.1875,79.0469 123.5313,79.0469 Q124.1563,79.0469 124.75,78.7813 Q125.3438,78.5 125.9688,77.9219 L125.9688,80.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="137" y="79.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="91" y2="91"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="99" y2="99"/>
+    <g id="cluster_C_0000685556094251433947">
+      <path d="M8.5,6.294 L34.5,6.294 A3.75,3.75 0 0 1 37,8.794 L44,29.0939 L429.5,29.0939 A2.5,2.5 0 0 1 432,31.5939 L432,607.594 A2.5,2.5 0 0 1 429.5,610.094 L8.5,610.094 A2.5,2.5 0 0 1 6,607.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="44" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="10" y="21.2999">ns1</text>
+    </g>
+    <g id="cluster_C_0001530587720836442927">
+      <path d="M32.5,152.294 L58.5,152.294 A3.75,3.75 0 0 1 61,154.794 L68,175.0939 L405.5,175.0939 A2.5,2.5 0 0 1 408,177.5939 L408,583.594 A2.5,2.5 0 0 1 405.5,586.094 L32.5,586.094 A2.5,2.5 0 0 1 30,583.594 L30,154.794 A2.5,2.5 0 0 1 32.5,152.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="68" y1="175.0939" y2="175.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="34" y="167.2999">ns2</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000619642232943663499">
+        <rect codeLine="11" fill="#F1F1F1" height="48" id="C_0000619642232943663499" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="94.5" y="41.294"/>
+        <ellipse cx="109.5" cy="57.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M104.5,58.4502 C104.5,60.9502 106.6406,62.7627 109.5625,62.7627 C110.7969,62.7627 111.9688,62.4659 112.7188,61.9502 C113.3281,61.5284 113.6563,61.1065 113.6563,60.7002 C113.6563,60.2315 113.2344,59.8252 112.7344,59.8252 C112.5,59.8252 112.2813,59.9034 112.0781,60.1065 C111.6406,60.544 111.6406,60.544 111.4688,60.6377 C111.0156,60.8721 110.375,61.0127 109.6094,61.0127 C107.6094,61.0127 106.3281,59.9971 106.3281,58.419 L106.3281,57.3721 C106.3281,55.669 107.5469,54.4659 109.25,54.4659 C109.8281,54.4659 110.4063,54.6065 110.875,54.8565 C111.3438,55.1221 111.5156,55.3096 111.5781,55.669 C111.7031,56.3409 111.9531,56.5909 112.4844,56.5909 C112.7656,56.5909 113.0469,56.4502 113.2344,56.2315 C113.3594,56.0596 113.4063,55.8877 113.4063,55.4502 L113.4063,54.0909 C113.4063,53.669 113.3906,53.5284 113.2656,53.3565 C113.0938,53.1065 112.8125,52.9502 112.4844,52.9502 C112.1719,52.9502 111.9688,53.0596 111.75,53.3252 C110.5781,52.8252 110.1406,52.7159 109.1875,52.7159 C106.5156,52.7159 104.5,54.7315 104.5,57.3565 L104.5,58.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="123.5" y="61.9">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="95.5" x2="134.5" y1="73.294" y2="73.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="95.5" x2="134.5" y1="81.294" y2="81.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="208" y="407"/>
-      <ellipse cx="223" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M225.9688,428.6406 Q225.3906,428.9375 224.75,429.0781 Q224.1094,429.2344 223.4063,429.2344 Q220.9063,429.2344 219.5781,427.5938 Q218.2656,425.9375 218.2656,422.8125 Q218.2656,419.6875 219.5781,418.0313 Q220.9063,416.375 223.4063,416.375 Q224.1094,416.375 224.75,416.5313 Q225.4063,416.6875 225.9688,416.9844 L225.9688,419.7031 Q225.3438,419.125 224.75,418.8594 Q224.1563,418.5781 223.5313,418.5781 Q222.1875,418.5781 221.5,419.6563 Q220.8125,420.7188 220.8125,422.8125 Q220.8125,424.9063 221.5,425.9844 Q222.1875,427.0469 223.5313,427.0469 Q224.1563,427.0469 224.75,426.7813 Q225.3438,426.5 225.9688,425.9219 L225.9688,428.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="237" y="427.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="439" y2="439"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="447" y2="447"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002207007194029669343">
+        <rect codeLine="16" fill="#F1F1F1" height="48" id="C_0002207007194029669343" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="198.5" y="413.094"/>
+        <ellipse cx="213.5" cy="429.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M208.5,430.2502 C208.5,432.7502 210.6406,434.5627 213.5625,434.5627 C214.7969,434.5627 215.9688,434.2659 216.7188,433.7502 C217.3281,433.3284 217.6563,432.9065 217.6563,432.5002 C217.6563,432.0315 217.2344,431.6252 216.7344,431.6252 C216.5,431.6252 216.2813,431.7034 216.0781,431.9065 C215.6406,432.344 215.6406,432.344 215.4688,432.4377 C215.0156,432.6721 214.375,432.8127 213.6094,432.8127 C211.6094,432.8127 210.3281,431.7971 210.3281,430.219 L210.3281,429.1721 C210.3281,427.469 211.5469,426.2659 213.25,426.2659 C213.8281,426.2659 214.4063,426.4065 214.875,426.6565 C215.3438,426.9221 215.5156,427.1096 215.5781,427.469 C215.7031,428.1409 215.9531,428.3909 216.4844,428.3909 C216.7656,428.3909 217.0469,428.2502 217.2344,428.0315 C217.3594,427.8596 217.4063,427.6877 217.4063,427.2502 L217.4063,425.8909 C217.4063,425.469 217.3906,425.3284 217.2656,425.1565 C217.0938,424.9065 216.8125,424.7502 216.4844,424.7502 C216.1719,424.7502 215.9688,424.8596 215.75,425.1252 C214.5781,424.6252 214.1406,424.5159 213.1875,424.5159 C210.5156,424.5159 208.5,426.5315 208.5,429.1565 L208.5,430.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="227.5" y="433.7">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="199.5" x2="238.5" y1="445.094" y2="445.094"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="199.5" x2="238.5" y1="453.094" y2="453.094"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="178" y="516"/>
-      <ellipse cx="193" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M195.9688,537.6406 Q195.3906,537.9375 194.75,538.0781 Q194.1094,538.2344 193.4063,538.2344 Q190.9063,538.2344 189.5781,536.5938 Q188.2656,534.9375 188.2656,531.8125 Q188.2656,528.6875 189.5781,527.0313 Q190.9063,525.375 193.4063,525.375 Q194.1094,525.375 194.75,525.5313 Q195.4063,525.6875 195.9688,525.9844 L195.9688,528.7031 Q195.3438,528.125 194.75,527.8594 Q194.1563,527.5781 193.5313,527.5781 Q192.1875,527.5781 191.5,528.6563 Q190.8125,529.7188 190.8125,531.8125 Q190.8125,533.9063 191.5,534.9844 Q192.1875,536.0469 193.5313,536.0469 Q194.1563,536.0469 194.75,535.7813 Q195.3438,535.5 195.9688,534.9219 L195.9688,537.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="536.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="548" y2="548"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="556" y2="556"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000204051985124373077">
+        <rect codeLine="20" fill="#F1F1F1" height="48" id="C_0000204051985124373077" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="153.5" y="522.094"/>
+        <ellipse cx="168.5" cy="538.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M163.5,539.2502 C163.5,541.7502 165.6406,543.5627 168.5625,543.5627 C169.7969,543.5627 170.9688,543.2659 171.7188,542.7502 C172.3281,542.3284 172.6563,541.9065 172.6563,541.5002 C172.6563,541.0315 172.2344,540.6252 171.7344,540.6252 C171.5,540.6252 171.2813,540.7034 171.0781,540.9065 C170.6406,541.344 170.6406,541.344 170.4688,541.4377 C170.0156,541.6721 169.375,541.8127 168.6094,541.8127 C166.6094,541.8127 165.3281,540.7971 165.3281,539.219 L165.3281,538.1721 C165.3281,536.469 166.5469,535.2659 168.25,535.2659 C168.8281,535.2659 169.4063,535.4065 169.875,535.6565 C170.3438,535.9221 170.5156,536.1096 170.5781,536.469 C170.7031,537.1409 170.9531,537.3909 171.4844,537.3909 C171.7656,537.3909 172.0469,537.2502 172.2344,537.0315 C172.3594,536.8596 172.4063,536.6877 172.4063,536.2502 L172.4063,534.8909 C172.4063,534.469 172.3906,534.3284 172.2656,534.1565 C172.0938,533.9065 171.8125,533.7502 171.4844,533.7502 C171.1719,533.7502 170.9688,533.8596 170.75,534.1252 C169.5781,533.6252 169.1406,533.5159 168.1875,533.5159 C165.5156,533.5159 163.5,535.5315 163.5,538.1565 L163.5,539.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="182.5" y="542.7">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="154.5" x2="193.5" y1="554.094" y2="554.094"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="154.5" x2="193.5" y1="562.094" y2="562.094"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="62" y="243.5"/>
-      <ellipse cx="77" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M79.9688,265.1406 Q79.3906,265.4375 78.75,265.5781 Q78.1094,265.7344 77.4063,265.7344 Q74.9063,265.7344 73.5781,264.0938 Q72.2656,262.4375 72.2656,259.3125 Q72.2656,256.1875 73.5781,254.5313 Q74.9063,252.875 77.4063,252.875 Q78.1094,252.875 78.75,253.0313 Q79.4063,253.1875 79.9688,253.4844 L79.9688,256.2031 Q79.3438,255.625 78.75,255.3594 Q78.1563,255.0781 77.5313,255.0781 Q76.1875,255.0781 75.5,256.1563 Q74.8125,257.2188 74.8125,259.3125 Q74.8125,261.4063 75.5,262.4844 Q76.1875,263.5469 77.5313,263.5469 Q78.1563,263.5469 78.75,263.2813 Q79.3438,263 79.9688,262.4219 L79.9688,265.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91" y="263.6543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="275.5" y2="275.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="283.5" y2="283.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001837009554564742531">
+        <rect codeLine="24" fill="#F1F1F1" height="48" id="C_0001837009554564742531" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="46" y="237.694"/>
+        <ellipse cx="61" cy="253.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M56,254.8502 C56,257.3502 58.1406,259.1627 61.0625,259.1627 C62.2969,259.1627 63.4688,258.8659 64.2188,258.3502 C64.8281,257.9284 65.1563,257.5065 65.1563,257.1002 C65.1563,256.6315 64.7344,256.2252 64.2344,256.2252 C64,256.2252 63.7813,256.3034 63.5781,256.5065 C63.1406,256.944 63.1406,256.944 62.9688,257.0377 C62.5156,257.2721 61.875,257.4127 61.1094,257.4127 C59.1094,257.4127 57.8281,256.3971 57.8281,254.819 L57.8281,253.7721 C57.8281,252.069 59.0469,250.8659 60.75,250.8659 C61.3281,250.8659 61.9063,251.0065 62.375,251.2565 C62.8438,251.5221 63.0156,251.7096 63.0781,252.069 C63.2031,252.7409 63.4531,252.9909 63.9844,252.9909 C64.2656,252.9909 64.5469,252.8502 64.7344,252.6315 C64.8594,252.4596 64.9063,252.2877 64.9063,251.8502 L64.9063,250.4909 C64.9063,250.069 64.8906,249.9284 64.7656,249.7565 C64.5938,249.5065 64.3125,249.3502 63.9844,249.3502 C63.6719,249.3502 63.4688,249.4596 63.25,249.7252 C62.0781,249.2252 61.6406,249.1159 60.6875,249.1159 C58.0156,249.1159 56,251.1315 56,253.7565 L56,254.8502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="75" y="258.3">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="47" x2="87" y1="269.694" y2="269.694"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="47" x2="87" y1="277.694" y2="277.694"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="253.5" y="516"/>
-      <ellipse cx="268.5" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M271.4688,537.6406 Q270.8906,537.9375 270.25,538.0781 Q269.6094,538.2344 268.9063,538.2344 Q266.4063,538.2344 265.0781,536.5938 Q263.7656,534.9375 263.7656,531.8125 Q263.7656,528.6875 265.0781,527.0313 Q266.4063,525.375 268.9063,525.375 Q269.6094,525.375 270.25,525.5313 Q270.9063,525.6875 271.4688,525.9844 L271.4688,528.7031 Q270.8438,528.125 270.25,527.8594 Q269.6563,527.5781 269.0313,527.5781 Q267.6875,527.5781 267,528.6563 Q266.3125,529.7188 266.3125,531.8125 Q266.3125,533.9063 267,534.9844 Q267.6875,536.0469 269.0313,536.0469 Q269.6563,536.0469 270.25,535.7813 Q270.8438,535.5 271.4688,534.9219 L271.4688,537.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="282.5" y="536.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="548" y2="548"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="556" y2="556"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0002029929560931799980">
+        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0002029929560931799980" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="229" y="522.094"/>
+        <ellipse cx="244" cy="538.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M239,539.2502 C239,541.7502 241.1406,543.5627 244.0625,543.5627 C245.2969,543.5627 246.4688,543.2659 247.2188,542.7502 C247.8281,542.3284 248.1563,541.9065 248.1563,541.5002 C248.1563,541.0315 247.7344,540.6252 247.2344,540.6252 C247,540.6252 246.7813,540.7034 246.5781,540.9065 C246.1406,541.344 246.1406,541.344 245.9688,541.4377 C245.5156,541.6721 244.875,541.8127 244.1094,541.8127 C242.1094,541.8127 240.8281,540.7971 240.8281,539.219 L240.8281,538.1721 C240.8281,536.469 242.0469,535.2659 243.75,535.2659 C244.3281,535.2659 244.9063,535.4065 245.375,535.6565 C245.8438,535.9221 246.0156,536.1096 246.0781,536.469 C246.2031,537.1409 246.4531,537.3909 246.9844,537.3909 C247.2656,537.3909 247.5469,537.2502 247.7344,537.0315 C247.8594,536.8596 247.9063,536.6877 247.9063,536.2502 L247.9063,534.8909 C247.9063,534.469 247.8906,534.3284 247.7656,534.1565 C247.5938,533.9065 247.3125,533.7502 246.9844,533.7502 C246.6719,533.7502 246.4688,533.8596 246.25,534.1252 C245.0781,533.6252 244.6406,533.5159 243.6875,533.5159 C241.0156,533.5159 239,535.5315 239,538.1565 L239,539.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="258" y="542.7">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="230" x2="270" y1="554.094" y2="554.094"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="230" x2="270" y1="562.094" y2="562.094"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="356" y="243.5"/>
-      <ellipse cx="371" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M373.9688,265.1406 Q373.3906,265.4375 372.75,265.5781 Q372.1094,265.7344 371.4063,265.7344 Q368.9063,265.7344 367.5781,264.0938 Q366.2656,262.4375 366.2656,259.3125 Q366.2656,256.1875 367.5781,254.5313 Q368.9063,252.875 371.4063,252.875 Q372.1094,252.875 372.75,253.0313 Q373.4063,253.1875 373.9688,253.4844 L373.9688,256.2031 Q373.3438,255.625 372.75,255.3594 Q372.1563,255.0781 371.5313,255.0781 Q370.1875,255.0781 369.5,256.1563 Q368.8125,257.2188 368.8125,259.3125 Q368.8125,261.4063 369.5,262.4844 Q370.1875,263.5469 371.5313,263.5469 Q372.1563,263.5469 372.75,263.2813 Q373.3438,263 373.9688,262.4219 L373.9688,265.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="385" y="263.6543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="275.5" y2="275.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="283.5" y2="283.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0002305358535757579772">
+        <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0002305358535757579772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="351.5" y="237.694"/>
+        <ellipse cx="366.5" cy="253.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M361.5,254.8502 C361.5,257.3502 363.6406,259.1627 366.5625,259.1627 C367.7969,259.1627 368.9688,258.8659 369.7188,258.3502 C370.3281,257.9284 370.6563,257.5065 370.6563,257.1002 C370.6563,256.6315 370.2344,256.2252 369.7344,256.2252 C369.5,256.2252 369.2813,256.3034 369.0781,256.5065 C368.6406,256.944 368.6406,256.944 368.4688,257.0377 C368.0156,257.2721 367.375,257.4127 366.6094,257.4127 C364.6094,257.4127 363.3281,256.3971 363.3281,254.819 L363.3281,253.7721 C363.3281,252.069 364.5469,250.8659 366.25,250.8659 C366.8281,250.8659 367.4063,251.0065 367.875,251.2565 C368.3438,251.5221 368.5156,251.7096 368.5781,252.069 C368.7031,252.7409 368.9531,252.9909 369.4844,252.9909 C369.7656,252.9909 370.0469,252.8502 370.2344,252.6315 C370.3594,252.4596 370.4063,252.2877 370.4063,251.8502 L370.4063,250.4909 C370.4063,250.069 370.3906,249.9284 370.2656,249.7565 C370.0938,249.5065 369.8125,249.3502 369.4844,249.3502 C369.1719,249.3502 368.9688,249.4596 368.75,249.7252 C367.5781,249.2252 367.1406,249.1159 366.1875,249.1159 C363.5156,249.1159 361.5,251.1315 361.5,253.7565 L361.5,254.8502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="380.5" y="258.3">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="352.5" x2="391.5" y1="269.694" y2="269.694"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="352.5" x2="391.5" y1="277.694" y2="277.694"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="137" y="205"/>
-      <ellipse cx="220.75" cy="221" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M223.7188,226.6406 Q223.1406,226.9375 222.5,227.0781 Q221.8594,227.2344 221.1563,227.2344 Q218.6563,227.2344 217.3281,225.5938 Q216.0156,223.9375 216.0156,220.8125 Q216.0156,217.6875 217.3281,216.0313 Q218.6563,214.375 221.1563,214.375 Q221.8594,214.375 222.5,214.5313 Q223.1563,214.6875 223.7188,214.9844 L223.7188,217.7031 Q223.0938,217.125 222.5,216.8594 Q221.9063,216.5781 221.2813,216.5781 Q219.9375,216.5781 219.25,217.6563 Q218.5625,218.7188 218.5625,220.8125 Q218.5625,222.9063 219.25,223.9844 Q219.9375,225.0469 221.2813,225.0469 Q221.9063,225.0469 222.5,224.7813 Q223.0938,224.5 223.7188,223.9219 L223.7188,226.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="241.25" y="225.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="237" y2="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000974430595320588991">
+        <rect codeLine="36" fill="#F1F1F1" height="148.7996" id="C_0000974430595320588991" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="193" x="123.5" y="187.294"/>
+        <ellipse cx="210.75" cy="203.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M205.75,204.4502 C205.75,206.9502 207.8906,208.7627 210.8125,208.7627 C212.0469,208.7627 213.2188,208.4659 213.9688,207.9502 C214.5781,207.5284 214.9063,207.1065 214.9063,206.7002 C214.9063,206.2315 214.4844,205.8252 213.9844,205.8252 C213.75,205.8252 213.5313,205.9034 213.3281,206.1065 C212.8906,206.544 212.8906,206.544 212.7188,206.6377 C212.2656,206.8721 211.625,207.0127 210.8594,207.0127 C208.8594,207.0127 207.5781,205.9971 207.5781,204.419 L207.5781,203.3721 C207.5781,201.669 208.7969,200.4659 210.5,200.4659 C211.0781,200.4659 211.6563,200.6065 212.125,200.8565 C212.5938,201.1221 212.7656,201.3096 212.8281,201.669 C212.9531,202.3409 213.2031,202.5909 213.7344,202.5909 C214.0156,202.5909 214.2969,202.4502 214.4844,202.2315 C214.6094,202.0596 214.6563,201.8877 214.6563,201.4502 L214.6563,200.0909 C214.6563,199.669 214.6406,199.5284 214.5156,199.3565 C214.3438,199.1065 214.0625,198.9502 213.7344,198.9502 C213.4219,198.9502 213.2188,199.0596 213,199.3252 C211.8281,198.8252 211.3906,198.7159 210.4375,198.7159 C207.7656,198.7159 205.75,200.7315 205.75,203.3565 L205.75,204.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="231.25" y="207.9">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="315.5" y1="219.294" y2="219.294"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="228.1939"/>
+          <ellipse cx="134.5" cy="233.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="143.5" y="236.2999">foo(AA &amp; aa) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="315.5" y1="244.0939" y2="244.0939"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="252.9939"/>
+          <ellipse cx="134.5" cy="257.9939" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="143.5" y="261.0999">a : A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="269.7938"/>
+          <ellipse cx="134.5" cy="274.7938" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="143.5" y="277.8998">i : std::vector&lt;std::uint8_t&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="286.5937"/>
+          <ellipse cx="134.5" cy="291.5937" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="143.5" y="294.6997">ns1_a : ns1::A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="303.3937"/>
+          <ellipse cx="134.5" cy="308.3937" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="143.5" y="311.4996">ns1_ns2_a : ns1::ns2::A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="320.1936"/>
+          <ellipse cx="134.5" cy="325.1936" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="143.5" y="328.2996">root_a : ::A *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="243"/>
-      <ellipse cx="148" cy="248" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000864916647665253425">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000864916647665253425" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="532.5" y="413.094"/>
+        <ellipse cx="547.5" cy="429.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M542.5,430.2502 C542.5,432.7502 544.6406,434.5627 547.5625,434.5627 C548.7969,434.5627 549.9688,434.2659 550.7188,433.7502 C551.3281,433.3284 551.6563,432.9065 551.6563,432.5002 C551.6563,432.0315 551.2344,431.6252 550.7344,431.6252 C550.5,431.6252 550.2813,431.7034 550.0781,431.9065 C549.6406,432.344 549.6406,432.344 549.4688,432.4377 C549.0156,432.6721 548.375,432.8127 547.6094,432.8127 C545.6094,432.8127 544.3281,431.7971 544.3281,430.219 L544.3281,429.1721 C544.3281,427.469 545.5469,426.2659 547.25,426.2659 C547.8281,426.2659 548.4063,426.4065 548.875,426.6565 C549.3438,426.9221 549.5156,427.1096 549.5781,427.469 C549.7031,428.1409 549.9531,428.3909 550.4844,428.3909 C550.7656,428.3909 551.0469,428.2502 551.2344,428.0315 C551.3594,427.8596 551.4063,427.6877 551.4063,427.2502 L551.4063,425.8909 C551.4063,425.469 551.3906,425.3284 551.2656,425.1565 C551.0938,424.9065 550.8125,424.7502 550.4844,424.7502 C550.1719,424.7502 549.9688,424.8596 549.75,425.1252 C548.5781,424.6252 548.1406,424.5159 547.1875,424.5159 C544.5156,424.5159 542.5,426.5315 542.5,429.1565 L542.5,430.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="561.5" y="433.7">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="533.5" x2="572.5" y1="445.094" y2="445.094"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="533.5" x2="572.5" y1="453.094" y2="453.094"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="157" y="251.2104">foo(AA &amp; aa) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <g id="elem_C_0000386872828559902182">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000386872828559902182" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="448" y="413.094"/>
+        <ellipse cx="463" cy="429.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M458,430.2502 C458,432.7502 460.1406,434.5627 463.0625,434.5627 C464.2969,434.5627 465.4688,434.2659 466.2188,433.7502 C466.8281,433.3284 467.1563,432.9065 467.1563,432.5002 C467.1563,432.0315 466.7344,431.6252 466.2344,431.6252 C466,431.6252 465.7813,431.7034 465.5781,431.9065 C465.1406,432.344 465.1406,432.344 464.9688,432.4377 C464.5156,432.6721 463.875,432.8127 463.1094,432.8127 C461.1094,432.8127 459.8281,431.7971 459.8281,430.219 L459.8281,429.1721 C459.8281,427.469 461.0469,426.2659 462.75,426.2659 C463.3281,426.2659 463.9063,426.4065 464.375,426.6565 C464.8438,426.9221 465.0156,427.1096 465.0781,427.469 C465.2031,428.1409 465.4531,428.3909 465.9844,428.3909 C466.2656,428.3909 466.5469,428.2502 466.7344,428.0315 C466.8594,427.8596 466.9063,427.6877 466.9063,427.2502 L466.9063,425.8909 C466.9063,425.469 466.8906,425.3284 466.7656,425.1565 C466.5938,424.9065 466.3125,424.7502 465.9844,424.7502 C465.6719,424.7502 465.4688,424.8596 465.25,425.1252 C464.0781,424.6252 463.6406,424.5159 462.6875,424.5159 C460.0156,424.5159 458,426.5315 458,429.1565 L458,430.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="477" y="433.7">AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="449" x2="497" y1="445.094" y2="445.094"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="449" x2="497" y1="453.094" y2="453.094"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="257.8047" y2="257.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="263.8047"/>
-      <ellipse cx="148" cy="268.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="157" y="272.0151">a : A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="276.6094"/>
-      <ellipse cx="148" cy="281.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="157" y="284.8198">i : std::vector&lt;std::uint8_t&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="289.4141"/>
-      <ellipse cx="148" cy="294.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="157" y="297.6245">ns1_a : ns1::A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="302.2188"/>
-      <ellipse cx="148" cy="307.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="157" y="310.4292">ns1_ns2_a : ns1::ns2::A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="315.0234"/>
-      <ellipse cx="148" cy="320.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="157" y="323.2339">root_a : ::A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="535" y="407"/>
-      <ellipse cx="550" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M552.9688,428.6406 Q552.3906,428.9375 551.75,429.0781 Q551.1094,429.2344 550.4063,429.2344 Q547.9063,429.2344 546.5781,427.5938 Q545.2656,425.9375 545.2656,422.8125 Q545.2656,419.6875 546.5781,418.0313 Q547.9063,416.375 550.4063,416.375 Q551.1094,416.375 551.75,416.5313 Q552.4063,416.6875 552.9688,416.9844 L552.9688,419.7031 Q552.3438,419.125 551.75,418.8594 Q551.1563,418.5781 550.5313,418.5781 Q549.1875,418.5781 548.5,419.6563 Q547.8125,420.7188 547.8125,422.8125 Q547.8125,424.9063 548.5,425.9844 Q549.1875,427.0469 550.5313,427.0469 Q551.1563,427.0469 551.75,426.7813 Q552.3438,426.5 552.9688,425.9219 L552.9688,428.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="564" y="427.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="439" y2="439"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="447" y2="447"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18ayqos9sdz4j)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="452" y="407"/>
-      <ellipse cx="467" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M469.9688,428.6406 Q469.3906,428.9375 468.75,429.0781 Q468.1094,429.2344 467.4063,429.2344 Q464.9063,429.2344 463.5781,427.5938 Q462.2656,425.9375 462.2656,422.8125 Q462.2656,419.6875 463.5781,418.0313 Q464.9063,416.375 467.4063,416.375 Q468.1094,416.375 468.75,416.5313 Q469.4063,416.6875 469.9688,416.9844 L469.9688,419.7031 Q469.3438,419.125 468.75,418.8594 Q468.1563,418.5781 467.5313,418.5781 Q466.1875,418.5781 465.5,419.6563 Q464.8125,420.7188 464.8125,422.8125 Q464.8125,424.9063 465.5,425.9844 Q466.1875,427.0469 467.5313,427.0469 Q468.1563,427.0469 468.75,426.7813 Q469.3438,426.5 469.9688,425.9219 L469.9688,428.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="481" y="427.1543">AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="453" x2="499" y1="439" y2="439"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="453" x2="499" y1="447" y2="447"/>
-    </a>
-    <path d="M216.06,474.59 C212.11,488.66 207.88,503.78 204.5,515.83 " fill="none" id="C_0002207007194029669343&lt;-C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="209.35,472.59,221.49,455.22,222.83,476.36,209.35,472.59" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M117.27,126.58 C108.09,162.98 95.24,213.97 87.85,243.29 " fill="none" id="C_0000619642232943663499&lt;-C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="110.5,124.8,122.17,107.11,124.07,128.22,110.5,124.8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M245.89,473.62 C252.06,487.96 258.74,503.5 264.04,515.83 " fill="none" id="C_0002207007194029669343&lt;-C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="239.45,476.36,237.98,455.22,252.31,470.83,239.45,476.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M547.01,387.2 C543.79,377.57 539.29,367.87 533,360 C496.19,313.9 429.38,286.33 396.05,274.81 " fill="none" id="C_0000864916647665253425&lt;-C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="553.87,385.76,552.09,406.88,540.31,389.26,553.87,385.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M321.32,328.87 C366.12,358.16 416.77,391.27 447.54,411.39 " fill="none" id="C_0000974430595320588991-&gt;C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="451.93,414.26,446.5749,405.9943,447.7414,411.5295,442.2061,412.6961,451.93,414.26" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M196.81,330.02 C192.37,345.32 190.63,361.72 195,377 C197.54,385.88 202.04,394.72 206.93,402.57 " fill="none" id="C_0000974430595320588991-&gt;C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="209.67,406.82,208.1679,397.0864,206.9662,402.6141,201.4385,401.4124,209.67,406.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="196" y="373.0669">+a</text>
-    <path d="M228.62,330.02 C228.47,354.73 228.3,381.99 228.17,401.8 " fill="none" id="C_0000974430595320588991-&gt;C_0002207007194029669343-1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="228.14,406.92,232.1914,397.943,228.1686,401.9201,224.1915,397.8973,228.14,406.92" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="235" cy="369.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="68" x="242" y="373.0669">ns1_ns2_a</text>
-    <path d="M194.87,204.83 C177.35,173.17 156.89,136.2 143.26,111.57 " fill="none" id="C_0000974430595320588991-&gt;C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="140.79,107.11,141.6642,116.92,143.2182,111.4808,148.6574,113.0348,140.79,107.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="173" 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="38" x="180" y="150.0669">ns1_a</text>
-    <path d="M321.06,320.88 C327.09,324.03 333.11,327.1 339,330 C416.68,368.29 441.23,366.92 518,407 C522.14,409.16 526.43,411.61 530.56,414.1 " fill="none" id="C_0000974430595320588991-&gt;C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="534.96,416.79,529.3839,408.6717,530.6993,414.1735,525.1975,415.4889,534.96,416.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="456" cy="369.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="41" x="463" y="373.0669">root_a</text>
+    <g id="link_C_0002207007194029669343_C_0000204051985124373077">
+      <path codeLine="47" d="M202.1441,478.1673 C194.6441,496.0073 191.35,503.844 183.85,521.664 " fill="none" id="C_0002207007194029669343-backto-C_0000204051985124373077" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="209.12,461.574,196.613,475.842,207.6752,480.4926,209.12,461.574" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000619642232943663499_C_0001837009554564742531">
+      <path codeLine="48" d="M104.896,107.2194 C95.646,144.6894 81.95,200.134 72.74,237.464 " fill="none" id="C_0000619642232943663499-backto-C_0001837009554564742531" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="109.21,89.744,99.0708,105.7814,110.7211,108.6574,109.21,89.744" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002207007194029669343_C_0002029929560931799980">
+      <path codeLine="49" d="M230.8102,478.8626 C235.9802,496.7026 238.05,503.844 243.21,521.664 " fill="none" id="C_0002207007194029669343-backto-C_0002029929560931799980" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="225.8,461.574,225.0473,480.5327,236.5731,477.1926,225.8,461.574" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000864916647665253425_C_0002305358535757579772">
+      <path codeLine="50" d="M546.252,395.1691 C543.312,380.5891 541.32,379.694 531,366.094 C493.97,317.314 426.81,284.834 392.86,270.714 " fill="none" id="C_0000864916647665253425-backto-C_0002305358535757579772" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="549.81,412.814,552.1336,393.9831,540.3704,396.3551,549.81,412.814" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0000386872828559902182">
+      <path codeLine="51" d="M316.73,328.994 C364.02,361.404 412.2513,394.4513 442.7813,415.3813 " fill="none" id="C_0000974430595320588991-to-C_0000386872828559902182" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="447.73,418.774,442.5686,410.3859,443.606,415.9468,438.0451,416.9842,447.73,418.774" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0002207007194029669343">
+      <path codeLine="52" d="M187.86,336.584 C184.68,351.964 183.93,368.064 188,383.094 C190.82,393.484 193.0579,398.8373 198.5879,407.6773 " fill="none" id="C_0000974430595320588991-to-C_0002207007194029669343" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="201.77,412.764,200.388,403.0126,199.1183,408.5251,193.6058,407.2553,201.77,412.764" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="189" y="379.171">+a</text>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0002207007194029669343">
+      <path codeLine="54" d="M219.57,336.484 C219.42,363.954 219.2867,387.1941 219.1667,406.8341 " fill="none" id="C_0000974430595320588991-to-C_0002207007194029669343-1" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="219.13,412.834,223.1849,403.8586,219.1605,407.8341,215.1851,403.8097,219.13,412.834" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="226" cy="375.394" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="233" y="379.171">ns1_ns2_a</text>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0000619642232943663499">
+      <path codeLine="53" d="M180.13,186.864 C161.51,152.404 143.5015,119.0531 130.5215,95.0231 " fill="none" id="C_0000974430595320588991-to-C_0000619642232943663499" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="127.67,89.744,128.4279,99.5636,130.0463,94.1432,135.4667,95.7616,127.67,89.744" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="158" cy="128.594" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="165" y="132.371">ns1_a</text>
+    </g>
+    <g id="link_C_0000974430595320588991_C_0000864916647665253425">
+      <path codeLine="55" d="M316.9,326.824 C322.63,330.064 328.35,333.184 334,336.094 C365.91,352.554 375.92,352.144 409,366.094 C456.49,386.114 469.31,389.264 515,413.094 C520.74,416.094 521.6748,416.4907 527.2348,419.8507 " fill="none" id="C_0000974430595320588991-to-C_0000864916647665253425" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="532.37,422.954,526.7361,414.8757,528.0907,420.3679,522.5984,421.7225,532.37,422.954" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="455" cy="375.394" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="462" y="379.171">root_a</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00046_class_mermaid.svg b/docs/test_cases/t00046_class_mermaid.svg
index c6735e8d..c3343e19 100644
--- a/docs/test_cases/t00046_class_mermaid.svg
+++ b/docs/test_cases/t00046_class_mermaid.svg
@@ -1,64 +1,69 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 611.66796875 437" style="max-width: 611.668px; background-color: white;" width="611.66796875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M95.25912675233644,322L89.30057437694704,326.1666666666667C83.34202200155762,330.3333333333333,71.42491725077882,338.6666666666667,65.4663648753894,347C59.5078125,355.3333333333333,59.5078125,363.6666666666667,59.5078125,367.8333333333333L59.5078125,372"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M400.03515625,322L400.03515625,326.1666666666667C400.03515625,330.3333333333333,400.03515625,338.6666666666667,400.03515625,347C400.03515625,355.3333333333333,400.03515625,363.6666666666667,400.03515625,367.8333333333333L400.03515625,372"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M176.77212324766356,322L182.73067562305297,326.1666666666667C188.68922799844236,330.3333333333333,200.6063327492212,338.6666666666667,206.56488512461058,347C212.5234375,355.3333333333333,212.5234375,363.6666666666667,212.5234375,367.8333333333333L212.5234375,372"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M552.60546875,322L552.60546875,326.1666666666667C552.60546875,330.3333333333333,552.60546875,338.6666666666667,552.60546875,347C552.60546875,355.3333333333333,552.60546875,363.6666666666667,552.60546875,367.8333333333333L552.60546875,372"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M298.58984375,197L298.58984375,202.66666666666666C298.58984375,208.33333333333334,298.58984375,219.66666666666666,298.58984375,231C298.58984375,242.33333333333334,298.58984375,253.66666666666666,298.58984375,259.3333333333333L298.58984375,265"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M192.58984375,170.93111704215403L177.08203125,180.94259753512836C161.57421875,190.95407802810269,130.55859375,210.97703901405134,118.35763541666667,226.65518617369233C106.15667708333335,242.33333333333334,112.77038541666667,253.66666666666666,116.07723958333334,259.3333333333333L119.38409375,265"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M373.1935949659533,197L377.66718851329443,202.66666666666666C382.1407820606355,208.33333333333334,391.08796915531775,219.66666666666666,395.5615627026589,231C400.03515625,242.33333333333334,400.03515625,253.66666666666666,400.03515625,259.3333333333333L400.03515625,265"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M230.7914944066148,197L226.72598492217898,202.66666666666666C222.6604754377432,208.33333333333334,214.5294564688716,219.66666666666666,204.08257198443576,231C193.6356875,242.33333333333334,180.8729375,253.66666666666666,174.4915625,259.3333333333333L168.1101875,265"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M404.58984375,156.1226856123516L429.2591145833333,168.602238010293C453.9283854166667,181.08179040823438,503.2669270833333,206.0408952041172,527.9361979166666,224.18711426872528C552.60546875,242.33333333333334,552.60546875,253.66666666666666,552.60546875,259.3333333333333L552.60546875,265"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M80.50792955961373,332.3151433039687L77.0079100496781,334.7626194199739C73.50789053974249,337.2100955359791,66.50785151987124,342.10504776798956,63.00783200993562,348.7191905506614C59.5078125,355.3333333333333,59.5078125,363.6666666666667,59.5078125,367.8333333333333L59.5078125,372"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M400.03515625,340L400.03515625,341.1666666666667C400.03515625,342.3333333333333,400.03515625,344.6666666666667,400.03515625,350C400.03515625,355.3333333333333,400.03515625,363.6666666666667,400.03515625,367.8333333333333L400.03515625,372"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M191.52332044038627,332.3151433039687L195.02333995032188,334.7626194199739C198.52335946025752,337.2100955359791,205.52339848012875,342.10504776798956,209.02341799006436,348.7191905506614C212.5234375,355.3333333333333,212.5234375,363.6666666666667,212.5234375,367.8333333333333L212.5234375,372"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M552.60546875,340L552.60546875,341.1666666666667C552.60546875,342.3333333333333,552.60546875,344.6666666666667,552.60546875,350C552.60546875,355.3333333333333,552.60546875,363.6666666666667,552.60546875,367.8333333333333L552.60546875,372"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M298.58984375,197L298.58984375,202.66666666666666C298.58984375,208.33333333333334,298.58984375,219.66666666666666,298.58984375,230C298.58984375,240.33333333333334,298.58984375,249.66666666666666,298.58984375,254.33333333333334L298.58984375,259"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M192.58984375,170.93111704215403L177.08203125,180.94259753512836C161.57421875,190.95407802810269,130.55859375,210.97703901405134,117.85361672047289,225.79149343093763C105.14863969094576,240.60594784782393,110.75431063189153,250.21189569564788,113.55714610236441,255.01486961955985L116.3599815728373,259.81784354347184"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M373.1935949659533,197L377.66718851329443,202.66666666666666C382.1407820606355,208.33333333333334,391.08796915531775,219.66666666666666,395.5615627026589,230C400.03515625,240.33333333333334,400.03515625,249.66666666666666,400.03515625,254.33333333333334L400.03515625,259"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M230.7914944066148,197L226.72598492217898,202.66666666666666C222.6604754377432,208.33333333333334,214.5294564688716,219.66666666666666,204.83031091786833,230.3360071631191C195.13116536686508,241.0053476595715,183.86389323373012,251.01069531914297,178.23025716716268,256.0133691489287L172.5966211005952,261.01604297871444"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M404.58984375,156.1226856123516L429.2591145833333,168.602238010293C453.9283854166667,181.08179040823438,503.2669270833333,206.0408952041172,527.9361979166666,223.18711426872528C552.60546875,240.33333333333334,552.60546875,249.66666666666666,552.60546875,254.33333333333334L552.60546875,259"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -154,7 +159,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L4">
+        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L4">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -173,7 +178,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L6">
+        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L6">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -192,7 +197,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L10">
+        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L10">
           <g title="A" id="classId-C_0000619642232943663499-2" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -211,7 +216,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L14">
+        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L14">
           <g title="A" id="classId-C_0002207007194029669343-3" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -230,7 +235,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L16">
+        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L16">
           <g title="B" id="classId-C_0000204051985124373077-4" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -249,7 +254,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L18">
+        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L18">
           <g title="C" id="classId-C_0001837009554564742531-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -268,7 +273,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L20">
+        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L20">
           <g title="D" id="classId-C_0002029929560931799980-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -287,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L22">
+        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L22">
           <g title="E" id="classId-C_0002305358535757579772-7" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -306,7 +311,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00046/t00046.cc#L24">
+        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L24">
           <g title="R" id="classId-C_0000974430595320588991-8" class="node default clickable">
             <rect height="189" width="212" y="-94.5" x="-106" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="106" x1="-106" class="divider"/>
@@ -324,7 +329,7 @@
               </foreignObject>
               <foreignObject transform="translate( -98.5, -53)" height="18" width="41.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+a : A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+a : A</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -98.5, -31)" height="18" width="197">
@@ -334,22 +339,22 @@
               </foreignObject>
               <foreignObject transform="translate( -98.5, -9)" height="18" width="111.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ns1_a : ns1::A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+ns1_a : ns1::A</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -98.5, 13)" height="18" width="181.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ns1_ns2_a : ns1::ns2::A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+ns1_ns2_a : ns1::ns2::A</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -98.5, 35)" height="18" width="87.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+root_a : ::A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+root_a : ::A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -98.5, 69)" height="18" width="142.75">
+              <foreignObject transform="translate( -98.5, 69)" height="18" width="151.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo(AA &amp; aa) : void</span>
+                  <span class="nodeLabel">+foo(AA &amp; aa) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00047.md b/docs/test_cases/t00047.md
index f8f5093b..ebd9bebd 100644
--- a/docs/test_cases/t00047.md
+++ b/docs/test_cases/t00047.md
@@ -12,7 +12,7 @@ diagrams:
         - clanguml::t00047
 ```
 ## Source code
-File t00047.cc
+File `tests/t00047/t00047.cc`
 ```cpp
 #include <type_traits>
 
diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg
index b2906ed0..395a2e62 100644
--- a/docs/test_cases/t00047_class.svg
+++ b/docs/test_cases/t00047_class.svg
@@ -1,59 +1,67 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:799px;height:175px;" version="1.1" viewBox="0 0 799 175" width="799px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="173px" preserveAspectRatio="none" style="width:751px;height:173px;background:#FFFFFF;" version="1.1" viewBox="0 0 751 173" width="751px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fi91kglh0k9la" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi91kglh0k9la)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="8"/>
-      <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="35" y="28.1543">conditional_t</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="123" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="124" y="17.1387">Else</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <g id="elem_C_0000047394280824625133">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000047394280824625133" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="7" y="10"/>
+        <ellipse cx="22" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,27.1563 C17,29.6563 19.1406,31.4688 22.0625,31.4688 C23.2969,31.4688 24.4688,31.1719 25.2188,30.6563 C25.8281,30.2344 26.1563,29.8125 26.1563,29.4063 C26.1563,28.9375 25.7344,28.5313 25.2344,28.5313 C25,28.5313 24.7813,28.6094 24.5781,28.8125 C24.1406,29.25 24.1406,29.25 23.9688,29.3438 C23.5156,29.5781 22.875,29.7188 22.1094,29.7188 C20.1094,29.7188 18.8281,28.7031 18.8281,27.125 L18.8281,26.0781 C18.8281,24.375 20.0469,23.1719 21.75,23.1719 C22.3281,23.1719 22.9063,23.3125 23.375,23.5625 C23.8438,23.8281 24.0156,24.0156 24.0781,24.375 C24.2031,25.0469 24.4531,25.2969 24.9844,25.2969 C25.2656,25.2969 25.5469,25.1563 25.7344,24.9375 C25.8594,24.7656 25.9063,24.5938 25.9063,24.1563 L25.9063,22.7969 C25.9063,22.375 25.8906,22.2344 25.7656,22.0625 C25.5938,21.8125 25.3125,21.6563 24.9844,21.6563 C24.6719,21.6563 24.4688,21.7656 24.25,22.0313 C23.0781,21.5313 22.6406,21.4219 21.6875,21.4219 C19.0156,21.4219 17,23.4375 17,26.0625 L17,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="36" y="30.606">conditional_t</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="26" x="124" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="24" x="125" y="21.2001">Else</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="146" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="146" y1="50" y2="50"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi91kglh0k9la)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="8"/>
-      <ellipse cx="197.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M200.4688,29.6406 Q199.8906,29.9375 199.25,30.0781 Q198.6094,30.2344 197.9063,30.2344 Q195.4063,30.2344 194.0781,28.5938 Q192.7656,26.9375 192.7656,23.8125 Q192.7656,20.6875 194.0781,19.0313 Q195.4063,17.375 197.9063,17.375 Q198.6094,17.375 199.25,17.5313 Q199.9063,17.6875 200.4688,17.9844 L200.4688,20.7031 Q199.8438,20.125 199.25,19.8594 Q198.6563,19.5781 198.0313,19.5781 Q196.6875,19.5781 196,20.6563 Q195.3125,21.7188 195.3125,23.8125 Q195.3125,25.9063 196,26.9844 Q196.6875,28.0469 198.0313,28.0469 Q198.6563,28.0469 199.25,27.7813 Q199.8438,27.5 200.4688,26.9219 L200.4688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="211.5" y="28.1543">conditional_t</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="168" x="299.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="166" x="300.5" y="17.1387">std::true_type,Result,Tail...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <g id="elem_C_0000599782159389775809">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000599782159389775809" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="259" x="181.5" y="10"/>
+        <ellipse cx="196.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M191.5,27.1563 C191.5,29.6563 193.6406,31.4688 196.5625,31.4688 C197.7969,31.4688 198.9688,31.1719 199.7188,30.6563 C200.3281,30.2344 200.6563,29.8125 200.6563,29.4063 C200.6563,28.9375 200.2344,28.5313 199.7344,28.5313 C199.5,28.5313 199.2813,28.6094 199.0781,28.8125 C198.6406,29.25 198.6406,29.25 198.4688,29.3438 C198.0156,29.5781 197.375,29.7188 196.6094,29.7188 C194.6094,29.7188 193.3281,28.7031 193.3281,27.125 L193.3281,26.0781 C193.3281,24.375 194.5469,23.1719 196.25,23.1719 C196.8281,23.1719 197.4063,23.3125 197.875,23.5625 C198.3438,23.8281 198.5156,24.0156 198.5781,24.375 C198.7031,25.0469 198.9531,25.2969 199.4844,25.2969 C199.7656,25.2969 200.0469,25.1563 200.2344,24.9375 C200.3594,24.7656 200.4063,24.5938 200.4063,24.1563 L200.4063,22.7969 C200.4063,22.375 200.3906,22.2344 200.2656,22.0625 C200.0938,21.8125 199.8125,21.6563 199.4844,21.6563 C199.1719,21.6563 198.9688,21.7656 198.75,22.0313 C197.5781,21.5313 197.1406,21.4219 196.1875,21.4219 C193.5156,21.4219 191.5,23.4375 191.5,26.0625 L191.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="210.5" y="30.606">conditional_t</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="145" x="298.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="143" x="299.5" y="21.2001">std::true_type,Result,Tail...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="182.5" x2="439.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="182.5" x2="439.5" y1="50" y2="50"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi91kglh0k9la)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="8"/>
-      <ellipse cx="515" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M517.9688,29.6406 Q517.3906,29.9375 516.75,30.0781 Q516.1094,30.2344 515.4063,30.2344 Q512.9063,30.2344 511.5781,28.5938 Q510.2656,26.9375 510.2656,23.8125 Q510.2656,20.6875 511.5781,19.0313 Q512.9063,17.375 515.4063,17.375 Q516.1094,17.375 516.75,17.5313 Q517.4063,17.6875 517.9688,17.9844 L517.9688,20.7031 Q517.3438,20.125 516.75,19.8594 Q516.1563,19.5781 515.5313,19.5781 Q514.1875,19.5781 513.5,20.6563 Q512.8125,21.7188 512.8125,23.8125 Q512.8125,25.9063 513.5,26.9844 Q514.1875,28.0469 515.5313,28.0469 Q516.1563,28.0469 516.75,27.7813 Q517.3438,27.5 517.9688,26.9219 L517.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="529" y="28.1543">conditional_t</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="171" x="617" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="618" y="17.1387">std::false_type,Result,Tail...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <g id="elem_C_0000824938194184364511">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000824938194184364511" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="264" x="476" y="10"/>
+        <ellipse cx="491" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M486,27.1563 C486,29.6563 488.1406,31.4688 491.0625,31.4688 C492.2969,31.4688 493.4688,31.1719 494.2188,30.6563 C494.8281,30.2344 495.1563,29.8125 495.1563,29.4063 C495.1563,28.9375 494.7344,28.5313 494.2344,28.5313 C494,28.5313 493.7813,28.6094 493.5781,28.8125 C493.1406,29.25 493.1406,29.25 492.9688,29.3438 C492.5156,29.5781 491.875,29.7188 491.1094,29.7188 C489.1094,29.7188 487.8281,28.7031 487.8281,27.125 L487.8281,26.0781 C487.8281,24.375 489.0469,23.1719 490.75,23.1719 C491.3281,23.1719 491.9063,23.3125 492.375,23.5625 C492.8438,23.8281 493.0156,24.0156 493.0781,24.375 C493.2031,25.0469 493.4531,25.2969 493.9844,25.2969 C494.2656,25.2969 494.5469,25.1563 494.7344,24.9375 C494.8594,24.7656 494.9063,24.5938 494.9063,24.1563 L494.9063,22.7969 C494.9063,22.375 494.8906,22.2344 494.7656,22.0625 C494.5938,21.8125 494.3125,21.6563 493.9844,21.6563 C493.6719,21.6563 493.4688,21.7656 493.25,22.0313 C492.0781,21.5313 491.6406,21.4219 490.6875,21.4219 C488.0156,21.4219 486,23.4375 486,26.0625 L486,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="505" y="30.606">conditional_t</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="150" x="593" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="148" x="594" y="21.2001">std::false_type,Result,Tail...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="477" x2="739" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="477" x2="739" y1="50" y2="50"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi91kglh0k9la)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="116"/>
-      <ellipse cx="268" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M270.9688,137.6406 Q270.3906,137.9375 269.75,138.0781 Q269.1094,138.2344 268.4063,138.2344 Q265.9063,138.2344 264.5781,136.5938 Q263.2656,134.9375 263.2656,131.8125 Q263.2656,128.6875 264.5781,127.0313 Q265.9063,125.375 268.4063,125.375 Q269.1094,125.375 269.75,125.5313 Q270.4063,125.6875 270.9688,125.9844 L270.9688,128.7031 Q270.3438,128.125 269.75,127.8594 Q269.1563,127.5781 268.5313,127.5781 Q267.1875,127.5781 266.5,128.6563 Q265.8125,129.7188 265.8125,131.8125 Q265.8125,133.9063 266.5,134.9844 Q267.1875,136.0469 268.5313,136.0469 Q269.1563,136.0469 269.75,135.7813 Q270.3438,135.5 270.9688,134.9219 L270.9688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="282" y="136.1543">conditional_t</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="370" y="113"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="371" y="125.1387">Ts...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="393" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="393" y1="156" y2="156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <g id="elem_C_0001673692992642087414">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001673692992642087414" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="242" y="118"/>
+        <ellipse cx="257" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M252,135.1563 C252,137.6563 254.1406,139.4688 257.0625,139.4688 C258.2969,139.4688 259.4688,139.1719 260.2188,138.6563 C260.8281,138.2344 261.1563,137.8125 261.1563,137.4063 C261.1563,136.9375 260.7344,136.5313 260.2344,136.5313 C260,136.5313 259.7813,136.6094 259.5781,136.8125 C259.1406,137.25 259.1406,137.25 258.9688,137.3438 C258.5156,137.5781 257.875,137.7188 257.1094,137.7188 C255.1094,137.7188 253.8281,136.7031 253.8281,135.125 L253.8281,134.0781 C253.8281,132.375 255.0469,131.1719 256.75,131.1719 C257.3281,131.1719 257.9063,131.3125 258.375,131.5625 C258.8438,131.8281 259.0156,132.0156 259.0781,132.375 C259.2031,133.0469 259.4531,133.2969 259.9844,133.2969 C260.2656,133.2969 260.5469,133.1563 260.7344,132.9375 C260.8594,132.7656 260.9063,132.5938 260.9063,132.1563 L260.9063,130.7969 C260.9063,130.375 260.8906,130.2344 260.7656,130.0625 C260.5938,129.8125 260.3125,129.6563 259.9844,129.6563 C259.6719,129.6563 259.4688,129.7656 259.25,130.0313 C258.0781,129.5313 257.6406,129.4219 256.6875,129.4219 C254.0156,129.4219 252,131.4375 252,134.0625 L252,135.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="271" y="138.606">conditional_t</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="24" x="359" y="115"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="22" x="360" y="129.2001">Ts...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="243" x2="379" y1="150" y2="150"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="243" x2="379" y1="158" y2="158"/>
+      </g>
     </a>
-    <path d="M130.1,56 C165.5,71.19 212.32,91.29 251.04,107.9 " fill="none" id="C_0000047394280824625133-&gt;C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="253.96,101.54,269.58,115.86,248.44,114.41,253.96,101.54" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M323.5,56 C323.5,67.59 323.5,82.03 323.5,95.6 " fill="none" id="C_0000599782159389775809-&gt;C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="330.5,95.68,323.5,115.68,316.5,95.68,330.5,95.68" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M573.28,56 C526.02,71.7 462.99,92.65 412.08,109.57 " fill="none" id="C_0000824938194184364511-&gt;C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="414.05,116.29,392.86,115.95,409.63,103,414.05,116.29" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000047394280824625133_C_0001673692992642087414">
+      <path codeLine="17" d="M128.64,58.39 C167.54,76.01 204.2349,92.6303 243.0949,110.2403 " fill="none" id="C_0000047394280824625133-to-C_0001673692992642087414" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="259.49,117.67,245.5715,104.7753,240.6183,115.7053,259.49,117.67" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000599782159389775809_C_0001673692992642087414">
+      <path codeLine="18" d="M311,58.26 C311,75.94 311,82.13 311,99.79 " fill="none" id="C_0000599782159389775809-to-C_0001673692992642087414" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="311,117.79,317,99.79,305,99.79,311,117.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000824938194184364511_C_0001673692992642087414">
+      <path codeLine="19" d="M542.45,58.39 C493.17,75.98 442.8936,93.9323 393.5836,111.5223 " fill="none" id="C_0000824938194184364511-to-C_0001673692992642087414" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="376.63,117.57,395.5995,117.1735,391.5677,105.8711,376.63,117.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00047_class_mermaid.svg b/docs/test_cases/t00047_class_mermaid.svg
index a13c7f79..7e1b9ee2 100644
--- a/docs/test_cases/t00047_class_mermaid.svg
+++ b/docs/test_cases/t00047_class_mermaid.svg
@@ -1,58 +1,63 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 963.25 180" style="max-width: 963.25px; background-color: white;" width="963.25" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M91.078125,65L91.078125,69.16666666666667C91.078125,73.33333333333333,91.078125,81.66666666666667,127.70442708333333,92.32630277770586C164.33072916666666,102.98593888874507,237.58333333333334,115.97187777749014,274.2096354166667,122.46484722186267L310.8359375,128.9578166662352"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M392.8671875,65L392.8671875,69.16666666666667C392.8671875,73.33333333333333,392.8671875,81.66666666666667,392.8671875,90C392.8671875,98.33333333333333,392.8671875,106.66666666666667,392.8671875,110.83333333333333L392.8671875,115"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M783.4140625,65L783.4140625,69.16666666666667C783.4140625,73.33333333333333,783.4140625,81.66666666666667,731.9947916666666,92.87712542508501C680.5755208333334,104.08758418350335,577.7369791666666,118.17516836700673,526.3177083333334,125.21896045875842L474.8984375,132.2627525505101"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M91.078125,65L91.078125,69.16666666666667C91.078125,73.33333333333333,91.078125,81.66666666666667,124.75048454704893,91.80263924801379C158.42284409409783,101.93861182936088,225.76756318819568,113.87722365872177,259.4399227352446,119.84652957340222L293.1122822822935,125.81583548808267"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M392.8671875,65L392.8671875,69.16666666666667C392.8671875,73.33333333333333,392.8671875,81.66666666666667,392.8671875,87C392.8671875,92.33333333333333,392.8671875,94.66666666666667,392.8671875,95.83333333333333L392.8671875,97"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M783.4140625,65L783.4140625,69.16666666666667C783.4140625,73.33333333333333,783.4140625,81.66666666666667,734.9670334148813,92.4699657633172C686.5200043297623,103.27326485996775,589.6259461595246,116.54652971993549,541.1789170744057,123.18316214991937L492.7318879892869,129.81979457990323"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -90,7 +95,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L8">
+        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L8">
           <g title="conditional_t" id="classId-C_0000047394280824625133-0" class="node default clickable">
             <rect height="57" width="166.15625" y="-28.5" x="-83.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.078125" x1="-83.078125" class="divider"/>
@@ -109,7 +114,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L13">
+        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L13">
           <g title="conditional_t" id="classId-C_0000599782159389775809-1" class="node default clickable">
             <rect height="57" width="337.421875" y="-28.5" x="-168.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="168.7109375" x1="-168.7109375" class="divider"/>
@@ -128,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L18">
+        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L18">
           <g title="conditional_t" id="classId-C_0000824938194184364511-2" class="node default clickable">
             <rect height="57" width="343.671875" y="-28.5" x="-171.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="171.8359375" x1="-171.8359375" class="divider"/>
@@ -147,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00047/t00047.cc#L6">
+        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L6">
           <g title="conditional_t" id="classId-C_0001673692992642087414-3" class="node default clickable">
             <rect height="57" width="164.0625" y="-28.5" x="-82.03125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.03125" x1="-82.03125" class="divider"/>
diff --git a/docs/test_cases/t00048.md b/docs/test_cases/t00048.md
index 070fa091..272187f4 100644
--- a/docs/test_cases/t00048.md
+++ b/docs/test_cases/t00048.md
@@ -14,7 +14,29 @@ diagrams:
         - clanguml::t00048
 ```
 ## Source code
-File b_t00048.h
+File `tests/t00048/t00048.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t00048 {
+
+struct Base {
+    int base;
+
+    virtual void foo() = 0;
+};
+
+template <typename T> struct BaseTemplate {
+    T base;
+
+    virtual void foo() = 0;
+};
+
+}
+}
+```
+File `tests/t00048/b_t00048.h`
 ```cpp
 #include "t00048.h"
 
@@ -38,19 +60,19 @@ template <typename T> struct BTemplate : public BaseTemplate<T> {
 }
 }
 ```
-File b_t00048.cc
+File `tests/t00048/a_t00048.cc`
 ```cpp
-#include "b_t00048.h"
+#include "a_t00048.h"
 
 namespace clanguml {
 namespace t00048 {
 
-void B::foo() { }
+void A::foo() { }
 
 }
 }
 ```
-File t00048.cc
+File `tests/t00048/t00048.cc`
 ```cpp
 #include "t00048.h"
 
@@ -59,7 +81,7 @@ namespace t00048 {
 }
 }
 ```
-File a_t00048.h
+File `tests/t00048/a_t00048.h`
 ```cpp
 #include "t00048.h"
 
@@ -83,36 +105,14 @@ template <typename T> struct ATemplate : public BaseTemplate<T> {
 }
 }
 ```
-File a_t00048.cc
+File `tests/t00048/b_t00048.cc`
 ```cpp
-#include "a_t00048.h"
+#include "b_t00048.h"
 
 namespace clanguml {
 namespace t00048 {
 
-void A::foo() { }
-
-}
-}
-```
-File t00048.h
-```cpp
-#pragma once
-
-namespace clanguml {
-namespace t00048 {
-
-struct Base {
-    int base;
-
-    virtual void foo() = 0;
-};
-
-template <typename T> struct BaseTemplate {
-    T base;
-
-    virtual void foo() = 0;
-};
+void B::foo() { }
 
 }
 }
@@ -157,6 +157,7 @@ template <typename T> struct BaseTemplate {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -218,6 +219,7 @@ template <typename T> struct BaseTemplate {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -293,6 +295,7 @@ template <typename T> struct BaseTemplate {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -361,6 +364,7 @@ template <typename T> struct BaseTemplate {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -436,6 +440,7 @@ template <typename T> struct BaseTemplate {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -504,6 +509,7 @@ template <typename T> struct BaseTemplate {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg
index a03cfad9..92d66697 100644
--- a/docs/test_cases/t00048_class.svg
+++ b/docs/test_cases/t00048_class.svg
@@ -1,159 +1,173 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:529px;height:226px;" version="1.1" viewBox="0 0 529 226" width="529px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="242px" preserveAspectRatio="none" style="width:547px;height:242px;background:#FFFFFF;" version="1.1" viewBox="0 0 547 242" width="547px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1l1y42ojez3mb" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l1y42ojez3mb)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
-      <ellipse cx="119" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M119.1094,19.3438 L117.9531,24.4219 L120.2813,24.4219 L119.1094,19.3438 Z M117.625,17.1094 L120.6094,17.1094 L123.9688,29.5 L121.5156,29.5 L120.75,26.4375 L117.4688,26.4375 L116.7188,29.5 L114.2813,29.5 L117.625,17.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="138" y="28.1543">Base</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <g id="elem_C_0000010200626899013233">
+        <rect codeLine="2" fill="#F1F1F1" height="83.6998" id="C_0000010200626899013233" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="89" y="10"/>
+        <ellipse cx="128.3" cy="26" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M129.8313,27.9375 L130.1594,28.7344 L129.8781,28.7344 C129.425,28.7344 129.3,28.7656 129.1281,28.875 C128.8469,29.0156 128.675,29.3125 128.675,29.6094 C128.675,29.9063 128.8156,30.1563 129.05,30.3281 C129.2219,30.4531 129.4563,30.5 129.8781,30.5 L132.2375,30.5 C132.5969,30.5 132.8469,30.4688 132.9875,30.375 C133.2531,30.2344 133.425,29.9219 133.425,29.6094 C133.425,29.3438 133.2844,29.0781 133.05,28.9063 C132.8625,28.7813 132.7063,28.75 132.2531,28.7344 L128.8625,20.9063 L125.1438,20.9063 C124.6906,20.9063 124.55,20.9219 124.3781,21.0313 C124.1125,21.2031 123.9406,21.4844 123.9406,21.7813 C123.9406,22.0625 124.0813,22.3281 124.3313,22.5 C124.5031,22.625 124.6906,22.6563 125.1438,22.6563 L126.1125,22.6563 L123.5344,28.7344 C122.7844,28.7344 122.3781,29.0313 122.3781,29.6094 C122.3781,30.2188 122.7688,30.5 123.5656,30.5 L125.8313,30.5 C126.1906,30.5 126.4406,30.4688 126.5813,30.375 C126.8469,30.2188 127.0188,29.9219 127.0188,29.6094 C127.0188,29.3438 126.8781,29.0781 126.6438,28.9063 C126.4563,28.7656 126.3,28.7344 125.8313,28.7344 L125.5344,28.7344 L125.8781,27.9375 L129.8313,27.9375 Z M129.0656,26.1875 L126.6125,26.1875 L127.8469,23.3125 L129.0656,26.1875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="32" x="147.7" y="31.95">Base</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="90" x2="206" y1="42" y2="42"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="95" y="51.95"/>
+          <ellipse cx="100" cy="56.95" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="109" y="61.3999">foo() = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="90" x2="206" y1="68.8999" y2="68.8999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="95" y="77.7999"/>
+          <ellipse cx="100" cy="82.7999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="109" y="85.9059">base : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="46"/>
-      <ellipse cx="92.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
+      <g id="elem_C_0000630197772543569536">
+        <rect codeLine="8" fill="#F1F1F1" height="83.6998" id="C_0000630197772543569536" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="300.5" y="10"/>
+        <ellipse cx="315.5" cy="26" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M317.0313,27.9375 L317.3594,28.7344 L317.0781,28.7344 C316.625,28.7344 316.5,28.7656 316.3281,28.875 C316.0469,29.0156 315.875,29.3125 315.875,29.6094 C315.875,29.9063 316.0156,30.1563 316.25,30.3281 C316.4219,30.4531 316.6563,30.5 317.0781,30.5 L319.4375,30.5 C319.7969,30.5 320.0469,30.4688 320.1875,30.375 C320.4531,30.2344 320.625,29.9219 320.625,29.6094 C320.625,29.3438 320.4844,29.0781 320.25,28.9063 C320.0625,28.7813 319.9063,28.75 319.4531,28.7344 L316.0625,20.9063 L312.3438,20.9063 C311.8906,20.9063 311.75,20.9219 311.5781,21.0313 C311.3125,21.2031 311.1406,21.4844 311.1406,21.7813 C311.1406,22.0625 311.2813,22.3281 311.5313,22.5 C311.7031,22.625 311.8906,22.6563 312.3438,22.6563 L313.3125,22.6563 L310.7344,28.7344 C309.9844,28.7344 309.5781,29.0313 309.5781,29.6094 C309.5781,30.2188 309.9688,30.5 310.7656,30.5 L313.0313,30.5 C313.3906,30.5 313.6406,30.4688 313.7813,30.375 C314.0469,30.2188 314.2188,29.9219 314.2188,29.6094 C314.2188,29.3438 314.0781,29.0781 313.8438,28.9063 C313.6563,28.7656 313.5,28.7344 313.0313,28.7344 L312.7344,28.7344 L313.0781,27.9375 L317.0313,27.9375 Z M316.2656,26.1875 L313.8125,26.1875 L315.0469,23.3125 L316.2656,26.1875 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="329.5" y="31.95">BaseTemplate</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="429.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="430.5" y="21.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="301.5" x2="434.5" y1="42" y2="42"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="306.5" y="51.95"/>
+          <ellipse cx="311.5" cy="56.95" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="320.5" y="61.3999">foo() = 0 : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="301.5" x2="434.5" y1="68.8999" y2="68.8999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="306.5" y="77.7999"/>
+          <ellipse cx="311.5" cy="82.7999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="320.5" y="85.9059">base : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="101.5" y="54.2104">foo() = 0 : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000059336049758992190">
+        <rect codeLine="14" fill="#F1F1F1" height="81.5999" id="C_0000059336049758992190" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="7" y="153.7"/>
+        <ellipse cx="45.85" cy="169.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M40.85,170.8563 C40.85,173.3563 42.9906,175.1688 45.9125,175.1688 C47.1469,175.1688 48.3188,174.8719 49.0688,174.3563 C49.6781,173.9344 50.0063,173.5125 50.0063,173.1063 C50.0063,172.6375 49.5844,172.2313 49.0844,172.2313 C48.85,172.2313 48.6313,172.3094 48.4281,172.5125 C47.9906,172.95 47.9906,172.95 47.8188,173.0438 C47.3656,173.2781 46.725,173.4188 45.9594,173.4188 C43.9594,173.4188 42.6781,172.4031 42.6781,170.825 L42.6781,169.7781 C42.6781,168.075 43.8969,166.8719 45.6,166.8719 C46.1781,166.8719 46.7563,167.0125 47.225,167.2625 C47.6938,167.5281 47.8656,167.7156 47.9281,168.075 C48.0531,168.7469 48.3031,168.9969 48.8344,168.9969 C49.1156,168.9969 49.3969,168.8563 49.5844,168.6375 C49.7094,168.4656 49.7563,168.2938 49.7563,167.8563 L49.7563,166.4969 C49.7563,166.075 49.7406,165.9344 49.6156,165.7625 C49.4438,165.5125 49.1625,165.3563 48.8344,165.3563 C48.5219,165.3563 48.3188,165.4656 48.1,165.7313 C46.9281,165.2313 46.4906,165.1219 45.5375,165.1219 C42.8656,165.1219 40.85,167.1375 40.85,169.7625 L40.85,170.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="65.15" y="174.306">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="185.7" y2="185.7"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="194.6"/>
+          <ellipse cx="18" cy="199.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="202.7059">foo() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="210.4999" y2="210.4999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="219.3999"/>
+          <ellipse cx="18" cy="224.3999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="27" y="227.5059">b : int</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="66.8047"/>
-      <ellipse cx="92.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
+      <g id="elem_C_0001635850649347735305">
+        <rect codeLine="20" fill="#F1F1F1" height="81.5999" id="C_0001635850649347735305" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="277" y="153.7"/>
+        <ellipse cx="292" cy="169.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M287,170.8563 C287,173.3563 289.1406,175.1688 292.0625,175.1688 C293.2969,175.1688 294.4688,174.8719 295.2188,174.3563 C295.8281,173.9344 296.1563,173.5125 296.1563,173.1063 C296.1563,172.6375 295.7344,172.2313 295.2344,172.2313 C295,172.2313 294.7813,172.3094 294.5781,172.5125 C294.1406,172.95 294.1406,172.95 293.9688,173.0438 C293.5156,173.2781 292.875,173.4188 292.1094,173.4188 C290.1094,173.4188 288.8281,172.4031 288.8281,170.825 L288.8281,169.7781 C288.8281,168.075 290.0469,166.8719 291.75,166.8719 C292.3281,166.8719 292.9063,167.0125 293.375,167.2625 C293.8438,167.5281 294.0156,167.7156 294.0781,168.075 C294.2031,168.7469 294.4531,168.9969 294.9844,168.9969 C295.2656,168.9969 295.5469,168.8563 295.7344,168.6375 C295.8594,168.4656 295.9063,168.2938 295.9063,167.8563 L295.9063,166.4969 C295.9063,166.075 295.8906,165.9344 295.7656,165.7625 C295.5938,165.5125 295.3125,165.3563 294.9844,165.3563 C294.6719,165.3563 294.4688,165.4656 294.25,165.7313 C293.0781,165.2313 292.6406,165.1219 291.6875,165.1219 C289.0156,165.1219 287,167.1375 287,169.7625 L287,170.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="306" y="174.306">BTemplate</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="383" y="150.7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="384" y="164.9001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="278" x2="388" y1="185.7" y2="185.7"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="283" y="194.6"/>
+          <ellipse cx="288" cy="199.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="297" y="202.7059">foo() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="278" x2="388" y1="210.4999" y2="210.4999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="283" y="219.3999"/>
+          <ellipse cx="288" cy="224.3999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="297" y="227.5059">b : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="101.5" y="75.0151">base : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000199333691834211223">
+        <rect codeLine="26" fill="#F1F1F1" height="81.5999" id="C_0000199333691834211223" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="136" y="153.7"/>
+        <ellipse cx="174.85" cy="169.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M169.85,170.8563 C169.85,173.3563 171.9906,175.1688 174.9125,175.1688 C176.1469,175.1688 177.3188,174.8719 178.0688,174.3563 C178.6781,173.9344 179.0063,173.5125 179.0063,173.1063 C179.0063,172.6375 178.5844,172.2313 178.0844,172.2313 C177.85,172.2313 177.6313,172.3094 177.4281,172.5125 C176.9906,172.95 176.9906,172.95 176.8188,173.0438 C176.3656,173.2781 175.725,173.4188 174.9594,173.4188 C172.9594,173.4188 171.6781,172.4031 171.6781,170.825 L171.6781,169.7781 C171.6781,168.075 172.8969,166.8719 174.6,166.8719 C175.1781,166.8719 175.7563,167.0125 176.225,167.2625 C176.6938,167.5281 176.8656,167.7156 176.9281,168.075 C177.0531,168.7469 177.3031,168.9969 177.8344,168.9969 C178.1156,168.9969 178.3969,168.8563 178.5844,168.6375 C178.7094,168.4656 178.7563,168.2938 178.7563,167.8563 L178.7563,166.4969 C178.7563,166.075 178.7406,165.9344 178.6156,165.7625 C178.4438,165.5125 178.1625,165.3563 177.8344,165.3563 C177.5219,165.3563 177.3188,165.4656 177.1,165.7313 C175.9281,165.2313 175.4906,165.1219 174.5375,165.1219 C171.8656,165.1219 169.85,167.1375 169.85,169.7625 L169.85,170.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="194.15" y="174.306">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="229" y1="185.7" y2="185.7"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="194.6"/>
+          <ellipse cx="147" cy="199.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="202.7059">foo() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="229" y1="210.4999" y2="210.4999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="219.3999"/>
+          <ellipse cx="147" cy="224.3999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="156" y="227.5059">a : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l1y42ojez3mb)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
-      <ellipse cx="299" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M299.1094,19.3438 L297.9531,24.4219 L300.2813,24.4219 L299.1094,19.3438 Z M297.625,17.1094 L300.6094,17.1094 L303.9688,29.5 L301.5156,29.5 L300.75,26.4375 L297.4688,26.4375 L296.7188,29.5 L294.2813,29.5 L297.625,17.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="88" x="313" y="28.1543">BaseTemplate</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="409" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="410" y="17.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="40" y2="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
+      <g id="elem_C_0001025697108404463905">
+        <rect codeLine="32" fill="#F1F1F1" height="81.5999" id="C_0001025697108404463905" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="424" y="153.7"/>
+        <ellipse cx="439" cy="169.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M434,170.8563 C434,173.3563 436.1406,175.1688 439.0625,175.1688 C440.2969,175.1688 441.4688,174.8719 442.2188,174.3563 C442.8281,173.9344 443.1563,173.5125 443.1563,173.1063 C443.1563,172.6375 442.7344,172.2313 442.2344,172.2313 C442,172.2313 441.7813,172.3094 441.5781,172.5125 C441.1406,172.95 441.1406,172.95 440.9688,173.0438 C440.5156,173.2781 439.875,173.4188 439.1094,173.4188 C437.1094,173.4188 435.8281,172.4031 435.8281,170.825 L435.8281,169.7781 C435.8281,168.075 437.0469,166.8719 438.75,166.8719 C439.3281,166.8719 439.9063,167.0125 440.375,167.2625 C440.8438,167.5281 441.0156,167.7156 441.0781,168.075 C441.2031,168.7469 441.4531,168.9969 441.9844,168.9969 C442.2656,168.9969 442.5469,168.8563 442.7344,168.6375 C442.8594,168.4656 442.9063,168.2938 442.9063,167.8563 L442.9063,166.4969 C442.9063,166.075 442.8906,165.9344 442.7656,165.7625 C442.5938,165.5125 442.3125,165.3563 441.9844,165.3563 C441.6719,165.3563 441.4688,165.4656 441.25,165.7313 C440.0781,165.2313 439.6406,165.1219 438.6875,165.1219 C436.0156,165.1219 434,167.1375 434,169.7625 L434,170.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="453" y="174.306">ATemplate</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="530" y="150.7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="531" y="164.9001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="425" x2="535" y1="185.7" y2="185.7"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="430" y="194.6"/>
+          <ellipse cx="435" cy="199.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="444" y="202.7059">foo() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="425" x2="535" y1="210.4999" y2="210.4999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="430" y="219.3999"/>
+          <ellipse cx="435" cy="224.3999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="444" y="227.5059">a : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="46"/>
-      <ellipse cx="295" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="304" y="54.2104">foo() = 0 : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="66.8047"/>
-      <ellipse cx="295" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304" y="75.0151">base : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l1y42ojez3mb)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
-      <ellipse cx="42.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M45.1188,163.6406 Q44.5406,163.9375 43.9,164.0781 Q43.2594,164.2344 42.5563,164.2344 Q40.0563,164.2344 38.7281,162.5938 Q37.4156,160.9375 37.4156,157.8125 Q37.4156,154.6875 38.7281,153.0313 Q40.0563,151.375 42.5563,151.375 Q43.2594,151.375 43.9,151.5313 Q44.5563,151.6875 45.1188,151.9844 L45.1188,154.7031 Q44.4938,154.125 43.9,153.8594 Q43.3063,153.5781 42.6813,153.5781 Q41.3375,153.5781 40.65,154.6563 Q39.9625,155.7188 39.9625,157.8125 Q39.9625,159.9063 40.65,160.9844 Q41.3375,162.0469 42.6813,162.0469 Q43.3063,162.0469 43.9,161.7813 Q44.4938,161.5 45.1188,160.9219 L45.1188,163.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="60.85" y="162.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="174" y2="174"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="180"/>
-      <ellipse cx="17" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="188.2104">foo() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="200.8047"/>
-      <ellipse cx="17" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="209.0151">b : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l1y42ojez3mb)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
-      <ellipse cx="277" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M279.9688,163.6406 Q279.3906,163.9375 278.75,164.0781 Q278.1094,164.2344 277.4063,164.2344 Q274.9063,164.2344 273.5781,162.5938 Q272.2656,160.9375 272.2656,157.8125 Q272.2656,154.6875 273.5781,153.0313 Q274.9063,151.375 277.4063,151.375 Q278.1094,151.375 278.75,151.5313 Q279.4063,151.6875 279.9688,151.9844 L279.9688,154.7031 Q279.3438,154.125 278.75,153.8594 Q278.1563,153.5781 277.5313,153.5781 Q276.1875,153.5781 275.5,154.6563 Q274.8125,155.7188 274.8125,157.8125 Q274.8125,159.9063 275.5,160.9844 Q276.1875,162.0469 277.5313,162.0469 Q278.1563,162.0469 278.75,161.7813 Q279.3438,161.5 279.9688,160.9219 L279.9688,163.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="291" y="162.1543">BTemplate</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="365" y="139"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="366" y="151.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="174" y2="174"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="180"/>
-      <ellipse cx="273" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="282" y="188.2104">foo() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="200.8047"/>
-      <ellipse cx="273" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="282" y="209.0151">b : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l1y42ojez3mb)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
-      <ellipse cx="164.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M167.1188,163.6406 Q166.5406,163.9375 165.9,164.0781 Q165.2594,164.2344 164.5563,164.2344 Q162.0563,164.2344 160.7281,162.5938 Q159.4156,160.9375 159.4156,157.8125 Q159.4156,154.6875 160.7281,153.0313 Q162.0563,151.375 164.5563,151.375 Q165.2594,151.375 165.9,151.5313 Q166.5563,151.6875 167.1188,151.9844 L167.1188,154.7031 Q166.4938,154.125 165.9,153.8594 Q165.3063,153.5781 164.6813,153.5781 Q163.3375,153.5781 162.65,154.6563 Q161.9625,155.7188 161.9625,157.8125 Q161.9625,159.9063 162.65,160.9844 Q163.3375,162.0469 164.6813,162.0469 Q165.3063,162.0469 165.9,161.7813 Q166.4938,161.5 167.1188,160.9219 L167.1188,163.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="182.85" y="162.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="174" y2="174"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="180"/>
-      <ellipse cx="139" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="188.2104">foo() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="200.8047"/>
-      <ellipse cx="139" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="148" y="209.0151">a : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l1y42ojez3mb)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
-      <ellipse cx="421" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M423.9688,163.6406 Q423.3906,163.9375 422.75,164.0781 Q422.1094,164.2344 421.4063,164.2344 Q418.9063,164.2344 417.5781,162.5938 Q416.2656,160.9375 416.2656,157.8125 Q416.2656,154.6875 417.5781,153.0313 Q418.9063,151.375 421.4063,151.375 Q422.1094,151.375 422.75,151.5313 Q423.4063,151.6875 423.9688,151.9844 L423.9688,154.7031 Q423.3438,154.125 422.75,153.8594 Q422.1563,153.5781 421.5313,153.5781 Q420.1875,153.5781 419.5,154.6563 Q418.8125,155.7188 418.8125,157.8125 Q418.8125,159.9063 419.5,160.9844 Q420.1875,162.0469 421.5313,162.0469 Q422.1563,162.0469 422.75,161.7813 Q423.3438,161.5 423.9688,160.9219 L423.9688,163.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="435" y="162.1543">ATemplate</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="509" y="139"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="510" y="151.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="174" y2="174"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="180"/>
-      <ellipse cx="417" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="426" y="188.2104">foo() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="200.8047"/>
-      <ellipse cx="417" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="426" y="209.0151">a : T</text>
-    </a>
-    <path d="M102.14,99.04 C92.53,113.46 82.34,128.74 73.52,141.97 " fill="none" id="C_0000010200626899013233&lt;-C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="96.54,94.83,113.45,82.07,108.18,102.59,96.54,94.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M335.52,101.9 C332.13,115.46 328.6,129.61 325.51,141.97 " fill="none" id="C_0000630197772543569536&lt;-C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="328.84,99.77,340.48,82.07,342.42,103.17,328.84,99.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M151.9,101.9 C155.39,115.46 159.04,129.61 162.22,141.97 " fill="none" id="C_0000010200626899013233&lt;-C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="145,103.18,146.79,82.07,158.56,99.69,145,103.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M392.9,97.61 C405.38,112.45 418.71,128.3 430.21,141.97 " fill="none" id="C_0000630197772543569536&lt;-C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="387.35,101.88,379.83,82.07,398.06,92.87,387.35,101.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000010200626899013233_C_0000059336049758992190">
+      <path codeLine="37" d="M110.5589,108.8759 C97.9889,127.6859 93.14,134.93 80.67,153.6 " fill="none" id="C_0000010200626899013233-backto-C_0000059336049758992190" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="120.56,93.91,105.5703,105.5422,115.5475,112.2096,120.56,93.91" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000630197772543569536_C_0001635850649347735305">
+      <path codeLine="38" d="M353.434,111.3775 C348.754,130.1875 347.57,134.93 342.93,153.6 " fill="none" id="C_0000630197772543569536-backto-C_0001635850649347735305" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="357.78,93.91,347.6115,109.9288,359.2565,112.8261,357.78,93.91" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000010200626899013233_C_0000199333691834211223">
+      <path codeLine="39" d="M162.566,111.3775 C167.246,130.1875 168.43,134.93 173.07,153.6 " fill="none" id="C_0000010200626899013233-backto-C_0000199333691834211223" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="158.22,93.91,156.7435,112.8261,168.3885,109.9288,158.22,93.91" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000630197772543569536_C_0001025697108404463905">
+      <path codeLine="40" d="M411.9134,107.9904 C426.8934,126.8004 433.36,134.93 448.23,153.6 " fill="none" id="C_0000630197772543569536-backto-C_0001025697108404463905" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="400.7,93.91,407.22,111.7282,416.6069,104.2526,400.7,93.91" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00048_class_mermaid.svg b/docs/test_cases/t00048_class_mermaid.svg
index 53eda906..d2a635cd 100644
--- a/docs/test_cases/t00048_class_mermaid.svg
+++ b/docs/test_cases/t00048_class_mermaid.svg
@@ -1,59 +1,64 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 612.84375 290" style="max-width: 612.844px; background-color: white;" width="612.84375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 630.625 290" style="max-width: 630.625px; background-color: white;" width="630.625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M82.96875,127.15464776990413L78.80208333333333,131.96220647492012C74.63541666666667,136.7697651799361,66.30208333333333,146.38488258996804,62.135416666666664,155.3591079616507C57.96875,164.33333333333334,57.96875,172.66666666666666,57.96875,176.83333333333334L57.96875,181"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M394.98405888728325,131L390.80572615606934,135.16666666666666C386.6273934248555,139.33333333333334,378.27072796242777,147.66666666666666,374.09239523121386,156C369.9140625,164.33333333333334,369.9140625,172.66666666666666,369.9140625,176.83333333333334L369.9140625,181"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M182.90625,127.15464776990413L187.07291666666666,131.96220647492012C191.23958333333334,136.7697651799361,199.57291666666666,146.38488258996804,203.73958333333334,155.3591079616507C207.90625,164.33333333333334,207.90625,172.66666666666666,207.90625,176.83333333333334L207.90625,181"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M518.3284411127167,131L522.5067738439307,135.16666666666666C526.6851065751445,139.33333333333334,535.0417720375723,147.66666666666666,539.2201047687862,156C543.3984375,164.33333333333334,543.3984375,172.66666666666666,543.3984375,176.83333333333334L543.3984375,181"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M75.24082766883893,142.02873153473837L73.10303347403244,144.35727627894866C70.96523927922595,146.68582102315892,66.68965088961298,151.34291051157945,64.55185669480649,157.8381219224564C62.4140625,164.33333333333334,62.4140625,172.66666666666666,62.4140625,176.83333333333334L62.4140625,181"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M400.0196060185661,143.71011637957636L397.96555709880505,145.75843031631362C395.911508179044,147.8067442530509,391.80341033952203,151.90337212652545,389.74936141976104,158.1183527299294C387.6953125,164.33333333333334,387.6953125,172.66666666666666,387.6953125,176.83333333333334L387.6953125,181"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M208.41542233116107,142.02873153473837L210.55321652596754,144.35727627894866C212.69101072077402,146.68582102315892,216.96659911038702,151.34291051157945,219.10439330519353,157.8381219224564C221.2421875,164.33333333333334,221.2421875,172.66666666666666,221.2421875,176.83333333333334L221.2421875,181"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M548.8553939814338,143.71011637957636L550.9094429011949,145.75843031631362C552.9634918209559,147.8067442530509,557.0715896604779,151.90337212652545,559.125638580239,158.1183527299294C561.1796875,164.33333333333334,561.1796875,172.66666666666666,561.1796875,176.83333333333334L561.1796875,181"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -94,11 +99,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(132.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L6">
+        <a transform="translate(141.828125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L6">
           <g title="Base" id="classId-C_0000010200626899013233-0" class="node default clickable">
-            <rect height="123" width="99.9375" y="-61.5" x="-49.96875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
-            <line y2="28.5" y1="28.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <rect height="123" width="108.828125" y="-61.5" x="-54.4140625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -110,20 +115,20 @@
                   <span class="nodeLabel">Base</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, 2)" height="18" width="74.28125">
+              <foreignObject transform="translate( -46.9140625, 2)" height="18" width="74.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+base : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, 36)" height="18" width="84.9375">
+              <foreignObject transform="translate( -46.9140625, 36)" height="18" width="93.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+foo() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+foo() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(456.65625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/t00048.h#L12">
+        <a transform="translate(474.4375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L12">
           <g title="BaseTemplate" id="classId-C_0000630197772543569536-1" class="node default clickable">
             <rect height="123" width="150.765625" y="-61.5" x="-75.3828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.3828125" x1="-75.3828125" class="divider"/>
@@ -144,19 +149,19 @@
                   <span class="nodeLabel">+base : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -67.8828125, 36)" height="18" width="84.9375">
+              <foreignObject transform="translate( -67.8828125, 36)" height="18" width="93.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+foo() : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+foo() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(57.96875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L8">
+        <a transform="translate(62.4140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L8">
           <g title="B" id="classId-C_0000059336049758992190-2" class="node default clickable">
-            <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <rect height="101" width="108.828125" y="-50.5" x="-54.4140625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -168,20 +173,20 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, -9)" height="18" width="48.484375">
+              <foreignObject transform="translate( -46.9140625, -9)" height="18" width="48.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+b : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, 25)" height="18" width="84.9375">
+              <foreignObject transform="translate( -46.9140625, 25)" height="18" width="93.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : void</span>
+                  <span class="nodeLabel">+foo() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(369.9140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/b_t00048.h#L14">
+        <a transform="translate(387.6953125, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L14">
           <g title="BTemplate" id="classId-C_0001635850649347735305-3" class="node default clickable">
             <rect height="101" width="124.078125" y="-50.5" x="-62.0390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="62.0390625" x1="-62.0390625" class="divider"/>
@@ -202,19 +207,19 @@
                   <span class="nodeLabel">+b : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.5390625, 25)" height="18" width="84.9375">
+              <foreignObject transform="translate( -54.5390625, 25)" height="18" width="93.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : void</span>
+                  <span class="nodeLabel">+foo() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(207.90625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L8">
+        <a transform="translate(221.2421875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L8">
           <g title="A" id="classId-C_0000199333691834211223-4" class="node default clickable">
-            <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <rect height="101" width="108.828125" y="-50.5" x="-54.4140625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -226,20 +231,20 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, -9)" height="18" width="48.484375">
+              <foreignObject transform="translate( -46.9140625, -9)" height="18" width="48.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -42.46875, 25)" height="18" width="84.9375">
+              <foreignObject transform="translate( -46.9140625, 25)" height="18" width="93.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : void</span>
+                  <span class="nodeLabel">+foo() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(543.3984375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00048/a_t00048.h#L14">
+        <a transform="translate(561.1796875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L14">
           <g title="ATemplate" id="classId-C_0001025697108404463905-5" class="node default clickable">
             <rect height="101" width="122.890625" y="-50.5" x="-61.4453125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="61.4453125" x1="-61.4453125" class="divider"/>
@@ -260,9 +265,9 @@
                   <span class="nodeLabel">+a : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -53.9453125, 25)" height="18" width="84.9375">
+              <foreignObject transform="translate( -53.9453125, 25)" height="18" width="93.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : void</span>
+                  <span class="nodeLabel">+foo() : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00049.md b/docs/test_cases/t00049.md
index e70de0d7..93725f55 100644
--- a/docs/test_cases/t00049.md
+++ b/docs/test_cases/t00049.md
@@ -18,7 +18,7 @@ diagrams:
         - clanguml::t00049
 ```
 ## Source code
-File t00049.cc
+File `tests/t00049/t00049.cc`
 ```cpp
 #include <map>
 #include <string>
@@ -84,6 +84,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -263,6 +264,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -288,6 +290,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg
index 7d511227..087c5e76 100644
--- a/docs/test_cases/t00049_class.svg
+++ b/docs/test_cases/t00049_class.svg
@@ -1,128 +1,144 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:401px;height:390px;" version="1.1" viewBox="0 0 401 390" width="401px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="413px" preserveAspectRatio="none" style="width:377px;height:413px;background:#FFFFFF;" version="1.1" viewBox="0 0 377 413" width="377px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxmv890v135bk" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxmv890v135bk)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="129.5" y="306"/>
-      <ellipse cx="165.65" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M168.6188,327.6406 Q168.0406,327.9375 167.4,328.0781 Q166.7594,328.2344 166.0563,328.2344 Q163.5563,328.2344 162.2281,326.5938 Q160.9156,324.9375 160.9156,321.8125 Q160.9156,318.6875 162.2281,317.0313 Q163.5563,315.375 166.0563,315.375 Q166.7594,315.375 167.4,315.5313 Q168.0563,315.6875 168.6188,315.9844 L168.6188,318.7031 Q167.9938,318.125 167.4,317.8594 Q166.8063,317.5781 166.1813,317.5781 Q164.8375,317.5781 164.15,318.6563 Q163.4625,319.7188 163.4625,321.8125 Q163.4625,323.9063 164.15,324.9844 Q164.8375,326.0469 166.1813,326.0469 Q166.8063,326.0469 167.4,325.7813 Q167.9938,325.5 168.6188,324.9219 L168.6188,327.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="184.35" y="326.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="221.5" y="303"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="222.5" y="315.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="338" y2="338"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000372971769516871577">
+        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0000372971769516871577" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="106" x="117" y="325"/>
+        <ellipse cx="156.3" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M151.3,342.1563 C151.3,344.6563 153.4406,346.4688 156.3625,346.4688 C157.5969,346.4688 158.7688,346.1719 159.5188,345.6563 C160.1281,345.2344 160.4563,344.8125 160.4563,344.4063 C160.4563,343.9375 160.0344,343.5313 159.5344,343.5313 C159.3,343.5313 159.0813,343.6094 158.8781,343.8125 C158.4406,344.25 158.4406,344.25 158.2688,344.3438 C157.8156,344.5781 157.175,344.7188 156.4094,344.7188 C154.4094,344.7188 153.1281,343.7031 153.1281,342.125 L153.1281,341.0781 C153.1281,339.375 154.3469,338.1719 156.05,338.1719 C156.6281,338.1719 157.2063,338.3125 157.675,338.5625 C158.1438,338.8281 158.3156,339.0156 158.3781,339.375 C158.5031,340.0469 158.7531,340.2969 159.2844,340.2969 C159.5656,340.2969 159.8469,340.1563 160.0344,339.9375 C160.1594,339.7656 160.2063,339.5938 160.2063,339.1563 L160.2063,337.7969 C160.2063,337.375 160.1906,337.2344 160.0656,337.0625 C159.8938,336.8125 159.6125,336.6563 159.2844,336.6563 C158.9719,336.6563 158.7688,336.7656 158.55,337.0313 C157.3781,336.5313 156.9406,336.4219 155.9875,336.4219 C153.3156,336.4219 151.3,338.4375 151.3,341.0625 L151.3,342.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="175.7" y="345.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="217" y="322"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="218" y="336.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="118" x2="222" y1="357" y2="357"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="123" y="365.9"/>
+          <ellipse cx="128" cy="370.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="137" y="374.0059">get_a() : T &amp;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="118" x2="222" y1="381.7999" y2="381.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="123" y="390.6999"/>
+          <ellipse cx="128" cy="395.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="137" y="398.8059">a : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="344"/>
-      <ellipse cx="140.5" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000654829353386288443">
+        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0000654829353386288443" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="7" y="216"/>
+        <ellipse cx="22" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,233.1563 C17,235.6563 19.1406,237.4688 22.0625,237.4688 C23.2969,237.4688 24.4688,237.1719 25.2188,236.6563 C25.8281,236.2344 26.1563,235.8125 26.1563,235.4063 C26.1563,234.9375 25.7344,234.5313 25.2344,234.5313 C25,234.5313 24.7813,234.6094 24.5781,234.8125 C24.1406,235.25 24.1406,235.25 23.9688,235.3438 C23.5156,235.5781 22.875,235.7188 22.1094,235.7188 C20.1094,235.7188 18.8281,234.7031 18.8281,233.125 L18.8281,232.0781 C18.8281,230.375 20.0469,229.1719 21.75,229.1719 C22.3281,229.1719 22.9063,229.3125 23.375,229.5625 C23.8438,229.8281 24.0156,230.0156 24.0781,230.375 C24.2031,231.0469 24.4531,231.2969 24.9844,231.2969 C25.2656,231.2969 25.5469,231.1563 25.7344,230.9375 C25.8594,230.7656 25.9063,230.5938 25.9063,230.1563 L25.9063,228.7969 C25.9063,228.375 25.8906,228.2344 25.7656,228.0625 C25.5938,227.8125 25.3125,227.6563 24.9844,227.6563 C24.6719,227.6563 24.4688,227.7656 24.25,228.0313 C23.0781,227.5313 22.6406,227.4219 21.6875,227.4219 C19.0156,227.4219 17,229.4375 17,232.0625 L17,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="236.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="39" x="53" y="213"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="37" x="54" y="227.2001">intmap</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="88" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="88" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="149.5" y="352.2104">get_a() : T &amp;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000973058255816844469">
+        <rect codeLine="12" fill="#F1F1F1" height="48" id="C_0000973058255816844469" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="92" x="124" y="216"/>
+        <ellipse cx="139" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M134,233.1563 C134,235.6563 136.1406,237.4688 139.0625,237.4688 C140.2969,237.4688 141.4688,237.1719 142.2188,236.6563 C142.8281,236.2344 143.1563,235.8125 143.1563,235.4063 C143.1563,234.9375 142.7344,234.5313 142.2344,234.5313 C142,234.5313 141.7813,234.6094 141.5781,234.8125 C141.1406,235.25 141.1406,235.25 140.9688,235.3438 C140.5156,235.5781 139.875,235.7188 139.1094,235.7188 C137.1094,235.7188 135.8281,234.7031 135.8281,233.125 L135.8281,232.0781 C135.8281,230.375 137.0469,229.1719 138.75,229.1719 C139.3281,229.1719 139.9063,229.3125 140.375,229.5625 C140.8438,229.8281 141.0156,230.0156 141.0781,230.375 C141.2031,231.0469 141.4531,231.2969 141.9844,231.2969 C142.2656,231.2969 142.5469,231.1563 142.7344,230.9375 C142.8594,230.7656 142.9063,230.5938 142.9063,230.1563 L142.9063,228.7969 C142.9063,228.375 142.8906,228.2344 142.7656,228.0625 C142.5938,227.8125 142.3125,227.6563 141.9844,227.6563 C141.6719,227.6563 141.4688,227.7656 141.25,228.0313 C140.0781,227.5313 139.6406,227.4219 138.6875,227.4219 C136.0156,227.4219 134,229.4375 134,232.0625 L134,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="153" y="236.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="49" x="170" y="213"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="47" x="171" y="227.2001">thestring</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="125" x2="215" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="125" x2="215" y1="256" y2="256"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="358.8047" y2="358.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="364.8047"/>
-      <ellipse cx="140.5" cy="369.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000562074851310302010">
+        <rect codeLine="16" fill="#F1F1F1" height="48" id="C_0000562074851310302010" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="115" x="251.5" y="216"/>
+        <ellipse cx="266.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M261.5,233.1563 C261.5,235.6563 263.6406,237.4688 266.5625,237.4688 C267.7969,237.4688 268.9688,237.1719 269.7188,236.6563 C270.3281,236.2344 270.6563,235.8125 270.6563,235.4063 C270.6563,234.9375 270.2344,234.5313 269.7344,234.5313 C269.5,234.5313 269.2813,234.6094 269.0781,234.8125 C268.6406,235.25 268.6406,235.25 268.4688,235.3438 C268.0156,235.5781 267.375,235.7188 266.6094,235.7188 C264.6094,235.7188 263.3281,234.7031 263.3281,233.125 L263.3281,232.0781 C263.3281,230.375 264.5469,229.1719 266.25,229.1719 C266.8281,229.1719 267.4063,229.3125 267.875,229.5625 C268.3438,229.8281 268.5156,230.0156 268.5781,230.375 C268.7031,231.0469 268.9531,231.2969 269.4844,231.2969 C269.7656,231.2969 270.0469,231.1563 270.2344,230.9375 C270.3594,230.7656 270.4063,230.5938 270.4063,230.1563 L270.4063,228.7969 C270.4063,228.375 270.3906,228.2344 270.2656,228.0625 C270.0938,227.8125 269.8125,227.6563 269.4844,227.6563 C269.1719,227.6563 268.9688,227.7656 268.75,228.0313 C267.5781,227.5313 267.1406,227.4219 266.1875,227.4219 C263.5156,227.4219 261.5,229.4375 261.5,232.0625 L261.5,233.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="280.5" y="236.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="72" x="297.5" y="213"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="70" x="298.5" y="227.2001">string_vector</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="252.5" x2="365.5" y1="248" y2="248"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="252.5" x2="365.5" y1="256" y2="256"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="149.5" y="373.0151">a : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0002288024073053091226">
+        <rect codeLine="20" fill="#F1F1F1" height="131.9996" id="C_0002288024073053091226" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="297" x="21.5" y="7"/>
+        <ellipse cx="160.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M155.75,24.1563 C155.75,26.6563 157.8906,28.4688 160.8125,28.4688 C162.0469,28.4688 163.2188,28.1719 163.9688,27.6563 C164.5781,27.2344 164.9063,26.8125 164.9063,26.4063 C164.9063,25.9375 164.4844,25.5313 163.9844,25.5313 C163.75,25.5313 163.5313,25.6094 163.3281,25.8125 C162.8906,26.25 162.8906,26.25 162.7188,26.3438 C162.2656,26.5781 161.625,26.7188 160.8594,26.7188 C158.8594,26.7188 157.5781,25.7031 157.5781,24.125 L157.5781,23.0781 C157.5781,21.375 158.7969,20.1719 160.5,20.1719 C161.0781,20.1719 161.6563,20.3125 162.125,20.5625 C162.5938,20.8281 162.7656,21.0156 162.8281,21.375 C162.9531,22.0469 163.2031,22.2969 163.7344,22.2969 C164.0156,22.2969 164.2969,22.1563 164.4844,21.9375 C164.6094,21.7656 164.6563,21.5938 164.6563,21.1563 L164.6563,19.7969 C164.6563,19.375 164.6406,19.2344 164.5156,19.0625 C164.3438,18.8125 164.0625,18.6563 163.7344,18.6563 C163.4219,18.6563 163.2188,18.7656 163,19.0313 C161.8281,18.5313 161.3906,18.4219 160.4375,18.4219 C157.7656,18.4219 155.75,20.4375 155.75,23.0625 L155.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="181.25" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="317.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="47.9"/>
+          <ellipse cx="32.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169" x="41.5" y="56.0059">get_int_map() : A&lt;intmap&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="64.6999"/>
+          <ellipse cx="32.5" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="271" x="41.5" y="72.8059">set_int_map(A&lt;intmap&gt; &amp;&amp; int_map) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="317.5" y1="80.5999" y2="80.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="89.4998"/>
+          <ellipse cx="32.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="41.5" y="97.6058">a_int_map : A&lt;intmap&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="106.2997"/>
+          <ellipse cx="32.5" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="41.5" y="114.4057">a_string : A&lt;thestring&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="123.0997"/>
+          <ellipse cx="32.5" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="217" x="41.5" y="131.2057">a_vector_string : A&lt;string_vector&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxmv890v135bk)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="197"/>
-      <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="45" x="51" y="194"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="52" y="206.1387">intmap</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="237" y2="237"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxmv890v135bk)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="128.5" y="197"/>
-      <ellipse cx="143.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M146.4688,218.6406 Q145.8906,218.9375 145.25,219.0781 Q144.6094,219.2344 143.9063,219.2344 Q141.4063,219.2344 140.0781,217.5938 Q138.7656,215.9375 138.7656,212.8125 Q138.7656,209.6875 140.0781,208.0313 Q141.4063,206.375 143.9063,206.375 Q144.6094,206.375 145.25,206.5313 Q145.9063,206.6875 146.4688,206.9844 L146.4688,209.7031 Q145.8438,209.125 145.25,208.8594 Q144.6563,208.5781 144.0313,208.5781 Q142.6875,208.5781 142,209.6563 Q141.3125,210.7188 141.3125,212.8125 Q141.3125,214.9063 142,215.9844 Q142.6875,217.0469 144.0313,217.0469 Q144.6563,217.0469 145.25,216.7813 Q145.8438,216.5 146.4688,215.9219 L146.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.5" y="217.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="58" x="173.5" y="194"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="174.5" y="206.1387">thestring</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="237" y2="237"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxmv890v135bk)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="263.5" y="197"/>
-      <ellipse cx="278.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M281.4688,218.6406 Q280.8906,218.9375 280.25,219.0781 Q279.6094,219.2344 278.9063,219.2344 Q276.4063,219.2344 275.0781,217.5938 Q273.7656,215.9375 273.7656,212.8125 Q273.7656,209.6875 275.0781,208.0313 Q276.4063,206.375 278.9063,206.375 Q279.6094,206.375 280.25,206.5313 Q280.9063,206.6875 281.4688,206.9844 L281.4688,209.7031 Q280.8438,209.125 280.25,208.8594 Q279.6563,208.5781 279.0313,208.5781 Q277.6875,208.5781 277,209.6563 Q276.3125,210.7188 276.3125,212.8125 Q276.3125,214.9063 277,215.9844 Q277.6875,217.0469 279.0313,217.0469 Q279.6563,217.0469 280.25,216.7813 Q280.8438,216.5 281.4688,215.9219 L281.4688,218.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="292.5" y="217.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="308.5" y="194"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="309.5" y="206.1387">string_vector</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="229" y2="229"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="237" y2="237"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxmv890v135bk)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="41" y="8"/>
-      <ellipse cx="170.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.2188,29.6406 Q172.6406,29.9375 172,30.0781 Q171.3594,30.2344 170.6563,30.2344 Q168.1563,30.2344 166.8281,28.5938 Q165.5156,26.9375 165.5156,23.8125 Q165.5156,20.6875 166.8281,19.0313 Q168.1563,17.375 170.6563,17.375 Q171.3594,17.375 172,17.5313 Q172.6563,17.6875 173.2188,17.9844 L173.2188,20.7031 Q172.5938,20.125 172,19.8594 Q171.4063,19.5781 170.7813,19.5781 Q169.4375,19.5781 168.75,20.6563 Q168.0625,21.7188 168.0625,23.8125 Q168.0625,25.9063 168.75,26.9844 Q169.4375,28.0469 170.7813,28.0469 Q171.4063,28.0469 172,27.7813 Q172.5938,27.5 173.2188,26.9219 L173.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190.75" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="46"/>
-      <ellipse cx="52" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="61" y="54.2104">get_int_map() : A&lt;intmap&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="58.8047"/>
-      <ellipse cx="52" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="61" y="67.0151">set_int_map(A&lt;intmap&gt; &amp;&amp; int_map) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="79.6094"/>
-      <ellipse cx="52" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="61" y="87.8198">a_int_map : A&lt;intmap&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="92.4141"/>
-      <ellipse cx="52" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="61" y="100.6245">a_string : A&lt;thestring&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="105.2188"/>
-      <ellipse cx="52" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="198" x="61" y="113.4292">a_vector_string : A&lt;string_vector&gt;</text>
-    </a>
-    <path d="M74.37,245.14 C88.77,258.53 107.47,275.93 125.05,292.27 " fill="none" id="C_0000654829353386288443-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="129.87,287.2,139.74,305.95,120.33,297.45,129.87,287.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M178.5,245.14 C178.5,256.67 178.5,271.17 178.5,285.41 " fill="none" id="C_0000973058255816844469-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="185.5,285.71,178.5,305.71,171.5,285.71,185.5,285.71" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M297.16,245.14 C280.42,258.8 258.58,276.63 238.21,293.26 " fill="none" id="C_0000562074851310302010-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="242.59,298.72,222.67,305.95,233.73,287.88,242.59,298.72" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M178.5,133.26 C178.5,155.95 178.5,179.72 178.5,196.62 " fill="none" id="C_0002288024073053091226&lt;-C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="178.5,120.08,174.5,126.08,178.5,132.08,182.5,126.08,178.5,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="184.5" cy="159.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="51" x="191.5" y="163.0669">a_string</text>
-    <path d="M239.93,129.77 C262.43,153.49 286.48,178.85 303.33,196.62 " fill="none" id="C_0002288024073053091226&lt;-C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="230.74,120.08,231.9615,127.1869,238.9915,128.7928,237.77,121.6859,230.74,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="279.5" cy="159.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="98" x="286.5" y="163.0669">a_vector_string</text>
-    <path d="M106.73,129.89 C100.65,136.46 94.81,143.22 89.5,150 C78.12,164.55 67.84,182.71 60.55,196.88 " fill="none" id="C_0002288024073053091226&lt;-C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="115.76,120.42,108.7238,121.9987,107.4749,129.1009,114.5111,127.5221,115.76,120.42" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="95.5" cy="159.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="67" x="102.5" y="163.0669">a_int_map</text>
+    <g id="link_C_0000654829353386288443_C_0000372971769516871577">
+      <path codeLine="28" d="M70.95,264.29 C87.65,281.24 98.0556,291.7992 117.7156,311.7492 " fill="none" id="C_0000654829353386288443-to-C_0000372971769516871577" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="130.35,324.57,121.9892,307.5378,113.442,315.9607,130.35,324.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000973058255816844469_C_0000372971769516871577">
+      <path codeLine="29" d="M170,264.29 C170,281.24 170,286.62 170,306.57 " fill="none" id="C_0000973058255816844469-to-C_0000372971769516871577" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="170,324.57,176,306.57,164,306.57,170,324.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000562074851310302010_C_0000372971769516871577">
+      <path codeLine="30" d="M282.86,264.29 C263.82,281.24 251.0118,292.6484 228.6118,312.5984 " fill="none" id="C_0000562074851310302010-to-C_0000372971769516871577" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="215.17,324.57,232.6023,317.079,224.6212,308.1178,215.17,324.57" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002288024073053091226_C_0000973058255816844469">
+      <path codeLine="31" d="M170,151.21 C170,178.24 170,195.85 170,215.74 " fill="none" id="C_0002288024073053091226-backto-C_0000973058255816844469" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="170,139.21,166,145.21,170,151.21,174,145.21,170,139.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="176" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="183" y="182.077">a_string</text>
+    </g>
+    <g id="link_C_0002288024073053091226_C_0000562074851310302010">
+      <path codeLine="32" d="M232.6692,148.3893 C255.4292,175.4193 272.65,195.85 289.41,215.74 " fill="none" id="C_0002288024073053091226-backto-C_0000562074851310302010" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="224.94,139.21,225.7448,146.376,232.6692,148.3893,231.8644,141.2232,224.94,139.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="270" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="89" x="277" y="182.077">a_vector_string</text>
+    </g>
+    <g id="link_C_0002288024073053091226_C_0000654829353386288443">
+      <path codeLine="33" d="M103.1333,148.6511 C95.1833,158.3511 94.98,159.13 88,169 C77.49,183.86 67.34,201.67 59.89,215.62 " fill="none" id="C_0002288024073053091226-backto-C_0000654829353386288443" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="110.74,139.37,103.843,141.475,103.1333,148.6511,110.0304,146.5461,110.74,139.37" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="94" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="60" x="101" y="182.077">a_int_map</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00049_class_mermaid.svg b/docs/test_cases/t00049_class_mermaid.svg
index 4e4016f5..e06fb016 100644
--- a/docs/test_cases/t00049_class_mermaid.svg
+++ b/docs/test_cases/t00049_class_mermaid.svg
@@ -1,61 +1,66 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 473.984375 459" style="max-width: 473.984px; background-color: white;" width="473.984375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M56.84375,300L56.84375,304.1666666666667C56.84375,308.3333333333333,56.84375,316.6666666666667,73.40104166666667,328.8627224675499C89.95833333333333,341.05877826843306,123.07291666666667,357.11755653686606,139.63020833333334,365.1469456710825L156.1875,373.17633480529906"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M212.53125,300L212.53125,304.1666666666667C212.53125,308.3333333333333,212.53125,316.6666666666667,212.53125,325C212.53125,333.3333333333333,212.53125,341.6666666666667,212.53125,345.8333333333333L212.53125,350"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M392.6796875,300L392.6796875,304.1666666666667C392.6796875,308.3333333333333,392.6796875,316.6666666666667,372.0455729166667,329.48106668401346C351.4114583333333,342.2954667013603,310.1432291666667,359.59093340272057,289.5091145833333,368.23866675340076L268.875,376.88640010408085"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M212.53125,175L212.53125,180.66666666666666C212.53125,186.33333333333334,212.53125,197.66666666666666,212.53125,209C212.53125,220.33333333333334,212.53125,231.66666666666666,212.53125,237.33333333333334L212.53125,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M340.5516289893617,175L349.23963874113474,180.66666666666666C357.9276484929078,186.33333333333334,375.3036679964539,197.66666666666666,383.99167774822695,209C392.6796875,220.33333333333334,392.6796875,231.66666666666666,392.6796875,237.33333333333334L392.6796875,243"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M101.89375,175L94.38541666666667,180.66666666666666C86.87708333333335,186.33333333333334,71.86041666666667,197.66666666666666,64.35208333333334,209C56.84375,220.33333333333334,56.84375,231.66666666666666,56.84375,237.33333333333334L56.84375,243"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M56.84375,300L56.84375,304.1666666666667C56.84375,308.3333333333333,56.84375,316.6666666666667,69.96081706356145,327.1943999783684C83.0778841271229,337.7221332900701,109.3120182542458,350.4442665801401,122.42908531780726,356.80533322517505L135.5461523813687,363.1663998702101"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M212.53125,300L212.53125,304.1666666666667C212.53125,308.3333333333333,212.53125,316.6666666666667,212.53125,322C212.53125,327.3333333333333,212.53125,329.6666666666667,212.53125,330.8333333333333L212.53125,332"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M392.6796875,300L392.6796875,304.1666666666667C392.6796875,308.3333333333333,392.6796875,316.6666666666667,375.5532940281003,328.0109848582233C358.4269005562007,339.35530304978,324.17411361240136,353.71060609956,307.04772014050167,360.88825762445L289.92132666860203,368.06590914934"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M212.53125,193L212.53125,195.66666666666666C212.53125,198.33333333333334,212.53125,203.66666666666666,212.53125,212C212.53125,220.33333333333334,212.53125,231.66666666666666,212.53125,237.33333333333334L212.53125,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M355.62816446725355,184.8335180878396L361.80341830604465,188.86126507319966C367.9786721448357,192.88901205855973,380.32917982241787,200.94450602927986,386.5044336612089,210.6389196813066C392.6796875,220.33333333333334,392.6796875,231.66666666666666,392.6796875,237.33333333333334L392.6796875,243"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M87.52634529400184,185.8433243064137L82.4125794116682,189.70277025534475C77.29881352933457,193.5622162042758,67.07128176466728,201.2811081021379,61.95751588233364,210.80722071773562C56.84375,220.33333333333334,56.84375,231.66666666666666,56.84375,237.33333333333334L56.84375,243"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -126,11 +131,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000372971769516871577-0" class="node default clickable">
-            <rect height="101" width="112.6875" y="-50.5" x="-56.34375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="56.34375" x1="-56.34375" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="56.34375" x1="-56.34375" class="divider"/>
+            <rect height="101" width="121.578125" y="-50.5" x="-60.7890625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="60.7890625" x1="-60.7890625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="60.7890625" x1="-60.7890625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -142,20 +147,20 @@
                   <span class="nodeLabel">A&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -48.84375, -9)" height="18" width="41.0625">
+              <foreignObject transform="translate( -53.2890625, -9)" height="18" width="41.0625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -48.84375, 25)" height="18" width="97.6875">
+              <foreignObject transform="translate( -53.2890625, 25)" height="18" width="106.578125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_a() : T &amp;</span>
+                  <span class="nodeLabel">+get_a() : : T &amp;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7">
+        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000654829353386288443-1" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -174,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000973058255816844469-2" class="node default clickable">
             <rect height="57" width="113.6875" y="-28.5" x="-56.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.84375" x1="-56.84375" class="divider"/>
@@ -193,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L7">
+        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000562074851310302010-3" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -212,11 +217,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00049/t00049.cc#L13">
+        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L13">
           <g title="R" id="classId-C_0002288024073053091226-4" class="node default clickable">
-            <rect height="167" width="267.140625" y="-83.5" x="-133.5703125" class="outer title-state"/>
-            <line y2="-53.5" y1="-53.5" x2="133.5703125" x1="-133.5703125" class="divider"/>
-            <line y2="28.5" y1="28.5" x2="133.5703125" x1="-133.5703125" class="divider"/>
+            <rect height="167" width="270.6875" y="-83.5" x="-135.34375" class="outer title-state"/>
+            <line y2="-53.5" y1="-53.5" x2="135.34375" x1="-135.34375" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="135.34375" x1="-135.34375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -228,29 +233,29 @@
                   <span class="nodeLabel">R</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -126.0703125, -42)" height="18" width="173.90625">
+              <foreignObject transform="translate( -127.84375, -42)" height="18" width="173.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a_int_map : A&lt;intmap&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -126.0703125, -20)" height="18" width="169.453125">
+              <foreignObject transform="translate( -127.84375, -20)" height="18" width="169.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a_string : A&lt;thestring&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -126.0703125, 2)" height="18" width="252.140625">
+              <foreignObject transform="translate( -127.84375, 2)" height="18" width="252.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a_vector_string : A&lt;string_vector&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -126.0703125, 36)" height="18" width="197.90625">
+              <foreignObject transform="translate( -127.84375, 36)" height="18" width="206.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_int_map() : A&lt;intmap&gt;</span>
+                  <span class="nodeLabel">+get_int_map() : : A&lt;intmap&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -126.0703125, 58)" height="18" width="246.796875">
+              <foreignObject transform="translate( -127.84375, 58)" height="18" width="255.6875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+set_int_map(A &amp;&amp; int_map) : void</span>
+                  <span class="nodeLabel">+set_int_map(A &amp;&amp; int_map) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00050.md b/docs/test_cases/t00050.md
index 90a25345..c39aab55 100644
--- a/docs/test_cases/t00050.md
+++ b/docs/test_cases/t00050.md
@@ -105,7 +105,7 @@ diagrams:
 
 ```
 ## Source code
-File t00050.cc
+File `tests/t00050/t00050.cc`
 ```cpp
 namespace clanguml {
 
diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg
index e955e835..376bec07 100644
--- a/docs/test_cases/t00050_class.svg
+++ b/docs/test_cases/t00050_class.svg
@@ -1,186 +1,226 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="684px" preserveAspectRatio="none" style="width:2480px;height:684px;" version="1.1" viewBox="0 0 2480 684" width="2480px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="699px" preserveAspectRatio="none" style="width:2338px;height:699px;background:#FFFFFF;" version="1.1" viewBox="0 0 2338 699" width="2338px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1poie1aqybmga" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1poie1aqybmga)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
-      <ellipse cx="216" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M218.9688,71.1406 Q218.3906,71.4375 217.75,71.5781 Q217.1094,71.7344 216.4063,71.7344 Q213.9063,71.7344 212.5781,70.0938 Q211.2656,68.4375 211.2656,65.3125 Q211.2656,62.1875 212.5781,60.5313 Q213.9063,58.875 216.4063,58.875 Q217.1094,58.875 217.75,59.0313 Q218.4063,59.1875 218.9688,59.4844 L218.9688,62.2031 Q218.3438,61.625 217.75,61.3594 Q217.1563,61.0781 216.5313,61.0781 Q215.1875,61.0781 214.5,62.1563 Q213.8125,63.2188 213.8125,65.3125 Q213.8125,67.4063 214.5,68.4844 Q215.1875,69.5469 216.5313,69.5469 Q217.1563,69.5469 217.75,69.2813 Q218.3438,69 218.9688,68.4219 L218.9688,71.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="230" y="69.6543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="81.5" y2="81.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="89.5" y2="89.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001885563213397742674">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001885563213397742674" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="186.5" y="52.32"/>
+        <ellipse cx="201.5" cy="68.32" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M196.5,69.4763 C196.5,71.9763 198.6406,73.7888 201.5625,73.7888 C202.7969,73.7888 203.9688,73.4919 204.7188,72.9763 C205.3281,72.5544 205.6563,72.1325 205.6563,71.7263 C205.6563,71.2575 205.2344,70.8513 204.7344,70.8513 C204.5,70.8513 204.2813,70.9294 204.0781,71.1325 C203.6406,71.57 203.6406,71.57 203.4688,71.6638 C203.0156,71.8981 202.375,72.0388 201.6094,72.0388 C199.6094,72.0388 198.3281,71.0231 198.3281,69.445 L198.3281,68.3981 C198.3281,66.695 199.5469,65.4919 201.25,65.4919 C201.8281,65.4919 202.4063,65.6325 202.875,65.8825 C203.3438,66.1481 203.5156,66.3356 203.5781,66.695 C203.7031,67.3669 203.9531,67.6169 204.4844,67.6169 C204.7656,67.6169 205.0469,67.4763 205.2344,67.2575 C205.3594,67.0856 205.4063,66.9138 205.4063,66.4763 L205.4063,65.1169 C205.4063,64.695 205.3906,64.5544 205.2656,64.3825 C205.0938,64.1325 204.8125,63.9763 204.4844,63.9763 C204.1719,63.9763 203.9688,64.0856 203.75,64.3513 C202.5781,63.8513 202.1406,63.7419 201.1875,63.7419 C198.5156,63.7419 196.5,65.7575 196.5,68.3825 L196.5,69.4763 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="215.5" y="72.926">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="187.5" x2="226.5" y1="84.32" y2="84.32"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="187.5" x2="226.5" y1="92.32" y2="92.32"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1poie1aqybmga)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
-      <ellipse cx="1359" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1361.9688,390.6406 Q1361.3906,390.9375 1360.75,391.0781 Q1360.1094,391.2344 1359.4063,391.2344 Q1356.9063,391.2344 1355.5781,389.5938 Q1354.2656,387.9375 1354.2656,384.8125 Q1354.2656,381.6875 1355.5781,380.0313 Q1356.9063,378.375 1359.4063,378.375 Q1360.1094,378.375 1360.75,378.5313 Q1361.4063,378.6875 1361.9688,378.9844 L1361.9688,381.7031 Q1361.3438,381.125 1360.75,380.8594 Q1360.1563,380.5781 1359.5313,380.5781 Q1358.1875,380.5781 1357.5,381.6563 Q1356.8125,382.7188 1356.8125,384.8125 Q1356.8125,386.9063 1357.5,387.9844 Q1358.1875,389.0469 1359.5313,389.0469 Q1360.1563,389.0469 1360.75,388.7813 Q1361.3438,388.5 1361.9688,387.9219 L1361.9688,390.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1373" y="389.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="401" y2="401"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="409" y2="409"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
+      <g id="elem_C_0000500262098409836244">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000500262098409836244" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1259.5" y="382.65"/>
+        <ellipse cx="1274.5" cy="398.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1269.5,399.8063 C1269.5,402.3063 1271.6406,404.1188 1274.5625,404.1188 C1275.7969,404.1188 1276.9688,403.8219 1277.7188,403.3063 C1278.3281,402.8844 1278.6563,402.4625 1278.6563,402.0563 C1278.6563,401.5875 1278.2344,401.1813 1277.7344,401.1813 C1277.5,401.1813 1277.2813,401.2594 1277.0781,401.4625 C1276.6406,401.9 1276.6406,401.9 1276.4688,401.9938 C1276.0156,402.2281 1275.375,402.3688 1274.6094,402.3688 C1272.6094,402.3688 1271.3281,401.3531 1271.3281,399.775 L1271.3281,398.7281 C1271.3281,397.025 1272.5469,395.8219 1274.25,395.8219 C1274.8281,395.8219 1275.4063,395.9625 1275.875,396.2125 C1276.3438,396.4781 1276.5156,396.6656 1276.5781,397.025 C1276.7031,397.6969 1276.9531,397.9469 1277.4844,397.9469 C1277.7656,397.9469 1278.0469,397.8063 1278.2344,397.5875 C1278.3594,397.4156 1278.4063,397.2438 1278.4063,396.8063 L1278.4063,395.4469 C1278.4063,395.025 1278.3906,394.8844 1278.2656,394.7125 C1278.0938,394.4625 1277.8125,394.3063 1277.4844,394.3063 C1277.1719,394.3063 1276.9688,394.4156 1276.75,394.6813 C1275.5781,394.1813 1275.1406,394.0719 1274.1875,394.0719 C1271.5156,394.0719 1269.5,396.0875 1269.5,398.7125 L1269.5,399.8063 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1288.5" y="403.256">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1260.5" x2="1299.5" y1="414.65" y2="414.65"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1260.5" x2="1299.5" y1="422.65" y2="422.65"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1poie1aqybmga)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
-      <ellipse cx="595" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M597.9688,390.6406 Q597.3906,390.9375 596.75,391.0781 Q596.1094,391.2344 595.4063,391.2344 Q592.9063,391.2344 591.5781,389.5938 Q590.2656,387.9375 590.2656,384.8125 Q590.2656,381.6875 591.5781,380.0313 Q592.9063,378.375 595.4063,378.375 Q596.1094,378.375 596.75,378.5313 Q597.4063,378.6875 597.9688,378.9844 L597.9688,381.7031 Q597.3438,381.125 596.75,380.8594 Q596.1563,380.5781 595.5313,380.5781 Q594.1875,380.5781 593.5,381.6563 Q592.8125,382.7188 592.8125,384.8125 Q592.8125,386.9063 593.5,387.9844 Q594.1875,389.0469 595.5313,389.0469 Q596.1563,389.0469 596.75,388.7813 Q597.3438,388.5 597.9688,387.9219 L597.9688,390.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="609" y="389.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="401" y2="401"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="409" y2="409"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
+      <g id="elem_C_0001663081653671078922">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001663081653671078922" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="542" y="382.65"/>
+        <ellipse cx="557" cy="398.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M552,399.8063 C552,402.3063 554.1406,404.1188 557.0625,404.1188 C558.2969,404.1188 559.4688,403.8219 560.2188,403.3063 C560.8281,402.8844 561.1563,402.4625 561.1563,402.0563 C561.1563,401.5875 560.7344,401.1813 560.2344,401.1813 C560,401.1813 559.7813,401.2594 559.5781,401.4625 C559.1406,401.9 559.1406,401.9 558.9688,401.9938 C558.5156,402.2281 557.875,402.3688 557.1094,402.3688 C555.1094,402.3688 553.8281,401.3531 553.8281,399.775 L553.8281,398.7281 C553.8281,397.025 555.0469,395.8219 556.75,395.8219 C557.3281,395.8219 557.9063,395.9625 558.375,396.2125 C558.8438,396.4781 559.0156,396.6656 559.0781,397.025 C559.2031,397.6969 559.4531,397.9469 559.9844,397.9469 C560.2656,397.9469 560.5469,397.8063 560.7344,397.5875 C560.8594,397.4156 560.9063,397.2438 560.9063,396.8063 L560.9063,395.4469 C560.9063,395.025 560.8906,394.8844 560.7656,394.7125 C560.5938,394.4625 560.3125,394.3063 559.9844,394.3063 C559.6719,394.3063 559.4688,394.4156 559.25,394.6813 C558.0781,394.1813 557.6406,394.0719 556.6875,394.0719 C554.0156,394.0719 552,396.0875 552,398.7125 L552,399.8063 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="571" y="403.256">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="543" x2="583" y1="414.65" y2="414.65"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="543" x2="583" y1="422.65" y2="422.65"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1poie1aqybmga)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
-      <ellipse cx="1721.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1724.4688,390.6406 Q1723.8906,390.9375 1723.25,391.0781 Q1722.6094,391.2344 1721.9063,391.2344 Q1719.4063,391.2344 1718.0781,389.5938 Q1716.7656,387.9375 1716.7656,384.8125 Q1716.7656,381.6875 1718.0781,380.0313 Q1719.4063,378.375 1721.9063,378.375 Q1722.6094,378.375 1723.25,378.5313 Q1723.9063,378.6875 1724.4688,378.9844 L1724.4688,381.7031 Q1723.8438,381.125 1723.25,380.8594 Q1722.6563,380.5781 1722.0313,380.5781 Q1720.6875,380.5781 1720,381.6563 Q1719.3125,382.7188 1719.3125,384.8125 Q1719.3125,386.9063 1720,387.9844 Q1720.6875,389.0469 1722.0313,389.0469 Q1722.6563,389.0469 1723.25,388.7813 Q1723.8438,388.5 1724.4688,387.9219 L1724.4688,390.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1735.5" y="389.1543">utils::D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="401" y2="401"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="409" y2="409"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001492514566602019299">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001492514566602019299" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="75" x="1597.5" y="382.65"/>
+        <ellipse cx="1612.5" cy="398.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1607.5,399.8063 C1607.5,402.3063 1609.6406,404.1188 1612.5625,404.1188 C1613.7969,404.1188 1614.9688,403.8219 1615.7188,403.3063 C1616.3281,402.8844 1616.6563,402.4625 1616.6563,402.0563 C1616.6563,401.5875 1616.2344,401.1813 1615.7344,401.1813 C1615.5,401.1813 1615.2813,401.2594 1615.0781,401.4625 C1614.6406,401.9 1614.6406,401.9 1614.4688,401.9938 C1614.0156,402.2281 1613.375,402.3688 1612.6094,402.3688 C1610.6094,402.3688 1609.3281,401.3531 1609.3281,399.775 L1609.3281,398.7281 C1609.3281,397.025 1610.5469,395.8219 1612.25,395.8219 C1612.8281,395.8219 1613.4063,395.9625 1613.875,396.2125 C1614.3438,396.4781 1614.5156,396.6656 1614.5781,397.025 C1614.7031,397.6969 1614.9531,397.9469 1615.4844,397.9469 C1615.7656,397.9469 1616.0469,397.8063 1616.2344,397.5875 C1616.3594,397.4156 1616.4063,397.2438 1616.4063,396.8063 L1616.4063,395.4469 C1616.4063,395.025 1616.3906,394.8844 1616.2656,394.7125 C1616.0938,394.4625 1615.8125,394.3063 1615.4844,394.3063 C1615.1719,394.3063 1614.9688,394.4156 1614.75,394.6813 C1613.5781,394.1813 1613.1406,394.0719 1612.1875,394.0719 C1609.5156,394.0719 1607.5,396.0875 1607.5,398.7125 L1607.5,399.8063 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="1626.5" y="403.256">utils::D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1598.5" x2="1671.5" y1="414.65" y2="414.65"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1598.5" x2="1671.5" y1="422.65" y2="422.65"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1poie1aqybmga)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
-      <ellipse cx="1847" cy="46.5" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1851.1094,52.5 L1843.3906,52.5 L1843.3906,40.1094 L1851.1094,40.1094 L1851.1094,42.2656 L1845.8438,42.2656 L1845.8438,44.9375 L1850.6094,44.9375 L1850.6094,47.0938 L1845.8438,47.0938 L1845.8438,50.3438 L1851.1094,50.3438 L1851.1094,52.5 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1861" y="50.6543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="62.5" y2="62.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="76.7104">E1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="89.5151">E2</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="102.3198">E3</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="108.9141" y2="108.9141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0002027344031570117998">
+        <rect codeLine="18" fill="#F1F1F1" height="98.3998" id="C_0002027344031570117998" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1718.5" y="27.12"/>
+        <ellipse cx="1733.5" cy="43.12" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1732.3594,44.1825 L1733.6719,44.1825 L1733.6719,44.2294 C1733.6719,44.6356 1733.6875,44.7919 1733.7969,44.9481 C1733.9688,45.1981 1734.2656,45.37 1734.5781,45.37 C1734.8594,45.37 1735.1563,45.2294 1735.3281,45.0106 C1735.4531,44.8231 1735.5,44.6825 1735.5,44.2294 L1735.5,42.3856 C1735.5,42.0575 1735.4844,41.9481 1735.4219,41.7763 C1735.3125,41.4794 1734.9531,41.2294 1734.5781,41.2294 C1734.2813,41.2294 1734.0156,41.37 1733.8438,41.5888 C1733.7031,41.7763 1733.6719,41.9481 1733.6719,42.3856 L1733.6719,42.4481 L1732.3594,42.4481 L1732.3594,40.2763 L1736.2031,40.2763 L1736.2031,41.0263 C1736.2031,41.4169 1736.2344,41.6044 1736.3438,41.7606 C1736.5156,42.0106 1736.8125,42.1825 1737.125,42.1825 C1737.4219,42.1825 1737.6875,42.0575 1737.875,41.8231 C1738.0156,41.6356 1738.0469,41.495 1738.0469,41.0263 L1738.0469,38.5263 L1730.3438,38.5263 C1729.8906,38.5263 1729.7656,38.5419 1729.5938,38.6513 C1729.3281,38.8231 1729.1563,39.0888 1729.1563,39.4013 C1729.1563,39.6825 1729.2813,39.9481 1729.5313,40.12 C1729.7188,40.245 1729.9063,40.2763 1730.3438,40.2763 L1730.5313,40.2763 L1730.5313,46.37 L1730.3438,46.37 C1729.9219,46.37 1729.7656,46.4013 1729.5938,46.495 C1729.3281,46.6513 1729.1563,46.9325 1729.1563,47.2294 C1729.1563,47.8075 1729.5625,48.12 1730.3438,48.12 L1738.4219,48.12 L1738.4219,45.5888 C1738.4219,45.1825 1738.3906,45.0106 1738.2813,44.8544 C1738.1094,44.5888 1737.8281,44.4325 1737.5,44.4325 C1737.2188,44.4325 1736.9375,44.5731 1736.75,44.7919 C1736.6094,44.9794 1736.5781,45.1356 1736.5781,45.5888 L1736.5781,46.37 L1732.3594,46.37 L1732.3594,44.1825 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1747.5" y="47.726">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1719.5" x2="1758.5" y1="59.12" y2="59.12"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="1724.5" y="76.1259">E1</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="1724.5" y="92.9259">E2</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="1724.5" y="109.7258">E3</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1719.5" x2="1758.5" y1="117.5198" y2="117.5198"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1poie1aqybmga)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
-      <ellipse cx="2068.5" cy="372" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M2071.4688,377.6406 Q2070.8906,377.9375 2070.25,378.0781 Q2069.6094,378.2344 2068.9063,378.2344 Q2066.4063,378.2344 2065.0781,376.5938 Q2063.7656,374.9375 2063.7656,371.8125 Q2063.7656,368.6875 2065.0781,367.0313 Q2066.4063,365.375 2068.9063,365.375 Q2069.6094,365.375 2070.25,365.5313 Q2070.9063,365.6875 2071.4688,365.9844 L2071.4688,368.7031 Q2070.8438,368.125 2070.25,367.8594 Q2069.6563,367.5781 2069.0313,367.5781 Q2067.6875,367.5781 2067,368.6563 Q2066.3125,369.7188 2066.3125,371.8125 Q2066.3125,373.9063 2067,374.9844 Q2067.6875,376.0469 2069.0313,376.0469 Q2069.6563,376.0469 2070.25,375.7813 Q2070.8438,375.5 2071.4688,374.9219 L2071.4688,377.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="2082.5" y="376.1543">F</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="54" x="2097.5" y="353"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="52" x="2098.5" y="365.1387">T,V,int N</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="388" y2="388"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="396" y2="396"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
+      <g id="elem_C_0000793698410848959592">
+        <rect codeLine="24" fill="#F1F1F1" height="81.5999" id="C_0000793698410848959592" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="91" x="1928.5" y="365.85"/>
+        <ellipse cx="1943.5" cy="381.85" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1938.5,383.0063 C1938.5,385.5063 1940.6406,387.3188 1943.5625,387.3188 C1944.7969,387.3188 1945.9688,387.0219 1946.7188,386.5063 C1947.3281,386.0844 1947.6563,385.6625 1947.6563,385.2563 C1947.6563,384.7875 1947.2344,384.3813 1946.7344,384.3813 C1946.5,384.3813 1946.2813,384.4594 1946.0781,384.6625 C1945.6406,385.1 1945.6406,385.1 1945.4688,385.1938 C1945.0156,385.4281 1944.375,385.5688 1943.6094,385.5688 C1941.6094,385.5688 1940.3281,384.5531 1940.3281,382.975 L1940.3281,381.9281 C1940.3281,380.225 1941.5469,379.0219 1943.25,379.0219 C1943.8281,379.0219 1944.4063,379.1625 1944.875,379.4125 C1945.3438,379.6781 1945.5156,379.8656 1945.5781,380.225 C1945.7031,380.8969 1945.9531,381.1469 1946.4844,381.1469 C1946.7656,381.1469 1947.0469,381.0063 1947.2344,380.7875 C1947.3594,380.6156 1947.4063,380.4438 1947.4063,380.0063 L1947.4063,378.6469 C1947.4063,378.225 1947.3906,378.0844 1947.2656,377.9125 C1947.0938,377.6625 1946.8125,377.5063 1946.4844,377.5063 C1946.1719,377.5063 1945.9688,377.6156 1945.75,377.8813 C1944.5781,377.3813 1944.1406,377.2719 1943.1875,377.2719 C1940.5156,377.2719 1938.5,379.2875 1938.5,381.9125 L1938.5,383.0063 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1957.5" y="386.456">F</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="48" x="1974.5" y="362.85"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="46" x="1975.5" y="377.0501">T,V,int N</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1929.5" x2="2018.5" y1="397.85" y2="397.85"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1929.5" x2="2018.5" y1="405.85" y2="405.85"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1934.5" y="414.75"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="1936.5" y="416.75"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="1948.5" y="422.8559">t : T[N]</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1934.5" y="431.5499"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="1936.5" y="433.5499"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="1948.5" y="439.6559">v : V</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="402"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="404"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0000449485154531299941">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000449485154531299941" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="775.5" y="382.65"/>
+        <ellipse cx="790.5" cy="398.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M785.5,399.8063 C785.5,402.3063 787.6406,404.1188 790.5625,404.1188 C791.7969,404.1188 792.9688,403.8219 793.7188,403.3063 C794.3281,402.8844 794.6563,402.4625 794.6563,402.0563 C794.6563,401.5875 794.2344,401.1813 793.7344,401.1813 C793.5,401.1813 793.2813,401.2594 793.0781,401.4625 C792.6406,401.9 792.6406,401.9 792.4688,401.9938 C792.0156,402.2281 791.375,402.3688 790.6094,402.3688 C788.6094,402.3688 787.3281,401.3531 787.3281,399.775 L787.3281,398.7281 C787.3281,397.025 788.5469,395.8219 790.25,395.8219 C790.8281,395.8219 791.4063,395.9625 791.875,396.2125 C792.3438,396.4781 792.5156,396.6656 792.5781,397.025 C792.7031,397.6969 792.9531,397.9469 793.4844,397.9469 C793.7656,397.9469 794.0469,397.8063 794.2344,397.5875 C794.3594,397.4156 794.4063,397.2438 794.4063,396.8063 L794.4063,395.4469 C794.4063,395.025 794.3906,394.8844 794.2656,394.7125 C794.0938,394.4625 793.8125,394.3063 793.4844,394.3063 C793.1719,394.3063 792.9688,394.4156 792.75,394.6813 C791.5781,394.1813 791.1406,394.0719 790.1875,394.0719 C787.5156,394.0719 785.5,396.0875 785.5,398.7125 L785.5,399.8063 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="804.5" y="403.256">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="776.5" x2="817.5" y1="414.65" y2="414.65"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="776.5" x2="817.5" y1="422.65" y2="422.65"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="2073.5" y="410.2104">t : T[N]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
+      <g id="elem_C_0001832693799357996932">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0001832693799357996932" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="2219" y="52.32"/>
+        <ellipse cx="2234" cy="68.32" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M2229,69.4763 C2229,71.9763 2231.1406,73.7888 2234.0625,73.7888 C2235.2969,73.7888 2236.4688,73.4919 2237.2188,72.9763 C2237.8281,72.5544 2238.1563,72.1325 2238.1563,71.7263 C2238.1563,71.2575 2237.7344,70.8513 2237.2344,70.8513 C2237,70.8513 2236.7813,70.9294 2236.5781,71.1325 C2236.1406,71.57 2236.1406,71.57 2235.9688,71.6638 C2235.5156,71.8981 2234.875,72.0388 2234.1094,72.0388 C2232.1094,72.0388 2230.8281,71.0231 2230.8281,69.445 L2230.8281,68.3981 C2230.8281,66.695 2232.0469,65.4919 2233.75,65.4919 C2234.3281,65.4919 2234.9063,65.6325 2235.375,65.8825 C2235.8438,66.1481 2236.0156,66.3356 2236.0781,66.695 C2236.2031,67.3669 2236.4531,67.6169 2236.9844,67.6169 C2237.2656,67.6169 2237.5469,67.4763 2237.7344,67.2575 C2237.8594,67.0856 2237.9063,66.9138 2237.9063,66.4763 L2237.9063,65.1169 C2237.9063,64.695 2237.8906,64.5544 2237.7656,64.3825 C2237.5938,64.1325 2237.3125,63.9763 2236.9844,63.9763 C2236.6719,63.9763 2236.4688,64.0856 2236.25,64.3513 C2235.0781,63.8513 2234.6406,63.7419 2233.6875,63.7419 C2231.0156,63.7419 2229,65.7575 2229,68.3825 L2229,69.4763 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="2248" y="72.926">NoComment</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="2220" x2="2330" y1="84.32" y2="84.32"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="2220" x2="2330" y1="92.32" y2="92.32"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="414.8047"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="416.8047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="2073.5" y="423.0151">v : V</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1poie1aqybmga)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
-      <ellipse cx="844.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M847.4688,390.6406 Q846.8906,390.9375 846.25,391.0781 Q845.6094,391.2344 844.9063,391.2344 Q842.4063,391.2344 841.0781,389.5938 Q839.7656,387.9375 839.7656,384.8125 Q839.7656,381.6875 841.0781,380.0313 Q842.4063,378.375 844.9063,378.375 Q845.6094,378.375 846.25,378.5313 Q846.9063,378.6875 847.4688,378.9844 L847.4688,381.7031 Q846.8438,381.125 846.25,380.8594 Q845.6563,380.5781 845.0313,380.5781 Q843.6875,380.5781 843,381.6563 Q842.3125,382.7188 842.3125,384.8125 Q842.3125,386.9063 843,387.9844 Q843.6875,389.0469 845.0313,389.0469 Q845.6563,389.0469 846.25,388.7813 Q846.8438,388.5 847.4688,387.9219 L847.4688,390.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="858.5" y="389.1543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="401" y2="401"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="409" y2="409"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1poie1aqybmga)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
-      <ellipse cx="2376" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M2378.9688,71.1406 Q2378.3906,71.4375 2377.75,71.5781 Q2377.1094,71.7344 2376.4063,71.7344 Q2373.9063,71.7344 2372.5781,70.0938 Q2371.2656,68.4375 2371.2656,65.3125 Q2371.2656,62.1875 2372.5781,60.5313 Q2373.9063,58.875 2376.4063,58.875 Q2377.1094,58.875 2377.75,59.0313 Q2378.4063,59.1875 2378.9688,59.4844 L2378.9688,62.2031 Q2378.3438,61.625 2377.75,61.3594 Q2377.1563,61.0781 2376.5313,61.0781 Q2375.1875,61.0781 2374.5,62.1563 Q2373.8125,63.2188 2373.8125,65.3125 Q2373.8125,67.4063 2374.5,68.4844 Q2375.1875,69.5469 2376.5313,69.5469 Q2377.1563,69.5469 2377.75,69.2813 Q2378.3438,69 2378.9688,68.4219 L2378.9688,71.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="2390" y="69.6543">NoComment</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="81.5" y2="81.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="89.5" y2="89.5"/>
-    </a>
-    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M156,61 L156,71 L166,71 L156,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="12" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M466,61 L466,71 L476,71 L466,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="282" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M534.5,199 L534.5,209 L544.5,209 L534.5,199 " fill="#AABBCC" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="484" x="33.5" y="216.0669">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="434" x="25.5" y="231.1997">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="470" x="25.5" y="246.3325">Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="444" x="25.5" y="261.4653">integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="176" x="25.5" y="276.5981">tellus ligula porttitor metus.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="29.5" y="291.731"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="476" x="25.5" y="306.8638">Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="472" x="25.5" y="321.9966">euismod libero facilisi aptent elementum felis blandit cursus gravida sociis</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="473" x="25.5" y="337.1294">erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="433" x="25.5" y="352.2622">ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="462" x="25.5" y="367.395">ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="468" x="25.5" y="382.5278">volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="433" x="25.5" y="397.6606">conubia mauris tempor, etiam ultricies proin quisque lectus sociis id</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="415" x="25.5" y="412.7935">tristique, integer phasellus taciti pretium adipiscing tortor sagittis</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="25.5" y="427.9263">ligula.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="29.5" y="443.0591"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="419" x="25.5" y="458.1919">Mollis pretium lorem primis senectus habitasse lectus scelerisque</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="421" x="25.5" y="473.3247">donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="496" x="25.5" y="488.4575">pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="498" x="25.5" y="503.5903">lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="504" x="25.5" y="518.7231">taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="493" x="25.5" y="533.856">est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="440" x="25.5" y="548.9888">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="453" x="25.5" y="564.1216">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="386" x="25.5" y="579.2544">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
-    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M966.5,61 L966.5,71 L976.5,71 L966.5,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="232" x="729.5" y="78.0669">This is a short description of class G.</text>
-    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1206,380.5 L1206,390.5 L1216,390.5 L1206,380.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="289" x="912" y="397.5669">This is an intermediate description of class G.</text>
-    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M963.5,647 L963.5,657 L973.5,657 L963.5,647 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="226" x="732.5" y="664.0669">This is a long description of class G.</text>
-    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1106.5,53.5 L1106.5,63.5 L1116.5,63.5 L1106.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1017.5" y="70.5669">Lorem ipsum</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1021.5" y="85.6997"/>
-    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1356,38 L1356,48 L1366,48 L1356,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1158" y="55.0669">TODO</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="1162" y="70.1997">1. Write meaningful comment</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="85.3325"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="100.4653"/>
-    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1500.5,38 L1500.5,48 L1510.5,48 L1500.5,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1407.5" y="55.0669">TODO</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1411.5" y="70.1997">2. Write tests</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="85.3325"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="100.4653"/>
-    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1646,46 L1646,56 L1656,56 L1646,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1552" y="63.0669">TODO</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1556" y="78.1997">3. Implement</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1556" y="93.3325"/>
-    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M678.5,53.5 L678.5,63.5 L688.5,63.5 L678.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="517.5" y="70.5669">Long comment example</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="521.5" y="85.6997"/>
-    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1787,46 L1787,56 L1797,56 L1787,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1697" y="63.0669">TODO</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="1701" y="78.1997">Implement...</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1701" y="93.3325"/>
-    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M2058.5,53.5 L2058.5,63.5 L2068.5,63.5 L2058.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="1913.5" y="70.5669">Simple array wrapper.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1917.5" y="85.6997"/>
-    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#f1poie1aqybmga)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M2316,8 L2316,18 L2326,18 L2316,8 " fill="#AAAAFF" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="160" x="2110" y="25.0669">Template parameters</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="40.1997"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="2110" y="55.3325">T</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="151" x="2122" y="55.3325">Type of array elements.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="70.4653"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="9" x="2110" y="85.5981">V</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="2123" y="85.5981">Type of regular element.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="100.731"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="10" x="2110" y="115.8638">N</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="2124" y="115.8638">Size of T array.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="130.9966"/>
-    <path d="M1082.7,93.66 C1096.31,107.11 1115.51,125.1 1134,139 C1175.12,169.92 1195.7,163.57 1233,199 C1287.91,251.15 1332.5,330.1 1352.55,368.86 " fill="none" id="GMN808-C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <g id="elem_GMN10">
+      <path d="M6,63.52 L6,89.12 A0,0 0 0 0 6,89.12 L152,89.12 A0,0 0 0 0 152,89.12 L152,81.52 L186.14,76.32 L152,73.52 L152,73.52 L142,63.52 L6,63.52 A0,0 0 0 0 6,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M142,63.52 L142,73.52 L152,73.52 L142,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="12" y="80.597">Lorem ipsum dolor sit</text>
+    </g>
+    <g id="elem_GMN13">
+      <path d="M262,63.52 L262,72.32 L227.81,76.32 L262,80.32 L262,89.12 A0,0 0 0 0 262,89.12 L448,89.12 A0,0 0 0 0 448,89.12 L448,73.52 L438,63.52 L262,63.52 A0,0 0 0 0 262,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M438,63.52 L438,73.52 L448,73.52 L438,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="268" y="80.597">Lorem ipsum dolor sit</text>
+    </g>
+    <g id="elem_GMN16">
+      <path d="M28.5,206.65 L28.5,606.6503 A0,0 0 0 0 28.5,606.6503 L507.5,606.6503 A0,0 0 0 0 507.5,606.6503 L507.5,410.65 L541.51,406.65 L507.5,402.65 L507.5,216.65 L497.5,206.65 L28.5,206.65 A0,0 0 0 0 28.5,206.65 " fill="#AABBCC" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M497.5,206.65 L497.5,216.65 L507.5,216.65 L497.5,206.65 " fill="#AABBCC" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="438" x="42.5" y="223.727">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="398" x="34.5" y="239.327">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="424" x="34.5" y="254.927">Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="402" x="34.5" y="270.5271">integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="157" x="34.5" y="286.1271">tellus ligula porttitor metus.</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="34.5" y="301.7271"> </text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="431" x="34.5" y="317.3271">Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="430" x="34.5" y="332.9271">euismod libero facilisi aptent elementum felis blandit cursus gravida sociis</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="425" x="34.5" y="348.5271">erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="393" x="34.5" y="364.1271">ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="414" x="34.5" y="379.7271">ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="424" x="34.5" y="395.3272">volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="393" x="34.5" y="410.9272">conubia mauris tempor, etiam ultricies proin quisque lectus sociis id</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="373" x="34.5" y="426.5272">tristique, integer phasellus taciti pretium adipiscing tortor sagittis</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="34.5" y="442.1272">ligula.</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="34.5" y="457.7272"> </text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="382" x="34.5" y="473.3272">Mollis pretium lorem primis senectus habitasse lectus scelerisque</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="383" x="34.5" y="488.9272">donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="449" x="34.5" y="504.5273">pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="454" x="34.5" y="520.1273">lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="458" x="34.5" y="535.7273">taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="444" x="34.5" y="551.3273">est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="394" x="34.5" y="566.9273">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="407" x="34.5" y="582.5273">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="348" x="34.5" y="598.1273">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
+    </g>
+    <g id="elem_GMN19">
+      <path d="M677.5,63.52 L677.5,89.12 A0,0 0 0 0 677.5,89.12 L793,89.12 L797,382.47 L801,89.12 L916.5,89.12 A0,0 0 0 0 916.5,89.12 L916.5,73.52 L906.5,63.52 L677.5,63.52 A0,0 0 0 0 677.5,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M906.5,63.52 L906.5,73.52 L916.5,73.52 L906.5,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="218" x="683.5" y="80.597">This is a short description of class G.</text>
+    </g>
+    <g id="elem_GMN22">
+      <path d="M853,393.85 L853,402.65 L818.88,406.65 L853,410.65 L853,419.45 A0,0 0 0 0 853,419.45 L1141,419.45 A0,0 0 0 0 1141,419.45 L1141,403.85 L1131,393.85 L853,393.85 A0,0 0 0 0 853,393.85 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M1131,393.85 L1131,403.85 L1141,403.85 L1131,393.85 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="267" x="859" y="410.927">This is an intermediate description of class G.</text>
+    </g>
+    <g id="elem_GMN25">
+      <path d="M680,666.65 L680,692.25 A0,0 0 0 0 680,692.25 L914,692.25 A0,0 0 0 0 914,692.25 L914,676.65 L904,666.65 L801,666.65 L797,430.74 L793,666.65 L680,666.65 A0,0 0 0 0 680,666.65 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M904,666.65 L904,676.65 L914,676.65 L904,666.65 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="213" x="686" y="683.727">This is a long description of class G.</text>
+    </g>
+    <g id="elem_GMN28">
+      <path d="M951,55.72 L951,96.92 L1047,96.92 L1047,65.72 L1037,55.72 L951,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M1037,55.72 L1037,65.72 L1047,65.72 L1037,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="75" x="957" y="72.797">Lorem ipsum</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="957" y="88.397"> </text>
+    </g>
+    <g id="elem_GMN31">
+      <path d="M1081.5,40.12 L1081.5,112.5201 A0,0 0 0 0 1081.5,112.5201 L1185.9,112.5201 L1272.81,382.26 L1193.9,112.5201 L1276.5,112.5201 A0,0 0 0 0 1276.5,112.5201 L1276.5,50.12 L1266.5,40.12 L1081.5,40.12 A0,0 0 0 0 1081.5,40.12 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M1266.5,40.12 L1266.5,50.12 L1276.5,50.12 L1266.5,40.12 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="37" x="1087.5" y="57.197">TODO</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="170" x="1091.5" y="72.797">1. Write meaningful comment</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1087.5" y="88.397"> </text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1087.5" y="103.9971"> </text>
+    </g>
+    <g id="elem_GMN34">
+      <path d="M1311.5,40.12 L1311.5,112.5201 A0,0 0 0 0 1311.5,112.5201 L1350.04,112.5201 L1285.91,382.26 L1358.04,112.5201 L1414.5,112.5201 A0,0 0 0 0 1414.5,112.5201 L1414.5,50.12 L1404.5,40.12 L1311.5,40.12 A0,0 0 0 0 1311.5,40.12 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M1404.5,40.12 L1404.5,50.12 L1414.5,50.12 L1404.5,40.12 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="37" x="1317.5" y="57.197">TODO</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="78" x="1321.5" y="72.797">2. Write tests</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1317.5" y="88.397"> </text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1317.5" y="103.9971"> </text>
+    </g>
+    <g id="elem_GMN37">
+      <path d="M1449.5,47.92 L1449.5,104.72 A0,0 0 0 0 1449.5,104.72 L1477.43,104.72 L1295.74,382.16 L1485.43,104.72 L1550.5,104.72 A0,0 0 0 0 1550.5,104.72 L1550.5,57.92 L1540.5,47.92 L1449.5,47.92 A0,0 0 0 0 1449.5,47.92 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M1540.5,47.92 L1540.5,57.92 L1550.5,57.92 L1540.5,47.92 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="37" x="1455.5" y="64.997">TODO</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="76" x="1459.5" y="80.597">3. Implement</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1455.5" y="96.197"> </text>
+    </g>
+    <g id="elem_GMN40">
+      <path d="M483,55.72 L483,96.92 A0,0 0 0 0 483,96.92 L559,96.92 L563,382.43 L567,96.92 L643,96.92 A0,0 0 0 0 643,96.92 L643,65.72 L633,55.72 L483,55.72 A0,0 0 0 0 483,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M633,55.72 L633,65.72 L643,65.72 L633,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="139" x="489" y="72.797">Long comment example</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="489" y="88.397"> </text>
+    </g>
+    <g id="elem_GMN43">
+      <path d="M1586,47.92 L1586,104.72 A0,0 0 0 0 1586,104.72 L1631,104.72 L1635,382.16 L1639,104.72 L1684,104.72 A0,0 0 0 0 1684,104.72 L1684,57.92 L1674,47.92 L1586,47.92 A0,0 0 0 0 1586,47.92 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M1674,47.92 L1674,57.92 L1684,57.92 L1674,47.92 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="37" x="1592" y="64.997">TODO</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="1596" y="80.597">Implement...</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1592" y="96.197"> </text>
+    </g>
+    <g id="elem_GMN46">
+      <path d="M1794.5,55.72 L1794.5,96.92 A0,0 0 0 0 1794.5,96.92 L1870.47,96.92 L1961.06,365.57 L1878.47,96.92 L1941.5,96.92 A0,0 0 0 0 1941.5,96.92 L1941.5,65.72 L1931.5,55.72 L1794.5,55.72 A0,0 0 0 0 1794.5,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M1931.5,55.72 L1931.5,65.72 L1941.5,65.72 L1931.5,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="126" x="1800.5" y="72.797">Simple array wrapper.</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1800.5" y="88.397"> </text>
+    </g>
+    <g id="elem_GMN49">
+      <path d="M1976.5,6 L1976.5,146.6501 A0,0 0 0 0 1976.5,146.6501 L2053.52,146.6501 L1986.95,365.52 L2061.52,146.6501 L2183.5,146.6501 A0,0 0 0 0 2183.5,146.6501 L2183.5,16 L2173.5,6 L1976.5,6 A0,0 0 0 0 1976.5,6 " fill="#AAAAFF" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M2173.5,6 L2173.5,16 L2183.5,16 L2173.5,6 " fill="#AAAAFF" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="130" x="1982.5" y="23.077">Template parameters</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1982.5" y="38.677"> </text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="8" x="1982.5" y="56.5">T</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="138" x="1994.5" y="56.227">Type of array elements.</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1982.5" y="71.8271"> </text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="9" x="1982.5" y="89.6501">V</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="141" x="1995.5" y="89.3771">Type of regular element.</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1982.5" y="104.9771"> </text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="9" x="1982.5" y="122.8001">N</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="90" x="1995.5" y="122.5271">Size of T array.</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1982.5" y="138.1271"> </text>
+    </g>
+    <g id="link_GMN28_C_0000500262098409836244">
+      <path d="M1015.47,97.42 C1027.95,111.99 1045.97,131.69 1064,146.65 C1102.14,178.31 1123.27,171.29 1158,206.65 C1211.24,260.86 1251.94,342.41 1269.91,382.18 " fill="none" id="GMN28-C_0000500262098409836244" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00050_class_mermaid.svg b/docs/test_cases/t00050_class_mermaid.svg
index ec069114..012e975f 100644
--- a/docs/test_cases/t00050_class_mermaid.svg
+++ b/docs/test_cases/t00050_class_mermaid.svg
@@ -1,50 +1,55 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 4049.046875 632" style="max-width: 4049.05px; background-color: white;" width="4049.046875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -184,7 +189,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L9">
+        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L9">
           <g title="A" id="classId-C_0001885563213397742674-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -203,7 +208,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L24">
+        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L24">
           <g title="Lorem ipsum" id="classId-C_0000500262098409836244-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +227,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L53">
+        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L53">
           <g title="Long comment example" id="classId-C_0001663081653671078922-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -241,7 +246,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L65">
+        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L65">
           <g title="D" id="classId-C_0001492514566602019299-3" class="node default clickable">
             <rect height="57" width="70.109375" y="-28.5" x="-35.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.0546875" x1="-35.0546875" class="divider"/>
@@ -260,7 +265,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L70">
+        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L70">
           <g title="E" id="classId-C_0002027344031570117998-4" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -294,7 +299,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L81">
+        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L81">
           <g title="Simple array wrapper." id="classId-C_0000793698410848959592-5" class="node default clickable">
             <rect height="101" width="105.109375" y="-50.5" x="-52.5546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="52.5546875" x1="-52.5546875" class="divider"/>
@@ -323,7 +328,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L91">
+        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L91">
           <g title="G" id="classId-C_0000449485154531299941-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -342,7 +347,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00050/t00050.cc#L93">
+        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L93">
           <g title="NoComment" id="classId-C_0001832693799357996932-7" class="node default clickable">
             <rect height="57" width="110.109375" y="-28.5" x="-55.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md
index 0f6587fa..d7e54070 100644
--- a/docs/test_cases/t00051.md
+++ b/docs/test_cases/t00051.md
@@ -12,7 +12,7 @@ diagrams:
     using_namespace: clanguml::t00051
 ```
 ## Source code
-File t00051.cc
+File `tests/t00051/t00051.cc`
 ```cpp
 #include <thread>
 
@@ -138,6 +138,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -172,6 +173,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -197,6 +199,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -291,6 +294,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -325,6 +329,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -350,6 +355,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -411,6 +417,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -436,6 +443,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -461,6 +469,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -486,6 +495,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -541,6 +551,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -599,6 +610,7 @@ A::custom_thread2 A::start_thread2()
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg
index cefcead2..4b717169 100644
--- a/docs/test_cases/t00051_class.svg
+++ b/docs/test_cases/t00051_class.svg
@@ -1,178 +1,190 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="599px" preserveAspectRatio="none" style="width:789px;height:599px;" version="1.1" viewBox="0 0 789 599" width="789px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="653px" preserveAspectRatio="none" style="width:846px;height:653px;background:#FFFFFF;" version="1.1" viewBox="0 0 846 653" width="846px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13cmjuctsf88y" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13cmjuctsf88y)" height="120.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="346" y="468"/>
-      <ellipse cx="400.25" cy="484" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M403.2188,489.6406 Q402.6406,489.9375 402,490.0781 Q401.3594,490.2344 400.6563,490.2344 Q398.1563,490.2344 396.8281,488.5938 Q395.5156,486.9375 395.5156,483.8125 Q395.5156,480.6875 396.8281,479.0313 Q398.1563,477.375 400.6563,477.375 Q401.3594,477.375 402,477.5313 Q402.6563,477.6875 403.2188,477.9844 L403.2188,480.7031 Q402.5938,480.125 402,479.8594 Q401.4063,479.5781 400.7813,479.5781 Q399.4375,479.5781 398.75,480.6563 Q398.0625,481.7188 398.0625,483.8125 Q398.0625,485.9063 398.75,486.9844 Q399.4375,488.0469 400.7813,488.0469 Q401.4063,488.0469 402,487.7813 Q402.5938,487.5 403.2188,486.9219 L403.2188,489.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="420.75" y="488.1543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="44" x="476" y="465"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="477" y="477.1387">F,FF=F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="516" y1="500" y2="500"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000486675674447050206">
+        <rect codeLine="2" fill="#F1F1F1" height="139.9996" id="C_0000486675674447050206" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="182" x="373.5" y="507"/>
+        <ellipse cx="434.75" cy="523" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M429.75,524.1563 C429.75,526.6563 431.8906,528.4688 434.8125,528.4688 C436.0469,528.4688 437.2188,528.1719 437.9688,527.6563 C438.5781,527.2344 438.9063,526.8125 438.9063,526.4063 C438.9063,525.9375 438.4844,525.5313 437.9844,525.5313 C437.75,525.5313 437.5313,525.6094 437.3281,525.8125 C436.8906,526.25 436.8906,526.25 436.7188,526.3438 C436.2656,526.5781 435.625,526.7188 434.8594,526.7188 C432.8594,526.7188 431.5781,525.7031 431.5781,524.125 L431.5781,523.0781 C431.5781,521.375 432.7969,520.1719 434.5,520.1719 C435.0781,520.1719 435.6563,520.3125 436.125,520.5625 C436.5938,520.8281 436.7656,521.0156 436.8281,521.375 C436.9531,522.0469 437.2031,522.2969 437.7344,522.2969 C438.0156,522.2969 438.2969,522.1563 438.4844,521.9375 C438.6094,521.7656 438.6563,521.5938 438.6563,521.1563 L438.6563,519.7969 C438.6563,519.375 438.6406,519.2344 438.5156,519.0625 C438.3438,518.8125 438.0625,518.6563 437.7344,518.6563 C437.4219,518.6563 437.2188,518.7656 437,519.0313 C435.8281,518.5313 435.3906,518.4219 434.4375,518.4219 C431.7656,518.4219 429.75,520.4375 429.75,523.0625 L429.75,524.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="455.25" y="527.606">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="40" x="518.5" y="504"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="38" x="519.5" y="518.2001">F,FF=F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="374.5" x2="554.5" y1="539" y2="539"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="547.9"/>
+          <ellipse cx="384.5" cy="552.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="156" x="393.5" y="556.0059">B(F &amp;&amp; f, FF &amp;&amp; ff) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="374.5" x2="554.5" y1="563.7999" y2="563.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="572.6999"/>
+          <ellipse cx="384.5" cy="577.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="393.5" y="580.8059">f() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="589.4998"/>
+          <ellipse cx="384.5" cy="594.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="393.5" y="597.6058">ff() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="374.5" x2="554.5" y1="605.3998" y2="605.3998"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="614.2997"/>
+          <ellipse cx="384.5" cy="619.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="393.5" y="622.4057">f_ : F</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="631.0997"/>
+          <ellipse cx="384.5" cy="636.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="393.5" y="639.2057">ff_ : FF</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="506"/>
-      <ellipse cx="357" cy="511" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001969502737237579476">
+        <rect codeLine="12" fill="#F1F1F1" height="139.9996" id="C_0001969502737237579476" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="513" x="208" y="307"/>
+        <ellipse cx="300.25" cy="323" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M295.25,324.1563 C295.25,326.6563 297.3906,328.4688 300.3125,328.4688 C301.5469,328.4688 302.7188,328.1719 303.4688,327.6563 C304.0781,327.2344 304.4063,326.8125 304.4063,326.4063 C304.4063,325.9375 303.9844,325.5313 303.4844,325.5313 C303.25,325.5313 303.0313,325.6094 302.8281,325.8125 C302.3906,326.25 302.3906,326.25 302.2188,326.3438 C301.7656,326.5781 301.125,326.7188 300.3594,326.7188 C298.3594,326.7188 297.0781,325.7031 297.0781,324.125 L297.0781,323.0781 C297.0781,321.375 298.2969,320.1719 300,320.1719 C300.5781,320.1719 301.1563,320.3125 301.625,320.5625 C302.0938,320.8281 302.2656,321.0156 302.3281,321.375 C302.4531,322.0469 302.7031,322.2969 303.2344,322.2969 C303.5156,322.2969 303.7969,322.1563 303.9844,321.9375 C304.1094,321.7656 304.1563,321.5938 304.1563,321.1563 L304.1563,319.7969 C304.1563,319.375 304.1406,319.2344 304.0156,319.0625 C303.8438,318.8125 303.5625,318.6563 303.2344,318.6563 C302.9219,318.6563 302.7188,318.7656 302.5,319.0313 C301.3281,318.5313 300.8906,318.4219 299.9375,318.4219 C297.2656,318.4219 295.25,320.4375 295.25,323.0625 L295.25,324.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="320.75" y="327.606">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="309" x="415" y="304"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="307" x="416" y="318.2001">(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="209" x2="720" y1="339" y2="339"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="347.9"/>
+          <ellipse cx="219" cy="352.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="487" x="228" y="356.0059">B((lambda at t00051.cc:43:18) &amp;&amp; f, (lambda at t00051.cc:43:27) &amp;&amp; ff) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="209" x2="720" y1="363.7999" y2="363.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="372.6999"/>
+          <ellipse cx="219" cy="377.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="228" y="380.8059">f() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="389.4998"/>
+          <ellipse cx="219" cy="394.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="228" y="397.6058">ff() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="209" x2="720" y1="405.3998" y2="405.3998"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="414.2997"/>
+          <ellipse cx="219" cy="419.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="228" y="422.4057">f_ : (lambda at t00051.cc:43:18)</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="431.0997"/>
+          <ellipse cx="219" cy="436.0997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="207" x="228" y="439.2057">ff_ : (lambda at t00051.cc:43:27)</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="366" y="514.2104">B(F &amp;&amp; f, FF &amp;&amp; ff) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001064663612772326174">
+        <rect codeLine="22" fill="#F1F1F1" height="115.1997" id="C_0001064663612772326174" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="520" x="204.5" y="131.8"/>
+        <ellipse cx="455.75" cy="147.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M450.75,148.9562 C450.75,151.4562 452.8906,153.2687 455.8125,153.2687 C457.0469,153.2687 458.2188,152.9719 458.9688,152.4562 C459.5781,152.0344 459.9063,151.6125 459.9063,151.2062 C459.9063,150.7375 459.4844,150.3312 458.9844,150.3312 C458.75,150.3312 458.5313,150.4094 458.3281,150.6125 C457.8906,151.05 457.8906,151.05 457.7188,151.1437 C457.2656,151.3781 456.625,151.5187 455.8594,151.5187 C453.8594,151.5187 452.5781,150.5031 452.5781,148.925 L452.5781,147.8781 C452.5781,146.175 453.7969,144.9719 455.5,144.9719 C456.0781,144.9719 456.6563,145.1125 457.125,145.3625 C457.5938,145.6281 457.7656,145.8156 457.8281,146.175 C457.9531,146.8469 458.2031,147.0969 458.7344,147.0969 C459.0156,147.0969 459.2969,146.9562 459.4844,146.7375 C459.6094,146.5656 459.6563,146.3937 459.6563,145.9562 L459.6563,144.5969 C459.6563,144.175 459.6406,144.0344 459.5156,143.8625 C459.3438,143.6125 459.0625,143.4562 458.7344,143.4562 C458.4219,143.4562 458.2188,143.5656 458,143.8312 C456.8281,143.3312 456.3906,143.2219 455.4375,143.2219 C452.7656,143.2219 450.75,145.2375 450.75,147.8625 L450.75,148.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="476.25" y="152.406">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="205.5" x2="723.5" y1="163.8" y2="163.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="210.5" y="172.7"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="212.5" y="174.7"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="279" x="224.5" y="180.8059">get_function() : (lambda at t00051.cc:48:16)</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="210.5" y="189.4999"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="212.5" y="191.4999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="210" x="224.5" y="197.6059">start_thread1() : custom_thread1</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="210.5" y="206.2998"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="212.5" y="208.2998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="210" x="224.5" y="214.4058">start_thread2() : custom_thread2</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="210.5" y="223.0997"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="212.5" y="225.0997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="494" x="224.5" y="231.2057">start_thread3() : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="205.5" x2="723.5" y1="238.9997" y2="238.9997"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="347" x2="516" y1="520.8047" y2="520.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="526.8047"/>
-      <ellipse cx="357" cy="531.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
+      <g id="elem_C_0000267762118222214764">
+        <rect codeLine="30" fill="#F1F1F1" height="64.7999" id="C_0000267762118222214764" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="481" x="7" y="7"/>
+        <ellipse cx="183.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M178.25,24.1563 C178.25,26.6563 180.3906,28.4688 183.3125,28.4688 C184.5469,28.4688 185.7188,28.1719 186.4688,27.6563 C187.0781,27.2344 187.4063,26.8125 187.4063,26.4063 C187.4063,25.9375 186.9844,25.5313 186.4844,25.5313 C186.25,25.5313 186.0313,25.6094 185.8281,25.8125 C185.3906,26.25 185.3906,26.25 185.2188,26.3438 C184.7656,26.5781 184.125,26.7188 183.3594,26.7188 C181.3594,26.7188 180.0781,25.7031 180.0781,24.125 L180.0781,23.0781 C180.0781,21.375 181.2969,20.1719 183,20.1719 C183.5781,20.1719 184.1563,20.3125 184.625,20.5625 C185.0938,20.8281 185.2656,21.0156 185.3281,21.375 C185.4531,22.0469 185.7031,22.2969 186.2344,22.2969 C186.5156,22.2969 186.7969,22.1563 186.9844,21.9375 C187.1094,21.7656 187.1563,21.5938 187.1563,21.1563 L187.1563,19.7969 C187.1563,19.375 187.1406,19.2344 187.0156,19.0625 C186.8438,18.8125 186.5625,18.6563 186.2344,18.6563 C185.9219,18.6563 185.7188,18.7656 185.5,19.0313 C184.3281,18.5313 183.8906,18.4219 182.9375,18.4219 C180.2656,18.4219 178.25,20.4375 178.25,23.0625 L178.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="203.75" y="27.606">A::custom_thread1</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="487" y1="39" y2="39"/>
+        <ellipse cx="18" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="455" x="27" y="56.0059">custom_thread1&lt;Function,Args...&gt;(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="487" y1="63.7999" y2="63.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="366" y="535.0151">f() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
+      <g id="elem_C_0000728501319748477470">
+        <rect codeLine="35" fill="#F1F1F1" height="64.7999" id="C_0000728501319748477470" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="316" x="523.5" y="7"/>
+        <ellipse cx="617.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M612.25,24.1563 C612.25,26.6563 614.3906,28.4688 617.3125,28.4688 C618.5469,28.4688 619.7188,28.1719 620.4688,27.6563 C621.0781,27.2344 621.4063,26.8125 621.4063,26.4063 C621.4063,25.9375 620.9844,25.5313 620.4844,25.5313 C620.25,25.5313 620.0313,25.6094 619.8281,25.8125 C619.3906,26.25 619.3906,26.25 619.2188,26.3438 C618.7656,26.5781 618.125,26.7188 617.3594,26.7188 C615.3594,26.7188 614.0781,25.7031 614.0781,24.125 L614.0781,23.0781 C614.0781,21.375 615.2969,20.1719 617,20.1719 C617.5781,20.1719 618.1563,20.3125 618.625,20.5625 C619.0938,20.8281 619.2656,21.0156 619.3281,21.375 C619.4531,22.0469 619.7031,22.2969 620.2344,22.2969 C620.5156,22.2969 620.7969,22.1563 620.9844,21.9375 C621.1094,21.7656 621.1563,21.5938 621.1563,21.1563 L621.1563,19.7969 C621.1563,19.375 621.1406,19.2344 621.0156,19.0625 C620.8438,18.8125 620.5625,18.6563 620.2344,18.6563 C619.9219,18.6563 619.7188,18.7656 619.5,19.0313 C618.3281,18.5313 617.8906,18.4219 616.9375,18.4219 C614.2656,18.4219 612.25,20.4375 612.25,23.0625 L612.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="637.75" y="27.606">A::custom_thread2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="524.5" x2="838.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="529.5" y="47.9"/>
+          <ellipse cx="534.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="543.5" y="56.0059">thread((lambda at t00051.cc:59:27) &amp;&amp;) : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="524.5" x2="838.5" y1="63.7999" y2="63.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="539.6094"/>
-      <ellipse cx="357" cy="544.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="366" y="547.8198">ff() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="516" y1="554.4141" y2="554.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="560.4141"/>
-      <ellipse cx="357" cy="565.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="366" y="568.6245">f_ : F</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="573.2188"/>
-      <ellipse cx="357" cy="578.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="366" y="581.4292">ff_ : FF</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13cmjuctsf88y)" height="120.0234" id="C_0001969502737237579476" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="288"/>
-      <ellipse cx="239.25" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M242.2188,309.6406 Q241.6406,309.9375 241,310.0781 Q240.3594,310.2344 239.6563,310.2344 Q237.1563,310.2344 235.8281,308.5938 Q234.5156,306.9375 234.5156,303.8125 Q234.5156,300.6875 235.8281,299.0313 Q237.1563,297.375 239.6563,297.375 Q240.3594,297.375 241,297.5313 Q241.6563,297.6875 242.2188,297.9844 L242.2188,300.7031 Q241.5938,300.125 241,299.8594 Q240.4063,299.5781 239.7813,299.5781 Q238.4375,299.5781 237.75,300.6563 Q237.0625,301.7188 237.0625,303.8125 Q237.0625,305.9063 237.75,306.9844 Q238.4375,308.0469 239.7813,308.0469 Q240.4063,308.0469 241,307.7813 Q241.5938,307.5 242.2188,306.9219 L242.2188,309.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="259.75" y="308.1543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="366" x="305" y="285"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="364" x="306" y="297.1387">(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="320" y2="320"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="326"/>
-      <ellipse cx="206" cy="331" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="447" x="215" y="334.2104">B((lambda at t00051.cc:43:18) &amp;&amp; f, (lambda at t00051.cc:43:27) &amp;&amp; ff) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="196" x2="667" y1="340.8047" y2="340.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="346.8047"/>
-      <ellipse cx="206" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="215" y="355.0151">f() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="359.6094"/>
-      <ellipse cx="206" cy="364.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="215" y="367.8198">ff() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="374.4141" y2="374.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="380.4141"/>
-      <ellipse cx="206" cy="385.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="182" x="215" y="388.6245">f_ : (lambda at t00051.cc:43:18)</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="393.2188"/>
-      <ellipse cx="206" cy="398.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="215" y="401.4292">ff_ : (lambda at t00051.cc:43:27)</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13cmjuctsf88y)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="129"/>
-      <ellipse cx="423.25" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M426.2188,150.6406 Q425.6406,150.9375 425,151.0781 Q424.3594,151.2344 423.6563,151.2344 Q421.1563,151.2344 419.8281,149.5938 Q418.5156,147.9375 418.5156,144.8125 Q418.5156,141.6875 419.8281,140.0313 Q421.1563,138.375 423.6563,138.375 Q424.3594,138.375 425,138.5313 Q425.6563,138.6875 426.2188,138.9844 L426.2188,141.7031 Q425.5938,141.125 425,140.8594 Q424.4063,140.5781 423.7813,140.5781 Q422.4375,140.5781 421.75,141.6563 Q421.0625,142.7188 421.0625,144.8125 Q421.0625,146.9063 421.75,147.9844 Q422.4375,149.0469 423.7813,149.0469 Q424.4063,149.0469 425,148.7813 Q425.5938,148.5 426.2188,147.9219 L426.2188,150.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="443.75" y="149.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="161" y2="161"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="167"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="169"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="215" y="175.2104">get_function() : (lambda at t00051.cc:48:16)</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="179.8047"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="181.8047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="215" y="188.0151">start_thread1() : custom_thread1</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="192.6094"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="194.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="215" y="200.8198">start_thread2() : custom_thread2</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="205.4141"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="207.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="447" x="215" y="213.6245">start_thread3() : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="220.2188" y2="220.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13cmjuctsf88y)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="447" x="6" y="8"/>
-      <ellipse cx="166.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M169.2188,29.6406 Q168.6406,29.9375 168,30.0781 Q167.3594,30.2344 166.6563,30.2344 Q164.1563,30.2344 162.8281,28.5938 Q161.5156,26.9375 161.5156,23.8125 Q161.5156,20.6875 162.8281,19.0313 Q164.1563,17.375 166.6563,17.375 Q167.3594,17.375 168,17.5313 Q168.6563,17.6875 169.2188,17.9844 L169.2188,20.7031 Q168.5938,20.125 168,19.8594 Q167.4063,19.5781 166.7813,19.5781 Q165.4375,19.5781 164.75,20.6563 Q164.0625,21.7188 164.0625,23.8125 Q164.0625,25.9063 164.75,26.9844 Q165.4375,28.0469 166.7813,28.0469 Q167.4063,28.0469 168,27.7813 Q168.5938,27.5 169.2188,26.9219 L169.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="186.75" y="28.1543">A::custom_thread1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="452" y1="40" y2="40"/>
-      <ellipse cx="17" cy="51" 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="421" x="26" y="54.2104">custom_thread1&lt;Function,Args...&gt;(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="452" y1="60.8047" y2="60.8047"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13cmjuctsf88y)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="290" x="488.5" y="8"/>
-      <ellipse cx="570.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M573.2188,29.6406 Q572.6406,29.9375 572,30.0781 Q571.3594,30.2344 570.6563,30.2344 Q568.1563,30.2344 566.8281,28.5938 Q565.5156,26.9375 565.5156,23.8125 Q565.5156,20.6875 566.8281,19.0313 Q568.1563,17.375 570.6563,17.375 Q571.3594,17.375 572,17.5313 Q572.6563,17.6875 573.2188,17.9844 L573.2188,20.7031 Q572.5938,20.125 572,19.8594 Q571.4063,19.5781 570.7813,19.5781 Q569.4375,19.5781 568.75,20.6563 Q568.0625,21.7188 568.0625,23.8125 Q568.0625,25.9063 568.75,26.9844 Q569.4375,28.0469 570.7813,28.0469 Q571.4063,28.0469 572,27.7813 Q572.5938,27.5 573.2188,26.9219 L573.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="590.75" y="28.1543">A::custom_thread2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="777.5" y1="40" y2="40"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="494.5" y="46"/>
-      <ellipse cx="499.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="264" x="508.5" y="54.2104">thread((lambda at t00051.cc:59:27) &amp;&amp;) : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="777.5" y1="60.8047" y2="60.8047"/>
-    <path d="M431.5,408.27 C431.5,420.88 431.5,434.39 431.5,447.61 " fill="none" id="C_0001969502737237579476-&gt;C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="438.5,447.99,431.5,467.99,424.5,447.99,438.5,447.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M431.5,228.4 C431.5,245.43 431.5,264.81 431.5,282.89 " fill="none" id="C_0001064663612772326174-&gt;C_0001969502737237579476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="431.5,287.95,435.5,278.95,431.5,282.95,427.5,278.95,431.5,287.95" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M272.83,69.1 C294.75,84.08 322.12,102.77 347.92,120.4 " fill="none" id="C_0000267762118222214764-&gt;C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="353.8232" cy="124.4388" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="347.2165" x2="360.43" y1="119.9276" y2="128.95"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="358.3344" x2="349.3121" y1="117.8321" y2="131.0456"/>
-    <path d="M590.17,69.1 C568.25,84.08 540.88,102.77 515.08,120.4 " fill="none" id="C_0000728501319748477470-&gt;C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="509.1768" cy="124.4388" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="515.7835" x2="502.57" y1="119.9276" y2="128.95"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="513.6879" x2="504.6656" y1="131.0456" y2="117.8321"/>
+    <g id="link_C_0001969502737237579476_C_0000486675674447050206">
+      <path codeLine="39" d="M464.5,447.25 C464.5,466.54 464.5,469.5 464.5,488.79 " fill="none" id="C_0001969502737237579476-to-C_0000486675674447050206" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="464.5,506.79,470.5,488.79,458.5,488.79,464.5,506.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001064663612772326174_C_0001969502737237579476">
+      <path codeLine="40" d="M464.5,247.35 C464.5,266.1 464.5,281.17 464.5,300.73 " fill="none" id="C_0001064663612772326174-to-C_0001969502737237579476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="464.5,306.73,468.5,297.73,464.5,301.73,460.5,297.73,464.5,306.73" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000267762118222214764_C_0001064663612772326174">
+      <path codeLine="41" d="M294.05,72.15 C319.33,89.39 338.1405,102.2265 367.5905,122.3065 " fill="none" id="C_0000267762118222214764-to-C_0001064663612772326174" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="374.2002" cy="126.8132" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="367.5905" x2="380.81" y1="122.3065" y2="131.32"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="378.707" x2="369.6935" y1="120.2035" y2="133.423"/>
+    </g>
+    <g id="link_C_0000728501319748477470_C_0001064663612772326174">
+      <path codeLine="42" d="M634.95,72.15 C609.67,89.39 590.8595,102.2265 561.4095,122.3065 " fill="none" id="C_0000728501319748477470-to-C_0001064663612772326174" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="554.7998" cy="126.8132" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="561.4095" x2="548.19" y1="122.3065" y2="131.32"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="559.3065" x2="550.293" y1="133.423" y2="120.2035"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00051_class_mermaid.svg b/docs/test_cases/t00051_class_mermaid.svg
index 539b4cf2..eb39389b 100644
--- a/docs/test_cases/t00051_class_mermaid.svg
+++ b/docs/test_cases/t00051_class_mermaid.svg
@@ -1,59 +1,64 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1446.28125 595" style="max-width: 1446.28px; background-color: white;" width="1446.28125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1459.625 595" style="max-width: 1459.62px; background-color: white;" width="1459.625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M292.6171875,370L292.6171875,374.1666666666667C292.6171875,378.3333333333333,292.6171875,386.6666666666667,292.6171875,395C292.6171875,403.3333333333333,292.6171875,411.6666666666667,292.6171875,415.8333333333333L292.6171875,420"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M543.8359375,132.3584405753217L501.9661458333333,139.96536714610144C460.0963541666667,147.57229371688115,376.3567708333333,162.78614685844056,334.4869791666667,174.55974009588695C292.6171875,186.33333333333334,292.6171875,194.66666666666666,292.6171875,198.83333333333334L292.6171875,203"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M829.2734375,153L829.2734375,157.16666666666666C829.2734375,161.33333333333334,829.2734375,169.66666666666666,829.2734375,185.33333333333334C829.2734375,201,829.2734375,224,829.2734375,235.5L829.2734375,247"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M1114.7109375,145.1426043878273L1138.8919270833333,150.61883698985608C1163.0729166666667,156.09506959188488,1211.4348958333333,167.04753479594243,1235.6158854166667,184.02376739797123C1259.796875,201,1259.796875,224,1259.796875,235.5L1259.796875,247"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M294.84375,370L294.84375,374.1666666666667C294.84375,378.3333333333333,294.84375,386.6666666666667,294.84375,392C294.84375,397.3333333333333,294.84375,399.6666666666667,294.84375,400.8333333333333L294.84375,402"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M548.2890625,132.51934690708308L506.0481770833333,140.09945575590257C463.8072916666667,147.67956460472206,379.3255208333333,162.83978230236104,337.0846354166667,173.5865578178472C294.84375,184.33333333333334,294.84375,190.66666666666666,294.84375,193.83333333333334L294.84375,197"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M838.171875,166.5L838.171875,168.41666666666666C838.171875,170.33333333333334,838.171875,174.16666666666666,838.171875,187.58333333333334C838.171875,201,838.171875,224,838.171875,235.5L838.171875,247"/>
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M1141.2278015168138,148.43120847276805L1163.2132720973448,153.35934039397338C1185.1987426778758,158.2874723151787,1229.169683838938,168.14373615758936,1251.155154419469,184.57186807879467C1273.140625,201,1273.140625,224,1273.140625,235.5L1273.140625,247"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -102,11 +107,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(292.6171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L6">
+        <a transform="translate(294.84375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0000486675674447050206-0" class="node default clickable">
-            <rect height="167" width="200.09375" y="-83.5" x="-100.046875" class="outer title-state"/>
-            <line y2="-53.5" y1="-53.5" x2="100.046875" x1="-100.046875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="100.046875" x1="-100.046875" class="divider"/>
+            <rect height="167" width="208.984375" y="-83.5" x="-104.4921875" class="outer title-state"/>
+            <line y2="-53.5" y1="-53.5" x2="104.4921875" x1="-104.4921875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="104.4921875" x1="-104.4921875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -118,39 +123,39 @@
                   <span class="nodeLabel">B&lt;F,FF=F&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -92.546875, -42)" height="18" width="45.796875">
+              <foreignObject transform="translate( -96.9921875, -42)" height="18" width="45.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+f_ : F</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -92.546875, -20)" height="18" width="59.734375">
+              <foreignObject transform="translate( -96.9921875, -20)" height="18" width="59.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+ff_ : FF</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -92.546875, 14)" height="18" width="185.09375">
+              <foreignObject transform="translate( -96.9921875, 14)" height="18" width="193.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+B(F &amp;&amp; f, FF &amp;&amp; ff) : void</span>
+                  <span class="nodeLabel">+B(F &amp;&amp; f, FF &amp;&amp; ff) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -92.546875, 36)" height="18" width="67.140625">
+              <foreignObject transform="translate( -96.9921875, 36)" height="18" width="76.03125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+f() : void</span>
+                  <span class="nodeLabel">+f() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -92.546875, 58)" height="18" width="71.296875">
+              <foreignObject transform="translate( -96.9921875, 58)" height="18" width="80.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+ff() : void</span>
+                  <span class="nodeLabel">+ff() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(292.6171875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L6">
+        <a transform="translate(294.84375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0001969502737237579476-1" class="node default clickable">
-            <rect height="167" width="569.234375" y="-83.5" x="-284.6171875" class="outer title-state"/>
-            <line y2="-53.5" y1="-53.5" x2="284.6171875" x1="-284.6171875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="284.6171875" x1="-284.6171875" class="divider"/>
+            <rect height="167" width="573.6875" y="-83.5" x="-286.84375" class="outer title-state"/>
+            <line y2="-53.5" y1="-53.5" x2="286.84375" x1="-286.84375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="286.84375" x1="-286.84375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -162,39 +167,39 @@
                   <span class="nodeLabel">B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.1171875, -42)" height="18" width="235.265625">
+              <foreignObject transform="translate( -279.34375, -42)" height="18" width="235.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+f_ : (lambda at t00051.cc:43:18)</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.1171875, -20)" height="18" width="239.421875">
+              <foreignObject transform="translate( -279.34375, -20)" height="18" width="239.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+ff_ : (lambda at t00051.cc:43:27)</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.1171875, 14)" height="18" width="554.234375">
+              <foreignObject transform="translate( -279.34375, 14)" height="18" width="558.6875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+B((lambda at t00051.cc:43:18) &amp;&amp; f, (lambda at t00051.cc:43:27) &amp;&amp; ff) : void</span>
+                  <span class="nodeLabel">+B((lambda at t00051.cc:43:18) &amp;&amp; f,(lambda at t00051.cc:43:27) &amp;&amp; ff) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.1171875, 36)" height="18" width="67.140625">
+              <foreignObject transform="translate( -279.34375, 36)" height="18" width="76.03125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+f() : void</span>
+                  <span class="nodeLabel">+f() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.1171875, 58)" height="18" width="71.296875">
+              <foreignObject transform="translate( -279.34375, 58)" height="18" width="80.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+ff() : void</span>
+                  <span class="nodeLabel">+ff() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(829.2734375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L20">
+        <a transform="translate(838.171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L20">
           <g title="A" id="classId-C_0001064663612772326174-2" class="node default clickable">
-            <rect height="145" width="570.875" y="-72.5" x="-285.4375" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="285.4375" x1="-285.4375" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="285.4375" x1="-285.4375" class="divider"/>
+            <rect height="145" width="579.765625" y="-72.5" x="-289.8828125" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="289.8828125" x1="-289.8828125" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="289.8828125" x1="-289.8828125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -206,34 +211,34 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.9375, -19)" height="18" width="315.734375">
+              <foreignObject transform="translate( -282.3828125, -19)" height="18" width="324.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-get_function() : (lambda at t00051.cc:48:16)</span>
+                  <span class="nodeLabel">-get_function() : : (lambda at t00051.cc:48:16)</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.9375, 3)" height="18" width="238.34375">
+              <foreignObject transform="translate( -282.3828125, 3)" height="18" width="247.234375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">-start_thread1() : custom_thread1</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">-start_thread1() : : custom_thread1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.9375, 25)" height="18" width="238.34375">
+              <foreignObject transform="translate( -282.3828125, 25)" height="18" width="247.234375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">-start_thread2() : custom_thread2</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">-start_thread2() : : custom_thread2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -277.9375, 47)" height="18" width="555.875">
+              <foreignObject transform="translate( -282.3828125, 47)" height="18" width="564.765625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-start_thread3() : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</span>
+                  <span class="nodeLabel">-start_thread3() : : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(829.2734375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L23">
+        <a transform="translate(838.171875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L23">
           <g title="A##custom_thread1" id="classId-C_0000267762118222214764-3" class="node default clickable">
-            <rect height="79" width="404.078125" y="-39.5" x="-202.0390625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="202.0390625" x1="-202.0390625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="202.0390625" x1="-202.0390625" class="divider"/>
+            <rect height="79" width="412.96875" y="-39.5" x="-206.484375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="206.484375" x1="-206.484375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="206.484375" x1="-206.484375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -245,15 +250,15 @@
                   <span class="nodeLabel">A::custom_thread1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -194.5390625, 14)" height="18" width="389.078125">
+              <foreignObject transform="translate( -198.984375, 14)" height="18" width="397.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+custom_thread1(Function &amp;&amp; f, Args &amp;&amp;... args) : void</span>
+                  <span class="nodeLabel">+custom_thread1(Function &amp;&amp; f, Args &amp;&amp;... args) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1259.796875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00051/t00051.cc#L35">
+        <a transform="translate(1273.140625, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L35">
           <g title="A##custom_thread2" id="classId-C_0000728501319748477470-4" class="node default clickable">
             <rect height="79" width="356.96875" y="-39.5" x="-178.484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="178.484375" x1="-178.484375" class="divider"/>
@@ -271,7 +276,7 @@
               </foreignObject>
               <foreignObject transform="translate( -170.984375, 14)" height="18" width="341.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+thread((lambda at t00051.cc:59:27) : &amp;&amp;) : void</span>
+                  <span class="nodeLabel">+thread((lambda at t00051.cc:59:27) &amp;&amp;) : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00052.md b/docs/test_cases/t00052.md
index 93ab2c7b..a2c98c8c 100644
--- a/docs/test_cases/t00052.md
+++ b/docs/test_cases/t00052.md
@@ -12,7 +12,7 @@ diagrams:
     using_namespace: clanguml::t00052
 ```
 ## Source code
-File t00052.cc
+File `tests/t00052/t00052.cc`
 ```cpp
 #include <cmath>
 
@@ -77,6 +77,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -101,6 +102,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -152,6 +154,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -182,6 +185,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -240,6 +244,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg
index b830e31e..19d7e332 100644
--- a/docs/test_cases/t00052_class.svg
+++ b/docs/test_cases/t00052_class.svg
@@ -1,118 +1,134 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:459px;height:390px;" version="1.1" viewBox="0 0 459 390" width="459px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="413px" preserveAspectRatio="none" style="width:494px;height:413px;background:#FFFFFF;" version="1.1" viewBox="0 0 494 413" width="494px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1vfrxl2c43izt" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vfrxl2c43izt)" height="73.6094" id="C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="6" y="171"/>
-      <ellipse cx="90.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M93.7188,192.6406 Q93.1406,192.9375 92.5,193.0781 Q91.8594,193.2344 91.1563,193.2344 Q88.6563,193.2344 87.3281,191.5938 Q86.0156,189.9375 86.0156,186.8125 Q86.0156,183.6875 87.3281,182.0313 Q88.6563,180.375 91.1563,180.375 Q91.8594,180.375 92.5,180.5313 Q93.1563,180.6875 93.7188,180.9844 L93.7188,183.7031 Q93.0938,183.125 92.5,182.8594 Q91.9063,182.5781 91.2813,182.5781 Q89.9375,182.5781 89.25,183.6563 Q88.5625,184.7188 88.5625,186.8125 Q88.5625,188.9063 89.25,189.9844 Q89.9375,191.0469 91.2813,191.0469 Q91.9063,191.0469 92.5,190.7813 Q93.0938,190.5 93.7188,189.9219 L93.7188,192.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="111.25" y="191.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="191" y1="203" y2="203"/>
-      <ellipse cx="17" cy="214" 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="77" x="26" y="217.2104">a&lt;T&gt;(T p) : T</text>
-      <ellipse cx="17" cy="226.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="160" x="26" y="230.0151">aa&lt;F,Q&gt;(F &amp;&amp; f, Q q) : void</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="191" y1="236.6094" y2="236.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002200853067459698271">
+        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0002200853067459698271" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="200" x="7" y="182.4"/>
+        <ellipse cx="98.25" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93.25,199.5563 C93.25,202.0563 95.3906,203.8688 98.3125,203.8688 C99.5469,203.8688 100.7188,203.5719 101.4688,203.0563 C102.0781,202.6344 102.4063,202.2125 102.4063,201.8063 C102.4063,201.3375 101.9844,200.9313 101.4844,200.9313 C101.25,200.9313 101.0313,201.0094 100.8281,201.2125 C100.3906,201.65 100.3906,201.65 100.2188,201.7438 C99.7656,201.9781 99.125,202.1188 98.3594,202.1188 C96.3594,202.1188 95.0781,201.1031 95.0781,199.525 L95.0781,198.4781 C95.0781,196.775 96.2969,195.5719 98,195.5719 C98.5781,195.5719 99.1563,195.7125 99.625,195.9625 C100.0938,196.2281 100.2656,196.4156 100.3281,196.775 C100.4531,197.4469 100.7031,197.6969 101.2344,197.6969 C101.5156,197.6969 101.7969,197.5563 101.9844,197.3375 C102.1094,197.1656 102.1563,196.9938 102.1563,196.5563 L102.1563,195.1969 C102.1563,194.775 102.1406,194.6344 102.0156,194.4625 C101.8438,194.2125 101.5625,194.0563 101.2344,194.0563 C100.9219,194.0563 100.7188,194.1656 100.5,194.4313 C99.3281,193.9313 98.8906,193.8219 97.9375,193.8219 C95.2656,193.8219 93.25,195.8375 93.25,198.4625 L93.25,199.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="118.75" y="203.006">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="206" y1="214.4" y2="214.4"/>
+        <ellipse cx="18" cy="228.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="27" y="231.4059">a&lt;T&gt;(T p) : T</text>
+        <ellipse cx="18" cy="245.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="27" y="248.2059">aa&lt;F,Q&gt;(F &amp;&amp; f, Q q) : void</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="206" y1="255.9999" y2="255.9999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vfrxl2c43izt)" height="73.6094" id="C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="156" y="306"/>
-      <ellipse cx="218.25" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M221.2188,327.6406 Q220.6406,327.9375 220,328.0781 Q219.3594,328.2344 218.6563,328.2344 Q216.1563,328.2344 214.8281,326.5938 Q213.5156,324.9375 213.5156,321.8125 Q213.5156,318.6875 214.8281,317.0313 Q216.1563,315.375 218.6563,315.375 Q219.3594,315.375 220,315.5313 Q220.6563,315.6875 221.2188,315.9844 L221.2188,318.7031 Q220.5938,318.125 220,317.8594 Q219.4063,317.5781 218.7813,317.5781 Q217.4375,317.5781 216.75,318.6563 Q216.0625,319.7188 216.0625,321.8125 Q216.0625,323.9063 216.75,324.9844 Q217.4375,326.0469 218.7813,326.0469 Q219.4063,326.0469 220,325.7813 Q220.5938,325.5 221.2188,324.9219 L221.2188,327.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="238.75" y="326.1543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="302" y="303"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="303" y="315.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="338" y2="338"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001737293776724790064">
+        <rect codeLine="8" fill="#F1F1F1" height="81.5999" id="C_0001737293776724790064" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="176" y="325"/>
+        <ellipse cx="242.75" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M237.75,342.1563 C237.75,344.6563 239.8906,346.4688 242.8125,346.4688 C244.0469,346.4688 245.2188,346.1719 245.9688,345.6563 C246.5781,345.2344 246.9063,344.8125 246.9063,344.4063 C246.9063,343.9375 246.4844,343.5313 245.9844,343.5313 C245.75,343.5313 245.5313,343.6094 245.3281,343.8125 C244.8906,344.25 244.8906,344.25 244.7188,344.3438 C244.2656,344.5781 243.625,344.7188 242.8594,344.7188 C240.8594,344.7188 239.5781,343.7031 239.5781,342.125 L239.5781,341.0781 C239.5781,339.375 240.7969,338.1719 242.5,338.1719 C243.0781,338.1719 243.6563,338.3125 244.125,338.5625 C244.5938,338.8281 244.7656,339.0156 244.8281,339.375 C244.9531,340.0469 245.2031,340.2969 245.7344,340.2969 C246.0156,340.2969 246.2969,340.1563 246.4844,339.9375 C246.6094,339.7656 246.6563,339.5938 246.6563,339.1563 L246.6563,337.7969 C246.6563,337.375 246.6406,337.2344 246.5156,337.0625 C246.3438,336.8125 246.0625,336.6563 245.7344,336.6563 C245.4219,336.6563 245.2188,336.7656 245,337.0313 C243.8281,336.5313 243.3906,336.4219 242.4375,336.4219 C239.7656,336.4219 237.75,338.4375 237.75,341.0625 L237.75,342.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="263.25" y="345.606">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="332" y="322"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="333" y="336.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="177" x2="337" y1="357" y2="357"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="182" y="365.9"/>
+          <ellipse cx="187" cy="370.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="196" y="374.0059">b(T t) : T</text>
+        </a>
+        <ellipse cx="187" cy="387.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136" x="196" y="390.8059">bb&lt;F&gt;(F &amp;&amp; f, T t) : T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="177" x2="337" y1="398.5999" y2="398.5999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="162" y="344"/>
-      <ellipse cx="167" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000687756639884832524">
+        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0000687756639884832524" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="373" y="333.4"/>
+        <ellipse cx="413.65" cy="349.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M408.65,350.5563 C408.65,353.0563 410.7906,354.8688 413.7125,354.8688 C414.9469,354.8688 416.1188,354.5719 416.8688,354.0563 C417.4781,353.6344 417.8063,353.2125 417.8063,352.8063 C417.8063,352.3375 417.3844,351.9313 416.8844,351.9313 C416.65,351.9313 416.4313,352.0094 416.2281,352.2125 C415.7906,352.65 415.7906,352.65 415.6188,352.7438 C415.1656,352.9781 414.525,353.1188 413.7594,353.1188 C411.7594,353.1188 410.4781,352.1031 410.4781,350.525 L410.4781,349.4781 C410.4781,347.775 411.6969,346.5719 413.4,346.5719 C413.9781,346.5719 414.5563,346.7125 415.025,346.9625 C415.4938,347.2281 415.6656,347.4156 415.7281,347.775 C415.8531,348.4469 416.1031,348.6969 416.6344,348.6969 C416.9156,348.6969 417.1969,348.5563 417.3844,348.3375 C417.5094,348.1656 417.5563,347.9938 417.5563,347.5563 L417.5563,346.1969 C417.5563,345.775 417.5406,345.6344 417.4156,345.4625 C417.2438,345.2125 416.9625,345.0563 416.6344,345.0563 C416.3219,345.0563 416.1188,345.1656 415.9,345.4313 C414.7281,344.9313 414.2906,344.8219 413.3375,344.8219 C410.6656,344.8219 408.65,346.8375 408.65,349.4625 L408.65,350.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="433.35" y="354.006">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="477" y="330.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="478" y="344.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="374" x2="482" y1="365.4" y2="365.4"/>
+        <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="381" y="376.3"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="393" y="382.4059">c&lt;P&gt;(P p) : T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="374" x2="482" y1="390.1999" y2="390.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="176" y="352.2104">b(T t) : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001043027222809675776">
+        <rect codeLine="19" fill="#F1F1F1" height="48" id="C_0001043027222809675776" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="242" y="199.2"/>
+        <ellipse cx="257" cy="215.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M252,216.3563 C252,218.8563 254.1406,220.6688 257.0625,220.6688 C258.2969,220.6688 259.4688,220.3719 260.2188,219.8563 C260.8281,219.4344 261.1563,219.0125 261.1563,218.6063 C261.1563,218.1375 260.7344,217.7313 260.2344,217.7313 C260,217.7313 259.7813,217.8094 259.5781,218.0125 C259.1406,218.45 259.1406,218.45 258.9688,218.5438 C258.5156,218.7781 257.875,218.9188 257.1094,218.9188 C255.1094,218.9188 253.8281,217.9031 253.8281,216.325 L253.8281,215.2781 C253.8281,213.575 255.0469,212.3719 256.75,212.3719 C257.3281,212.3719 257.9063,212.5125 258.375,212.7625 C258.8438,213.0281 259.0156,213.2156 259.0781,213.575 C259.2031,214.2469 259.4531,214.4969 259.9844,214.4969 C260.2656,214.4969 260.5469,214.3563 260.7344,214.1375 C260.8594,213.9656 260.9063,213.7938 260.9063,213.3563 L260.9063,211.9969 C260.9063,211.575 260.8906,211.4344 260.7656,211.2625 C260.5938,211.0125 260.3125,210.8563 259.9844,210.8563 C259.6719,210.8563 259.4688,210.9656 259.25,211.2313 C258.0781,210.7313 257.6406,210.6219 256.6875,210.6219 C254.0156,210.6219 252,212.6375 252,215.2625 L252,216.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="271" y="219.806">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="288" y="196.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="289" y="210.4001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="243" x2="299" y1="231.2" y2="231.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="243" x2="299" y1="239.2" y2="239.2"/>
+      </g>
     </a>
-    <ellipse cx="167" cy="361.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="176" y="365.0151">bb&lt;F&gt;(F &amp;&amp; f, T t) : T</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="371.6094" y2="371.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vfrxl2c43izt)" height="60.8047" id="C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="343" y="312.5"/>
-      <ellipse cx="380.95" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M383.9188,334.1406 Q383.3406,334.4375 382.7,334.5781 Q382.0594,334.7344 381.3563,334.7344 Q378.8563,334.7344 377.5281,333.0938 Q376.2156,331.4375 376.2156,328.3125 Q376.2156,325.1875 377.5281,323.5313 Q378.8563,321.875 381.3563,321.875 Q382.0594,321.875 382.7,322.0313 Q383.3563,322.1875 383.9188,322.4844 L383.9188,325.2031 Q383.2938,324.625 382.7,324.3594 Q382.1063,324.0781 381.4813,324.0781 Q380.1375,324.0781 379.45,325.1563 Q378.7625,326.2188 378.7625,328.3125 Q378.7625,330.4063 379.45,331.4844 Q380.1375,332.5469 381.4813,332.5469 Q382.1063,332.5469 382.7,332.2813 Q383.2938,332 383.9188,331.4219 L383.9188,334.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="400.05" y="332.6543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="439" y="309.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="440" y="321.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="344" x2="444" y1="344.5" y2="344.5"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="351" y="352.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="363" y="358.7104">c&lt;P&gt;(P p) : T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="344" x2="444" y1="365.3047" y2="365.3047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000492968837554438176">
+        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0000492968837554438176" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="370.5" y="199.2"/>
+        <ellipse cx="385.5" cy="215.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M380.5,216.3563 C380.5,218.8563 382.6406,220.6688 385.5625,220.6688 C386.7969,220.6688 387.9688,220.3719 388.7188,219.8563 C389.3281,219.4344 389.6563,219.0125 389.6563,218.6063 C389.6563,218.1375 389.2344,217.7313 388.7344,217.7313 C388.5,217.7313 388.2813,217.8094 388.0781,218.0125 C387.6406,218.45 387.6406,218.45 387.4688,218.5438 C387.0156,218.7781 386.375,218.9188 385.6094,218.9188 C383.6094,218.9188 382.3281,217.9031 382.3281,216.325 L382.3281,215.2781 C382.3281,213.575 383.5469,212.3719 385.25,212.3719 C385.8281,212.3719 386.4063,212.5125 386.875,212.7625 C387.3438,213.0281 387.5156,213.2156 387.5781,213.575 C387.7031,214.2469 387.9531,214.4969 388.4844,214.4969 C388.7656,214.4969 389.0469,214.3563 389.2344,214.1375 C389.3594,213.9656 389.4063,213.7938 389.4063,213.3563 L389.4063,211.9969 C389.4063,211.575 389.3906,211.4344 389.2656,211.2625 C389.0938,211.0125 388.8125,210.8563 388.4844,210.8563 C388.1719,210.8563 387.9688,210.9656 387.75,211.2313 C386.5781,210.7313 386.1406,210.6219 385.1875,210.6219 C382.5156,210.6219 380.5,212.6375 380.5,215.2625 L380.5,216.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="399.5" y="219.806">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="417.5" y="196.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="418.5" y="210.4001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="371.5" x2="428.5" y1="231.2" y2="231.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="371.5" x2="428.5" y1="239.2" y2="239.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vfrxl2c43izt)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
-      <ellipse cx="242" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M244.9688,205.6406 Q244.3906,205.9375 243.75,206.0781 Q243.1094,206.2344 242.4063,206.2344 Q239.9063,206.2344 238.5781,204.5938 Q237.2656,202.9375 237.2656,199.8125 Q237.2656,196.6875 238.5781,195.0313 Q239.9063,193.375 242.4063,193.375 Q243.1094,193.375 243.75,193.5313 Q244.4063,193.6875 244.9688,193.9844 L244.9688,196.7031 Q244.3438,196.125 243.75,195.8594 Q243.1563,195.5781 242.5313,195.5781 Q241.1875,195.5781 240.5,196.6563 Q239.8125,197.7188 239.8125,199.8125 Q239.8125,201.9063 240.5,202.9844 Q241.1875,204.0469 242.5313,204.0469 Q243.1563,204.0469 243.75,203.7813 Q244.3438,203.5 244.9688,202.9219 L244.9688,205.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="256" y="204.1543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="272" y="181"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="273" y="193.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="216" y2="216"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="224" y2="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001157978668683299226">
+        <rect codeLine="27" fill="#F1F1F1" height="98.3998" id="C_0001157978668683299226" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="86" x="228" y="7"/>
+        <ellipse cx="262.8" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M257.8,24.1563 C257.8,26.6563 259.9406,28.4688 262.8625,28.4688 C264.0969,28.4688 265.2688,28.1719 266.0188,27.6563 C266.6281,27.2344 266.9563,26.8125 266.9563,26.4063 C266.9563,25.9375 266.5344,25.5313 266.0344,25.5313 C265.8,25.5313 265.5813,25.6094 265.3781,25.8125 C264.9406,26.25 264.9406,26.25 264.7688,26.3438 C264.3156,26.5781 263.675,26.7188 262.9094,26.7188 C260.9094,26.7188 259.6281,25.7031 259.6281,24.125 L259.6281,23.0781 C259.6281,21.375 260.8469,20.1719 262.55,20.1719 C263.1281,20.1719 263.7063,20.3125 264.175,20.5625 C264.6438,20.8281 264.8156,21.0156 264.8781,21.375 C265.0031,22.0469 265.2531,22.2969 265.7844,22.2969 C266.0656,22.2969 266.3469,22.1563 266.5344,21.9375 C266.6594,21.7656 266.7063,21.5938 266.7063,21.1563 L266.7063,19.7969 C266.7063,19.375 266.6906,19.2344 266.5656,19.0625 C266.3938,18.8125 266.1125,18.6563 265.7844,18.6563 C265.4719,18.6563 265.2688,18.7656 265.05,19.0313 C263.8781,18.5313 263.4406,18.4219 262.4875,18.4219 C259.8156,18.4219 257.8,20.4375 257.8,23.0625 L257.8,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="281.2" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="229" x2="313" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="229" x2="313" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="234" y="55.9"/>
+          <ellipse cx="239" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="248" y="64.0059">a : A</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="234" y="72.6999"/>
+          <ellipse cx="239" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="248" y="80.8059">b : B&lt;int&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="234" y="89.4998"/>
+          <ellipse cx="239" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="248" y="97.6058">c : C&lt;int&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vfrxl2c43izt)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
-      <ellipse cx="366" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M368.9688,205.6406 Q368.3906,205.9375 367.75,206.0781 Q367.1094,206.2344 366.4063,206.2344 Q363.9063,206.2344 362.5781,204.5938 Q361.2656,202.9375 361.2656,199.8125 Q361.2656,196.6875 362.5781,195.0313 Q363.9063,193.375 366.4063,193.375 Q367.1094,193.375 367.75,193.5313 Q368.4063,193.6875 368.9688,193.9844 L368.9688,196.7031 Q368.3438,196.125 367.75,195.8594 Q367.1563,195.5781 366.5313,195.5781 Q365.1875,195.5781 364.5,196.6563 Q363.8125,197.7188 363.8125,199.8125 Q363.8125,201.9063 364.5,202.9844 Q365.1875,204.0469 366.5313,204.0469 Q367.1563,204.0469 367.75,203.7813 Q368.3438,203.5 368.9688,202.9219 L368.9688,205.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="380" y="204.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="396" y="181"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="397" y="193.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="216" y2="216"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="224" y2="224"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vfrxl2c43izt)" height="86.4141" id="C_0001157978668683299226" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="214.5" y="8"/>
-      <ellipse cx="249.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M252.7188,29.6406 Q252.1406,29.9375 251.5,30.0781 Q250.8594,30.2344 250.1563,30.2344 Q247.6563,30.2344 246.3281,28.5938 Q245.0156,26.9375 245.0156,23.8125 Q245.0156,20.6875 246.3281,19.0313 Q247.6563,17.375 250.1563,17.375 Q250.8594,17.375 251.5,17.5313 Q252.1563,17.6875 252.7188,17.9844 L252.7188,20.7031 Q252.0938,20.125 251.5,19.8594 Q250.9063,19.5781 250.2813,19.5781 Q248.9375,19.5781 248.25,20.6563 Q247.5625,21.7188 247.5625,23.8125 Q247.5625,25.9063 248.25,26.9844 Q248.9375,28.0469 250.2813,28.0469 Q250.9063,28.0469 251.5,27.7813 Q252.0938,27.5 252.7188,26.9219 L252.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="268.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="54"/>
-      <ellipse cx="225.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="234.5" y="62.2104">a : A</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="66.8047"/>
-      <ellipse cx="225.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="59" x="234.5" y="75.0151">b : B&lt;int&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="79.6094"/>
-      <ellipse cx="225.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="234.5" y="87.8198">c : C&lt;int&gt;</text>
-    </a>
-    <path d="M252.65,232.17 C249.84,247.09 246.07,267.16 242.51,286.07 " fill="none" id="C_0001043027222809675776-&gt;C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="249.37,287.46,238.8,305.83,235.61,284.88,249.37,287.46" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M383.26,232.17 C384.87,248.63 387.1,271.36 389.1,291.88 " fill="none" id="C_0000492968837554438176-&gt;C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="396.1,291.51,391.08,312.1,382.16,292.88,396.1,291.51" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M204.81,103.2 C182.25,125.33 156.39,150.7 135.89,170.82 " fill="none" id="C_0001157978668683299226&lt;-C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="214.24,93.95,207.155,95.2927,205.6694,102.3491,212.7544,101.0064,214.24,93.95" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="184" y="137.0669">+a</text>
-    <path d="M257,107.68 C257,133.94 257,163.83 257,183.9 " fill="none" id="C_0001157978668683299226&lt;-C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="257,94.35,253,100.35,257,106.35,261,100.35,257,94.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="258" y="137.0669">+b</text>
-    <path d="M299.24,104.81 C320.78,131.73 345.87,163.09 362.52,183.9 " fill="none" id="C_0001157978668683299226&lt;-C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="290.88,94.35,291.5059,101.5339,298.3779,103.7191,297.752,96.5353,290.88,94.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="328" y="137.0669">+c</text>
+    <g id="link_C_0001043027222809675776_C_0001737293776724790064">
+      <path codeLine="33" d="M268.69,247.42 C266.6,268.4 265.2626,281.8185 262.7726,306.8385 " fill="none" id="C_0001043027222809675776-to-C_0001737293776724790064" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="260.99,324.75,268.7431,307.4327,256.8021,306.2443,260.99,324.75" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000492968837554438176_C_0000687756639884832524">
+      <path codeLine="34" d="M404.62,247.42 C409.28,270.82 412.9982,289.4359 418.1782,315.4759 " fill="none" id="C_0000492968837554438176-to-C_0000687756639884832524" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="421.69,333.13,424.0629,314.3053,412.2935,316.6465,421.69,333.13" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001157978668683299226_C_0002200853067459698271">
+      <path codeLine="35" d="M219.4518,109.0623 C194.4018,134.2723 171.49,157.31 146.99,181.97 " fill="none" id="C_0001157978668683299226-backto-C_0002200853067459698271" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="227.91,100.55,220.8435,101.9867,219.4518,109.0623,226.5183,107.6255,227.91,100.55" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="190" y="148.477">+a</text>
+    </g>
+    <g id="link_C_0001157978668683299226_C_0001043027222809675776">
+      <path codeLine="36" d="M271,117.81 C271,148.61 271,175.04 271,199.11 " fill="none" id="C_0001157978668683299226-backto-C_0001043027222809675776" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="271,105.81,267,111.81,271,117.81,275,111.81,271,105.81" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="272" y="148.477">+b</text>
+    </g>
+    <g id="link_C_0001157978668683299226_C_0000492968837554438176">
+      <path codeLine="37" d="M316.4011,115.2637 C340.4811,146.0637 363.13,175.04 381.94,199.11 " fill="none" id="C_0001157978668683299226-backto-C_0000492968837554438176" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="309.01,105.81,309.5543,113.0005,316.4011,115.2637,315.8568,108.0732,309.01,105.81" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="345" y="148.477">+c</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00052_class_mermaid.svg b/docs/test_cases/t00052_class_mermaid.svg
index e8dbe054..decea17d 100644
--- a/docs/test_cases/t00052_class_mermaid.svg
+++ b/docs/test_cases/t00052_class_mermaid.svg
@@ -1,60 +1,65 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 541.703125 459" style="max-width: 541.703px; background-color: white;" width="541.703125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 563.9296875 459" style="max-width: 563.93px; background-color: white;" width="563.9296875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M265.0234375,278L265.0234375,285.8333333333333C265.0234375,293.6666666666667,265.0234375,309.3333333333333,265.0234375,321.3333333333333C265.0234375,333.3333333333333,265.0234375,341.6666666666667,265.0234375,345.8333333333333L265.0234375,350"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M461.125,278L461.125,285.8333333333333C461.125,293.6666666666667,461.125,309.3333333333333,461.125,323.1666666666667C461.125,337,461.125,349,461.125,355L461.125,361"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M218.6015625,95.62258896100907L198.05338541666666,107.1854908008409C177.50520833333334,118.7483926406727,136.40885416666666,141.87419632033635,115.86067708333333,159.10376482683486C95.3125,176.33333333333334,95.3125,187.66666666666666,95.3125,193.33333333333334L95.3125,199"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M265.0234375,131L265.0234375,136.66666666666666C265.0234375,142.33333333333334,265.0234375,153.66666666666666,265.0234375,168.66666666666666C265.0234375,183.66666666666666,265.0234375,202.33333333333334,265.0234375,211.66666666666666L265.0234375,221"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M311.4453125,92.1071072865623L336.3919270833333,104.25592273880191C361.3385416666667,116.40473819104153,411.2317708333333,140.70236909552077,436.1783854166667,162.1845178810937C461.125,183.66666666666666,461.125,202.33333333333334,461.125,211.66666666666666L461.125,221"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M273.9140625,278L273.9140625,285.8333333333333C273.9140625,293.6666666666667,273.9140625,309.3333333333333,273.9140625,318.3333333333333C273.9140625,327.3333333333333,273.9140625,329.6666666666667,273.9140625,330.8333333333333L273.9140625,332"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M478.90625,278L478.90625,285.8333333333333C478.90625,293.6666666666667,478.90625,309.3333333333333,478.90625,320.1666666666667C478.90625,331,478.90625,337,478.90625,340L478.90625,343"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M211.70937157084782,103.61044957464364L193.0507783923732,113.84204131220304C174.39218521389853,124.07363304976242,137.07499885694926,144.53681652488123,118.41640567847463,160.4350749291073C99.7578125,176.33333333333334,99.7578125,187.66666666666666,99.7578125,193.33333333333334L99.7578125,199"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M273.9140625,149L273.9140625,151.66666666666666C273.9140625,154.33333333333334,273.9140625,159.66666666666666,273.9140625,171.66666666666666C273.9140625,183.66666666666666,273.9140625,202.33333333333334,273.9140625,211.66666666666666L273.9140625,221"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M336.65220293104875,98.72790611795953L360.361210775874,109.77325509829961C384.0702186206992,120.8186040786397,431.4882343103496,142.90930203931984,455.19724215517476,163.28798435299325C478.90625,183.66666666666666,478.90625,202.33333333333334,478.90625,211.66666666666666L478.90625,221"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -79,7 +84,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(95.3125, 165)" class="edgeLabel">
+        <g transform="translate(99.7578125, 165)" class="edgeLabel">
           <g transform="translate(-9.125, -9)" class="label">
             <foreignObject height="18" width="18.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -90,7 +95,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(265.0234375, 165)" class="edgeLabel">
+        <g transform="translate(273.9140625, 165)" class="edgeLabel">
           <g transform="translate(-9.125, -9)" class="label">
             <foreignObject height="18" width="18.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -101,7 +106,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(461.125, 165)" class="edgeLabel">
+        <g transform="translate(478.90625, 165)" class="edgeLabel">
           <g transform="translate(-8.671875, -9)" class="label">
             <foreignObject height="18" width="17.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -114,11 +119,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(95.3125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L6">
+        <a transform="translate(99.7578125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L6">
           <g title="A" id="classId-C_0002200853067459698271-0" class="node default clickable">
-            <rect height="101" width="174.625" y="-50.5" x="-87.3125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="87.3125" x1="-87.3125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="87.3125" x1="-87.3125" class="divider"/>
+            <rect height="101" width="183.515625" y="-50.5" x="-91.7578125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="91.7578125" x1="-91.7578125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="91.7578125" x1="-91.7578125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -130,24 +135,24 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -79.8125, 3)" height="18" width="74.546875">
+              <foreignObject transform="translate( -84.2578125, 3)" height="18" width="83.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+a(T p) : T</span>
+                  <span class="nodeLabel">+a(T p) : : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -79.8125, 25)" height="18" width="159.625">
+              <foreignObject transform="translate( -84.2578125, 25)" height="18" width="168.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+aa(F &amp;&amp; f, Q q) : void</span>
+                  <span class="nodeLabel">+aa(F &amp;&amp; f, Q q) : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L13">
+        <a transform="translate(273.9140625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001737293776724790064-1" class="node default clickable">
-            <rect height="101" width="147.046875" y="-50.5" x="-73.5234375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="73.5234375" x1="-73.5234375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="73.5234375" x1="-73.5234375" class="divider"/>
+            <rect height="101" width="155.9375" y="-50.5" x="-77.96875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="77.96875" x1="-77.96875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="77.96875" x1="-77.96875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -159,24 +164,24 @@
                   <span class="nodeLabel">B&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -66.0234375, 3)" height="18" width="70.09375">
+              <foreignObject transform="translate( -70.46875, 3)" height="18" width="78.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+b(T t) : T</span>
+                  <span class="nodeLabel">+b(T t) : : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -66.0234375, 25)" height="18" width="132.046875">
+              <foreignObject transform="translate( -70.46875, 25)" height="18" width="140.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+bb(F &amp;&amp; f, T t) : T</span>
+                  <span class="nodeLabel">+bb(F &amp;&amp; f, T t) : : T</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(461.125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L20">
+        <a transform="translate(478.90625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000687756639884832524-2" class="node default clickable">
-            <rect height="79" width="145.15625" y="-39.5" x="-72.578125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="72.578125" x1="-72.578125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="72.578125" x1="-72.578125" class="divider"/>
+            <rect height="79" width="154.046875" y="-39.5" x="-77.0234375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="77.0234375" x1="-77.0234375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="77.0234375" x1="-77.0234375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -188,15 +193,15 @@
                   <span class="nodeLabel">C&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.078125, 14)" height="18" width="130.15625">
+              <foreignObject transform="translate( -69.5234375, 14)" height="18" width="139.046875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-c&lt;p&gt;(P p) : T&lt;/p&gt;</span>
+                  <span class="nodeLabel">-c&lt;p&gt;(P p) : : T&lt;/p&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L13">
+        <a transform="translate(273.9140625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001043027222809675776-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -215,7 +220,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(461.125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L20">
+        <a transform="translate(478.90625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000492968837554438176-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -234,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00052/t00052.cc#L29">
+        <a transform="translate(273.9140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L29">
           <g title="R" id="classId-C_0001157978668683299226-5" class="node default clickable">
             <rect height="123" width="92.84375" y="-61.5" x="-46.421875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="46.421875" x1="-46.421875" class="divider"/>
diff --git a/docs/test_cases/t00053.md b/docs/test_cases/t00053.md
index d9b65f96..c4234092 100644
--- a/docs/test_cases/t00053.md
+++ b/docs/test_cases/t00053.md
@@ -20,7 +20,7 @@ diagrams:
 
 ```
 ## Source code
-File t00053.cc
+File `tests/t00053/t00053.cc`
 ```cpp
 namespace clanguml {
 namespace t00053 {
diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg
index a9b9434d..67b8c90f 100644
--- a/docs/test_cases/t00053_class.svg
+++ b/docs/test_cases/t00053_class.svg
@@ -1,152 +1,180 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="340px" preserveAspectRatio="none" style="width:698px;height:340px;" version="1.1" viewBox="0 0 698 340" width="698px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="419px" preserveAspectRatio="none" style="width:579px;height:419px;background:#FFFFFF;" version="1.1" viewBox="0 0 579 419" width="579px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fmk851bq23e7b" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0000322642841130459425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="46.5"/>
-      <ellipse cx="249" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M251.9688,68.1406 Q251.3906,68.4375 250.75,68.5781 Q250.1094,68.7344 249.4063,68.7344 Q246.9063,68.7344 245.5781,67.0938 Q244.2656,65.4375 244.2656,62.3125 Q244.2656,59.1875 245.5781,57.5313 Q246.9063,55.875 249.4063,55.875 Q250.1094,55.875 250.75,56.0313 Q251.4063,56.1875 251.9688,56.4844 L251.9688,59.2031 Q251.3438,58.625 250.75,58.3594 Q250.1563,58.0781 249.5313,58.0781 Q248.1875,58.0781 247.5,59.1563 Q246.8125,60.2188 246.8125,62.3125 Q246.8125,64.4063 247.5,65.4844 Q248.1875,66.5469 249.5313,66.5469 Q250.1563,66.5469 250.75,66.2813 Q251.3438,66 251.9688,65.4219 L251.9688,68.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="66.6543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="78.5" y2="78.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="86.5" y2="86.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <g id="elem_C_0001376344645244260547">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001376344645244260547" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="8.5" y="7"/>
+        <ellipse cx="23.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M18.5,24.1563 C18.5,26.6563 20.6406,28.4688 23.5625,28.4688 C24.7969,28.4688 25.9688,28.1719 26.7188,27.6563 C27.3281,27.2344 27.6563,26.8125 27.6563,26.4063 C27.6563,25.9375 27.2344,25.5313 26.7344,25.5313 C26.5,25.5313 26.2813,25.6094 26.0781,25.8125 C25.6406,26.25 25.6406,26.25 25.4688,26.3438 C25.0156,26.5781 24.375,26.7188 23.6094,26.7188 C21.6094,26.7188 20.3281,25.7031 20.3281,24.125 L20.3281,23.0781 C20.3281,21.375 21.5469,20.1719 23.25,20.1719 C23.8281,20.1719 24.4063,20.3125 24.875,20.5625 C25.3438,20.8281 25.5156,21.0156 25.5781,21.375 C25.7031,22.0469 25.9531,22.2969 26.4844,22.2969 C26.7656,22.2969 27.0469,22.1563 27.2344,21.9375 C27.3594,21.7656 27.4063,21.5938 27.4063,21.1563 L27.4063,19.7969 C27.4063,19.375 27.3906,19.2344 27.2656,19.0625 C27.0938,18.8125 26.8125,18.6563 26.4844,18.6563 C26.1719,18.6563 25.9688,18.7656 25.75,19.0313 C24.5781,18.5313 24.1406,18.4219 23.1875,18.4219 C20.5156,18.4219 18.5,20.4375 18.5,23.0625 L18.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="37.5" y="27.606">b</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="9.5" x2="47.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="9.5" x2="47.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0001248473990784124468" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309" y="46.5"/>
-      <ellipse cx="324" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M326.9688,68.1406 Q326.3906,68.4375 325.75,68.5781 Q325.1094,68.7344 324.4063,68.7344 Q321.9063,68.7344 320.5781,67.0938 Q319.2656,65.4375 319.2656,62.3125 Q319.2656,59.1875 320.5781,57.5313 Q321.9063,55.875 324.4063,55.875 Q325.1094,55.875 325.75,56.0313 Q326.4063,56.1875 326.9688,56.4844 L326.9688,59.2031 Q326.3438,58.625 325.75,58.3594 Q325.1563,58.0781 324.5313,58.0781 Q323.1875,58.0781 322.5,59.1563 Q321.8125,60.2188 321.8125,62.3125 Q321.8125,64.4063 322.5,65.4844 Q323.1875,66.5469 324.5313,66.5469 Q325.1563,66.5469 325.75,66.2813 Q326.3438,66 326.9688,65.4219 L326.9688,68.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338" y="66.6543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="78.5" y2="78.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="86.5" y2="86.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <g id="elem_C_0001264455164862224089">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0001264455164862224089" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="83.5" y="7"/>
+        <ellipse cx="98.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93.5,24.1563 C93.5,26.6563 95.6406,28.4688 98.5625,28.4688 C99.7969,28.4688 100.9688,28.1719 101.7188,27.6563 C102.3281,27.2344 102.6563,26.8125 102.6563,26.4063 C102.6563,25.9375 102.2344,25.5313 101.7344,25.5313 C101.5,25.5313 101.2813,25.6094 101.0781,25.8125 C100.6406,26.25 100.6406,26.25 100.4688,26.3438 C100.0156,26.5781 99.375,26.7188 98.6094,26.7188 C96.6094,26.7188 95.3281,25.7031 95.3281,24.125 L95.3281,23.0781 C95.3281,21.375 96.5469,20.1719 98.25,20.1719 C98.8281,20.1719 99.4063,20.3125 99.875,20.5625 C100.3438,20.8281 100.5156,21.0156 100.5781,21.375 C100.7031,22.0469 100.9531,22.2969 101.4844,22.2969 C101.7656,22.2969 102.0469,22.1563 102.2344,21.9375 C102.3594,21.7656 102.4063,21.5938 102.4063,21.1563 L102.4063,19.7969 C102.4063,19.375 102.3906,19.2344 102.2656,19.0625 C102.0938,18.8125 101.8125,18.6563 101.4844,18.6563 C101.1719,18.6563 100.9688,18.7656 100.75,19.0313 C99.5781,18.5313 99.1406,18.4219 98.1875,18.4219 C95.5156,18.4219 93.5,20.4375 93.5,23.0625 L93.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="112.5" y="27.606">d</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84.5" x2="122.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84.5" x2="122.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0001038384764221361257" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="161"/>
-      <ellipse cx="249" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M251.9688,182.6406 Q251.3906,182.9375 250.75,183.0781 Q250.1094,183.2344 249.4063,183.2344 Q246.9063,183.2344 245.5781,181.5938 Q244.2656,179.9375 244.2656,176.8125 Q244.2656,173.6875 245.5781,172.0313 Q246.9063,170.375 249.4063,170.375 Q250.1094,170.375 250.75,170.5313 Q251.4063,170.6875 251.9688,170.9844 L251.9688,173.7031 Q251.3438,173.125 250.75,172.8594 Q250.1563,172.5781 249.5313,172.5781 Q248.1875,172.5781 247.5,173.6563 Q246.8125,174.7188 246.8125,176.8125 Q246.8125,178.9063 247.5,179.9844 Q248.1875,181.0469 249.5313,181.0469 Q250.1563,181.0469 250.75,180.7813 Q251.3438,180.5 251.9688,179.9219 L251.9688,182.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="181.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="193" y2="193"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="201" y2="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <g id="elem_C_0000200227126708762001">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000200227126708762001" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="158.5" y="7"/>
+        <ellipse cx="173.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M168.5,24.1563 C168.5,26.6563 170.6406,28.4688 173.5625,28.4688 C174.7969,28.4688 175.9688,28.1719 176.7188,27.6563 C177.3281,27.2344 177.6563,26.8125 177.6563,26.4063 C177.6563,25.9375 177.2344,25.5313 176.7344,25.5313 C176.5,25.5313 176.2813,25.6094 176.0781,25.8125 C175.6406,26.25 175.6406,26.25 175.4688,26.3438 C175.0156,26.5781 174.375,26.7188 173.6094,26.7188 C171.6094,26.7188 170.3281,25.7031 170.3281,24.125 L170.3281,23.0781 C170.3281,21.375 171.5469,20.1719 173.25,20.1719 C173.8281,20.1719 174.4063,20.3125 174.875,20.5625 C175.3438,20.8281 175.5156,21.0156 175.5781,21.375 C175.7031,22.0469 175.9531,22.2969 176.4844,22.2969 C176.7656,22.2969 177.0469,22.1563 177.2344,21.9375 C177.3594,21.7656 177.4063,21.5938 177.4063,21.1563 L177.4063,19.7969 C177.4063,19.375 177.3906,19.2344 177.2656,19.0625 C177.0938,18.8125 176.8125,18.6563 176.4844,18.6563 C176.1719,18.6563 175.9688,18.7656 175.75,19.0313 C174.5781,18.5313 174.1406,18.4219 173.1875,18.4219 C170.5156,18.4219 168.5,20.4375 168.5,23.0625 L168.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="187.5" y="27.606">g</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="197.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="197.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0000530253748811039667" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="309.5" y="161"/>
-      <ellipse cx="324.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M327.4688,182.6406 Q326.8906,182.9375 326.25,183.0781 Q325.6094,183.2344 324.9063,183.2344 Q322.4063,183.2344 321.0781,181.5938 Q319.7656,179.9375 319.7656,176.8125 Q319.7656,173.6875 321.0781,172.0313 Q322.4063,170.375 324.9063,170.375 Q325.6094,170.375 326.25,170.5313 Q326.9063,170.6875 327.4688,170.9844 L327.4688,173.7031 Q326.8438,173.125 326.25,172.8594 Q325.6563,172.5781 325.0313,172.5781 Q323.6875,172.5781 323,173.6563 Q322.3125,174.7188 322.3125,176.8125 Q322.3125,178.9063 323,179.9844 Q323.6875,181.0469 325.0313,181.0469 Q325.6563,181.0469 326.25,180.7813 Q326.8438,180.5 327.4688,179.9219 L327.4688,182.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="338.5" y="181.1543">F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="193" y2="193"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="201" y2="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000876623970071162908">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0000876623970071162908" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="234" y="7"/>
+        <ellipse cx="249" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M244,24.1563 C244,26.6563 246.1406,28.4688 249.0625,28.4688 C250.2969,28.4688 251.4688,28.1719 252.2188,27.6563 C252.8281,27.2344 253.1563,26.8125 253.1563,26.4063 C253.1563,25.9375 252.7344,25.5313 252.2344,25.5313 C252,25.5313 251.7813,25.6094 251.5781,25.8125 C251.1406,26.25 251.1406,26.25 250.9688,26.3438 C250.5156,26.5781 249.875,26.7188 249.1094,26.7188 C247.1094,26.7188 245.8281,25.7031 245.8281,24.125 L245.8281,23.0781 C245.8281,21.375 247.0469,20.1719 248.75,20.1719 C249.3281,20.1719 249.9063,20.3125 250.375,20.5625 C250.8438,20.8281 251.0156,21.0156 251.0781,21.375 C251.2031,22.0469 251.4531,22.2969 251.9844,22.2969 C252.2656,22.2969 252.5469,22.1563 252.7344,21.9375 C252.8594,21.7656 252.9063,21.5938 252.9063,21.1563 L252.9063,19.7969 C252.9063,19.375 252.8906,19.2344 252.7656,19.0625 C252.5938,18.8125 252.3125,18.6563 251.9844,18.6563 C251.6719,18.6563 251.4688,18.7656 251.25,19.0313 C250.0781,18.5313 249.6406,18.4219 248.6875,18.4219 C246.0156,18.4219 244,20.4375 244,23.0625 L244,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="263" y="27.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="235" x2="274" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="235" x2="274" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0000347629837292519144" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="46.5"/>
-      <ellipse cx="420" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M422.9688,68.1406 Q422.3906,68.4375 421.75,68.5781 Q421.1094,68.7344 420.4063,68.7344 Q417.9063,68.7344 416.5781,67.0938 Q415.2656,65.4375 415.2656,62.3125 Q415.2656,59.1875 416.5781,57.5313 Q417.9063,55.875 420.4063,55.875 Q421.1094,55.875 421.75,56.0313 Q422.4063,56.1875 422.9688,56.4844 L422.9688,59.2031 Q422.3438,58.625 421.75,58.3594 Q421.1563,58.0781 420.5313,58.0781 Q419.1875,58.0781 418.5,59.1563 Q417.8125,60.2188 417.8125,62.3125 Q417.8125,64.4063 418.5,65.4844 Q419.1875,66.5469 420.5313,66.5469 Q421.1563,66.5469 421.75,66.2813 Q422.3438,66 422.9688,65.4219 L422.9688,68.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="66.6543">a</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="78.5" y2="78.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="86.5" y2="86.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0000470228045297785394">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000470228045297785394" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="309.5" y="7"/>
+        <ellipse cx="324.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M319.5,24.1563 C319.5,26.6563 321.6406,28.4688 324.5625,28.4688 C325.7969,28.4688 326.9688,28.1719 327.7188,27.6563 C328.3281,27.2344 328.6563,26.8125 328.6563,26.4063 C328.6563,25.9375 328.2344,25.5313 327.7344,25.5313 C327.5,25.5313 327.2813,25.6094 327.0781,25.8125 C326.6406,26.25 326.6406,26.25 326.4688,26.3438 C326.0156,26.5781 325.375,26.7188 324.6094,26.7188 C322.6094,26.7188 321.3281,25.7031 321.3281,24.125 L321.3281,23.0781 C321.3281,21.375 322.5469,20.1719 324.25,20.1719 C324.8281,20.1719 325.4063,20.3125 325.875,20.5625 C326.3438,20.8281 326.5156,21.0156 326.5781,21.375 C326.7031,22.0469 326.9531,22.2969 327.4844,22.2969 C327.7656,22.2969 328.0469,22.1563 328.2344,21.9375 C328.3594,21.7656 328.4063,21.5938 328.4063,21.1563 L328.4063,19.7969 C328.4063,19.375 328.3906,19.2344 328.2656,19.0625 C328.0938,18.8125 327.8125,18.6563 327.4844,18.6563 C327.1719,18.6563 326.9688,18.7656 326.75,19.0313 C325.5781,18.5313 325.1406,18.4219 324.1875,18.4219 C321.5156,18.4219 319.5,20.4375 319.5,23.0625 L319.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="338.5" y="27.606">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="310.5" x2="350.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="310.5" x2="350.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0000504463801094568803" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="480.5" y="46.5"/>
-      <ellipse cx="495.5" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M498.4688,68.1406 Q497.8906,68.4375 497.25,68.5781 Q496.6094,68.7344 495.9063,68.7344 Q493.4063,68.7344 492.0781,67.0938 Q490.7656,65.4375 490.7656,62.3125 Q490.7656,59.1875 492.0781,57.5313 Q493.4063,55.875 495.9063,55.875 Q496.6094,55.875 497.25,56.0313 Q497.9063,56.1875 498.4688,56.4844 L498.4688,59.2031 Q497.8438,58.625 497.25,58.3594 Q496.6563,58.0781 496.0313,58.0781 Q494.6875,58.0781 494,59.1563 Q493.3125,60.2188 493.3125,62.3125 Q493.3125,64.4063 494,65.4844 Q494.6875,66.5469 496.0313,66.5469 Q496.6563,66.5469 497.25,66.2813 Q497.8438,66 498.4688,65.4219 L498.4688,68.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="509.5" y="66.6543">c</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="78.5" y2="78.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="86.5" y2="86.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0001031614323468823578">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001031614323468823578" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="7" y="123.4"/>
+        <ellipse cx="22" cy="139.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,140.5563 C17,143.0563 19.1406,144.8688 22.0625,144.8688 C23.2969,144.8688 24.4688,144.5719 25.2188,144.0563 C25.8281,143.6344 26.1563,143.2125 26.1563,142.8063 C26.1563,142.3375 25.7344,141.9313 25.2344,141.9313 C25,141.9313 24.7813,142.0094 24.5781,142.2125 C24.1406,142.65 24.1406,142.65 23.9688,142.7438 C23.5156,142.9781 22.875,143.1188 22.1094,143.1188 C20.1094,143.1188 18.8281,142.1031 18.8281,140.525 L18.8281,139.4781 C18.8281,137.775 20.0469,136.5719 21.75,136.5719 C22.3281,136.5719 22.9063,136.7125 23.375,136.9625 C23.8438,137.2281 24.0156,137.4156 24.0781,137.775 C24.2031,138.4469 24.4531,138.6969 24.9844,138.6969 C25.2656,138.6969 25.5469,138.5563 25.7344,138.3375 C25.8594,138.1656 25.9063,137.9938 25.9063,137.5563 L25.9063,136.1969 C25.9063,135.775 25.8906,135.6344 25.7656,135.4625 C25.5938,135.2125 25.3125,135.0563 24.9844,135.0563 C24.6719,135.0563 24.4688,135.1656 24.25,135.4313 C23.0781,134.9313 22.6406,134.8219 21.6875,134.8219 C19.0156,134.8219 17,136.8375 17,139.4625 L17,140.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="36" y="144.006">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="49" y1="155.4" y2="155.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="49" y1="163.4" y2="163.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0000907921963776939609" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="161"/>
-      <ellipse cx="420" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M422.9688,182.6406 Q422.3906,182.9375 421.75,183.0781 Q421.1094,183.2344 420.4063,183.2344 Q417.9063,183.2344 416.5781,181.5938 Q415.2656,179.9375 415.2656,176.8125 Q415.2656,173.6875 416.5781,172.0313 Q417.9063,170.375 420.4063,170.375 Q421.1094,170.375 421.75,170.5313 Q422.4063,170.6875 422.9688,170.9844 L422.9688,173.7031 Q422.3438,173.125 421.75,172.8594 Q421.1563,172.5781 420.5313,172.5781 Q419.1875,172.5781 418.5,173.6563 Q417.8125,174.7188 417.8125,176.8125 Q417.8125,178.9063 418.5,179.9844 Q419.1875,181.0469 420.5313,181.0469 Q421.1563,181.0469 421.75,180.7813 Q422.3438,180.5 422.9688,179.9219 L422.9688,182.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="181.1543">e</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="193" y2="193"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="201" y2="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <g id="elem_C_0001473214620883985930">
+        <rect codeLine="26" fill="#F1F1F1" height="64.7999" id="C_0001473214620883985930" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="85" y="115"/>
+        <ellipse cx="100" cy="131" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M98.8594,132.0625 L100.1719,132.0625 L100.1719,132.1094 C100.1719,132.5156 100.1875,132.6719 100.2969,132.8281 C100.4688,133.0781 100.7656,133.25 101.0781,133.25 C101.3594,133.25 101.6563,133.1094 101.8281,132.8906 C101.9531,132.7031 102,132.5625 102,132.1094 L102,130.2656 C102,129.9375 101.9844,129.8281 101.9219,129.6563 C101.8125,129.3594 101.4531,129.1094 101.0781,129.1094 C100.7813,129.1094 100.5156,129.25 100.3438,129.4688 C100.2031,129.6563 100.1719,129.8281 100.1719,130.2656 L100.1719,130.3281 L98.8594,130.3281 L98.8594,128.1563 L102.7031,128.1563 L102.7031,128.9063 C102.7031,129.2969 102.7344,129.4844 102.8438,129.6406 C103.0156,129.8906 103.3125,130.0625 103.625,130.0625 C103.9219,130.0625 104.1875,129.9375 104.375,129.7031 C104.5156,129.5156 104.5469,129.375 104.5469,128.9063 L104.5469,126.4063 L96.8438,126.4063 C96.3906,126.4063 96.2656,126.4219 96.0938,126.5313 C95.8281,126.7031 95.6563,126.9688 95.6563,127.2813 C95.6563,127.5625 95.7813,127.8281 96.0313,128 C96.2188,128.125 96.4063,128.1563 96.8438,128.1563 L97.0313,128.1563 L97.0313,134.25 L96.8438,134.25 C96.4219,134.25 96.2656,134.2813 96.0938,134.375 C95.8281,134.5313 95.6563,134.8125 95.6563,135.1094 C95.6563,135.6875 96.0625,136 96.8438,136 L104.9219,136 L104.9219,133.4688 C104.9219,133.0625 104.8906,132.8906 104.7813,132.7344 C104.6094,132.4688 104.3281,132.3125 104,132.3125 C103.7188,132.3125 103.4375,132.4531 103.25,132.6719 C103.1094,132.8594 103.0781,133.0156 103.0781,133.4688 L103.0781,134.25 L98.8594,134.25 L98.8594,132.0625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="114" y="135.606">i</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="86" x2="119" y1="147" y2="147"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="91" y="164.0059">iii</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="86" x2="119" y1="171.7999" y2="171.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0001421289128664274084" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="480" y="161"/>
-      <ellipse cx="495" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M497.9688,182.6406 Q497.3906,182.9375 496.75,183.0781 Q496.1094,183.2344 495.4063,183.2344 Q492.9063,183.2344 491.5781,181.5938 Q490.2656,179.9375 490.2656,176.8125 Q490.2656,173.6875 491.5781,172.0313 Q492.9063,170.375 495.4063,170.375 Q496.1094,170.375 496.75,170.5313 Q497.4063,170.6875 497.9688,170.9844 L497.9688,173.7031 Q497.3438,173.125 496.75,172.8594 Q496.1563,172.5781 495.5313,172.5781 Q494.1875,172.5781 493.5,173.6563 Q492.8125,174.7188 492.8125,176.8125 Q492.8125,178.9063 493.5,179.9844 Q494.1875,181.0469 495.5313,181.0469 Q496.1563,181.0469 496.75,180.7813 Q497.3438,180.5 497.9688,179.9219 L497.9688,182.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="509" y="181.1543">f</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="193" y2="193"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="201" y2="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000322642841130459425">
+        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0000322642841130459425" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="239.8"/>
+        <ellipse cx="98" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M93,256.9563 C93,259.4563 95.1406,261.2688 98.0625,261.2688 C99.2969,261.2688 100.4688,260.9719 101.2188,260.4563 C101.8281,260.0344 102.1563,259.6125 102.1563,259.2063 C102.1563,258.7375 101.7344,258.3313 101.2344,258.3313 C101,258.3313 100.7813,258.4094 100.5781,258.6125 C100.1406,259.05 100.1406,259.05 99.9688,259.1438 C99.5156,259.3781 98.875,259.5188 98.1094,259.5188 C96.1094,259.5188 94.8281,258.5031 94.8281,256.925 L94.8281,255.8781 C94.8281,254.175 96.0469,252.9719 97.75,252.9719 C98.3281,252.9719 98.9063,253.1125 99.375,253.3625 C99.8438,253.6281 100.0156,253.8156 100.0781,254.175 C100.2031,254.8469 100.4531,255.0969 100.9844,255.0969 C101.2656,255.0969 101.5469,254.9563 101.7344,254.7375 C101.8594,254.5656 101.9063,254.3938 101.9063,253.9563 L101.9063,252.5969 C101.9063,252.175 101.8906,252.0344 101.7656,251.8625 C101.5938,251.6125 101.3125,251.4563 100.9844,251.4563 C100.6719,251.4563 100.4688,251.5656 100.25,251.8313 C99.0781,251.3313 98.6406,251.2219 97.6875,251.2219 C95.0156,251.2219 93,253.2375 93,255.8625 L93,256.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="260.406">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="279.8" y2="279.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="60.8047" id="C_0000190978367074032185" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="647" y="40"/>
-      <ellipse cx="662" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M666.1094,62 L658.3906,62 L658.3906,49.6094 L666.1094,49.6094 L666.1094,51.7656 L660.8438,51.7656 L660.8438,54.4375 L665.6094,54.4375 L665.6094,56.5938 L660.8438,56.5938 L660.8438,59.8438 L666.1094,59.8438 L666.1094,62 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="676" y="60.1543">h</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="648" x2="686" y1="72" y2="72"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="653" y="86.2104">hhh</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="648" x2="686" y1="92.8047" y2="92.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001248473990784124468">
+        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0001248473990784124468" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="239.8"/>
+        <ellipse cx="173.5" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M168.5,256.9563 C168.5,259.4563 170.6406,261.2688 173.5625,261.2688 C174.7969,261.2688 175.9688,260.9719 176.7188,260.4563 C177.3281,260.0344 177.6563,259.6125 177.6563,259.2063 C177.6563,258.7375 177.2344,258.3313 176.7344,258.3313 C176.5,258.3313 176.2813,258.4094 176.0781,258.6125 C175.6406,259.05 175.6406,259.05 175.4688,259.1438 C175.0156,259.3781 174.375,259.5188 173.6094,259.5188 C171.6094,259.5188 170.3281,258.5031 170.3281,256.925 L170.3281,255.8781 C170.3281,254.175 171.5469,252.9719 173.25,252.9719 C173.8281,252.9719 174.4063,253.1125 174.875,253.3625 C175.3438,253.6281 175.5156,253.8156 175.5781,254.175 C175.7031,254.8469 175.9531,255.0969 176.4844,255.0969 C176.7656,255.0969 177.0469,254.9563 177.2344,254.7375 C177.3594,254.5656 177.4063,254.3938 177.4063,253.9563 L177.4063,252.5969 C177.4063,252.175 177.3906,252.0344 177.2656,251.8625 C177.0938,251.6125 176.8125,251.4563 176.4844,251.4563 C176.1719,251.4563 175.9688,251.5656 175.75,251.8313 C174.5781,251.3313 174.1406,251.2219 173.1875,251.2219 C170.5156,251.2219 168.5,253.2375 168.5,255.8625 L168.5,256.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="260.406">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="279.8" y2="279.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="60.8047" id="C_0000965083605473661435" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="576.5" y="40"/>
-      <ellipse cx="591.5" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M595.6094,62 L587.8906,62 L587.8906,49.6094 L595.6094,49.6094 L595.6094,51.7656 L590.3438,51.7656 L590.3438,54.4375 L595.1094,54.4375 L595.1094,56.5938 L590.3438,56.5938 L590.3438,59.8438 L595.6094,59.8438 L595.6094,62 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="605.5" y="60.1543">j</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="577.5" x2="610.5" y1="72" y2="72"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="582.5" y="86.2104">jjj</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="577.5" x2="610.5" y1="92.8047" y2="92.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001038384764221361257">
+        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001038384764221361257" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="235" y="239.8"/>
+        <ellipse cx="250" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M245,256.9563 C245,259.4563 247.1406,261.2688 250.0625,261.2688 C251.2969,261.2688 252.4688,260.9719 253.2188,260.4563 C253.8281,260.0344 254.1563,259.6125 254.1563,259.2063 C254.1563,258.7375 253.7344,258.3313 253.2344,258.3313 C253,258.3313 252.7813,258.4094 252.5781,258.6125 C252.1406,259.05 252.1406,259.05 251.9688,259.1438 C251.5156,259.3781 250.875,259.5188 250.1094,259.5188 C248.1094,259.5188 246.8281,258.5031 246.8281,256.925 L246.8281,255.8781 C246.8281,254.175 248.0469,252.9719 249.75,252.9719 C250.3281,252.9719 250.9063,253.1125 251.375,253.3625 C251.8438,253.6281 252.0156,253.8156 252.0781,254.175 C252.2031,254.8469 252.4531,255.0969 252.9844,255.0969 C253.2656,255.0969 253.5469,254.9563 253.7344,254.7375 C253.8594,254.5656 253.9063,254.3938 253.9063,253.9563 L253.9063,252.5969 C253.9063,252.175 253.8906,252.0344 253.7656,251.8625 C253.5938,251.6125 253.3125,251.4563 252.9844,251.4563 C252.6719,251.4563 252.4688,251.5656 252.25,251.8313 C251.0781,251.3313 250.6406,251.2219 249.6875,251.2219 C247.0156,251.2219 245,253.2375 245,255.8625 L245,256.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="264" y="260.406">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236" x2="275" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236" x2="275" y1="279.8" y2="279.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0001376344645244260547" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="46.5"/>
-      <ellipse cx="21" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,68.1406 Q23.3906,68.4375 22.75,68.5781 Q22.1094,68.7344 21.4063,68.7344 Q18.9063,68.7344 17.5781,67.0938 Q16.2656,65.4375 16.2656,62.3125 Q16.2656,59.1875 17.5781,57.5313 Q18.9063,55.875 21.4063,55.875 Q22.1094,55.875 22.75,56.0313 Q23.4063,56.1875 23.9688,56.4844 L23.9688,59.2031 Q23.3438,58.625 22.75,58.3594 Q22.1563,58.0781 21.5313,58.0781 Q20.1875,58.0781 19.5,59.1563 Q18.8125,60.2188 18.8125,62.3125 Q18.8125,64.4063 19.5,65.4844 Q20.1875,66.5469 21.5313,66.5469 Q22.1563,66.5469 22.75,66.2813 Q23.3438,66 23.9688,65.4219 L23.9688,68.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="66.6543">b</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="78.5" y2="78.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="86.5" y2="86.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000530253748811039667">
+        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0000530253748811039667" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="239.8"/>
+        <ellipse cx="22" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,256.9563 C17,259.4563 19.1406,261.2688 22.0625,261.2688 C23.2969,261.2688 24.4688,260.9719 25.2188,260.4563 C25.8281,260.0344 26.1563,259.6125 26.1563,259.2063 C26.1563,258.7375 25.7344,258.3313 25.2344,258.3313 C25,258.3313 24.7813,258.4094 24.5781,258.6125 C24.1406,259.05 24.1406,259.05 23.9688,259.1438 C23.5156,259.3781 22.875,259.5188 22.1094,259.5188 C20.1094,259.5188 18.8281,258.5031 18.8281,256.925 L18.8281,255.8781 C18.8281,254.175 20.0469,252.9719 21.75,252.9719 C22.3281,252.9719 22.9063,253.1125 23.375,253.3625 C23.8438,253.6281 24.0156,253.8156 24.0781,254.175 C24.2031,254.8469 24.4531,255.0969 24.9844,255.0969 C25.2656,255.0969 25.5469,254.9563 25.7344,254.7375 C25.8594,254.5656 25.9063,254.3938 25.9063,253.9563 L25.9063,252.5969 C25.9063,252.175 25.8906,252.0344 25.7656,251.8625 C25.5938,251.6125 25.3125,251.4563 24.9844,251.4563 C24.6719,251.4563 24.4688,251.5656 24.25,251.8313 C23.0781,251.3313 22.6406,251.2219 21.6875,251.2219 C19.0156,251.2219 17,253.2375 17,255.8625 L17,256.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="260.406">F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="279.8" y2="279.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0001264455164862224089" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="46.5"/>
-      <ellipse cx="96" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M98.9688,68.1406 Q98.3906,68.4375 97.75,68.5781 Q97.1094,68.7344 96.4063,68.7344 Q93.9063,68.7344 92.5781,67.0938 Q91.2656,65.4375 91.2656,62.3125 Q91.2656,59.1875 92.5781,57.5313 Q93.9063,55.875 96.4063,55.875 Q97.1094,55.875 97.75,56.0313 Q98.4063,56.1875 98.9688,56.4844 L98.9688,59.2031 Q98.3438,58.625 97.75,58.3594 Q97.1563,58.0781 96.5313,58.0781 Q95.1875,58.0781 94.5,59.1563 Q93.8125,60.2188 93.8125,62.3125 Q93.8125,64.4063 94.5,65.4844 Q95.1875,66.5469 96.5313,66.5469 Q97.1563,66.5469 97.75,66.2813 Q98.3438,66 98.9688,65.4219 L98.9688,68.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="66.6543">d</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="78.5" y2="78.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="86.5" y2="86.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <g id="elem_C_0000347629837292519144">
+        <rect codeLine="49" fill="#F1F1F1" height="48" id="C_0000347629837292519144" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="311.5" y="239.8"/>
+        <ellipse cx="326.5" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M321.5,256.9563 C321.5,259.4563 323.6406,261.2688 326.5625,261.2688 C327.7969,261.2688 328.9688,260.9719 329.7188,260.4563 C330.3281,260.0344 330.6563,259.6125 330.6563,259.2063 C330.6563,258.7375 330.2344,258.3313 329.7344,258.3313 C329.5,258.3313 329.2813,258.4094 329.0781,258.6125 C328.6406,259.05 328.6406,259.05 328.4688,259.1438 C328.0156,259.3781 327.375,259.5188 326.6094,259.5188 C324.6094,259.5188 323.3281,258.5031 323.3281,256.925 L323.3281,255.8781 C323.3281,254.175 324.5469,252.9719 326.25,252.9719 C326.8281,252.9719 327.4063,253.1125 327.875,253.3625 C328.3438,253.6281 328.5156,253.8156 328.5781,254.175 C328.7031,254.8469 328.9531,255.0969 329.4844,255.0969 C329.7656,255.0969 330.0469,254.9563 330.2344,254.7375 C330.3594,254.5656 330.4063,254.3938 330.4063,253.9563 L330.4063,252.5969 C330.4063,252.175 330.3906,252.0344 330.2656,251.8625 C330.0938,251.6125 329.8125,251.4563 329.4844,251.4563 C329.1719,251.4563 328.9688,251.5656 328.75,251.8313 C327.5781,251.3313 327.1406,251.2219 326.1875,251.2219 C323.5156,251.2219 321.5,253.2375 321.5,255.8625 L321.5,256.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="340.5" y="260.406">a</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="312.5" x2="350.5" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="312.5" x2="350.5" y1="279.8" y2="279.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0000200227126708762001" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="46.5"/>
-      <ellipse cx="171" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.9688,68.1406 Q173.3906,68.4375 172.75,68.5781 Q172.1094,68.7344 171.4063,68.7344 Q168.9063,68.7344 167.5781,67.0938 Q166.2656,65.4375 166.2656,62.3125 Q166.2656,59.1875 167.5781,57.5313 Q168.9063,55.875 171.4063,55.875 Q172.1094,55.875 172.75,56.0313 Q173.4063,56.1875 173.9688,56.4844 L173.9688,59.2031 Q173.3438,58.625 172.75,58.3594 Q172.1563,58.0781 171.5313,58.0781 Q170.1875,58.0781 169.5,59.1563 Q168.8125,60.2188 168.8125,62.3125 Q168.8125,64.4063 169.5,65.4844 Q170.1875,66.5469 171.5313,66.5469 Q172.1563,66.5469 172.75,66.2813 Q173.3438,66 173.9688,65.4219 L173.9688,68.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="66.6543">g</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="78.5" y2="78.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="86.5" y2="86.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <g id="elem_C_0000504463801094568803">
+        <rect codeLine="53" fill="#F1F1F1" height="48" id="C_0000504463801094568803" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="387" y="239.8"/>
+        <ellipse cx="402" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M397,256.9563 C397,259.4563 399.1406,261.2688 402.0625,261.2688 C403.2969,261.2688 404.4688,260.9719 405.2188,260.4563 C405.8281,260.0344 406.1563,259.6125 406.1563,259.2063 C406.1563,258.7375 405.7344,258.3313 405.2344,258.3313 C405,258.3313 404.7813,258.4094 404.5781,258.6125 C404.1406,259.05 404.1406,259.05 403.9688,259.1438 C403.5156,259.3781 402.875,259.5188 402.1094,259.5188 C400.1094,259.5188 398.8281,258.5031 398.8281,256.925 L398.8281,255.8781 C398.8281,254.175 400.0469,252.9719 401.75,252.9719 C402.3281,252.9719 402.9063,253.1125 403.375,253.3625 C403.8438,253.6281 404.0156,253.8156 404.0781,254.175 C404.2031,254.8469 404.4531,255.0969 404.9844,255.0969 C405.2656,255.0969 405.5469,254.9563 405.7344,254.7375 C405.8594,254.5656 405.9063,254.3938 405.9063,253.9563 L405.9063,252.5969 C405.9063,252.175 405.8906,252.0344 405.7656,251.8625 C405.5938,251.6125 405.3125,251.4563 404.9844,251.4563 C404.6719,251.4563 404.4688,251.5656 404.25,251.8313 C403.0781,251.3313 402.6406,251.2219 401.6875,251.2219 C399.0156,251.2219 397,253.2375 397,255.8625 L397,256.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="416" y="260.406">c</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="388" x2="425" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="388" x2="425" y1="279.8" y2="279.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0000876623970071162908" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="161"/>
-      <ellipse cx="21" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,182.6406 Q23.3906,182.9375 22.75,183.0781 Q22.1094,183.2344 21.4063,183.2344 Q18.9063,183.2344 17.5781,181.5938 Q16.2656,179.9375 16.2656,176.8125 Q16.2656,173.6875 17.5781,172.0313 Q18.9063,170.375 21.4063,170.375 Q22.1094,170.375 22.75,170.5313 Q23.4063,170.6875 23.9688,170.9844 L23.9688,173.7031 Q23.3438,173.125 22.75,172.8594 Q22.1563,172.5781 21.5313,172.5781 Q20.1875,172.5781 19.5,173.6563 Q18.8125,174.7188 18.8125,176.8125 Q18.8125,178.9063 19.5,179.9844 Q20.1875,181.0469 21.5313,181.0469 Q22.1563,181.0469 22.75,180.7813 Q23.3438,180.5 23.9688,179.9219 L23.9688,182.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="181.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="193" y2="193"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="201" y2="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <g id="elem_C_0000907921963776939609">
+        <rect codeLine="57" fill="#F1F1F1" height="48" id="C_0000907921963776939609" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="461.5" y="239.8"/>
+        <ellipse cx="476.5" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M471.5,256.9563 C471.5,259.4563 473.6406,261.2688 476.5625,261.2688 C477.7969,261.2688 478.9688,260.9719 479.7188,260.4563 C480.3281,260.0344 480.6563,259.6125 480.6563,259.2063 C480.6563,258.7375 480.2344,258.3313 479.7344,258.3313 C479.5,258.3313 479.2813,258.4094 479.0781,258.6125 C478.6406,259.05 478.6406,259.05 478.4688,259.1438 C478.0156,259.3781 477.375,259.5188 476.6094,259.5188 C474.6094,259.5188 473.3281,258.5031 473.3281,256.925 L473.3281,255.8781 C473.3281,254.175 474.5469,252.9719 476.25,252.9719 C476.8281,252.9719 477.4063,253.1125 477.875,253.3625 C478.3438,253.6281 478.5156,253.8156 478.5781,254.175 C478.7031,254.8469 478.9531,255.0969 479.4844,255.0969 C479.7656,255.0969 480.0469,254.9563 480.2344,254.7375 C480.3594,254.5656 480.4063,254.3938 480.4063,253.9563 L480.4063,252.5969 C480.4063,252.175 480.3906,252.0344 480.2656,251.8625 C480.0938,251.6125 479.8125,251.4563 479.4844,251.4563 C479.1719,251.4563 478.9688,251.5656 478.75,251.8313 C477.5781,251.3313 477.1406,251.2219 476.1875,251.2219 C473.5156,251.2219 471.5,253.2375 471.5,255.8625 L471.5,256.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="490.5" y="260.406">e</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="462.5" x2="500.5" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="462.5" x2="500.5" y1="279.8" y2="279.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0000470228045297785394" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="81.5" y="161"/>
-      <ellipse cx="96.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M99.4688,182.6406 Q98.8906,182.9375 98.25,183.0781 Q97.6094,183.2344 96.9063,183.2344 Q94.4063,183.2344 93.0781,181.5938 Q91.7656,179.9375 91.7656,176.8125 Q91.7656,173.6875 93.0781,172.0313 Q94.4063,170.375 96.9063,170.375 Q97.6094,170.375 98.25,170.5313 Q98.9063,170.6875 99.4688,170.9844 L99.4688,173.7031 Q98.8438,173.125 98.25,172.8594 Q97.6563,172.5781 97.0313,172.5781 Q95.6875,172.5781 95,173.6563 Q94.3125,174.7188 94.3125,176.8125 Q94.3125,178.9063 95,179.9844 Q95.6875,181.0469 97.0313,181.0469 Q97.6563,181.0469 98.25,180.7813 Q98.8438,180.5 99.4688,179.9219 L99.4688,182.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="110.5" y="181.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="193" y2="193"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="201" y2="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <g id="elem_C_0001421289128664274084">
+        <rect codeLine="61" fill="#F1F1F1" height="48" id="C_0001421289128664274084" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="536.5" y="239.8"/>
+        <ellipse cx="551.5" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M546.5,256.9563 C546.5,259.4563 548.6406,261.2688 551.5625,261.2688 C552.7969,261.2688 553.9688,260.9719 554.7188,260.4563 C555.3281,260.0344 555.6563,259.6125 555.6563,259.2063 C555.6563,258.7375 555.2344,258.3313 554.7344,258.3313 C554.5,258.3313 554.2813,258.4094 554.0781,258.6125 C553.6406,259.05 553.6406,259.05 553.4688,259.1438 C553.0156,259.3781 552.375,259.5188 551.6094,259.5188 C549.6094,259.5188 548.3281,258.5031 548.3281,256.925 L548.3281,255.8781 C548.3281,254.175 549.5469,252.9719 551.25,252.9719 C551.8281,252.9719 552.4063,253.1125 552.875,253.3625 C553.3438,253.6281 553.5156,253.8156 553.5781,254.175 C553.7031,254.8469 553.9531,255.0969 554.4844,255.0969 C554.7656,255.0969 555.0469,254.9563 555.2344,254.7375 C555.3594,254.5656 555.4063,254.3938 555.4063,253.9563 L555.4063,252.5969 C555.4063,252.175 555.3906,252.0344 555.2656,251.8625 C555.0938,251.6125 554.8125,251.4563 554.4844,251.4563 C554.1719,251.4563 553.9688,251.5656 553.75,251.8313 C552.5781,251.3313 552.1406,251.2219 551.1875,251.2219 C548.5156,251.2219 546.5,253.2375 546.5,255.8625 L546.5,256.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="565.5" y="260.406">f</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="537.5" x2="571.5" y1="271.8" y2="271.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="537.5" x2="571.5" y1="279.8" y2="279.8"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="48" id="C_0001031614323468823578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="157.5" y="161"/>
-      <ellipse cx="172.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M175.4688,182.6406 Q174.8906,182.9375 174.25,183.0781 Q173.6094,183.2344 172.9063,183.2344 Q170.4063,183.2344 169.0781,181.5938 Q167.7656,179.9375 167.7656,176.8125 Q167.7656,173.6875 169.0781,172.0313 Q170.4063,170.375 172.9063,170.375 Q173.6094,170.375 174.25,170.5313 Q174.9063,170.6875 175.4688,170.9844 L175.4688,173.7031 Q174.8438,173.125 174.25,172.8594 Q173.6563,172.5781 173.0313,172.5781 Q171.6875,172.5781 171,173.6563 Q170.3125,174.7188 170.3125,176.8125 Q170.3125,178.9063 171,179.9844 Q171.6875,181.0469 173.0313,181.0469 Q173.6563,181.0469 174.25,180.7813 Q174.8438,180.5 175.4688,179.9219 L175.4688,182.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="181.1543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="193" y2="193"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="201" y2="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <g id="elem_C_0000190978367074032185">
+        <rect codeLine="67" fill="#F1F1F1" height="64.7999" id="C_0000190978367074032185" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="7.5" y="347.8"/>
+        <ellipse cx="22.5" cy="363.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M21.3594,364.8625 L22.6719,364.8625 L22.6719,364.9094 C22.6719,365.3156 22.6875,365.4719 22.7969,365.6281 C22.9688,365.8781 23.2656,366.05 23.5781,366.05 C23.8594,366.05 24.1563,365.9094 24.3281,365.6906 C24.4531,365.5031 24.5,365.3625 24.5,364.9094 L24.5,363.0656 C24.5,362.7375 24.4844,362.6281 24.4219,362.4563 C24.3125,362.1594 23.9531,361.9094 23.5781,361.9094 C23.2813,361.9094 23.0156,362.05 22.8438,362.2688 C22.7031,362.4563 22.6719,362.6281 22.6719,363.0656 L22.6719,363.1281 L21.3594,363.1281 L21.3594,360.9563 L25.2031,360.9563 L25.2031,361.7063 C25.2031,362.0969 25.2344,362.2844 25.3438,362.4406 C25.5156,362.6906 25.8125,362.8625 26.125,362.8625 C26.4219,362.8625 26.6875,362.7375 26.875,362.5031 C27.0156,362.3156 27.0469,362.175 27.0469,361.7063 L27.0469,359.2063 L19.3438,359.2063 C18.8906,359.2063 18.7656,359.2219 18.5938,359.3313 C18.3281,359.5031 18.1563,359.7688 18.1563,360.0813 C18.1563,360.3625 18.2813,360.6281 18.5313,360.8 C18.7188,360.925 18.9063,360.9563 19.3438,360.9563 L19.5313,360.9563 L19.5313,367.05 L19.3438,367.05 C18.9219,367.05 18.7656,367.0813 18.5938,367.175 C18.3281,367.3313 18.1563,367.6125 18.1563,367.9094 C18.1563,368.4875 18.5625,368.8 19.3438,368.8 L27.4219,368.8 L27.4219,366.2688 C27.4219,365.8625 27.3906,365.6906 27.2813,365.5344 C27.1094,365.2688 26.8281,365.1125 26.5,365.1125 C26.2188,365.1125 25.9375,365.2531 25.75,365.4719 C25.6094,365.6594 25.5781,365.8156 25.5781,366.2688 L25.5781,367.05 L21.3594,367.05 L21.3594,364.8625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="36.5" y="368.406">h</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8.5" x2="46.5" y1="379.8" y2="379.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="13.5" y="396.8059">hhh</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8.5" x2="46.5" y1="404.5999" y2="404.5999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmk851bq23e7b)" height="60.8047" id="C_0001473214620883985930" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="8.5" y="269"/>
-      <ellipse cx="23.5" cy="285" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M27.6094,291 L19.8906,291 L19.8906,278.6094 L27.6094,278.6094 L27.6094,280.7656 L22.3438,280.7656 L22.3438,283.4375 L27.1094,283.4375 L27.1094,285.5938 L22.3438,285.5938 L22.3438,288.8438 L27.6094,288.8438 L27.6094,291 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="37.5" y="289.1543">i</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="9.5" x2="42.5" y1="301" y2="301"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="14.5" y="315.2104">iii</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="9.5" x2="42.5" y1="321.8047" y2="321.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <g id="elem_C_0000965083605473661435">
+        <rect codeLine="71" fill="#F1F1F1" height="64.7999" id="C_0000965083605473661435" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="83" y="347.8"/>
+        <ellipse cx="98" cy="363.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M96.8594,364.8625 L98.1719,364.8625 L98.1719,364.9094 C98.1719,365.3156 98.1875,365.4719 98.2969,365.6281 C98.4688,365.8781 98.7656,366.05 99.0781,366.05 C99.3594,366.05 99.6563,365.9094 99.8281,365.6906 C99.9531,365.5031 100,365.3625 100,364.9094 L100,363.0656 C100,362.7375 99.9844,362.6281 99.9219,362.4563 C99.8125,362.1594 99.4531,361.9094 99.0781,361.9094 C98.7813,361.9094 98.5156,362.05 98.3438,362.2688 C98.2031,362.4563 98.1719,362.6281 98.1719,363.0656 L98.1719,363.1281 L96.8594,363.1281 L96.8594,360.9563 L100.7031,360.9563 L100.7031,361.7063 C100.7031,362.0969 100.7344,362.2844 100.8438,362.4406 C101.0156,362.6906 101.3125,362.8625 101.625,362.8625 C101.9219,362.8625 102.1875,362.7375 102.375,362.5031 C102.5156,362.3156 102.5469,362.175 102.5469,361.7063 L102.5469,359.2063 L94.8438,359.2063 C94.3906,359.2063 94.2656,359.2219 94.0938,359.3313 C93.8281,359.5031 93.6563,359.7688 93.6563,360.0813 C93.6563,360.3625 93.7813,360.6281 94.0313,360.8 C94.2188,360.925 94.4063,360.9563 94.8438,360.9563 L95.0313,360.9563 L95.0313,367.05 L94.8438,367.05 C94.4219,367.05 94.2656,367.0813 94.0938,367.175 C93.8281,367.3313 93.6563,367.6125 93.6563,367.9094 C93.6563,368.4875 94.0625,368.8 94.8438,368.8 L102.9219,368.8 L102.9219,366.2688 C102.9219,365.8625 102.8906,365.6906 102.7813,365.5344 C102.6094,365.2688 102.3281,365.1125 102,365.1125 C101.7188,365.1125 101.4375,365.2531 101.25,365.4719 C101.1094,365.6594 101.0781,365.8156 101.0781,366.2688 L101.0781,367.05 L96.8594,367.05 L96.8594,364.8625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="112" y="368.406">j</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="117" y1="379.8" y2="379.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="89" y="396.8059">jjj</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="117" y1="404.5999" y2="404.5999"/>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00053_class_mermaid.svg b/docs/test_cases/t00053_class_mermaid.svg
index 502ce400..30027b4b 100644
--- a/docs/test_cases/t00053_class_mermaid.svg
+++ b/docs/test_cases/t00053_class_mermaid.svg
@@ -1,50 +1,55 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1531.796875 117" style="max-width: 1531.8px; background-color: white;" width="1531.796875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,7 +57,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L4">
           <g title="b" id="classId-C_0001376344645244260547-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -71,7 +76,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L6">
+        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L6">
           <g title="d" id="classId-C_0001264455164862224089-1" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -90,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L9">
+        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L9">
           <g title="g" id="classId-C_0000200227126708762001-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -109,7 +114,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L12">
+        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L12">
           <g title="B" id="classId-C_0000876623970071162908-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L14">
+        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L14">
           <g title="D" id="classId-C_0000470228045297785394-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L17">
+        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L17">
           <g title="G" id="classId-C_0001031614323468823578-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -166,7 +171,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L20">
+        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L20">
           <g title="i" id="classId-C_0001473214620883985930-6" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -190,7 +195,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L11">
+        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L11">
           <g title="A" id="classId-C_0000322642841130459425-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -209,7 +214,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L13">
+        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L13">
           <g title="C" id="classId-C_0001248473990784124468-8" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -228,7 +233,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L15">
+        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L15">
           <g title="E" id="classId-C_0001038384764221361257-9" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -247,7 +252,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L16">
+        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L16">
           <g title="F" id="classId-C_0000530253748811039667-10" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -266,7 +271,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L3">
+        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L3">
           <g title="a" id="classId-C_0000347629837292519144-11" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -285,7 +290,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L5">
+        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L5">
           <g title="c" id="classId-C_0000504463801094568803-12" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -304,7 +309,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L7">
+        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L7">
           <g title="e" id="classId-C_0000907921963776939609-13" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -323,7 +328,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L8">
+        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L8">
           <g title="f" id="classId-C_0001421289128664274084-14" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -342,7 +347,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L19">
+        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L19">
           <g title="h" id="classId-C_0000190978367074032185-15" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -366,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00053/t00053.cc#L21">
+        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L21">
           <g title="j" id="classId-C_0000965083605473661435-16" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
diff --git a/docs/test_cases/t00054.md b/docs/test_cases/t00054.md
index 02353751..b19c652b 100644
--- a/docs/test_cases/t00054.md
+++ b/docs/test_cases/t00054.md
@@ -24,7 +24,7 @@ diagrams:
         - together: [detail4::i,detail4::j]
 ```
 ## Source code
-File t00054.cc
+File `tests/t00054/t00054.cc`
 ```cpp
 namespace clanguml {
 namespace t00054 {
diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg
index d6d07155..532dd26a 100644
--- a/docs/test_cases/t00054_class.svg
+++ b/docs/test_cases/t00054_class.svg
@@ -1,183 +1,393 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:1774px;height:380px;" version="1.1" viewBox="0 0 1774 380" width="1774px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="659px" preserveAspectRatio="none" style="width:1187px;height:659px;background:#FFFFFF;" version="1.1" viewBox="0 0 1187 659" width="1187px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ff2u993w1e2bb" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#ff2u993w1e2bb)" points="707,55,756,55,763,77.2969,1049,77.2969,1049,226,707,226,707,55" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="707" x2="763" y1="77.2969" y2="77.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="43" x="711" y="69.9951">detail</text>
-    <polygon fill="#FFFFFF" filter="url(#ff2u993w1e2bb)" points="1073,24,1132,24,1139,46.2969,1752,46.2969,1752,238,1073,238,1073,24" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="1073" x2="1139" y1="46.2969" y2="46.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1077" y="38.9951">detail2</text>
-    <polygon fill="#FFFFFF" filter="url(#ff2u993w1e2bb)" points="1531,67,1590,67,1597,89.2969,1728,89.2969,1728,214,1531,214,1531,67" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="1531" x2="1597" y1="89.2969" y2="89.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1535" y="81.9951">detail3</text>
-    <polygon fill="#FFFFFF" filter="url(#ff2u993w1e2bb)" points="22,54,81,54,88,76.2969,377,76.2969,377,368,22,368,22,54" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="88" y1="76.2969" y2="76.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="26" y="68.9951">detail4</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="48" id="C_0001569559620782547158" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="723" y="126"/>
-      <ellipse cx="738" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M740.9688,147.6406 Q740.3906,147.9375 739.75,148.0781 Q739.1094,148.2344 738.4063,148.2344 Q735.9063,148.2344 734.5781,146.5938 Q733.2656,144.9375 733.2656,141.8125 Q733.2656,138.6875 734.5781,137.0313 Q735.9063,135.375 738.4063,135.375 Q739.1094,135.375 739.75,135.5313 Q740.4063,135.6875 740.9688,135.9844 L740.9688,138.7031 Q740.3438,138.125 739.75,137.8594 Q739.1563,137.5781 738.5313,137.5781 Q737.1875,137.5781 736.5,138.6563 Q735.8125,139.7188 735.8125,141.8125 Q735.8125,143.9063 736.5,144.9844 Q737.1875,146.0469 738.5313,146.0469 Q739.1563,146.0469 739.75,145.7813 Q740.3438,145.5 740.9688,144.9219 L740.9688,147.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="752" y="146.1543">d</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="166" y2="166"/>
+    <g id="cluster_C_0001528412426718409492">
+      <path d="M618,49.294 L657,49.294 A3.75,3.75 0 0 1 659.5,51.794 L666.5,72.0939 L776,72.0939 A2.5,2.5 0 0 1 778.5,74.5939 L778.5,269.794 A2.5,2.5 0 0 1 776,272.294 L618,272.294 A2.5,2.5 0 0 1 615.5,269.794 L615.5,51.794 A2.5,2.5 0 0 1 618,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="615.5" x2="666.5" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="619.5" y="64.2999">detail</text>
+    </g>
+    <g id="cluster_C_0001254251774710725340">
+      <path d="M845,6.294 L892,6.294 A3.75,3.75 0 0 1 894.5,8.794 L901.5,29.0939 L1178,29.0939 A2.5,2.5 0 0 1 1180.5,31.5939 L1180.5,408.794 A2.5,2.5 0 0 1 1178,411.294 L845,411.294 A2.5,2.5 0 0 1 842.5,408.794 L842.5,8.794 A2.5,2.5 0 0 1 845,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="842.5" x2="901.5" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="846.5" y="21.2999">detail2</text>
+    </g>
+    <g id="cluster_C_0002287989977787433815">
+      <path d="M994,49.294 L1041,49.294 A3.75,3.75 0 0 1 1043.5,51.794 L1050.5,72.0939 L1154,72.0939 A2.5,2.5 0 0 1 1156.5,74.5939 L1156.5,161.794 A2.5,2.5 0 0 1 1154,164.294 L994,164.294 A2.5,2.5 0 0 1 991.5,161.794 L991.5,51.794 A2.5,2.5 0 0 1 994,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="991.5" x2="1050.5" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="995.5" y="64.2999">detail3</text>
+    </g>
+    <g id="cluster_C_0001966327474066391027">
+      <path d="M447,296.294 L494,296.294 A3.75,3.75 0 0 1 496.5,298.794 L503.5,319.0939 L816,319.0939 A2.5,2.5 0 0 1 818.5,321.5939 L818.5,649.994 A2.5,2.5 0 0 1 816,652.494 L447,652.494 A2.5,2.5 0 0 1 444.5,649.994 L444.5,298.794 A2.5,2.5 0 0 1 447,296.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="444.5" x2="503.5" y1="319.0939" y2="319.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="448.5" y="311.2999">detail4</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <g id="elem_C_0001569559620782547158">
+        <rect codeLine="7" fill="#F1F1F1" height="48" id="C_0001569559620782547158" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="639.5" y="92.294"/>
+        <ellipse cx="654.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M649.5,109.4502 C649.5,111.9502 651.6406,113.7627 654.5625,113.7627 C655.7969,113.7627 656.9688,113.4659 657.7188,112.9502 C658.3281,112.5284 658.6563,112.1065 658.6563,111.7002 C658.6563,111.2315 658.2344,110.8252 657.7344,110.8252 C657.5,110.8252 657.2813,110.9034 657.0781,111.1065 C656.6406,111.544 656.6406,111.544 656.4688,111.6377 C656.0156,111.8721 655.375,112.0127 654.6094,112.0127 C652.6094,112.0127 651.3281,110.9971 651.3281,109.419 L651.3281,108.3721 C651.3281,106.669 652.5469,105.4659 654.25,105.4659 C654.8281,105.4659 655.4063,105.6065 655.875,105.8565 C656.3438,106.1221 656.5156,106.3096 656.5781,106.669 C656.7031,107.3409 656.9531,107.5909 657.4844,107.5909 C657.7656,107.5909 658.0469,107.4502 658.2344,107.2315 C658.3594,107.0596 658.4063,106.8877 658.4063,106.4502 L658.4063,105.0909 C658.4063,104.669 658.3906,104.5284 658.2656,104.3565 C658.0938,104.1065 657.8125,103.9502 657.4844,103.9502 C657.1719,103.9502 656.9688,104.0596 656.75,104.3252 C655.5781,103.8252 655.1406,103.7159 654.1875,103.7159 C651.5156,103.7159 649.5,105.7315 649.5,108.3565 L649.5,109.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="668.5" y="112.9">d</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="640.5" x2="678.5" y1="124.294" y2="124.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="640.5" x2="678.5" y1="132.294" y2="132.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="72" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="114"/>
-      <ellipse cx="984" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M986.9688,135.6406 Q986.3906,135.9375 985.75,136.0781 Q985.1094,136.2344 984.4063,136.2344 Q981.9063,136.2344 980.5781,134.5938 Q979.2656,132.9375 979.2656,129.8125 Q979.2656,126.6875 980.5781,125.0313 Q981.9063,123.375 984.4063,123.375 Q985.1094,123.375 985.75,123.5313 Q986.4063,123.6875 986.9688,123.9844 L986.9688,126.7031 Q986.3438,126.125 985.75,125.8594 Q985.1563,125.5781 984.5313,125.5781 Q983.1875,125.5781 982.5,126.6563 Q981.8125,127.7188 981.8125,129.8125 Q981.8125,131.9063 982.5,132.9844 Q983.1875,134.0469 984.5313,134.0469 Q985.1563,134.0469 985.75,133.7813 Q986.3438,133.5 986.9688,132.9219 L986.9688,135.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="998" y="134.1543">a</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="146" y2="146"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="154" y2="154"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="162" y2="162"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="170" y2="170"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="178" y2="178"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <g id="elem_C_0001158868779503074564">
+        <rect codeLine="12" fill="#F1F1F1" height="48" id="C_0001158868779503074564" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="714.5" y="92.294"/>
+        <ellipse cx="729.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M724.5,109.4502 C724.5,111.9502 726.6406,113.7627 729.5625,113.7627 C730.7969,113.7627 731.9688,113.4659 732.7188,112.9502 C733.3281,112.5284 733.6563,112.1065 733.6563,111.7002 C733.6563,111.2315 733.2344,110.8252 732.7344,110.8252 C732.5,110.8252 732.2813,110.9034 732.0781,111.1065 C731.6406,111.544 731.6406,111.544 731.4688,111.6377 C731.0156,111.8721 730.375,112.0127 729.6094,112.0127 C727.6094,112.0127 726.3281,110.9971 726.3281,109.419 L726.3281,108.3721 C726.3281,106.669 727.5469,105.4659 729.25,105.4659 C729.8281,105.4659 730.4063,105.6065 730.875,105.8565 C731.3438,106.1221 731.5156,106.3096 731.5781,106.669 C731.7031,107.3409 731.9531,107.5909 732.4844,107.5909 C732.7656,107.5909 733.0469,107.4502 733.2344,107.2315 C733.3594,107.0596 733.4063,106.8877 733.4063,106.4502 L733.4063,105.0909 C733.4063,104.669 733.3906,104.5284 733.2656,104.3565 C733.0938,104.1065 732.8125,103.9502 732.4844,103.9502 C732.1719,103.9502 731.9688,104.0596 731.75,104.3252 C730.5781,103.8252 730.1406,103.7159 729.1875,103.7159 C726.5156,103.7159 724.5,105.7315 724.5,108.3565 L724.5,109.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="743.5" y="112.9">a</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="715.5" x2="753.5" y1="124.294" y2="124.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="715.5" x2="753.5" y1="132.294" y2="132.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="72" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="114"/>
-      <ellipse cx="888.5" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M891.4688,135.6406 Q890.8906,135.9375 890.25,136.0781 Q889.6094,136.2344 888.9063,136.2344 Q886.4063,136.2344 885.0781,134.5938 Q883.7656,132.9375 883.7656,129.8125 Q883.7656,126.6875 885.0781,125.0313 Q886.4063,123.375 888.9063,123.375 Q889.6094,123.375 890.25,123.5313 Q890.9063,123.6875 891.4688,123.9844 L891.4688,126.7031 Q890.8438,126.125 890.25,125.8594 Q889.6563,125.5781 889.0313,125.5781 Q887.6875,125.5781 887,126.6563 Q886.3125,127.7188 886.3125,129.8125 Q886.3125,131.9063 887,132.9844 Q887.6875,134.0469 889.0313,134.0469 Q889.6563,134.0469 890.25,133.7813 Q890.8438,133.5 891.4688,132.9219 L891.4688,135.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="902.5" y="134.1543">c</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="146" y2="146"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="154" y2="154"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="162" y2="162"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="170" y2="170"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="178" y2="178"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <g id="elem_C_0001168031834662719964">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001168031834662719964" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="640" y="200.294"/>
+        <ellipse cx="655" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M650,217.4502 C650,219.9502 652.1406,221.7627 655.0625,221.7627 C656.2969,221.7627 657.4688,221.4659 658.2188,220.9502 C658.8281,220.5284 659.1563,220.1065 659.1563,219.7002 C659.1563,219.2315 658.7344,218.8252 658.2344,218.8252 C658,218.8252 657.7813,218.9034 657.5781,219.1065 C657.1406,219.544 657.1406,219.544 656.9688,219.6377 C656.5156,219.8721 655.875,220.0127 655.1094,220.0127 C653.1094,220.0127 651.8281,218.9971 651.8281,217.419 L651.8281,216.3721 C651.8281,214.669 653.0469,213.4659 654.75,213.4659 C655.3281,213.4659 655.9063,213.6065 656.375,213.8565 C656.8438,214.1221 657.0156,214.3096 657.0781,214.669 C657.2031,215.3409 657.4531,215.5909 657.9844,215.5909 C658.2656,215.5909 658.5469,215.4502 658.7344,215.2315 C658.8594,215.0596 658.9063,214.8877 658.9063,214.4502 L658.9063,213.0909 C658.9063,212.669 658.8906,212.5284 658.7656,212.3565 C658.5938,212.1065 658.3125,211.9502 657.9844,211.9502 C657.6719,211.9502 657.4688,212.0596 657.25,212.3252 C656.0781,211.8252 655.6406,211.7159 654.6875,211.7159 C652.0156,211.7159 650,213.7315 650,216.3565 L650,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="669" y="220.9">c</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="641" x2="678" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="641" x2="678" y1="240.294" y2="240.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="72" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="114"/>
-      <ellipse cx="813" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M815.9688,135.6406 Q815.3906,135.9375 814.75,136.0781 Q814.1094,136.2344 813.4063,136.2344 Q810.9063,136.2344 809.5781,134.5938 Q808.2656,132.9375 808.2656,129.8125 Q808.2656,126.6875 809.5781,125.0313 Q810.9063,123.375 813.4063,123.375 Q814.1094,123.375 814.75,123.5313 Q815.4063,123.6875 815.9688,123.9844 L815.9688,126.7031 Q815.3438,126.125 814.75,125.8594 Q814.1563,125.5781 813.5313,125.5781 Q812.1875,125.5781 811.5,126.6563 Q810.8125,127.7188 810.8125,129.8125 Q810.8125,131.9063 811.5,132.9844 Q812.1875,134.0469 813.5313,134.0469 Q814.1563,134.0469 814.75,133.7813 Q815.3438,133.5 815.9688,132.9219 L815.9688,135.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827" y="134.1543">e</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="146" y2="146"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="154" y2="154"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="162" y2="162"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="170" y2="170"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="178" y2="178"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <g id="elem_C_0002037550833462858827">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0002037550833462858827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="714.5" y="200.294"/>
+        <ellipse cx="729.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M724.5,217.4502 C724.5,219.9502 726.6406,221.7627 729.5625,221.7627 C730.7969,221.7627 731.9688,221.4659 732.7188,220.9502 C733.3281,220.5284 733.6563,220.1065 733.6563,219.7002 C733.6563,219.2315 733.2344,218.8252 732.7344,218.8252 C732.5,218.8252 732.2813,218.9034 732.0781,219.1065 C731.6406,219.544 731.6406,219.544 731.4688,219.6377 C731.0156,219.8721 730.375,220.0127 729.6094,220.0127 C727.6094,220.0127 726.3281,218.9971 726.3281,217.419 L726.3281,216.3721 C726.3281,214.669 727.5469,213.4659 729.25,213.4659 C729.8281,213.4659 730.4063,213.6065 730.875,213.8565 C731.3438,214.1221 731.5156,214.3096 731.5781,214.669 C731.7031,215.3409 731.9531,215.5909 732.4844,215.5909 C732.7656,215.5909 733.0469,215.4502 733.2344,215.2315 C733.3594,215.0596 733.4063,214.8877 733.4063,214.4502 L733.4063,213.0909 C733.4063,212.669 733.3906,212.5284 733.2656,212.3565 C733.0938,212.1065 732.8125,211.9502 732.4844,211.9502 C732.1719,211.9502 731.9688,212.0596 731.75,212.3252 C730.5781,211.8252 730.1406,211.7159 729.1875,211.7159 C726.5156,211.7159 724.5,213.7315 724.5,216.3565 L724.5,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="743.5" y="220.9">e</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="715.5" x2="753.5" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="715.5" x2="753.5" y1="240.294" y2="240.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="48" id="C_0000540054955081677892" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1209" y="126"/>
-      <ellipse cx="1224" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1226.9688,147.6406 Q1226.3906,147.9375 1225.75,148.0781 Q1225.1094,148.2344 1224.4063,148.2344 Q1221.9063,148.2344 1220.5781,146.5938 Q1219.2656,144.9375 1219.2656,141.8125 Q1219.2656,138.6875 1220.5781,137.0313 Q1221.9063,135.375 1224.4063,135.375 Q1225.1094,135.375 1225.75,135.5313 Q1226.4063,135.6875 1226.9688,135.9844 L1226.9688,138.7031 Q1226.3438,138.125 1225.75,137.8594 Q1225.1563,137.5781 1224.5313,137.5781 Q1223.1875,137.5781 1222.5,138.6563 Q1221.8125,139.7188 1221.8125,141.8125 Q1221.8125,143.9063 1222.5,144.9844 Q1223.1875,146.0469 1224.5313,146.0469 Q1225.1563,146.0469 1225.75,145.7813 Q1226.3438,145.5 1226.9688,144.9219 L1226.9688,147.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1238" y="146.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="166" y2="166"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000540054955081677892">
+        <rect codeLine="33" fill="#F1F1F1" height="48" id="C_0000540054955081677892" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="858.5" y="92.294"/>
+        <ellipse cx="873.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M868.5,109.4502 C868.5,111.9502 870.6406,113.7627 873.5625,113.7627 C874.7969,113.7627 875.9688,113.4659 876.7188,112.9502 C877.3281,112.5284 877.6563,112.1065 877.6563,111.7002 C877.6563,111.2315 877.2344,110.8252 876.7344,110.8252 C876.5,110.8252 876.2813,110.9034 876.0781,111.1065 C875.6406,111.544 875.6406,111.544 875.4688,111.6377 C875.0156,111.8721 874.375,112.0127 873.6094,112.0127 C871.6094,112.0127 870.3281,110.9971 870.3281,109.419 L870.3281,108.3721 C870.3281,106.669 871.5469,105.4659 873.25,105.4659 C873.8281,105.4659 874.4063,105.6065 874.875,105.8565 C875.3438,106.1221 875.5156,106.3096 875.5781,106.669 C875.7031,107.3409 875.9531,107.5909 876.4844,107.5909 C876.7656,107.5909 877.0469,107.4502 877.2344,107.2315 C877.3594,107.0596 877.4063,106.8877 877.4063,106.4502 L877.4063,105.0909 C877.4063,104.669 877.3906,104.5284 877.2656,104.3565 C877.0938,104.1065 876.8125,103.9502 876.4844,103.9502 C876.1719,103.9502 875.9688,104.0596 875.75,104.3252 C874.5781,103.8252 874.1406,103.7159 873.1875,103.7159 C870.5156,103.7159 868.5,105.7315 868.5,108.3565 L868.5,109.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="887.5" y="112.9">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="859.5" x2="899.5" y1="124.294" y2="124.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="859.5" x2="899.5" y1="132.294" y2="132.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="48" id="C_0000446694692150903211" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="1134.5" y="126"/>
-      <ellipse cx="1149.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1152.4688,147.6406 Q1151.8906,147.9375 1151.25,148.0781 Q1150.6094,148.2344 1149.9063,148.2344 Q1147.4063,148.2344 1146.0781,146.5938 Q1144.7656,144.9375 1144.7656,141.8125 Q1144.7656,138.6875 1146.0781,137.0313 Q1147.4063,135.375 1149.9063,135.375 Q1150.6094,135.375 1151.25,135.5313 Q1151.9063,135.6875 1152.4688,135.9844 L1152.4688,138.7031 Q1151.8438,138.125 1151.25,137.8594 Q1150.6563,137.5781 1150.0313,137.5781 Q1148.6875,137.5781 1148,138.6563 Q1147.3125,139.7188 1147.3125,141.8125 Q1147.3125,143.9063 1148,144.9844 Q1148.6875,146.0469 1150.0313,146.0469 Q1150.6563,146.0469 1151.25,145.7813 Q1151.8438,145.5 1152.4688,144.9219 L1152.4688,147.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1163.5" y="146.1543">F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="166" y2="166"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000446694692150903211">
+        <rect codeLine="49" fill="#F1F1F1" height="48" id="C_0000446694692150903211" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="935" y="92.294"/>
+        <ellipse cx="950" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M945,109.4502 C945,111.9502 947.1406,113.7627 950.0625,113.7627 C951.2969,113.7627 952.4688,113.4659 953.2188,112.9502 C953.8281,112.5284 954.1563,112.1065 954.1563,111.7002 C954.1563,111.2315 953.7344,110.8252 953.2344,110.8252 C953,110.8252 952.7813,110.9034 952.5781,111.1065 C952.1406,111.544 952.1406,111.544 951.9688,111.6377 C951.5156,111.8721 950.875,112.0127 950.1094,112.0127 C948.1094,112.0127 946.8281,110.9971 946.8281,109.419 L946.8281,108.3721 C946.8281,106.669 948.0469,105.4659 949.75,105.4659 C950.3281,105.4659 950.9063,105.6065 951.375,105.8565 C951.8438,106.1221 952.0156,106.3096 952.0781,106.669 C952.2031,107.3409 952.4531,107.5909 952.9844,107.5909 C953.2656,107.5909 953.5469,107.4502 953.7344,107.2315 C953.8594,107.0596 953.9063,106.8877 953.9063,106.4502 L953.9063,105.0909 C953.9063,104.669 953.8906,104.5284 953.7656,104.3565 C953.5938,104.1065 953.3125,103.9502 952.9844,103.9502 C952.6719,103.9502 952.4688,104.0596 952.25,104.3252 C951.0781,103.8252 950.6406,103.7159 949.6875,103.7159 C947.0156,103.7159 945,105.7315 945,108.3565 L945,109.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="964" y="112.9">F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="936" x2="975" y1="124.294" y2="124.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="936" x2="975" y1="132.294" y2="132.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="48" id="C_0001266390196945323478" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1646.5" y="126"/>
-      <ellipse cx="1661.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1664.4688,147.6406 Q1663.8906,147.9375 1663.25,148.0781 Q1662.6094,148.2344 1661.9063,148.2344 Q1659.4063,148.2344 1658.0781,146.5938 Q1656.7656,144.9375 1656.7656,141.8125 Q1656.7656,138.6875 1658.0781,137.0313 Q1659.4063,135.375 1661.9063,135.375 Q1662.6094,135.375 1663.25,135.5313 Q1663.9063,135.6875 1664.4688,135.9844 L1664.4688,138.7031 Q1663.8438,138.125 1663.25,137.8594 Q1662.6563,137.5781 1662.0313,137.5781 Q1660.6875,137.5781 1660,138.6563 Q1659.3125,139.7188 1659.3125,141.8125 Q1659.3125,143.9063 1660,144.9844 Q1660.6875,146.0469 1662.0313,146.0469 Q1662.6563,146.0469 1663.25,145.7813 Q1663.8438,145.5 1664.4688,144.9219 L1664.4688,147.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1675.5" y="146.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="166" y2="166"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000917656824503504804">
+        <rect codeLine="54" fill="#F1F1F1" height="48" id="C_0000917656824503504804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="942" y="200.294"/>
+        <ellipse cx="957" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M952,217.4502 C952,219.9502 954.1406,221.7627 957.0625,221.7627 C958.2969,221.7627 959.4688,221.4659 960.2188,220.9502 C960.8281,220.5284 961.1563,220.1065 961.1563,219.7002 C961.1563,219.2315 960.7344,218.8252 960.2344,218.8252 C960,218.8252 959.7813,218.9034 959.5781,219.1065 C959.1406,219.544 959.1406,219.544 958.9688,219.6377 C958.5156,219.8721 957.875,220.0127 957.1094,220.0127 C955.1094,220.0127 953.8281,218.9971 953.8281,217.419 L953.8281,216.3721 C953.8281,214.669 955.0469,213.4659 956.75,213.4659 C957.3281,213.4659 957.9063,213.6065 958.375,213.8565 C958.8438,214.1221 959.0156,214.3096 959.0781,214.669 C959.2031,215.3409 959.4531,215.5909 959.9844,215.5909 C960.2656,215.5909 960.5469,215.4502 960.7344,215.2315 C960.8594,215.0596 960.9063,214.8877 960.9063,214.4502 L960.9063,213.0909 C960.9063,212.669 960.8906,212.5284 960.7656,212.3565 C960.5938,212.1065 960.3125,211.9502 959.9844,211.9502 C959.6719,211.9502 959.4688,212.0596 959.25,212.3252 C958.0781,211.8252 957.6406,211.7159 956.6875,211.7159 C954.0156,211.7159 952,213.7315 952,216.3565 L952,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="971" y="220.9">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="943" x2="982" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="943" x2="982" y1="240.294" y2="240.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="48" id="C_0000134928214982255105" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1571" y="126"/>
-      <ellipse cx="1586" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1588.9688,147.6406 Q1588.3906,147.9375 1587.75,148.0781 Q1587.1094,148.2344 1586.4063,148.2344 Q1583.9063,148.2344 1582.5781,146.5938 Q1581.2656,144.9375 1581.2656,141.8125 Q1581.2656,138.6875 1582.5781,137.0313 Q1583.9063,135.375 1586.4063,135.375 Q1587.1094,135.375 1587.75,135.5313 Q1588.4063,135.6875 1588.9688,135.9844 L1588.9688,138.7031 Q1588.3438,138.125 1587.75,137.8594 Q1587.1563,137.5781 1586.5313,137.5781 Q1585.1875,137.5781 1584.5,138.6563 Q1583.8125,139.7188 1583.8125,141.8125 Q1583.8125,143.9063 1584.5,144.9844 Q1585.1875,146.0469 1586.5313,146.0469 Q1587.1563,146.0469 1587.75,145.7813 Q1588.3438,145.5 1588.9688,144.9219 L1588.9688,147.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1600" y="146.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="166" y2="166"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001235773045370563004">
+        <rect codeLine="58" fill="#F1F1F1" height="48" id="C_0001235773045370563004" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="866" y="200.294"/>
+        <ellipse cx="881" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M876,217.4502 C876,219.9502 878.1406,221.7627 881.0625,221.7627 C882.2969,221.7627 883.4688,221.4659 884.2188,220.9502 C884.8281,220.5284 885.1563,220.1065 885.1563,219.7002 C885.1563,219.2315 884.7344,218.8252 884.2344,218.8252 C884,218.8252 883.7813,218.9034 883.5781,219.1065 C883.1406,219.544 883.1406,219.544 882.9688,219.6377 C882.5156,219.8721 881.875,220.0127 881.1094,220.0127 C879.1094,220.0127 877.8281,218.9971 877.8281,217.419 L877.8281,216.3721 C877.8281,214.669 879.0469,213.4659 880.75,213.4659 C881.3281,213.4659 881.9063,213.6065 882.375,213.8565 C882.8438,214.1221 883.0156,214.3096 883.0781,214.669 C883.2031,215.3409 883.4531,215.5909 883.9844,215.5909 C884.2656,215.5909 884.5469,215.4502 884.7344,215.2315 C884.8594,215.0596 884.9063,214.8877 884.9063,214.4502 L884.9063,213.0909 C884.9063,212.669 884.8906,212.5284 884.7656,212.3565 C884.5938,212.1065 884.3125,211.9502 883.9844,211.9502 C883.6719,211.9502 883.4688,212.0596 883.25,212.3252 C882.0781,211.8252 881.6406,211.7159 880.6875,211.7159 C878.0156,211.7159 876,213.7315 876,216.3565 L876,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="895" y="220.9">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="867" x2="906" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="867" x2="906" y1="240.294" y2="240.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="64" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="118"/>
-      <ellipse cx="1466" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1468.9688,139.6406 Q1468.3906,139.9375 1467.75,140.0781 Q1467.1094,140.2344 1466.4063,140.2344 Q1463.9063,140.2344 1462.5781,138.5938 Q1461.2656,136.9375 1461.2656,133.8125 Q1461.2656,130.6875 1462.5781,129.0313 Q1463.9063,127.375 1466.4063,127.375 Q1467.1094,127.375 1467.75,127.5313 Q1468.4063,127.6875 1468.9688,127.9844 L1468.9688,130.7031 Q1468.3438,130.125 1467.75,129.8594 Q1467.1563,129.5781 1466.5313,129.5781 Q1465.1875,129.5781 1464.5,130.6563 Q1463.8125,131.7188 1463.8125,133.8125 Q1463.8125,135.9063 1464.5,136.9844 Q1465.1875,138.0469 1466.5313,138.0469 Q1467.1563,138.0469 1467.75,137.7813 Q1468.3438,137.5 1468.9688,136.9219 L1468.9688,139.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1480" y="138.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="150" y2="150"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="166" y2="166"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="174" y2="174"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <g id="elem_C_0001158868779503074564">
+        <rect codeLine="64" fill="#F1F1F1" height="48" id="C_0001158868779503074564" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="1018.5" y="200.294"/>
+        <ellipse cx="1033.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1028.5,217.4502 C1028.5,219.9502 1030.6406,221.7627 1033.5625,221.7627 C1034.7969,221.7627 1035.9688,221.4659 1036.7188,220.9502 C1037.3281,220.5284 1037.6563,220.1065 1037.6563,219.7002 C1037.6563,219.2315 1037.2344,218.8252 1036.7344,218.8252 C1036.5,218.8252 1036.2813,218.9034 1036.0781,219.1065 C1035.6406,219.544 1035.6406,219.544 1035.4688,219.6377 C1035.0156,219.8721 1034.375,220.0127 1033.6094,220.0127 C1031.6094,220.0127 1030.3281,218.9971 1030.3281,217.419 L1030.3281,216.3721 C1030.3281,214.669 1031.5469,213.4659 1033.25,213.4659 C1033.8281,213.4659 1034.4063,213.6065 1034.875,213.8565 C1035.3438,214.1221 1035.5156,214.3096 1035.5781,214.669 C1035.7031,215.3409 1035.9531,215.5909 1036.4844,215.5909 C1036.7656,215.5909 1037.0469,215.4502 1037.2344,215.2315 C1037.3594,215.0596 1037.4063,214.8877 1037.4063,214.4502 L1037.4063,213.0909 C1037.4063,212.669 1037.3906,212.5284 1037.2656,212.3565 C1037.0938,212.1065 1036.8125,211.9502 1036.4844,211.9502 C1036.1719,211.9502 1035.9688,212.0596 1035.75,212.3252 C1034.5781,211.8252 1034.1406,211.7159 1033.1875,211.7159 C1030.5156,211.7159 1028.5,213.7315 1028.5,216.3565 L1028.5,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="1047.5" y="220.9">a</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1019.5" x2="1057.5" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1019.5" x2="1057.5" y1="240.294" y2="240.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="64" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="118"/>
-      <ellipse cx="1391" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1393.9688,139.6406 Q1393.3906,139.9375 1392.75,140.0781 Q1392.1094,140.2344 1391.4063,140.2344 Q1388.9063,140.2344 1387.5781,138.5938 Q1386.2656,136.9375 1386.2656,133.8125 Q1386.2656,130.6875 1387.5781,129.0313 Q1388.9063,127.375 1391.4063,127.375 Q1392.1094,127.375 1392.75,127.5313 Q1393.4063,127.6875 1393.9688,127.9844 L1393.9688,130.7031 Q1393.3438,130.125 1392.75,129.8594 Q1392.1563,129.5781 1391.5313,129.5781 Q1390.1875,129.5781 1389.5,130.6563 Q1388.8125,131.7188 1388.8125,133.8125 Q1388.8125,135.9063 1389.5,136.9844 Q1390.1875,138.0469 1391.5313,138.0469 Q1392.1563,138.0469 1392.75,137.7813 Q1393.3438,137.5 1393.9688,136.9219 L1393.9688,139.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1405" y="138.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="150" y2="150"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="166" y2="166"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="174" y2="174"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <g id="elem_C_0002123626454198320938">
+        <rect codeLine="68" fill="#F1F1F1" height="48" id="C_0002123626454198320938" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="1093.5" y="200.294"/>
+        <ellipse cx="1108.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1103.5,217.4502 C1103.5,219.9502 1105.6406,221.7627 1108.5625,221.7627 C1109.7969,221.7627 1110.9688,221.4659 1111.7188,220.9502 C1112.3281,220.5284 1112.6563,220.1065 1112.6563,219.7002 C1112.6563,219.2315 1112.2344,218.8252 1111.7344,218.8252 C1111.5,218.8252 1111.2813,218.9034 1111.0781,219.1065 C1110.6406,219.544 1110.6406,219.544 1110.4688,219.6377 C1110.0156,219.8721 1109.375,220.0127 1108.6094,220.0127 C1106.6094,220.0127 1105.3281,218.9971 1105.3281,217.419 L1105.3281,216.3721 C1105.3281,214.669 1106.5469,213.4659 1108.25,213.4659 C1108.8281,213.4659 1109.4063,213.6065 1109.875,213.8565 C1110.3438,214.1221 1110.5156,214.3096 1110.5781,214.669 C1110.7031,215.3409 1110.9531,215.5909 1111.4844,215.5909 C1111.7656,215.5909 1112.0469,215.4502 1112.2344,215.2315 C1112.3594,215.0596 1112.4063,214.8877 1112.4063,214.4502 L1112.4063,213.0909 C1112.4063,212.669 1112.3906,212.5284 1112.2656,212.3565 C1112.0938,212.1065 1111.8125,211.9502 1111.4844,211.9502 C1111.1719,211.9502 1110.9688,212.0596 1110.75,212.3252 C1109.5781,211.8252 1109.1406,211.7159 1108.1875,211.7159 C1105.5156,211.7159 1103.5,213.7315 1103.5,216.3565 L1103.5,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="1122.5" y="220.9">f</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1094.5" x2="1128.5" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1094.5" x2="1128.5" y1="240.294" y2="240.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="64" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="118"/>
-      <ellipse cx="1299" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1301.9688,139.6406 Q1301.3906,139.9375 1300.75,140.0781 Q1300.1094,140.2344 1299.4063,140.2344 Q1296.9063,140.2344 1295.5781,138.5938 Q1294.2656,136.9375 1294.2656,133.8125 Q1294.2656,130.6875 1295.5781,129.0313 Q1296.9063,127.375 1299.4063,127.375 Q1300.1094,127.375 1300.75,127.5313 Q1301.4063,127.6875 1301.9688,127.9844 L1301.9688,130.7031 Q1301.3438,130.125 1300.75,129.8594 Q1300.1563,129.5781 1299.5313,129.5781 Q1298.1875,129.5781 1297.5,130.6563 Q1296.8125,131.7188 1296.8125,133.8125 Q1296.8125,135.9063 1297.5,136.9844 Q1298.1875,138.0469 1299.5313,138.0469 Q1300.1563,138.0469 1300.75,137.7813 Q1301.3438,137.5 1301.9688,136.9219 L1301.9688,139.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="1313" y="138.1543">f</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="150" y2="150"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="166" y2="166"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="174" y2="174"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <g id="elem_C_0001168031834662719964">
+        <rect codeLine="74" fill="#F1F1F1" height="48" id="C_0001168031834662719964" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="867" y="339.294"/>
+        <ellipse cx="882" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M877,356.4502 C877,358.9502 879.1406,360.7627 882.0625,360.7627 C883.2969,360.7627 884.4688,360.4659 885.2188,359.9502 C885.8281,359.5284 886.1563,359.1065 886.1563,358.7002 C886.1563,358.2315 885.7344,357.8252 885.2344,357.8252 C885,357.8252 884.7813,357.9034 884.5781,358.1065 C884.1406,358.544 884.1406,358.544 883.9688,358.6377 C883.5156,358.8721 882.875,359.0127 882.1094,359.0127 C880.1094,359.0127 878.8281,357.9971 878.8281,356.419 L878.8281,355.3721 C878.8281,353.669 880.0469,352.4659 881.75,352.4659 C882.3281,352.4659 882.9063,352.6065 883.375,352.8565 C883.8438,353.1221 884.0156,353.3096 884.0781,353.669 C884.2031,354.3409 884.4531,354.5909 884.9844,354.5909 C885.2656,354.5909 885.5469,354.4502 885.7344,354.2315 C885.8594,354.0596 885.9063,353.8877 885.9063,353.4502 L885.9063,352.0909 C885.9063,351.669 885.8906,351.5284 885.7656,351.3565 C885.5938,351.1065 885.3125,350.9502 884.9844,350.9502 C884.6719,350.9502 884.4688,351.0596 884.25,351.3252 C883.0781,350.8252 882.6406,350.7159 881.6875,350.7159 C879.0156,350.7159 877,352.7315 877,355.3565 L877,356.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="896" y="359.9">c</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="868" x2="905" y1="371.294" y2="371.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="868" x2="905" y1="379.294" y2="379.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="56" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="122"/>
-      <ellipse cx="310.5" cy="138" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M313.4688,143.6406 Q312.8906,143.9375 312.25,144.0781 Q311.6094,144.2344 310.9063,144.2344 Q308.4063,144.2344 307.0781,142.5938 Q305.7656,140.9375 305.7656,137.8125 Q305.7656,134.6875 307.0781,133.0313 Q308.4063,131.375 310.9063,131.375 Q311.6094,131.375 312.25,131.5313 Q312.9063,131.6875 313.4688,131.9844 L313.4688,134.7031 Q312.8438,134.125 312.25,133.8594 Q311.6563,133.5781 311.0313,133.5781 Q309.6875,133.5781 309,134.6563 Q308.3125,135.7188 308.3125,137.8125 Q308.3125,139.9063 309,140.9844 Q309.6875,142.0469 311.0313,142.0469 Q311.6563,142.0469 312.25,141.7813 Q312.8438,141.5 313.4688,140.9219 L313.4688,143.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="324.5" y="142.1543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="154" y2="154"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="162" y2="162"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="170" y2="170"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <g id="elem_C_0002037550833462858827">
+        <rect codeLine="78" fill="#F1F1F1" height="48" id="C_0002037550833462858827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="941.5" y="339.294"/>
+        <ellipse cx="956.5" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M951.5,356.4502 C951.5,358.9502 953.6406,360.7627 956.5625,360.7627 C957.7969,360.7627 958.9688,360.4659 959.7188,359.9502 C960.3281,359.5284 960.6563,359.1065 960.6563,358.7002 C960.6563,358.2315 960.2344,357.8252 959.7344,357.8252 C959.5,357.8252 959.2813,357.9034 959.0781,358.1065 C958.6406,358.544 958.6406,358.544 958.4688,358.6377 C958.0156,358.8721 957.375,359.0127 956.6094,359.0127 C954.6094,359.0127 953.3281,357.9971 953.3281,356.419 L953.3281,355.3721 C953.3281,353.669 954.5469,352.4659 956.25,352.4659 C956.8281,352.4659 957.4063,352.6065 957.875,352.8565 C958.3438,353.1221 958.5156,353.3096 958.5781,353.669 C958.7031,354.3409 958.9531,354.5909 959.4844,354.5909 C959.7656,354.5909 960.0469,354.4502 960.2344,354.2315 C960.3594,354.0596 960.4063,353.8877 960.4063,353.4502 L960.4063,352.0909 C960.4063,351.669 960.3906,351.5284 960.2656,351.3565 C960.0938,351.1065 959.8125,350.9502 959.4844,350.9502 C959.1719,350.9502 958.9688,351.0596 958.75,351.3252 C957.5781,350.8252 957.1406,350.7159 956.1875,350.7159 C953.5156,350.7159 951.5,352.7315 951.5,355.3565 L951.5,356.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="970.5" y="359.9">e</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="942.5" x2="980.5" y1="371.294" y2="371.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="942.5" x2="980.5" y1="379.294" y2="379.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="73.6094" id="C_0001592677999268391183" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="128" y="113"/>
-      <ellipse cx="143" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M147.1094,135 L139.3906,135 L139.3906,122.6094 L147.1094,122.6094 L147.1094,124.7656 L141.8438,124.7656 L141.8438,127.4375 L146.6094,127.4375 L146.6094,129.5938 L141.8438,129.5938 L141.8438,132.8438 L147.1094,132.8438 L147.1094,135 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157" y="133.1543">h</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="167" y1="145" y2="145"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="134" y="159.2104">hhh</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="134" y="172.0151">hhh</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="167" y1="178.6094" y2="178.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001266390196945323478">
+        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001266390196945323478" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="1090.5" y="92.294"/>
+        <ellipse cx="1105.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1100.5,109.4502 C1100.5,111.9502 1102.6406,113.7627 1105.5625,113.7627 C1106.7969,113.7627 1107.9688,113.4659 1108.7188,112.9502 C1109.3281,112.5284 1109.6563,112.1065 1109.6563,111.7002 C1109.6563,111.2315 1109.2344,110.8252 1108.7344,110.8252 C1108.5,110.8252 1108.2813,110.9034 1108.0781,111.1065 C1107.6406,111.544 1107.6406,111.544 1107.4688,111.6377 C1107.0156,111.8721 1106.375,112.0127 1105.6094,112.0127 C1103.6094,112.0127 1102.3281,110.9971 1102.3281,109.419 L1102.3281,108.3721 C1102.3281,106.669 1103.5469,105.4659 1105.25,105.4659 C1105.8281,105.4659 1106.4063,105.6065 1106.875,105.8565 C1107.3438,106.1221 1107.5156,106.3096 1107.5781,106.669 C1107.7031,107.3409 1107.9531,107.5909 1108.4844,107.5909 C1108.7656,107.5909 1109.0469,107.4502 1109.2344,107.2315 C1109.3594,107.0596 1109.4063,106.8877 1109.4063,106.4502 L1109.4063,105.0909 C1109.4063,104.669 1109.3906,104.5284 1109.2656,104.3565 C1109.0938,104.1065 1108.8125,103.9502 1108.4844,103.9502 C1108.1719,103.9502 1107.9688,104.0596 1107.75,104.3252 C1106.5781,103.8252 1106.1406,103.7159 1105.1875,103.7159 C1102.5156,103.7159 1100.5,105.7315 1100.5,108.3565 L1100.5,109.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1119.5" y="112.9">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1091.5" x2="1131.5" y1="124.294" y2="124.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1091.5" x2="1131.5" y1="132.294" y2="132.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="73.6094" id="C_0000441521323390223397" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="203.5" y="113"/>
-      <ellipse cx="218.5" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M222.6094,135 L214.8906,135 L214.8906,122.6094 L222.6094,122.6094 L222.6094,124.7656 L217.3438,124.7656 L217.3438,127.4375 L222.1094,127.4375 L222.1094,129.5938 L217.3438,129.5938 L217.3438,132.8438 L222.6094,132.8438 L222.6094,135 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="232.5" y="133.1543">i</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="237.5" y1="145" y2="145"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="159.2104">iii</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="172.0151">iii</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="237.5" y1="178.6094" y2="178.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0000134928214982255105">
+        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0000134928214982255105" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1015" y="92.294"/>
+        <ellipse cx="1030" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1025,109.4502 C1025,111.9502 1027.1406,113.7627 1030.0625,113.7627 C1031.2969,113.7627 1032.4688,113.4659 1033.2188,112.9502 C1033.8281,112.5284 1034.1563,112.1065 1034.1563,111.7002 C1034.1563,111.2315 1033.7344,110.8252 1033.2344,110.8252 C1033,110.8252 1032.7813,110.9034 1032.5781,111.1065 C1032.1406,111.544 1032.1406,111.544 1031.9688,111.6377 C1031.5156,111.8721 1030.875,112.0127 1030.1094,112.0127 C1028.1094,112.0127 1026.8281,110.9971 1026.8281,109.419 L1026.8281,108.3721 C1026.8281,106.669 1028.0469,105.4659 1029.75,105.4659 C1030.3281,105.4659 1030.9063,105.6065 1031.375,105.8565 C1031.8438,106.1221 1032.0156,106.3096 1032.0781,106.669 C1032.2031,107.3409 1032.4531,107.5909 1032.9844,107.5909 C1033.2656,107.5909 1033.5469,107.4502 1033.7344,107.2315 C1033.8594,107.0596 1033.9063,106.8877 1033.9063,106.4502 L1033.9063,105.0909 C1033.9063,104.669 1033.8906,104.5284 1033.7656,104.3565 C1033.5938,104.1065 1033.3125,103.9502 1032.9844,103.9502 C1032.6719,103.9502 1032.4688,104.0596 1032.25,104.3252 C1031.0781,103.8252 1030.6406,103.7159 1029.6875,103.7159 C1027.0156,103.7159 1025,105.7315 1025,108.3565 L1025,109.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1044" y="112.9">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1016" x2="1055" y1="124.294" y2="124.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1016" x2="1055" y1="132.294" y2="132.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="73.6094" id="C_0000499334434426587347" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="130.5" y="254"/>
-      <ellipse cx="145.5" cy="270" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M149.6094,276 L141.8906,276 L141.8906,263.6094 L149.6094,263.6094 L149.6094,265.7656 L144.3438,265.7656 L144.3438,268.4375 L149.1094,268.4375 L149.1094,270.5938 L144.3438,270.5938 L144.3438,273.8438 L149.6094,273.8438 L149.6094,276 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="159.5" y="274.1543">j</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="164.5" y1="286" y2="286"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="136.5" y="300.2104">jjj</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="136.5" y="313.0151">jjj</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="164.5" y1="319.6094" y2="319.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000917656824503504804">
+        <rect codeLine="86" fill="#F1F1F1" height="48" id="C_0000917656824503504804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="600" y="339.294"/>
+        <ellipse cx="615" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M610,356.4502 C610,358.9502 612.1406,360.7627 615.0625,360.7627 C616.2969,360.7627 617.4688,360.4659 618.2188,359.9502 C618.8281,359.5284 619.1563,359.1065 619.1563,358.7002 C619.1563,358.2315 618.7344,357.8252 618.2344,357.8252 C618,357.8252 617.7813,357.9034 617.5781,358.1065 C617.1406,358.544 617.1406,358.544 616.9688,358.6377 C616.5156,358.8721 615.875,359.0127 615.1094,359.0127 C613.1094,359.0127 611.8281,357.9971 611.8281,356.419 L611.8281,355.3721 C611.8281,353.669 613.0469,352.4659 614.75,352.4659 C615.3281,352.4659 615.9063,352.6065 616.375,352.8565 C616.8438,353.1221 617.0156,353.3096 617.0781,353.669 C617.2031,354.3409 617.4531,354.5909 617.9844,354.5909 C618.2656,354.5909 618.5469,354.4502 618.7344,354.2315 C618.8594,354.0596 618.9063,353.8877 618.9063,353.4502 L618.9063,352.0909 C618.9063,351.669 618.8906,351.5284 618.7656,351.3565 C618.5938,351.1065 618.3125,350.9502 617.9844,350.9502 C617.6719,350.9502 617.4688,351.0596 617.25,351.3252 C616.0781,350.8252 615.6406,350.7159 614.6875,350.7159 C612.0156,350.7159 610,352.7315 610,355.3565 L610,356.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="629" y="359.9">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="601" x2="640" y1="371.294" y2="371.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="601" x2="640" y1="379.294" y2="379.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="48" id="C_0000252416999805673718" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="573" y="126"/>
-      <ellipse cx="588" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M590.9688,147.6406 Q590.3906,147.9375 589.75,148.0781 Q589.1094,148.2344 588.4063,148.2344 Q585.9063,148.2344 584.5781,146.5938 Q583.2656,144.9375 583.2656,141.8125 Q583.2656,138.6875 584.5781,137.0313 Q585.9063,135.375 588.4063,135.375 Q589.1094,135.375 589.75,135.5313 Q590.4063,135.6875 590.9688,135.9844 L590.9688,138.7031 Q590.3438,138.125 589.75,137.8594 Q589.1563,137.5781 588.5313,137.5781 Q587.1875,137.5781 586.5,138.6563 Q585.8125,139.7188 585.8125,141.8125 Q585.8125,143.9063 586.5,144.9844 Q587.1875,146.0469 588.5313,146.0469 Q589.1563,146.0469 589.75,145.7813 Q590.3438,145.5 590.9688,144.9219 L590.9688,147.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="602" y="146.1543">b</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="166" y2="166"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001235773045370563004">
+        <rect codeLine="90" fill="#F1F1F1" height="48" id="C_0001235773045370563004" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="676" y="339.294"/>
+        <ellipse cx="691" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M686,356.4502 C686,358.9502 688.1406,360.7627 691.0625,360.7627 C692.2969,360.7627 693.4688,360.4659 694.2188,359.9502 C694.8281,359.5284 695.1563,359.1065 695.1563,358.7002 C695.1563,358.2315 694.7344,357.8252 694.2344,357.8252 C694,357.8252 693.7813,357.9034 693.5781,358.1065 C693.1406,358.544 693.1406,358.544 692.9688,358.6377 C692.5156,358.8721 691.875,359.0127 691.1094,359.0127 C689.1094,359.0127 687.8281,357.9971 687.8281,356.419 L687.8281,355.3721 C687.8281,353.669 689.0469,352.4659 690.75,352.4659 C691.3281,352.4659 691.9063,352.6065 692.375,352.8565 C692.8438,353.1221 693.0156,353.3096 693.0781,353.669 C693.2031,354.3409 693.4531,354.5909 693.9844,354.5909 C694.2656,354.5909 694.5469,354.4502 694.7344,354.2315 C694.8594,354.0596 694.9063,353.8877 694.9063,353.4502 L694.9063,352.0909 C694.9063,351.669 694.8906,351.5284 694.7656,351.3565 C694.5938,351.1065 694.3125,350.9502 693.9844,350.9502 C693.6719,350.9502 693.4688,351.0596 693.25,351.3252 C692.0781,350.8252 691.6406,350.7159 690.6875,350.7159 C688.0156,350.7159 686,352.7315 686,355.3565 L686,356.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="705" y="359.9">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="677" x2="716" y1="371.294" y2="371.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="677" x2="716" y1="379.294" y2="379.294"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff2u993w1e2bb)" height="48" id="C_0000595494794840378320" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="648" y="126"/>
-      <ellipse cx="663" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M665.9688,147.6406 Q665.3906,147.9375 664.75,148.0781 Q664.1094,148.2344 663.4063,148.2344 Q660.9063,148.2344 659.5781,146.5938 Q658.2656,144.9375 658.2656,141.8125 Q658.2656,138.6875 659.5781,137.0313 Q660.9063,135.375 663.4063,135.375 Q664.1094,135.375 664.75,135.5313 Q665.4063,135.6875 665.9688,135.9844 L665.9688,138.7031 Q665.3438,138.125 664.75,137.8594 Q664.1563,137.5781 663.5313,137.5781 Q662.1875,137.5781 661.5,138.6563 Q660.8125,139.7188 660.8125,141.8125 Q660.8125,143.9063 661.5,144.9844 Q662.1875,146.0469 663.5313,146.0469 Q664.1563,146.0469 664.75,145.7813 Q665.3438,145.5 665.9688,144.9219 L665.9688,147.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="677" y="146.1543">g</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="649" x2="687" y1="158" y2="158"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="649" x2="687" y1="166" y2="166"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0001365815261671395853">
+        <rect codeLine="94" fill="#F1F1F1" height="48" id="C_0001365815261671395853" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="752" y="339.294"/>
+        <ellipse cx="767" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M762,356.4502 C762,358.9502 764.1406,360.7627 767.0625,360.7627 C768.2969,360.7627 769.4688,360.4659 770.2188,359.9502 C770.8281,359.5284 771.1563,359.1065 771.1563,358.7002 C771.1563,358.2315 770.7344,357.8252 770.2344,357.8252 C770,357.8252 769.7813,357.9034 769.5781,358.1065 C769.1406,358.544 769.1406,358.544 768.9688,358.6377 C768.5156,358.8721 767.875,359.0127 767.1094,359.0127 C765.1094,359.0127 763.8281,357.9971 763.8281,356.419 L763.8281,355.3721 C763.8281,353.669 765.0469,352.4659 766.75,352.4659 C767.3281,352.4659 767.9063,352.6065 768.375,352.8565 C768.8438,353.1221 769.0156,353.3096 769.0781,353.669 C769.2031,354.3409 769.4531,354.5909 769.9844,354.5909 C770.2656,354.5909 770.5469,354.4502 770.7344,354.2315 C770.8594,354.0596 770.9063,353.8877 770.9063,353.4502 L770.9063,352.0909 C770.9063,351.669 770.8906,351.5284 770.7656,351.3565 C770.5938,351.1065 770.3125,350.9502 769.9844,350.9502 C769.6719,350.9502 769.4688,351.0596 769.25,351.3252 C768.0781,350.8252 767.6406,350.7159 766.6875,350.7159 C764.0156,350.7159 762,352.7315 762,355.3565 L762,356.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="781" y="359.9">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="753" x2="794" y1="371.294" y2="371.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="753" x2="794" y1="379.294" y2="379.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <g id="elem_C_0001158868779503074564">
+        <rect codeLine="100" fill="#F1F1F1" height="48" id="C_0001158868779503074564" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="754.5" y="464.094"/>
+        <ellipse cx="769.5" cy="480.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M764.5,481.2502 C764.5,483.7502 766.6406,485.5627 769.5625,485.5627 C770.7969,485.5627 771.9688,485.2659 772.7188,484.7502 C773.3281,484.3284 773.6563,483.9065 773.6563,483.5002 C773.6563,483.0315 773.2344,482.6252 772.7344,482.6252 C772.5,482.6252 772.2813,482.7034 772.0781,482.9065 C771.6406,483.344 771.6406,483.344 771.4688,483.4377 C771.0156,483.6721 770.375,483.8127 769.6094,483.8127 C767.6094,483.8127 766.3281,482.7971 766.3281,481.219 L766.3281,480.1721 C766.3281,478.469 767.5469,477.2659 769.25,477.2659 C769.8281,477.2659 770.4063,477.4065 770.875,477.6565 C771.3438,477.9221 771.5156,478.1096 771.5781,478.469 C771.7031,479.1409 771.9531,479.3909 772.4844,479.3909 C772.7656,479.3909 773.0469,479.2502 773.2344,479.0315 C773.3594,478.8596 773.4063,478.6877 773.4063,478.2502 L773.4063,476.8909 C773.4063,476.469 773.3906,476.3284 773.2656,476.1565 C773.0938,475.9065 772.8125,475.7502 772.4844,475.7502 C772.1719,475.7502 771.9688,475.8596 771.75,476.1252 C770.5781,475.6252 770.1406,475.5159 769.1875,475.5159 C766.5156,475.5159 764.5,477.5315 764.5,480.1565 L764.5,481.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="783.5" y="484.7">a</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="755.5" x2="793.5" y1="496.094" y2="496.094"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="755.5" x2="793.5" y1="504.094" y2="504.094"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <g id="elem_C_0002123626454198320938">
+        <rect codeLine="104" fill="#F1F1F1" height="48" id="C_0002123626454198320938" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="683.5" y="464.094"/>
+        <ellipse cx="698.5" cy="480.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M693.5,481.2502 C693.5,483.7502 695.6406,485.5627 698.5625,485.5627 C699.7969,485.5627 700.9688,485.2659 701.7188,484.7502 C702.3281,484.3284 702.6563,483.9065 702.6563,483.5002 C702.6563,483.0315 702.2344,482.6252 701.7344,482.6252 C701.5,482.6252 701.2813,482.7034 701.0781,482.9065 C700.6406,483.344 700.6406,483.344 700.4688,483.4377 C700.0156,483.6721 699.375,483.8127 698.6094,483.8127 C696.6094,483.8127 695.3281,482.7971 695.3281,481.219 L695.3281,480.1721 C695.3281,478.469 696.5469,477.2659 698.25,477.2659 C698.8281,477.2659 699.4063,477.4065 699.875,477.6565 C700.3438,477.9221 700.5156,478.1096 700.5781,478.469 C700.7031,479.1409 700.9531,479.3909 701.4844,479.3909 C701.7656,479.3909 702.0469,479.2502 702.2344,479.0315 C702.3594,478.8596 702.4063,478.6877 702.4063,478.2502 L702.4063,476.8909 C702.4063,476.469 702.3906,476.3284 702.2656,476.1565 C702.0938,475.9065 701.8125,475.7502 701.4844,475.7502 C701.1719,475.7502 700.9688,475.8596 700.75,476.1252 C699.5781,475.6252 699.1406,475.5159 698.1875,475.5159 C695.5156,475.5159 693.5,477.5315 693.5,480.1565 L693.5,481.2502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="712.5" y="484.7">f</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="684.5" x2="718.5" y1="496.094" y2="496.094"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="684.5" x2="718.5" y1="504.094" y2="504.094"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <g id="elem_C_0001592677999268391183">
+        <rect codeLine="110" fill="#F1F1F1" height="64.7999" id="C_0001592677999268391183" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="468.5" y="455.694"/>
+        <ellipse cx="483.5" cy="471.694" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M482.3594,472.7565 L483.6719,472.7565 L483.6719,472.8034 C483.6719,473.2096 483.6875,473.3659 483.7969,473.5221 C483.9688,473.7721 484.2656,473.944 484.5781,473.944 C484.8594,473.944 485.1563,473.8034 485.3281,473.5846 C485.4531,473.3971 485.5,473.2565 485.5,472.8034 L485.5,470.9596 C485.5,470.6315 485.4844,470.5221 485.4219,470.3502 C485.3125,470.0534 484.9531,469.8034 484.5781,469.8034 C484.2813,469.8034 484.0156,469.944 483.8438,470.1627 C483.7031,470.3502 483.6719,470.5221 483.6719,470.9596 L483.6719,471.0221 L482.3594,471.0221 L482.3594,468.8502 L486.2031,468.8502 L486.2031,469.6002 C486.2031,469.9909 486.2344,470.1784 486.3438,470.3346 C486.5156,470.5846 486.8125,470.7565 487.125,470.7565 C487.4219,470.7565 487.6875,470.6315 487.875,470.3971 C488.0156,470.2096 488.0469,470.069 488.0469,469.6002 L488.0469,467.1002 L480.3438,467.1002 C479.8906,467.1002 479.7656,467.1159 479.5938,467.2252 C479.3281,467.3971 479.1563,467.6627 479.1563,467.9752 C479.1563,468.2565 479.2813,468.5221 479.5313,468.694 C479.7188,468.819 479.9063,468.8502 480.3438,468.8502 L480.5313,468.8502 L480.5313,474.944 L480.3438,474.944 C479.9219,474.944 479.7656,474.9752 479.5938,475.069 C479.3281,475.2252 479.1563,475.5065 479.1563,475.8034 C479.1563,476.3815 479.5625,476.694 480.3438,476.694 L488.4219,476.694 L488.4219,474.1627 C488.4219,473.7565 488.3906,473.5846 488.2813,473.4284 C488.1094,473.1627 487.8281,473.0065 487.5,473.0065 C487.2188,473.0065 486.9375,473.1471 486.75,473.3659 C486.6094,473.5534 486.5781,473.7096 486.5781,474.1627 L486.5781,474.944 L482.3594,474.944 L482.3594,472.7565 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="497.5" y="476.3">h</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="469.5" x2="507.5" y1="487.694" y2="487.694"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="474.5" y="504.6999">hhh</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="469.5" x2="507.5" y1="512.4939" y2="512.4939"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <g id="elem_C_0000441521323390223397">
+        <rect codeLine="114" fill="#F1F1F1" height="64.7999" id="C_0000441521323390223397" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="544" y="455.694"/>
+        <ellipse cx="559" cy="471.694" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M557.8594,472.7565 L559.1719,472.7565 L559.1719,472.8034 C559.1719,473.2096 559.1875,473.3659 559.2969,473.5221 C559.4688,473.7721 559.7656,473.944 560.0781,473.944 C560.3594,473.944 560.6563,473.8034 560.8281,473.5846 C560.9531,473.3971 561,473.2565 561,472.8034 L561,470.9596 C561,470.6315 560.9844,470.5221 560.9219,470.3502 C560.8125,470.0534 560.4531,469.8034 560.0781,469.8034 C559.7813,469.8034 559.5156,469.944 559.3438,470.1627 C559.2031,470.3502 559.1719,470.5221 559.1719,470.9596 L559.1719,471.0221 L557.8594,471.0221 L557.8594,468.8502 L561.7031,468.8502 L561.7031,469.6002 C561.7031,469.9909 561.7344,470.1784 561.8438,470.3346 C562.0156,470.5846 562.3125,470.7565 562.625,470.7565 C562.9219,470.7565 563.1875,470.6315 563.375,470.3971 C563.5156,470.2096 563.5469,470.069 563.5469,469.6002 L563.5469,467.1002 L555.8438,467.1002 C555.3906,467.1002 555.2656,467.1159 555.0938,467.2252 C554.8281,467.3971 554.6563,467.6627 554.6563,467.9752 C554.6563,468.2565 554.7813,468.5221 555.0313,468.694 C555.2188,468.819 555.4063,468.8502 555.8438,468.8502 L556.0313,468.8502 L556.0313,474.944 L555.8438,474.944 C555.4219,474.944 555.2656,474.9752 555.0938,475.069 C554.8281,475.2252 554.6563,475.5065 554.6563,475.8034 C554.6563,476.3815 555.0625,476.694 555.8438,476.694 L563.9219,476.694 L563.9219,474.1627 C563.9219,473.7565 563.8906,473.5846 563.7813,473.4284 C563.6094,473.1627 563.3281,473.0065 563,473.0065 C562.7188,473.0065 562.4375,473.1471 562.25,473.3659 C562.1094,473.5534 562.0781,473.7096 562.0781,474.1627 L562.0781,474.944 L557.8594,474.944 L557.8594,472.7565 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="573" y="476.3">i</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="545" x2="578" y1="487.694" y2="487.694"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="550" y="504.6999">iii</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="545" x2="578" y1="512.4939" y2="512.4939"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <g id="elem_C_0000499334434426587347">
+        <rect codeLine="118" fill="#F1F1F1" height="64.7999" id="C_0000499334434426587347" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="614" y="455.694"/>
+        <ellipse cx="629" cy="471.694" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M627.8594,472.7565 L629.1719,472.7565 L629.1719,472.8034 C629.1719,473.2096 629.1875,473.3659 629.2969,473.5221 C629.4688,473.7721 629.7656,473.944 630.0781,473.944 C630.3594,473.944 630.6563,473.8034 630.8281,473.5846 C630.9531,473.3971 631,473.2565 631,472.8034 L631,470.9596 C631,470.6315 630.9844,470.5221 630.9219,470.3502 C630.8125,470.0534 630.4531,469.8034 630.0781,469.8034 C629.7813,469.8034 629.5156,469.944 629.3438,470.1627 C629.2031,470.3502 629.1719,470.5221 629.1719,470.9596 L629.1719,471.0221 L627.8594,471.0221 L627.8594,468.8502 L631.7031,468.8502 L631.7031,469.6002 C631.7031,469.9909 631.7344,470.1784 631.8438,470.3346 C632.0156,470.5846 632.3125,470.7565 632.625,470.7565 C632.9219,470.7565 633.1875,470.6315 633.375,470.3971 C633.5156,470.2096 633.5469,470.069 633.5469,469.6002 L633.5469,467.1002 L625.8438,467.1002 C625.3906,467.1002 625.2656,467.1159 625.0938,467.2252 C624.8281,467.3971 624.6563,467.6627 624.6563,467.9752 C624.6563,468.2565 624.7813,468.5221 625.0313,468.694 C625.2188,468.819 625.4063,468.8502 625.8438,468.8502 L626.0313,468.8502 L626.0313,474.944 L625.8438,474.944 C625.4219,474.944 625.2656,474.9752 625.0938,475.069 C624.8281,475.2252 624.6563,475.5065 624.6563,475.8034 C624.6563,476.3815 625.0625,476.694 625.8438,476.694 L633.9219,476.694 L633.9219,474.1627 C633.9219,473.7565 633.8906,473.5846 633.7813,473.4284 C633.6094,473.1627 633.3281,473.0065 633,473.0065 C632.7188,473.0065 632.4375,473.1471 632.25,473.3659 C632.1094,473.5534 632.0781,473.7096 632.0781,474.1627 L632.0781,474.944 L627.8594,474.944 L627.8594,472.7565 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="643" y="476.3">j</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="648" y1="487.694" y2="487.694"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="620" y="504.6999">jjj</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="648" y1="512.4939" y2="512.4939"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <g id="elem_C_0001168031834662719964">
+        <rect codeLine="124" fill="#F1F1F1" height="48" id="C_0001168031834662719964" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="680" y="580.494"/>
+        <ellipse cx="695" cy="596.494" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M690,597.6502 C690,600.1502 692.1406,601.9627 695.0625,601.9627 C696.2969,601.9627 697.4688,601.6659 698.2188,601.1502 C698.8281,600.7284 699.1563,600.3065 699.1563,599.9002 C699.1563,599.4315 698.7344,599.0252 698.2344,599.0252 C698,599.0252 697.7813,599.1034 697.5781,599.3065 C697.1406,599.744 697.1406,599.744 696.9688,599.8377 C696.5156,600.0721 695.875,600.2127 695.1094,600.2127 C693.1094,600.2127 691.8281,599.1971 691.8281,597.619 L691.8281,596.5721 C691.8281,594.869 693.0469,593.6659 694.75,593.6659 C695.3281,593.6659 695.9063,593.8065 696.375,594.0565 C696.8438,594.3221 697.0156,594.5096 697.0781,594.869 C697.2031,595.5409 697.4531,595.7909 697.9844,595.7909 C698.2656,595.7909 698.5469,595.6502 698.7344,595.4315 C698.8594,595.2596 698.9063,595.0877 698.9063,594.6502 L698.9063,593.2909 C698.9063,592.869 698.8906,592.7284 698.7656,592.5565 C698.5938,592.3065 698.3125,592.1502 697.9844,592.1502 C697.6719,592.1502 697.4688,592.2596 697.25,592.5252 C696.0781,592.0252 695.6406,591.9159 694.6875,591.9159 C692.0156,591.9159 690,593.9315 690,596.5565 L690,597.6502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="709" y="601.1">c</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="681" x2="718" y1="612.494" y2="612.494"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="681" x2="718" y1="620.494" y2="620.494"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <g id="elem_C_0002037550833462858827">
+        <rect codeLine="128" fill="#F1F1F1" height="48" id="C_0002037550833462858827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="754.5" y="580.494"/>
+        <ellipse cx="769.5" cy="596.494" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M764.5,597.6502 C764.5,600.1502 766.6406,601.9627 769.5625,601.9627 C770.7969,601.9627 771.9688,601.6659 772.7188,601.1502 C773.3281,600.7284 773.6563,600.3065 773.6563,599.9002 C773.6563,599.4315 773.2344,599.0252 772.7344,599.0252 C772.5,599.0252 772.2813,599.1034 772.0781,599.3065 C771.6406,599.744 771.6406,599.744 771.4688,599.8377 C771.0156,600.0721 770.375,600.2127 769.6094,600.2127 C767.6094,600.2127 766.3281,599.1971 766.3281,597.619 L766.3281,596.5721 C766.3281,594.869 767.5469,593.6659 769.25,593.6659 C769.8281,593.6659 770.4063,593.8065 770.875,594.0565 C771.3438,594.3221 771.5156,594.5096 771.5781,594.869 C771.7031,595.5409 771.9531,595.7909 772.4844,595.7909 C772.7656,595.7909 773.0469,595.6502 773.2344,595.4315 C773.3594,595.2596 773.4063,595.0877 773.4063,594.6502 L773.4063,593.2909 C773.4063,592.869 773.3906,592.7284 773.2656,592.5565 C773.0938,592.3065 772.8125,592.1502 772.4844,592.1502 C772.1719,592.1502 771.9688,592.2596 771.75,592.5252 C770.5781,592.0252 770.1406,591.9159 769.1875,591.9159 C766.5156,591.9159 764.5,593.9315 764.5,596.5565 L764.5,597.6502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="783.5" y="601.1">e</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="755.5" x2="793.5" y1="612.494" y2="612.494"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="755.5" x2="793.5" y1="620.494" y2="620.494"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <g id="elem_C_0000252416999805673718">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000252416999805673718" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="9.5" y="92.294"/>
+        <ellipse cx="24.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M19.5,109.4502 C19.5,111.9502 21.6406,113.7627 24.5625,113.7627 C25.7969,113.7627 26.9688,113.4659 27.7188,112.9502 C28.3281,112.5284 28.6563,112.1065 28.6563,111.7002 C28.6563,111.2315 28.2344,110.8252 27.7344,110.8252 C27.5,110.8252 27.2813,110.9034 27.0781,111.1065 C26.6406,111.544 26.6406,111.544 26.4688,111.6377 C26.0156,111.8721 25.375,112.0127 24.6094,112.0127 C22.6094,112.0127 21.3281,110.9971 21.3281,109.419 L21.3281,108.3721 C21.3281,106.669 22.5469,105.4659 24.25,105.4659 C24.8281,105.4659 25.4063,105.6065 25.875,105.8565 C26.3438,106.1221 26.5156,106.3096 26.5781,106.669 C26.7031,107.3409 26.9531,107.5909 27.4844,107.5909 C27.7656,107.5909 28.0469,107.4502 28.2344,107.2315 C28.3594,107.0596 28.4063,106.8877 28.4063,106.4502 L28.4063,105.0909 C28.4063,104.669 28.3906,104.5284 28.2656,104.3565 C28.0938,104.1065 27.8125,103.9502 27.4844,103.9502 C27.1719,103.9502 26.9688,104.0596 26.75,104.3252 C25.5781,103.8252 25.1406,103.7159 24.1875,103.7159 C21.5156,103.7159 19.5,105.7315 19.5,108.3565 L19.5,109.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="38.5" y="112.9">b</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="10.5" x2="48.5" y1="124.294" y2="124.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="10.5" x2="48.5" y1="132.294" y2="132.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <g id="elem_C_0000595494794840378320">
+        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0000595494794840378320" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="84.5" y="92.294"/>
+        <ellipse cx="99.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M94.5,109.4502 C94.5,111.9502 96.6406,113.7627 99.5625,113.7627 C100.7969,113.7627 101.9688,113.4659 102.7188,112.9502 C103.3281,112.5284 103.6563,112.1065 103.6563,111.7002 C103.6563,111.2315 103.2344,110.8252 102.7344,110.8252 C102.5,110.8252 102.2813,110.9034 102.0781,111.1065 C101.6406,111.544 101.6406,111.544 101.4688,111.6377 C101.0156,111.8721 100.375,112.0127 99.6094,112.0127 C97.6094,112.0127 96.3281,110.9971 96.3281,109.419 L96.3281,108.3721 C96.3281,106.669 97.5469,105.4659 99.25,105.4659 C99.8281,105.4659 100.4063,105.6065 100.875,105.8565 C101.3438,106.1221 101.5156,106.3096 101.5781,106.669 C101.7031,107.3409 101.9531,107.5909 102.4844,107.5909 C102.7656,107.5909 103.0469,107.4502 103.2344,107.2315 C103.3594,107.0596 103.4063,106.8877 103.4063,106.4502 L103.4063,105.0909 C103.4063,104.669 103.3906,104.5284 103.2656,104.3565 C103.0938,104.1065 102.8125,103.9502 102.4844,103.9502 C102.1719,103.9502 101.9688,104.0596 101.75,104.3252 C100.5781,103.8252 100.1406,103.7159 99.1875,103.7159 C96.5156,103.7159 94.5,105.7315 94.5,108.3565 L94.5,109.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="113.5" y="112.9">g</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="123.5" y1="124.294" y2="124.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="123.5" y1="132.294" y2="132.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000917656824503504804">
+        <rect codeLine="135" fill="#F1F1F1" height="48" id="C_0000917656824503504804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="85" y="200.294"/>
+        <ellipse cx="100" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M95,217.4502 C95,219.9502 97.1406,221.7627 100.0625,221.7627 C101.2969,221.7627 102.4688,221.4659 103.2188,220.9502 C103.8281,220.5284 104.1563,220.1065 104.1563,219.7002 C104.1563,219.2315 103.7344,218.8252 103.2344,218.8252 C103,218.8252 102.7813,218.9034 102.5781,219.1065 C102.1406,219.544 102.1406,219.544 101.9688,219.6377 C101.5156,219.8721 100.875,220.0127 100.1094,220.0127 C98.1094,220.0127 96.8281,218.9971 96.8281,217.419 L96.8281,216.3721 C96.8281,214.669 98.0469,213.4659 99.75,213.4659 C100.3281,213.4659 100.9063,213.6065 101.375,213.8565 C101.8438,214.1221 102.0156,214.3096 102.0781,214.669 C102.2031,215.3409 102.4531,215.5909 102.9844,215.5909 C103.2656,215.5909 103.5469,215.4502 103.7344,215.2315 C103.8594,215.0596 103.9063,214.8877 103.9063,214.4502 L103.9063,213.0909 C103.9063,212.669 103.8906,212.5284 103.7656,212.3565 C103.5938,212.1065 103.3125,211.9502 102.9844,211.9502 C102.6719,211.9502 102.4688,212.0596 102.25,212.3252 C101.0781,211.8252 100.6406,211.7159 99.6875,211.7159 C97.0156,211.7159 95,213.7315 95,216.3565 L95,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="114" y="220.9">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="86" x2="125" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="86" x2="125" y1="240.294" y2="240.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001235773045370563004">
+        <rect codeLine="139" fill="#F1F1F1" height="48" id="C_0001235773045370563004" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="161" y="200.294"/>
+        <ellipse cx="176" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M171,217.4502 C171,219.9502 173.1406,221.7627 176.0625,221.7627 C177.2969,221.7627 178.4688,221.4659 179.2188,220.9502 C179.8281,220.5284 180.1563,220.1065 180.1563,219.7002 C180.1563,219.2315 179.7344,218.8252 179.2344,218.8252 C179,218.8252 178.7813,218.9034 178.5781,219.1065 C178.1406,219.544 178.1406,219.544 177.9688,219.6377 C177.5156,219.8721 176.875,220.0127 176.1094,220.0127 C174.1094,220.0127 172.8281,218.9971 172.8281,217.419 L172.8281,216.3721 C172.8281,214.669 174.0469,213.4659 175.75,213.4659 C176.3281,213.4659 176.9063,213.6065 177.375,213.8565 C177.8438,214.1221 178.0156,214.3096 178.0781,214.669 C178.2031,215.3409 178.4531,215.5909 178.9844,215.5909 C179.2656,215.5909 179.5469,215.4502 179.7344,215.2315 C179.8594,215.0596 179.9063,214.8877 179.9063,214.4502 L179.9063,213.0909 C179.9063,212.669 179.8906,212.5284 179.7656,212.3565 C179.5938,212.1065 179.3125,211.9502 178.9844,211.9502 C178.6719,211.9502 178.4688,212.0596 178.25,212.3252 C177.0781,211.8252 176.6406,211.7159 175.6875,211.7159 C173.0156,211.7159 171,213.7315 171,216.3565 L171,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="190" y="220.9">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="162" x2="201" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="162" x2="201" y1="240.294" y2="240.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0001365815261671395853">
+        <rect codeLine="143" fill="#F1F1F1" height="48" id="C_0001365815261671395853" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="7" y="200.294"/>
+        <ellipse cx="22" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,217.4502 C17,219.9502 19.1406,221.7627 22.0625,221.7627 C23.2969,221.7627 24.4688,221.4659 25.2188,220.9502 C25.8281,220.5284 26.1563,220.1065 26.1563,219.7002 C26.1563,219.2315 25.7344,218.8252 25.2344,218.8252 C25,218.8252 24.7813,218.9034 24.5781,219.1065 C24.1406,219.544 24.1406,219.544 23.9688,219.6377 C23.5156,219.8721 22.875,220.0127 22.1094,220.0127 C20.1094,220.0127 18.8281,218.9971 18.8281,217.419 L18.8281,216.3721 C18.8281,214.669 20.0469,213.4659 21.75,213.4659 C22.3281,213.4659 22.9063,213.6065 23.375,213.8565 C23.8438,214.1221 24.0156,214.3096 24.0781,214.669 C24.2031,215.3409 24.4531,215.5909 24.9844,215.5909 C25.2656,215.5909 25.5469,215.4502 25.7344,215.2315 C25.8594,215.0596 25.9063,214.8877 25.9063,214.4502 L25.9063,213.0909 C25.9063,212.669 25.8906,212.5284 25.7656,212.3565 C25.5938,212.1065 25.3125,211.9502 24.9844,211.9502 C24.6719,211.9502 24.4688,212.0596 24.25,212.3252 C23.0781,211.8252 22.6406,211.7159 21.6875,211.7159 C19.0156,211.7159 17,213.7315 17,216.3565 L17,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="36" y="220.9">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="49" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="49" y1="240.294" y2="240.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <g id="elem_C_0001158868779503074564">
+        <rect codeLine="149" fill="#F1F1F1" height="48" id="C_0001158868779503074564" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="237.5" y="200.294"/>
+        <ellipse cx="252.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M247.5,217.4502 C247.5,219.9502 249.6406,221.7627 252.5625,221.7627 C253.7969,221.7627 254.9688,221.4659 255.7188,220.9502 C256.3281,220.5284 256.6563,220.1065 256.6563,219.7002 C256.6563,219.2315 256.2344,218.8252 255.7344,218.8252 C255.5,218.8252 255.2813,218.9034 255.0781,219.1065 C254.6406,219.544 254.6406,219.544 254.4688,219.6377 C254.0156,219.8721 253.375,220.0127 252.6094,220.0127 C250.6094,220.0127 249.3281,218.9971 249.3281,217.419 L249.3281,216.3721 C249.3281,214.669 250.5469,213.4659 252.25,213.4659 C252.8281,213.4659 253.4063,213.6065 253.875,213.8565 C254.3438,214.1221 254.5156,214.3096 254.5781,214.669 C254.7031,215.3409 254.9531,215.5909 255.4844,215.5909 C255.7656,215.5909 256.0469,215.4502 256.2344,215.2315 C256.3594,215.0596 256.4063,214.8877 256.4063,214.4502 L256.4063,213.0909 C256.4063,212.669 256.3906,212.5284 256.2656,212.3565 C256.0938,212.1065 255.8125,211.9502 255.4844,211.9502 C255.1719,211.9502 254.9688,212.0596 254.75,212.3252 C253.5781,211.8252 253.1406,211.7159 252.1875,211.7159 C249.5156,211.7159 247.5,213.7315 247.5,216.3565 L247.5,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="266.5" y="220.9">a</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="238.5" x2="276.5" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="238.5" x2="276.5" y1="240.294" y2="240.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <g id="elem_C_0002123626454198320938">
+        <rect codeLine="153" fill="#F1F1F1" height="48" id="C_0002123626454198320938" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="312.5" y="200.294"/>
+        <ellipse cx="327.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M322.5,217.4502 C322.5,219.9502 324.6406,221.7627 327.5625,221.7627 C328.7969,221.7627 329.9688,221.4659 330.7188,220.9502 C331.3281,220.5284 331.6563,220.1065 331.6563,219.7002 C331.6563,219.2315 331.2344,218.8252 330.7344,218.8252 C330.5,218.8252 330.2813,218.9034 330.0781,219.1065 C329.6406,219.544 329.6406,219.544 329.4688,219.6377 C329.0156,219.8721 328.375,220.0127 327.6094,220.0127 C325.6094,220.0127 324.3281,218.9971 324.3281,217.419 L324.3281,216.3721 C324.3281,214.669 325.5469,213.4659 327.25,213.4659 C327.8281,213.4659 328.4063,213.6065 328.875,213.8565 C329.3438,214.1221 329.5156,214.3096 329.5781,214.669 C329.7031,215.3409 329.9531,215.5909 330.4844,215.5909 C330.7656,215.5909 331.0469,215.4502 331.2344,215.2315 C331.3594,215.0596 331.4063,214.8877 331.4063,214.4502 L331.4063,213.0909 C331.4063,212.669 331.3906,212.5284 331.2656,212.3565 C331.0938,212.1065 330.8125,211.9502 330.4844,211.9502 C330.1719,211.9502 329.9688,212.0596 329.75,212.3252 C328.5781,211.8252 328.1406,211.7159 327.1875,211.7159 C324.5156,211.7159 322.5,213.7315 322.5,216.3565 L322.5,217.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="341.5" y="220.9">f</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313.5" x2="347.5" y1="232.294" y2="232.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313.5" x2="347.5" y1="240.294" y2="240.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <g id="elem_C_0001592677999268391183">
+        <rect codeLine="159" fill="#F1F1F1" height="64.7999" id="C_0001592677999268391183" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="230.5" y="330.894"/>
+        <ellipse cx="245.5" cy="346.894" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M244.3594,347.9565 L245.6719,347.9565 L245.6719,348.0034 C245.6719,348.4096 245.6875,348.5659 245.7969,348.7221 C245.9688,348.9721 246.2656,349.144 246.5781,349.144 C246.8594,349.144 247.1563,349.0034 247.3281,348.7846 C247.4531,348.5971 247.5,348.4565 247.5,348.0034 L247.5,346.1596 C247.5,345.8315 247.4844,345.7221 247.4219,345.5502 C247.3125,345.2534 246.9531,345.0034 246.5781,345.0034 C246.2813,345.0034 246.0156,345.144 245.8438,345.3627 C245.7031,345.5502 245.6719,345.7221 245.6719,346.1596 L245.6719,346.2221 L244.3594,346.2221 L244.3594,344.0502 L248.2031,344.0502 L248.2031,344.8002 C248.2031,345.1909 248.2344,345.3784 248.3438,345.5346 C248.5156,345.7846 248.8125,345.9565 249.125,345.9565 C249.4219,345.9565 249.6875,345.8315 249.875,345.5971 C250.0156,345.4096 250.0469,345.269 250.0469,344.8002 L250.0469,342.3002 L242.3438,342.3002 C241.8906,342.3002 241.7656,342.3159 241.5938,342.4252 C241.3281,342.5971 241.1563,342.8627 241.1563,343.1752 C241.1563,343.4565 241.2813,343.7221 241.5313,343.894 C241.7188,344.019 241.9063,344.0502 242.3438,344.0502 L242.5313,344.0502 L242.5313,350.144 L242.3438,350.144 C241.9219,350.144 241.7656,350.1752 241.5938,350.269 C241.3281,350.4252 241.1563,350.7065 241.1563,351.0034 C241.1563,351.5815 241.5625,351.894 242.3438,351.894 L250.4219,351.894 L250.4219,349.3627 C250.4219,348.9565 250.3906,348.7846 250.2813,348.6284 C250.1094,348.3627 249.8281,348.2065 249.5,348.2065 C249.2188,348.2065 248.9375,348.3471 248.75,348.5659 C248.6094,348.7534 248.5781,348.9096 248.5781,349.3627 L248.5781,350.144 L244.3594,350.144 L244.3594,347.9565 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="259.5" y="351.5">h</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="231.5" x2="269.5" y1="362.894" y2="362.894"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="236.5" y="379.8999">hhh</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="231.5" x2="269.5" y1="387.6939" y2="387.6939"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <g id="elem_C_0000441521323390223397">
+        <rect codeLine="163" fill="#F1F1F1" height="64.7999" id="C_0000441521323390223397" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="90" y="330.894"/>
+        <ellipse cx="105" cy="346.894" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M103.8594,347.9565 L105.1719,347.9565 L105.1719,348.0034 C105.1719,348.4096 105.1875,348.5659 105.2969,348.7221 C105.4688,348.9721 105.7656,349.144 106.0781,349.144 C106.3594,349.144 106.6563,349.0034 106.8281,348.7846 C106.9531,348.5971 107,348.4565 107,348.0034 L107,346.1596 C107,345.8315 106.9844,345.7221 106.9219,345.5502 C106.8125,345.2534 106.4531,345.0034 106.0781,345.0034 C105.7813,345.0034 105.5156,345.144 105.3438,345.3627 C105.2031,345.5502 105.1719,345.7221 105.1719,346.1596 L105.1719,346.2221 L103.8594,346.2221 L103.8594,344.0502 L107.7031,344.0502 L107.7031,344.8002 C107.7031,345.1909 107.7344,345.3784 107.8438,345.5346 C108.0156,345.7846 108.3125,345.9565 108.625,345.9565 C108.9219,345.9565 109.1875,345.8315 109.375,345.5971 C109.5156,345.4096 109.5469,345.269 109.5469,344.8002 L109.5469,342.3002 L101.8438,342.3002 C101.3906,342.3002 101.2656,342.3159 101.0938,342.4252 C100.8281,342.5971 100.6563,342.8627 100.6563,343.1752 C100.6563,343.4565 100.7813,343.7221 101.0313,343.894 C101.2188,344.019 101.4063,344.0502 101.8438,344.0502 L102.0313,344.0502 L102.0313,350.144 L101.8438,350.144 C101.4219,350.144 101.2656,350.1752 101.0938,350.269 C100.8281,350.4252 100.6563,350.7065 100.6563,351.0034 C100.6563,351.5815 101.0625,351.894 101.8438,351.894 L109.9219,351.894 L109.9219,349.3627 C109.9219,348.9565 109.8906,348.7846 109.7813,348.6284 C109.6094,348.3627 109.3281,348.2065 109,348.2065 C108.7188,348.2065 108.4375,348.3471 108.25,348.5659 C108.1094,348.7534 108.0781,348.9096 108.0781,349.3627 L108.0781,350.144 L103.8594,350.144 L103.8594,347.9565 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="119" y="351.5">i</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="124" y1="362.894" y2="362.894"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="96" y="379.8999">iii</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="124" y1="387.6939" y2="387.6939"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <g id="elem_C_0000499334434426587347">
+        <rect codeLine="167" fill="#F1F1F1" height="64.7999" id="C_0000499334434426587347" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="160" y="330.894"/>
+        <ellipse cx="175" cy="346.894" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M173.8594,347.9565 L175.1719,347.9565 L175.1719,348.0034 C175.1719,348.4096 175.1875,348.5659 175.2969,348.7221 C175.4688,348.9721 175.7656,349.144 176.0781,349.144 C176.3594,349.144 176.6563,349.0034 176.8281,348.7846 C176.9531,348.5971 177,348.4565 177,348.0034 L177,346.1596 C177,345.8315 176.9844,345.7221 176.9219,345.5502 C176.8125,345.2534 176.4531,345.0034 176.0781,345.0034 C175.7813,345.0034 175.5156,345.144 175.3438,345.3627 C175.2031,345.5502 175.1719,345.7221 175.1719,346.1596 L175.1719,346.2221 L173.8594,346.2221 L173.8594,344.0502 L177.7031,344.0502 L177.7031,344.8002 C177.7031,345.1909 177.7344,345.3784 177.8438,345.5346 C178.0156,345.7846 178.3125,345.9565 178.625,345.9565 C178.9219,345.9565 179.1875,345.8315 179.375,345.5971 C179.5156,345.4096 179.5469,345.269 179.5469,344.8002 L179.5469,342.3002 L171.8438,342.3002 C171.3906,342.3002 171.2656,342.3159 171.0938,342.4252 C170.8281,342.5971 170.6563,342.8627 170.6563,343.1752 C170.6563,343.4565 170.7813,343.7221 171.0313,343.894 C171.2188,344.019 171.4063,344.0502 171.8438,344.0502 L172.0313,344.0502 L172.0313,350.144 L171.8438,350.144 C171.4219,350.144 171.2656,350.1752 171.0938,350.269 C170.8281,350.4252 170.6563,350.7065 170.6563,351.0034 C170.6563,351.5815 171.0625,351.894 171.8438,351.894 L179.9219,351.894 L179.9219,349.3627 C179.9219,348.9565 179.8906,348.7846 179.7813,348.6284 C179.6094,348.3627 179.3281,348.2065 179,348.2065 C178.7188,348.2065 178.4375,348.3471 178.25,348.5659 C178.1094,348.7534 178.0781,348.9096 178.0781,349.3627 L178.0781,350.144 L173.8594,350.144 L173.8594,347.9565 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="189" y="351.5">j</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="161" x2="194" y1="362.894" y2="362.894"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="166" y="379.8999">jjj</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="161" x2="194" y1="387.6939" y2="387.6939"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <g id="elem_C_0001168031834662719964">
+        <rect codeLine="173" fill="#F1F1F1" height="48" id="C_0001168031834662719964" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="306" y="339.294"/>
+        <ellipse cx="321" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M316,356.4502 C316,358.9502 318.1406,360.7627 321.0625,360.7627 C322.2969,360.7627 323.4688,360.4659 324.2188,359.9502 C324.8281,359.5284 325.1563,359.1065 325.1563,358.7002 C325.1563,358.2315 324.7344,357.8252 324.2344,357.8252 C324,357.8252 323.7813,357.9034 323.5781,358.1065 C323.1406,358.544 323.1406,358.544 322.9688,358.6377 C322.5156,358.8721 321.875,359.0127 321.1094,359.0127 C319.1094,359.0127 317.8281,357.9971 317.8281,356.419 L317.8281,355.3721 C317.8281,353.669 319.0469,352.4659 320.75,352.4659 C321.3281,352.4659 321.9063,352.6065 322.375,352.8565 C322.8438,353.1221 323.0156,353.3096 323.0781,353.669 C323.2031,354.3409 323.4531,354.5909 323.9844,354.5909 C324.2656,354.5909 324.5469,354.4502 324.7344,354.2315 C324.8594,354.0596 324.9063,353.8877 324.9063,353.4502 L324.9063,352.0909 C324.9063,351.669 324.8906,351.5284 324.7656,351.3565 C324.5938,351.1065 324.3125,350.9502 323.9844,350.9502 C323.6719,350.9502 323.4688,351.0596 323.25,351.3252 C322.0781,350.8252 321.6406,350.7159 320.6875,350.7159 C318.0156,350.7159 316,352.7315 316,355.3565 L316,356.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="335" y="359.9">c</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="307" x2="344" y1="371.294" y2="371.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="307" x2="344" y1="379.294" y2="379.294"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <g id="elem_C_0002037550833462858827">
+        <rect codeLine="177" fill="#F1F1F1" height="48" id="C_0002037550833462858827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="380.5" y="339.294"/>
+        <ellipse cx="395.5" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M390.5,356.4502 C390.5,358.9502 392.6406,360.7627 395.5625,360.7627 C396.7969,360.7627 397.9688,360.4659 398.7188,359.9502 C399.3281,359.5284 399.6563,359.1065 399.6563,358.7002 C399.6563,358.2315 399.2344,357.8252 398.7344,357.8252 C398.5,357.8252 398.2813,357.9034 398.0781,358.1065 C397.6406,358.544 397.6406,358.544 397.4688,358.6377 C397.0156,358.8721 396.375,359.0127 395.6094,359.0127 C393.6094,359.0127 392.3281,357.9971 392.3281,356.419 L392.3281,355.3721 C392.3281,353.669 393.5469,352.4659 395.25,352.4659 C395.8281,352.4659 396.4063,352.6065 396.875,352.8565 C397.3438,353.1221 397.5156,353.3096 397.5781,353.669 C397.7031,354.3409 397.9531,354.5909 398.4844,354.5909 C398.7656,354.5909 399.0469,354.4502 399.2344,354.2315 C399.3594,354.0596 399.4063,353.8877 399.4063,353.4502 L399.4063,352.0909 C399.4063,351.669 399.3906,351.5284 399.2656,351.3565 C399.0938,351.1065 398.8125,350.9502 398.4844,350.9502 C398.1719,350.9502 397.9688,351.0596 397.75,351.3252 C396.5781,350.8252 396.1406,350.7159 395.1875,350.7159 C392.5156,350.7159 390.5,352.7315 390.5,355.3565 L390.5,356.4502 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="409.5" y="359.9">e</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="381.5" x2="419.5" y1="371.294" y2="371.294"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="381.5" x2="419.5" y1="379.294" y2="379.294"/>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00054_class_mermaid.svg b/docs/test_cases/t00054_class_mermaid.svg
index 64dbb670..3b24e55e 100644
--- a/docs/test_cases/t00054_class_mermaid.svg
+++ b/docs/test_cases/t00054_class_mermaid.svg
@@ -1,50 +1,55 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2057.171875 117" style="max-width: 2057.17px; background-color: white;" width="2057.171875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,7 +57,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L4">
           <g title="b" id="classId-C_0000252416999805673718-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -71,7 +76,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L8">
+        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L8">
           <g title="d" id="classId-C_0001569559620782547158-1" class="node default clickable">
             <rect height="57" width="77.21875" y="-28.5" x="-38.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.609375" x1="-38.609375" class="divider"/>
@@ -90,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L12">
+        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L12">
           <g title="g" id="classId-C_0000595494794840378320-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -109,7 +114,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L18">
+        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L18">
           <g title="C" id="classId-C_0000540054955081677892-3" class="node default clickable">
             <rect height="57" width="87.90625" y="-28.5" x="-43.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.953125" x1="-43.953125" class="divider"/>
@@ -128,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L23">
+        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L23">
           <g title="F" id="classId-C_0000446694692150903211-4" class="node default clickable">
             <rect height="57" width="86.125" y="-28.5" x="-43.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.0625" x1="-43.0625" class="divider"/>
@@ -147,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L14">
+        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14">
           <g title="A" id="classId-C_0000917656824503504804-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -166,7 +171,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L15">
+        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15">
           <g title="B" id="classId-C_0001235773045370563004-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -185,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L25">
+        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25">
           <g title="G" id="classId-C_0001365815261671395853-7" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -204,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L3">
+        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3">
           <g title="a" id="classId-C_0001158868779503074564-8" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -223,7 +228,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L11">
+        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11">
           <g title="f" id="classId-C_0002123626454198320938-9" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -242,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L20">
+        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L20">
           <g title="D" id="classId-C_0001266390196945323478-10" class="node default clickable">
             <rect height="57" width="149.25" y="-28.5" x="-74.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.625" x1="-74.625" class="divider"/>
@@ -261,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L21">
+        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L21">
           <g title="E" id="classId-C_0000134928214982255105-11" class="node default clickable">
             <rect height="57" width="148.359375" y="-28.5" x="-74.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.1796875" x1="-74.1796875" class="divider"/>
@@ -280,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L28">
+        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28">
           <g title="h" id="classId-C_0001592677999268391183-12" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -304,7 +309,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L29">
+        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29">
           <g title="i" id="classId-C_0000441521323390223397-13" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -328,7 +333,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L30">
+        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30">
           <g title="j" id="classId-C_0000499334434426587347-14" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -352,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L7">
+        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7">
           <g title="c" id="classId-C_0001168031834662719964-15" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -371,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00054/t00054.cc#L9">
+        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9">
           <g title="e" id="classId-C_0002037550833462858827-16" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
diff --git a/docs/test_cases/t00055.md b/docs/test_cases/t00055.md
index d6889792..ddbafcb6 100644
--- a/docs/test_cases/t00055.md
+++ b/docs/test_cases/t00055.md
@@ -17,7 +17,7 @@ diagrams:
         - column: [D, F, H, J]
 ```
 ## Source code
-File t00055.cc
+File `tests/t00055/t00055.cc`
 ```cpp
 namespace clanguml {
 namespace t00055 {
diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg
index fd032d8b..b60989f3 100644
--- a/docs/test_cases/t00055_class.svg
+++ b/docs/test_cases/t00055_class.svg
@@ -1,93 +1,107 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="499px" preserveAspectRatio="none" style="width:429px;height:499px;" version="1.1" viewBox="0 0 429 499" width="429px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="494px" preserveAspectRatio="none" style="width:431px;height:494px;background:#FFFFFF;" version="1.1" viewBox="0 0 431 494" width="431px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f721siibqirf1" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0001697191682863715554" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="8"/>
-      <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001697191682863715554">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001697191682863715554" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="7"/>
+        <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,24.1563 C17,26.6563 19.1406,28.4688 22.0625,28.4688 C23.2969,28.4688 24.4688,28.1719 25.2188,27.6563 C25.8281,27.2344 26.1563,26.8125 26.1563,26.4063 C26.1563,25.9375 25.7344,25.5313 25.2344,25.5313 C25,25.5313 24.7813,25.6094 24.5781,25.8125 C24.1406,26.25 24.1406,26.25 23.9688,26.3438 C23.5156,26.5781 22.875,26.7188 22.1094,26.7188 C20.1094,26.7188 18.8281,25.7031 18.8281,24.125 L18.8281,23.0781 C18.8281,21.375 20.0469,20.1719 21.75,20.1719 C22.3281,20.1719 22.9063,20.3125 23.375,20.5625 C23.8438,20.8281 24.0156,21.0156 24.0781,21.375 C24.2031,22.0469 24.4531,22.2969 24.9844,22.2969 C25.2656,22.2969 25.5469,22.1563 25.7344,21.9375 C25.8594,21.7656 25.9063,21.5938 25.9063,21.1563 L25.9063,19.7969 C25.9063,19.375 25.8906,19.2344 25.7656,19.0625 C25.5938,18.8125 25.3125,18.6563 24.9844,18.6563 C24.6719,18.6563 24.4688,18.7656 24.25,19.0313 C23.0781,18.5313 22.6406,18.4219 21.6875,18.4219 C19.0156,18.4219 17,20.4375 17,23.0625 L17,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0000188599859894721517" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="378" y="8"/>
-      <ellipse cx="393" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M395.9688,29.6406 Q395.3906,29.9375 394.75,30.0781 Q394.1094,30.2344 393.4063,30.2344 Q390.9063,30.2344 389.5781,28.5938 Q388.2656,26.9375 388.2656,23.8125 Q388.2656,20.6875 389.5781,19.0313 Q390.9063,17.375 393.4063,17.375 Q394.1094,17.375 394.75,17.5313 Q395.4063,17.6875 395.9688,17.9844 L395.9688,20.7031 Q395.3438,20.125 394.75,19.8594 Q394.1563,19.5781 393.5313,19.5781 Q392.1875,19.5781 391.5,20.6563 Q390.8125,21.7188 390.8125,23.8125 Q390.8125,25.9063 391.5,26.9844 Q392.1875,28.0469 393.5313,28.0469 Q394.1563,28.0469 394.75,27.7813 Q395.3438,27.5 395.9688,26.9219 L395.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="407" y="28.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000188599859894721517">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000188599859894721517" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="383" y="7"/>
+        <ellipse cx="398" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M393,24.1563 C393,26.6563 395.1406,28.4688 398.0625,28.4688 C399.2969,28.4688 400.4688,28.1719 401.2188,27.6563 C401.8281,27.2344 402.1563,26.8125 402.1563,26.4063 C402.1563,25.9375 401.7344,25.5313 401.2344,25.5313 C401,25.5313 400.7813,25.6094 400.5781,25.8125 C400.1406,26.25 400.1406,26.25 399.9688,26.3438 C399.5156,26.5781 398.875,26.7188 398.1094,26.7188 C396.1094,26.7188 394.8281,25.7031 394.8281,24.125 L394.8281,23.0781 C394.8281,21.375 396.0469,20.1719 397.75,20.1719 C398.3281,20.1719 398.9063,20.3125 399.375,20.5625 C399.8438,20.8281 400.0156,21.0156 400.0781,21.375 C400.2031,22.0469 400.4531,22.2969 400.9844,22.2969 C401.2656,22.2969 401.5469,22.1563 401.7344,21.9375 C401.8594,21.7656 401.9063,21.5938 401.9063,21.1563 L401.9063,19.7969 C401.9063,19.375 401.8906,19.2344 401.7656,19.0625 C401.5938,18.8125 401.3125,18.6563 400.9844,18.6563 C400.6719,18.6563 400.4688,18.7656 400.25,19.0313 C399.0781,18.5313 398.6406,18.4219 397.6875,18.4219 C395.0156,18.4219 393,20.4375 393,23.0625 L393,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="412" y="27.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="384" x2="423" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="384" x2="423" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0000625177137967392996" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="8"/>
-      <ellipse cx="96" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M98.9688,29.6406 Q98.3906,29.9375 97.75,30.0781 Q97.1094,30.2344 96.4063,30.2344 Q93.9063,30.2344 92.5781,28.5938 Q91.2656,26.9375 91.2656,23.8125 Q91.2656,20.6875 92.5781,19.0313 Q93.9063,17.375 96.4063,17.375 Q97.1094,17.375 97.75,17.5313 Q98.4063,17.6875 98.9688,17.9844 L98.9688,20.7031 Q98.3438,20.125 97.75,19.8594 Q97.1563,19.5781 96.5313,19.5781 Q95.1875,19.5781 94.5,20.6563 Q93.8125,21.7188 93.8125,23.8125 Q93.8125,25.9063 94.5,26.9844 Q95.1875,28.0469 96.5313,28.0469 Q97.1563,28.0469 97.75,27.7813 Q98.3438,27.5 98.9688,26.9219 L98.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="28.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000625177137967392996">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000625177137967392996" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="82.5" y="7"/>
+        <ellipse cx="97.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M92.5,24.1563 C92.5,26.6563 94.6406,28.4688 97.5625,28.4688 C98.7969,28.4688 99.9688,28.1719 100.7188,27.6563 C101.3281,27.2344 101.6563,26.8125 101.6563,26.4063 C101.6563,25.9375 101.2344,25.5313 100.7344,25.5313 C100.5,25.5313 100.2813,25.6094 100.0781,25.8125 C99.6406,26.25 99.6406,26.25 99.4688,26.3438 C99.0156,26.5781 98.375,26.7188 97.6094,26.7188 C95.6094,26.7188 94.3281,25.7031 94.3281,24.125 L94.3281,23.0781 C94.3281,21.375 95.5469,20.1719 97.25,20.1719 C97.8281,20.1719 98.4063,20.3125 98.875,20.5625 C99.3438,20.8281 99.5156,21.0156 99.5781,21.375 C99.7031,22.0469 99.9531,22.2969 100.4844,22.2969 C100.7656,22.2969 101.0469,22.1563 101.2344,21.9375 C101.3594,21.7656 101.4063,21.5938 101.4063,21.1563 L101.4063,19.7969 C101.4063,19.375 101.3906,19.2344 101.2656,19.0625 C101.0938,18.8125 100.8125,18.6563 100.4844,18.6563 C100.1719,18.6563 99.9688,18.7656 99.75,19.0313 C98.5781,18.5313 98.1406,18.4219 97.1875,18.4219 C94.5156,18.4219 92.5,20.4375 92.5,23.0625 L92.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="111.5" y="27.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="83.5" x2="123.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="83.5" x2="123.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0001046415640323289221" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="116"/>
-      <ellipse cx="392.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M395.4688,137.6406 Q394.8906,137.9375 394.25,138.0781 Q393.6094,138.2344 392.9063,138.2344 Q390.4063,138.2344 389.0781,136.5938 Q387.7656,134.9375 387.7656,131.8125 Q387.7656,128.6875 389.0781,127.0313 Q390.4063,125.375 392.9063,125.375 Q393.6094,125.375 394.25,125.5313 Q394.9063,125.6875 395.4688,125.9844 L395.4688,128.7031 Q394.8438,128.125 394.25,127.8594 Q393.6563,127.5781 393.0313,127.5781 Q391.6875,127.5781 391,128.6563 Q390.3125,129.7188 390.3125,131.8125 Q390.3125,133.9063 391,134.9844 Q391.6875,136.0469 393.0313,136.0469 Q393.6563,136.0469 394.25,135.7813 Q394.8438,135.5 395.4688,134.9219 L395.4688,137.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="136.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="148" y2="148"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="156" y2="156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001046415640323289221">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001046415640323289221" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="382.5" y="115"/>
+        <ellipse cx="397.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M392.5,132.1563 C392.5,134.6563 394.6406,136.4688 397.5625,136.4688 C398.7969,136.4688 399.9688,136.1719 400.7188,135.6563 C401.3281,135.2344 401.6563,134.8125 401.6563,134.4063 C401.6563,133.9375 401.2344,133.5313 400.7344,133.5313 C400.5,133.5313 400.2813,133.6094 400.0781,133.8125 C399.6406,134.25 399.6406,134.25 399.4688,134.3438 C399.0156,134.5781 398.375,134.7188 397.6094,134.7188 C395.6094,134.7188 394.3281,133.7031 394.3281,132.125 L394.3281,131.0781 C394.3281,129.375 395.5469,128.1719 397.25,128.1719 C397.8281,128.1719 398.4063,128.3125 398.875,128.5625 C399.3438,128.8281 399.5156,129.0156 399.5781,129.375 C399.7031,130.0469 399.9531,130.2969 400.4844,130.2969 C400.7656,130.2969 401.0469,130.1563 401.2344,129.9375 C401.3594,129.7656 401.4063,129.5938 401.4063,129.1563 L401.4063,127.7969 C401.4063,127.375 401.3906,127.2344 401.2656,127.0625 C401.0938,126.8125 400.8125,126.6563 400.4844,126.6563 C400.1719,126.6563 399.9688,126.7656 399.75,127.0313 C398.5781,126.5313 398.1406,126.4219 397.1875,126.4219 C394.5156,126.4219 392.5,128.4375 392.5,131.0625 L392.5,132.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="411.5" y="135.606">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="383.5" x2="423.5" y1="147" y2="147"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="383.5" x2="423.5" y1="155" y2="155"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0000702117239243796422" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="8"/>
-      <ellipse cx="171" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.9688,29.6406 Q173.3906,29.9375 172.75,30.0781 Q172.1094,30.2344 171.4063,30.2344 Q168.9063,30.2344 167.5781,28.5938 Q166.2656,26.9375 166.2656,23.8125 Q166.2656,20.6875 167.5781,19.0313 Q168.9063,17.375 171.4063,17.375 Q172.1094,17.375 172.75,17.5313 Q173.4063,17.6875 173.9688,17.9844 L173.9688,20.7031 Q173.3438,20.125 172.75,19.8594 Q172.1563,19.5781 171.5313,19.5781 Q170.1875,19.5781 169.5,20.6563 Q168.8125,21.7188 168.8125,23.8125 Q168.8125,25.9063 169.5,26.9844 Q170.1875,28.0469 171.5313,28.0469 Q172.1563,28.0469 172.75,27.7813 Q173.3438,27.5 173.9688,26.9219 L173.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="28.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0000702117239243796422">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000702117239243796422" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="159" y="7"/>
+        <ellipse cx="174" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M169,24.1563 C169,26.6563 171.1406,28.4688 174.0625,28.4688 C175.2969,28.4688 176.4688,28.1719 177.2188,27.6563 C177.8281,27.2344 178.1563,26.8125 178.1563,26.4063 C178.1563,25.9375 177.7344,25.5313 177.2344,25.5313 C177,25.5313 176.7813,25.6094 176.5781,25.8125 C176.1406,26.25 176.1406,26.25 175.9688,26.3438 C175.5156,26.5781 174.875,26.7188 174.1094,26.7188 C172.1094,26.7188 170.8281,25.7031 170.8281,24.125 L170.8281,23.0781 C170.8281,21.375 172.0469,20.1719 173.75,20.1719 C174.3281,20.1719 174.9063,20.3125 175.375,20.5625 C175.8438,20.8281 176.0156,21.0156 176.0781,21.375 C176.2031,22.0469 176.4531,22.2969 176.9844,22.2969 C177.2656,22.2969 177.5469,22.1563 177.7344,21.9375 C177.8594,21.7656 177.9063,21.5938 177.9063,21.1563 L177.9063,19.7969 C177.9063,19.375 177.8906,19.2344 177.7656,19.0625 C177.5938,18.8125 177.3125,18.6563 176.9844,18.6563 C176.6719,18.6563 176.4688,18.7656 176.25,19.0313 C175.0781,18.5313 174.6406,18.4219 173.6875,18.4219 C171.0156,18.4219 169,20.4375 169,23.0625 L169,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="188" y="27.606">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="160" x2="199" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="160" x2="199" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0001511375015718046137" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="378.5" y="224"/>
-      <ellipse cx="393.5" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M396.4688,245.6406 Q395.8906,245.9375 395.25,246.0781 Q394.6094,246.2344 393.9063,246.2344 Q391.4063,246.2344 390.0781,244.5938 Q388.7656,242.9375 388.7656,239.8125 Q388.7656,236.6875 390.0781,235.0313 Q391.4063,233.375 393.9063,233.375 Q394.6094,233.375 395.25,233.5313 Q395.9063,233.6875 396.4688,233.9844 L396.4688,236.7031 Q395.8438,236.125 395.25,235.8594 Q394.6563,235.5781 394.0313,235.5781 Q392.6875,235.5781 392,236.6563 Q391.3125,237.7188 391.3125,239.8125 Q391.3125,241.9063 392,242.9844 Q392.6875,244.0469 394.0313,244.0469 Q394.6563,244.0469 395.25,243.7813 Q395.8438,243.5 396.4688,242.9219 L396.4688,245.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="407.5" y="244.1543">F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="256" y2="256"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="264" y2="264"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0001511375015718046137">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001511375015718046137" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="383" y="223"/>
+        <ellipse cx="398" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M393,240.1563 C393,242.6563 395.1406,244.4688 398.0625,244.4688 C399.2969,244.4688 400.4688,244.1719 401.2188,243.6563 C401.8281,243.2344 402.1563,242.8125 402.1563,242.4063 C402.1563,241.9375 401.7344,241.5313 401.2344,241.5313 C401,241.5313 400.7813,241.6094 400.5781,241.8125 C400.1406,242.25 400.1406,242.25 399.9688,242.3438 C399.5156,242.5781 398.875,242.7188 398.1094,242.7188 C396.1094,242.7188 394.8281,241.7031 394.8281,240.125 L394.8281,239.0781 C394.8281,237.375 396.0469,236.1719 397.75,236.1719 C398.3281,236.1719 398.9063,236.3125 399.375,236.5625 C399.8438,236.8281 400.0156,237.0156 400.0781,237.375 C400.2031,238.0469 400.4531,238.2969 400.9844,238.2969 C401.2656,238.2969 401.5469,238.1563 401.7344,237.9375 C401.8594,237.7656 401.9063,237.5938 401.9063,237.1563 L401.9063,235.7969 C401.9063,235.375 401.8906,235.2344 401.7656,235.0625 C401.5938,234.8125 401.3125,234.6563 400.9844,234.6563 C400.6719,234.6563 400.4688,234.7656 400.25,235.0313 C399.0781,234.5313 398.6406,234.4219 397.6875,234.4219 C395.0156,234.4219 393,236.4375 393,239.0625 L393,240.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="412" y="243.606">F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="384" x2="423" y1="255" y2="255"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="384" x2="423" y1="263" y2="263"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0000651600874645139639" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="8"/>
-      <ellipse cx="246.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M249.4688,29.6406 Q248.8906,29.9375 248.25,30.0781 Q247.6094,30.2344 246.9063,30.2344 Q244.4063,30.2344 243.0781,28.5938 Q241.7656,26.9375 241.7656,23.8125 Q241.7656,20.6875 243.0781,19.0313 Q244.4063,17.375 246.9063,17.375 Q247.6094,17.375 248.25,17.5313 Q248.9063,17.6875 249.4688,17.9844 L249.4688,20.7031 Q248.8438,20.125 248.25,19.8594 Q247.6563,19.5781 247.0313,19.5781 Q245.6875,19.5781 245,20.6563 Q244.3125,21.7188 244.3125,23.8125 Q244.3125,25.9063 245,26.9844 Q245.6875,28.0469 247.0313,28.0469 Q247.6563,28.0469 248.25,27.7813 Q248.8438,27.5 249.4688,26.9219 L249.4688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="28.1543">G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0000651600874645139639">
+        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000651600874645139639" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="235" y="7"/>
+        <ellipse cx="250" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M245,24.1563 C245,26.6563 247.1406,28.4688 250.0625,28.4688 C251.2969,28.4688 252.4688,28.1719 253.2188,27.6563 C253.8281,27.2344 254.1563,26.8125 254.1563,26.4063 C254.1563,25.9375 253.7344,25.5313 253.2344,25.5313 C253,25.5313 252.7813,25.6094 252.5781,25.8125 C252.1406,26.25 252.1406,26.25 251.9688,26.3438 C251.5156,26.5781 250.875,26.7188 250.1094,26.7188 C248.1094,26.7188 246.8281,25.7031 246.8281,24.125 L246.8281,23.0781 C246.8281,21.375 248.0469,20.1719 249.75,20.1719 C250.3281,20.1719 250.9063,20.3125 251.375,20.5625 C251.8438,20.8281 252.0156,21.0156 252.0781,21.375 C252.2031,22.0469 252.4531,22.2969 252.9844,22.2969 C253.2656,22.2969 253.5469,22.1563 253.7344,21.9375 C253.8594,21.7656 253.9063,21.5938 253.9063,21.1563 L253.9063,19.7969 C253.9063,19.375 253.8906,19.2344 253.7656,19.0625 C253.5938,18.8125 253.3125,18.6563 252.9844,18.6563 C252.6719,18.6563 252.4688,18.7656 252.25,19.0313 C251.0781,18.5313 250.6406,18.4219 249.6875,18.4219 C247.0156,18.4219 245,20.4375 245,23.0625 L245,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="264" y="27.606">G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236" x2="277" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="236" x2="277" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0000374142601071476038" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="332"/>
-      <ellipse cx="392.5" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M395.4688,353.6406 Q394.8906,353.9375 394.25,354.0781 Q393.6094,354.2344 392.9063,354.2344 Q390.4063,354.2344 389.0781,352.5938 Q387.7656,350.9375 387.7656,347.8125 Q387.7656,344.6875 389.0781,343.0313 Q390.4063,341.375 392.9063,341.375 Q393.6094,341.375 394.25,341.5313 Q394.9063,341.6875 395.4688,341.9844 L395.4688,344.7031 Q394.8438,344.125 394.25,343.8594 Q393.6563,343.5781 393.0313,343.5781 Q391.6875,343.5781 391,344.6563 Q390.3125,345.7188 390.3125,347.8125 Q390.3125,349.9063 391,350.9844 Q391.6875,352.0469 393.0313,352.0469 Q393.6563,352.0469 394.25,351.7813 Q394.8438,351.5 395.4688,350.9219 L395.4688,353.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="352.1543">H</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="364" y2="364"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="372" y2="372"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <g id="elem_C_0000374142601071476038">
+        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000374142601071476038" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="382.5" y="331"/>
+        <ellipse cx="397.5" cy="347" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M392.5,348.1563 C392.5,350.6563 394.6406,352.4688 397.5625,352.4688 C398.7969,352.4688 399.9688,352.1719 400.7188,351.6563 C401.3281,351.2344 401.6563,350.8125 401.6563,350.4063 C401.6563,349.9375 401.2344,349.5313 400.7344,349.5313 C400.5,349.5313 400.2813,349.6094 400.0781,349.8125 C399.6406,350.25 399.6406,350.25 399.4688,350.3438 C399.0156,350.5781 398.375,350.7188 397.6094,350.7188 C395.6094,350.7188 394.3281,349.7031 394.3281,348.125 L394.3281,347.0781 C394.3281,345.375 395.5469,344.1719 397.25,344.1719 C397.8281,344.1719 398.4063,344.3125 398.875,344.5625 C399.3438,344.8281 399.5156,345.0156 399.5781,345.375 C399.7031,346.0469 399.9531,346.2969 400.4844,346.2969 C400.7656,346.2969 401.0469,346.1563 401.2344,345.9375 C401.3594,345.7656 401.4063,345.5938 401.4063,345.1563 L401.4063,343.7969 C401.4063,343.375 401.3906,343.2344 401.2656,343.0625 C401.0938,342.8125 400.8125,342.6563 400.4844,342.6563 C400.1719,342.6563 399.9688,342.7656 399.75,343.0313 C398.5781,342.5313 398.1406,342.4219 397.1875,342.4219 C394.5156,342.4219 392.5,344.4375 392.5,347.0625 L392.5,348.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="411.5" y="351.606">H</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="383.5" x2="423.5" y1="363" y2="363"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="383.5" x2="423.5" y1="371" y2="371"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0000295372236079742697" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="307.5" y="8"/>
-      <ellipse cx="322.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M325.4688,29.6406 Q324.8906,29.9375 324.25,30.0781 Q323.6094,30.2344 322.9063,30.2344 Q320.4063,30.2344 319.0781,28.5938 Q317.7656,26.9375 317.7656,23.8125 Q317.7656,20.6875 319.0781,19.0313 Q320.4063,17.375 322.9063,17.375 Q323.6094,17.375 324.25,17.5313 Q324.9063,17.6875 325.4688,17.9844 L325.4688,20.7031 Q324.8438,20.125 324.25,19.8594 Q323.6563,19.5781 323.0313,19.5781 Q321.6875,19.5781 321,20.6563 Q320.3125,21.7188 320.3125,23.8125 Q320.3125,25.9063 321,26.9844 Q321.6875,28.0469 323.0313,28.0469 Q323.6563,28.0469 324.25,27.7813 Q324.8438,27.5 325.4688,26.9219 L325.4688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="336.5" y="28.1543">I</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <g id="elem_C_0000295372236079742697">
+        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000295372236079742697" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="312.5" y="7"/>
+        <ellipse cx="327.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M322.5,24.1563 C322.5,26.6563 324.6406,28.4688 327.5625,28.4688 C328.7969,28.4688 329.9688,28.1719 330.7188,27.6563 C331.3281,27.2344 331.6563,26.8125 331.6563,26.4063 C331.6563,25.9375 331.2344,25.5313 330.7344,25.5313 C330.5,25.5313 330.2813,25.6094 330.0781,25.8125 C329.6406,26.25 329.6406,26.25 329.4688,26.3438 C329.0156,26.5781 328.375,26.7188 327.6094,26.7188 C325.6094,26.7188 324.3281,25.7031 324.3281,24.125 L324.3281,23.0781 C324.3281,21.375 325.5469,20.1719 327.25,20.1719 C327.8281,20.1719 328.4063,20.3125 328.875,20.5625 C329.3438,20.8281 329.5156,21.0156 329.5781,21.375 C329.7031,22.0469 329.9531,22.2969 330.4844,22.2969 C330.7656,22.2969 331.0469,22.1563 331.2344,21.9375 C331.3594,21.7656 331.4063,21.5938 331.4063,21.1563 L331.4063,19.7969 C331.4063,19.375 331.3906,19.2344 331.2656,19.0625 C331.0938,18.8125 330.8125,18.6563 330.4844,18.6563 C330.1719,18.6563 329.9688,18.7656 329.75,19.0313 C328.5781,18.5313 328.1406,18.4219 327.1875,18.4219 C324.5156,18.4219 322.5,20.4375 322.5,23.0625 L322.5,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="341.5" y="27.606">I</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313.5" x2="347.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="313.5" x2="347.5" y1="47" y2="47"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f721siibqirf1)" height="48" id="C_0000769231292718551090" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="380.5" y="440"/>
-      <ellipse cx="395.5" cy="456" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M398.4688,461.6406 Q397.8906,461.9375 397.25,462.0781 Q396.6094,462.2344 395.9063,462.2344 Q393.4063,462.2344 392.0781,460.5938 Q390.7656,458.9375 390.7656,455.8125 Q390.7656,452.6875 392.0781,451.0313 Q393.4063,449.375 395.9063,449.375 Q396.6094,449.375 397.25,449.5313 Q397.9063,449.6875 398.4688,449.9844 L398.4688,452.7031 Q397.8438,452.125 397.25,451.8594 Q396.6563,451.5781 396.0313,451.5781 Q394.6875,451.5781 394,452.6563 Q393.3125,453.7188 393.3125,455.8125 Q393.3125,457.9063 394,458.9844 Q394.6875,460.0469 396.0313,460.0469 Q396.6563,460.0469 397.25,459.7813 Q397.8438,459.5 398.4688,458.9219 L398.4688,461.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="409.5" y="460.1543">J</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="381.5" x2="414.5" y1="472" y2="472"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="381.5" x2="414.5" y1="480" y2="480"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <g id="elem_C_0000769231292718551090">
+        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0000769231292718551090" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="384" y="439"/>
+        <ellipse cx="399" cy="455" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M394,456.1563 C394,458.6563 396.1406,460.4688 399.0625,460.4688 C400.2969,460.4688 401.4688,460.1719 402.2188,459.6563 C402.8281,459.2344 403.1563,458.8125 403.1563,458.4063 C403.1563,457.9375 402.7344,457.5313 402.2344,457.5313 C402,457.5313 401.7813,457.6094 401.5781,457.8125 C401.1406,458.25 401.1406,458.25 400.9688,458.3438 C400.5156,458.5781 399.875,458.7188 399.1094,458.7188 C397.1094,458.7188 395.8281,457.7031 395.8281,456.125 L395.8281,455.0781 C395.8281,453.375 397.0469,452.1719 398.75,452.1719 C399.3281,452.1719 399.9063,452.3125 400.375,452.5625 C400.8438,452.8281 401.0156,453.0156 401.0781,453.375 C401.2031,454.0469 401.4531,454.2969 401.9844,454.2969 C402.2656,454.2969 402.5469,454.1563 402.7344,453.9375 C402.8594,453.7656 402.9063,453.5938 402.9063,453.1563 L402.9063,451.7969 C402.9063,451.375 402.8906,451.2344 402.7656,451.0625 C402.5938,450.8125 402.3125,450.6563 401.9844,450.6563 C401.6719,450.6563 401.4688,450.7656 401.25,451.0313 C400.0781,450.5313 399.6406,450.4219 398.6875,450.4219 C396.0156,450.4219 394,452.4375 394,455.0625 L394,456.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="413" y="459.606">J</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="385" x2="422" y1="471" y2="471"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="385" x2="422" y1="479" y2="479"/>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00055_class_mermaid.svg b/docs/test_cases/t00055_class_mermaid.svg
index 6e63c0cc..f1c70c9e 100644
--- a/docs/test_cases/t00055_class_mermaid.svg
+++ b/docs/test_cases/t00055_class_mermaid.svg
@@ -1,50 +1,55 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 720.078125 73" style="max-width: 720.078px; background-color: white;" width="720.078125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,7 +57,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L3">
           <g title="A" id="classId-C_0001697191682863715554-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +76,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L4">
+        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L4">
           <g title="B" id="classId-C_0000188599859894721517-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -90,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L5">
+        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L5">
           <g title="C" id="classId-C_0000625177137967392996-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +114,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L6">
+        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L6">
           <g title="D" id="classId-C_0001046415640323289221-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L7">
+        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L7">
           <g title="E" id="classId-C_0000702117239243796422-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -147,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L8">
+        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L8">
           <g title="F" id="classId-C_0001511375015718046137-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -166,7 +171,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L9">
+        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L9">
           <g title="G" id="classId-C_0000651600874645139639-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -185,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L10">
+        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L10">
           <g title="H" id="classId-C_0000374142601071476038-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -204,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L11">
+        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L11">
           <g title="I" id="classId-C_0000295372236079742697-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -223,7 +228,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00055/t00055.cc#L12">
+        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L12">
           <g title="J" id="classId-C_0000769231292718551090-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
diff --git a/docs/test_cases/t00056.md b/docs/test_cases/t00056.md
index 9c5f8104..277cdf12 100644
--- a/docs/test_cases/t00056.md
+++ b/docs/test_cases/t00056.md
@@ -12,7 +12,7 @@ diagrams:
     using_namespace: clanguml::t00056
 ```
 ## Source code
-File t00056.cc
+File `tests/t00056/t00056.cc`
 ```cpp
 #include <concepts>
 #include <string>
diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg
index 206c7d55..27452232 100644
--- a/docs/test_cases/t00056_class.svg
+++ b/docs/test_cases/t00056_class.svg
@@ -1,277 +1,327 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="613px" preserveAspectRatio="none" style="width:1507px;height:613px;" version="1.1" viewBox="0 0 1507 613" width="1507px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="674px" preserveAspectRatio="none" style="width:1482px;height:674px;background:#FFFFFF;" version="1.1" viewBox="0 0 1482 674" width="1482px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fo72pm3mnrjgy" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="53.9375" id="C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="6" y="184"/>
-      <ellipse cx="21" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,208.6094 Q23.3906,208.9063 22.75,209.0469 Q22.1094,209.2031 21.4063,209.2031 Q18.9063,209.2031 17.5781,207.5625 Q16.2656,205.9063 16.2656,202.7813 Q16.2656,199.6563 17.5781,198 Q18.9063,196.3438 21.4063,196.3438 Q22.1094,196.3438 22.75,196.5 Q23.4063,196.6563 23.9688,196.9531 L23.9688,199.6719 Q23.3438,199.0938 22.75,198.8281 Q22.1563,198.5469 21.5313,198.5469 Q20.1875,198.5469 19.5,199.625 Q18.8125,200.6875 18.8125,202.7813 Q18.8125,204.875 19.5,205.9531 Q20.1875,207.0156 21.5313,207.0156 Q22.1563,207.0156 22.75,206.75 Q23.3438,206.4688 23.9688,205.8906 L23.9688,208.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="66.5" y="200.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="128" x="35" y="214.1074">greater_than_simple</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="171" y="181"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="172" y="193.1387">T,L</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="221.9375" y2="221.9375"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="229.9375" y2="229.9375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
+      <g id="elem_C_0000902541696362244204">
+        <rect codeLine="2" fill="#F1F1F1" height="59" id="C_0000902541696362244204" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="7" y="202.2"/>
+        <ellipse cx="22" cy="223.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,224.8563 C17,227.3563 19.1406,229.1688 22.0625,229.1688 C23.2969,229.1688 24.4688,228.8719 25.2188,228.3563 C25.8281,227.9344 26.1563,227.5125 26.1563,227.1063 C26.1563,226.6375 25.7344,226.2313 25.2344,226.2313 C25,226.2313 24.7813,226.3094 24.5781,226.5125 C24.1406,226.95 24.1406,226.95 23.9688,227.0438 C23.5156,227.2781 22.875,227.4188 22.1094,227.4188 C20.1094,227.4188 18.8281,226.4031 18.8281,224.825 L18.8281,223.7781 C18.8281,222.075 20.0469,220.8719 21.75,220.8719 C22.3281,220.8719 22.9063,221.0125 23.375,221.2625 C23.8438,221.5281 24.0156,221.7156 24.0781,222.075 C24.2031,222.7469 24.4531,222.9969 24.9844,222.9969 C25.2656,222.9969 25.5469,222.8563 25.7344,222.6375 C25.8594,222.4656 25.9063,222.2938 25.9063,221.8563 L25.9063,220.4969 C25.9063,220.075 25.8906,219.9344 25.7656,219.7625 C25.5938,219.5125 25.3125,219.3563 24.9844,219.3563 C24.6719,219.3563 24.4688,219.4656 24.25,219.7313 C23.0781,219.2313 22.6406,219.1219 21.6875,219.1219 C19.0156,219.1219 17,221.1375 17,223.7625 L17,224.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="73" y="220.4001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="36" y="236.4061">greater_than_simple</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="19" x="175" y="199.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="17" x="176" y="213.4001">T,L</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="190" y1="245.2" y2="245.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="190" y1="253.2" y2="253.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="79.5469" id="C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.5;" width="225" x="223.5" y="171"/>
-      <ellipse cx="238.5" cy="189.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M241.4688,195.6094 Q240.8906,195.9063 240.25,196.0469 Q239.6094,196.2031 238.9063,196.2031 Q236.4063,196.2031 235.0781,194.5625 Q233.7656,192.9063 233.7656,189.7813 Q233.7656,186.6563 235.0781,185 Q236.4063,183.3438 238.9063,183.3438 Q239.6094,183.3438 240.25,183.5 Q240.9063,183.6563 241.4688,183.9531 L241.4688,186.6719 Q240.8438,186.0938 240.25,185.8281 Q239.6563,185.5469 239.0313,185.5469 Q237.6875,185.5469 237,186.625 Q236.3125,187.6875 236.3125,189.7813 Q236.3125,191.875 237,192.9531 Q237.6875,194.0156 239.0313,194.0156 Q239.6563,194.0156 240.25,193.75 Q240.8438,193.4688 241.4688,192.8906 L241.4688,195.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="305.5" y="187.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="171" x="252.5" y="201.1074">greater_than_with_requires</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="431.5" y="168"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="432.5" y="180.1387">T,P</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="224.5" x2="447.5" y1="208.9375" y2="208.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="229.5" y="223.1479">(T l,P r)</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="224.5" x2="447.5" y1="229.7422" y2="229.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="229.5" y="243.9526">sizeof (l) &gt; sizeof (r)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
+      <g id="elem_C_0001830716585637735576">
+        <rect codeLine="5" fill="#F1F1F1" height="92.5999" id="C_0001830716585637735576" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="226.5" y="185.4"/>
+        <ellipse cx="241.5" cy="206.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M236.5,208.0563 C236.5,210.5563 238.6406,212.3688 241.5625,212.3688 C242.7969,212.3688 243.9688,212.0719 244.7188,211.5563 C245.3281,211.1344 245.6563,210.7125 245.6563,210.3063 C245.6563,209.8375 245.2344,209.4313 244.7344,209.4313 C244.5,209.4313 244.2813,209.5094 244.0781,209.7125 C243.6406,210.15 243.6406,210.15 243.4688,210.2438 C243.0156,210.4781 242.375,210.6188 241.6094,210.6188 C239.6094,210.6188 238.3281,209.6031 238.3281,208.025 L238.3281,206.9781 C238.3281,205.275 239.5469,204.0719 241.25,204.0719 C241.8281,204.0719 242.4063,204.2125 242.875,204.4625 C243.3438,204.7281 243.5156,204.9156 243.5781,205.275 C243.7031,205.9469 243.9531,206.1969 244.4844,206.1969 C244.7656,206.1969 245.0469,206.0563 245.2344,205.8375 C245.3594,205.6656 245.4063,205.4938 245.4063,205.0563 L245.4063,203.6969 C245.4063,203.275 245.3906,203.1344 245.2656,202.9625 C245.0938,202.7125 244.8125,202.5563 244.4844,202.5563 C244.1719,202.5563 243.9688,202.6656 243.75,202.9313 C242.5781,202.4313 242.1406,202.3219 241.1875,202.3219 C238.5156,202.3219 236.5,204.3375 236.5,206.9625 L236.5,208.0563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="314.5" y="203.6001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="255.5" y="219.6061">greater_than_with_requires</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="438.5" y="182.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="439.5" y="196.6001">T,P</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="227.5" x2="454.5" y1="228.4" y2="228.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="232.5" y="245.406">(T l,P r)</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="227.5" x2="454.5" y1="253.2" y2="253.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="232.5" y="270.2059">sizeof (l) &gt; sizeof (r)</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="53.9375" id="C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="843.5" y="529"/>
-      <ellipse cx="858.5" cy="547.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M861.4688,553.6094 Q860.8906,553.9063 860.25,554.0469 Q859.6094,554.2031 858.9063,554.2031 Q856.4063,554.2031 855.0781,552.5625 Q853.7656,550.9063 853.7656,547.7813 Q853.7656,544.6563 855.0781,543 Q856.4063,541.3438 858.9063,541.3438 Q859.6094,541.3438 860.25,541.5 Q860.9063,541.6563 861.4688,541.9531 L861.4688,544.6719 Q860.8438,544.0938 860.25,543.8281 Q859.6563,543.5469 859.0313,543.5469 Q857.6875,543.5469 857,544.625 Q856.3125,545.6875 856.3125,547.7813 Q856.3125,549.875 857,550.9531 Q857.6875,552.0156 859.0313,552.0156 Q859.6563,552.0156 860.25,551.75 Q860.8438,551.4688 861.4688,550.8906 L861.4688,553.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="888" y="545.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="96" x="872.5" y="559.1074">max_four_bytes</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="976.5" y="526"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="977.5" y="538.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="566.9375" y2="566.9375"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="574.9375" y2="574.9375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
+      <g id="elem_C_0000385255522691733325">
+        <rect codeLine="11" fill="#F1F1F1" height="59" id="C_0000385255522691733325" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="145" x="841.5" y="583.4"/>
+        <ellipse cx="856.5" cy="604.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M851.5,606.0563 C851.5,608.5563 853.6406,610.3688 856.5625,610.3688 C857.7969,610.3688 858.9688,610.0719 859.7188,609.5563 C860.3281,609.1344 860.6563,608.7125 860.6563,608.3063 C860.6563,607.8375 860.2344,607.4313 859.7344,607.4313 C859.5,607.4313 859.2813,607.5094 859.0781,607.7125 C858.6406,608.15 858.6406,608.15 858.4688,608.2438 C858.0156,608.4781 857.375,608.6188 856.6094,608.6188 C854.6094,608.6188 853.3281,607.6031 853.3281,606.025 L853.3281,604.9781 C853.3281,603.275 854.5469,602.0719 856.25,602.0719 C856.8281,602.0719 857.4063,602.2125 857.875,602.4625 C858.3438,602.7281 858.5156,602.9156 858.5781,603.275 C858.7031,603.9469 858.9531,604.1969 859.4844,604.1969 C859.7656,604.1969 860.0469,604.0563 860.2344,603.8375 C860.3594,603.6656 860.4063,603.4938 860.4063,603.0563 L860.4063,601.6969 C860.4063,601.275 860.3906,601.1344 860.2656,600.9625 C860.0938,600.7125 859.8125,600.5563 859.4844,600.5563 C859.1719,600.5563 858.9688,600.6656 858.75,600.9313 C857.5781,600.4313 857.1406,600.3219 856.1875,600.3219 C853.5156,600.3219 851.5,602.3375 851.5,604.9625 L851.5,606.0563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="893" y="601.6001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102" x="870.5" y="617.6061">max_four_bytes</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="980.5" y="580.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="981.5" y="594.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="842.5" x2="985.5" y1="626.4" y2="626.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="842.5" x2="985.5" y1="634.4" y2="634.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="92.3516" id="C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="1147" y="510"/>
-      <ellipse cx="1163.8" cy="528.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1166.7688,534.6094 Q1166.1906,534.9063 1165.55,535.0469 Q1164.9094,535.2031 1164.2063,535.2031 Q1161.7063,535.2031 1160.3781,533.5625 Q1159.0656,531.9063 1159.0656,528.7813 Q1159.0656,525.6563 1160.3781,524 Q1161.7063,522.3438 1164.2063,522.3438 Q1164.9094,522.3438 1165.55,522.5 Q1166.2063,522.6563 1166.7688,522.9531 L1166.7688,525.6719 Q1166.1438,525.0938 1165.55,524.8281 Q1164.9563,524.5469 1164.3313,524.5469 Q1162.9875,524.5469 1162.3,525.625 Q1161.6125,526.6875 1161.6125,528.7813 Q1161.6125,530.875 1162.3,531.9531 Q1162.9875,533.0156 1164.3313,533.0156 Q1164.9563,533.0156 1165.55,532.75 Q1166.1438,532.4688 1166.7688,531.8906 L1166.7688,534.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1176.2" y="526.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="1184.7" y="540.1074">iterable</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1249" y="507"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1250" y="519.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1148" x2="1254" y1="547.9375" y2="547.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="1153" y="562.1479">(T container)</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="1148" x2="1254" y1="568.7422" y2="568.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="1153" y="582.9526">container.begin()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="86" x="1153" y="595.7573">container.end()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
+      <g id="elem_C_0000392540961352249242">
+        <rect codeLine="14" fill="#F1F1F1" height="109.3998" id="C_0000392540961352249242" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="1125" y="558.2"/>
+        <ellipse cx="1150.8" cy="579.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1145.8,580.8563 C1145.8,583.3563 1147.9406,585.1688 1150.8625,585.1688 C1152.0969,585.1688 1153.2688,584.8719 1154.0188,584.3563 C1154.6281,583.9344 1154.9563,583.5125 1154.9563,583.1063 C1154.9563,582.6375 1154.5344,582.2313 1154.0344,582.2313 C1153.8,582.2313 1153.5813,582.3094 1153.3781,582.5125 C1152.9406,582.95 1152.9406,582.95 1152.7688,583.0438 C1152.3156,583.2781 1151.675,583.4188 1150.9094,583.4188 C1148.9094,583.4188 1147.6281,582.4031 1147.6281,580.825 L1147.6281,579.7781 C1147.6281,578.075 1148.8469,576.8719 1150.55,576.8719 C1151.1281,576.8719 1151.7063,577.0125 1152.175,577.2625 C1152.6438,577.5281 1152.8156,577.7156 1152.8781,578.075 C1153.0031,578.7469 1153.2531,578.9969 1153.7844,578.9969 C1154.0656,578.9969 1154.3469,578.8563 1154.5344,578.6375 C1154.6594,578.4656 1154.7063,578.2938 1154.7063,577.8563 L1154.7063,576.4969 C1154.7063,576.075 1154.6906,575.9344 1154.5656,575.7625 C1154.3938,575.5125 1154.1125,575.3563 1153.7844,575.3563 C1153.4719,575.3563 1153.2688,575.4656 1153.05,575.7313 C1151.8781,575.2313 1151.4406,575.1219 1150.4875,575.1219 C1147.8156,575.1219 1145.8,577.1375 1145.8,579.7625 L1145.8,580.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="1165.2" y="576.4001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="1170.2" y="592.4061">iterable</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1239" y="555.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1240" y="569.4001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1126" x2="1244" y1="601.2" y2="601.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="1131" y="618.206">(T container)</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="1126" x2="1244" y1="626" y2="626"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="1131" y="643.0059">container.begin()</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="1131" y="659.8058">container.end()</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="79.5469" id="C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="1322.5" y="516"/>
-      <ellipse cx="1341.55" cy="534.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1344.5188,540.6094 Q1343.9406,540.9063 1343.3,541.0469 Q1342.6594,541.2031 1341.9563,541.2031 Q1339.4563,541.2031 1338.1281,539.5625 Q1336.8156,537.9063 1336.8156,534.7813 Q1336.8156,531.6563 1338.1281,530 Q1339.4563,528.3438 1341.9563,528.3438 Q1342.6594,528.3438 1343.3,528.5 Q1343.9563,528.6563 1344.5188,528.9531 L1344.5188,531.6719 Q1343.8938,531.0938 1343.3,530.8281 Q1342.7063,530.5469 1342.0813,530.5469 Q1340.7375,530.5469 1340.05,531.625 Q1339.3625,532.6875 1339.3625,534.7813 Q1339.3625,536.875 1340.05,537.9531 Q1340.7375,539.0156 1342.0813,539.0156 Q1342.7063,539.0156 1343.3,538.75 Q1343.8938,538.4688 1344.5188,537.8906 L1344.5188,540.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371.45" y="532.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="1356.45" y="546.1074">has_value_type</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1463.5" y="513"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1464.5" y="525.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1323.5" x2="1468.5" y1="553.9375" y2="553.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="8" x="1328.5" y="568.1479">()</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="1323.5" x2="1468.5" y1="574.7422" y2="574.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="1328.5" y="588.9526">typename T::value_type</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
+      <g id="elem_C_0001850394311226276678">
+        <rect codeLine="21" fill="#F1F1F1" height="92.5999" id="C_0001850394311226276678" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="165" x="1288.5" y="566.6"/>
+        <ellipse cx="1313.4" cy="588.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1308.4,589.2563 C1308.4,591.7563 1310.5406,593.5688 1313.4625,593.5688 C1314.6969,593.5688 1315.8688,593.2719 1316.6188,592.7563 C1317.2281,592.3344 1317.5563,591.9125 1317.5563,591.5063 C1317.5563,591.0375 1317.1344,590.6313 1316.6344,590.6313 C1316.4,590.6313 1316.1813,590.7094 1315.9781,590.9125 C1315.5406,591.35 1315.5406,591.35 1315.3688,591.4438 C1314.9156,591.6781 1314.275,591.8188 1313.5094,591.8188 C1311.5094,591.8188 1310.2281,590.8031 1310.2281,589.225 L1310.2281,588.1781 C1310.2281,586.475 1311.4469,585.2719 1313.15,585.2719 C1313.7281,585.2719 1314.3063,585.4125 1314.775,585.6625 C1315.2438,585.9281 1315.4156,586.1156 1315.4781,586.475 C1315.6031,587.1469 1315.8531,587.3969 1316.3844,587.3969 C1316.6656,587.3969 1316.9469,587.2563 1317.1344,587.0375 C1317.2594,586.8656 1317.3063,586.6938 1317.3063,586.2563 L1317.3063,584.8969 C1317.3063,584.475 1317.2906,584.3344 1317.1656,584.1625 C1316.9938,583.9125 1316.7125,583.7563 1316.3844,583.7563 C1316.0719,583.7563 1315.8688,583.8656 1315.65,584.1313 C1314.4781,583.6313 1314.0406,583.5219 1313.0875,583.5219 C1310.4156,583.5219 1308.4,585.5375 1308.4,588.1625 L1308.4,589.2563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="1351.1" y="584.8001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="1329.6" y="600.8061">has_value_type</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1447.5" y="563.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1448.5" y="577.8001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1289.5" x2="1452.5" y1="609.6" y2="609.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1294.5" y="626.606">()</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="1289.5" x2="1452.5" y1="634.4" y2="634.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="1294.5" y="651.4059">typename T::value_type</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="105.1563" id="C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="429.5" y="328"/>
-      <ellipse cx="501.25" cy="346.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M504.2188,352.6094 Q503.6406,352.9063 503,353.0469 Q502.3594,353.2031 501.6563,353.2031 Q499.1563,353.2031 497.8281,351.5625 Q496.5156,349.9063 496.5156,346.7813 Q496.5156,343.6563 497.8281,342 Q499.1563,340.3438 501.6563,340.3438 Q502.3594,340.3438 503,340.5 Q503.6563,340.6563 504.2188,340.9531 L504.2188,343.6719 Q503.5938,343.0938 503,342.8281 Q502.4063,342.5469 501.7813,342.5469 Q500.4375,342.5469 499.75,343.625 Q499.0625,344.6875 499.0625,346.7813 Q499.0625,348.875 499.75,349.9531 Q500.4375,351.0156 501.7813,351.0156 Q502.4063,351.0156 503,350.75 Q503.5938,350.4688 504.2188,349.8906 L504.2188,352.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="554.25" y="344.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="130" x="521.75" y="358.1074">convertible_to_string</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="716.5" y="325"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="717.5" y="337.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="430.5" x2="721.5" y1="365.9375" y2="365.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="435.5" y="380.1479">(T s)</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="430.5" x2="721.5" y1="386.7422" y2="386.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="80" x="435.5" y="400.9526">std::string{s}</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="435.5" y="413.7573">{std::to_string(s)} noexcept</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="281" x="435.5" y="426.562">{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
+      <g id="elem_C_0000137304962071054497">
+        <rect codeLine="27" fill="#F1F1F1" height="126.1997" id="C_0000137304962071054497" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="305" x="423.5" y="355"/>
+        <ellipse cx="500.25" cy="376.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M495.25,377.6563 C495.25,380.1563 497.3906,381.9688 500.3125,381.9688 C501.5469,381.9688 502.7188,381.6719 503.4688,381.1563 C504.0781,380.7344 504.4063,380.3125 504.4063,379.9063 C504.4063,379.4375 503.9844,379.0313 503.4844,379.0313 C503.25,379.0313 503.0313,379.1094 502.8281,379.3125 C502.3906,379.75 502.3906,379.75 502.2188,379.8438 C501.7656,380.0781 501.125,380.2188 500.3594,380.2188 C498.3594,380.2188 497.0781,379.2031 497.0781,377.625 L497.0781,376.5781 C497.0781,374.875 498.2969,373.6719 500,373.6719 C500.5781,373.6719 501.1563,373.8125 501.625,374.0625 C502.0938,374.3281 502.2656,374.5156 502.3281,374.875 C502.4531,375.5469 502.7031,375.7969 503.2344,375.7969 C503.5156,375.7969 503.7969,375.6563 503.9844,375.4375 C504.1094,375.2656 504.1563,375.0938 504.1563,374.6563 L504.1563,373.2969 C504.1563,372.875 504.1406,372.7344 504.0156,372.5625 C503.8438,372.3125 503.5625,372.1563 503.2344,372.1563 C502.9219,372.1563 502.7188,372.2656 502.5,372.5313 C501.3281,372.0313 500.8906,371.9219 499.9375,371.9219 C497.2656,371.9219 495.25,373.9375 495.25,376.5625 L495.25,377.6563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="558.25" y="373.2001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="520.75" y="389.2061">convertible_to_string</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="722.5" y="352"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="723.5" y="366.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="424.5" x2="727.5" y1="398" y2="398"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="429.5" y="415.006">(T s)</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="424.5" x2="727.5" y1="422.8" y2="422.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="429.5" y="439.8059">std::string{s}</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="429.5" y="456.6058">{std::to_string(s)} noexcept</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="293" x="429.5" y="473.4058">{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="53.9375" id="C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="1299" y="353.5"/>
-      <ellipse cx="1314" cy="372.4688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1316.9688,378.1094 Q1316.3906,378.4063 1315.75,378.5469 Q1315.1094,378.7031 1314.4063,378.7031 Q1311.9063,378.7031 1310.5781,377.0625 Q1309.2656,375.4063 1309.2656,372.2813 Q1309.2656,369.1563 1310.5781,367.5 Q1311.9063,365.8438 1314.4063,365.8438 Q1315.1094,365.8438 1315.75,366 Q1316.4063,366.1563 1316.9688,366.4531 L1316.9688,369.1719 Q1316.3438,368.5938 1315.75,368.3281 Q1315.1563,368.0469 1314.5313,368.0469 Q1313.1875,368.0469 1312.5,369.125 Q1311.8125,370.1875 1311.8125,372.2813 Q1311.8125,374.375 1312.5,375.4531 Q1313.1875,376.5156 1314.5313,376.5156 Q1315.1563,376.5156 1315.75,376.25 Q1316.3438,375.9688 1316.9688,375.3906 L1316.9688,378.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371" y="369.6387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="151" x="1328" y="383.6074">iterable_with_value_type</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1487" y="350.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1488" y="362.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="391.4375" y2="391.4375"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="399.4375" y2="399.4375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
+      <g id="elem_C_0001043398062146751019">
+        <rect codeLine="35" fill="#F1F1F1" height="59" id="C_0001043398062146751019" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="200" x="1271" y="388.6"/>
+        <ellipse cx="1286" cy="410.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1281,411.2563 C1281,413.7563 1283.1406,415.5688 1286.0625,415.5688 C1287.2969,415.5688 1288.4688,415.2719 1289.2188,414.7563 C1289.8281,414.3344 1290.1563,413.9125 1290.1563,413.5063 C1290.1563,413.0375 1289.7344,412.6313 1289.2344,412.6313 C1289,412.6313 1288.7813,412.7094 1288.5781,412.9125 C1288.1406,413.35 1288.1406,413.35 1287.9688,413.4438 C1287.5156,413.6781 1286.875,413.8188 1286.1094,413.8188 C1284.1094,413.8188 1282.8281,412.8031 1282.8281,411.225 L1282.8281,410.1781 C1282.8281,408.475 1284.0469,407.2719 1285.75,407.2719 C1286.3281,407.2719 1286.9063,407.4125 1287.375,407.6625 C1287.8438,407.9281 1288.0156,408.1156 1288.0781,408.475 C1288.2031,409.1469 1288.4531,409.3969 1288.9844,409.3969 C1289.2656,409.3969 1289.5469,409.2563 1289.7344,409.0375 C1289.8594,408.8656 1289.9063,408.6938 1289.9063,408.2563 L1289.9063,406.8969 C1289.9063,406.475 1289.8906,406.3344 1289.7656,406.1625 C1289.5938,405.9125 1289.3125,405.7563 1288.9844,405.7563 C1288.6719,405.7563 1288.4688,405.8656 1288.25,406.1313 C1287.0781,405.6313 1286.6406,405.5219 1285.6875,405.5219 C1283.0156,405.5219 1281,407.5375 1281,410.1625 L1281,411.2563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="1350" y="406.8001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="1300" y="422.8061">iterable_with_value_type</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1465" y="385.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1466" y="399.8001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1272" x2="1470" y1="431.6" y2="431.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1272" x2="1470" y1="439.6" y2="439.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="53.9375" id="C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.5;" width="220" x="858" y="184"/>
-      <ellipse cx="873" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M875.9688,208.6094 Q875.3906,208.9063 874.75,209.0469 Q874.1094,209.2031 873.4063,209.2031 Q870.9063,209.2031 869.5781,207.5625 Q868.2656,205.9063 868.2656,202.7813 Q868.2656,199.6563 869.5781,198 Q870.9063,196.3438 873.4063,196.3438 Q874.1094,196.3438 874.75,196.5 Q875.4063,196.6563 875.9688,196.9531 L875.9688,199.6719 Q875.3438,199.0938 874.75,198.8281 Q874.1563,198.5469 873.5313,198.5469 Q872.1875,198.5469 871.5,199.625 Q870.8125,200.6875 870.8125,202.7813 Q870.8125,204.875 871.5,205.9531 Q872.1875,207.0156 873.5313,207.0156 Q874.1563,207.0156 874.75,206.75 Q875.3438,206.4688 875.9688,205.8906 L875.9688,208.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="943" y="200.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="177" x="887" y="214.1074">iterable_or_small_value_type</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1072" y="181"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1073" y="193.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="221.9375" y2="221.9375"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="229.9375" y2="229.9375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
+      <g id="elem_C_0000866345615551223718">
+        <rect codeLine="38" fill="#F1F1F1" height="59" id="C_0000866345615551223718" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="847.5" y="202.2"/>
+        <ellipse cx="862.5" cy="223.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M857.5,224.8563 C857.5,227.3563 859.6406,229.1688 862.5625,229.1688 C863.7969,229.1688 864.9688,228.8719 865.7188,228.3563 C866.3281,227.9344 866.6563,227.5125 866.6563,227.1063 C866.6563,226.6375 866.2344,226.2313 865.7344,226.2313 C865.5,226.2313 865.2813,226.3094 865.0781,226.5125 C864.6406,226.95 864.6406,226.95 864.4688,227.0438 C864.0156,227.2781 863.375,227.4188 862.6094,227.4188 C860.6094,227.4188 859.3281,226.4031 859.3281,224.825 L859.3281,223.7781 C859.3281,222.075 860.5469,220.8719 862.25,220.8719 C862.8281,220.8719 863.4063,221.0125 863.875,221.2625 C864.3438,221.5281 864.5156,221.7156 864.5781,222.075 C864.7031,222.7469 864.9531,222.9969 865.4844,222.9969 C865.7656,222.9969 866.0469,222.8563 866.2344,222.6375 C866.3594,222.4656 866.4063,222.2938 866.4063,221.8563 L866.4063,220.4969 C866.4063,220.075 866.3906,219.9344 866.2656,219.7625 C866.0938,219.5125 865.8125,219.3563 865.4844,219.3563 C865.1719,219.3563 864.9688,219.4656 864.75,219.7313 C863.5781,219.2313 863.1406,219.1219 862.1875,219.1219 C859.5156,219.1219 857.5,221.1375 857.5,223.7625 L857.5,224.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="941" y="220.4001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="876.5" y="236.4061">iterable_or_small_value_type</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1070.5" y="199.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1071.5" y="213.4001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="848.5" x2="1075.5" y1="245.2" y2="245.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="848.5" x2="1075.5" y1="253.2" y2="253.2"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="60.8047" id="C_0001418333499545421661" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="837" y="350"/>
-      <ellipse cx="852" cy="366" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M854.9688,371.6406 Q854.3906,371.9375 853.75,372.0781 Q853.1094,372.2344 852.4063,372.2344 Q849.9063,372.2344 848.5781,370.5938 Q847.2656,368.9375 847.2656,365.8125 Q847.2656,362.6875 848.5781,361.0313 Q849.9063,359.375 852.4063,359.375 Q853.1094,359.375 853.75,359.5313 Q854.4063,359.6875 854.9688,359.9844 L854.9688,362.7031 Q854.3438,362.125 853.75,361.8594 Q853.1563,361.5781 852.5313,361.5781 Q851.1875,361.5781 850.5,362.6563 Q849.8125,363.7188 849.8125,365.8125 Q849.8125,367.9063 850.5,368.9844 Q851.1875,370.0469 852.5313,370.0469 Q853.1563,370.0469 853.75,369.7813 Q854.3438,369.5 854.9688,368.9219 L854.9688,371.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="866" y="370.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="110" x="882" y="347"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="883" y="359.1387">max_four_bytes T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="382" y2="382"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="390" y2="390"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001418333499545421661">
+        <rect codeLine="41" fill="#F1F1F1" height="64.7999" id="C_0001418333499545421661" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="142" x="843" y="385.7"/>
+        <ellipse cx="858" cy="401.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M853,402.8563 C853,405.3563 855.1406,407.1688 858.0625,407.1688 C859.2969,407.1688 860.4688,406.8719 861.2188,406.3563 C861.8281,405.9344 862.1563,405.5125 862.1563,405.1063 C862.1563,404.6375 861.7344,404.2313 861.2344,404.2313 C861,404.2313 860.7813,404.3094 860.5781,404.5125 C860.1406,404.95 860.1406,404.95 859.9688,405.0438 C859.5156,405.2781 858.875,405.4188 858.1094,405.4188 C856.1094,405.4188 854.8281,404.4031 854.8281,402.825 L854.8281,401.7781 C854.8281,400.075 856.0469,398.8719 857.75,398.8719 C858.3281,398.8719 858.9063,399.0125 859.375,399.2625 C859.8438,399.5281 860.0156,399.7156 860.0781,400.075 C860.2031,400.7469 860.4531,400.9969 860.9844,400.9969 C861.2656,400.9969 861.5469,400.8563 861.7344,400.6375 C861.8594,400.4656 861.9063,400.2938 861.9063,399.8563 L861.9063,398.4969 C861.9063,398.075 861.8906,397.9344 861.7656,397.7625 C861.5938,397.5125 861.3125,397.3563 860.9844,397.3563 C860.6719,397.3563 860.4688,397.4656 860.25,397.7313 C859.0781,397.2313 858.6406,397.1219 857.6875,397.1219 C855.0156,397.1219 853,399.1375 853,401.7625 L853,402.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="872" y="406.306">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="99" x="889" y="382.7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="97" x="890" y="396.9001">max_four_bytes T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="844" x2="984" y1="417.7" y2="417.7"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="844" x2="984" y1="425.7" y2="425.7"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="849" y="434.6"/>
+          <ellipse cx="854" cy="439.6" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="863" y="442.7059">a : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="843" y="396"/>
-      <ellipse cx="848" cy="401" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001814355496814977880">
+        <rect codeLine="46" fill="#F1F1F1" height="64.7999" id="C_0001814355496814977880" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="934.5" y="26.8"/>
+        <ellipse cx="950.85" cy="42.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M945.85,43.9563 C945.85,46.4563 947.9906,48.2688 950.9125,48.2688 C952.1469,48.2688 953.3188,47.9719 954.0688,47.4563 C954.6781,47.0344 955.0063,46.6125 955.0063,46.2063 C955.0063,45.7375 954.5844,45.3313 954.0844,45.3313 C953.85,45.3313 953.6313,45.4094 953.4281,45.6125 C952.9906,46.05 952.9906,46.05 952.8188,46.1438 C952.3656,46.3781 951.725,46.5188 950.9594,46.5188 C948.9594,46.5188 947.6781,45.5031 947.6781,43.925 L947.6781,42.8781 C947.6781,41.175 948.8969,39.9719 950.6,39.9719 C951.1781,39.9719 951.7563,40.1125 952.225,40.3625 C952.6938,40.6281 952.8656,40.8156 952.9281,41.175 C953.0531,41.8469 953.3031,42.0969 953.8344,42.0969 C954.1156,42.0969 954.3969,41.9563 954.5844,41.7375 C954.7094,41.5656 954.7563,41.3938 954.7563,40.9563 L954.7563,39.5969 C954.7563,39.175 954.7406,39.0344 954.6156,38.8625 C954.4438,38.6125 954.1625,38.4563 953.8344,38.4563 C953.5219,38.4563 953.3188,38.5656 953.1,38.8313 C951.9281,38.3313 951.4906,38.2219 950.5375,38.2219 C947.8656,38.2219 945.85,40.2375 945.85,42.8625 L945.85,43.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="965.15" y="47.406">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="983.5" y="23.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="984.5" y="38.0001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="935.5" x2="988.5" y1="58.8" y2="58.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="935.5" x2="988.5" y1="66.8" y2="66.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="940.5" y="75.7"/>
+          <ellipse cx="945.5" cy="80.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="954.5" y="83.8059">b : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="857" y="404.2104">a : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001512618198241549089">
+        <rect codeLine="51" fill="#F1F1F1" height="64.7999" id="C_0001512618198241549089" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="170" x="491" y="199.3"/>
+        <ellipse cx="506" cy="215.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M501,216.4563 C501,218.9563 503.1406,220.7688 506.0625,220.7688 C507.2969,220.7688 508.4688,220.4719 509.2188,219.9563 C509.8281,219.5344 510.1563,219.1125 510.1563,218.7063 C510.1563,218.2375 509.7344,217.8313 509.2344,217.8313 C509,217.8313 508.7813,217.9094 508.5781,218.1125 C508.1406,218.55 508.1406,218.55 507.9688,218.6438 C507.5156,218.8781 506.875,219.0188 506.1094,219.0188 C504.1094,219.0188 502.8281,218.0031 502.8281,216.425 L502.8281,215.3781 C502.8281,213.675 504.0469,212.4719 505.75,212.4719 C506.3281,212.4719 506.9063,212.6125 507.375,212.8625 C507.8438,213.1281 508.0156,213.3156 508.0781,213.675 C508.2031,214.3469 508.4531,214.5969 508.9844,214.5969 C509.2656,214.5969 509.5469,214.4563 509.7344,214.2375 C509.8594,214.0656 509.9063,213.8938 509.9063,213.4563 L509.9063,212.0969 C509.9063,211.675 509.8906,211.5344 509.7656,211.3625 C509.5938,211.1125 509.3125,210.9563 508.9844,210.9563 C508.6719,210.9563 508.4688,211.0656 508.25,211.3313 C507.0781,210.8313 506.6406,210.7219 505.6875,210.7219 C503.0156,210.7219 501,212.7375 501,215.3625 L501,216.4563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="520" y="219.906">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="126" x="538" y="196.3"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="124" x="539" y="210.5001">convertible_to_string T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="492" x2="660" y1="231.3" y2="231.3"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="492" x2="660" y1="239.3" y2="239.3"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="497" y="248.2"/>
+          <ellipse cx="502" cy="253.2" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="511" y="256.3059">c : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="60.8047" id="C_0001814355496814977880" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="942" y="20.5"/>
-      <ellipse cx="957.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M960.4188,42.1406 Q959.8406,42.4375 959.2,42.5781 Q958.5594,42.7344 957.8563,42.7344 Q955.3563,42.7344 954.0281,41.0938 Q952.7156,39.4375 952.7156,36.3125 Q952.7156,33.1875 954.0281,31.5313 Q955.3563,29.875 957.8563,29.875 Q958.5594,29.875 959.2,30.0313 Q959.8563,30.1875 960.4188,30.4844 L960.4188,33.2031 Q959.7938,32.625 959.2,32.3594 Q958.6063,32.0781 957.9813,32.0781 Q956.6375,32.0781 955.95,33.1563 Q955.2625,34.2188 955.2625,36.3125 Q955.2625,38.4063 955.95,39.4844 Q956.6375,40.5469 957.9813,40.5469 Q958.6063,40.5469 959.2,40.2813 Q959.7938,40 960.4188,39.4219 L960.4188,42.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="971.55" y="40.6543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="988" y="17.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="989" y="29.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="52.5" y2="52.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="60.5" y2="60.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001635109601630198093">
+        <rect codeLine="56" fill="#F1F1F1" height="48" id="C_0001635109601630198093" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="216" x="1020" y="394.1"/>
+        <ellipse cx="1035" cy="410.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1030,411.2563 C1030,413.7563 1032.1406,415.5688 1035.0625,415.5688 C1036.2969,415.5688 1037.4688,415.2719 1038.2188,414.7563 C1038.8281,414.3344 1039.1563,413.9125 1039.1563,413.5063 C1039.1563,413.0375 1038.7344,412.6313 1038.2344,412.6313 C1038,412.6313 1037.7813,412.7094 1037.5781,412.9125 C1037.1406,413.35 1037.1406,413.35 1036.9688,413.4438 C1036.5156,413.6781 1035.875,413.8188 1035.1094,413.8188 C1033.1094,413.8188 1031.8281,412.8031 1031.8281,411.225 L1031.8281,410.1781 C1031.8281,408.475 1033.0469,407.2719 1034.75,407.2719 C1035.3281,407.2719 1035.9063,407.4125 1036.375,407.6625 C1036.8438,407.9281 1037.0156,408.1156 1037.0781,408.475 C1037.2031,409.1469 1037.4531,409.3969 1037.9844,409.3969 C1038.2656,409.3969 1038.5469,409.2563 1038.7344,409.0375 C1038.8594,408.8656 1038.9063,408.6938 1038.9063,408.2563 L1038.9063,406.8969 C1038.9063,406.475 1038.8906,406.3344 1038.7656,406.1625 C1038.5938,405.9125 1038.3125,405.7563 1037.9844,405.7563 C1037.6719,405.7563 1037.4688,405.8656 1037.25,406.1313 C1036.0781,405.6313 1035.6406,405.5219 1034.6875,405.5219 C1032.0156,405.5219 1030,407.5375 1030,410.1625 L1030,411.2563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1049" y="414.706">D</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="172" x="1067" y="391.1"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="170" x="1068" y="405.3001">iterable T1,T2,iterable T3,T4,T5</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1021" x2="1235" y1="426.1" y2="426.1"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1021" x2="1235" y1="434.1" y2="434.1"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="948" y="66.5"/>
-      <ellipse cx="953" cy="71.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001429225801945621089">
+        <rect codeLine="60" fill="#F1F1F1" height="98.3998" id="C_0001429225801945621089" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="294.5" y="10"/>
+        <ellipse cx="309.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M304.5,27.1563 C304.5,29.6563 306.6406,31.4688 309.5625,31.4688 C310.7969,31.4688 311.9688,31.1719 312.7188,30.6563 C313.3281,30.2344 313.6563,29.8125 313.6563,29.4063 C313.6563,28.9375 313.2344,28.5313 312.7344,28.5313 C312.5,28.5313 312.2813,28.6094 312.0781,28.8125 C311.6406,29.25 311.6406,29.25 311.4688,29.3438 C311.0156,29.5781 310.375,29.7188 309.6094,29.7188 C307.6094,29.7188 306.3281,28.7031 306.3281,27.125 L306.3281,26.0781 C306.3281,24.375 307.5469,23.1719 309.25,23.1719 C309.8281,23.1719 310.4063,23.3125 310.875,23.5625 C311.3438,23.8281 311.5156,24.0156 311.5781,24.375 C311.7031,25.0469 311.9531,25.2969 312.4844,25.2969 C312.7656,25.2969 313.0469,25.1563 313.2344,24.9375 C313.3594,24.7656 313.4063,24.5938 313.4063,24.1563 L313.4063,22.7969 C313.4063,22.375 313.3906,22.2344 313.2656,22.0625 C313.0938,21.8125 312.8125,21.6563 312.4844,21.6563 C312.1719,21.6563 311.9688,21.7656 311.75,22.0313 C310.5781,21.5313 310.1406,21.4219 309.1875,21.4219 C306.5156,21.4219 304.5,23.4375 304.5,26.0625 L304.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="323.5" y="30.606">E</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="50" x="340.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="341.5" y="21.2001">T1,T2,T3</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="295.5" x2="386.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="295.5" x2="386.5" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300.5" y="58.9"/>
+          <ellipse cx="305.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="314.5" y="67.0059">e1 : T1</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300.5" y="75.6999"/>
+          <ellipse cx="305.5" cy="80.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="314.5" y="83.8059">e2 : T2</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300.5" y="92.4998"/>
+          <ellipse cx="305.5" cy="97.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="314.5" y="100.6058">e3 : T3</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="962" y="74.7104">b : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <g id="elem_C_0000856301122972546034">
+        <rect codeLine="67" fill="#F1F1F1" height="98.3998" id="C_0000856301122972546034" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="52.5" y="10"/>
+        <ellipse cx="67.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M62.5,27.1563 C62.5,29.6563 64.6406,31.4688 67.5625,31.4688 C68.7969,31.4688 69.9688,31.1719 70.7188,30.6563 C71.3281,30.2344 71.6563,29.8125 71.6563,29.4063 C71.6563,28.9375 71.2344,28.5313 70.7344,28.5313 C70.5,28.5313 70.2813,28.6094 70.0781,28.8125 C69.6406,29.25 69.6406,29.25 69.4688,29.3438 C69.0156,29.5781 68.375,29.7188 67.6094,29.7188 C65.6094,29.7188 64.3281,28.7031 64.3281,27.125 L64.3281,26.0781 C64.3281,24.375 65.5469,23.1719 67.25,23.1719 C67.8281,23.1719 68.4063,23.3125 68.875,23.5625 C69.3438,23.8281 69.5156,24.0156 69.5781,24.375 C69.7031,25.0469 69.9531,25.2969 70.4844,25.2969 C70.7656,25.2969 71.0469,25.1563 71.2344,24.9375 C71.3594,24.7656 71.4063,24.5938 71.4063,24.1563 L71.4063,22.7969 C71.4063,22.375 71.3906,22.2344 71.2656,22.0625 C71.0938,21.8125 70.8125,21.6563 70.4844,21.6563 C70.1719,21.6563 69.9688,21.7656 69.75,22.0313 C68.5781,21.5313 68.1406,21.4219 67.1875,21.4219 C64.5156,21.4219 62.5,23.4375 62.5,26.0625 L62.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81.5" y="30.606">F</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="50" x="98.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="99.5" y="21.2001">T1,T2,T3</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="53.5" x2="144.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="53.5" x2="144.5" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="58.5" y="58.9"/>
+          <ellipse cx="63.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="72.5" y="67.0059">f1 : T1</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="58.5" y="75.6999"/>
+          <ellipse cx="63.5" cy="80.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="72.5" y="83.8059">f2 : T2</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="58.5" y="92.4998"/>
+          <ellipse cx="63.5" cy="97.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="72.5" y="100.6058">f3 : T3</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="60.8047" id="C_0001512618198241549089" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="484" y="180.5"/>
-      <ellipse cx="499" cy="196.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M501.9688,202.1406 Q501.3906,202.4375 500.75,202.5781 Q500.1094,202.7344 499.4063,202.7344 Q496.9063,202.7344 495.5781,201.0938 Q494.2656,199.4375 494.2656,196.3125 Q494.2656,193.1875 495.5781,191.5313 Q496.9063,189.875 499.4063,189.875 Q500.1094,189.875 500.75,190.0313 Q501.4063,190.1875 501.9688,190.4844 L501.9688,193.2031 Q501.3438,192.625 500.75,192.3594 Q500.1563,192.0781 499.5313,192.0781 Q498.1875,192.0781 497.5,193.1563 Q496.8125,194.2188 496.8125,196.3125 Q496.8125,198.4063 497.5,199.4844 Q498.1875,200.5469 499.5313,200.5469 Q500.1563,200.5469 500.75,200.2813 Q501.3438,200 501.9688,199.4219 L501.9688,202.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="513" y="200.6543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="142" x="529" y="177.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="140" x="530" y="189.6387">convertible_to_string T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="212.5" y2="212.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="220.5" y2="220.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="490" y="226.5"/>
-      <ellipse cx="495" cy="231.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="504" y="234.7104">c : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="48" id="C_0001635109601630198093" style="stroke: #A80036; stroke-width: 1.5;" width="240" x="1024" y="356.5"/>
-      <ellipse cx="1039" cy="372.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1041.9688,378.1406 Q1041.3906,378.4375 1040.75,378.5781 Q1040.1094,378.7344 1039.4063,378.7344 Q1036.9063,378.7344 1035.5781,377.0938 Q1034.2656,375.4375 1034.2656,372.3125 Q1034.2656,369.1875 1035.5781,367.5313 Q1036.9063,365.875 1039.4063,365.875 Q1040.1094,365.875 1040.75,366.0313 Q1041.4063,366.1875 1041.9688,366.4844 L1041.9688,369.2031 Q1041.3438,368.625 1040.75,368.3594 Q1040.1563,368.0781 1039.5313,368.0781 Q1038.1875,368.0781 1037.5,369.1563 Q1036.8125,370.2188 1036.8125,372.3125 Q1036.8125,374.4063 1037.5,375.4844 Q1038.1875,376.5469 1039.5313,376.5469 Q1040.1563,376.5469 1040.75,376.2813 Q1041.3438,376 1041.9688,375.4219 L1041.9688,378.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1053" y="376.6543">D</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="197" x="1070" y="353.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="195" x="1071" y="365.6387">iterable T1,T2,iterable T3,T4,T5</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="388.5" y2="388.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="396.5" y2="396.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="86.4141" id="C_0001429225801945621089" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="287.5" y="8"/>
-      <ellipse cx="302.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M305.4688,29.6406 Q304.8906,29.9375 304.25,30.0781 Q303.6094,30.2344 302.9063,30.2344 Q300.4063,30.2344 299.0781,28.5938 Q297.7656,26.9375 297.7656,23.8125 Q297.7656,20.6875 299.0781,19.0313 Q300.4063,17.375 302.9063,17.375 Q303.6094,17.375 304.25,17.5313 Q304.9063,17.6875 305.4688,17.9844 L305.4688,20.7031 Q304.8438,20.125 304.25,19.8594 Q303.6563,19.5781 303.0313,19.5781 Q301.6875,19.5781 301,20.6563 Q300.3125,21.7188 300.3125,23.8125 Q300.3125,25.9063 301,26.9844 Q301.6875,28.0469 303.0313,28.0469 Q303.6563,28.0469 304.25,27.7813 Q304.8438,27.5 305.4688,26.9219 L305.4688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="316.5" y="28.1543">E</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="55" x="332.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="53" x="333.5" y="17.1387">T1,T2,T3</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="54"/>
-      <ellipse cx="298.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="62.2104">e1 : T1</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="66.8047"/>
-      <ellipse cx="298.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="75.0151">e2 : T2</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="79.6094"/>
-      <ellipse cx="298.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="87.8198">e3 : T3</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo72pm3mnrjgy)" height="86.4141" id="C_0000856301122972546034" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="49" y="8"/>
-      <ellipse cx="64" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M66.9688,29.6406 Q66.3906,29.9375 65.75,30.0781 Q65.1094,30.2344 64.4063,30.2344 Q61.9063,30.2344 60.5781,28.5938 Q59.2656,26.9375 59.2656,23.8125 Q59.2656,20.6875 60.5781,19.0313 Q61.9063,17.375 64.4063,17.375 Q65.1094,17.375 65.75,17.5313 Q66.4063,17.6875 66.9688,17.9844 L66.9688,20.7031 Q66.3438,20.125 65.75,19.8594 Q65.1563,19.5781 64.5313,19.5781 Q63.1875,19.5781 62.5,20.6563 Q61.8125,21.7188 61.8125,23.8125 Q61.8125,25.9063 62.5,26.9844 Q63.1875,28.0469 64.5313,28.0469 Q65.1563,28.0469 65.75,27.7813 Q66.3438,27.5 66.9688,26.9219 L66.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="78" y="28.1543">F</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="55" x="93" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="53" x="94" y="17.1387">T1,T2,T3</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="54"/>
-      <ellipse cx="60" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="62.2104">f1 : T1</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="66.8047"/>
-      <ellipse cx="60" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="75.0151">f2 : T2</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="79.6094"/>
-      <ellipse cx="60" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="87.8198">f3 : T3</text>
-    </a>
-    <path d="M669.56,433.19 C697.84,448.52 729.06,465.18 758,480 C789.06,495.91 824.03,512.91 852.89,526.69 " fill="none" id="C_0000137304962071054497-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="857.46,528.88,851.0448,521.407,852.9431,526.7359,847.6142,528.6341,857.46,528.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="759" y="476.0669">T</text>
-    <path d="M1366.38,407.85 C1337.09,433.92 1291.55,474.43 1255.68,506.35 " fill="none" id="C_0001043398062146751019-&gt;C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1251.79,509.81,1261.1798,506.8382,1255.5333,506.4953,1255.8762,500.8488,1251.79,509.81" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="1305" y="476.0669">T</text>
-    <path d="M1396,407.85 C1396,435.12 1396,478.18 1396,510.69 " fill="none" id="C_0001043398062146751019-&gt;C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1396,515.82,1400,506.82,1396,510.82,1392,506.82,1396,515.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="1397" y="476.0669">T</text>
-    <path d="M1043.12,238.07 C1107.09,260.68 1201.21,294.88 1282,328 C1299.54,335.19 1318.37,343.47 1335.58,351.25 " fill="none" id="C_0000866345615551223718-&gt;C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1340.39,353.43,1333.8519,346.0643,1335.8382,351.361,1330.5415,353.3472,1340.39,353.43" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="1206" y="294.0669">T</text>
-    <path d="M908.59,238.21 C872.92,257.44 830.6,287.32 810,328 C788.92,369.63 793.97,389.17 810,433 C823.37,469.57 853.09,502.75 877.18,525.24 " fill="none" id="C_0000866345615551223718-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="881,528.75,877.0955,519.7082,877.3243,525.3604,871.6721,525.5892,881,528.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="811" y="385.0669">T</text>
-    <path d="M913,411.33 C913,442.65 913,491.7 913,523.6 " fill="none" id="C_0001418333499545421661-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="913,528.96,917,519.96,913,523.96,909,519.96,913,528.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="914" y="476.0669">T</text>
-    <path d="M968,81.72 C968,109.41 968,150.54 968,178.72 " fill="none" id="C_0001814355496814977880-&gt;C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="968,183.82,972,174.82,968,178.82,964,174.82,968,183.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="969" y="137.0669">T</text>
-    <path d="M576,241.56 C576,264.02 576,295.58 576,322.86 " fill="none" id="C_0001512618198241549089-&gt;C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="576,327.89,580,318.89,576,322.89,572,318.89,576,327.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="577" y="294.0669">T</text>
-    <path d="M1138.73,404.51 C1135.1,424.94 1132.34,455.3 1141,480 C1144.12,488.9 1148.79,497.52 1154.17,505.56 " fill="none" id="C_0001635109601630198093-&gt;C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1157.23,509.96,1155.3889,500.2848,1154.381,505.8511,1148.8146,504.8432,1157.23,509.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="1142" y="476.0669">T1</text>
-    <path d="M1151.57,404.54 C1159.94,430.02 1173.68,471.84 1184.55,504.93 " fill="none" id="C_0001635109601630198093-&gt;C_0000392540961352249242-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1186.13,509.75,1187.123,499.9513,1184.5703,504.9995,1179.5222,502.4468,1186.13,509.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="1176" y="476.0669">T3</text>
-    <path d="M1100.85,404.63 C1073.82,419.87 1038.77,441.01 1010,463 C985.28,481.9 959.85,506.23 941.23,525.13 " fill="none" id="C_0001635109601630198093-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="937.6,528.83,946.7562,525.2018,941.0996,525.2589,941.0425,519.6024,937.6,528.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="1011" y="476.0669">T2</text>
-    <path d="M1119.77,404.53 C1097.48,425.24 1063.11,456.02 1031,480 C1009.03,496.41 983.47,512.94 961.77,526.29 " fill="none" id="C_0001635109601630198093-&gt;C_0000385255522691733325-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="957.48,528.92,967.2425,527.6189,961.7407,526.3035,963.0561,520.8017,957.48,528.92" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="1051" y="476.0669">T5</text>
-    <path d="M336,94.34 C336,116.34 336,143.22 336,165.53 " fill="none" id="C_0001429225801945621089-&gt;C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="336,170.8,340,161.8,336,165.8,332,161.8,336,170.8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="337" y="137.0669">T1,T3</text>
-    <path d="M97,94.34 C97,120.97 97,154.73 97,178.89 " fill="none" id="C_0000856301122972546034-&gt;C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="97,183.9,101,174.9,97,178.9,93,174.9,97,183.9" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="98" y="137.0669">T1,T3</text>
+    <g id="link_C_0000137304962071054497_C_0000385255522691733325">
+      <path codeLine="73" d="M681.45,481.62 C707.69,496.99 735.8,513.31 762,528.2 C794.61,546.74 826.1842,564.164 855.4242,580.134 " fill="none" id="C_0000137304962071054497-to-C_0000385255522691733325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="860.69,583.01,854.7087,575.1855,856.3018,580.6133,850.874,582.2065,860.69,583.01" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="763" y="524.277">T</text>
+    </g>
+    <g id="link_C_0001043398062146751019_C_0000392540961352249242">
+      <path codeLine="74" d="M1343.15,447.96 C1315.18,476.96 1275.5757,518.0118 1241.1657,553.6818 " fill="none" id="C_0001043398062146751019-to-C_0000392540961352249242" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1237,558,1246.1273,554.2998,1240.4714,554.4015,1240.3697,548.7455,1237,558" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="1279" y="524.277">T</text>
+    </g>
+    <g id="link_C_0001043398062146751019_C_0001850394311226276678">
+      <path codeLine="75" d="M1371,447.96 C1371,479.27 1371,523.67 1371,560.33 " fill="none" id="C_0001043398062146751019-to-C_0001850394311226276678" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1371,566.33,1375,557.33,1371,561.33,1367,557.33,1371,566.33" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="1372" y="524.277">T</text>
+    </g>
+    <g id="link_C_0000866345615551223718_C_0001043398062146751019">
+      <path codeLine="76" d="M1036.32,261.65 C1095.83,285.35 1181.11,320.48 1254,355 C1275.61,365.24 1293.6978,374.5641 1313.8178,385.4041 " fill="none" id="C_0000866345615551223718-to-C_0001043398062146751019" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1319.1,388.25,1313.074,380.4598,1314.6982,385.8785,1309.2795,387.5027,1319.1,388.25" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="1183" y="321.077">T</text>
+    </g>
+    <g id="link_C_0000866345615551223718_C_0000385255522691733325">
+      <path codeLine="77" d="M908.01,261.5 C874.74,282.52 834.95,314.4 816,355 C792.27,405.82 798.27,427.99 816,481.2 C829.27,521.02 855.7957,554.1509 879.3257,578.6709 " fill="none" id="C_0000866345615551223718-to-C_0000385255522691733325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="883.48,583,880.1346,573.7367,880.018,579.3924,874.3624,579.2759,883.48,583" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="817" y="422.677">T</text>
+    </g>
+    <g id="link_C_0001418333499545421661_C_0000385255522691733325">
+      <path codeLine="78" d="M914,450.94 C914,487.73 914,541.74 914,577.17 " fill="none" id="C_0001418333499545421661-to-C_0000385255522691733325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="914,583.17,918,574.17,914,578.17,910,574.17,914,583.17" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="915" y="524.277">T</text>
+    </g>
+    <g id="link_C_0001814355496814977880_C_0000866345615551223718">
+      <path codeLine="79" d="M962,91.87 C962,123.36 962,165.26 962,195.76 " fill="none" id="C_0001814355496814977880-to-C_0000866345615551223718" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="962,201.76,966,192.76,962,196.76,958,192.76,962,201.76" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="963" y="151.477">T</text>
+    </g>
+    <g id="link_C_0001512618198241549089_C_0000137304962071054497">
+      <path codeLine="80" d="M576,264.4 C576,289.11 576,318.21 576,348.53 " fill="none" id="C_0001512618198241549089-to-C_0000137304962071054497" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="576,354.53,580,345.53,576,349.53,572,345.53,576,354.53" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="577" y="321.077">T</text>
+    </g>
+    <g id="link_C_0001635109601630198093_C_0000392540961352249242">
+      <path codeLine="81" d="M1122.99,442.29 C1119.13,464.82 1115.84,499.7 1125,528.2 C1128.28,538.41 1130.1596,543.3398 1135.9596,552.6998 " fill="none" id="C_0001635109601630198093-to-C_0000392540961352249242" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1139.12,557.8,1137.7796,548.0428,1136.4864,553.5498,1130.9793,552.2566,1139.12,557.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1126" y="524.277">T1</text>
+    </g>
+    <g id="link_C_0001635109601630198093_C_0000392540961352249242">
+      <path codeLine="82" d="M1134.88,442.36 C1143.28,470.8 1156.0888,514.0962 1167.3388,552.1462 " fill="none" id="C_0001635109601630198093-to-C_0000392540961352249242-1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1169.04,557.9,1170.3241,548.1352,1167.6223,553.1052,1162.6524,550.4035,1169.04,557.9" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1160" y="524.277">T3</text>
+    </g>
+    <g id="link_C_0001635109601630198093_C_0000385255522691733325">
+      <path codeLine="83" d="M1090.28,442.42 C1063.5,459.81 1027.42,484.99 999,511.2 C974.95,533.38 954.8974,557.4436 938.6574,578.5636 " fill="none" id="C_0001635109601630198093-to-C_0000385255522691733325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="935,583.32,943.657,578.6236,938.0478,579.3563,937.3151,573.7471,935,583.32" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1000" y="524.277">T2</text>
+    </g>
+    <g id="link_C_0001635109601630198093_C_0000385255522691733325">
+      <path codeLine="84" d="M1106.44,442.49 C1085.18,465.16 1051.4,500.14 1020,528.2 C998.58,547.34 978.1559,563.685 957.7059,579.325 " fill="none" id="C_0001635109601630198093-to-C_0000385255522691733325-1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="952.94,582.97,962.5189,580.6799,956.9116,579.9325,957.6589,574.3253,952.94,582.97" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1036" y="524.277">T5</text>
+    </g>
+    <g id="link_C_0001429225801945621089_C_0001830716585637735576">
+      <path codeLine="85" d="M341,108.6 C341,132.63 341,155.48 341,179.11 " fill="none" id="C_0001429225801945621089-to-C_0001830716585637735576" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="341,185.11,345,176.11,341,180.11,337,176.11,341,185.11" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="342" y="151.477">T1,T3</text>
+    </g>
+    <g id="link_C_0000856301122972546034_C_0000902541696362244204">
+      <path codeLine="86" d="M99,108.6 C99,138.73 99,170.46 99,195.94 " fill="none" id="C_0000856301122972546034-to-C_0000902541696362244204" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="99,201.94,103,192.94,99,196.94,95,192.94,99,201.94" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="100" y="151.477">T1,T3</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00056_class_mermaid.svg b/docs/test_cases/t00056_class_mermaid.svg
index 7e213452..95752e94 100644
--- a/docs/test_cases/t00056_class_mermaid.svg
+++ b/docs/test_cases/t00056_class_mermaid.svg
@@ -1,69 +1,74 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1519.96484375 778" style="max-width: 1519.96px; background-color: white;" width="1519.96484375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1334.92578125,557L1334.92578125,562.6666666666666C1334.92578125,568.3333333333334,1334.92578125,579.6666666666666,1310.4147135416667,596.6751257333266C1285.9036458333333,613.6835847999864,1236.8815104166667,636.3671695999728,1212.3704427083333,647.708961999966L1187.859375,659.0507543999593"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M442.21662234042554,513L468.7430186170213,526C495.26941489361707,539,548.3222074468085,565,569.2033450183964,583.6666666666666C590.0844825899843,602.3333333333334,578.7939651799687,613.6666666666666,573.1487064749608,619.3333333333334L567.503447769953,625"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M324.58725066489365,513L312.4001828457447,526C300.21311502659574,539,275.8389793882979,565,263.6519115691489,585.5C251.46484375,606,251.46484375,621,251.46484375,628.5L251.46484375,636"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M587.078125,295.9922813969692L549.5013020833334,305.99356783080765C511.9244791666667,315.9948542646461,436.7708333333333,335.9974271323231,399.1940104166667,358.99871356616154C361.6171875,382,361.6171875,408,361.6171875,421L361.6171875,434"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M853.78125,295.9922813969692L891.3580729166666,305.99356783080765C928.9348958333334,315.9948542646461,1004.0885416666666,335.9974271323231,1041.6653645833333,365.58204689949486C1079.2421875,395.1666666666667,1079.2421875,434.3333333333333,1079.2421875,473.5C1079.2421875,512.6666666666666,1079.2421875,551.8333333333334,1081.9183538732393,582.5833333333334C1084.5945202464789,613.3333333333334,1089.9468529929577,635.6666666666666,1092.623019366197,646.8333333333334L1095.2991857394366,658"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M948.2578125,513L948.2578125,526C948.2578125,539,948.2578125,565,964.6678648278561,589.1666666666666C981.077917155712,613.3333333333334,1013.8980218114242,635.6666666666666,1030.3080741392803,646.8333333333334L1046.7181264671362,658"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M720.4296875,109L720.4296875,118.33333333333333C720.4296875,127.66666666666667,720.4296875,146.33333333333334,720.4296875,165C720.4296875,183.66666666666666,720.4296875,202.33333333333334,720.4296875,211.66666666666666L720.4296875,221"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1334.92578125,300L1334.92578125,309.3333333333333C1334.92578125,318.6666666666667,1334.92578125,337.3333333333333,1334.92578125,352.3333333333333C1334.92578125,367.3333333333333,1334.92578125,378.6666666666667,1334.92578125,384.3333333333333L1334.92578125,390"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M626.3488031914893,502L604.8740026595744,516.8333333333334C583.3992021276596,531.6666666666666,540.4496010638298,561.3333333333334,518.8565371320714,581.8333333333334C497.263473200313,602.3333333333334,497.026946400626,613.6666666666666,496.9086830007825,619.3333333333334L496.79041960093895,625"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M603.2427692819149,502L569.7420212765957,516.8333333333334C536.2412732712766,531.6666666666666,469.2397772606383,561.3333333333334,440.6894645057103,581.8333333333334C412.13915175078245,602.3333333333334,422.04002225156495,613.6666666666666,426.99045750195614,619.3333333333334L431.9408927523474,625"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M702.1845744680851,502L720.1798537234041,516.8333333333334C738.1751329787234,531.6666666666666,774.1656914893616,561.3333333333334,827.4135749113475,588.9103288252453C880.6614583333334,616.4873243171572,951.1666666666666,641.9746486343146,986.4192708333334,654.7183107928931L1021.671875,667.4619729514718"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M692.8045877659574,502L705.9178856382978,516.8333333333334C719.0311835106382,531.6666666666666,745.2577792553192,561.3333333333334,800.0689937943262,589.491233005157C854.8802083333334,617.6491326769807,938.2760416666666,644.2982653539615,979.9739583333334,657.6228316924519L1021.671875,670.9473980309423"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M403.75,131L403.75,136.66666666666666C403.75,142.33333333333334,403.75,153.66666666666666,403.75,165C403.75,176.33333333333334,403.75,187.66666666666666,403.75,193.33333333333334L403.75,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M114.2109375,131L114.2109375,136.66666666666666C114.2109375,142.33333333333334,114.2109375,153.66666666666666,114.2109375,168.66666666666666C114.2109375,183.66666666666666,114.2109375,202.33333333333334,114.2109375,211.66666666666666L114.2109375,221"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1334.92578125,557L1334.92578125,562.6666666666666C1334.92578125,568.3333333333334,1334.92578125,579.6666666666666,1311.3222640567699,596.2551828056136C1287.7187468635395,612.8436989445606,1240.511712477079,634.6873978891213,1216.908195283849,645.6092473614016L1193.3046780906186,656.5310968336819"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M442.21662234042554,513L468.7430186170213,526C495.26941489361707,539,548.3222074468085,565,569.9091123271791,582.9582229456458C591.4960172075495,600.9164458912916,581.6170344150988,610.8328917825833,576.6775430188736,615.7911147282291L571.7380516226483,620.749337673875"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M324.58725066489365,513L312.4001828457447,526C300.21311502659574,539,275.8389793882979,565,263.6519115691489,584.5C251.46484375,604,251.46484375,617,251.46484375,623.5L251.46484375,630"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M587.078125,295.9922813969692L549.5013020833334,305.99356783080765C511.9244791666667,315.9948542646461,436.7708333333333,335.9974271323231,399.1940104166667,357.99871356616154C361.6171875,380,361.6171875,404,361.6171875,416L361.6171875,428"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M853.78125,295.9922813969692L891.3580729166666,305.99356783080765C928.9348958333334,315.9948542646461,1004.0885416666666,335.9974271323231,1041.6653645833333,365.58204689949486C1079.2421875,395.1666666666667,1079.2421875,434.3333333333333,1079.2421875,473.5C1079.2421875,512.6666666666666,1079.2421875,551.8333333333334,1081.6852966064162,581.6108703209874C1084.1284057128323,611.3884073086415,1089.0146239256649,631.776814617283,1091.457733032081,641.9710182716037L1093.9008421384972,652.1652219259245"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M948.2578125,513L948.2578125,526C948.2578125,539,948.2578125,565,963.8411218229412,588.6040868911464C979.4244311458824,612.2081737822928,1010.5910497917649,633.4163475645854,1026.1743591147062,644.0204344557318L1041.7576684376475,654.6245213468782"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M720.4296875,109L720.4296875,118.33333333333333C720.4296875,127.66666666666667,720.4296875,146.33333333333334,720.4296875,164C720.4296875,181.66666666666666,720.4296875,198.33333333333334,720.4296875,206.66666666666666L720.4296875,215"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1334.92578125,300L1334.92578125,309.3333333333333C1334.92578125,318.6666666666667,1334.92578125,337.3333333333333,1334.92578125,351.3333333333333C1334.92578125,365.3333333333333,1334.92578125,374.6666666666667,1334.92578125,379.3333333333333L1334.92578125,384"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M626.3488031914893,502L604.8740026595744,516.8333333333334C583.3992021276596,531.6666666666666,540.4496010638298,561.3333333333334,518.8774026002487,580.8335510409128C497.3052041366677,600.3337687484922,497.1104082733354,609.6675374969844,497.01301034166926,614.3344218712305L496.91561241000306,619.0013062454766"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M603.2427692819149,502L569.7420212765957,516.8333333333334C536.2412732712766,531.6666666666666,469.2397772606383,561.3333333333334,440.03155459564005,581.0802366926349C410.82333193064187,600.8271400519365,419.4083826112838,610.6542801038728,423.70090795160473,615.5678501298411L427.9934332919257,620.4814201558092"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M702.1845744680851,502L720.1798537234041,516.8333333333334C738.1751329787234,531.6666666666666,774.1656914893616,561.3333333333334,826.4731365841516,588.5703644848493C878.7805816789414,615.8073956363652,947.4049133578828,640.6147912727304,981.7170791973535,653.018489090913L1016.0292450368244,665.4221869090956"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M692.8045877659574,502L705.9178856382978,516.8333333333334C719.0311835106382,531.6666666666666,745.2577792553192,561.3333333333334,799.1164452812924,589.1868461948037C852.9751113072657,617.0403590562739,934.4658476145314,643.0807181125479,975.2112157681644,656.1008976406848L1015.9565839217972,669.1210771688218"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M403.75,131L403.75,136.66666666666666C403.75,142.33333333333334,403.75,153.66666666666666,403.75,164C403.75,174.33333333333334,403.75,183.66666666666666,403.75,188.33333333333334L403.75,193"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M114.2109375,131L114.2109375,136.66666666666666C114.2109375,142.33333333333334,114.2109375,153.66666666666666,114.2109375,167.66666666666666C114.2109375,181.66666666666666,114.2109375,198.33333333333334,114.2109375,206.66666666666666L114.2109375,215"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(1334.92578125, 591)" class="edgeLabel">
@@ -222,7 +227,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L8">
+        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L8">
           <g title="greater_than_simple" id="classId-C_0000902541696362244204-0" class="node default clickable">
             <rect height="79" width="212.421875" y="-39.5" x="-106.2109375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="106.2109375" x1="-106.2109375" class="divider"/>
@@ -241,7 +246,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L11">
+        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L11">
           <g title="greater_than_with_requires" id="classId-C_0001830716585637735576-1" class="node default clickable">
             <rect height="123" width="266.65625" y="-61.5" x="-133.328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="133.328125" x1="-133.328125" class="divider"/>
@@ -262,15 +267,15 @@
                   <span class="nodeLabel">"sizeof (l) &gt; sizeof (r)"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -125.828125, 36)" height="18" width="64.109375">
+              <foreignObject transform="translate( -125.828125, 36)" height="18" width="77.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T l,P r)"</span>
+                  <span class="nodeLabel">"(T l,P r) : "</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L16">
+        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L16">
           <g title="max_four_bytes" id="classId-C_0000385255522691733325-2" class="node default clickable">
             <rect height="79" width="166.1875" y="-39.5" x="-83.09375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="83.09375" x1="-83.09375" class="divider"/>
@@ -289,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L20">
+        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L20">
           <g title="iterable" id="classId-C_0000392540961352249242-3" class="node default clickable">
             <rect height="145" width="145.546875" y="-72.5" x="-72.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="72.7734375" x1="-72.7734375" class="divider"/>
@@ -315,15 +320,15 @@
                   <span class="nodeLabel">"container.end()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.2734375, 47)" height="18" width="101.765625">
+              <foreignObject transform="translate( -65.2734375, 47)" height="18" width="115.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T container)"</span>
+                  <span class="nodeLabel">"(T container) : "</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L27">
+        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L27">
           <g title="has_value_type" id="classId-C_0001850394311226276678-4" class="node default clickable">
             <rect height="123" width="195.0625" y="-61.5" x="-97.53125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.53125" x1="-97.53125" class="divider"/>
@@ -344,15 +349,15 @@
                   <span class="nodeLabel">"typename T::value_type"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -90.03125, 36)" height="18" width="22.015625">
+              <foreignObject transform="translate( -90.03125, 36)" height="18" width="35.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"()"</span>
+                  <span class="nodeLabel">"() : "</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L30">
+        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L30">
           <g title="convertible_to_string" id="classId-C_0000137304962071054497-5" class="node default clickable">
             <rect height="167" width="354.078125" y="-83.5" x="-177.0390625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="177.0390625" x1="-177.0390625" class="divider"/>
@@ -383,15 +388,15 @@
                   <span class="nodeLabel">"{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -169.5390625, 58)" height="18" width="43.953125">
+              <foreignObject transform="translate( -169.5390625, 58)" height="18" width="57.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T s)"</span>
+                  <span class="nodeLabel">"(T s) : "</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L46">
+        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L46">
           <g title="iterable_with_value_type" id="classId-C_0001043398062146751019-6" class="node default clickable">
             <rect height="79" width="232.875" y="-39.5" x="-116.4375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="116.4375" x1="-116.4375" class="divider"/>
@@ -410,7 +415,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L49">
+        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L49">
           <g title="iterable_or_small_value_type" id="classId-C_0000866345615551223718-7" class="node default clickable">
             <rect height="79" width="266.703125" y="-39.5" x="-133.3515625" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="133.3515625" x1="-133.3515625" class="divider"/>
@@ -429,7 +434,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L53">
+        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L53">
           <g title="A" id="classId-C_0001418333499545421661-8" class="node default clickable">
             <rect height="79" width="182.1875" y="-39.5" x="-91.09375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="91.09375" x1="-91.09375" class="divider"/>
@@ -453,7 +458,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L60">
+        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L60">
           <g title="B" id="classId-C_0001814355496814977880-9" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -477,7 +482,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L70">
+        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L70">
           <g title="C" id="classId-C_0001512618198241549089-10" class="node default clickable">
             <rect height="79" width="222.171875" y="-39.5" x="-111.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="111.0859375" x1="-111.0859375" class="divider"/>
@@ -501,7 +506,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L76">
+        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L76">
           <g title="D" id="classId-C_0001635109601630198093-11" class="node default clickable">
             <rect height="57" width="279.109375" y="-28.5" x="-139.5546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="139.5546875" x1="-139.5546875" class="divider"/>
@@ -520,7 +525,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L80">
+        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L80">
           <g title="E" id="classId-C_0001429225801945621089-12" class="node default clickable">
             <rect height="123" width="109.265625" y="-61.5" x="-54.6328125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.6328125" x1="-54.6328125" class="divider"/>
@@ -554,7 +559,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00056/t00056.cc#L88">
+        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L88">
           <g title="F" id="classId-C_0000856301122972546034-13" class="node default clickable">
             <rect height="123" width="108.375" y="-61.5" x="-54.1875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.1875" x1="-54.1875" class="divider"/>
diff --git a/docs/test_cases/t00057.md b/docs/test_cases/t00057.md
index 6dfe08c0..e64ddb6d 100644
--- a/docs/test_cases/t00057.md
+++ b/docs/test_cases/t00057.md
@@ -9,7 +9,7 @@ diagrams:
       - src/t00057_impl.c
 ```
 ## Source code
-File t00057.c
+File `tests/t00057/t00057.c`
 ```cpp
 #include "include/t00057.h"
 
@@ -56,6 +56,20 @@ struct t00057_R {
     struct t00057_G *g;
 };
 
+```
+File `tests/t00057/src/t00057_impl.c`
+```cpp
+#include "../include/t00057.h"
+
+struct t00057_F {
+    int f1;
+};
+```
+File `tests/t00057/include/t00057.h`
+```cpp
+#pragma once
+
+struct t00057_F;
 ```
 ## Generated PlantUML diagrams
 ![t00057_class](./t00057_class.svg "Test case C99/C11 translation units with structs and unions")
diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg
index 071a6541..3df55a2f 100644
--- a/docs/test_cases/t00057_class.svg
+++ b/docs/test_cases/t00057_class.svg
@@ -1,271 +1,303 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="476px" preserveAspectRatio="none" style="width:1040px;height:476px;" version="1.1" viewBox="0 0 1040 476" width="1040px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="524px" preserveAspectRatio="none" style="width:1084px;height:524px;background:#FFFFFF;" version="1.1" viewBox="0 0 1084 524" width="1084px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxvn00fkkrj0j" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="235.5"/>
-      <ellipse cx="21" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,257.1406 Q23.3906,257.4375 22.75,257.5781 Q22.1094,257.7344 21.4063,257.7344 Q18.9063,257.7344 17.5781,256.0938 Q16.2656,254.4375 16.2656,251.3125 Q16.2656,248.1875 17.5781,246.5313 Q18.9063,244.875 21.4063,244.875 Q22.1094,244.875 22.75,245.0313 Q23.4063,245.1875 23.9688,245.4844 L23.9688,248.2031 Q23.3438,247.625 22.75,247.3594 Q22.1563,247.0781 21.5313,247.0781 Q20.1875,247.0781 19.5,248.1563 Q18.8125,249.2188 18.8125,251.3125 Q18.8125,253.4063 19.5,254.4844 Q20.1875,255.5469 21.5313,255.5469 Q22.1563,255.5469 22.75,255.2813 Q23.3438,255 23.9688,254.4219 L23.9688,257.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="35" y="255.6543">t00057_A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="267.5" y2="267.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="275.5" y2="275.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
+      <g id="elem_C_0000940295970488928395">
+        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000940295970488928395" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="7" y="266.4"/>
+        <ellipse cx="22" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,283.5563 C17,286.0563 19.1406,287.8688 22.0625,287.8688 C23.2969,287.8688 24.4688,287.5719 25.2188,287.0563 C25.8281,286.6344 26.1563,286.2125 26.1563,285.8063 C26.1563,285.3375 25.7344,284.9313 25.2344,284.9313 C25,284.9313 24.7813,285.0094 24.5781,285.2125 C24.1406,285.65 24.1406,285.65 23.9688,285.7438 C23.5156,285.9781 22.875,286.1188 22.1094,286.1188 C20.1094,286.1188 18.8281,285.1031 18.8281,283.525 L18.8281,282.4781 C18.8281,280.775 20.0469,279.5719 21.75,279.5719 C22.3281,279.5719 22.9063,279.7125 23.375,279.9625 C23.8438,280.2281 24.0156,280.4156 24.0781,280.775 C24.2031,281.4469 24.4531,281.6969 24.9844,281.6969 C25.2656,281.6969 25.5469,281.5563 25.7344,281.3375 C25.8594,281.1656 25.9063,280.9938 25.9063,280.5563 L25.9063,279.1969 C25.9063,278.775 25.8906,278.6344 25.7656,278.4625 C25.5938,278.2125 25.3125,278.0563 24.9844,278.0563 C24.6719,278.0563 24.4688,278.1656 24.25,278.4313 C23.0781,277.9313 22.6406,277.8219 21.6875,277.8219 C19.0156,277.8219 17,279.8375 17,282.4625 L17,283.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="36" y="287.006">t00057_A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="99" y1="298.4" y2="298.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="99" y1="306.4" y2="306.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="315.3"/>
+          <ellipse cx="18" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="323.4059">a1 : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="281.5"/>
-      <ellipse cx="17" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
+      <g id="elem_C_0001030391494410415852">
+        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001030391494410415852" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="135" y="266.4"/>
+        <ellipse cx="150" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M145,283.5563 C145,286.0563 147.1406,287.8688 150.0625,287.8688 C151.2969,287.8688 152.4688,287.5719 153.2188,287.0563 C153.8281,286.6344 154.1563,286.2125 154.1563,285.8063 C154.1563,285.3375 153.7344,284.9313 153.2344,284.9313 C153,284.9313 152.7813,285.0094 152.5781,285.2125 C152.1406,285.65 152.1406,285.65 151.9688,285.7438 C151.5156,285.9781 150.875,286.1188 150.1094,286.1188 C148.1094,286.1188 146.8281,285.1031 146.8281,283.525 L146.8281,282.4781 C146.8281,280.775 148.0469,279.5719 149.75,279.5719 C150.3281,279.5719 150.9063,279.7125 151.375,279.9625 C151.8438,280.2281 152.0156,280.4156 152.0781,280.775 C152.2031,281.4469 152.4531,281.6969 152.9844,281.6969 C153.2656,281.6969 153.5469,281.5563 153.7344,281.3375 C153.8594,281.1656 153.9063,280.9938 153.9063,280.5563 L153.9063,279.1969 C153.9063,278.775 153.8906,278.6344 153.7656,278.4625 C153.5938,278.2125 153.3125,278.0563 152.9844,278.0563 C152.6719,278.0563 152.4688,278.1656 152.25,278.4313 C151.0781,277.9313 150.6406,277.8219 149.6875,277.8219 C147.0156,277.8219 145,279.8375 145,282.4625 L145,283.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="164" y="287.006">t00057_B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="136" x2="227" y1="298.4" y2="298.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="136" x2="227" y1="306.4" y2="306.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="141" y="315.3"/>
+          <ellipse cx="146" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="155" y="323.4059">b1 : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="26" y="289.7104">a1 : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
+      <g id="elem_C_0000388213894542327772">
+        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0000388213894542327772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="263.5" y="266.4"/>
+        <ellipse cx="278.5" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M273.5,283.5563 C273.5,286.0563 275.6406,287.8688 278.5625,287.8688 C279.7969,287.8688 280.9688,287.5719 281.7188,287.0563 C282.3281,286.6344 282.6563,286.2125 282.6563,285.8063 C282.6563,285.3375 282.2344,284.9313 281.7344,284.9313 C281.5,284.9313 281.2813,285.0094 281.0781,285.2125 C280.6406,285.65 280.6406,285.65 280.4688,285.7438 C280.0156,285.9781 279.375,286.1188 278.6094,286.1188 C276.6094,286.1188 275.3281,285.1031 275.3281,283.525 L275.3281,282.4781 C275.3281,280.775 276.5469,279.5719 278.25,279.5719 C278.8281,279.5719 279.4063,279.7125 279.875,279.9625 C280.3438,280.2281 280.5156,280.4156 280.5781,280.775 C280.7031,281.4469 280.9531,281.6969 281.4844,281.6969 C281.7656,281.6969 282.0469,281.5563 282.2344,281.3375 C282.3594,281.1656 282.4063,280.9938 282.4063,280.5563 L282.4063,279.1969 C282.4063,278.775 282.3906,278.6344 282.2656,278.4625 C282.0938,278.2125 281.8125,278.0563 281.4844,278.0563 C281.1719,278.0563 280.9688,278.1656 280.75,278.4313 C279.5781,277.9313 279.1406,277.8219 278.1875,277.8219 C275.5156,277.8219 273.5,279.8375 273.5,282.4625 L273.5,283.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="292.5" y="287.006">t00057_C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="264.5" x2="356.5" y1="298.4" y2="298.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="264.5" x2="356.5" y1="306.4" y2="306.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="269.5" y="315.3"/>
+          <ellipse cx="274.5" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="283.5" y="323.4059">c1 : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="235.5"/>
-      <ellipse cx="147" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M149.9688,257.1406 Q149.3906,257.4375 148.75,257.5781 Q148.1094,257.7344 147.4063,257.7344 Q144.9063,257.7344 143.5781,256.0938 Q142.2656,254.4375 142.2656,251.3125 Q142.2656,248.1875 143.5781,246.5313 Q144.9063,244.875 147.4063,244.875 Q148.1094,244.875 148.75,245.0313 Q149.4063,245.1875 149.9688,245.4844 L149.9688,248.2031 Q149.3438,247.625 148.75,247.3594 Q148.1563,247.0781 147.5313,247.0781 Q146.1875,247.0781 145.5,248.1563 Q144.8125,249.2188 144.8125,251.3125 Q144.8125,253.4063 145.5,254.4844 Q146.1875,255.5469 147.5313,255.5469 Q148.1563,255.5469 148.75,255.2813 Q149.3438,255 149.9688,254.4219 L149.9688,257.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="161" y="255.6543">t00057_B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="267.5" y2="267.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="275.5" y2="275.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
+      <g id="elem_C_0000784667124248020371">
+        <rect codeLine="17" fill="#F1F1F1" height="92.5999" id="C_0000784667124248020371" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="392.5" y="252.5"/>
+        <ellipse cx="407.5" cy="274" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M402.5,275.1563 C402.5,277.6563 404.6406,279.4688 407.5625,279.4688 C408.7969,279.4688 409.9688,279.1719 410.7188,278.6563 C411.3281,278.2344 411.6563,277.8125 411.6563,277.4063 C411.6563,276.9375 411.2344,276.5313 410.7344,276.5313 C410.5,276.5313 410.2813,276.6094 410.0781,276.8125 C409.6406,277.25 409.6406,277.25 409.4688,277.3438 C409.0156,277.5781 408.375,277.7188 407.6094,277.7188 C405.6094,277.7188 404.3281,276.7031 404.3281,275.125 L404.3281,274.0781 C404.3281,272.375 405.5469,271.1719 407.25,271.1719 C407.8281,271.1719 408.4063,271.3125 408.875,271.5625 C409.3438,271.8281 409.5156,272.0156 409.5781,272.375 C409.7031,273.0469 409.9531,273.2969 410.4844,273.2969 C410.7656,273.2969 411.0469,273.1563 411.2344,272.9375 C411.3594,272.7656 411.4063,272.5938 411.4063,272.1563 L411.4063,270.7969 C411.4063,270.375 411.3906,270.2344 411.2656,270.0625 C411.0938,269.8125 410.8125,269.6563 410.4844,269.6563 C410.1719,269.6563 409.9688,269.7656 409.75,270.0313 C408.5781,269.5313 408.1406,269.4219 407.1875,269.4219 C404.5156,269.4219 402.5,271.4375 402.5,274.0625 L402.5,275.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="45" x="430" y="270.7001">«union»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="421.5" y="286.7061">t00057_D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="393.5" x2="485.5" y1="295.5" y2="295.5"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="393.5" x2="485.5" y1="303.5" y2="303.5"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="398.5" y="312.4"/>
+          <ellipse cx="403.5" cy="317.4" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="412.5" y="320.506">d1 : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="398.5" y="329.1999"/>
+          <ellipse cx="403.5" cy="334.1999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="412.5" y="337.3059">d2 : float</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="281.5"/>
-      <ellipse cx="143" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
+      <g id="elem_C_0000682873132844345324">
+        <rect codeLine="23" fill="#F1F1F1" height="98.3998" id="C_0000682873132844345324" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="297" x="522" y="249.6"/>
+        <ellipse cx="635.75" cy="265.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M630.75,266.7563 C630.75,269.2563 632.8906,271.0688 635.8125,271.0688 C637.0469,271.0688 638.2188,270.7719 638.9688,270.2563 C639.5781,269.8344 639.9063,269.4125 639.9063,269.0063 C639.9063,268.5375 639.4844,268.1313 638.9844,268.1313 C638.75,268.1313 638.5313,268.2094 638.3281,268.4125 C637.8906,268.85 637.8906,268.85 637.7188,268.9438 C637.2656,269.1781 636.625,269.3188 635.8594,269.3188 C633.8594,269.3188 632.5781,268.3031 632.5781,266.725 L632.5781,265.6781 C632.5781,263.975 633.7969,262.7719 635.5,262.7719 C636.0781,262.7719 636.6563,262.9125 637.125,263.1625 C637.5938,263.4281 637.7656,263.6156 637.8281,263.975 C637.9531,264.6469 638.2031,264.8969 638.7344,264.8969 C639.0156,264.8969 639.2969,264.7563 639.4844,264.5375 C639.6094,264.3656 639.6563,264.1938 639.6563,263.7563 L639.6563,262.3969 C639.6563,261.975 639.6406,261.8344 639.5156,261.6625 C639.3438,261.4125 639.0625,261.2563 638.7344,261.2563 C638.4219,261.2563 638.2188,261.3656 638,261.6313 C636.8281,261.1313 636.3906,261.0219 635.4375,261.0219 C632.7656,261.0219 630.75,263.0375 630.75,265.6625 L630.75,266.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="656.25" y="270.206">t00057_E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="523" x2="818" y1="281.6" y2="281.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="523" x2="818" y1="289.6" y2="289.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="528" y="298.5"/>
+          <ellipse cx="533" cy="303.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="271" x="542" y="306.6059">coordinates : t00057_E::(anonymous_739)</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="528" y="315.2999"/>
+          <ellipse cx="533" cy="320.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="542" y="323.4059">e : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="528" y="332.0998"/>
+          <ellipse cx="533" cy="337.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="236" x="542" y="340.2058">height : t00057_E::(anonymous_807)</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="152" y="289.7104">b1 : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
+      <g id="elem_C_0000161676142413826748">
+        <rect codeLine="30" fill="#F1F1F1" height="81.5999" id="C_0000161676142413826748" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="185" x="477" y="430.5"/>
+        <ellipse cx="492" cy="446.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M487,447.6563 C487,450.1563 489.1406,451.9688 492.0625,451.9688 C493.2969,451.9688 494.4688,451.6719 495.2188,451.1563 C495.8281,450.7344 496.1563,450.3125 496.1563,449.9063 C496.1563,449.4375 495.7344,449.0313 495.2344,449.0313 C495,449.0313 494.7813,449.1094 494.5781,449.3125 C494.1406,449.75 494.1406,449.75 493.9688,449.8438 C493.5156,450.0781 492.875,450.2188 492.1094,450.2188 C490.1094,450.2188 488.8281,449.2031 488.8281,447.625 L488.8281,446.5781 C488.8281,444.875 490.0469,443.6719 491.75,443.6719 C492.3281,443.6719 492.9063,443.8125 493.375,444.0625 C493.8438,444.3281 494.0156,444.5156 494.0781,444.875 C494.2031,445.5469 494.4531,445.7969 494.9844,445.7969 C495.2656,445.7969 495.5469,445.6563 495.7344,445.4375 C495.8594,445.2656 495.9063,445.0938 495.9063,444.6563 L495.9063,443.2969 C495.9063,442.875 495.8906,442.7344 495.7656,442.5625 C495.5938,442.3125 495.3125,442.1563 494.9844,442.1563 C494.6719,442.1563 494.4688,442.2656 494.25,442.5313 C493.0781,442.0313 492.6406,441.9219 491.6875,441.9219 C489.0156,441.9219 487,443.9375 487,446.5625 L487,447.6563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="506" y="451.106">t00057_E::(coordinates)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="478" x2="661" y1="462.5" y2="462.5"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="478" x2="661" y1="470.5" y2="470.5"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483" y="479.4"/>
+          <ellipse cx="488" cy="484.4" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="497" y="487.5059">x : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483" y="496.1999"/>
+          <ellipse cx="488" cy="501.1999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="497" y="504.3059">y : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="235.5"/>
-      <ellipse cx="273" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M275.9688,257.1406 Q275.3906,257.4375 274.75,257.5781 Q274.1094,257.7344 273.4063,257.7344 Q270.9063,257.7344 269.5781,256.0938 Q268.2656,254.4375 268.2656,251.3125 Q268.2656,248.1875 269.5781,246.5313 Q270.9063,244.875 273.4063,244.875 Q274.1094,244.875 274.75,245.0313 Q275.4063,245.1875 275.9688,245.4844 L275.9688,248.2031 Q275.3438,247.625 274.75,247.3594 Q274.1563,247.0781 273.5313,247.0781 Q272.1875,247.0781 271.5,248.1563 Q270.8125,249.2188 270.8125,251.3125 Q270.8125,253.4063 271.5,254.4844 Q272.1875,255.5469 273.5313,255.5469 Q274.1563,255.5469 274.75,255.2813 Q275.3438,255 275.9688,254.4219 L275.9688,257.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="287" y="255.6543">t00057_C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="267.5" y2="267.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="275.5" y2="275.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
+      <g id="elem_C_0002265335931722752750">
+        <rect codeLine="36" fill="#F1F1F1" height="92.5999" id="C_0002265335931722752750" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="150" x="696.5" y="425"/>
+        <ellipse cx="711.5" cy="446.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M706.5,447.6563 C706.5,450.1563 708.6406,451.9688 711.5625,451.9688 C712.7969,451.9688 713.9688,451.6719 714.7188,451.1563 C715.3281,450.7344 715.6563,450.3125 715.6563,449.9063 C715.6563,449.4375 715.2344,449.0313 714.7344,449.0313 C714.5,449.0313 714.2813,449.1094 714.0781,449.3125 C713.6406,449.75 713.6406,449.75 713.4688,449.8438 C713.0156,450.0781 712.375,450.2188 711.6094,450.2188 C709.6094,450.2188 708.3281,449.2031 708.3281,447.625 L708.3281,446.5781 C708.3281,444.875 709.5469,443.6719 711.25,443.6719 C711.8281,443.6719 712.4063,443.8125 712.875,444.0625 C713.3438,444.3281 713.5156,444.5156 713.5781,444.875 C713.7031,445.5469 713.9531,445.7969 714.4844,445.7969 C714.7656,445.7969 715.0469,445.6563 715.2344,445.4375 C715.3594,445.2656 715.4063,445.0938 715.4063,444.6563 L715.4063,443.2969 C715.4063,442.875 715.3906,442.7344 715.2656,442.5625 C715.0938,442.3125 714.8125,442.1563 714.4844,442.1563 C714.1719,442.1563 713.9688,442.2656 713.75,442.5313 C712.5781,442.0313 712.1406,441.9219 711.1875,441.9219 C708.5156,441.9219 706.5,443.9375 706.5,446.5625 L706.5,447.6563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="45" x="762" y="443.2001">«union»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="725.5" y="459.2061">t00057_E::(height)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="697.5" x2="845.5" y1="468" y2="468"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="697.5" x2="845.5" y1="476" y2="476"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="702.5" y="484.9"/>
+          <ellipse cx="707.5" cy="489.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59" x="716.5" y="493.006">t : double</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="702.5" y="501.6999"/>
+          <ellipse cx="707.5" cy="506.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="716.5" y="509.8059">z : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="264" y="281.5"/>
-      <ellipse cx="269" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
+      <g id="elem_C_0001592909736406415155">
+        <rect codeLine="42" fill="#F1F1F1" height="64.7999" id="C_0001592909736406415155" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="95" x="854" y="266.4"/>
+        <ellipse cx="869" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M864,283.5563 C864,286.0563 866.1406,287.8688 869.0625,287.8688 C870.2969,287.8688 871.4688,287.5719 872.2188,287.0563 C872.8281,286.6344 873.1563,286.2125 873.1563,285.8063 C873.1563,285.3375 872.7344,284.9313 872.2344,284.9313 C872,284.9313 871.7813,285.0094 871.5781,285.2125 C871.1406,285.65 871.1406,285.65 870.9688,285.7438 C870.5156,285.9781 869.875,286.1188 869.1094,286.1188 C867.1094,286.1188 865.8281,285.1031 865.8281,283.525 L865.8281,282.4781 C865.8281,280.775 867.0469,279.5719 868.75,279.5719 C869.3281,279.5719 869.9063,279.7125 870.375,279.9625 C870.8438,280.2281 871.0156,280.4156 871.0781,280.775 C871.2031,281.4469 871.4531,281.6969 871.9844,281.6969 C872.2656,281.6969 872.5469,281.5563 872.7344,281.3375 C872.8594,281.1656 872.9063,280.9938 872.9063,280.5563 L872.9063,279.1969 C872.9063,278.775 872.8906,278.6344 872.7656,278.4625 C872.5938,278.2125 872.3125,278.0563 871.9844,278.0563 C871.6719,278.0563 871.4688,278.1656 871.25,278.4313 C870.0781,277.9313 869.6406,277.8219 868.6875,277.8219 C866.0156,277.8219 864,279.8375 864,282.4625 L864,283.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="883" y="287.006">t00057_G</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="855" x2="948" y1="298.4" y2="298.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="855" x2="948" y1="306.4" y2="306.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="860" y="315.3"/>
+          <ellipse cx="865" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="874" y="323.4059">g1 : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="278" y="289.7104">c1 : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
+      <g id="elem_C_0000370583978606928327">
+        <rect codeLine="47" fill="#F1F1F1" height="165.5995" id="C_0000370583978606928327" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="361" y="7"/>
+        <ellipse cx="404.35" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M399.35,24.1563 C399.35,26.6563 401.4906,28.4688 404.4125,28.4688 C405.6469,28.4688 406.8188,28.1719 407.5688,27.6563 C408.1781,27.2344 408.5063,26.8125 408.5063,26.4063 C408.5063,25.9375 408.0844,25.5313 407.5844,25.5313 C407.35,25.5313 407.1313,25.6094 406.9281,25.8125 C406.4906,26.25 406.4906,26.25 406.3188,26.3438 C405.8656,26.5781 405.225,26.7188 404.4594,26.7188 C402.4594,26.7188 401.1781,25.7031 401.1781,24.125 L401.1781,23.0781 C401.1781,21.375 402.3969,20.1719 404.1,20.1719 C404.6781,20.1719 405.2563,20.3125 405.725,20.5625 C406.1938,20.8281 406.3656,21.0156 406.4281,21.375 C406.5531,22.0469 406.8031,22.2969 407.3344,22.2969 C407.6156,22.2969 407.8969,22.1563 408.0844,21.9375 C408.2094,21.7656 408.2563,21.5938 408.2563,21.1563 L408.2563,19.7969 C408.2563,19.375 408.2406,19.2344 408.1156,19.0625 C407.9438,18.8125 407.6625,18.6563 407.3344,18.6563 C407.0219,18.6563 406.8188,18.7656 406.6,19.0313 C405.4281,18.5313 404.9906,18.4219 404.0375,18.4219 C401.3656,18.4219 399.35,20.4375 399.35,23.0625 L399.35,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="424.65" y="27.606">t00057_R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="517" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="517" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="55.9"/>
+          <ellipse cx="372" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="381" y="64.0059">a : struct t00057_A</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="72.6999"/>
+          <ellipse cx="372" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="381" y="80.8059">b : t00057_B</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="89.4998"/>
+          <ellipse cx="372" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="381" y="97.6058">c : struct t00057_C *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="106.2997"/>
+          <ellipse cx="372" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="381" y="114.4057">d : union t00057_D</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="123.0997"/>
+          <ellipse cx="372" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="381" y="131.2057">e : struct t00057_E *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="139.8996"/>
+          <ellipse cx="372" cy="144.8996" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="381" y="148.0056">f : struct t00057_F *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="156.6995"/>
+          <ellipse cx="372" cy="161.6995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="381" y="164.8055">g : struct t00057_G *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="226"/>
-      <ellipse cx="399.5" cy="244.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M402.4688,250.6094 Q401.8906,250.9063 401.25,251.0469 Q400.6094,251.2031 399.9063,251.2031 Q397.4063,251.2031 396.0781,249.5625 Q394.7656,247.9063 394.7656,244.7813 Q394.7656,241.6563 396.0781,240 Q397.4063,238.3438 399.9063,238.3438 Q400.6094,238.3438 401.25,238.5 Q401.9063,238.6563 402.4688,238.9531 L402.4688,241.6719 Q401.8438,241.0938 401.25,240.8281 Q400.6563,240.5469 400.0313,240.5469 Q398.6875,240.5469 398,241.625 Q397.3125,242.6875 397.3125,244.7813 Q397.3125,246.875 398,247.9531 Q398.6875,249.0156 400.0313,249.0156 Q400.6563,249.0156 401.25,248.75 Q401.8438,248.4688 402.4688,247.8906 L402.4688,250.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="419" y="242.1387">«union»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="413.5" y="256.1074">t00057_D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="263.9375" y2="263.9375"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="271.9375" y2="271.9375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
+      <g id="elem_C_0000085797106299568719">
+        <rect codeLine="58" fill="#F1F1F1" height="64.7999" id="C_0000085797106299568719" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="984" y="266.4"/>
+        <ellipse cx="999" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M994,283.5563 C994,286.0563 996.1406,287.8688 999.0625,287.8688 C1000.2969,287.8688 1001.4688,287.5719 1002.2188,287.0563 C1002.8281,286.6344 1003.1563,286.2125 1003.1563,285.8063 C1003.1563,285.3375 1002.7344,284.9313 1002.2344,284.9313 C1002,284.9313 1001.7813,285.0094 1001.5781,285.2125 C1001.1406,285.65 1001.1406,285.65 1000.9688,285.7438 C1000.5156,285.9781 999.875,286.1188 999.1094,286.1188 C997.1094,286.1188 995.8281,285.1031 995.8281,283.525 L995.8281,282.4781 C995.8281,280.775 997.0469,279.5719 998.75,279.5719 C999.3281,279.5719 999.9063,279.7125 1000.375,279.9625 C1000.8438,280.2281 1001.0156,280.4156 1001.0781,280.775 C1001.2031,281.4469 1001.4531,281.6969 1001.9844,281.6969 C1002.2656,281.6969 1002.5469,281.5563 1002.7344,281.3375 C1002.8594,281.1656 1002.9063,280.9938 1002.9063,280.5563 L1002.9063,279.1969 C1002.9063,278.775 1002.8906,278.6344 1002.7656,278.4625 C1002.5938,278.2125 1002.3125,278.0563 1001.9844,278.0563 C1001.6719,278.0563 1001.4688,278.1656 1001.25,278.4313 C1000.0781,277.9313 999.6406,277.8219 998.6875,277.8219 C996.0156,277.8219 994,279.8375 994,282.4625 L994,283.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="1013" y="287.006">t00057_F</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="985" x2="1076" y1="298.4" y2="298.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="985" x2="1076" y1="306.4" y2="306.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="990" y="315.3"/>
+          <ellipse cx="995" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="1004" y="323.4059">f1 : int</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="277.9375"/>
-      <ellipse cx="395.5" cy="282.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="404.5" y="286.1479">d1 : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="290.7422"/>
-      <ellipse cx="395.5" cy="295.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="404.5" y="298.9526">d2 : float</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="223"/>
-      <ellipse cx="610.75" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M613.7188,244.6406 Q613.1406,244.9375 612.5,245.0781 Q611.8594,245.2344 611.1563,245.2344 Q608.6563,245.2344 607.3281,243.5938 Q606.0156,241.9375 606.0156,238.8125 Q606.0156,235.6875 607.3281,234.0313 Q608.6563,232.375 611.1563,232.375 Q611.8594,232.375 612.5,232.5313 Q613.1563,232.6875 613.7188,232.9844 L613.7188,235.7031 Q613.0938,235.125 612.5,234.8594 Q611.9063,234.5781 611.2813,234.5781 Q609.9375,234.5781 609.25,235.6563 Q608.5625,236.7188 608.5625,238.8125 Q608.5625,240.9063 609.25,241.9844 Q609.9375,243.0469 611.2813,243.0469 Q611.9063,243.0469 612.5,242.7813 Q613.0938,242.5 613.7188,241.9219 L613.7188,244.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="631.25" y="243.1543">t00057_E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="255" y2="255"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="263" y2="263"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="269"/>
-      <ellipse cx="522.5" cy="274" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="240" x="531.5" y="277.2104">coordinates : t00057_E::(anonymous_739)</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="281.8047"/>
-      <ellipse cx="522.5" cy="286.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="531.5" y="290.0151">e : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="294.6094"/>
-      <ellipse cx="522.5" cy="299.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="531.5" y="302.8198">height : t00057_E::(anonymous_807)</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="389"/>
-      <ellipse cx="466.5" cy="405" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M469.4688,410.6406 Q468.8906,410.9375 468.25,411.0781 Q467.6094,411.2344 466.9063,411.2344 Q464.4063,411.2344 463.0781,409.5938 Q461.7656,407.9375 461.7656,404.8125 Q461.7656,401.6875 463.0781,400.0313 Q464.4063,398.375 466.9063,398.375 Q467.6094,398.375 468.25,398.5313 Q468.9063,398.6875 469.4688,398.9844 L469.4688,401.7031 Q468.8438,401.125 468.25,400.8594 Q467.6563,400.5781 467.0313,400.5781 Q465.6875,400.5781 465,401.6563 Q464.3125,402.7188 464.3125,404.8125 Q464.3125,406.9063 465,407.9844 Q465.6875,409.0469 467.0313,409.0469 Q467.6563,409.0469 468.25,408.7813 Q468.8438,408.5 469.4688,407.9219 L469.4688,410.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="152" x="480.5" y="409.1543">t00057_E::(coordinates)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="421" y2="421"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="429" y2="429"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="435"/>
-      <ellipse cx="462.5" cy="440" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="443.2104">x : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="447.8047"/>
-      <ellipse cx="462.5" cy="452.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="456.0151">y : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="386"/>
-      <ellipse cx="686" cy="404.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M688.9688,410.6094 Q688.3906,410.9063 687.75,411.0469 Q687.1094,411.2031 686.4063,411.2031 Q683.9063,411.2031 682.5781,409.5625 Q681.2656,407.9063 681.2656,404.7813 Q681.2656,401.6563 682.5781,400 Q683.9063,398.3438 686.4063,398.3438 Q687.1094,398.3438 687.75,398.5 Q688.4063,398.6563 688.9688,398.9531 L688.9688,401.6719 Q688.3438,401.0938 687.75,400.8281 Q687.1563,400.5469 686.5313,400.5469 Q685.1875,400.5469 684.5,401.625 Q683.8125,402.6875 683.8125,404.7813 Q683.8125,406.875 684.5,407.9531 Q685.1875,409.0156 686.5313,409.0156 Q687.1563,409.0156 687.75,408.75 Q688.3438,408.4688 688.9688,407.8906 L688.9688,410.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="734" y="402.1387">«union»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="117" x="700" y="416.1074">t00057_E::(height)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="423.9375" y2="423.9375"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="431.9375" y2="431.9375"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="437.9375"/>
-      <ellipse cx="682" cy="442.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="691" y="446.1479">t : double</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="450.7422"/>
-      <ellipse cx="682" cy="455.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="691" y="458.9526">z : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="60.8047" id="C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="812.5" y="235.5"/>
-      <ellipse cx="827.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M830.4688,257.1406 Q829.8906,257.4375 829.25,257.5781 Q828.6094,257.7344 827.9063,257.7344 Q825.4063,257.7344 824.0781,256.0938 Q822.7656,254.4375 822.7656,251.3125 Q822.7656,248.1875 824.0781,246.5313 Q825.4063,244.875 827.9063,244.875 Q828.6094,244.875 829.25,245.0313 Q829.9063,245.1875 830.4688,245.4844 L830.4688,248.2031 Q829.8438,247.625 829.25,247.3594 Q828.6563,247.0781 828.0313,247.0781 Q826.6875,247.0781 826,248.1563 Q825.3125,249.2188 825.3125,251.3125 Q825.3125,253.4063 826,254.4844 Q826.6875,255.5469 828.0313,255.5469 Q828.6563,255.5469 829.25,255.2813 Q829.8438,255 830.4688,254.4219 L830.4688,257.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="841.5" y="255.6543">t00057_G</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="267.5" y2="267.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="275.5" y2="275.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="818.5" y="281.5"/>
-      <ellipse cx="823.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="832.5" y="289.7104">g1 : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="137.6328" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="357.5" y="8"/>
-      <ellipse cx="397.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M400.2188,29.6406 Q399.6406,29.9375 399,30.0781 Q398.3594,30.2344 397.6563,30.2344 Q395.1563,30.2344 393.8281,28.5938 Q392.5156,26.9375 392.5156,23.8125 Q392.5156,20.6875 393.8281,19.0313 Q395.1563,17.375 397.6563,17.375 Q398.3594,17.375 399,17.5313 Q399.6563,17.6875 400.2188,17.9844 L400.2188,20.7031 Q399.5938,20.125 399,19.8594 Q398.4063,19.5781 397.7813,19.5781 Q396.4375,19.5781 395.75,20.6563 Q395.0625,21.7188 395.0625,23.8125 Q395.0625,25.9063 395.75,26.9844 Q396.4375,28.0469 397.7813,28.0469 Q398.4063,28.0469 399,27.7813 Q399.5938,27.5 400.2188,26.9219 L400.2188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="416.75" y="28.1543">t00057_R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="54"/>
-      <ellipse cx="368.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="377.5" y="62.2104">a : struct t00057_A</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="66.8047"/>
-      <ellipse cx="368.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="377.5" y="75.0151">b : t00057_B</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="79.6094"/>
-      <ellipse cx="368.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="87.8198">c : struct t00057_C *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="92.4141"/>
-      <ellipse cx="368.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="377.5" y="100.6245">d : union t00057_D</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="105.2188"/>
-      <ellipse cx="368.5" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="113.4292">e : struct t00057_E *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="118.0234"/>
-      <ellipse cx="368.5" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="377.5" y="126.2339">f : struct t00057_F *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="130.8281"/>
-      <ellipse cx="368.5" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="377.5" y="139.0386">g : struct t00057_G *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxvn00fkkrj0j)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="939.5" y="235.5"/>
-      <ellipse cx="954.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M957.4688,257.1406 Q956.8906,257.4375 956.25,257.5781 Q955.6094,257.7344 954.9063,257.7344 Q952.4063,257.7344 951.0781,256.0938 Q949.7656,254.4375 949.7656,251.3125 Q949.7656,248.1875 951.0781,246.5313 Q952.4063,244.875 954.9063,244.875 Q955.6094,244.875 956.25,245.0313 Q956.9063,245.1875 957.4688,245.4844 L957.4688,248.2031 Q956.8438,247.625 956.25,247.3594 Q955.6563,247.0781 955.0313,247.0781 Q953.6875,247.0781 953,248.1563 Q952.3125,249.2188 952.3125,251.3125 Q952.3125,253.4063 953,254.4844 Q953.6875,255.5469 955.0313,255.5469 Q955.6563,255.5469 956.25,255.2813 Q956.8438,255 957.4688,254.4219 L957.4688,257.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="968.5" y="255.6543">t00057_F</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="267.5" y2="267.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="275.5" y2="275.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="945.5" y="281.5"/>
-      <ellipse cx="950.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="959.5" y="289.7104">f1 : int</text>
-    </a>
-    <path d="M610.32,320.47 C595.89,343.04 579.48,368.72 566.53,388.97 " fill="none" id="C_0000682873132844345324&lt;-C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="617.43,309.34,610.8263,312.2367,610.9602,319.4465,617.564,316.5499,617.43,309.34" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="603.5" cy="348.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="75" x="610.5" y="352.0669">coordinates</text>
-    <path d="M682.2,320.38 C686.41,326.62 690.59,332.92 694.5,339 C704.17,354.04 714.31,370.9 722.98,385.68 " fill="none" id="C_0000682873132844345324&lt;-C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="674.62,309.3,674.7034,316.5106,681.3915,319.2069,681.308,311.9963,674.62,309.3" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="711.5" cy="348.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="40" x="718.5" y="352.0669">height</text>
-    <path d="M345.2,112.8 C280.56,140.2 190.26,180.71 114.5,223 C107.73,226.78 100.73,231.05 93.97,235.38 " fill="none" id="C_0000370583978606928327&lt;-C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="357.36,107.67,350.2777,106.3129,346.3011,112.3285,353.3834,113.6855,357.36,107.67" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="200.5" y="189.0669">+a</text>
-    <path d="M346.73,139.91 C303.25,172.06 252.12,209.84 217.54,235.41 " fill="none" id="C_0000370583978606928327&lt;-C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="357.32,132.09,350.1176,132.4441,347.6743,139.2286,354.8767,138.8746,357.32,132.09" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="297.5" y="189.0669">+b</text>
-    <path d="M384.29,146.04 C364.66,174.94 342.65,207.36 326.56,231.05 " fill="none" id="C_0000370583978606928327-&gt;C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="323.63,235.36,332.0044,230.1764,326.4462,231.2286,325.3941,225.6704,323.63,235.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="364.5" y="189.0669">+c</text>
-    <path d="M430.5,159.13 C430.5,182.27 430.5,206.45 430.5,225.84 " fill="none" id="C_0000370583978606928327&lt;-C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="430.5,146.04,426.5,152.04,430.5,158.04,434.5,152.04,430.5,146.04" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="431.5" y="189.0669">+d</text>
-    <path d="M503.55,141.83 C532.75,167.35 565.71,196.15 592.41,219.48 " fill="none" id="C_0000370583978606928327-&gt;C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="596.3,222.88,592.1584,213.9443,592.5362,219.5885,586.892,219.9663,596.3,222.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="558.5" y="189.0669">+e</text>
-    <path d="M503.7,92.39 C601.88,113.28 780.21,156.9 921.5,223 C927.48,225.8 933.53,229.11 939.41,232.63 " fill="none" id="C_0000370583978606928327-&gt;C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="943.86,235.36,938.2839,227.2417,939.5993,232.7435,934.0975,234.0589,943.86,235.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="846.5" y="189.0669">+f</text>
-    <path d="M503.54,102.19 C578.43,128.12 697.35,172.43 794.5,223 C800.14,225.93 805.9,229.24 811.55,232.67 " fill="none" id="C_0000370583978606928327-&gt;C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="815.84,235.31,810.2836,227.1782,811.5856,232.6831,806.0807,233.9852,815.84,235.31" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="728.5" y="189.0669">+g</text>
+    <g id="link_C_0000682873132844345324_C_0000161676142413826748">
+      <path codeLine="62" d="M635.7148,358.5249 C620.3748,384.4249 607.82,405.6 593.3,430.13 " fill="none" id="C_0000682873132844345324-backto-C_0000161676142413826748" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="641.83,348.2,635.3307,351.3241,635.7148,358.5249,642.214,355.4009,641.83,348.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="629.5" cy="387.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="67" x="636.5" y="391.077">coordinates</text>
+    </g>
+    <g id="link_C_0000682873132844345324_C_0002265335931722752750">
+      <path codeLine="63" d="M705.2863,358.5243 C719.5163,382.5443 730.5,401.08 744.49,424.71 " fill="none" id="C_0000682873132844345324-backto-C_0002265335931722752750" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="699.17,348.2,698.7867,355.4009,705.2863,358.5243,705.6696,351.3234,699.17,348.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="730.5" cy="387.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="737.5" y="391.077">height</text>
+    </g>
+    <g id="link_C_0000370583978606928327_C_0000940295970488928395">
+      <path codeLine="64" d="M349.5955,129.6188 C283.0255,159.3888 197.12,200.58 117.5,249.6 C109.45,254.56 101.15,260.28 93.32,266.02 " fill="none" id="C_0000370583978606928327-backto-C_0000940295970488928395" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="360.55,124.72,353.4398,123.5179,349.5955,129.6188,356.7057,130.8209,360.55,124.72" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="195.5" y="215.677">+a</text>
+    </g>
+    <g id="link_C_0000370583978606928327_C_0001030391494410415852">
+      <path codeLine="65" d="M351.3302,161.5397 C305.0902,198.6397 258.03,236.4 221,266.11 " fill="none" id="C_0000370583978606928327-backto-C_0001030391494410415852" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="360.69,154.03,353.5069,154.6649,351.3302,161.5397,358.5133,160.9047,360.69,154.03" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="296.5" y="215.677">+b</text>
+    </g>
+    <g id="link_C_0000370583978606928327_C_0000388213894542327772">
+      <path codeLine="66" d="M388.33,172.91 C368,205.53 348.9932,236.0277 333.5332,260.8377 " fill="none" id="C_0000370583978606928327-to-C_0000388213894542327772" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="330.36,265.93,338.5146,260.4071,333.0043,261.6865,331.7249,256.1762,330.36,265.93" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="368.5" y="215.677">+c</text>
+    </g>
+    <g id="link_C_0000370583978606928327_C_0000784667124248020371">
+      <path codeLine="67" d="M439.5,184.91 C439.5,211.89 439.5,228.89 439.5,252.15 " fill="none" id="C_0000370583978606928327-backto-C_0000784667124248020371" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="439.5,172.91,435.5,178.91,439.5,184.91,443.5,178.91,439.5,172.91" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="440.5" y="215.677">+d</text>
+    </g>
+    <g id="link_C_0000370583978606928327_C_0000682873132844345324">
+      <path codeLine="68" d="M518.35,161.46 C550.63,190.39 582.7117,219.1357 611.8917,245.2857 " fill="none" id="C_0000370583978606928327-to-C_0000682873132844345324" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="616.36,249.29,612.3271,240.3047,612.6364,245.9531,606.988,246.2624,616.36,249.29" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="583.5" y="215.677">+e</text>
+    </g>
+    <g id="link_C_0000370583978606928327_C_0000085797106299568719">
+      <path codeLine="69" d="M518.23,105.45 C624.2,127.16 816.7,173.68 966.5,249.6 C975.43,254.13 979.5387,256.4032 987.8187,262.3932 " fill="none" id="C_0000370583978606928327-to-C_0000085797106299568719" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="992.68,265.91,987.7326,257.3939,988.6289,262.9793,983.0435,263.8757,992.68,265.91" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="900.5" y="215.677">+f</text>
+    </g>
+    <g id="link_C_0000370583978606928327_C_0001592909736406415155">
+      <path codeLine="70" d="M518.3,115.59 C600.41,142.95 731.5,190.97 836.5,249.6 C845.09,254.39 848.9624,256.6758 857.1424,262.5358 " fill="none" id="C_0000370583978606928327-to-C_0001592909736406415155" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="862.02,266.03,857.0331,257.537,857.9554,263.1182,852.3742,264.0404,862.02,266.03" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="775.5" y="215.677">+g</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00057_class_mermaid.svg b/docs/test_cases/t00057_class_mermaid.svg
index de8a84d2..d8f08528 100644
--- a/docs/test_cases/t00057_class_mermaid.svg
+++ b/docs/test_cases/t00057_class_mermaid.svg
@@ -1,64 +1,69 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1154 609" style="max-width: 1154px; background-color: white;" width="1154" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M640.4825752617801,410L633.8057918848167,415.6666666666667C627.1290085078534,421.3333333333333,613.7754417539267,432.6666666666667,607.0986583769633,445.8333333333333C600.421875,459,600.421875,474,600.421875,481.5L600.421875,489"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M785.4080497382199,410L792.0848331151833,415.6666666666667C798.7616164921466,421.3333333333333,812.1151832460733,432.6666666666667,818.7919666230367,444C825.46875,455.3333333333333,825.46875,466.6666666666667,825.46875,472.3333333333333L825.46875,478"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M376.4921875,141.05592004001846L322.18359375,159.7132667000154C267.875,178.3706133600123,159.2578125,215.68530668000616,104.94921875,243.6759866733364C50.640625,271.6666666666667,50.640625,290.3333333333333,50.640625,299.6666666666667L50.640625,309"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M376.4921875,154.82274956722446L344.73046875,171.18562463935373C312.96875,187.548499711483,249.4453125,220.2742498557415,217.68359375,245.97045826120407C185.921875,271.6666666666667,185.921875,290.3333333333333,185.921875,299.6666666666667L185.921875,309"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M376.4921875,196.07878805350555L367.27734375,205.56565671125463C358.0625,215.0525253690037,339.6328125,234.02626268450186,330.41796875,252.84646467558426C321.203125,271.6666666666667,321.203125,290.3333333333333,321.203125,299.6666666666667L321.203125,309"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M456.703125,219L456.703125,224.66666666666666C456.703125,230.33333333333334,456.703125,241.66666666666666,456.703125,253C456.703125,264.3333333333333,456.703125,275.6666666666667,456.703125,281.3333333333333L456.703125,287"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M536.9140625,157.16738315192538L566.2526041666666,173.13948595993782C595.5911458333334,189.11158876795025,654.2682291666666,221.05579438397513,683.6067708333334,242.69456385865422C712.9453125,264.3333333333333,712.9453125,275.6666666666667,712.9453125,281.3333333333333L712.9453125,287"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M536.9140625,130.7797155128731L631.4700520833334,151.14976292739425C726.0260416666666,171.51981034191542,915.1380208333334,212.2599051709577,1009.6940104166666,241.96328591881218C1104.25,271.6666666666667,1104.25,290.3333333333333,1104.25,299.6666666666667L1104.25,309"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M536.9140625,135.32404345772318L608.9973958333334,154.936702881436C681.0807291666666,174.54936230514878,825.2473958333334,213.7746811525744,897.3307291666666,242.72067390962056C969.4140625,271.6666666666667,969.4140625,290.3333333333333,969.4140625,299.6666666666667L969.4140625,309"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M626.758949311702,421.6474070411549L622.3694369264184,425.37283920096246C617.9799245411347,429.09827136076996,609.2008997705674,436.549135680385,604.8113873852836,447.7745678401925C600.421875,459,600.421875,474,600.421875,481.5L600.421875,489"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M799.131675688298,421.6474070411549L803.5211880735816,425.37283920096246C807.9107004588653,429.09827136076996,816.6897252294326,436.549135680385,821.0792376147164,445.9412345068592C825.46875,455.3333333333333,825.46875,466.6666666666667,825.46875,472.3333333333333L825.46875,478"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M359.46874659788875,146.90420695605854L307.9973929982406,164.5868391300488C256.5260393985925,182.26947130403903,153.58333219929625,217.6347356520195,102.11197859964813,244.65070115934307C50.640625,271.6666666666667,50.640625,290.3333333333333,50.640625,299.6666666666667L50.640625,309"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M360.4908049601395,163.06627774471292L331.39598330011626,178.0552314539274C302.30116164009297,193.04418516314195,244.11151832004649,223.02209258157097,215.01669666002326,247.3443796241188C185.921875,271.6666666666667,185.921875,290.3333333333333,185.921875,299.6666666666667L185.921875,309"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M376.4921875,196.07878805350555L367.27734375,205.56565671125463C358.0625,215.0525253690037,339.6328125,234.02626268450186,330.41796875,251.84646467558426C321.203125,269.6666666666667,321.203125,286.3333333333333,321.203125,294.6666666666667L321.203125,303"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M456.703125,237L456.703125,239.66666666666666C456.703125,242.33333333333334,456.703125,247.66666666666666,456.703125,256C456.703125,264.3333333333333,456.703125,275.6666666666667,456.703125,281.3333333333333L456.703125,287"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M536.9140625,157.16738315192538L566.2526041666666,173.13948595993782C595.5911458333334,189.11158876795025,654.2682291666666,221.05579438397513,683.6067708333334,241.69456385865422C712.9453125,262.3333333333333,712.9453125,271.6666666666667,712.9453125,276.3333333333333L712.9453125,281"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M536.9140625,130.7797155128731L631.4700520833334,151.14976292739425C726.0260416666666,171.51981034191542,915.1380208333334,212.2599051709577,1009.6940104166666,240.96328591881218C1104.25,269.6666666666667,1104.25,286.3333333333333,1104.25,294.6666666666667L1104.25,303"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M536.9140625,135.32404345772318L608.9973958333334,154.936702881436C681.0807291666666,174.54936230514878,825.2473958333334,213.7746811525744,897.3307291666666,241.72067390962056C969.4140625,269.6666666666667,969.4140625,286.3333333333333,969.4140625,294.6666666666667L969.4140625,303"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(600.421875, 444)" class="edgeLabel">
@@ -162,7 +167,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L3">
+        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L3">
           <g title="t00057_A" id="classId-C_0000940295970488928395-0" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -186,7 +191,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L7">
+        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L7">
           <g title="t00057_B" id="classId-C_0001030391494410415852-1" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -210,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L11">
+        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L11">
           <g title="t00057_C" id="classId-C_0000388213894542327772-2" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -234,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L15">
+        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L15">
           <g title="t00057_D" id="classId-C_0000784667124248020371-3" class="node default clickable">
             <rect height="123" width="85.71875" y="-61.5" x="-42.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.859375" x1="-42.859375" class="divider"/>
@@ -263,7 +268,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L20">
+        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L20">
           <g title="t00057_E" id="classId-C_0000682873132844345324-4" class="node default clickable">
             <rect height="123" width="326.765625" y="-61.5" x="-163.3828125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="163.3828125" x1="-163.3828125" class="divider"/>
@@ -297,7 +302,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L22">
+        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L22">
           <g title="t00057_E##(coordinates)" id="classId-C_0000161676142413826748-5" class="node default clickable">
             <rect height="101" width="196.390625" y="-50.5" x="-98.1953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="98.1953125" x1="-98.1953125" class="divider"/>
@@ -326,7 +331,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L26">
+        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L26">
           <g title="t00057_E##(height)" id="classId-C_0002265335931722752750-6" class="node default clickable">
             <rect height="123" width="153.703125" y="-61.5" x="-76.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.8515625" x1="-76.8515625" class="divider"/>
@@ -355,7 +360,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L32">
+        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L32">
           <g title="t00057_G" id="classId-C_0001592909736406415155-7" class="node default clickable">
             <rect height="79" width="86.171875" y="-39.5" x="-43.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="43.0859375" x1="-43.0859375" class="divider"/>
@@ -379,7 +384,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/t00057.c#L36">
+        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L36">
           <g title="t00057_R" id="classId-C_0000370583978606928327-8" class="node default clickable">
             <rect height="211" width="160.421875" y="-105.5" x="-80.2109375" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="80.2109375" x1="-80.2109375" class="divider"/>
@@ -407,7 +412,7 @@
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, -20)" height="18" width="143.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+c : struct t00057_C </span>
+                  <span style="font-style:italic;" class="nodeLabel">+c : struct t00057_C</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, 2)" height="18" width="144.5625">
@@ -417,23 +422,23 @@
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, 24)" height="18" width="143.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+e : struct t00057_E </span>
+                  <span style="font-style:italic;" class="nodeLabel">+e : struct t00057_E</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, 46)" height="18" width="138.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+f : struct t00057_F </span>
+                  <span style="font-style:italic;" class="nodeLabel">+f : struct t00057_F</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, 68)" height="18" width="145.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+g : struct t00057_G </span>
+                  <span style="font-style:italic;" class="nodeLabel">+g : struct t00057_G</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00057/include/t00057.h#L3">
+        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/include/t00057.h#L3">
           <g title="t00057_F" id="classId-C_0000085797106299568719-9" class="node default clickable">
             <rect height="79" width="83.5" y="-39.5" x="-41.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="41.75" x1="-41.75" class="divider"/>
diff --git a/docs/test_cases/t00058.md b/docs/test_cases/t00058.md
index a7e0966a..0bc20930 100644
--- a/docs/test_cases/t00058.md
+++ b/docs/test_cases/t00058.md
@@ -15,7 +15,7 @@ diagrams:
         - '{{ alias("same_as_first_type<T,Args...>") }} ..> {{ alias("first_type<T,Args...>") }}'
 ```
 ## Source code
-File t00058.cc
+File `tests/t00058/t00058.cc`
 ```cpp
 #include <string>
 #include <type_traits>
diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg
index 16214db5..41fc7335 100644
--- a/docs/test_cases/t00058_class.svg
+++ b/docs/test_cases/t00058_class.svg
@@ -1,151 +1,179 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="809px" preserveAspectRatio="none" style="width:437px;height:809px;" version="1.1" viewBox="0 0 437 809" width="437px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="828px" preserveAspectRatio="none" style="width:405px;height:828px;background:#FFFFFF;" version="1.1" viewBox="0 0 405 828" width="405px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2qmyrvog8c84" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qmyrvog8c84)" height="48" id="C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="155.5" y="750"/>
-      <ellipse cx="170.5" cy="766" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M173.4688,771.6406 Q172.8906,771.9375 172.25,772.0781 Q171.6094,772.2344 170.9063,772.2344 Q168.4063,772.2344 167.0781,770.5938 Q165.7656,768.9375 165.7656,765.8125 Q165.7656,762.6875 167.0781,761.0313 Q168.4063,759.375 170.9063,759.375 Q171.6094,759.375 172.25,759.5313 Q172.9063,759.6875 173.4688,759.9844 L173.4688,762.7031 Q172.8438,762.125 172.25,761.8594 Q171.6563,761.5781 171.0313,761.5781 Q169.6875,761.5781 169,762.6563 Q168.3125,763.7188 168.3125,765.8125 Q168.3125,767.9063 169,768.9844 Q169.6875,770.0469 171.0313,770.0469 Q171.6563,770.0469 172.25,769.7813 Q172.8438,769.5 173.4688,768.9219 L173.4688,771.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="184.5" y="770.1543">first_type</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="52" x="249.5" y="747"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="250.5" y="759.1387">T,Args...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="782" y2="782"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="790" y2="790"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
+      <g id="elem_C_0000039461943261269692">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000039461943261269692" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="159.5" y="773"/>
+        <ellipse cx="174.5" cy="789" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M169.5,790.1563 C169.5,792.6563 171.6406,794.4688 174.5625,794.4688 C175.7969,794.4688 176.9688,794.1719 177.7188,793.6563 C178.3281,793.2344 178.6563,792.8125 178.6563,792.4063 C178.6563,791.9375 178.2344,791.5313 177.7344,791.5313 C177.5,791.5313 177.2813,791.6094 177.0781,791.8125 C176.6406,792.25 176.6406,792.25 176.4688,792.3438 C176.0156,792.5781 175.375,792.7188 174.6094,792.7188 C172.6094,792.7188 171.3281,791.7031 171.3281,790.125 L171.3281,789.0781 C171.3281,787.375 172.5469,786.1719 174.25,786.1719 C174.8281,786.1719 175.4063,786.3125 175.875,786.5625 C176.3438,786.8281 176.5156,787.0156 176.5781,787.375 C176.7031,788.0469 176.9531,788.2969 177.4844,788.2969 C177.7656,788.2969 178.0469,788.1563 178.2344,787.9375 C178.3594,787.7656 178.4063,787.5938 178.4063,787.1563 L178.4063,785.7969 C178.4063,785.375 178.3906,785.2344 178.2656,785.0625 C178.0938,784.8125 177.8125,784.6563 177.4844,784.6563 C177.1719,784.6563 176.9688,784.7656 176.75,785.0313 C175.5781,784.5313 175.1406,784.4219 174.1875,784.4219 C171.5156,784.4219 169.5,786.4375 169.5,789.0625 L169.5,790.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="188.5" y="793.606">first_type</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="254.5" y="770"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="255.5" y="784.2001">T,Args...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="160.5" x2="296.5" y1="805" y2="805"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="160.5" x2="296.5" y1="813" y2="813"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qmyrvog8c84)" height="53.9375" id="C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="125" y="635"/>
-      <ellipse cx="140" cy="653.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M142.9688,659.6094 Q142.3906,659.9063 141.75,660.0469 Q141.1094,660.2031 140.4063,660.2031 Q137.9063,660.2031 136.5781,658.5625 Q135.2656,656.9063 135.2656,653.7813 Q135.2656,650.6563 136.5781,649 Q137.9063,647.3438 140.4063,647.3438 Q141.1094,647.3438 141.75,647.5 Q142.4063,647.6563 142.9688,647.9531 L142.9688,650.6719 Q142.3438,650.0938 141.75,649.8281 Q141.1563,649.5469 140.5313,649.5469 Q139.1875,649.5469 138.5,650.625 Q137.8125,651.6875 137.8125,653.7813 Q137.8125,655.875 138.5,656.9531 Q139.1875,658.0156 140.5313,658.0156 Q141.1563,658.0156 141.75,657.75 Q142.3438,657.4688 142.9688,656.8906 L142.9688,659.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="180.5" y="651.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="154" y="665.1074">same_as_first_type</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="52" x="280" y="632"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="281" y="644.1387">T,Args...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="672.9375" y2="672.9375"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="680.9375" y2="680.9375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
+      <g id="elem_C_0001725820236573641307">
+        <rect codeLine="6" fill="#F1F1F1" height="59" id="C_0001725820236573641307" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="204" x="126.5" y="653"/>
+        <ellipse cx="141.5" cy="674.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M136.5,675.6563 C136.5,678.1563 138.6406,679.9688 141.5625,679.9688 C142.7969,679.9688 143.9688,679.6719 144.7188,679.1563 C145.3281,678.7344 145.6563,678.3125 145.6563,677.9063 C145.6563,677.4375 145.2344,677.0313 144.7344,677.0313 C144.5,677.0313 144.2813,677.1094 144.0781,677.3125 C143.6406,677.75 143.6406,677.75 143.4688,677.8438 C143.0156,678.0781 142.375,678.2188 141.6094,678.2188 C139.6094,678.2188 138.3281,677.2031 138.3281,675.625 L138.3281,674.5781 C138.3281,672.875 139.5469,671.6719 141.25,671.6719 C141.8281,671.6719 142.4063,671.8125 142.875,672.0625 C143.3438,672.3281 143.5156,672.5156 143.5781,672.875 C143.7031,673.5469 143.9531,673.7969 144.4844,673.7969 C144.7656,673.7969 145.0469,673.6563 145.2344,673.4375 C145.3594,673.2656 145.4063,673.0938 145.4063,672.6563 L145.4063,671.2969 C145.4063,670.875 145.3906,670.7344 145.2656,670.5625 C145.0938,670.3125 144.8125,670.1563 144.4844,670.1563 C144.1719,670.1563 143.9688,670.2656 143.75,670.5313 C142.5781,670.0313 142.1406,669.9219 141.1875,669.9219 C138.5156,669.9219 136.5,671.9375 136.5,674.5625 L136.5,675.6563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="189" y="671.2001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124" x="155.5" y="687.2061">same_as_first_type</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="287.5" y="650"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="288.5" y="664.2001">T,Args...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="127.5" x2="329.5" y1="696" y2="696"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="127.5" x2="329.5" y1="704" y2="704"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qmyrvog8c84)" height="60.8047" id="C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="93.5" y="497"/>
-      <ellipse cx="125.15" cy="513" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M128.1188,518.6406 Q127.5406,518.9375 126.9,519.0781 Q126.2594,519.2344 125.5563,519.2344 Q123.0563,519.2344 121.7281,517.5938 Q120.4156,515.9375 120.4156,512.8125 Q120.4156,509.6875 121.7281,508.0313 Q123.0563,506.375 125.5563,506.375 Q126.2594,506.375 126.9,506.5313 Q127.5563,506.6875 128.1188,506.9844 L128.1188,509.7031 Q127.4938,509.125 126.9,508.8594 Q126.3063,508.5781 125.6813,508.5781 Q124.3375,508.5781 123.65,509.6563 Q122.9625,510.7188 122.9625,512.8125 Q122.9625,514.9063 123.65,515.9844 Q124.3375,517.0469 125.6813,517.0469 Q126.3063,517.0469 126.9,516.7813 Q127.4938,516.5 128.1188,515.9219 L128.1188,518.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="142.85" y="517.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="52" x="175.5" y="494"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="176.5" y="506.1387">T,Args...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="529" y2="529"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="537" y2="537"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000798619347004821702">
+        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0000798619347004821702" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="90" y="511.2"/>
+        <ellipse cx="126.6" cy="527.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M121.6,528.3563 C121.6,530.8563 123.7406,532.6688 126.6625,532.6688 C127.8969,532.6688 129.0688,532.3719 129.8188,531.8563 C130.4281,531.4344 130.7563,531.0125 130.7563,530.6063 C130.7563,530.1375 130.3344,529.7313 129.8344,529.7313 C129.6,529.7313 129.3813,529.8094 129.1781,530.0125 C128.7406,530.45 128.7406,530.45 128.5688,530.5438 C128.1156,530.7781 127.475,530.9188 126.7094,530.9188 C124.7094,530.9188 123.4281,529.9031 123.4281,528.325 L123.4281,527.2781 C123.4281,525.575 124.6469,524.3719 126.35,524.3719 C126.9281,524.3719 127.5063,524.5125 127.975,524.7625 C128.4438,525.0281 128.6156,525.2156 128.6781,525.575 C128.8031,526.2469 129.0531,526.4969 129.5844,526.4969 C129.8656,526.4969 130.1469,526.3563 130.3344,526.1375 C130.4594,525.9656 130.5063,525.7938 130.5063,525.3563 L130.5063,523.9969 C130.5063,523.575 130.4906,523.4344 130.3656,523.2625 C130.1938,523.0125 129.9125,522.8563 129.5844,522.8563 C129.2719,522.8563 129.0688,522.9656 128.85,523.2313 C127.6781,522.7313 127.2406,522.6219 126.2875,522.6219 C123.6156,522.6219 121.6,524.6375 121.6,527.2625 L121.6,528.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="145.4" y="531.806">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="184" y="508.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="185" y="522.4001">T,Args...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="226" y1="543.2" y2="543.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="226" y1="551.2" y2="551.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="560.1"/>
+          <ellipse cx="101" cy="565.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="110" y="568.2059">a : std::vector&lt;T&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="99.5" y="543"/>
-      <ellipse cx="104.5" cy="548" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000420594889696591405">
+        <rect codeLine="14" fill="#F1F1F1" height="81.5999" id="C_0000420594889696591405" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="229" y="399.6"/>
+        <ellipse cx="260.65" cy="415.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M255.65,416.7563 C255.65,419.2563 257.7906,421.0688 260.7125,421.0688 C261.9469,421.0688 263.1188,420.7719 263.8688,420.2563 C264.4781,419.8344 264.8063,419.4125 264.8063,419.0063 C264.8063,418.5375 264.3844,418.1313 263.8844,418.1313 C263.65,418.1313 263.4313,418.2094 263.2281,418.4125 C262.7906,418.85 262.7906,418.85 262.6188,418.9438 C262.1656,419.1781 261.525,419.3188 260.7594,419.3188 C258.7594,419.3188 257.4781,418.3031 257.4781,416.725 L257.4781,415.6781 C257.4781,413.975 258.6969,412.7719 260.4,412.7719 C260.9781,412.7719 261.5563,412.9125 262.025,413.1625 C262.4938,413.4281 262.6656,413.6156 262.7281,413.975 C262.8531,414.6469 263.1031,414.8969 263.6344,414.8969 C263.9156,414.8969 264.1969,414.7563 264.3844,414.5375 C264.5094,414.3656 264.5563,414.1938 264.5563,413.7563 L264.5563,412.3969 C264.5563,411.975 264.5406,411.8344 264.4156,411.6625 C264.2438,411.4125 263.9625,411.2563 263.6344,411.2563 C263.3219,411.2563 263.1188,411.3656 262.9,411.6313 C261.7281,411.1313 261.2906,411.0219 260.3375,411.0219 C257.6656,411.0219 255.65,413.0375 255.65,415.6625 L255.65,416.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="278.35" y="420.206">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="57" x="312" y="396.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="55" x="313" y="410.8001">T,P,Args...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="230" x2="365" y1="431.6" y2="431.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="230" x2="365" y1="439.6" y2="439.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="235" y="448.5"/>
+          <ellipse cx="240" cy="453.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="249" y="456.6059">b : std::vector&lt;T&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="235" y="465.2999"/>
+          <ellipse cx="240" cy="470.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="249" y="473.4059">bb : P</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="113.5" y="551.2104">a : std::vector&lt;T&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001724002183455178980">
+        <rect codeLine="20" fill="#F1F1F1" height="48" id="C_0001724002183455178980" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="170" x="32.5" y="243.6"/>
+        <ellipse cx="47.5" cy="259.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M42.5,260.7563 C42.5,263.2563 44.6406,265.0688 47.5625,265.0688 C48.7969,265.0688 49.9688,264.7719 50.7188,264.2563 C51.3281,263.8344 51.6563,263.4125 51.6563,263.0063 C51.6563,262.5375 51.2344,262.1313 50.7344,262.1313 C50.5,262.1313 50.2813,262.2094 50.0781,262.4125 C49.6406,262.85 49.6406,262.85 49.4688,262.9438 C49.0156,263.1781 48.375,263.3188 47.6094,263.3188 C45.6094,263.3188 44.3281,262.3031 44.3281,260.725 L44.3281,259.6781 C44.3281,257.975 45.5469,256.7719 47.25,256.7719 C47.8281,256.7719 48.4063,256.9125 48.875,257.1625 C49.3438,257.4281 49.5156,257.6156 49.5781,257.975 C49.7031,258.6469 49.9531,258.8969 50.4844,258.8969 C50.7656,258.8969 51.0469,258.7563 51.2344,258.5375 C51.3594,258.3656 51.4063,258.1938 51.4063,257.7563 L51.4063,256.3969 C51.4063,255.975 51.3906,255.8344 51.2656,255.6625 C51.0938,255.4125 50.8125,255.2563 50.4844,255.2563 C50.1719,255.2563 49.9688,255.3656 49.75,255.6313 C48.5781,255.1313 48.1406,255.0219 47.1875,255.0219 C44.5156,255.0219 42.5,257.0375 42.5,259.6625 L42.5,260.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="61.5" y="264.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="127" x="78.5" y="240.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="125" x="79.5" y="254.8001">int,int,double,std::string</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="33.5" x2="201.5" y1="275.6" y2="275.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="33.5" x2="201.5" y1="283.6" y2="283.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qmyrvog8c84)" height="73.6094" id="C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="229.5" y="393"/>
-      <ellipse cx="256.2" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M259.1688,414.6406 Q258.5906,414.9375 257.95,415.0781 Q257.3094,415.2344 256.6063,415.2344 Q254.1063,415.2344 252.7781,413.5938 Q251.4656,411.9375 251.4656,408.8125 Q251.4656,405.6875 252.7781,404.0313 Q254.1063,402.375 256.6063,402.375 Q257.3094,402.375 257.95,402.5313 Q258.6063,402.6875 259.1688,402.9844 L259.1688,405.7031 Q258.5438,405.125 257.95,404.8594 Q257.3563,404.5781 256.7313,404.5781 Q255.3875,404.5781 254.7,405.6563 Q254.0125,406.7188 254.0125,408.8125 Q254.0125,410.9063 254.7,411.9844 Q255.3875,413.0469 256.7313,413.0469 Q257.3563,413.0469 257.95,412.7813 Q258.5438,412.5 259.1688,411.9219 L259.1688,414.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="272.8" y="413.1543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="63" x="300.5" y="390"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="301.5" y="402.1387">T,P,Args...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="425" y2="425"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="433" y2="433"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001372381231906520278">
+        <rect codeLine="24" fill="#F1F1F1" height="48" id="C_0001372381231906520278" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="170.5" y="321.6"/>
+        <ellipse cx="185.5" cy="337.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M180.5,338.7563 C180.5,341.2563 182.6406,343.0688 185.5625,343.0688 C186.7969,343.0688 187.9688,342.7719 188.7188,342.2563 C189.3281,341.8344 189.6563,341.4125 189.6563,341.0063 C189.6563,340.5375 189.2344,340.1313 188.7344,340.1313 C188.5,340.1313 188.2813,340.2094 188.0781,340.4125 C187.6406,340.85 187.6406,340.85 187.4688,340.9438 C187.0156,341.1781 186.375,341.3188 185.6094,341.3188 C183.6094,341.3188 182.3281,340.3031 182.3281,338.725 L182.3281,337.6781 C182.3281,335.975 183.5469,334.7719 185.25,334.7719 C185.8281,334.7719 186.4063,334.9125 186.875,335.1625 C187.3438,335.4281 187.5156,335.6156 187.5781,335.975 C187.7031,336.6469 187.9531,336.8969 188.4844,336.8969 C188.7656,336.8969 189.0469,336.7563 189.2344,336.5375 C189.3594,336.3656 189.4063,336.1938 189.4063,335.7563 L189.4063,334.3969 C189.4063,333.975 189.3906,333.8344 189.2656,333.6625 C189.0938,333.4125 188.8125,333.2563 188.4844,333.2563 C188.1719,333.2563 187.9688,333.3656 187.75,333.6313 C186.5781,333.1313 186.1406,333.0219 185.1875,333.0219 C182.5156,333.0219 180.5,335.0375 180.5,337.6625 L180.5,338.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="199.5" y="342.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="31" x="216.5" y="318.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="29" x="217.5" y="332.8001">int,int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="243.5" y1="353.6" y2="353.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="243.5" y1="361.6" y2="361.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="439"/>
-      <ellipse cx="240.5" cy="444" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000290383080560130133">
+        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0000290383080560130133" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="224" x="170.5" y="165.6"/>
+        <ellipse cx="185.5" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M180.5,182.7563 C180.5,185.2563 182.6406,187.0688 185.5625,187.0688 C186.7969,187.0688 187.9688,186.7719 188.7188,186.2563 C189.3281,185.8344 189.6563,185.4125 189.6563,185.0063 C189.6563,184.5375 189.2344,184.1313 188.7344,184.1313 C188.5,184.1313 188.2813,184.2094 188.0781,184.4125 C187.6406,184.85 187.6406,184.85 187.4688,184.9438 C187.0156,185.1781 186.375,185.3188 185.6094,185.3188 C183.6094,185.3188 182.3281,184.3031 182.3281,182.725 L182.3281,181.6781 C182.3281,179.975 183.5469,178.7719 185.25,178.7719 C185.8281,178.7719 186.4063,178.9125 186.875,179.1625 C187.3438,179.4281 187.5156,179.6156 187.5781,179.975 C187.7031,180.6469 187.9531,180.8969 188.4844,180.8969 C188.7656,180.8969 189.0469,180.7563 189.2344,180.5375 C189.3594,180.3656 189.4063,180.1938 189.4063,179.7563 L189.4063,178.3969 C189.4063,177.975 189.3906,177.8344 189.2656,177.6625 C189.0938,177.4125 188.8125,177.2563 188.4844,177.2563 C188.1719,177.2563 187.9688,177.3656 187.75,177.6313 C186.5781,177.1313 186.1406,177.0219 185.1875,177.0219 C182.5156,177.0219 180.5,179.0375 180.5,181.6625 L180.5,182.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="199.5" y="186.206">B</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="181" x="216.5" y="162.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="179" x="217.5" y="176.8001">int,std::string,int,double,A&lt;int,int&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="393.5" y1="197.6" y2="197.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="393.5" y1="205.6" y2="205.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="249.5" y="447.2104">b : std::vector&lt;T&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001015108159699260009">
+        <rect codeLine="32" fill="#F1F1F1" height="81.5999" id="C_0001015108159699260009" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="289" x="7" y="7"/>
+        <ellipse cx="142.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M137.25,24.1563 C137.25,26.6563 139.3906,28.4688 142.3125,28.4688 C143.5469,28.4688 144.7188,28.1719 145.4688,27.6563 C146.0781,27.2344 146.4063,26.8125 146.4063,26.4063 C146.4063,25.9375 145.9844,25.5313 145.4844,25.5313 C145.25,25.5313 145.0313,25.6094 144.8281,25.8125 C144.3906,26.25 144.3906,26.25 144.2188,26.3438 C143.7656,26.5781 143.125,26.7188 142.3594,26.7188 C140.3594,26.7188 139.0781,25.7031 139.0781,24.125 L139.0781,23.0781 C139.0781,21.375 140.2969,20.1719 142,20.1719 C142.5781,20.1719 143.1563,20.3125 143.625,20.5625 C144.0938,20.8281 144.2656,21.0156 144.3281,21.375 C144.4531,22.0469 144.7031,22.2969 145.2344,22.2969 C145.5156,22.2969 145.7969,22.1563 145.9844,21.9375 C146.1094,21.7656 146.1563,21.5938 146.1563,21.1563 L146.1563,19.7969 C146.1563,19.375 146.1406,19.2344 146.0156,19.0625 C145.8438,18.8125 145.5625,18.6563 145.2344,18.6563 C144.9219,18.6563 144.7188,18.7656 144.5,19.0313 C143.3281,18.5313 142.8906,18.4219 141.9375,18.4219 C139.2656,18.4219 137.25,20.4375 137.25,23.0625 L137.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="162.75" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="295" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="295" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="55.9"/>
+          <ellipse cx="18" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="27" y="64.0059">aa : A&lt;int,int,double,std::string&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="72.6999"/>
+          <ellipse cx="18" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="263" x="27" y="80.8059">bb : B&lt;int,std::string,int,double,A&lt;int,int&gt;&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="451.8047"/>
-      <ellipse cx="240.5" cy="456.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="249.5" y="460.0151">bb : P</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qmyrvog8c84)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
-      <ellipse cx="27.5" cy="253" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M30.4688,258.6406 Q29.8906,258.9375 29.25,259.0781 Q28.6094,259.2344 27.9063,259.2344 Q25.4063,259.2344 24.0781,257.5938 Q22.7656,255.9375 22.7656,252.8125 Q22.7656,249.6875 24.0781,248.0313 Q25.4063,246.375 27.9063,246.375 Q28.6094,246.375 29.25,246.5313 Q29.9063,246.6875 30.4688,246.9844 L30.4688,249.7031 Q29.8438,249.125 29.25,248.8594 Q28.6563,248.5781 28.0313,248.5781 Q26.6875,248.5781 26,249.6563 Q25.3125,250.7188 25.3125,252.8125 Q25.3125,254.9063 26,255.9844 Q26.6875,257.0469 28.0313,257.0469 Q28.6563,257.0469 29.25,256.7813 Q29.8438,256.5 30.4688,255.9219 L30.4688,258.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="41.5" y="257.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="151" x="57.5" y="234"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="149" x="58.5" y="246.1387">int,int,double,std::string</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="269" y2="269"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="277" y2="277"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qmyrvog8c84)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
-      <ellipse cx="177" cy="331" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M179.9688,336.6406 Q179.3906,336.9375 178.75,337.0781 Q178.1094,337.2344 177.4063,337.2344 Q174.9063,337.2344 173.5781,335.5938 Q172.2656,333.9375 172.2656,330.8125 Q172.2656,327.6875 173.5781,326.0313 Q174.9063,324.375 177.4063,324.375 Q178.1094,324.375 178.75,324.5313 Q179.4063,324.6875 179.9688,324.9844 L179.9688,327.7031 Q179.3438,327.125 178.75,326.8594 Q178.1563,326.5781 177.5313,326.5781 Q176.1875,326.5781 175.5,327.6563 Q174.8125,328.7188 174.8125,330.8125 Q174.8125,332.9063 175.5,333.9844 Q176.1875,335.0469 177.5313,335.0469 Q178.1563,335.0469 178.75,334.7813 Q179.3438,334.5 179.9688,333.9219 L179.9688,336.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191" y="335.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="38" x="207" y="312"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="208" y="324.1387">int,int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="347" y2="347"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="355" y2="355"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qmyrvog8c84)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
-      <ellipse cx="177.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M180.4688,180.6406 Q179.8906,180.9375 179.25,181.0781 Q178.6094,181.2344 177.9063,181.2344 Q175.4063,181.2344 174.0781,179.5938 Q172.7656,177.9375 172.7656,174.8125 Q172.7656,171.6875 174.0781,170.0313 Q175.4063,168.375 177.9063,168.375 Q178.6094,168.375 179.25,168.5313 Q179.9063,168.6875 180.4688,168.9844 L180.4688,171.7031 Q179.8438,171.125 179.25,170.8594 Q178.6563,170.5781 178.0313,170.5781 Q176.6875,170.5781 176,171.6563 Q175.3125,172.7188 175.3125,174.8125 Q175.3125,176.9063 176,177.9844 Q176.6875,179.0469 178.0313,179.0469 Q178.6563,179.0469 179.25,178.7813 Q179.8438,178.5 180.4688,177.9219 L180.4688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191.5" y="179.1543">B</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="219" x="207.5" y="156"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="217" x="208.5" y="168.1387">int,std::string,int,double,A&lt;int,int&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="191" y2="191"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="199" y2="199"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qmyrvog8c84)" height="73.6094" id="C_0001015108159699260009" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="6" y="8"/>
-      <ellipse cx="135.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M138.7188,29.6406 Q138.1406,29.9375 137.5,30.0781 Q136.8594,30.2344 136.1563,30.2344 Q133.6563,30.2344 132.3281,28.5938 Q131.0156,26.9375 131.0156,23.8125 Q131.0156,20.6875 132.3281,19.0313 Q133.6563,17.375 136.1563,17.375 Q136.8594,17.375 137.5,17.5313 Q138.1563,17.6875 138.7188,17.9844 L138.7188,20.7031 Q138.0938,20.125 137.5,19.8594 Q136.9063,19.5781 136.2813,19.5781 Q134.9375,19.5781 134.25,20.6563 Q133.5625,21.7188 133.5625,23.8125 Q133.5625,25.9063 134.25,26.9844 Q134.9375,28.0469 136.2813,28.0469 Q136.9063,28.0469 137.5,27.7813 Q138.0938,27.5 138.7188,26.9219 L138.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
-      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="26" y="62.2104">aa : A&lt;int,int,double,std::string&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
-      <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="250" x="26" y="75.0151">bb : B&lt;int,std::string,int,double,A&lt;int,int&gt;&gt;</text>
-    </a>
-    <path d="M174.26,558.24 C185.3,579.75 200.17,608.73 211.31,630.43 " fill="none" id="C_0000798619347004821702-&gt;C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="213.63,634.95,213.0696,625.1171,211.3426,630.5039,205.9558,628.7769,213.63,634.95" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="199" y="601.0669">T,Args...</text>
-    <path d="M291.28,467.3 C286.77,503.2 277.51,559.24 260,605 C256.7,613.63 252.14,622.46 247.45,630.49 " fill="none" id="C_0000420594889696591405-&gt;C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="244.85,634.86,252.8965,629.1808,247.4119,630.5662,246.0265,625.0817,244.85,634.86" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="287" y="532.0669">T,Args...</text>
-    <path d="M113.35,285.01 C121.42,327.68 138.85,419.93 149.69,477.25 " fill="none" id="C_0001724002183455178980-&gt;C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="156.58,476.03,153.42,496.99,142.83,478.63,156.58,476.03" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M196.64,363.24 C190.1,391.62 178.86,440.37 170.36,477.23 " fill="none" id="C_0001372381231906520278-&gt;C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="177.16,478.88,165.85,496.8,163.52,475.74,177.16,478.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M279.38,207.06 C263.09,234.61 235.86,280.7 218.43,310.2 " fill="none" id="C_0000290383080560130133-&gt;C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="215.72,314.79,223.7359,309.0676,218.2588,310.4825,216.8439,305.0055,215.72,314.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M293.19,207.05 C293.49,244.63 294.11,320.19 294.54,372.64 " fill="none" id="C_0000290383080560130133-&gt;C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="301.54,372.79,294.7,392.84,287.54,372.9,301.54,372.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M135.96,95.14 C128.7,139.55 118.32,202.99 112.8,236.76 " fill="none" id="C_0001015108159699260009&lt;-C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="138.06,82.3,133.1433,87.575,136.1214,94.1424,141.0382,88.8674,138.06,82.3" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="140" 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="16" x="147" y="125.0669">aa</text>
-    <path d="M193.16,90.87 C217.96,113.51 247.01,140.02 267.36,158.6 " fill="none" id="C_0001015108159699260009&lt;-C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="183.54,82.09,185.2714,89.0902,192.399,90.1844,190.6676,83.1842,183.54,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="237" 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="16" x="244" y="125.0669">bb</text>
-    <path d="M227,689.07 C227,705.77 227,727.44 227,744.57 " fill="none" id="C_0001725820236573641307-&gt;C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="227,749.74,231,740.74,227,744.74,223,740.74,227,749.74" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000798619347004821702_C_0001725820236573641307">
+      <path codeLine="37" d="M174.74,576.35 C186.53,599.42 199.63,625.0271 211.05,647.3771 " fill="none" id="C_0000798619347004821702-to-C_0001725820236573641307" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="213.78,652.72,213.2469,642.8856,211.505,648.2676,206.123,646.5256,213.78,652.72" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="51" x="199.5" y="619.077">T,Args...</text>
+    </g>
+    <g id="link_C_0000420594889696591405_C_0001725820236573641307">
+      <path codeLine="38" d="M292.4,481.61 C286.89,519.01 276.52,575.89 259.5,623 C255.87,633.05 253.6307,638.2405 248.6307,647.5005 " fill="none" id="C_0000420594889696591405-to-C_0001725820236573641307" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="245.78,652.78,253.5758,646.7612,248.1556,648.3804,246.5364,642.9602,245.78,652.78" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="51" x="287.5" y="548.177">T,Args...</text>
+    </g>
+    <g id="link_C_0001724002183455178980_C_0000798619347004821702">
+      <path codeLine="39" d="M121,291.96 C128.35,341.14 142.788,437.5779 151.108,493.2179 " fill="none" id="C_0001724002183455178980-to-C_0000798619347004821702" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="153.77,511.02,157.042,492.3306,145.174,494.1053,153.77,511.02" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001372381231906520278_C_0000798619347004821702">
+      <path codeLine="40" d="M201.69,369.85 C192.92,404.94 180.6467,454.0277 170.7767,493.4977 " fill="none" id="C_0001372381231906520278-to-C_0000798619347004821702" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="166.41,510.96,176.5975,494.9533,164.9559,492.0421,166.41,510.96" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000290383080560130133_C_0001372381231906520278">
+      <path codeLine="41" d="M271.11,213.99 C256.97,243.02 235.6389,286.8366 221.4989,315.8466 " fill="none" id="C_0000290383080560130133-to-C_0001372381231906520278" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="218.87,321.24,226.4089,314.9024,221.0607,316.7455,219.2177,311.3973,218.87,321.24" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000290383080560130133_C_0000420594889696591405">
+      <path codeLine="42" d="M283.91,214.01 C286.47,256.47 290.8287,328.6725 293.9887,381.1825 " fill="none" id="C_0000290383080560130133-to-C_0000420594889696591405" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="295.07,399.15,299.9779,380.8221,287.9996,381.5429,295.07,399.15" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001015108159699260009_C_0001724002183455178980">
+      <path codeLine="43" d="M143.3694,100.8564 C136.2894,146.2164 126.87,206.58 121.12,243.39 " fill="none" id="C_0001015108159699260009-backto-C_0001724002183455178980" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="145.22,89,140.3425,94.3114,143.3694,100.8564,148.2468,95.5451,145.22,89" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="146.5" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="153.5" y="131.677">aa</text>
+    </g>
+    <g id="link_C_0001015108159699260009_C_0000290383080560130133">
+      <path codeLine="44" d="M197.2441,97.6174 C220.3741,122.3074 241.04,144.35 260.52,165.15 " fill="none" id="C_0001015108159699260009-backto-C_0000290383080560130133" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="189.04,88.86,190.2229,95.9734,197.2441,97.6174,196.0612,90.504,189.04,88.86" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="238.5" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="245.5" y="131.677">bb</text>
+    </g>
+    <g id="link_C_0001725820236573641307_C_0000039461943261269692">
+      <path codeLine="45" d="M228.5,712.47 C228.5,731.22 228.5,749.31 228.5,766.79 " fill="none" id="C_0001725820236573641307-to-C_0000039461943261269692" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="228.5,772.79,232.5,763.79,228.5,767.79,224.5,763.79,228.5,772.79" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00058_class_mermaid.svg b/docs/test_cases/t00058_class_mermaid.svg
index 5ad57e5a..345cd26e 100644
--- a/docs/test_cases/t00058_class_mermaid.svg
+++ b/docs/test_cases/t00058_class_mermaid.svg
@@ -1,63 +1,68 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 652.8828125 647" style="max-width: 652.883px; background-color: white;" width="652.8828125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M287.2421875,481L287.2421875,488.5C287.2421875,496,287.2421875,511,294.9073660714286,524.1666666666666C302.57254464285717,537.3333333333334,317.9029017857143,548.6666666666666,325.5680803571429,554.3333333333334L333.23325892857144,560"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M530.859375,492L530.859375,497.6666666666667C530.859375,503.3333333333333,530.859375,514.6666666666666,519.7422760770975,526C508.625177154195,537.3333333333334,486.39097930839006,548.6666666666666,475.27388038548753,554.3333333333334L464.15678146258506,560"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M182.7421875,341L182.7421875,345.1666666666667C182.7421875,349.3333333333333,182.7421875,357.6666666666667,191.04682326158942,367.8333333333333C199.35145902317882,378,215.9607305463576,390,224.26536630794703,396L232.57000206953643,402"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M391.7421875,341L391.7421875,345.1666666666667C391.7421875,349.3333333333333,391.7421875,357.6666666666667,383.4375517384106,367.8333333333333C375.13291597682115,378,358.52364445364236,390,350.21900869205297,396L341.91437293046357,402"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M438.2010075934579,234L430.4578709112149,238.16666666666666C422.71473422897196,242.33333333333334,407.22846086448595,250.66666666666666,399.48532418224295,259C391.7421875,267.3333333333333,391.7421875,275.6666666666667,391.7421875,279.8333333333333L391.7421875,284"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M512.3101635514018,234L515.4016987928348,238.16666666666666C518.4932340342679,242.33333333333334,524.6763045171339,250.66666666666666,527.767839758567,263.75C530.859375,276.8333333333333,530.859375,294.6666666666667,530.859375,312.5C530.859375,330.3333333333333,530.859375,348.1666666666667,530.859375,361.25C530.859375,374.3333333333333,530.859375,382.6666666666667,530.859375,386.8333333333333L530.859375,391"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M264.7935928254438,109L251.1183586045365,114.66666666666667C237.4431243836292,120.33333333333333,210.09265594181457,131.66666666666666,196.4174217209073,147.75C182.7421875,163.83333333333334,182.7421875,184.66666666666666,182.7421875,204C182.7421875,223.33333333333334,182.7421875,241.16666666666666,182.7421875,254.25C182.7421875,267.3333333333333,182.7421875,275.6666666666667,182.7421875,279.8333333333333L182.7421875,284"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M449.1167252218935,109L456.12461476824456,114.66666666666667C463.1325043145957,120.33333333333333,477.1482834072978,131.66666666666666,484.1561729536489,143C491.1640625,154.33333333333334,491.1640625,165.66666666666666,491.1640625,171.33333333333334L491.1640625,177"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M287.2421875,481L287.2421875,488.5C287.2421875,496,287.2421875,511,294.1032450870902,523.572200988476C300.9643026741805,536.1444019769519,314.686417848361,546.2888039539038,321.5474754354512,551.3610049423797L328.40853302254146,556.4332059308557"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M530.859375,492L530.859375,497.6666666666667C530.859375,503.3333333333333,530.859375,514.6666666666666,520.6332105631419,525.545868145164C510.4070461262839,536.4250696236614,489.9547172525679,546.850139247323,479.72855281570986,552.0626740591538L469.50238837885183,557.2752088709846"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M182.7421875,341L182.7421875,345.1666666666667C182.7421875,349.3333333333333,182.7421875,357.6666666666667,188.61509242076352,366.07643688852613C194.48799734152703,374.4862071103856,206.23380718305407,382.9724142207711,212.10671210381759,387.2155177759639L217.97961702458113,391.4586213311567"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M391.7421875,341L391.7421875,345.1666666666667C391.7421875,349.3333333333333,391.7421875,357.6666666666667,385.86928257923654,366.07643688852613C379.99637765847297,374.4862071103856,368.25056781694593,382.9724142207711,362.37766289618247,387.2155177759639L356.5047579754189,391.4586213311567"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M438.2010075934579,234L430.4578709112149,238.16666666666666C422.71473422897196,242.33333333333334,407.22846086448595,250.66666666666666,399.48532418224295,258C391.7421875,265.3333333333333,391.7421875,271.6666666666667,391.7421875,274.8333333333333L391.7421875,278"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M512.3101635514018,234L515.4016987928348,238.16666666666666C518.4932340342679,242.33333333333334,524.6763045171339,250.66666666666666,527.767839758567,263.75C530.859375,276.8333333333333,530.859375,294.6666666666667,530.859375,312.5C530.859375,330.3333333333333,530.859375,348.1666666666667,530.859375,358.25C530.859375,368.3333333333333,530.859375,370.6666666666667,530.859375,371.8333333333333L530.859375,373"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M248.16470686068473,115.89058426920673L237.26095363390394,120.40882022433895C226.35720040712317,124.92705617947115,204.5496939535616,133.96352808973558,193.64594072678082,148.89843071153447C182.7421875,163.83333333333334,182.7421875,184.66666666666666,182.7421875,204C182.7421875,223.33333333333334,182.7421875,241.16666666666666,182.7421875,254.25C182.7421875,267.3333333333333,182.7421875,275.6666666666667,182.7421875,279.8333333333333L182.7421875,284"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M463.11336903528013,120.31786030843224L467.7884846127334,124.09821692369354C472.46360019018675,127.87857353895483,481.8138313450934,135.43928676947743,486.48894692254663,144.8863100514054C491.1640625,154.33333333333334,491.1640625,165.66666666666666,491.1640625,171.33333333333334L491.1640625,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(287.2421875, 526)" class="edgeLabel">
@@ -150,7 +155,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L11">
+        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L11">
           <g title="first_type" id="classId-C_0000039461943261269692-0" class="node default clickable">
             <rect height="57" width="167.953125" y="-28.5" x="-83.9765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.9765625" x1="-83.9765625" class="divider"/>
@@ -169,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L22">
+        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L22">
           <g title="same_as_first_type" id="classId-C_0001725820236573641307-1" class="node default clickable">
             <rect height="79" width="244.46875" y="-39.5" x="-122.234375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="122.234375" x1="-122.234375" class="divider"/>
@@ -188,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L27">
+        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0000798619347004821702-2" class="node default clickable">
             <rect height="79" width="148.84375" y="-39.5" x="-74.421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -212,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33">
+        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000420594889696591405-3" class="node default clickable">
             <rect height="101" width="148.84375" y="-50.5" x="-74.421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -241,7 +246,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L27">
+        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0001724002183455178980-4" class="node default clickable">
             <rect height="57" width="229.21875" y="-28.5" x="-114.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="114.609375" x1="-114.609375" class="divider"/>
@@ -260,7 +265,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33">
+        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33">
           <g title="A" id="classId-C_0001372381231906520278-5" class="node default clickable">
             <rect height="57" width="88.78125" y="-28.5" x="-44.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="44.390625" x1="-44.390625" class="divider"/>
@@ -279,7 +284,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L33">
+        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000290383080560130133-6" class="node default clickable">
             <rect height="57" width="307.4375" y="-28.5" x="-153.71875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="153.71875" x1="-153.71875" class="divider"/>
@@ -298,7 +303,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00058/t00058.cc#L38">
+        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L38">
           <g title="R" id="classId-C_0001015108159699260009-7" class="node default clickable">
             <rect height="101" width="321.421875" y="-50.5" x="-160.7109375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="160.7109375" x1="-160.7109375" class="divider"/>
diff --git a/docs/test_cases/t00059.md b/docs/test_cases/t00059.md
index 1686ab54..ca9aa916 100644
--- a/docs/test_cases/t00059.md
+++ b/docs/test_cases/t00059.md
@@ -12,7 +12,7 @@ diagrams:
     using_namespace: clanguml::t00059
 ```
 ## Source code
-File t00059.cc
+File `tests/t00059/t00059.cc`
 ```cpp
 #include <string>
 
@@ -165,6 +165,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -190,6 +191,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -238,6 +240,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -263,6 +266,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -311,6 +315,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -336,6 +341,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -384,6 +390,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -409,6 +416,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -457,6 +465,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -482,6 +491,7 @@ struct R {
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg
index a9b69bb0..1b58e64d 100644
--- a/docs/test_cases/t00059_class.svg
+++ b/docs/test_cases/t00059_class.svg
@@ -1,239 +1,279 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="679px" preserveAspectRatio="none" style="width:1199px;height:679px;" version="1.1" viewBox="0 0 1199 679" width="1199px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="719px" preserveAspectRatio="none" style="width:1250px;height:719px;background:#FFFFFF;" version="1.1" viewBox="0 0 1250 719" width="1250px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f9ndp7jenyu6k" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="534" y="576"/>
-      <ellipse cx="549" cy="594.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M551.9688,600.6094 Q551.3906,600.9063 550.75,601.0469 Q550.1094,601.2031 549.4063,601.2031 Q546.9063,601.2031 545.5781,599.5625 Q544.2656,597.9063 544.2656,594.7813 Q544.2656,591.6563 545.5781,590 Q546.9063,588.3438 549.4063,588.3438 Q550.1094,588.3438 550.75,588.5 Q551.4063,588.6563 551.9688,588.9531 L551.9688,591.6719 Q551.3438,591.0938 550.75,590.8281 Q550.1563,590.5469 549.5313,590.5469 Q548.1875,590.5469 547.5,591.625 Q546.8125,592.6875 546.8125,594.7813 Q546.8125,596.875 547.5,597.9531 Q548.1875,599.0156 549.5313,599.0156 Q550.1563,599.0156 550.75,598.75 Q551.3438,598.4688 551.9688,597.8906 L551.9688,600.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="561" y="592.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="574.5" y="606.1074">fruit_c</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="632" y="573"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="633" y="585.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="535" x2="637" y1="613.9375" y2="613.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="540" y="628.1479">(T t)</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="535" x2="637" y1="634.7422" y2="634.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="540" y="648.9526">T{}</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="540" y="661.7573">t.get_name()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
+      <g id="elem_C_0001926201868069460340">
+        <rect codeLine="2" fill="#F1F1F1" height="109.3998" id="C_0001926201868069460340" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="96" x="565" y="602.8"/>
+        <ellipse cx="580" cy="624.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M575,625.4563 C575,627.9563 577.1406,629.7688 580.0625,629.7688 C581.2969,629.7688 582.4688,629.4719 583.2188,628.9563 C583.8281,628.5344 584.1563,628.1125 584.1563,627.7063 C584.1563,627.2375 583.7344,626.8313 583.2344,626.8313 C583,626.8313 582.7813,626.9094 582.5781,627.1125 C582.1406,627.55 582.1406,627.55 581.9688,627.6438 C581.5156,627.8781 580.875,628.0188 580.1094,628.0188 C578.1094,628.0188 576.8281,627.0031 576.8281,625.425 L576.8281,624.3781 C576.8281,622.675 578.0469,621.4719 579.75,621.4719 C580.3281,621.4719 580.9063,621.6125 581.375,621.8625 C581.8438,622.1281 582.0156,622.3156 582.0781,622.675 C582.2031,623.3469 582.4531,623.5969 582.9844,623.5969 C583.2656,623.5969 583.5469,623.4563 583.7344,623.2375 C583.8594,623.0656 583.9063,622.8938 583.9063,622.4563 L583.9063,621.0969 C583.9063,620.675 583.8906,620.5344 583.7656,620.3625 C583.5938,620.1125 583.3125,619.9563 582.9844,619.9563 C582.6719,619.9563 582.4688,620.0656 582.25,620.3313 C581.0781,619.8313 580.6406,619.7219 579.6875,619.7219 C577.0156,619.7219 575,621.7375 575,624.3625 L575,625.4563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="592" y="621.0001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="601" y="637.0061">fruit_c</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="655" y="599.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="656" y="614.0001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="566" x2="660" y1="645.8" y2="645.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="571" y="662.806">(T t)</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="566" x2="660" y1="670.6" y2="670.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="571" y="687.6059">T{}</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="571" y="704.4058">t.get_name()</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="456" y="419"/>
-      <ellipse cx="475.5" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M478.4688,443.6094 Q477.8906,443.9063 477.25,444.0469 Q476.6094,444.2031 475.9063,444.2031 Q473.4063,444.2031 472.0781,442.5625 Q470.7656,440.9063 470.7656,437.7813 Q470.7656,434.6563 472.0781,433 Q473.4063,431.3438 475.9063,431.3438 Q476.6094,431.3438 477.25,431.5 Q477.9063,431.6563 478.4688,431.9531 L478.4688,434.6719 Q477.8438,434.0938 477.25,433.8281 Q476.6563,433.5469 476.0313,433.5469 Q474.6875,433.5469 474,434.625 Q473.3125,435.6875 473.3125,437.7813 Q473.3125,439.875 474,440.9531 Q474.6875,442.0156 476.0313,442.0156 Q476.6563,442.0156 477.25,441.75 Q477.8438,441.4688 478.4688,440.8906 L478.4688,443.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="488.5" y="435.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="497" y="449.1074">apple_c</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="564" y="416"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="565" y="428.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="457" x2="569" y1="456.9375" y2="456.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="462" y="471.1479">(T t)</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="457" x2="569" y1="477.7422" y2="477.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="462" y="491.9526">t.get_sweetness()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
+      <g id="elem_C_0001932582371736186409">
+        <rect codeLine="9" fill="#F1F1F1" height="92.5999" id="C_0001932582371736186409" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="125" x="471.5" y="433.2"/>
+        <ellipse cx="499.55" cy="454.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M494.55,455.8563 C494.55,458.3563 496.6906,460.1688 499.6125,460.1688 C500.8469,460.1688 502.0188,459.8719 502.7688,459.3563 C503.3781,458.9344 503.7063,458.5125 503.7063,458.1063 C503.7063,457.6375 503.2844,457.2313 502.7844,457.2313 C502.55,457.2313 502.3313,457.3094 502.1281,457.5125 C501.6906,457.95 501.6906,457.95 501.5188,458.0438 C501.0656,458.2781 500.425,458.4188 499.6594,458.4188 C497.6594,458.4188 496.3781,457.4031 496.3781,455.825 L496.3781,454.7781 C496.3781,453.075 497.5969,451.8719 499.3,451.8719 C499.8781,451.8719 500.4563,452.0125 500.925,452.2625 C501.3938,452.5281 501.5656,452.7156 501.6281,453.075 C501.7531,453.7469 502.0031,453.9969 502.5344,453.9969 C502.8156,453.9969 503.0969,453.8563 503.2844,453.6375 C503.4094,453.4656 503.4563,453.2938 503.4563,452.8563 L503.4563,451.4969 C503.4563,451.075 503.4406,450.9344 503.3156,450.7625 C503.1438,450.5125 502.8625,450.3563 502.5344,450.3563 C502.2219,450.3563 502.0188,450.4656 501.8,450.7313 C500.6281,450.2313 500.1906,450.1219 499.2375,450.1219 C496.5656,450.1219 494.55,452.1375 494.55,454.7625 L494.55,455.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="514.45" y="451.4001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="517.95" y="467.4061">apple_c</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="590.5" y="430.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="591.5" y="444.4001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="472.5" x2="595.5" y1="476.2" y2="476.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="477.5" y="493.206">(T t)</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="472.5" x2="595.5" y1="501" y2="501"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="477.5" y="518.0059">t.get_sweetness()</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="605" y="419"/>
-      <ellipse cx="622.7" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M625.6688,443.6094 Q625.0906,443.9063 624.45,444.0469 Q623.8094,444.2031 623.1063,444.2031 Q620.6063,444.2031 619.2781,442.5625 Q617.9656,440.9063 617.9656,437.7813 Q617.9656,434.6563 619.2781,433 Q620.6063,431.3438 623.1063,431.3438 Q623.8094,431.3438 624.45,431.5 Q625.1063,431.6563 625.6688,431.9531 L625.6688,434.6719 Q625.0438,434.0938 624.45,433.8281 Q623.8563,433.5469 623.2313,433.5469 Q621.8875,433.5469 621.2,434.625 Q620.5125,435.6875 620.5125,437.7813 Q620.5125,439.875 621.2,440.9531 Q621.8875,442.0156 623.2313,442.0156 Q623.8563,442.0156 624.45,441.75 Q625.0438,441.4688 625.6688,440.8906 L625.6688,443.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="635.3" y="435.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="638.8" y="449.1074">orange_c</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="709" y="416"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="710" y="428.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="606" x2="714" y1="456.9375" y2="456.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="611" y="471.1479">(T t)</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="606" x2="714" y1="477.7422" y2="477.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="611" y="491.9526">t.get_bitterness()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
+      <g id="elem_C_0001483904441065806133">
+        <rect codeLine="15" fill="#F1F1F1" height="92.5999" id="C_0001483904441065806133" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="632" y="433.2"/>
+        <ellipse cx="654.65" cy="454.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M649.65,455.8563 C649.65,458.3563 651.7906,460.1688 654.7125,460.1688 C655.9469,460.1688 657.1188,459.8719 657.8688,459.3563 C658.4781,458.9344 658.8063,458.5125 658.8063,458.1063 C658.8063,457.6375 658.3844,457.2313 657.8844,457.2313 C657.65,457.2313 657.4313,457.3094 657.2281,457.5125 C656.7906,457.95 656.7906,457.95 656.6188,458.0438 C656.1656,458.2781 655.525,458.4188 654.7594,458.4188 C652.7594,458.4188 651.4781,457.4031 651.4781,455.825 L651.4781,454.7781 C651.4781,453.075 652.6969,451.8719 654.4,451.8719 C654.9781,451.8719 655.5563,452.0125 656.025,452.2625 C656.4938,452.5281 656.6656,452.7156 656.7281,453.075 C656.8531,453.7469 657.1031,453.9969 657.6344,453.9969 C657.9156,453.9969 658.1969,453.8563 658.3844,453.6375 C658.5094,453.4656 658.5563,453.2938 658.5563,452.8563 L658.5563,451.4969 C658.5563,451.075 658.5406,450.9344 658.4156,450.7625 C658.2438,450.5125 657.9625,450.3563 657.6344,450.3563 C657.3219,450.3563 657.1188,450.4656 656.9,450.7313 C655.7281,450.2313 655.2906,450.1219 654.3375,450.1219 C651.6656,450.1219 649.65,452.1375 649.65,454.7625 L649.65,455.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="671.85" y="451.4001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="670.35" y="467.4061">orange_c</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="746" y="430.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="747" y="444.4001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="633" x2="751" y1="476.2" y2="476.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="638" y="493.206">(T t)</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="633" x2="751" y1="501" y2="501"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="638" y="518.0059">t.get_bitterness()</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="268"/>
-      <ellipse cx="65.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M68.7188,289.6406 Q68.1406,289.9375 67.5,290.0781 Q66.8594,290.2344 66.1563,290.2344 Q63.6563,290.2344 62.3281,288.5938 Q61.0156,286.9375 61.0156,283.8125 Q61.0156,280.6875 62.3281,279.0313 Q63.6563,277.375 66.1563,277.375 Q66.8594,277.375 67.5,277.5313 Q68.1563,277.6875 68.7188,277.9844 L68.7188,280.7031 Q68.0938,280.125 67.5,279.8594 Q66.9063,279.5781 66.2813,279.5781 Q64.9375,279.5781 64.25,280.6563 Q63.5625,281.7188 63.5625,283.8125 Q63.5625,285.9063 64.25,286.9844 Q64.9375,288.0469 66.2813,288.0469 Q66.9063,288.0469 67.5,287.7813 Q68.0938,287.5 68.7188,286.9219 L68.7188,289.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="68" x="86.25" y="288.1543">gala_apple</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="300" y2="300"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
+      <g id="elem_C_0000399997161214328320">
+        <rect codeLine="21" fill="#F1F1F1" height="81.5999" id="C_0000399997161214328320" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="7" y="274.6"/>
+        <ellipse cx="73.75" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M68.75,291.7563 C68.75,294.2563 70.8906,296.0688 73.8125,296.0688 C75.0469,296.0688 76.2188,295.7719 76.9688,295.2563 C77.5781,294.8344 77.9063,294.4125 77.9063,294.0063 C77.9063,293.5375 77.4844,293.1313 76.9844,293.1313 C76.75,293.1313 76.5313,293.2094 76.3281,293.4125 C75.8906,293.85 75.8906,293.85 75.7188,293.9438 C75.2656,294.1781 74.625,294.3188 73.8594,294.3188 C71.8594,294.3188 70.5781,293.3031 70.5781,291.725 L70.5781,290.6781 C70.5781,288.975 71.7969,287.7719 73.5,287.7719 C74.0781,287.7719 74.6563,287.9125 75.125,288.1625 C75.5938,288.4281 75.7656,288.6156 75.8281,288.975 C75.9531,289.6469 76.2031,289.8969 76.7344,289.8969 C77.0156,289.8969 77.2969,289.7563 77.4844,289.5375 C77.6094,289.3656 77.6563,289.1938 77.6563,288.7563 L77.6563,287.3969 C77.6563,286.975 77.6406,286.8344 77.5156,286.6625 C77.3438,286.4125 77.0625,286.2563 76.7344,286.2563 C76.4219,286.2563 76.2188,286.3656 76,286.6313 C74.8281,286.1313 74.3906,286.0219 73.4375,286.0219 C70.7656,286.0219 68.75,288.0375 68.75,290.6625 L68.75,291.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="70" x="94.25" y="295.206">gala_apple</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="218" y1="306.6" y2="306.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="315.5"/>
+          <ellipse cx="18" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="27" y="323.6059">get_name() const : std::string</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="332.2999"/>
+          <ellipse cx="18" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="27" y="340.4059">get_sweetness() const : float</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="218" y1="348.1999" y2="348.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="306"/>
-      <ellipse cx="17" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
+      <g id="elem_C_0000660406972347773654">
+        <rect codeLine="27" fill="#F1F1F1" height="81.5999" id="C_0000660406972347773654" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="784" y="274.6"/>
+        <ellipse cx="842.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M837.25,291.7563 C837.25,294.2563 839.3906,296.0688 842.3125,296.0688 C843.5469,296.0688 844.7188,295.7719 845.4688,295.2563 C846.0781,294.8344 846.4063,294.4125 846.4063,294.0063 C846.4063,293.5375 845.9844,293.1313 845.4844,293.1313 C845.25,293.1313 845.0313,293.2094 844.8281,293.4125 C844.3906,293.85 844.3906,293.85 844.2188,293.9438 C843.7656,294.1781 843.125,294.3188 842.3594,294.3188 C840.3594,294.3188 839.0781,293.3031 839.0781,291.725 L839.0781,290.6781 C839.0781,288.975 840.2969,287.7719 842,287.7719 C842.5781,287.7719 843.1563,287.9125 843.625,288.1625 C844.0938,288.4281 844.2656,288.6156 844.3281,288.975 C844.4531,289.6469 844.7031,289.8969 845.2344,289.8969 C845.5156,289.8969 845.7969,289.7563 845.9844,289.5375 C846.1094,289.3656 846.1563,289.1938 846.1563,288.7563 L846.1563,287.3969 C846.1563,286.975 846.1406,286.8344 846.0156,286.6625 C845.8438,286.4125 845.5625,286.2563 845.2344,286.2563 C844.9219,286.2563 844.7188,286.3656 844.5,286.6313 C843.3281,286.1313 842.8906,286.0219 841.9375,286.0219 C839.2656,286.0219 837.25,288.0375 837.25,290.6625 L837.25,291.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="862.75" y="295.206">empire_apple</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="785" x2="995" y1="306.6" y2="306.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="790" y="315.5"/>
+          <ellipse cx="795" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="804" y="323.6059">get_name() const : std::string</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="790" y="332.2999"/>
+          <ellipse cx="795" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="804" y="340.4059">get_sweetness() const : float</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="785" x2="995" y1="348.1999" y2="348.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="314.2104">get_name() const : std::string</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
+      <g id="elem_C_0001649295452510454080">
+        <rect codeLine="33" fill="#F1F1F1" height="81.5999" id="C_0001649295452510454080" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="1031" y="274.6"/>
+        <ellipse cx="1093.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1088.25,291.7563 C1088.25,294.2563 1090.3906,296.0688 1093.3125,296.0688 C1094.5469,296.0688 1095.7188,295.7719 1096.4688,295.2563 C1097.0781,294.8344 1097.4063,294.4125 1097.4063,294.0063 C1097.4063,293.5375 1096.9844,293.1313 1096.4844,293.1313 C1096.25,293.1313 1096.0313,293.2094 1095.8281,293.4125 C1095.3906,293.85 1095.3906,293.85 1095.2188,293.9438 C1094.7656,294.1781 1094.125,294.3188 1093.3594,294.3188 C1091.3594,294.3188 1090.0781,293.3031 1090.0781,291.725 L1090.0781,290.6781 C1090.0781,288.975 1091.2969,287.7719 1093,287.7719 C1093.5781,287.7719 1094.1563,287.9125 1094.625,288.1625 C1095.0938,288.4281 1095.2656,288.6156 1095.3281,288.975 C1095.4531,289.6469 1095.7031,289.8969 1096.2344,289.8969 C1096.5156,289.8969 1096.7969,289.7563 1096.9844,289.5375 C1097.1094,289.3656 1097.1563,289.1938 1097.1563,288.7563 L1097.1563,287.3969 C1097.1563,286.975 1097.1406,286.8344 1097.0156,286.6625 C1096.8438,286.4125 1096.5625,286.2563 1096.2344,286.2563 C1095.9219,286.2563 1095.7188,286.3656 1095.5,286.6313 C1094.3281,286.1313 1093.8906,286.0219 1092.9375,286.0219 C1090.2656,286.0219 1088.25,288.0375 1088.25,290.6625 L1088.25,291.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="1113.75" y="295.206">lima_orange</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1032" x2="1242" y1="306.6" y2="306.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1037" y="315.5"/>
+          <ellipse cx="1042" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177" x="1051" y="323.6059">get_bitterness() const : float</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1037" y="332.2999"/>
+          <ellipse cx="1042" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1051" y="340.4059">get_name() const : std::string</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1032" x2="1242" y1="348.1999" y2="348.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="318.8047"/>
-      <ellipse cx="17" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
+      <g id="elem_C_0000802727760415733923">
+        <rect codeLine="39" fill="#F1F1F1" height="81.5999" id="C_0000802727760415733923" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="254" y="274.6"/>
+        <ellipse cx="303.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M298.25,291.7563 C298.25,294.2563 300.3906,296.0688 303.3125,296.0688 C304.5469,296.0688 305.7188,295.7719 306.4688,295.2563 C307.0781,294.8344 307.4063,294.4125 307.4063,294.0063 C307.4063,293.5375 306.9844,293.1313 306.4844,293.1313 C306.25,293.1313 306.0313,293.2094 305.8281,293.4125 C305.3906,293.85 305.3906,293.85 305.2188,293.9438 C304.7656,294.1781 304.125,294.3188 303.3594,294.3188 C301.3594,294.3188 300.0781,293.3031 300.0781,291.725 L300.0781,290.6781 C300.0781,288.975 301.2969,287.7719 303,287.7719 C303.5781,287.7719 304.1563,287.9125 304.625,288.1625 C305.0938,288.4281 305.2656,288.6156 305.3281,288.975 C305.4531,289.6469 305.7031,289.8969 306.2344,289.8969 C306.5156,289.8969 306.7969,289.7563 306.9844,289.5375 C307.1094,289.3656 307.1563,289.1938 307.1563,288.7563 L307.1563,287.3969 C307.1563,286.975 307.1406,286.8344 307.0156,286.6625 C306.8438,286.4125 306.5625,286.2563 306.2344,286.2563 C305.9219,286.2563 305.7188,286.3656 305.5,286.6313 C304.3281,286.1313 303.8906,286.0219 302.9375,286.0219 C300.2656,286.0219 298.25,288.0375 298.25,290.6625 L298.25,291.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="105" x="323.75" y="295.206">valencia_orange</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="255" x2="465" y1="306.6" y2="306.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="260" y="315.5"/>
+          <ellipse cx="265" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177" x="274" y="323.6059">get_bitterness() const : float</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="260" y="332.2999"/>
+          <ellipse cx="265" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="274" y="340.4059">get_name() const : std::string</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="255" x2="465" y1="348.1999" y2="348.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="26" y="327.0151">get_sweetness() const : float</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <g id="elem_C_0002301786483822933456">
+        <rect codeLine="45" fill="#F1F1F1" height="81.5999" id="C_0002301786483822933456" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="247" x="501.5" y="274.6"/>
+        <ellipse cx="516.5" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M511.5,291.7563 C511.5,294.2563 513.6406,296.0688 516.5625,296.0688 C517.7969,296.0688 518.9688,295.7719 519.7188,295.2563 C520.3281,294.8344 520.6563,294.4125 520.6563,294.0063 C520.6563,293.5375 520.2344,293.1313 519.7344,293.1313 C519.5,293.1313 519.2813,293.2094 519.0781,293.4125 C518.6406,293.85 518.6406,293.85 518.4688,293.9438 C518.0156,294.1781 517.375,294.3188 516.6094,294.3188 C514.6094,294.3188 513.3281,293.3031 513.3281,291.725 L513.3281,290.6781 C513.3281,288.975 514.5469,287.7719 516.25,287.7719 C516.8281,287.7719 517.4063,287.9125 517.875,288.1625 C518.3438,288.4281 518.5156,288.6156 518.5781,288.975 C518.7031,289.6469 518.9531,289.8969 519.4844,289.8969 C519.7656,289.8969 520.0469,289.7563 520.2344,289.5375 C520.3594,289.3656 520.4063,289.1938 520.4063,288.7563 L520.4063,287.3969 C520.4063,286.975 520.3906,286.8344 520.2656,286.6625 C520.0938,286.4125 519.8125,286.2563 519.4844,286.2563 C519.1719,286.2563 518.9688,286.3656 518.75,286.6313 C517.5781,286.1313 517.1406,286.0219 516.1875,286.0219 C513.5156,286.0219 511.5,288.0375 511.5,290.6625 L511.5,291.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="530.5" y="295.206">fruit_factory</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="138" x="613.5" y="271.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="136" x="614.5" y="285.8001">apple_c TA,orange_c TO</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="502.5" x2="747.5" y1="306.6" y2="306.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="507.5" y="315.5"/>
+          <ellipse cx="512.5" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="161" x="521.5" y="323.6059">create_apple() const : TA</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="507.5" y="332.2999"/>
+          <ellipse cx="512.5" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="521.5" y="340.4059">create_orange() const : TO</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="502.5" x2="747.5" y1="348.1999" y2="348.1999"/>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="268"/>
-      <ellipse cx="812.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M815.7188,289.6406 Q815.1406,289.9375 814.5,290.0781 Q813.8594,290.2344 813.1563,290.2344 Q810.6563,290.2344 809.3281,288.5938 Q808.0156,286.9375 808.0156,283.8125 Q808.0156,280.6875 809.3281,279.0313 Q810.6563,277.375 813.1563,277.375 Q813.8594,277.375 814.5,277.5313 Q815.1563,277.6875 815.7188,277.9844 L815.7188,280.7031 Q815.0938,280.125 814.5,279.8594 Q813.9063,279.5781 813.2813,279.5781 Q811.9375,279.5781 811.25,280.6563 Q810.5625,281.7188 810.5625,283.8125 Q810.5625,285.9063 811.25,286.9844 Q811.9375,288.0469 813.2813,288.0469 Q813.9063,288.0469 814.5,287.7813 Q815.0938,287.5 815.7188,286.9219 L815.7188,289.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="833.25" y="288.1543">empire_apple</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="300" y2="300"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <g id="elem_C_0000551278102444647278">
+        <rect codeLine="51" fill="#F1F1F1" height="48" id="C_0000551278102444647278" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="268" x="357" y="165.6"/>
+        <ellipse cx="372" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M367,182.7563 C367,185.2563 369.1406,187.0688 372.0625,187.0688 C373.2969,187.0688 374.4688,186.7719 375.2188,186.2563 C375.8281,185.8344 376.1563,185.4125 376.1563,185.0063 C376.1563,184.5375 375.7344,184.1313 375.2344,184.1313 C375,184.1313 374.7813,184.2094 374.5781,184.4125 C374.1406,184.85 374.1406,184.85 373.9688,184.9438 C373.5156,185.1781 372.875,185.3188 372.1094,185.3188 C370.1094,185.3188 368.8281,184.3031 368.8281,182.725 L368.8281,181.6781 C368.8281,179.975 370.0469,178.7719 371.75,178.7719 C372.3281,178.7719 372.9063,178.9125 373.375,179.1625 C373.8438,179.4281 374.0156,179.6156 374.0781,179.975 C374.2031,180.6469 374.4531,180.8969 374.9844,180.8969 C375.2656,180.8969 375.5469,180.7563 375.7344,180.5375 C375.8594,180.3656 375.9063,180.1938 375.9063,179.7563 L375.9063,178.3969 C375.9063,177.975 375.8906,177.8344 375.7656,177.6625 C375.5938,177.4125 375.3125,177.2563 374.9844,177.2563 C374.6719,177.2563 374.4688,177.3656 374.25,177.6313 C373.0781,177.1313 372.6406,177.0219 371.6875,177.0219 C369.0156,177.0219 367,179.0375 367,181.6625 L367,182.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="386" y="186.206">fruit_factory</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="159" x="469" y="162.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="157" x="470" y="176.8001">gala_apple,valencia_orange</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="358" x2="624" y1="197.6" y2="197.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="358" x2="624" y1="205.6" y2="205.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="306"/>
-      <ellipse cx="772" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <g id="elem_C_0000536390279563541226">
+        <rect codeLine="55" fill="#F1F1F1" height="48" id="C_0000536390279563541226" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="259" x="728.5" y="165.6"/>
+        <ellipse cx="743.5" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M738.5,182.7563 C738.5,185.2563 740.6406,187.0688 743.5625,187.0688 C744.7969,187.0688 745.9688,186.7719 746.7188,186.2563 C747.3281,185.8344 747.6563,185.4125 747.6563,185.0063 C747.6563,184.5375 747.2344,184.1313 746.7344,184.1313 C746.5,184.1313 746.2813,184.2094 746.0781,184.4125 C745.6406,184.85 745.6406,184.85 745.4688,184.9438 C745.0156,185.1781 744.375,185.3188 743.6094,185.3188 C741.6094,185.3188 740.3281,184.3031 740.3281,182.725 L740.3281,181.6781 C740.3281,179.975 741.5469,178.7719 743.25,178.7719 C743.8281,178.7719 744.4063,178.9125 744.875,179.1625 C745.3438,179.4281 745.5156,179.6156 745.5781,179.975 C745.7031,180.6469 745.9531,180.8969 746.4844,180.8969 C746.7656,180.8969 747.0469,180.7563 747.2344,180.5375 C747.3594,180.3656 747.4063,180.1938 747.4063,179.7563 L747.4063,178.3969 C747.4063,177.975 747.3906,177.8344 747.2656,177.6625 C747.0938,177.4125 746.8125,177.2563 746.4844,177.2563 C746.1719,177.2563 745.9688,177.3656 745.75,177.6313 C744.5781,177.1313 744.1406,177.0219 743.1875,177.0219 C740.5156,177.0219 738.5,179.0375 738.5,181.6625 L738.5,182.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="757.5" y="186.206">fruit_factory</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="150" x="840.5" y="162.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="148" x="841.5" y="176.8001">empire_apple,lima_orange</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="729.5" x2="986.5" y1="197.6" y2="197.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="729.5" x2="986.5" y1="205.6" y2="205.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="781" y="314.2104">get_name() const : std::string</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001128300671453354325">
+        <rect codeLine="59" fill="#F1F1F1" height="81.5999" id="C_0001128300671453354325" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="188" x="550" y="7"/>
+        <ellipse cx="634.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M629.75,24.1563 C629.75,26.6563 631.8906,28.4688 634.8125,28.4688 C636.0469,28.4688 637.2188,28.1719 637.9688,27.6563 C638.5781,27.2344 638.9063,26.8125 638.9063,26.4063 C638.9063,25.9375 638.4844,25.5313 637.9844,25.5313 C637.75,25.5313 637.5313,25.6094 637.3281,25.8125 C636.8906,26.25 636.8906,26.25 636.7188,26.3438 C636.2656,26.5781 635.625,26.7188 634.8594,26.7188 C632.8594,26.7188 631.5781,25.7031 631.5781,24.125 L631.5781,23.0781 C631.5781,21.375 632.7969,20.1719 634.5,20.1719 C635.0781,20.1719 635.6563,20.3125 636.125,20.5625 C636.5938,20.8281 636.7656,21.0156 636.8281,21.375 C636.9531,22.0469 637.2031,22.2969 637.7344,22.2969 C638.0156,22.2969 638.2969,22.1563 638.4844,21.9375 C638.6094,21.7656 638.6563,21.5938 638.6563,21.1563 L638.6563,19.7969 C638.6563,19.375 638.6406,19.2344 638.5156,19.0625 C638.3438,18.8125 638.0625,18.6563 637.7344,18.6563 C637.4219,18.6563 637.2188,18.7656 637,19.0313 C635.8281,18.5313 635.3906,18.4219 634.4375,18.4219 C631.7656,18.4219 629.75,20.4375 629.75,23.0625 L629.75,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="655.25" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="551" x2="737" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="551" x2="737" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="556" y="55.9"/>
+          <ellipse cx="561" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="570" y="64.0059">factory_1 : fruit_factory_1</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="556" y="72.6999"/>
+          <ellipse cx="561" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="570" y="80.8059">factory_2 : fruit_factory_2</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="318.8047"/>
-      <ellipse cx="772" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="781" y="327.0151">get_sweetness() const : float</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="268"/>
-      <ellipse cx="1047.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1050.7188,289.6406 Q1050.1406,289.9375 1049.5,290.0781 Q1048.8594,290.2344 1048.1563,290.2344 Q1045.6563,290.2344 1044.3281,288.5938 Q1043.0156,286.9375 1043.0156,283.8125 Q1043.0156,280.6875 1044.3281,279.0313 Q1045.6563,277.375 1048.1563,277.375 Q1048.8594,277.375 1049.5,277.5313 Q1050.1563,277.6875 1050.7188,277.9844 L1050.7188,280.7031 Q1050.0938,280.125 1049.5,279.8594 Q1048.9063,279.5781 1048.2813,279.5781 Q1046.9375,279.5781 1046.25,280.6563 Q1045.5625,281.7188 1045.5625,283.8125 Q1045.5625,285.9063 1046.25,286.9844 Q1046.9375,288.0469 1048.2813,288.0469 Q1048.9063,288.0469 1049.5,287.7813 Q1050.0938,287.5 1050.7188,286.9219 L1050.7188,289.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="1068.25" y="288.1543">lima_orange</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="300" y2="300"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="306"/>
-      <ellipse cx="1003" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="1012" y="314.2104">get_bitterness() const : float</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="318.8047"/>
-      <ellipse cx="1003" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="1012" y="327.0151">get_name() const : std::string</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="268"/>
-      <ellipse cx="279.9" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M282.8688,289.6406 Q282.2906,289.9375 281.65,290.0781 Q281.0094,290.2344 280.3063,290.2344 Q277.8063,290.2344 276.4781,288.5938 Q275.1656,286.9375 275.1656,283.8125 Q275.1656,280.6875 276.4781,279.0313 Q277.8063,277.375 280.3063,277.375 Q281.0094,277.375 281.65,277.5313 Q282.3063,277.6875 282.8688,277.9844 L282.8688,280.7031 Q282.2438,280.125 281.65,279.8594 Q281.0563,279.5781 280.4313,279.5781 Q279.0875,279.5781 278.4,280.6563 Q277.7125,281.7188 277.7125,283.8125 Q277.7125,285.9063 278.4,286.9844 Q279.0875,288.0469 280.4313,288.0469 Q281.0563,288.0469 281.65,287.7813 Q282.2438,287.5 282.8688,286.9219 L282.8688,289.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="102" x="300.1" y="288.1543">valencia_orange</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="300" y2="300"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="306"/>
-      <ellipse cx="248" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="257" y="314.2104">get_bitterness() const : float</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="318.8047"/>
-      <ellipse cx="248" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="257" y="327.0151">get_name() const : std::string</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="268"/>
-      <ellipse cx="483" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M485.9688,289.6406 Q485.3906,289.9375 484.75,290.0781 Q484.1094,290.2344 483.4063,290.2344 Q480.9063,290.2344 479.5781,288.5938 Q478.2656,286.9375 478.2656,283.8125 Q478.2656,280.6875 479.5781,279.0313 Q480.9063,277.375 483.4063,277.375 Q484.1094,277.375 484.75,277.5313 Q485.4063,277.6875 485.9688,277.9844 L485.9688,280.7031 Q485.3438,280.125 484.75,279.8594 Q484.1563,279.5781 483.5313,279.5781 Q482.1875,279.5781 481.5,280.6563 Q480.8125,281.7188 480.8125,283.8125 Q480.8125,285.9063 481.5,286.9844 Q482.1875,288.0469 483.5313,288.0469 Q484.1563,288.0469 484.75,287.7813 Q485.3438,287.5 485.9688,286.9219 L485.9688,289.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="497" y="288.1543">fruit_factory</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="150" x="579" y="265"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="580" y="277.1387">apple_c TA,orange_c TO</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="300" y2="300"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="306"/>
-      <ellipse cx="479" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="488" y="314.2104">create_apple() const : TA</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="318.8047"/>
-      <ellipse cx="479" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="488" y="327.0151">create_orange() const : TO</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="257" y="159"/>
-      <ellipse cx="272" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M274.9688,180.6406 Q274.3906,180.9375 273.75,181.0781 Q273.1094,181.2344 272.4063,181.2344 Q269.9063,181.2344 268.5781,179.5938 Q267.2656,177.9375 267.2656,174.8125 Q267.2656,171.6875 268.5781,170.0313 Q269.9063,168.375 272.4063,168.375 Q273.1094,168.375 273.75,168.5313 Q274.4063,168.6875 274.9688,168.9844 L274.9688,171.7031 Q274.3438,171.125 273.75,170.8594 Q273.1563,170.5781 272.5313,170.5781 Q271.1875,170.5781 270.5,171.6563 Q269.8125,172.7188 269.8125,174.8125 Q269.8125,176.9063 270.5,177.9844 Q271.1875,179.0469 272.5313,179.0469 Q273.1563,179.0469 273.75,178.7813 Q274.3438,178.5 274.9688,177.9219 L274.9688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="286" y="179.1543">fruit_factory</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="176" x="368" y="156"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="174" x="369" y="168.1387">gala_apple,valencia_orange</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="191" y2="191"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="199" y2="199"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="673" y="159"/>
-      <ellipse cx="688" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M690.9688,180.6406 Q690.3906,180.9375 689.75,181.0781 Q689.1094,181.2344 688.4063,181.2344 Q685.9063,181.2344 684.5781,179.5938 Q683.2656,177.9375 683.2656,174.8125 Q683.2656,171.6875 684.5781,170.0313 Q685.9063,168.375 688.4063,168.375 Q689.1094,168.375 689.75,168.5313 Q690.4063,168.6875 690.9688,168.9844 L690.9688,171.7031 Q690.3438,171.125 689.75,170.8594 Q689.1563,170.5781 688.5313,170.5781 Q687.1875,170.5781 686.5,171.6563 Q685.8125,172.7188 685.8125,174.8125 Q685.8125,176.9063 686.5,177.9844 Q687.1875,179.0469 688.5313,179.0469 Q689.1563,179.0469 689.75,178.7813 Q690.3438,178.5 690.9688,177.9219 L690.9688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="702" y="179.1543">fruit_factory</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="166" x="784" y="156"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="164" x="785" y="168.1387">empire_apple,lima_orange</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="191" y2="191"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="199" y2="199"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ndp7jenyu6k)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="469.5" y="8"/>
-      <ellipse cx="546.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M549.7188,29.6406 Q549.1406,29.9375 548.5,30.0781 Q547.8594,30.2344 547.1563,30.2344 Q544.6563,30.2344 543.3281,28.5938 Q542.0156,26.9375 542.0156,23.8125 Q542.0156,20.6875 543.3281,19.0313 Q544.6563,17.375 547.1563,17.375 Q547.8594,17.375 548.5,17.5313 Q549.1563,17.6875 549.7188,17.9844 L549.7188,20.7031 Q549.0938,20.125 548.5,19.8594 Q547.9063,19.5781 547.2813,19.5781 Q545.9375,19.5781 545.25,20.6563 Q544.5625,21.7188 544.5625,23.8125 Q544.5625,25.9063 545.25,26.9844 Q545.9375,28.0469 547.2813,28.0469 Q547.9063,28.0469 548.5,27.7813 Q549.0938,27.5 549.7188,26.9219 L549.7188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="567.25" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="54"/>
-      <ellipse cx="480.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="62.2104">factory_1 : fruit_factory_1</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="66.8047"/>
-      <ellipse cx="480.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="75.0151">factory_2 : fruit_factory_2</text>
-    </a>
-    <path d="M530.86,499.39 C540.67,521.03 552.94,548.09 563.42,571.19 " fill="none" id="C_0001932582371736186409-&gt;C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="565.49,575.76,565.4072,565.9115,563.421,571.2082,558.1243,569.2219,565.49,575.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="553" y="542.0669">T</text>
-    <path d="M641.9,499.39 C631.95,521.03 619.51,548.09 608.89,571.19 " fill="none" id="C_0001483904441065806133-&gt;C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="606.79,575.76,614.1972,569.269,608.888,571.2215,606.9356,565.9122,606.79,575.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="629" y="542.0669">T</text>
-    <path d="M577.09,342.02 C565.13,363.67 549.83,391.36 537.17,414.26 " fill="none" id="C_0002301786483822933456-&gt;C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="534.68,418.77,542.5326,412.8255,537.0973,414.3932,535.5296,408.9579,534.68,418.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="562" y="385.0669">TA</text>
-    <path d="M611.93,342.02 C620.86,363.58 632.28,391.13 641.75,413.97 " fill="none" id="C_0002301786483822933456-&gt;C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="643.74,418.77,643.9859,408.9242,641.824,414.1517,636.5966,411.9898,643.74,418.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="632" y="385.0669">TO</text>
-    <path d="M342.12,207.14 C301.17,223.8 245,246.64 197.5,265.97 " fill="none" id="C_0000551278102444647278-&gt;C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="192.63,267.95,202.474,268.2587,197.2605,266.0635,199.4556,260.85,192.63,267.95" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M386.66,207.14 C378.22,222.96 366.81,244.36 356.85,263.03 " fill="none" id="C_0000551278102444647278-&gt;C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="354.35,267.71,362.1025,261.6355,356.694,263.2935,355.0361,257.8851,354.35,267.71" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M437.18,207.14 C460.72,221.41 491.76,240.22 520.22,257.46 " fill="none" id="C_0000551278102444647278-&gt;C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="524.03,251.59,537.51,267.95,516.78,263.57,524.03,251.59" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M819.45,207.14 C825.91,222.96 834.65,244.36 842.27,263.03 " fill="none" id="C_0000536390279563541226-&gt;C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="844.18,267.71,844.4887,257.866,842.2935,263.0795,837.08,260.8844,844.18,267.71" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M863.99,207.14 C902.86,223.8 956.17,246.64 1001.26,265.97 " fill="none" id="C_0000536390279563541226-&gt;C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1005.87,267.95,999.1815,260.7206,1001.2765,265.9752,996.0219,268.0702,1005.87,267.95" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M768.93,207.14 C743.36,221.54 709.58,240.57 678.74,257.95 " fill="none" id="C_0000536390279563541226-&gt;C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="681.86,264.23,661,267.95,674.99,252.03,681.86,264.23" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M503.53,90.87 C477.57,113.51 447.15,140.02 425.84,158.6 " fill="none" id="C_0001128300671453354325&lt;-C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="513.6,82.09,506.4488,83.0174,504.5544,89.9752,511.7056,89.0478,513.6,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="483" 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="59" x="490" y="125.0669">factory_1</text>
-    <path d="M634.41,88.35 C678,111.6 730.37,139.53 766.51,158.8 " fill="none" id="C_0001128300671453354325&lt;-C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="622.67,82.09,626.0834,88.4421,633.2597,87.7343,629.8463,81.3823,622.67,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="712" 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="59" x="719" y="125.0669">factory_2</text>
+    <g id="link_C_0001932582371736186409_C_0001926201868069460340">
+      <path codeLine="64" d="M554.55,526.28 C565.02,549.61 575.3644,572.6455 586.3044,597.0355 " fill="none" id="C_0001932582371736186409-to-C_0001926201868069460340" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="588.76,602.51,588.7263,592.6612,586.7137,597.9479,581.427,595.9353,588.76,602.51" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="575" y="568.877">T</text>
+    </g>
+    <g id="link_C_0001483904441065806133_C_0001926201868069460340">
+      <path codeLine="65" d="M671.45,526.28 C660.98,549.61 650.6356,572.6455 639.6956,597.0355 " fill="none" id="C_0001483904441065806133-to-C_0001926201868069460340" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="637.24,602.51,644.573,595.9353,639.2863,597.9479,637.2737,592.6612,637.24,602.51" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="659" y="568.877">T</text>
+    </g>
+    <g id="link_C_0002301786483822933456_C_0001932582371736186409">
+      <path codeLine="66" d="M602.51,356.47 C589.51,379.63 576.0478,403.6085 562.5478,427.6485 " fill="none" id="C_0002301786483822933456-to-C_0001932582371736186409" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="559.61,432.88,567.5045,426.9912,562.0582,428.5204,560.5291,423.0741,559.61,432.88" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="586" y="399.277">TA</text>
+    </g>
+    <g id="link_C_0002301786483822933456_C_0001483904441065806133">
+      <path codeLine="67" d="M641.56,356.47 C651.13,379.63 660.9194,403.2945 670.8494,427.3345 " fill="none" id="C_0002301786483822933456-to-C_0001483904441065806133" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="673.14,432.88,673.4011,423.0346,671.2311,428.2587,666.007,426.0888,673.14,432.88" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="18" x="662" y="399.277">TO</text>
+    </g>
+    <g id="link_C_0000551278102444647278_C_0000399997161214328320">
+      <path codeLine="68" d="M419.46,214.03 C362.95,232.54 288.9419,256.7723 224.9819,277.7223 " fill="none" id="C_0000551278102444647278-to-C_0000399997161214328320" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="219.28,279.59,229.078,280.5898,224.0316,278.0336,226.5878,272.9872,219.28,279.59" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000551278102444647278_C_0000802727760415733923">
+      <path codeLine="69" d="M466.36,213.89 C448.42,230.84 428.0408,250.0989 406.9308,270.0489 " fill="none" id="C_0000551278102444647278-to-C_0000802727760415733923" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="402.57,274.17,411.8586,270.8955,406.204,270.7357,406.3637,265.0811,402.57,274.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000551278102444647278_C_0002301786483822933456">
+      <path codeLine="70" d="M516.2,213.89 C534.55,230.84 546.6399,242.0041 568.2299,261.9541 " fill="none" id="C_0000551278102444647278-to-C_0002301786483822933456" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="581.45,274.17,572.3018,257.5474,564.1579,266.3608,581.45,274.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000536390279563541226_C_0000660406972347773654">
+      <path codeLine="71" d="M864.02,213.89 C868.4,230.84 872.9376,248.4112 878.0976,268.3612 " fill="none" id="C_0000536390279563541226-to-C_0000660406972347773654" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="879.6,274.17,881.2189,264.4551,878.348,269.3293,873.4738,266.4584,879.6,274.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000536390279563541226_C_0001649295452510454080">
+      <path codeLine="72" d="M910.81,214.03 C948.96,230.96 995.9555,251.8168 1040.7655,271.6968 " fill="none" id="C_0000536390279563541226-to-C_0001649295452510454080" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1046.25,274.13,1039.6454,266.8239,1041.6796,272.1023,1036.4011,274.1365,1046.25,274.13" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000536390279563541226_C_0002301786483822933456">
+      <path codeLine="73" d="M813.9,214.03 C781.97,231 753.9263,245.9056 716.4463,265.8156 " fill="none" id="C_0000536390279563541226-to-C_0002301786483822933456" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="700.55,274.26,719.2611,271.1144,713.6315,260.5169,700.55,274.26" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001128300671453354325_C_0000551278102444647278">
+      <path codeLine="74" d="M591.3014,96.9547 C564.2814,121.6447 539.42,144.35 516.67,165.15 " fill="none" id="C_0001128300671453354325-backto-C_0000551278102444647278" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="600.16,88.86,593.0324,89.9545,591.3014,96.9547,598.4289,95.8602,600.16,88.86" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="574" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="581" y="131.677">factory_1</text>
+    </g>
+    <g id="link_C_0001128300671453354325_C_0000536390279563541226">
+      <path codeLine="75" d="M715.6564,95.6128 C753.4364,120.2928 790.45,144.47 822.19,165.21 " fill="none" id="C_0001128300671453354325-backto-C_0000536390279563541226" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="705.61,89.05,708.4456,95.6802,715.6564,95.6128,712.8208,88.9826,705.61,89.05" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="782" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="789" y="131.677">factory_2</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00059_class_mermaid.svg b/docs/test_cases/t00059_class_mermaid.svg
index 0025a45d..2579a153 100644
--- a/docs/test_cases/t00059_class_mermaid.svg
+++ b/docs/test_cases/t00059_class_mermaid.svg
@@ -1,70 +1,75 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1490.921875 797" style="max-width: 1490.92px; background-color: white;" width="1490.921875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1526.484375 797" style="max-width: 1526.48px; background-color: white;" width="1526.484375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M936.1328125,576L936.1328125,581.6666666666666C936.1328125,587.3333333333334,936.1328125,598.6666666666666,943.00390625,611.6682393630905C949.875,624.6698120595145,963.6171875,639.3396241190289,970.48828125,646.6745301487862L977.359375,654.0094361785434"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1135.6640625,576L1135.6640625,581.6666666666666C1135.6640625,587.3333333333334,1135.6640625,598.6666666666666,1128.79296875,611.6682393630905C1121.921875,624.6698120595145,1108.1796875,639.3396241190289,1101.30859375,646.6745301487862L1094.4375,654.0094361785434"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M976.2751941568048,385L969.584797214004,390.6666666666667C962.8944002712033,396.3333333333333,949.5136063856016,407.6666666666667,942.8232094428008,419C936.1328125,430.3333333333333,936.1328125,441.6666666666667,936.1328125,447.3333333333333L936.1328125,453"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1095.5216808431953,385L1102.2120777859961,390.6666666666667C1108.902474728797,396.3333333333333,1122.2832686143984,407.6666666666667,1128.9736655571992,419C1135.6640625,430.3333333333333,1135.6640625,441.6666666666667,1135.6640625,447.3333333333333L1135.6640625,453"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M263.9372079439253,234L241.31746495327107,238.16666666666666C218.69772196261684,242.33333333333334,173.45823598130843,250.66666666666666,150.8384929906542,259C128.21875,267.3333333333333,128.21875,275.6666666666667,128.21875,279.8333333333333L128.21875,284"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M418.65625,234L418.65625,238.16666666666666C418.65625,242.33333333333334,418.65625,250.66666666666666,418.65625,259C418.65625,267.3333333333333,418.65625,275.6666666666667,418.65625,279.8333333333333L418.65625,284"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M588.453125,227.38329726169192L629.33984375,232.6527477180766C670.2265625,237.9221981744613,752,248.46109908723065,804.0415200745033,257.897216210282C856.0830401490066,267.3333333333333,878.3926427980132,275.6666666666667,889.5474441225165,279.8333333333333L900.7022454470199,284"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M960.7973860981308,234L942.9600613317757,238.16666666666666C925.1227365654205,242.33333333333334,889.4480870327103,250.66666666666666,863.6262320511233,259C837.8043770695364,267.3333333333333,821.8353166390729,275.6666666666667,813.850786423841,279.8333333333333L805.8662562086092,284"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1124.2353971962616,234L1130.2925184968847,238.16666666666666C1136.3496397975077,242.33333333333334,1148.4638823987539,250.66666666666666,1168.1720453660437,259.9324237270666C1187.8802083333333,269.1981807874665,1215.1822916666667,279.396361574933,1228.8333333333333,284.49545196866626L1242.484375,289.5945423623995"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1144.8633542640187,234L1153.9362587616822,238.16666666666666C1163.0091632593458,242.33333333333334,1181.1549722546729,250.66666666666666,1181.2100873621598,259C1181.265202469647,267.3333333333333,1163.2296236892937,275.6666666666667,1154.211834299117,279.8333333333333L1145.1940449089404,284"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M508.34375,103.55383864671438L493.3958333333333,110.12819887226199C478.4479166666667,116.70255909780958,448.5520833333333,129.85127954890478,433.6041666666667,142.09230644111906C418.65625,154.33333333333334,418.65625,165.66666666666666,418.65625,171.33333333333334L418.65625,177"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M713.21875,76.83800625631011L774.81640625,87.86500521359176C836.4140625,98.8920041708734,959.609375,120.9460020854367,1021.20703125,137.639667709385C1082.8046875,154.33333333333334,1082.8046875,165.66666666666666,1082.8046875,171.33333333333334L1082.8046875,177"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M962.8046875,576L962.8046875,581.6666666666666C962.8046875,587.3333333333334,962.8046875,598.6666666666666,968.9921251056027,610.9384350905436C975.1795627112054,623.2102035144206,987.5544379224107,636.4204070288412,993.7418755280133,643.0255087860515L999.929313133616,649.6306105432618"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1162.3359375,576L1162.3359375,581.6666666666666C1162.3359375,587.3333333333334,1162.3359375,598.6666666666666,1156.1484998943972,610.9384350905436C1149.9610622887947,623.2102035144206,1137.5861870775893,636.4204070288412,1131.3987494719865,643.0255087860515L1125.211311866384,649.6306105432618"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M1002.9470691568048,385L996.256672214004,390.6666666666667C989.5662752712033,396.3333333333333,976.1854813856016,407.6666666666667,969.4950844428008,418C962.8046875,428.3333333333333,962.8046875,437.6666666666667,962.8046875,442.3333333333333L962.8046875,447"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1122.1935558431953,385L1128.8839527859961,390.6666666666667C1135.574349728797,396.3333333333333,1148.9551436143984,407.6666666666667,1155.6455405571992,418C1162.3359375,428.3333333333333,1162.3359375,437.6666666666667,1162.3359375,442.3333333333333L1162.3359375,447"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M272.5370181074766,234L249.22485883956384,238.16666666666666C225.91269957165107,242.33333333333334,179.28838103582552,250.66666666666666,155.97622176791276,258C132.6640625,265.3333333333333,132.6640625,271.6666666666667,132.6640625,274.8333333333333L132.6640625,278"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M431.9921875,234L431.9921875,238.16666666666666C431.9921875,242.33333333333334,431.9921875,250.66666666666666,431.9921875,258C431.9921875,265.3333333333333,431.9921875,271.6666666666667,431.9921875,274.8333333333333L431.9921875,278"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M601.7890625,226.7021625761278L644.8984375,232.0851354801065C688.0078125,237.46810838408518,774.2265625,248.23405419204258,825.6803965562013,256.73394315659374C877.1342306124026,265.2338321211448,893.8231487248053,271.4676642422897,902.1676077810066,274.5845803028621L910.512066837208,277.7014963634345"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M985.3920122663551,234L967.9008956386292,238.16666666666666C950.4097790109034,242.33333333333334,915.4275457554517,250.66666666666666,890.5987450333131,258.5483049955507C865.7699443111745,266.42994332443476,851.0945761223489,273.85988664886946,843.7568920279363,277.5748583110868L836.4192079335234,281.28982997330417"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1151.1980870327102,234L1157.9476246105917,238.16666666666666C1164.6971621884734,242.33333333333334,1178.1962373442368,250.66666666666666,1196.9191504160176,259.3057630168925C1215.6420634877986,267.94485936711834,1239.5888144755975,276.88971873423674,1251.5621899694968,281.3621484177959L1263.535565463396,285.8345781013551"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1170.642012266355,234L1180.2342289719625,238.16666666666666C1189.82644567757,242.33333333333334,1209.010879088785,250.66666666666666,1212.192400558493,257.7556427087924C1215.3739220282012,264.8446187509181,1202.5525315564025,270.6892375018362,1196.141836320503,273.6115468772952L1189.7311410846037,276.5338562527543"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M505.20291061118263,110.80061885285656L493.0011234259855,116.16718237738047C480.7993362407885,121.53374590190437,456.3957618703942,132.2668729509522,444.19397468519713,143.30010314214277C431.9921875,154.33333333333334,431.9921875,165.66666666666666,431.9921875,171.33333333333334L431.9921875,177"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M744.28310326173,79.61400076155226L804.4077943847751,90.17833396796021C864.5324855078201,100.74266717436818,984.78186775391,121.87133358718408,1044.9065588769552,138.1023334602587C1105.03125,154.33333333333334,1105.03125,165.66666666666666,1105.03125,171.33333333333334L1105.03125,177"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(936.1328125, 610)" class="edgeLabel">
+        <g transform="translate(962.8046875, 610)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -75,7 +80,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1135.6640625, 610)" class="edgeLabel">
+        <g transform="translate(1162.3359375, 610)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -86,7 +91,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(936.1328125, 419)" class="edgeLabel">
+        <g transform="translate(962.8046875, 419)" class="edgeLabel">
           <g transform="translate(-9.6328125, -9)" class="label">
             <foreignObject height="18" width="19.265625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -97,7 +102,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1135.6640625, 419)" class="edgeLabel">
+        <g transform="translate(1162.3359375, 419)" class="edgeLabel">
           <g transform="translate(-10.96875, -9)" class="label">
             <foreignObject height="18" width="21.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -174,7 +179,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(418.65625, 143)" class="edgeLabel">
+        <g transform="translate(431.9921875, 143)" class="edgeLabel">
           <g transform="translate(-37.578125, -9)" class="label">
             <foreignObject height="18" width="75.15625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -185,7 +190,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1082.8046875, 143)" class="edgeLabel">
+        <g transform="translate(1105.03125, 143)" class="edgeLabel">
           <g transform="translate(-37.578125, -9)" class="label">
             <foreignObject height="18" width="75.15625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -198,7 +203,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1035.8984375, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L7">
+        <a transform="translate(1062.5703125, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L7">
           <g title="fruit_c" id="classId-C_0001926201868069460340-0" class="node default clickable">
             <rect height="145" width="117.078125" y="-72.5" x="-58.5390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.5390625" x1="-58.5390625" class="divider"/>
@@ -224,15 +229,15 @@
                   <span class="nodeLabel">"t.get_name()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -51.0390625, 47)" height="18" width="40.390625">
+              <foreignObject transform="translate( -51.0390625, 47)" height="18" width="53.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T t)"</span>
+                  <span class="nodeLabel">"(T t) : "</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(936.1328125, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L13">
+        <a transform="translate(962.8046875, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L13">
           <g title="apple_c" id="classId-C_0001932582371736186409-1" class="node default clickable">
             <rect height="123" width="152.640625" y="-61.5" x="-76.3203125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.3203125" x1="-76.3203125" class="divider"/>
@@ -253,15 +258,15 @@
                   <span class="nodeLabel">"t.get_sweetness()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -68.8203125, 36)" height="18" width="40.390625">
+              <foreignObject transform="translate( -68.8203125, 36)" height="18" width="53.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T t)"</span>
+                  <span class="nodeLabel">"(T t) : "</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1135.6640625, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L16">
+        <a transform="translate(1162.3359375, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L16">
           <g title="orange_c" id="classId-C_0001483904441065806133-2" class="node default clickable">
             <rect height="123" width="146.421875" y="-61.5" x="-73.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="73.2109375" x1="-73.2109375" class="divider"/>
@@ -282,19 +287,19 @@
                   <span class="nodeLabel">"t.get_bitterness()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.7109375, 36)" height="18" width="40.390625">
+              <foreignObject transform="translate( -65.7109375, 36)" height="18" width="53.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T t)"</span>
+                  <span class="nodeLabel">"(T t) : "</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(128.21875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L18">
+        <a transform="translate(132.6640625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L18">
           <g title="gala_apple" id="classId-C_0000399997161214328320-3" class="node default clickable">
-            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <rect height="101" width="249.328125" y="-50.5" x="-124.6640625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -306,24 +311,24 @@
                   <span class="nodeLabel">gala_apple</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -112.71875, 3)" height="18" width="225.4375">
+              <foreignObject transform="translate( -117.1640625, 3)" height="18" width="234.328125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : [const] std::string</span>
+                  <span class="nodeLabel">+get_name() : : [const] std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -112.71875, 25)" height="18" width="221.890625">
+              <foreignObject transform="translate( -117.1640625, 25)" height="18" width="230.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_sweetness() : [const] float</span>
+                  <span class="nodeLabel">+get_sweetness() : : [const] float</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(709.09375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L24">
+        <a transform="translate(731.3203125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L24">
           <g title="empire_apple" id="classId-C_0000660406972347773654-4" class="node default clickable">
-            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <rect height="101" width="249.328125" y="-50.5" x="-124.6640625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -335,24 +340,24 @@
                   <span class="nodeLabel">empire_apple</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -112.71875, 3)" height="18" width="225.4375">
+              <foreignObject transform="translate( -117.1640625, 3)" height="18" width="234.328125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : [const] std::string</span>
+                  <span class="nodeLabel">+get_name() : : [const] std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -112.71875, 25)" height="18" width="221.890625">
+              <foreignObject transform="translate( -117.1640625, 25)" height="18" width="230.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_sweetness() : [const] float</span>
+                  <span class="nodeLabel">+get_sweetness() : : [const] float</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1362.703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L30">
+        <a transform="translate(1393.8203125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L30">
           <g title="lima_orange" id="classId-C_0001649295452510454080-5" class="node default clickable">
-            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <rect height="101" width="249.328125" y="-50.5" x="-124.6640625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -364,24 +369,24 @@
                   <span class="nodeLabel">lima_orange</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -112.71875, 3)" height="18" width="215.671875">
+              <foreignObject transform="translate( -117.1640625, 3)" height="18" width="224.5625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_bitterness() : [const] float</span>
+                  <span class="nodeLabel">+get_bitterness() : : [const] float</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -112.71875, 25)" height="18" width="225.4375">
+              <foreignObject transform="translate( -117.1640625, 25)" height="18" width="234.328125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : [const] std::string</span>
+                  <span class="nodeLabel">+get_name() : : [const] std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(418.65625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L36">
+        <a transform="translate(431.9921875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L36">
           <g title="valencia_orange" id="classId-C_0000802727760415733923-6" class="node default clickable">
-            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <rect height="101" width="249.328125" y="-50.5" x="-124.6640625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -393,20 +398,20 @@
                   <span class="nodeLabel">valencia_orange</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -112.71875, 3)" height="18" width="215.671875">
+              <foreignObject transform="translate( -117.1640625, 3)" height="18" width="224.5625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_bitterness() : [const] float</span>
+                  <span class="nodeLabel">+get_bitterness() : : [const] float</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -112.71875, 25)" height="18" width="225.4375">
+              <foreignObject transform="translate( -117.1640625, 25)" height="18" width="234.328125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : [const] std::string</span>
+                  <span class="nodeLabel">+get_name() : : [const] std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1035.8984375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1062.5703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0002301786483822933456-7" class="node default clickable">
             <rect height="101" width="313.171875" y="-50.5" x="-156.5859375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="156.5859375" x1="-156.5859375" class="divider"/>
@@ -422,20 +427,20 @@
                   <span class="nodeLabel">fruit_factory&lt;apple_c TA,orange_c TO&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -149.0859375, 3)" height="18" width="196.40625">
+              <foreignObject transform="translate( -149.0859375, 3)" height="18" width="205.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+create_apple() : [const] TA</span>
+                  <span class="nodeLabel">+create_apple() : : [const] TA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -149.0859375, 25)" height="18" width="209.75">
+              <foreignObject transform="translate( -149.0859375, 25)" height="18" width="218.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+create_orange() : [const] TO</span>
+                  <span class="nodeLabel">+create_orange() : : [const] TO</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(418.65625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42">
+        <a transform="translate(431.9921875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000551278102444647278-8" class="node default clickable">
             <rect height="57" width="339.59375" y="-28.5" x="-169.796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="169.796875" x1="-169.796875" class="divider"/>
@@ -454,7 +459,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1082.8046875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1105.03125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000536390279563541226-9" class="node default clickable">
             <rect height="57" width="328.90625" y="-28.5" x="-164.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="164.453125" x1="-164.453125" class="divider"/>
@@ -473,7 +478,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(610.78125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00059/t00059.cc#L51">
+        <a transform="translate(624.1171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L51">
           <g title="R" id="classId-C_0001128300671453354325-10" class="node default clickable">
             <rect height="101" width="204.875" y="-50.5" x="-102.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="102.4375" x1="-102.4375" class="divider"/>
diff --git a/docs/test_cases/t00060.md b/docs/test_cases/t00060.md
index d27d0768..a0fede27 100644
--- a/docs/test_cases/t00060.md
+++ b/docs/test_cases/t00060.md
@@ -15,7 +15,7 @@ diagrams:
     using_namespace: clanguml::t00060
 ```
 ## Source code
-File t00060.cc
+File `tests/t00060/t00060.cc`
 ```cpp
 namespace clanguml {
 namespace t00060 {
diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg
index f19e215f..a0faba10 100644
--- a/docs/test_cases/t00060_class.svg
+++ b/docs/test_cases/t00060_class.svg
@@ -1,99 +1,117 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="340px" preserveAspectRatio="none" style="width:254px;height:340px;" version="1.1" viewBox="0 0 254 340" width="254px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="349px" preserveAspectRatio="none" style="width:257px;height:349px;background:#FFFFFF;" version="1.1" viewBox="0 0 257 349" width="257px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10y7hga6snsvu" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10y7hga6snsvu)" height="48" id="C_0001373615549846303472" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="61" y="14.5"/>
-      <ellipse cx="76" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M78.9688,36.1406 Q78.3906,36.4375 77.75,36.5781 Q77.1094,36.7344 76.4063,36.7344 Q73.9063,36.7344 72.5781,35.0938 Q71.2656,33.4375 71.2656,30.3125 Q71.2656,27.1875 72.5781,25.5313 Q73.9063,23.875 76.4063,23.875 Q77.1094,23.875 77.75,24.0313 Q78.4063,24.1875 78.9688,24.4844 L78.9688,27.2031 Q78.3438,26.625 77.75,26.3594 Q77.1563,26.0781 76.5313,26.0781 Q75.1875,26.0781 74.5,27.1563 Q73.8125,28.2188 73.8125,30.3125 Q73.8125,32.4063 74.5,33.4844 Q75.1875,34.5469 76.5313,34.5469 Q77.1563,34.5469 77.75,34.2813 Q78.3438,34 78.9688,33.4219 L78.9688,36.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="90" y="34.6543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="46.5" y2="46.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="54.5" y2="54.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001373615549846303472">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001373615549846303472" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="43" y="18.4"/>
+        <ellipse cx="58" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M53,35.5562 C53,38.0562 55.1406,39.8687 58.0625,39.8687 C59.2969,39.8687 60.4688,39.5719 61.2188,39.0562 C61.8281,38.6344 62.1563,38.2125 62.1563,37.8062 C62.1563,37.3375 61.7344,36.9312 61.2344,36.9312 C61,36.9312 60.7813,37.0094 60.5781,37.2125 C60.1406,37.65 60.1406,37.65 59.9688,37.7437 C59.5156,37.9781 58.875,38.1187 58.1094,38.1187 C56.1094,38.1187 54.8281,37.1031 54.8281,35.525 L54.8281,34.4781 C54.8281,32.775 56.0469,31.5719 57.75,31.5719 C58.3281,31.5719 58.9063,31.7125 59.375,31.9625 C59.8438,32.2281 60.0156,32.4156 60.0781,32.775 C60.2031,33.4469 60.4531,33.6969 60.9844,33.6969 C61.2656,33.6969 61.5469,33.5562 61.7344,33.3375 C61.8594,33.1656 61.9063,32.9937 61.9063,32.5562 L61.9063,31.1969 C61.9063,30.775 61.8906,30.6344 61.7656,30.4625 C61.5938,30.2125 61.3125,30.0562 60.9844,30.0562 C60.6719,30.0562 60.4688,30.1656 60.25,30.4312 C59.0781,29.9312 58.6406,29.8219 57.6875,29.8219 C55.0156,29.8219 53,31.8375 53,34.4625 L53,35.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="72" y="39.006">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="44" x2="83" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="44" x2="83" y1="58.4" y2="58.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10y7hga6snsvu)" height="48" id="C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="159"/>
-      <ellipse cx="21" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,180.6406 Q23.3906,180.9375 22.75,181.0781 Q22.1094,181.2344 21.4063,181.2344 Q18.9063,181.2344 17.5781,179.5938 Q16.2656,177.9375 16.2656,174.8125 Q16.2656,171.6875 17.5781,170.0313 Q18.9063,168.375 21.4063,168.375 Q22.1094,168.375 22.75,168.5313 Q23.4063,168.6875 23.9688,168.9844 L23.9688,171.7031 Q23.3438,171.125 22.75,170.8594 Q22.1563,170.5781 21.5313,170.5781 Q20.1875,170.5781 19.5,171.6563 Q18.8125,172.7188 18.8125,174.8125 Q18.8125,176.9063 19.5,177.9844 Q20.1875,179.0469 21.5313,179.0469 Q22.1563,179.0469 22.75,178.7813 Q23.3438,178.5 23.9688,177.9219 L23.9688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="179.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="191" y2="191"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="199" y2="199"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000479650368930934571">
+        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000479650368930934571" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="168.6"/>
+        <ellipse cx="22" cy="184.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,185.7562 C17,188.2562 19.1406,190.0687 22.0625,190.0687 C23.2969,190.0687 24.4688,189.7719 25.2188,189.2562 C25.8281,188.8344 26.1563,188.4125 26.1563,188.0062 C26.1563,187.5375 25.7344,187.1312 25.2344,187.1312 C25,187.1312 24.7813,187.2094 24.5781,187.4125 C24.1406,187.85 24.1406,187.85 23.9688,187.9437 C23.5156,188.1781 22.875,188.3187 22.1094,188.3187 C20.1094,188.3187 18.8281,187.3031 18.8281,185.725 L18.8281,184.6781 C18.8281,182.975 20.0469,181.7719 21.75,181.7719 C22.3281,181.7719 22.9063,181.9125 23.375,182.1625 C23.8438,182.4281 24.0156,182.6156 24.0781,182.975 C24.2031,183.6469 24.4531,183.8969 24.9844,183.8969 C25.2656,183.8969 25.5469,183.7562 25.7344,183.5375 C25.8594,183.3656 25.9063,183.1937 25.9063,182.7562 L25.9063,181.3969 C25.9063,180.975 25.8906,180.8344 25.7656,180.6625 C25.5938,180.4125 25.3125,180.2562 24.9844,180.2562 C24.6719,180.2562 24.4688,180.3656 24.25,180.6312 C23.0781,180.1312 22.6406,180.0219 21.6875,180.0219 C19.0156,180.0219 17,182.0375 17,184.6625 L17,185.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="189.206">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="200.6" y2="200.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="208.6" y2="208.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10y7hga6snsvu)" height="48" id="C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="159"/>
-      <ellipse cx="96" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M98.9688,180.6406 Q98.3906,180.9375 97.75,181.0781 Q97.1094,181.2344 96.4063,181.2344 Q93.9063,181.2344 92.5781,179.5938 Q91.2656,177.9375 91.2656,174.8125 Q91.2656,171.6875 92.5781,170.0313 Q93.9063,168.375 96.4063,168.375 Q97.1094,168.375 97.75,168.5313 Q98.4063,168.6875 98.9688,168.9844 L98.9688,171.7031 Q98.3438,171.125 97.75,170.8594 Q97.1563,170.5781 96.5313,170.5781 Q95.1875,170.5781 94.5,171.6563 Q93.8125,172.7188 93.8125,174.8125 Q93.8125,176.9063 94.5,177.9844 Q95.1875,179.0469 96.5313,179.0469 Q97.1563,179.0469 97.75,178.7813 Q98.3438,178.5 98.9688,177.9219 L98.9688,180.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="179.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="191" y2="191"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="199" y2="199"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001827660844127264787">
+        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001827660844127264787" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="82.5" y="168.6"/>
+        <ellipse cx="97.5" cy="184.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M92.5,185.7562 C92.5,188.2562 94.6406,190.0687 97.5625,190.0687 C98.7969,190.0687 99.9688,189.7719 100.7188,189.2562 C101.3281,188.8344 101.6563,188.4125 101.6563,188.0062 C101.6563,187.5375 101.2344,187.1312 100.7344,187.1312 C100.5,187.1312 100.2813,187.2094 100.0781,187.4125 C99.6406,187.85 99.6406,187.85 99.4688,187.9437 C99.0156,188.1781 98.375,188.3187 97.6094,188.3187 C95.6094,188.3187 94.3281,187.3031 94.3281,185.725 L94.3281,184.6781 C94.3281,182.975 95.5469,181.7719 97.25,181.7719 C97.8281,181.7719 98.4063,181.9125 98.875,182.1625 C99.3438,182.4281 99.5156,182.6156 99.5781,182.975 C99.7031,183.6469 99.9531,183.8969 100.4844,183.8969 C100.7656,183.8969 101.0469,183.7562 101.2344,183.5375 C101.3594,183.3656 101.4063,183.1937 101.4063,182.7562 L101.4063,181.3969 C101.4063,180.975 101.3906,180.8344 101.2656,180.6625 C101.0938,180.4125 100.8125,180.2562 100.4844,180.2562 C100.1719,180.2562 99.9688,180.3656 99.75,180.6312 C98.5781,180.1312 98.1406,180.0219 97.1875,180.0219 C94.5156,180.0219 92.5,182.0375 92.5,184.6625 L92.5,185.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="111.5" y="189.206">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="83.5" x2="123.5" y1="200.6" y2="200.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="83.5" x2="123.5" y1="208.6" y2="208.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10y7hga6snsvu)" height="48" id="C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="42.5" y="281"/>
-      <ellipse cx="57.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M60.4688,302.6406 Q59.8906,302.9375 59.25,303.0781 Q58.6094,303.2344 57.9063,303.2344 Q55.4063,303.2344 54.0781,301.5938 Q52.7656,299.9375 52.7656,296.8125 Q52.7656,293.6875 54.0781,292.0313 Q55.4063,290.375 57.9063,290.375 Q58.6094,290.375 59.25,290.5313 Q59.9063,290.6875 60.4688,290.9844 L60.4688,293.7031 Q59.8438,293.125 59.25,292.8594 Q58.6563,292.5781 58.0313,292.5781 Q56.6875,292.5781 56,293.6563 Q55.3125,294.7188 55.3125,296.8125 Q55.3125,298.9063 56,299.9844 Q56.6875,301.0469 58.0313,301.0469 Q58.6563,301.0469 59.25,300.7813 Q59.8438,300.5 60.4688,299.9219 L60.4688,302.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="71.5" y="301.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="313" y2="313"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="321" y2="321"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001629687372290281981">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001629687372290281981" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="43.5" y="294.4"/>
+        <ellipse cx="58.5" cy="310.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M53.5,311.5563 C53.5,314.0563 55.6406,315.8688 58.5625,315.8688 C59.7969,315.8688 60.9688,315.5719 61.7188,315.0563 C62.3281,314.6344 62.6563,314.2125 62.6563,313.8063 C62.6563,313.3375 62.2344,312.9313 61.7344,312.9313 C61.5,312.9313 61.2813,313.0094 61.0781,313.2125 C60.6406,313.65 60.6406,313.65 60.4688,313.7438 C60.0156,313.9781 59.375,314.1188 58.6094,314.1188 C56.6094,314.1188 55.3281,313.1031 55.3281,311.525 L55.3281,310.4781 C55.3281,308.775 56.5469,307.5719 58.25,307.5719 C58.8281,307.5719 59.4063,307.7125 59.875,307.9625 C60.3438,308.2281 60.5156,308.4156 60.5781,308.775 C60.7031,309.4469 60.9531,309.6969 61.4844,309.6969 C61.7656,309.6969 62.0469,309.5563 62.2344,309.3375 C62.3594,309.1656 62.4063,308.9938 62.4063,308.5563 L62.4063,307.1969 C62.4063,306.775 62.3906,306.6344 62.2656,306.4625 C62.0938,306.2125 61.8125,306.0563 61.4844,306.0563 C61.1719,306.0563 60.9688,306.1656 60.75,306.4313 C59.5781,305.9313 59.1406,305.8219 58.1875,305.8219 C55.5156,305.8219 53.5,307.8375 53.5,310.4625 L53.5,311.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="72.5" y="315.006">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="44.5" x2="84.5" y1="326.4" y2="326.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="44.5" x2="84.5" y1="334.4" y2="334.4"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10y7hga6snsvu)" height="60.8047" id="C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="136" y="8"/>
-      <ellipse cx="151" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M153.9688,29.6406 Q153.3906,29.9375 152.75,30.0781 Q152.1094,30.2344 151.4063,30.2344 Q148.9063,30.2344 147.5781,28.5938 Q146.2656,26.9375 146.2656,23.8125 Q146.2656,20.6875 147.5781,19.0313 Q148.9063,17.375 151.4063,17.375 Q152.1094,17.375 152.75,17.5313 Q153.4063,17.6875 153.9688,17.9844 L153.9688,20.7031 Q153.3438,20.125 152.75,19.8594 Q152.1563,19.5781 151.5313,19.5781 Q150.1875,19.5781 149.5,20.6563 Q148.8125,21.7188 148.8125,23.8125 Q148.8125,25.9063 149.5,26.9844 Q150.1875,28.0469 151.5313,28.0469 Q152.1563,28.0469 152.75,27.7813 Q153.3438,27.5 153.9688,26.9219 L153.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="165" y="28.1543">G</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="182" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="183" y="17.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <g id="elem_C_0001877304825033069517">
+        <rect codeLine="18" fill="#F1F1F1" height="64.7999" id="C_0001877304825033069517" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="137" y="10"/>
+        <ellipse cx="152.45" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M147.45,27.1563 C147.45,29.6563 149.5906,31.4688 152.5125,31.4688 C153.7469,31.4688 154.9188,31.1719 155.6688,30.6563 C156.2781,30.2344 156.6063,29.8125 156.6063,29.4063 C156.6063,28.9375 156.1844,28.5313 155.6844,28.5313 C155.45,28.5313 155.2313,28.6094 155.0281,28.8125 C154.5906,29.25 154.5906,29.25 154.4188,29.3438 C153.9656,29.5781 153.325,29.7188 152.5594,29.7188 C150.5594,29.7188 149.2781,28.7031 149.2781,27.125 L149.2781,26.0781 C149.2781,24.375 150.4969,23.1719 152.2,23.1719 C152.7781,23.1719 153.3563,23.3125 153.825,23.5625 C154.2938,23.8281 154.4656,24.0156 154.5281,24.375 C154.6531,25.0469 154.9031,25.2969 155.4344,25.2969 C155.7156,25.2969 155.9969,25.1563 156.1844,24.9375 C156.3094,24.7656 156.3563,24.5938 156.3563,24.1563 L156.3563,22.7969 C156.3563,22.375 156.3406,22.2344 156.2156,22.0625 C156.0438,21.8125 155.7625,21.6563 155.4344,21.6563 C155.1219,21.6563 154.9188,21.7656 154.7,22.0313 C153.5281,21.5313 153.0906,21.4219 152.1375,21.4219 C149.4656,21.4219 147.45,23.4375 147.45,26.0625 L147.45,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="166.55" y="30.606">G</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="186" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="187" y="21.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="138" x2="191" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="138" x2="191" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="143" y="58.9"/>
+          <ellipse cx="148" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="157" y="67.0059">g : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142" y="54"/>
-      <ellipse cx="147" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <g id="elem_C_0001881610349123495638">
+        <rect codeLine="23" fill="#F1F1F1" height="81.5999" id="C_0001881610349123495638" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="164.5" y="151.8"/>
+        <ellipse cx="187.6" cy="167.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M182.6,168.9562 C182.6,171.4562 184.7406,173.2687 187.6625,173.2687 C188.8969,173.2687 190.0688,172.9719 190.8188,172.4562 C191.4281,172.0344 191.7563,171.6125 191.7563,171.2062 C191.7563,170.7375 191.3344,170.3312 190.8344,170.3312 C190.6,170.3312 190.3813,170.4094 190.1781,170.6125 C189.7406,171.05 189.7406,171.05 189.5688,171.1437 C189.1156,171.3781 188.475,171.5187 187.7094,171.5187 C185.7094,171.5187 184.4281,170.5031 184.4281,168.925 L184.4281,167.8781 C184.4281,166.175 185.6469,164.9719 187.35,164.9719 C187.9281,164.9719 188.5063,165.1125 188.975,165.3625 C189.4438,165.6281 189.6156,165.8156 189.6781,166.175 C189.8031,166.8469 190.0531,167.0969 190.5844,167.0969 C190.8656,167.0969 191.1469,166.9562 191.3344,166.7375 C191.4594,166.5656 191.5063,166.3937 191.5063,165.9562 L191.5063,164.5969 C191.5063,164.175 191.4906,164.0344 191.3656,163.8625 C191.1938,163.6125 190.9125,163.4562 190.5844,163.4562 C190.2719,163.4562 190.0688,163.5656 189.85,163.8312 C188.6781,163.3312 188.2406,163.2219 187.2875,163.2219 C184.6156,163.2219 182.6,165.2375 182.6,167.8625 L182.6,168.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="203.4" y="172.406">H</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="229.5" y="148.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="230.5" y="163.0001">T,P</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="165.5" x2="245.5" y1="183.8" y2="183.8"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="165.5" x2="245.5" y1="191.8" y2="191.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="170.5" y="200.7"/>
+          <ellipse cx="175.5" cy="205.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="184.5" y="208.8059">h : G&lt;T&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="170.5" y="217.4999"/>
+          <ellipse cx="175.5" cy="222.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="184.5" y="225.6059">hh : P</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="156" y="62.2104">g : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10y7hga6snsvu)" height="73.6094" id="C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="161.5" y="146"/>
-      <ellipse cx="183.7" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M186.6688,167.6406 Q186.0906,167.9375 185.45,168.0781 Q184.8094,168.2344 184.1063,168.2344 Q181.6063,168.2344 180.2781,166.5938 Q178.9656,164.9375 178.9656,161.8125 Q178.9656,158.6875 180.2781,157.0313 Q181.6063,155.375 184.1063,155.375 Q184.8094,155.375 185.45,155.5313 Q186.1063,155.6875 186.6688,155.9844 L186.6688,158.7031 Q186.0438,158.125 185.45,157.8594 Q184.8563,157.5781 184.2313,157.5781 Q182.8875,157.5781 182.2,158.6563 Q181.5125,159.7188 181.5125,161.8125 Q181.5125,163.9063 182.2,164.9844 Q182.8875,166.0469 184.2313,166.0469 Q184.8563,166.0469 185.45,165.7813 Q186.0438,165.5 186.6688,164.9219 L186.6688,167.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="199.3" y="166.1543">H</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="223.5" y="143"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="224.5" y="155.1387">T,P</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="178" y2="178"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="186" y2="186"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="192"/>
-      <ellipse cx="172.5" cy="197" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="181.5" y="200.2104">h : G&lt;T&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="204.8047"/>
-      <ellipse cx="172.5" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="181.5" y="213.0151">hh : P</text>
-    </a>
-    <path d="M64.83,81.38 C55.08,106.65 43.02,137.89 34.96,158.8 " fill="none" id="C_0001373615549846303472&lt;-C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="58.31,78.85,72.04,62.71,71.37,83.89,58.31,78.85" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M87.09,82.89 C90.6,107.89 94.87,138.31 97.74,158.8 " fill="none" id="C_0001373615549846303472&lt;-C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="80.11,83.49,84.26,62.71,93.97,81.55,80.11,83.49" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M39.08,226.42 C44.73,244.76 51.13,265.51 55.89,280.93 " fill="none" id="C_0000479650368930934571&lt;-C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="32.34,228.31,33.13,207.14,45.72,224.19,32.34,228.31" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M87.57,226.42 C81.76,244.76 75.19,265.51 70.3,280.93 " fill="none" id="C_0001827660844127264787&lt;-C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="80.96,224.09,93.67,207.14,94.31,228.32,80.96,224.09" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M187.63,133.13 C181.79,111.81 175.14,87.52 170.08,69.03 " fill="none" id="C_0001881610349123495638&lt;-C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="191.13,145.94,193.4064,139.0976,187.9659,134.3647,185.6895,141.207,191.13,145.94" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="183" y="112.0669">+h</text>
-    <path d="M165.61,89.39 C166.89,98.35 168.64,107.52 171,116 C173.77,125.94 177.85,136.29 182.1,145.76 " fill="none" id="C_0001877304825033069517&lt;-C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="158.63,89.99,163.36,69.34,172.54,88.44,158.63,89.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001373615549846303472_C_0000479650368930934571">
+      <path codeLine="28" d="M53.5457,84.37 C46.7957,112.12 39.91,140.53 33.18,168.23 " fill="none" id="C_0001373615549846303472-backto-C_0000479650368930934571" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="57.8,66.88,47.7157,82.9519,59.3757,85.7881,57.8,66.88" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001373615549846303472_C_0001827660844127264787">
+      <path codeLine="29" d="M74.5305,84.2581 C82.0205,112.0081 89.71,140.53 97.19,168.23 " fill="none" id="C_0001373615549846303472-backto-C_0001827660844127264787" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="69.84,66.88,68.7378,85.8216,80.3232,82.6946,69.84,66.88" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000479650368930934571_C_0001629687372290281981">
+      <path codeLine="30" d="M39.6115,234.1371 C46.2215,256.2671 50.97,272.12 57.57,294.22 " fill="none" id="C_0000479650368930934571-backto-C_0001629687372290281981" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="34.46,216.89,33.8625,235.8543,45.3606,232.4199,34.46,216.89" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001827660844127264787_C_0001629687372290281981">
+      <path codeLine="31" d="M90.7526,234.0586 C83.7826,256.1886 78.76,272.12 71.8,294.22 " fill="none" id="C_0001827660844127264787-backto-C_0001629687372290281981" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="96.16,216.89,85.0298,232.2561,96.4755,235.861,96.16,216.89" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001881610349123495638_C_0001877304825033069517">
+      <path codeLine="32" d="M191.1717,139.8141 C184.5517,115.8741 179.46,97.48 173.3,75.19 " fill="none" id="C_0001881610349123495638-backto-C_0001877304825033069517" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="194.37,151.38,196.6262,144.5309,191.1717,139.8141,188.9156,146.6631,194.37,151.38" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="185.5" y="117.877">+h</text>
+    </g>
+    <g id="link_C_0001877304825033069517_C_0001881610349123495638">
+      <path codeLine="33" d="M168.1916,93.0136 C169.6116,107.4536 170.29,106.73 174.5,121.8 C177.25,131.63 181.15,141.87 185.26,151.37 " fill="none" id="C_0001877304825033069517-backto-C_0001881610349123495638" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="166.43,75.1,162.2204,93.6008,174.1628,92.4264,166.43,75.1" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00060_class_mermaid.svg b/docs/test_cases/t00060_class_mermaid.svg
index 48e49b72..35f96a14 100644
--- a/docs/test_cases/t00060_class_mermaid.svg
+++ b/docs/test_cases/t00060_class_mermaid.svg
@@ -1,61 +1,66 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 256.609375 371" style="max-width: 256.609px; background-color: white;" width="256.609375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M46.28125,73L42.114583333333336,81C37.947916666666664,89,29.614583333333332,105,25.447916666666668,122.33333333333333C21.28125,139.66666666666666,21.28125,158.33333333333334,21.28125,167.66666666666666L21.28125,177"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M72.84375,73L77.01041666666667,81C81.17708333333333,89,89.51041666666667,105,93.67708333333333,122.33333333333333C97.84375,139.66666666666666,97.84375,158.33333333333334,97.84375,167.66666666666666L97.84375,177"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M21.28125,234L21.28125,241.83333333333334C21.28125,249.66666666666666,21.28125,265.3333333333333,25.447916666666668,278.98979591836735C29.614583333333332,292.6462585034014,37.947916666666664,304.2925170068027,42.114583333333336,310.11564625850343L46.28125,315.9387755102041"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M97.84375,234L97.84375,241.83333333333334C97.84375,249.66666666666666,97.84375,265.3333333333333,93.67708333333333,278.98979591836735C89.51041666666667,292.6462585034014,81.17708333333333,304.2925170068027,77.01041666666667,310.11564625850343L72.84375,315.9387755102041"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M213.5702200443787,155L214.5467979536489,149.33333333333334C215.52337586291912,143.66666666666666,217.47653168145953,132.33333333333334,217.33037716442593,121C217.1842226473923,109.66666666666667,214.93875779478458,98.33333333333333,213.81602536848072,92.66666666666667L212.69329294217687,87"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M181.4833386479592,87L178.128693664966,92.66666666666667C174.77404868197277,98.33333333333333,168.0647587159864,109.66666666666667,167.62805936908788,121C167.19136002218934,132.33333333333334,173.02725129437871,143.66666666666666,175.94519693047337,149.33333333333334L178.86314256656806,155"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M37.96643046093457,88.96445351500563L35.18556705077881,94.30371126250469C32.40470364062305,99.64296901000375,26.84297682031152,110.32148450500188,24.06211341015576,124.99407558583427C21.28125,139.66666666666666,21.28125,158.33333333333334,21.28125,167.66666666666666L21.28125,177"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M81.15856953906544,88.96445351500563L83.9394329492212,94.30371126250469C86.72029635937696,99.64296901000375,92.28202317968847,110.32148450500188,95.06288658984424,124.99407558583427C97.84375,139.66666666666666,97.84375,158.33333333333334,97.84375,167.66666666666666L97.84375,177"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M21.28125,252L21.28125,256.8333333333333C21.28125,261.6666666666667,21.28125,271.3333333333333,25.447916666666668,281.98979591836735C29.614583333333332,292.6462585034014,37.947916666666664,304.2925170068027,42.114583333333336,310.11564625850343L46.28125,315.9387755102041"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M97.84375,252L97.84375,256.8333333333333C97.84375,261.6666666666667,97.84375,271.3333333333333,93.67708333333333,281.98979591836735C89.51041666666667,292.6462585034014,81.17708333333333,304.2925170068027,77.01041666666667,310.11564625850343L72.84375,315.9387755102041"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M216.62722645301693,137.261490710391L217.09430329418078,134.55124225865916C217.56138013534462,131.84099380692734,218.49553381767228,126.42049690346367,217.8398782325323,118.04358178506516C217.1842226473923,109.66666666666667,214.93875779478458,98.33333333333333,213.81602536848072,92.66666666666667L212.69329294217687,87"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M172.31373365875712,102.48929773559797L170.48735617396426,105.57441477966499C168.6609786891714,108.65953182373198,165.0082237195857,114.82976591186599,166.09979187088751,123.58154962259967C167.19136002218934,132.33333333333334,173.02725129437871,143.66666666666666,175.94519693047337,149.33333333333334L178.86314256656806,155"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -116,7 +121,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L3">
+        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L3">
           <g title="A" id="classId-C_0001373615549846303472-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -135,7 +140,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L4">
+        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L4">
           <g title="B" id="classId-C_0000479650368930934571-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -154,7 +159,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L5">
+        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L5">
           <g title="C" id="classId-C_0001827660844127264787-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -173,7 +178,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L6">
+        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L6">
           <g title="D" id="classId-C_0001629687372290281981-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -192,7 +197,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L10">
+        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L10">
           <g title="G" id="classId-C_0001877304825033069517-4" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -216,7 +221,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00060/t00060.cc#L14">
+        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L14">
           <g title="H" id="classId-C_0001881610349123495638-5" class="node default clickable">
             <rect height="101" width="87.484375" y="-50.5" x="-43.7421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="43.7421875" x1="-43.7421875" class="divider"/>
diff --git a/docs/test_cases/t00061.md b/docs/test_cases/t00061.md
index a643b640..4387656a 100644
--- a/docs/test_cases/t00061.md
+++ b/docs/test_cases/t00061.md
@@ -14,7 +14,7 @@ diagrams:
     using_namespace: clanguml::t00061
 ```
 ## Source code
-File t00061.cc
+File `tests/t00061/t00061.cc`
 ```cpp
 #include "include/t00061_a.h"
 #include "include/t00061_b.h"
@@ -28,6 +28,22 @@ struct C {
 }
 }
 ```
+File `tests/t00061/include/t00061_a.h`
+```cpp
+namespace clanguml {
+namespace t00061 {
+struct A { };
+}
+}
+```
+File `tests/t00061/include/t00061_b.h`
+```cpp
+namespace clanguml {
+namespace t00061 {
+struct B { };
+}
+}
+```
 ## Generated PlantUML diagrams
 ![t00061_class](./t00061_class.svg "Paths diagram filter test case")
 ## Generated Mermaid diagrams
diff --git a/docs/test_cases/t00061_class.svg b/docs/test_cases/t00061_class.svg
index c5a15856..24140ee8 100644
--- a/docs/test_cases/t00061_class.svg
+++ b/docs/test_cases/t00061_class.svg
@@ -1,21 +1,17 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="69px" preserveAspectRatio="none" style="width:62px;height:69px;background:#FFFFFF;" version="1.1" viewBox="0 0 62 69" width="62px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkintn0xbw1jg" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkintn0xbw1jg)" height="48" id="C_0001010204727957329423" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
-      <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="39" y2="39"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="47" y2="47"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001010204727957329423">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001010204727957329423" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="7"/>
+        <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,24.1563 C17,26.6563 19.1406,28.4688 22.0625,28.4688 C23.2969,28.4688 24.4688,28.1719 25.2188,27.6563 C25.8281,27.2344 26.1563,26.8125 26.1563,26.4063 C26.1563,25.9375 25.7344,25.5313 25.2344,25.5313 C25,25.5313 24.7813,25.6094 24.5781,25.8125 C24.1406,26.25 24.1406,26.25 23.9688,26.3438 C23.5156,26.5781 22.875,26.7188 22.1094,26.7188 C20.1094,26.7188 18.8281,25.7031 18.8281,24.125 L18.8281,23.0781 C18.8281,21.375 20.0469,20.1719 21.75,20.1719 C22.3281,20.1719 22.9063,20.3125 23.375,20.5625 C23.8438,20.8281 24.0156,21.0156 24.0781,21.375 C24.2031,22.0469 24.4531,22.2969 24.9844,22.2969 C25.2656,22.2969 25.5469,22.1563 25.7344,21.9375 C25.8594,21.7656 25.9063,21.5938 25.9063,21.1563 L25.9063,19.7969 C25.9063,19.375 25.8906,19.2344 25.7656,19.0625 C25.5938,18.8125 25.3125,18.6563 24.9844,18.6563 C24.6719,18.6563 24.4688,18.7656 24.25,19.0313 C23.0781,18.5313 22.6406,18.4219 21.6875,18.4219 C19.0156,18.4219 17,20.4375 17,23.0625 L17,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="47" y2="47"/>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00061_class_mermaid.svg b/docs/test_cases/t00061_class_mermaid.svg
index 04eaa65c..8f75c358 100644
--- a/docs/test_cases/t00061_class_mermaid.svg
+++ b/docs/test_cases/t00061_class_mermaid.svg
@@ -1,50 +1,55 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 42.5625 73" style="max-width: 42.5625px; background-color: white;" width="42.5625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,7 +57,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00061/include/t00061_a.h#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00061/include/t00061_a.h#L3">
           <g title="A" id="classId-C_0001010204727957329423-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00062.md b/docs/test_cases/t00062.md
index 439ecaf9..fbc7d99b 100644
--- a/docs/test_cases/t00062.md
+++ b/docs/test_cases/t00062.md
@@ -15,7 +15,7 @@ diagrams:
         - left to right direction
 ```
 ## Source code
-File t00062.cc
+File `tests/t00062/t00062.cc`
 ```cpp
 #include <map>
 #include <string>
diff --git a/docs/test_cases/t00062_class.svg b/docs/test_cases/t00062_class.svg
index dfd806dc..aeb547a8 100644
--- a/docs/test_cases/t00062_class.svg
+++ b/docs/test_cases/t00062_class.svg
@@ -1,464 +1,544 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1285px" preserveAspectRatio="none" style="width:1087px;height:1285px;" version="1.1" viewBox="0 0 1087 1285" width="1087px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1347px" preserveAspectRatio="none" style="width:975px;height:1347px;background:#FFFFFF;" version="1.1" viewBox="0 0 975 1347" width="975px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1me531f59jiwf" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.5;" width="67" x="813" y="1214"/>
-      <ellipse cx="828.45" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M831.4188,1235.6406 Q830.8406,1235.9375 830.2,1236.0781 Q829.5594,1236.2344 828.8563,1236.2344 Q826.3563,1236.2344 825.0281,1234.5938 Q823.7156,1232.9375 823.7156,1229.8125 Q823.7156,1226.6875 825.0281,1225.0313 Q826.3563,1223.375 828.8563,1223.375 Q829.5594,1223.375 830.2,1223.5313 Q830.8563,1223.6875 831.4188,1223.9844 L831.4188,1226.7031 Q830.7938,1226.125 830.2,1225.8594 Q829.6063,1225.5781 828.9813,1225.5781 Q827.6375,1225.5781 826.95,1226.6563 Q826.2625,1227.7188 826.2625,1229.8125 Q826.2625,1231.9063 826.95,1232.9844 Q827.6375,1234.0469 828.9813,1234.0469 Q829.6063,1234.0469 830.2,1233.7813 Q830.7938,1233.5 831.4188,1232.9219 L831.4188,1235.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="842.55" y="1234.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="24" x="859" y="1211"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="22" x="860" y="1223.1387">U &amp;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1246" y2="1246"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1254" y2="1254"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="819" y="1260"/>
-      <ellipse cx="824" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="833" y="1268.2104">u : U &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="465" y="1214"/>
-      <ellipse cx="480" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M482.9688,1235.6406 Q482.3906,1235.9375 481.75,1236.0781 Q481.1094,1236.2344 480.4063,1236.2344 Q477.9063,1236.2344 476.5781,1234.5938 Q475.2656,1232.9375 475.2656,1229.8125 Q475.2656,1226.6875 476.5781,1225.0313 Q477.9063,1223.375 480.4063,1223.375 Q481.1094,1223.375 481.75,1223.5313 Q482.4063,1223.6875 482.9688,1223.9844 L482.9688,1226.7031 Q482.3438,1226.125 481.75,1225.8594 Q481.1563,1225.5781 480.5313,1225.5781 Q479.1875,1225.5781 478.5,1226.6563 Q477.8125,1227.7188 477.8125,1229.8125 Q477.8125,1231.9063 478.5,1232.9844 Q479.1875,1234.0469 480.5313,1234.0469 Q481.1563,1234.0469 481.75,1233.7813 Q482.3438,1233.5 482.9688,1232.9219 L482.9688,1235.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="494" y="1234.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="164" x="510" y="1211"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="162" x="511" y="1223.1387">std::map&lt;std::string,U&gt; &amp;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1246" y2="1246"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1254" y2="1254"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="471" y="1260"/>
-      <ellipse cx="476" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="485" y="1268.2104">u : U &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="48" id="C_0001239388209995793547" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="1220.5"/>
-      <ellipse cx="21" cy="1236.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M23.9688,1242.1406 Q23.3906,1242.4375 22.75,1242.5781 Q22.1094,1242.7344 21.4063,1242.7344 Q18.9063,1242.7344 17.5781,1241.0938 Q16.2656,1239.4375 16.2656,1236.3125 Q16.2656,1233.1875 17.5781,1231.5313 Q18.9063,1229.875 21.4063,1229.875 Q22.1094,1229.875 22.75,1230.0313 Q23.4063,1230.1875 23.9688,1230.4844 L23.9688,1233.2031 Q23.3438,1232.625 22.75,1232.3594 Q22.1563,1232.0781 21.5313,1232.0781 Q20.1875,1232.0781 19.5,1233.1563 Q18.8125,1234.2188 18.8125,1236.3125 Q18.8125,1238.4063 19.5,1239.4844 Q20.1875,1240.5469 21.5313,1240.5469 Q22.1563,1240.5469 22.75,1240.2813 Q23.3438,1240 23.9688,1239.4219 L23.9688,1242.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="1240.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="357" x="51" y="1217.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="355" x="52" y="1229.6387">std::map&lt;std::string,std::map&lt;std::string,std::string&gt;&gt; &amp;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1252.5" y2="1252.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1260.5" y2="1260.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="810" y="8"/>
-      <ellipse cx="825" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M827.9688,29.6406 Q827.3906,29.9375 826.75,30.0781 Q826.1094,30.2344 825.4063,30.2344 Q822.9063,30.2344 821.5781,28.5938 Q820.2656,26.9375 820.2656,23.8125 Q820.2656,20.6875 821.5781,19.0313 Q822.9063,17.375 825.4063,17.375 Q826.1094,17.375 826.75,17.5313 Q827.4063,17.6875 827.9688,17.9844 L827.9688,20.7031 Q827.3438,20.125 826.75,19.8594 Q826.1563,19.5781 825.5313,19.5781 Q824.1875,19.5781 823.5,20.6563 Q822.8125,21.7188 822.8125,23.8125 Q822.8125,25.9063 823.5,26.9844 Q824.1875,28.0469 825.5313,28.0469 Q826.1563,28.0469 826.75,27.7813 Q827.3438,27.5 827.9688,26.9219 L827.9688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="839" y="28.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="31" x="855" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="29" x="856" y="17.1387">U * *</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="816" y="54"/>
-      <ellipse cx="821" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="830" y="62.2104">u : U **</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0001379193770802992785" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="509.5" y="8"/>
-      <ellipse cx="524.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M527.4688,29.6406 Q526.8906,29.9375 526.25,30.0781 Q525.6094,30.2344 524.9063,30.2344 Q522.4063,30.2344 521.0781,28.5938 Q519.7656,26.9375 519.7656,23.8125 Q519.7656,20.6875 521.0781,19.0313 Q522.4063,17.375 524.9063,17.375 Q525.6094,17.375 526.25,17.5313 Q526.9063,17.6875 527.4688,17.9844 L527.4688,20.7031 Q526.8438,20.125 526.25,19.8594 Q525.6563,19.5781 525.0313,19.5781 Q523.6875,19.5781 523,20.6563 Q522.3125,21.7188 522.3125,23.8125 Q522.3125,25.9063 523,26.9844 Q523.6875,28.0469 525.0313,28.0469 Q525.6563,28.0469 526.25,27.7813 Q526.8438,27.5 527.4688,26.9219 L527.4688,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="538.5" y="28.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="554.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="555.5" y="17.1387">U * * const*</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="515.5" y="54"/>
-      <ellipse cx="520.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="529.5" y="62.2104">u : U ***</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0001407865337446777280" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="731" y="104"/>
-      <ellipse cx="746" cy="120" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M748.9688,125.6406 Q748.3906,125.9375 747.75,126.0781 Q747.1094,126.2344 746.4063,126.2344 Q743.9063,126.2344 742.5781,124.5938 Q741.2656,122.9375 741.2656,119.8125 Q741.2656,116.6875 742.5781,115.0313 Q743.9063,113.375 746.4063,113.375 Q747.1094,113.375 747.75,113.5313 Q748.4063,113.6875 748.9688,113.9844 L748.9688,116.7031 Q748.3438,116.125 747.75,115.8594 Q747.1563,115.5781 746.5313,115.5781 Q745.1875,115.5781 744.5,116.6563 Q743.8125,117.7188 743.8125,119.8125 Q743.8125,121.9063 744.5,122.9844 Q745.1875,124.0469 746.5313,124.0469 Q747.1563,124.0469 747.75,123.7813 Q748.3438,123.5 748.9688,122.9219 L748.9688,125.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="760" y="124.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="189" x="776" y="101"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="187" x="777" y="113.1387">U const volatile* const volatile</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="136" y2="136"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="144" y2="144"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="737" y="150"/>
-      <ellipse cx="742" cy="155" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="751" y="158.2104">u : U ***</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="808" y="200"/>
-      <ellipse cx="823.9" cy="216" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M826.8688,221.6406 Q826.2906,221.9375 825.65,222.0781 Q825.0094,222.2344 824.3063,222.2344 Q821.8063,222.2344 820.4781,220.5938 Q819.1656,218.9375 819.1656,215.8125 Q819.1656,212.6875 820.4781,211.0313 Q821.8063,209.375 824.3063,209.375 Q825.0094,209.375 825.65,209.5313 Q826.3063,209.6875 826.8688,209.9844 L826.8688,212.7031 Q826.2438,212.125 825.65,211.8594 Q825.0563,211.5781 824.4313,211.5781 Q823.0875,211.5781 822.4,212.6563 Q821.7125,213.7188 821.7125,215.8125 Q821.7125,217.9063 822.4,218.9844 Q823.0875,220.0469 824.4313,220.0469 Q825.0563,220.0469 825.65,219.7813 Q826.2438,219.5 826.8688,218.9219 L826.8688,221.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838.1" y="220.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="33" x="855" y="197"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="31" x="856" y="209.1387">U &amp;&amp;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="232" y2="232"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="240" y2="240"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="814" y="246"/>
-      <ellipse cx="819" cy="251" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="828" y="254.2104">u : U &amp;&amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0000352457857519671117" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="795.5" y="296"/>
-      <ellipse cx="811.4" cy="312" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M814.3688,317.6406 Q813.7906,317.9375 813.15,318.0781 Q812.5094,318.2344 811.8063,318.2344 Q809.3063,318.2344 807.9781,316.5938 Q806.6656,314.9375 806.6656,311.8125 Q806.6656,308.6875 807.9781,307.0313 Q809.3063,305.375 811.8063,305.375 Q812.5094,305.375 813.15,305.5313 Q813.8063,305.6875 814.3688,305.9844 L814.3688,308.7031 Q813.7438,308.125 813.15,307.8594 Q812.5563,307.5781 811.9313,307.5781 Q810.5875,307.5781 809.9,308.6563 Q809.2125,309.7188 809.2125,311.8125 Q809.2125,313.9063 809.9,314.9844 Q810.5875,316.0469 811.9313,316.0469 Q812.5563,316.0469 813.15,315.7813 Q813.7438,315.5 814.3688,314.9219 L814.3688,317.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.6" y="316.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="58" x="842.5" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="843.5" y="305.1387">U const&amp;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="328" y2="328"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="336" y2="336"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="342"/>
-      <ellipse cx="806.5" cy="347" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="815.5" y="350.2104">u : const U &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="73.6094" id="C_0000314708288320430272" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="804.5" y="392.5"/>
-      <ellipse cx="821.3" cy="408.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M824.2688,414.1406 Q823.6906,414.4375 823.05,414.5781 Q822.4094,414.7344 821.7063,414.7344 Q819.2063,414.7344 817.8781,413.0938 Q816.5656,411.4375 816.5656,408.3125 Q816.5656,405.1875 817.8781,403.5313 Q819.2063,401.875 821.7063,401.875 Q822.4094,401.875 823.05,402.0313 Q823.7063,402.1875 824.2688,402.4844 L824.2688,405.2031 Q823.6438,404.625 823.05,404.3594 Q822.4563,404.0781 821.8313,404.0781 Q820.4875,404.0781 819.8,405.1563 Q819.1125,406.2188 819.1125,408.3125 Q819.1125,410.4063 819.8,411.4844 Q820.4875,412.5469 821.8313,412.5469 Q822.4563,412.5469 823.05,412.2813 Q823.6438,412 824.2688,411.4219 L824.2688,414.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="835.7" y="412.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="38" x="853.5" y="389.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="854.5" y="401.6387">M C::*</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="424.5" y2="424.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="432.5" y2="432.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="438.5"/>
-      <ellipse cx="815.5" cy="443.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="824.5" y="446.7104">c : C &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="451.3047"/>
-      <ellipse cx="815.5" cy="456.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="824.5" y="459.5151">m : M C::*</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="73.6094" id="C_0000827753335392390402" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="517" y="149.5"/>
-      <ellipse cx="532" cy="165.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M534.9688,171.1406 Q534.3906,171.4375 533.75,171.5781 Q533.1094,171.7344 532.4063,171.7344 Q529.9063,171.7344 528.5781,170.0938 Q527.2656,168.4375 527.2656,165.3125 Q527.2656,162.1875 528.5781,160.5313 Q529.9063,158.875 532.4063,158.875 Q533.1094,158.875 533.75,159.0313 Q534.4063,159.1875 534.9688,159.4844 L534.9688,162.2031 Q534.3438,161.625 533.75,161.3594 Q533.1563,161.0781 532.5313,161.0781 Q531.1875,161.0781 530.5,162.1563 Q529.8125,163.2188 529.8125,165.3125 Q529.8125,167.4063 530.5,168.4844 Q531.1875,169.5469 532.5313,169.5469 Q533.1563,169.5469 533.75,169.2813 Q534.3438,169 534.9688,168.4219 L534.9688,171.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="546" y="169.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="60" x="562" y="146.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="58" x="563" y="158.6387">M C::* &amp;&amp;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="181.5" y2="181.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="189.5" y2="189.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="195.5"/>
-      <ellipse cx="528" cy="200.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="537" y="203.7104">c : C &amp;&amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="208.3047"/>
-      <ellipse cx="528" cy="213.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="537" y="216.5151">m : M C::*</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="73.6094" id="C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="786" y="501.5"/>
-      <ellipse cx="801" cy="517.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M803.9688,523.1406 Q803.3906,523.4375 802.75,523.5781 Q802.1094,523.7344 801.4063,523.7344 Q798.9063,523.7344 797.5781,522.0938 Q796.2656,520.4375 796.2656,517.3125 Q796.2656,514.1875 797.5781,512.5313 Q798.9063,510.875 801.4063,510.875 Q802.1094,510.875 802.75,511.0313 Q803.4063,511.1875 803.9688,511.4844 L803.9688,514.2031 Q803.3438,513.625 802.75,513.3594 Q802.1563,513.0781 801.5313,513.0781 Q800.1875,513.0781 799.5,514.1563 Q798.8125,515.2188 798.8125,517.3125 Q798.8125,519.4063 799.5,520.4844 Q800.1875,521.5469 801.5313,521.5469 Q802.1563,521.5469 802.75,521.2813 Q803.3438,521 803.9688,520.4219 L803.9688,523.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="815" y="521.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="79" x="831" y="498.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="77" x="832" y="510.6387">M (C::*)(Arg)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="533.5" y2="533.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="541.5" y2="541.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="547.5"/>
-      <ellipse cx="797" cy="552.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="806" y="555.7104">c : C &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="560.3047"/>
-      <ellipse cx="797" cy="565.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="806" y="568.5151">m : M C::*</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0000476497055497873078" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="501.5" y="508"/>
-      <ellipse cx="516.5" cy="524" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M519.4688,529.6406 Q518.8906,529.9375 518.25,530.0781 Q517.6094,530.2344 516.9063,530.2344 Q514.4063,530.2344 513.0781,528.5938 Q511.7656,526.9375 511.7656,523.8125 Q511.7656,520.6875 513.0781,519.0313 Q514.4063,517.375 516.9063,517.375 Q517.6094,517.375 518.25,517.5313 Q518.9063,517.6875 519.4688,517.9844 L519.4688,520.7031 Q518.8438,520.125 518.25,519.8594 Q517.6563,519.5781 517.0313,519.5781 Q515.6875,519.5781 515,520.6563 Q514.3125,521.7188 514.3125,523.8125 Q514.3125,525.9063 515,526.9844 Q515.6875,528.0469 517.0313,528.0469 Q517.6563,528.0469 518.25,527.7813 Q518.8438,527.5 519.4688,526.9219 L519.4688,529.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="530.5" y="528.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="91" x="546.5" y="505"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="89" x="547.5" y="517.1387">int (C::*)(bool)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="540" y2="540"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="548" y2="548"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="507.5" y="554"/>
-      <ellipse cx="512.5" cy="559" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="521.5" y="562.2104">c : C &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="73.6094" id="C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="496.5" y="258.5"/>
-      <ellipse cx="511.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M514.4688,280.1406 Q513.8906,280.4375 513.25,280.5781 Q512.6094,280.7344 511.9063,280.7344 Q509.4063,280.7344 508.0781,279.0938 Q506.7656,277.4375 506.7656,274.3125 Q506.7656,271.1875 508.0781,269.5313 Q509.4063,267.875 511.9063,267.875 Q512.6094,267.875 513.25,268.0313 Q513.9063,268.1875 514.4688,268.4844 L514.4688,271.2031 Q513.8438,270.625 513.25,270.3594 Q512.6563,270.0781 512.0313,270.0781 Q510.6875,270.0781 510,271.1563 Q509.3125,272.2188 509.3125,274.3125 Q509.3125,276.4063 510,277.4844 Q510.6875,278.5469 512.0313,278.5469 Q512.6563,278.5469 513.25,278.2813 Q513.8438,278 514.4688,277.4219 L514.4688,280.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="525.5" y="278.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="101" x="541.5" y="255.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="542.5" y="267.6387">M (C::*)(Arg) &amp;&amp;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="290.5" y2="290.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="298.5" y2="298.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="304.5"/>
-      <ellipse cx="507.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="516.5" y="312.7104">c : C &amp;&amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="317.3047"/>
-      <ellipse cx="507.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="516.5" y="325.5151">m : M C::*</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="73.6094" id="C_0001357746808315142717" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="127.5" y="258.5"/>
-      <ellipse cx="142.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M145.4688,280.1406 Q144.8906,280.4375 144.25,280.5781 Q143.6094,280.7344 142.9063,280.7344 Q140.4063,280.7344 139.0781,279.0938 Q137.7656,277.4375 137.7656,274.3125 Q137.7656,271.1875 139.0781,269.5313 Q140.4063,267.875 142.9063,267.875 Q143.6094,267.875 144.25,268.0313 Q144.9063,268.1875 145.4688,268.4844 L145.4688,271.2031 Q144.8438,270.625 144.25,270.3594 Q143.6563,270.0781 143.0313,270.0781 Q141.6875,270.0781 141,271.1563 Q140.3125,272.2188 140.3125,274.3125 Q140.3125,276.4063 141,277.4844 Q141.6875,278.5469 143.0313,278.5469 Q143.6563,278.5469 144.25,278.2813 Q144.8438,278 145.4688,277.4219 L145.4688,280.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.5" y="278.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="114" x="172.5" y="255.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="112" x="173.5" y="267.6387">float (C::*)(int) &amp;&amp;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="290.5" y2="290.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="298.5" y2="298.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="304.5"/>
-      <ellipse cx="138.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="147.5" y="312.7104">c : C &amp;&amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="317.3047"/>
-      <ellipse cx="138.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="147.5" y="325.5151">mf : float C::*</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="73.6094" id="C_0000544335779197078982" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="749" y="610.5"/>
-      <ellipse cx="764" cy="626.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M766.9688,632.1406 Q766.3906,632.4375 765.75,632.5781 Q765.1094,632.7344 764.4063,632.7344 Q761.9063,632.7344 760.5781,631.0938 Q759.2656,629.4375 759.2656,626.3125 Q759.2656,623.1875 760.5781,621.5313 Q761.9063,619.875 764.4063,619.875 Q765.1094,619.875 765.75,620.0313 Q766.4063,620.1875 766.9688,620.4844 L766.9688,623.2031 Q766.3438,622.625 765.75,622.3594 Q765.1563,622.0781 764.5313,622.0781 Q763.1875,622.0781 762.5,623.1563 Q761.8125,624.2188 761.8125,626.3125 Q761.8125,628.4063 762.5,629.4844 Q763.1875,630.5469 764.5313,630.5469 Q765.1563,630.5469 765.75,630.2813 Q766.3438,630 766.9688,629.4219 L766.9688,632.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="778" y="630.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="153" x="794" y="607.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="151" x="795" y="619.6387">M (C::*)(Arg1,Arg2,Arg3)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="642.5" y2="642.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="650.5" y2="650.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="656.5"/>
-      <ellipse cx="760" cy="661.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="769" y="664.7104">c : C &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="669.3047"/>
-      <ellipse cx="760" cy="674.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="769" y="677.5151">m : M C::*</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="801" y="720"/>
-      <ellipse cx="816" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M818.9688,741.6406 Q818.3906,741.9375 817.75,742.0781 Q817.1094,742.2344 816.4063,742.2344 Q813.9063,742.2344 812.5781,740.5938 Q811.2656,738.9375 811.2656,735.8125 Q811.2656,732.6875 812.5781,731.0313 Q813.9063,729.375 816.4063,729.375 Q817.1094,729.375 817.75,729.5313 Q818.4063,729.6875 818.9688,729.9844 L818.9688,732.7031 Q818.3438,732.125 817.75,731.8594 Q817.1563,731.5781 816.5313,731.5781 Q815.1875,731.5781 814.5,732.6563 Q813.8125,733.7188 813.8125,735.8125 Q813.8125,737.9063 814.5,738.9844 Q815.1875,740.0469 816.5313,740.0469 Q817.1563,740.0469 817.75,739.7813 Q818.3438,739.5 818.9688,738.9219 L818.9688,741.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="830" y="740.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="49" x="846" y="717"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="847" y="729.1387">char[N]</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="752" y2="752"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="760" y2="760"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="807" y="766"/>
-      <ellipse cx="812" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="821" y="774.2104">n : char[N]</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0001318419672443856415" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="493.5" y="720"/>
-      <ellipse cx="524.25" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M527.2188,741.6406 Q526.6406,741.9375 526,742.0781 Q525.3594,742.2344 524.6563,742.2344 Q522.1563,742.2344 520.8281,740.5938 Q519.5156,738.9375 519.5156,735.8125 Q519.5156,732.6875 520.8281,731.0313 Q522.1563,729.375 524.6563,729.375 Q525.3594,729.375 526,729.5313 Q526.6563,729.6875 527.2188,729.9844 L527.2188,732.7031 Q526.5938,732.125 526,731.8594 Q525.4063,731.5781 524.7813,731.5781 Q523.4375,731.5781 522.75,732.6563 Q522.0625,733.7188 522.0625,735.8125 Q522.0625,737.9063 522.75,738.9844 Q523.4375,740.0469 524.7813,740.0469 Q525.4063,740.0469 526,739.7813 Q526.5938,739.5 527.2188,738.9219 L527.2188,741.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="541.75" y="740.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="72" x="573.5" y="717"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="70" x="574.5" y="729.1387">char[1000]</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="752" y2="752"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="760" y2="760"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="499.5" y="766"/>
-      <ellipse cx="504.5" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="513.5" y="774.2104">n : std::vector&lt;char&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0000599593856979463652" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="782" y="816"/>
-      <ellipse cx="797.9" cy="832" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M800.8688,837.6406 Q800.2906,837.9375 799.65,838.0781 Q799.0094,838.2344 798.3063,838.2344 Q795.8063,838.2344 794.4781,836.5938 Q793.1656,834.9375 793.1656,831.8125 Q793.1656,828.6875 794.4781,827.0313 Q795.8063,825.375 798.3063,825.375 Q799.0094,825.375 799.65,825.5313 Q800.3063,825.6875 800.8688,825.9844 L800.8688,828.7031 Q800.2438,828.125 799.65,827.8594 Q799.0563,827.5781 798.4313,827.5781 Q797.0875,827.5781 796.4,828.6563 Q795.7125,829.7188 795.7125,831.8125 Q795.7125,833.9063 796.4,834.9844 Q797.0875,836.0469 798.4313,836.0469 Q799.0563,836.0469 799.65,835.7813 Q800.2438,835.5 800.8688,834.9219 L800.8688,837.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.1" y="836.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="85" x="829" y="813"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="83" x="830" y="825.1387">char[M][L][K]</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="848" y2="848"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="856" y2="856"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="788" y="862"/>
-      <ellipse cx="793" cy="867" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="802" y="870.2104">klm : char[K][L][M]</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0000015395295268000991" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="809" y="912"/>
-      <ellipse cx="824" cy="928" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M826.9688,933.6406 Q826.3906,933.9375 825.75,934.0781 Q825.1094,934.2344 824.4063,934.2344 Q821.9063,934.2344 820.5781,932.5938 Q819.2656,930.9375 819.2656,927.8125 Q819.2656,924.6875 820.5781,923.0313 Q821.9063,921.375 824.4063,921.375 Q825.1094,921.375 825.75,921.5313 Q826.4063,921.6875 826.9688,921.9844 L826.9688,924.7031 Q826.3438,924.125 825.75,923.8594 Q825.1563,923.5781 824.5313,923.5781 Q823.1875,923.5781 822.5,924.6563 Q821.8125,925.7188 821.8125,927.8125 Q821.8125,929.9063 822.5,930.9844 Q823.1875,932.0469 824.5313,932.0469 Q825.1563,932.0469 825.75,931.7813 Q826.3438,931.5 826.9688,930.9219 L826.9688,933.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838" y="932.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="33" x="854" y="909"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="31" x="855" y="921.1387">U(...)</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="944" y2="944"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="952" y2="952"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="815" y="958"/>
-      <ellipse cx="820" cy="963" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="829" y="966.2104">u : bool</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="60.8047" id="C_0001603321863498552207" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="807" y="1008"/>
-      <ellipse cx="822" cy="1024" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M824.9688,1029.6406 Q824.3906,1029.9375 823.75,1030.0781 Q823.1094,1030.2344 822.4063,1030.2344 Q819.9063,1030.2344 818.5781,1028.5938 Q817.2656,1026.9375 817.2656,1023.8125 Q817.2656,1020.6875 818.5781,1019.0313 Q819.9063,1017.375 822.4063,1017.375 Q823.1094,1017.375 823.75,1017.5313 Q824.4063,1017.6875 824.9688,1017.9844 L824.9688,1020.7031 Q824.3438,1020.125 823.75,1019.8594 Q823.1563,1019.5781 822.5313,1019.5781 Q821.1875,1019.5781 820.5,1020.6563 Q819.8125,1021.7188 819.8125,1023.8125 Q819.8125,1025.9063 820.5,1026.9844 Q821.1875,1028.0469 822.5313,1028.0469 Q823.1563,1028.0469 823.75,1027.7813 Q824.3438,1027.5 824.9688,1026.9219 L824.9688,1029.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="836" y="1028.1543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="37" x="852" y="1005"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="35" x="853" y="1017.1387">C&lt;T&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1040" y2="1040"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1048" y2="1048"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="813" y="1054"/>
-      <ellipse cx="818" cy="1059" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="827" y="1062.2104">c : C&lt;T&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="73.6094" id="C_0000232518961342221670" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="759.5" y="1104.5"/>
-      <ellipse cx="797.9" cy="1120.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M800.8688,1126.1406 Q800.2906,1126.4375 799.65,1126.5781 Q799.0094,1126.7344 798.3063,1126.7344 Q795.8063,1126.7344 794.4781,1125.0938 Q793.1656,1123.4375 793.1656,1120.3125 Q793.1656,1117.1875 794.4781,1115.5313 Q795.8063,1113.875 798.3063,1113.875 Q799.0094,1113.875 799.65,1114.0313 Q800.3063,1114.1875 800.8688,1114.4844 L800.8688,1117.2031 Q800.2438,1116.625 799.65,1116.3594 Q799.0563,1116.0781 798.4313,1116.0781 Q797.0875,1116.0781 796.4,1117.1563 Q795.7125,1118.2188 795.7125,1120.3125 Q795.7125,1122.4063 796.4,1123.4844 Q797.0875,1124.5469 798.4313,1124.5469 Q799.0563,1124.5469 799.65,1124.2813 Q800.2438,1124 800.8688,1123.4219 L800.8688,1126.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="817.1" y="1124.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="80" x="856.5" y="1101.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="857.5" y="1113.6387">C&lt;T,Args...&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1136.5" y2="1136.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1144.5" y2="1144.5"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1150.5"/>
-      <ellipse cx="770.5" cy="1155.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="779.5" y="1158.7104">args : std::tuple&lt;Args...&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1163.3047"/>
-      <ellipse cx="770.5" cy="1168.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="779.5" y="1171.5151">c : C&lt;T&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me531f59jiwf)" height="48" id="C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.5;" width="51" x="1022" y="623.5"/>
-      <ellipse cx="1037" cy="639.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1039.9688,645.1406 Q1039.3906,645.4375 1038.75,645.5781 Q1038.1094,645.7344 1037.4063,645.7344 Q1034.9063,645.7344 1033.5781,644.0938 Q1032.2656,642.4375 1032.2656,639.3125 Q1032.2656,636.1875 1033.5781,634.5313 Q1034.9063,632.875 1037.4063,632.875 Q1038.1094,632.875 1038.75,633.0313 Q1039.4063,633.1875 1039.9688,633.4844 L1039.9688,636.2031 Q1039.3438,635.625 1038.75,635.3594 Q1038.1563,635.0781 1037.5313,635.0781 Q1036.1875,635.0781 1035.5,636.1563 Q1034.8125,637.2188 1034.8125,639.3125 Q1034.8125,641.4063 1035.5,642.4844 Q1036.1875,643.5469 1037.5313,643.5469 Q1038.1563,643.5469 1038.75,643.2813 Q1039.3438,643 1039.9688,642.4219 L1039.9688,645.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1051" y="643.6543">A</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1067" y="620.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1068" y="632.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1072" y1="655.5" y2="655.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1072" y1="663.5" y2="663.5"/>
-    </a>
-    <path d="M880.16,1239.67 C906.44,1234 942.16,1221.89 962,1196.5 C1023.36,1117.97 1040.72,808.34 1045.13,692 " fill="none" id="C_0001046827200300090710-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1038.15,691.48,1045.84,671.73,1052.14,691.97,1038.15,691.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M671.17,1244.5 C712.38,1244.5 758.19,1244.5 792.5,1244.5 " fill="none" id="C_0001099548178945911245-&gt;C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="792.73,1237.5,812.73,1244.5,792.73,1251.5,792.73,1237.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M405.2,1244.5 C418.54,1244.5 431.74,1244.5 444.51,1244.5 " fill="none" id="C_0001239388209995793547-&gt;C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="444.85,1237.5,464.85,1244.5,444.85,1251.5,444.85,1237.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M883.12,43.96 C909.08,49.89 942.93,62.01 962,86.5 C1024.75,167.08 1041.29,485.26 1045.3,603.21 " fill="none" id="C_0000045701897814162098-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1052.31,603.19,1045.93,623.4,1038.31,603.63,1052.31,603.19" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M626.63,38.5 C674.53,38.5 742.28,38.5 789.67,38.5 " fill="none" id="C_0001379193770802992785-&gt;C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="789.87,31.5,809.87,38.5,789.87,45.5,789.87,31.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M943.22,165.18 C950.25,170.13 956.67,175.86 962,182.5 C1013.95,247.16 1036.54,499.69 1043.75,603.04 " fill="none" id="C_0001407865337446777280-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1050.75,602.82,1045.1,623.24,1036.78,603.75,1050.75,602.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M885.03,236.98 C910.38,243.31 942.64,255.49 962,278.5 C1003.3,327.59 1030.75,516.41 1041.46,603.29 " fill="none" id="C_0001034483227649400416-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1048.42,602.58,1043.84,623.27,1034.52,604.24,1048.42,602.58" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M897.7,337.25 C920.11,344.39 945.2,355.99 962,374.5 C1020.69,439.17 1038.62,543.96 1044.1,603.14 " fill="none" id="C_0000352457857519671117-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1051.1,602.93,1045.64,623.41,1037.14,604,1051.1,602.93" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M888.74,441.54 C912.46,450.14 941.52,463.73 962,483.5 C996.75,517.05 1019.89,567.99 1033.03,604.19 " fill="none" id="C_0000314708288320430272-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1039.72,602.12,1039.55,623.31,1026.47,606.64,1039.72,602.12" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M619.07,194.47 C666.6,202.03 737.98,213.39 787.85,221.33 " fill="none" id="C_0000827753335392390402-&gt;C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="789.13,214.44,807.78,224.5,786.93,228.27,789.13,214.44" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M907.11,564.74 C925.02,573.12 944.53,582.76 962,592.5 C976.29,600.47 991.42,609.96 1004.86,618.79 " fill="none" id="C_0000395583480407686249-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1009.2,613.27,1021.91,630.22,1001.4,624.9,1009.2,613.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M634.53,538.5 C673.74,538.5 723.85,538.5 765.4,538.5 " fill="none" id="C_0000476497055497873078-&gt;C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="765.63,531.5,785.63,538.5,765.63,545.5,765.63,531.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M639.85,278.85 C685.91,268.02 745.19,254.08 788.26,243.95 " fill="none" id="C_0001619634759668095904-&gt;C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="786.91,237.08,807.98,239.32,790.11,250.71,786.91,237.08" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M283.84,295.5 C340.19,295.5 416.73,295.5 476.02,295.5 " fill="none" id="C_0001357746808315142717-&gt;C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="476.21,288.5,496.21,295.5,476.21,302.5,476.21,288.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M944.09,647.5 C964.17,647.5 984.4,647.5 1001.53,647.5 " fill="none" id="C_0000544335779197078982-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1001.63,640.5,1021.63,647.5,1001.63,654.5,1001.63,640.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M892.06,733.42 C913.58,724.68 939.54,713.38 962,701.5 C976.28,693.95 991.32,684.77 1004.68,676.14 " fill="none" id="C_0000602066980416477930-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1001.09,670.12,1021.64,664.92,1008.82,681.8,1001.09,670.12" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M642.73,750.5 C685.75,750.5 739.5,750.5 780.85,750.5 " fill="none" id="C_0001318419672443856415-&gt;C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="780.93,743.5,800.93,750.5,780.93,757.5,780.93,743.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M911.24,828.42 C929.08,821.19 947.53,811.42 962,798.5 C994.85,769.18 1017.78,723.93 1031.39,690.61 " fill="none" id="C_0000599593856979463652-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1024.96,687.82,1038.66,671.65,1038.03,692.83,1024.96,687.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M884.03,935.44 C909.08,928.83 941.39,916.54 962,894.5 C1015.18,837.61 1035.04,745.82 1042.35,691.6 " fill="none" id="C_0000015395295268000991-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1035.42,690.57,1044.71,671.52,1049.33,692.2,1035.42,690.57" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M886,1031.64 C911.13,1025.2 942.73,1013.02 962,990.5 C1000.48,945.52 1028.97,773.37 1040.66,691.39 " fill="none" id="C_0001603321863498552207-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1033.74,690.36,1043.42,671.51,1047.61,692.28,1033.74,690.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M933.59,1111.52 C944.39,1104.71 954.33,1096.46 962,1086.5 C1009.46,1024.91 1034.39,790.8 1042.99,691.96 " fill="none" id="C_0000232518961342221670-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1036.04,691.07,1044.68,671.73,1049.99,692.24,1036.04,691.07" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001046827200300090710">
+        <rect codeLine="3" fill="#F1F1F1" height="64.7999" id="C_0001046827200300090710" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="69" x="714" y="1276"/>
+        <ellipse cx="730.8" cy="1292" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M725.8,1293.1563 C725.8,1295.6563 727.9406,1297.4688 730.8625,1297.4688 C732.0969,1297.4688 733.2688,1297.1719 734.0188,1296.6563 C734.6281,1296.2344 734.9563,1295.8125 734.9563,1295.4063 C734.9563,1294.9375 734.5344,1294.5313 734.0344,1294.5313 C733.8,1294.5313 733.5813,1294.6094 733.3781,1294.8125 C732.9406,1295.25 732.9406,1295.25 732.7688,1295.3438 C732.3156,1295.5781 731.675,1295.7188 730.9094,1295.7188 C728.9094,1295.7188 727.6281,1294.7031 727.6281,1293.125 L727.6281,1292.0781 C727.6281,1290.375 728.8469,1289.1719 730.55,1289.1719 C731.1281,1289.1719 731.7063,1289.3125 732.175,1289.5625 C732.6438,1289.8281 732.8156,1290.0156 732.8781,1290.375 C733.0031,1291.0469 733.2531,1291.2969 733.7844,1291.2969 C734.0656,1291.2969 734.3469,1291.1563 734.5344,1290.9375 C734.6594,1290.7656 734.7063,1290.5938 734.7063,1290.1563 L734.7063,1288.7969 C734.7063,1288.375 734.6906,1288.2344 734.5656,1288.0625 C734.3938,1287.8125 734.1125,1287.6563 733.7844,1287.6563 C733.4719,1287.6563 733.2688,1287.7656 733.05,1288.0313 C731.8781,1287.5313 731.4406,1287.4219 730.4875,1287.4219 C727.8156,1287.4219 725.8,1289.4375 725.8,1292.0625 L725.8,1293.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="745.2" y="1296.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="22" x="764" y="1273"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="20" x="765" y="1287.2001">U &amp;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="715" x2="782" y1="1308" y2="1308"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="715" x2="782" y1="1316" y2="1316"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="720" y="1324.9"/>
+          <ellipse cx="725" cy="1329.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="734" y="1333.0059">u : U &amp;</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001099548178945911245">
+        <rect codeLine="8" fill="#F1F1F1" height="64.7999" id="C_0001099548178945911245" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="180" x="405" y="1276"/>
+        <ellipse cx="420" cy="1292" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M415,1293.1563 C415,1295.6563 417.1406,1297.4688 420.0625,1297.4688 C421.2969,1297.4688 422.4688,1297.1719 423.2188,1296.6563 C423.8281,1296.2344 424.1563,1295.8125 424.1563,1295.4063 C424.1563,1294.9375 423.7344,1294.5313 423.2344,1294.5313 C423,1294.5313 422.7813,1294.6094 422.5781,1294.8125 C422.1406,1295.25 422.1406,1295.25 421.9688,1295.3438 C421.5156,1295.5781 420.875,1295.7188 420.1094,1295.7188 C418.1094,1295.7188 416.8281,1294.7031 416.8281,1293.125 L416.8281,1292.0781 C416.8281,1290.375 418.0469,1289.1719 419.75,1289.1719 C420.3281,1289.1719 420.9063,1289.3125 421.375,1289.5625 C421.8438,1289.8281 422.0156,1290.0156 422.0781,1290.375 C422.2031,1291.0469 422.4531,1291.2969 422.9844,1291.2969 C423.2656,1291.2969 423.5469,1291.1563 423.7344,1290.9375 C423.8594,1290.7656 423.9063,1290.5938 423.9063,1290.1563 L423.9063,1288.7969 C423.9063,1288.375 423.8906,1288.2344 423.7656,1288.0625 C423.5938,1287.8125 423.3125,1287.6563 422.9844,1287.6563 C422.6719,1287.6563 422.4688,1287.7656 422.25,1288.0313 C421.0781,1287.5313 420.6406,1287.4219 419.6875,1287.4219 C417.0156,1287.4219 415,1289.4375 415,1292.0625 L415,1293.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="434" y="1296.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="137" x="451" y="1273"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="135" x="452" y="1287.2001">std::map&lt;std::string,U&gt; &amp;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="406" x2="584" y1="1308" y2="1308"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="406" x2="584" y1="1316" y2="1316"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="411" y="1324.9"/>
+          <ellipse cx="416" cy="1329.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="425" y="1333.0059">u : U &amp;</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001239388209995793547">
+        <rect codeLine="13" fill="#F1F1F1" height="48" id="C_0001239388209995793547" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="338" x="7" y="1284.4"/>
+        <ellipse cx="22" cy="1300.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,1301.5562 C17,1304.0562 19.1406,1305.8687 22.0625,1305.8687 C23.2969,1305.8687 24.4688,1305.5719 25.2188,1305.0562 C25.8281,1304.6344 26.1563,1304.2125 26.1563,1303.8062 C26.1563,1303.3375 25.7344,1302.9312 25.2344,1302.9312 C25,1302.9312 24.7813,1303.0094 24.5781,1303.2125 C24.1406,1303.65 24.1406,1303.65 23.9688,1303.7437 C23.5156,1303.9781 22.875,1304.1187 22.1094,1304.1187 C20.1094,1304.1187 18.8281,1303.1031 18.8281,1301.525 L18.8281,1300.4781 C18.8281,1298.775 20.0469,1297.5719 21.75,1297.5719 C22.3281,1297.5719 22.9063,1297.7125 23.375,1297.9625 C23.8438,1298.2281 24.0156,1298.4156 24.0781,1298.775 C24.2031,1299.4469 24.4531,1299.6969 24.9844,1299.6969 C25.2656,1299.6969 25.5469,1299.5562 25.7344,1299.3375 C25.8594,1299.1656 25.9063,1298.9937 25.9063,1298.5562 L25.9063,1297.1969 C25.9063,1296.775 25.8906,1296.6344 25.7656,1296.4625 C25.5938,1296.2125 25.3125,1296.0562 24.9844,1296.0562 C24.6719,1296.0562 24.4688,1296.1656 24.25,1296.4312 C23.0781,1295.9312 22.6406,1295.8219 21.6875,1295.8219 C19.0156,1295.8219 17,1297.8375 17,1300.4625 L17,1301.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="1305.006">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="295" x="53" y="1281.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="293" x="54" y="1295.6001">std::map&lt;std::string,std::map&lt;std::string,std::string&gt;&gt; &amp;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="344" y1="1316.4" y2="1316.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="344" y1="1324.4" y2="1324.4"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000045701897814162098">
+        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0000045701897814162098" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="70" x="713.5" y="10"/>
+        <ellipse cx="728.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M723.5,27.1563 C723.5,29.6563 725.6406,31.4688 728.5625,31.4688 C729.7969,31.4688 730.9688,31.1719 731.7188,30.6563 C732.3281,30.2344 732.6563,29.8125 732.6563,29.4063 C732.6563,28.9375 732.2344,28.5313 731.7344,28.5313 C731.5,28.5313 731.2813,28.6094 731.0781,28.8125 C730.6406,29.25 730.6406,29.25 730.4688,29.3438 C730.0156,29.5781 729.375,29.7188 728.6094,29.7188 C726.6094,29.7188 725.3281,28.7031 725.3281,27.125 L725.3281,26.0781 C725.3281,24.375 726.5469,23.1719 728.25,23.1719 C728.8281,23.1719 729.4063,23.3125 729.875,23.5625 C730.3438,23.8281 730.5156,24.0156 730.5781,24.375 C730.7031,25.0469 730.9531,25.2969 731.4844,25.2969 C731.7656,25.2969 732.0469,25.1563 732.2344,24.9375 C732.3594,24.7656 732.4063,24.5938 732.4063,24.1563 L732.4063,22.7969 C732.4063,22.375 732.3906,22.2344 732.2656,22.0625 C732.0938,21.8125 731.8125,21.6563 731.4844,21.6563 C731.1719,21.6563 730.9688,21.7656 730.75,22.0313 C729.5781,21.5313 729.1406,21.4219 728.1875,21.4219 C725.5156,21.4219 723.5,23.4375 723.5,26.0625 L723.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="742.5" y="30.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="27" x="759.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="25" x="760.5" y="21.2001">U * *</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="714.5" x2="782.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="714.5" x2="782.5" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="719.5" y="58.9"/>
+          <ellipse cx="724.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="733.5" y="67.0059">u : U **</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001379193770802992785">
+        <rect codeLine="22" fill="#F1F1F1" height="64.7999" id="C_0001379193770802992785" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="441.5" y="10"/>
+        <ellipse cx="456.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M451.5,27.1563 C451.5,29.6563 453.6406,31.4688 456.5625,31.4688 C457.7969,31.4688 458.9688,31.1719 459.7188,30.6563 C460.3281,30.2344 460.6563,29.8125 460.6563,29.4063 C460.6563,28.9375 460.2344,28.5313 459.7344,28.5313 C459.5,28.5313 459.2813,28.6094 459.0781,28.8125 C458.6406,29.25 458.6406,29.25 458.4688,29.3438 C458.0156,29.5781 457.375,29.7188 456.6094,29.7188 C454.6094,29.7188 453.3281,28.7031 453.3281,27.125 L453.3281,26.0781 C453.3281,24.375 454.5469,23.1719 456.25,23.1719 C456.8281,23.1719 457.4063,23.3125 457.875,23.5625 C458.3438,23.8281 458.5156,24.0156 458.5781,24.375 C458.7031,25.0469 458.9531,25.2969 459.4844,25.2969 C459.7656,25.2969 460.0469,25.1563 460.2344,24.9375 C460.3594,24.7656 460.4063,24.5938 460.4063,24.1563 L460.4063,22.7969 C460.4063,22.375 460.3906,22.2344 460.2656,22.0625 C460.0938,21.8125 459.8125,21.6563 459.4844,21.6563 C459.1719,21.6563 458.9688,21.7656 458.75,22.0313 C457.5781,21.5313 457.1406,21.4219 456.1875,21.4219 C453.5156,21.4219 451.5,23.4375 451.5,26.0625 L451.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="470.5" y="30.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="64" x="487.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="62" x="488.5" y="21.2001">U * * const*</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="442.5" x2="547.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="442.5" x2="547.5" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="447.5" y="58.9"/>
+          <ellipse cx="452.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="461.5" y="67.0059">u : U ***</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001407865337446777280">
+        <rect codeLine="27" fill="#F1F1F1" height="64.7999" id="C_0001407865337446777280" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="207" x="645" y="110"/>
+        <ellipse cx="660" cy="126" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M655,127.1563 C655,129.6563 657.1406,131.4688 660.0625,131.4688 C661.2969,131.4688 662.4688,131.1719 663.2188,130.6563 C663.8281,130.2344 664.1563,129.8125 664.1563,129.4063 C664.1563,128.9375 663.7344,128.5313 663.2344,128.5313 C663,128.5313 662.7813,128.6094 662.5781,128.8125 C662.1406,129.25 662.1406,129.25 661.9688,129.3438 C661.5156,129.5781 660.875,129.7188 660.1094,129.7188 C658.1094,129.7188 656.8281,128.7031 656.8281,127.125 L656.8281,126.0781 C656.8281,124.375 658.0469,123.1719 659.75,123.1719 C660.3281,123.1719 660.9063,123.3125 661.375,123.5625 C661.8438,123.8281 662.0156,124.0156 662.0781,124.375 C662.2031,125.0469 662.4531,125.2969 662.9844,125.2969 C663.2656,125.2969 663.5469,125.1563 663.7344,124.9375 C663.8594,124.7656 663.9063,124.5938 663.9063,124.1563 L663.9063,122.7969 C663.9063,122.375 663.8906,122.2344 663.7656,122.0625 C663.5938,121.8125 663.3125,121.6563 662.9844,121.6563 C662.6719,121.6563 662.4688,121.7656 662.25,122.0313 C661.0781,121.5313 660.6406,121.4219 659.6875,121.4219 C657.0156,121.4219 655,123.4375 655,126.0625 L655,127.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="674" y="130.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="164" x="691" y="107"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="162" x="692" y="121.2001">U const volatile* const volatile</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="646" x2="851" y1="142" y2="142"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="646" x2="851" y1="150" y2="150"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="651" y="158.9"/>
+          <ellipse cx="656" cy="163.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="665" y="167.0059">u : U ***</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001034483227649400416">
+        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0001034483227649400416" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="709.5" y="210"/>
+        <ellipse cx="726.75" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M721.75,227.1563 C721.75,229.6563 723.8906,231.4688 726.8125,231.4688 C728.0469,231.4688 729.2188,231.1719 729.9688,230.6563 C730.5781,230.2344 730.9063,229.8125 730.9063,229.4063 C730.9063,228.9375 730.4844,228.5313 729.9844,228.5313 C729.75,228.5313 729.5313,228.6094 729.3281,228.8125 C728.8906,229.25 728.8906,229.25 728.7188,229.3438 C728.2656,229.5781 727.625,229.7188 726.8594,229.7188 C724.8594,229.7188 723.5781,228.7031 723.5781,227.125 L723.5781,226.0781 C723.5781,224.375 724.7969,223.1719 726.5,223.1719 C727.0781,223.1719 727.6563,223.3125 728.125,223.5625 C728.5938,223.8281 728.7656,224.0156 728.8281,224.375 C728.9531,225.0469 729.2031,225.2969 729.7344,225.2969 C730.0156,225.2969 730.2969,225.1563 730.4844,224.9375 C730.6094,224.7656 730.6563,224.5938 730.6563,224.1563 L730.6563,222.7969 C730.6563,222.375 730.6406,222.2344 730.5156,222.0625 C730.3438,221.8125 730.0625,221.6563 729.7344,221.6563 C729.4219,221.6563 729.2188,221.7656 729,222.0313 C727.8281,221.5313 727.3906,221.4219 726.4375,221.4219 C723.7656,221.4219 721.75,223.4375 721.75,226.0625 L721.75,227.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="741.25" y="230.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="30" x="760.5" y="207"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="28" x="761.5" y="221.2001">U &amp;&amp;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="710.5" x2="786.5" y1="242" y2="242"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="710.5" x2="786.5" y1="250" y2="250"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="715.5" y="258.9"/>
+          <ellipse cx="720.5" cy="263.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="729.5" y="267.0059">u : U &amp;&amp;</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000352457857519671117">
+        <rect codeLine="37" fill="#F1F1F1" height="64.7999" id="C_0000352457857519671117" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="695" y="310"/>
+        <ellipse cx="715.85" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M710.85,327.1563 C710.85,329.6563 712.9906,331.4688 715.9125,331.4688 C717.1469,331.4688 718.3188,331.1719 719.0688,330.6563 C719.6781,330.2344 720.0063,329.8125 720.0063,329.4063 C720.0063,328.9375 719.5844,328.5313 719.0844,328.5313 C718.85,328.5313 718.6313,328.6094 718.4281,328.8125 C717.9906,329.25 717.9906,329.25 717.8188,329.3438 C717.3656,329.5781 716.725,329.7188 715.9594,329.7188 C713.9594,329.7188 712.6781,328.7031 712.6781,327.125 L712.6781,326.0781 C712.6781,324.375 713.8969,323.1719 715.6,323.1719 C716.1781,323.1719 716.7563,323.3125 717.225,323.5625 C717.6938,323.8281 717.8656,324.0156 717.9281,324.375 C718.0531,325.0469 718.3031,325.2969 718.8344,325.2969 C719.1156,325.2969 719.3969,325.1563 719.5844,324.9375 C719.7094,324.7656 719.7563,324.5938 719.7563,324.1563 L719.7563,322.7969 C719.7563,322.375 719.7406,322.2344 719.6156,322.0625 C719.4438,321.8125 719.1625,321.6563 718.8344,321.6563 C718.5219,321.6563 718.3188,321.7656 718.1,322.0313 C716.9281,321.5313 716.4906,321.4219 715.5375,321.4219 C712.8656,321.4219 710.85,323.4375 710.85,326.0625 L710.85,327.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="731.15" y="330.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="51" x="754" y="307"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="49" x="755" y="321.2001">U const&amp;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="696" x2="801" y1="342" y2="342"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="696" x2="801" y1="350" y2="350"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="701" y="358.9"/>
+          <ellipse cx="706" cy="363.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="715" y="367.0059">u : const U &amp;</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000314708288320430272">
+        <rect codeLine="42" fill="#F1F1F1" height="81.5999" id="C_0000314708288320430272" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="89" x="704" y="409.6"/>
+        <ellipse cx="723.95" cy="425.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M718.95,426.7562 C718.95,429.2562 721.0906,431.0687 724.0125,431.0687 C725.2469,431.0687 726.4188,430.7719 727.1688,430.2562 C727.7781,429.8344 728.1063,429.4125 728.1063,429.0062 C728.1063,428.5375 727.6844,428.1312 727.1844,428.1312 C726.95,428.1312 726.7313,428.2094 726.5281,428.4125 C726.0906,428.85 726.0906,428.85 725.9188,428.9437 C725.4656,429.1781 724.825,429.3187 724.0594,429.3187 C722.0594,429.3187 720.7781,428.3031 720.7781,426.725 L720.7781,425.6781 C720.7781,423.975 721.9969,422.7719 723.7,422.7719 C724.2781,422.7719 724.8563,422.9125 725.325,423.1625 C725.7938,423.4281 725.9656,423.6156 726.0281,423.975 C726.1531,424.6469 726.4031,424.8969 726.9344,424.8969 C727.2156,424.8969 727.4969,424.7562 727.6844,424.5375 C727.8094,424.3656 727.8563,424.1937 727.8563,423.7562 L727.8563,422.3969 C727.8563,421.975 727.8406,421.8344 727.7156,421.6625 C727.5438,421.4125 727.2625,421.2562 726.9344,421.2562 C726.6219,421.2562 726.4188,421.3656 726.2,421.6312 C725.0281,421.1312 724.5906,421.0219 723.6375,421.0219 C720.9656,421.0219 718.95,423.0375 718.95,425.6625 L718.95,426.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="739.05" y="430.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="35" x="761" y="406.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="33" x="762" y="420.8001">M C::*</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="705" x2="792" y1="441.6" y2="441.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="705" x2="792" y1="449.6" y2="449.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="710" y="458.5"/>
+          <ellipse cx="715" cy="463.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="724" y="466.6059">c : C &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="710" y="475.2999"/>
+          <ellipse cx="715" cy="480.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="724" y="483.4059">m : M C::*</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000827753335392390402">
+        <rect codeLine="48" fill="#F1F1F1" height="81.5999" id="C_0000827753335392390402" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="446.5" y="155.6"/>
+        <ellipse cx="461.5" cy="171.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M456.5,172.7562 C456.5,175.2562 458.6406,177.0687 461.5625,177.0687 C462.7969,177.0687 463.9688,176.7719 464.7188,176.2562 C465.3281,175.8344 465.6563,175.4125 465.6563,175.0062 C465.6563,174.5375 465.2344,174.1312 464.7344,174.1312 C464.5,174.1312 464.2813,174.2094 464.0781,174.4125 C463.6406,174.85 463.6406,174.85 463.4688,174.9437 C463.0156,175.1781 462.375,175.3187 461.6094,175.3187 C459.6094,175.3187 458.3281,174.3031 458.3281,172.725 L458.3281,171.6781 C458.3281,169.975 459.5469,168.7719 461.25,168.7719 C461.8281,168.7719 462.4063,168.9125 462.875,169.1625 C463.3438,169.4281 463.5156,169.6156 463.5781,169.975 C463.7031,170.6469 463.9531,170.8969 464.4844,170.8969 C464.7656,170.8969 465.0469,170.7562 465.2344,170.5375 C465.3594,170.3656 465.4063,170.1937 465.4063,169.7562 L465.4063,168.3969 C465.4063,167.975 465.3906,167.8344 465.2656,167.6625 C465.0938,167.4125 464.8125,167.2562 464.4844,167.2562 C464.1719,167.2562 463.9688,167.3656 463.75,167.6312 C462.5781,167.1312 462.1406,167.0219 461.1875,167.0219 C458.5156,167.0219 456.5,169.0375 456.5,171.6625 L456.5,172.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="475.5" y="176.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="492.5" y="152.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="493.5" y="166.8001">M C::* &amp;&amp;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="447.5" x2="542.5" y1="187.6" y2="187.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="447.5" x2="542.5" y1="195.6" y2="195.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="452.5" y="204.5"/>
+          <ellipse cx="457.5" cy="209.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="466.5" y="212.6059">c : C &amp;&amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="452.5" y="221.2999"/>
+          <ellipse cx="457.5" cy="226.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="466.5" y="229.4059">m : M C::*</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000395583480407686249">
+        <rect codeLine="54" fill="#F1F1F1" height="81.5999" id="C_0000395583480407686249" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="692" y="526.6"/>
+        <ellipse cx="707" cy="542.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M702,543.7562 C702,546.2562 704.1406,548.0687 707.0625,548.0687 C708.2969,548.0687 709.4688,547.7719 710.2188,547.2562 C710.8281,546.8344 711.1563,546.4125 711.1563,546.0062 C711.1563,545.5375 710.7344,545.1312 710.2344,545.1312 C710,545.1312 709.7813,545.2094 709.5781,545.4125 C709.1406,545.85 709.1406,545.85 708.9688,545.9437 C708.5156,546.1781 707.875,546.3187 707.1094,546.3187 C705.1094,546.3187 703.8281,545.3031 703.8281,543.725 L703.8281,542.6781 C703.8281,540.975 705.0469,539.7719 706.75,539.7719 C707.3281,539.7719 707.9063,539.9125 708.375,540.1625 C708.8438,540.4281 709.0156,540.6156 709.0781,540.975 C709.2031,541.6469 709.4531,541.8969 709.9844,541.8969 C710.2656,541.8969 710.5469,541.7562 710.7344,541.5375 C710.8594,541.3656 710.9063,541.1937 710.9063,540.7562 L710.9063,539.3969 C710.9063,538.975 710.8906,538.8344 710.7656,538.6625 C710.5938,538.4125 710.3125,538.2562 709.9844,538.2562 C709.6719,538.2562 709.4688,538.3656 709.25,538.6312 C708.0781,538.1312 707.6406,538.0219 706.6875,538.0219 C704.0156,538.0219 702,540.0375 702,542.6625 L702,543.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="721" y="547.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="70" x="738" y="523.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="68" x="739" y="537.8001">M (C::*)(Arg)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="693" x2="804" y1="558.6" y2="558.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="693" x2="804" y1="566.6" y2="566.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="698" y="575.5"/>
+          <ellipse cx="703" cy="580.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="712" y="583.6059">c : C &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="698" y="592.2999"/>
+          <ellipse cx="703" cy="597.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="712" y="600.4059">m : M C::*</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000476497055497873078">
+        <rect codeLine="60" fill="#F1F1F1" height="64.7999" id="C_0000476497055497873078" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="121" x="434.5" y="535"/>
+        <ellipse cx="449.5" cy="551" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M444.5,552.1563 C444.5,554.6563 446.6406,556.4688 449.5625,556.4688 C450.7969,556.4688 451.9688,556.1719 452.7188,555.6563 C453.3281,555.2344 453.6563,554.8125 453.6563,554.4063 C453.6563,553.9375 453.2344,553.5313 452.7344,553.5313 C452.5,553.5313 452.2813,553.6094 452.0781,553.8125 C451.6406,554.25 451.6406,554.25 451.4688,554.3438 C451.0156,554.5781 450.375,554.7188 449.6094,554.7188 C447.6094,554.7188 446.3281,553.7031 446.3281,552.125 L446.3281,551.0781 C446.3281,549.375 447.5469,548.1719 449.25,548.1719 C449.8281,548.1719 450.4063,548.3125 450.875,548.5625 C451.3438,548.8281 451.5156,549.0156 451.5781,549.375 C451.7031,550.0469 451.9531,550.2969 452.4844,550.2969 C452.7656,550.2969 453.0469,550.1563 453.2344,549.9375 C453.3594,549.7656 453.4063,549.5938 453.4063,549.1563 L453.4063,547.7969 C453.4063,547.375 453.3906,547.2344 453.2656,547.0625 C453.0938,546.8125 452.8125,546.6563 452.4844,546.6563 C452.1719,546.6563 451.9688,546.7656 451.75,547.0313 C450.5781,546.5313 450.1406,546.4219 449.1875,546.4219 C446.5156,546.4219 444.5,548.4375 444.5,551.0625 L444.5,552.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="463.5" y="555.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="78" x="480.5" y="532"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="76" x="481.5" y="546.2001">int (C::*)(bool)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="435.5" x2="554.5" y1="567" y2="567"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="435.5" x2="554.5" y1="575" y2="575"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="440.5" y="583.9"/>
+          <ellipse cx="445.5" cy="588.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="454.5" y="592.0059">c : C &amp;</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001619634759668095904">
+        <rect codeLine="65" fill="#F1F1F1" height="81.5999" id="C_0001619634759668095904" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="132" x="429" y="272.6"/>
+        <ellipse cx="444" cy="288.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M439,289.7562 C439,292.2562 441.1406,294.0687 444.0625,294.0687 C445.2969,294.0687 446.4688,293.7719 447.2188,293.2562 C447.8281,292.8344 448.1563,292.4125 448.1563,292.0062 C448.1563,291.5375 447.7344,291.1312 447.2344,291.1312 C447,291.1312 446.7813,291.2094 446.5781,291.4125 C446.1406,291.85 446.1406,291.85 445.9688,291.9437 C445.5156,292.1781 444.875,292.3187 444.1094,292.3187 C442.1094,292.3187 440.8281,291.3031 440.8281,289.725 L440.8281,288.6781 C440.8281,286.975 442.0469,285.7719 443.75,285.7719 C444.3281,285.7719 444.9063,285.9125 445.375,286.1625 C445.8438,286.4281 446.0156,286.6156 446.0781,286.975 C446.2031,287.6469 446.4531,287.8969 446.9844,287.8969 C447.2656,287.8969 447.5469,287.7562 447.7344,287.5375 C447.8594,287.3656 447.9063,287.1937 447.9063,286.7562 L447.9063,285.3969 C447.9063,284.975 447.8906,284.8344 447.7656,284.6625 C447.5938,284.4125 447.3125,284.2562 446.9844,284.2562 C446.6719,284.2562 446.4688,284.3656 446.25,284.6312 C445.0781,284.1312 444.6406,284.0219 443.6875,284.0219 C441.0156,284.0219 439,286.0375 439,288.6625 L439,289.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="458" y="293.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="89" x="475" y="269.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="87" x="476" y="283.8001">M (C::*)(Arg) &amp;&amp;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="430" x2="560" y1="304.6" y2="304.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="430" x2="560" y1="312.6" y2="312.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="435" y="321.5"/>
+          <ellipse cx="440" cy="326.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="449" y="329.6059">c : C &amp;&amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="435" y="338.2999"/>
+          <ellipse cx="440" cy="343.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="449" y="346.4059">m : M C::*</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001357746808315142717">
+        <rect codeLine="71" fill="#F1F1F1" height="81.5999" id="C_0001357746808315142717" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="106.5" y="272.6"/>
+        <ellipse cx="121.5" cy="288.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M116.5,289.7562 C116.5,292.2562 118.6406,294.0687 121.5625,294.0687 C122.7969,294.0687 123.9688,293.7719 124.7188,293.2562 C125.3281,292.8344 125.6563,292.4125 125.6563,292.0062 C125.6563,291.5375 125.2344,291.1312 124.7344,291.1312 C124.5,291.1312 124.2813,291.2094 124.0781,291.4125 C123.6406,291.85 123.6406,291.85 123.4688,291.9437 C123.0156,292.1781 122.375,292.3187 121.6094,292.3187 C119.6094,292.3187 118.3281,291.3031 118.3281,289.725 L118.3281,288.6781 C118.3281,286.975 119.5469,285.7719 121.25,285.7719 C121.8281,285.7719 122.4063,285.9125 122.875,286.1625 C123.3438,286.4281 123.5156,286.6156 123.5781,286.975 C123.7031,287.6469 123.9531,287.8969 124.4844,287.8969 C124.7656,287.8969 125.0469,287.7562 125.2344,287.5375 C125.3594,287.3656 125.4063,287.1937 125.4063,286.7562 L125.4063,285.3969 C125.4063,284.975 125.3906,284.8344 125.2656,284.6625 C125.0938,284.4125 124.8125,284.2562 124.4844,284.2562 C124.1719,284.2562 123.9688,284.3656 123.75,284.6312 C122.5781,284.1312 122.1406,284.0219 121.1875,284.0219 C118.5156,284.0219 116.5,286.0375 116.5,288.6625 L116.5,289.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="135.5" y="293.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="96" x="152.5" y="269.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="94" x="153.5" y="283.8001">float (C::*)(int) &amp;&amp;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="107.5" x2="244.5" y1="304.6" y2="304.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="107.5" x2="244.5" y1="312.6" y2="312.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="112.5" y="321.5"/>
+          <ellipse cx="117.5" cy="326.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="126.5" y="329.6059">c : C &amp;&amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="112.5" y="338.2999"/>
+          <ellipse cx="117.5" cy="343.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="126.5" y="346.4059">mf : float C::*</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000544335779197078982">
+        <rect codeLine="77" fill="#F1F1F1" height="81.5999" id="C_0000544335779197078982" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="178" x="659.5" y="643.6"/>
+        <ellipse cx="674.5" cy="659.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M669.5,660.7562 C669.5,663.2562 671.6406,665.0687 674.5625,665.0687 C675.7969,665.0687 676.9688,664.7719 677.7188,664.2562 C678.3281,663.8344 678.6563,663.4125 678.6563,663.0062 C678.6563,662.5375 678.2344,662.1312 677.7344,662.1312 C677.5,662.1312 677.2813,662.2094 677.0781,662.4125 C676.6406,662.85 676.6406,662.85 676.4688,662.9437 C676.0156,663.1781 675.375,663.3187 674.6094,663.3187 C672.6094,663.3187 671.3281,662.3031 671.3281,660.725 L671.3281,659.6781 C671.3281,657.975 672.5469,656.7719 674.25,656.7719 C674.8281,656.7719 675.4063,656.9125 675.875,657.1625 C676.3438,657.4281 676.5156,657.6156 676.5781,657.975 C676.7031,658.6469 676.9531,658.8969 677.4844,658.8969 C677.7656,658.8969 678.0469,658.7562 678.2344,658.5375 C678.3594,658.3656 678.4063,658.1937 678.4063,657.7562 L678.4063,656.3969 C678.4063,655.975 678.3906,655.8344 678.2656,655.6625 C678.0938,655.4125 677.8125,655.2562 677.4844,655.2562 C677.1719,655.2562 676.9688,655.3656 676.75,655.6312 C675.5781,655.1312 675.1406,655.0219 674.1875,655.0219 C671.5156,655.0219 669.5,657.0375 669.5,659.6625 L669.5,660.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="688.5" y="664.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="135" x="705.5" y="640.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="133" x="706.5" y="654.8001">M (C::*)(Arg1,Arg2,Arg3)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="660.5" x2="836.5" y1="675.6" y2="675.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="660.5" x2="836.5" y1="683.6" y2="683.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="665.5" y="692.5"/>
+          <ellipse cx="670.5" cy="697.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="679.5" y="700.6059">c : C &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="665.5" y="709.2999"/>
+          <ellipse cx="670.5" cy="714.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="679.5" y="717.4059">m : M C::*</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000602066980416477930">
+        <rect codeLine="83" fill="#F1F1F1" height="64.7999" id="C_0000602066980416477930" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="92" x="702.5" y="760"/>
+        <ellipse cx="721.1" cy="776" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M716.1,777.1563 C716.1,779.6563 718.2406,781.4688 721.1625,781.4688 C722.3969,781.4688 723.5688,781.1719 724.3188,780.6563 C724.9281,780.2344 725.2563,779.8125 725.2563,779.4063 C725.2563,778.9375 724.8344,778.5313 724.3344,778.5313 C724.1,778.5313 723.8813,778.6094 723.6781,778.8125 C723.2406,779.25 723.2406,779.25 723.0688,779.3438 C722.6156,779.5781 721.975,779.7188 721.2094,779.7188 C719.2094,779.7188 717.9281,778.7031 717.9281,777.125 L717.9281,776.0781 C717.9281,774.375 719.1469,773.1719 720.85,773.1719 C721.4281,773.1719 722.0063,773.3125 722.475,773.5625 C722.9438,773.8281 723.1156,774.0156 723.1781,774.375 C723.3031,775.0469 723.5531,775.2969 724.0844,775.2969 C724.3656,775.2969 724.6469,775.1563 724.8344,774.9375 C724.9594,774.7656 725.0063,774.5938 725.0063,774.1563 L725.0063,772.7969 C725.0063,772.375 724.9906,772.2344 724.8656,772.0625 C724.6938,771.8125 724.4125,771.6563 724.0844,771.6563 C723.7719,771.6563 723.5688,771.7656 723.35,772.0313 C722.1781,771.5313 721.7406,771.4219 720.7875,771.4219 C718.1156,771.4219 716.1,773.4375 716.1,776.0625 L716.1,777.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="735.9" y="780.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="41" x="756.5" y="757"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="39" x="757.5" y="771.2001">char[N]</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="703.5" x2="793.5" y1="792" y2="792"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="703.5" x2="793.5" y1="800" y2="800"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="708.5" y="808.9"/>
+          <ellipse cx="713.5" cy="813.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="722.5" y="817.0059">n : char[N]</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001318419672443856415">
+        <rect codeLine="88" fill="#F1F1F1" height="64.7999" id="C_0001318419672443856415" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="156" x="417" y="760"/>
+        <ellipse cx="455.85" cy="776" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M450.85,777.1563 C450.85,779.6563 452.9906,781.4688 455.9125,781.4688 C457.1469,781.4688 458.3188,781.1719 459.0688,780.6563 C459.6781,780.2344 460.0063,779.8125 460.0063,779.4063 C460.0063,778.9375 459.5844,778.5313 459.0844,778.5313 C458.85,778.5313 458.6313,778.6094 458.4281,778.8125 C457.9906,779.25 457.9906,779.25 457.8188,779.3438 C457.3656,779.5781 456.725,779.7188 455.9594,779.7188 C453.9594,779.7188 452.6781,778.7031 452.6781,777.125 L452.6781,776.0781 C452.6781,774.375 453.8969,773.1719 455.6,773.1719 C456.1781,773.1719 456.7563,773.3125 457.225,773.5625 C457.6938,773.8281 457.8656,774.0156 457.9281,774.375 C458.0531,775.0469 458.3031,775.2969 458.8344,775.2969 C459.1156,775.2969 459.3969,775.1563 459.5844,774.9375 C459.7094,774.7656 459.7563,774.5938 459.7563,774.1563 L459.7563,772.7969 C459.7563,772.375 459.7406,772.2344 459.6156,772.0625 C459.4438,771.8125 459.1625,771.6563 458.8344,771.6563 C458.5219,771.6563 458.3188,771.7656 458.1,772.0313 C456.9281,771.5313 456.4906,771.4219 455.5375,771.4219 C452.8656,771.4219 450.85,773.4375 450.85,776.0625 L450.85,777.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="475.15" y="780.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="60" x="516" y="757"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="58" x="517" y="771.2001">char[1000]</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="418" x2="572" y1="792" y2="792"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="418" x2="572" y1="800" y2="800"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="423" y="808.9"/>
+          <ellipse cx="428" cy="813.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="130" x="437" y="817.0059">n : std::vector&lt;char&gt;</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000599593856979463652">
+        <rect codeLine="93" fill="#F1F1F1" height="64.7999" id="C_0000599593856979463652" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="141" x="678" y="860"/>
+        <ellipse cx="706.05" cy="876" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M701.05,877.1563 C701.05,879.6563 703.1906,881.4688 706.1125,881.4688 C707.3469,881.4688 708.5188,881.1719 709.2688,880.6563 C709.8781,880.2344 710.2063,879.8125 710.2063,879.4063 C710.2063,878.9375 709.7844,878.5313 709.2844,878.5313 C709.05,878.5313 708.8313,878.6094 708.6281,878.8125 C708.1906,879.25 708.1906,879.25 708.0188,879.3438 C707.5656,879.5781 706.925,879.7188 706.1594,879.7188 C704.1594,879.7188 702.8781,878.7031 702.8781,877.125 L702.8781,876.0781 C702.8781,874.375 704.0969,873.1719 705.8,873.1719 C706.3781,873.1719 706.9563,873.3125 707.425,873.5625 C707.8938,873.8281 708.0656,874.0156 708.1281,874.375 C708.2531,875.0469 708.5031,875.2969 709.0344,875.2969 C709.3156,875.2969 709.5969,875.1563 709.7844,874.9375 C709.9094,874.7656 709.9563,874.5938 709.9563,874.1563 L709.9563,872.7969 C709.9563,872.375 709.9406,872.2344 709.8156,872.0625 C709.6438,871.8125 709.3625,871.6563 709.0344,871.6563 C708.7219,871.6563 708.5188,871.7656 708.3,872.0313 C707.1281,871.5313 706.6906,871.4219 705.7375,871.4219 C703.0656,871.4219 701.05,873.4375 701.05,876.0625 L701.05,877.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="722.95" y="880.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="69" x="753" y="857"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="67" x="754" y="871.2001">char[M][L][K]</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="679" x2="818" y1="892" y2="892"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="679" x2="818" y1="900" y2="900"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="684" y="908.9"/>
+          <ellipse cx="689" cy="913.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="698" y="917.0059">klm : char[K][L][M]</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000015395295268000991">
+        <rect codeLine="98" fill="#F1F1F1" height="64.7999" id="C_0000015395295268000991" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="73" x="712" y="960"/>
+        <ellipse cx="727.9" cy="976" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M722.9,977.1563 C722.9,979.6563 725.0406,981.4688 727.9625,981.4688 C729.1969,981.4688 730.3688,981.1719 731.1188,980.6563 C731.7281,980.2344 732.0563,979.8125 732.0563,979.4063 C732.0563,978.9375 731.6344,978.5313 731.1344,978.5313 C730.9,978.5313 730.6813,978.6094 730.4781,978.8125 C730.0406,979.25 730.0406,979.25 729.8688,979.3438 C729.4156,979.5781 728.775,979.7188 728.0094,979.7188 C726.0094,979.7188 724.7281,978.7031 724.7281,977.125 L724.7281,976.0781 C724.7281,974.375 725.9469,973.1719 727.65,973.1719 C728.2281,973.1719 728.8063,973.3125 729.275,973.5625 C729.7438,973.8281 729.9156,974.0156 729.9781,974.375 C730.1031,975.0469 730.3531,975.2969 730.8844,975.2969 C731.1656,975.2969 731.4469,975.1563 731.6344,974.9375 C731.7594,974.7656 731.8063,974.5938 731.8063,974.1563 L731.8063,972.7969 C731.8063,972.375 731.7906,972.2344 731.6656,972.0625 C731.4938,971.8125 731.2125,971.6563 730.8844,971.6563 C730.5719,971.6563 730.3688,971.7656 730.15,972.0313 C728.9781,971.5313 728.5406,971.4219 727.5875,971.4219 C724.9156,971.4219 722.9,973.4375 722.9,976.0625 L722.9,977.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="742.1" y="980.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="28" x="760" y="957"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="26" x="761" y="971.2001">U(...)</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="713" x2="784" y1="992" y2="992"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="713" x2="784" y1="1000" y2="1000"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="718" y="1008.9"/>
+          <ellipse cx="723" cy="1013.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="732" y="1017.0059">u : bool</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001603321863498552207">
+        <rect codeLine="103" fill="#F1F1F1" height="64.7999" id="C_0001603321863498552207" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="708.5" y="1060"/>
+        <ellipse cx="725.75" cy="1076" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M720.75,1077.1563 C720.75,1079.6563 722.8906,1081.4688 725.8125,1081.4688 C727.0469,1081.4688 728.2188,1081.1719 728.9688,1080.6563 C729.5781,1080.2344 729.9063,1079.8125 729.9063,1079.4063 C729.9063,1078.9375 729.4844,1078.5313 728.9844,1078.5313 C728.75,1078.5313 728.5313,1078.6094 728.3281,1078.8125 C727.8906,1079.25 727.8906,1079.25 727.7188,1079.3438 C727.2656,1079.5781 726.625,1079.7188 725.8594,1079.7188 C723.8594,1079.7188 722.5781,1078.7031 722.5781,1077.125 L722.5781,1076.0781 C722.5781,1074.375 723.7969,1073.1719 725.5,1073.1719 C726.0781,1073.1719 726.6563,1073.3125 727.125,1073.5625 C727.5938,1073.8281 727.7656,1074.0156 727.8281,1074.375 C727.9531,1075.0469 728.2031,1075.2969 728.7344,1075.2969 C729.0156,1075.2969 729.2969,1075.1563 729.4844,1074.9375 C729.6094,1074.7656 729.6563,1074.5938 729.6563,1074.1563 L729.6563,1072.7969 C729.6563,1072.375 729.6406,1072.2344 729.5156,1072.0625 C729.3438,1071.8125 729.0625,1071.6563 728.7344,1071.6563 C728.4219,1071.6563 728.2188,1071.7656 728,1072.0313 C726.8281,1071.5313 726.3906,1071.4219 725.4375,1071.4219 C722.7656,1071.4219 720.75,1073.4375 720.75,1076.0625 L720.75,1077.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="740.25" y="1080.606">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="759.5" y="1057"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="760.5" y="1071.2001">C&lt;T&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="709.5" x2="787.5" y1="1092" y2="1092"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="709.5" x2="787.5" y1="1100" y2="1100"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="714.5" y="1108.9"/>
+          <ellipse cx="719.5" cy="1113.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="728.5" y="1117.0059">c : C&lt;T&gt;</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000232518961342221670">
+        <rect codeLine="108" fill="#F1F1F1" height="81.5999" id="C_0000232518961342221670" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="181" x="658" y="1159.6"/>
+        <ellipse cx="704.25" cy="1175.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M699.25,1176.7563 C699.25,1179.2563 701.3906,1181.0688 704.3125,1181.0688 C705.5469,1181.0688 706.7188,1180.7719 707.4688,1180.2563 C708.0781,1179.8344 708.4063,1179.4125 708.4063,1179.0063 C708.4063,1178.5375 707.9844,1178.1313 707.4844,1178.1313 C707.25,1178.1313 707.0313,1178.2094 706.8281,1178.4125 C706.3906,1178.85 706.3906,1178.85 706.2188,1178.9438 C705.7656,1179.1781 705.125,1179.3188 704.3594,1179.3188 C702.3594,1179.3188 701.0781,1178.3031 701.0781,1176.725 L701.0781,1175.6781 C701.0781,1173.975 702.2969,1172.7719 704,1172.7719 C704.5781,1172.7719 705.1563,1172.9125 705.625,1173.1625 C706.0938,1173.4281 706.2656,1173.6156 706.3281,1173.975 C706.4531,1174.6469 706.7031,1174.8969 707.2344,1174.8969 C707.5156,1174.8969 707.7969,1174.7563 707.9844,1174.5375 C708.1094,1174.3656 708.1563,1174.1938 708.1563,1173.7563 L708.1563,1172.3969 C708.1563,1171.975 708.1406,1171.8344 708.0156,1171.6625 C707.8438,1171.4125 707.5625,1171.2563 707.2344,1171.2563 C706.9219,1171.2563 706.7188,1171.3656 706.5,1171.6313 C705.3281,1171.1313 704.8906,1171.0219 703.9375,1171.0219 C701.2656,1171.0219 699.25,1173.0375 699.25,1175.6625 L699.25,1176.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="724.75" y="1180.206">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="69" x="773" y="1156.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="67" x="774" y="1170.8001">C&lt;T,Args...&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="659" x2="838" y1="1191.6" y2="1191.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="659" x2="838" y1="1199.6" y2="1199.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="664" y="1208.5"/>
+          <ellipse cx="669" cy="1213.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="678" y="1216.6059">args : std::tuple&lt;Args...&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="664" y="1225.2999"/>
+          <ellipse cx="669" cy="1230.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="678" y="1233.4059">c : C&lt;T&gt;</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000121103565834936476">
+        <rect codeLine="114" fill="#F1F1F1" height="48" id="C_0000121103565834936476" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="52" x="912" y="660.4"/>
+        <ellipse cx="927" cy="676.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M922,677.5563 C922,680.0563 924.1406,681.8688 927.0625,681.8688 C928.2969,681.8688 929.4688,681.5719 930.2188,681.0563 C930.8281,680.6344 931.1563,680.2125 931.1563,679.8063 C931.1563,679.3375 930.7344,678.9313 930.2344,678.9313 C930,678.9313 929.7813,679.0094 929.5781,679.2125 C929.1406,679.65 929.1406,679.65 928.9688,679.7438 C928.5156,679.9781 927.875,680.1188 927.1094,680.1188 C925.1094,680.1188 923.8281,679.1031 923.8281,677.525 L923.8281,676.4781 C923.8281,674.775 925.0469,673.5719 926.75,673.5719 C927.3281,673.5719 927.9063,673.7125 928.375,673.9625 C928.8438,674.2281 929.0156,674.4156 929.0781,674.775 C929.2031,675.4469 929.4531,675.6969 929.9844,675.6969 C930.2656,675.6969 930.5469,675.5563 930.7344,675.3375 C930.8594,675.1656 930.9063,674.9938 930.9063,674.5563 L930.9063,673.1969 C930.9063,672.775 930.8906,672.6344 930.7656,672.4625 C930.5938,672.2125 930.3125,672.0563 929.9844,672.0563 C929.6719,672.0563 929.4688,672.1656 929.25,672.4313 C928.0781,671.9313 927.6406,671.8219 926.6875,671.8219 C924.0156,671.8219 922,673.8375 922,676.4625 L922,677.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="941" y="681.006">A</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="958" y="657.4"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="959" y="671.6001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="913" x2="963" y1="692.4" y2="692.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="913" x2="963" y1="700.4" y2="700.4"/>
+      </g>
+    </a>
+    <g id="link_C_0001046827200300090710_C_0000121103565834936476">
+      <path codeLine="117" d="M783.48,1300.68 C806.51,1293.62 835.62,1280.77 852,1258.4 C917.76,1168.58 932.7705,824.0513 935.8005,726.6113 " fill="none" id="C_0001046827200300090710-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="936.36,708.62,929.8034,726.4248,941.7976,726.7978,936.36,708.62" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001099548178945911245_C_0001046827200300090710">
+      <path codeLine="118" d="M585.38,1308.4 C629.85,1308.4 662.97,1308.4 695.72,1308.4 " fill="none" id="C_0001099548178945911245-to-C_0001046827200300090710" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="713.72,1308.4,695.72,1302.4,695.72,1314.4,713.72,1308.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001239388209995793547_C_0001099548178945911245">
+      <path codeLine="119" d="M345.25,1308.4 C365.7,1308.4 367.93,1308.4 386.58,1308.4 " fill="none" id="C_0001239388209995793547-to-C_0001099548178945911245" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="404.58,1308.4,386.58,1302.4,386.58,1314.4,404.58,1308.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045701897814162098_C_0000121103565834936476">
+      <path codeLine="120" d="M783.51,50.1 C806.55,57.15 835.67,70 852,92.4 C919.73,185.33 933.4233,542.6461 936.0033,642.1161 " fill="none" id="C_0000045701897814162098-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="936.47,660.11,942.0013,641.9605,930.0053,642.2716,936.47,660.11" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001379193770802992785_C_0000045701897814162098">
+      <path codeLine="121" d="M548.72,42.4 C598.27,42.4 652.97,42.4 695.34,42.4 " fill="none" id="C_0001379193770802992785-to-C_0000045701897814162098" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="713.34,42.4,695.34,36.4,695.34,48.4,713.34,42.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001407865337446777280_C_0000121103565834936476">
+      <path codeLine="122" d="M834.64,175.23 C841.18,180.21 847.13,185.91 852,192.4 C908.73,267.96 929.4219,553.6411 934.6319,642.1211 " fill="none" id="C_0001407865337446777280-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="935.69,660.09,940.6216,641.7684,928.6423,642.4738,935.69,660.09" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001034483227649400416_C_0000121103565834936476">
+      <path codeLine="123" d="M787.75,252.01 C809.73,259.48 836.05,272.07 852,292.4 C897.83,350.82 924.36,566.0238 932.58,642.2438 " fill="none" id="C_0001034483227649400416-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="934.51,660.14,938.5454,641.6004,926.6146,642.8871,934.51,660.14" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000352457857519671117_C_0000121103565834936476">
+      <path codeLine="124" d="M802.29,358.26 C820.26,365.99 839.05,377.03 852,392.4 C920.04,473.16 932.7584,587.9721 935.4484,642.2121 " fill="none" id="C_0000352457857519671117-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="936.34,660.19,941.441,641.9149,929.4558,642.5093,936.34,660.19" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000314708288320430272_C_0000121103565834936476">
+      <path codeLine="125" d="M793.36,468.41 C813.19,478.23 835.76,491.98 852,509.4 C893.8,554.24 913.8013,606.2453 924.9513,642.7453 " fill="none" id="C_0000314708288320430272-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="930.21,659.96,930.6895,640.9924,919.213,644.4982,930.21,659.96" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000827753335392390402_C_0001034483227649400416">
+      <path codeLine="126" d="M543.9,205.16 C591.93,213.95 647.2335,224.0625 691.5335,232.1625 " fill="none" id="C_0000827753335392390402-to-C_0001034483227649400416" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="709.24,235.4,692.6127,226.2603,690.4544,238.0646,709.24,235.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000395583480407686249_C_0000121103565834936476">
+      <path codeLine="127" d="M805.28,598.48 C820.57,607.27 837.04,617.01 852,626.4 C872.43,639.22 880.2105,644.3182 896.9305,656.0382 " fill="none" id="C_0000395583480407686249-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="911.67,666.37,900.3744,651.125,893.4865,660.9514,911.67,666.37" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000476497055497873078_C_0000395583480407686249">
+      <path codeLine="128" d="M555.92,567.4 C597.18,567.4 633.61,567.4 673.91,567.4 " fill="none" id="C_0000476497055497873078-to-C_0000395583480407686249" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="691.91,567.4,673.91,561.4,673.91,573.4,691.91,567.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001619634759668095904_C_0001034483227649400416">
+      <path codeLine="129" d="M561.42,294.93 C608.29,281.7 652.476,269.2166 691.686,258.1566 " fill="none" id="C_0001619634759668095904-to-C_0001034483227649400416" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="709.01,253.27,690.0571,252.3819,693.3149,263.9313,709.01,253.27" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001357746808315142717_C_0001619634759668095904">
+      <path codeLine="130" d="M245.78,313.4 C300.05,313.4 357.23,313.4 410.6,313.4 " fill="none" id="C_0001357746808315142717-to-C_0001619634759668095904" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="428.6,313.4,410.6,307.4,410.6,319.4,428.6,313.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000544335779197078982_C_0000121103565834936476">
+      <path codeLine="131" d="M837.76,684.4 C864.74,684.4 874.32,684.4 893.54,684.4 " fill="none" id="C_0000544335779197078982-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="911.54,684.4,893.54,678.4,893.54,690.4,911.54,684.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000602066980416477930_C_0000121103565834936476">
+      <path codeLine="132" d="M794.89,772 C812.97,763.43 833.77,752.99 852,742.4 C872.7,730.37 880.3913,725.5382 896.9613,713.6582 " fill="none" id="C_0000602066980416477930-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="911.59,703.17,893.4653,708.7819,900.4574,718.5344,911.59,703.17" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001318419672443856415_C_0000602066980416477930">
+      <path codeLine="133" d="M573.17,792.4 C615.47,792.4 648.45,792.4 684.32,792.4 " fill="none" id="C_0001318419672443856415-to-C_0000602066980416477930" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="702.32,792.4,684.32,786.4,684.32,798.4,702.32,792.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000599593856979463652_C_0000121103565834936476">
+      <path codeLine="134" d="M819.24,865.77 C831.03,859.28 842.51,851.52 852,842.4 C891.98,803.98 911.5129,759.5927 923.3329,725.7627 " fill="none" id="C_0000599593856979463652-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="929.27,708.77,917.6686,723.7836,928.9971,727.7417,929.27,708.77" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000015395295268000991_C_0000121103565834936476">
+      <path codeLine="135" d="M785.26,982.78 C807.29,975.15 834.55,962.39 852,942.4 C912.78,872.76 928.5618,776.4339 933.4418,726.7139 " fill="none" id="C_0000015395295268000991-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="935.2,708.8,927.4704,726.1278,939.4131,727.3,935.2,708.8" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001603321863498552207_C_0000121103565834936476">
+      <path codeLine="136" d="M788.87,1082.24 C810.54,1074.69 836.16,1062.19 852,1042.4 C894.12,989.79 922.216,798.548 931.616,726.668 " fill="none" id="C_0001603321863498552207-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="933.95,708.82,925.6666,725.89,937.5653,727.446,933.95,708.82" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000232518961342221670_C_0000121103565834936476">
+      <path codeLine="137" d="M836.55,1159.21 C842.34,1154.15 847.61,1148.56 852,1142.4 C902.84,1071.13 927.0519,810.7833 933.7519,726.6033 " fill="none" id="C_0000232518961342221670-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="935.18,708.66,927.7708,726.1272,939.733,727.0793,935.18,708.66" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00062_class_mermaid.svg b/docs/test_cases/t00062_class_mermaid.svg
index a739c0a0..d1152ef4 100644
--- a/docs/test_cases/t00062_class_mermaid.svg
+++ b/docs/test_cases/t00062_class_mermaid.svg
@@ -1,76 +1,81 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2641.2578125 526" style="max-width: 2641.26px; background-color: white;" width="2641.2578125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M247.9609375,400L247.9609375,406C247.9609375,412,247.9609375,424,437.4505208333333,438.70602732434753C626.9401041666666,453.41205464869495,1005.9192708333334,470.8241092973899,1195.4088541666667,479.5301366217374L1384.8984375,488.23616394608484"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M247.9609375,249L247.9609375,255C247.9609375,261,247.9609375,273,247.9609375,285C247.9609375,297,247.9609375,309,247.9609375,315L247.9609375,321"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M247.9609375,87L247.9609375,94.83333333333333C247.9609375,102.66666666666667,247.9609375,118.33333333333333,247.9609375,132.16666666666666C247.9609375,146,247.9609375,158,247.9609375,164L247.9609375,170"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M485,400L485,406C485,412,485,424,634.9830729166666,438.6521892655367C784.9661458333334,453.3043785310735,1084.9322916666667,470.6087570621469,1234.9153645833333,479.2609463276836L1384.8984375,487.9131355932203"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M485,249L485,255C485,261,485,273,485,285C485,297,485,309,485,315L485,321"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M712.28125,400L712.28125,406C712.28125,412,712.28125,424,824.3841145833334,438.5663320909957C936.4869791666666,453.1326641819913,1160.6927083333333,470.26532836398263,1272.7955729166667,478.83166045497825L1384.8984375,487.3979925459739"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M942.671875,400L942.671875,406C942.671875,412,942.671875,424,1016.3763020833334,438.3945034871215C1090.0807291666667,452.78900697424297,1237.4895833333333,469.57801394848593,1311.1940104166667,477.9725174356074L1384.8984375,486.36702092272895"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1092.8203125,400L1092.8203125,406C1092.8203125,412,1092.8203125,424,1141.5,438.14917984696996C1190.1796875,452.29835969394,1287.5390625,468.59671938787983,1336.21875,476.7458992348498L1384.8984375,484.89507908181974"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1246.515625,411L1246.515625,415.1666666666667C1246.515625,419.3333333333333,1246.515625,427.6666666666667,1269.5794270833333,439.2714475212709C1292.6432291666667,450.87622837587514,1338.7708333333333,465.7524567517503,1361.8346354166667,473.19057093968786L1384.8984375,480.6286851276255"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M801.4609375,260L801.4609375,264.1666666666667C801.4609375,268.3333333333333,801.4609375,276.6666666666667,817.9661458333334,289.6580267404334C834.4713541666666,302.6493868142001,867.4817708333334,320.29877362840017,883.9869791666666,329.12346703550025L900.4921875,337.9481604426003"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M1412.40625,411L1412.40625,415.1666666666667C1412.40625,419.3333333333333,1412.40625,427.6666666666667,1412.40625,436C1412.40625,444.3333333333333,1412.40625,452.6666666666667,1412.40625,456.8333333333333L1412.40625,461"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1412.40625,249L1412.40625,255C1412.40625,261,1412.40625,273,1412.40625,283.1666666666667C1412.40625,293.3333333333333,1412.40625,301.6666666666667,1412.40625,305.8333333333333L1412.40625,310"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M1072.3828125,260L1072.3828125,264.1666666666667C1072.3828125,268.3333333333333,1072.3828125,276.6666666666667,1057.7942708333333,289.32479070047583C1043.2057291666667,301.982914734285,1014.0286458333334,318.96582946856995,999.4401041666666,327.4572868357124L984.8515625,335.9487442028549"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M1072.3828125,109L1072.3828125,113.16666666666667C1072.3828125,117.33333333333333,1072.3828125,125.66666666666667,1072.3828125,134C1072.3828125,142.33333333333334,1072.3828125,150.66666666666666,1072.3828125,154.83333333333334L1072.3828125,159"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1648.078125,411L1648.078125,415.1666666666667C1648.078125,419.3333333333333,1648.078125,427.6666666666667,1613.3841145833333,439.7092394307056C1578.6901041666667,451.7518121947446,1509.3020833333333,467.50362438948923,1474.6080729166667,475.37953048686154L1439.9140625,483.2554365842339"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M1864.2109375,400L1864.2109375,406C1864.2109375,412,1864.2109375,424,1793.4947916666667,438.3737816511329C1722.7786458333333,452.74756330226575,1581.3463541666667,469.4951266045316,1510.6302083333333,477.8689082556645L1439.9140625,486.2426899067974"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id17" d="M1864.2109375,249L1864.2109375,255C1864.2109375,261,1864.2109375,273,1864.2109375,285C1864.2109375,297,1864.2109375,309,1864.2109375,315L1864.2109375,321"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id18" d="M2041.46875,400L2041.46875,406C2041.46875,412,2041.46875,424,1941.2096354166667,438.52675629243254C1840.9505208333333,453.0535125848651,1640.4322916666667,470.1070251697301,1540.1731770833333,478.63378146216263L1439.9140625,487.1605377545951"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id19" d="M2208.5,400L2208.5,406C2208.5,412,2208.5,424,2080.40234375,438.60856476938176C1952.3046875,453.21712953876346,1696.109375,470.434259077527,1568.01171875,479.04282384690873L1439.9140625,487.6513886162905"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id20" d="M2341.75,400L2341.75,406C2341.75,412,2341.75,424,2191.4440104166665,438.6527406492036C2041.1380208333333,453.3054812984073,1740.5260416666667,470.61096259681455,1590.2200520833333,479.26370324601817L1439.9140625,487.9164438952218"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M2533.9296875,411L2533.9296875,415.1666666666667C2533.9296875,419.3333333333333,2533.9296875,427.6666666666667,2351.59375,440.531299269734C2169.2578125,453.3959318728014,1804.5859375,470.79186374560277,1622.25,479.4898296820034L1439.9140625,488.1877956184041"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M247.9609375,400L247.9609375,406C247.9609375,412,247.9609375,424,434.4536821916786,438.56833870504744C620.946426883357,453.1366774100948,993.9319162667142,470.2733548201897,1180.4246609583927,478.84169352523713L1366.9174056500713,487.41003223028457"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M247.9609375,249L247.9609375,255C247.9609375,261,247.9609375,273,247.9609375,282C247.9609375,291,247.9609375,297,247.9609375,300L247.9609375,303"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M247.9609375,87L247.9609375,94.83333333333333C247.9609375,102.66666666666667,247.9609375,118.33333333333333,247.9609375,129.16666666666666C247.9609375,140,247.9609375,146,247.9609375,149L247.9609375,152"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M485,400L485,406C485,412,485,424,631.9880523104937,438.47941320064575C778.9761046209874,452.95882640129156,1072.9522092419747,469.9176528025832,1219.9402615524684,478.39706600322893L1366.928313862962,486.87647920387474"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M485,249L485,255C485,261,485,273,485,282C485,291,485,297,485,300L485,303"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M712.28125,400L712.28125,406C712.28125,412,712.28125,424,821.3928352715657,438.33775370402253C930.5044205431315,452.675507408045,1148.727591086263,469.35101481609007,1257.8391763578286,477.68876852011255L1366.9507616293945,486.02652222413514"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M942.671875,400L942.671875,406C942.671875,412,942.671875,424,1013.3955726214053,438.05501582196365C1084.1192702428107,452.1100316439272,1225.5666654856213,468.2200632878544,1296.2903631070267,476.275079109818L1367.014060728432,484.3300949317816"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1092.8203125,400L1092.8203125,406C1092.8203125,412,1092.8203125,424,1138.5411728234485,437.65386001161113C1184.2620331468968,451.3077200232222,1275.7037537937938,466.61544004644435,1321.4246141172423,474.2693000580555L1367.1454744406906,481.92316006966655"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1246.515625,411L1246.515625,415.1666666666667C1246.515625,419.3333333333333,1246.515625,427.6666666666667,1266.7242353364484,438.3506434766882C1286.9328456728965,449.03462028670987,1327.3500663457933,462.0692405734197,1347.5586766822416,468.5865507167746L1367.76728701869,475.1038608601295"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M801.4609375,260L801.4609375,264.1666666666667C801.4609375,268.3333333333333,801.4609375,276.6666666666667,815.3205470364511,288.2435278871515C829.1801565729023,299.8203891076364,856.8993756458045,314.64077821527286,870.7589851822557,322.05097276909106L884.618594718707,329.46116732290926"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M1412.40625,411L1412.40625,415.1666666666667C1412.40625,419.3333333333333,1412.40625,427.6666666666667,1412.40625,433C1412.40625,438.3333333333333,1412.40625,440.6666666666667,1412.40625,441.8333333333333L1412.40625,443"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1412.40625,249L1412.40625,255C1412.40625,261,1412.40625,273,1412.40625,280.1666666666667C1412.40625,287.3333333333333,1412.40625,289.6666666666667,1412.40625,290.8333333333333L1412.40625,292"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M1072.3828125,260L1072.3828125,264.1666666666667C1072.3828125,268.3333333333333,1072.3828125,276.6666666666667,1060.3870393460504,287.8156348306391C1048.391266192101,298.9646029946116,1024.3997198842019,312.9292059892232,1012.4039467302524,319.911507486529L1000.4081735763028,326.8938089838348"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M1072.3828125,109L1072.3828125,113.16666666666667C1072.3828125,117.33333333333333,1072.3828125,125.66666666666667,1072.3828125,131C1072.3828125,136.33333333333334,1072.3828125,138.66666666666666,1072.3828125,139.83333333333334L1072.3828125,141"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1648.078125,411L1648.078125,415.1666666666667C1648.078125,419.3333333333333,1648.078125,427.6666666666667,1616.309678824992,439.04510550751803C1584.5412326499838,450.4235443483694,1521.004340299968,464.8470886967387,1489.2358941249595,472.0588608709234L1457.4674479499515,479.2706330451081"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M1864.2109375,400L1864.2109375,406C1864.2109375,412,1864.2109375,424,1796.4739774901282,438.02100434278503C1728.7370174802566,452.04200868557,1593.2630974605133,468.08401737114013,1525.5261374506415,476.10502171392517L1457.78917744077,484.1260260567102"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id17" d="M1864.2109375,249L1864.2109375,255C1864.2109375,261,1864.2109375,273,1864.2109375,282C1864.2109375,291,1864.2109375,297,1864.2109375,300L1864.2109375,303"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id18" d="M2041.46875,400L2041.46875,406C2041.46875,412,2041.46875,424,1944.1988443827556,438.2725324598471C1846.928938765511,452.5450649196943,1652.3891275310218,469.0901298393885,1555.1192219137774,477.36266229923564L1457.8493162965328,485.63519475908276"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id19" d="M2208.5,400L2208.5,406C2208.5,412,2208.5,424,2083.395592217076,438.4074090725953C1958.2911844341513,452.8148181451907,1708.0823688683024,469.6296362903815,1582.9779610853777,478.0370453629768L1457.8735533024535,486.44445443557214"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id20" d="M2341.75,400L2341.75,406C2341.75,412,2341.75,424,2194.4390517119277,438.48032359760515C2047.1281034238552,452.96064719521036,1752.5062068477102,469.92129439042066,1605.195258559638,478.40161798802586L1457.8843102715655,486.881941585631"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M2533.9296875,411L2533.9296875,415.1666666666667C2533.9296875,419.3333333333333,2533.9296875,427.6666666666667,2354.590342454327,440.3883529068262C2175.2509974086547,453.1100391469857,1816.5723073173092,470.2200782939714,1637.2329622716363,478.77509786746424L1457.893617225964,487.3301174409571"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -306,7 +311,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L9">
+        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L9">
           <g title="A" id="classId-C_0001046827200300090710-0" class="node default clickable">
             <rect height="79" width="73.25" y="-39.5" x="-36.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.625" x1="-36.625" class="divider"/>
@@ -330,7 +335,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L13">
+        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L13">
           <g title="A" id="classId-C_0001099548178945911245-1" class="node default clickable">
             <rect height="79" width="242.59375" y="-39.5" x="-121.296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.296875" x1="-121.296875" class="divider"/>
@@ -354,7 +359,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L18">
+        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L18">
           <g title="A" id="classId-C_0001239388209995793547-2" class="node default clickable">
             <rect height="57" width="479.921875" y="-28.5" x="-239.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="239.9609375" x1="-239.9609375" class="divider"/>
@@ -373,7 +378,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L20">
+        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L20">
           <g title="A" id="classId-C_0000045701897814162098-3" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -397,7 +402,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L24">
+        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L24">
           <g title="A" id="classId-C_0001379193770802992785-4" class="node default clickable">
             <rect height="79" width="131.484375" y="-39.5" x="-65.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.7421875" x1="-65.7421875" class="divider"/>
@@ -421,7 +426,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L28">
+        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L28">
           <g title="A" id="classId-C_0001407865337446777280-5" class="node default clickable">
             <rect height="79" width="276.421875" y="-39.5" x="-138.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="138.2109375" x1="-138.2109375" class="divider"/>
@@ -445,7 +450,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L32">
+        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L32">
           <g title="A" id="classId-C_0001034483227649400416-6" class="node default clickable">
             <rect height="79" width="84.359375" y="-39.5" x="-42.1796875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.1796875" x1="-42.1796875" class="divider"/>
@@ -469,7 +474,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L36">
+        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L36">
           <g title="A" id="classId-C_0000352457857519671117-7" class="node default clickable">
             <rect height="79" width="115.9375" y="-39.5" x="-57.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="57.96875" x1="-57.96875" class="divider"/>
@@ -493,7 +498,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L40">
+        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L40">
           <g title="A" id="classId-C_0000314708288320430272-8" class="node default clickable">
             <rect height="101" width="91.453125" y="-50.5" x="-45.7265625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="45.7265625" x1="-45.7265625" class="divider"/>
@@ -522,7 +527,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L45">
+        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L45">
           <g title="A" id="classId-C_0000827753335392390402-9" class="node default clickable">
             <rect height="101" width="119.015625" y="-50.5" x="-59.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.5078125" x1="-59.5078125" class="divider"/>
@@ -551,7 +556,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L50">
+        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L50">
           <g title="A" id="classId-C_0000395583480407686249-10" class="node default clickable">
             <rect height="101" width="140.328125" y="-50.5" x="-70.1640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="70.1640625" x1="-70.1640625" class="divider"/>
@@ -580,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L55">
+        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L55">
           <g title="A" id="classId-C_0000476497055497873078-11" class="node default clickable">
             <rect height="79" width="152.75" y="-39.5" x="-76.375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.375" x1="-76.375" class="divider"/>
@@ -604,7 +609,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L59">
+        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L59">
           <g title="A" id="classId-C_0001619634759668095904-12" class="node default clickable">
             <rect height="101" width="167.875" y="-50.5" x="-83.9375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="83.9375" x1="-83.9375" class="divider"/>
@@ -633,7 +638,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L64">
+        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L64">
           <g title="A" id="classId-C_0001357746808315142717-13" class="node default clickable">
             <rect height="101" width="180.3125" y="-50.5" x="-90.15625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="90.15625" x1="-90.15625" class="divider"/>
@@ -662,7 +667,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L70">
+        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L70">
           <g title="A" id="classId-C_0000544335779197078982-14" class="node default clickable">
             <rect height="101" width="231.015625" y="-50.5" x="-115.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="115.5078125" x1="-115.5078125" class="divider"/>
@@ -691,7 +696,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L75">
+        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L75">
           <g title="A" id="classId-C_0000602066980416477930-15" class="node default clickable">
             <rect height="79" width="101.25" y="-39.5" x="-50.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="50.625" x1="-50.625" class="divider"/>
@@ -715,7 +720,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L79">
+        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L79">
           <g title="A" id="classId-C_0001318419672443856415-16" class="node default clickable">
             <rect height="79" width="170.203125" y="-39.5" x="-85.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="85.1015625" x1="-85.1015625" class="divider"/>
@@ -739,7 +744,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L83">
+        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83">
           <g title="A" id="classId-C_0000599593856979463652-17" class="node default clickable">
             <rect height="79" width="153.265625" y="-39.5" x="-76.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.6328125" x1="-76.6328125" class="divider"/>
@@ -763,7 +768,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L85">
+        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L85">
           <g title="A" id="classId-C_0000015395295268000991-18" class="node default clickable">
             <rect height="79" width="80.796875" y="-39.5" x="-40.3984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.3984375" x1="-40.3984375" class="divider"/>
@@ -787,7 +792,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L89">
+        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L89">
           <g title="A" id="classId-C_0001603321863498552207-19" class="node default clickable">
             <rect height="79" width="85.703125" y="-39.5" x="-42.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.8515625" x1="-42.8515625" class="divider"/>
@@ -811,7 +816,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L95">
+        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L95">
           <g title="A" id="classId-C_0000232518961342221670-20" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -840,7 +845,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00062/t00062.cc#L7">
+        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L7">
           <g title="A" id="classId-C_0000121103565834936476-21" class="node default clickable">
             <rect height="57" width="55.015625" y="-28.5" x="-27.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
diff --git a/docs/test_cases/t00063.md b/docs/test_cases/t00063.md
index 71f6bbbf..78b52ef0 100644
--- a/docs/test_cases/t00063.md
+++ b/docs/test_cases/t00063.md
@@ -15,7 +15,7 @@ diagrams:
     using_namespace: clanguml::t00063
 ```
 ## Source code
-File t00063.cc
+File `tests/t00063/t00063.cc`
 ```cpp
 namespace clanguml {
 namespace t00063 {
diff --git a/docs/test_cases/t00063_class.svg b/docs/test_cases/t00063_class.svg
index ff16f157..c1590e8f 100644
--- a/docs/test_cases/t00063_class.svg
+++ b/docs/test_cases/t00063_class.svg
@@ -1,21 +1,17 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="69px" preserveAspectRatio="none" style="width:62px;height:69px;background:#FFFFFF;" version="1.1" viewBox="0 0 62 69" width="62px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fcf12fjqw2neh" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcf12fjqw2neh)" height="48" id="C_0001518171774798799557" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
-      <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="39" y2="39"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="47" y2="47"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001518171774798799557">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001518171774798799557" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="7"/>
+        <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M17,24.1563 C17,26.6563 19.1406,28.4688 22.0625,28.4688 C23.2969,28.4688 24.4688,28.1719 25.2188,27.6563 C25.8281,27.2344 26.1563,26.8125 26.1563,26.4063 C26.1563,25.9375 25.7344,25.5313 25.2344,25.5313 C25,25.5313 24.7813,25.6094 24.5781,25.8125 C24.1406,26.25 24.1406,26.25 23.9688,26.3438 C23.5156,26.5781 22.875,26.7188 22.1094,26.7188 C20.1094,26.7188 18.8281,25.7031 18.8281,24.125 L18.8281,23.0781 C18.8281,21.375 20.0469,20.1719 21.75,20.1719 C22.3281,20.1719 22.9063,20.3125 23.375,20.5625 C23.8438,20.8281 24.0156,21.0156 24.0781,21.375 C24.2031,22.0469 24.4531,22.2969 24.9844,22.2969 C25.2656,22.2969 25.5469,22.1563 25.7344,21.9375 C25.8594,21.7656 25.9063,21.5938 25.9063,21.1563 L25.9063,19.7969 C25.9063,19.375 25.8906,19.2344 25.7656,19.0625 C25.5938,18.8125 25.3125,18.6563 24.9844,18.6563 C24.6719,18.6563 24.4688,18.7656 24.25,19.0313 C23.0781,18.5313 22.6406,18.4219 21.6875,18.4219 C19.0156,18.4219 17,20.4375 17,23.0625 L17,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="47" y2="47"/>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00063_class_mermaid.svg b/docs/test_cases/t00063_class_mermaid.svg
index f86ddbb2..5dc436a4 100644
--- a/docs/test_cases/t00063_class_mermaid.svg
+++ b/docs/test_cases/t00063_class_mermaid.svg
@@ -1,50 +1,55 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 42.5625 73" style="max-width: 42.5625px; background-color: white;" width="42.5625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,7 +57,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00063/t00063.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00063/t00063.cc#L3">
           <g title="A" id="classId-C_0001518171774798799557-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00064.md b/docs/test_cases/t00064.md
index 7e349227..a3f2b94d 100644
--- a/docs/test_cases/t00064.md
+++ b/docs/test_cases/t00064.md
@@ -15,7 +15,7 @@ diagrams:
         - left to right direction
 ```
 ## Source code
-File t00064.cc
+File `tests/t00064/t00064.cc`
 ```cpp
 #include <cstddef>
 #include <tuple>
@@ -501,6 +501,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -531,6 +532,7 @@ public:
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -561,6 +563,7 @@ public:
           "is_constexpr": true,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00064_class.svg b/docs/test_cases/t00064_class.svg
index 57142fcb..437cbcc5 100644
--- a/docs/test_cases/t00064_class.svg
+++ b/docs/test_cases/t00064_class.svg
@@ -1,337 +1,433 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1373px" preserveAspectRatio="none" style="width:2348px;height:1373px;" version="1.1" viewBox="0 0 2348 1373" width="2348px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1350px" preserveAspectRatio="none" style="width:2227px;height:1350px;background:#FFFFFF;" version="1.1" viewBox="0 0 2227 1350" width="2227px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6g3tgu9pu4de" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="2219.5" y="571.2"/>
-      <ellipse cx="2234.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M2237.4688,592.8406 Q2236.8906,593.1375 2236.25,593.2781 Q2235.6094,593.4344 2234.9063,593.4344 Q2232.4063,593.4344 2231.0781,591.7938 Q2229.7656,590.1375 2229.7656,587.0125 Q2229.7656,583.8875 2231.0781,582.2313 Q2232.4063,580.575 2234.9063,580.575 Q2235.6094,580.575 2236.25,580.7313 Q2236.9063,580.8875 2237.4688,581.1844 L2237.4688,583.9031 Q2236.8438,583.325 2236.25,583.0594 Q2235.6563,582.7781 2235.0313,582.7781 Q2233.6875,582.7781 2233,583.8563 Q2232.3125,584.9188 2232.3125,587.0125 Q2232.3125,589.1063 2233,590.1844 Q2233.6875,591.2469 2235.0313,591.2469 Q2235.6563,591.2469 2236.25,590.9813 Q2236.8438,590.7 2237.4688,590.1219 L2237.4688,592.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="2248.5" y="591.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="2307.5" y="568.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="2308.5" y="580.3387">Ts...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="603.2" y2="603.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="611.2" y2="611.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0002055044356505752139">
+        <rect codeLine="3" fill="#F1F1F1" height="48" id="C_0002055044356505752139" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="2102" y="573"/>
+        <ellipse cx="2117" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M2112,590.1563 C2112,592.6563 2114.1406,594.4688 2117.0625,594.4688 C2118.2969,594.4688 2119.4688,594.1719 2120.2188,593.6563 C2120.8281,593.2344 2121.1563,592.8125 2121.1563,592.4063 C2121.1563,591.9375 2120.7344,591.5313 2120.2344,591.5313 C2120,591.5313 2119.7813,591.6094 2119.5781,591.8125 C2119.1406,592.25 2119.1406,592.25 2118.9688,592.3438 C2118.5156,592.5781 2117.875,592.7188 2117.1094,592.7188 C2115.1094,592.7188 2113.8281,591.7031 2113.8281,590.125 L2113.8281,589.0781 C2113.8281,587.375 2115.0469,586.1719 2116.75,586.1719 C2117.3281,586.1719 2117.9063,586.3125 2118.375,586.5625 C2118.8438,586.8281 2119.0156,587.0156 2119.0781,587.375 C2119.2031,588.0469 2119.4531,588.2969 2119.9844,588.2969 C2120.2656,588.2969 2120.5469,588.1563 2120.7344,587.9375 C2120.8594,587.7656 2120.9063,587.5938 2120.9063,587.1563 L2120.9063,585.7969 C2120.9063,585.375 2120.8906,585.2344 2120.7656,585.0625 C2120.5938,584.8125 2120.3125,584.6563 2119.9844,584.6563 C2119.6719,584.6563 2119.4688,584.7656 2119.25,585.0313 C2118.0781,584.5313 2117.6406,584.4219 2116.6875,584.4219 C2114.0156,584.4219 2112,586.4375 2112,589.0625 L2112,590.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="2131" y="593.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="24" x="2191" y="570"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="22" x="2192" y="584.2001">Ts...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="2103" x2="2211" y1="605" y2="605"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="2103" x2="2211" y1="613" y2="613"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001536403088019105838" style="stroke: #A80036; stroke-width: 1.5;" width="190" x="1773" y="245.2"/>
-      <ellipse cx="1788" cy="261.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1790.9688,266.8406 Q1790.3906,267.1375 1789.75,267.2781 Q1789.1094,267.4344 1788.4063,267.4344 Q1785.9063,267.4344 1784.5781,265.7938 Q1783.2656,264.1375 1783.2656,261.0125 Q1783.2656,257.8875 1784.5781,256.2313 Q1785.9063,254.575 1788.4063,254.575 Q1789.1094,254.575 1789.75,254.7313 Q1790.4063,254.8875 1790.9688,255.1844 L1790.9688,257.9031 Q1790.3438,257.325 1789.75,257.0594 Q1789.1563,256.7781 1788.5313,256.7781 Q1787.1875,256.7781 1786.5,257.8563 Q1785.8125,258.9188 1785.8125,261.0125 Q1785.8125,263.1063 1786.5,264.1844 Q1787.1875,265.2469 1788.5313,265.2469 Q1789.1563,265.2469 1789.75,264.9813 Q1790.3438,264.7 1790.9688,264.1219 L1790.9688,266.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1802" y="265.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="105" x="1861" y="242.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1862" y="254.3387">Ret(Arg &amp;&amp;),Ts...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="277.2" y2="277.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="285.2" y2="285.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0001536403088019105838">
+        <rect codeLine="7" fill="#F1F1F1" height="48" id="C_0001536403088019105838" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="178" x="1694.5" y="247"/>
+        <ellipse cx="1709.5" cy="263" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1704.5,264.1563 C1704.5,266.6563 1706.6406,268.4688 1709.5625,268.4688 C1710.7969,268.4688 1711.9688,268.1719 1712.7188,267.6563 C1713.3281,267.2344 1713.6563,266.8125 1713.6563,266.4063 C1713.6563,265.9375 1713.2344,265.5313 1712.7344,265.5313 C1712.5,265.5313 1712.2813,265.6094 1712.0781,265.8125 C1711.6406,266.25 1711.6406,266.25 1711.4688,266.3438 C1711.0156,266.5781 1710.375,266.7188 1709.6094,266.7188 C1707.6094,266.7188 1706.3281,265.7031 1706.3281,264.125 L1706.3281,263.0781 C1706.3281,261.375 1707.5469,260.1719 1709.25,260.1719 C1709.8281,260.1719 1710.4063,260.3125 1710.875,260.5625 C1711.3438,260.8281 1711.5156,261.0156 1711.5781,261.375 C1711.7031,262.0469 1711.9531,262.2969 1712.4844,262.2969 C1712.7656,262.2969 1713.0469,262.1563 1713.2344,261.9375 C1713.3594,261.7656 1713.4063,261.5938 1713.4063,261.1563 L1713.4063,259.7969 C1713.4063,259.375 1713.3906,259.2344 1713.2656,259.0625 C1713.0938,258.8125 1712.8125,258.6563 1712.4844,258.6563 C1712.1719,258.6563 1711.9688,258.7656 1711.75,259.0313 C1710.5781,258.5313 1710.1406,258.4219 1709.1875,258.4219 C1706.5156,258.4219 1704.5,260.4375 1704.5,263.0625 L1704.5,264.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1723.5" y="267.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="92" x="1783.5" y="244"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="90" x="1784.5" y="258.2001">Ret(Arg &amp;&amp;),Ts...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1695.5" x2="1871.5" y1="279" y2="279"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1695.5" x2="1871.5" y1="287" y2="287"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001613293628874851145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="1787.5" y="494.2"/>
-      <ellipse cx="1802.5" cy="510.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1805.4688,515.8406 Q1804.8906,516.1375 1804.25,516.2781 Q1803.6094,516.4344 1802.9063,516.4344 Q1800.4063,516.4344 1799.0781,514.7938 Q1797.7656,513.1375 1797.7656,510.0125 Q1797.7656,506.8875 1799.0781,505.2313 Q1800.4063,503.575 1802.9063,503.575 Q1803.6094,503.575 1804.25,503.7313 Q1804.9063,503.8875 1805.4688,504.1844 L1805.4688,506.9031 Q1804.8438,506.325 1804.25,506.0594 Q1803.6563,505.7781 1803.0313,505.7781 Q1801.6875,505.7781 1801,506.8563 Q1800.3125,507.9188 1800.3125,510.0125 Q1800.3125,512.1063 1801,513.1844 Q1801.6875,514.2469 1803.0313,514.2469 Q1803.6563,514.2469 1804.25,513.9813 Q1804.8438,513.7 1805.4688,513.1219 L1805.4688,515.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1816.5" y="514.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="76" x="1875.5" y="491.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="74" x="1876.5" y="503.3387">T const,Ts...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="526.2" y2="526.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="534.2" y2="534.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0001613293628874851145">
+        <rect codeLine="11" fill="#F1F1F1" height="48" id="C_0001613293628874851145" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="152" x="1707.5" y="496"/>
+        <ellipse cx="1722.5" cy="512" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1717.5,513.1563 C1717.5,515.6563 1719.6406,517.4688 1722.5625,517.4688 C1723.7969,517.4688 1724.9688,517.1719 1725.7188,516.6563 C1726.3281,516.2344 1726.6563,515.8125 1726.6563,515.4063 C1726.6563,514.9375 1726.2344,514.5313 1725.7344,514.5313 C1725.5,514.5313 1725.2813,514.6094 1725.0781,514.8125 C1724.6406,515.25 1724.6406,515.25 1724.4688,515.3438 C1724.0156,515.5781 1723.375,515.7188 1722.6094,515.7188 C1720.6094,515.7188 1719.3281,514.7031 1719.3281,513.125 L1719.3281,512.0781 C1719.3281,510.375 1720.5469,509.1719 1722.25,509.1719 C1722.8281,509.1719 1723.4063,509.3125 1723.875,509.5625 C1724.3438,509.8281 1724.5156,510.0156 1724.5781,510.375 C1724.7031,511.0469 1724.9531,511.2969 1725.4844,511.2969 C1725.7656,511.2969 1726.0469,511.1563 1726.2344,510.9375 C1726.3594,510.7656 1726.4063,510.5938 1726.4063,510.1563 L1726.4063,508.7969 C1726.4063,508.375 1726.3906,508.2344 1726.2656,508.0625 C1726.0938,507.8125 1725.8125,507.6563 1725.4844,507.6563 C1725.1719,507.6563 1724.9688,507.7656 1724.75,508.0313 C1723.5781,507.5313 1723.1406,507.4219 1722.1875,507.4219 C1719.5156,507.4219 1717.5,509.4375 1717.5,512.0625 L1717.5,513.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1736.5" y="516.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="66" x="1796.5" y="493"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="64" x="1797.5" y="507.2001">T const,Ts...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1708.5" x2="1858.5" y1="528" y2="528"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1708.5" x2="1858.5" y1="536" y2="536"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L17" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="1789.5" y="91.2"/>
-      <ellipse cx="1804.5" cy="107.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1807.4688,112.8406 Q1806.8906,113.1375 1806.25,113.2781 Q1805.6094,113.4344 1804.9063,113.4344 Q1802.4063,113.4344 1801.0781,111.7938 Q1799.7656,110.1375 1799.7656,107.0125 Q1799.7656,103.8875 1801.0781,102.2313 Q1802.4063,100.575 1804.9063,100.575 Q1805.6094,100.575 1806.25,100.7313 Q1806.9063,100.8875 1807.4688,101.1844 L1807.4688,103.9031 Q1806.8438,103.325 1806.25,103.0594 Q1805.6563,102.7781 1805.0313,102.7781 Q1803.6875,102.7781 1803,103.8563 Q1802.3125,104.9188 1802.3125,107.0125 Q1802.3125,109.1063 1803,110.1844 Q1803.6875,111.2469 1805.0313,111.2469 Q1805.6563,111.2469 1806.25,110.9813 Q1806.8438,110.7 1807.4688,110.1219 L1807.4688,112.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1818.5" y="111.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="72" x="1877.5" y="88.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="70" x="1878.5" y="100.3387">Head,Tail...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="123.2" y2="123.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="131.2" y2="131.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0000096201031647373215">
+        <rect codeLine="15" fill="#F1F1F1" height="48" id="C_0000096201031647373215" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="150" x="1708.5" y="93"/>
+        <ellipse cx="1723.5" cy="109" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1718.5,110.1563 C1718.5,112.6563 1720.6406,114.4688 1723.5625,114.4688 C1724.7969,114.4688 1725.9688,114.1719 1726.7188,113.6563 C1727.3281,113.2344 1727.6563,112.8125 1727.6563,112.4063 C1727.6563,111.9375 1727.2344,111.5313 1726.7344,111.5313 C1726.5,111.5313 1726.2813,111.6094 1726.0781,111.8125 C1725.6406,112.25 1725.6406,112.25 1725.4688,112.3438 C1725.0156,112.5781 1724.375,112.7188 1723.6094,112.7188 C1721.6094,112.7188 1720.3281,111.7031 1720.3281,110.125 L1720.3281,109.0781 C1720.3281,107.375 1721.5469,106.1719 1723.25,106.1719 C1723.8281,106.1719 1724.4063,106.3125 1724.875,106.5625 C1725.3438,106.8281 1725.5156,107.0156 1725.5781,107.375 C1725.7031,108.0469 1725.9531,108.2969 1726.4844,108.2969 C1726.7656,108.2969 1727.0469,108.1563 1727.2344,107.9375 C1727.3594,107.7656 1727.4063,107.5938 1727.4063,107.1563 L1727.4063,105.7969 C1727.4063,105.375 1727.3906,105.2344 1727.2656,105.0625 C1727.0938,104.8125 1726.8125,104.6563 1726.4844,104.6563 C1726.1719,104.6563 1725.9688,104.7656 1725.75,105.0313 C1724.5781,104.5313 1724.1406,104.4219 1723.1875,104.4219 C1720.5156,104.4219 1718.5,106.4375 1718.5,109.0625 L1718.5,110.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1737.5" y="113.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="64" x="1797.5" y="90"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="62" x="1798.5" y="104.2001">Head,Tail...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1709.5" x2="1857.5" y1="125" y2="125"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1709.5" x2="1857.5" y1="133" y2="133"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001342666740698875376" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1050.5" y="39.2"/>
-      <ellipse cx="1065.5" cy="55.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1068.4688,60.8406 Q1067.8906,61.1375 1067.25,61.2781 Q1066.6094,61.4344 1065.9063,61.4344 Q1063.4063,61.4344 1062.0781,59.7938 Q1060.7656,58.1375 1060.7656,55.0125 Q1060.7656,51.8875 1062.0781,50.2313 Q1063.4063,48.575 1065.9063,48.575 Q1066.6094,48.575 1067.25,48.7313 Q1067.9063,48.8875 1068.4688,49.1844 L1068.4688,51.9031 Q1067.8438,51.325 1067.25,51.0594 Q1066.6563,50.7781 1066.0313,50.7781 Q1064.6875,50.7781 1064,51.8563 Q1063.3125,52.9188 1063.3125,55.0125 Q1063.3125,57.1063 1064,58.1844 Q1064.6875,59.2469 1066.0313,59.2469 Q1066.6563,59.2469 1067.25,58.9813 Q1067.8438,58.7 1068.4688,58.1219 L1068.4688,60.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1079.5" y="59.3543">head</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="143" x="1119.5" y="36.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="141" x="1120.5" y="48.3387">type_list&lt;Head,Tail...&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="71.2" y2="71.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="79.2" y2="79.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <g id="elem_C_0001342666740698875376">
+        <rect codeLine="19" fill="#F1F1F1" height="48" id="C_0001342666740698875376" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="189" x="1039.5" y="41"/>
+        <ellipse cx="1054.5" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1049.5,58.1563 C1049.5,60.6563 1051.6406,62.4688 1054.5625,62.4688 C1055.7969,62.4688 1056.9688,62.1719 1057.7188,61.6563 C1058.3281,61.2344 1058.6563,60.8125 1058.6563,60.4063 C1058.6563,59.9375 1058.2344,59.5313 1057.7344,59.5313 C1057.5,59.5313 1057.2813,59.6094 1057.0781,59.8125 C1056.6406,60.25 1056.6406,60.25 1056.4688,60.3438 C1056.0156,60.5781 1055.375,60.7188 1054.6094,60.7188 C1052.6094,60.7188 1051.3281,59.7031 1051.3281,58.125 L1051.3281,57.0781 C1051.3281,55.375 1052.5469,54.1719 1054.25,54.1719 C1054.8281,54.1719 1055.4063,54.3125 1055.875,54.5625 C1056.3438,54.8281 1056.5156,55.0156 1056.5781,55.375 C1056.7031,56.0469 1056.9531,56.2969 1057.4844,56.2969 C1057.7656,56.2969 1058.0469,56.1563 1058.2344,55.9375 C1058.3594,55.7656 1058.4063,55.5938 1058.4063,55.1563 L1058.4063,53.7969 C1058.4063,53.375 1058.3906,53.2344 1058.2656,53.0625 C1058.0938,52.8125 1057.8125,52.6563 1057.4844,52.6563 C1057.1719,52.6563 1056.9688,52.7656 1056.75,53.0313 C1055.5781,52.5313 1055.1406,52.4219 1054.1875,52.4219 C1051.5156,52.4219 1049.5,54.4375 1049.5,57.0625 L1049.5,58.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="1068.5" y="61.606">head</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="123" x="1108.5" y="38"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="121" x="1109.5" y="52.2001">type_list&lt;Head,Tail...&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1040.5" x2="1227.5" y1="73" y2="73"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1040.5" x2="1227.5" y1="81" y2="81"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L21" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L21" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0000074655005329778311" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="1803.5" y="897.2"/>
-      <ellipse cx="1818.5" cy="913.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1821.4688,918.8406 Q1820.8906,919.1375 1820.25,919.2781 Q1819.6094,919.4344 1818.9063,919.4344 Q1816.4063,919.4344 1815.0781,917.7938 Q1813.7656,916.1375 1813.7656,913.0125 Q1813.7656,909.8875 1815.0781,908.2313 Q1816.4063,906.575 1818.9063,906.575 Q1819.6094,906.575 1820.25,906.7313 Q1820.9063,906.8875 1821.4688,907.1844 L1821.4688,909.9031 Q1820.8438,909.325 1820.25,909.0594 Q1819.6563,908.7781 1819.0313,908.7781 Q1817.6875,908.7781 1817,909.8563 Q1816.3125,910.9188 1816.3125,913.0125 Q1816.3125,915.1063 1817,916.1844 Q1817.6875,917.2469 1819.0313,917.2469 Q1819.6563,917.2469 1820.25,916.9813 Q1820.8438,916.7 1821.4688,916.1219 L1821.4688,918.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1832.5" y="917.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="44" x="1891.5" y="894.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="1892.5" y="906.3387">Type...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="929.2" y2="929.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="937.2" y2="937.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L21" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L21" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0000074655005329778311">
+        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0000074655005329778311" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="1721.5" y="899"/>
+        <ellipse cx="1736.5" cy="915" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1731.5,916.1563 C1731.5,918.6563 1733.6406,920.4688 1736.5625,920.4688 C1737.7969,920.4688 1738.9688,920.1719 1739.7188,919.6563 C1740.3281,919.2344 1740.6563,918.8125 1740.6563,918.4063 C1740.6563,917.9375 1740.2344,917.5313 1739.7344,917.5313 C1739.5,917.5313 1739.2813,917.6094 1739.0781,917.8125 C1738.6406,918.25 1738.6406,918.25 1738.4688,918.3438 C1738.0156,918.5781 1737.375,918.7188 1736.6094,918.7188 C1734.6094,918.7188 1733.3281,917.7031 1733.3281,916.125 L1733.3281,915.0781 C1733.3281,913.375 1734.5469,912.1719 1736.25,912.1719 C1736.8281,912.1719 1737.4063,912.3125 1737.875,912.5625 C1738.3438,912.8281 1738.5156,913.0156 1738.5781,913.375 C1738.7031,914.0469 1738.9531,914.2969 1739.4844,914.2969 C1739.7656,914.2969 1740.0469,914.1563 1740.2344,913.9375 C1740.3594,913.7656 1740.4063,913.5938 1740.4063,913.1563 L1740.4063,911.7969 C1740.4063,911.375 1740.3906,911.2344 1740.2656,911.0625 C1740.0938,910.8125 1739.8125,910.6563 1739.4844,910.6563 C1739.1719,910.6563 1738.9688,910.7656 1738.75,911.0313 C1737.5781,910.5313 1737.1406,910.4219 1736.1875,910.4219 C1733.5156,910.4219 1731.5,912.4375 1731.5,915.0625 L1731.5,916.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1750.5" y="919.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="38" x="1810.5" y="896"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="36" x="1811.5" y="910.2001">Type...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1722.5" x2="1844.5" y1="931" y2="931"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1722.5" x2="1844.5" y1="939" y2="939"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="1805.5" y="980.2"/>
-      <ellipse cx="1820.5" cy="996.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1823.4688,1001.8406 Q1822.8906,1002.1375 1822.25,1002.2781 Q1821.6094,1002.4344 1820.9063,1002.4344 Q1818.4063,1002.4344 1817.0781,1000.7938 Q1815.7656,999.1375 1815.7656,996.0125 Q1815.7656,992.8875 1817.0781,991.2313 Q1818.4063,989.575 1820.9063,989.575 Q1821.6094,989.575 1822.25,989.7313 Q1822.9063,989.8875 1823.4688,990.1844 L1823.4688,992.9031 Q1822.8438,992.325 1822.25,992.0594 Q1821.6563,991.7781 1821.0313,991.7781 Q1819.6875,991.7781 1819,992.8563 Q1818.3125,993.9188 1818.3125,996.0125 Q1818.3125,998.1063 1819,999.1844 Q1819.6875,1000.2469 1821.0313,1000.2469 Q1821.6563,1000.2469 1822.25,999.9813 Q1822.8438,999.7 1823.4688,999.1219 L1823.4688,1001.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1834.5" y="1000.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="40" x="1893.5" y="977.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="1894.5" y="989.3387">First...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1012.2" y2="1012.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1020.2" y2="1020.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0001877705309010128195">
+        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0001877705309010128195" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="1723.5" y="982"/>
+        <ellipse cx="1738.5" cy="998" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1733.5,999.1563 C1733.5,1001.6563 1735.6406,1003.4688 1738.5625,1003.4688 C1739.7969,1003.4688 1740.9688,1003.1719 1741.7188,1002.6563 C1742.3281,1002.2344 1742.6563,1001.8125 1742.6563,1001.4063 C1742.6563,1000.9375 1742.2344,1000.5313 1741.7344,1000.5313 C1741.5,1000.5313 1741.2813,1000.6094 1741.0781,1000.8125 C1740.6406,1001.25 1740.6406,1001.25 1740.4688,1001.3438 C1740.0156,1001.5781 1739.375,1001.7188 1738.6094,1001.7188 C1736.6094,1001.7188 1735.3281,1000.7031 1735.3281,999.125 L1735.3281,998.0781 C1735.3281,996.375 1736.5469,995.1719 1738.25,995.1719 C1738.8281,995.1719 1739.4063,995.3125 1739.875,995.5625 C1740.3438,995.8281 1740.5156,996.0156 1740.5781,996.375 C1740.7031,997.0469 1740.9531,997.2969 1741.4844,997.2969 C1741.7656,997.2969 1742.0469,997.1563 1742.2344,996.9375 C1742.3594,996.7656 1742.4063,996.5938 1742.4063,996.1563 L1742.4063,994.7969 C1742.4063,994.375 1742.3906,994.2344 1742.2656,994.0625 C1742.0938,993.8125 1741.8125,993.6563 1741.4844,993.6563 C1741.1719,993.6563 1740.9688,993.7656 1740.75,994.0313 C1739.5781,993.5313 1739.1406,993.4219 1738.1875,993.4219 C1735.5156,993.4219 1733.5,995.4375 1733.5,998.0625 L1733.5,999.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1752.5" y="1002.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="34" x="1812.5" y="979"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="32" x="1813.5" y="993.2001">First...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1724.5" x2="1842.5" y1="1014" y2="1014"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1724.5" x2="1842.5" y1="1022" y2="1022"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1795" y="814.2"/>
-      <ellipse cx="1810" cy="830.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1812.9688,835.8406 Q1812.3906,836.1375 1811.75,836.2781 Q1811.1094,836.4344 1810.4063,836.4344 Q1807.9063,836.4344 1806.5781,834.7938 Q1805.2656,833.1375 1805.2656,830.0125 Q1805.2656,826.8875 1806.5781,825.2313 Q1807.9063,823.575 1810.4063,823.575 Q1811.1094,823.575 1811.75,823.7313 Q1812.4063,823.8875 1812.9688,824.1844 L1812.9688,826.9031 Q1812.3438,826.325 1811.75,826.0594 Q1811.1563,825.7781 1810.5313,825.7781 Q1809.1875,825.7781 1808.5,826.8563 Q1807.8125,827.9188 1807.8125,830.0125 Q1807.8125,832.1063 1808.5,833.1844 Q1809.1875,834.2469 1810.5313,834.2469 Q1811.1563,834.2469 1811.75,833.9813 Q1812.3438,833.7 1812.9688,833.1219 L1812.9688,835.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1824" y="834.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="61" x="1883" y="811.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="1884" y="823.3387">Second...</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="846.2" y2="846.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="854.2" y2="854.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0001737554639587928188">
+        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0001737554639587928188" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="1714" y="816"/>
+        <ellipse cx="1729" cy="832" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1724,833.1563 C1724,835.6563 1726.1406,837.4688 1729.0625,837.4688 C1730.2969,837.4688 1731.4688,837.1719 1732.2188,836.6563 C1732.8281,836.2344 1733.1563,835.8125 1733.1563,835.4063 C1733.1563,834.9375 1732.7344,834.5313 1732.2344,834.5313 C1732,834.5313 1731.7813,834.6094 1731.5781,834.8125 C1731.1406,835.25 1731.1406,835.25 1730.9688,835.3438 C1730.5156,835.5781 1729.875,835.7188 1729.1094,835.7188 C1727.1094,835.7188 1725.8281,834.7031 1725.8281,833.125 L1725.8281,832.0781 C1725.8281,830.375 1727.0469,829.1719 1728.75,829.1719 C1729.3281,829.1719 1729.9063,829.3125 1730.375,829.5625 C1730.8438,829.8281 1731.0156,830.0156 1731.0781,830.375 C1731.2031,831.0469 1731.4531,831.2969 1731.9844,831.2969 C1732.2656,831.2969 1732.5469,831.1563 1732.7344,830.9375 C1732.8594,830.7656 1732.9063,830.5938 1732.9063,830.1563 L1732.9063,828.7969 C1732.9063,828.375 1732.8906,828.2344 1732.7656,828.0625 C1732.5938,827.8125 1732.3125,827.6563 1731.9844,827.6563 C1731.6719,827.6563 1731.4688,827.7656 1731.25,828.0313 C1730.0781,827.5313 1729.6406,827.4219 1728.6875,827.4219 C1726.0156,827.4219 1724,829.4375 1724,832.0625 L1724,833.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1743" y="836.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="53" x="1803" y="813"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="51" x="1804" y="827.2001">Second...</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1715" x2="1852" y1="848" y2="848"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1715" x2="1852" y1="856" y2="856"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="60.8047" id="C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="965.5" y="965.7"/>
-      <ellipse cx="980.5" cy="981.7" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M983.4688,987.3406 Q982.8906,987.6375 982.25,987.7781 Q981.6094,987.9344 980.9063,987.9344 Q978.4063,987.9344 977.0781,986.2938 Q975.7656,984.6375 975.7656,981.5125 Q975.7656,978.3875 977.0781,976.7313 Q978.4063,975.075 980.9063,975.075 Q981.6094,975.075 982.25,975.2313 Q982.9063,975.3875 983.4688,975.6844 L983.4688,978.4031 Q982.8438,977.825 982.25,977.5594 Q981.6563,977.2781 981.0313,977.2781 Q979.6875,977.2781 979,978.3563 Q978.3125,979.4188 978.3125,981.5125 Q978.3125,983.6063 979,984.6844 Q979.6875,985.7469 981.0313,985.7469 Q981.6563,985.7469 982.25,985.4813 Q982.8438,985.2 983.4688,984.6219 L983.4688,987.3406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="994.5" y="985.8543">type_group_pair</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="245" x="1102.5" y="962.7"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="243" x="1103.5" y="974.8387">type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="997.7" y2="997.7"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="1005.7" y2="1005.7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <g id="elem_C_0001313421318785708660">
+        <rect codeLine="35" fill="#F1F1F1" height="64.7999" id="C_0001313421318785708660" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="344" x="962" y="969.6"/>
+        <ellipse cx="977" cy="985.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M972,986.7563 C972,989.2563 974.1406,991.0688 977.0625,991.0688 C978.2969,991.0688 979.4688,990.7719 980.2188,990.2563 C980.8281,989.8344 981.1563,989.4125 981.1563,989.0063 C981.1563,988.5375 980.7344,988.1313 980.2344,988.1313 C980,988.1313 979.7813,988.2094 979.5781,988.4125 C979.1406,988.85 979.1406,988.85 978.9688,988.9438 C978.5156,989.1781 977.875,989.3188 977.1094,989.3188 C975.1094,989.3188 973.8281,988.3031 973.8281,986.725 L973.8281,985.6781 C973.8281,983.975 975.0469,982.7719 976.75,982.7719 C977.3281,982.7719 977.9063,982.9125 978.375,983.1625 C978.8438,983.4281 979.0156,983.6156 979.0781,983.975 C979.2031,984.6469 979.4531,984.8969 979.9844,984.8969 C980.2656,984.8969 980.5469,984.7563 980.7344,984.5375 C980.8594,984.3656 980.9063,984.1938 980.9063,983.7563 L980.9063,982.3969 C980.9063,981.975 980.8906,981.8344 980.7656,981.6625 C980.5938,981.4125 980.3125,981.2563 979.9844,981.2563 C979.6719,981.2563 979.4688,981.3656 979.25,981.6313 C978.0781,981.1313 977.6406,981.0219 976.6875,981.0219 C974.0156,981.0219 972,983.0375 972,985.6625 L972,986.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="991" y="990.206">type_group_pair</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="206" x="1103" y="966.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="204" x="1104" y="980.8001">type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="963" x2="1305" y1="1001.6" y2="1001.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="963" x2="1305" y1="1009.6" y2="1009.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="968" y="1018.5"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="970" y="1020.5"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="112" x="982" y="1026.6059">size : const size_t</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="971.5" y="1011.7"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="973.5" y="1013.7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <g id="elem_C_0002110316024454672764">
+        <rect codeLine="40" fill="#F1F1F1" height="48" id="C_0002110316024454672764" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="2098" y="1065"/>
+        <ellipse cx="2113" cy="1081" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M2108,1082.1563 C2108,1084.6563 2110.1406,1086.4688 2113.0625,1086.4688 C2114.2969,1086.4688 2115.4688,1086.1719 2116.2188,1085.6563 C2116.8281,1085.2344 2117.1563,1084.8125 2117.1563,1084.4063 C2117.1563,1083.9375 2116.7344,1083.5313 2116.2344,1083.5313 C2116,1083.5313 2115.7813,1083.6094 2115.5781,1083.8125 C2115.1406,1084.25 2115.1406,1084.25 2114.9688,1084.3438 C2114.5156,1084.5781 2113.875,1084.7188 2113.1094,1084.7188 C2111.1094,1084.7188 2109.8281,1083.7031 2109.8281,1082.125 L2109.8281,1081.0781 C2109.8281,1079.375 2111.0469,1078.1719 2112.75,1078.1719 C2113.3281,1078.1719 2113.9063,1078.3125 2114.375,1078.5625 C2114.8438,1078.8281 2115.0156,1079.0156 2115.0781,1079.375 C2115.2031,1080.0469 2115.4531,1080.2969 2115.9844,1080.2969 C2116.2656,1080.2969 2116.5469,1080.1563 2116.7344,1079.9375 C2116.8594,1079.7656 2116.9063,1079.5938 2116.9063,1079.1563 L2116.9063,1077.7969 C2116.9063,1077.375 2116.8906,1077.2344 2116.7656,1077.0625 C2116.5938,1076.8125 2116.3125,1076.6563 2115.9844,1076.6563 C2115.6719,1076.6563 2115.4688,1076.7656 2115.25,1077.0313 C2114.0781,1076.5313 2113.6406,1076.4219 2112.6875,1076.4219 C2110.0156,1076.4219 2108,1078.4375 2108,1081.0625 L2108,1082.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="2127" y="1085.606">optional_ref</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="2210" y="1062"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="2211" y="1076.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="2099" x2="2215" y1="1097" y2="1097"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="2099" x2="2215" y1="1105" y2="1105"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="101" x="985.5" y="1019.9104">size : const size_t</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <g id="elem_C_0000476531044436856932">
+        <rect codeLine="44" fill="#F1F1F1" height="48" id="C_0000476531044436856932" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="507" x="1530" y="1065"/>
+        <ellipse cx="1545" cy="1081" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1540,1082.1563 C1540,1084.6563 1542.1406,1086.4688 1545.0625,1086.4688 C1546.2969,1086.4688 1547.4688,1086.1719 1548.2188,1085.6563 C1548.8281,1085.2344 1549.1563,1084.8125 1549.1563,1084.4063 C1549.1563,1083.9375 1548.7344,1083.5313 1548.2344,1083.5313 C1548,1083.5313 1547.7813,1083.6094 1547.5781,1083.8125 C1547.1406,1084.25 1547.1406,1084.25 1546.9688,1084.3438 C1546.5156,1084.5781 1545.875,1084.7188 1545.1094,1084.7188 C1543.1094,1084.7188 1541.8281,1083.7031 1541.8281,1082.125 L1541.8281,1081.0781 C1541.8281,1079.375 1543.0469,1078.1719 1544.75,1078.1719 C1545.3281,1078.1719 1545.9063,1078.3125 1546.375,1078.5625 C1546.8438,1078.8281 1547.0156,1079.0156 1547.0781,1079.375 C1547.2031,1080.0469 1547.4531,1080.2969 1547.9844,1080.2969 C1548.2656,1080.2969 1548.5469,1080.1563 1548.7344,1079.9375 C1548.8594,1079.7656 1548.9063,1079.5938 1548.9063,1079.1563 L1548.9063,1077.7969 C1548.9063,1077.375 1548.8906,1077.2344 1548.7656,1077.0625 C1548.5938,1076.8125 1548.3125,1076.6563 1547.9844,1076.6563 C1547.6719,1076.6563 1547.4688,1076.7656 1547.25,1077.0313 C1546.0781,1076.5313 1545.6406,1076.4219 1544.6875,1076.4219 C1542.0156,1076.4219 1540,1078.4375 1540,1081.0625 L1540,1082.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="1559" y="1085.606">optional_ref</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="398" x="1642" y="1062"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="396" x="1643" y="1076.2001">type_group_pair_it&lt;It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;&gt;::value_type</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1531" x2="2036" y1="1097" y2="1097"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1531" x2="2036" y1="1105" y2="1105"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="2217" y="1063.2"/>
-      <ellipse cx="2232" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M2234.9688,1084.8406 Q2234.3906,1085.1375 2233.75,1085.2781 Q2233.1094,1085.4344 2232.4063,1085.4344 Q2229.9063,1085.4344 2228.5781,1083.7938 Q2227.2656,1082.1375 2227.2656,1079.0125 Q2227.2656,1075.8875 2228.5781,1074.2313 Q2229.9063,1072.575 2232.4063,1072.575 Q2233.1094,1072.575 2233.75,1072.7313 Q2234.4063,1072.8875 2234.9688,1073.1844 L2234.9688,1075.9031 Q2234.3438,1075.325 2233.75,1075.0594 Q2233.1563,1074.7781 2232.5313,1074.7781 Q2231.1875,1074.7781 2230.5,1075.8563 Q2229.8125,1076.9188 2229.8125,1079.0125 Q2229.8125,1081.1063 2230.5,1082.1844 Q2231.1875,1083.2469 2232.5313,1083.2469 Q2233.1563,1083.2469 2233.75,1082.9813 Q2234.3438,1082.7 2234.9688,1082.1219 L2234.9688,1084.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="2246" y="1083.3543">optional_ref</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="2328" y="1060.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="2329" y="1072.3387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1095.2" y2="1095.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1103.2" y2="1103.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <g id="elem_C_0001024383802991748694">
+        <rect codeLine="48" fill="#F1F1F1" height="98.3998" id="C_0001024383802991748694" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="368" x="950" y="811.8"/>
+        <ellipse cx="965" cy="827.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M960,828.9563 C960,831.4563 962.1406,833.2688 965.0625,833.2688 C966.2969,833.2688 967.4688,832.9719 968.2188,832.4563 C968.8281,832.0344 969.1563,831.6125 969.1563,831.2063 C969.1563,830.7375 968.7344,830.3313 968.2344,830.3313 C968,830.3313 967.7813,830.4094 967.5781,830.6125 C967.1406,831.05 967.1406,831.05 966.9688,831.1438 C966.5156,831.3781 965.875,831.5188 965.1094,831.5188 C963.1094,831.5188 961.8281,830.5031 961.8281,828.925 L961.8281,827.8781 C961.8281,826.175 963.0469,824.9719 964.75,824.9719 C965.3281,824.9719 965.9063,825.1125 966.375,825.3625 C966.8438,825.6281 967.0156,825.8156 967.0781,826.175 C967.2031,826.8469 967.4531,827.0969 967.9844,827.0969 C968.2656,827.0969 968.5469,826.9563 968.7344,826.7375 C968.8594,826.5656 968.9063,826.3938 968.9063,825.9563 L968.9063,824.5969 C968.9063,824.175 968.8906,824.0344 968.7656,823.8625 C968.5938,823.6125 968.3125,823.4563 967.9844,823.4563 C967.6719,823.4563 967.4688,823.5656 967.25,823.8313 C966.0781,823.3313 965.6406,823.2219 964.6875,823.2219 C962.0156,823.2219 960,825.2375 960,827.8625 L960,828.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="979" y="832.406">type_group_pair_it</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="215" x="1106" y="808.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="213" x="1107" y="823.0001">It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="951" x2="1317" y1="843.8" y2="843.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="956" y="852.7"/>
+          <ellipse cx="961" cy="857.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="970" y="860.8059">find(const value_type &amp; v) constexpr : unsigned int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="956" y="869.4999"/>
+          <ellipse cx="961" cy="874.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="970" y="877.6059">get(unsigned int i) : ref_t</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="956" y="886.2998"/>
+          <ellipse cx="961" cy="891.2998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="250" x="970" y="894.4058">getp(unsigned int i) : const value_type *</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="951" x2="1317" y1="902.1998" y2="902.1998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.5;" width="576" x="1580" y="1063.2"/>
-      <ellipse cx="1595" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1597.9688,1084.8406 Q1597.3906,1085.1375 1596.75,1085.2781 Q1596.1094,1085.4344 1595.4063,1085.4344 Q1592.9063,1085.4344 1591.5781,1083.7938 Q1590.2656,1082.1375 1590.2656,1079.0125 Q1590.2656,1075.8875 1591.5781,1074.2313 Q1592.9063,1072.575 1595.4063,1072.575 Q1596.1094,1072.575 1596.75,1072.7313 Q1597.4063,1072.8875 1597.9688,1073.1844 L1597.9688,1075.9031 Q1597.3438,1075.325 1596.75,1075.0594 Q1596.1563,1074.7781 1595.5313,1074.7781 Q1594.1875,1074.7781 1593.5,1075.8563 Q1592.8125,1076.9188 1592.8125,1079.0125 Q1592.8125,1081.1063 1593.5,1082.1844 Q1594.1875,1083.2469 1595.5313,1083.2469 Q1596.1563,1083.2469 1596.75,1082.9813 Q1597.3438,1082.7 1597.9688,1082.1219 L1597.9688,1084.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="1609" y="1083.3543">optional_ref</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="468" x="1691" y="1060.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="466" x="1692" y="1072.3387">type_group_pair_it&lt;It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;&gt;::value_type</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1095.2" y2="1095.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1103.2" y2="1103.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000586286676481245707">
+        <rect codeLine="55" fill="#F1F1F1" height="48" id="C_0000586286676481245707" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1763" y="330"/>
+        <ellipse cx="1778" cy="346" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1773,347.1563 C1773,349.6563 1775.1406,351.4688 1778.0625,351.4688 C1779.2969,351.4688 1780.4688,351.1719 1781.2188,350.6563 C1781.8281,350.2344 1782.1563,349.8125 1782.1563,349.4063 C1782.1563,348.9375 1781.7344,348.5313 1781.2344,348.5313 C1781,348.5313 1780.7813,348.6094 1780.5781,348.8125 C1780.1406,349.25 1780.1406,349.25 1779.9688,349.3438 C1779.5156,349.5781 1778.875,349.7188 1778.1094,349.7188 C1776.1094,349.7188 1774.8281,348.7031 1774.8281,347.125 L1774.8281,346.0781 C1774.8281,344.375 1776.0469,343.1719 1777.75,343.1719 C1778.3281,343.1719 1778.9063,343.3125 1779.375,343.5625 C1779.8438,343.8281 1780.0156,344.0156 1780.0781,344.375 C1780.2031,345.0469 1780.4531,345.2969 1780.9844,345.2969 C1781.2656,345.2969 1781.5469,345.1563 1781.7344,344.9375 C1781.8594,344.7656 1781.9063,344.5938 1781.9063,344.1563 L1781.9063,342.7969 C1781.9063,342.375 1781.8906,342.2344 1781.7656,342.0625 C1781.5938,341.8125 1781.3125,341.6563 1780.9844,341.6563 C1780.6719,341.6563 1780.4688,341.7656 1780.25,342.0313 C1779.0781,341.5313 1778.6406,341.4219 1777.6875,341.4219 C1775.0156,341.4219 1773,343.4375 1773,346.0625 L1773,347.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1792" y="350.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1764" x2="1803" y1="362" y2="362"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1764" x2="1803" y1="370" y2="370"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="86.4141" id="C_0001024383802991748694" style="stroke: #A80036; stroke-width: 1.5;" width="406" x="952" y="816.2"/>
-      <ellipse cx="967" cy="832.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M969.9688,837.8406 Q969.3906,838.1375 968.75,838.2781 Q968.1094,838.4344 967.4063,838.4344 Q964.9063,838.4344 963.5781,836.7938 Q962.2656,835.1375 962.2656,832.0125 Q962.2656,828.8875 963.5781,827.2313 Q964.9063,825.575 967.4063,825.575 Q968.1094,825.575 968.75,825.7313 Q969.4063,825.8875 969.9688,826.1844 L969.9688,828.9031 Q969.3438,828.325 968.75,828.0594 Q968.1563,827.7781 967.5313,827.7781 Q966.1875,827.7781 965.5,828.8563 Q964.8125,829.9188 964.8125,832.0125 Q964.8125,834.1063 965.5,835.1844 Q966.1875,836.2469 967.5313,836.2469 Q968.1563,836.2469 968.75,835.9813 Q969.3438,835.7 969.9688,835.1219 L969.9688,837.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="981" y="836.3543">type_group_pair_it</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="258" x="1103" y="813.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="256" x="1104" y="825.3387">It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="848.2" y2="848.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001353306307770366167">
+        <rect codeLine="59" fill="#F1F1F1" height="48" id="C_0001353306307770366167" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1763" y="650"/>
+        <ellipse cx="1778" cy="666" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1773,667.1563 C1773,669.6563 1775.1406,671.4688 1778.0625,671.4688 C1779.2969,671.4688 1780.4688,671.1719 1781.2188,670.6563 C1781.8281,670.2344 1782.1563,669.8125 1782.1563,669.4063 C1782.1563,668.9375 1781.7344,668.5313 1781.2344,668.5313 C1781,668.5313 1780.7813,668.6094 1780.5781,668.8125 C1780.1406,669.25 1780.1406,669.25 1779.9688,669.3438 C1779.5156,669.5781 1778.875,669.7188 1778.1094,669.7188 C1776.1094,669.7188 1774.8281,668.7031 1774.8281,667.125 L1774.8281,666.0781 C1774.8281,664.375 1776.0469,663.1719 1777.75,663.1719 C1778.3281,663.1719 1778.9063,663.3125 1779.375,663.5625 C1779.8438,663.8281 1780.0156,664.0156 1780.0781,664.375 C1780.2031,665.0469 1780.4531,665.2969 1780.9844,665.2969 C1781.2656,665.2969 1781.5469,665.1563 1781.7344,664.9375 C1781.8594,664.7656 1781.9063,664.5938 1781.9063,664.1563 L1781.9063,662.7969 C1781.9063,662.375 1781.8906,662.2344 1781.7656,662.0625 C1781.5938,661.8125 1781.3125,661.6563 1780.9844,661.6563 C1780.6719,661.6563 1780.4688,661.7656 1780.25,662.0313 C1779.0781,661.5313 1778.6406,661.4219 1777.6875,661.4219 C1775.0156,661.4219 1773,663.4375 1773,666.0625 L1773,667.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1792" y="670.606">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1764" x2="1803" y1="682" y2="682"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1764" x2="1803" y1="690" y2="690"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="854.2"/>
-      <ellipse cx="963" cy="859.2" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000598044391549147725">
+        <rect codeLine="63" fill="#F1F1F1" height="48" id="C_0000598044391549147725" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="1762.5" y="413"/>
+        <ellipse cx="1777.5" cy="429" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1772.5,430.1563 C1772.5,432.6563 1774.6406,434.4688 1777.5625,434.4688 C1778.7969,434.4688 1779.9688,434.1719 1780.7188,433.6563 C1781.3281,433.2344 1781.6563,432.8125 1781.6563,432.4063 C1781.6563,431.9375 1781.2344,431.5313 1780.7344,431.5313 C1780.5,431.5313 1780.2813,431.6094 1780.0781,431.8125 C1779.6406,432.25 1779.6406,432.25 1779.4688,432.3438 C1779.0156,432.5781 1778.375,432.7188 1777.6094,432.7188 C1775.6094,432.7188 1774.3281,431.7031 1774.3281,430.125 L1774.3281,429.0781 C1774.3281,427.375 1775.5469,426.1719 1777.25,426.1719 C1777.8281,426.1719 1778.4063,426.3125 1778.875,426.5625 C1779.3438,426.8281 1779.5156,427.0156 1779.5781,427.375 C1779.7031,428.0469 1779.9531,428.2969 1780.4844,428.2969 C1780.7656,428.2969 1781.0469,428.1563 1781.2344,427.9375 C1781.3594,427.7656 1781.4063,427.5938 1781.4063,427.1563 L1781.4063,425.7969 C1781.4063,425.375 1781.3906,425.2344 1781.2656,425.0625 C1781.0938,424.8125 1780.8125,424.6563 1780.4844,424.6563 C1780.1719,424.6563 1779.9688,424.7656 1779.75,425.0313 C1778.5781,424.5313 1778.1406,424.4219 1777.1875,424.4219 C1774.5156,424.4219 1772.5,426.4375 1772.5,429.0625 L1772.5,430.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1791.5" y="433.606">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1763.5" x2="1803.5" y1="445" y2="445"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1763.5" x2="1803.5" y1="453" y2="453"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="290" x="972" y="862.4104">find(const value_type &amp; v) constexpr : unsigned int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0000425551452299939770">
+        <rect codeLine="67" fill="#F1F1F1" height="48" id="C_0000425551452299939770" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="1064.5" y="330"/>
+        <ellipse cx="1079.5" cy="346" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1074.5,347.1563 C1074.5,349.6563 1076.6406,351.4688 1079.5625,351.4688 C1080.7969,351.4688 1081.9688,351.1719 1082.7188,350.6563 C1083.3281,350.2344 1083.6563,349.8125 1083.6563,349.4063 C1083.6563,348.9375 1083.2344,348.5313 1082.7344,348.5313 C1082.5,348.5313 1082.2813,348.6094 1082.0781,348.8125 C1081.6406,349.25 1081.6406,349.25 1081.4688,349.3438 C1081.0156,349.5781 1080.375,349.7188 1079.6094,349.7188 C1077.6094,349.7188 1076.3281,348.7031 1076.3281,347.125 L1076.3281,346.0781 C1076.3281,344.375 1077.5469,343.1719 1079.25,343.1719 C1079.8281,343.1719 1080.4063,343.3125 1080.875,343.5625 C1081.3438,343.8281 1081.5156,344.0156 1081.5781,344.375 C1081.7031,345.0469 1081.9531,345.2969 1082.4844,345.2969 C1082.7656,345.2969 1083.0469,345.1563 1083.2344,344.9375 C1083.3594,344.7656 1083.4063,344.5938 1083.4063,344.1563 L1083.4063,342.7969 C1083.4063,342.375 1083.3906,342.2344 1083.2656,342.0625 C1083.0938,341.8125 1082.8125,341.6563 1082.4844,341.6563 C1082.1719,341.6563 1081.9688,341.7656 1081.75,342.0313 C1080.5781,341.5313 1080.1406,341.4219 1079.1875,341.4219 C1076.5156,341.4219 1074.5,343.4375 1074.5,346.0625 L1074.5,347.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1093.5" y="350.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="53" x="1153.5" y="327"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="51" x="1154.5" y="341.2001">A,bool,int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1065.5" x2="1202.5" y1="362" y2="362"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1065.5" x2="1202.5" y1="370" y2="370"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="867.0047"/>
-      <ellipse cx="963" cy="872.0047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0000179850898515269194">
+        <rect codeLine="71" fill="#F1F1F1" height="48" id="C_0000179850898515269194" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="152" x="1348" y="1210"/>
+        <ellipse cx="1363" cy="1226" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1358,1227.1563 C1358,1229.6563 1360.1406,1231.4688 1363.0625,1231.4688 C1364.2969,1231.4688 1365.4688,1231.1719 1366.2188,1230.6563 C1366.8281,1230.2344 1367.1563,1229.8125 1367.1563,1229.4063 C1367.1563,1228.9375 1366.7344,1228.5313 1366.2344,1228.5313 C1366,1228.5313 1365.7813,1228.6094 1365.5781,1228.8125 C1365.1406,1229.25 1365.1406,1229.25 1364.9688,1229.3438 C1364.5156,1229.5781 1363.875,1229.7188 1363.1094,1229.7188 C1361.1094,1229.7188 1359.8281,1228.7031 1359.8281,1227.125 L1359.8281,1226.0781 C1359.8281,1224.375 1361.0469,1223.1719 1362.75,1223.1719 C1363.3281,1223.1719 1363.9063,1223.3125 1364.375,1223.5625 C1364.8438,1223.8281 1365.0156,1224.0156 1365.0781,1224.375 C1365.2031,1225.0469 1365.4531,1225.2969 1365.9844,1225.2969 C1366.2656,1225.2969 1366.5469,1225.1563 1366.7344,1224.9375 C1366.8594,1224.7656 1366.9063,1224.5938 1366.9063,1224.1563 L1366.9063,1222.7969 C1366.9063,1222.375 1366.8906,1222.2344 1366.7656,1222.0625 C1366.5938,1221.8125 1366.3125,1221.6563 1365.9844,1221.6563 C1365.6719,1221.6563 1365.4688,1221.7656 1365.25,1222.0313 C1364.0781,1221.5313 1363.6406,1221.4219 1362.6875,1221.4219 C1360.0156,1221.4219 1358,1223.4375 1358,1226.0625 L1358,1227.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1377" y="1230.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="66" x="1437" y="1207"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="64" x="1438" y="1221.2001">float,double</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1349" x2="1499" y1="1242" y2="1242"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1349" x2="1499" y1="1250" y2="1250"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="972" y="875.2151">get(unsigned int i) : ref_t</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <g id="elem_C_0001070380438303872295">
+        <rect codeLine="75" fill="#F1F1F1" height="48" id="C_0001070380438303872295" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="119" x="1074.5" y="573"/>
+        <ellipse cx="1089.5" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1084.5,590.1563 C1084.5,592.6563 1086.6406,594.4688 1089.5625,594.4688 C1090.7969,594.4688 1091.9688,594.1719 1092.7188,593.6563 C1093.3281,593.2344 1093.6563,592.8125 1093.6563,592.4063 C1093.6563,591.9375 1093.2344,591.5313 1092.7344,591.5313 C1092.5,591.5313 1092.2813,591.6094 1092.0781,591.8125 C1091.6406,592.25 1091.6406,592.25 1091.4688,592.3438 C1091.0156,592.5781 1090.375,592.7188 1089.6094,592.7188 C1087.6094,592.7188 1086.3281,591.7031 1086.3281,590.125 L1086.3281,589.0781 C1086.3281,587.375 1087.5469,586.1719 1089.25,586.1719 C1089.8281,586.1719 1090.4063,586.3125 1090.875,586.5625 C1091.3438,586.8281 1091.5156,587.0156 1091.5781,587.375 C1091.7031,588.0469 1091.9531,588.2969 1092.4844,588.2969 C1092.7656,588.2969 1093.0469,588.1563 1093.2344,587.9375 C1093.3594,587.7656 1093.4063,587.5938 1093.4063,587.1563 L1093.4063,585.7969 C1093.4063,585.375 1093.3906,585.2344 1093.2656,585.0625 C1093.0938,584.8125 1092.8125,584.6563 1092.4844,584.6563 C1092.1719,584.6563 1091.9688,584.7656 1091.75,585.0313 C1090.5781,584.5313 1090.1406,584.4219 1089.1875,584.4219 C1086.5156,584.4219 1084.5,586.4375 1084.5,589.0625 L1084.5,590.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1103.5" y="593.606">type_list</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="33" x="1163.5" y="570"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="31" x="1164.5" y="584.2001">A,B,C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1075.5" x2="1192.5" y1="605" y2="605"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1075.5" x2="1192.5" y1="613" y2="613"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="879.8094"/>
-      <ellipse cx="963" cy="884.8094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <g id="elem_C_0001854055939974723413">
+        <rect codeLine="79" fill="#F1F1F1" height="48" id="C_0001854055939974723413" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="356" x="533" y="752"/>
+        <ellipse cx="548" cy="768" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M543,769.1563 C543,771.6563 545.1406,773.4688 548.0625,773.4688 C549.2969,773.4688 550.4688,773.1719 551.2188,772.6563 C551.8281,772.2344 552.1563,771.8125 552.1563,771.4063 C552.1563,770.9375 551.7344,770.5313 551.2344,770.5313 C551,770.5313 550.7813,770.6094 550.5781,770.8125 C550.1406,771.25 550.1406,771.25 549.9688,771.3438 C549.5156,771.5781 548.875,771.7188 548.1094,771.7188 C546.1094,771.7188 544.8281,770.7031 544.8281,769.125 L544.8281,768.0781 C544.8281,766.375 546.0469,765.1719 547.75,765.1719 C548.3281,765.1719 548.9063,765.3125 549.375,765.5625 C549.8438,765.8281 550.0156,766.0156 550.0781,766.375 C550.2031,767.0469 550.4531,767.2969 550.9844,767.2969 C551.2656,767.2969 551.5469,767.1563 551.7344,766.9375 C551.8594,766.7656 551.9063,766.5938 551.9063,766.1563 L551.9063,764.7969 C551.9063,764.375 551.8906,764.2344 551.7656,764.0625 C551.5938,763.8125 551.3125,763.6563 550.9844,763.6563 C550.6719,763.6563 550.4688,763.7656 550.25,764.0313 C549.0781,763.5313 548.6406,763.4219 547.6875,763.4219 C545.0156,763.4219 543,765.4375 543,768.0625 L543,769.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="562" y="772.606">type_group_pair</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="218" x="674" y="749"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="216" x="675" y="763.2001">type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="534" x2="888" y1="784" y2="784"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="534" x2="888" y1="792" y2="792"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="227" x="972" y="888.0198">getp(unsigned int i) : const value_type *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0002161425587790795236">
+        <rect codeLine="83" fill="#F1F1F1" height="81.5999" id="C_0002161425587790795236" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="431" x="7" y="586.2"/>
+        <ellipse cx="213.25" cy="602.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M208.25,603.3563 C208.25,605.8563 210.3906,607.6688 213.3125,607.6688 C214.5469,607.6688 215.7188,607.3719 216.4688,606.8563 C217.0781,606.4344 217.4063,606.0125 217.4063,605.6063 C217.4063,605.1375 216.9844,604.7313 216.4844,604.7313 C216.25,604.7313 216.0313,604.8094 215.8281,605.0125 C215.3906,605.45 215.3906,605.45 215.2188,605.5438 C214.7656,605.7781 214.125,605.9188 213.3594,605.9188 C211.3594,605.9188 210.0781,604.9031 210.0781,603.325 L210.0781,602.2781 C210.0781,600.575 211.2969,599.3719 213,599.3719 C213.5781,599.3719 214.1563,599.5125 214.625,599.7625 C215.0938,600.0281 215.2656,600.2156 215.3281,600.575 C215.4531,601.2469 215.7031,601.4969 216.2344,601.4969 C216.5156,601.4969 216.7969,601.3563 216.9844,601.1375 C217.1094,600.9656 217.1563,600.7938 217.1563,600.3563 L217.1563,598.9969 C217.1563,598.575 217.1406,598.4344 217.0156,598.2625 C216.8438,598.0125 216.5625,597.8563 216.2344,597.8563 C215.9219,597.8563 215.7188,597.9656 215.5,598.2313 C214.3281,597.7313 213.8906,597.6219 212.9375,597.6219 C210.2656,597.6219 208.25,599.6375 208.25,602.2625 L208.25,603.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="233.75" y="606.806">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="437" y1="618.2" y2="618.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="437" y1="626.2" y2="626.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="635.1"/>
+          <ellipse cx="18" cy="640.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="405" x="27" y="643.2059">abc : type_group_pair&lt;type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="651.8999"/>
+          <ellipse cx="18" cy="656.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="27" y="660.0059">aboolint : type_list&lt;A,bool,int&gt;</text>
+        </a>
+      </g>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="894.6141" y2="894.6141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="328.2"/>
-      <ellipse cx="1863" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1865.9688,349.8406 Q1865.3906,350.1375 1864.75,350.2781 Q1864.1094,350.4344 1863.4063,350.4344 Q1860.9063,350.4344 1859.5781,348.7938 Q1858.2656,347.1375 1858.2656,344.0125 Q1858.2656,340.8875 1859.5781,339.2313 Q1860.9063,337.575 1863.4063,337.575 Q1864.1094,337.575 1864.75,337.7313 Q1865.4063,337.8875 1865.9688,338.1844 L1865.9688,340.9031 Q1865.3438,340.325 1864.75,340.0594 Q1864.1563,339.7781 1863.5313,339.7781 Q1862.1875,339.7781 1861.5,340.8563 Q1860.8125,341.9188 1860.8125,344.0125 Q1860.8125,346.1063 1861.5,347.1844 Q1862.1875,348.2469 1863.5313,348.2469 Q1864.1563,348.2469 1864.75,347.9813 Q1865.3438,347.7 1865.9688,347.1219 L1865.9688,349.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="348.3543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="360.2" y2="360.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="368.2" y2="368.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <g id="elem_C_0000271990753639572557">
+        <rect codeLine="89" fill="#F1F1F1" height="48" id="C_0000271990753639572557" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="251" x="1658" y="1148"/>
+        <ellipse cx="1673" cy="1164" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1668,1165.1563 C1668,1167.6563 1670.1406,1169.4688 1673.0625,1169.4688 C1674.2969,1169.4688 1675.4688,1169.1719 1676.2188,1168.6563 C1676.8281,1168.2344 1677.1563,1167.8125 1677.1563,1167.4063 C1677.1563,1166.9375 1676.7344,1166.5313 1676.2344,1166.5313 C1676,1166.5313 1675.7813,1166.6094 1675.5781,1166.8125 C1675.1406,1167.25 1675.1406,1167.25 1674.9688,1167.3438 C1674.5156,1167.5781 1673.875,1167.7188 1673.1094,1167.7188 C1671.1094,1167.7188 1669.8281,1166.7031 1669.8281,1165.125 L1669.8281,1164.0781 C1669.8281,1162.375 1671.0469,1161.1719 1672.75,1161.1719 C1673.3281,1161.1719 1673.9063,1161.3125 1674.375,1161.5625 C1674.8438,1161.8281 1675.0156,1162.0156 1675.0781,1162.375 C1675.2031,1163.0469 1675.4531,1163.2969 1675.9844,1163.2969 C1676.2656,1163.2969 1676.5469,1163.1563 1676.7344,1162.9375 C1676.8594,1162.7656 1676.9063,1162.5938 1676.9063,1162.1563 L1676.9063,1160.7969 C1676.9063,1160.375 1676.8906,1160.2344 1676.7656,1160.0625 C1676.5938,1159.8125 1676.3125,1159.6563 1675.9844,1159.6563 C1675.6719,1159.6563 1675.4688,1159.7656 1675.25,1160.0313 C1674.0781,1159.5313 1673.6406,1159.4219 1672.6875,1159.4219 C1670.0156,1159.4219 1668,1161.4375 1668,1164.0625 L1668,1165.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="1687" y="1168.606">type_group_pair</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="113" x="1799" y="1145"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="111" x="1800" y="1159.2001">typename,typename</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1659" x2="1908" y1="1180" y2="1180"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1659" x2="1908" y1="1188" y2="1188"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="648.2"/>
-      <ellipse cx="1863" cy="664.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1865.9688,669.8406 Q1865.3906,670.1375 1864.75,670.2781 Q1864.1094,670.4344 1863.4063,670.4344 Q1860.9063,670.4344 1859.5781,668.7938 Q1858.2656,667.1375 1858.2656,664.0125 Q1858.2656,660.8875 1859.5781,659.2313 Q1860.9063,657.575 1863.4063,657.575 Q1864.1094,657.575 1864.75,657.7313 Q1865.4063,657.8875 1865.9688,658.1844 L1865.9688,660.9031 Q1865.3438,660.325 1864.75,660.0594 Q1864.1563,659.7781 1863.5313,659.7781 Q1862.1875,659.7781 1861.5,660.8563 Q1860.8125,661.9188 1860.8125,664.0125 Q1860.8125,666.1063 1861.5,667.1844 Q1862.1875,668.2469 1863.5313,668.2469 Q1864.1563,668.2469 1864.75,667.9813 Q1865.3438,667.7 1865.9688,667.1219 L1865.9688,669.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="668.3543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="680.2" y2="680.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="688.2" y2="688.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <g id="elem_C_0001057906395469156958">
+        <rect codeLine="93" fill="#F1F1F1" height="48" id="C_0001057906395469156958" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="323" x="1622" y="733"/>
+        <ellipse cx="1637" cy="749" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1632,750.1563 C1632,752.6563 1634.1406,754.4688 1637.0625,754.4688 C1638.2969,754.4688 1639.4688,754.1719 1640.2188,753.6563 C1640.8281,753.2344 1641.1563,752.8125 1641.1563,752.4063 C1641.1563,751.9375 1640.7344,751.5313 1640.2344,751.5313 C1640,751.5313 1639.7813,751.6094 1639.5781,751.8125 C1639.1406,752.25 1639.1406,752.25 1638.9688,752.3438 C1638.5156,752.5781 1637.875,752.7188 1637.1094,752.7188 C1635.1094,752.7188 1633.8281,751.7031 1633.8281,750.125 L1633.8281,749.0781 C1633.8281,747.375 1635.0469,746.1719 1636.75,746.1719 C1637.3281,746.1719 1637.9063,746.3125 1638.375,746.5625 C1638.8438,746.8281 1639.0156,747.0156 1639.0781,747.375 C1639.2031,748.0469 1639.4531,748.2969 1639.9844,748.2969 C1640.2656,748.2969 1640.5469,748.1563 1640.7344,747.9375 C1640.8594,747.7656 1640.9063,747.5938 1640.9063,747.1563 L1640.9063,745.7969 C1640.9063,745.375 1640.8906,745.2344 1640.7656,745.0625 C1640.5938,744.8125 1640.3125,744.6563 1639.9844,744.6563 C1639.6719,744.6563 1639.4688,744.7656 1639.25,745.0313 C1638.0781,744.5313 1637.6406,744.4219 1636.6875,744.4219 C1634.0156,744.4219 1632,746.4375 1632,749.0625 L1632,750.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="1651" y="753.606">type_group_pair_it</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="170" x="1778" y="730"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="168" x="1779" y="744.2001">typename,typename,typename</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1623" x2="1944" y1="765" y2="765"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1623" x2="1944" y1="773" y2="773"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="411.2"/>
-      <ellipse cx="1863" cy="427.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1865.9688,432.8406 Q1865.3906,433.1375 1864.75,433.2781 Q1864.1094,433.4344 1863.4063,433.4344 Q1860.9063,433.4344 1859.5781,431.7938 Q1858.2656,430.1375 1858.2656,427.0125 Q1858.2656,423.8875 1859.5781,422.2313 Q1860.9063,420.575 1863.4063,420.575 Q1864.1094,420.575 1864.75,420.7313 Q1865.4063,420.8875 1865.9688,421.1844 L1865.9688,423.9031 Q1865.3438,423.325 1864.75,423.0594 Q1864.1563,422.7781 1863.5313,422.7781 Q1862.1875,422.7781 1861.5,423.8563 Q1860.8125,424.9188 1860.8125,427.0125 Q1860.8125,429.1063 1861.5,430.1844 Q1862.1875,431.2469 1863.5313,431.2469 Q1864.1563,431.2469 1864.75,430.9813 Q1865.3438,430.7 1865.9688,430.1219 L1865.9688,432.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="431.3543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="443.2" y2="443.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="451.2" y2="451.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <g id="elem_C_0001317314479884183399">
+        <rect codeLine="97" fill="#F1F1F1" height="48" id="C_0001317314479884183399" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="122" x="1722.5" y="10"/>
+        <ellipse cx="1737.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M1732.5,27.1563 C1732.5,29.6563 1734.6406,31.4688 1737.5625,31.4688 C1738.7969,31.4688 1739.9688,31.1719 1740.7188,30.6563 C1741.3281,30.2344 1741.6563,29.8125 1741.6563,29.4063 C1741.6563,28.9375 1741.2344,28.5313 1740.7344,28.5313 C1740.5,28.5313 1740.2813,28.6094 1740.0781,28.8125 C1739.6406,29.25 1739.6406,29.25 1739.4688,29.3438 C1739.0156,29.5781 1738.375,29.7188 1737.6094,29.7188 C1735.6094,29.7188 1734.3281,28.7031 1734.3281,27.125 L1734.3281,26.0781 C1734.3281,24.375 1735.5469,23.1719 1737.25,23.1719 C1737.8281,23.1719 1738.4063,23.3125 1738.875,23.5625 C1739.3438,23.8281 1739.5156,24.0156 1739.5781,24.375 C1739.7031,25.0469 1739.9531,25.2969 1740.4844,25.2969 C1740.7656,25.2969 1741.0469,25.1563 1741.2344,24.9375 C1741.3594,24.7656 1741.4063,24.5938 1741.4063,24.1563 L1741.4063,22.7969 C1741.4063,22.375 1741.3906,22.2344 1741.2656,22.0625 C1741.0938,21.8125 1740.8125,21.6563 1740.4844,21.6563 C1740.1719,21.6563 1739.9688,21.7656 1739.75,22.0313 C1738.5781,21.5313 1738.1406,21.4219 1737.1875,21.4219 C1734.5156,21.4219 1732.5,23.4375 1732.5,26.0625 L1732.5,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="1751.5" y="30.606">head</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56" x="1791.5" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54" x="1792.5" y="21.2001">typename</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1723.5" x2="1843.5" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="1723.5" x2="1843.5" y1="50" y2="50"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1082" y="328.2"/>
-      <ellipse cx="1097" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1099.9688,349.8406 Q1099.3906,350.1375 1098.75,350.2781 Q1098.1094,350.4344 1097.4063,350.4344 Q1094.9063,350.4344 1093.5781,348.7938 Q1092.2656,347.1375 1092.2656,344.0125 Q1092.2656,340.8875 1093.5781,339.2313 Q1094.9063,337.575 1097.4063,337.575 Q1098.1094,337.575 1098.75,337.7313 Q1099.4063,337.8875 1099.9688,338.1844 L1099.9688,340.9031 Q1099.3438,340.325 1098.75,340.0594 Q1098.1563,339.7781 1097.5313,339.7781 Q1096.1875,339.7781 1095.5,340.8563 Q1094.8125,341.9188 1094.8125,344.0125 Q1094.8125,346.1063 1095.5,347.1844 Q1096.1875,348.2469 1097.5313,348.2469 Q1098.1563,348.2469 1098.75,347.9813 Q1099.3438,347.7 1099.9688,347.1219 L1099.9688,349.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1111" y="348.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="61" x="1170" y="325.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="1171" y="337.3387">A,bool,int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="360.2" y2="360.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="368.2" y2="368.2"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="1388" y="1208.2"/>
-      <ellipse cx="1403" cy="1224.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1405.9688,1229.8406 Q1405.3906,1230.1375 1404.75,1230.2781 Q1404.1094,1230.4344 1403.4063,1230.4344 Q1400.9063,1230.4344 1399.5781,1228.7938 Q1398.2656,1227.1375 1398.2656,1224.0125 Q1398.2656,1220.8875 1399.5781,1219.2313 Q1400.9063,1217.575 1403.4063,1217.575 Q1404.1094,1217.575 1404.75,1217.7313 Q1405.4063,1217.8875 1405.9688,1218.1844 L1405.9688,1220.9031 Q1405.3438,1220.325 1404.75,1220.0594 Q1404.1563,1219.7781 1403.5313,1219.7781 Q1402.1875,1219.7781 1401.5,1220.8563 Q1400.8125,1221.9188 1400.8125,1224.0125 Q1400.8125,1226.1063 1401.5,1227.1844 Q1402.1875,1228.2469 1403.5313,1228.2469 Q1404.1563,1228.2469 1404.75,1227.9813 Q1405.3438,1227.7 1405.9688,1227.1219 L1405.9688,1229.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1417" y="1228.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="77" x="1476" y="1205.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="75" x="1477" y="1217.3387">float,double</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1240.2" y2="1240.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1248.2" y2="1248.2"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="1095.5" y="571.2"/>
-      <ellipse cx="1110.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1113.4688,592.8406 Q1112.8906,593.1375 1112.25,593.2781 Q1111.6094,593.4344 1110.9063,593.4344 Q1108.4063,593.4344 1107.0781,591.7938 Q1105.7656,590.1375 1105.7656,587.0125 Q1105.7656,583.8875 1107.0781,582.2313 Q1108.4063,580.575 1110.9063,580.575 Q1111.6094,580.575 1112.25,580.7313 Q1112.9063,580.8875 1113.4688,581.1844 L1113.4688,583.9031 Q1112.8438,583.325 1112.25,583.0594 Q1111.6563,582.7781 1111.0313,582.7781 Q1109.6875,582.7781 1109,583.8563 Q1108.3125,584.9188 1108.3125,587.0125 Q1108.3125,589.1063 1109,590.1844 Q1109.6875,591.2469 1111.0313,591.2469 Q1111.6563,591.2469 1112.25,590.9813 Q1112.8438,590.7 1113.4688,590.1219 L1113.4688,592.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1124.5" y="591.3543">type_list</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="1183.5" y="568.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="1184.5" y="580.3387">A,B,C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="603.2" y2="603.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="611.2" y2="611.2"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.5;" width="389" x="502" y="748.2"/>
-      <ellipse cx="517" cy="764.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M519.9688,769.8406 Q519.3906,770.1375 518.75,770.2781 Q518.1094,770.4344 517.4063,770.4344 Q514.9063,770.4344 513.5781,768.7938 Q512.2656,767.1375 512.2656,764.0125 Q512.2656,760.8875 513.5781,759.2313 Q514.9063,757.575 517.4063,757.575 Q518.1094,757.575 518.75,757.7313 Q519.4063,757.8875 519.9688,758.1844 L519.9688,760.9031 Q519.3438,760.325 518.75,760.0594 Q518.1563,759.7781 517.5313,759.7781 Q516.1875,759.7781 515.5,760.8563 Q514.8125,761.9188 514.8125,764.0125 Q514.8125,766.1063 515.5,767.1844 Q516.1875,768.2469 517.5313,768.2469 Q518.1563,768.2469 518.75,767.9813 Q519.3438,767.7 519.9688,767.1219 L519.9688,769.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="531" y="768.3543">type_group_pair</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="255" x="639" y="745.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="253" x="640" y="757.3387">type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="780.2" y2="780.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="788.2" y2="788.2"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="73.6094" id="C_0002161425587790795236" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="586.2"/>
-      <ellipse cx="197.25" cy="602.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M200.2188,607.8406 Q199.6406,608.1375 199,608.2781 Q198.3594,608.4344 197.6563,608.4344 Q195.1563,608.4344 193.8281,606.7938 Q192.5156,605.1375 192.5156,602.0125 Q192.5156,598.8875 193.8281,597.2313 Q195.1563,595.575 197.6563,595.575 Q198.3594,595.575 199,595.7313 Q199.6563,595.8875 200.2188,596.1844 L200.2188,598.9031 Q199.5938,598.325 199,598.0594 Q198.4063,597.7781 197.7813,597.7781 Q196.4375,597.7781 195.75,598.8563 Q195.0625,599.9188 195.0625,602.0125 Q195.0625,604.1063 195.75,605.1844 Q196.4375,606.2469 197.7813,606.2469 Q198.4063,606.2469 199,605.9813 Q199.5938,605.7 200.2188,605.1219 L200.2188,607.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="217.75" y="606.3543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="618.2" y2="618.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="626.2" y2="626.2"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="632.2"/>
-      <ellipse cx="17" cy="637.2" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="373" x="26" y="640.4104">abc : type_group_pair&lt;type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="645.0047"/>
-      <ellipse cx="17" cy="650.0047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="175" x="26" y="653.2151">aboolint : type_list&lt;A,bool,int&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="1735" y="1146.2"/>
-      <ellipse cx="1750" cy="1162.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1752.9688,1167.8406 Q1752.3906,1168.1375 1751.75,1168.2781 Q1751.1094,1168.4344 1750.4063,1168.4344 Q1747.9063,1168.4344 1746.5781,1166.7938 Q1745.2656,1165.1375 1745.2656,1162.0125 Q1745.2656,1158.8875 1746.5781,1157.2313 Q1747.9063,1155.575 1750.4063,1155.575 Q1751.1094,1155.575 1751.75,1155.7313 Q1752.4063,1155.8875 1752.9688,1156.1844 L1752.9688,1158.9031 Q1752.3438,1158.325 1751.75,1158.0594 Q1751.1563,1157.7781 1750.5313,1157.7781 Q1749.1875,1157.7781 1748.5,1158.8563 Q1747.8125,1159.9188 1747.8125,1162.0125 Q1747.8125,1164.1063 1748.5,1165.1844 Q1749.1875,1166.2469 1750.5313,1166.2469 Q1751.1563,1166.2469 1751.75,1165.9813 Q1752.3438,1165.7 1752.9688,1165.1219 L1752.9688,1167.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="1764" y="1166.3543">type_group_pair</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="132" x="1872" y="1143.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="130" x="1873" y="1155.3387">typename,typename</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1178.2" y2="1178.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1186.2" y2="1186.2"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.5;" width="347" x="1694.5" y="731.2"/>
-      <ellipse cx="1709.5" cy="747.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1712.4688,752.8406 Q1711.8906,753.1375 1711.25,753.2781 Q1710.6094,753.4344 1709.9063,753.4344 Q1707.4063,753.4344 1706.0781,751.7938 Q1704.7656,750.1375 1704.7656,747.0125 Q1704.7656,743.8875 1706.0781,742.2313 Q1707.4063,740.575 1709.9063,740.575 Q1710.6094,740.575 1711.25,740.7313 Q1711.9063,740.8875 1712.4688,741.1844 L1712.4688,743.9031 Q1711.8438,743.325 1711.25,743.0594 Q1710.6563,742.7781 1710.0313,742.7781 Q1708.6875,742.7781 1708,743.8563 Q1707.3125,744.9188 1707.3125,747.0125 Q1707.3125,749.1063 1708,750.1844 Q1708.6875,751.2469 1710.0313,751.2469 Q1710.6563,751.2469 1711.25,750.9813 Q1711.8438,750.7 1712.4688,750.1219 L1712.4688,752.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="1723.5" y="751.3543">type_group_pair_it</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="199" x="1845.5" y="728.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="197" x="1846.5" y="740.3387">typename,typename,typename</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="763.2" y2="763.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="771.2" y2="771.2"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6g3tgu9pu4de)" height="48" id="C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="1802.5" y="8.2"/>
-      <ellipse cx="1817.5" cy="24.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1820.4688,29.8406 Q1819.8906,30.1375 1819.25,30.2781 Q1818.6094,30.4344 1817.9063,30.4344 Q1815.4063,30.4344 1814.0781,28.7938 Q1812.7656,27.1375 1812.7656,24.0125 Q1812.7656,20.8875 1814.0781,19.2313 Q1815.4063,17.575 1817.9063,17.575 Q1818.6094,17.575 1819.25,17.7313 Q1819.9063,17.8875 1820.4688,18.1844 L1820.4688,20.9031 Q1819.8438,20.325 1819.25,20.0594 Q1818.6563,19.7781 1818.0313,19.7781 Q1816.6875,19.7781 1816,20.8563 Q1815.3125,21.9188 1815.3125,24.0125 Q1815.3125,26.1063 1816,27.1844 Q1816.6875,28.2469 1818.0313,28.2469 Q1818.6563,28.2469 1819.25,27.9813 Q1819.8438,27.7 1820.4688,27.1219 L1820.4688,29.8406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1831.5" y="28.3543">head</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="65" x="1871.5" y="5.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="63" x="1872.5" y="17.3387">typename</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1803.5" x2="1932.5" y1="40.2" y2="40.2"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1803.5" x2="1932.5" y1="48.2" y2="48.2"/>
-    </a>
-    <path d="M1963.06,260.15 C2023.99,259.29 2101.8,268.19 2156,310.2 C2232.51,369.5 2260.05,487.02 2269.63,551.07 " fill="none" id="C_0001536403088019105838-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2276.58,550.2,2272.28,570.95,2262.7,552.05,2276.58,550.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1948.61,528.05 C2013.27,536.75 2106.59,550.89 2187,569.2 C2191.19,570.16 2195.47,571.2 2199.77,572.3 " fill="none" id="C_0001613293628874851145-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2201.78,565.59,2219.24,577.6,2198.1,579.1,2201.78,565.59" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1946.8,104.91 C2018.72,100.05 2123.73,105.55 2187,166.2 C2241.97,218.9 2264.49,451.92 2271.69,550.7 " fill="none" id="C_0000096201031647373215-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2278.69,550.5,2273.08,570.93,2264.72,551.46,2278.69,550.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1259.77,70.79 C1401.76,81.18 1653.79,99.61 1784,109.13 " fill="none" id="C_0001342666740698875376-&gt;C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1789.34,109.52,1780.6488,104.8872,1784.3528,109.1627,1780.0772,112.8667,1789.34,109.52" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1259.77,58.68 C1401.03,52.52 1651.19,41.61 1781.97,35.91 " fill="none" id="C_0001342666740698875376-&gt;C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1782,28.9,1802.28,35.02,1782.61,42.89,1782,28.9" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1932.66,929.02 C1995.85,933.23 2092.25,929.61 2156,880.2 C2232.51,820.91 2260.05,703.39 2269.63,639.34 " fill="none" id="C_0000074655005329778311-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2262.7,638.36,2272.28,619.46,2276.58,640.21,2262.7,638.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1930.57,1012.87 C1994.38,1018.24 2093.38,1016.01 2156,963.2 C2253.45,881.02 2271.53,718.24 2274.37,639.67 " fill="none" id="C_0001877705309010128195-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2267.37,639.51,2274.82,619.67,2281.37,639.82,2267.37,639.51" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1941.16,844.51 C2003.21,846.3 2092.47,839.84 2156,797.2 C2212.04,759.59 2245.23,685.82 2261.64,638.6 " fill="none" id="C_0001737554639587928188-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2255.08,636.14,2267.93,619.29,2268.39,640.47,2255.08,636.14" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1344.67,998.33 C1494.97,1000.02 1696.72,1002.29 1799.97,1003.45 " fill="none" id="C_0001313421318785708660-&gt;C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1805.11,1003.51,1796.1446,999.433,1800.1102,1003.4671,1796.076,1007.4327,1805.11,1003.51" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1254.12,965.7 C1339.53,940.03 1467.02,903.83 1580,880.2 C1650.45,865.47 1731.7,854.09 1789.73,846.92 " fill="none" id="C_0001313421318785708660-&gt;C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1794.92,846.28,1785.4964,843.4172,1789.958,846.8949,1786.4802,851.3564,1794.92,846.28" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1239.37,1026.77 C1324.09,1056.78 1459.62,1101.91 1580,1129.2 C1623.42,1139.05 1671.1,1146.98 1714.91,1153.15 " fill="none" id="C_0001313421318785708660-&gt;C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1715.87,1146.22,1734.73,1155.86,1713.97,1160.09,1715.87,1146.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M2156.12,1087.2 C2170.45,1087.2 2184.09,1087.2 2196.68,1087.2 " fill="none" id="C_0000476531044436856932-&gt;C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2196.81,1080.2,2216.81,1087.2,2196.81,1094.2,2196.81,1080.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1358.01,876.04 C1421.92,887.08 1491.17,905.27 1550,935.2 C1566.25,943.47 1563.55,955.33 1580,963.2 C1650.1,996.76 1740.05,1004.75 1800.4,1005.81 " fill="none" id="C_0001024383802991748694-&gt;C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1805.42,1005.88,1796.4781,1001.7518,1800.4205,1005.8086,1796.3638,1009.751,1805.42,1005.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1358.32,853.23 C1502.03,848.98 1687.04,843.52 1789.68,840.49 " fill="none" id="C_0001024383802991748694-&gt;C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1794.81,840.33,1785.6994,836.5887,1789.812,840.4728,1785.9279,844.5854,1794.81,840.33" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1253.87,902.31 C1286.94,916.88 1324.08,933.24 1358,948.2 C1456.68,991.72 1476.31,1016.52 1580,1046.2 C1601.68,1052.41 1624.57,1057.7 1647.58,1062.2 " fill="none" id="C_0001024383802991748694-&gt;C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1652.49,1063.15,1644.4238,1057.4988,1647.5827,1062.1914,1642.8901,1065.3504,1652.49,1063.15" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1358.11,827.68 C1368.22,826.16 1378.22,824.66 1388,823.2 C1482.23,809.2 1586.99,794.26 1674.44,781.96 " fill="none" id="C_0001024383802991748694-&gt;C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1673.49,775.03,1694.27,779.17,1675.43,788.89,1673.49,775.03" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1228.09,352.2 C1383.83,352.2 1745.53,352.2 1842.64,352.2 " fill="none" id="C_0000425551452299939770-&gt;C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1847.86,352.2,1838.86,348.2,1842.86,352.2,1838.86,356.2,1847.86,352.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1217.26,328.08 C1298.6,297.46 1447.46,246.33 1580,227.2 C1706.69,208.92 2051.4,153.43 2156,227.2 C2209.91,265.22 2250.9,461.82 2267.02,551.06 " fill="none" id="C_0000425551452299939770-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2273.96,550.12,2270.54,571.03,2260.18,552.55,2273.96,550.12" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1542.37,1256.24 C1679.9,1296.92 1980.88,1361.24 2156,1212.2 C2200.11,1174.66 2252.61,774.59 2269.2,639.48 " fill="none" id="C_0000179850898515269194-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2262.27,638.5,2271.63,619.49,2276.17,640.19,2262.27,638.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1195.17,571.05 C1267.96,527.45 1430.3,436.14 1580,393.2 C1674.76,366.02 1792.52,356.43 1842.62,353.43 " fill="none" id="C_0001070380438303872295-&gt;C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1847.82,353.12,1838.6059,349.6415,1842.8282,353.4061,1839.0636,357.6284,1847.82,353.12" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1214.63,601.86 C1261.53,607.17 1328.97,614.75 1388,621.2 C1562.2,640.24 1772.15,662.28 1842.61,669.65 " fill="none" id="C_0001070380438303872295-&gt;C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1847.83,670.2,1839.2894,665.2951,1842.8565,669.6855,1838.4662,673.2527,1847.83,670.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1214.73,576.06 C1296.01,550.19 1447.77,504.08 1580,476.2 C1676.22,455.92 1792.74,442.71 1842.53,437.6 " fill="none" id="C_0001070380438303872295-&gt;C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1847.7,437.07,1838.3362,434.0173,1842.7265,437.5845,1839.1594,441.9749,1847.7,437.07" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1214.56,595.2 C1402.29,595.2 1989.05,595.2 2198.92,595.2 " fill="none" id="C_0001070380438303872295-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="2199.18,588.2,2219.18,595.2,2199.18,602.2,2199.18,588.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M714.04,796.49 C750.88,848.87 844.91,973.42 952,1044.2 C1089.22,1134.89 1275.82,1188.73 1382.94,1214.2 " fill="none" id="C_0001854055939974723413-&gt;C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1387.98,1215.39,1380.1315,1209.4401,1383.1122,1214.248,1378.3043,1217.2286,1387.98,1215.39" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M759.54,748.15 C846.27,714.52 1002.93,653.78 1090.46,619.84 " fill="none" id="C_0001854055939974723413-&gt;C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1095.35,617.94,1085.5119,617.4798,1090.6911,619.755,1088.4159,624.9341,1095.35,617.94" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M734.38,796.29 C782.96,827.39 871.66,882.06 952,920.2 C981.29,934.11 1013.87,947.3 1044.15,958.67 " fill="none" id="C_0001854055939974723413-&gt;C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="1046.82,952.19,1063.17,965.68,1041.98,965.33,1046.82,952.19" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M348.93,582.46 C554.27,523.74 925.89,417.45 1081.94,372.81 " fill="none" id="C_0002161425587790795236&lt;-C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="336.26,586.09,343.128,588.2878,347.7983,582.7933,340.9303,580.5956,336.26,586.09" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="670" cy="420.2664" 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="51" x="677" y="424.2669">aboolint</text>
-    <path d="M340.61,664.07 C429.2,691.06 542.27,725.51 616.68,748.18 " fill="none" id="C_0002161425587790795236&lt;-C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="328,660.23,332.57,665.8081,339.4767,663.7349,334.9067,658.1569,328,660.23" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="441" cy="685.2664" 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="448" y="689.2669">abc</text>
+    <g id="link_C_0001536403088019105838_C_0002055044356505752139">
+      <path codeLine="100" d="M1872.74,264.99 C1925.54,265.96 1991.07,275.76 2037,312 C2121.81,378.94 2144.6586,499.2027 2151.4686,554.9827 " fill="none" id="C_0001536403088019105838-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2153.65,572.85,2157.4244,554.2555,2145.5129,555.7098,2153.65,572.85" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001613293628874851145_C_0002055044356505752139">
+      <path codeLine="101" d="M1859.87,531.26 C1917.27,540.39 1998.05,554.43 2068,571 C2079.01,573.61 2073.3861,571.7778 2084.5061,574.9878 " fill="none" id="C_0001613293628874851145-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2101.8,579.98,2086.1702,569.2232,2082.8421,580.7524,2101.8,579.98" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000096201031647373215_C_0002055044356505752139">
+      <path codeLine="102" d="M1858.97,109.16 C1922.97,106.81 2013.33,114.65 2068,168 C2126.7,225.29 2147.7452,472.761 2153.2952,554.811 " fill="none" id="C_0000096201031647373215-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2154.51,572.77,2159.2815,554.4061,2147.3089,555.216,2154.51,572.77" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001342666740698875376_C_0000096201031647373215">
+      <path codeLine="103" d="M1228.81,72.54 C1358.49,82.95 1583.9092,101.0601 1702.2992,110.5601 " fill="none" id="C_0001342666740698875376-to-C_0000096201031647373215" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1708.28,111.04,1699.6288,106.3329,1703.296,110.6401,1698.9889,114.3073,1708.28,111.04" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001342666740698875376_C_0001317314479884183399">
+      <path codeLine="104" d="M1228.81,60.51 C1363.74,54.05 1590.8406,43.1802 1704.1306,37.7602 " fill="none" id="C_0001342666740698875376-to-C_0001317314479884183399" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="1722.11,36.9,1703.8438,31.767,1704.4173,43.7533,1722.11,36.9" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000074655005329778311_C_0002055044356505752139">
+      <path codeLine="105" d="M1845.89,928.8 C1901.54,930.7 1982.88,924.72 2037,882 C2121.81,815.07 2144.659,694.8074 2151.469,639.0174 " fill="none" id="C_0000074655005329778311-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2153.65,621.15,2145.5132,638.2904,2157.4248,639.7444,2153.65,621.15" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001877705309010128195_C_0002055044356505752139">
+      <path codeLine="106" d="M1843.77,1012.68 C1900.06,1015.62 1983.76,1010.72 2037,965 C2142.96,874.02 2155.0467,705.9484 2155.9467,639.3684 " fill="none" id="C_0001877705309010128195-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2156.19,621.37,2149.9473,639.2873,2161.9462,639.4495,2156.19,621.37" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001737554639587928188_C_0002055044356505752139">
+      <path codeLine="107" d="M1853.26,844.07 C1907.6,843.93 1983.02,835.91 2037,799 C2101.01,755.24 2130.2937,681.9346 2143.8337,638.4946 " fill="none" id="C_0001737554639587928188-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2149.19,621.31,2138.1055,636.7091,2149.5619,640.28,2149.19,621.31" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001313421318785708660_C_0001877705309010128195">
+      <path codeLine="108" d="M1306.39,1003.06 C1444.08,1003.91 1623.4001,1005.0228 1717.0401,1005.6028 " fill="none" id="C_0001313421318785708660-to-C_0001877705309010128195" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1723.04,1005.64,1714.0649,1001.5843,1718.0401,1005.609,1714.0154,1009.5842,1723.04,1005.64" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001313421318785708660_C_0001737554639587928188">
+      <path codeLine="109" d="M1229.39,969.11 C1308.8,942.41 1425.75,905.32 1530,881 C1591.52,866.66 1656.6955,856.404 1707.7455,849.414 " fill="none" id="C_0001313421318785708660-to-C_0001737554639587928188" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1713.69,848.6,1704.2306,845.8579,1708.7362,849.2783,1705.3158,853.784,1713.69,848.6" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001313421318785708660_C_0000271990753639572557">
+      <path codeLine="110" d="M1222.12,1034.77 C1301.42,1063.56 1422.22,1104.82 1530,1131 C1571.21,1141.02 1599.0362,1146.4783 1640.0162,1152.8883 " fill="none" id="C_0001313421318785708660-to-C_0000271990753639572557" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="1657.8,1155.67,1640.9435,1146.9604,1639.089,1158.8162,1657.8,1155.67" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000476531044436856932_C_0002110316024454672764">
+      <path codeLine="111" d="M2037.43,1089 C2059.4,1089 2061.92,1089 2079.51,1089 " fill="none" id="C_0000476531044436856932-to-C_0002110316024454672764" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2097.51,1089,2079.51,1083,2079.51,1095,2097.51,1089" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001024383802991748694_C_0001877705309010128195">
+      <path codeLine="112" d="M1318.46,879.19 C1378.69,890.3 1444.4,908.19 1500,937 C1516.19,945.4 1513.62,956.97 1530,965 C1591.31,995.07 1664.0551,1003.5628 1717.1751,1005.7528 " fill="none" id="C_0001024383802991748694-to-C_0001877705309010128195" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1723.17,1006,1714.3424,1001.6327,1718.1742,1005.794,1714.0129,1009.6259,1723.17,1006" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001024383802991748694_C_0001737554639587928188">
+      <path codeLine="113" d="M1318.38,855.06 C1450.19,850.78 1614.5032,845.4547 1707.8132,842.4247 " fill="none" id="C_0001024383802991748694-to-C_0001737554639587928188" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1713.81,842.23,1704.6849,838.5242,1708.8126,842.3923,1704.9446,846.52,1713.81,842.23" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001024383802991748694_C_0000476531044436856932">
+      <path codeLine="114" d="M1235.99,910.62 C1342.77,962.8 1499.93,1038.65 1530,1048 C1550.67,1054.43 1566.7592,1058.6618 1588.7592,1063.3018 " fill="none" id="C_0001024383802991748694-to-C_0000476531044436856932" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1594.63,1064.54,1586.6492,1058.7688,1589.7376,1063.5082,1584.9983,1066.5966,1594.63,1064.54" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001024383802991748694_C_0001057906395469156958">
+      <path codeLine="115" d="M1318.26,829.88 C1328.32,828.22 1338.28,826.59 1348,825 C1439,810.19 1523.0324,796.9872 1605.2224,784.2472 " fill="none" id="C_0001024383802991748694-to-C_0001057906395469156958" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="1623.01,781.49,1604.3034,778.318,1606.1415,790.1764,1623.01,781.49" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000425551452299939770_C_0000586286676481245707">
+      <path codeLine="116" d="M1203.99,354 C1348.83,354 1672.21,354 1756.54,354 " fill="none" id="C_0000425551452299939770-to-C_0000586286676481245707" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1762.54,354,1753.54,350,1757.54,354,1753.54,358,1762.54,354" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000425551452299939770_C_0002055044356505752139">
+      <path codeLine="117" d="M1192.55,329.63 C1268.28,298.99 1406.31,248.11 1530,229 C1752.69,194.61 1853.09,98.8 2037,229 C2095.3,270.28 2135.8207,479.3736 2148.8807,554.8436 " fill="none" id="C_0000425551452299939770-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2151.95,572.58,2154.7929,553.8205,2142.9686,555.8667,2151.95,572.58" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000179850898515269194_C_0002055044356505752139">
+      <path codeLine="118" d="M1500.44,1258.27 C1627.56,1293.98 1885.38,1343.4 2037,1214 C2083.52,1174.3 2137.6845,748.5793 2150.9445,639.1593 " fill="none" id="C_0000179850898515269194-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2153.11,621.29,2144.9881,638.4374,2156.9009,639.8811,2153.11,621.29" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001070380438303872295_C_0000586286676481245707">
+      <path codeLine="119" d="M1171.8,572.59 C1239.52,528.97 1389.78,438.22 1530,395 C1614.25,369.04 1713.6779,359.1536 1756.7779,355.8136 " fill="none" id="C_0001070380438303872295-to-C_0000586286676481245707" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1762.76,355.35,1753.4779,352.0573,1757.7749,355.7363,1754.096,360.0334,1762.76,355.35" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001070380438303872295_C_0001353306307770366167">
+      <path codeLine="120" d="M1193.76,604.25 C1236.53,609.51 1295.84,616.76 1348,623 C1507.88,642.14 1694.9699,663.8696 1756.6099,671.0096 " fill="none" id="C_0001070380438303872295-to-C_0001353306307770366167" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1762.57,671.7,1754.09,666.691,1757.6032,671.1247,1753.1695,674.6379,1762.57,671.7" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001070380438303872295_C_0000598044391549147725">
+      <path codeLine="121" d="M1193.9,576.6 C1270.53,550.67 1408.92,505.94 1530,478 C1615.25,458.33 1712.864,445.385 1756.074,440.125 " fill="none" id="C_0001070380438303872295-to-C_0000598044391549147725" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1762.03,439.4,1752.6126,436.5169,1757.0666,440.0042,1753.5793,444.4582,1762.03,439.4" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001070380438303872295_C_0002055044356505752139">
+      <path codeLine="122" d="M1193.93,597 C1375.8,597 1908.5,597 2083.79,597 " fill="none" id="C_0001070380438303872295-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="2101.79,597,2083.79,591,2083.79,603,2101.79,597" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001854055939974723413_C_0000179850898515269194">
+      <path codeLine="123" d="M726.83,800.18 C760.33,852.96 847.03,979.54 950,1052 C1075.56,1140.37 1243.8979,1191.3798 1342.0579,1215.8298 " fill="none" id="C_0001854055939974723413-to-C_0000179850898515269194" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1347.88,1217.28,1340.1136,1211.2233,1343.0282,1216.0715,1338.18,1218.9861,1347.88,1217.28" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001854055939974723413_C_0001070380438303872295">
+      <path codeLine="124" d="M769.22,751.68 C849.59,717.5 989.5583,657.9875 1070.0483,623.7675 " fill="none" id="C_0001854055939974723413-to-C_0001070380438303872295" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1075.57,621.42,1065.7224,621.2602,1070.9686,623.3763,1068.8525,628.6224,1075.57,621.42" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001854055939974723413_C_0001313421318785708660">
+      <path codeLine="125" d="M745.89,800.48 C791.01,832.4 873.97,888.78 950,928 C979.39,943.17 995.8925,950.7875 1025.8925,962.6575 " fill="none" id="C_0001854055939974723413-to-C_0001313421318785708660" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="1042.63,969.28,1028.1,957.0784,1023.685,968.2367,1042.63,969.28" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002161425587790795236_C_0000425551452299939770">
+      <path codeLine="126" d="M372.1433,582.3899 C569.5233,523.1399 914.85,419.48 1064.27,374.63 " fill="none" id="C_0002161425587790795236-backto-C_0000425551452299939770" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="360.65,585.84,367.5467,587.9461,372.1433,582.3899,365.2466,580.2838,360.65,585.84" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="687.5" cy="420.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="45" x="694.5" y="424.077">aboolint</text>
+    </g>
+    <g id="link_C_0002161425587790795236_C_0001854055939974723413">
+      <path codeLine="127" d="M369.5238,671.7246 C456.9838,698.5146 556.58,729.01 630.3,751.59 " fill="none" id="C_0002161425587790795236-backto-C_0001854055939974723413" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="358.05,668.21,362.6154,673.7919,369.5238,671.7246,364.9584,666.1427,358.05,668.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="474" cy="697.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="481" y="701.077">abc</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00064_class_mermaid.svg b/docs/test_cases/t00064_class_mermaid.svg
index 66e2f38e..1a2e75a2 100644
--- a/docs/test_cases/t00064_class_mermaid.svg
+++ b/docs/test_cases/t00064_class_mermaid.svg
@@ -1,83 +1,88 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 3853.625 647" style="max-width: 3853.62px; background-color: white;" width="3853.625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M120.7109375,532L120.7109375,536.1666666666666C120.7109375,540.3333333333334,120.7109375,548.6666666666666,524.8515625,561.5182292892491C928.9921875,574.3697919118316,1737.2734375,591.7395838236632,2141.4140625,600.424479779579L2545.5546875,609.1093757354948"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M378.8046875,532L378.8046875,536.1666666666666C378.8046875,540.3333333333334,378.8046875,548.6666666666666,739.9296875,561.491422379537C1101.0546875,574.3161780924073,1823.3046875,591.6323561848145,2184.4296875,600.2904452310181L2545.5546875,608.9485342772217"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M1008.9609375,532L1008.9609375,536.1666666666666C1008.9609375,540.3333333333334,1008.9609375,548.6666666666666,1265.0598958333333,561.389665165612C1521.1588541666667,574.1126636645573,2033.3567708333333,591.2253273291147,2289.4557291666665,599.7816591613935L2545.5546875,608.3379909936722"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M913.7968298410404,392L929.657514450867,401.6666666666667C945.5181990606937,411.3333333333333,977.2395682803468,430.6666666666667,993.1002528901735,444.5C1008.9609375,458.3333333333333,1008.9609375,466.6666666666667,1008.9609375,470.8333333333333L1008.9609375,475"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M778.0820538294797,392L747.9108261078997,401.6666666666667C717.7395983863198,411.3333333333333,657.3971429431599,430.6666666666667,627.22591522158,444.5C597.0546875,458.3333333333333,597.0546875,466.6666666666667,597.0546875,470.8333333333333L597.0546875,475"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M793.96875,532L793.96875,536.1666666666666C793.96875,540.3333333333334,793.96875,548.6666666666666,1085.8997395833333,561.4323174298668C1377.8307291666667,574.1979681930669,1961.6927083333333,591.3959363861337,2253.6236979166665,599.9949204826671L2545.5546875,608.5939045792005"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M3052.19140625,532L3052.19140625,536.1666666666666C3052.19140625,540.3333333333334,3052.19140625,548.6666666666666,2989.322265625,560.4443376380012C2926.453125,572.2220086093358,2800.71484375,587.4440172186718,2737.845703125,595.0550215233397L2674.9765625,602.6660258280077"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M2107.67578125,532L2107.67578125,536.1666666666666C2107.67578125,540.3333333333334,2107.67578125,548.6666666666666,2180.6555989583335,560.6019348996992C2253.6354166666665,572.5372031327317,2399.5950520833335,588.0744062654635,2472.5748697916665,595.8430078318294L2545.5546875,603.6116093981952"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1819.514157333815,403L1835.1634904865125,410.8333333333333C1850.8128236392101,418.6666666666667,1882.111489944605,434.3333333333333,2075.340250180636,450.5093570200232C2268.5690104166665,466.68538070671315,2623.7278645833335,483.37076141342624,2801.3072916666665,491.7134517667828L2978.88671875,500.0561421201394"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1810.3812093569363,403L1824.219367172447,410.8333333333333C1838.0575249879575,418.6666666666667,1865.7338406189785,434.3333333333333,1901.1384046844894,447.551584263108C1936.54296875,460.7698351928827,1979.67578125,471.5396703857653,2001.2421875,476.9245879822067L2022.80859375,482.309505578648"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M1542.302429552023,403L1502.9772850433526,410.8333333333333C1463.652140534682,418.6666666666667,1385.0018515173408,434.3333333333333,1345.6767070086705,446.3333333333333C1306.3515625,458.3333333333333,1306.3515625,466.6666666666667,1306.3515625,470.8333333333333L1306.3515625,475"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M2585.71484375,532L2585.71484375,536.1666666666666C2585.71484375,540.3333333333334,2585.71484375,548.6666666666666,2533.7272135416665,560.1634195346091C2481.7395833333335,571.6601724025517,2377.7643229166665,586.3203448051034,2325.7766927083335,593.6504310063792L2273.7890625,600.9805172076551"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M2771.984375,403.52862471071967L2818.685546875,411.2738539255997C2865.38671875,419.0190831404798,2958.7890625,434.5095415702399,3005.490234375,446.42143745178663C3052.19140625,458.3333333333333,3052.19140625,466.6666666666667,3052.19140625,470.8333333333333L3052.19140625,475"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M2389.789333453757,425L2380.2476216281307,429.1666666666667C2370.7059098025047,433.3333333333333,2351.6224861512524,441.6666666666667,2318.7480920339594,451.38469990445583C2285.8736979166665,461.102733142245,2239.2083333333335,472.20546628449,2215.8756510416665,477.75683285561246L2192.54296875,483.308199426735"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M2375.5696802745665,425L2365.0645773121387,429.1666666666667C2354.559474349711,433.3333333333333,2333.549268424855,441.6666666666667,2344.319537833923,450C2355.0898072429904,458.3333333333333,2397.6405519859813,466.6666666666667,2418.9159243574763,470.8333333333333L2440.191296728972,475"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M2289.265625,398.4582502109401L2229.9563802083335,407.04854184245005C2170.6471354166665,415.6388334739601,2052.0286458333335,432.81941673698003,1979.7947028329438,445.5763750351567C1907.5607598325544,458.3333333333333,1881.711363415109,466.6666666666667,1868.786665206386,470.8333333333333L1855.8619669976636,475"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id17" d="M3738.25,532L3738.25,536.1666666666666C3738.25,540.3333333333334,3738.25,548.6666666666666,3734.5397135416665,558.4181320291607C3730.8294270833335,568.1695973916547,3723.4088541666665,579.3391947833095,3719.6985677083335,584.9239934791368L3715.98828125,590.5087921749642"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id18" d="M3667.012485397196,532L3656.597644080997,536.1666666666666C3646.182802764797,540.3333333333334,3625.3531201323985,548.6666666666666,3460.0137996495328,561.1696617294621C3294.6744791666665,573.6726567922576,2984.8255208333335,590.3453135845152,2829.9010416666665,598.681641980644L2674.9765625,607.0179703767728"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id19" d="M3479.1171875,532L3479.1171875,536.1666666666666C3479.1171875,540.3333333333334,3479.1171875,548.6666666666666,3345.09375,561.085898231322C3211.0703125,573.505129795977,2943.0234375,590.0102595919542,2809,598.2628244899428L2674.9765625,606.5153893879312"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id20" d="M3315.5348641939254,532L3323.156006619938,536.1666666666666C3330.7771490459504,540.3333333333334,3346.019433897975,548.6666666666666,3408.3345867406547,561.4031670670785C3470.6497395833335,574.1396674674903,3580.0377604166665,591.2793349349807,3634.7317708333335,599.849168668726L3689.42578125,608.4190024024712"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M3286.175452686916,532L3289.504283489097,536.1666666666666C3292.833114291277,540.3333333333334,3299.4907758956383,548.6666666666666,3331.371038989486,561.1084453144289C3363.2513020833335,573.5502239621909,3420.3541666666665,590.1004479243819,3448.9055989583335,598.3755599054774L3477.45703125,606.6506718865728"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id22" d="M3224.6619816004672,532L3218.99761487539,536.1666666666666C3213.3332481503116,540.3333333333334,3202.004514700156,548.6666666666666,3227.8277781834113,561.1643404488232C3253.6510416666665,573.6620142309797,3316.6263020833335,590.3240284619595,3348.1139322916665,598.6550355774493L3379.6015625,606.9860426929392"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id23" d="M3207.9918954439254,532L3199.890381619938,536.1666666666666C3191.7888677959504,540.3333333333334,3175.585840147975,548.6666666666666,3086.7499513239877,560.6992118030361C2997.9140625,572.7317569394055,2836.4453125,588.4635138788111,2755.7109375,596.3293923485139L2674.9765625,604.1952708182167"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id24" d="M3406.7609375,234L3418.8203125,239.66666666666666C3430.8796875000003,245.33333333333334,3454.9984375,256.6666666666667,3467.0578124999997,278.25C3479.1171875,299.8333333333333,3479.1171875,331.6666666666667,3479.1171875,362C3479.1171875,392.3333333333333,3479.1171875,421.1666666666667,3479.1171875,439.75C3479.1171875,458.3333333333333,3479.1171875,466.6666666666667,3479.1171875,470.8333333333333L3479.1171875,475"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id25" d="M3308.39675,234L3300.898333333333,239.66666666666666C3293.3999166666667,245.33333333333334,3278.403083333333,256.6666666666667,3270.904666666667,278.25C3263.40625,299.8333333333333,3263.40625,331.6666666666667,3263.40625,362C3263.40625,392.3333333333333,3263.40625,421.1666666666667,3263.40625,439.75C3263.40625,458.3333333333333,3263.40625,466.6666666666667,3263.40625,470.8333333333333L3263.40625,475"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id26" d="M3113.65625,214.54904990146224L2884.8138020833335,223.45754158455188C2655.9713541666665,232.36603326764148,2198.2864583333335,250.18301663382076,1969.4440104166667,268.4248416502437C1740.6015625,286.6666666666667,1740.6015625,305.3333333333333,1740.6015625,314.6666666666667L1740.6015625,324"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id27" d="M3684.5748890532545,109L3693.520740877712,114.66666666666667C3702.4665927021692,120.33333333333333,3720.358296351085,131.66666666666666,3729.3041481755427,147.75C3738.25,163.83333333333334,3738.25,184.66666666666666,3738.25,205.5C3738.25,226.33333333333334,3738.25,247.16666666666666,3738.25,273.5C3738.25,299.8333333333333,3738.25,331.6666666666667,3738.25,362C3738.25,392.3333333333333,3738.25,421.1666666666667,3738.25,439.75C3738.25,458.3333333333333,3738.25,466.6666666666667,3738.25,470.8333333333333L3738.25,475"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M3450.218657544379,109L3432.8671104536493,114.66666666666667C3415.5155633629197,120.33333333333333,3380.8124691814596,131.66666666666666,3363.4609220907296,143C3346.109375,154.33333333333334,3346.109375,165.66666666666666,3346.109375,171.33333333333334L3346.109375,177"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M120.7109375,532L120.7109375,536.1666666666666C120.7109375,540.3333333333334,120.7109375,548.6666666666666,521.8522549765834,561.4537748093743C922.9935724531666,574.240882952082,1725.2762074063332,591.4817659041638,2126.4175248829165,600.1022073802047L2527.5588423595,608.7226488562458"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M378.8046875,532L378.8046875,536.1666666666666C378.8046875,540.3333333333334,378.8046875,548.6666666666666,736.9305493527372,561.4195170693511C1095.0564112054742,574.1723674720355,1811.3081349109486,591.3447349440711,2169.4339967636856,599.9309186800888L2527.559858616423,608.5171024161066"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M1008.9609375,532L1008.9609375,536.1666666666666C1008.9609375,540.3333333333334,1008.9609375,548.6666666666666,1262.06156880072,561.2894902910257C1515.1622001014396,573.9123139153847,2021.363462702879,590.8246278307694,2274.464094003599,599.2807847884618L2527.5647253043185,607.7369417461541"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M913.7968298410404,392L929.657514450867,401.6666666666667C945.5181990606937,411.3333333333333,977.2395682803468,430.6666666666667,993.1002528901735,443.5C1008.9609375,456.3333333333333,1008.9609375,462.6666666666667,1008.9609375,465.8333333333333L1008.9609375,469"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M778.0820538294797,392L747.9108261078997,401.6666666666667C717.7395983863198,411.3333333333333,657.3971429431599,430.6666666666667,627.22591522158,441.5C597.0546875,452.3333333333333,597.0546875,454.6666666666667,597.0546875,455.8333333333333L597.0546875,457"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M793.96875,532L793.96875,536.1666666666666C793.96875,540.3333333333334,793.96875,548.6666666666666,1082.9010401800676,561.3439891283193C1371.8333303601355,574.0213115899719,1949.6979107202708,591.0426231799438,2238.630200900339,599.5532789749298L2527.5624910804063,608.0639347699157"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M3052.19140625,532L3052.19140625,536.1666666666666C3052.19140625,540.3333333333334,3052.19140625,548.6666666666666,2992.3005206844955,560.083786947267C2932.409635118991,571.5009072278672,2812.627863987982,586.0018144557343,2752.736978422478,593.2522680696679L2692.8460928569734,600.5027216836015"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M2107.67578125,532L2107.67578125,536.1666666666666C2107.67578125,540.3333333333334,2107.67578125,548.6666666666666,2177.672452826551,560.2843830827752C2247.669124403102,571.9020994988838,2387.662467556204,586.8041989977675,2457.6591391327547,594.2552487472094L2527.6558107093056,601.7062984966512"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1819.514157333815,403L1835.1634904865125,410.8333333333333C1850.8128236392101,418.6666666666667,1882.111489944605,434.3333333333333,2074.34135191976,450.46242872983856C2266.571213894915,466.5915241263438,2619.732271539831,483.1830482526877,2796.3128003622883,491.47881031585956L2972.893329184746,499.77457237903144"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1810.3812093569363,403L1824.219367172447,410.8333333333333C1838.0575249879575,418.6666666666667,1865.7338406189785,434.3333333333333,1900.1681914742765,447.30933165377604C1934.6025423295741,460.2853299742187,1975.794928409148,470.5706599484374,1996.391121448935,475.7133249355468L2016.987314488722,480.85598992265614"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M1542.302429552023,403L1502.9772850433526,410.8333333333333C1463.652140534682,418.6666666666667,1385.0018515173408,434.3333333333333,1345.6767070086705,443.3333333333333C1306.3515625,452.3333333333333,1306.3515625,454.6666666666667,1306.3515625,455.8333333333333L1306.3515625,457"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M2585.71484375,532L2585.71484375,536.1666666666666C2585.71484375,540.3333333333334,2585.71484375,548.6666666666666,2536.69783080183,559.7445721953337C2487.6808178536608,570.8224777240008,2389.646791957321,584.6449554480015,2340.629779009151,591.556194310002L2291.6127660609814,598.4674331720023"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M2771.984375,403.52862471071967L2818.685546875,411.2738539255997C2865.38671875,419.0190831404798,2958.7890625,434.5095415702399,3005.490234375,445.42143745178663C3052.19140625,456.3333333333333,3052.19140625,462.6666666666667,3052.19140625,465.8333333333333L3052.19140625,469"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M2389.789333453757,425L2380.2476216281307,429.1666666666667C2370.7059098025047,433.3333333333333,2351.6224861512524,441.6666666666667,2319.7209361335204,451.1532385514186C2287.8193861157883,460.63981043617065,2243.0997097315762,471.27962087234135,2220.7398715394706,476.59952609042665L2198.3800333473646,481.919431308512"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M2375.5696802745665,425L2365.0645773121387,429.1666666666667C2354.559474349711,433.3333333333333,2333.549268424855,441.6666666666667,2343.33818077936,449.80780652597065C2353.1270931338645,457.94894638527467,2393.7151237677294,465.8978927705493,2414.0091390846615,469.8723659631866L2434.303154401594,473.8468391558239"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M2289.265625,398.4582502109401L2229.9563802083335,407.04854184245005C2170.6471354166665,415.6388334739601,2052.0286458333335,432.81941673698003,1982.649995869022,444.65588512313985C1913.2713459047106,456.4923535092996,1893.1325355594208,462.98470701859924,1883.063130386776,466.2308837732491L1872.9937252141312,469.4770605278989"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id17" d="M3738.25,532L3738.25,536.1666666666666C3738.25,540.3333333333334,3738.25,548.6666666666666,3735.0930797484693,557.585193951529C3731.936159496939,566.5037212363915,3725.622318993878,576.0074424727828,3722.4653987423476,580.7593030909785L3719.3084784908165,585.5111637091743"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id18" d="M3667.012485397196,532L3656.597644080997,536.1666666666666C3646.182802764797,540.3333333333334,3625.3531201323985,548.6666666666666,3463.009465948439,561.0084679777243C3300.6658117644783,573.350269288782,2996.8081860289567,589.7005385775641,2844.8793731611963,597.8756732219551L2692.9505602934355,606.0508078663462"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id19" d="M3479.1171875,532L3479.1171875,536.1666666666666C3479.1171875,540.3333333333334,3479.1171875,548.6666666666666,3348.0880788020636,560.9015208326676C3217.0589701041263,573.1363749986687,2955.0007527082525,589.2727499973374,2823.971644010316,597.3409374966717L2692.9425353123793,605.4091249960061"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id20" d="M3315.5348641939254,532L3323.156006619938,536.1666666666666C3330.7771490459504,540.3333333333334,3346.019433897975,548.6666666666666,3407.3466406288608,561.2483688752569C3468.6738473597457,573.8300710838471,3576.085975969491,590.6601421676942,3629.792040274364,599.0751777096177L3683.4981045792365,607.4902132515413"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M3286.175452686916,532L3289.504283489097,536.1666666666666C3292.833114291277,540.3333333333334,3299.4907758956383,548.6666666666666,3330.410566637484,560.8300699185338C3361.330357379329,572.9934731704009,3416.5122772586583,588.9869463408018,3444.1032371983233,596.9836829260022L3471.694197137988,604.9804195112026"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id22" d="M3224.6619816004672,532L3218.99761487539,536.1666666666666C3213.3332481503116,540.3333333333334,3202.004514700156,548.6666666666666,3226.8610429335135,560.9085613319952C3251.7175711668715,573.1504559973238,3312.759361083743,589.3009119946477,3343.2802560421787,597.3761399933096L3373.801151000614,605.4513679919716"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id23" d="M3207.9918954439254,532L3199.890381619938,536.1666666666666C3191.7888677959504,540.3333333333334,3175.585840147975,548.6666666666666,3089.73581325045,560.40830192678C3003.8857863529242,572.1499371868933,2848.388760205849,587.2998743737867,2770.640247132311,594.8748429672333L2692.891734058773,602.44981156068"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id24" d="M3406.7609375,234L3418.8203125,239.66666666666666C3430.8796875000003,245.33333333333334,3454.9984375,256.6666666666667,3467.0578124999997,278.25C3479.1171875,299.8333333333333,3479.1171875,331.6666666666667,3479.1171875,362C3479.1171875,392.3333333333333,3479.1171875,421.1666666666667,3479.1171875,438.75C3479.1171875,456.3333333333333,3479.1171875,462.6666666666667,3479.1171875,465.8333333333333L3479.1171875,469"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id25" d="M3308.39675,234L3300.898333333333,239.66666666666666C3293.3999166666667,245.33333333333334,3278.403083333333,256.6666666666667,3270.904666666667,278.25C3263.40625,299.8333333333333,3263.40625,331.6666666666667,3263.40625,362C3263.40625,392.3333333333333,3263.40625,421.1666666666667,3263.40625,438.75C3263.40625,456.3333333333333,3263.40625,462.6666666666667,3263.40625,465.8333333333333L3263.40625,469"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id26" d="M3113.65625,214.54904990146224L2884.8138020833335,223.45754158455188C2655.9713541666665,232.36603326764148,2198.2864583333335,250.18301663382076,1969.4440104166667,265.4248416502437C1740.6015625,280.6666666666667,1740.6015625,293.3333333333333,1740.6015625,299.6666666666667L1740.6015625,306"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id27" d="M3699.780894369829,118.6321026942356L3706.192411974858,122.69341891186299C3712.603929579886,126.75473512949038,3725.426964789943,134.87736756474519,3731.8384823949714,149.35535044903926C3738.25,163.83333333333334,3738.25,184.66666666666666,3738.25,205.5C3738.25,226.33333333333334,3738.25,247.16666666666666,3738.25,273.5C3738.25,299.8333333333333,3738.25,331.6666666666667,3738.25,362C3738.25,392.3333333333333,3738.25,421.1666666666667,3738.25,439.75C3738.25,458.3333333333333,3738.25,466.6666666666667,3738.25,470.8333333333333L3738.25,475"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M3433.1080082346575,114.58799429131153L3418.6082360288815,119.32332857609295C3404.1084638231055,124.05866286087435,3375.1089194115525,133.52933143043717,3360.609147205776,143.93133238188526C3346.109375,154.33333333333334,3346.109375,165.66666666666666,3346.109375,171.33333333333334L3346.109375,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -390,7 +395,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L8">
+        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0002055044356505752139-0" class="node default clickable">
             <rect height="57" width="129.421875" y="-28.5" x="-64.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="64.7109375" x1="-64.7109375" class="divider"/>
@@ -409,7 +414,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L11">
+        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L11">
           <g title="type_list" id="classId-C_0001536403088019105838-1" class="node default clickable">
             <rect height="57" width="225.421875" y="-28.5" x="-112.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.7109375" x1="-112.7109375" class="divider"/>
@@ -428,7 +433,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L13">
+        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L13">
           <g title="type_list" id="classId-C_0001613293628874851145-2" class="node default clickable">
             <rect height="57" width="190.765625" y="-28.5" x="-95.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.3828125" x1="-95.3828125" class="divider"/>
@@ -447,7 +452,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L17">
+        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17">
           <g title="type_list" id="classId-C_0000096201031647373215-3" class="node default clickable">
             <rect height="57" width="181.890625" y="-28.5" x="-90.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="90.9453125" x1="-90.9453125" class="divider"/>
@@ -466,7 +471,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L17">
+        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17">
           <g title="head" id="classId-C_0001342666740698875376-4" class="node default clickable">
             <rect height="57" width="237.921875" y="-28.5" x="-118.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="118.9609375" x1="-118.9609375" class="divider"/>
@@ -485,7 +490,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L21">
+        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L21">
           <g title="type_list" id="classId-C_0000074655005329778311-5" class="node default clickable">
             <rect height="57" width="148.09375" y="-28.5" x="-74.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.046875" x1="-74.046875" class="divider"/>
@@ -504,7 +509,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27">
+        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27">
           <g title="type_list" id="classId-C_0001877705309010128195-6" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -523,7 +528,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27">
+        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27">
           <g title="type_list" id="classId-C_0001737554639587928188-7" class="node default clickable">
             <rect height="57" width="169.734375" y="-28.5" x="-84.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="84.8671875" x1="-84.8671875" class="divider"/>
@@ -542,7 +547,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L27">
+        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27">
           <g title="type_group_pair" id="classId-C_0001313421318785708660-8" class="node default clickable">
             <rect height="79" width="449.828125" y="-39.5" x="-224.9140625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="224.9140625" x1="-224.9140625" class="divider"/>
@@ -566,7 +571,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0002110316024454672764-9" class="node default clickable">
             <rect height="57" width="135.03125" y="-28.5" x="-67.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.515625" x1="-67.515625" class="divider"/>
@@ -585,7 +590,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0000476531044436856932-10" class="node default clickable">
             <rect height="57" width="686.34375" y="-28.5" x="-343.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="343.171875" x1="-343.171875" class="divider"/>
@@ -604,7 +609,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L35">
+        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L35">
           <g title="type_group_pair_it" id="classId-C_0001024383802991748694-11" class="node default clickable">
             <rect height="123" width="482.71875" y="-61.5" x="-241.359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="241.359375" x1="-241.359375" class="divider"/>
@@ -620,25 +625,25 @@
                   <span class="nodeLabel">type_group_pair_it&lt;It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -233.859375, -8)" height="18" width="375.765625">
+              <foreignObject transform="translate( -233.859375, -8)" height="18" width="384.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+find(const value_type &amp; v) : [constexpr] unsigned int</span>
+                  <span class="nodeLabel">+find(const value_type &amp; v) : : [constexpr] unsigned int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -233.859375, 14)" height="18" width="181.890625">
+              <foreignObject transform="translate( -233.859375, 14)" height="18" width="190.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get(unsigned int i) : ref_t</span>
+                  <span class="nodeLabel">+get(unsigned int i) : : ref_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -233.859375, 36)" height="18" width="278.84375">
+              <foreignObject transform="translate( -233.859375, 36)" height="18" width="287.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+getp(unsigned int i) : const value_type</span>
+                  <span style="font-style:italic;" class="nodeLabel">+getp(unsigned int i) : : const value_type</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L51">
+        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L51">
           <g title="A" id="classId-C_0000586286676481245707-12" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -657,7 +662,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L52">
+        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L52">
           <g title="B" id="classId-C_0001353306307770366167-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -676,7 +681,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L53">
+        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L53">
           <g title="C" id="classId-C_0000598044391549147725-14" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -695,7 +700,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L8">
+        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0000425551452299939770-15" class="node default clickable">
             <rect height="57" width="172.359375" y="-28.5" x="-86.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="86.1796875" x1="-86.1796875" class="divider"/>
@@ -714,7 +719,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0000179850898515269194-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -733,7 +738,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0001070380438303872295-17" class="node default clickable">
             <rect height="57" width="142.15625" y="-28.5" x="-71.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="71.078125" x1="-71.078125" class="divider"/>
@@ -752,7 +757,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0001854055939974723413-18" class="node default clickable">
             <rect height="57" width="464.90625" y="-28.5" x="-232.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="232.453125" x1="-232.453125" class="divider"/>
@@ -771,7 +776,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L55">
+        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L55">
           <g title="R" id="classId-C_0002161425587790795236-19" class="node default clickable">
             <rect height="101" width="481.546875" y="-50.5" x="-240.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="240.7734375" x1="-240.7734375" class="divider"/>
@@ -800,7 +805,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L25">
+        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0000271990753639572557-20" class="node default clickable">
             <rect height="57" width="312.890625" y="-28.5" x="-156.4453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="156.4453125" x1="-156.4453125" class="divider"/>
@@ -819,7 +824,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L33">
+        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L33">
           <g title="type_group_pair_it" id="classId-C_0001057906395469156958-21" class="node default clickable">
             <rect height="57" width="410.703125" y="-28.5" x="-205.3515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="205.3515625" x1="-205.3515625" class="divider"/>
@@ -838,7 +843,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00064/t00064.cc#L15">
+        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L15">
           <g title="head" id="classId-C_0001317314479884183399-22" class="node default clickable">
             <rect height="57" width="145.734375" y="-28.5" x="-72.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.8671875" x1="-72.8671875" class="divider"/>
diff --git a/docs/test_cases/t00065.md b/docs/test_cases/t00065.md
index f357d420..1765ece3 100644
--- a/docs/test_cases/t00065.md
+++ b/docs/test_cases/t00065.md
@@ -14,7 +14,7 @@ diagrams:
     using_namespace: clanguml::t00065
 ```
 ## Source code
-File t00065.cc
+File `tests/t00065/t00065.cc`
 ```cpp
 #include "module1/module1.h"
 #include "module2/module2.h"
@@ -26,6 +26,80 @@ struct R {
     C<B> c;
     D<B> d;
 };
+}
+}
+```
+File `tests/t00065/module1/module1.h`
+```cpp
+#include "submodule1a/submodule1a.h"
+
+#pragma once
+
+namespace clanguml {
+namespace t00065 {
+
+enum class ABC { a, b, c };
+
+enum XYZ { x, y, z };
+
+struct A {
+    ABC abc;
+    XYZ xyz;
+    detail::AImpl *pimpl;
+};
+}
+}
+```
+File `tests/t00065/module1/submodule1a/submodule1a.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t00065 {
+namespace detail {
+struct AImpl { };
+}
+}
+}
+```
+File `tests/t00065/module2/module2.h`
+```cpp
+#pragma once
+
+#include "concepts/concepts.h"
+
+namespace clanguml {
+namespace t00065 {
+struct B {
+    B() = default;
+    void b() { }
+};
+
+template <typename T> struct C {
+    T *t;
+};
+
+template <bconcept T> struct D {
+    T t;
+    C<int> c;
+};
+
+}
+}
+```
+File `tests/t00065/module2/concepts/concepts.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t00065 {
+
+template <typename T>
+concept bconcept = requires(T t) {
+                       T{};
+                       t.b();
+                   };
+
 }
 }
 ```
@@ -222,6 +296,7 @@ struct R {
               "is_constexpr": false,
               "is_constructor": true,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": true,
               "is_deleted": false,
               "is_move_assignment": false,
@@ -247,6 +322,7 @@ struct R {
               "is_constexpr": false,
               "is_constructor": false,
               "is_copy_assignment": false,
+              "is_coroutine": false,
               "is_defaulted": false,
               "is_deleted": false,
               "is_move_assignment": false,
diff --git a/docs/test_cases/t00065_class.svg b/docs/test_cases/t00065_class.svg
index d5a2175a..d49d88f9 100644
--- a/docs/test_cases/t00065_class.svg
+++ b/docs/test_cases/t00065_class.svg
@@ -1,256 +1,310 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="792px" preserveAspectRatio="none" style="width:746px;height:792px;" version="1.1" viewBox="0 0 746 792" width="746px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="837px" preserveAspectRatio="none" style="width:743px;height:837px;background:#FFFFFF;" version="1.1" viewBox="0 0 743 837" width="743px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1gqtadk17vvc7" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1gqtadk17vvc7)" points="22,157,96,157,103,179.2969,347,179.2969,347,464,22,464,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="103" y1="179.2969" y2="179.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="26" y="171.9951">module1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1gqtadk17vvc7)" points="201,341,313,341,320,363.2969,323,363.2969,323,440,201,440,201,341" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="201" x2="320" y1="363.2969" y2="363.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="106" x="205" y="355.9951">submodule1a</text>
-    <polygon fill="#FFFFFF" filter="url(#f1gqtadk17vvc7)" points="371,176,445,176,452,198.2969,724,198.2969,724,780,371,780,371,176" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="371" x2="452" y1="198.2969" y2="198.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="375" y="190.9951">module2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1gqtadk17vvc7)" points="476,513,555,513,562,535.2969,600,535.2969,600,656,476,656,476,513" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="476" x2="562" y1="535.2969" y2="535.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="73" x="480" y="527.9951">concepts</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="86.4141" id="C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="129" y="357"/>
-      <ellipse cx="144" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M148.1094,379 L140.3906,379 L140.3906,366.6094 L148.1094,366.6094 L148.1094,368.7656 L142.8438,368.7656 L142.8438,371.4375 L147.6094,371.4375 L147.6094,373.5938 L142.8438,373.5938 L142.8438,376.8438 L148.1094,376.8438 L148.1094,379 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="158" y="377.1543">ABC</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="130" x2="184" y1="389" y2="389"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="7" x="135" y="403.2104">a</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="7" x="135" y="416.0151">b</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="135" y="428.8198">c</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="130" x2="184" y1="435.4141" y2="435.4141"/>
+    <g id="cluster_C_0001412157780338101779">
+      <path d="M8.5,168.4 L68.5,168.4 A3.75,3.75 0 0 1 71,170.9 L78,191.1999 L357.5,191.1999 A2.5,2.5 0 0 1 360,193.6999 L360,490.7 A2.5,2.5 0 0 1 357.5,493.2 L8.5,493.2 A2.5,2.5 0 0 1 6,490.7 L6,170.9 A2.5,2.5 0 0 1 8.5,168.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="78" y1="191.1999" y2="191.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="59" x="10" y="183.4059">module1</text>
+    </g>
+    <g id="cluster_C_0001297703398614094707">
+      <path d="M196.5,369 L290.5,369 A3.75,3.75 0 0 1 293,371.5 L300,391.7999 L333.5,391.7999 A2.5,2.5 0 0 1 336,394.2999 L336,465.5 A2.5,2.5 0 0 1 333.5,468 L196.5,468 A2.5,2.5 0 0 1 194,465.5 L194,371.5 A2.5,2.5 0 0 1 196.5,369 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="194" x2="300" y1="391.7999" y2="391.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="93" x="198" y="384.0059">submodule1a</text>
+    </g>
+    <g id="cluster_C_0001820314545546323131">
+      <path d="M386.5,193.6 L446.5,193.6 A3.75,3.75 0 0 1 449,196.1 L456,216.3999 L733.5,216.3999 A2.5,2.5 0 0 1 736,218.8999 L736,827.9 A2.5,2.5 0 0 1 733.5,830.4 L386.5,830.4 A2.5,2.5 0 0 1 384,827.9 L384,196.1 A2.5,2.5 0 0 1 386.5,193.6 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="384" x2="456" y1="216.3999" y2="216.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="59" x="388" y="208.6059">module2</text>
+    </g>
+    <g id="cluster_C_0000611808069975917158">
+      <path d="M487.5,542.2 L552.5,542.2 A3.75,3.75 0 0 1 555,544.7 L562,564.9999 L616.5,564.9999 A2.5,2.5 0 0 1 619,567.4999 L619,700.1 A2.5,2.5 0 0 1 616.5,702.6 L487.5,702.6 A2.5,2.5 0 0 1 485,700.1 L485,544.7 A2.5,2.5 0 0 1 487.5,542.2 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="485" x2="562" y1="564.9999" y2="564.9999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="64" x="489" y="557.2059">concepts</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
+      <g id="elem_C_0002145362985538918973">
+        <rect codeLine="9" fill="#F1F1F1" height="98.3998" id="C_0002145362985538918973" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="60" x="115" y="378.8"/>
+        <ellipse cx="130" cy="394.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M128.8594,395.8625 L130.1719,395.8625 L130.1719,395.9094 C130.1719,396.3156 130.1875,396.4719 130.2969,396.6281 C130.4688,396.8781 130.7656,397.05 131.0781,397.05 C131.3594,397.05 131.6563,396.9094 131.8281,396.6906 C131.9531,396.5031 132,396.3625 132,395.9094 L132,394.0656 C132,393.7375 131.9844,393.6281 131.9219,393.4562 C131.8125,393.1594 131.4531,392.9094 131.0781,392.9094 C130.7813,392.9094 130.5156,393.05 130.3438,393.2687 C130.2031,393.4562 130.1719,393.6281 130.1719,394.0656 L130.1719,394.1281 L128.8594,394.1281 L128.8594,391.9562 L132.7031,391.9562 L132.7031,392.7062 C132.7031,393.0969 132.7344,393.2844 132.8438,393.4406 C133.0156,393.6906 133.3125,393.8625 133.625,393.8625 C133.9219,393.8625 134.1875,393.7375 134.375,393.5031 C134.5156,393.3156 134.5469,393.175 134.5469,392.7062 L134.5469,390.2062 L126.8438,390.2062 C126.3906,390.2062 126.2656,390.2219 126.0938,390.3312 C125.8281,390.5031 125.6563,390.7687 125.6563,391.0812 C125.6563,391.3625 125.7813,391.6281 126.0313,391.8 C126.2188,391.925 126.4063,391.9562 126.8438,391.9562 L127.0313,391.9562 L127.0313,398.05 L126.8438,398.05 C126.4219,398.05 126.2656,398.0812 126.0938,398.175 C125.8281,398.3312 125.6563,398.6125 125.6563,398.9094 C125.6563,399.4875 126.0625,399.8 126.8438,399.8 L134.9219,399.8 L134.9219,397.2687 C134.9219,396.8625 134.8906,396.6906 134.7813,396.5344 C134.6094,396.2687 134.3281,396.1125 134,396.1125 C133.7188,396.1125 133.4375,396.2531 133.25,396.4719 C133.1094,396.6594 133.0781,396.8156 133.0781,397.2687 L133.0781,398.05 L128.8594,398.05 L128.8594,395.8625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="144" y="399.406">ABC</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="116" x2="174" y1="410.8" y2="410.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="121" y="427.8059">a</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="121" y="444.6059">b</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="121" y="461.4058">c</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="116" x2="174" y1="469.1998" y2="469.1998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="86.4141" id="C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="38.5" y="357"/>
-      <ellipse cx="53.5" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M57.6094,379 L49.8906,379 L49.8906,366.6094 L57.6094,366.6094 L57.6094,368.7656 L52.3438,368.7656 L52.3438,371.4375 L57.1094,371.4375 L57.1094,373.5938 L52.3438,373.5938 L52.3438,376.8438 L57.6094,376.8438 L57.6094,379 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="67.5" y="377.1543">XYZ</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="92.5" y1="389" y2="389"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="44.5" y="403.2104">x</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="44.5" y="416.0151">y</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="5" x="44.5" y="428.8198">z</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="92.5" y1="435.4141" y2="435.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
+      <g id="elem_C_0001435940218810141944">
+        <rect codeLine="15" fill="#F1F1F1" height="98.3998" id="C_0001435940218810141944" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="21.5" y="378.8"/>
+        <ellipse cx="36.5" cy="394.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M35.3594,395.8625 L36.6719,395.8625 L36.6719,395.9094 C36.6719,396.3156 36.6875,396.4719 36.7969,396.6281 C36.9688,396.8781 37.2656,397.05 37.5781,397.05 C37.8594,397.05 38.1563,396.9094 38.3281,396.6906 C38.4531,396.5031 38.5,396.3625 38.5,395.9094 L38.5,394.0656 C38.5,393.7375 38.4844,393.6281 38.4219,393.4562 C38.3125,393.1594 37.9531,392.9094 37.5781,392.9094 C37.2813,392.9094 37.0156,393.05 36.8438,393.2687 C36.7031,393.4562 36.6719,393.6281 36.6719,394.0656 L36.6719,394.1281 L35.3594,394.1281 L35.3594,391.9562 L39.2031,391.9562 L39.2031,392.7062 C39.2031,393.0969 39.2344,393.2844 39.3438,393.4406 C39.5156,393.6906 39.8125,393.8625 40.125,393.8625 C40.4219,393.8625 40.6875,393.7375 40.875,393.5031 C41.0156,393.3156 41.0469,393.175 41.0469,392.7062 L41.0469,390.2062 L33.3438,390.2062 C32.8906,390.2062 32.7656,390.2219 32.5938,390.3312 C32.3281,390.5031 32.1563,390.7687 32.1563,391.0812 C32.1563,391.3625 32.2813,391.6281 32.5313,391.8 C32.7188,391.925 32.9063,391.9562 33.3438,391.9562 L33.5313,391.9562 L33.5313,398.05 L33.3438,398.05 C32.9219,398.05 32.7656,398.0812 32.5938,398.175 C32.3281,398.3312 32.1563,398.6125 32.1563,398.9094 C32.1563,399.4875 32.5625,399.8 33.3438,399.8 L41.4219,399.8 L41.4219,397.2687 C41.4219,396.8625 41.3906,396.6906 41.2813,396.5344 C41.1094,396.2687 40.8281,396.1125 40.5,396.1125 C40.2188,396.1125 39.9375,396.2531 39.75,396.4719 C39.6094,396.6594 39.5781,396.8156 39.5781,397.2687 L39.5781,398.05 L35.3594,398.05 L35.3594,395.8625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="50.5" y="399.406">XYZ</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="79.5" y1="410.8" y2="410.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="27.5" y="427.8059">x</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="27.5" y="444.6059">y</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="27.5" y="461.4058">z</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="79.5" y1="469.1998" y2="469.1998"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="86.4141" id="C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="130.5" y="192"/>
-      <ellipse cx="196.75" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M199.7188,213.6406 Q199.1406,213.9375 198.5,214.0781 Q197.8594,214.2344 197.1563,214.2344 Q194.6563,214.2344 193.3281,212.5938 Q192.0156,210.9375 192.0156,207.8125 Q192.0156,204.6875 193.3281,203.0313 Q194.6563,201.375 197.1563,201.375 Q197.8594,201.375 198.5,201.5313 Q199.1563,201.6875 199.7188,201.9844 L199.7188,204.7031 Q199.0938,204.125 198.5,203.8594 Q197.9063,203.5781 197.2813,203.5781 Q195.9375,203.5781 195.25,204.6563 Q194.5625,205.7188 194.5625,207.8125 Q194.5625,209.9063 195.25,210.9844 Q195.9375,212.0469 197.2813,212.0469 Q197.9063,212.0469 198.5,211.7813 Q199.0938,211.5 199.7188,210.9219 L199.7188,213.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="217.25" y="212.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="278.5" y1="224" y2="224"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="278.5" y1="232" y2="232"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001178194542408300737">
+        <rect codeLine="21" fill="#F1F1F1" height="98.3998" id="C_0001178194542408300737" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="159" x="124.5" y="203.4"/>
+        <ellipse cx="195.25" cy="219.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M190.25,220.5562 C190.25,223.0562 192.3906,224.8687 195.3125,224.8687 C196.5469,224.8687 197.7188,224.5719 198.4688,224.0562 C199.0781,223.6344 199.4063,223.2125 199.4063,222.8062 C199.4063,222.3375 198.9844,221.9312 198.4844,221.9312 C198.25,221.9312 198.0313,222.0094 197.8281,222.2125 C197.3906,222.65 197.3906,222.65 197.2188,222.7437 C196.7656,222.9781 196.125,223.1187 195.3594,223.1187 C193.3594,223.1187 192.0781,222.1031 192.0781,220.525 L192.0781,219.4781 C192.0781,217.775 193.2969,216.5719 195,216.5719 C195.5781,216.5719 196.1563,216.7125 196.625,216.9625 C197.0938,217.2281 197.2656,217.4156 197.3281,217.775 C197.4531,218.4469 197.7031,218.6969 198.2344,218.6969 C198.5156,218.6969 198.7969,218.5562 198.9844,218.3375 C199.1094,218.1656 199.1563,217.9937 199.1563,217.5562 L199.1563,216.1969 C199.1563,215.775 199.1406,215.6344 199.0156,215.4625 C198.8438,215.2125 198.5625,215.0562 198.2344,215.0562 C197.9219,215.0562 197.7188,215.1656 197.5,215.4312 C196.3281,214.9312 195.8906,214.8219 194.9375,214.8219 C192.2656,214.8219 190.25,216.8375 190.25,219.4625 L190.25,220.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="215.75" y="224.006">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="125.5" x2="282.5" y1="235.4" y2="235.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="125.5" x2="282.5" y1="243.4" y2="243.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="130.5" y="252.3"/>
+          <ellipse cx="135.5" cy="257.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="144.5" y="260.4059">abc : ABC</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="130.5" y="269.0999"/>
+          <ellipse cx="135.5" cy="274.0999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="144.5" y="277.2059">pimpl : detail::AImpl *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="130.5" y="285.8998"/>
+          <ellipse cx="135.5" cy="290.8998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="144.5" y="294.0058">xyz : XYZ</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="238"/>
-      <ellipse cx="141.5" cy="243" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
+      <g id="elem_C_0000674757414308736755">
+        <rect codeLine="4" fill="#F1F1F1" height="48" id="C_0000674757414308736755" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="210" y="404"/>
+        <ellipse cx="225" cy="420" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M220,421.1563 C220,423.6563 222.1406,425.4688 225.0625,425.4688 C226.2969,425.4688 227.4688,425.1719 228.2188,424.6563 C228.8281,424.2344 229.1563,423.8125 229.1563,423.4063 C229.1563,422.9375 228.7344,422.5313 228.2344,422.5313 C228,422.5313 227.7813,422.6094 227.5781,422.8125 C227.1406,423.25 227.1406,423.25 226.9688,423.3438 C226.5156,423.5781 225.875,423.7188 225.1094,423.7188 C223.1094,423.7188 221.8281,422.7031 221.8281,421.125 L221.8281,420.0781 C221.8281,418.375 223.0469,417.1719 224.75,417.1719 C225.3281,417.1719 225.9063,417.3125 226.375,417.5625 C226.8438,417.8281 227.0156,418.0156 227.0781,418.375 C227.2031,419.0469 227.4531,419.2969 227.9844,419.2969 C228.2656,419.2969 228.5469,419.1563 228.7344,418.9375 C228.8594,418.7656 228.9063,418.5938 228.9063,418.1563 L228.9063,416.7969 C228.9063,416.375 228.8906,416.2344 228.7656,416.0625 C228.5938,415.8125 228.3125,415.6563 227.9844,415.6563 C227.6719,415.6563 227.4688,415.7656 227.25,416.0313 C226.0781,415.5313 225.6406,415.4219 224.6875,415.4219 C222.0156,415.4219 220,417.4375 220,420.0625 L220,421.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="239" y="424.606">detail::AImpl</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="211" x2="319" y1="436" y2="436"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="211" x2="319" y1="444" y2="444"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="150.5" y="246.2104">abc : ABC</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001651810571114530033">
+        <rect codeLine="39" fill="#F1F1F1" height="89.5999" id="C_0001651810571114530033" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="142" x="437" y="383.2"/>
+        <ellipse cx="499.25" cy="399.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M494.25,400.3563 C494.25,402.8563 496.3906,404.6688 499.3125,404.6688 C500.5469,404.6688 501.7188,404.3719 502.4688,403.8563 C503.0781,403.4344 503.4063,403.0125 503.4063,402.6063 C503.4063,402.1375 502.9844,401.7313 502.4844,401.7313 C502.25,401.7313 502.0313,401.8094 501.8281,402.0125 C501.3906,402.45 501.3906,402.45 501.2188,402.5438 C500.7656,402.7781 500.125,402.9188 499.3594,402.9188 C497.3594,402.9188 496.0781,401.9031 496.0781,400.325 L496.0781,399.2781 C496.0781,397.575 497.2969,396.3719 499,396.3719 C499.5781,396.3719 500.1563,396.5125 500.625,396.7625 C501.0938,397.0281 501.2656,397.2156 501.3281,397.575 C501.4531,398.2469 501.7031,398.4969 502.2344,398.4969 C502.5156,398.4969 502.7969,398.3563 502.9844,398.1375 C503.1094,397.9656 503.1563,397.7938 503.1563,397.3563 L503.1563,395.9969 C503.1563,395.575 503.1406,395.4344 503.0156,395.2625 C502.8438,395.0125 502.5625,394.8563 502.2344,394.8563 C501.9219,394.8563 501.7188,394.9656 501.5,395.2313 C500.3281,394.7313 499.8906,394.6219 498.9375,394.6219 C496.2656,394.6219 494.25,396.6375 494.25,399.2625 L494.25,400.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="519.75" y="403.806">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="438" x2="578" y1="415.2" y2="415.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="443" y="424.1"/>
+          <ellipse cx="448" cy="429.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="457" y="432.2059">B() = default : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="438" x2="578" y1="439.9999" y2="439.9999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="443" y="448.8999"/>
+          <ellipse cx="448" cy="453.8999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="457" y="457.0059">b() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="438" x2="578" y1="464.7999" y2="464.7999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="250.8047"/>
-      <ellipse cx="141.5" cy="255.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001157378014768957235">
+        <rect codeLine="46" fill="#F1F1F1" height="64.7999" id="C_0001157378014768957235" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="60" x="518" y="749.6"/>
+        <ellipse cx="536.15" cy="765.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M531.15,766.7563 C531.15,769.2563 533.2906,771.0688 536.2125,771.0688 C537.4469,771.0688 538.6188,770.7719 539.3688,770.2563 C539.9781,769.8344 540.3063,769.4125 540.3063,769.0063 C540.3063,768.5375 539.8844,768.1313 539.3844,768.1313 C539.15,768.1313 538.9313,768.2094 538.7281,768.4125 C538.2906,768.85 538.2906,768.85 538.1188,768.9438 C537.6656,769.1781 537.025,769.3188 536.2594,769.3188 C534.2594,769.3188 532.9781,768.3031 532.9781,766.725 L532.9781,765.6781 C532.9781,763.975 534.1969,762.7719 535.9,762.7719 C536.4781,762.7719 537.0563,762.9125 537.525,763.1625 C537.9938,763.4281 538.1656,763.6156 538.2281,763.975 C538.3531,764.6469 538.6031,764.8969 539.1344,764.8969 C539.4156,764.8969 539.6969,764.7563 539.8844,764.5375 C540.0094,764.3656 540.0563,764.1938 540.0563,763.7563 L540.0563,762.3969 C540.0563,761.975 540.0406,761.8344 539.9156,761.6625 C539.7438,761.4125 539.4625,761.2563 539.1344,761.2563 C538.8219,761.2563 538.6188,761.3656 538.4,761.6313 C537.2281,761.1313 536.7906,761.0219 535.8375,761.0219 C533.1656,761.0219 531.15,763.0375 531.15,765.6625 L531.15,766.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="550.85" y="770.206">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="572" y="746.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="573" y="760.8001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="519" x2="577" y1="781.6" y2="781.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="519" x2="577" y1="789.6" y2="789.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="524" y="798.5"/>
+          <ellipse cx="529" cy="803.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="538" y="806.6059">t : T *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="150.5" y="259.0151">pimpl : detail::AImpl *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0000580575003920044707">
+        <rect codeLine="51" fill="#F1F1F1" height="48" id="C_0000580575003920044707" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="637.5" y="607.9"/>
+        <ellipse cx="652.5" cy="623.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M647.5,625.0563 C647.5,627.5563 649.6406,629.3688 652.5625,629.3688 C653.7969,629.3688 654.9688,629.0719 655.7188,628.5563 C656.3281,628.1344 656.6563,627.7125 656.6563,627.3063 C656.6563,626.8375 656.2344,626.4313 655.7344,626.4313 C655.5,626.4313 655.2813,626.5094 655.0781,626.7125 C654.6406,627.15 654.6406,627.15 654.4688,627.2438 C654.0156,627.4781 653.375,627.6188 652.6094,627.6188 C650.6094,627.6188 649.3281,626.6031 649.3281,625.025 L649.3281,623.9781 C649.3281,622.275 650.5469,621.0719 652.25,621.0719 C652.8281,621.0719 653.4063,621.2125 653.875,621.4625 C654.3438,621.7281 654.5156,621.9156 654.5781,622.275 C654.7031,622.9469 654.9531,623.1969 655.4844,623.1969 C655.7656,623.1969 656.0469,623.0563 656.2344,622.8375 C656.3594,622.6656 656.4063,622.4938 656.4063,622.0563 L656.4063,620.6969 C656.4063,620.275 656.3906,620.1344 656.2656,619.9625 C656.0938,619.7125 655.8125,619.5563 655.4844,619.5563 C655.1719,619.5563 654.9688,619.6656 654.75,619.9313 C653.5781,619.4313 653.1406,619.3219 652.1875,619.3219 C649.5156,619.3219 647.5,621.3375 647.5,623.9625 L647.5,625.0563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="666.5" y="628.506">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="684.5" y="604.9"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="685.5" y="619.1001">int</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="638.5" x2="695.5" y1="639.9" y2="639.9"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="638.5" x2="695.5" y1="647.9" y2="647.9"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="263.6094"/>
-      <ellipse cx="141.5" cy="268.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001719752929087851944">
+        <rect codeLine="55" fill="#F1F1F1" height="81.5999" id="C_0001719752929087851944" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="106" x="614" y="387.2"/>
+        <ellipse cx="629" cy="403.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M624,404.3563 C624,406.8563 626.1406,408.6688 629.0625,408.6688 C630.2969,408.6688 631.4688,408.3719 632.2188,407.8563 C632.8281,407.4344 633.1563,407.0125 633.1563,406.6063 C633.1563,406.1375 632.7344,405.7313 632.2344,405.7313 C632,405.7313 631.7813,405.8094 631.5781,406.0125 C631.1406,406.45 631.1406,406.45 630.9688,406.5438 C630.5156,406.7781 629.875,406.9188 629.1094,406.9188 C627.1094,406.9188 625.8281,405.9031 625.8281,404.325 L625.8281,403.2781 C625.8281,401.575 627.0469,400.3719 628.75,400.3719 C629.3281,400.3719 629.9063,400.5125 630.375,400.7625 C630.8438,401.0281 631.0156,401.2156 631.0781,401.575 C631.2031,402.2469 631.4531,402.4969 631.9844,402.4969 C632.2656,402.4969 632.5469,402.3563 632.7344,402.1375 C632.8594,401.9656 632.9063,401.7938 632.9063,401.3563 L632.9063,399.9969 C632.9063,399.575 632.8906,399.4344 632.7656,399.2625 C632.5938,399.0125 632.3125,398.8563 631.9844,398.8563 C631.6719,398.8563 631.4688,398.9656 631.25,399.2313 C630.0781,398.7313 629.6406,398.6219 628.6875,398.6219 C626.0156,398.6219 624,400.6375 624,403.2625 L624,404.3563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="643" y="407.806">D</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="62" x="661" y="384.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="60" x="662" y="398.4001">bconcept T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="719" y1="419.2" y2="419.2"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="719" y1="427.2" y2="427.2"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="620" y="436.1"/>
+          <ellipse cx="625" cy="441.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="634" y="444.2059">c : C&lt;int&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="620" y="452.8999"/>
+          <ellipse cx="625" cy="457.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="634" y="461.0059">t : T</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="150.5" y="271.8198">xyz : XYZ</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001373403346245688670">
+        <rect codeLine="61" fill="#F1F1F1" height="48" id="C_0001373403346245688670" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="400" y="228.6"/>
+        <ellipse cx="415" cy="244.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M410,245.7563 C410,248.2563 412.1406,250.0688 415.0625,250.0688 C416.2969,250.0688 417.4688,249.7719 418.2188,249.2563 C418.8281,248.8344 419.1563,248.4125 419.1563,248.0063 C419.1563,247.5375 418.7344,247.1313 418.2344,247.1313 C418,247.1313 417.7813,247.2094 417.5781,247.4125 C417.1406,247.85 417.1406,247.85 416.9688,247.9438 C416.5156,248.1781 415.875,248.3188 415.1094,248.3188 C413.1094,248.3188 411.8281,247.3031 411.8281,245.725 L411.8281,244.6781 C411.8281,242.975 413.0469,241.7719 414.75,241.7719 C415.3281,241.7719 415.9063,241.9125 416.375,242.1625 C416.8438,242.4281 417.0156,242.6156 417.0781,242.975 C417.2031,243.6469 417.4531,243.8969 417.9844,243.8969 C418.2656,243.8969 418.5469,243.7563 418.7344,243.5375 C418.8594,243.3656 418.9063,243.1938 418.9063,242.7563 L418.9063,241.3969 C418.9063,240.975 418.8906,240.8344 418.7656,240.6625 C418.5938,240.4125 418.3125,240.2563 417.9844,240.2563 C417.6719,240.2563 417.4688,240.3656 417.25,240.6313 C416.0781,240.1313 415.6406,240.0219 414.6875,240.0219 C412.0156,240.0219 410,242.0375 410,244.6625 L410,245.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="429" y="249.206">C</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="10" x="447" y="225.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="8" x="448" y="239.8001">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="401" x2="453" y1="260.6" y2="260.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="401" x2="453" y1="268.6" y2="268.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="48" id="C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="220.5" y="376"/>
-      <ellipse cx="235.5" cy="392" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M238.4688,397.6406 Q237.8906,397.9375 237.25,398.0781 Q236.6094,398.2344 235.9063,398.2344 Q233.4063,398.2344 232.0781,396.5938 Q230.7656,394.9375 230.7656,391.8125 Q230.7656,388.6875 232.0781,387.0313 Q233.4063,385.375 235.9063,385.375 Q236.6094,385.375 237.25,385.5313 Q237.9063,385.6875 238.4688,385.9844 L238.4688,388.7031 Q237.8438,388.125 237.25,387.8594 Q236.6563,387.5781 236.0313,387.5781 Q234.6875,387.5781 234,388.6563 Q233.3125,389.7188 233.3125,391.8125 Q233.3125,393.9063 234,394.9844 Q234.6875,396.0469 236.0313,396.0469 Q236.6563,396.0469 237.25,395.7813 Q237.8438,395.5 238.4688,394.9219 L238.4688,397.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="249.5" y="396.1543">AImpl</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="221.5" x2="284.5" y1="408" y2="408"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="221.5" x2="284.5" y1="416" y2="416"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0002024276012622729482">
+        <rect codeLine="65" fill="#F1F1F1" height="48" id="C_0002024276012622729482" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="489" y="228.6"/>
+        <ellipse cx="504" cy="244.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M499,245.7563 C499,248.2563 501.1406,250.0688 504.0625,250.0688 C505.2969,250.0688 506.4688,249.7719 507.2188,249.2563 C507.8281,248.8344 508.1563,248.4125 508.1563,248.0063 C508.1563,247.5375 507.7344,247.1313 507.2344,247.1313 C507,247.1313 506.7813,247.2094 506.5781,247.4125 C506.1406,247.85 506.1406,247.85 505.9688,247.9438 C505.5156,248.1781 504.875,248.3188 504.1094,248.3188 C502.1094,248.3188 500.8281,247.3031 500.8281,245.725 L500.8281,244.6781 C500.8281,242.975 502.0469,241.7719 503.75,241.7719 C504.3281,241.7719 504.9063,241.9125 505.375,242.1625 C505.8438,242.4281 506.0156,242.6156 506.0781,242.975 C506.2031,243.6469 506.4531,243.8969 506.9844,243.8969 C507.2656,243.8969 507.5469,243.7563 507.7344,243.5375 C507.8594,243.3656 507.9063,243.1938 507.9063,242.7563 L507.9063,241.3969 C507.9063,240.975 507.8906,240.8344 507.7656,240.6625 C507.5938,240.4125 507.3125,240.2563 506.9844,240.2563 C506.6719,240.2563 506.4688,240.3656 506.25,240.6313 C505.0781,240.1313 504.6406,240.0219 503.6875,240.0219 C501.0156,240.0219 499,242.0375 499,244.6625 L499,245.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="518" y="249.206">D</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="10" x="536" y="225.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="8" x="537" y="239.8001">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="490" x2="542" y1="260.6" y2="260.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="490" x2="542" y1="268.6" y2="268.6"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="81.6094" id="C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="424.5" y="359"/>
-      <ellipse cx="482.75" cy="375" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M485.7188,380.6406 Q485.1406,380.9375 484.5,381.0781 Q483.8594,381.2344 483.1563,381.2344 Q480.6563,381.2344 479.3281,379.5938 Q478.0156,377.9375 478.0156,374.8125 Q478.0156,371.6875 479.3281,370.0313 Q480.6563,368.375 483.1563,368.375 Q483.8594,368.375 484.5,368.5313 Q485.1563,368.6875 485.7188,368.9844 L485.7188,371.7031 Q485.0938,371.125 484.5,370.8594 Q483.9063,370.5781 483.2813,370.5781 Q481.9375,370.5781 481.25,371.6563 Q480.5625,372.7188 480.5625,374.8125 Q480.5625,376.9063 481.25,377.9844 Q481.9375,379.0469 483.2813,379.0469 Q483.9063,379.0469 484.5,378.7813 Q485.0938,378.5 485.7188,377.9219 L485.7188,380.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="503.25" y="379.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="425.5" x2="556.5" y1="391" y2="391"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
+      <g id="elem_C_0001325475407133721370">
+        <rect codeLine="31" fill="#F1F1F1" height="109.3998" id="C_0001325475407133721370" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="501.5" y="577.2"/>
+        <ellipse cx="516.5" cy="598.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M511.5,599.8563 C511.5,602.3563 513.6406,604.1688 516.5625,604.1688 C517.7969,604.1688 518.9688,603.8719 519.7188,603.3563 C520.3281,602.9344 520.6563,602.5125 520.6563,602.1063 C520.6563,601.6375 520.2344,601.2313 519.7344,601.2313 C519.5,601.2313 519.2813,601.3094 519.0781,601.5125 C518.6406,601.95 518.6406,601.95 518.4688,602.0438 C518.0156,602.2781 517.375,602.4188 516.6094,602.4188 C514.6094,602.4188 513.3281,601.4031 513.3281,599.825 L513.3281,598.7781 C513.3281,597.075 514.5469,595.8719 516.25,595.8719 C516.8281,595.8719 517.4063,596.0125 517.875,596.2625 C518.3438,596.5281 518.5156,596.7156 518.5781,597.075 C518.7031,597.7469 518.9531,597.9969 519.4844,597.9969 C519.7656,597.9969 520.0469,597.8563 520.2344,597.6375 C520.3594,597.4656 520.4063,597.2938 520.4063,596.8563 L520.4063,595.4969 C520.4063,595.075 520.3906,594.9344 520.2656,594.7625 C520.0938,594.5125 519.8125,594.3563 519.4844,594.3563 C519.1719,594.3563 518.9688,594.4656 518.75,594.7313 C517.5781,594.2313 517.1406,594.1219 516.1875,594.1219 C513.5156,594.1219 511.5,596.1375 511.5,598.7625 L511.5,599.8563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="531" y="595.4001">«concept»</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="530.5" y="611.4061">bconcept</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="596.5" y="574.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="597.5" y="588.4001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="502.5" x2="601.5" y1="620.2" y2="620.2"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="507.5" y="637.206">(T t)</text>
+        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="502.5" x2="601.5" y1="645" y2="645"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="507.5" y="662.0059">T{}</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="26" x="507.5" y="678.8058">t.b()</text>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="430.5" y="397"/>
-      <ellipse cx="435.5" cy="402" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001082111961413727438">
+        <rect codeLine="70" fill="#F1F1F1" height="98.3998" id="C_0001082111961413727438" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="386.5" y="7"/>
+        <ellipse cx="419.05" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M414.05,24.1563 C414.05,26.6563 416.1906,28.4688 419.1125,28.4688 C420.3469,28.4688 421.5188,28.1719 422.2688,27.6563 C422.8781,27.2344 423.2063,26.8125 423.2063,26.4063 C423.2063,25.9375 422.7844,25.5313 422.2844,25.5313 C422.05,25.5313 421.8313,25.6094 421.6281,25.8125 C421.1906,26.25 421.1906,26.25 421.0188,26.3438 C420.5656,26.5781 419.925,26.7188 419.1594,26.7188 C417.1594,26.7188 415.8781,25.7031 415.8781,24.125 L415.8781,23.0781 C415.8781,21.375 417.0969,20.1719 418.8,20.1719 C419.3781,20.1719 419.9563,20.3125 420.425,20.5625 C420.8938,20.8281 421.0656,21.0156 421.1281,21.375 C421.2531,22.0469 421.5031,22.2969 422.0344,22.2969 C422.3156,22.2969 422.5969,22.1563 422.7844,21.9375 C422.9094,21.7656 422.9563,21.5938 422.9563,21.1563 L422.9563,19.7969 C422.9563,19.375 422.9406,19.2344 422.8156,19.0625 C422.6438,18.8125 422.3625,18.6563 422.0344,18.6563 C421.7219,18.6563 421.5188,18.7656 421.3,19.0313 C420.1281,18.5313 419.6906,18.4219 418.7375,18.4219 C416.0656,18.4219 414.05,20.4375 414.05,23.0625 L414.05,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="436.95" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="387.5" x2="466.5" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="387.5" x2="466.5" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="392.5" y="55.9"/>
+          <ellipse cx="397.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="406.5" y="64.0059">a : A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="392.5" y="72.6999"/>
+          <ellipse cx="397.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="406.5" y="80.8059">c : C&lt;B&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="392.5" y="89.4998"/>
+          <ellipse cx="397.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="406.5" y="97.6058">d : D&lt;B&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="444.5" y="405.2104">B() = default : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="425.5" x2="556.5" y1="411.8047" y2="411.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="430.5" y="417.8047"/>
-      <ellipse cx="435.5" cy="422.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="444.5" y="426.0151">b() : void</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="425.5" x2="556.5" y1="432.6094" y2="432.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="60.8047" id="C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="503.5" y="703"/>
-      <ellipse cx="522.1" cy="719" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M525.0688,724.6406 Q524.4906,724.9375 523.85,725.0781 Q523.2094,725.2344 522.5063,725.2344 Q520.0063,725.2344 518.6781,723.5938 Q517.3656,721.9375 517.3656,718.8125 Q517.3656,715.6875 518.6781,714.0313 Q520.0063,712.375 522.5063,712.375 Q523.2094,712.375 523.85,712.5313 Q524.5063,712.6875 525.0688,712.9844 L525.0688,715.7031 Q524.4438,715.125 523.85,714.8594 Q523.2563,714.5781 522.6313,714.5781 Q521.2875,714.5781 520.6,715.6563 Q519.9125,716.7188 519.9125,718.8125 Q519.9125,720.9063 520.6,721.9844 Q521.2875,723.0469 522.6313,723.0469 Q523.2563,723.0469 523.85,722.7813 Q524.4438,722.5 525.0688,721.9219 L525.0688,724.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="536.9" y="723.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="556.5" y="700"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="557.5" y="712.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="504.5" x2="561.5" y1="735" y2="735"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="504.5" x2="561.5" y1="743" y2="743"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="509.5" y="749"/>
-      <ellipse cx="514.5" cy="754" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="523.5" y="757.2104">t : T *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="48" id="C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="620" y="570"/>
-      <ellipse cx="635" cy="586" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M637.9688,591.6406 Q637.3906,591.9375 636.75,592.0781 Q636.1094,592.2344 635.4063,592.2344 Q632.9063,592.2344 631.5781,590.5938 Q630.2656,588.9375 630.2656,585.8125 Q630.2656,582.6875 631.5781,581.0313 Q632.9063,579.375 635.4063,579.375 Q636.1094,579.375 636.75,579.5313 Q637.4063,579.6875 637.9688,579.9844 L637.9688,582.7031 Q637.3438,582.125 636.75,581.8594 Q636.1563,581.5781 635.5313,581.5781 Q634.1875,581.5781 633.5,582.6563 Q632.8125,583.7188 632.8125,585.8125 Q632.8125,587.9063 633.5,588.9844 Q634.1875,590.0469 635.5313,590.0469 Q636.1563,590.0469 636.75,589.7813 Q637.3438,589.5 637.9688,588.9219 L637.9688,591.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="649" y="590.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="665" y="567"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="666" y="579.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="621" x2="679" y1="602" y2="602"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="621" x2="679" y1="610" y2="610"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="73.6094" id="C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="592.5" y="363"/>
-      <ellipse cx="607.5" cy="379" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M610.4688,384.6406 Q609.8906,384.9375 609.25,385.0781 Q608.6094,385.2344 607.9063,385.2344 Q605.4063,385.2344 604.0781,383.5938 Q602.7656,381.9375 602.7656,378.8125 Q602.7656,375.6875 604.0781,374.0313 Q605.4063,372.375 607.9063,372.375 Q608.6094,372.375 609.25,372.5313 Q609.9063,372.6875 610.4688,372.9844 L610.4688,375.7031 Q609.8438,375.125 609.25,374.8594 Q608.6563,374.5781 608.0313,374.5781 Q606.6875,374.5781 606,375.6563 Q605.3125,376.7188 605.3125,378.8125 Q605.3125,380.9063 606,381.9844 Q606.6875,383.0469 608.0313,383.0469 Q608.6563,383.0469 609.25,382.7813 Q609.8438,382.5 610.4688,381.9219 L610.4688,384.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="621.5" y="383.1543">D</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="72" x="638.5" y="360"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="70" x="639.5" y="372.1387">bconcept T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="593.5" x2="706.5" y1="395" y2="395"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="593.5" x2="706.5" y1="403" y2="403"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598.5" y="409"/>
-      <ellipse cx="603.5" cy="414" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="612.5" y="417.2104">c : C&lt;int&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598.5" y="421.8047"/>
-      <ellipse cx="603.5" cy="426.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="612.5" y="430.0151">t : T</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="48" id="C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="387" y="211"/>
-      <ellipse cx="402" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M404.9688,232.6406 Q404.3906,232.9375 403.75,233.0781 Q403.1094,233.2344 402.4063,233.2344 Q399.9063,233.2344 398.5781,231.5938 Q397.2656,229.9375 397.2656,226.8125 Q397.2656,223.6875 398.5781,222.0313 Q399.9063,220.375 402.4063,220.375 Q403.1094,220.375 403.75,220.5313 Q404.4063,220.6875 404.9688,220.9844 L404.9688,223.7031 Q404.3438,223.125 403.75,222.8594 Q403.1563,222.5781 402.5313,222.5781 Q401.1875,222.5781 400.5,223.6563 Q399.8125,224.7188 399.8125,226.8125 Q399.8125,228.9063 400.5,229.9844 Q401.1875,231.0469 402.5313,231.0469 Q403.1563,231.0469 403.75,230.7813 Q404.3438,230.5 404.9688,229.9219 L404.9688,232.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="416" y="231.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="432" y="208"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="433" y="220.1387">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="388" x2="438" y1="243" y2="243"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="388" x2="438" y1="251" y2="251"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="48" id="C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="474.5" y="211"/>
-      <ellipse cx="489.5" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M492.4688,232.6406 Q491.8906,232.9375 491.25,233.0781 Q490.6094,233.2344 489.9063,233.2344 Q487.4063,233.2344 486.0781,231.5938 Q484.7656,229.9375 484.7656,226.8125 Q484.7656,223.6875 486.0781,222.0313 Q487.4063,220.375 489.9063,220.375 Q490.6094,220.375 491.25,220.5313 Q491.9063,220.6875 492.4688,220.9844 L492.4688,223.7031 Q491.8438,223.125 491.25,222.8594 Q490.6563,222.5781 490.0313,222.5781 Q488.6875,222.5781 488,223.6563 Q487.3125,224.7188 487.3125,226.8125 Q487.3125,228.9063 488,229.9844 Q488.6875,231.0469 490.0313,231.0469 Q490.6563,231.0469 491.25,230.7813 Q491.8438,230.5 492.4688,229.9219 L492.4688,232.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="503.5" y="231.1543">D</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="520.5" y="208"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="521.5" y="220.1387">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="475.5" x2="526.5" y1="243" y2="243"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="475.5" x2="526.5" y1="251" y2="251"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="92.3516" id="C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="491.5" y="548"/>
-      <ellipse cx="506.5" cy="566.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M509.4688,572.6094 Q508.8906,572.9063 508.25,573.0469 Q507.6094,573.2031 506.9063,573.2031 Q504.4063,573.2031 503.0781,571.5625 Q501.7656,569.9063 501.7656,566.7813 Q501.7656,563.6563 503.0781,562 Q504.4063,560.3438 506.9063,560.3438 Q507.6094,560.3438 508.25,560.5 Q508.9063,560.6563 509.4688,560.9531 L509.4688,563.6719 Q508.8438,563.0938 508.25,562.8281 Q507.6563,562.5469 507.0313,562.5469 Q505.6875,562.5469 505,563.625 Q504.3125,564.6875 504.3125,566.7813 Q504.3125,568.875 505,569.9531 Q505.6875,571.0156 507.0313,571.0156 Q507.6563,571.0156 508.25,570.75 Q508.8438,570.4688 509.4688,569.8906 L509.4688,572.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="518.5" y="564.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="521.5" y="578.1074">bconcept</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="583.5" y1="585.9375" y2="585.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="497.5" y="600.1479">(T t)</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="492.5" x2="583.5" y1="606.7422" y2="606.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="497.5" y="620.9526">T{}</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="497.5" y="633.7573">t.b()</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gqtadk17vvc7)" height="86.4141" id="C_0001082111961413727438" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="373.5" y="8"/>
-      <ellipse cx="406.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M409.0188,29.6406 Q408.4406,29.9375 407.8,30.0781 Q407.1594,30.2344 406.4563,30.2344 Q403.9563,30.2344 402.6281,28.5938 Q401.3156,26.9375 401.3156,23.8125 Q401.3156,20.6875 402.6281,19.0313 Q403.9563,17.375 406.4563,17.375 Q407.1594,17.375 407.8,17.5313 Q408.4563,17.6875 409.0188,17.9844 L409.0188,20.7031 Q408.3938,20.125 407.8,19.8594 Q407.2063,19.5781 406.5813,19.5781 Q405.2375,19.5781 404.55,20.6563 Q403.8625,21.7188 403.8625,23.8125 Q403.8625,25.9063 404.55,26.9844 Q405.2375,28.0469 406.5813,28.0469 Q407.2063,28.0469 407.8,27.7813 Q408.3938,27.5 409.0188,26.9219 L409.0188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="423.95" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="451.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="451.5" y1="48" y2="48"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="54"/>
-      <ellipse cx="384.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="393.5" y="62.2104">a : A *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="66.8047"/>
-      <ellipse cx="384.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="393.5" y="75.0151">c : C&lt;B&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="79.6094"/>
-      <ellipse cx="384.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="393.5" y="87.8198">d : D&lt;B&gt;</text>
-    </a>
-    <path d="M174.62,290.21 C172.09,296.1 169.81,302.1 168,308 C163.24,323.52 160.53,341.12 158.99,356.68 " fill="none" id="C_0001178194542408300737&lt;-C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="180.11,278.35,173.9609,282.1168,175.0729,289.2417,181.222,285.4748,180.11,278.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="174" cy="317.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="181" y="321.0669">abc</text>
-    <path d="M140.91,287.09 C133.86,293.8 127.06,300.85 121,308 C108.47,322.79 96.97,340.75 87.75,356.8 " fill="none" id="C_0001178194542408300737&lt;-C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="150.61,278.16,143.4867,279.2821,141.7828,286.289,148.906,285.1669,150.61,278.16" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="127" cy="317.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="134" y="321.0669">xyz</text>
-    <path d="M217.49,278.4 C226.08,307.58 237.25,345.53 244.75,371 " fill="none" id="C_0001178194542408300737-&gt;C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="246.2,375.92,247.4932,366.1564,244.7869,371.1239,239.8194,368.4175,246.2,375.92" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="237" cy="317.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="35" x="244" y="321.0669">pimpl</text>
-    <path d="M634.6,618.01 C625.1,631.74 612.4,649.3 600,664 C592.76,672.58 584.68,681.4 576.71,689.74 " fill="none" id="C_0000580575003920044707-&gt;C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="581.67,694.67,562.67,704.06,571.67,684.87,581.67,694.67" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M628.78,437.07 C617.03,457.07 602.18,482.4 589,505 C581.79,517.36 574.04,530.72 566.8,543.2 " fill="none" id="C_0001719752929087851944-&gt;C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="564.16,547.75,572.1333,541.9684,566.6669,543.4238,565.2115,537.9574,564.16,547.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="603" y="493.0669">T</text>
-    <path d="M650,450.34 C650,488.73 650,540.27 650,569.73 " fill="none" id="C_0001719752929087851944&lt;-C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="650,437.11,646,443.11,650,449.11,654,443.11,650,437.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="651" y="493.0669">+c</text>
-    <path d="M424.01,259.01 C435.77,283.58 454.7,323.15 469.45,353.96 " fill="none" id="C_0001373403346245688670-&gt;C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="471.78,358.83,471.5087,348.9849,469.6242,354.3186,464.2905,352.4341,471.78,358.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M409.44,259 C403.52,301.47 393.56,394.88 407,472 C422.56,561.33 430.98,585.29 476,664 C480.53,671.92 486,679.83 491.73,687.3 " fill="none" id="C_0001373403346245688670-&gt;C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="497.19,682.92,504.44,702.83,486.35,691.79,497.19,682.92" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M499.59,259.01 C498.09,283.48 495.67,322.82 493.79,353.58 " fill="none" id="C_0002024276012622729482-&gt;C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="493.46,358.83,497.9918,350.0857,493.7595,353.839,490.0062,349.6066,493.46,358.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M522.03,259.01 C543.07,282.02 576.14,318.2 603.39,348.01 " fill="none" id="C_0002024276012622729482-&gt;C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="608.68,343.43,617.01,362.91,598.35,352.87,608.68,343.43" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M373.39,86.66 C340.41,115.52 293.18,156.84 257.13,188.38 " fill="none" id="C_0001082111961413727438-&gt;C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="253.24,191.79,262.6417,188.8561,256.9967,188.4904,257.3624,182.8454,253.24,191.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="328" y="137.0669">+a</text>
-    <path d="M413,107.53 C413,142.21 413,185.04 413,210.9 " fill="none" id="C_0001082111961413727438&lt;-C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="413,94.21,409,100.21,413,106.21,417,100.21,413,94.21" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="414" y="137.0669">+c</text>
-    <path d="M439.19,106.16 C456.07,141.07 477.16,184.7 489.83,210.9 " fill="none" id="C_0001082111961413727438&lt;-C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="433.41,94.21,432.4243,101.3534,438.6391,105.0107,439.6248,97.8673,433.41,94.21" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="455" y="137.0669">+d</text>
+    <g id="link_C_0001178194542408300737_C_0002145362985538918973">
+      <path codeLine="76" d="M181.3839,313.5346 C177.8039,323.2846 178.29,322.21 175,331.8 C169.83,346.88 164.5,363.42 159.8,378.42 " fill="none" id="C_0001178194542408300737-backto-C_0002145362985538918973" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="185.52,302.27,179.697,306.5236,181.3839,313.5346,187.2068,309.281,185.52,302.27" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="181" cy="341.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="188" y="344.877">abc</text>
+    </g>
+    <g id="link_C_0001178194542408300737_C_0001435940218810141944">
+      <path codeLine="77" d="M144.1558,310.7663 C126.2058,328.6363 114.85,340.94 98,361 C92.21,367.89 86.38,375.46 80.88,382.94 " fill="none" id="C_0001178194542408300737-backto-C_0001435940218810141944" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="152.66,302.3,145.5858,303.6984,144.1558,310.7663,151.23,309.3679,152.66,302.3" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="129" cy="341.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="136" y="344.877">xyz</text>
+    </g>
+    <g id="link_C_0001178194542408300737_C_0000674757414308736755">
+      <path codeLine="78" d="M220.99,301.9 C232.7,335.17 245.7386,372.2401 254.8586,398.1601 " fill="none" id="C_0001178194542408300737-to-C_0000674757414308736755" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="256.85,403.82,257.6361,394.0026,255.1905,399.1034,250.0896,396.6578,256.85,403.82" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="242" cy="341.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="249" y="344.877">pimpl</text>
+    </g>
+    <g id="link_C_0000580575003920044707_C_0001157378014768957235">
+      <path codeLine="79" d="M654.48,656.29 C645.5,672.23 632.61,693.47 619,710.6 C606.8,725.96 604.5938,729.087 591.3538,741.637 " fill="none" id="C_0000580575003920044707-to-C_0001157378014768957235" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="578.29,754.02,595.4814,745.9916,587.2261,737.2824,578.29,754.02" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001719752929087851944_C_0001325475407133721370">
+      <path codeLine="80" d="M644.05,469.21 C632.87,488.81 619.23,512.73 607,534.2 C599.11,548.05 593.5671,557.795 585.6471,571.715 " fill="none" id="C_0001719752929087851944-to-C_0001325475407133721370" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="582.68,576.93,590.6074,571.0856,585.1526,572.5842,583.6541,567.1294,582.68,576.93" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="621" y="522.277">T</text>
+    </g>
+    <g id="link_C_0001719752929087851944_C_0000580575003920044707">
+      <path codeLine="81" d="M667,480.89 C667,522.26 667,573.55 667,607.48 " fill="none" id="C_0001719752929087851944-backto-C_0000580575003920044707" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="667,468.89,663,474.89,667,480.89,671,474.89,667,468.89" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="668" y="522.277">+c</text>
+    </g>
+    <g id="link_C_0001373403346245688670_C_0001651810571114530033">
+      <path codeLine="82" d="M437.92,276.99 C450.58,304.07 469.1615,343.8435 484.9115,377.5735 " fill="none" id="C_0001373403346245688670-to-C_0001651810571114530033" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="487.45,383.01,487.2665,373.1629,485.3345,378.4796,480.0178,376.5476,487.45,383.01" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001373403346245688670_C_0001157378014768957235">
+      <path codeLine="83" d="M423.59,276.98 C417.75,321.11 407.62,419.57 420,501.2 C434.61,597.55 436.96,625.82 485,710.6 C493.65,725.87 493.6412,727.6594 505.1712,739.7194 " fill="none" id="C_0001373403346245688670-to-C_0001157378014768957235" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="517.61,752.73,509.508,735.5731,500.8343,743.8657,517.61,752.73" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002024276012622729482_C_0001651810571114530033">
+      <path codeLine="84" d="M514.92,276.99 C513.67,304.07 511.8672,343.2864 510.3072,377.0164 " fill="none" id="C_0002024276012622729482-to-C_0001651810571114530033" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="510.03,383.01,514.4415,374.2044,510.261,378.0153,506.4501,373.8348,510.03,383.01" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002024276012622729482_C_0001719752929087851944">
+      <path codeLine="85" d="M536.36,276.99 C560.84,305.09 590.4794,339.1353 620.1294,373.1853 " fill="none" id="C_0002024276012622729482-to-C_0001719752929087851944" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="631.95,386.76,624.6543,369.2451,615.6045,377.1255,631.95,386.76" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001082111961413727438_C_0001178194542408300737">
+      <path codeLine="86" d="M386.1,92.86 C350.64,123.77 303.5226,164.8371 264.2826,199.0471 " fill="none" id="C_0001082111961413727438-to-C_0001178194542408300737" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="259.76,202.99,269.1725,200.0908,263.5288,199.7043,263.9153,194.0606,259.76,202.99" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="336" y="148.477">+a</text>
+    </g>
+    <g id="link_C_0001082111961413727438_C_0001373403346245688670">
+      <path codeLine="87" d="M427,117.75 C427,156.89 427,198.2 427,228.34 " fill="none" id="C_0001082111961413727438-backto-C_0001373403346245688670" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="427,105.75,423,111.75,427,117.75,431,111.75,427,105.75" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="428" y="148.477">+c</text>
+    </g>
+    <g id="link_C_0001082111961413727438_C_0002024276012622729482">
+      <path codeLine="88" d="M454.2254,116.6608 C472.1454,155.8008 491.55,198.2 505.35,228.34 " fill="none" id="C_0001082111961413727438-backto-C_0002024276012622729482" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="449.23,105.75,448.0908,112.8705,454.2254,116.6608,455.3647,109.5403,449.23,105.75" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="469" y="148.477">+d</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00065_class_mermaid.svg b/docs/test_cases/t00065_class_mermaid.svg
index 620f8af3..98fe284a 100644
--- a/docs/test_cases/t00065_class_mermaid.svg
+++ b/docs/test_cases/t00065_class_mermaid.svg
@@ -1,68 +1,73 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 974.5 885" style="max-width: 974.5px; background-color: white;" width="974.5" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 983.390625 885" style="max-width: 983.391px; background-color: white;" width="983.390625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M158.6484375,306.0823098617176L143.68619791666666,314.40192488476464C128.72395833333334,322.72153990781175,98.79947916666667,339.36076995390584,83.83723958333333,353.3470516436196C68.875,367.3333333333333,68.875,378.6666666666667,68.875,384.3333333333333L68.875,390"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M240.625,322L240.625,327.6666666666667C240.625,333.3333333333333,240.625,344.6666666666667,240.625,356C240.625,367.3333333333333,240.625,378.6666666666667,240.625,384.3333333333333L240.625,390"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M322.6015625,307.42930735728L336.7421875,315.5244227977333C350.8828125,323.61953823818664,379.1640625,339.80976911909335,393.3046875,360.90488455954664C407.4453125,382,407.4453125,408,407.4453125,421L407.4453125,434"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M934.1015625,704L934.1015625,715.5C934.1015625,727,934.1015625,750,918.6881510416666,769.7855177914511C903.2747395833334,789.571035582902,872.4479166666666,806.1420711658039,857.0345052083334,814.427588957255L841.62109375,822.713106748706"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M831.1394146126761,513L825.0185225938967,522.3333333333334C818.8976305751174,531.6666666666666,806.6558465375587,550.3333333333334,800.5349545187793,565.3333333333334C794.4140625,580.3333333333334,794.4140625,591.6666666666666,794.4140625,597.3333333333334L794.4140625,603"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M897.3762103873239,513L903.4971024061033,522.3333333333334C909.6179944248826,531.6666666666666,921.8597784624413,550.3333333333334,927.9806704812207,572.6666666666666C934.1015625,595,934.1015625,621,934.1015625,634L934.1015625,647"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M626.7976112565445,289L620.3743114637872,300.1666666666667C613.9510116710297,311.3333333333333,601.1044120855148,333.6666666666667,594.6811122927575,354.1666666666667C588.2578125,374.6666666666667,588.2578125,393.3333333333333,588.2578125,402.6666666666667L588.2578125,412"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M659.5852012434555,289L666.0085010362128,300.1666666666667C672.4318008289703,311.3333333333333,685.2784004144851,333.6666666666667,691.7017002072425,362.5833333333333C698.125,391.5,698.125,427,698.125,462.5C698.125,498,698.125,533.5,698.125,569C698.125,604.5,698.125,640,698.125,674C698.125,708,698.125,740.5,712.8717447916666,764.9505270602499C727.6184895833334,789.4010541204998,757.1119791666666,805.8021082409996,771.8587239583334,814.0026353012495L786.60546875,822.2031623614994"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M825.859375,286.0882136144179L812.927734375,297.7401780120149C799.99609375,309.39214240961195,774.1328125,332.69607120480595,747.0104166666666,353.79306526331646C719.8880208333334,374.89005932182704,691.5065104166666,393.7801186436541,677.3157552083334,403.22514830456754L663.125,412.67017796548106"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M857.2421056937172,289L858.411390161431,300.1666666666667C859.5806746291449,311.3333333333333,861.9192435645724,333.6666666666667,863.0885280322863,354.1666666666667C864.2578125,374.6666666666667,864.2578125,393.3333333333333,864.2578125,402.6666666666667L864.2578125,412"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M599.44140625,79.87872245456398L539.638671875,94.06560204546999C479.8359375,108.25248163637599,360.23046875,136.626240818188,300.427734375,156.47978707576067C240.625,176.33333333333334,240.625,187.66666666666666,240.625,193.33333333333334L240.625,199"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M643.19140625,131L643.19140625,136.66666666666666C643.19140625,142.33333333333334,643.19140625,153.66666666666666,643.19140625,170.5C643.19140625,187.33333333333334,643.19140625,209.66666666666666,643.19140625,220.83333333333334L643.19140625,232"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M686.94140625,89.29531027335148L714.8274739583334,101.91275856112622C742.7135416666666,114.53020684890099,798.4856770833334,139.76510342445047,826.3717447916666,163.5492183788919C854.2578125,187.33333333333334,854.2578125,209.66666666666666,854.2578125,220.83333333333334L854.2578125,232"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M142.91684803056788,314.82971477776283L130.57654002547324,321.691428981469C118.23623202037858,328.5531431851752,93.55561601018928,342.2765715925876,81.21530800509464,354.8049524629605C68.875,367.3333333333333,68.875,378.6666666666667,68.875,384.3333333333333L68.875,390"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M240.625,340L240.625,342.6666666666667C240.625,345.3333333333333,240.625,350.6666666666667,240.625,359C240.625,367.3333333333333,240.625,378.6666666666667,240.625,384.3333333333333L240.625,390"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M322.6015625,307.42930735728L336.7421875,315.5244227977333C350.8828125,323.61953823818664,379.1640625,339.80976911909335,393.3046875,359.90488455954664C407.4453125,380,407.4453125,404,407.4453125,416L407.4453125,428"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M942.9921875,704L942.9921875,715.5C942.9921875,727,942.9921875,750,930.2211913837477,768.3650808305355C917.4501952674954,786.7301616610708,891.9082030349906,800.4603233221419,879.1372069187383,807.3254041526774L866.3662108024861,814.1904849832129"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M840.0300396126761,513L833.9091475938967,522.3333333333334C827.7882555751174,531.6666666666666,815.5464715375587,550.3333333333334,809.4255795187793,564.3333333333334C803.3046875,578.3333333333334,803.3046875,587.6666666666666,803.3046875,592.3333333333334L803.3046875,597"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M916.1380201804043,528.0519005703884L920.6137147336702,534.876583808657C925.0894092869362,541.7012670469256,934.040798393468,555.3506335234628,938.516492946734,575.1753167617313C942.9921875,595,942.9921875,621,942.9921875,634L942.9921875,647"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M632.8022742146596,289L626.119082678883,300.1666666666667C619.4358911431065,311.3333333333333,606.0695080715532,333.6666666666667,599.3863165357766,353.1666666666667C592.703125,372.6666666666667,592.703125,389.3333333333333,592.703125,397.6666666666667L592.703125,406"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M666.9164757853404,289L673.599667321117,300.1666666666667C680.2828588568935,311.3333333333333,693.6492419284468,333.6666666666667,700.3324334642234,362.5833333333333C707.015625,391.5,707.015625,427,707.015625,462.5C707.015625,498,707.015625,533.5,707.015625,569C707.015625,604.5,707.015625,640,707.015625,674C707.015625,708,707.015625,740.5,719.1404937873211,763.4925262996749C731.2653625746424,786.4850525993497,755.5151001492846,799.9701051986996,767.6399689366058,806.7126314983744L779.7648377239269,813.4551577980494"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M834.75,286.0882136144179L821.818359375,297.7401780120149C808.88671875,309.39214240961195,783.0234375,332.69607120480595,756.5186555377473,353.1378060453582C730.0138735754946,373.5795408859104,702.8675909009893,391.1590817718208,689.2944495637366,399.948852214776L675.7213082264839,408.73862265773124"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M866.1327306937172,289L867.302015161431,300.1666666666667C868.4712996291449,311.3333333333333,870.8098685645724,333.6666666666667,871.9791530322863,351.1666666666667C873.1484375,368.6666666666667,873.1484375,381.3333333333333,873.1484375,387.6666666666667L873.1484375,394"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M606.109375,79.7096139895384L545.1953125,93.92467832461534C484.28125,108.13974265969227,362.453125,136.56987132984614,301.5390625,155.45160233158973C240.625,174.33333333333334,240.625,183.66666666666666,240.625,188.33333333333334L240.625,193"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M649.859375,149L649.859375,151.66666666666666C649.859375,154.33333333333334,649.859375,159.66666666666666,649.859375,173.5C649.859375,187.33333333333334,649.859375,209.66666666666666,649.859375,220.83333333333334L649.859375,232"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M710.0377710537011,96.44482668621818L735.5562154614177,107.87068890518181C761.074659869134,119.29655112414544,812.1115486845671,142.1482755620727,837.6299930922836,164.74080444770303C863.1484375,187.33333333333334,863.1484375,209.66666666666666,863.1484375,220.83333333333334L863.1484375,232"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(68.875, 356)" class="edgeLabel">
@@ -109,7 +114,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(794.4140625, 569)" class="edgeLabel">
+        <g transform="translate(803.3046875, 569)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -120,7 +125,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(934.1015625, 569)" class="edgeLabel">
+        <g transform="translate(942.9921875, 569)" class="edgeLabel">
           <g transform="translate(-8.671875, -9)" class="label">
             <foreignObject height="18" width="17.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -186,7 +191,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(643.19140625, 165)" class="edgeLabel">
+        <g transform="translate(649.859375, 165)" class="edgeLabel">
           <g transform="translate(-8.671875, -9)" class="label">
             <foreignObject height="18" width="17.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -197,7 +202,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(854.2578125, 165)" class="edgeLabel">
+        <g transform="translate(863.1484375, 165)" class="edgeLabel">
           <g transform="translate(-9.125, -9)" class="label">
             <foreignObject height="18" width="18.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -210,7 +215,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/submodule1a/submodule1a.h#L6">
+        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/submodule1a/submodule1a.h#L6">
           <g title="AImpl" id="classId-C_0000674757414308736755-0" class="node default clickable">
             <rect height="57" width="111.890625" y="-28.5" x="-55.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.9453125" x1="-55.9453125" class="divider"/>
@@ -229,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L8">
+        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L8">
           <g title="ABC" id="classId-C_0002145362985538918973-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -263,7 +268,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L10">
+        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L10">
           <g title="XYZ" id="classId-C_0001435940218810141944-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -297,7 +302,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module1/module1.h#L12">
+        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L12">
           <g title="A" id="classId-C_0001178194542408300737-3" class="node default clickable">
             <rect height="123" width="163.953125" y="-61.5" x="-81.9765625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.9765625" x1="-81.9765625" class="divider"/>
@@ -320,7 +325,7 @@
               </foreignObject>
               <foreignObject transform="translate( -74.4765625, 2)" height="18" width="148.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+pimpl : detail::AImpl </span>
+                  <span style="font-style:italic;" class="nodeLabel">+pimpl : detail::AImpl</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -74.4765625, 24)" height="18" width="77.796875">
@@ -331,7 +336,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(794.4140625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/concepts/concepts.h#L7">
+        <a transform="translate(803.3046875, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/concepts/concepts.h#L7">
           <g title="bconcept" id="classId-C_0001325475407133721370-4" class="node default clickable">
             <rect height="145" width="114.578125" y="-72.5" x="-57.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="57.2890625" x1="-57.2890625" class="divider"/>
@@ -357,19 +362,19 @@
                   <span class="nodeLabel">"t.b()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -49.7890625, 47)" height="18" width="40.390625">
+              <foreignObject transform="translate( -49.7890625, 47)" height="18" width="53.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T t)"</span>
+                  <span class="nodeLabel">"(T t) : "</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(588.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L7">
+        <a transform="translate(592.703125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L7">
           <g title="B" id="classId-C_0001651810571114530033-5" class="node default clickable">
-            <rect height="101" width="149.734375" y="-50.5" x="-74.8671875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="74.8671875" x1="-74.8671875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="74.8671875" x1="-74.8671875" class="divider"/>
+            <rect height="101" width="158.625" y="-50.5" x="-79.3125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="79.3125" x1="-79.3125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="79.3125" x1="-79.3125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -381,20 +386,20 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -67.3671875, 3)" height="18" width="134.734375">
+              <foreignObject transform="translate( -71.8125, 3)" height="18" width="143.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+B() : [default] void</span>
+                  <span class="nodeLabel">+B() : : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -67.3671875, 25)" height="18" width="71.59375">
+              <foreignObject transform="translate( -71.8125, 25)" height="18" width="80.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+b() : void</span>
+                  <span class="nodeLabel">+b() : : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(814.11328125, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(823.00390625, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001157378014768957235-6" class="node default clickable">
             <rect height="79" width="55.015625" y="-39.5" x="-27.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
@@ -412,13 +417,13 @@
               </foreignObject>
               <foreignObject transform="translate( -20.0078125, 2)" height="18" width="36.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+t : T </span>
+                  <span style="font-style:italic;" class="nodeLabel">+t : T</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(934.1015625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(942.9921875, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0000580575003920044707-7" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -437,7 +442,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(864.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(873.1484375, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0001719752929087851944-8" class="node default clickable">
             <rect height="101" width="130.578125" y="-50.5" x="-65.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.2890625" x1="-65.2890625" class="divider"/>
@@ -466,7 +471,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(643.19140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(649.859375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001373403346245688670-9" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -485,7 +490,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(854.2578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(863.1484375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0002024276012622729482-10" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -504,7 +509,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(643.19140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00065/t00065.cc#L6">
+        <a transform="translate(649.859375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L6">
           <g title="R" id="classId-C_0001082111961413727438-11" class="node default clickable">
             <rect height="123" width="87.5" y="-61.5" x="-43.75" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="43.75" x1="-43.75" class="divider"/>
@@ -522,7 +527,7 @@
               </foreignObject>
               <foreignObject transform="translate( -36.25, -20)" height="18" width="41.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+a : A </span>
+                  <span style="font-style:italic;" class="nodeLabel">+a : A</span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -36.25, 2)" height="18" width="71.59375">
diff --git a/docs/test_cases/t00066.md b/docs/test_cases/t00066.md
index 9ab7858f..fab6b6ee 100644
--- a/docs/test_cases/t00066.md
+++ b/docs/test_cases/t00066.md
@@ -14,7 +14,7 @@ diagrams:
     using_namespace: clanguml::t00066
 ```
 ## Source code
-File t00066.cc
+File `tests/t00066/t00066.cc`
 ```cpp
 #include <functional>
 #include <string>
@@ -234,6 +234,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -259,6 +260,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -289,6 +291,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -319,6 +322,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": true,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": true,
           "is_move_assignment": false,
@@ -349,6 +353,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": true,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -374,6 +379,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -399,6 +405,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -424,6 +431,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -449,6 +457,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -474,6 +483,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -499,6 +509,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": true,
@@ -529,6 +540,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": true,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -559,6 +571,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -584,6 +597,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -614,6 +628,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -648,6 +663,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -679,6 +695,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -714,6 +731,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -744,6 +762,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -769,6 +788,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00066_class.svg b/docs/test_cases/t00066_class.svg
index 4096b831..ed29597e 100644
--- a/docs/test_cases/t00066_class.svg
+++ b/docs/test_cases/t00066_class.svg
@@ -1,231 +1,227 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="450px" preserveAspectRatio="none" style="width:347px;height:450px;" version="1.1" viewBox="0 0 347 450" width="347px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="572px" preserveAspectRatio="none" style="width:369px;height:572px;background:#FFFFFF;" version="1.1" viewBox="0 0 369 572" width="369px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f187fxcn0ync1m" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187fxcn0ync1m)" height="432.1406" id="C_0001899957281758233935" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
-      <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
-      <ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="53.2104">public_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
-      <polygon fill="none" points="18,57.8047,22,61.8047,18,65.8047,14,61.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="66.0151">protected_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="72.6094"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="78.8198">private_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="85.4141"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="91.6245">a_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="98.2188"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="104.4292">b_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="117.2339">c_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
-      <ellipse cx="18" cy="126.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="130.0386">static_int : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
-      <ellipse cx="18" cy="139.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="142.8433">static_const_int : const int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
-      <ellipse cx="18" cy="152.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="155.6479">auto_member : const unsigned long</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="168.2422"/>
-      <ellipse cx="18" cy="173.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="176.4526">A() = default : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="181.0469"/>
-      <ellipse cx="18" cy="186.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="189.2573">A(int i) : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="193.8516"/>
-      <ellipse cx="18" cy="198.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="202.062">A(A &amp;&amp;) = default : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="206.6563"/>
-      <ellipse cx="18" cy="211.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="214.8667">A(const A &amp;) = deleted : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="219.4609"/>
-      <ellipse cx="18" cy="224.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="227.6714">~A() = default : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
-      <ellipse cx="18" cy="237.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="240.4761">basic_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
-      <ellipse cx="18" cy="250.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="253.2808">static_method() : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
-      <ellipse cx="18" cy="262.875" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="266.0854">const_method() const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
-      <ellipse cx="18" cy="275.6797" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="278.8901">auto_method() : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
-      <ellipse cx="18" cy="288.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="291.6948">operator++() : A &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
-      <ellipse cx="18" cy="301.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="304.4995">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="309.0938"/>
-      <ellipse cx="18" cy="314.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="317.3042">operator=(A &amp; other) noexcept : A &amp;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="321.8984"/>
-      <ellipse cx="18" cy="326.8984" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="330.1089">size() const : std::size_t</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="334.7031"/>
-      <ellipse cx="18" cy="339.7031" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="342.9136">double_int(const int i) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="347.5078"/>
-      <ellipse cx="18" cy="352.5078" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="355.7183">sum(const double a, const double b) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="360.3125"/>
-      <ellipse cx="18" cy="365.3125" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="368.5229">default_int(int i = 12) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="373.1172"/>
-      <ellipse cx="18" cy="378.1172" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="381.3276">default_string(int i, std::string s = "abc") : std::string</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="385.9219"/>
-      <ellipse cx="18" cy="390.9219" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="394.1323">create_from_int(int i) : A</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="398.7266"/>
-      <polygon fill="#FFFF44" points="18,398.7266,22,402.7266,18,406.7266,14,402.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="406.937">protected_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="411.5313"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="413.5313"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="419.7417">private_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="424.3359"/>
-      <polygon fill="#FFFF44" points="18,424.3359,22,428.3359,18,432.3359,14,428.3359" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="432.5464">compare : std::function&lt;bool (const int)&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001899957281758233935">
+        <rect codeLine="2" fill="#F1F1F1" height="551.9978" id="C_0001899957281758233935" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="348" x="7" y="7"/>
+        <ellipse cx="172.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M167.25,24.1563 C167.25,26.6563 169.3906,28.4688 172.3125,28.4688 C173.5469,28.4688 174.7188,28.1719 175.4688,27.6563 C176.0781,27.2344 176.4063,26.8125 176.4063,26.4063 C176.4063,25.9375 175.9844,25.5313 175.4844,25.5313 C175.25,25.5313 175.0313,25.6094 174.8281,25.8125 C174.3906,26.25 174.3906,26.25 174.2188,26.3438 C173.7656,26.5781 173.125,26.7188 172.3594,26.7188 C170.3594,26.7188 169.0781,25.7031 169.0781,24.125 L169.0781,23.0781 C169.0781,21.375 170.2969,20.1719 172,20.1719 C172.5781,20.1719 173.1563,20.3125 173.625,20.5625 C174.0938,20.8281 174.2656,21.0156 174.3281,21.375 C174.4531,22.0469 174.7031,22.2969 175.2344,22.2969 C175.5156,22.2969 175.7969,22.1563 175.9844,21.9375 C176.1094,21.7656 176.1563,21.5938 176.1563,21.1563 L176.1563,19.7969 C176.1563,19.375 176.1406,19.2344 176.0156,19.0625 C175.8438,18.8125 175.5625,18.6563 175.2344,18.6563 C174.9219,18.6563 174.7188,18.7656 174.5,19.0313 C173.3281,18.5313 172.8906,18.4219 171.9375,18.4219 C169.2656,18.4219 167.25,20.4375 167.25,23.0625 L167.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.75" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="47.9"/>
+          <ellipse cx="18" cy="52.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="27" y="56.0059">public_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="64.6999"/>
+          <polygon fill="none" points="18,64.6999,22,68.6999,18,72.6999,14,68.6999" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="27" y="72.8059">protected_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="81.4998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="83.4998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="27" y="89.6058">private_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="98.2997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="100.2997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="106.4057">a_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="115.0997"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="117.0997"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="123.2057">b_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="131.8996"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="133.8996"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="27" y="140.0056">c_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="148.6995"/>
+          <ellipse cx="18" cy="153.6995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="83" x="27" y="156.8055">static_int : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="165.4995"/>
+          <ellipse cx="18" cy="170.4995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="163" x="27" y="173.6054">static_const_int : const int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="182.2994"/>
+          <ellipse cx="18" cy="187.2994" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="228" x="27" y="190.4054">auto_member : const unsigned long</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="198.1993" y2="198.1993"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="207.0993"/>
+          <ellipse cx="18" cy="212.0993" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="27" y="215.2053">A() = default : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.8992"/>
+          <ellipse cx="18" cy="228.8992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="27" y="232.0052">A(int i) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="240.6992"/>
+          <ellipse cx="18" cy="245.6992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="248.8051">A(A &amp;&amp;) = default : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="257.4991"/>
+          <ellipse cx="18" cy="262.4991" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="180" x="27" y="265.6051">A(const A &amp;) = deleted : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="274.299"/>
+          <ellipse cx="18" cy="279.299" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124" x="27" y="282.405">~A() = default : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="291.0989"/>
+          <ellipse cx="18" cy="296.0989" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="27" y="299.2049">basic_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="307.8989"/>
+          <ellipse cx="18" cy="312.8989" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="126" x="27" y="316.0048">static_method() : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="324.6988"/>
+          <ellipse cx="18" cy="329.6988" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="27" y="332.8048">const_method() const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="341.4987"/>
+          <ellipse cx="18" cy="346.4987" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="27" y="349.6047">auto_method() : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="358.2986"/>
+          <ellipse cx="18" cy="363.2986" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="27" y="366.4046">operator++() : A &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="375.0986"/>
+          <ellipse cx="18" cy="380.0986" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="236" x="27" y="383.2046">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="391.8985"/>
+          <ellipse cx="18" cy="396.8985" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="27" y="400.0045">operator=(A &amp; other) noexcept : A &amp;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="408.6984"/>
+          <ellipse cx="18" cy="413.6984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="27" y="416.8044">size() const : std::size_t</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="425.4984"/>
+          <ellipse cx="18" cy="430.4984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="27" y="433.6043">double_int(const int i) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="442.2983"/>
+          <ellipse cx="18" cy="447.2983" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="258" x="27" y="450.4043">sum(const double a, const double b) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="459.0982"/>
+          <ellipse cx="18" cy="464.0982" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="27" y="467.2042">default_int(int i = 12) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="475.8981"/>
+          <ellipse cx="18" cy="480.8981" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="27" y="484.0041">default_string(int i, std::string s = "abc") : std::string</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="492.6981"/>
+          <ellipse cx="18" cy="497.6981" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="153" x="27" y="500.804">create_from_int(int i) : A</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="509.498"/>
+          <polygon fill="#FFFF44" points="18,509.498,22,513.498,18,517.498,14,513.498" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="164" x="27" y="517.604">protected_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="526.2979"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="528.2979"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="534.4039">private_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="543.0978"/>
+          <polygon fill="#FFFF44" points="18,543.0978,22,547.0978,18,551.0978,14,547.0978" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="255" x="27" y="551.2038">compare : std::function&lt;bool (const int)&gt;</text>
+        </a>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00066_class_mermaid.svg b/docs/test_cases/t00066_class_mermaid.svg
index 1ec82fac..368a6ff6 100644
--- a/docs/test_cases/t00066_class_mermaid.svg
+++ b/docs/test_cases/t00066_class_mermaid.svg
@@ -1,50 +1,55 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 733" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 409.640625 733" style="max-width: 409.641px; background-color: white;" width="409.640625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,11 +57,11 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00066/t00066.cc#L7">
+        <a transform="translate(204.8203125, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L7">
           <g title="A" id="classId-C_0001899957281758233935-0" class="node default clickable">
-            <rect height="717" width="384.75" y="-358.5" x="-192.375" class="outer title-state"/>
-            <line y2="-328.5" y1="-328.5" x2="192.375" x1="-192.375" class="divider"/>
-            <line y2="-92.5" y1="-92.5" x2="192.375" x1="-192.375" class="divider"/>
+            <rect height="717" width="393.640625" y="-358.5" x="-196.8203125" class="outer title-state"/>
+            <line y2="-328.5" y1="-328.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
+            <line y2="-92.5" y1="-92.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -68,154 +73,154 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -317)" height="18" width="148.96875">
+              <foreignObject transform="translate( -189.3203125, -317)" height="18" width="148.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+public_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -295)" height="18" width="173.421875">
+              <foreignObject transform="translate( -189.3203125, -295)" height="18" width="173.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#protected_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -273)" height="18" width="294.390625">
+              <foreignObject transform="translate( -189.3203125, -273)" height="18" width="294.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#compare : std::function&lt;bool (const int)&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -251)" height="18" width="151.171875">
+              <foreignObject transform="translate( -189.3203125, -251)" height="18" width="151.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-private_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -229)" height="18" width="53.359375">
+              <foreignObject transform="translate( -189.3203125, -229)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-a_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -207)" height="18" width="53.359375">
+              <foreignObject transform="translate( -189.3203125, -207)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-b_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -185)" height="18" width="52.46875">
+              <foreignObject transform="translate( -189.3203125, -185)" height="18" width="52.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-c_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -163)" height="18" width="102.71875">
+              <foreignObject transform="translate( -189.3203125, -163)" height="18" width="102.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -141)" height="18" width="192.546875">
+              <foreignObject transform="translate( -189.3203125, -141)" height="18" width="192.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_const_int : const int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -119)" height="18" width="263.734375">
+              <foreignObject transform="translate( -189.3203125, -119)" height="18" width="263.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+auto_member : const unsigned long</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -85)" height="18" width="134.734375">
+              <foreignObject transform="translate( -189.3203125, -85)" height="18" width="143.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A() : [default] void</span>
+                  <span class="nodeLabel">+A() : : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -63)" height="18" width="98.265625">
+              <foreignObject transform="translate( -189.3203125, -63)" height="18" width="107.15625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(int i) : void</span>
+                  <span class="nodeLabel">+A(int i) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -41)" height="18" width="170.3125">
+              <foreignObject transform="translate( -189.3203125, -41)" height="18" width="179.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(A &amp;&amp;) : [default] void</span>
+                  <span class="nodeLabel">+A(A &amp;&amp;) : : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -19)" height="18" width="140.078125">
+              <foreignObject transform="translate( -189.3203125, -19)" height="18" width="148.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(const A &amp;) : void</span>
+                  <span class="nodeLabel">+A(const A &amp;) : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 3)" height="18" width="144.078125">
+              <foreignObject transform="translate( -189.3203125, 3)" height="18" width="152.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~A() : [default] void</span>
+                  <span class="nodeLabel">+~A() : : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 25)" height="18" width="162.3125">
+              <foreignObject transform="translate( -189.3203125, 25)" height="18" width="171.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+basic_method() : void</span>
+                  <span class="nodeLabel">+basic_method() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 47)" height="18" width="149.84375">
+              <foreignObject transform="translate( -189.3203125, 47)" height="18" width="158.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+static_method() : int</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+static_method() : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 69)" height="18" width="214.78125">
+              <foreignObject transform="translate( -189.3203125, 69)" height="18" width="223.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : [const] void</span>
+                  <span class="nodeLabel">+const_method() : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 91)" height="18" width="143.640625">
+              <foreignObject transform="translate( -189.3203125, 91)" height="18" width="152.53125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+auto_method() : int</span>
+                  <span class="nodeLabel">+auto_method() : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 113)" height="18" width="135.640625">
+              <foreignObject transform="translate( -189.3203125, 113)" height="18" width="144.53125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator++() : A &amp;</span>
+                  <span class="nodeLabel">+operator++() : : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 135)" height="18" width="202.796875">
+              <foreignObject transform="translate( -189.3203125, 135)" height="18" width="211.6875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(A &amp;&amp; other) : A &amp;</span>
+                  <span class="nodeLabel">+operator=(A &amp;&amp; other) : : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 157)" height="18" width="192.125">
+              <foreignObject transform="translate( -189.3203125, 157)" height="18" width="201.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(A &amp; other) : A &amp;</span>
+                  <span class="nodeLabel">+operator=(A &amp; other) : : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 179)" height="18" width="185.40625">
+              <foreignObject transform="translate( -189.3203125, 179)" height="18" width="194.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : [const] std::size_t</span>
+                  <span class="nodeLabel">+size() : : [const] std::size_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 201)" height="18" width="191.671875">
+              <foreignObject transform="translate( -189.3203125, 201)" height="18" width="200.5625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+double_int(const int i) : int</span>
+                  <span class="nodeLabel">+double_int(const int i) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 223)" height="18" width="297.515625">
+              <foreignObject transform="translate( -189.3203125, 223)" height="18" width="306.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sum(const double a, const double b) : int</span>
+                  <span class="nodeLabel">+sum(const double a, const double b) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 245)" height="18" width="185">
+              <foreignObject transform="translate( -189.3203125, 245)" height="18" width="193.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_int(int i = 12) : int</span>
+                  <span class="nodeLabel">+default_int(int i = 12) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 267)" height="18" width="369.75">
+              <foreignObject transform="translate( -189.3203125, 267)" height="18" width="378.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : std::string</span>
+                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 289)" height="18" width="179.1875">
+              <foreignObject transform="translate( -189.3203125, 289)" height="18" width="188.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+create_from_int(int i) : A</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+create_from_int(int i) : : A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 311)" height="18" width="191.21875">
+              <foreignObject transform="translate( -189.3203125, 311)" height="18" width="200.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#protected_method() : void</span>
+                  <span class="nodeLabel">#protected_method() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 333)" height="18" width="168.96875">
+              <foreignObject transform="translate( -189.3203125, 333)" height="18" width="177.859375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-private_method() : void</span>
+                  <span class="nodeLabel">-private_method() : : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00067.md b/docs/test_cases/t00067.md
index 7822566a..17eba7dc 100644
--- a/docs/test_cases/t00067.md
+++ b/docs/test_cases/t00067.md
@@ -19,7 +19,7 @@ diagrams:
     using_namespace: clanguml::t00067
 ```
 ## Source code
-File t00067.cc
+File `tests/t00067/t00067.cc`
 ```cpp
 #include <functional>
 #include <string>
@@ -237,6 +237,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -262,6 +263,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -287,6 +289,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -312,6 +315,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -337,6 +341,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -367,6 +372,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -401,6 +407,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -432,6 +439,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -467,6 +475,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
@@ -492,6 +501,7 @@ int A::static_int = 1;
           "is_constexpr": false,
           "is_constructor": false,
           "is_copy_assignment": false,
+          "is_coroutine": false,
           "is_defaulted": false,
           "is_deleted": false,
           "is_move_assignment": false,
diff --git a/docs/test_cases/t00067_class.svg b/docs/test_cases/t00067_class.svg
index 6498ede8..80ae2940 100644
--- a/docs/test_cases/t00067_class.svg
+++ b/docs/test_cases/t00067_class.svg
@@ -1,161 +1,157 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="322px" preserveAspectRatio="none" style="width:347px;height:322px;" version="1.1" viewBox="0 0 347 322" width="347px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="404px" preserveAspectRatio="none" style="width:369px;height:404px;background:#FFFFFF;" version="1.1" viewBox="0 0 369 404" width="369px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f12s587fhbplw0" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12s587fhbplw0)" height="304.0938" id="C_0000541140581420098839" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
-      <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
-      <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="53.2104">auto_method() : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
-      <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="66.0151">basic_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
-      <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="78.8198">const_method() const : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
-      <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="91.6245">default_int(int i = 12) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
-      <ellipse cx="18" cy="101.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="104.4292">default_string(int i, std::string s = "abc") : std::string</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
-      <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="117.2339">double_int(const int i) : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
-      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="123.8281"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="130.0386">private_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
-      <polygon fill="#FFFF44" points="18,134.6328,22,138.6328,18,142.6328,14,138.6328" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="142.8433">protected_method() : void</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
-      <ellipse cx="18" cy="152.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="155.6479">size() const : std::size_t</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="160.2422"/>
-      <ellipse cx="18" cy="165.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="168.4526">sum(const double a, const double b) : int</text>
-    </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="175.0469" y2="175.0469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="181.0469"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="183.0469"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="189.2573">a_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="193.8516"/>
-      <ellipse cx="18" cy="198.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="202.062">auto_member : const unsigned long</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="206.6563"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="208.6563"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="214.8667">b_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="219.4609"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="221.4609"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="227.6714">c_ : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
-      <polygon fill="#FFFF44" points="18,232.2656,22,236.2656,18,240.2656,14,236.2656" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="240.4761">compare : std::function&lt;bool (const int)&gt;</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="247.0703"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="253.2808">private_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
-      <polygon fill="none" points="18,257.875,22,261.875,18,265.875,14,261.875" style="stroke: #B38D22; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="266.0854">protected_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
-      <ellipse cx="18" cy="275.6797" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="278.8901">public_member : int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
-      <ellipse cx="18" cy="288.4844" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="291.6948">static_const_int : const int</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
-      <ellipse cx="18" cy="301.2891" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="304.4995">static_int : int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000541140581420098839">
+        <rect codeLine="2" fill="#F1F1F1" height="383.9985" id="C_0000541140581420098839" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="348" x="7" y="7"/>
+        <ellipse cx="172.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M167.25,24.1563 C167.25,26.6563 169.3906,28.4688 172.3125,28.4688 C173.5469,28.4688 174.7188,28.1719 175.4688,27.6563 C176.0781,27.2344 176.4063,26.8125 176.4063,26.4063 C176.4063,25.9375 175.9844,25.5313 175.4844,25.5313 C175.25,25.5313 175.0313,25.6094 174.8281,25.8125 C174.3906,26.25 174.3906,26.25 174.2188,26.3438 C173.7656,26.5781 173.125,26.7188 172.3594,26.7188 C170.3594,26.7188 169.0781,25.7031 169.0781,24.125 L169.0781,23.0781 C169.0781,21.375 170.2969,20.1719 172,20.1719 C172.5781,20.1719 173.1563,20.3125 173.625,20.5625 C174.0938,20.8281 174.2656,21.0156 174.3281,21.375 C174.4531,22.0469 174.7031,22.2969 175.2344,22.2969 C175.5156,22.2969 175.7969,22.1563 175.9844,21.9375 C176.1094,21.7656 176.1563,21.5938 176.1563,21.1563 L176.1563,19.7969 C176.1563,19.375 176.1406,19.2344 176.0156,19.0625 C175.8438,18.8125 175.5625,18.6563 175.2344,18.6563 C174.9219,18.6563 174.7188,18.7656 174.5,19.0313 C173.3281,18.5313 172.8906,18.4219 171.9375,18.4219 C169.2656,18.4219 167.25,20.4375 167.25,23.0625 L167.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.75" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="47.9"/>
+          <ellipse cx="18" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="27" y="56.0059">auto_method() : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="64.6999"/>
+          <ellipse cx="18" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="27" y="72.8059">basic_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="81.4998"/>
+          <ellipse cx="18" cy="86.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="27" y="89.6058">const_method() const : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="98.2997"/>
+          <ellipse cx="18" cy="103.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="27" y="106.4057">default_int(int i = 12) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="115.0997"/>
+          <ellipse cx="18" cy="120.0997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="27" y="123.2057">default_string(int i, std::string s = "abc") : std::string</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="131.8996"/>
+          <ellipse cx="18" cy="136.8996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="27" y="140.0056">double_int(const int i) : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="148.6995"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="150.6995"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="156.8055">private_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="165.4995"/>
+          <polygon fill="#FFFF44" points="18,165.4995,22,169.4995,18,173.4995,14,169.4995" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="164" x="27" y="173.6054">protected_method() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="182.2994"/>
+          <ellipse cx="18" cy="187.2994" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="27" y="190.4054">size() const : std::size_t</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="199.0993"/>
+          <ellipse cx="18" cy="204.0993" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="258" x="27" y="207.2053">sum(const double a, const double b) : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="214.9993" y2="214.9993"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.8992"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="225.8992"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="232.0052">a_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="240.6992"/>
+          <ellipse cx="18" cy="245.6992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="228" x="27" y="248.8051">auto_member : const unsigned long</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="257.4991"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="259.4991"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="265.6051">b_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="274.299"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="276.299"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="27" y="282.405">c_ : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="291.0989"/>
+          <polygon fill="#FFFF44" points="18,291.0989,22,295.0989,18,299.0989,14,295.0989" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="255" x="27" y="299.2049">compare : std::function&lt;bool (const int)&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="307.8989"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="309.8989"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="27" y="316.0048">private_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="324.6988"/>
+          <polygon fill="none" points="18,324.6988,22,328.6988,18,332.6988,14,328.6988" style="stroke:#B38D22;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="27" y="332.8048">protected_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="341.4987"/>
+          <ellipse cx="18" cy="346.4987" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="27" y="349.6047">public_member : int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="358.2986"/>
+          <ellipse cx="18" cy="363.2986" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="163" x="27" y="366.4046">static_const_int : const int</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="375.0986"/>
+          <ellipse cx="18" cy="380.0986" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="83" x="27" y="383.2046">static_int : int</text>
+        </a>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00067_class_mermaid.svg b/docs/test_cases/t00067_class_mermaid.svg
index 6b362e53..00b6e59f 100644
--- a/docs/test_cases/t00067_class_mermaid.svg
+++ b/docs/test_cases/t00067_class_mermaid.svg
@@ -1,50 +1,55 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 513" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 409.640625 513" style="max-width: 409.641px; background-color: white;" width="409.640625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -52,11 +57,11 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00067/t00067.cc#L6">
+        <a transform="translate(204.8203125, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L6">
           <g title="A" id="classId-C_0000541140581420098839-0" class="node default clickable">
-            <rect height="497" width="384.75" y="-248.5" x="-192.375" class="outer title-state"/>
-            <line y2="-218.5" y1="-218.5" x2="192.375" x1="-192.375" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="192.375" x1="-192.375" class="divider"/>
+            <rect height="497" width="393.640625" y="-248.5" x="-196.8203125" class="outer title-state"/>
+            <line y2="-218.5" y1="-218.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -68,104 +73,104 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -207)" height="18" width="53.359375">
+              <foreignObject transform="translate( -189.3203125, -207)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-a_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -185)" height="18" width="263.734375">
+              <foreignObject transform="translate( -189.3203125, -185)" height="18" width="263.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+auto_member : const unsigned long</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -163)" height="18" width="53.359375">
+              <foreignObject transform="translate( -189.3203125, -163)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-b_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -141)" height="18" width="52.46875">
+              <foreignObject transform="translate( -189.3203125, -141)" height="18" width="52.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-c_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -119)" height="18" width="294.390625">
+              <foreignObject transform="translate( -189.3203125, -119)" height="18" width="294.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#compare : std::function&lt;bool (const int)&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -97)" height="18" width="151.171875">
+              <foreignObject transform="translate( -189.3203125, -97)" height="18" width="151.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-private_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -75)" height="18" width="173.421875">
+              <foreignObject transform="translate( -189.3203125, -75)" height="18" width="173.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#protected_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -53)" height="18" width="148.96875">
+              <foreignObject transform="translate( -189.3203125, -53)" height="18" width="148.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+public_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -31)" height="18" width="192.546875">
+              <foreignObject transform="translate( -189.3203125, -31)" height="18" width="192.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_const_int : const int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, -9)" height="18" width="102.71875">
+              <foreignObject transform="translate( -189.3203125, -9)" height="18" width="102.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 25)" height="18" width="143.640625">
+              <foreignObject transform="translate( -189.3203125, 25)" height="18" width="152.53125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+auto_method() : int</span>
+                  <span class="nodeLabel">+auto_method() : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 47)" height="18" width="162.3125">
+              <foreignObject transform="translate( -189.3203125, 47)" height="18" width="171.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+basic_method() : void</span>
+                  <span class="nodeLabel">+basic_method() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 69)" height="18" width="214.78125">
+              <foreignObject transform="translate( -189.3203125, 69)" height="18" width="223.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : [const] void</span>
+                  <span class="nodeLabel">+const_method() : : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 91)" height="18" width="185">
+              <foreignObject transform="translate( -189.3203125, 91)" height="18" width="193.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_int(int i = 12) : int</span>
+                  <span class="nodeLabel">+default_int(int i = 12) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 113)" height="18" width="369.75">
+              <foreignObject transform="translate( -189.3203125, 113)" height="18" width="378.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : std::string</span>
+                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 135)" height="18" width="191.671875">
+              <foreignObject transform="translate( -189.3203125, 135)" height="18" width="200.5625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+double_int(const int i) : int</span>
+                  <span class="nodeLabel">+double_int(const int i) : : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 157)" height="18" width="168.96875">
+              <foreignObject transform="translate( -189.3203125, 157)" height="18" width="177.859375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-private_method() : void</span>
+                  <span class="nodeLabel">-private_method() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 179)" height="18" width="191.21875">
+              <foreignObject transform="translate( -189.3203125, 179)" height="18" width="200.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#protected_method() : void</span>
+                  <span class="nodeLabel">#protected_method() : : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 201)" height="18" width="185.40625">
+              <foreignObject transform="translate( -189.3203125, 201)" height="18" width="194.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : [const] std::size_t</span>
+                  <span class="nodeLabel">+size() : : [const] std::size_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -184.875, 223)" height="18" width="297.515625">
+              <foreignObject transform="translate( -189.3203125, 223)" height="18" width="306.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sum(const double a, const double b) : int</span>
+                  <span class="nodeLabel">+sum(const double a, const double b) : : int</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00068.md b/docs/test_cases/t00068.md
index f4e00155..2c9e55a5 100644
--- a/docs/test_cases/t00068.md
+++ b/docs/test_cases/t00068.md
@@ -43,7 +43,7 @@ diagrams:
     using_namespace: clanguml::t00068
 ```
 ## Source code
-File t00068.cc
+File `tests/t00068/t00068.cc`
 ```cpp
 #include <memory>
 #include <vector>
diff --git a/docs/test_cases/t00068_r0_class.svg b/docs/test_cases/t00068_r0_class.svg
index 6f5707a2..79fb3dbc 100644
--- a/docs/test_cases/t00068_r0_class.svg
+++ b/docs/test_cases/t00068_r0_class.svg
@@ -1,36 +1,32 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="112px" preserveAspectRatio="none" style="width:222px;height:112px;" version="1.1" viewBox="0 0 222 112" width="222px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="140px" preserveAspectRatio="none" style="width:191px;height:140px;background:#FFFFFF;" version="1.1" viewBox="0 0 191 140" width="191px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13miaz46zbn0o" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="2" y="16.708">AAA context of radius 0</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13miaz46zbn0o)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="56.5" y="27.9531"/>
-      <ellipse cx="90.85" cy="43.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M93.8188,49.5938 Q93.2406,49.8906 92.6,50.0313 Q91.9594,50.1875 91.2563,50.1875 Q88.7563,50.1875 87.4281,48.5469 Q86.1156,46.8906 86.1156,43.7656 Q86.1156,40.6406 87.4281,38.9844 Q88.7563,37.3281 91.2563,37.3281 Q91.9594,37.3281 92.6,37.4844 Q93.2563,37.6406 93.8188,37.9375 L93.8188,40.6563 Q93.1938,40.0781 92.6,39.8125 Q92.0063,39.5313 91.3813,39.5313 Q90.0375,39.5313 89.35,40.6094 Q88.6625,41.6719 88.6625,43.7656 Q88.6625,45.8594 89.35,46.9375 Q90.0375,48 91.3813,48 Q92.0063,48 92.6,47.7344 Q93.1938,47.4531 93.8188,46.875 L93.8188,49.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="109.15" y="48.1074">AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="57.5" x2="154.5" y1="59.9531" y2="59.9531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="57.5" x2="154.5" y1="67.9531" y2="67.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="62.5" y="73.9531"/>
-      <ellipse cx="67.5" cy="78.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="76.5" y="82.1636">akind : AKind</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="62.5" y="86.7578"/>
-      <ellipse cx="67.5" cy="91.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="76.5" y="94.9683">bb : BB *</text>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="163" x="10" y="23.0059">AAA context of radius 0</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <g id="elem_C_0001484819281509619918">
+        <rect codeLine="3" fill="#F1F1F1" height="81.5999" id="C_0001484819281509619918" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="37.5" y="44.7999"/>
+        <ellipse cx="75" cy="60.7999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M70,61.9562 C70,64.4562 72.1406,66.2687 75.0625,66.2687 C76.2969,66.2687 77.4688,65.9718 78.2188,65.4562 C78.8281,65.0343 79.1563,64.6124 79.1563,64.2062 C79.1563,63.7374 78.7344,63.3312 78.2344,63.3312 C78,63.3312 77.7813,63.4093 77.5781,63.6124 C77.1406,64.0499 77.1406,64.0499 76.9688,64.1437 C76.5156,64.3781 75.875,64.5187 75.1094,64.5187 C73.1094,64.5187 71.8281,63.5031 71.8281,61.9249 L71.8281,60.8781 C71.8281,59.1749 73.0469,57.9718 74.75,57.9718 C75.3281,57.9718 75.9063,58.1124 76.375,58.3624 C76.8438,58.6281 77.0156,58.8156 77.0781,59.1749 C77.2031,59.8468 77.4531,60.0968 77.9844,60.0968 C78.2656,60.0968 78.5469,59.9562 78.7344,59.7374 C78.8594,59.5656 78.9063,59.3937 78.9063,58.9562 L78.9063,57.5968 C78.9063,57.1749 78.8906,57.0343 78.7656,56.8624 C78.5938,56.6124 78.3125,56.4562 77.9844,56.4562 C77.6719,56.4562 77.4688,56.5656 77.25,56.8312 C76.0781,56.3312 75.6406,56.2218 74.6875,56.2218 C72.0156,56.2218 70,58.2374 70,60.8624 L70,61.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="94" y="65.4059">AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="38.5" x2="145.5" y1="76.7999" y2="76.7999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="38.5" x2="145.5" y1="84.7999" y2="84.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="43.5" y="93.6999"/>
+          <ellipse cx="48.5" cy="98.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="57.5" y="101.8059">akind : AKind</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="43.5" y="110.4998"/>
+          <ellipse cx="48.5" cy="115.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="57.5" y="118.6058">bb : BB *</text>
+        </a>
+      </g>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00068_r0_class_mermaid.svg b/docs/test_cases/t00068_r0_class_mermaid.svg
index 571e28d7..5fc69921 100644
--- a/docs/test_cases/t00068_r0_class_mermaid.svg
+++ b/docs/test_cases/t00068_r0_class_mermaid.svg
@@ -1,51 +1,55 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-34.6875 -49 203.125 166" style="max-width: 203.125px; background-color: white;" width="203.125" id="my-svg">
-  <title id="chart-title-my-svg">AAA context of radius 0</title>
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-34.6875 -49 203.125 166" style="max-width: 203.125px; background-color: white;" width="203.125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -53,7 +57,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(66.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19">
+        <a transform="translate(66.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-0" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -76,7 +80,7 @@
               </foreignObject>
               <foreignObject transform="translate( -51.375, 13)" height="18" width="61.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+bb : BB </span>
+                  <span style="font-style:italic;" class="nodeLabel">+bb : BB</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00068_r1_class.svg b/docs/test_cases/t00068_r1_class.svg
index 0283cabb..1461974d 100644
--- a/docs/test_cases/t00068_r1_class.svg
+++ b/docs/test_cases/t00068_r1_class.svg
@@ -1,99 +1,111 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="415px" preserveAspectRatio="none" style="width:250px;height:415px;" version="1.1" viewBox="0 0 250 415" width="250px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="450px" preserveAspectRatio="none" style="width:255px;height:450px;background:#FFFFFF;" version="1.1" viewBox="0 0 255 450" width="255px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1i9sfbr1oykmk" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="24.5" y="16.708">AAA context of radius 1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i9sfbr1oykmk)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="330.4531"/>
-      <ellipse cx="59.75" cy="346.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M62.7188,352.0938 Q62.1406,352.3906 61.5,352.5313 Q60.8594,352.6875 60.1563,352.6875 Q57.6563,352.6875 56.3281,351.0469 Q55.0156,349.3906 55.0156,346.2656 Q55.0156,343.1406 56.3281,341.4844 Q57.6563,339.8281 60.1563,339.8281 Q60.8594,339.8281 61.5,339.9844 Q62.1563,340.1406 62.7188,340.4375 L62.7188,343.1563 Q62.0938,342.5781 61.5,342.3125 Q60.9063,342.0313 60.2813,342.0313 Q58.9375,342.0313 58.25,343.1094 Q57.5625,344.1719 57.5625,346.2656 Q57.5625,348.3594 58.25,349.4375 Q58.9375,350.5 60.2813,350.5 Q60.9063,350.5 61.5,350.2344 Q62.0938,349.9531 62.7188,349.375 L62.7188,352.0938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="80.25" y="350.6074">BB</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="362.4531" y2="362.4531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="370.4531" y2="370.4531"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="163" x="39.25" y="23.0059">AAA context of radius 1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <g id="elem_C_0001427649116338755656">
+        <rect codeLine="3" fill="#F1F1F1" height="64.7999" id="C_0001427649116338755656" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="7" y="361.9999"/>
+        <ellipse cx="62.25" cy="377.9999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M57.25,379.1562 C57.25,381.6562 59.3906,383.4687 62.3125,383.4687 C63.5469,383.4687 64.7188,383.1718 65.4688,382.6562 C66.0781,382.2343 66.4063,381.8124 66.4063,381.4062 C66.4063,380.9374 65.9844,380.5312 65.4844,380.5312 C65.25,380.5312 65.0313,380.6093 64.8281,380.8124 C64.3906,381.2499 64.3906,381.2499 64.2188,381.3437 C63.7656,381.5781 63.125,381.7187 62.3594,381.7187 C60.3594,381.7187 59.0781,380.7031 59.0781,379.1249 L59.0781,378.0781 C59.0781,376.3749 60.2969,375.1718 62,375.1718 C62.5781,375.1718 63.1563,375.3124 63.625,375.5624 C64.0938,375.8281 64.2656,376.0156 64.3281,376.3749 C64.4531,377.0468 64.7031,377.2968 65.2344,377.2968 C65.5156,377.2968 65.7969,377.1562 65.9844,376.9374 C66.1094,376.7656 66.1563,376.5937 66.1563,376.1562 L66.1563,374.7968 C66.1563,374.3749 66.1406,374.2343 66.0156,374.0624 C65.8438,373.8124 65.5625,373.6562 65.2344,373.6562 C64.9219,373.6562 64.7188,373.7656 64.5,374.0312 C63.3281,373.5312 62.8906,373.4218 61.9375,373.4218 C59.2656,373.4218 57.25,375.4374 57.25,378.0624 L57.25,379.1562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="82.75" y="382.6059">BB</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="143" y1="393.9999" y2="393.9999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="143" y1="401.9999" y2="401.9999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="410.8999"/>
+          <ellipse cx="18" cy="415.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="27" y="419.0059">b : std::vector&lt;B&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="376.4531"/>
-      <ellipse cx="17" cy="381.4531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
+      <g id="elem_C_0001888428536574868284">
+        <rect codeLine="8" fill="#F1F1F1" height="98.3998" id="C_0001888428536574868284" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="69" x="179" y="345.1999"/>
+        <ellipse cx="194" cy="361.1999" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M192.8594,362.2624 L194.1719,362.2624 L194.1719,362.3093 C194.1719,362.7156 194.1875,362.8718 194.2969,363.0281 C194.4688,363.2781 194.7656,363.4499 195.0781,363.4499 C195.3594,363.4499 195.6563,363.3093 195.8281,363.0906 C195.9531,362.9031 196,362.7624 196,362.3093 L196,360.4656 C196,360.1374 195.9844,360.0281 195.9219,359.8562 C195.8125,359.5593 195.4531,359.3093 195.0781,359.3093 C194.7813,359.3093 194.5156,359.4499 194.3438,359.6687 C194.2031,359.8562 194.1719,360.0281 194.1719,360.4656 L194.1719,360.5281 L192.8594,360.5281 L192.8594,358.3562 L196.7031,358.3562 L196.7031,359.1062 C196.7031,359.4968 196.7344,359.6843 196.8438,359.8406 C197.0156,360.0906 197.3125,360.2624 197.625,360.2624 C197.9219,360.2624 198.1875,360.1374 198.375,359.9031 C198.5156,359.7156 198.5469,359.5749 198.5469,359.1062 L198.5469,356.6062 L190.8438,356.6062 C190.3906,356.6062 190.2656,356.6218 190.0938,356.7312 C189.8281,356.9031 189.6563,357.1687 189.6563,357.4812 C189.6563,357.7624 189.7813,358.0281 190.0313,358.1999 C190.2188,358.3249 190.4063,358.3562 190.8438,358.3562 L191.0313,358.3562 L191.0313,364.4499 L190.8438,364.4499 C190.4219,364.4499 190.2656,364.4812 190.0938,364.5749 C189.8281,364.7312 189.6563,365.0124 189.6563,365.3093 C189.6563,365.8874 190.0625,366.1999 190.8438,366.1999 L198.9219,366.1999 L198.9219,363.6687 C198.9219,363.2624 198.8906,363.0906 198.7813,362.9343 C198.6094,362.6687 198.3281,362.5124 198,362.5124 C197.7188,362.5124 197.4375,362.6531 197.25,362.8718 C197.1094,363.0593 197.0781,363.2156 197.0781,363.6687 L197.0781,364.4499 L192.8594,364.4499 L192.8594,362.2624 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="208" y="365.8059">AKind</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="180" x2="247" y1="377.1999" y2="377.1999"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="185" y="394.2059">OneA</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="185" y="411.0058">TwoA</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="185" y="427.8057">ThreeA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="180" x2="247" y1="435.5997" y2="435.5997"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="384.6636">b : std::vector&lt;B&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <g id="elem_C_0000577981285610429577">
+        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0000577981285610429577" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="65.5" y="53.1999"/>
+        <ellipse cx="80.5" cy="69.1999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M75.5,70.3562 C75.5,72.8562 77.6406,74.6687 80.5625,74.6687 C81.7969,74.6687 82.9688,74.3718 83.7188,73.8562 C84.3281,73.4343 84.6563,73.0124 84.6563,72.6062 C84.6563,72.1374 84.2344,71.7312 83.7344,71.7312 C83.5,71.7312 83.2813,71.8093 83.0781,72.0124 C82.6406,72.4499 82.6406,72.4499 82.4688,72.5437 C82.0156,72.7781 81.375,72.9187 80.6094,72.9187 C78.6094,72.9187 77.3281,71.9031 77.3281,70.3249 L77.3281,69.2781 C77.3281,67.5749 78.5469,66.3718 80.25,66.3718 C80.8281,66.3718 81.4063,66.5124 81.875,66.7624 C82.3438,67.0281 82.5156,67.2156 82.5781,67.5749 C82.7031,68.2468 82.9531,68.4968 83.4844,68.4968 C83.7656,68.4968 84.0469,68.3562 84.2344,68.1374 C84.3594,67.9656 84.4063,67.7937 84.4063,67.3562 L84.4063,65.9968 C84.4063,65.5749 84.3906,65.4343 84.2656,65.2624 C84.0938,65.0124 83.8125,64.8562 83.4844,64.8562 C83.1719,64.8562 82.9688,64.9656 82.75,65.2312 C81.5781,64.7312 81.1406,64.6218 80.1875,64.6218 C77.5156,64.6218 75.5,66.6374 75.5,69.2624 L75.5,70.3562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="94.5" y="73.8059">AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="66.5" x2="114.5" y1="85.1999" y2="85.1999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="66.5" x2="114.5" y1="93.1999" y2="93.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i9sfbr1oykmk)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="317.9531"/>
-      <ellipse cx="188" cy="333.9531" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M192.1094,339.9531 L184.3906,339.9531 L184.3906,327.5625 L192.1094,327.5625 L192.1094,329.7188 L186.8438,329.7188 L186.8438,332.3906 L191.6094,332.3906 L191.6094,334.5469 L186.8438,334.5469 L186.8438,337.7969 L192.1094,337.7969 L192.1094,339.9531 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="34" x="202" y="338.1074">AKind</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="349.9531" y2="349.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="364.1636">OneA</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="376.9683">TwoA</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="179" y="389.7729">ThreeA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="396.3672" y2="396.3672"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <g id="elem_C_0001484819281509619918">
+        <rect codeLine="18" fill="#F1F1F1" height="81.5999" id="C_0001484819281509619918" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="90" y="186.5999"/>
+        <ellipse cx="127.5" cy="202.5999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M122.5,203.7562 C122.5,206.2562 124.6406,208.0687 127.5625,208.0687 C128.7969,208.0687 129.9688,207.7718 130.7188,207.2562 C131.3281,206.8343 131.6563,206.4124 131.6563,206.0062 C131.6563,205.5374 131.2344,205.1312 130.7344,205.1312 C130.5,205.1312 130.2813,205.2093 130.0781,205.4124 C129.6406,205.8499 129.6406,205.8499 129.4688,205.9437 C129.0156,206.1781 128.375,206.3187 127.6094,206.3187 C125.6094,206.3187 124.3281,205.3031 124.3281,203.7249 L124.3281,202.6781 C124.3281,200.9749 125.5469,199.7718 127.25,199.7718 C127.8281,199.7718 128.4063,199.9124 128.875,200.1624 C129.3438,200.4281 129.5156,200.6156 129.5781,200.9749 C129.7031,201.6468 129.9531,201.8968 130.4844,201.8968 C130.7656,201.8968 131.0469,201.7562 131.2344,201.5374 C131.3594,201.3656 131.4063,201.1937 131.4063,200.7562 L131.4063,199.3968 C131.4063,198.9749 131.3906,198.8343 131.2656,198.6624 C131.0938,198.4124 130.8125,198.2562 130.4844,198.2562 C130.1719,198.2562 129.9688,198.3656 129.75,198.6312 C128.5781,198.1312 128.1406,198.0218 127.1875,198.0218 C124.5156,198.0218 122.5,200.0374 122.5,202.6624 L122.5,203.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="146.5" y="207.2059">AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="198" y1="218.5999" y2="218.5999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="198" y1="226.5999" y2="226.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="235.4999"/>
+          <ellipse cx="101" cy="240.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="110" y="243.6059">akind : AKind</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="252.2998"/>
+          <ellipse cx="101" cy="257.2998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="110" y="260.4058">bb : BB *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i9sfbr1oykmk)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="35.4531"/>
-      <ellipse cx="78" cy="51.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M80.9688,57.0938 Q80.3906,57.3906 79.75,57.5313 Q79.1094,57.6875 78.4063,57.6875 Q75.9063,57.6875 74.5781,56.0469 Q73.2656,54.3906 73.2656,51.2656 Q73.2656,48.1406 74.5781,46.4844 Q75.9063,44.8281 78.4063,44.8281 Q79.1094,44.8281 79.75,44.9844 Q80.4063,45.1406 80.9688,45.4375 L80.9688,48.1563 Q80.3438,47.5781 79.75,47.3125 Q79.1563,47.0313 78.5313,47.0313 Q77.1875,47.0313 76.5,48.1094 Q75.8125,49.1719 75.8125,51.2656 Q75.8125,53.3594 76.5,54.4375 Q77.1875,55.5 78.5313,55.5 Q79.1563,55.5 79.75,55.2344 Q80.3438,54.9531 80.9688,54.375 L80.9688,57.0938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="92" y="55.6074">AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="67.4531" y2="67.4531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="75.4531" y2="75.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000999621481464424961">
+        <rect codeLine="24" fill="#F1F1F1" height="64.7999" id="C_0000999621481464424961" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="98" x="150.5" y="44.7999"/>
+        <ellipse cx="190.7" cy="60.7999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M185.7,61.9562 C185.7,64.4562 187.8406,66.2687 190.7625,66.2687 C191.9969,66.2687 193.1688,65.9718 193.9188,65.4562 C194.5281,65.0343 194.8563,64.6124 194.8563,64.2062 C194.8563,63.7374 194.4344,63.3312 193.9344,63.3312 C193.7,63.3312 193.4813,63.4093 193.2781,63.6124 C192.8406,64.0499 192.8406,64.0499 192.6688,64.1437 C192.2156,64.3781 191.575,64.5187 190.8094,64.5187 C188.8094,64.5187 187.5281,63.5031 187.5281,61.9249 L187.5281,60.8781 C187.5281,59.1749 188.7469,57.9718 190.45,57.9718 C191.0281,57.9718 191.6063,58.1124 192.075,58.3624 C192.5438,58.6281 192.7156,58.8156 192.7781,59.1749 C192.9031,59.8468 193.1531,60.0968 193.6844,60.0968 C193.9656,60.0968 194.2469,59.9562 194.4344,59.7374 C194.5594,59.5656 194.6063,59.3937 194.6063,58.9562 L194.6063,57.5968 C194.6063,57.1749 194.5906,57.0343 194.4656,56.8624 C194.2938,56.6124 194.0125,56.4562 193.6844,56.4562 C193.3719,56.4562 193.1688,56.5656 192.95,56.8312 C191.7781,56.3312 191.3406,56.2218 190.3875,56.2218 C187.7156,56.2218 185.7,58.2374 185.7,60.8624 L185.7,61.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="210.3" y="65.4059">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="247.5" y1="76.7999" y2="76.7999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="247.5" y1="84.7999" y2="84.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="156.5" y="93.6999"/>
+          <ellipse cx="161.5" cy="98.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="170.5" y="101.8059">aaa : AAA *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i9sfbr1oykmk)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="166.9531"/>
-      <ellipse cx="123.85" cy="182.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M126.8188,188.5938 Q126.2406,188.8906 125.6,189.0313 Q124.9594,189.1875 124.2563,189.1875 Q121.7563,189.1875 120.4281,187.5469 Q119.1156,185.8906 119.1156,182.7656 Q119.1156,179.6406 120.4281,177.9844 Q121.7563,176.3281 124.2563,176.3281 Q124.9594,176.3281 125.6,176.4844 Q126.2563,176.6406 126.8188,176.9375 L126.8188,179.6563 Q126.1938,179.0781 125.6,178.8125 Q125.0063,178.5313 124.3813,178.5313 Q123.0375,178.5313 122.35,179.6094 Q121.6625,180.6719 121.6625,182.7656 Q121.6625,184.8594 122.35,185.9375 Q123.0375,187 124.3813,187 Q125.0063,187 125.6,186.7344 Q126.1938,186.4531 126.8188,185.875 L126.8188,188.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="142.15" y="187.1074">AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="198.9531" y2="198.9531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="206.9531" y2="206.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="212.9531"/>
-      <ellipse cx="100.5" cy="217.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="109.5" y="221.1636">akind : AKind</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="225.7578"/>
-      <ellipse cx="100.5" cy="230.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="109.5" y="233.9683">bb : BB *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i9sfbr1oykmk)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="146" y="28.9531"/>
-      <ellipse cx="183.5" cy="44.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M186.4688,50.5938 Q185.8906,50.8906 185.25,51.0313 Q184.6094,51.1875 183.9063,51.1875 Q181.4063,51.1875 180.0781,49.5469 Q178.7656,47.8906 178.7656,44.7656 Q178.7656,41.6406 180.0781,39.9844 Q181.4063,38.3281 183.9063,38.3281 Q184.6094,38.3281 185.25,38.4844 Q185.9063,38.6406 186.4688,38.9375 L186.4688,41.6563 Q185.8438,41.0781 185.25,40.8125 Q184.6563,40.5313 184.0313,40.5313 Q182.6875,40.5313 182,41.6094 Q181.3125,42.6719 181.3125,44.7656 Q181.3125,46.8594 182,47.9375 Q182.6875,49 184.0313,49 Q184.6563,49 185.25,48.7344 Q185.8438,48.4531 186.4688,47.875 L186.4688,50.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="202.5" y="49.1074">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="147" x2="235" y1="60.9531" y2="60.9531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="147" x2="235" y1="68.9531" y2="68.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="152" y="74.9531"/>
-      <ellipse cx="157" cy="79.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="64" x="166" y="83.1636">aaa : AAA *</text>
-    </a>
-    <path d="M123.29,241.2931 C112.3,266.7131 97.72,300.4531 86.91,325.4531 " fill="none" id="C_0001484819281509619918-&gt;C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="84.8,330.3331,92.0469,323.6637,86.7868,325.7448,84.7057,320.4847,84.8,330.3331" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="116" cy="280.0195" 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="123" y="284.02">bb</text>
-    <path d="M159.92,253.3531 C168.85,274.0031 179.17,297.8831 187.78,317.8031 " fill="none" id="C_0001484819281509619918&lt;-C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="154.71,241.2931,153.4195,248.3878,159.472,252.3078,160.7626,245.2131,154.71,241.2931" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="180" cy="280.0195" 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="34" x="187" y="284.02">akind</text>
-    <path d="M102.35,102.5131 C109.82,122.9831 118.7,147.3331 125.85,166.9331 " fill="none" id="C_0000577981285610429577&lt;-C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="95.75,104.8531,95.47,83.6631,108.9,100.0531,95.75,104.8531" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M180.23,89.9831 C172.62,110.8331 162.32,139.0531 153.92,162.0631 " fill="none" id="C_0000999621481464424961-&gt;C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="152.16,166.8931,159.0018,159.8086,153.8733,162.1958,151.4861,157.0673,152.16,166.8931" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="174" cy="129.0195" 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="181" y="133.02">aaa</text>
+    <g id="link_C_0001484819281509619918_C_0001427649116338755656">
+      <path codeLine="28" d="M127.8,268.3399 C115.83,296.9499 102.2439,329.4341 91.1339,356.0141 " fill="none" id="C_0001484819281509619918-to-C_0001427649116338755656" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="88.82,361.5499,95.9814,354.7887,90.7483,356.9367,88.6003,351.7035,88.82,361.5499" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="120.5" cy="307.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="127.5" y="311.2769">bb</text>
+    </g>
+    <g id="link_C_0001484819281509619918_C_0001888428536574868284">
+      <path codeLine="29" d="M165.829,279.4112 C175.479,302.4912 183.07,320.6199 193.26,344.9999 " fill="none" id="C_0001484819281509619918-backto-C_0001888428536574868284" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="161.2,268.3399,159.8241,275.4185,165.829,279.4112,167.2049,272.3325,161.2,268.3399" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="184.5" cy="307.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="191.5" y="311.2769">akind</text>
+    </g>
+    <g id="link_C_0000577981285610429577_C_0001484819281509619918">
+      <path codeLine="30" d="M105.2174,118.594 C113.4774,141.284 120.01,159.1899 129.88,186.2799 " fill="none" id="C_0000577981285610429577-backto-C_0001484819281509619918" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="99.06,101.6799,99.5793,120.6465,110.8554,116.5416,99.06,101.6799" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000999621481464424961_C_0001484819281509619918">
+      <path codeLine="31" d="M187.7,109.9899 C179.43,132.2799 170.3966,156.6145 161.5166,180.5545 " fill="none" id="C_0000999621481464424961-to-C_0001484819281509619918" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="159.43,186.1799,166.3103,179.1328,161.1689,181.492,158.8096,176.3506,159.43,186.1799" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="180.5" cy="148.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="187.5" y="152.6769">aaa</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00068_r1_class_mermaid.svg b/docs/test_cases/t00068_r1_class_mermaid.svg
index 0fe4ab70..b28fe765 100644
--- a/docs/test_cases/t00068_r1_class_mermaid.svg
+++ b/docs/test_cases/t00068_r1_class_mermaid.svg
@@ -1,60 +1,64 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 337.5 526" style="max-width: 337.5px; background-color: white;" width="337.5" id="my-svg">
-  <title id="chart-title-my-svg">AAA context of radius 1</title>
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 337.5 526" style="max-width: 337.5px; background-color: white;" width="337.5" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M120.2448224852071,256L114.01651873767258,261.6666666666667C107.78821499013806,267.3333333333333,95.33160749506904,278.6666666666667,89.10330374753453,295.5C82.875,312.3333333333333,82.875,334.6666666666667,82.875,345.8333333333333L82.875,357"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M231.2551775147929,256L237.48348126232744,261.6666666666667C243.71178500986193,267.3333333333333,256.168392504931,278.6666666666667,262.39669625246546,290C268.625,301.3333333333333,268.625,312.6666666666667,268.625,318.3333333333333L268.625,324"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M117.2734375,76L117.2734375,83.5C117.2734375,91,117.2734375,106,121.19494267751479,119.16666666666667C125.11644785502959,132.33333333333334,132.95945821005918,143.66666666666666,136.88096338757396,149.33333333333334L140.80246856508876,155"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M234.2265625,87L234.2265625,92.66666666666667C234.2265625,98.33333333333333,234.2265625,109.66666666666667,230.30505732248523,121C226.38355214497042,132.33333333333334,218.54054178994082,143.66666666666666,214.61903661242604,149.33333333333334L210.69753143491124,155"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M120.2448224852071,256L114.01651873767258,261.6666666666667C107.78821499013806,267.3333333333333,95.33160749506904,278.6666666666667,89.10330374753453,294.5C82.875,310.3333333333333,82.875,330.6666666666667,82.875,340.8333333333333L82.875,351"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M244.5692327868808,268.1134607859104L248.57852732240067,271.76121732159197C252.58782185792052,275.40897385727357,260.60641092896026,282.70448692863675,264.61570546448013,292.01891013098503C268.625,301.3333333333333,268.625,312.6666666666667,268.625,318.3333333333333L268.625,324"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M117.2734375,94L117.2734375,98.5C117.2734375,103,117.2734375,112,121.19494267751479,122.16666666666667C125.11644785502959,132.33333333333334,132.95945821005918,143.66666666666666,136.88096338757396,149.33333333333334L140.80246856508876,155"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M234.2265625,87L234.2265625,92.66666666666667C234.2265625,98.33333333333333,234.2265625,109.66666666666667,230.87411311026017,120.17770108208765C227.52166372052034,130.68873549750865,220.81676494104067,140.37747099501726,217.46431555130084,145.2218387437716L214.11186616156098,150.0662064925259"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(82.875, 290)" class="edgeLabel">
@@ -101,7 +105,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L9">
+        <a transform="translate(82.875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9">
           <g title="BB" id="classId-C_0001427649116338755656-0" class="node default clickable">
             <rect height="79" width="149.75" y="-39.5" x="-74.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -125,7 +129,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.625, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L13">
+        <a transform="translate(268.625, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13">
           <g title="AKind" id="classId-C_0001888428536574868284-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -159,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L17">
+        <a transform="translate(117.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17">
           <g title="AA" id="classId-C_0000577981285610429577-2" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -178,7 +182,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.75, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19">
+        <a transform="translate(175.75, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-3" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -201,13 +205,13 @@
               </foreignObject>
               <foreignObject transform="translate( -51.375, 13)" height="18" width="61.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+bb : BB </span>
+                  <span style="font-style:italic;" class="nodeLabel">+bb : BB</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(234.2265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L24">
+        <a transform="translate(234.2265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24">
           <g title="R" id="classId-C_0000999621481464424961-4" class="node default clickable">
             <rect height="79" width="95.796875" y="-39.5" x="-47.8984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="47.8984375" x1="-47.8984375" class="divider"/>
@@ -225,7 +229,7 @@
               </foreignObject>
               <foreignObject transform="translate( -40.3984375, 2)" height="18" width="80.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+aaa : AAA </span>
+                  <span style="font-style:italic;" class="nodeLabel">+aaa : AAA</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00068_r2_class.svg b/docs/test_cases/t00068_r2_class.svg
index b4f0b979..a6a545b5 100644
--- a/docs/test_cases/t00068_r2_class.svg
+++ b/docs/test_cases/t00068_r2_class.svg
@@ -1,138 +1,162 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="677px" preserveAspectRatio="none" style="width:301px;height:677px;" version="1.1" viewBox="0 0 301 677" width="301px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="717px" preserveAspectRatio="none" style="width:310px;height:717px;background:#FFFFFF;" version="1.1" viewBox="0 0 310 717" width="310px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1no9u9ctrx5yq" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="50" y="16.708">AAA context of radius 2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1no9u9ctrx5yq)" height="48" id="C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="52" y="618.9531"/>
-      <ellipse cx="67" cy="634.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M69.9688,640.5938 Q69.3906,640.8906 68.75,641.0313 Q68.1094,641.1875 67.4063,641.1875 Q64.9063,641.1875 63.5781,639.5469 Q62.2656,637.8906 62.2656,634.7656 Q62.2656,631.6406 63.5781,629.9844 Q64.9063,628.3281 67.4063,628.3281 Q68.1094,628.3281 68.75,628.4844 Q69.4063,628.6406 69.9688,628.9375 L69.9688,631.6563 Q69.3438,631.0781 68.75,630.8125 Q68.1563,630.5313 67.5313,630.5313 Q66.1875,630.5313 65.5,631.6094 Q64.8125,632.6719 64.8125,634.7656 Q64.8125,636.8594 65.5,637.9375 Q66.1875,639 67.5313,639 Q68.1563,639 68.75,638.7344 Q69.3438,638.4531 69.9688,637.875 L69.9688,640.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="81" y="639.1074">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="53" x2="91" y1="650.9531" y2="650.9531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="53" x2="91" y1="658.9531" y2="658.9531"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="163" x="66.5" y="23.0059">AAA context of radius 2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0000359183874441719256">
+        <rect codeLine="3" fill="#F1F1F1" height="48" id="C_0000359183874441719256" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="55" y="662.3999"/>
+        <ellipse cx="70" cy="678.3999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M65,679.5562 C65,682.0562 67.1406,683.8687 70.0625,683.8687 C71.2969,683.8687 72.4688,683.5718 73.2188,683.0562 C73.8281,682.6343 74.1563,682.2124 74.1563,681.8062 C74.1563,681.3374 73.7344,680.9312 73.2344,680.9312 C73,680.9312 72.7813,681.0093 72.5781,681.2124 C72.1406,681.6499 72.1406,681.6499 71.9688,681.7437 C71.5156,681.9781 70.875,682.1187 70.1094,682.1187 C68.1094,682.1187 66.8281,681.1031 66.8281,679.5249 L66.8281,678.4781 C66.8281,676.7749 68.0469,675.5718 69.75,675.5718 C70.3281,675.5718 70.9063,675.7124 71.375,675.9624 C71.8438,676.2281 72.0156,676.4156 72.0781,676.7749 C72.2031,677.4468 72.4531,677.6968 72.9844,677.6968 C73.2656,677.6968 73.5469,677.5562 73.7344,677.3374 C73.8594,677.1656 73.9063,676.9937 73.9063,676.5562 L73.9063,675.1968 C73.9063,674.7749 73.8906,674.6343 73.7656,674.4624 C73.5938,674.2124 73.3125,674.0562 72.9844,674.0562 C72.6719,674.0562 72.4688,674.1656 72.25,674.4312 C71.0781,673.9312 70.6406,673.8218 69.6875,673.8218 C67.0156,673.8218 65,675.8374 65,678.4624 L65,679.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="84" y="683.0059">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="56" x2="95" y1="694.3999" y2="694.3999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="56" x2="95" y1="702.3999" y2="702.3999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1no9u9ctrx5yq)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="468.4531"/>
-      <ellipse cx="59.75" cy="484.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M62.7188,490.0938 Q62.1406,490.3906 61.5,490.5313 Q60.8594,490.6875 60.1563,490.6875 Q57.6563,490.6875 56.3281,489.0469 Q55.0156,487.3906 55.0156,484.2656 Q55.0156,481.1406 56.3281,479.4844 Q57.6563,477.8281 60.1563,477.8281 Q60.8594,477.8281 61.5,477.9844 Q62.1563,478.1406 62.7188,478.4375 L62.7188,481.1563 Q62.0938,480.5781 61.5,480.3125 Q60.9063,480.0313 60.2813,480.0313 Q58.9375,480.0313 58.25,481.1094 Q57.5625,482.1719 57.5625,484.2656 Q57.5625,486.3594 58.25,487.4375 Q58.9375,488.5 60.2813,488.5 Q60.9063,488.5 61.5,488.2344 Q62.0938,487.9531 62.7188,487.375 L62.7188,490.0938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="80.25" y="488.6074">BB</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="500.4531" y2="500.4531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="508.4531" y2="508.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <g id="elem_C_0001427649116338755656">
+        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001427649116338755656" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="7" y="503.7999"/>
+        <ellipse cx="62.25" cy="519.7999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M57.25,520.9562 C57.25,523.4562 59.3906,525.2687 62.3125,525.2687 C63.5469,525.2687 64.7188,524.9718 65.4688,524.4562 C66.0781,524.0343 66.4063,523.6124 66.4063,523.2062 C66.4063,522.7374 65.9844,522.3312 65.4844,522.3312 C65.25,522.3312 65.0313,522.4093 64.8281,522.6124 C64.3906,523.0499 64.3906,523.0499 64.2188,523.1437 C63.7656,523.3781 63.125,523.5187 62.3594,523.5187 C60.3594,523.5187 59.0781,522.5031 59.0781,520.9249 L59.0781,519.8781 C59.0781,518.1749 60.2969,516.9718 62,516.9718 C62.5781,516.9718 63.1563,517.1124 63.625,517.3624 C64.0938,517.6281 64.2656,517.8156 64.3281,518.1749 C64.4531,518.8468 64.7031,519.0968 65.2344,519.0968 C65.5156,519.0968 65.7969,518.9562 65.9844,518.7374 C66.1094,518.5656 66.1563,518.3937 66.1563,517.9562 L66.1563,516.5968 C66.1563,516.1749 66.1406,516.0343 66.0156,515.8624 C65.8438,515.6124 65.5625,515.4562 65.2344,515.4562 C64.9219,515.4562 64.7188,515.5656 64.5,515.8312 C63.3281,515.3312 62.8906,515.2218 61.9375,515.2218 C59.2656,515.2218 57.25,517.2374 57.25,519.8624 L57.25,520.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="82.75" y="524.4059">BB</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="143" y1="535.7999" y2="535.7999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="143" y1="543.7999" y2="543.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="552.6999"/>
+          <ellipse cx="18" cy="557.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="27" y="560.8059">b : std::vector&lt;B&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="514.4531"/>
-      <ellipse cx="17" cy="519.4531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
+      <g id="elem_C_0001888428536574868284">
+        <rect codeLine="12" fill="#F1F1F1" height="98.3998" id="C_0001888428536574868284" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="69" x="179" y="486.9999"/>
+        <ellipse cx="194" cy="502.9999" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M192.8594,504.0624 L194.1719,504.0624 L194.1719,504.1093 C194.1719,504.5156 194.1875,504.6718 194.2969,504.8281 C194.4688,505.0781 194.7656,505.2499 195.0781,505.2499 C195.3594,505.2499 195.6563,505.1093 195.8281,504.8906 C195.9531,504.7031 196,504.5624 196,504.1093 L196,502.2656 C196,501.9374 195.9844,501.8281 195.9219,501.6562 C195.8125,501.3593 195.4531,501.1093 195.0781,501.1093 C194.7813,501.1093 194.5156,501.2499 194.3438,501.4687 C194.2031,501.6562 194.1719,501.8281 194.1719,502.2656 L194.1719,502.3281 L192.8594,502.3281 L192.8594,500.1562 L196.7031,500.1562 L196.7031,500.9062 C196.7031,501.2968 196.7344,501.4843 196.8438,501.6406 C197.0156,501.8906 197.3125,502.0624 197.625,502.0624 C197.9219,502.0624 198.1875,501.9374 198.375,501.7031 C198.5156,501.5156 198.5469,501.3749 198.5469,500.9062 L198.5469,498.4062 L190.8438,498.4062 C190.3906,498.4062 190.2656,498.4218 190.0938,498.5312 C189.8281,498.7031 189.6563,498.9687 189.6563,499.2812 C189.6563,499.5624 189.7813,499.8281 190.0313,499.9999 C190.2188,500.1249 190.4063,500.1562 190.8438,500.1562 L191.0313,500.1562 L191.0313,506.2499 L190.8438,506.2499 C190.4219,506.2499 190.2656,506.2812 190.0938,506.3749 C189.8281,506.5312 189.6563,506.8124 189.6563,507.1093 C189.6563,507.6874 190.0625,507.9999 190.8438,507.9999 L198.9219,507.9999 L198.9219,505.4687 C198.9219,505.0624 198.8906,504.8906 198.7813,504.7343 C198.6094,504.4687 198.3281,504.3124 198,504.3124 C197.7188,504.3124 197.4375,504.4531 197.25,504.6718 C197.1094,504.8593 197.0781,505.0156 197.0781,505.4687 L197.0781,506.2499 L192.8594,506.2499 L192.8594,504.0624 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="208" y="507.6059">AKind</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="180" x2="247" y1="518.9999" y2="518.9999"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="185" y="536.0059">OneA</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="185" y="552.8058">TwoA</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="185" y="569.6057">ThreeA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="180" x2="247" y1="577.3997" y2="577.3997"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="522.6636">b : std::vector&lt;B&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0001297439817144700057">
+        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001297439817144700057" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="62" y="53.1999"/>
+        <ellipse cx="77" cy="69.1999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M72,70.3562 C72,72.8562 74.1406,74.6687 77.0625,74.6687 C78.2969,74.6687 79.4688,74.3718 80.2188,73.8562 C80.8281,73.4343 81.1563,73.0124 81.1563,72.6062 C81.1563,72.1374 80.7344,71.7312 80.2344,71.7312 C80,71.7312 79.7813,71.8093 79.5781,72.0124 C79.1406,72.4499 79.1406,72.4499 78.9688,72.5437 C78.5156,72.7781 77.875,72.9187 77.1094,72.9187 C75.1094,72.9187 73.8281,71.9031 73.8281,70.3249 L73.8281,69.2781 C73.8281,67.5749 75.0469,66.3718 76.75,66.3718 C77.3281,66.3718 77.9063,66.5124 78.375,66.7624 C78.8438,67.0281 79.0156,67.2156 79.0781,67.5749 C79.2031,68.2468 79.4531,68.4968 79.9844,68.4968 C80.2656,68.4968 80.5469,68.3562 80.7344,68.1374 C80.8594,67.9656 80.9063,67.7937 80.9063,67.3562 L80.9063,65.9968 C80.9063,65.5749 80.8906,65.4343 80.7656,65.2624 C80.5938,65.0124 80.3125,64.8562 79.9844,64.8562 C79.6719,64.8562 79.4688,64.9656 79.25,65.2312 C78.0781,64.7312 77.6406,64.6218 76.6875,64.6218 C74.0156,64.6218 72,66.6374 72,69.2624 L72,70.3562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="91" y="73.8059">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="63" x2="102" y1="85.1999" y2="85.1999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="63" x2="102" y1="93.1999" y2="93.1999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1no9u9ctrx5yq)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="455.9531"/>
-      <ellipse cx="188" cy="471.9531" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M192.1094,477.9531 L184.3906,477.9531 L184.3906,465.5625 L192.1094,465.5625 L192.1094,467.7188 L186.8438,467.7188 L186.8438,470.3906 L191.6094,470.3906 L191.6094,472.5469 L186.8438,472.5469 L186.8438,475.7969 L192.1094,475.7969 L192.1094,477.9531 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="34" x="202" y="476.1074">AKind</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="487.9531" y2="487.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="502.1636">OneA</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="514.9683">TwoA</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="179" y="527.7729">ThreeA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="534.3672" y2="534.3672"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <g id="elem_C_0000577981285610429577">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000577981285610429577" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="65.5" y="194.9999"/>
+        <ellipse cx="80.5" cy="210.9999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M75.5,212.1562 C75.5,214.6562 77.6406,216.4687 80.5625,216.4687 C81.7969,216.4687 82.9688,216.1718 83.7188,215.6562 C84.3281,215.2343 84.6563,214.8124 84.6563,214.4062 C84.6563,213.9374 84.2344,213.5312 83.7344,213.5312 C83.5,213.5312 83.2813,213.6093 83.0781,213.8124 C82.6406,214.2499 82.6406,214.2499 82.4688,214.3437 C82.0156,214.5781 81.375,214.7187 80.6094,214.7187 C78.6094,214.7187 77.3281,213.7031 77.3281,212.1249 L77.3281,211.0781 C77.3281,209.3749 78.5469,208.1718 80.25,208.1718 C80.8281,208.1718 81.4063,208.3124 81.875,208.5624 C82.3438,208.8281 82.5156,209.0156 82.5781,209.3749 C82.7031,210.0468 82.9531,210.2968 83.4844,210.2968 C83.7656,210.2968 84.0469,210.1562 84.2344,209.9374 C84.3594,209.7656 84.4063,209.5937 84.4063,209.1562 L84.4063,207.7968 C84.4063,207.3749 84.3906,207.2343 84.2656,207.0624 C84.0938,206.8124 83.8125,206.6562 83.4844,206.6562 C83.1719,206.6562 82.9688,206.7656 82.75,207.0312 C81.5781,206.5312 81.1406,206.4218 80.1875,206.4218 C77.5156,206.4218 75.5,208.4374 75.5,211.0624 L75.5,212.1562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="94.5" y="215.6059">AA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="66.5" x2="114.5" y1="226.9999" y2="226.9999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="66.5" x2="114.5" y1="234.9999" y2="234.9999"/>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1no9u9ctrx5yq)" height="48" id="C_0001297439817144700057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="59" y="35.4531"/>
-      <ellipse cx="74" cy="51.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M76.9688,57.0938 Q76.3906,57.3906 75.75,57.5313 Q75.1094,57.6875 74.4063,57.6875 Q71.9063,57.6875 70.5781,56.0469 Q69.2656,54.3906 69.2656,51.2656 Q69.2656,48.1406 70.5781,46.4844 Q71.9063,44.8281 74.4063,44.8281 Q75.1094,44.8281 75.75,44.9844 Q76.4063,45.1406 76.9688,45.4375 L76.9688,48.1563 Q76.3438,47.5781 75.75,47.3125 Q75.1563,47.0313 74.5313,47.0313 Q73.1875,47.0313 72.5,48.1094 Q71.8125,49.1719 71.8125,51.2656 Q71.8125,53.3594 72.5,54.4375 Q73.1875,55.5 74.5313,55.5 Q75.1563,55.5 75.75,55.2344 Q76.3438,54.9531 76.9688,54.375 L76.9688,57.0938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="88" y="55.6074">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="60" x2="98" y1="67.4531" y2="67.4531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="60" x2="98" y1="75.4531" y2="75.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <g id="elem_C_0001484819281509619918">
+        <rect codeLine="26" fill="#F1F1F1" height="81.5999" id="C_0001484819281509619918" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="90" y="328.3999"/>
+        <ellipse cx="127.5" cy="344.3999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M122.5,345.5562 C122.5,348.0562 124.6406,349.8687 127.5625,349.8687 C128.7969,349.8687 129.9688,349.5718 130.7188,349.0562 C131.3281,348.6343 131.6563,348.2124 131.6563,347.8062 C131.6563,347.3374 131.2344,346.9312 130.7344,346.9312 C130.5,346.9312 130.2813,347.0093 130.0781,347.2124 C129.6406,347.6499 129.6406,347.6499 129.4688,347.7437 C129.0156,347.9781 128.375,348.1187 127.6094,348.1187 C125.6094,348.1187 124.3281,347.1031 124.3281,345.5249 L124.3281,344.4781 C124.3281,342.7749 125.5469,341.5718 127.25,341.5718 C127.8281,341.5718 128.4063,341.7124 128.875,341.9624 C129.3438,342.2281 129.5156,342.4156 129.5781,342.7749 C129.7031,343.4468 129.9531,343.6968 130.4844,343.6968 C130.7656,343.6968 131.0469,343.5562 131.2344,343.3374 C131.3594,343.1656 131.4063,342.9937 131.4063,342.5562 L131.4063,341.1968 C131.4063,340.7749 131.3906,340.6343 131.2656,340.4624 C131.0938,340.2124 130.8125,340.0562 130.4844,340.0562 C130.1719,340.0562 129.9688,340.1656 129.75,340.4312 C128.5781,339.9312 128.1406,339.8218 127.1875,339.8218 C124.5156,339.8218 122.5,341.8374 122.5,344.4624 L122.5,345.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="146.5" y="349.0059">AAA</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="198" y1="360.3999" y2="360.3999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="198" y1="368.3999" y2="368.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="377.2999"/>
+          <ellipse cx="101" cy="382.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="110" y="385.4059">akind : AKind</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="394.0998"/>
+          <ellipse cx="101" cy="399.0998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="110" y="402.2058">bb : BB *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1no9u9ctrx5yq)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="173.4531"/>
-      <ellipse cx="78" cy="189.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M80.9688,195.0938 Q80.3906,195.3906 79.75,195.5313 Q79.1094,195.6875 78.4063,195.6875 Q75.9063,195.6875 74.5781,194.0469 Q73.2656,192.3906 73.2656,189.2656 Q73.2656,186.1406 74.5781,184.4844 Q75.9063,182.8281 78.4063,182.8281 Q79.1094,182.8281 79.75,182.9844 Q80.4063,183.1406 80.9688,183.4375 L80.9688,186.1563 Q80.3438,185.5781 79.75,185.3125 Q79.1563,185.0313 78.5313,185.0313 Q77.1875,185.0313 76.5,186.1094 Q75.8125,187.1719 75.8125,189.2656 Q75.8125,191.3594 76.5,192.4375 Q77.1875,193.5 78.5313,193.5 Q79.1563,193.5 79.75,193.2344 Q80.3438,192.9531 80.9688,192.375 L80.9688,195.0938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="92" y="193.6074">AA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="205.4531" y2="205.4531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="213.4531" y2="213.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0000999621481464424961">
+        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0000999621481464424961" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="98" x="164.5" y="186.5999"/>
+        <ellipse cx="204.7" cy="202.5999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M199.7,203.7562 C199.7,206.2562 201.8406,208.0687 204.7625,208.0687 C205.9969,208.0687 207.1688,207.7718 207.9188,207.2562 C208.5281,206.8343 208.8563,206.4124 208.8563,206.0062 C208.8563,205.5374 208.4344,205.1312 207.9344,205.1312 C207.7,205.1312 207.4813,205.2093 207.2781,205.4124 C206.8406,205.8499 206.8406,205.8499 206.6688,205.9437 C206.2156,206.1781 205.575,206.3187 204.8094,206.3187 C202.8094,206.3187 201.5281,205.3031 201.5281,203.7249 L201.5281,202.6781 C201.5281,200.9749 202.7469,199.7718 204.45,199.7718 C205.0281,199.7718 205.6063,199.9124 206.075,200.1624 C206.5438,200.4281 206.7156,200.6156 206.7781,200.9749 C206.9031,201.6468 207.1531,201.8968 207.6844,201.8968 C207.9656,201.8968 208.2469,201.7562 208.4344,201.5374 C208.5594,201.3656 208.6063,201.1937 208.6063,200.7562 L208.6063,199.3968 C208.6063,198.9749 208.5906,198.8343 208.4656,198.6624 C208.2938,198.4124 208.0125,198.2562 207.6844,198.2562 C207.3719,198.2562 207.1688,198.3656 206.95,198.6312 C205.7781,198.1312 205.3406,198.0218 204.3875,198.0218 C201.7156,198.0218 199.7,200.0374 199.7,202.6624 L199.7,203.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="224.3" y="207.2059">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="165.5" x2="261.5" y1="218.5999" y2="218.5999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="165.5" x2="261.5" y1="226.5999" y2="226.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="170.5" y="235.4999"/>
+          <ellipse cx="175.5" cy="240.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="184.5" y="243.6059">aaa : AAA *</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1no9u9ctrx5yq)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="304.9531"/>
-      <ellipse cx="123.85" cy="320.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M126.8188,326.5938 Q126.2406,326.8906 125.6,327.0313 Q124.9594,327.1875 124.2563,327.1875 Q121.7563,327.1875 120.4281,325.5469 Q119.1156,323.8906 119.1156,320.7656 Q119.1156,317.6406 120.4281,315.9844 Q121.7563,314.3281 124.2563,314.3281 Q124.9594,314.3281 125.6,314.4844 Q126.2563,314.6406 126.8188,314.9375 L126.8188,317.6563 Q126.1938,317.0781 125.6,316.8125 Q125.0063,316.5313 124.3813,316.5313 Q123.0375,316.5313 122.35,317.6094 Q121.6625,318.6719 121.6625,320.7656 Q121.6625,322.8594 122.35,323.9375 Q123.0375,325 124.3813,325 Q125.0063,325 125.6,324.7344 Q126.1938,324.4531 126.8188,323.875 L126.8188,326.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="142.15" y="325.1074">AAA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="336.9531" y2="336.9531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="344.9531" y2="344.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L28" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L28" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <g id="elem_C_0001168375787542426694">
+        <rect codeLine="37" fill="#F1F1F1" height="64.7999" id="C_0001168375787542426694" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="165" x="138" y="44.7999"/>
+        <ellipse cx="206.25" cy="60.7999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M201.25,61.9562 C201.25,64.4562 203.3906,66.2687 206.3125,66.2687 C207.5469,66.2687 208.7188,65.9718 209.4688,65.4562 C210.0781,65.0343 210.4063,64.6124 210.4063,64.2062 C210.4063,63.7374 209.9844,63.3312 209.4844,63.3312 C209.25,63.3312 209.0313,63.4093 208.8281,63.6124 C208.3906,64.0499 208.3906,64.0499 208.2188,64.1437 C207.7656,64.3781 207.125,64.5187 206.3594,64.5187 C204.3594,64.5187 203.0781,63.5031 203.0781,61.9249 L203.0781,60.8781 C203.0781,59.1749 204.2969,57.9718 206,57.9718 C206.5781,57.9718 207.1563,58.1124 207.625,58.3624 C208.0938,58.6281 208.2656,58.8156 208.3281,59.1749 C208.4531,59.8468 208.7031,60.0968 209.2344,60.0968 C209.5156,60.0968 209.7969,59.9562 209.9844,59.7374 C210.1094,59.5656 210.1563,59.3937 210.1563,58.9562 L210.1563,57.5968 C210.1563,57.1749 210.1406,57.0343 210.0156,56.8624 C209.8438,56.6124 209.5625,56.4562 209.2344,56.4562 C208.9219,56.4562 208.7188,56.5656 208.5,56.8312 C207.3281,56.3312 206.8906,56.2218 205.9375,56.2218 C203.2656,56.2218 201.25,58.2374 201.25,60.8624 L201.25,61.9562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="226.75" y="65.4059">RR</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="302" y1="76.7999" y2="76.7999"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="302" y1="84.7999" y2="84.7999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="144" y="93.6999"/>
+          <ellipse cx="149" cy="98.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139" x="158" y="101.8059">r : std::shared_ptr&lt;R&gt;</text>
+        </a>
+      </g>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="350.9531"/>
-      <ellipse cx="100.5" cy="355.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="109.5" y="359.1636">akind : AKind</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="363.7578"/>
-      <ellipse cx="100.5" cy="368.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="109.5" y="371.9683">bb : BB *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1no9u9ctrx5yq)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="160" y="166.9531"/>
-      <ellipse cx="197.5" cy="182.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M200.4688,188.5938 Q199.8906,188.8906 199.25,189.0313 Q198.6094,189.1875 197.9063,189.1875 Q195.4063,189.1875 194.0781,187.5469 Q192.7656,185.8906 192.7656,182.7656 Q192.7656,179.6406 194.0781,177.9844 Q195.4063,176.3281 197.9063,176.3281 Q198.6094,176.3281 199.25,176.4844 Q199.9063,176.6406 200.4688,176.9375 L200.4688,179.6563 Q199.8438,179.0781 199.25,178.8125 Q198.6563,178.5313 198.0313,178.5313 Q196.6875,178.5313 196,179.6094 Q195.3125,180.6719 195.3125,182.7656 Q195.3125,184.8594 196,185.9375 Q196.6875,187 198.0313,187 Q198.6563,187 199.25,186.7344 Q199.8438,186.4531 200.4688,185.875 L200.4688,188.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="216.5" y="187.1074">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="249" y1="198.9531" y2="198.9531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="249" y1="206.9531" y2="206.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="212.9531"/>
-      <ellipse cx="171" cy="217.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="64" x="180" y="221.1636">aaa : AAA *</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L28" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L28" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1no9u9ctrx5yq)" height="60.8047" id="C_0001168375787542426694" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="134" y="28.9531"/>
-      <ellipse cx="199.75" cy="44.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M202.7188,50.5938 Q202.1406,50.8906 201.5,51.0313 Q200.8594,51.1875 200.1563,51.1875 Q197.6563,51.1875 196.3281,49.5469 Q195.0156,47.8906 195.0156,44.7656 Q195.0156,41.6406 196.3281,39.9844 Q197.6563,38.3281 200.1563,38.3281 Q200.8594,38.3281 201.5,38.4844 Q202.1563,38.6406 202.7188,38.9375 L202.7188,41.6563 Q202.0938,41.0781 201.5,40.8125 Q200.9063,40.5313 200.2813,40.5313 Q198.9375,40.5313 198.25,41.6094 Q197.5625,42.6719 197.5625,44.7656 Q197.5625,46.8594 198.25,47.9375 Q198.9375,49 200.2813,49 Q200.9063,49 201.5,48.7344 Q202.0938,48.4531 202.7188,47.875 L202.7188,50.5938 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="220.25" y="49.1074">RR</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="289" y1="60.9531" y2="60.9531"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="289" y1="68.9531" y2="68.9531"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="140" y="74.9531"/>
-      <ellipse cx="145" cy="79.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="154" y="83.1636">r : std::shared_ptr&lt;R&gt;</text>
-    </a>
-    <path d="M72,542.9131 C72,567.8431 72,598.2831 72,618.7731 " fill="none" id="C_0001427649116338755656&lt;-C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="72,529.7231,68,535.7231,72,541.7231,76,535.7231,72,529.7231" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="73" y="585.02">+b</text>
-    <path d="M81.53,103.5031 C82.89,126.6131 84.51,154.1831 85.64,173.2731 " fill="none" id="C_0001297439817144700057&lt;-C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="74.54,103.9031,80.36,83.5231,88.52,103.0731,74.54,103.9031" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M123.29,379.2931 C112.3,404.7131 97.72,438.4531 86.91,463.4531 " fill="none" id="C_0001484819281509619918-&gt;C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="84.8,468.3331,92.0469,461.6637,86.7868,463.7448,84.7057,458.4847,84.8,468.3331" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="116" cy="418.0195" 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="123" y="422.02">bb</text>
-    <path d="M159.92,391.3531 C168.85,412.0031 179.17,435.8831 187.78,455.8031 " fill="none" id="C_0001484819281509619918&lt;-C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="154.71,379.2931,153.4195,386.3878,159.472,390.3078,160.7626,383.2131,154.71,379.2931" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="180" cy="418.0195" 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="34" x="187" y="422.02">akind</text>
-    <path d="M102.35,240.5131 C109.82,260.9831 118.7,285.3331 125.85,304.9331 " fill="none" id="C_0000577981285610429577&lt;-C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="95.75,242.8531,95.47,221.6631,108.9,238.0531,95.75,242.8531" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M191.32,227.9831 C181.63,248.9231 168.49,277.2831 157.8,300.3531 " fill="none" id="C_0000999621481464424961-&gt;C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="155.7,304.8931,163.1072,298.4022,157.798,300.3546,155.8456,295.0453,155.7,304.8931" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="181" cy="267.0195" 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="188" y="271.02">aaa</text>
-    <path d="M210.48,89.9631 C209.4,110.9331 207.95,139.1931 206.81,161.3331 " fill="none" id="C_0001168375787542426694-&gt;C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="206.54,166.5331,210.9983,157.7511,206.7975,161.5398,203.0089,157.339,206.54,166.5331" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="209" y="133.02">+r</text>
+    <g id="link_C_0001427649116338755656_C_0000359183874441719256">
+      <path codeLine="41" d="M75.5,580.9899 C75.5,608.8899 75.5,636.8199 75.5,661.9099 " fill="none" id="C_0001427649116338755656-backto-C_0000359183874441719256" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="75.5,568.9899,71.5,574.9899,75.5,580.9899,79.5,574.9899,75.5,568.9899" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="76.5" y="628.4769">+b</text>
+    </g>
+    <g id="link_C_0001297439817144700057_C_0000577981285610429577">
+      <path codeLine="42" d="M84.8705,119.5704 C86.3505,145.3804 87.68,168.6899 89.16,194.5199 " fill="none" id="C_0001297439817144700057-backto-C_0000577981285610429577" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="83.84,101.5999,78.8803,119.9139,90.8606,119.2269,83.84,101.5999" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001484819281509619918_C_0001427649116338755656">
+      <path codeLine="43" d="M127.8,410.1399 C115.83,438.7499 102.2439,471.2341 91.1339,497.8141 " fill="none" id="C_0001484819281509619918-to-C_0001427649116338755656" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="88.82,503.3499,95.9814,496.5887,90.7483,498.7367,88.6003,493.5035,88.82,503.3499" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="120.5" cy="449.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="127.5" y="453.0769">bb</text>
+    </g>
+    <g id="link_C_0001484819281509619918_C_0001888428536574868284">
+      <path codeLine="44" d="M165.829,421.2112 C175.479,444.2912 183.07,462.4199 193.26,486.7999 " fill="none" id="C_0001484819281509619918-backto-C_0001888428536574868284" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="161.2,410.1399,159.8241,417.2185,165.829,421.2112,167.2049,414.1325,161.2,410.1399" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="185.5" cy="449.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="192.5" y="453.0769">akind</text>
+    </g>
+    <g id="link_C_0000577981285610429577_C_0001484819281509619918">
+      <path codeLine="45" d="M105.2174,260.394 C113.4774,283.084 120.01,300.9899 129.88,328.0799 " fill="none" id="C_0000577981285610429577-backto-C_0001484819281509619918" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="99.06,243.4799,99.5793,262.4465,110.8554,258.3416,99.06,243.4799" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000999621481464424961_C_0001484819281509619918">
+      <path codeLine="46" d="M198.7,251.7899 C188.32,274.0799 176.9013,298.6 165.7613,322.54 " fill="none" id="C_0000999621481464424961-to-C_0001484819281509619918" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="163.23,327.9799,170.6536,321.5077,165.3395,323.4467,163.4004,318.1325,163.23,327.9799" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="189.5" cy="290.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="196.5" y="294.4769">aaa</text>
+    </g>
+    <g id="link_C_0001168375787542426694_C_0000999621481464424961">
+      <path codeLine="47" d="M218.91,109.9199 C217.77,132.7999 216.5316,157.5575 215.3816,180.4075 " fill="none" id="C_0001168375787542426694-to-C_0000999621481464424961" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="215.08,186.3999,219.5273,177.6124,215.3313,181.4062,211.5374,177.2102,215.08,186.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="218.5" y="152.6769">+r</text>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t00068_r2_class_mermaid.svg b/docs/test_cases/t00068_r2_class_mermaid.svg
index b442380a..18a1239c 100644
--- a/docs/test_cases/t00068_r2_class_mermaid.svg
+++ b/docs/test_cases/t00068_r2_class_mermaid.svg
@@ -1,63 +1,67 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 350.37890625 798" style="max-width: 350.379px; background-color: white;" width="350.37890625" id="my-svg">
-  <title id="chart-title-my-svg">AAA context of radius 2</title>
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 350.37890625 798" style="max-width: 350.379px; background-color: white;" width="350.37890625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M82.875,583L82.875,594.1666666666666C82.875,605.3333333333334,82.875,627.6666666666666,82.875,644.5C82.875,661.3333333333334,82.875,672.6666666666666,82.875,678.3333333333334L82.875,684"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M99.11328125,76L99.11328125,83.5C99.11328125,91,99.11328125,106,99.11328125,121C99.11328125,136,99.11328125,151,99.11328125,158.5L99.11328125,166"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M120.2448224852071,403L114.01651873767258,408.6666666666667C107.78821499013806,414.3333333333333,95.33160749506904,425.6666666666667,89.10330374753453,442.5C82.875,459.3333333333333,82.875,481.6666666666667,82.875,492.8333333333333L82.875,504"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M231.2551775147929,403L237.48348126232744,408.6666666666667C243.71178500986193,414.3333333333333,256.168392504931,425.6666666666667,262.39669625246546,437C268.625,448.3333333333333,268.625,459.6666666666667,268.625,465.3333333333333L268.625,471"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M99.11328125,223L99.11328125,230.5C99.11328125,238,99.11328125,253,104.25262728057199,266.1666666666667C109.39197331114399,279.3333333333333,119.67066537228796,290.6666666666667,124.81001140285996,296.3333333333333L129.94935743343194,302"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M252.38671875,234L252.38671875,239.66666666666666C252.38671875,245.33333333333334,252.38671875,256.6666666666667,247.247372719428,268C242.10802668885603,279.3333333333333,231.82933462771203,290.6666666666667,226.68998859714006,296.3333333333333L221.55064256656806,302"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M252.38671875,87L252.38671875,92.66666666666667C252.38671875,98.33333333333333,252.38671875,109.66666666666667,252.38671875,121C252.38671875,132.33333333333334,252.38671875,143.66666666666666,252.38671875,149.33333333333334L252.38671875,155"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M82.875,601L82.875,609.1666666666666C82.875,617.3333333333334,82.875,633.6666666666666,82.875,647.5C82.875,661.3333333333334,82.875,672.6666666666666,82.875,678.3333333333334L82.875,684"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M99.11328125,94L99.11328125,98.5C99.11328125,103,99.11328125,112,99.11328125,124C99.11328125,136,99.11328125,151,99.11328125,158.5L99.11328125,166"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M120.2448224852071,403L114.01651873767258,408.6666666666667C107.78821499013806,414.3333333333333,95.33160749506904,425.6666666666667,89.10330374753453,441.5C82.875,457.3333333333333,82.875,477.6666666666667,82.875,487.8333333333333L82.875,498"/>
+        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M244.5692327868808,415.1134607859104L248.57852732240067,418.761217321592C252.58782185792052,422.40897385727357,260.60641092896026,429.70448692863675,264.61570546448013,439.01891013098503C268.625,448.3333333333333,268.625,459.6666666666667,268.625,465.3333333333333L268.625,471"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M99.11328125,241L99.11328125,245.5C99.11328125,250,99.11328125,259,104.25262728057199,269.1666666666667C109.39197331114399,279.3333333333333,119.67066537228796,290.6666666666667,124.81001140285996,296.3333333333333L129.94935743343194,302"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M252.38671875,234L252.38671875,239.66666666666666C252.38671875,245.33333333333334,252.38671875,256.6666666666667,247.91917411326082,267.25926868079966C243.45162947652167,277.85187069493264,234.51654020304332,287.7037413898653,230.04899556630414,292.62967673733164L225.58145092956497,297.55561208479793"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M252.38671875,87L252.38671875,92.66666666666667C252.38671875,98.33333333333333,252.38671875,109.66666666666667,252.38671875,120C252.38671875,130.33333333333334,252.38671875,139.66666666666666,252.38671875,144.33333333333334L252.38671875,149"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(82.875, 650)" class="edgeLabel">
@@ -135,7 +139,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.875, 712.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L7">
+        <a transform="translate(82.875, 712.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L7">
           <g title="B" id="classId-C_0000359183874441719256-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -154,7 +158,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(82.875, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L9">
+        <a transform="translate(82.875, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9">
           <g title="BB" id="classId-C_0001427649116338755656-1" class="node default clickable">
             <rect height="79" width="149.75" y="-39.5" x="-74.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -178,7 +182,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.625, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L13">
+        <a transform="translate(268.625, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13">
           <g title="AKind" id="classId-C_0001888428536574868284-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -212,7 +216,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.11328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L15">
+        <a transform="translate(99.11328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L15">
           <g title="A" id="classId-C_0001297439817144700057-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -231,7 +235,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.11328125, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L17">
+        <a transform="translate(99.11328125, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17">
           <g title="AA" id="classId-C_0000577981285610429577-4" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -250,7 +254,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.75, 352.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L19">
+        <a transform="translate(175.75, 352.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-5" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -273,13 +277,13 @@
               </foreignObject>
               <foreignObject transform="translate( -51.375, 13)" height="18" width="61.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+bb : BB </span>
+                  <span style="font-style:italic;" class="nodeLabel">+bb : BB</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(252.38671875, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L24">
+        <a transform="translate(252.38671875, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24">
           <g title="R" id="classId-C_0000999621481464424961-6" class="node default clickable">
             <rect height="79" width="95.796875" y="-39.5" x="-47.8984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="47.8984375" x1="-47.8984375" class="divider"/>
@@ -297,13 +301,13 @@
               </foreignObject>
               <foreignObject transform="translate( -40.3984375, 2)" height="18" width="80.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+aaa : AAA </span>
+                  <span style="font-style:italic;" class="nodeLabel">+aaa : AAA</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(252.38671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t00068/t00068.cc#L28">
+        <a transform="translate(252.38671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L28">
           <g title="RR" id="classId-C_0001168375787542426694-7" class="node default clickable">
             <rect height="79" width="179.984375" y="-39.5" x="-89.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="89.9921875" x1="-89.9921875" class="divider"/>
diff --git a/docs/test_cases/t00069.md b/docs/test_cases/t00069.md
new file mode 100644
index 00000000..69fa153d
--- /dev/null
+++ b/docs/test_cases/t00069.md
@@ -0,0 +1,547 @@
+# t00069 - Coroutine methods in class diagrams
+## Config
+```yaml
+diagrams:
+  t00069_class:
+    type: class
+    glob:
+      - t00069.cc
+    include:
+      namespaces:
+        - clanguml::t00069
+    using_namespace: clanguml::t00069
+```
+## Source code
+File `tests/t00069/t00069.cc`
+```cpp
+#include <coroutine>
+#include <optional>
+
+namespace clanguml {
+namespace t00069 {
+
+template <typename T> struct generator {
+    struct promise_type;
+    using handle_type = std::coroutine_handle<promise_type>;
+
+    generator(handle_type h)
+        : h_(h)
+    {
+    }
+
+    ~generator() { h_.destroy(); }
+
+    struct promise_type {
+        T value_;
+        std::exception_ptr exception_;
+
+        generator get_return_object()
+        {
+            return generator(handle_type::from_promise(*this));
+        }
+        std::suspend_always initial_suspend() { return {}; }
+
+        std::suspend_always final_suspend() noexcept { return {}; }
+
+        void unhandled_exception() { exception_ = std::current_exception(); }
+
+        template <std::convertible_to<T> From>
+        std::suspend_always yield_value(From &&from)
+        {
+            value_ = std::forward<From>(from);
+            return {};
+        }
+
+        void return_void() { }
+    };
+
+    handle_type h_;
+
+private:
+    bool full_ = false;
+};
+
+class A {
+public:
+    generator<unsigned long> iota() { co_yield counter_++; }
+
+    generator<unsigned long> seed()
+    {
+        counter_ = 42;
+        co_return;
+    }
+
+private:
+    unsigned long counter_;
+};
+
+} // namespace t00069
+} // namespace clanguml
+
+```
+## Generated PlantUML diagrams
+![t00069_class](./t00069_class.svg "Coroutine methods in class diagrams")
+## Generated Mermaid diagrams
+![t00069_class](./t00069_class_mermaid.svg "Coroutine methods in class diagrams")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00069::generator<T>",
+      "id": "2142496233889685657",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "h_",
+          "source_location": {
+            "column": 17,
+            "file": "t00069.cc",
+            "line": 42,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "handle_type"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "full_",
+          "source_location": {
+            "column": 10,
+            "file": "t00069.cc",
+            "line": 45,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "bool"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": true,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "generator",
+          "parameters": [
+            {
+              "name": "h",
+              "type": "handle_type"
+            }
+          ],
+          "source_location": {
+            "column": 5,
+            "file": "t00069.cc",
+            "line": 11,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "~generator",
+          "parameters": [],
+          "source_location": {
+            "column": 5,
+            "file": "t00069.cc",
+            "line": 16,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "void"
+        }
+      ],
+      "name": "generator",
+      "namespace": "clanguml::t00069",
+      "source_location": {
+        "column": 30,
+        "file": "t00069.cc",
+        "line": 7,
+        "translation_unit": "t00069.cc"
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00069::generator::promise_type",
+      "id": "721812727497968117",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "value_",
+          "source_location": {
+            "column": 11,
+            "file": "t00069.cc",
+            "line": 19,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "exception_",
+          "source_location": {
+            "column": 28,
+            "file": "t00069.cc",
+            "line": 20,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "std::exception_ptr"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_return_object",
+          "parameters": [],
+          "source_location": {
+            "column": 19,
+            "file": "t00069.cc",
+            "line": 22,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "generator<T>"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "initial_suspend",
+          "parameters": [],
+          "source_location": {
+            "column": 29,
+            "file": "t00069.cc",
+            "line": 26,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "std::suspend_always"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": true,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "final_suspend",
+          "parameters": [],
+          "source_location": {
+            "column": 29,
+            "file": "t00069.cc",
+            "line": 28,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "std::suspend_always"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "unhandled_exception",
+          "parameters": [],
+          "source_location": {
+            "column": 14,
+            "file": "t00069.cc",
+            "line": 30,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "return_void",
+          "parameters": [],
+          "source_location": {
+            "column": 14,
+            "file": "t00069.cc",
+            "line": 39,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "yield_value",
+          "parameters": [
+            {
+              "name": "from",
+              "type": "From &&"
+            }
+          ],
+          "type": "std::suspend_always"
+        }
+      ],
+      "name": "generator::promise_type",
+      "namespace": "clanguml::t00069",
+      "source_location": {
+        "column": 12,
+        "file": "t00069.cc",
+        "line": 18,
+        "translation_unit": "t00069.cc"
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00069::generator<unsigned long>",
+      "id": "1604358347140526608",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "generator",
+      "namespace": "clanguml::t00069",
+      "source_location": {
+        "column": 30,
+        "file": "t00069.cc",
+        "line": 7,
+        "translation_unit": "t00069.cc"
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "unsigned long"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00069::A",
+      "id": "2160142503252767290",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "counter_",
+          "source_location": {
+            "column": 19,
+            "file": "t00069.cc",
+            "line": 59,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "unsigned long"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": true,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "iota",
+          "parameters": [],
+          "source_location": {
+            "column": 30,
+            "file": "t00069.cc",
+            "line": 50,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "clanguml::t00069::generator<unsigned long>"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": true,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "seed",
+          "parameters": [],
+          "source_location": {
+            "column": 30,
+            "file": "t00069.cc",
+            "line": 52,
+            "translation_unit": "t00069.cc"
+          },
+          "type": "clanguml::t00069::generator<unsigned long>"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00069",
+      "source_location": {
+        "column": 7,
+        "file": "t00069.cc",
+        "line": 48,
+        "translation_unit": "t00069.cc"
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00069_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2142496233889685657",
+      "source": "721812727497968117",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "2142496233889685657",
+      "source": "1604358347140526608",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1604358347140526608",
+      "source": "2160142503252767290",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t00069"
+}
+```
diff --git a/docs/test_cases/t00069_class.svg b/docs/test_cases/t00069_class.svg
new file mode 100644
index 00000000..13da91c0
--- /dev/null
+++ b/docs/test_cases/t00069_class.svg
@@ -0,0 +1,165 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="529px" preserveAspectRatio="none" style="width:805px;height:529px;background:#FFFFFF;" version="1.1" viewBox="0 0 805 529" width="805px" zoomAndPan="magnify">
+  <defs>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <g id="elem_C_0002142496233889685657">
+        <rect codeLine="2" fill="#F1F1F1" height="115.1997" id="C_0002142496233889685657" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="226" x="338" y="407.8"/>
+        <ellipse cx="410.25" cy="423.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M405.25,424.9563 C405.25,427.4563 407.3906,429.2688 410.3125,429.2688 C411.5469,429.2688 412.7188,428.9719 413.4688,428.4563 C414.0781,428.0344 414.4063,427.6125 414.4063,427.2063 C414.4063,426.7375 413.9844,426.3313 413.4844,426.3313 C413.25,426.3313 413.0313,426.4094 412.8281,426.6125 C412.3906,427.05 412.3906,427.05 412.2188,427.1438 C411.7656,427.3781 411.125,427.5188 410.3594,427.5188 C408.3594,427.5188 407.0781,426.5031 407.0781,424.925 L407.0781,423.8781 C407.0781,422.175 408.2969,420.9719 410,420.9719 C410.5781,420.9719 411.1563,421.1125 411.625,421.3625 C412.0938,421.6281 412.2656,421.8156 412.3281,422.175 C412.4531,422.8469 412.7031,423.0969 413.2344,423.0969 C413.5156,423.0969 413.7969,422.9563 413.9844,422.7375 C414.1094,422.5656 414.1563,422.3938 414.1563,421.9563 L414.1563,420.5969 C414.1563,420.175 414.1406,420.0344 414.0156,419.8625 C413.8438,419.6125 413.5625,419.4563 413.2344,419.4563 C412.9219,419.4563 412.7188,419.5656 412.5,419.8313 C411.3281,419.3313 410.8906,419.2219 409.9375,419.2219 C407.2656,419.2219 405.25,421.2375 405.25,423.8625 L405.25,424.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="430.75" y="428.406">generator</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="558" y="404.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="559" y="419.0001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="339" x2="563" y1="439.8" y2="439.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="344" y="448.7"/>
+          <ellipse cx="349" cy="453.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="358" y="456.8059">generator(handle_type h) : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="344" y="465.4999"/>
+          <ellipse cx="349" cy="470.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="358" y="473.6059">~generator() : void</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="339" x2="563" y1="481.3999" y2="481.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="344" y="490.2998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="346" y="492.2998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="65" x="358" y="498.4058">full_ : bool</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="344" y="507.0997"/>
+          <ellipse cx="349" cy="512.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="358" y="515.2057">h_ : handle_type</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L18" target="_top" title="generator##promise_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L18" xlink:show="new" xlink:title="generator##promise_type" xlink:type="simple">
+      <g id="elem_C_0000721812727497968117">
+        <rect codeLine="10" fill="#F1F1F1" height="182.3994" id="C_0000721812727497968117" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="510" x="7" y="165.4"/>
+        <ellipse cx="179.75" cy="181.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M174.75,182.5562 C174.75,185.0562 176.8906,186.8687 179.8125,186.8687 C181.0469,186.8687 182.2188,186.5719 182.9688,186.0562 C183.5781,185.6344 183.9063,185.2125 183.9063,184.8062 C183.9063,184.3375 183.4844,183.9312 182.9844,183.9312 C182.75,183.9312 182.5313,184.0094 182.3281,184.2125 C181.8906,184.65 181.8906,184.65 181.7188,184.7437 C181.2656,184.9781 180.625,185.1187 179.8594,185.1187 C177.8594,185.1187 176.5781,184.1031 176.5781,182.525 L176.5781,181.4781 C176.5781,179.775 177.7969,178.5719 179.5,178.5719 C180.0781,178.5719 180.6563,178.7125 181.125,178.9625 C181.5938,179.2281 181.7656,179.4156 181.8281,179.775 C181.9531,180.4469 182.2031,180.6969 182.7344,180.6969 C183.0156,180.6969 183.2969,180.5562 183.4844,180.3375 C183.6094,180.1656 183.6563,179.9937 183.6563,179.5562 L183.6563,178.1969 C183.6563,177.775 183.6406,177.6344 183.5156,177.4625 C183.3438,177.2125 183.0625,177.0562 182.7344,177.0562 C182.4219,177.0562 182.2188,177.1656 182,177.4312 C180.8281,176.9312 180.3906,176.8219 179.4375,176.8219 C176.7656,176.8219 174.75,178.8375 174.75,181.4625 L174.75,182.5562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="156" x="200.25" y="186.006">generator::promise_type</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="516" y1="197.4" y2="197.4"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="206.3"/>
+          <ellipse cx="18" cy="211.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="27" y="214.4059">final_suspend() noexcept : std::suspend_always</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.0999"/>
+          <ellipse cx="18" cy="228.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="27" y="231.2059">get_return_object() : generator&lt;T&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="239.8998"/>
+          <ellipse cx="18" cy="244.8998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248" x="27" y="248.0058">initial_suspend() : std::suspend_always</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="256.6997"/>
+          <ellipse cx="18" cy="261.6997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="27" y="264.8057">return_void() : void</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="273.4997"/>
+          <ellipse cx="18" cy="278.4997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="184" x="27" y="281.6057">unhandled_exception() : void</text>
+        </a>
+        <ellipse cx="18" cy="295.2996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="484" x="27" y="298.4056">yield_value&lt;std::convertible_to From&gt;(From &amp;&amp; from) : std::suspend_always</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="516" y1="306.1996" y2="306.1996"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="315.0995"/>
+          <ellipse cx="18" cy="320.0995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="194" x="27" y="323.2055">exception_ : std::exception_ptr</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="331.8995"/>
+          <ellipse cx="18" cy="336.8995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="27" y="340.0054">value_ : T</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <g id="elem_C_0001604358347140526608">
+        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001604358347140526608" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="176" x="552" y="232.6"/>
+        <ellipse cx="567" cy="248.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M562,249.7563 C562,252.2563 564.1406,254.0688 567.0625,254.0688 C568.2969,254.0688 569.4688,253.7719 570.2188,253.2563 C570.8281,252.8344 571.1563,252.4125 571.1563,252.0063 C571.1563,251.5375 570.7344,251.1313 570.2344,251.1313 C570,251.1313 569.7813,251.2094 569.5781,251.4125 C569.1406,251.85 569.1406,251.85 568.9688,251.9438 C568.5156,252.1781 567.875,252.3188 567.1094,252.3188 C565.1094,252.3188 563.8281,251.3031 563.8281,249.725 L563.8281,248.6781 C563.8281,246.975 565.0469,245.7719 566.75,245.7719 C567.3281,245.7719 567.9063,245.9125 568.375,246.1625 C568.8438,246.4281 569.0156,246.6156 569.0781,246.975 C569.2031,247.6469 569.4531,247.8969 569.9844,247.8969 C570.2656,247.8969 570.5469,247.7563 570.7344,247.5375 C570.8594,247.3656 570.9063,247.1938 570.9063,246.7563 L570.9063,245.3969 C570.9063,244.975 570.8906,244.8344 570.7656,244.6625 C570.5938,244.4125 570.3125,244.2563 569.9844,244.2563 C569.6719,244.2563 569.4688,244.3656 569.25,244.6313 C568.0781,244.1313 567.6406,244.0219 566.6875,244.0219 C564.0156,244.0219 562,246.0375 562,248.6625 L562,249.7563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="581" y="253.206">generator</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="80" x="651" y="229.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="78" x="652" y="243.8001">unsigned long</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="553" x2="727" y1="264.6" y2="264.6"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="553" x2="727" y1="272.6" y2="272.6"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L48" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L48" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002160142503252767290">
+        <rect codeLine="26" fill="#F1F1F1" height="98.3998" id="C_0002160142503252767290" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="317" x="481.5" y="7"/>
+        <ellipse cx="631.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M626.25,24.1563 C626.25,26.6563 628.3906,28.4688 631.3125,28.4688 C632.5469,28.4688 633.7188,28.1719 634.4688,27.6563 C635.0781,27.2344 635.4063,26.8125 635.4063,26.4063 C635.4063,25.9375 634.9844,25.5313 634.4844,25.5313 C634.25,25.5313 634.0313,25.6094 633.8281,25.8125 C633.3906,26.25 633.3906,26.25 633.2188,26.3438 C632.7656,26.5781 632.125,26.7188 631.3594,26.7188 C629.3594,26.7188 628.0781,25.7031 628.0781,24.125 L628.0781,23.0781 C628.0781,21.375 629.2969,20.1719 631,20.1719 C631.5781,20.1719 632.1563,20.3125 632.625,20.5625 C633.0938,20.8281 633.2656,21.0156 633.3281,21.375 C633.4531,22.0469 633.7031,22.2969 634.2344,22.2969 C634.5156,22.2969 634.7969,22.1563 634.9844,21.9375 C635.1094,21.7656 635.1563,21.5938 635.1563,21.1563 L635.1563,19.7969 C635.1563,19.375 635.1406,19.2344 635.0156,19.0625 C634.8438,18.8125 634.5625,18.6563 634.2344,18.6563 C633.9219,18.6563 633.7188,18.7656 633.5,19.0313 C632.3281,18.5313 631.8906,18.4219 630.9375,18.4219 C628.2656,18.4219 626.25,20.4375 626.25,23.0625 L626.25,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="651.75" y="27.606">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="482.5" x2="797.5" y1="39" y2="39"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="487.5" y="47.9"/>
+          <ellipse cx="492.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="283" x="501.5" y="56.0059">iota() [coroutine] : generator&lt;unsigned long&gt;</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="487.5" y="64.6999"/>
+          <ellipse cx="492.5" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="291" x="501.5" y="72.8059">seed() [coroutine] : generator&lt;unsigned long&gt;</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="482.5" x2="797.5" y1="80.5999" y2="80.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="487.5" y="89.4998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="489.5" y="91.4998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="501.5" y="97.6058">counter_ : unsigned long</text>
+        </a>
+      </g>
+    </a>
+    <g id="link_C_0000721812727497968117_C_0002142496233889685657">
+      <path codeLine="32" d="M344.62,348.01 C363.1,368.22 371.3947,377.3006 388.2147,395.7006 " fill="none" id="C_0000721812727497968117-to-C_0002142496233889685657" style="stroke:#181818;stroke-width:1.0;"/>
+      <ellipse cx="393.6123" cy="401.6053" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="388.2147" x2="399.01" y1="395.7006" y2="407.51"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="399.517" x2="387.7077" y1="396.2077" y2="407.003"/>
+    </g>
+    <g id="link_C_0001604358347140526608_C_0002142496233889685657">
+      <path codeLine="33" d="M618.69,280.92 C590.79,311.45 553.1049,352.6846 514.9849,394.3846 " fill="none" id="C_0001604358347140526608-to-C_0002142496233889685657" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="none" points="502.84,407.67,519.4133,398.4329,510.5564,390.3363,502.84,407.67" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002160142503252767290_C_0001604358347140526608">
+      <path codeLine="34" d="M640,105.73 C640,145.89 640,195.18 640,226.14 " fill="none" id="C_0002160142503252767290-to-C_0001604358347140526608" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="640,232.14,644,223.14,640,227.14,636,223.14,640,232.14" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t00069_class_mermaid.svg b/docs/test_cases/t00069_class_mermaid.svg
new file mode 100644
index 00000000..53a99bab
--- /dev/null
+++ b/docs/test_cases/t00069_class_mermaid.svg
@@ -0,0 +1,252 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 401.375 724" style="max-width: 401.375px; background-color: white;" width="401.375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+      <style type="text/css">a:hover { text-decoration: underline; }</style>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+        <path d="M 1,7 L18,13 V 1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+        <path d="M 1,1 V 13 L18,7 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+        <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+        <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths">
+        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M200.6875,446.5L200.6875,448.4166666666667C200.6875,450.3333333333333,200.6875,454.1666666666667,200.6875,460.25C200.6875,466.3333333333333,200.6875,474.6666666666667,200.6875,478.8333333333333L200.6875,483"/>
+        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M200.6875,238L200.6875,242.16666666666666C200.6875,246.33333333333334,200.6875,254.66666666666666,200.6875,260C200.6875,265.3333333333333,200.6875,267.6666666666667,200.6875,268.8333333333333L200.6875,270"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M200.6875,131L200.6875,135.16666666666666C200.6875,139.33333333333334,200.6875,147.66666666666666,200.6875,155C200.6875,162.33333333333334,200.6875,168.66666666666666,200.6875,171.83333333333334L200.6875,175"/>
+      </g>
+      <g class="edgeLabels">
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <a transform="translate(200.6875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7">
+          <g title="generator" id="classId-C_0002142496233889685657-0" class="node default clickable">
+            <rect height="145" width="255.609375" y="-72.5" x="-127.8046875" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="127.8046875" x1="-127.8046875" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="127.8046875" x1="-127.8046875" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -51.1328125, -65)" height="18" width="102.265625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">generator&lt;T&gt;</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -120.3046875, -31)" height="18" width="78.265625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-full_ : bool</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -120.3046875, -9)" height="18" width="127.671875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+h_ : handle_type</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -120.3046875, 25)" height="18" width="240.609375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+generator(handle_type h) : : void</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -120.3046875, 47)" height="18" width="149.421875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+~generator() : : void</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(200.6875, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L18">
+          <g title="generator##promise_type" id="classId-C_0000721812727497968117-1" class="node default clickable">
+            <rect height="233" width="385.375" y="-116.5" x="-192.6875" class="outer title-state"/>
+            <line y2="-86.5" y1="-86.5" x2="192.6875" x1="-192.6875" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="192.6875" x1="-192.6875" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -94.25, -109)" height="18" width="188.5" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">generator::promise_type</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -185.1875, -75)" height="18" width="226.375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+exception_ : std::exception_ptr</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -185.1875, -53)" height="18" width="79.3125">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+value_ : T</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -185.1875, -19)" height="18" width="289.5">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+final_suspend() : : std::suspend_always</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -185.1875, 3)" height="18" width="263.71875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+get_return_object() : : generator&lt;T&gt;</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -185.1875, 25)" height="18" width="296.609375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+initial_suspend() : : std::suspend_always</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -185.1875, 47)" height="18" width="151.625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+return_void() : : void</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -185.1875, 69)" height="18" width="223.71875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+unhandled_exception() : : void</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -185.1875, 91)" height="18" width="370.375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+yield_value(From &amp;&amp; from) : : std::suspend_always</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(200.6875, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7">
+          <g title="generator" id="classId-C_0001604358347140526608-2" class="node default clickable">
+            <rect height="57" width="216.8125" y="-28.5" x="-108.40625" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="108.40625" x1="-108.40625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="108.40625" x1="-108.40625" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -100.90625, -21)" height="18" width="201.8125" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">generator&lt;unsigned long&gt;</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(200.6875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L48">
+          <g title="A" id="classId-C_0002160142503252767290-3" class="node default clickable">
+            <rect height="123" width="357.90625" y="-61.5" x="-178.953125" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="178.953125" x1="-178.953125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="178.953125" x1="-178.953125" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -54)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">A</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -171.453125, -20)" height="18" width="180.578125">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-counter_ : unsigned long</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -171.453125, 14)" height="18" width="334">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+iota() : : [coroutine] generator&lt;unsigned long&gt;</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -171.453125, 36)" height="18" width="342.90625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+seed() : : [coroutine] generator&lt;unsigned long&gt;</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t00070.md b/docs/test_cases/t00070.md
new file mode 100644
index 00000000..4d317017
--- /dev/null
+++ b/docs/test_cases/t00070.md
@@ -0,0 +1,259 @@
+# t00070 - Diagram filter based on C++20 modules
+## Config
+```yaml
+diagrams:
+  t00070_class:
+    type: class
+    glob:
+      - t00070.cc
+    include:
+      modules:
+        - t00070
+    exclude:
+      modules:
+        - t00070.lib2
+      module_access:
+        - private
+    using_namespace: clanguml::t00070
+```
+## Source code
+File `tests/t00070/t00070.cc`
+```cpp
+import t00070;
+import t00070.lib1;
+import t00070.lib2;
+
+namespace clanguml {
+namespace t00070 {
+int tmain()
+{
+    B b;
+    C c;
+
+    return 0;
+}
+}
+}
+```
+File `tests/t00070/src/lib1.cppm`
+```cpp
+export module t00070.lib1;
+
+export namespace clanguml::t00070 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+enum class BBB { bbb1, bbb2 };
+}
+
+module :private;
+namespace clanguml::t00070 {
+class BBBB { };
+}
+```
+File `tests/t00070/src/lib2.cppm`
+```cpp
+export module t00070.lib2;
+
+export namespace clanguml::t00070 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+enum class CCC { ccc1, ccc2 };
+}
+```
+File `tests/t00070/src/common.cppm`
+```cpp
+export module t00070;
+export import t00070.lib1;
+export import t00070.lib2;
+
+export namespace clanguml::t00070 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
+```
+## Generated PlantUML diagrams
+![t00070_class](./t00070_class.svg "Diagram filter based on C++20 modules")
+## Generated Mermaid diagrams
+![t00070_class](./t00070_class_mermaid.svg "Diagram filter based on C++20 modules")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00070::B",
+      "id": "1364261599035905834",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "module": {
+        "is_private": false,
+        "name": "t00070.lib1"
+      },
+      "name": "B",
+      "namespace": "clanguml::t00070",
+      "source_location": {
+        "column": 7,
+        "file": "src/lib1.cppm",
+        "line": 4,
+        "translation_unit": "t00070.cc"
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00070::BB<T>",
+      "id": "1485755083045282660",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "t",
+          "source_location": {
+            "column": 7,
+            "file": "src/lib1.cppm",
+            "line": 7,
+            "translation_unit": "t00070.cc"
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "module": {
+        "is_private": false,
+        "name": "t00070.lib1"
+      },
+      "name": "BB",
+      "namespace": "clanguml::t00070",
+      "source_location": {
+        "column": 29,
+        "file": "src/lib1.cppm",
+        "line": 6,
+        "translation_unit": "t00070.cc"
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "bbb1",
+        "bbb2"
+      ],
+      "display_name": "clanguml::t00070::BBB",
+      "id": "1734694076622541097",
+      "is_nested": false,
+      "module": {
+        "is_private": false,
+        "name": "t00070.lib1"
+      },
+      "name": "BBB",
+      "namespace": "clanguml::t00070",
+      "source_location": {
+        "column": 12,
+        "file": "src/lib1.cppm",
+        "line": 10,
+        "translation_unit": "t00070.cc"
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00070::A",
+      "id": "668221430913861424",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "column": 9,
+            "file": "src/common.cppm",
+            "line": 9,
+            "translation_unit": "t00070.cc"
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": false,
+          "is_consteval": false,
+          "is_constexpr": false,
+          "is_constructor": false,
+          "is_copy_assignment": false,
+          "is_coroutine": false,
+          "is_defaulted": false,
+          "is_deleted": false,
+          "is_move_assignment": false,
+          "is_noexcept": false,
+          "is_operator": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get",
+          "parameters": [],
+          "source_location": {
+            "column": 9,
+            "file": "src/common.cppm",
+            "line": 7,
+            "translation_unit": "t00070.cc"
+          },
+          "type": "int"
+        }
+      ],
+      "module": {
+        "is_private": false,
+        "name": "t00070"
+      },
+      "name": "A",
+      "namespace": "clanguml::t00070",
+      "source_location": {
+        "column": 7,
+        "file": "src/common.cppm",
+        "line": 6,
+        "translation_unit": "t00070.cc"
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00070_class",
+  "relationships": [],
+  "using_namespace": "clanguml::t00070"
+}
+```
diff --git a/docs/test_cases/t00070_class.svg b/docs/test_cases/t00070_class.svg
new file mode 100644
index 00000000..ba83c587
--- /dev/null
+++ b/docs/test_cases/t00070_class.svg
@@ -0,0 +1,72 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="223px" preserveAspectRatio="none" style="width:191px;height:223px;background:#FFFFFF;" version="1.1" viewBox="0 0 191 223" width="191px" zoomAndPan="magnify">
+  <defs>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001364261599035905834">
+        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001364261599035905834" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="16" y="18.4"/>
+        <ellipse cx="31" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M26,35.5563 C26,38.0563 28.1406,39.8688 31.0625,39.8688 C32.2969,39.8688 33.4688,39.5719 34.2188,39.0563 C34.8281,38.6344 35.1563,38.2125 35.1563,37.8063 C35.1563,37.3375 34.7344,36.9313 34.2344,36.9313 C34,36.9313 33.7813,37.0094 33.5781,37.2125 C33.1406,37.65 33.1406,37.65 32.9688,37.7438 C32.5156,37.9781 31.875,38.1188 31.1094,38.1188 C29.1094,38.1188 27.8281,37.1031 27.8281,35.525 L27.8281,34.4781 C27.8281,32.775 29.0469,31.5719 30.75,31.5719 C31.3281,31.5719 31.9063,31.7125 32.375,31.9625 C32.8438,32.2281 33.0156,32.4156 33.0781,32.775 C33.2031,33.4469 33.4531,33.6969 33.9844,33.6969 C34.2656,33.6969 34.5469,33.5563 34.7344,33.3375 C34.8594,33.1656 34.9063,32.9938 34.9063,32.5563 L34.9063,31.1969 C34.9063,30.775 34.8906,30.6344 34.7656,30.4625 C34.5938,30.2125 34.3125,30.0563 33.9844,30.0563 C33.6719,30.0563 33.4688,30.1656 33.25,30.4313 C32.0781,29.9313 31.6406,29.8219 30.6875,29.8219 C28.0156,29.8219 26,31.8375 26,34.4625 L26,35.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="45" y="39.006">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="17" x2="56" y1="50.4" y2="50.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="17" x2="56" y1="58.4" y2="58.4"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <g id="elem_C_0001485755083045282660">
+        <rect codeLine="6" fill="#F1F1F1" height="64.7999" id="C_0001485755083045282660" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="92" y="10"/>
+        <ellipse cx="107" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M102,27.1563 C102,29.6563 104.1406,31.4688 107.0625,31.4688 C108.2969,31.4688 109.4688,31.1719 110.2188,30.6563 C110.8281,30.2344 111.1563,29.8125 111.1563,29.4063 C111.1563,28.9375 110.7344,28.5313 110.2344,28.5313 C110,28.5313 109.7813,28.6094 109.5781,28.8125 C109.1406,29.25 109.1406,29.25 108.9688,29.3438 C108.5156,29.5781 107.875,29.7188 107.1094,29.7188 C105.1094,29.7188 103.8281,28.7031 103.8281,27.125 L103.8281,26.0781 C103.8281,24.375 105.0469,23.1719 106.75,23.1719 C107.3281,23.1719 107.9063,23.3125 108.375,23.5625 C108.8438,23.8281 109.0156,24.0156 109.0781,24.375 C109.2031,25.0469 109.4531,25.2969 109.9844,25.2969 C110.2656,25.2969 110.5469,25.1563 110.7344,24.9375 C110.8594,24.7656 110.9063,24.5938 110.9063,24.1563 L110.9063,22.7969 C110.9063,22.375 110.8906,22.2344 110.7656,22.0625 C110.5938,21.8125 110.3125,21.6563 109.9844,21.6563 C109.6719,21.6563 109.4688,21.7656 109.25,22.0313 C108.0781,21.5313 107.6406,21.4219 106.6875,21.4219 C104.0156,21.4219 102,23.4375 102,26.0625 L102,27.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="121" y="30.606">BB</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="147" y="7"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="148" y="21.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="93" x2="152" y1="42" y2="42"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="93" x2="152" y1="50" y2="50"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="98" y="58.9"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="100" y="60.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="112" y="67.0059">t : T</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L10" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L10" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <g id="elem_C_0001734694076622541097">
+        <rect codeLine="11" fill="#F1F1F1" height="81.5999" id="C_0001734694076622541097" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="7" y="134.8"/>
+        <ellipse cx="22" cy="150.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M20.8594,151.8625 L22.1719,151.8625 L22.1719,151.9094 C22.1719,152.3156 22.1875,152.4719 22.2969,152.6281 C22.4688,152.8781 22.7656,153.05 23.0781,153.05 C23.3594,153.05 23.6563,152.9094 23.8281,152.6906 C23.9531,152.5031 24,152.3625 24,151.9094 L24,150.0656 C24,149.7375 23.9844,149.6281 23.9219,149.4563 C23.8125,149.1594 23.4531,148.9094 23.0781,148.9094 C22.7813,148.9094 22.5156,149.05 22.3438,149.2688 C22.2031,149.4563 22.1719,149.6281 22.1719,150.0656 L22.1719,150.1281 L20.8594,150.1281 L20.8594,147.9563 L24.7031,147.9563 L24.7031,148.7063 C24.7031,149.0969 24.7344,149.2844 24.8438,149.4406 C25.0156,149.6906 25.3125,149.8625 25.625,149.8625 C25.9219,149.8625 26.1875,149.7375 26.375,149.5031 C26.5156,149.3156 26.5469,149.175 26.5469,148.7063 L26.5469,146.2063 L18.8438,146.2063 C18.3906,146.2063 18.2656,146.2219 18.0938,146.3313 C17.8281,146.5031 17.6563,146.7688 17.6563,147.0813 C17.6563,147.3625 17.7813,147.6281 18.0313,147.8 C18.2188,147.925 18.4063,147.9563 18.8438,147.9563 L19.0313,147.9563 L19.0313,154.05 L18.8438,154.05 C18.4219,154.05 18.2656,154.0813 18.0938,154.175 C17.8281,154.3313 17.6563,154.6125 17.6563,154.9094 C17.6563,155.4875 18.0625,155.8 18.8438,155.8 L26.9219,155.8 L26.9219,153.2688 C26.9219,152.8625 26.8906,152.6906 26.7813,152.5344 C26.6094,152.2688 26.3281,152.1125 26,152.1125 C25.7188,152.1125 25.4375,152.2531 25.25,152.4719 C25.1094,152.6594 25.0781,152.8156 25.0781,153.2688 L25.0781,154.05 L20.8594,154.05 L20.8594,151.8625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="36" y="155.406">BBB</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="65" y1="166.8" y2="166.8"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="13" y="183.8059">bbb1</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="13" y="200.6059">bbb2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="65" y1="208.3999" y2="208.3999"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0000668221430913861424">
+        <rect codeLine="16" fill="#F1F1F1" height="81.5999" id="C_0000668221430913861424" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="101" y="134.8"/>
+        <ellipse cx="134.9" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M129.9,151.9563 C129.9,154.4563 132.0406,156.2688 134.9625,156.2688 C136.1969,156.2688 137.3688,155.9719 138.1188,155.4563 C138.7281,155.0344 139.0563,154.6125 139.0563,154.2063 C139.0563,153.7375 138.6344,153.3313 138.1344,153.3313 C137.9,153.3313 137.6813,153.4094 137.4781,153.6125 C137.0406,154.05 137.0406,154.05 136.8688,154.1438 C136.4156,154.3781 135.775,154.5188 135.0094,154.5188 C133.0094,154.5188 131.7281,153.5031 131.7281,151.925 L131.7281,150.8781 C131.7281,149.175 132.9469,147.9719 134.65,147.9719 C135.2281,147.9719 135.8063,148.1125 136.275,148.3625 C136.7438,148.6281 136.9156,148.8156 136.9781,149.175 C137.1031,149.8469 137.3531,150.0969 137.8844,150.0969 C138.1656,150.0969 138.4469,149.9563 138.6344,149.7375 C138.7594,149.5656 138.8063,149.3938 138.8063,148.9563 L138.8063,147.5969 C138.8063,147.175 138.7906,147.0344 138.6656,146.8625 C138.4938,146.6125 138.2125,146.4563 137.8844,146.4563 C137.5719,146.4563 137.3688,146.5656 137.15,146.8313 C135.9781,146.3313 135.5406,146.2219 134.5875,146.2219 C131.9156,146.2219 129.9,148.2375 129.9,150.8625 L129.9,151.9563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="153.1" y="155.406">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="102" x2="183" y1="166.8" y2="166.8"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="107" y="175.7"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="109" y="177.7"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="121" y="183.8059">get() : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="102" x2="183" y1="191.5999" y2="191.5999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="107" y="200.4999"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="109" y="202.4999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="121" y="208.6059">a : int</text>
+        </a>
+      </g>
+    </a>
+  </g>
+</svg>
diff --git a/docs/test_cases/t00070_class_mermaid.svg b/docs/test_cases/t00070_class_mermaid.svg
new file mode 100644
index 00000000..f611352c
--- /dev/null
+++ b/docs/test_cases/t00070_class_mermaid.svg
@@ -0,0 +1,164 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 473.25 139" style="max-width: 473.25px; background-color: white;" width="473.25" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+      <style type="text/css">a:hover { text-decoration: underline; }</style>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+        <path d="M 1,7 L18,13 V 1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+        <path d="M 1,1 V 13 L18,7 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+        <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+        <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths"/>
+      <g class="edgeLabels"/>
+      <g class="nodes">
+        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L4">
+          <g title="B" id="classId-C_0001364261599035905834-0" class="node default clickable">
+            <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -21)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">B</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L6">
+          <g title="BB" id="classId-C_0001485755083045282660-1" class="node default clickable">
+            <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, -32)" height="18" width="51.578125" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">BB&lt;T&gt;</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, 2)" height="18" width="32.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-t : T</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L10">
+          <g title="BBB" id="classId-C_0001734694076622541097-2" class="node default clickable">
+            <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
+            <g class="label">
+              <foreignObject transform="translate( -53.375, -54)" height="18" width="106.75">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">«enumeration»</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -17.3359375, -32)" height="18" width="34.671875" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">BBB</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 2)" height="18" width="35.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">bbb1</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 24)" height="18" width="35.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">bbb2</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(419.0703125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L6">
+          <g title="A" id="classId-C_0000668221430913861424-3" class="node default clickable">
+            <rect height="101" width="92.359375" y="-50.5" x="-46.1796875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -43)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">A</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -38.6796875, -9)" height="18" width="44.46875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-a : int</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -38.6796875, 25)" height="18" width="77.359375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-get() : : int</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t00071.md b/docs/test_cases/t00071.md
new file mode 100644
index 00000000..279feac0
--- /dev/null
+++ b/docs/test_cases/t00071.md
@@ -0,0 +1,534 @@
+# t00071 - Class diagram with C++20 modules generated as packages
+## Config
+```yaml
+diagrams:
+  t00071_class:
+    type: class
+    glob:
+      - t00071.cc
+    include:
+      namespaces:
+        - clanguml::t00071
+    generate_packages: true
+    package_type: module
+    using_namespace: clanguml::t00071
+    using_module: t00071
+```
+## Source code
+File `tests/t00071/t00071.cc`
+```cpp
+import t00071.app;
+import t00071.app.lib1;
+import t00071.app.lib1.mod1;
+import t00071.app.lib1.mod2;
+import t00071.app.lib2;
+
+namespace clanguml {
+namespace t00071 {
+class R {
+    A *a;
+    B *b;
+    C *c;
+};
+}
+}
+```
+File `tests/t00071/src/lib1.cppm`
+```cpp
+export module t00071.app.lib1;
+
+export namespace clanguml::t00071 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+}
+```
+File `tests/t00071/src/lib2.cppm`
+```cpp
+export module t00071.app.lib2;
+
+export namespace clanguml::t00071 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+namespace detail {
+enum class CCC { ccc1, ccc2 };
+}
+}
+```
+File `tests/t00071/src/lib1mod1.cppm`
+```cpp
+export module t00071.app.lib1.mod1;
+
+export namespace clanguml::t00071 {
+class D { };
+}
+```
+File `tests/t00071/src/t00071_mod.cppm`
+```cpp
+export module t00071.app;
+export import t00071.app.lib1;
+export import t00071.app.lib2;
+
+export namespace clanguml::t00071 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
+```
+File `tests/t00071/src/lib1mod2.cppm`
+```cpp
+export module t00071.app.lib1.mod2;
+
+export namespace clanguml::t00071 {
+class E { };
+}
+```
+## Generated PlantUML diagrams
+![t00071_class](./t00071_class.svg "Class diagram with C++20 modules generated as packages")
+## Generated Mermaid diagrams
+![t00071_class](./t00071_class_mermaid.svg "Class diagram with C++20 modules generated as packages")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "display_name": "app",
+      "elements": [
+        {
+          "display_name": "app::lib1",
+          "elements": [
+            {
+              "bases": [],
+              "display_name": "clanguml::t00071::B",
+              "id": "1319862510251967999",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "module": {
+                "is_private": false,
+                "name": "t00071.app.lib1"
+              },
+              "name": "B",
+              "namespace": "clanguml::t00071",
+              "source_location": {
+                "column": 7,
+                "file": "src/lib1.cppm",
+                "line": 4,
+                "translation_unit": "t00071.cc"
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [],
+              "display_name": "clanguml::t00071::BB<T>",
+              "id": "569632796637866961",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": true,
+              "is_union": false,
+              "members": [
+                {
+                  "access": "private",
+                  "is_static": false,
+                  "name": "t",
+                  "source_location": {
+                    "column": 7,
+                    "file": "src/lib1.cppm",
+                    "line": 7,
+                    "translation_unit": "t00071.cc"
+                  },
+                  "type": "T"
+                }
+              ],
+              "methods": [],
+              "module": {
+                "is_private": false,
+                "name": "t00071.app.lib1"
+              },
+              "name": "BB",
+              "namespace": "clanguml::t00071",
+              "source_location": {
+                "column": 29,
+                "file": "src/lib1.cppm",
+                "line": 6,
+                "translation_unit": "t00071.cc"
+              },
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "template_type",
+                  "name": "T",
+                  "template_parameters": []
+                }
+              ],
+              "type": "class"
+            },
+            {
+              "constants": [
+                "bbb1",
+                "bbb2"
+              ],
+              "display_name": "clanguml::t00071::detail::BBB",
+              "id": "1625078061541942293",
+              "is_nested": false,
+              "module": {
+                "is_private": false,
+                "name": "t00071.app.lib1"
+              },
+              "name": "BBB",
+              "namespace": "clanguml::t00071::detail",
+              "source_location": {
+                "column": 12,
+                "file": "src/lib1.cppm",
+                "line": 11,
+                "translation_unit": "t00071.cc"
+              },
+              "type": "enum"
+            },
+            {
+              "display_name": "app::lib1::mod1",
+              "elements": [
+                {
+                  "bases": [],
+                  "display_name": "clanguml::t00071::D",
+                  "id": "1168777064323042894",
+                  "is_abstract": false,
+                  "is_nested": false,
+                  "is_struct": false,
+                  "is_template": false,
+                  "is_union": false,
+                  "members": [],
+                  "methods": [],
+                  "module": {
+                    "is_private": false,
+                    "name": "t00071.app.lib1.mod1"
+                  },
+                  "name": "D",
+                  "namespace": "clanguml::t00071",
+                  "source_location": {
+                    "column": 7,
+                    "file": "src/lib1mod1.cppm",
+                    "line": 4,
+                    "translation_unit": "t00071.cc"
+                  },
+                  "template_parameters": [],
+                  "type": "class"
+                }
+              ],
+              "name": "mod1",
+              "type": "module"
+            },
+            {
+              "display_name": "app::lib1::mod2",
+              "elements": [
+                {
+                  "bases": [],
+                  "display_name": "clanguml::t00071::E",
+                  "id": "1302694761523535504",
+                  "is_abstract": false,
+                  "is_nested": false,
+                  "is_struct": false,
+                  "is_template": false,
+                  "is_union": false,
+                  "members": [],
+                  "methods": [],
+                  "module": {
+                    "is_private": false,
+                    "name": "t00071.app.lib1.mod2"
+                  },
+                  "name": "E",
+                  "namespace": "clanguml::t00071",
+                  "source_location": {
+                    "column": 7,
+                    "file": "src/lib1mod2.cppm",
+                    "line": 4,
+                    "translation_unit": "t00071.cc"
+                  },
+                  "template_parameters": [],
+                  "type": "class"
+                }
+              ],
+              "name": "mod2",
+              "type": "module"
+            }
+          ],
+          "name": "lib1",
+          "type": "module"
+        },
+        {
+          "display_name": "app::lib2",
+          "elements": [
+            {
+              "bases": [],
+              "display_name": "clanguml::t00071::C",
+              "id": "1697463991772603674",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "module": {
+                "is_private": false,
+                "name": "t00071.app.lib2"
+              },
+              "name": "C",
+              "namespace": "clanguml::t00071",
+              "source_location": {
+                "column": 7,
+                "file": "src/lib2.cppm",
+                "line": 4,
+                "translation_unit": "t00071.cc"
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [],
+              "display_name": "clanguml::t00071::CC<T>",
+              "id": "1911193033649971391",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": true,
+              "is_union": false,
+              "members": [
+                {
+                  "access": "private",
+                  "is_static": false,
+                  "name": "t",
+                  "source_location": {
+                    "column": 7,
+                    "file": "src/lib2.cppm",
+                    "line": 7,
+                    "translation_unit": "t00071.cc"
+                  },
+                  "type": "T"
+                }
+              ],
+              "methods": [],
+              "module": {
+                "is_private": false,
+                "name": "t00071.app.lib2"
+              },
+              "name": "CC",
+              "namespace": "clanguml::t00071",
+              "source_location": {
+                "column": 29,
+                "file": "src/lib2.cppm",
+                "line": 6,
+                "translation_unit": "t00071.cc"
+              },
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "template_type",
+                  "name": "T",
+                  "template_parameters": []
+                }
+              ],
+              "type": "class"
+            },
+            {
+              "constants": [
+                "ccc1",
+                "ccc2"
+              ],
+              "display_name": "clanguml::t00071::detail::CCC",
+              "id": "931278702894205804",
+              "is_nested": false,
+              "module": {
+                "is_private": false,
+                "name": "t00071.app.lib2"
+              },
+              "name": "CCC",
+              "namespace": "clanguml::t00071::detail",
+              "source_location": {
+                "column": 12,
+                "file": "src/lib2.cppm",
+                "line": 11,
+                "translation_unit": "t00071.cc"
+              },
+              "type": "enum"
+            }
+          ],
+          "name": "lib2",
+          "type": "module"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00071::A",
+          "id": "2210005074053139118",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": false,
+          "is_template": false,
+          "is_union": false,
+          "members": [
+            {
+              "access": "private",
+              "is_static": false,
+              "name": "a",
+              "source_location": {
+                "column": 9,
+                "file": "src/t00071_mod.cppm",
+                "line": 9,
+                "translation_unit": "t00071.cc"
+              },
+              "type": "int"
+            }
+          ],
+          "methods": [
+            {
+              "access": "private",
+              "is_const": false,
+              "is_consteval": false,
+              "is_constexpr": false,
+              "is_constructor": false,
+              "is_copy_assignment": false,
+              "is_coroutine": false,
+              "is_defaulted": false,
+              "is_deleted": false,
+              "is_move_assignment": false,
+              "is_noexcept": false,
+              "is_operator": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "get",
+              "parameters": [],
+              "source_location": {
+                "column": 9,
+                "file": "src/t00071_mod.cppm",
+                "line": 7,
+                "translation_unit": "t00071.cc"
+              },
+              "type": "int"
+            }
+          ],
+          "module": {
+            "is_private": false,
+            "name": "t00071.app"
+          },
+          "name": "A",
+          "namespace": "clanguml::t00071",
+          "source_location": {
+            "column": 7,
+            "file": "src/t00071_mod.cppm",
+            "line": 6,
+            "translation_unit": "t00071.cc"
+          },
+          "template_parameters": [],
+          "type": "class"
+        }
+      ],
+      "name": "app",
+      "type": "module"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00071::R",
+      "id": "1629943620359873327",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "column": 8,
+            "file": "t00071.cc",
+            "line": 10,
+            "translation_unit": "t00071.cc"
+          },
+          "type": "A *"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "column": 8,
+            "file": "t00071.cc",
+            "line": 11,
+            "translation_unit": "t00071.cc"
+          },
+          "type": "B *"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "column": 8,
+            "file": "t00071.cc",
+            "line": 12,
+            "translation_unit": "t00071.cc"
+          },
+          "type": "C *"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00071",
+      "source_location": {
+        "column": 7,
+        "file": "t00071.cc",
+        "line": 9,
+        "translation_unit": "t00071.cc"
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00071_class",
+  "relationships": [
+    {
+      "access": "private",
+      "destination": "2210005074053139118",
+      "label": "a",
+      "source": "1629943620359873327",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "1319862510251967999",
+      "label": "b",
+      "source": "1629943620359873327",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "1697463991772603674",
+      "label": "c",
+      "source": "1629943620359873327",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00071"
+}
+```
diff --git a/docs/test_cases/t00071_class.svg b/docs/test_cases/t00071_class.svg
new file mode 100644
index 00000000..e6978d13
--- /dev/null
+++ b/docs/test_cases/t00071_class.svg
@@ -0,0 +1,204 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="408px" preserveAspectRatio="none" style="width:992px;height:408px;background:#FFFFFF;" version="1.1" viewBox="0 0 992 408" width="992px" zoomAndPan="magnify">
+  <defs>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <g id="cluster_C_0002001320261642080149">
+      <path d="M8.5,168.4 L35.5,168.4 A3.75,3.75 0 0 1 38,170.9 L45,191.1999 L982.5,191.1999 A2.5,2.5 0 0 1 985,193.6999 L985,398.9 A2.5,2.5 0 0 1 982.5,401.4 L8.5,401.4 A2.5,2.5 0 0 1 6,398.9 L6,170.9 A2.5,2.5 0 0 1 8.5,168.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="45" y1="191.1999" y2="191.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="10" y="183.4059">app</text>
+    </g>
+    <g id="cluster_C_0000134702274523771711">
+      <path d="M126.5,211.4 L152.5,211.4 A3.75,3.75 0 0 1 155,213.9 L162,234.1999 L624.5,234.1999 A2.5,2.5 0 0 1 627,236.6999 L627,374.9 A2.5,2.5 0 0 1 624.5,377.4 L126.5,377.4 A2.5,2.5 0 0 1 124,374.9 L124,213.9 A2.5,2.5 0 0 1 126.5,211.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="124" x2="162" y1="234.1999" y2="234.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="128" y="226.4059">lib1</text>
+    </g>
+    <g id="cluster_C_0001936594361848936362">
+      <path d="M531.5,254.4 L570.5,254.4 A3.75,3.75 0 0 1 573,256.9 L580,277.1999 L600.5,277.1999 A2.5,2.5 0 0 1 603,279.6999 L603,350.9 A2.5,2.5 0 0 1 600.5,353.4 L531.5,353.4 A2.5,2.5 0 0 1 529,350.9 L529,256.9 A2.5,2.5 0 0 1 531.5,254.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="529" x2="580" y1="277.1999" y2="277.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="533" y="269.4059">mod1</text>
+    </g>
+    <g id="cluster_C_0001593800309768706851">
+      <path d="M435.5,254.4 L474.5,254.4 A3.75,3.75 0 0 1 477,256.9 L484,277.1999 L502.5,277.1999 A2.5,2.5 0 0 1 505,279.6999 L505,350.9 A2.5,2.5 0 0 1 502.5,353.4 L435.5,353.4 A2.5,2.5 0 0 1 433,350.9 L433,256.9 A2.5,2.5 0 0 1 435.5,254.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="433" x2="484" y1="277.1999" y2="277.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="437" y="269.4059">mod2</text>
+    </g>
+    <g id="cluster_C_0000572912820161417686">
+      <path d="M653.5,237.6 L679.5,237.6 A3.75,3.75 0 0 1 682,240.1 L689,260.3999 L958.5,260.3999 A2.5,2.5 0 0 1 961,262.8999 L961,367.7 A2.5,2.5 0 0 1 958.5,370.2 L653.5,370.2 A2.5,2.5 0 0 1 651,367.7 L651,240.1 A2.5,2.5 0 0 1 653.5,237.6 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="651" x2="689" y1="260.3999" y2="260.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="655" y="252.6059">lib2</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <g id="elem_C_0002210005074053139118">
+        <rect codeLine="47" fill="#F1F1F1" height="81.5999" id="C_0002210005074053139118" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="22.5" y="272.6"/>
+        <ellipse cx="56.4" cy="288.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M51.4,289.7562 C51.4,292.2562 53.5406,294.0687 56.4625,294.0687 C57.6969,294.0687 58.8688,293.7719 59.6188,293.2562 C60.2281,292.8344 60.5563,292.4125 60.5563,292.0062 C60.5563,291.5375 60.1344,291.1312 59.6344,291.1312 C59.4,291.1312 59.1813,291.2094 58.9781,291.4125 C58.5406,291.85 58.5406,291.85 58.3688,291.9437 C57.9156,292.1781 57.275,292.3187 56.5094,292.3187 C54.5094,292.3187 53.2281,291.3031 53.2281,289.725 L53.2281,288.6781 C53.2281,286.975 54.4469,285.7719 56.15,285.7719 C56.7281,285.7719 57.3063,285.9125 57.775,286.1625 C58.2438,286.4281 58.4156,286.6156 58.4781,286.975 C58.6031,287.6469 58.8531,287.8969 59.3844,287.8969 C59.6656,287.8969 59.9469,287.7562 60.1344,287.5375 C60.2594,287.3656 60.3063,287.1937 60.3063,286.7562 L60.3063,285.3969 C60.3063,284.975 60.2906,284.8344 60.1656,284.6625 C59.9938,284.4125 59.7125,284.2562 59.3844,284.2562 C59.0719,284.2562 58.8688,284.3656 58.65,284.6312 C57.4781,284.1312 57.0406,284.0219 56.0875,284.0219 C53.4156,284.0219 51.4,286.0375 51.4,288.6625 L51.4,289.7562 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="74.6" y="293.206">A</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="23.5" x2="104.5" y1="304.6" y2="304.6"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="28.5" y="313.5"/>
+          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="30.5" y="315.5"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="42.5" y="321.6059">get() : int</text>
+        </a>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="23.5" x2="104.5" y1="329.3999" y2="329.3999"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="28.5" y="338.2999"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="30.5" y="340.2999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="42.5" y="346.4059">a : int</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <g id="elem_C_0001319862510251967999">
+        <rect codeLine="4" fill="#F1F1F1" height="48" id="C_0001319862510251967999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="372.5" y="289.4"/>
+        <ellipse cx="387.5" cy="305.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M382.5,306.5563 C382.5,309.0563 384.6406,310.8688 387.5625,310.8688 C388.7969,310.8688 389.9688,310.5719 390.7188,310.0563 C391.3281,309.6344 391.6563,309.2125 391.6563,308.8063 C391.6563,308.3375 391.2344,307.9313 390.7344,307.9313 C390.5,307.9313 390.2813,308.0094 390.0781,308.2125 C389.6406,308.65 389.6406,308.65 389.4688,308.7438 C389.0156,308.9781 388.375,309.1188 387.6094,309.1188 C385.6094,309.1188 384.3281,308.1031 384.3281,306.525 L384.3281,305.4781 C384.3281,303.775 385.5469,302.5719 387.25,302.5719 C387.8281,302.5719 388.4063,302.7125 388.875,302.9625 C389.3438,303.2281 389.5156,303.4156 389.5781,303.775 C389.7031,304.4469 389.9531,304.6969 390.4844,304.6969 C390.7656,304.6969 391.0469,304.5563 391.2344,304.3375 C391.3594,304.1656 391.4063,303.9938 391.4063,303.5563 L391.4063,302.1969 C391.4063,301.775 391.3906,301.6344 391.2656,301.4625 C391.0938,301.2125 390.8125,301.0563 390.4844,301.0563 C390.1719,301.0563 389.9688,301.1656 389.75,301.4313 C388.5781,300.9313 388.1406,300.8219 387.1875,300.8219 C384.5156,300.8219 382.5,302.8375 382.5,305.4625 L382.5,306.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="401.5" y="310.006">B</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="373.5" x2="412.5" y1="321.4" y2="321.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="373.5" x2="412.5" y1="329.4" y2="329.4"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <g id="elem_C_0000569632796637866961">
+        <rect codeLine="8" fill="#F1F1F1" height="64.7999" id="C_0000569632796637866961" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="276.5" y="281"/>
+        <ellipse cx="291.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M286.5,298.1563 C286.5,300.6563 288.6406,302.4688 291.5625,302.4688 C292.7969,302.4688 293.9688,302.1719 294.7188,301.6563 C295.3281,301.2344 295.6563,300.8125 295.6563,300.4063 C295.6563,299.9375 295.2344,299.5313 294.7344,299.5313 C294.5,299.5313 294.2813,299.6094 294.0781,299.8125 C293.6406,300.25 293.6406,300.25 293.4688,300.3438 C293.0156,300.5781 292.375,300.7188 291.6094,300.7188 C289.6094,300.7188 288.3281,299.7031 288.3281,298.125 L288.3281,297.0781 C288.3281,295.375 289.5469,294.1719 291.25,294.1719 C291.8281,294.1719 292.4063,294.3125 292.875,294.5625 C293.3438,294.8281 293.5156,295.0156 293.5781,295.375 C293.7031,296.0469 293.9531,296.2969 294.4844,296.2969 C294.7656,296.2969 295.0469,296.1563 295.2344,295.9375 C295.3594,295.7656 295.4063,295.5938 295.4063,295.1563 L295.4063,293.7969 C295.4063,293.375 295.3906,293.2344 295.2656,293.0625 C295.0938,292.8125 294.8125,292.6563 294.4844,292.6563 C294.1719,292.6563 293.9688,292.7656 293.75,293.0313 C292.5781,292.5313 292.1406,292.4219 291.1875,292.4219 C288.5156,292.4219 286.5,294.4375 286.5,297.0625 L286.5,298.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="305.5" y="301.606">BB</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="331.5" y="278"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="332.5" y="292.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="277.5" x2="336.5" y1="313" y2="313"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="277.5" x2="336.5" y1="321" y2="321"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="282.5" y="329.9"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="284.5" y="331.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="296.5" y="338.0059">t : T</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <g id="elem_C_0001625078061541942293">
+        <rect codeLine="13" fill="#F1F1F1" height="81.5999" id="C_0001625078061541942293" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="140.5" y="272.6"/>
+        <ellipse cx="155.5" cy="288.6" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M154.3594,289.6625 L155.6719,289.6625 L155.6719,289.7094 C155.6719,290.1156 155.6875,290.2719 155.7969,290.4281 C155.9688,290.6781 156.2656,290.85 156.5781,290.85 C156.8594,290.85 157.1563,290.7094 157.3281,290.4906 C157.4531,290.3031 157.5,290.1625 157.5,289.7094 L157.5,287.8656 C157.5,287.5375 157.4844,287.4281 157.4219,287.2562 C157.3125,286.9594 156.9531,286.7094 156.5781,286.7094 C156.2813,286.7094 156.0156,286.85 155.8438,287.0687 C155.7031,287.2562 155.6719,287.4281 155.6719,287.8656 L155.6719,287.9281 L154.3594,287.9281 L154.3594,285.7562 L158.2031,285.7562 L158.2031,286.5062 C158.2031,286.8969 158.2344,287.0844 158.3438,287.2406 C158.5156,287.4906 158.8125,287.6625 159.125,287.6625 C159.4219,287.6625 159.6875,287.5375 159.875,287.3031 C160.0156,287.1156 160.0469,286.975 160.0469,286.5062 L160.0469,284.0062 L152.3438,284.0062 C151.8906,284.0062 151.7656,284.0219 151.5938,284.1312 C151.3281,284.3031 151.1563,284.5687 151.1563,284.8812 C151.1563,285.1625 151.2813,285.4281 151.5313,285.6 C151.7188,285.725 151.9063,285.7562 152.3438,285.7562 L152.5313,285.7562 L152.5313,291.85 L152.3438,291.85 C151.9219,291.85 151.7656,291.8812 151.5938,291.975 C151.3281,292.1312 151.1563,292.4125 151.1563,292.7094 C151.1563,293.2875 151.5625,293.6 152.3438,293.6 L160.4219,293.6 L160.4219,291.0687 C160.4219,290.6625 160.3906,290.4906 160.2813,290.3344 C160.1094,290.0687 159.8281,289.9125 159.5,289.9125 C159.2188,289.9125 158.9375,290.0531 158.75,290.2719 C158.6094,290.4594 158.5781,290.6156 158.5781,291.0687 L158.5781,291.85 L154.3594,291.85 L154.3594,289.6625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="169.5" y="293.206">detail::BBB</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="141.5" x2="240.5" y1="304.6" y2="304.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="146.5" y="321.6059">bbb1</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="146.5" y="338.4059">bbb2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="141.5" x2="240.5" y1="346.1999" y2="346.1999"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <g id="elem_C_0001168777064323042894">
+        <rect codeLine="19" fill="#F1F1F1" height="48" id="C_0001168777064323042894" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="545" y="289.4"/>
+        <ellipse cx="560" cy="305.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M555,306.5563 C555,309.0563 557.1406,310.8688 560.0625,310.8688 C561.2969,310.8688 562.4688,310.5719 563.2188,310.0563 C563.8281,309.6344 564.1563,309.2125 564.1563,308.8063 C564.1563,308.3375 563.7344,307.9313 563.2344,307.9313 C563,307.9313 562.7813,308.0094 562.5781,308.2125 C562.1406,308.65 562.1406,308.65 561.9688,308.7438 C561.5156,308.9781 560.875,309.1188 560.1094,309.1188 C558.1094,309.1188 556.8281,308.1031 556.8281,306.525 L556.8281,305.4781 C556.8281,303.775 558.0469,302.5719 559.75,302.5719 C560.3281,302.5719 560.9063,302.7125 561.375,302.9625 C561.8438,303.2281 562.0156,303.4156 562.0781,303.775 C562.2031,304.4469 562.4531,304.6969 562.9844,304.6969 C563.2656,304.6969 563.5469,304.5563 563.7344,304.3375 C563.8594,304.1656 563.9063,303.9938 563.9063,303.5563 L563.9063,302.1969 C563.9063,301.775 563.8906,301.6344 563.7656,301.4625 C563.5938,301.2125 563.3125,301.0563 562.9844,301.0563 C562.6719,301.0563 562.4688,301.1656 562.25,301.4313 C561.0781,300.9313 560.6406,300.8219 559.6875,300.8219 C557.0156,300.8219 555,302.8375 555,305.4625 L555,306.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="574" y="310.006">D</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="546" x2="586" y1="321.4" y2="321.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="546" x2="586" y1="329.4" y2="329.4"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <g id="elem_C_0001302694761523535504">
+        <rect codeLine="25" fill="#F1F1F1" height="48" id="C_0001302694761523535504" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="448.5" y="289.4"/>
+        <ellipse cx="463.5" cy="305.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M458.5,306.5563 C458.5,309.0563 460.6406,310.8688 463.5625,310.8688 C464.7969,310.8688 465.9688,310.5719 466.7188,310.0563 C467.3281,309.6344 467.6563,309.2125 467.6563,308.8063 C467.6563,308.3375 467.2344,307.9313 466.7344,307.9313 C466.5,307.9313 466.2813,308.0094 466.0781,308.2125 C465.6406,308.65 465.6406,308.65 465.4688,308.7438 C465.0156,308.9781 464.375,309.1188 463.6094,309.1188 C461.6094,309.1188 460.3281,308.1031 460.3281,306.525 L460.3281,305.4781 C460.3281,303.775 461.5469,302.5719 463.25,302.5719 C463.8281,302.5719 464.4063,302.7125 464.875,302.9625 C465.3438,303.2281 465.5156,303.4156 465.5781,303.775 C465.7031,304.4469 465.9531,304.6969 466.4844,304.6969 C466.7656,304.6969 467.0469,304.5563 467.2344,304.3375 C467.3594,304.1656 467.4063,303.9938 467.4063,303.5563 L467.4063,302.1969 C467.4063,301.775 467.3906,301.6344 467.2656,301.4625 C467.0938,301.2125 466.8125,301.0563 466.4844,301.0563 C466.1719,301.0563 465.9688,301.1656 465.75,301.4313 C464.5781,300.9313 464.1406,300.8219 463.1875,300.8219 C460.5156,300.8219 458.5,302.8375 458.5,305.4625 L458.5,306.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="477.5" y="310.006">E</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="449.5" x2="488.5" y1="321.4" y2="321.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="449.5" x2="488.5" y1="329.4" y2="329.4"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <g id="elem_C_0001697463991772603674">
+        <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0001697463991772603674" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="903" y="289.4"/>
+        <ellipse cx="918" cy="305.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M913,306.5563 C913,309.0563 915.1406,310.8688 918.0625,310.8688 C919.2969,310.8688 920.4688,310.5719 921.2188,310.0563 C921.8281,309.6344 922.1563,309.2125 922.1563,308.8063 C922.1563,308.3375 921.7344,307.9313 921.2344,307.9313 C921,307.9313 920.7813,308.0094 920.5781,308.2125 C920.1406,308.65 920.1406,308.65 919.9688,308.7438 C919.5156,308.9781 918.875,309.1188 918.1094,309.1188 C916.1094,309.1188 914.8281,308.1031 914.8281,306.525 L914.8281,305.4781 C914.8281,303.775 916.0469,302.5719 917.75,302.5719 C918.3281,302.5719 918.9063,302.7125 919.375,302.9625 C919.8438,303.2281 920.0156,303.4156 920.0781,303.775 C920.2031,304.4469 920.4531,304.6969 920.9844,304.6969 C921.2656,304.6969 921.5469,304.5563 921.7344,304.3375 C921.8594,304.1656 921.9063,303.9938 921.9063,303.5563 L921.9063,302.1969 C921.9063,301.775 921.8906,301.6344 921.7656,301.4625 C921.5938,301.2125 921.3125,301.0563 920.9844,301.0563 C920.6719,301.0563 920.4688,301.1656 920.25,301.4313 C919.0781,300.9313 918.6406,300.8219 917.6875,300.8219 C915.0156,300.8219 913,302.8375 913,305.4625 L913,306.5563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="932" y="310.006">C</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="904" x2="944" y1="321.4" y2="321.4"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="904" x2="944" y1="329.4" y2="329.4"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <g id="elem_C_0001911193033649971391">
+        <rect codeLine="36" fill="#F1F1F1" height="64.7999" id="C_0001911193033649971391" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="805.5" y="281"/>
+        <ellipse cx="820.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M815.5,298.1563 C815.5,300.6563 817.6406,302.4688 820.5625,302.4688 C821.7969,302.4688 822.9688,302.1719 823.7188,301.6563 C824.3281,301.2344 824.6563,300.8125 824.6563,300.4063 C824.6563,299.9375 824.2344,299.5313 823.7344,299.5313 C823.5,299.5313 823.2813,299.6094 823.0781,299.8125 C822.6406,300.25 822.6406,300.25 822.4688,300.3438 C822.0156,300.5781 821.375,300.7188 820.6094,300.7188 C818.6094,300.7188 817.3281,299.7031 817.3281,298.125 L817.3281,297.0781 C817.3281,295.375 818.5469,294.1719 820.25,294.1719 C820.8281,294.1719 821.4063,294.3125 821.875,294.5625 C822.3438,294.8281 822.5156,295.0156 822.5781,295.375 C822.7031,296.0469 822.9531,296.2969 823.4844,296.2969 C823.7656,296.2969 824.0469,296.1563 824.2344,295.9375 C824.3594,295.7656 824.4063,295.5938 824.4063,295.1563 L824.4063,293.7969 C824.4063,293.375 824.3906,293.2344 824.2656,293.0625 C824.0938,292.8125 823.8125,292.6563 823.4844,292.6563 C823.1719,292.6563 822.9688,292.7656 822.75,293.0313 C821.5781,292.5313 821.1406,292.4219 820.1875,292.4219 C817.5156,292.4219 815.5,294.4375 815.5,297.0625 L815.5,298.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="834.5" y="301.606">CC</text>
+        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="862.5" y="278"/>
+        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="863.5" y="292.2001">T</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="806.5" x2="867.5" y1="313" y2="313"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="806.5" x2="867.5" y1="321" y2="321"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="811.5" y="329.9"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="813.5" y="331.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="825.5" y="338.0059">t : T</text>
+        </a>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <g id="elem_C_0000931278702894205804">
+        <rect codeLine="41" fill="#F1F1F1" height="81.5999" id="C_0000931278702894205804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="667" y="272.6"/>
+        <ellipse cx="682" cy="288.6" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M680.8594,289.6625 L682.1719,289.6625 L682.1719,289.7094 C682.1719,290.1156 682.1875,290.2719 682.2969,290.4281 C682.4688,290.6781 682.7656,290.85 683.0781,290.85 C683.3594,290.85 683.6563,290.7094 683.8281,290.4906 C683.9531,290.3031 684,290.1625 684,289.7094 L684,287.8656 C684,287.5375 683.9844,287.4281 683.9219,287.2562 C683.8125,286.9594 683.4531,286.7094 683.0781,286.7094 C682.7813,286.7094 682.5156,286.85 682.3438,287.0687 C682.2031,287.2562 682.1719,287.4281 682.1719,287.8656 L682.1719,287.9281 L680.8594,287.9281 L680.8594,285.7562 L684.7031,285.7562 L684.7031,286.5062 C684.7031,286.8969 684.7344,287.0844 684.8438,287.2406 C685.0156,287.4906 685.3125,287.6625 685.625,287.6625 C685.9219,287.6625 686.1875,287.5375 686.375,287.3031 C686.5156,287.1156 686.5469,286.975 686.5469,286.5062 L686.5469,284.0062 L678.8438,284.0062 C678.3906,284.0062 678.2656,284.0219 678.0938,284.1312 C677.8281,284.3031 677.6563,284.5687 677.6563,284.8812 C677.6563,285.1625 677.7813,285.4281 678.0313,285.6 C678.2188,285.725 678.4063,285.7562 678.8438,285.7562 L679.0313,285.7562 L679.0313,291.85 L678.8438,291.85 C678.4219,291.85 678.2656,291.8812 678.0938,291.975 C677.8281,292.1312 677.6563,292.4125 677.6563,292.7094 C677.6563,293.2875 678.0625,293.6 678.8438,293.6 L686.9219,293.6 L686.9219,291.0687 C686.9219,290.6625 686.8906,290.4906 686.7813,290.3344 C686.6094,290.0687 686.3281,289.9125 686,289.9125 C685.7188,289.9125 685.4375,290.0531 685.25,290.2719 C685.1094,290.4594 685.0781,290.6156 685.0781,291.0687 L685.0781,291.85 L680.8594,291.85 L680.8594,289.6625 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="696" y="293.206">detail::CCC</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="668" x2="770" y1="304.6" y2="304.6"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="673" y="321.6059">ccc1</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="673" y="338.4059">ccc2</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="668" x2="770" y1="346.1999" y2="346.1999"/>
+      </g>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <g id="elem_C_0001629943620359873327">
+        <rect codeLine="54" fill="#F1F1F1" height="98.3998" id="C_0001629943620359873327" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="64" x="361" y="7"/>
+        <ellipse cx="385.9" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+        <path d="M380.9,24.1563 C380.9,26.6563 383.0406,28.4688 385.9625,28.4688 C387.1969,28.4688 388.3688,28.1719 389.1188,27.6563 C389.7281,27.2344 390.0563,26.8125 390.0563,26.4063 C390.0563,25.9375 389.6344,25.5313 389.1344,25.5313 C388.9,25.5313 388.6813,25.6094 388.4781,25.8125 C388.0406,26.25 388.0406,26.25 387.8688,26.3438 C387.4156,26.5781 386.775,26.7188 386.0094,26.7188 C384.0094,26.7188 382.7281,25.7031 382.7281,24.125 L382.7281,23.0781 C382.7281,21.375 383.9469,20.1719 385.65,20.1719 C386.2281,20.1719 386.8063,20.3125 387.275,20.5625 C387.7438,20.8281 387.9156,21.0156 387.9781,21.375 C388.1031,22.0469 388.3531,22.2969 388.8844,22.2969 C389.1656,22.2969 389.4469,22.1563 389.6344,21.9375 C389.7594,21.7656 389.8063,21.5938 389.8063,21.1563 L389.8063,19.7969 C389.8063,19.375 389.7906,19.2344 389.6656,19.0625 C389.4938,18.8125 389.2125,18.6563 388.8844,18.6563 C388.5719,18.6563 388.3688,18.7656 388.15,19.0313 C386.9781,18.5313 386.5406,18.4219 385.5875,18.4219 C382.9156,18.4219 380.9,20.4375 380.9,23.0625 L380.9,24.1563 Z " fill="#000000"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="402.1" y="27.606">R</text>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="424" y1="39" y2="39"/>
+        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="424" y1="47" y2="47"/>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="55.9"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="369" y="57.9"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="381" y="64.0059">a : A *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="72.6999"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="369" y="74.6999"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="381" y="80.8059">b : B *</text>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="89.4998"/>
+          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="369" y="91.4998"/>
+        </a>
+        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
+          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="381" y="97.6058">c : C *</text>
+        </a>
+      </g>
+    </a>
+    <g id="link_C_0001629943620359873327_C_0002210005074053139118">
+      <path codeLine="60" d="M360.73,61.1 C305.17,69.46 190.99,94.05 124,160.4 C93.46,190.65 79.3435,232.4711 71.8635,266.3511 " fill="none" id="C_0001629943620359873327-to-C_0002210005074053139118" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="70.57,272.21,76.4162,264.284,71.6479,267.3276,68.6043,262.5593,70.57,272.21" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="155" y="148.477">-a</text>
+    </g>
+    <g id="link_C_0001629943620359873327_C_0001319862510251967999">
+      <path codeLine="61" d="M393,105.8 C393,160.61 393,241.48 393,282.92 " fill="none" id="C_0001629943620359873327-to-C_0001319862510251967999" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="393,288.92,397,279.92,393,283.92,389,279.92,393,288.92" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="394" y="148.477">-b</text>
+    </g>
+    <g id="link_C_0001629943620359873327_C_0001697463991772603674">
+      <path codeLine="62" d="M425.42,59.57 C524.25,67.47 819.12,96.06 886,160.4 C921.28,194.35 925.8243,249.7006 925.3543,283.1406 " fill="none" id="C_0001629943620359873327-to-C_0001697463991772603674" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="925.27,289.14,929.3961,280.1971,925.3403,284.1405,921.3969,280.0847,925.27,289.14" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="875" y="148.477">-c</text>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t00071_class_mermaid.svg b/docs/test_cases/t00071_class_mermaid.svg
new file mode 100644
index 00000000..1197683a
--- /dev/null
+++ b/docs/test_cases/t00071_class_mermaid.svg
@@ -0,0 +1,346 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 823.0703125 308" style="max-width: 823.07px; background-color: white;" width="823.0703125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+      <style type="text/css">a:hover { text-decoration: underline; }</style>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+        <path d="M 1,7 L18,13 V 1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+        <path d="M 1,1 V 13 L18,7 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+        <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+        <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths">
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M736.890625,86.70525091216751L716.703125,99.75437576013958C696.515625,112.80350060811168,656.140625,138.90175030405584,635.953125,156.61754181869458C615.765625,174.33333333333334,615.765625,183.66666666666666,615.765625,188.33333333333334L615.765625,193"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M738.8554892015707,131L736.5840014179756,136.66666666666666C734.3125136343805,142.33333333333334,729.7695380671903,153.66666666666666,727.4980502835951,167.66666666666666C725.2265625,181.66666666666666,725.2265625,198.33333333333334,725.2265625,206.66666666666666L725.2265625,215"/>
+        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M788.1601357984293,131L790.4316235820244,136.66666666666666C792.7031113656195,142.33333333333334,797.2460869328097,153.66666666666666,799.5175747164049,167.66666666666666C801.7890625,181.66666666666666,801.7890625,198.33333333333334,801.7890625,206.66666666666666L801.7890625,215"/>
+      </g>
+      <g class="edgeLabels">
+        <g transform="translate(615.765625, 165)" class="edgeLabel">
+          <g transform="translate(-7.1171875, -9)" class="label">
+            <foreignObject height="18" width="14.234375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel">-a</span>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(725.2265625, 165)" class="edgeLabel">
+          <g transform="translate(-7.1171875, -9)" class="label">
+            <foreignObject height="18" width="14.234375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel">-b</span>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(801.7890625, 165)" class="edgeLabel">
+          <g transform="translate(-6.6640625, -9)" class="label">
+            <foreignObject height="18" width="13.328125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel">-c</span>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <a transform="translate(725.2265625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L4">
+          <g title="B" id="classId-C_0001319862510251967999-0" class="node default clickable">
+            <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -21)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">B</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(41.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L6">
+          <g title="BB" id="classId-C_0000569632796637866961-1" class="node default clickable">
+            <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, -32)" height="18" width="51.578125" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">BB&lt;T&gt;</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, 2)" height="18" width="32.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-t : T</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(185.453125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L11">
+          <g title="BBB" id="classId-C_0001625078061541942293-2" class="node default clickable">
+            <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
+            <g class="label">
+              <foreignObject transform="translate( -53.375, -54)" height="18" width="106.75">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">«enumeration»</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -43.5546875, -32)" height="18" width="87.109375" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">detail::BBB</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 2)" height="18" width="35.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">bbb1</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 24)" height="18" width="35.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">bbb2</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(309.609375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod1.cppm#L4">
+          <g title="D" id="classId-C_0001168777064323042894-3" class="node default clickable">
+            <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -21)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">D</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(385.7265625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod2.cppm#L4">
+          <g title="E" id="classId-C_0001302694761523535504-4" class="node default clickable">
+            <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.3359375, -21)" height="18" width="10.671875" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">E</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(801.7890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L4">
+          <g title="C" id="classId-C_0001697463991772603674-5" class="node default clickable">
+            <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -21)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">C</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(481.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L6">
+          <g title="CC" id="classId-C_0001911193033649971391-6" class="node default clickable">
+            <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, -32)" height="18" width="51.578125" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">CC&lt;T&gt;</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, 2)" height="18" width="32.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-t : T</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(626.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L11">
+          <g title="CCC" id="classId-C_0000931278702894205804-7" class="node default clickable">
+            <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
+            <g class="label">
+              <foreignObject transform="translate( -53.375, -54)" height="18" width="106.75">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">«enumeration»</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -43.5546875, -32)" height="18" width="87.109375" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">detail::CCC</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 2)" height="18" width="32.90625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">ccc1</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 24)" height="18" width="32.90625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">ccc2</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(615.765625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L6">
+          <g title="A" id="classId-C_0002210005074053139118-8" class="node default clickable">
+            <rect height="101" width="92.359375" y="-50.5" x="-46.1796875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -43)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">A</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -38.6796875, -9)" height="18" width="44.46875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-a : int</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -38.6796875, 25)" height="18" width="77.359375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-get() : : int</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(763.5078125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L9">
+          <g title="R" id="classId-C_0001629943620359873327-9" class="node default clickable">
+            <rect height="123" width="53.234375" y="-61.5" x="-26.6171875" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="26.6171875" x1="-26.6171875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="26.6171875" x1="-26.6171875" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -54)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">R</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -19.1171875, -20)" height="18" width="37.640625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
+                  <span style="font-style:italic;" class="nodeLabel">-a : A</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -19.1171875, 2)" height="18" width="38.234375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
+                  <span style="font-style:italic;" class="nodeLabel">-b : B</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -19.1171875, 24)" height="18" width="38.21875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
+                  <span style="font-style:italic;" class="nodeLabel">-c : C</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md
index 4ea79e4d..c6b2fc47 100644
--- a/docs/test_cases/t20001.md
+++ b/docs/test_cases/t20001.md
@@ -31,7 +31,7 @@ diagrams:
 
 ```
 ## Source code
-File t20001.cc
+File `tests/t20001/t20001.cc`
 ```cpp
 #include <algorithm>
 #include <vector>
diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg
index fe2a3803..3537b01e 100644
--- a/docs/test_cases/t20001_sequence.svg
+++ b/docs/test_cases/t20001_sequence.svg
@@ -1,116 +1,110 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="699px" preserveAspectRatio="none" style="width:341px;height:699px;" version="1.1" viewBox="0 0 341 699" width="341px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="688px" preserveAspectRatio="none" style="width:304px;height:688px;background:#FFFFFF;" version="1.1" viewBox="0 0 304 688" width="304px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pjtsqv6ze4bt" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="293" x="24.5" y="26.708">Basic sequence diagram example</text>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="94" x2="94" y1="73.25" y2="658.7109"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="73.25" y2="658.7109"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="320" x2="320" y1="73.25" y2="658.7109"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pjtsqv6ze4bt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="37.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="68" y="57.9482">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1pjtsqv6ze4bt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="657.7109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="68" y="677.7061">tmain()</text>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="229" x="36.5" y="28.0059">Basic sequence diagram example</text>
+    <rect fill="#FFFFFF" height="515.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="76.5" y="84.5999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="106.1999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="260.9999"/>
+    <rect fill="#FFFFFF" height="156.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="369.7999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="171.5" y="407.4"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="171.5" y="477"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="555.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="281.5" y="165.7999"/>
+    <rect fill="#FFFFFF" height="259.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="281.5" y="340.1999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="81" x2="81" y1="74.5999" y2="653.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="171" x2="171" y1="74.5999" y2="653.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="286" x2="286" y1="74.5999" y2="653.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="52" y="42.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="59" y="62.8059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="52" y="652.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="59" y="672.2059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pjtsqv6ze4bt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="37.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="57.9482">A</text>
-      <rect fill="#FEFECE" filter="url(#f1pjtsqv6ze4bt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="657.7109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="677.7061">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="160" y="42.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="167" y="62.8059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="160" y="652.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="167" y="672.2059">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pjtsqv6ze4bt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="37.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="313" y="57.9482">B</text>
-      <rect fill="#FEFECE" filter="url(#f1pjtsqv6ze4bt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="657.7109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="313" y="677.7061">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="275" y="42.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="282" y="62.8059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="275" y="652.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="282" y="672.2059">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1pjtsqv6ze4bt)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="176,100.3828,186,104.3828,176,108.3828,180,104.3828" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="182" y1="104.3828" y2="104.3828"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="106" y="99.3169">A()</text>
+    <rect fill="#FFFFFF" height="515.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="76.5" y="84.5999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="106.1999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="260.9999"/>
+    <rect fill="#FFFFFF" height="156.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="369.7999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="171.5" y="407.4"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="171.5" y="477"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="555.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="281.5" y="165.7999"/>
+    <rect fill="#FFFFFF" height="259.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="281.5" y="340.1999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="154.5,102.1999,164.5,106.1999,154.5,110.1999,158.5,106.1999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="86.5" x2="160.5" y1="106.1999" y2="106.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="93.5" y="100.6769">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="303,159.5156,313,163.5156,303,167.5156,307,163.5156" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="309" y1="163.5156" y2="163.5156"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="106" y="158.4497">B(A &amp;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="269.5,161.7999,279.5,165.7999,269.5,169.7999,273.5,165.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="86.5" x2="275.5" y1="165.7999" y2="165.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="93.5" y="160.2769">B(A &amp;)</text>
     </a>
-    <path d="M19,206.5156 L19,231.5156 L164,231.5156 L164,216.5156 L154,206.5156 L19,206.5156 " fill="#FBFB77" filter="url(#f1pjtsqv6ze4bt)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M154,206.5156 L154,216.5156 L164,216.5156 L154,206.5156 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="124" x="25" y="223.5825">Just add 2 numbers</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="176,257.7813,186,261.7813,176,265.7813,180,261.7813" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="182" y1="261.7813" y2="261.7813"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="106" y="256.7153">add(int,int)</text>
+    <path d="M13,208.7999 L13,233.7999 L149,233.7999 L149,218.7999 L139,208.7999 L13,208.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M139,208.7999 L139,218.7999 L149,218.7999 L139,208.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="115" x="19" y="225.8769">Just add 2 numbers</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="154.5,256.9999,164.5,260.9999,154.5,264.9999,158.5,260.9999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="86.5" x2="160.5" y1="260.9999" y2="260.9999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="93.5" y="255.4769">add(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="110,271.7813,100,275.7813,110,279.7813,106,275.7813" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="104" x2="192" y1="275.7813" y2="275.7813"/>
-    <path d="M8,288.7813 L8,313.7813 L177,313.7813 L177,298.7813 L167,288.7813 L8,288.7813 " fill="#FBFB77" filter="url(#f1pjtsqv6ze4bt)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M167,288.7813 L167,298.7813 L177,298.7813 L167,288.7813 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="148" x="14" y="305.8481">And now add another 2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="303,340.0469,313,344.0469,303,348.0469,307,344.0469" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="309" y1="344.0469" y2="344.0469"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="106" y="338.981">wrap_add3(int,int,int)</text>
+    <polygon fill="#181818" points="97.5,270.9999,87.5,274.9999,97.5,278.9999,93.5,274.9999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="91.5" x2="170.5" y1="274.9999" y2="274.9999"/>
+    <path d="M5,287.9999 L5,312.9999 L159,312.9999 L159,297.9999 L149,287.9999 L5,287.9999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M149,287.9999 L149,297.9999 L159,297.9999 L149,287.9999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="133" x="11" y="305.0769">And now add another 2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="269.5,336.1999,279.5,340.1999,269.5,344.1999,273.5,340.1999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="86.5" x2="275.5" y1="340.1999" y2="340.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="120" x="93.5" y="334.6769">wrap_add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="209,369.1797,199,373.1797,209,377.1797,205,373.1797" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="314" y1="373.1797" y2="373.1797"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="215" y="368.1138">add3(int,int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="187.5,365.7999,177.5,369.7999,187.5,373.7999,183.5,369.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="181.5" x2="280.5" y1="369.7999" y2="369.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="86" x="193.5" y="364.2769">add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="198" x2="245" y1="397.3125" y2="397.3125"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="245" y1="397.3125" y2="410.3125"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204" x2="245" y1="410.3125" y2="410.3125"/>
-      <polygon fill="#A80036" points="214,406.3125,204,410.3125,214,414.3125,210,410.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="210" y="392.2466">add(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="176.5" x2="223.5" y1="394.4" y2="394.4"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="223.5" y1="394.4" y2="407.4"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="223.5" y1="407.4" y2="407.4"/>
+      <polygon fill="#181818" points="192.5,403.4,182.5,407.4,192.5,411.4,188.5,407.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="188.5" y="388.877">add(int,int)</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="203" x2="245" y1="434.3125" y2="434.3125"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="245" x2="245" y1="434.3125" y2="447.3125"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="198" x2="245" y1="447.3125" y2="447.3125"/>
-    <polygon fill="#A80036" points="208,443.3125,198,447.3125,208,451.3125,204,447.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="245" y1="471.4453" y2="471.4453"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="245" y1="471.4453" y2="484.4453"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204" x2="245" y1="484.4453" y2="484.4453"/>
-      <polygon fill="#A80036" points="214,480.4453,204,484.4453,214,488.4453,210,484.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="210" y="466.3794">log_result(int)</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="181.5" x2="223.5" y1="431.4" y2="431.4"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="223.5" x2="223.5" y1="431.4" y2="444.4"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="176.5" x2="223.5" y1="444.4" y2="444.4"/>
+    <polygon fill="#181818" points="186.5,440.4,176.5,444.4,186.5,448.4,182.5,444.4" style="stroke:#181818;stroke-width:1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="181.5" x2="223.5" y1="469" y2="469"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="223.5" y1="469" y2="482"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="223.5" y1="482" y2="482"/>
+      <polygon fill="#181818" points="192.5,478,182.5,482,192.5,486,188.5,482" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="78" x="188.5" y="463.477">log_result(int)</text>
     </a>
-    <polygon fill="#A80036" points="303,524.4453,313,528.4453,303,532.4453,307,528.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193" x2="309" y1="528.4453" y2="528.4453"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="209,553.5781,199,557.5781,209,561.5781,205,557.5781" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="314" y1="557.5781" y2="557.5781"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="215" y="552.5122">log_result(int)</text>
+    <polygon fill="#181818" points="269.5,522,279.5,526,269.5,530,273.5,526" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="171.5" x2="275.5" y1="526" y2="526"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="187.5,551.6,177.5,555.6,187.5,559.6,183.5,555.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="181.5" x2="280.5" y1="555.6" y2="555.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="78" x="193.5" y="550.077">log_result(int)</text>
     </a>
-    <polygon fill="#A80036" points="105,597.5781,95,601.5781,105,605.5781,101,601.5781" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="99" x2="319" y1="601.5781" y2="601.5781"/>
-    <path d="M24,614.5781 L24,639.5781 L159,639.5781 L159,624.5781 L149,614.5781 L24,614.5781 " fill="#FBFB77" filter="url(#f1pjtsqv6ze4bt)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M149,614.5781 L149,624.5781 L159,624.5781 L149,614.5781 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="30" y="631.645">Main test function</text>
+    <polygon fill="#181818" points="92.5,595.6,82.5,599.6,92.5,603.6,88.5,599.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="86.5" x2="285.5" y1="599.6" y2="599.6"/>
+    <path d="M19,612.6 L19,637.6 L144,637.6 L144,622.6 L134,612.6 L19,612.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M134,612.6 L134,622.6 L144,622.6 L134,612.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="104" x="25" y="629.677">Main test function</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t20001_sequence_mermaid.svg b/docs/test_cases/t20001_sequence_mermaid.svg
index 51e39579..ef11462d 100644
--- a/docs/test_cases/t20001_sequence_mermaid.svg
+++ b/docs/test_cases/t20001_sequence_mermaid.svg
@@ -1,5 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-60 -50 660 850" style="max-width: 660px; background-color: white;" width="660" id="my-svg">
-  <title id="chart-title-my-svg">Basic sequence diagram example</title>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-60 -50 660 850" style="max-width: 660px; background-color: white;" width="660" id="my-svg">
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="724" x="400"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="756.5" x="475">
@@ -64,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -128,29 +127,29 @@
       <tspan x="75">Main test function</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">A()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="278">B(A &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="219" x="178">add(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="250" x2="275" y1="250" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="265" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="260" x2="80" y1="260" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="322" x="278">wrap_add3(int,int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="353" x2="475" y1="353" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="368" x="373">add3(int,int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="399" x2="275" y1="399" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">A()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="276">B(A &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="219" x="176">add(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="250" x2="271" y1="250" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="265" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="260" x2="83" y1="260" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="322" x="276">wrap_add3(int,int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="353" x2="471" y1="353" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="368" x="375">add3(int,int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="399" x2="279" y1="399" x1="470"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="414" x="280">add(int,int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,445 C 340,435 340,475 280,465"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="490" x="285">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 285,485 C 345,475 345,515 285,505"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="530" x="280">log_result(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,561 C 340,551 340,591 280,581"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="606" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="601" x2="470" y1="601" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="616" x="373">log_result(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="647" x2="275" y1="647" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="662" x="275">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="657" x2="80" y1="657" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="606" x="374">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="601" x2="467" y1="601" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="616" x="375">log_result(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="647" x2="279" y1="647" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="662" x="277">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="657" x2="83" y1="657" x1="470"/>
   <text y="-25" x="180">Basic sequence diagram example</text>
 </svg>
diff --git a/docs/test_cases/t20002.md b/docs/test_cases/t20002.md
index eea0656e..c4176911 100644
--- a/docs/test_cases/t20002.md
+++ b/docs/test_cases/t20002.md
@@ -15,7 +15,7 @@ diagrams:
 
 ```
 ## Source code
-File t20002.cc
+File `tests/t20002/t20002.cc`
 ```cpp
 #include <algorithm>
 #include <numeric>
diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg
index 188e8fd2..4ce8e8c6 100644
--- a/docs/test_cases/t20002_sequence.svg
+++ b/docs/test_cases/t20002_sequence.svg
@@ -1,61 +1,55 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:245px;height:170px;" version="1.1" viewBox="0 0 245 170" width="245px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="164px" preserveAspectRatio="none" style="width:217px;height:164px;background:#FFFFFF;" version="1.1" viewBox="0 0 217 164" width="217px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pqq01fuqb1q8" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1pqq01fuqb1q8)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1pqq01fuqb1q8)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1pqq01fuqb1q8)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1pqq01fuqb1q8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="33" x2="33" y1="38.2969" y2="130.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="93" x2="93" y1="38.2969" y2="130.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="153" x2="153" y1="38.2969" y2="130.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="213" x2="213" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pqq01fuqb1q8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="22.9951">m1()</text>
-      <rect fill="#FEFECE" filter="url(#f1pqq01fuqb1q8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="149.292">m1()</text>
+    <rect fill="#FFFFFF" height="64" style="stroke:#181818;stroke-width:1.0;" width="10" x="22" y="46.7999"/>
+    <rect fill="#FFFFFF" height="58" style="stroke:#181818;stroke-width:1.0;" width="10" x="76" y="52.7999"/>
+    <rect fill="#FFFFFF" height="44" style="stroke:#181818;stroke-width:1.0;" width="10" x="130" y="66.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="80.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="27" x2="27" y1="36.7999" y2="128.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="81" x2="81" y1="36.7999" y2="128.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="135" x2="135" y1="36.7999" y2="128.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="189" x2="189" y1="36.7999" y2="128.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="12" y="25.0059">m1()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="5" y="127.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="12" y="147.8059">m1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pqq01fuqb1q8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="22.9951">m2()</text>
-      <rect fill="#FEFECE" filter="url(#f1pqq01fuqb1q8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="149.292">m2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="59" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="66" y="25.0059">m2()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="59" y="127.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="66" y="147.8059">m2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pqq01fuqb1q8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="22.9951">m3()</text>
-      <rect fill="#FEFECE" filter="url(#f1pqq01fuqb1q8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="149.292">m3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="113" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="120" y="25.0059">m3()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="113" y="127.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="120" y="147.8059">m3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pqq01fuqb1q8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="22.9951">m4()</text>
-      <rect fill="#FEFECE" filter="url(#f1pqq01fuqb1q8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="149.292">m4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="167" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="174" y="25.0059">m4()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="167" y="127.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="174" y="147.8059">m4()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1pqq01fuqb1q8)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1pqq01fuqb1q8)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1pqq01fuqb1q8)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1pqq01fuqb1q8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="76,50.2969,86,54.2969,76,58.2969,80,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="82" y1="54.2969" y2="54.2969"/>
+    <rect fill="#FFFFFF" height="64" style="stroke:#181818;stroke-width:1.0;" width="10" x="22" y="46.7999"/>
+    <rect fill="#FFFFFF" height="58" style="stroke:#181818;stroke-width:1.0;" width="10" x="76" y="52.7999"/>
+    <rect fill="#FFFFFF" height="44" style="stroke:#181818;stroke-width:1.0;" width="10" x="130" y="66.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="80.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="64,48.7999,74,52.7999,64,56.7999,68,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="32" x2="70" y1="52.7999" y2="52.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="136,64.2969,146,68.2969,136,72.2969,140,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="98" x2="142" y1="68.2969" y2="68.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="118,62.7999,128,66.7999,118,70.7999,122,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="86" x2="124" y1="66.7999" y2="66.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="196,78.2969,206,82.2969,196,86.2969,200,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="158" x2="202" y1="82.2969" y2="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="172,76.7999,182,80.7999,172,84.7999,176,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="140" x2="178" y1="80.7999" y2="80.7999"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20002_sequence_mermaid.svg b/docs/test_cases/t20002_sequence_mermaid.svg
index 856d0a45..53f2199c 100644
--- a/docs/test_cases/t20002_sequence_mermaid.svg
+++ b/docs/test_cases/t20002_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -109,10 +109,10 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="89" x="670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="378">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="475" y1="85" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="578">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="675" y1="95" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="376">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="471" y1="85" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="576">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="671" y1="95" x1="480"/>
 </svg>
diff --git a/docs/test_cases/t20003.md b/docs/test_cases/t20003.md
index f523d0a0..92d17d1c 100644
--- a/docs/test_cases/t20003.md
+++ b/docs/test_cases/t20003.md
@@ -15,7 +15,7 @@ diagrams:
 
 ```
 ## Source code
-File t20003.cc
+File `tests/t20003/t20003.cc`
 ```cpp
 namespace clanguml {
 namespace t20003 {
diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg
index 0502df17..302a670e 100644
--- a/docs/test_cases/t20003_sequence.svg
+++ b/docs/test_cases/t20003_sequence.svg
@@ -1,61 +1,55 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:413px;height:170px;" version="1.1" viewBox="0 0 413 170" width="413px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="164px" preserveAspectRatio="none" style="width:353px;height:164px;background:#FFFFFF;" version="1.1" viewBox="0 0 353 164" width="353px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10t3fpclrvksb" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f10t3fpclrvksb)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10t3fpclrvksb)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10t3fpclrvksb)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10t3fpclrvksb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="54" x2="54" y1="38.2969" y2="130.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="156" x2="156" y1="38.2969" y2="130.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="258" x2="258" y1="38.2969" y2="130.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="360" x2="360" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10t3fpclrvksb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="22.9951">m1&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f10t3fpclrvksb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="149.292">m1&lt;T&gt;(T)</text>
+    <rect fill="#FFFFFF" height="64" style="stroke:#181818;stroke-width:1.0;" width="10" x="39" y="46.7999"/>
+    <rect fill="#FFFFFF" height="58" style="stroke:#181818;stroke-width:1.0;" width="10" x="127" y="52.7999"/>
+    <rect fill="#FFFFFF" height="44" style="stroke:#181818;stroke-width:1.0;" width="10" x="215" y="66.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="303" y="80.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="44" x2="44" y1="36.7999" y2="128.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="132" x2="132" y1="36.7999" y2="128.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="220" x2="220" y1="36.7999" y2="128.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="308" x2="308" y1="36.7999" y2="128.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="12" y="25.0059">m1&lt;T&gt;(T)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="5" y="127.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="12" y="147.8059">m1&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10t3fpclrvksb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="22.9951">m2&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f10t3fpclrvksb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="149.292">m2&lt;T&gt;(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="93" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="100" y="25.0059">m2&lt;T&gt;(T)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="93" y="127.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="100" y="147.8059">m2&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10t3fpclrvksb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="22.9951">m3&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f10t3fpclrvksb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="149.292">m3&lt;T&gt;(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="181" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="188" y="25.0059">m3&lt;T&gt;(T)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="181" y="127.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="188" y="147.8059">m3&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10t3fpclrvksb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="22.9951">m4&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f10t3fpclrvksb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="149.292">m4&lt;T&gt;(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="269" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="276" y="25.0059">m4&lt;T&gt;(T)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="269" y="127.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="276" y="147.8059">m4&lt;T&gt;(T)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f10t3fpclrvksb)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10t3fpclrvksb)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10t3fpclrvksb)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10t3fpclrvksb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="139,50.2969,149,54.2969,139,58.2969,143,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="59" x2="145" y1="54.2969" y2="54.2969"/>
+    <rect fill="#FFFFFF" height="64" style="stroke:#181818;stroke-width:1.0;" width="10" x="39" y="46.7999"/>
+    <rect fill="#FFFFFF" height="58" style="stroke:#181818;stroke-width:1.0;" width="10" x="127" y="52.7999"/>
+    <rect fill="#FFFFFF" height="44" style="stroke:#181818;stroke-width:1.0;" width="10" x="215" y="66.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="303" y="80.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="115,48.7999,125,52.7999,115,56.7999,119,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="49" x2="121" y1="52.7999" y2="52.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="241,64.2969,251,68.2969,241,72.2969,245,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="247" y1="68.2969" y2="68.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="203,62.7999,213,66.7999,203,70.7999,207,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137" x2="209" y1="66.7999" y2="66.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="343,78.2969,353,82.2969,343,86.2969,347,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="263" x2="349" y1="82.2969" y2="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="291,76.7999,301,80.7999,291,84.7999,295,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="225" x2="297" y1="80.7999" y2="80.7999"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20003_sequence_mermaid.svg b/docs/test_cases/t20003_sequence_mermaid.svg
index 6541cbff..1da4bead 100644
--- a/docs/test_cases/t20003_sequence_mermaid.svg
+++ b/docs/test_cases/t20003_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -109,10 +109,10 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="89" x="670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="378">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="475" y1="85" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="578">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="675" y1="95" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="376">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="471" y1="85" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="576">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="671" y1="95" x1="480"/>
 </svg>
diff --git a/docs/test_cases/t20004.md b/docs/test_cases/t20004.md
index 46d2ffff..d688fe04 100644
--- a/docs/test_cases/t20004.md
+++ b/docs/test_cases/t20004.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20004::main()"
 ```
 ## Source code
-File t20004.cc
+File `tests/t20004/t20004.cc`
 ```cpp
 #include <string>
 
diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg
index 32db2ffb..e412a4a4 100644
--- a/docs/test_cases/t20004_sequence.svg
+++ b/docs/test_cases/t20004_sequence.svg
@@ -1,157 +1,151 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="350px" preserveAspectRatio="none" style="width:1706px;height:350px;" version="1.1" viewBox="0 0 1706 350" width="1706px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="344px" preserveAspectRatio="none" style="width:1474px;height:344px;background:#FFFFFF;" version="1.1" viewBox="0 0 1474 344" width="1474px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f16nv3n1etyauj" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="38" x2="38" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="145" x2="145" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="357" x2="357" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="639" x2="639" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="893" x2="893" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1119" x2="1119" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1291" x2="1291" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1409" x2="1409" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1527" x2="1527" y1="38.2969" y2="310.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1645" x2="1645" y1="38.2969" y2="310.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="22.9951">main()</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="329.292">main()</text>
+    <rect fill="#FFFFFF" height="244" style="stroke:#181818;stroke-width:1.0;" width="10" x="27.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="122" y="52.7999"/>
+    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="308" y="80.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="556" y="94.7999"/>
+    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="777" y="136.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="971" y="150.7999"/>
+    <rect fill="#FFFFFF" height="98" style="stroke:#181818;stroke-width:1.0;" width="10" x="1118" y="192.7999"/>
+    <rect fill="#FFFFFF" height="70" style="stroke:#181818;stroke-width:1.0;" width="10" x="1218" y="206.7999"/>
+    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="1318" y="220.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="1418" y="234.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="32" x2="32" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="127" x2="127" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="313" x2="313" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="561" x2="561" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="782" x2="782" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="976" x2="976" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1123" x2="1123" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1223" x2="1223" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1323" x2="1323" y1="36.7999" y2="308.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1423" x2="1423" y1="36.7999" y2="308.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="12" y="25.0059">main()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="5" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="12" y="327.8059">main()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="22.9951">m1&lt;float&gt;(float)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="329.292">m1&lt;float&gt;(float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="70" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="77" y="25.0059">m1&lt;float&gt;(float)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="70" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="77" y="327.8059">m1&lt;float&gt;(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="22.9951">m1&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="329.292">m1&lt;unsigned long&gt;(unsigned long)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="194" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224" x="201" y="25.0059">m1&lt;unsigned long&gt;(unsigned long)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="194" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224" x="201" y="327.8059">m1&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="22.9951">m4&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="329.292">m4&lt;unsigned long&gt;(unsigned long)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="442" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224" x="449" y="25.0059">m4&lt;unsigned long&gt;(unsigned long)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="442" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224" x="449" y="327.8059">m4&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="22.9951">m1&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="329.292">m1&lt;std::string&gt;(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="690" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="697" y="25.0059">m1&lt;std::string&gt;(std::string)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="690" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="697" y="327.8059">m1&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="22.9951">m2&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="329.292">m2&lt;std::string&gt;(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="884" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="891" y="25.0059">m2&lt;std::string&gt;(std::string)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="884" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="891" y="327.8059">m2&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="22.9951">m1&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="329.292">m1&lt;int&gt;(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1078" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1085" y="25.0059">m1&lt;int&gt;(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1078" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1085" y="327.8059">m1&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="22.9951">m2&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="329.292">m2&lt;int&gt;(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1178" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1185" y="25.0059">m2&lt;int&gt;(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1178" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1185" y="327.8059">m2&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="22.9951">m3&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="329.292">m3&lt;int&gt;(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1278" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1285" y="25.0059">m3&lt;int&gt;(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1278" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1285" y="327.8059">m3&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="22.9951">m4&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16nv3n1etyauj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="329.292">m4&lt;int&gt;(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1378" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1385" y="25.0059">m4&lt;int&gt;(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1378" y="307.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1385" y="327.8059">m4&lt;int&gt;(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16nv3n1etyauj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="128,50.2969,138,54.2969,128,58.2969,132,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="134" y1="54.2969" y2="54.2969"/>
+    <rect fill="#FFFFFF" height="244" style="stroke:#181818;stroke-width:1.0;" width="10" x="27.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="122" y="52.7999"/>
+    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="308" y="80.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="556" y="94.7999"/>
+    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="777" y="136.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="971" y="150.7999"/>
+    <rect fill="#FFFFFF" height="98" style="stroke:#181818;stroke-width:1.0;" width="10" x="1118" y="192.7999"/>
+    <rect fill="#FFFFFF" height="70" style="stroke:#181818;stroke-width:1.0;" width="10" x="1218" y="206.7999"/>
+    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="1318" y="220.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="1418" y="234.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="110,48.7999,120,52.7999,110,56.7999,114,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="37.5" x2="116" y1="52.7999" y2="52.7999"/>
     </a>
-    <polygon fill="#A80036" points="54.5,64.2969,44.5,68.2969,54.5,72.2969,50.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="144" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="340,78.2969,350,82.2969,340,86.2969,344,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="346" y1="82.2969" y2="82.2969"/>
+    <polygon fill="#181818" points="48.5,62.7999,38.5,66.7999,48.5,70.7999,44.5,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="42.5" x2="126" y1="66.7999" y2="66.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="296,76.7999,306,80.7999,296,84.7999,300,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="37.5" x2="302" y1="80.7999" y2="80.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="622,92.2969,632,96.2969,622,100.2969,626,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="362" x2="628" y1="96.2969" y2="96.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="544,90.7999,554,94.7999,544,98.7999,548,94.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="318" x2="550" y1="94.7999" y2="94.7999"/>
     </a>
-    <polygon fill="#A80036" points="373,106.2969,363,110.2969,373,114.2969,369,110.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="367" x2="638" y1="110.2969" y2="110.2969"/>
-    <polygon fill="#A80036" points="54.5,120.2969,44.5,124.2969,54.5,128.2969,50.5,124.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="356" y1="124.2969" y2="124.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="876,134.2969,886,138.2969,876,142.2969,880,138.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="882" y1="138.2969" y2="138.2969"/>
+    <polygon fill="#181818" points="329,104.7999,319,108.7999,329,112.7999,325,108.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="323" x2="560" y1="108.7999" y2="108.7999"/>
+    <polygon fill="#181818" points="48.5,118.7999,38.5,122.7999,48.5,126.7999,44.5,122.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="42.5" x2="312" y1="122.7999" y2="122.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="765,132.7999,775,136.7999,765,140.7999,769,136.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="37.5" x2="771" y1="136.7999" y2="136.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="1102,148.2969,1112,152.2969,1102,156.2969,1106,152.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="898" x2="1108" y1="152.2969" y2="152.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="959,146.7999,969,150.7999,959,154.7999,963,150.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="787" x2="965" y1="150.7999" y2="150.7999"/>
     </a>
-    <polygon fill="#A80036" points="909,162.2969,899,166.2969,909,170.2969,905,166.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="903" x2="1118" y1="166.2969" y2="166.2969"/>
-    <polygon fill="#A80036" points="54.5,176.2969,44.5,180.2969,54.5,184.2969,50.5,180.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="892" y1="180.2969" y2="180.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="1274,190.2969,1284,194.2969,1274,198.2969,1278,194.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="1280" y1="194.2969" y2="194.2969"/>
+    <polygon fill="#181818" points="798,160.7999,788,164.7999,798,168.7999,794,164.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="792" x2="975" y1="164.7999" y2="164.7999"/>
+    <polygon fill="#181818" points="48.5,174.7999,38.5,178.7999,48.5,182.7999,44.5,178.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="42.5" x2="781" y1="178.7999" y2="178.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="1106,188.7999,1116,192.7999,1106,196.7999,1110,192.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="37.5" x2="1112" y1="192.7999" y2="192.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="1392,204.2969,1402,208.2969,1392,212.2969,1396,208.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="1296" x2="1398" y1="208.2969" y2="208.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="1206,202.7999,1216,206.7999,1206,210.7999,1210,206.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="1128" x2="1212" y1="206.7999" y2="206.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="1510,218.2969,1520,222.2969,1510,226.2969,1514,222.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="1414" x2="1516" y1="222.2969" y2="222.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="1306,216.7999,1316,220.7999,1306,224.7999,1310,220.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="1228" x2="1312" y1="220.7999" y2="220.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="1628,232.2969,1638,236.2969,1628,240.2969,1632,236.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="1532" x2="1634" y1="236.2969" y2="236.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="1406,230.7999,1416,234.7999,1406,238.7999,1410,234.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="1328" x2="1412" y1="234.7999" y2="234.7999"/>
     </a>
-    <polygon fill="#A80036" points="1543,246.2969,1533,250.2969,1543,254.2969,1539,250.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1537" x2="1644" y1="250.2969" y2="250.2969"/>
-    <polygon fill="#A80036" points="1425,260.2969,1415,264.2969,1425,268.2969,1421,264.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1419" x2="1526" y1="264.2969" y2="264.2969"/>
-    <polygon fill="#A80036" points="1307,274.2969,1297,278.2969,1307,282.2969,1303,278.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1301" x2="1408" y1="278.2969" y2="278.2969"/>
-    <polygon fill="#A80036" points="49.5,288.2969,39.5,292.2969,49.5,296.2969,45.5,292.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="43.5" x2="1290" y1="292.2969" y2="292.2969"/>
+    <polygon fill="#181818" points="1339,244.7999,1329,248.7999,1339,252.7999,1335,248.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="1333" x2="1422" y1="248.7999" y2="248.7999"/>
+    <polygon fill="#181818" points="1239,258.7999,1229,262.7999,1239,266.7999,1235,262.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="1233" x2="1322" y1="262.7999" y2="262.7999"/>
+    <polygon fill="#181818" points="1139,272.7999,1129,276.7999,1139,280.7999,1135,276.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="1133" x2="1222" y1="276.7999" y2="276.7999"/>
+    <polygon fill="#181818" points="43.5,286.7999,33.5,290.7999,43.5,294.7999,39.5,290.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="37.5" x2="1122" y1="290.7999" y2="290.7999"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20004_sequence_mermaid.svg b/docs/test_cases/t20004_sequence_mermaid.svg
index 20b66b63..65a0309a 100644
--- a/docs/test_cases/t20004_sequence_mermaid.svg
+++ b/docs/test_cases/t20004_sequence_mermaid.svg
@@ -168,17 +168,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -217,40 +217,40 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="209" x="2164"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="80" y1="85" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="303">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="525" y1="95" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="110" x="678">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="105" x2="825" y1="105" x1="530"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="120" x="675">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="115" x2="530" y1="115" x1="820"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="130" x="300">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="125" x2="80" y1="125" x1="520"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="140" x="589">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="135" x2="1098.5" y1="135" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="150" x="1225">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="145" x2="1345.5" y1="145" x1="1103.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="160" x="1222">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="155" x2="1103.5" y1="155" x1="1340.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="170" x="587">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="165" x2="80" y1="165" x1="1093.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="180" x="825">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="175" x2="1569" y1="175" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="190" x="1672">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="185" x2="1769" y1="185" x1="1574"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="200" x="1872">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="195" x2="1969" y1="195" x1="1774"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="210" x="2072">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="205" x2="2169" y1="205" x1="1974"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="220" x="2069">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="215" x2="1974" y1="215" x1="2164"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="230" x="1869">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="225" x2="1774" y1="225" x1="1964"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="240" x="1669">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="235" x2="1574" y1="235" x1="1764"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="250" x="822">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="245" x2="80" y1="245" x1="1564"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="83" y1="85" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="301">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="521" y1="95" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="110" x="676">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="105" x2="821" y1="105" x1="530"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="120" x="677">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="115" x2="533" y1="115" x1="820"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="130" x="302">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="125" x2="83" y1="125" x1="520"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="140" x="587">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="135" x2="1094.5" y1="135" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="150" x="1223">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="145" x2="1341.5" y1="145" x1="1103.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="160" x="1224">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="155" x2="1106.5" y1="155" x1="1340.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="170" x="588">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="165" x2="83" y1="165" x1="1093.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="180" x="823">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="175" x2="1565" y1="175" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="190" x="1670">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="185" x2="1765" y1="185" x1="1574"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="200" x="1870">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="195" x2="1965" y1="195" x1="1774"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="210" x="2070">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="205" x2="2165" y1="205" x1="1974"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="220" x="2071">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="215" x2="1977" y1="215" x1="2164"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="230" x="1871">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="225" x2="1777" y1="225" x1="1964"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="240" x="1671">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="235" x2="1577" y1="235" x1="1764"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="250" x="824">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="245" x2="83" y1="245" x1="1564"/>
 </svg>
diff --git a/docs/test_cases/t20005.md b/docs/test_cases/t20005.md
index 7946a80d..28f8a757 100644
--- a/docs/test_cases/t20005.md
+++ b/docs/test_cases/t20005.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20005::C<T>::c(T)"
 ```
 ## Source code
-File t20005.cc
+File `tests/t20005/t20005.cc`
 ```cpp
 namespace clanguml {
 namespace t20005 {
diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg
index 3cea17ef..b9afa284 100644
--- a/docs/test_cases/t20005_sequence.svg
+++ b/docs/test_cases/t20005_sequence.svg
@@ -1,59 +1,53 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:229px;height:227px;" version="1.1" viewBox="0 0 229 227" width="229px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="223px" preserveAspectRatio="none" style="width:193px;height:223px;background:#FFFFFF;" version="1.1" viewBox="0 0 193 223" width="193px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f8bkm66hkk3mm" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f8bkm66hkk3mm)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f8bkm66hkk3mm)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f8bkm66hkk3mm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="50.5" x2="50.5" y1="38.2969" y2="187.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="121.5" x2="121.5" y1="38.2969" y2="187.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8bkm66hkk3mm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="22.9951">C&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f8bkm66hkk3mm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="206.6904">C&lt;T&gt;</text>
+    <rect fill="#FFFFFF" height="101.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="42" y="68.3999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="100.5" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="158.5" y="127.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="46.5" x2="46.5" y1="36.7999" y2="187.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="105.5" x2="105.5" y1="36.7999" y2="187.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="163.5" x2="163.5" y1="36.7999" y2="187.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="49" x="22.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="29.5" y="25.0059">C&lt;T&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="49" x="22.5" y="186.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="29.5" y="206.6059">C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8bkm66hkk3mm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="22.9951">B&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f8bkm66hkk3mm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="206.6904">B&lt;T&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="48" x="81.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="88.5" y="25.0059">B&lt;T&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="48" x="81.5" y="186.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="88.5" y="206.6059">B&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8bkm66hkk3mm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="22.9951">A&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f8bkm66hkk3mm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="206.6904">A&lt;T&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="48" x="139.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="146.5" y="25.0059">A&lt;T&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="48" x="139.5" y="186.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="146.5" y="206.6059">A&lt;T&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f8bkm66hkk3mm)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f8bkm66hkk3mm)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f8bkm66hkk3mm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
-    <polygon fill="#A80036" points="34,65.4297,44,69.4297,34,73.4297,38,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="40" y1="69.4297" y2="69.4297"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="10" y="64.3638">c(T)</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="105,94.5625,115,98.5625,105,102.5625,109,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="56" x2="111" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="63" y="93.4966">b(T)</text>
+    <rect fill="#FFFFFF" height="101.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="42" y="68.3999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="100.5" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="158.5" y="127.6"/>
+    <polygon fill="#181818" points="30,64.3999,40,68.3999,30,72.3999,34,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="36" y1="68.3999" y2="68.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="23" x="7" y="62.8769">c(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="88.5,94,98.5,98,88.5,102,92.5,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="52" x2="94.5" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="23" x="59" y="92.477">b(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="175.5,123.6953,185.5,127.6953,175.5,131.6953,179.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="127" x2="181.5" y1="127.6953" y2="127.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="134" y="122.6294">a(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="146.5,123.6,156.5,127.6,146.5,131.6,150.5,127.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="110.5" x2="152.5" y1="127.6" y2="127.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="23" x="117.5" y="122.077">a(T)</text>
     </a>
-    <polygon fill="#A80036" points="138,137.6953,128,141.6953,138,145.6953,134,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="132" x2="191.5" y1="141.6953" y2="141.6953"/>
-    <polygon fill="#A80036" points="67,151.6953,57,155.6953,67,159.6953,63,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="61" x2="121" y1="155.6953" y2="155.6953"/>
-    <polygon fill="#A80036" points="14,165.6953,4,169.6953,14,173.6953,10,169.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="8" x2="50" y1="169.6953" y2="169.6953"/>
+    <polygon fill="#181818" points="121.5,137.6,111.5,141.6,121.5,145.6,117.5,141.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="115.5" x2="162.5" y1="141.6" y2="141.6"/>
+    <polygon fill="#181818" points="63,151.6,53,155.6,63,159.6,59,155.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="57" x2="104.5" y1="155.6" y2="155.6"/>
+    <polygon fill="#181818" points="11,165.6,1,169.6,11,173.6,7,169.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="5" x2="46" y1="169.6" y2="169.6"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20005_sequence_mermaid.svg b/docs/test_cases/t20005_sequence_mermaid.svg
index 63cb6780..d0bced3a 100644
--- a/docs/test_cases/t20005_sequence_mermaid.svg
+++ b/docs/test_cases/t20005_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -106,16 +106,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="207" x="670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">c(T)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="75" y1="111" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="278">b(T)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="578">a(T)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="575">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="213" x2="480" y1="213" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="275">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="80" y1="223" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="178">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="233" x2="275" y1="233" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="177">c(T)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="79" y1="111" x1="274"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="276">b(T)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="576">a(T)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="213" x2="483" y1="213" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="277">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="83" y1="223" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="176">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="233" x2="271" y1="233" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20006.md b/docs/test_cases/t20006.md
index dd640a5e..c3f22f38 100644
--- a/docs/test_cases/t20006.md
+++ b/docs/test_cases/t20006.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20006::tmain()"
 ```
 ## Source code
-File t20006.cc
+File `tests/t20006/t20006.cc`
 ```cpp
 #include <string>
 
diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg
index a254564e..7ce2ed72 100644
--- a/docs/test_cases/t20006_sequence.svg
+++ b/docs/test_cases/t20006_sequence.svg
@@ -1,207 +1,201 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="872px" preserveAspectRatio="none" style="width:986px;height:872px;" version="1.1" viewBox="0 0 986 872" width="986px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="874px" preserveAspectRatio="none" style="width:829px;height:874px;background:#FFFFFF;" version="1.1" viewBox="0 0 829 874" width="829px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1wnp4rfvc8p5j" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="832.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="832.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="832.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="302" x2="302" y1="38.2969" y2="832.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="435" x2="435" y1="38.2969" y2="832.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="583" x2="583" y1="38.2969" y2="832.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="832.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="842" x2="842" y1="38.2969" y2="832.5547"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="940" x2="940" y1="38.2969" y2="832.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="851.5498">tmain()</text>
+    <rect fill="#FFFFFF" height="774.2002" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="98"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="248.5" y="155.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="359.5" y="185.2"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="242.8"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="540.4001"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="629.6001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="606" y="302.4"/>
+    <rect fill="#FFFFFF" height="102.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="606" y="718.8001"/>
+    <rect fill="#FFFFFF" height="64.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="611" y="756.4001"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="704" y="362"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="704" y="451.2001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="391.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="480.8001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="570.0001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="659.2001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="791.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="839.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="101" x2="101" y1="36.7999" y2="839.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="166" x2="166" y1="36.7999" y2="839.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="253" x2="253" y1="36.7999" y2="839.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="364" x2="364" y1="36.7999" y2="839.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="489" x2="489" y1="36.7999" y2="839.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="611" x2="611" y1="36.7999" y2="839.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="709" x2="709" y1="36.7999" y2="839.0002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="791" x2="791" y1="36.7999" y2="839.0002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="858.0061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="851.5498">B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="25.0059">B&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="858.0061">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="851.5498">A&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="139" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="146" y="25.0059">A&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="139" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="146" y="858.0061">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="851.5498">B&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="203" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="210" y="25.0059">B&lt;std::string&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="203" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="210" y="858.0061">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="851.5498">A&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="314" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="321" y="25.0059">A&lt;std::string&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="314" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="321" y="858.0061">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="22.9951">BB&lt;int,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="851.5498">BB&lt;int,std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="425" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="432" y="25.0059">BB&lt;int,std::string&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="425" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="432" y="858.0061">BB&lt;int,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="22.9951">BB&lt;int,float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="851.5498">BB&lt;int,float&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="564" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="571" y="25.0059">BB&lt;int,float&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="564" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="571" y="858.0061">BB&lt;int,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="22.9951">BB&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="851.5498">BB&lt;int,int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="668" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="675" y="25.0059">BB&lt;int,int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="668" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="675" y="858.0061">BB&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="22.9951">AA&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1wnp4rfvc8p5j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="831.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="851.5498">AA&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="760" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="767" y="25.0059">AA&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="760" y="838.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="767" y="858.0061">AA&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1wnp4rfvc8p5j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
+    <rect fill="#FFFFFF" height="774.2002" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="98"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="248.5" y="155.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="359.5" y="185.2"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="242.8"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="540.4001"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="629.6001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="606" y="302.4"/>
+    <rect fill="#FFFFFF" height="102.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="606" y="718.8001"/>
+    <rect fill="#FFFFFF" height="64.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="611" y="756.4001"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="704" y="362"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="704" y="451.2001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="391.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="480.8001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="570.0001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="659.2001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="791.0002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84,64.3999,94,68.3999,84,72.3999,88,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="62.8769">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="149,94,159,98,149,102,153,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="155" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="113" y="92.477">a1(int)</text>
     </a>
-    <polygon fill="#A80036" points="134.5,108.5625,124.5,112.5625,134.5,116.5625,130.5,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="128.5" x2="196" y1="112.5625" y2="112.5625"/>
-    <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="117.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="285.5,151.6953,295.5,155.6953,285.5,159.6953,289.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="291.5" y1="155.6953" y2="155.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="150.6294">b(std::string)</text>
+    <polygon fill="#181818" points="117,108,107,112,117,116,113,112" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="111" x2="165" y1="112" y2="112"/>
+    <polygon fill="#181818" points="50.5,122,40.5,126,50.5,130,46.5,126" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="100" y1="126" y2="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="236.5,151.6,246.5,155.6,236.5,159.6,240.5,155.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="242.5" y1="155.6" y2="155.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="46.5" y="150.077">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="418,180.8281,428,184.8281,418,188.8281,422,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="307.5" x2="424" y1="184.8281" y2="184.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="314.5" y="179.7622">a2(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="347.5,181.2,357.5,185.2,347.5,189.2,351.5,185.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="258.5" x2="353.5" y1="185.2" y2="185.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="80" x="265.5" y="179.677">a2(std::string)</text>
     </a>
-    <polygon fill="#A80036" points="318.5,194.8281,308.5,198.8281,318.5,202.8281,314.5,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="312.5" x2="434" y1="198.8281" y2="198.8281"/>
-    <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="301.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="566,237.9609,576,241.9609,566,245.9609,570,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="241.9609" y2="241.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="53" y="236.895">BB(AA&lt;int&gt; *)</text>
+    <polygon fill="#181818" points="269.5,195.2,259.5,199.2,269.5,203.2,265.5,199.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="263.5" x2="363.5" y1="199.2" y2="199.2"/>
+    <polygon fill="#181818" points="50.5,209.2,40.5,213.2,50.5,217.2,46.5,213.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="252.5" y1="213.2" y2="213.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="472.5,238.8,482.5,242.8,472.5,246.8,476.5,242.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="478.5" y1="242.8" y2="242.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="83" x="46.5" y="237.277">BB(AA&lt;int&gt; *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="709,297.0938,719,301.0938,709,305.0938,713,301.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="301.0938" y2="301.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="99" x="53" y="296.0278">BB(AA&lt;int&gt; &amp;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="594,298.4,604,302.4,594,306.4,598,302.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="600" y1="302.4" y2="302.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="87" x="46.5" y="296.877">BB(AA&lt;int&gt; &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="825,356.2266,835,360.2266,825,364.2266,829,360.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="360.2266" y2="360.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="355.1606">bb1(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="692,358,702,362,692,366,696,362" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="698" y1="362" y2="362"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="46.5" y="356.477">bb1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="923.5,385.3594,933.5,389.3594,923.5,393.3594,927.5,389.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="389.3594" y2="389.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="384.2935">aa1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="774.5,387.6,784.5,391.6,774.5,395.6,778.5,391.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="714" x2="780.5" y1="391.6" y2="391.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="721" y="386.077">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="825,444.4922,835,448.4922,825,452.4922,829,448.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="448.4922" y2="448.4922"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="443.4263">bb2(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="692,447.2001,702,451.2001,692,455.2001,696,451.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="698" y1="451.2001" y2="451.2001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="46.5" y="445.677">bb2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="923.5,473.625,933.5,477.625,923.5,481.625,927.5,477.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="477.625" y2="477.625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="472.5591">aa2(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="774.5,476.8001,784.5,480.8001,774.5,484.8001,778.5,480.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="714" x2="780.5" y1="480.8001" y2="480.8001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="721" y="475.2771">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="566,532.7578,576,536.7578,566,540.7578,570,536.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="536.7578" y2="536.7578"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="531.6919">bb1(int,std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="472.5,536.4001,482.5,540.4001,472.5,544.4001,476.5,540.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="478.5" y1="540.4001" y2="540.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="46.5" y="534.8771">bb1(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="923.5,561.8906,933.5,565.8906,923.5,569.8906,927.5,565.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="565.8906" y2="565.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="560.8247">aa2(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="774.5,566.0001,784.5,570.0001,774.5,574.0001,778.5,570.0001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="494.5" x2="780.5" y1="570.0001" y2="570.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="501.5" y="564.4771">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="566,621.0234,576,625.0234,566,629.0234,570,625.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="625.0234" y2="625.0234"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="619.9575">bb2(int,std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="472.5,625.6001,482.5,629.6001,472.5,633.6001,476.5,629.6001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="478.5" y1="629.6001" y2="629.6001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="46.5" y="624.0771">bb2(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="923.5,650.1563,933.5,654.1563,923.5,658.1563,927.5,654.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="654.1563" y2="654.1563"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="649.0903">aa1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="774.5,655.2001,784.5,659.2001,774.5,663.2001,778.5,659.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="494.5" x2="780.5" y1="659.2001" y2="659.2001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="501.5" y="653.6771">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="709,709.2891,719,713.2891,709,717.2891,713,713.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="713.2891" y2="713.2891"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="708.2231">bb1(int,float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="594,714.8001,604,718.8001,594,722.8001,598,718.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="600" y1="718.8001" y2="718.8001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="46.5" y="713.2771">bb1(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="731" x2="778" y1="737.4219" y2="737.4219"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="778" x2="778" y1="737.4219" y2="750.4219"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="737" x2="778" y1="750.4219" y2="750.4219"/>
-      <polygon fill="#A80036" points="747,746.4219,737,750.4219,747,754.4219,743,750.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="743" y="732.356">bb2(int,float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="616" x2="663" y1="743.4001" y2="743.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="663" x2="663" y1="743.4001" y2="756.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="622" x2="663" y1="756.4001" y2="756.4001"/>
+      <polygon fill="#181818" points="632,752.4001,622,756.4001,632,760.4001,628,756.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="628" y="737.8771">bb2(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="923.5,780.5547,933.5,784.5547,923.5,788.5547,927.5,784.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="736" x2="929.5" y1="784.5547" y2="784.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="743" y="779.4888">aa2(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="774.5,787.0002,784.5,791.0002,774.5,795.0002,778.5,791.0002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="621" x2="780.5" y1="791.0002" y2="791.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="628" y="785.4772">aa2(int)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20006_sequence_mermaid.svg b/docs/test_cases/t20006_sequence_mermaid.svg
index 33f9eca7..e291068d 100644
--- a/docs/test_cases/t20006_sequence_mermaid.svg
+++ b/docs/test_cases/t20006_sequence_mermaid.svg
@@ -153,17 +153,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -226,46 +226,46 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="911" x="1670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="280" y1="167" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="80" y1="177" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="378">b(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="675" y1="223" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="778">a2(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="875" y1="269" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="775">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="680" y1="279" x1="870"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="80" y1="289" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="578">BB(AA&lt;int&gt; *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="1075" y1="335" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="678">BB(AA&lt;int&gt; &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="1275" y1="381" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="778">bb1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="427" x2="1475" y1="427" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="442" x="1578">aa1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="473" x2="1675" y1="473" x1="1480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="488" x="778">bb2(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="519" x2="1475" y1="519" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="534" x="1578">aa2(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="565" x2="1675" y1="565" x1="1480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="580" x="578">bb1(int,std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="611" x2="1075" y1="611" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="626" x="1378">aa2(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="657" x2="1675" y1="657" x1="1080"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="672" x="578">bb2(int,std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="703" x2="1075" y1="703" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="718" x="1378">aa1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="749" x2="1675" y1="749" x1="1080"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="764" x="678">bb1(int,float)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="795" x2="1275" y1="795" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="283" y1="167" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="83" y1="177" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="376">b(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="671" y1="223" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="776">a2(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="871" y1="269" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="777">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="683" y1="279" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="83" y1="289" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="576">BB(AA&lt;int&gt; *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="1071" y1="335" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="676">BB(AA&lt;int&gt; &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="1271" y1="381" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="776">bb1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="427" x2="1471" y1="427" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="442" x="1576">aa1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="473" x2="1671" y1="473" x1="1480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="488" x="776">bb2(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="519" x2="1471" y1="519" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="534" x="1576">aa2(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="565" x2="1671" y1="565" x1="1480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="580" x="576">bb1(int,std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="611" x2="1071" y1="611" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="626" x="1376">aa2(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="657" x2="1671" y1="657" x1="1080"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="672" x="576">bb2(int,std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="703" x2="1071" y1="703" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="718" x="1376">aa1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="749" x2="1671" y1="749" x1="1080"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="764" x="676">bb1(int,float)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="795" x2="1271" y1="795" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="810" x="1280">bb2(int,float)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1280,841 C 1340,831 1340,871 1280,861"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="886" x="1480">aa2(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="917" x2="1675" y1="917" x1="1285"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="886" x="1478">aa2(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="917" x2="1671" y1="917" x1="1285"/>
 </svg>
diff --git a/docs/test_cases/t20007.md b/docs/test_cases/t20007.md
index ed41be24..ef03fdd1 100644
--- a/docs/test_cases/t20007.md
+++ b/docs/test_cases/t20007.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20007::tmain()"
 ```
 ## Source code
-File t20007.cc
+File `tests/t20007/t20007.cc`
 ```cpp
 #include <string>
 #include <utility>
diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg
index f26892f6..a823cc7a 100644
--- a/docs/test_cases/t20007_sequence.svg
+++ b/docs/test_cases/t20007_sequence.svg
@@ -1,70 +1,64 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:768px;height:227px;" version="1.1" viewBox="0 0 768 227" width="768px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="223px" preserveAspectRatio="none" style="width:668px;height:223px;background:#FFFFFF;" version="1.1" viewBox="0 0 668 223" width="668px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1uzjtqv5fjvoe" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1uzjtqv5fjvoe)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1uzjtqv5fjvoe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1uzjtqv5fjvoe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1uzjtqv5fjvoe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="187.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191.5" x2="191.5" y1="38.2969" y2="187.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="354.5" x2="354.5" y1="38.2969" y2="187.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="609.5" x2="609.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1uzjtqv5fjvoe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1uzjtqv5fjvoe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="206.6904">tmain()</text>
+    <rect fill="#FFFFFF" height="122.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="163.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="305" y="112"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="526.5" y="155.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="187.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="168.5" x2="168.5" y1="36.7999" y2="187.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="309.5" x2="309.5" y1="36.7999" y2="187.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="531.5" x2="531.5" y1="36.7999" y2="187.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="186.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="206.6059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1uzjtqv5fjvoe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="22.9951">Adder&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1uzjtqv5fjvoe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="206.6904">Adder&lt;int,int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="102" x="117.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="124.5" y="25.0059">Adder&lt;int,int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="102" x="117.5" y="186.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="124.5" y="206.6059">Adder&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1uzjtqv5fjvoe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="22.9951">Adder&lt;int,float,double&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1uzjtqv5fjvoe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="206.6904">Adder&lt;int,float,double&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="161" x="229.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="236.5" y="25.0059">Adder&lt;int,float,double&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="161" x="229.5" y="186.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="236.5" y="206.6059">Adder&lt;int,float,double&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1uzjtqv5fjvoe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="22.9951">Adder&lt;std::string,std::string,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1uzjtqv5fjvoe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="206.6904">Adder&lt;std::string,std::string,std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="262" x="400.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248" x="407.5" y="25.0059">Adder&lt;std::string,std::string,std::string&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="262" x="400.5" y="186.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248" x="407.5" y="206.6059">Adder&lt;std::string,std::string,std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1uzjtqv5fjvoe)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1uzjtqv5fjvoe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1uzjtqv5fjvoe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1uzjtqv5fjvoe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="175,65.4297,185,69.4297,175,73.4297,179,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="181" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="53" y="64.3638">add(int &amp;&amp;,int &amp;&amp;)</text>
+    <rect fill="#FFFFFF" height="122.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="163.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="305" y="112"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="526.5" y="155.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="151.5,64.3999,161.5,68.3999,151.5,72.3999,155.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="157.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="46.5" y="62.8769">add(int &amp;&amp;,int &amp;&amp;)</text>
     </a>
-    <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="191" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="338,108.5625,348,112.5625,338,116.5625,342,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="344" y1="112.5625" y2="112.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="207" x="53" y="107.4966">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
+    <polygon fill="#181818" points="50.5,78.3999,40.5,82.3999,50.5,86.3999,46.5,82.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="167.5" y1="82.3999" y2="82.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="293,108,303,112,293,116,297,112" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="299" y1="112" y2="112"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="180" x="46.5" y="106.477">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
     </a>
-    <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="354" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="592.5,151.6953,602.5,155.6953,592.5,159.6953,596.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="598.5" y1="155.6953" y2="155.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="312" x="53" y="150.6294">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
+    <polygon fill="#181818" points="50.5,122,40.5,126,50.5,130,46.5,126" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="309" y1="126" y2="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="514.5,151.6,524.5,155.6,514.5,159.6,518.5,155.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="520.5" y1="155.6" y2="155.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="277" x="46.5" y="150.077">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
     </a>
-    <polygon fill="#A80036" points="52,165.6953,42,169.6953,52,173.6953,48,169.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="608.5" y1="169.6953" y2="169.6953"/>
+    <polygon fill="#181818" points="45.5,165.6,35.5,169.6,45.5,173.6,41.5,169.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="530.5" y1="169.6" y2="169.6"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20007_sequence_mermaid.svg b/docs/test_cases/t20007_sequence_mermaid.svg
index 44578764..d8e74d36 100644
--- a/docs/test_cases/t20007_sequence_mermaid.svg
+++ b/docs/test_cases/t20007_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -109,16 +109,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="227" x="760"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">add(int &amp;&amp;,int &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="121" x2="80" y1="121" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="284">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="167" x2="488" y1="167" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="282">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="80" y1="177" x1="483"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="423">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="765" y1="223" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="420">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="233" x2="80" y1="233" x1="760"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">add(int &amp;&amp;,int &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="121" x2="83" y1="121" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="282">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="167" x2="484" y1="167" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="283">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="83" y1="177" x1="483"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="421">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="761" y1="223" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="422">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="233" x2="83" y1="233" x1="760"/>
 </svg>
diff --git a/docs/test_cases/t20008.md b/docs/test_cases/t20008.md
index df1d6091..84b5a01a 100644
--- a/docs/test_cases/t20008.md
+++ b/docs/test_cases/t20008.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20008::tmain()"
 ```
 ## Source code
-File t20008.cc
+File `tests/t20008/t20008.cc`
 ```cpp
 #include <string>
 #include <type_traits>
diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg
index 811803db..e6a2e2ae 100644
--- a/docs/test_cases/t20008_sequence.svg
+++ b/docs/test_cases/t20008_sequence.svg
@@ -1,106 +1,100 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:794px;height:363px;" version="1.1" viewBox="0 0 794 363" width="794px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="360px" preserveAspectRatio="none" style="width:669px;height:360px;background:#FFFFFF;" version="1.1" viewBox="0 0 669 360" width="669px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fwkl0p0k8qh3w" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="309" x2="309" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="454" x2="454" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="593" x2="593" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
+    <rect fill="#FFFFFF" height="259.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="98"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="255" y="157.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="379" y="187.2"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="496.5" y="246.8"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="607.5" y="276.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="101" x2="101" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="166" x2="166" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="260" x2="260" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="384" x2="384" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="501" x2="501" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="612" x2="612" y1="36.7999" y2="324.4"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="343.406">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="342.0889">B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="25.0059">B&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="343.406">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="342.0889">A&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="139" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="146" y="25.0059">A&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="139" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="146" y="343.406">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="22.9951">B&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="342.0889">B&lt;const char *&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="203" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="210" y="25.0059">B&lt;const char *&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="203" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="210" y="343.406">B&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="22.9951">A&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="342.0889">A&lt;const char *&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="327" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="334" y="25.0059">A&lt;const char *&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="327" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="334" y="343.406">A&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="342.0889">B&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="451" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="458" y="25.0059">B&lt;std::string&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="451" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="458" y="343.406">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fwkl0p0k8qh3w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="342.0889">A&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="562" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="569" y="25.0059">A&lt;std::string&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="562" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="569" y="343.406">A&lt;std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fwkl0p0k8qh3w)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
+    <rect fill="#FFFFFF" height="259.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="98"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="255" y="157.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="379" y="187.2"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="496.5" y="246.8"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="607.5" y="276.4"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84,64.3999,94,68.3999,84,72.3999,88,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="62.8769">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="149,94,159,98,149,102,153,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="155" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="113" y="92.477">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="292,153.6953,302,157.6953,292,161.6953,296,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="298" y1="157.6953" y2="157.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="53" y="152.6294">b(const char *)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="243,153.6,253,157.6,243,161.6,247,157.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="249" y1="157.6" y2="157.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="46.5" y="152.077">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="437.5,182.8281,447.5,186.8281,437.5,190.8281,441.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="314" x2="443.5" y1="186.8281" y2="186.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="321" y="181.7622">a2(const char *)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="367,183.2,377,187.2,367,191.2,371,187.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="265" x2="373" y1="187.2" y2="187.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="272" y="181.677">a2(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="576.5,241.9609,586.5,245.9609,576.5,249.9609,580.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="582.5" y1="245.9609" y2="245.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="240.895">b(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="484.5,242.8,494.5,246.8,484.5,250.8,488.5,246.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="490.5" y1="246.8" y2="246.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="46.5" y="241.277">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="709,271.0938,719,275.0938,709,279.0938,713,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="598.5" x2="715" y1="275.0938" y2="275.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="605.5" y="270.0278">a3(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="595.5,272.4,605.5,276.4,595.5,280.4,599.5,276.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="506.5" x2="601.5" y1="276.4" y2="276.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="80" x="513.5" y="270.877">a3(std::string)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20008_sequence_mermaid.svg b/docs/test_cases/t20008_sequence_mermaid.svg
index 12de9b96..7ed8f2b4 100644
--- a/docs/test_cases/t20008_sequence_mermaid.svg
+++ b/docs/test_cases/t20008_sequence_mermaid.svg
@@ -123,17 +123,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -163,16 +163,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="335" x="1270"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="378">b(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="778">a2(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="578">b(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1075" y1="295" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1178">a3(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1275" y1="341" x1="1080"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="376">b(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="776">a2(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="576">b(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1071" y1="295" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1176">a3(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1271" y1="341" x1="1080"/>
 </svg>
diff --git a/docs/test_cases/t20009.md b/docs/test_cases/t20009.md
index 20fb2e98..86ec38cd 100644
--- a/docs/test_cases/t20009.md
+++ b/docs/test_cases/t20009.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20009::tmain()"
 ```
 ## Source code
-File t20009.cc
+File `tests/t20009/t20009.cc`
 ```cpp
 #include <memory>
 #include <string>
diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg
index b9342bc3..36710d01 100644
--- a/docs/test_cases/t20009_sequence.svg
+++ b/docs/test_cases/t20009_sequence.svg
@@ -1,106 +1,100 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:690px;height:363px;" version="1.1" viewBox="0 0 690 363" width="690px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="360px" preserveAspectRatio="none" style="width:584px;height:360px;background:#FFFFFF;" version="1.1" viewBox="0 0 584 360" width="584px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1y1c7putcwzsp" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="284.5" x2="284.5" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="389.5" x2="389.5" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="468.5" x2="468.5" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="552.5" x2="552.5" y1="38.2969" y2="323.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="643.5" x2="643.5" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
+    <rect fill="#FFFFFF" height="259.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="131.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="242.5" y="98"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="330" y="157.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="394" y="187.2"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="464" y="246.8"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="540" y="276.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="136" x2="136" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="247" x2="247" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="335" x2="335" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="399" x2="399" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="469" x2="469" y1="36.7999" y2="324.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="545" x2="545" y1="36.7999" y2="324.4"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="343.406">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="342.0889">B&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="86" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="93" y="25.0059">B&lt;std::string&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="86" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="93" y="343.406">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="342.0889">A&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="197" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="204" y="25.0059">A&lt;std::string&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="197" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="204" y="343.406">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="342.0889">B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="308" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="315" y="25.0059">B&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="308" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="315" y="343.406">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="342.0889">A&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="372" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="379" y="25.0059">A&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="372" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="379" y="343.406">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="22.9951">B&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="342.0889">B&lt;float&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="436" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="443" y="25.0059">B&lt;float&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="436" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="443" y="343.406">B&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="22.9951">A&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1y1c7putcwzsp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="342.0889">A&lt;float&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="512" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="519" y="25.0059">A&lt;float&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="512" y="323.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="519" y="343.406">A&lt;float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1y1c7putcwzsp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="135,65.4297,145,69.4297,135,73.4297,139,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="141" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="64.3638">b(std::string)</text>
+    <rect fill="#FFFFFF" height="259.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="131.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="242.5" y="98"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="330" y="157.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="394" y="187.2"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="464" y="246.8"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="540" y="276.4"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="119.5,64.3999,129.5,68.3999,119.5,72.3999,123.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="125.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="46.5" y="62.8769">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="267.5,94.5625,277.5,98.5625,267.5,102.5625,271.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="273.5" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164" y="93.4966">a(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="230.5,94,240.5,98,230.5,102,234.5,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="141.5" x2="236.5" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="148.5" y="92.477">a(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="373,153.6953,383,157.6953,373,161.6953,377,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="379" y1="157.6953" y2="157.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="152.6294">b(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="318,153.6,328,157.6,318,161.6,322,157.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="324" y1="157.6" y2="157.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="152.077">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="451.5,182.8281,461.5,186.8281,451.5,190.8281,455.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="395" x2="457.5" y1="186.8281" y2="186.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="402" y="181.7622">a(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="382,183.2,392,187.2,382,191.2,386,187.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="340" x2="388" y1="187.2" y2="187.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="347" y="181.677">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="536,241.9609,546,245.9609,536,249.9609,540,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="542" y1="245.9609" y2="245.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="53" y="240.895">b(float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="452,242.8,462,246.8,452,250.8,456,246.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="458" y1="246.8" y2="246.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="241.277">b(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="626.5,271.0938,636.5,275.0938,626.5,279.0938,630.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="558" x2="632.5" y1="275.0938" y2="275.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="565" y="270.0278">a(float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="528,272.4,538,276.4,528,280.4,532,276.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="474" x2="534" y1="276.4" y2="276.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="481" y="270.877">a(float)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20009_sequence_mermaid.svg b/docs/test_cases/t20009_sequence_mermaid.svg
index a5ffc27e..f53d5c87 100644
--- a/docs/test_cases/t20009_sequence_mermaid.svg
+++ b/docs/test_cases/t20009_sequence_mermaid.svg
@@ -123,17 +123,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -163,16 +163,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="335" x="1270"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="378">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="778">a(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="578">b(float)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1075" y1="295" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1178">a(float)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1275" y1="341" x1="1080"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="376">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="776">a(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="576">b(float)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1071" y1="295" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1176">a(float)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1271" y1="341" x1="1080"/>
 </svg>
diff --git a/docs/test_cases/t20010.md b/docs/test_cases/t20010.md
index da541ed7..3d66e51b 100644
--- a/docs/test_cases/t20010.md
+++ b/docs/test_cases/t20010.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20010::tmain()"
 ```
 ## Source code
-File t20010.cc
+File `tests/t20010/t20010.cc`
 ```cpp
 #include <array>
 #include <map>
diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg
index 97d689c4..7e058705 100644
--- a/docs/test_cases/t20010_sequence.svg
+++ b/docs/test_cases/t20010_sequence.svg
@@ -1,92 +1,86 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:197px;height:451px;" version="1.1" viewBox="0 0 197 451" width="197px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="449px" preserveAspectRatio="none" style="width:169px;height:449px;background:#FFFFFF;" version="1.1" viewBox="0 0 169 449" width="169px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fpv6146gv9x0l" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="411.3594"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="176" x2="176" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpv6146gv9x0l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fpv6146gv9x0l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
+    <rect fill="#FFFFFF" height="348.8001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="157.6"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="246.8"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="336"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="98"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="187.2"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="276.4"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="365.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="413.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="101" x2="101" y1="36.7999" y2="413.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="151.5" x2="151.5" y1="36.7999" y2="413.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="412.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="432.606">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpv6146gv9x0l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fpv6146gv9x0l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="430.3545">B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="25.0059">B&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="412.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="432.606">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpv6146gv9x0l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fpv6146gv9x0l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="430.3545">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="140.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="147.5" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="140.5" y="412.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="147.5" y="432.606">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fpv6146gv9x0l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="64.3638">b1()</text>
+    <rect fill="#FFFFFF" height="348.8001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="157.6"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="246.8"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="336"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="98"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="187.2"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="276.4"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="365.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84,64.3999,94,68.3999,84,72.3999,88,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="46.5" y="62.8769">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="159.5,94.5625,169.5,98.5625,159.5,102.5625,163.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="93.4966">a1()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="135,94,145,98,135,102,139,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="141" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="113" y="92.477">a1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="101.5,153.6953,111.5,157.6953,101.5,161.6953,105.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="157.6953" y2="157.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="152.6294">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84,153.6,94,157.6,84,161.6,88,157.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="157.6" y2="157.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="46.5" y="152.077">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="159.5,182.8281,169.5,186.8281,159.5,190.8281,163.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="186.8281" y2="186.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="181.7622">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="135,183.2,145,187.2,135,191.2,139,187.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="141" y1="187.2" y2="187.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="113" y="181.677">a2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="101.5,241.9609,111.5,245.9609,101.5,249.9609,105.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="245.9609" y2="245.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="240.895">b3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84,242.8,94,246.8,84,250.8,88,246.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="246.8" y2="246.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="46.5" y="241.277">b3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="159.5,271.0938,169.5,275.0938,159.5,279.0938,163.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="275.0938" y2="275.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="270.0278">a3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="135,272.4,145,276.4,135,280.4,139,276.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="141" y1="276.4" y2="276.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="113" y="270.877">a3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="101.5,330.2266,111.5,334.2266,101.5,338.2266,105.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="334.2266" y2="334.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="329.1606">b4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84,332,94,336,84,340,88,336" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="336" y2="336"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="46.5" y="330.477">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="159.5,359.3594,169.5,363.3594,159.5,367.3594,163.5,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="363.3594" y2="363.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="358.2935">a4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="135,361.6,145,365.6,135,369.6,139,365.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="141" y1="365.6" y2="365.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="113" y="360.077">a4()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20010_sequence_mermaid.svg b/docs/test_cases/t20010_sequence_mermaid.svg
index f8beb39e..787ae425 100644
--- a/docs/test_cases/t20010_sequence_mermaid.svg
+++ b/docs/test_cases/t20010_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -109,20 +109,20 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="427" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="178">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="275" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="378">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="475" y1="249" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="178">b3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="275" y1="295" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="378">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="475" y1="341" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="178">b4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="275" y1="387" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="378">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="475" y1="433" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="176">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="271" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="376">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="471" y1="249" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="176">b3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="271" y1="295" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="376">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="471" y1="341" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="176">b4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="271" y1="387" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="376">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="471" y1="433" x1="280"/>
 </svg>
diff --git a/docs/test_cases/t20011.md b/docs/test_cases/t20011.md
index 90513c32..38f5d1fe 100644
--- a/docs/test_cases/t20011.md
+++ b/docs/test_cases/t20011.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20011::tmain()"
 ```
 ## Source code
-File t20011.cc
+File `tests/t20011/t20011.cc`
 ```cpp
 namespace clanguml {
 namespace t20011 {
diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg
index b6d82166..10ea35d2 100644
--- a/docs/test_cases/t20011_sequence.svg
+++ b/docs/test_cases/t20011_sequence.svg
@@ -1,109 +1,103 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="593px" preserveAspectRatio="none" style="width:203px;height:593px;" version="1.1" viewBox="0 0 203 593" width="203px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="592px" preserveAspectRatio="none" style="width:183px;height:592px;background:#FFFFFF;" version="1.1" viewBox="0 0 183 592" width="183px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1h4xzn6iqm39k" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="552.7578"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="103.5" x2="103.5" y1="38.2969" y2="552.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4xzn6iqm39k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1h4xzn6iqm39k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="571.7529">tmain()</text>
+    <rect fill="#FFFFFF" height="499.6002" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="112.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="87.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="92.5" y="130.6"/>
+    <rect fill="#FFFFFF" height="344.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="87.5" y="202.2"/>
+    <rect fill="#FFFFFF" height="306.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="92.5" y="239.8"/>
+    <rect fill="#FFFFFF" height="264.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="97.5" y="282.4"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="102.5" y="349.6"/>
+    <rect fill="#FFFFFF" height="117.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="102.5" y="422.2001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="107.5" y="489.4001"/>
+    <rect fill="none" height="90.2" style="stroke:#000000;stroke-width:1.5;" width="81.5" x="71" y="83.3999"/>
+    <rect fill="none" height="237.0001" style="stroke:#000000;stroke-width:1.5;" width="116.5" x="61" y="302.4"/>
+    <rect fill="none" height="90.2" style="stroke:#000000;stroke-width:1.5;" width="96.5" x="71" y="442.2001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="556.4001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="92" x2="92" y1="36.7999" y2="556.4001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="555.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="575.406">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h4xzn6iqm39k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1h4xzn6iqm39k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="571.7529">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="81" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="88" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="81" y="555.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="88" y="575.406">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1h4xzn6iqm39k)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="87,65.4297,97,69.4297,87,73.4297,91,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">a(int)</text>
+    <rect fill="#FFFFFF" height="499.6002" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="112.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="87.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="92.5" y="130.6"/>
+    <rect fill="#FFFFFF" height="344.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="87.5" y="202.2"/>
+    <rect fill="#FFFFFF" height="306.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="92.5" y="239.8"/>
+    <rect fill="#FFFFFF" height="264.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="97.5" y="282.4"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="102.5" y="349.6"/>
+    <rect fill="#FFFFFF" height="117.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="102.5" y="422.2001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="107.5" y="489.4001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="75.5,64.3999,85.5,68.3999,75.5,72.3999,79.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="81.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="62.8769">a(int)</text>
     </a>
-    <path d="M80.5,84.4297 L144.5,84.4297 L144.5,91.4297 L134.5,101.4297 L80.5,101.4297 L80.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="97.4966">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="156" y1="122.6953" y2="122.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="122.6953" y2="135.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="135.6953" y2="135.6953"/>
-      <polygon fill="#A80036" points="125,131.6953,115,135.6953,125,139.6953,121,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="121" y="117.6294">a(int)</text>
+    <path d="M71,83.3999 L131,83.3999 L131,91 L121,101 L71,101 L71,83.3999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="90.2" style="stroke:#000000;stroke-width:1.5;" width="81.5" x="71" y="83.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="86" y="96.477">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="102.5" x2="144.5" y1="122.6" y2="122.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="144.5" x2="144.5" y1="122.6" y2="135.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="103.5" x2="144.5" y1="135.6" y2="135.6"/>
+      <polygon fill="#181818" points="113.5,131.6,103.5,135.6,113.5,139.6,109.5,135.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="109.5" y="117.077">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="87,197.8281,97,201.8281,87,205.8281,91,201.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="201.8281" y2="201.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="196.7622">b(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="75.5,198.2,85.5,202.2,75.5,206.2,79.5,202.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="81.5" y1="202.2" y2="202.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="196.677">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="109" x2="156" y1="225.9609" y2="225.9609"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="225.9609" y2="238.9609"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="238.9609" y2="238.9609"/>
-      <polygon fill="#A80036" points="125,234.9609,115,238.9609,125,242.9609,121,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="121" y="220.895">c(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="97.5" x2="144.5" y1="226.8" y2="226.8"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="144.5" x2="144.5" y1="226.8" y2="239.8"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="103.5" x2="144.5" y1="239.8" y2="239.8"/>
+      <polygon fill="#181818" points="113.5,235.8,103.5,239.8,113.5,243.8,109.5,239.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="109.5" y="221.277">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="161" y1="268.0938" y2="268.0938"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="161" y1="268.0938" y2="281.0938"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="120" x2="161" y1="281.0938" y2="281.0938"/>
-      <polygon fill="#A80036" points="130,277.0938,120,281.0938,130,285.0938,126,281.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="126" y="263.0278">d(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="102.5" x2="149.5" y1="269.4" y2="269.4"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="149.5" x2="149.5" y1="269.4" y2="282.4"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="108.5" x2="149.5" y1="282.4" y2="282.4"/>
+      <polygon fill="#181818" points="118.5,278.4,108.5,282.4,118.5,286.4,114.5,282.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="114.5" y="263.877">d(int)</text>
     </a>
-    <path d="M70.5,301.0938 L134.5,301.0938 L134.5,308.0938 L124.5,318.0938 L70.5,318.0938 L70.5,301.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85.5" y="314.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="124" x2="166" y1="339.3594" y2="339.3594"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="339.3594" y2="352.3594"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="352.3594" y2="352.3594"/>
-      <polygon fill="#A80036" points="135,348.3594,125,352.3594,135,356.3594,131,352.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="334.2935">b(int)</text>
+    <path d="M61,302.4 L121,302.4 L121,310 L111,320 L61,320 L61,302.4 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="237.0001" style="stroke:#000000;stroke-width:1.5;" width="116.5" x="61" y="302.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="76" y="315.477">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="112.5" x2="154.5" y1="341.6" y2="341.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="154.5" x2="154.5" y1="341.6" y2="354.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="113.5" x2="154.5" y1="354.6" y2="354.6"/>
+      <polygon fill="#181818" points="123.5,350.6,113.5,354.6,123.5,358.6,119.5,354.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="119.5" y="336.077">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="119" x2="166" y1="406.4922" y2="406.4922"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="406.4922" y2="419.4922"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="419.4922" y2="419.4922"/>
-      <polygon fill="#A80036" points="135,415.4922,125,419.4922,135,423.4922,131,419.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="401.4263">a(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="107.5" x2="154.5" y1="409.2001" y2="409.2001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="154.5" x2="154.5" y1="409.2001" y2="422.2001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="113.5" x2="154.5" y1="422.2001" y2="422.2001"/>
+      <polygon fill="#181818" points="123.5,418.2001,113.5,422.2001,123.5,426.2001,119.5,422.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="119.5" y="403.677">a(int)</text>
     </a>
-    <path d="M80.5,439.4922 L144.5,439.4922 L144.5,446.4922 L134.5,456.4922 L80.5,456.4922 L80.5,439.4922 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="452.5591">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="129" x2="171" y1="477.7578" y2="477.7578"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="171" x2="171" y1="477.7578" y2="490.7578"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="171" y1="490.7578" y2="490.7578"/>
-      <polygon fill="#A80036" points="140,486.7578,130,490.7578,140,494.7578,136,490.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="136" y="472.6919">a(int)</text>
+    <path d="M71,442.2001 L131,442.2001 L131,449.8001 L121,459.8001 L71,459.8001 L71,442.2001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="90.2" style="stroke:#000000;stroke-width:1.5;" width="96.5" x="71" y="442.2001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="86" y="455.2771">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="117.5" x2="159.5" y1="481.4001" y2="481.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="159.5" x2="159.5" y1="481.4001" y2="494.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="118.5" x2="159.5" y1="494.4001" y2="494.4001"/>
+      <polygon fill="#181818" points="128.5,490.4001,118.5,494.4001,128.5,498.4001,124.5,494.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="124.5" y="475.8771">a(int)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20011_sequence_mermaid.svg b/docs/test_cases/t20011_sequence_mermaid.svg
index c412119f..1080c061 100644
--- a/docs/test_cases/t20011_sequence_mermaid.svg
+++ b/docs/test_cases/t20011_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -127,12 +127,12 @@
       <tspan x="320">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="280">a(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,182 C 340,172 340,212 280,202"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="267" x="178">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="298" x2="275" y1="298" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="267" x="176">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="298" x2="271" y1="298" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="313" x="280">c(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,344 C 340,334 340,374 280,364"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="389" x="285">d(int)</text>
diff --git a/docs/test_cases/t20012.md b/docs/test_cases/t20012.md
index 79ca70fc..9cb1a56a 100644
--- a/docs/test_cases/t20012.md
+++ b/docs/test_cases/t20012.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20012::tmain()"
 ```
 ## Source code
-File t20012.cc
+File `tests/t20012/t20012.cc`
 ```cpp
 #include <algorithm>
 #include <functional>
diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg
index 96fbed23..dbd2da97 100644
--- a/docs/test_cases/t20012_sequence.svg
+++ b/docs/test_cases/t20012_sequence.svg
@@ -1,271 +1,265 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1219px" preserveAspectRatio="none" style="width:1261px;height:1219px;" version="1.1" viewBox="0 0 1261 1219" width="1261px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1225px" preserveAspectRatio="none" style="width:1132px;height:1225px;background:#FFFFFF;" version="1.1" viewBox="0 0 1132 1225" width="1132px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fq7nvg3q5wl2n" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="1033.2188"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1070.3516"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1112.4844"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="974.9531"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1126" y="1004.0859"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1179.4844"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="212" x2="212" y1="38.2969" y2="1179.4844"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="363" x2="363" y1="38.2969" y2="1179.4844"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="426.5" x2="426.5" y1="38.2969" y2="1179.4844"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="578.5" x2="578.5" y1="38.2969" y2="1179.4844"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="730.5" x2="730.5" y1="38.2969" y2="1179.4844"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="875.5" x2="875.5" y1="38.2969" y2="1179.4844"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1130.5" x2="1130.5" y1="38.2969" y2="1179.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1178.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1198.4795">tmain()</text>
+    <rect fill="#FFFFFF" height="1124.4003" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="303.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="68.3999"/>
+    <rect fill="#FFFFFF" height="303.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="576.0001"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="320.5" y="98"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="325.5" y="135.6"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="330.5" y="178.2"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="320.5" y="605.6001"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="325.5" y="643.2001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="330.5" y="685.8001"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="380.5" y="242.8"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="385.5" y="280.4"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="390.5" y="323"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="380.5" y="750.4001"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="385.5" y="788.0002"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="390.5" y="830.6002"/>
+    <rect fill="#FFFFFF" height="492.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="517" y="401.6"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="654" y="431.2001"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="659" y="468.8001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="664" y="511.4001"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="654" y="1042.0002"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="659" y="1079.6002"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="664" y="1122.2003"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="782.5" y="923.2002"/>
+    <rect fill="#FFFFFF" height="188.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="782.5" y="982.8002"/>
+    <rect fill="#FFFFFF" height="158.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="1010" y="1012.4002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="1189.2003"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="189" x2="189" y1="36.7999" y2="1189.2003"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="325" x2="325" y1="36.7999" y2="1189.2003"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="385" x2="385" y1="36.7999" y2="1189.2003"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="522" x2="522" y1="36.7999" y2="1189.2003"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="659" x2="659" y1="36.7999" y2="1189.2003"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="787" x2="787" y1="36.7999" y2="1189.2003"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1015" x2="1015" y1="36.7999" y2="1189.2003"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="1188.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="1208.2062">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:67:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="91" y="22.9951">tmain()::(lambda t20012.cc:67:20)</text>
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="1178.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="91" y="1198.4795">tmain()::(lambda t20012.cc:67:20)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:67:20)" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="81" y="25.0059">tmain()::(lambda t20012.cc:67:20)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="74" y="1188.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="81" y="1208.2062">tmain()::(lambda t20012.cc:67:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="357" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="1178.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="357" y="1198.4795">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="314" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="321" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="314" y="1188.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="321" y="1208.2062">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="419.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="1178.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="419.5" y="1198.4795">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="374" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="381" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="374" y="1188.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="381" y="1208.2062">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:80:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="457.5" y="22.9951">tmain()::(lambda t20012.cc:80:20)</text>
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="1178.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="457.5" y="1198.4795">tmain()::(lambda t20012.cc:80:20)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:80:20)" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="407" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="414" y="25.0059">tmain()::(lambda t20012.cc:80:20)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="407" y="1188.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="414" y="1208.2062">tmain()::(lambda t20012.cc:80:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="723.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="1178.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="723.5" y="1198.4795">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="647" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="654" y="25.0059">C</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="647" y="1188.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="654" y="1208.2062">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="239" x="754.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="225" x="761.5" y="22.9951">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="239" x="754.5" y="1178.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="225" x="761.5" y="1198.4795">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="681" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="688" y="25.0059">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="681" y="1188.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="688" y="1208.2062">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:86:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1007.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1014.5" y="22.9951">tmain()::(lambda t20012.cc:86:9)</text>
-      <rect fill="#FEFECE" filter="url(#fq7nvg3q5wl2n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1007.5" y="1178.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1014.5" y="1198.4795">tmain()::(lambda t20012.cc:86:9)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:86:9)" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="222" x="904" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="208" x="911" y="25.0059">tmain()::(lambda t20012.cc:86:9)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="222" x="904" y="1188.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="208" x="911" y="1208.2062">tmain()::(lambda t20012.cc:86:9)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="1033.2188"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1070.3516"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1112.4844"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="974.9531"/>
-    <rect fill="#FFFFFF" filter="url(#fq7nvg3q5wl2n)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1126" y="1004.0859"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="195,65.4297,205,69.4297,195,73.4297,199,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="201" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="64.3638">operator()()</text>
+    <rect fill="#FFFFFF" height="1124.4003" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="303.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="68.3999"/>
+    <rect fill="#FFFFFF" height="303.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="576.0001"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="320.5" y="98"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="325.5" y="135.6"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="330.5" y="178.2"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="320.5" y="605.6001"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="325.5" y="643.2001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="330.5" y="685.8001"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="380.5" y="242.8"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="385.5" y="280.4"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="390.5" y="323"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="380.5" y="750.4001"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="385.5" y="788.0002"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="390.5" y="830.6002"/>
+    <rect fill="#FFFFFF" height="492.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="517" y="401.6"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="654" y="431.2001"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="659" y="468.8001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="664" y="511.4001"/>
+    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="654" y="1042.0002"/>
+    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="659" y="1079.6002"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="664" y="1122.2003"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="782.5" y="923.2002"/>
+    <rect fill="#FFFFFF" height="188.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="782.5" y="982.8002"/>
+    <rect fill="#FFFFFF" height="158.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="1010" y="1012.4002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="172,64.3999,182,68.3999,172,72.3999,176,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="178" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="46.5" y="62.8769">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="346.5,94.5625,356.5,98.5625,346.5,102.5625,350.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="352.5" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="93.4966">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="308.5,94,318.5,98,308.5,102,312.5,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="194" x2="314.5" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="201" y="92.477">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="368.5" x2="415.5" y1="122.6953" y2="122.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="415.5" x2="415.5" y1="122.6953" y2="135.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="374.5" x2="415.5" y1="135.6953" y2="135.6953"/>
-      <polygon fill="#A80036" points="384.5,131.6953,374.5,135.6953,384.5,139.6953,380.5,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="380.5" y="117.6294">aa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="330.5" x2="377.5" y1="122.6" y2="122.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="377.5" x2="377.5" y1="122.6" y2="135.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="336.5" x2="377.5" y1="135.6" y2="135.6"/>
+      <polygon fill="#181818" points="346.5,131.6,336.5,135.6,346.5,139.6,342.5,135.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="342.5" y="117.077">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="378.5" x2="420.5" y1="169.8281" y2="169.8281"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="420.5" x2="420.5" y1="169.8281" y2="182.8281"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="379.5" x2="420.5" y1="182.8281" y2="182.8281"/>
-      <polygon fill="#A80036" points="389.5,178.8281,379.5,182.8281,389.5,186.8281,385.5,182.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="385.5" y="164.7622">aaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="340.5" x2="382.5" y1="170.2" y2="170.2"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="382.5" x2="382.5" y1="170.2" y2="183.2"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="341.5" x2="382.5" y1="183.2" y2="183.2"/>
+      <polygon fill="#181818" points="351.5,179.2,341.5,183.2,351.5,187.2,347.5,183.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="347.5" y="164.677">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="409.5,237.9609,419.5,241.9609,409.5,245.9609,413.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="415.5" y1="241.9609" y2="241.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="236.895">b()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="368.5,238.8,378.5,242.8,368.5,246.8,372.5,242.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="194" x2="374.5" y1="242.8" y2="242.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="201" y="237.277">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="431.5" x2="478.5" y1="266.0938" y2="266.0938"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="478.5" x2="478.5" y1="266.0938" y2="279.0938"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="437.5" x2="478.5" y1="279.0938" y2="279.0938"/>
-      <polygon fill="#A80036" points="447.5,275.0938,437.5,279.0938,447.5,283.0938,443.5,279.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="443.5" y="261.0278">bb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="390.5" x2="437.5" y1="267.4" y2="267.4"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="437.5" x2="437.5" y1="267.4" y2="280.4"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="396.5" x2="437.5" y1="280.4" y2="280.4"/>
+      <polygon fill="#181818" points="406.5,276.4,396.5,280.4,406.5,284.4,402.5,280.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="402.5" y="261.877">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="441.5" x2="483.5" y1="313.2266" y2="313.2266"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="483.5" x2="483.5" y1="313.2266" y2="326.2266"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="442.5" x2="483.5" y1="326.2266" y2="326.2266"/>
-      <polygon fill="#A80036" points="452.5,322.2266,442.5,326.2266,452.5,330.2266,448.5,326.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="448.5" y="308.1606">bbb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="400.5" x2="442.5" y1="315" y2="315"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="442.5" x2="442.5" y1="315" y2="328"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="401.5" x2="442.5" y1="328" y2="328"/>
+      <polygon fill="#181818" points="411.5,324,401.5,328,411.5,332,407.5,328" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="407.5" y="309.477">bbb()</text>
     </a>
-    <polygon fill="#A80036" points="57,366.2266,47,370.2266,57,374.2266,53,370.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="211" y1="370.2266" y2="370.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="561.5,395.3594,571.5,399.3594,561.5,403.3594,565.5,399.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="567.5" y1="399.3594" y2="399.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="394.2935">operator()()</text>
+    <polygon fill="#181818" points="50.5,368,40.5,372,50.5,376,46.5,372" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="188" y1="372" y2="372"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="505,397.6,515,401.6,505,405.6,509,401.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="511" y1="401.6" y2="401.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="46.5" y="396.077">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="713.5,424.4922,723.5,428.4922,713.5,432.4922,717.5,428.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="583.5" x2="719.5" y1="428.4922" y2="428.4922"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="590.5" y="423.4263">c()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="642,427.2001,652,431.2001,642,435.2001,646,431.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="527" x2="648" y1="431.2001" y2="431.2001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="534" y="425.677">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="735.5" x2="782.5" y1="452.625" y2="452.625"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="782.5" x2="782.5" y1="452.625" y2="465.625"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="741.5" x2="782.5" y1="465.625" y2="465.625"/>
-      <polygon fill="#A80036" points="751.5,461.625,741.5,465.625,751.5,469.625,747.5,465.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="747.5" y="447.5591">cc()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="664" x2="711" y1="455.8001" y2="455.8001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="711" x2="711" y1="455.8001" y2="468.8001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="670" x2="711" y1="468.8001" y2="468.8001"/>
+      <polygon fill="#181818" points="680,464.8001,670,468.8001,680,472.8001,676,468.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="676" y="450.2771">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="745.5" x2="787.5" y1="499.7578" y2="499.7578"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="787.5" x2="787.5" y1="499.7578" y2="512.7578"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="746.5" x2="787.5" y1="512.7578" y2="512.7578"/>
-      <polygon fill="#A80036" points="756.5,508.7578,746.5,512.7578,756.5,516.7578,752.5,512.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="752.5" y="494.6919">ccc()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="674" x2="716" y1="503.4001" y2="503.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="716" x2="716" y1="503.4001" y2="516.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="675" x2="716" y1="516.4001" y2="516.4001"/>
+      <polygon fill="#181818" points="685,512.4001,675,516.4001,685,520.4001,681,516.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="681" y="497.8771">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="228,567.8906,218,571.8906,228,575.8906,224,571.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="572.5" y1="571.8906" y2="571.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="234" y="566.8247">operator()()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="205,572.0001,195,576.0001,205,580.0001,201,576.0001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="199" x2="516" y1="576.0001" y2="576.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="211" y="570.4771">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="346.5,597.0234,356.5,601.0234,346.5,605.0234,350.5,601.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="352.5" y1="601.0234" y2="601.0234"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="595.9575">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="308.5,601.6001,318.5,605.6001,308.5,609.6001,312.5,605.6001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="194" x2="314.5" y1="605.6001" y2="605.6001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="201" y="600.0771">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="368.5" x2="415.5" y1="625.1563" y2="625.1563"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="415.5" x2="415.5" y1="625.1563" y2="638.1563"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="374.5" x2="415.5" y1="638.1563" y2="638.1563"/>
-      <polygon fill="#A80036" points="384.5,634.1563,374.5,638.1563,384.5,642.1563,380.5,638.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="380.5" y="620.0903">aa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="330.5" x2="377.5" y1="630.2001" y2="630.2001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="377.5" x2="377.5" y1="630.2001" y2="643.2001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="336.5" x2="377.5" y1="643.2001" y2="643.2001"/>
+      <polygon fill="#181818" points="346.5,639.2001,336.5,643.2001,346.5,647.2001,342.5,643.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="342.5" y="624.6771">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="378.5" x2="420.5" y1="672.2891" y2="672.2891"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="420.5" x2="420.5" y1="672.2891" y2="685.2891"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="379.5" x2="420.5" y1="685.2891" y2="685.2891"/>
-      <polygon fill="#A80036" points="389.5,681.2891,379.5,685.2891,389.5,689.2891,385.5,685.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="385.5" y="667.2231">aaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="340.5" x2="382.5" y1="677.8001" y2="677.8001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="382.5" x2="382.5" y1="677.8001" y2="690.8001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="341.5" x2="382.5" y1="690.8001" y2="690.8001"/>
+      <polygon fill="#181818" points="351.5,686.8001,341.5,690.8001,351.5,694.8001,347.5,690.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="347.5" y="672.2771">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="409.5,740.4219,419.5,744.4219,409.5,748.4219,413.5,744.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="415.5" y1="744.4219" y2="744.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="739.356">b()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="368.5,746.4001,378.5,750.4001,368.5,754.4001,372.5,750.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="194" x2="374.5" y1="750.4001" y2="750.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="201" y="744.8771">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="431.5" x2="478.5" y1="768.5547" y2="768.5547"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="478.5" x2="478.5" y1="768.5547" y2="781.5547"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="437.5" x2="478.5" y1="781.5547" y2="781.5547"/>
-      <polygon fill="#A80036" points="447.5,777.5547,437.5,781.5547,447.5,785.5547,443.5,781.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="443.5" y="763.4888">bb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="390.5" x2="437.5" y1="775.0002" y2="775.0002"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="437.5" x2="437.5" y1="775.0002" y2="788.0002"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="396.5" x2="437.5" y1="788.0002" y2="788.0002"/>
+      <polygon fill="#181818" points="406.5,784.0002,396.5,788.0002,406.5,792.0002,402.5,788.0002" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="402.5" y="769.4772">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="441.5" x2="483.5" y1="815.6875" y2="815.6875"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="483.5" x2="483.5" y1="815.6875" y2="828.6875"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="442.5" x2="483.5" y1="828.6875" y2="828.6875"/>
-      <polygon fill="#A80036" points="452.5,824.6875,442.5,828.6875,452.5,832.6875,448.5,828.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="448.5" y="810.6216">bbb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="400.5" x2="442.5" y1="822.6002" y2="822.6002"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="442.5" x2="442.5" y1="822.6002" y2="835.6002"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="401.5" x2="442.5" y1="835.6002" y2="835.6002"/>
+      <polygon fill="#181818" points="411.5,831.6002,401.5,835.6002,411.5,839.6002,407.5,835.6002" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="407.5" y="817.0772">bbb()</text>
     </a>
-    <polygon fill="#A80036" points="561.5,868.6875,571.5,872.6875,561.5,876.6875,565.5,872.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="212" x2="567.5" y1="872.6875" y2="872.6875"/>
-    <polygon fill="#A80036" points="57,882.6875,47,886.6875,57,890.6875,53,886.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="577.5" y1="886.6875" y2="886.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="859,911.8203,869,915.8203,859,919.8203,863,915.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="865" y1="915.8203" y2="915.8203"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="498" x="53" y="910.7544">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
+    <polygon fill="#181818" points="505,875.6002,515,879.6002,505,883.6002,509,879.6002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="511" y1="879.6002" y2="879.6002"/>
+    <polygon fill="#181818" points="50.5,889.6002,40.5,893.6002,50.5,897.6002,46.5,893.6002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="521" y1="893.6002" y2="893.6002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="770.5,919.2002,780.5,923.2002,770.5,927.2002,774.5,923.2002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="776.5" y1="923.2002" y2="923.2002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="445" x="46.5" y="917.6772">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="859,970.9531,869,974.9531,859,978.9531,863,974.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="865" y1="974.9531" y2="974.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="969.8872">r()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="770.5,978.8002,780.5,982.8002,770.5,986.8002,774.5,982.8002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="776.5" y1="982.8002" y2="982.8002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="46.5" y="977.2772">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="1114,1000.0859,1124,1004.0859,1114,1008.0859,1118,1004.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="881" x2="1120" y1="1004.0859" y2="1004.0859"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="888" y="999.02">operator()()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="998,1008.4002,1008,1012.4002,998,1016.4002,1002,1012.4002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="792.5" x2="1004" y1="1012.4002" y2="1012.4002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="799.5" y="1006.8772">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="746.5,1029.2188,736.5,1033.2188,746.5,1037.2188,742.5,1033.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="740.5" x2="1125" y1="1033.2188" y2="1033.2188"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="752.5" y="1028.1528">c()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="675,1038.0002,665,1042.0002,675,1046.0002,671,1042.0002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="669" x2="1009" y1="1042.0002" y2="1042.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="681" y="1036.4772">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="735.5" x2="782.5" y1="1057.3516" y2="1057.3516"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="782.5" x2="782.5" y1="1057.3516" y2="1070.3516"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="741.5" x2="782.5" y1="1070.3516" y2="1070.3516"/>
-      <polygon fill="#A80036" points="751.5,1066.3516,741.5,1070.3516,751.5,1074.3516,747.5,1070.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="747.5" y="1052.2856">cc()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="664" x2="711" y1="1066.6002" y2="1066.6002"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="711" x2="711" y1="1066.6002" y2="1079.6002"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="670" x2="711" y1="1079.6002" y2="1079.6002"/>
+      <polygon fill="#181818" points="680,1075.6002,670,1079.6002,680,1083.6002,676,1079.6002" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="676" y="1061.0772">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="745.5" x2="787.5" y1="1104.4844" y2="1104.4844"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="787.5" x2="787.5" y1="1104.4844" y2="1117.4844"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="746.5" x2="787.5" y1="1117.4844" y2="1117.4844"/>
-      <polygon fill="#A80036" points="756.5,1113.4844,746.5,1117.4844,756.5,1121.4844,752.5,1117.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="752.5" y="1099.4185">ccc()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="674" x2="716" y1="1114.2003" y2="1114.2003"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="716" x2="716" y1="1114.2003" y2="1127.2003"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="675" x2="716" y1="1127.2003" y2="1127.2003"/>
+      <polygon fill="#181818" points="685,1123.2003,675,1127.2003,685,1131.2003,681,1127.2003" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="681" y="1108.6773">ccc()</text>
     </a>
-    <polygon fill="#A80036" points="887,1157.4844,877,1161.4844,887,1165.4844,883,1161.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="881" x2="1130" y1="1161.4844" y2="1161.4844"/>
+    <polygon fill="#181818" points="798.5,1167.2003,788.5,1171.2003,798.5,1175.2003,794.5,1171.2003" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="792.5" x2="1014" y1="1171.2003" y2="1171.2003"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20012_sequence_mermaid.svg b/docs/test_cases/t20012_sequence_mermaid.svg
index 45caec59..c0ac5669 100644
--- a/docs/test_cases/t20012_sequence_mermaid.svg
+++ b/docs/test_cases/t20012_sequence_mermaid.svg
@@ -138,17 +138,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -232,60 +232,60 @@
   <g>
     <rect class="activation2" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="1553" x="1262"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="200">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="320.5" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="446">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="566" y1="157" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="198">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="316.5" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="444">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="562" y1="157" x1="325.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="571">aa()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 571,203 C 631,193 631,233 571,223"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="248" x="576">aaa()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 576,279 C 636,269 636,309 576,299"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="324" x="546">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="355" x2="766" y1="355" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="324" x="544">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="355" x2="762" y1="355" x1="325.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="370" x="771">bb()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 771,401 C 831,391 831,431 771,421"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="446" x="776">bbb()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 776,477 C 836,467 836,507 776,497"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="522" x="198">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="517" x2="80" y1="517" x1="315.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="532" x="546">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="563" x2="1011.5" y1="563" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="578" x="1137">c()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="609" x2="1257" y1="609" x1="1016.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="522" x="199">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="517" x2="83" y1="517" x1="315.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="532" x="544">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="563" x2="1007.5" y1="563" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="578" x="1135">c()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="609" x2="1253" y1="609" x1="1016.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="624" x="1262">cc()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1262,655 C 1322,645 1322,685 1262,675"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="700" x="1267">ccc()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1267,731 C 1327,721 1327,761 1267,751"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="664">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="807" x2="320.5" y1="807" x1="1006.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="822" x="446">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="853" x2="566" y1="853" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="666">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="807" x2="324.5" y1="807" x1="1006.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="822" x="444">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="853" x2="562" y1="853" x1="325.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="868" x="571">aa()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 571,899 C 631,889 631,929 571,919"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="944" x="576">aaa()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 576,975 C 636,965 636,1005 576,995"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1020" x="546">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1051" x2="766" y1="1051" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1020" x="544">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1051" x2="762" y1="1051" x1="325.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1066" x="771">bb()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 771,1097 C 831,1087 831,1127 771,1117"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1142" x="776">bbb()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 776,1173 C 836,1163 836,1203 776,1193"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1218" x="666">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1213" x2="1006.5" y1="1213" x1="325.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1228" x="543">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1223" x2="80" y1="1223" x1="1006.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1238" x="788">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1269" x2="1495" y1="1269" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1284" x="788">r()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1315" x2="1495" y1="1315" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1330" x="1637">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1361" x2="1774.5" y1="1361" x1="1500"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1376" x="1513">c()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1407" x2="1257" y1="1407" x1="1769.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1218" x="665">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1213" x2="1003.5" y1="1213" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1228" x="545">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1223" x2="83" y1="1223" x1="1006.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1238" x="786">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1269" x2="1491" y1="1269" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1284" x="786">r()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1315" x2="1491" y1="1315" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1330" x="1635">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1361" x2="1770.5" y1="1361" x1="1500"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1376" x="1515">c()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1407" x2="1261" y1="1407" x1="1769.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1422" x="1262">cc()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1262,1453 C 1322,1443 1322,1483 1262,1473"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1498" x="1267">ccc()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1267,1529 C 1327,1519 1327,1559 1267,1549"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1574" x="1635">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1569" x2="1500" y1="1569" x1="1769.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1574" x="1636">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1569" x2="1503" y1="1569" x1="1769.5"/>
 </svg>
diff --git a/docs/test_cases/t20013.md b/docs/test_cases/t20013.md
index b7832457..8967c979 100644
--- a/docs/test_cases/t20013.md
+++ b/docs/test_cases/t20013.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20013::tmain(int,char **)"
 ```
 ## Source code
-File t20013.cc
+File `tests/t20013/t20013.cc`
 ```cpp
 namespace clanguml {
 namespace t20013 {
diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg
index 82745b5d..51f6a6fb 100644
--- a/docs/test_cases/t20013_sequence.svg
+++ b/docs/test_cases/t20013_sequence.svg
@@ -1,90 +1,84 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:354px;height:357px;" version="1.1" viewBox="0 0 354 357" width="354px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="354px" preserveAspectRatio="none" style="width:317px;height:354px;background:#FFFFFF;" version="1.1" viewBox="0 0 317 354" width="317px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ao371ai25o4" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="317.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="317.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="317.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ao371ai25o4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#f1ao371ai25o4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="336.0889">tmain(int,char **)</text>
+    <rect fill="#FFFFFF" height="253.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="68.3999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="155.6"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="242.8"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="185.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="272.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="65" x2="65" y1="36.7999" y2="318.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="178.5" x2="178.5" y1="36.7999" y2="318.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="299.5" x2="299.5" y1="36.7999" y2="318.4"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="25.0059">tmain(int,char **)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="317.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="337.406">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ao371ai25o4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1ao371ai25o4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="336.0889">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="167.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="174.5" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="167.5" y="317.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="174.5" y="337.406">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ao371ai25o4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1ao371ai25o4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="336.0889">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="288.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="295.5" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="288.5" y="317.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="295.5" y="337.406">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ao371ai25o4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
+    <rect fill="#FFFFFF" height="253.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="68.3999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="155.6"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="242.8"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="185.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="272.4"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162,64.3999,172,68.3999,162,72.3999,166,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="77" y="62.8769">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="283,94,293,98,283,102,287,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="191" y="92.477">a1(int)</text>
     </a>
-    <polygon fill="#A80036" points="216.5,108.5625,206.5,112.5625,216.5,116.5625,212.5,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="112.5625" y2="112.5625"/>
-    <polygon fill="#A80036" points="91.5,122.5625,81.5,126.5625,91.5,130.5625,87.5,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="183.5,151.6953,193.5,155.6953,183.5,159.6953,187.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="155.6953" y2="155.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="150.6294">b(double)</text>
+    <polygon fill="#181818" points="195,108,185,112,195,116,191,112" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="112" y2="112"/>
+    <polygon fill="#181818" points="81,122,71,126,81,130,77,126" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="178" y1="126" y2="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162,151.6,172,155.6,162,159.6,166,155.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="155.6" y2="155.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="77" y="150.077">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="316.5,180.8281,326.5,184.8281,316.5,188.8281,320.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="184.8281" y2="184.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="179.7622">a2(double)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="283,181.2,293,185.2,283,189.2,287,185.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="185.2" y2="185.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="60" x="191" y="179.677">a2(double)</text>
     </a>
-    <polygon fill="#A80036" points="216.5,194.8281,206.5,198.8281,216.5,202.8281,212.5,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="198.8281" y2="198.8281"/>
-    <polygon fill="#A80036" points="91.5,208.8281,81.5,212.8281,91.5,216.8281,87.5,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="183.5,237.9609,193.5,241.9609,183.5,245.9609,187.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="241.9609" y2="241.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="236.895">b(const char *)</text>
+    <polygon fill="#181818" points="195,195.2,185,199.2,195,203.2,191,199.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="199.2" y2="199.2"/>
+    <polygon fill="#181818" points="81,209.2,71,213.2,81,217.2,77,213.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="178" y1="213.2" y2="213.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162,238.8,172,242.8,162,246.8,166,242.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="242.8" y2="242.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="77" y="237.277">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="316.5,267.0938,326.5,271.0938,316.5,275.0938,320.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="271.0938" y2="271.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="266.0278">a3(const char *)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="283,268.4,293,272.4,283,276.4,287,272.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="272.4" y2="272.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="191" y="266.877">a3(const char *)</text>
     </a>
-    <polygon fill="#A80036" points="216.5,281.0938,206.5,285.0938,216.5,289.0938,212.5,285.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="285.0938" y2="285.0938"/>
-    <polygon fill="#A80036" points="86.5,295.0938,76.5,299.0938,86.5,303.0938,82.5,299.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="80.5" x2="199.5" y1="299.0938" y2="299.0938"/>
+    <polygon fill="#181818" points="195,282.4,185,286.4,195,290.4,191,286.4" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="286.4" y2="286.4"/>
+    <polygon fill="#181818" points="76,296.4,66,300.4,76,304.4,72,300.4" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="70" x2="178" y1="300.4" y2="300.4"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20013_sequence_mermaid.svg b/docs/test_cases/t20013_sequence_mermaid.svg
index 9113c14e..1cc14dee 100644
--- a/docs/test_cases/t20013_sequence_mermaid.svg
+++ b/docs/test_cases/t20013_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -103,28 +103,28 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="385" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="280" y1="167" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="80" y1="177" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="178">b(double)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="275" y1="223" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="378">a2(double)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="475" y1="269" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="280" y1="279" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="80" y1="289" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="178">b(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="275" y1="335" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="378">a3(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="475" y1="381" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="391" x2="280" y1="391" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="406" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="401" x2="80" y1="401" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="283" y1="167" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="83" y1="177" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="176">b(double)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="271" y1="223" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="376">a2(double)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="471" y1="269" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="283" y1="279" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="83" y1="289" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="176">b(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="271" y1="335" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="376">a3(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="471" y1="381" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="391" x2="283" y1="391" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="406" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="401" x2="83" y1="401" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20014.md b/docs/test_cases/t20014.md
index aa6bae26..682a3f78 100644
--- a/docs/test_cases/t20014.md
+++ b/docs/test_cases/t20014.md
@@ -17,7 +17,33 @@ diagrams:
       - function: "clanguml::t20014::tmain()"
 ```
 ## Source code
-File t20014.cc
+File `tests/t20014/t20014_a.cc`
+```cpp
+#include "include/t20014_a.h"
+namespace clanguml {
+namespace t20014 {
+
+int A::a1(int i, int j) { return i + j; }
+
+int A::a2(int i, int j) { return i - j; }
+
+}
+}
+```
+File `tests/t20014/t20014_b.cc`
+```cpp
+#include "include/t20014_b.h"
+namespace clanguml {
+namespace t20014 {
+
+int B::b1(int i, int j) { return a_.a1(i, j); }
+
+int B::b2(int i, int j) { return a_.a2(i, j); }
+
+}
+}
+```
+File `tests/t20014/t20014.cc`
 ```cpp
 #include "include/t20014.h"
 #include "include/t20014_b.h"
@@ -43,39 +69,77 @@ int tmain()
 }
 }
 ```
-File t20014_a.cc
-```cpp
-#include "include/t20014_a.h"
-namespace clanguml {
-namespace t20014 {
-
-int A::a1(int i, int j) { return i + j; }
-
-int A::a2(int i, int j) { return i - j; }
-
-}
-}
-```
-File t20014_b.cc
-```cpp
-#include "include/t20014_b.h"
-namespace clanguml {
-namespace t20014 {
-
-int B::b1(int i, int j) { return a_.a1(i, j); }
-
-int B::b2(int i, int j) { return a_.a2(i, j); }
-
-}
-}
-```
-File t20014_c.cc
+File `tests/t20014/t20014_c.cc`
 ```cpp
 #include "include/t20014_c.h"
 
 namespace clanguml {
 namespace t20014 {
 
+}
+}
+```
+File `tests/t20014/include/t20014.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t20014 {
+
+int tmain();
+
+}
+}
+```
+File `tests/t20014/include/t20014_b.h`
+```cpp
+#pragma once
+
+#include "t20014_a.h"
+
+namespace clanguml {
+namespace t20014 {
+
+struct B {
+    int b1(int i, int);
+    int b2(int i, int);
+
+    A a_;
+};
+
+}
+}
+```
+File `tests/t20014/include/t20014_c.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t20014 {
+
+template <typename T, typename F> struct C {
+    F c1(F i, F j) { return c_.b1(i, j); }
+
+    F c2(F i, F j) { return c_.b2(i, j); }
+
+    T c_;
+};
+
+}
+}
+```
+File `tests/t20014/include/t20014_a.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t20014 {
+
+struct A {
+    int a1(int i, int j);
+    int a2(int i, int j);
+};
+
 }
 }
 ```
diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg
index dee72eee..99748fb3 100644
--- a/docs/test_cases/t20014_sequence.svg
+++ b/docs/test_cases/t20014_sequence.svg
@@ -1,106 +1,100 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="400px" preserveAspectRatio="none" style="width:336px;height:400px;" version="1.1" viewBox="0 0 336 400" width="336px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="397px" preserveAspectRatio="none" style="width:296px;height:397px;background:#FFFFFF;" version="1.1" viewBox="0 0 296 397" width="296px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jjkg8uci0nl6" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="360.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="360.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="222.5" x2="222.5" y1="38.2969" y2="360.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287.5" x2="287.5" y1="38.2969" y2="360.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jjkg8uci0nl6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1jjkg8uci0nl6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="379.2217">tmain()</text>
+    <rect fill="#FFFFFF" height="297.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="155.6"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="272.4"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="185.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="302"/>
+    <rect fill="#FFFFFF" height="101.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="251" y="242.8"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="362"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="117" x2="117" y1="36.7999" y2="362"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="200" x2="200" y1="36.7999" y2="362"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="256" x2="256" y1="36.7999" y2="362"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="361"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="381.006">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jjkg8uci0nl6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1jjkg8uci0nl6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="379.2217">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="106" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="113" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="106" y="361"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="113" y="381.006">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jjkg8uci0nl6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1jjkg8uci0nl6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="379.2217">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="189" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="196" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="189" y="361"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="196" y="381.006">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jjkg8uci0nl6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="22.9951">C&lt;B,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1jjkg8uci0nl6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="379.2217">C&lt;B,int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="222" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="229" y="25.0059">C&lt;B,int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="222" y="361"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="229" y="381.006">C&lt;B,int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1jjkg8uci0nl6)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="115,65.4297,125,69.4297,115,73.4297,119,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="64.3638">b1(int,int)</text>
+    <rect fill="#FFFFFF" height="297.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="155.6"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="272.4"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="185.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="302"/>
+    <rect fill="#FFFFFF" height="101.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="251" y="242.8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="100.5,64.3999,110.5,68.3999,100.5,72.3999,104.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="106.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="46.5" y="62.8769">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="206,94.5625,216,98.5625,206,102.5625,210,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="93.4966">a1(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="183.5,94,193.5,98,183.5,102,187.5,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="122.5" x2="189.5" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="129.5" y="92.477">a1(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="148,108.5625,138,112.5625,148,116.5625,144,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="112.5625" y2="112.5625"/>
-    <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="115,151.6953,125,155.6953,115,159.6953,119,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="155.6953" y2="155.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="150.6294">b2(int,int)</text>
+    <polygon fill="#181818" points="133.5,108,123.5,112,133.5,116,129.5,112" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="127.5" x2="199.5" y1="112" y2="112"/>
+    <polygon fill="#181818" points="50.5,122,40.5,126,50.5,130,46.5,126" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="116.5" y1="126" y2="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="100.5,151.6,110.5,155.6,100.5,159.6,104.5,155.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="106.5" y1="155.6" y2="155.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="46.5" y="150.077">b2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="206,180.8281,216,184.8281,206,188.8281,210,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="184.8281" y2="184.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="179.7622">a2(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="183.5,181.2,193.5,185.2,183.5,189.2,187.5,185.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="122.5" x2="189.5" y1="185.2" y2="185.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="129.5" y="179.677">a2(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="148,194.8281,138,198.8281,148,202.8281,144,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="198.8281" y2="198.8281"/>
-    <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="271,237.9609,281,241.9609,271,245.9609,275,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="277" y1="241.9609" y2="241.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="53" y="236.895">c1(int,int)</text>
+    <polygon fill="#181818" points="133.5,195.2,123.5,199.2,133.5,203.2,129.5,199.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="127.5" x2="199.5" y1="199.2" y2="199.2"/>
+    <polygon fill="#181818" points="50.5,209.2,40.5,213.2,50.5,217.2,46.5,213.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="116.5" y1="213.2" y2="213.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="239,238.8,249,242.8,239,246.8,243,242.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="245" y1="242.8" y2="242.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="46.5" y="237.277">c1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="148,267.0938,138,271.0938,148,275.0938,144,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="142" x2="282" y1="271.0938" y2="271.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="154" y="266.0278">b1(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="133.5,268.4,123.5,272.4,133.5,276.4,129.5,272.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="127.5" x2="250" y1="272.4" y2="272.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="139.5" y="266.877">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="206,296.2266,216,300.2266,206,304.2266,210,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="300.2266" y2="300.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="295.1606">a1(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="183.5,298,193.5,302,183.5,306,187.5,302" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="122.5" x2="189.5" y1="302" y2="302"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="129.5" y="296.477">a1(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="148,310.2266,138,314.2266,148,318.2266,144,314.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="314.2266" y2="314.2266"/>
-    <polygon fill="#A80036" points="271,324.2266,281,328.2266,271,332.2266,275,328.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="132" x2="277" y1="328.2266" y2="328.2266"/>
-    <polygon fill="#A80036" points="52,338.2266,42,342.2266,52,346.2266,48,342.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="287" y1="342.2266" y2="342.2266"/>
+    <polygon fill="#181818" points="133.5,312,123.5,316,133.5,320,129.5,316" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="127.5" x2="199.5" y1="316" y2="316"/>
+    <polygon fill="#181818" points="239,326,249,330,239,334,243,330" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="117.5" x2="245" y1="330" y2="330"/>
+    <polygon fill="#181818" points="45.5,340,35.5,344,45.5,348,41.5,344" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="255" y1="344" y2="344"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20014_sequence_mermaid.svg b/docs/test_cases/t20014_sequence_mermaid.svg
index 701f40f7..863079c3 100644
--- a/docs/test_cases/t20014_sequence_mermaid.svg
+++ b/docs/test_cases/t20014_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -121,32 +121,32 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="431" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="280" y1="167" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="80" y1="177" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="178">b2(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="275" y1="223" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="378">a2(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="475" y1="269" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="280" y1="279" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="80" y1="289" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="378">c1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="675" y1="335" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="473">b1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="275" y1="381" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="378">a1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="427" x2="475" y1="427" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="442" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="437" x2="280" y1="437" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="452" x="475">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="447" x2="670" y1="447" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="462" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="457" x2="80" y1="457" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="283" y1="167" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="83" y1="177" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="176">b2(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="271" y1="223" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="376">a2(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="471" y1="269" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="283" y1="279" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="83" y1="289" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="376">c1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="671" y1="335" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="475">b1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="279" y1="381" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="376">a1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="427" x2="471" y1="427" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="442" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="437" x2="283" y1="437" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="452" x="474">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="447" x2="667" y1="447" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="462" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="457" x2="83" y1="457" x1="670"/>
 </svg>
diff --git a/docs/test_cases/t20015.md b/docs/test_cases/t20015.md
index 2885a933..450f464e 100644
--- a/docs/test_cases/t20015.md
+++ b/docs/test_cases/t20015.md
@@ -17,7 +17,7 @@ diagrams:
       - function: "clanguml::t20015::tmain()"
 ```
 ## Source code
-File t20015.cc
+File `tests/t20015/t20015.cc`
 ```cpp
 #include <memory>
 #include <optional>
diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg
index c11653fc..85679e02 100644
--- a/docs/test_cases/t20015_sequence.svg
+++ b/docs/test_cases/t20015_sequence.svg
@@ -1,36 +1,30 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:338px;height:157px;" version="1.1" viewBox="0 0 338 157" width="338px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="152px" preserveAspectRatio="none" style="width:299px;height:152px;background:#FFFFFF;" version="1.1" viewBox="0 0 299 152" width="299px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ji97hxyy5a8f" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ji97hxyy5a8f)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ji97hxyy5a8f)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="317" x2="317" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ji97hxyy5a8f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ji97hxyy5a8f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
+    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="276.5" y="68.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="116.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="281" x2="281" y1="36.7999" y2="116.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="115.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="135.4059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ji97hxyy5a8f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1ji97hxyy5a8f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="136.4248">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="270" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="277" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="270" y="115.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="277" y="135.4059">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ji97hxyy5a8f)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ji97hxyy5a8f)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="300,65.4297,310,69.4297,300,73.4297,304,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="306" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="53" y="64.3638">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
+    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="276.5" y="68.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="264.5,64.3999,274.5,68.3999,264.5,72.3999,268.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="270.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="218" x="46.5" y="62.8769">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20015_sequence_mermaid.svg b/docs/test_cases/t20015_sequence_mermaid.svg
index 15fab6f5..1ad5fd15 100644
--- a/docs/test_cases/t20015_sequence_mermaid.svg
+++ b/docs/test_cases/t20015_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -73,6 +73,6 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="105" x="385"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="235">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="390" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="233">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="386" y1="111" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20016.md b/docs/test_cases/t20016.md
index dda41246..240d4618 100644
--- a/docs/test_cases/t20016.md
+++ b/docs/test_cases/t20016.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20016::tmain()"
 ```
 ## Source code
-File t20016.cc
+File `tests/t20016/t20016.cc`
 ```cpp
 namespace clanguml {
 namespace t20016 {
diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg
index 855247e6..58671b0b 100644
--- a/docs/test_cases/t20016_sequence.svg
+++ b/docs/test_cases/t20016_sequence.svg
@@ -1,68 +1,62 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="273px" preserveAspectRatio="none" style="width:281px;height:273px;" version="1.1" viewBox="0 0 281 273" width="281px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="268px" preserveAspectRatio="none" style="width:251px;height:268px;background:#FFFFFF;" version="1.1" viewBox="0 0 251 268" width="251px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkusc3chkk7hb" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="232.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="125" x2="125" y1="38.2969" y2="232.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="260.5" x2="260.5" y1="38.2969" y2="232.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkusc3chkk7hb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fkusc3chkk7hb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="251.8232">tmain()</text>
+    <rect fill="#FFFFFF" height="168.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="104.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="104.5" y="157.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="228.5" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="228.5" y="187.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="233.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="109.5" x2="109.5" y1="36.7999" y2="233.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="233" x2="233" y1="36.7999" y2="233.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="232.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="252.2059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkusc3chkk7hb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="22.9951">B&lt;long&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fkusc3chkk7hb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="251.8232">B&lt;long&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="76.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="83.5" y="25.0059">B&lt;long&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="76.5" y="232.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="83.5" y="252.2059">B&lt;long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkusc3chkk7hb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fkusc3chkk7hb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="251.8232">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="222" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="229" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="222" y="232.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="229" y="252.2059">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkusc3chkk7hb)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="108,65.4297,118,69.4297,108,73.4297,112,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="64.3638">b1(long)</text>
+    <rect fill="#FFFFFF" height="168.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="104.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="104.5" y="157.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="228.5" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="228.5" y="187.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="92.5,64.3999,102.5,68.3999,92.5,72.3999,96.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="98.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="46.5" y="62.8769">b1(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="244,94.5625,254,98.5625,244,102.5625,248,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="137" y="93.4966">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="216.5,94,226.5,98,216.5,102,220.5,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="114.5" x2="222.5" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="121.5" y="92.477">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="108,153.6953,118,157.6953,108,161.6953,112,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="157.6953" y2="157.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="152.6294">b2(long)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="92.5,153.6,102.5,157.6,92.5,161.6,96.5,157.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="98.5" y1="157.6" y2="157.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="46.5" y="152.077">b2(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="244,182.8281,254,186.8281,244,190.8281,248,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="186.8281" y2="186.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="107" x="137" y="181.7622">a2(const long &amp;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="216.5,183.2,226.5,187.2,216.5,191.2,220.5,187.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="114.5" x2="222.5" y1="187.2" y2="187.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="95" x="121.5" y="181.677">a2(const long &amp;)</text>
     </a>
-    <polygon fill="#A80036" points="141,196.8281,131,200.8281,141,204.8281,137,200.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="135" x2="260" y1="200.8281" y2="200.8281"/>
-    <polygon fill="#A80036" points="52,210.8281,42,214.8281,52,218.8281,48,214.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="124" y1="214.8281" y2="214.8281"/>
+    <polygon fill="#181818" points="125.5,197.2,115.5,201.2,125.5,205.2,121.5,201.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="119.5" x2="232.5" y1="201.2" y2="201.2"/>
+    <polygon fill="#181818" points="45.5,211.2,35.5,215.2,45.5,219.2,41.5,215.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="108.5" y1="215.2" y2="215.2"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20016_sequence_mermaid.svg b/docs/test_cases/t20016_sequence_mermaid.svg
index a4e11094..ab1dfed3 100644
--- a/docs/test_cases/t20016_sequence_mermaid.svg
+++ b/docs/test_cases/t20016_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -97,16 +97,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="253" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b1(long)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="178">b2(long)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="275" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="378">a2(const long &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="475" y1="249" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="259" x2="280" y1="259" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="274" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="269" x2="80" y1="269" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b1(long)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="176">b2(long)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="271" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="376">a2(const long &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="471" y1="249" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="259" x2="283" y1="259" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="274" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="269" x2="83" y1="269" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20017.md b/docs/test_cases/t20017.md
index cb88dffb..84ac052b 100644
--- a/docs/test_cases/t20017.md
+++ b/docs/test_cases/t20017.md
@@ -18,7 +18,7 @@ diagrams:
       - function: "clanguml::t20017::tmain()"
 ```
 ## Source code
-File t20017_b.cc
+File `tests/t20017/t20017_b.cc`
 ```cpp
 #include "include/t20017_b.h"
 
@@ -28,7 +28,7 @@ int b1(int x, int y) { return x - y; }
 }
 }
 ```
-File t20017.cc
+File `tests/t20017/t20017.cc`
 ```cpp
 #include "include/t20017_a.h"
 #include "include/t20017_b.h"
@@ -39,6 +39,30 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); }
 }
 }
 ```
+File `tests/t20017/include/t20017_b.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t20017 {
+int b1(int x, int y);
+
+template <typename T> T b2(T x, T y) { return x / y; }
+}
+}
+```
+File `tests/t20017/include/t20017_a.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t20017 {
+int a1(int x, int y) { return x + y; }
+int a2(int x, int y) { return x - y; }
+int a3(int x, int y) { return x * y; }
+}
+}
+```
 ## Generated PlantUML diagrams
 ![t20017_sequence](./t20017_sequence.svg "Test case for combine_free_functions_into_file_participants option")
 ## Generated Mermaid diagrams
diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg
index 409b1775..281ddfec 100644
--- a/docs/test_cases/t20017_sequence.svg
+++ b/docs/test_cases/t20017_sequence.svg
@@ -1,80 +1,74 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:448px;height:357px;" version="1.1" viewBox="0 0 448 357" width="448px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="354px" preserveAspectRatio="none" style="width:398px;height:354px;background:#FFFFFF;" version="1.1" viewBox="0 0 398 354" width="398px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1dzrqw34z6rl5" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="74" x2="74" y1="38.2969" y2="317.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="203" x2="203" y1="38.2969" y2="317.0938"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="317.0938"/>
-    <rect fill="#FEFECE" filter="url(#f1dzrqw34z6rl5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="22.9951">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f1dzrqw34z6rl5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="336.0889">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f1dzrqw34z6rl5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="22.9951">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f1dzrqw34z6rl5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="336.0889">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f1dzrqw34z6rl5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="22.9951">include/t20017_b.h</text>
-    <rect fill="#FEFECE" filter="url(#f1dzrqw34z6rl5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="336.0889">include/t20017_b.h</text>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzrqw34z6rl5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
-    <polygon fill="#A80036" points="57,65.4297,67,69.4297,57,73.4297,61,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="63" y1="69.4297" y2="69.4297"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="10" y="64.3638">tmain()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="186.5,94.5625,196.5,98.5625,186.5,102.5625,190.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="93.4966">a3(int,int)</text>
+    <rect fill="#FFFFFF" height="232.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="59" y="68.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="185.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="228.8"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="319.5" y="141.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="319.5" y="272.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="64" x2="64" y1="36.7999" y2="318.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="179" x2="179" y1="36.7999" y2="318.4"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="324" x2="324" y1="36.7999" y2="318.4"/>
+    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="76" x="26" y="5"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="33" y="25.0059">t20017.cc</text>
+    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="76" x="26" y="317.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="33" y="337.406">t20017.cc</text>
+    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="112" y="5"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="119" y="25.0059">include/t20017_a.h</text>
+    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="112" y="317.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="119" y="337.406">include/t20017_a.h</text>
+    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="257" y="5"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="264" y="25.0059">include/t20017_b.h</text>
+    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="257" y="317.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="264" y="337.406">include/t20017_b.h</text>
+    <rect fill="#FFFFFF" height="232.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="59" y="68.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="98"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="185.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="228.8"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="319.5" y="141.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="319.5" y="272.4"/>
+    <polygon fill="#181818" points="47,64.3999,57,68.3999,47,72.3999,51,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="53" y1="68.3999" y2="68.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="7" y="62.8769">tmain()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162.5,94,172.5,98,162.5,102,166.5,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="168.5" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="76" y="92.477">a3(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="90,108.5625,80,112.5625,90,116.5625,86,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="112.5625" y2="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="348,137.6953,358,141.6953,348,145.6953,352,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="141.6953" y2="141.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="136.6294">b1(int,int)</text>
+    <polygon fill="#181818" points="80,108,70,112,80,116,76,112" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="178.5" y1="112" y2="112"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="307.5,137.6,317.5,141.6,307.5,145.6,311.5,141.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="313.5" y1="141.6" y2="141.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="76" y="136.077">b1(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="90,151.6953,80,155.6953,90,159.6953,86,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="155.6953" y2="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="186.5,180.8281,196.5,184.8281,186.5,188.8281,190.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="184.8281" y2="184.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="179.7622">a2(int,int)</text>
+    <polygon fill="#181818" points="80,151.6,70,155.6,80,159.6,76,155.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="323.5" y1="155.6" y2="155.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162.5,181.2,172.5,185.2,162.5,189.2,166.5,185.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="168.5" y1="185.2" y2="185.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="76" y="179.677">a2(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="90,194.8281,80,198.8281,90,202.8281,86,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="198.8281" y2="198.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="186.5,223.9609,196.5,227.9609,186.5,231.9609,190.5,227.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="227.9609" y2="227.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="222.895">a1(int,int)</text>
+    <polygon fill="#181818" points="80,195.2,70,199.2,80,203.2,76,199.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="178.5" y1="199.2" y2="199.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162.5,224.8,172.5,228.8,162.5,232.8,166.5,228.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="168.5" y1="228.8" y2="228.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="76" y="223.277">a1(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="90,237.9609,80,241.9609,90,245.9609,86,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="241.9609" y2="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="348,267.0938,358,271.0938,348,275.0938,352,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="271.0938" y2="271.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="86" y="266.0278">b2&lt;int&gt;(int,int)</text>
+    <polygon fill="#181818" points="80,238.8,70,242.8,80,246.8,76,242.8" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="178.5" y1="242.8" y2="242.8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="307.5,268.4,317.5,272.4,307.5,276.4,311.5,272.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="313.5" y1="272.4" y2="272.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="84" x="76" y="266.877">b2&lt;int&gt;(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="90,281.0938,80,285.0938,90,289.0938,86,285.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="285.0938" y2="285.0938"/>
-    <polygon fill="#A80036" points="14,295.0938,4,299.0938,14,303.0938,10,299.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="8" x2="73" y1="299.0938" y2="299.0938"/>
+    <polygon fill="#181818" points="80,282.4,70,286.4,80,290.4,76,286.4" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="323.5" y1="286.4" y2="286.4"/>
+    <polygon fill="#181818" points="11,296.4,1,300.4,11,304.4,7,300.4" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="5" x2="63" y1="300.4" y2="300.4"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20017_sequence_mermaid.svg b/docs/test_cases/t20017_sequence_mermaid.svg
index 27d40e19..61f8c28f 100644
--- a/docs/test_cases/t20017_sequence_mermaid.svg
+++ b/docs/test_cases/t20017_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -115,28 +115,28 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="385" x="677.5"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">tmain()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="75" y1="111" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="279">a3(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="477.5" y1="157" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="276">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="80" y1="167" x1="472.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="381">b1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="213" x2="682.5" y1="213" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="379">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="80" y1="223" x1="677.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="279">a2(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="477.5" y1="269" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="276">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="80" y1="279" x1="472.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="279">a1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="325" x2="477.5" y1="325" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="340" x="276">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="335" x2="80" y1="335" x1="472.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="381">b2&lt;int&gt;(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="682.5" y1="381" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="379">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="391" x2="80" y1="391" x1="677.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="406" x="178">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="401" x2="275" y1="401" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="177">tmain()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="79" y1="111" x1="274"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="277">a3(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="473.5" y1="157" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="278">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="83" y1="167" x1="472.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="379">b1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="213" x2="678.5" y1="213" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="380">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="83" y1="223" x1="677.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="277">a2(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="473.5" y1="269" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="278">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="83" y1="279" x1="472.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="277">a1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="325" x2="473.5" y1="325" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="340" x="278">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="335" x2="83" y1="335" x1="472.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="379">b2&lt;int&gt;(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="678.5" y1="381" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="380">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="391" x2="83" y1="391" x1="677.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="406" x="176">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="401" x2="271" y1="401" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20018.md b/docs/test_cases/t20018.md
index 2168fbef..993ada3e 100644
--- a/docs/test_cases/t20018.md
+++ b/docs/test_cases/t20018.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20018::tmain()"
 ```
 ## Source code
-File t20018.cc
+File `tests/t20018/t20018.cc`
 ```cpp
 #include <iostream>
 
diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg
index 931d5df0..52eeb7a4 100644
--- a/docs/test_cases/t20018_sequence.svg
+++ b/docs/test_cases/t20018_sequence.svg
@@ -1,120 +1,114 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="332px" preserveAspectRatio="none" style="width:1013px;height:332px;" version="1.1" viewBox="0 0 1013 332" width="1013px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="329px" preserveAspectRatio="none" style="width:882px;height:329px;background:#FFFFFF;" version="1.1" viewBox="0 0 882 329" width="882px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fi0i5q8ollv0v" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="292.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191" x2="191" y1="38.2969" y2="292.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="362" x2="362" y1="38.2969" y2="292.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="480" x2="480" y1="38.2969" y2="292.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="598" x2="598" y1="38.2969" y2="292.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="716" x2="716" y1="38.2969" y2="292.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="834" x2="834" y1="38.2969" y2="292.2266"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="952" x2="952" y1="38.2969" y2="292.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="311.2217">tmain()</text>
+    <rect fill="#FFFFFF" height="229.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="207.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="68.3999"/>
+    <rect fill="#FFFFFF" height="178.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="309.5" y="98"/>
+    <rect fill="#FFFFFF" height="148.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="412.5" y="127.6"/>
+    <rect fill="#FFFFFF" height="118.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="515.5" y="157.2"/>
+    <rect fill="#FFFFFF" height="89.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="618.5" y="186.8"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="721.5" y="216.4"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="824.5" y="246"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="294"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="166" x2="166" y1="36.7999" y2="294"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="314" x2="314" y1="36.7999" y2="294"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="417" x2="417" y1="36.7999" y2="294"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="520" x2="520" y1="36.7999" y2="294"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="623" x2="623" y1="36.7999" y2="294"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="726" x2="726" y1="36.7999" y2="294"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="829" x2="829" y1="36.7999" y2="294"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="313.006">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="22.9951">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="311.2217">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="81" y="25.0059">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="74" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="81" y="313.006">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="22.9951">Factorial&lt;5&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="311.2217">Factorial&lt;5&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="268" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="275" y="25.0059">Factorial&lt;5&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="268" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="275" y="313.006">Factorial&lt;5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="22.9951">Factorial&lt;4&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="311.2217">Factorial&lt;4&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="371" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="378" y="25.0059">Factorial&lt;4&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="371" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="378" y="313.006">Factorial&lt;4&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="22.9951">Factorial&lt;3&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="311.2217">Factorial&lt;3&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="474" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="481" y="25.0059">Factorial&lt;3&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="474" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="481" y="313.006">Factorial&lt;3&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="22.9951">Factorial&lt;2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="311.2217">Factorial&lt;2&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="577" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="584" y="25.0059">Factorial&lt;2&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="577" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="584" y="313.006">Factorial&lt;2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="22.9951">Factorial&lt;1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="311.2217">Factorial&lt;1&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="680" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="687" y="25.0059">Factorial&lt;1&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="680" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="687" y="313.006">Factorial&lt;1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="22.9951">Factorial&lt;0&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fi0i5q8ollv0v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="311.2217">Factorial&lt;0&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="783" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="790" y="25.0059">Factorial&lt;0&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="783" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="790" y="313.006">Factorial&lt;0&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fi0i5q8ollv0v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="174,65.4297,184,69.4297,174,73.4297,178,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="180" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="39" x="53" y="64.3638">print()</text>
+    <rect fill="#FFFFFF" height="229.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="207.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="68.3999"/>
+    <rect fill="#FFFFFF" height="178.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="309.5" y="98"/>
+    <rect fill="#FFFFFF" height="148.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="412.5" y="127.6"/>
+    <rect fill="#FFFFFF" height="118.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="515.5" y="157.2"/>
+    <rect fill="#FFFFFF" height="89.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="618.5" y="186.8"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="721.5" y="216.4"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="824.5" y="246"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="149,64.3999,159,68.3999,149,72.3999,153,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="155" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="33" x="46.5" y="62.8769">print()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="345,94.5625,355,98.5625,345,102.5625,349,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="196" x2="351" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="203" y="93.4966">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="297.5,94,307.5,98,297.5,102,301.5,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="171" x2="303.5" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="178" y="92.477">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="463,123.6953,473,127.6953,463,131.6953,467,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="367" x2="469" y1="127.6953" y2="127.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="374" y="122.6294">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="400.5,123.6,410.5,127.6,400.5,131.6,404.5,127.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="319.5" x2="406.5" y1="127.6" y2="127.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="326.5" y="122.077">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="581,152.8281,591,156.8281,581,160.8281,585,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="485" x2="587" y1="156.8281" y2="156.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="492" y="151.7622">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="503.5,153.2,513.5,157.2,503.5,161.2,507.5,157.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="422.5" x2="509.5" y1="157.2" y2="157.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="429.5" y="151.677">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="699,181.9609,709,185.9609,699,189.9609,703,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="603" x2="705" y1="185.9609" y2="185.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="610" y="180.895">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="606.5,182.8,616.5,186.8,606.5,190.8,610.5,186.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="525.5" x2="612.5" y1="186.8" y2="186.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="532.5" y="181.277">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="817,211.0938,827,215.0938,817,219.0938,821,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="721" x2="823" y1="215.0938" y2="215.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="728" y="210.0278">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="709.5,212.4,719.5,216.4,709.5,220.4,713.5,216.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="628.5" x2="715.5" y1="216.4" y2="216.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="635.5" y="210.877">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="935,240.2266,945,244.2266,935,248.2266,939,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="839" x2="941" y1="244.2266" y2="244.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="846" y="239.1606">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="812.5,242,822.5,246,812.5,250,816.5,246" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="731.5" x2="818.5" y1="246" y2="246"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="738.5" y="240.477">print(int)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20018_sequence_mermaid.svg b/docs/test_cases/t20018_sequence_mermaid.svg
index 93ba205f..f4234234 100644
--- a/docs/test_cases/t20018_sequence_mermaid.svg
+++ b/docs/test_cases/t20018_sequence_mermaid.svg
@@ -138,17 +138,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -181,18 +181,18 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="381" x="1519"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="190">print()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="299.5" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="414">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="524" y1="157" x1="304.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="627">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="724" y1="203" x1="529"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="827">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="924" y1="249" x1="729"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="1027">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1124" y1="295" x1="929"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1227">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1324" y1="341" x1="1129"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="1427">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="1524" y1="387" x1="1329"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="188">print()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="295.5" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="412">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="520" y1="157" x1="304.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="625">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="720" y1="203" x1="529"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="825">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="920" y1="249" x1="729"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="1025">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1120" y1="295" x1="929"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1225">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1320" y1="341" x1="1129"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="1425">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="1520" y1="387" x1="1329"/>
 </svg>
diff --git a/docs/test_cases/t20019.md b/docs/test_cases/t20019.md
index c9c8e2d2..255e972b 100644
--- a/docs/test_cases/t20019.md
+++ b/docs/test_cases/t20019.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20019::tmain()"
 ```
 ## Source code
-File t20019.cc
+File `tests/t20019/t20019.cc`
 ```cpp
 #include <cstdio>
 
diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg
index af637231..56ea902d 100644
--- a/docs/test_cases/t20019_sequence.svg
+++ b/docs/test_cases/t20019_sequence.svg
@@ -1,106 +1,100 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:391px;height:451px;" version="1.1" viewBox="0 0 391 451" width="391px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="449px" preserveAspectRatio="none" style="width:334px;height:449px;background:#FFFFFF;" version="1.1" viewBox="0 0 334 449" width="334px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1t59u2rmqsmhf" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="411.3594"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="210" x2="210" y1="38.2969" y2="411.3594"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287" x2="287" y1="38.2969" y2="411.3594"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
+    <rect fill="#FFFFFF" height="348.8001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="109" y="68.3999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="109" y="246.8"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="175" y="98"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="175" y="276.4"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="241" y="157.6"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="241" y="336"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="307" y="187.2"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="307" y="365.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="413.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="114" x2="114" y1="36.7999" y2="413.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="180" x2="180" y1="36.7999" y2="413.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="246" x2="246" y1="36.7999" y2="413.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="312" x2="312" y1="36.7999" y2="413.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="412.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="432.606">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="22.9951">Base&lt;D1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="430.3545">Base&lt;D1&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="81" y="25.0059">Base&lt;D1&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="74" y="412.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="81" y="432.606">Base&lt;D1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="22.9951">D1</text>
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="430.3545">D1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="164" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="171" y="25.0059">D1</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="164" y="412.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="171" y="432.606">D1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="22.9951">Base&lt;D2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="430.3545">Base&lt;D2&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="206" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="213" y="25.0059">Base&lt;D2&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="206" y="412.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="213" y="432.606">Base&lt;D2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="22.9951">D2</text>
-      <rect fill="#FEFECE" filter="url(#f1t59u2rmqsmhf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="430.3545">D2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="296" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="303" y="25.0059">D2</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="296" y="412.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="303" y="432.606">D2</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1t59u2rmqsmhf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="115.5,65.4297,125.5,69.4297,115.5,73.4297,119.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="64.3638">name()</text>
+    <rect fill="#FFFFFF" height="348.8001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="109" y="68.3999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="109" y="246.8"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="175" y="98"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="175" y="276.4"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="241" y="157.6"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="241" y="336"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="307" y="187.2"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="307" y="365.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="97,64.3999,107,68.3999,97,72.3999,101,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="103" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="62.8769">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="193,94.5625,203,98.5625,193,102.5625,197,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="93.4966">impl()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="163,94,173,98,163,102,167,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="119" x2="169" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="126" y="92.477">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="270.5,153.6953,280.5,157.6953,270.5,161.6953,274.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="157.6953" y2="157.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="152.6294">name()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="229,153.6,239,157.6,229,161.6,233,157.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="235" y1="157.6" y2="157.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="152.077">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="348,182.8281,358,186.8281,348,190.8281,352,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="186.8281" y2="186.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="181.7622">impl()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="295,183.2,305,187.2,295,191.2,299,187.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="251" x2="301" y1="187.2" y2="187.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="258" y="181.677">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="115.5,241.9609,125.5,245.9609,115.5,249.9609,119.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="245.9609" y2="245.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="240.895">name()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="97,242.8,107,246.8,97,250.8,101,246.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="103" y1="246.8" y2="246.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="241.277">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="193,271.0938,203,275.0938,193,279.0938,197,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="275.0938" y2="275.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="270.0278">impl()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="163,272.4,173,276.4,163,280.4,167,276.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="119" x2="169" y1="276.4" y2="276.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="126" y="270.877">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="270.5,330.2266,280.5,334.2266,270.5,338.2266,274.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="334.2266" y2="334.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="329.1606">name()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="229,332,239,336,229,340,233,336" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="235" y1="336" y2="336"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="330.477">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="348,359.3594,358,363.3594,348,367.3594,352,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="363.3594" y2="363.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="358.2935">impl()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="295,361.6,305,365.6,295,369.6,299,365.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="251" x2="301" y1="365.6" y2="365.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="258" y="360.077">impl()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20019_sequence_mermaid.svg b/docs/test_cases/t20019_sequence_mermaid.svg
index 51597fd2..0faa67ed 100644
--- a/docs/test_cases/t20019_sequence_mermaid.svg
+++ b/docs/test_cases/t20019_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -139,20 +139,20 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="427" x="870"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">name()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">impl()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="378">name()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="778">impl()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="178">name()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="275" y1="295" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="378">impl()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="475" y1="341" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="378">name()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="675" y1="387" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="778">impl()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="875" y1="433" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">name()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">impl()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="376">name()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="776">impl()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="176">name()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="271" y1="295" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="376">impl()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="471" y1="341" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="376">name()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="671" y1="387" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="776">impl()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="871" y1="433" x1="680"/>
 </svg>
diff --git a/docs/test_cases/t20020.md b/docs/test_cases/t20020.md
index 46ce82fa..07fd03cf 100644
--- a/docs/test_cases/t20020.md
+++ b/docs/test_cases/t20020.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20020::tmain()"
 ```
 ## Source code
-File t20020.cc
+File `tests/t20020/t20020.cc`
 ```cpp
 #include <cmath>
 #include <cstdint>
diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg
index 4e25416c..f03f9db4 100644
--- a/docs/test_cases/t20020_sequence.svg
+++ b/docs/test_cases/t20020_sequence.svg
@@ -1,203 +1,193 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="879px" preserveAspectRatio="none" style="width:385px;height:879px;" version="1.1" viewBox="0 0 385 879" width="385px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="882px" preserveAspectRatio="none" style="width:334px;height:882px;background:#FFFFFF;" version="1.1" viewBox="0 0 334 882" width="334px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fpezzki6t4y2k" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="115.5625"/>
-    <rect fill="#FFFFFF" height="250.7969" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="160.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
-    <rect fill="#FFFFFF" height="88.2656" style="stroke: none; stroke-width: 1.0;" width="271.5" x="23" y="316.2266"/>
-    <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="411.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="839.6875"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132.5" x2="132.5" y1="38.2969" y2="839.6875"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="170.5" x2="170.5" y1="38.2969" y2="839.6875"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="839.6875"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="329.5" x2="329.5" y1="38.2969" y2="839.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="838.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="858.6826">tmain()</text>
+    <rect fill="#FFFFFF" height="789.8002" style="stroke:#181818;stroke-width:1.0;" width="10" x="54.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="93"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="138.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="208.8"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="341.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="437.8001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="252.4"/>
+    <rect fill="#FFFFFF" height="181.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="572.6001"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152" y="634.8001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="152" y="704.4001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="296"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="385.2001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="488.4001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="286" y="807.6002"/>
+    <rect fill="none" height="406.0001" style="stroke:#000000;stroke-width:1.5;" width="263.5" x="10" y="53.7999"/>
+    <rect fill="none" height="237.6001" style="stroke:#000000;stroke-width:1.5;" width="243.5" x="20" y="169.6"/>
+    <rect fill="none" height="221.0001" style="stroke:#000000;stroke-width:1.5;" width="237" x="20" y="533.4001"/>
+    <rect fill="none" height="159.8" style="stroke:#000000;stroke-width:1.5;" width="117" x="130" y="587.6001"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="308.5" x="20" y="768.4001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="59" x2="59" y1="36.7999" y2="846.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="118" x2="118" y1="36.7999" y2="846.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="152" x2="152" y1="36.7999" y2="846.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="241.5" x2="241.5" y1="36.7999" y2="846.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="290.5" x2="290.5" y1="36.7999" y2="846.6002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="30" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="37" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="30" y="845.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="37" y="865.6061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="838.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="858.6826">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="107" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="114" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="107" y="845.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="114" y="865.6061">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="838.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="858.6826">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="140" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="147" y="25.0059">C</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="140" y="845.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="147" y="865.6061">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="838.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="858.6826">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="230.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="237.5" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="230.5" y="845.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="237.5" y="865.6061">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="22.9951">D&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fpezzki6t4y2k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="838.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="858.6826">D&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="263.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="270.5" y="25.0059">D&lt;int&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="263.5" y="845.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="270.5" y="865.6061">D&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fpezzki6t4y2k)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
-    <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="116,89.5625,126,93.5625,116,97.5625,120,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="93.5625" y2="93.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="88.4966">a1()</text>
+    <rect fill="#FFFFFF" height="789.8002" style="stroke:#181818;stroke-width:1.0;" width="10" x="54.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="93"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="138.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="208.8"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="341.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="437.8001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="252.4"/>
+    <rect fill="#FFFFFF" height="181.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="572.6001"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152" y="634.8001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="152" y="704.4001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="296"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="385.2001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="488.4001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="286" y="807.6002"/>
+    <path d="M10,53.7999 L70,53.7999 L70,61.3999 L60,71.3999 L10,71.3999 L10,53.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="406.0001" style="stroke:#000000;stroke-width:1.5;" width="263.5" x="10" y="53.7999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="66.8769">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="101.5,89,111.5,93,101.5,97,105.5,93" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="93" y2="93"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="87.477">a1()</text>
     </a>
-    <polygon fill="#A80036" points="82,103.5625,72,107.5625,82,111.5625,78,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="107.5625" y2="107.5625"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="116.5625" y2="116.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="116,134.6953,126,138.6953,116,142.6953,120,138.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="138.6953" y2="138.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="133.6294">a5()</text>
+    <polygon fill="#181818" points="75.5,103,65.5,107,75.5,111,71.5,107" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="107" y2="107"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="273.5" y1="116" y2="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="101.5,134.6,111.5,138.6,101.5,142.6,105.5,138.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="138.6" y2="138.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="133.077">a5()</text>
     </a>
-    <polygon fill="#A80036" points="82,148.6953,72,152.6953,82,156.6953,78,152.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="152.6953" y2="152.6953"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="161.6953" y2="161.6953"/>
-    <path d="M23,169.6953 L87,169.6953 L87,176.6953 L77,186.6953 L23,186.6953 L23,169.6953 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="182.7622">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="116,203.9609,126,207.9609,116,211.9609,120,207.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="207.9609" y2="207.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="202.895">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="84" y="202.895">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="110" y="202.895">]</text>
+    <polygon fill="#181818" points="75.5,148.6,65.5,152.6,75.5,156.6,71.5,152.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="152.6" y2="152.6"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="273.5" y1="161.6" y2="161.6"/>
+    <path d="M20,169.6 L80,169.6 L80,177.2 L70,187.2 L20,187.2 L20,169.6 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="237.6001" style="stroke:#000000;stroke-width:1.5;" width="243.5" x="20" y="169.6"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="35" y="182.677">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="101.5,204.8,111.5,208.8,101.5,212.8,105.5,208.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="208.8" y2="208.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="71.5" y="203.277">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="75.5" y="203.277">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="97.5" y="203.277">]</text>
     </a>
-    <polygon fill="#A80036" points="82,217.9609,72,221.9609,82,225.9609,78,221.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="221.9609" y2="221.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="153.5,247.0938,163.5,251.0938,153.5,255.0938,157.5,251.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="251.0938" y2="251.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="246.0278">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="41" x="84" y="246.0278">c3(int)</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="125" y="246.0278">]</text>
+    <polygon fill="#181818" points="75.5,218.8,65.5,222.8,75.5,226.8,71.5,222.8" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="222.8" y2="222.8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="135,248.4,145,252.4,135,256.4,139,252.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="141" y1="252.4" y2="252.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="71.5" y="246.877">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="75.5" y="246.877">c3(int)</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="111.5" y="246.877">]</text>
     </a>
-    <polygon fill="#A80036" points="82,261.0938,72,265.0938,82,269.0938,78,265.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="169.5" y1="265.0938" y2="265.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="253.5,290.2266,263.5,294.2266,253.5,298.2266,257.5,294.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="294.2266" y2="294.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="289.1606">b1()</text>
+    <polygon fill="#181818" points="75.5,262.4,65.5,266.4,75.5,270.4,71.5,266.4" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="151" y1="266.4" y2="266.4"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="225,292,235,296,225,300,229,296" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="231" y1="296" y2="296"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="290.477">b1()</text>
     </a>
-    <polygon fill="#A80036" points="82,304.2266,72,308.2266,82,312.2266,78,308.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="269.5" y1="308.2266" y2="308.2266"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="23" x2="294.5" y1="317.2266" y2="317.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="116,335.3594,126,339.3594,116,343.3594,120,339.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="339.3594" y2="339.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="334.2935">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="84" y="334.2935">a3()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="110" y="334.2935">]</text>
+    <polygon fill="#181818" points="75.5,306,65.5,310,75.5,314,71.5,310" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="241" y1="310" y2="310"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="20" x2="263.5" y1="319" y2="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="101.5,337.6,111.5,341.6,101.5,345.6,105.5,341.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="341.6" y2="341.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="71.5" y="336.077">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="75.5" y="336.077">a3()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="97.5" y="336.077">]</text>
     </a>
-    <polygon fill="#A80036" points="82,349.3594,72,353.3594,82,357.3594,78,353.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="353.3594" y2="353.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="253.5,378.4922,263.5,382.4922,253.5,386.4922,257.5,382.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="382.4922" y2="382.4922"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="377.4263">b2()</text>
+    <polygon fill="#181818" points="75.5,351.6,65.5,355.6,75.5,359.6,71.5,355.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="355.6" y2="355.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="225,381.2001,235,385.2001,225,389.2001,229,385.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="231" y1="385.2001" y2="385.2001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="379.677">b2()</text>
     </a>
-    <polygon fill="#A80036" points="82,392.4922,72,396.4922,82,400.4922,78,396.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="269.5" y1="396.4922" y2="396.4922"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="412.4922" y2="412.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="116,430.625,126,434.625,116,438.625,120,434.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="434.625" y2="434.625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="429.5591">a4()</text>
+    <polygon fill="#181818" points="75.5,395.2001,65.5,399.2001,75.5,403.2001,71.5,399.2001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="241" y1="399.2001" y2="399.2001"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="273.5" y1="415.2001" y2="415.2001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="101.5,433.8001,111.5,437.8001,101.5,441.8001,105.5,437.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="437.8001" y2="437.8001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="432.2771">a4()</text>
     </a>
-    <polygon fill="#A80036" points="82,444.625,72,448.625,82,452.625,78,448.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="448.625" y2="448.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="253.5,480.7578,263.5,484.7578,253.5,488.7578,257.5,484.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="484.7578" y2="484.7578"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="29" x="78" y="479.6919">log()</text>
+    <polygon fill="#181818" points="75.5,447.8001,65.5,451.8001,75.5,455.8001,71.5,451.8001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="451.8001" y2="451.8001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="225,484.4001,235,488.4001,225,492.4001,229,488.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="231" y1="488.4001" y2="488.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="25" x="71.5" y="482.8771">log()</text>
     </a>
-    <path d="M23,529.7578 L87,529.7578 L87,536.7578 L77,546.7578 L23,546.7578 L23,529.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="542.8247">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="153.5,564.0234,163.5,568.0234,153.5,572.0234,157.5,568.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="568.0234" y2="568.0234"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="78" y="562.9575">c1() const</text>
+    <path d="M20,533.4001 L80,533.4001 L80,541.0001 L70,551.0001 L20,551.0001 L20,533.4001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="221.0001" style="stroke:#000000;stroke-width:1.5;" width="237" x="20" y="533.4001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="35" y="546.4771">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="135,568.6001,145,572.6001,135,576.6001,139,572.6001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="141" y1="572.6001" y2="572.6001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="71.5" y="567.0771">c1() const</text>
     </a>
-    <path d="M146.5,583.0234 L210.5,583.0234 L210.5,590.0234 L200.5,600.0234 L146.5,600.0234 L146.5,583.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="161.5" y="596.0903">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="222.5" y1="616.2891" y2="616.2891"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="616.2891" y2="629.2891"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="629.2891" y2="629.2891"/>
-      <polygon fill="#A80036" points="191.5,625.2891,181.5,629.2891,191.5,633.2891,187.5,629.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="187.5" y="611.2231">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="193.5" y="611.2231">c2() const</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="257.5" y="611.2231">]</text>
+    <path d="M130,587.6001 L190,587.6001 L190,595.2001 L180,605.2001 L130,605.2001 L130,587.6001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="159.8" style="stroke:#000000;stroke-width:1.5;" width="117" x="130" y="587.6001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="145" y="600.6771">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="157" x2="204" y1="621.8001" y2="621.8001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="204" x2="204" y1="621.8001" y2="634.8001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="163" x2="204" y1="634.8001" y2="634.8001"/>
+      <polygon fill="#181818" points="173,630.8001,163,634.8001,173,638.8001,169,634.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="169" y="616.2771">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="173" y="616.2771">c2() const</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="231" y="616.2771">]</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180.5" x2="222.5" y1="653.2891" y2="653.2891"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222.5" x2="222.5" y1="653.2891" y2="666.2891"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175.5" x2="222.5" y1="666.2891" y2="666.2891"/>
-    <polygon fill="#A80036" points="185.5,662.2891,175.5,666.2891,185.5,670.2891,181.5,666.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="180.5" x2="222.5" y1="690.4219" y2="690.4219"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="690.4219" y2="703.4219"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="703.4219" y2="703.4219"/>
-      <polygon fill="#A80036" points="191.5,699.4219,181.5,703.4219,191.5,707.4219,187.5,703.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="68" x="187.5" y="685.356">log() const</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162" x2="204" y1="658.8001" y2="658.8001"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204" x2="204" y1="658.8001" y2="671.8001"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157" x2="204" y1="671.8001" y2="671.8001"/>
+    <polygon fill="#181818" points="167,667.8001,157,671.8001,167,675.8001,163,671.8001" style="stroke:#181818;stroke-width:1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="162" x2="204" y1="696.4001" y2="696.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="204" x2="204" y1="696.4001" y2="709.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="163" x2="204" y1="709.4001" y2="709.4001"/>
+      <polygon fill="#181818" points="173,705.4001,163,709.4001,173,713.4001,169,709.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="169" y="690.8771">log() const</text>
     </a>
-    <path d="M23,762.4219 L87,762.4219 L87,769.4219 L77,779.4219 L23,779.4219 L23,762.4219 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="775.4888">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="312.5,796.6875,322.5,800.6875,312.5,804.6875,316.5,800.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="318.5" y1="800.6875" y2="800.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="78" y="795.6216">d1(int,int)</text>
+    <path d="M20,768.4001 L80,768.4001 L80,776.0002 L70,786.0002 L20,786.0002 L20,768.4001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="308.5" x="20" y="768.4001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="35" y="781.4772">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="274,803.6002,284,807.6002,274,811.6002,278,807.6002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="280" y1="807.6002" y2="807.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="71.5" y="802.0772">d1(int,int)</text>
     </a>
-    <polygon fill="#A80036" points="82,810.6875,72,814.6875,82,818.6875,78,814.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="328.5" y1="814.6875" y2="814.6875"/>
+    <polygon fill="#181818" points="75.5,817.6002,65.5,821.6002,75.5,825.6002,71.5,821.6002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="290" y1="821.6002" y2="821.6002"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20020_sequence_mermaid.svg b/docs/test_cases/t20020_sequence_mermaid.svg
index df3f9b5a..5d5264f7 100644
--- a/docs/test_cases/t20020_sequence_mermaid.svg
+++ b/docs/test_cases/t20020_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -213,50 +213,50 @@
       <tspan x="500">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="178">a1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="275" y1="136" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="146" x2="80" y1="146" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="186" x="178">a5()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="217" x2="275" y1="217" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="232" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="227" x2="80" y1="227" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="292" x="178">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="323" x2="275" y1="323" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="338" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="333" x2="80" y1="333" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="348" x="278">[c3(int)]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="379" x2="475" y1="379" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="394" x="275">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="389" x2="80" y1="389" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="378">b1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="435" x2="675" y1="435" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="450" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="445" x2="80" y1="445" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="485" x="178">[a3()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="516" x2="275" y1="516" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="531" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="526" x2="80" y1="526" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="378">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="572" x2="675" y1="572" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="587" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="582" x2="80" y1="582" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="644" x="178">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="675" x2="275" y1="675" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="690" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="685" x2="80" y1="685" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="722" x="378">log()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="753" x2="675" y1="753" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="793" x="278">c1() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="824" x2="475" y1="824" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="176">a1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="271" y1="136" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="146" x2="83" y1="146" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="186" x="176">a5()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="217" x2="271" y1="217" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="232" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="227" x2="83" y1="227" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="292" x="176">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="323" x2="271" y1="323" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="338" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="333" x2="83" y1="333" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="348" x="276">[c3(int)]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="379" x2="471" y1="379" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="394" x="277">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="389" x2="83" y1="389" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="376">b1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="435" x2="671" y1="435" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="450" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="445" x2="83" y1="445" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="485" x="176">[a3()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="516" x2="271" y1="516" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="531" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="526" x2="83" y1="526" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="376">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="572" x2="671" y1="572" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="587" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="582" x2="83" y1="582" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="644" x="176">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="675" x2="271" y1="675" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="690" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="685" x2="83" y1="685" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="722" x="376">log()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="753" x2="671" y1="753" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="793" x="276">c1() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="824" x2="471" y1="824" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="864" x="480">[c2() const]</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,895 C 540,885 540,925 480,915"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="940" x="485">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 485,935 C 545,925 545,965 485,955"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="980" x="480">log() const</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,1011 C 540,1001 540,1041 480,1031"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1131" x="478">d1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1162" x2="875" y1="1162" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1177" x="475">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1172" x2="80" y1="1172" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1131" x="476">d1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1162" x2="871" y1="1162" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1177" x="477">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1172" x2="83" y1="1172" x1="870"/>
 </svg>
diff --git a/docs/test_cases/t20021.md b/docs/test_cases/t20021.md
index 842372a8..dd372543 100644
--- a/docs/test_cases/t20021.md
+++ b/docs/test_cases/t20021.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20021::tmain()"
 ```
 ## Source code
-File t20021.cc
+File `tests/t20021/t20021.cc`
 ```cpp
 #include <vector>
 
diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg
index d1882660..42f16e13 100644
--- a/docs/test_cases/t20021_sequence.svg
+++ b/docs/test_cases/t20021_sequence.svg
@@ -1,178 +1,172 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:315px;height:754px;" version="1.1" viewBox="0 0 315 754" width="315px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="756px" preserveAspectRatio="none" style="width:285px;height:756px;background:#FFFFFF;" version="1.1" viewBox="0 0 285 756" width="285px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fyu4z9jh62u4d" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="76" x2="76" y1="38.2969" y2="714.4219"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="183" x2="183" y1="38.2969" y2="714.4219"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="242.5" x2="242.5" y1="38.2969" y2="714.4219"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="280.5" x2="280.5" y1="38.2969" y2="714.4219"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyu4z9jh62u4d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fyu4z9jh62u4d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="733.417">tmain()</text>
+    <rect fill="#FFFFFF" height="655.6002" style="stroke:#181818;stroke-width:1.0;" width="10" x="64.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="83.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="93"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="164.5" y="130.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="342.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="386.2001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="480.4001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="637.8001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="206.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="299"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="429.8001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="252.5" y="562.6001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="252.5" y="688.4001"/>
+    <rect fill="none" height="455.6002" style="stroke:#000000;stroke-width:1.5;" width="256" x="10" y="53.7999"/>
+    <rect fill="none" height="267.2001" style="stroke:#000000;stroke-width:1.5;" width="236" x="20" y="235.2"/>
+    <rect fill="none" height="192.0001" style="stroke:#000000;stroke-width:1.5;" width="216" x="30" y="259.8"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="249" x="30" y="523.4001"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="156.5" x="30" y="598.6001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="69" x2="69" y1="36.7999" y2="720.4001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="164.5" x2="164.5" y1="36.7999" y2="720.4001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="224" x2="224" y1="36.7999" y2="720.4001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="257" x2="257" y1="36.7999" y2="720.4001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="40" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="47" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="40" y="719.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="47" y="739.4061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyu4z9jh62u4d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fyu4z9jh62u4d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="733.417">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="152.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="159.5" y="25.0059">C</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="152.5" y="719.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="159.5" y="739.4061">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyu4z9jh62u4d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fyu4z9jh62u4d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="733.417">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="213" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="220" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="213" y="719.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="220" y="739.4061">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyu4z9jh62u4d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fyu4z9jh62u4d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="733.417">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="246" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="253" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="246" y="719.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="253" y="739.4061">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fyu4z9jh62u4d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
-    <path d="M13,55.2969 L90,55.2969 L90,62.2969 L80,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="68.3638">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="166,89.5625,176,93.5625,166,97.5625,170,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="93.5625" y2="93.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="88.4966">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="88.4966">c4()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="88.4966">]</text>
+    <rect fill="#FFFFFF" height="655.6002" style="stroke:#181818;stroke-width:1.0;" width="10" x="64.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="83.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="93"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="164.5" y="130.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="342.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="386.2001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="480.4001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="637.8001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="206.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="299"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="429.8001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="252.5" y="562.6001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="252.5" y="688.4001"/>
+    <path d="M10,53.7999 L83,53.7999 L83,61.3999 L73,71.3999 L10,71.3999 L10,53.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="455.6002" style="stroke:#000000;stroke-width:1.5;" width="256" x="10" y="53.7999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="66.8769">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="147.5,89,157.5,93,147.5,97,151.5,93" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="93" y2="93"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="87.477">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="87.477">c4()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="87.477">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="235" y1="117.6953" y2="117.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="235" x2="235" y1="117.6953" y2="130.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="235" y1="130.6953" y2="130.6953"/>
-      <polygon fill="#A80036" points="204,126.6953,194,130.6953,204,134.6953,200,130.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="200" y="112.6294">c5()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="169.5" x2="216.5" y1="117.6" y2="117.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="216.5" x2="216.5" y1="117.6" y2="130.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="175.5" x2="216.5" y1="130.6" y2="130.6"/>
+      <polygon fill="#181818" points="185.5,126.6,175.5,130.6,185.5,134.6,181.5,130.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="181.5" y="112.077">c5()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193" x2="235" y1="154.6953" y2="154.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="235" x2="235" y1="154.6953" y2="167.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="188" x2="235" y1="167.6953" y2="167.6953"/>
-    <polygon fill="#A80036" points="198,163.6953,188,167.6953,198,171.6953,194,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="92,172.6953,82,176.6953,92,180.6953,88,176.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="176.6953" y2="176.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="226,201.8281,236,205.8281,226,209.8281,230,205.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="205.8281" y2="205.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="200.7622">a3()</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="174.5" x2="216.5" y1="154.6" y2="154.6"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="216.5" x2="216.5" y1="154.6" y2="167.6"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="169.5" x2="216.5" y1="167.6" y2="167.6"/>
+    <polygon fill="#181818" points="179.5,163.6,169.5,167.6,179.5,171.6,175.5,167.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <polygon fill="#181818" points="85.5,172.6,75.5,176.6,85.5,180.6,81.5,176.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="176.6" y2="176.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="207.5,202.2,217.5,206.2,207.5,210.2,211.5,206.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="213.5" y1="206.2" y2="206.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="81.5" y="200.677">a3()</text>
     </a>
-    <polygon fill="#A80036" points="92,215.8281,82,219.8281,92,223.8281,88,219.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="219.8281" y2="219.8281"/>
-    <path d="M23,234.8281 L100,234.8281 L100,241.8281 L90,251.8281 L23,251.8281 L23,234.8281 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="38" y="247.895">loop</text>
-    <path d="M33,258.9609 L110,258.9609 L110,265.9609 L100,275.9609 L33,275.9609 L33,258.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="272.0278">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="226,293.2266,236,297.2266,226,301.2266,230,297.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="297.2266" y2="297.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="292.1606">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="94" y="292.1606">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="120" y="292.1606">]</text>
+    <polygon fill="#181818" points="85.5,216.2,75.5,220.2,85.5,224.2,81.5,220.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="223.5" y1="220.2" y2="220.2"/>
+    <path d="M20,235.2 L93,235.2 L93,242.8 L83,252.8 L20,252.8 L20,235.2 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="267.2001" style="stroke:#000000;stroke-width:1.5;" width="236" x="20" y="235.2"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="35" y="248.277">loop</text>
+    <path d="M30,259.8 L103,259.8 L103,267.4 L93,277.4 L30,277.4 L30,259.8 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="192.0001" style="stroke:#000000;stroke-width:1.5;" width="216" x="30" y="259.8"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="45" y="272.877">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="207.5,295,217.5,299,207.5,303,211.5,299" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="213.5" y1="299" y2="299"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="293.477">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="293.477">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="293.477">]</text>
     </a>
-    <polygon fill="#A80036" points="92,307.2266,82,311.2266,92,315.2266,88,311.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="311.2266" y2="311.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="166,336.3594,176,340.3594,166,344.3594,170,340.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="340.3594" y2="340.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="335.2935">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="335.2935">c1()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="335.2935">]</text>
+    <polygon fill="#181818" points="85.5,309,75.5,313,85.5,317,81.5,313" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="223.5" y1="313" y2="313"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="147.5,338.6,157.5,342.6,147.5,346.6,151.5,342.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="342.6" y2="342.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="337.077">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="337.077">c1()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="337.077">]</text>
     </a>
-    <polygon fill="#A80036" points="92,350.3594,82,354.3594,92,358.3594,88,354.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="354.3594" y2="354.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="166,379.4922,176,383.4922,166,387.4922,170,383.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="383.4922" y2="383.4922"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="378.4263">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="378.4263">c2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="378.4263">]</text>
+    <polygon fill="#181818" points="85.5,352.6,75.5,356.6,85.5,360.6,81.5,356.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="356.6" y2="356.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="147.5,382.2001,157.5,386.2001,147.5,390.2001,151.5,386.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="386.2001" y2="386.2001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="380.677">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="380.677">c2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="380.677">]</text>
     </a>
-    <polygon fill="#A80036" points="92,393.4922,82,397.4922,92,401.4922,88,397.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="397.4922" y2="397.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="226,422.625,236,426.625,226,430.625,230,426.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="426.625" y2="426.625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="421.5591">a1()</text>
+    <polygon fill="#181818" points="85.5,396.2001,75.5,400.2001,85.5,404.2001,81.5,400.2001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="400.2001" y2="400.2001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="207.5,425.8001,217.5,429.8001,207.5,433.8001,211.5,429.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="213.5" y1="429.8001" y2="429.8001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="81.5" y="424.2771">a1()</text>
     </a>
-    <polygon fill="#A80036" points="92,436.625,82,440.625,92,444.625,88,440.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="440.625" y2="440.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="166,472.7578,176,476.7578,166,480.7578,170,476.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="476.7578" y2="476.7578"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="471.6919">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="471.6919">c3()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="471.6919">]</text>
+    <polygon fill="#181818" points="85.5,439.8001,75.5,443.8001,85.5,447.8001,81.5,443.8001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="223.5" y1="443.8001" y2="443.8001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="147.5,476.4001,157.5,480.4001,147.5,484.4001,151.5,480.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="480.4001" y2="480.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="474.8771">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="474.8771">c3()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="474.8771">]</text>
     </a>
-    <polygon fill="#A80036" points="92,486.7578,82,490.7578,92,494.7578,88,490.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="490.7578" y2="490.7578"/>
-    <path d="M33,519.7578 L110,519.7578 L110,526.7578 L100,536.7578 L33,536.7578 L33,519.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="532.8247">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="263.5,554.0234,273.5,558.0234,263.5,562.0234,267.5,558.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="558.0234" y2="558.0234"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="88" y="552.9575">b2() const</text>
+    <polygon fill="#181818" points="85.5,490.4001,75.5,494.4001,85.5,498.4001,81.5,494.4001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="494.4001" y2="494.4001"/>
+    <path d="M30,523.4001 L103,523.4001 L103,531.0001 L93,541.0001 L30,541.0001 L30,523.4001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="249" x="30" y="523.4001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="45" y="536.4771">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="240.5,558.6001,250.5,562.6001,240.5,566.6001,244.5,562.6001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="246.5" y1="562.6001" y2="562.6001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="81.5" y="557.0771">b2() const</text>
     </a>
-    <polygon fill="#A80036" points="92,568.0234,82,572.0234,92,576.0234,88,572.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="279.5" y1="572.0234" y2="572.0234"/>
-    <path d="M33,594.0234 L110,594.0234 L110,601.0234 L100,611.0234 L33,611.0234 L33,594.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="607.0903">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="166,628.2891,176,632.2891,166,636.2891,170,632.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="632.2891" y2="632.2891"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="627.2231">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="66" x="94" y="627.2231">contents()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="160" y="627.2231">]</text>
+    <polygon fill="#181818" points="85.5,572.6001,75.5,576.6001,85.5,580.6001,81.5,576.6001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="256.5" y1="576.6001" y2="576.6001"/>
+    <path d="M30,598.6001 L103,598.6001 L103,606.2001 L93,616.2001 L30,616.2001 L30,598.6001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="156.5" x="30" y="598.6001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="45" y="611.6771">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="147.5,633.8001,157.5,637.8001,147.5,641.8001,151.5,637.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="637.8001" y2="637.8001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="632.2771">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="85.5" y="632.2771">contents()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="143.5" y="632.2771">]</text>
     </a>
-    <polygon fill="#A80036" points="92,642.2891,82,646.2891,92,650.2891,88,646.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="646.2891" y2="646.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="263.5,678.4219,273.5,682.4219,263.5,686.4219,267.5,682.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="682.4219" y2="682.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="88" y="677.356">b2() const</text>
+    <polygon fill="#181818" points="85.5,647.8001,75.5,651.8001,85.5,655.8001,81.5,651.8001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="651.8001" y2="651.8001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="240.5,684.4001,250.5,688.4001,240.5,692.4001,244.5,688.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="246.5" y1="688.4001" y2="688.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="81.5" y="682.8771">b2() const</text>
     </a>
-    <polygon fill="#A80036" points="87,692.4219,77,696.4219,87,700.4219,83,696.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="81" x2="279.5" y1="696.4219" y2="696.4219"/>
+    <polygon fill="#181818" points="80.5,698.4001,70.5,702.4001,80.5,706.4001,76.5,702.4001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74.5" x2="256.5" y1="702.4001" y2="702.4001"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20021_sequence_mermaid.svg b/docs/test_cases/t20021_sequence_mermaid.svg
index 5b801fd5..304da27e 100644
--- a/docs/test_cases/t20021_sequence_mermaid.svg
+++ b/docs/test_cases/t20021_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -188,48 +188,48 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="958" x="670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="178">[c4()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="275" y1="136" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="176">[c4()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="271" y1="136" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="280">c5()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,182 C 340,172 340,212 280,202"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="227" x="285">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 285,222 C 345,212 345,252 285,242"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="267" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="262" x2="80" y1="262" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="277" x="278">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="308" x2="475" y1="308" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="323" x="275">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="318" x2="80" y1="318" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="383" x="278">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="414" x2="475" y1="414" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="429" x="275">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="424" x2="80" y1="424" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="439" x="178">[c1()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="470" x2="275" y1="470" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="485" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="480" x2="80" y1="480" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="495" x="178">[c2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="526" x2="275" y1="526" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="536" x2="80" y1="536" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="551" x="278">a1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="582" x2="475" y1="582" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="597" x="275">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="592" x2="80" y1="592" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="629" x="178">[c3()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="660" x2="275" y1="660" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="675" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="670" x2="80" y1="670" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="742" x="378">b2() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="773" x2="675" y1="773" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="788" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="783" x2="80" y1="783" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="845" x="178">[contents()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="876" x2="275" y1="876" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="891" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="886" x2="80" y1="886" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="923" x="378">b2() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="954" x2="675" y1="954" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="969" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="964" x2="80" y1="964" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="267" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="262" x2="83" y1="262" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="277" x="276">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="308" x2="471" y1="308" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="323" x="277">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="318" x2="83" y1="318" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="383" x="276">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="414" x2="471" y1="414" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="429" x="277">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="424" x2="83" y1="424" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="439" x="176">[c1()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="470" x2="271" y1="470" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="485" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="480" x2="83" y1="480" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="495" x="176">[c2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="526" x2="271" y1="526" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="536" x2="83" y1="536" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="551" x="276">a1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="582" x2="471" y1="582" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="597" x="277">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="592" x2="83" y1="592" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="629" x="176">[c3()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="660" x2="271" y1="660" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="675" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="670" x2="83" y1="670" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="742" x="376">b2() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="773" x2="671" y1="773" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="788" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="783" x2="83" y1="783" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="845" x="176">[contents()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="876" x2="271" y1="876" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="891" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="886" x2="83" y1="886" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="923" x="376">b2() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="954" x2="671" y1="954" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="969" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="964" x2="83" y1="964" x1="670"/>
 </svg>
diff --git a/docs/test_cases/t20022.md b/docs/test_cases/t20022.md
index bbd03ba5..4227c200 100644
--- a/docs/test_cases/t20022.md
+++ b/docs/test_cases/t20022.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20022::tmain()"
 ```
 ## Source code
-File t20022.cc
+File `tests/t20022/t20022.cc`
 ```cpp
 #include <memory>
 
diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg
index 4395b792..45010b5c 100644
--- a/docs/test_cases/t20022_sequence.svg
+++ b/docs/test_cases/t20022_sequence.svg
@@ -1,58 +1,52 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="245px" preserveAspectRatio="none" style="width:254px;height:245px;" version="1.1" viewBox="0 0 254 245" width="254px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:228px;height:241px;background:#FFFFFF;" version="1.1" viewBox="0 0 228 241" width="228px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ofqpbnwz6k2d" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ofqpbnwz6k2d)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ofqpbnwz6k2d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ofqpbnwz6k2d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ofqpbnwz6k2d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="205.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="185.5" x2="185.5" y1="38.2969" y2="205.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="233" x2="233" y1="38.2969" y2="205.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ofqpbnwz6k2d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ofqpbnwz6k2d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="204.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="224.6904">tmain()</text>
+    <rect fill="#FFFFFF" height="140.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="161.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="161.5" y="128"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="157.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="205.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="166" x2="166" y1="36.7999" y2="205.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="210" x2="210" y1="36.7999" y2="205.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="204.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="224.6059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ofqpbnwz6k2d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1ofqpbnwz6k2d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="204.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="224.6904">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="155" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="162" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="155" y="204.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="162" y="224.6059">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ofqpbnwz6k2d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1ofqpbnwz6k2d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="204.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="224.6904">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="199" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="206" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="199" y="204.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="206" y="224.6059">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ofqpbnwz6k2d)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ofqpbnwz6k2d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ofqpbnwz6k2d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ofqpbnwz6k2d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="169,65.4297,179,69.4297,169,73.4297,173,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="53" y="64.3638">A(std::unique_ptr</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="163" y="64.3638">)</text>
+    <rect fill="#FFFFFF" height="140.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="161.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="161.5" y="128"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="157.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="149.5,64.3999,159.5,68.3999,149.5,72.3999,153.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="155.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="99" x="46.5" y="62.8769">A(std::unique_ptr</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="145.5" y="62.8769">)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="169,124.5625,179,128.5625,169,132.5625,173,128.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="128.5625" y2="128.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="123.4966">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="149.5,124,159.5,128,149.5,132,153.5,128" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="155.5" y1="128" y2="128"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="122.477">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="216,153.6953,226,157.6953,216,161.6953,220,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="191" x2="222" y1="157.6953" y2="157.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="198" y="152.6294">b()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="193.5,153.6,203.5,157.6,193.5,161.6,197.5,157.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="171.5" x2="199.5" y1="157.6" y2="157.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="178.5" y="152.077">b()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20022_sequence_mermaid.svg b/docs/test_cases/t20022_sequence_mermaid.svg
index d9408adc..d5311f88 100644
--- a/docs/test_cases/t20022_sequence_mermaid.svg
+++ b/docs/test_cases/t20022_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -94,10 +94,10 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="197" x="488"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="187">A(std::unique_ptr&lt;B&gt;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="293" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="187">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="293" y1="157" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="396">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="493" y1="203" x1="298"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="185">A(std::unique_ptr&lt;B&gt;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="289" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="185">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="289" y1="157" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="394">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="489" y1="203" x1="298"/>
 </svg>
diff --git a/docs/test_cases/t20023.md b/docs/test_cases/t20023.md
index 923520d1..46a8368f 100644
--- a/docs/test_cases/t20023.md
+++ b/docs/test_cases/t20023.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20023::tmain()"
 ```
 ## Source code
-File t20023.cc
+File `tests/t20023/t20023.cc`
 ```cpp
 #include <stdexcept>
 
diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg
index 7b97fa28..4b194beb 100644
--- a/docs/test_cases/t20023_sequence.svg
+++ b/docs/test_cases/t20023_sequence.svg
@@ -1,103 +1,94 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:229px;height:493px;" version="1.1" viewBox="0 0 229 493" width="229px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="491px" preserveAspectRatio="none" style="width:192px;height:491px;background:#FFFFFF;" version="1.1" viewBox="0 0 192 491" width="192px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f15sfh1gpx8jx" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
-    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="170.6953"/>
-    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="254.6328"/>
-    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="338.5703"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="453.5078"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="453.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15sfh1gpx8jx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f15sfh1gpx8jx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="472.5029">tmain()</text>
+    <rect fill="#FFFFFF" height="391.1998" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="369.5998" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="130.6"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="215.3999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="300.1998"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="384.9997"/>
+    <rect fill="none" height="341.5998" style="stroke:#000000;stroke-width:1.5;" width="121" x="64" y="83.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="455.9997"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="85" x2="85" y1="36.7999" y2="455.9997"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="454.9997"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="475.0057">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15sfh1gpx8jx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f15sfh1gpx8jx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="472.5029">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="454.9997"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="475.0057">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f15sfh1gpx8jx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
+    <rect fill="#FFFFFF" height="391.1998" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="369.5998" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="130.6"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="215.3999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="300.1998"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="384.9997"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="68.5,64.3999,78.5,68.3999,68.5,72.3999,72.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="74.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="62.8769">a()</text>
     </a>
-    <path d="M74,84.4297 L139,84.4297 L139,91.4297 L129,101.4297 L74,101.4297 L74,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="97.4966">try</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="117.6953" y2="117.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="117.6953" y2="130.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="130.6953" y2="130.6953"/>
-      <polygon fill="#A80036" points="118.5,126.6953,108.5,130.6953,118.5,134.6953,114.5,130.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="112.6294">a1()</text>
+    <path d="M64,83.3999 L125,83.3999 L125,91 L115,101 L64,101 L64,83.3999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="341.5998" style="stroke:#000000;stroke-width:1.5;" width="121" x="64" y="83.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="16" x="79" y="96.477">try</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="90.5" x2="137.5" y1="117.6" y2="117.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="137.5" y1="117.6" y2="130.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="96.5" x2="137.5" y1="130.6" y2="130.6"/>
+      <polygon fill="#181818" points="106.5,126.6,96.5,130.6,106.5,134.6,102.5,130.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="102.5" y="112.077">a1()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="107.5" x2="149.5" y1="154.6953" y2="154.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="149.5" x2="149.5" y1="154.6953" y2="167.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="149.5" y1="167.6953" y2="167.6953"/>
-    <polygon fill="#A80036" points="112.5,163.6953,102.5,167.6953,112.5,171.6953,108.5,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="171.6953" y2="171.6953"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="79" y="181.9058">[std::runtime_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="201.6328" y2="201.6328"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="201.6328" y2="214.6328"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="214.6328" y2="214.6328"/>
-      <polygon fill="#A80036" points="118.5,210.6328,108.5,214.6328,118.5,218.6328,114.5,214.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="196.5669">a2()</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="95.5" x2="137.5" y1="154.6" y2="154.6"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="137.5" x2="137.5" y1="154.6" y2="167.6"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="90.5" x2="137.5" y1="167.6" y2="167.6"/>
+    <polygon fill="#181818" points="100.5,163.6,90.5,167.6,100.5,171.6,96.5,167.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="64" x2="185" y1="171.6" y2="171.6"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="116" x="69" y="181.8189">[std::runtime_error &amp;]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="90.5" x2="137.5" y1="202.3999" y2="202.3999"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="137.5" y1="202.3999" y2="215.3999"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="96.5" x2="137.5" y1="215.3999" y2="215.3999"/>
+      <polygon fill="#181818" points="106.5,211.3999,96.5,215.3999,106.5,219.3999,102.5,215.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="102.5" y="196.8769">a2()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="107.5" x2="149.5" y1="238.6328" y2="238.6328"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="149.5" x2="149.5" y1="238.6328" y2="251.6328"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="149.5" y1="251.6328" y2="251.6328"/>
-    <polygon fill="#A80036" points="112.5,247.6328,102.5,251.6328,112.5,255.6328,108.5,251.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="255.6328" y2="255.6328"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="120" x="79" y="265.8433">[std::logic_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="285.5703" y2="285.5703"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="285.5703" y2="298.5703"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="298.5703" y2="298.5703"/>
-      <polygon fill="#A80036" points="118.5,294.5703,108.5,298.5703,118.5,302.5703,114.5,298.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="280.5044">a3()</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="95.5" x2="137.5" y1="239.3999" y2="239.3999"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="137.5" x2="137.5" y1="239.3999" y2="252.3999"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="90.5" x2="137.5" y1="252.3999" y2="252.3999"/>
+    <polygon fill="#181818" points="100.5,248.3999,90.5,252.3999,100.5,256.3999,96.5,252.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="64" x2="185" y1="256.3999" y2="256.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="101" x="69" y="266.6188">[std::logic_error &amp;]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="90.5" x2="137.5" y1="287.1998" y2="287.1998"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="137.5" y1="287.1998" y2="300.1998"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="96.5" x2="137.5" y1="300.1998" y2="300.1998"/>
+      <polygon fill="#181818" points="106.5,296.1998,96.5,300.1998,106.5,304.1998,102.5,300.1998" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="102.5" y="281.6768">a3()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="107.5" x2="149.5" y1="322.5703" y2="322.5703"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="149.5" x2="149.5" y1="322.5703" y2="335.5703"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="149.5" y1="335.5703" y2="335.5703"/>
-    <polygon fill="#A80036" points="112.5,331.5703,102.5,335.5703,112.5,339.5703,108.5,335.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="339.5703" y2="339.5703"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="79" y="349.7808">[...]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="369.5078" y2="369.5078"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="369.5078" y2="382.5078"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="382.5078" y2="382.5078"/>
-      <polygon fill="#A80036" points="118.5,378.5078,108.5,382.5078,118.5,386.5078,114.5,382.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="364.4419">a4()</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="95.5" x2="137.5" y1="324.1998" y2="324.1998"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="137.5" x2="137.5" y1="324.1998" y2="337.1998"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="90.5" x2="137.5" y1="337.1998" y2="337.1998"/>
+    <polygon fill="#181818" points="100.5,333.1998,90.5,337.1998,100.5,341.1998,96.5,337.1998" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="64" x2="185" y1="341.1998" y2="341.1998"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="17" x="69" y="351.4187">[...]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="90.5" x2="137.5" y1="371.9997" y2="371.9997"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="137.5" y1="371.9997" y2="384.9997"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="96.5" x2="137.5" y1="384.9997" y2="384.9997"/>
+      <polygon fill="#181818" points="106.5,380.9997,96.5,384.9997,106.5,388.9997,102.5,384.9997" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="102.5" y="366.4767">a4()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="107.5" x2="149.5" y1="406.5078" y2="406.5078"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="149.5" x2="149.5" y1="406.5078" y2="419.5078"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="149.5" y1="419.5078" y2="419.5078"/>
-    <polygon fill="#A80036" points="112.5,415.5078,102.5,419.5078,112.5,423.5078,108.5,419.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="52,431.5078,42,435.5078,52,439.5078,48,435.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="96.5" y1="435.5078" y2="435.5078"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="95.5" x2="137.5" y1="408.9997" y2="408.9997"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="137.5" x2="137.5" y1="408.9997" y2="421.9997"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="90.5" x2="137.5" y1="421.9997" y2="421.9997"/>
+    <polygon fill="#181818" points="100.5,417.9997,90.5,421.9997,100.5,425.9997,96.5,421.9997" style="stroke:#181818;stroke-width:1.0;"/>
+    <polygon fill="#181818" points="45.5,433.9997,35.5,437.9997,45.5,441.9997,41.5,437.9997" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="84.5" y1="437.9997" y2="437.9997"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20023_sequence_mermaid.svg b/docs/test_cases/t20023_sequence_mermaid.svg
index 724fa9de..fd33db0c 100644
--- a/docs/test_cases/t20023_sequence_mermaid.svg
+++ b/docs/test_cases/t20023_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -104,8 +104,8 @@
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="479" x="282.5">rror &amp;]</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="637" x="282.5">[...]</text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="280">a1()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,182 C 340,172 340,212 280,202"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="227" x="285">​</text>
@@ -122,6 +122,6 @@
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,695 C 340,685 340,725 280,715"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="740" x="285">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 285,735 C 345,725 345,765 285,755"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="820" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="815" x2="80" y1="815" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="820" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="815" x2="83" y1="815" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20024.md b/docs/test_cases/t20024.md
index 2df7d3c2..421c3b2b 100644
--- a/docs/test_cases/t20024.md
+++ b/docs/test_cases/t20024.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20024::tmain()"
 ```
 ## Source code
-File t20024.cc
+File `tests/t20024/t20024.cc`
 ```cpp
 namespace clanguml {
 namespace t20024 {
diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg
index 0db18bd4..09ffcf86 100644
--- a/docs/test_cases/t20024_sequence.svg
+++ b/docs/test_cases/t20024_sequence.svg
@@ -1,172 +1,158 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="916px" preserveAspectRatio="none" style="width:364px;height:916px;" version="1.1" viewBox="0 0 364 916" width="364px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="919px" preserveAspectRatio="none" style="width:322px;height:919px;background:#FFFFFF;" version="1.1" viewBox="0 0 322 919" width="322px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7urce32d73qv" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
-    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="101.5625"/>
-    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="185.5"/>
-    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="269.4375"/>
-    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="353.375"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
-    <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="511.5781"/>
-    <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="598.5156"/>
-    <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="685.4531"/>
-    <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="772.3906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="876.3281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="169.5" x2="169.5" y1="38.2969" y2="876.3281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="230" x2="230" y1="38.2969" y2="876.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7urce32d73qv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f7urce32d73qv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="895.3232">tmain()</text>
+    <rect fill="#FFFFFF" height="826.7994" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="384.7997" style="stroke:#181818;stroke-width:1.0;" width="10" x="147.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="145.7999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="230.5998"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="315.3997"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="400.1996"/>
+    <rect fill="#FFFFFF" height="390.7997" style="stroke:#181818;stroke-width:1.0;" width="10" x="207.5" y="482.7996"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="560.1996"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="647.9995"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="735.7994"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="823.5993"/>
+    <rect fill="none" height="356.7997" style="stroke:#000000;stroke-width:1.5;" width="90" x="131" y="83.3999"/>
+    <rect fill="none" height="368.7997" style="stroke:#000000;stroke-width:1.5;" width="124" x="191" y="497.7996"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="883.5993"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="152" x2="152" y1="36.7999" y2="883.5993"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="212" x2="212" y1="36.7999" y2="883.5993"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="882.5993"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="902.6052">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7urce32d73qv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f7urce32d73qv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="895.3232">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="141" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="148" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="141" y="882.5993"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="148" y="902.6052">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7urce32d73qv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f7urce32d73qv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="895.3232">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="201" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="208" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="201" y="882.5993"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="208" y="902.6052">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f7urce32d73qv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="153,65.4297,163,69.4297,153,73.4297,157,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="159" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="53" y="64.3638">select(enum_a)</text>
+    <rect fill="#FFFFFF" height="826.7994" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="384.7997" style="stroke:#181818;stroke-width:1.0;" width="10" x="147.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="145.7999"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="230.5998"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="315.3997"/>
+    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="400.1996"/>
+    <rect fill="#FFFFFF" height="390.7997" style="stroke:#181818;stroke-width:1.0;" width="10" x="207.5" y="482.7996"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="560.1996"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="647.9995"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="735.7994"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="823.5993"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="135.5,64.3999,145.5,68.3999,135.5,72.3999,139.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="141.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="89" x="46.5" y="62.8769">select(enum_a)</text>
     </a>
-    <path d="M146.5,84.4297 L238.5,84.4297 L238.5,91.4297 L228.5,101.4297 L146.5,101.4297 L146.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="161.5" y="97.4966">switch</text>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="102.5625" y2="102.5625"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="38" x="151.5" y="112.7729">[zero]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="132.5" y2="132.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="132.5" y2="145.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="145.5" y2="145.5"/>
-      <polygon fill="#A80036" points="191,141.5,181,145.5,191,149.5,187,145.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="187" y="127.4341">a0()</text>
+    <path d="M131,83.3999 L216,83.3999 L216,91 L206,101 L131,101 L131,83.3999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="356.7997" style="stroke:#000000;stroke-width:1.5;" width="90" x="131" y="83.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="40" x="146" y="96.477">switch</text>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="131" x2="221" y1="102" y2="102"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="31" x="136" y="112.2189">[zero]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="157.5" x2="204.5" y1="132.7999" y2="132.7999"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="204.5" x2="204.5" y1="132.7999" y2="145.7999"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="163.5" x2="204.5" y1="145.7999" y2="145.7999"/>
+      <polygon fill="#181818" points="173.5,141.7999,163.5,145.7999,173.5,149.7999,169.5,145.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="169.5" y="127.2769">a0()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180" x2="222" y1="169.5" y2="169.5"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222" x2="222" y1="169.5" y2="182.5"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175" x2="222" y1="182.5" y2="182.5"/>
-    <polygon fill="#A80036" points="185,178.5,175,182.5,185,186.5,181,182.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="186.5" y2="186.5"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="196.7104">[one]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="216.4375" y2="216.4375"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="216.4375" y2="229.4375"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="229.4375" y2="229.4375"/>
-      <polygon fill="#A80036" points="191,225.4375,181,229.4375,191,233.4375,187,229.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="187" y="211.3716">a1()</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162.5" x2="204.5" y1="169.7999" y2="169.7999"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204.5" x2="204.5" y1="169.7999" y2="182.7999"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157.5" x2="204.5" y1="182.7999" y2="182.7999"/>
+    <polygon fill="#181818" points="167.5,178.7999,157.5,182.7999,167.5,186.7999,163.5,182.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="131" x2="221" y1="186.7999" y2="186.7999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="28" x="136" y="197.0188">[one]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="157.5" x2="204.5" y1="217.5998" y2="217.5998"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="204.5" x2="204.5" y1="217.5998" y2="230.5998"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="163.5" x2="204.5" y1="230.5998" y2="230.5998"/>
+      <polygon fill="#181818" points="173.5,226.5998,163.5,230.5998,173.5,234.5998,169.5,230.5998" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="169.5" y="212.0768">a1()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180" x2="222" y1="253.4375" y2="253.4375"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222" x2="222" y1="253.4375" y2="266.4375"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175" x2="222" y1="266.4375" y2="266.4375"/>
-    <polygon fill="#A80036" points="185,262.4375,175,266.4375,185,270.4375,181,266.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="270.4375" y2="270.4375"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="280.6479">[two]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="300.375" y2="300.375"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="300.375" y2="313.375"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="313.375" y2="313.375"/>
-      <polygon fill="#A80036" points="191,309.375,181,313.375,191,317.375,187,313.375" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="187" y="295.3091">a2()</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162.5" x2="204.5" y1="254.5998" y2="254.5998"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204.5" x2="204.5" y1="254.5998" y2="267.5998"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157.5" x2="204.5" y1="267.5998" y2="267.5998"/>
+    <polygon fill="#181818" points="167.5,263.5998,157.5,267.5998,167.5,271.5998,163.5,267.5998" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="131" x2="221" y1="271.5998" y2="271.5998"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="28" x="136" y="281.8187">[two]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="157.5" x2="204.5" y1="302.3997" y2="302.3997"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="204.5" x2="204.5" y1="302.3997" y2="315.3997"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="163.5" x2="204.5" y1="315.3997" y2="315.3997"/>
+      <polygon fill="#181818" points="173.5,311.3997,163.5,315.3997,173.5,319.3997,169.5,315.3997" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="169.5" y="296.8767">a2()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180" x2="222" y1="337.375" y2="337.375"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222" x2="222" y1="337.375" y2="350.375"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175" x2="222" y1="350.375" y2="350.375"/>
-    <polygon fill="#A80036" points="185,346.375,175,350.375,185,354.375,181,350.375" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="354.375" y2="354.375"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="151.5" y="364.5854">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="384.3125" y2="384.3125"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="384.3125" y2="397.3125"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="397.3125" y2="397.3125"/>
-      <polygon fill="#A80036" points="191,393.3125,181,397.3125,191,401.3125,187,397.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="187" y="379.2466">a3()</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162.5" x2="204.5" y1="339.3997" y2="339.3997"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204.5" x2="204.5" y1="339.3997" y2="352.3997"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157.5" x2="204.5" y1="352.3997" y2="352.3997"/>
+    <polygon fill="#181818" points="167.5,348.3997,157.5,352.3997,167.5,356.3997,163.5,352.3997" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="131" x2="221" y1="356.3997" y2="356.3997"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="45" x="136" y="366.6186">[default]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="157.5" x2="204.5" y1="387.1996" y2="387.1996"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="204.5" x2="204.5" y1="387.1996" y2="400.1996"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="163.5" x2="204.5" y1="400.1996" y2="400.1996"/>
+      <polygon fill="#181818" points="173.5,396.1996,163.5,400.1996,173.5,404.1996,169.5,400.1996" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="169.5" y="381.6766">a3()</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180" x2="222" y1="421.3125" y2="421.3125"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222" x2="222" y1="421.3125" y2="434.3125"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175" x2="222" y1="434.3125" y2="434.3125"/>
-    <polygon fill="#A80036" points="185,430.3125,175,434.3125,185,438.3125,181,434.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="57,446.3125,47,450.3125,57,454.3125,53,450.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="169" y1="450.3125" y2="450.3125"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="213,475.4453,223,479.4453,213,483.4453,217,479.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="219" y1="479.4453" y2="479.4453"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="86" x="53" y="474.3794">select(colors)</text>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162.5" x2="204.5" y1="424.1996" y2="424.1996"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204.5" x2="204.5" y1="424.1996" y2="437.1996"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157.5" x2="204.5" y1="437.1996" y2="437.1996"/>
+    <polygon fill="#181818" points="167.5,433.1996,157.5,437.1996,167.5,441.1996,163.5,437.1996" style="stroke:#181818;stroke-width:1.0;"/>
+    <polygon fill="#181818" points="50.5,449.1996,40.5,453.1996,50.5,457.1996,46.5,453.1996" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="151.5" y1="453.1996" y2="453.1996"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="195.5,478.7996,205.5,482.7996,195.5,486.7996,199.5,482.7996" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="201.5" y1="482.7996" y2="482.7996"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="78" x="46.5" y="477.2766">select(colors)</text>
     </a>
-    <path d="M206,494.4453 L298,494.4453 L298,501.4453 L288,511.4453 L206,511.4453 L206,494.4453 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="221" y="507.5122">switch</text>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="512.5781" y2="512.5781"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="117" x="211" y="522.7886">[enum colors::red]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="547.5156" y2="547.5156"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="547.5156" y2="560.5156"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="560.5156" y2="560.5156"/>
-      <polygon fill="#A80036" points="251,556.5156,241,560.5156,251,564.5156,247,560.5156" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="247" y="542.4497">red()</text>
+    <path d="M191,497.7996 L276,497.7996 L276,505.3996 L266,515.3996 L191,515.3996 L191,497.7996 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="368.7997" style="stroke:#000000;stroke-width:1.5;" width="124" x="191" y="497.7996"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="40" x="206" y="510.8766">switch</text>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="191" x2="315" y1="516.3996" y2="516.3996"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="99" x="196" y="526.6186">[enum colors::red]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="222.5" x2="264.5" y1="552.1996" y2="552.1996"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="264.5" x2="264.5" y1="552.1996" y2="565.1996"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="264.5" y1="565.1996" y2="565.1996"/>
+      <polygon fill="#181818" points="233.5,561.1996,223.5,565.1996,233.5,569.1996,229.5,565.1996" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="229.5" y="546.6766">red()</text>
     </a>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="599.5156" y2="599.5156"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="211" y="609.7261">[enum colors::orange]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="634.4531" y2="634.4531"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="634.4531" y2="647.4531"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="647.4531" y2="647.4531"/>
-      <polygon fill="#A80036" points="251,643.4531,241,647.4531,251,651.4531,247,647.4531" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="55" x="247" y="629.3872">orange()</text>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="191" x2="315" y1="604.1996" y2="604.1996"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="119" x="196" y="614.4185">[enum colors::orange]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="222.5" x2="264.5" y1="639.9995" y2="639.9995"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="264.5" x2="264.5" y1="639.9995" y2="652.9995"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="264.5" y1="652.9995" y2="652.9995"/>
+      <polygon fill="#181818" points="233.5,648.9995,223.5,652.9995,233.5,656.9995,229.5,652.9995" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="47" x="229.5" y="634.4765">orange()</text>
     </a>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="686.4531" y2="686.4531"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="133" x="211" y="696.6636">[enum colors::green]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="721.3906" y2="721.3906"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="721.3906" y2="734.3906"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="734.3906" y2="734.3906"/>
-      <polygon fill="#A80036" points="251,730.3906,241,734.3906,251,738.3906,247,734.3906" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="247" y="716.3247">green()</text>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="191" x2="315" y1="691.9995" y2="691.9995"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="112" x="196" y="702.2184">[enum colors::green]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="222.5" x2="264.5" y1="727.7994" y2="727.7994"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="264.5" x2="264.5" y1="727.7994" y2="740.7994"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="264.5" y1="740.7994" y2="740.7994"/>
+      <polygon fill="#181818" points="233.5,736.7994,223.5,740.7994,233.5,744.7994,229.5,740.7994" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="229.5" y="722.2764">green()</text>
     </a>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="773.3906" y2="773.3906"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="211" y="783.6011">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="808.3281" y2="808.3281"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="808.3281" y2="821.3281"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="821.3281" y2="821.3281"/>
-      <polygon fill="#A80036" points="251,817.3281,241,821.3281,251,825.3281,247,821.3281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="38" x="247" y="803.2622">grey()</text>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="191" x2="315" y1="779.7994" y2="779.7994"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="45" x="196" y="790.0183">[default]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="222.5" x2="264.5" y1="815.5993" y2="815.5993"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="264.5" x2="264.5" y1="815.5993" y2="828.5993"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="264.5" y1="828.5993" y2="828.5993"/>
+      <polygon fill="#181818" points="233.5,824.5993,223.5,828.5993,233.5,832.5993,229.5,828.5993" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="33" x="229.5" y="810.0763">grey()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20024_sequence_mermaid.svg b/docs/test_cases/t20024_sequence_mermaid.svg
index f7db7c3e..b75ef24a 100644
--- a/docs/test_cases/t20024_sequence_mermaid.svg
+++ b/docs/test_cases/t20024_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -158,8 +158,8 @@
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="1256" x="480">]</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="1375" x="480">[default]</text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">select(enum_a)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">select(enum_a)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="196" x="280">a0()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,227 C 340,217 340,257 280,247"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="272" x="285">​</text>
@@ -176,10 +176,10 @@
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,710 C 340,700 340,740 280,730"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="755" x="285">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 285,750 C 345,740 345,780 285,770"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="835" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="830" x2="80" y1="830" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="845" x="278">select(colors)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="876" x2="475" y1="876" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="835" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="830" x2="83" y1="830" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="845" x="276">select(colors)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="876" x2="471" y1="876" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="975" x="480">red()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,1006 C 540,996 540,1036 480,1026"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1128" x="480">orange()</text>
diff --git a/docs/test_cases/t20025.md b/docs/test_cases/t20025.md
index 3bf4fe21..01286289 100644
--- a/docs/test_cases/t20025.md
+++ b/docs/test_cases/t20025.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20025::tmain()"
 ```
 ## Source code
-File t20025.cc
+File `tests/t20025/t20025.cc`
 ```cpp
 namespace clanguml {
 namespace t20025 {
diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg
index f919c8ee..e55861a2 100644
--- a/docs/test_cases/t20025_sequence.svg
+++ b/docs/test_cases/t20025_sequence.svg
@@ -1,53 +1,47 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="169px" preserveAspectRatio="none" style="width:220px;height:169px;" version="1.1" viewBox="0 0 220 169" width="220px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="164px" preserveAspectRatio="none" style="width:195px;height:164px;background:#FFFFFF;" version="1.1" viewBox="0 0 195 164" width="195px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fwh2np27rw89l" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fwh2np27rw89l)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fwh2np27rw89l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fwh2np27rw89l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="129.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="129.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="167" x2="167" y1="38.2969" y2="129.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwh2np27rw89l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fwh2np27rw89l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="128.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="148.4248">tmain()</text>
+    <rect fill="#FFFFFF" height="63.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="143" y="96.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="128.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="85" x2="85" y1="36.7999" y2="128.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="148" x2="148" y1="36.7999" y2="128.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="127.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="147.4059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwh2np27rw89l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fwh2np27rw89l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="128.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="148.4248">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="127.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="147.4059">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwh2np27rw89l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="22.9951">add(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#fwh2np27rw89l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="128.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="148.4248">add(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="107" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114" y="25.0059">add(int,int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="107" y="127.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114" y="147.4059">add(int,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fwh2np27rw89l)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fwh2np27rw89l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fwh2np27rw89l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
+    <rect fill="#FFFFFF" height="63.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="143" y="96.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="68.5,64.3999,78.5,68.3999,68.5,72.3999,72.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="74.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="62.8769">a()</text>
     </a>
-    <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="96.5" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="150,93.4297,160,97.4297,150,101.4297,154,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="156" y1="97.4297" y2="97.4297"/>
+    <polygon fill="#181818" points="50.5,78.3999,40.5,82.3999,50.5,86.3999,46.5,82.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="84.5" y1="82.3999" y2="82.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="131,92.3999,141,96.3999,131,100.3999,135,96.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="137" y1="96.3999" y2="96.3999"/>
     </a>
-    <polygon fill="#A80036" points="52,107.4297,42,111.4297,52,115.4297,48,111.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="166" y1="111.4297" y2="111.4297"/>
+    <polygon fill="#181818" points="45.5,106.3999,35.5,110.3999,45.5,114.3999,41.5,110.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="147" y1="110.3999" y2="110.3999"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20025_sequence_mermaid.svg b/docs/test_cases/t20025_sequence_mermaid.svg
index 35762bd1..c0d86545 100644
--- a/docs/test_cases/t20025_sequence_mermaid.svg
+++ b/docs/test_cases/t20025_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -91,12 +91,12 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="135" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="121" x2="80" y1="121" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="278">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="475" y1="131" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="275">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="141" x2="80" y1="141" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="121" x2="83" y1="121" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="276">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="471" y1="131" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="277">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="141" x2="83" y1="141" x1="470"/>
 </svg>
diff --git a/docs/test_cases/t20026.md b/docs/test_cases/t20026.md
index 19a12b67..68641dfe 100644
--- a/docs/test_cases/t20026.md
+++ b/docs/test_cases/t20026.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20026::tmain()"
 ```
 ## Source code
-File t20026.cc
+File `tests/t20026/t20026.cc`
 ```cpp
 namespace clanguml {
 namespace t20026 {
diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg
index 0e383134..61829ec1 100644
--- a/docs/test_cases/t20026_sequence.svg
+++ b/docs/test_cases/t20026_sequence.svg
@@ -1,36 +1,30 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="152px" preserveAspectRatio="none" style="width:103px;height:152px;background:#FFFFFF;" version="1.1" viewBox="0 0 103 152" width="103px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f19amdzch63b0e" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f19amdzch63b0e)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f19amdzch63b0e)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19amdzch63b0e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f19amdzch63b0e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
+    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="116.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="85" x2="85" y1="36.7999" y2="116.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="115.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="135.4059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19amdzch63b0e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f19amdzch63b0e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="115.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="135.4059">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f19amdzch63b0e)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f19amdzch63b0e)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
+    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="68.5,64.3999,78.5,68.3999,68.5,72.3999,72.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="74.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="62.8769">a()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20026_sequence_mermaid.svg b/docs/test_cases/t20026_sequence_mermaid.svg
index 121a3afb..aa7c3fe8 100644
--- a/docs/test_cases/t20026_sequence_mermaid.svg
+++ b/docs/test_cases/t20026_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -73,6 +73,6 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="105" x="270"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20027.md b/docs/test_cases/t20027.md
index 6b75773c..960a38e8 100644
--- a/docs/test_cases/t20027.md
+++ b/docs/test_cases/t20027.md
@@ -16,7 +16,7 @@ diagrams:
       - function: "clanguml::t20027::tmain()"
 ```
 ## Source code
-File t20027.cc
+File `tests/t20027/t20027.cc`
 ```cpp
 namespace clanguml {
 namespace t20027 {
diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg
index a246289c..bf5a9d45 100644
--- a/docs/test_cases/t20027_sequence.svg
+++ b/docs/test_cases/t20027_sequence.svg
@@ -1,36 +1,30 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="152px" preserveAspectRatio="none" style="width:103px;height:152px;background:#FFFFFF;" version="1.1" viewBox="0 0 103 152" width="103px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1nw10c2k0hu5" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1nw10c2k0hu5)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1nw10c2k0hu5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1nw10c2k0hu5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1nw10c2k0hu5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
+    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="116.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="85" x2="85" y1="36.7999" y2="116.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="115.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="135.4059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1nw10c2k0hu5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1nw10c2k0hu5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="115.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="135.4059">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1nw10c2k0hu5)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1nw10c2k0hu5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
+    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="68.5,64.3999,78.5,68.3999,68.5,72.3999,72.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="74.5" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="62.8769">a()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20027_sequence_mermaid.svg b/docs/test_cases/t20027_sequence_mermaid.svg
index 121a3afb..aa7c3fe8 100644
--- a/docs/test_cases/t20027_sequence_mermaid.svg
+++ b/docs/test_cases/t20027_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -73,6 +73,6 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="105" x="270"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20028.md b/docs/test_cases/t20028.md
index 584adaa4..ecaa82ba 100644
--- a/docs/test_cases/t20028.md
+++ b/docs/test_cases/t20028.md
@@ -17,7 +17,7 @@ diagrams:
       - function: "clanguml::t20028::tmain()"
 ```
 ## Source code
-File t20028.cc
+File `tests/t20028/t20028.cc`
 ```cpp
 namespace clanguml {
 namespace t20028 {
diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg
index c5966367..48bbd873 100644
--- a/docs/test_cases/t20028_sequence.svg
+++ b/docs/test_cases/t20028_sequence.svg
@@ -1,73 +1,66 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:150px;height:304px;" version="1.1" viewBox="0 0 150 304" width="150px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="300px" preserveAspectRatio="none" style="width:130px;height:300px;background:#FFFFFF;" version="1.1" viewBox="0 0 130 300" width="130px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f11wmjwmq23ggv" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="125.5" x="13" y="201.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="263.9609"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="114.5" x2="114.5" y1="38.2969" y2="263.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11wmjwmq23ggv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f11wmjwmq23ggv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="282.9561">tmain()</text>
+    <rect fill="#FFFFFF" height="208.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="44.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="93"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="136.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="180.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="225.8"/>
+    <rect fill="none" height="194.0001" style="stroke:#000000;stroke-width:1.5;" width="113" x="10" y="53.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="49" x2="49" y1="36.7999" y2="264.8"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="101" x2="101" y1="36.7999" y2="264.8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="20" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="27" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="20" y="263.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="27" y="283.8059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11wmjwmq23ggv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f11wmjwmq23ggv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="262.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="282.9561">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="90" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="97" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="90" y="263.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="97" y="283.8059">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f11wmjwmq23ggv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
-    <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="98,89.5625,108,93.5625,98,97.5625,102,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="93.5625" y2="93.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="88.4966">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="74" y="88.4966">a()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="92" y="88.4966">]</text>
+    <rect fill="#FFFFFF" height="208.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="44.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="93"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="136.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="180.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="225.8"/>
+    <path d="M10,53.7999 L70,53.7999 L70,61.3999 L60,71.3999 L10,71.3999 L10,53.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="194.0001" style="stroke:#000000;stroke-width:1.5;" width="113" x="10" y="53.7999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="66.8769">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84.5,89,94.5,93,84.5,97,88.5,93" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="90.5" y1="93" y2="93"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="87.477">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="65.5" y="87.477">a()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="80.5" y="87.477">]</text>
     </a>
-    <polygon fill="#A80036" points="72,103.5625,62,107.5625,72,111.5625,68,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="107.5625" y2="107.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="98,132.6953,108,136.6953,98,140.6953,102,136.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="136.6953" y2="136.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="131.6294">b()</text>
+    <polygon fill="#181818" points="65.5,103,55.5,107,65.5,111,61.5,107" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="100.5" y1="107" y2="107"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84.5,132.6,94.5,136.6,84.5,140.6,88.5,136.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="90.5" y1="136.6" y2="136.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="61.5" y="131.077">b()</text>
     </a>
-    <polygon fill="#A80036" points="72,146.6953,62,150.6953,72,154.6953,68,150.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="150.6953" y2="150.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="98,175.8281,108,179.8281,98,183.8281,102,179.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="179.8281" y2="179.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="68" y="174.7622">c()</text>
+    <polygon fill="#181818" points="65.5,146.6,55.5,150.6,65.5,154.6,61.5,150.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="100.5" y1="150.6" y2="150.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84.5,176.2,94.5,180.2,84.5,184.2,88.5,180.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="90.5" y1="180.2" y2="180.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="61.5" y="174.677">c()</text>
     </a>
-    <polygon fill="#A80036" points="72,189.8281,62,193.8281,72,197.8281,68,193.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="193.8281" y2="193.8281"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="138.5" y1="202.8281" y2="202.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="98,220.9609,108,224.9609,98,228.9609,102,224.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="224.9609" y2="224.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="219.895">d()</text>
+    <polygon fill="#181818" points="65.5,190.2,55.5,194.2,65.5,198.2,61.5,194.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="100.5" y1="194.2" y2="194.2"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="123" y1="203.2" y2="203.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="84.5,221.8,94.5,225.8,84.5,229.8,88.5,225.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="90.5" y1="225.8" y2="225.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="61.5" y="220.277">d()</text>
     </a>
-    <polygon fill="#A80036" points="72,234.9609,62,238.9609,72,242.9609,68,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="238.9609" y2="238.9609"/>
+    <polygon fill="#181818" points="65.5,235.8,55.5,239.8,65.5,243.8,61.5,239.8" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="100.5" y1="239.8" y2="239.8"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20028_sequence_mermaid.svg b/docs/test_cases/t20028_sequence_mermaid.svg
index 0ebc51b3..8e6a25b5 100644
--- a/docs/test_cases/t20028_sequence_mermaid.svg
+++ b/docs/test_cases/t20028_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -94,20 +94,20 @@
       <tspan x="200">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="178">[a()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="275" y1="136" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="146" x2="80" y1="146" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="161" x="178">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="192" x2="275" y1="192" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="207" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="202" x2="80" y1="202" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="217" x="178">c()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="248" x2="275" y1="248" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="263" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="258" x2="80" y1="258" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="298" x="178">d()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="329" x2="275" y1="329" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="344" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="339" x2="80" y1="339" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="176">[a()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="271" y1="136" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="146" x2="83" y1="146" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="161" x="176">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="192" x2="271" y1="192" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="207" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="202" x2="83" y1="202" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="217" x="176">c()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="248" x2="271" y1="248" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="263" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="258" x2="83" y1="258" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="298" x="176">d()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="329" x2="271" y1="329" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="344" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="339" x2="83" y1="339" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20029.md b/docs/test_cases/t20029.md
index e761dbcf..3dae67cb 100644
--- a/docs/test_cases/t20029.md
+++ b/docs/test_cases/t20029.md
@@ -26,7 +26,7 @@ diagrams:
       - clanguml::t20029::encode_b64(std::string &&)
 ```
 ## Source code
-File t20029.cc
+File `tests/t20029/t20029.cc`
 ```cpp
 #include <atomic>
 #include <functional>
diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg
index 370102a5..3445eb7c 100644
--- a/docs/test_cases/t20029_sequence.svg
+++ b/docs/test_cases/t20029_sequence.svg
@@ -1,142 +1,136 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="740px" preserveAspectRatio="none" style="width:1064px;height:740px;" version="1.1" viewBox="0 0 1064 740" width="1064px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="727px" preserveAspectRatio="none" style="width:937px;height:727px;background:#FFFFFF;" version="1.1" viewBox="0 0 937 727" width="937px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6vwupsa5fjc0" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="460.7266" style="stroke: #000000; stroke-width: 2.0;" width="993" x="60" y="222.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="426" y="550.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="113" x2="113" y1="38.2969" y2="700.6875"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="296" x2="296" y1="38.2969" y2="700.6875"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="545" x2="545" y1="38.2969" y2="700.6875"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="745" x2="745" y1="38.2969" y2="700.6875"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="926" x2="926" y1="38.2969" y2="700.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="87" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="699.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="87" y="719.6826">tmain()</text>
+    <rect fill="#FFFFFF" height="634.8002" style="stroke:#181818;stroke-width:1.0;" width="10" x="94.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="380.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="255" y="279.6"/>
+    <rect fill="#FFFFFF" height="53" style="stroke:#181818;stroke-width:1.0;" width="10" x="260" y="384.0001"/>
+    <rect fill="#FFFFFF" height="172.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="472.5" y="473.6001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="652.5" y="119.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="652.5" y="603.6002"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="813" y="403.0001"/>
+    <rect fill="none" height="458.8002" style="stroke:#000000;stroke-width:1.5;" width="881.5" x="50" y="215.8"/>
+    <rect fill="none" height="427.2002" style="stroke:#000000;stroke-width:1.5;" width="861.5" x="60" y="240.4"/>
+    <rect fill="none" height="92.8" style="stroke:#000000;stroke-width:1.5;" width="363.5" x="371" y="539.8001"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="343.5" x="381" y="564.4001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="99" x2="99" y1="36.7999" y2="691.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="260" x2="260" y1="36.7999" y2="691.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="477" x2="477" y1="36.7999" y2="691.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="657.5" x2="657.5" y1="36.7999" y2="691.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="817.5" x2="817.5" y1="36.7999" y2="691.6002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="70" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="77" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="70" y="690.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="77" y="710.6061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="163" y="22.9951">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="699.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="163" y="719.6826">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="242" x="139" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="228" x="146" y="25.0059">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="242" x="139" y="690.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="228" x="146" y="710.6061">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L25" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L25" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="453" y="22.9951">Retrier&lt;ConnectionPool&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="699.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="453" y="719.6826">Retrier&lt;ConnectionPool&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L25" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L25" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="173" x="391" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="398" y="25.0059">Retrier&lt;ConnectionPool&gt;</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="173" x="391" y="690.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="398" y="710.6061">Retrier&lt;ConnectionPool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L43" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L43" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="688" y="22.9951">ConnectionPool</text>
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="699.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="688" y="719.6826">ConnectionPool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L43" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L43" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="600.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="607.5" y="25.0059">ConnectionPool</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="600.5" y="690.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="607.5" y="710.6061">ConnectionPool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="826" y="22.9951">encode_b64(std::string &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f6vwupsa5fjc0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="699.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="826" y="719.6826">encode_b64(std::string &amp;&amp;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="187" x="724.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="731.5" y="25.0059">encode_b64(std::string &amp;&amp;)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="187" x="724.5" y="690.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="731.5" y="710.6061">encode_b64(std::string &amp;&amp;)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f6vwupsa5fjc0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
-    <path d="M8,53.2969 L8,93.2969 L215,93.2969 L215,63.2969 L205,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f6vwupsa5fjc0)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M205,53.2969 L205,63.2969 L215,63.2969 L205,53.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="173" x="14" y="70.3638">Establish connection to the</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="186" x="14" y="85.4966">remote server synchronously</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="728,119.6953,738,123.6953,728,127.6953,732,123.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="118" x2="734" y1="123.6953" y2="123.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="125" y="118.6294">connect()</text>
+    <rect fill="#FFFFFF" height="634.8002" style="stroke:#181818;stroke-width:1.0;" width="10" x="94.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="380.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="255" y="279.6"/>
+    <rect fill="#FFFFFF" height="53" style="stroke:#181818;stroke-width:1.0;" width="10" x="260" y="384.0001"/>
+    <rect fill="#FFFFFF" height="172.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="472.5" y="473.6001"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="652.5" y="119.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="652.5" y="603.6002"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="813" y="403.0001"/>
+    <path d="M5,51.7999 L5,92.7999 L194,92.7999 L194,61.7999 L184,51.7999 L5,51.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M184,51.7999 L184,61.7999 L194,61.7999 L184,51.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="158" x="11" y="68.8769">Establish connection to the</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="168" x="11" y="84.477">remote server synchronously</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="640.5,115.6,650.5,119.6,640.5,123.6,644.5,119.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="104.5" x2="646.5" y1="119.6" y2="119.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="111.5" y="114.077">connect()</text>
     </a>
-    <path d="M17,166.6953 L17,206.6953 L205,206.6953 L205,176.6953 L195,166.6953 L17,166.6953 " fill="#FBFB77" filter="url(#f6vwupsa5fjc0)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M195,166.6953 L195,176.6953 L205,176.6953 L195,166.6953 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="167" x="23" y="183.7622">Repeat for each line in the</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="23" y="198.895">input stream</text>
-    <path d="M60,222.9609 L137,222.9609 L137,229.9609 L127,239.9609 L60,239.9609 L60,222.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="460.7266" style="stroke: #000000; stroke-width: 2.0;" width="993" x="60" y="222.9609"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="236.0278">loop</text>
-    <path d="M70,247.0938 L134,247.0938 L134,254.0938 L124,264.0938 L70,264.0938 L70,247.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85" y="260.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="279,281.3594,289,285.3594,279,289.3594,283,285.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="118" x2="285" y1="285.3594" y2="285.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="125" y="280.2935">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="131" y="280.2935">send(std::string &amp;&amp;)</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="262" y="280.2935">]</text>
+    <path d="M13,162.6 L13,203.6 L186,203.6 L186,172.6 L176,162.6 L13,162.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M176,162.6 L176,172.6 L186,172.6 L176,162.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="152" x="19" y="179.677">Repeat for each line in the</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="19" y="195.277">input stream</text>
+    <path d="M50,215.8 L123,215.8 L123,223.4 L113,233.4 L50,233.4 L50,215.8 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="458.8002" style="stroke:#000000;stroke-width:1.5;" width="881.5" x="50" y="215.8"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="65" y="228.877">loop</text>
+    <path d="M60,240.4 L120,240.4 L120,248 L110,258 L60,258 L60,240.4 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="427.2002" style="stroke:#000000;stroke-width:1.5;" width="861.5" x="60" y="240.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="75" y="253.477">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="243,275.6,253,279.6,243,283.6,247,279.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="104.5" x2="249" y1="279.6" y2="279.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="111.5" y="274.077">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="116" x="115.5" y="274.077">send(std::string &amp;&amp;)</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="231.5" y="274.077">]</text>
     </a>
-    <path d="M197,298.3594 L197,353.3594 L391,353.3594 L391,308.3594 L381,298.3594 L197,298.3594 " fill="#FBFB77" filter="url(#f6vwupsa5fjc0)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M381,298.3594 L381,308.3594 L391,308.3594 L381,298.3594 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="173" x="203" y="315.4263">Encode the message using</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="172" x="203" y="330.5591">Base64 encoding and pass</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="117" x="203" y="345.6919">it to the next layer</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="348" y1="378.8906" y2="378.8906"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="348" x2="348" y1="378.8906" y2="391.8906"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="307" x2="348" y1="391.8906" y2="391.8906"/>
-      <polygon fill="#A80036" points="317,387.8906,307,391.8906,317,395.8906,313,391.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="147" x="313" y="373.8247">encode(std::string &amp;&amp;)</text>
+    <path d="M170,292.6 L170,348.6 L349,348.6 L349,302.6 L339,292.6 L170,292.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M339,292.6 L339,302.6 L349,302.6 L339,292.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="158" x="176" y="309.677">Encode the message using</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="157" x="176" y="325.2771">Base64 encoding and pass</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="176" y="340.8771">it to the next layer</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="265" x2="312" y1="371.0001" y2="371.0001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="312" x2="312" y1="371.0001" y2="384.0001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="271" x2="312" y1="384.0001" y2="384.0001"/>
+      <polygon fill="#181818" points="281,380.0001,271,384.0001,281,388.0001,277,384.0001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="130" x="277" y="365.4771">encode(std::string &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="909,406.8906,919,410.8906,909,414.8906,913,410.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="306" x2="915" y1="410.8906" y2="410.8906"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="801,399.0001,811,403.0001,801,407.0001,805,403.0001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="270" x2="807" y1="403.0001" y2="403.0001"/>
     </a>
-    <polygon fill="#A80036" points="317,420.8906,307,424.8906,317,428.8906,313,424.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="311" x2="925" y1="424.8906" y2="424.8906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="306" x2="348" y1="443.8906" y2="443.8906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="348" x2="348" y1="443.8906" y2="456.8906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="301" x2="348" y1="456.8906" y2="456.8906"/>
-    <polygon fill="#A80036" points="311,452.8906,301,456.8906,311,460.8906,307,456.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="528,477.0234,538,481.0234,528,485.0234,532,481.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="534" y1="481.0234" y2="481.0234"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="308" y="475.9575">send(std::string &amp;&amp;)</text>
+    <polygon fill="#181818" points="281,413.0001,271,417.0001,281,421.0001,277,417.0001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="275" x2="817" y1="417.0001" y2="417.0001"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="270" x2="312" y1="436.0001" y2="436.0001"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="312" x2="312" y1="436.0001" y2="449.0001"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="265" x2="312" y1="449.0001" y2="449.0001"/>
+    <polygon fill="#181818" points="275,445.0001,265,449.0001,275,453.0001,271,449.0001" style="stroke:#181818;stroke-width:1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="460.5,469.6001,470.5,473.6001,460.5,477.6001,464.5,473.6001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="265" x2="466.5" y1="473.6001" y2="473.6001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="116" x="272" y="468.0771">send(std::string &amp;&amp;)</text>
     </a>
-    <path d="M440,494.0234 L440,534.0234 L646,534.0234 L646,504.0234 L636,494.0234 L440,494.0234 " fill="#FBFB77" filter="url(#f6vwupsa5fjc0)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M636,494.0234 L636,504.0234 L646,504.0234 L636,494.0234 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="446" y="511.0903">Repeat until send() succeeds</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="167" x="446" y="526.2231">or retry count is exceeded</text>
-    <path d="M426,550.2891 L503,550.2891 L503,557.2891 L493,567.2891 L426,567.2891 L426,550.2891 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="426" y="550.2891"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="441" y="563.356">loop</text>
-    <path d="M436,574.4219 L500,574.4219 L500,581.4219 L490,591.4219 L436,591.4219 L436,574.4219 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="451" y="587.4888">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20029/t20029.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="728,608.6875,738,612.6875,728,616.6875,732,612.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="550" x2="734" y1="612.6875" y2="612.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="557" y="607.6216">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="159" x="563" y="607.6216">send(const std::string &amp;)</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="722" y="607.6216">]</text>
+    <path d="M382,486.6001 L382,527.6001 L572,527.6001 L572,496.6001 L562,486.6001 L382,486.6001 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M562,486.6001 L562,496.6001 L572,496.6001 L562,486.6001 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="169" x="388" y="503.6771">Repeat until send() succeeds</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="151" x="388" y="519.2771">or retry count is exceeded</text>
+    <path d="M371,539.8001 L444,539.8001 L444,547.4001 L434,557.4001 L371,557.4001 L371,539.8001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="92.8" style="stroke:#000000;stroke-width:1.5;" width="363.5" x="371" y="539.8001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="386" y="552.8771">loop</text>
+    <path d="M381,564.4001 L441,564.4001 L441,572.0002 L431,582.0002 L381,582.0002 L381,564.4001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="343.5" x="381" y="564.4001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="396" y="577.4772">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="640.5,599.6002,650.5,603.6002,640.5,607.6002,644.5,603.6002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="482.5" x2="646.5" y1="603.6002" y2="603.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="489.5" y="598.0772">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="143" x="493.5" y="598.0772">send(const std::string &amp;)</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="636.5" y="598.0772">]</text>
     </a>
-    <polygon fill="#A80036" points="561,622.6875,551,626.6875,561,630.6875,557,626.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="555" x2="744" y1="626.6875" y2="626.6875"/>
-    <polygon fill="#A80036" points="312,650.6875,302,654.6875,312,658.6875,308,654.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="306" x2="544" y1="654.6875" y2="654.6875"/>
-    <polygon fill="#A80036" points="129,664.6875,119,668.6875,129,672.6875,125,668.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="123" x2="295" y1="668.6875" y2="668.6875"/>
+    <polygon fill="#181818" points="493.5,613.6002,483.5,617.6002,493.5,621.6002,489.5,617.6002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="487.5" x2="656.5" y1="617.6002" y2="617.6002"/>
+    <polygon fill="#181818" points="276,641.6002,266,645.6002,276,649.6002,272,645.6002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="270" x2="476.5" y1="645.6002" y2="645.6002"/>
+    <polygon fill="#181818" points="115.5,655.6002,105.5,659.6002,115.5,663.6002,111.5,659.6002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="109.5" x2="259" y1="659.6002" y2="659.6002"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20029_sequence_mermaid.svg b/docs/test_cases/t20029_sequence_mermaid.svg
index 262a0097..1938095e 100644
--- a/docs/test_cases/t20029_sequence_mermaid.svg
+++ b/docs/test_cases/t20029_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -216,26 +216,26 @@
       <tspan x="594.75">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="144" x="460">connect()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="175" x2="839" y1="175" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="204">[send(std::string &amp;&amp;)]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="328.5" y1="335" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="144" x="458">connect()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="175" x2="835" y1="175" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="202">[send(std::string &amp;&amp;)]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="324.5" y1="335" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="431" x="334">encode(std::string &amp;&amp;)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 333.5,462 C 393.5,452 393.5,492 333.5,482"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="507" x="702">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="502" x2="1064.5" y1="502" x1="338.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="517" x="699">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="512" x2="338.5" y1="512" x1="1059.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="507" x="700">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="502" x2="1060.5" y1="502" x1="338.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="517" x="701">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="512" x2="341.5" y1="512" x1="1059.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="527" x="339">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 338.5,522 C 398.5,512 398.5,552 338.5,542"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="567" x="467">send(std::string &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="598" x2="600" y1="598" x1="333.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="727" x="722">[send(const std::string &amp;)]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="758" x2="839" y1="758" x1="605"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="773" x="720">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="768" x2="605" y1="768" x1="834"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="815" x="464">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="810" x2="333.5" y1="810" x1="595"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="825" x="202">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="820" x2="80" y1="820" x1="323.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="567" x="465">send(std::string &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="598" x2="596" y1="598" x1="333.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="727" x="720">[send(const std::string &amp;)]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="758" x2="835" y1="758" x1="605"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="773" x="721">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="768" x2="608" y1="768" x1="834"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="815" x="466">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="810" x2="336.5" y1="810" x1="595"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="825" x="203">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="820" x2="83" y1="820" x1="323.5"/>
 </svg>
diff --git a/docs/test_cases/t20030.md b/docs/test_cases/t20030.md
index 3f705e77..769f29df 100644
--- a/docs/test_cases/t20030.md
+++ b/docs/test_cases/t20030.md
@@ -15,7 +15,7 @@ diagrams:
       - function: "clanguml::t20030::tmain(bool,int)"
 ```
 ## Source code
-File t20030.cc
+File `tests/t20030/t20030.cc`
 ```cpp
 namespace clanguml {
 namespace t20030 {
diff --git a/docs/test_cases/t20030_sequence.svg b/docs/test_cases/t20030_sequence.svg
index 20b8a1dc..79bc502d 100644
--- a/docs/test_cases/t20030_sequence.svg
+++ b/docs/test_cases/t20030_sequence.svg
@@ -1,155 +1,149 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="777px" preserveAspectRatio="none" style="width:427px;height:777px;" version="1.1" viewBox="0 0 427 777" width="427px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="776px" preserveAspectRatio="none" style="width:381px;height:776px;background:#FFFFFF;" version="1.1" viewBox="0 0 381 776" width="381px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="flrsg5v0cy8bz" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="736.8906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="736.8906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="193" x2="193" y1="38.2969" y2="736.8906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="361" x2="361" y1="38.2969" y2="736.8906"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flrsg5v0cy8bz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
-      <rect fill="#FEFECE" filter="url(#flrsg5v0cy8bz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="735.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="755.8857">tmain(int)</text>
+    <rect fill="#FFFFFF" height="195.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="37" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="115" y="52.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="96.3999"/>
+    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="156"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="193.6"/>
+    <rect fill="#FFFFFF" height="65.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="272.2"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="309.8"/>
+    <rect fill="#FFFFFF" height="65.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="374.4"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="412"/>
+    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="476.6"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="514.2001"/>
+    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="592.8001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="630.4001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="709.0001"/>
+    <rect fill="#FFFFFF" height="480.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="317.5" y="242.6"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="42" x2="42" y1="36.7999" y2="741.0001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="120" x2="120" y1="36.7999" y2="741.0001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="172" x2="172" y1="36.7999" y2="741.0001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="322" x2="322" y1="36.7999" y2="741.0001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="12" y="25.0059">tmain(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="5" y="740.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="12" y="760.006">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flrsg5v0cy8bz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
-      <rect fill="#FEFECE" filter="url(#flrsg5v0cy8bz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="735.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="755.8857">magic()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="89" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="96" y="25.0059">magic()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="89" y="740.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="96" y="760.006">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flrsg5v0cy8bz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#flrsg5v0cy8bz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="735.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="755.8857">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="161" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="168" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="161" y="740.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="168" y="760.006">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flrsg5v0cy8bz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="22.9951">tmain(bool,int)</text>
-      <rect fill="#FEFECE" filter="url(#flrsg5v0cy8bz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="735.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="755.8857">tmain(bool,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="270" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="277" y="25.0059">tmain(bool,int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="270" y="740.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="277" y="760.006">tmain(bool,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
-    <rect fill="#FFFFFF" filter="url(#flrsg5v0cy8bz)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
+    <rect fill="#FFFFFF" height="195.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="37" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="115" y="52.7999"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="96.3999"/>
+    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="156"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="193.6"/>
+    <rect fill="#FFFFFF" height="65.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="272.2"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="309.8"/>
+    <rect fill="#FFFFFF" height="65.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="374.4"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="412"/>
+    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="476.6"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="514.2001"/>
+    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="592.8001"/>
+    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="630.4001"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="709.0001"/>
+    <rect fill="#FFFFFF" height="480.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="317.5" y="242.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="103,48.7999,113,52.7999,103,56.7999,107,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="109" y1="52.7999" y2="52.7999"/>
     </a>
-    <polygon fill="#A80036" points="65.5,64.2969,55.5,68.2969,65.5,72.2969,61.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="59.5" x2="134.5" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="176.5,93.4297,186.5,97.4297,176.5,101.4297,180.5,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="97.4297" y2="97.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="61.5" y="92.3638">A(int)</text>
+    <polygon fill="#181818" points="58,62.7999,48,66.7999,58,70.7999,54,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="52" x2="119" y1="66.7999" y2="66.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="155.5,92.3999,165.5,96.3999,155.5,100.3999,159.5,96.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="161.5" y1="96.3999" y2="96.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="54" y="90.8769">A(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="176.5,152.5625,186.5,156.5625,176.5,160.5625,180.5,156.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="156.5625" y2="156.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="61.5" y="151.4966">operator+=(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="155.5,152,165.5,156,155.5,160,159.5,156" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="161.5" y1="156" y2="156"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="54" y="150.477">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="185.6953" y2="185.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="185.6953" y2="198.6953"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="198.6953" y2="198.6953"/>
-      <polygon fill="#A80036" points="214.5,194.6953,204.5,198.6953,214.5,202.6953,210.5,198.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="210.5" y="180.6294">add(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="185.6" y2="185.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="185.6" y2="198.6"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="198.6" y2="198.6"/>
+      <polygon fill="#181818" points="193.5,194.6,183.5,198.6,193.5,202.6,189.5,198.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="189.5" y="180.077">add(int)</text>
     </a>
-    <polygon fill="#A80036" points="60.5,238.6953,50.5,242.6953,60.5,246.6953,56.5,242.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="192.5" y1="242.6953" y2="242.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="209.5,267.8281,199.5,271.8281,209.5,275.8281,205.5,271.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="271.8281" y2="271.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="266.7622">A()</text>
+    <polygon fill="#181818" points="53,238.6,43,242.6,53,246.6,49,242.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="47" x2="171.5" y1="242.6" y2="242.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="188.5,268.2,178.5,272.2,188.5,276.2,184.5,272.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="272.2" y2="272.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="194.5" y="266.677">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="300.9609" y2="300.9609"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="300.9609" y2="313.9609"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="313.9609" y2="313.9609"/>
-      <polygon fill="#A80036" points="214.5,309.9609,204.5,313.9609,214.5,317.9609,210.5,313.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="295.895">create()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="301.8" y2="301.8"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="301.8" y2="314.8"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="314.8" y2="314.8"/>
+      <polygon fill="#181818" points="193.5,310.8,183.5,314.8,193.5,318.8,189.5,314.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="189.5" y="296.277">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="209.5,369.0938,199.5,373.0938,209.5,377.0938,205.5,373.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="373.0938" y2="373.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="368.0278">A()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="188.5,370.4,178.5,374.4,188.5,378.4,184.5,374.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="374.4" y2="374.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="194.5" y="368.877">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="402.2266" y2="402.2266"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="402.2266" y2="415.2266"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="415.2266" y2="415.2266"/>
-      <polygon fill="#A80036" points="214.5,411.2266,204.5,415.2266,214.5,419.2266,210.5,415.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="397.1606">create()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="404" y2="404"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="404" y2="417"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="417" y2="417"/>
+      <polygon fill="#181818" points="193.5,413,183.5,417,193.5,421,189.5,417" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="189.5" y="398.477">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="209.5,470.3594,199.5,474.3594,209.5,478.3594,205.5,474.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="474.3594" y2="474.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="215.5" y="469.2935">operator+=(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="188.5,472.6,178.5,476.6,188.5,480.6,184.5,476.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="476.6" y2="476.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="194.5" y="471.077">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="503.4922" y2="503.4922"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="503.4922" y2="516.4922"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="516.4922" y2="516.4922"/>
-      <polygon fill="#A80036" points="214.5,512.4922,204.5,516.4922,214.5,520.4922,210.5,516.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="210.5" y="498.4263">add(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="506.2001" y2="506.2001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="506.2001" y2="519.2001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="519.2001" y2="519.2001"/>
+      <polygon fill="#181818" points="193.5,515.2001,183.5,519.2001,193.5,523.2001,189.5,519.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="189.5" y="500.677">add(int)</text>
     </a>
-    <polygon fill="#A80036" points="344.5,556.4922,354.5,560.4922,344.5,564.4922,348.5,560.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="560.4922" y2="560.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="209.5,585.625,199.5,589.625,209.5,593.625,205.5,589.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="589.625" y2="589.625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="215.5" y="584.5591">operator=(const A &amp;)</text>
+    <polygon fill="#181818" points="305.5,559.2001,315.5,563.2001,305.5,567.2001,309.5,563.2001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="172.5" x2="311.5" y1="563.2001" y2="563.2001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="188.5,588.8001,178.5,592.8001,188.5,596.8001,184.5,592.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="592.8001" y2="592.8001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="121" x="194.5" y="587.2771">operator=(const A &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="618.7578" y2="618.7578"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="618.7578" y2="631.7578"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="631.7578" y2="631.7578"/>
-      <polygon fill="#A80036" points="214.5,627.7578,204.5,631.7578,214.5,635.7578,210.5,631.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="210.5" y="613.6919">set(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="622.4001" y2="622.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="622.4001" y2="635.4001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="635.4001" y2="635.4001"/>
+      <polygon fill="#181818" points="193.5,631.4001,183.5,635.4001,193.5,639.4001,189.5,635.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="189.5" y="616.8771">set(int)</text>
     </a>
-    <polygon fill="#A80036" points="344.5,671.7578,354.5,675.7578,344.5,679.7578,348.5,675.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="675.7578" y2="675.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="209.5,700.8906,199.5,704.8906,209.5,708.8906,205.5,704.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="704.8906" y2="704.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="215.5" y="699.8247">value() const</text>
+    <polygon fill="#181818" points="305.5,675.4001,315.5,679.4001,305.5,683.4001,309.5,679.4001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="172.5" x2="311.5" y1="679.4001" y2="679.4001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="188.5,705.0001,178.5,709.0001,188.5,713.0001,184.5,709.0001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="709.0001" y2="709.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="75" x="194.5" y="703.4771">value() const</text>
     </a>
-    <polygon fill="#A80036" points="349.5,714.8906,359.5,718.8906,349.5,722.8906,353.5,718.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="355.5" y1="718.8906" y2="718.8906"/>
+    <polygon fill="#181818" points="310.5,719.0001,320.5,723.0001,310.5,727.0001,314.5,723.0001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="172.5" x2="316.5" y1="723.0001" y2="723.0001"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20030_sequence_mermaid.svg b/docs/test_cases/t20030_sequence_mermaid.svg
index 13ec0fcc..5fd85c74 100644
--- a/docs/test_cases/t20030_sequence_mermaid.svg
+++ b/docs/test_cases/t20030_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -142,40 +142,40 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="821" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="80" y1="85" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="278">A(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="475" y1="131" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="278">operator+=(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="177" x2="475" y1="177" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="83" y1="85" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="276">A(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="471" y1="131" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="276">operator+=(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="177" x2="471" y1="177" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="480">add(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,223 C 540,213 540,253 480,243"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="268" x="275">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="263" x2="80" y1="263" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="278" x="576">A()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="309" x2="475" y1="309" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="268" x="277">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="263" x2="83" y1="263" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="278" x="578">A()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="309" x2="479" y1="309" x1="677"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="324" x="480">create()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,355 C 540,345 540,385 480,375"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="400" x="576">A()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="431" x2="475" y1="431" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="400" x="578">A()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="431" x2="479" y1="431" x1="677"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="446" x="480">create()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,477 C 540,467 540,507 480,497"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="522" x="576">operator+=(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="553" x2="475" y1="553" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="522" x="578">operator+=(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="553" x2="479" y1="553" x1="677"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="568" x="480">add(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,599 C 540,589 540,629 480,619"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="644" x="579">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="639" x2="677" y1="639" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="654" x="576">operator=(const A &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="685" x2="475" y1="685" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="644" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="639" x2="674" y1="639" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="654" x="578">operator=(const A &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="685" x2="479" y1="685" x1="677"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="700" x="480">set(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,731 C 540,721 540,761 480,751"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="579">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="771" x2="677" y1="771" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="786" x="576">value() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="817" x2="475" y1="817" x1="677"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="832" x="579">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="827" x2="677" y1="827" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="771" x2="674" y1="771" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="786" x="578">value() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="817" x2="479" y1="817" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="832" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="827" x2="674" y1="827" x1="480"/>
 </svg>
diff --git a/docs/test_cases/t20031.md b/docs/test_cases/t20031.md
index 9747bfab..87b24b2c 100644
--- a/docs/test_cases/t20031.md
+++ b/docs/test_cases/t20031.md
@@ -20,7 +20,7 @@ diagrams:
       - function: "clanguml::t20031::tmain(bool,int)"
 ```
 ## Source code
-File t20031.cc
+File `tests/t20031/t20031.cc`
 ```cpp
 #include <functional>
 
diff --git a/docs/test_cases/t20031_sequence.svg b/docs/test_cases/t20031_sequence.svg
index bad071f9..14adda5a 100644
--- a/docs/test_cases/t20031_sequence.svg
+++ b/docs/test_cases/t20031_sequence.svg
@@ -1,77 +1,71 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="197px" preserveAspectRatio="none" style="width:578px;height:197px;" version="1.1" viewBox="0 0 578 197" width="578px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="192px" preserveAspectRatio="none" style="width:511px;height:192px;background:#FFFFFF;" version="1.1" viewBox="0 0 511 192" width="511px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4g6hjlufk9eo" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="157.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="157.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="238" x2="238" y1="38.2969" y2="157.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="420" x2="420" y1="38.2969" y2="157.4297"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="557" x2="557" y1="38.2969" y2="157.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="156.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="176.4248">tmain(int)</text>
+    <rect fill="#FFFFFF" height="20" style="stroke:#181818;stroke-width:1.0;" width="10" x="37" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="115" y="52.7999"/>
+    <rect fill="#FFFFFF" height="71.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="208.5" y="66.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="369" y="80.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="124.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="42" x2="42" y1="36.7999" y2="156.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="120" x2="120" y1="36.7999" y2="156.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="213" x2="213" y1="36.7999" y2="156.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="374" x2="374" y1="36.7999" y2="156.3999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="493" x2="493" y1="36.7999" y2="156.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="12" y="25.0059">tmain(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="5" y="155.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="12" y="175.4059">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="156.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="176.4248">magic()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="89" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="96" y="25.0059">magic()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="89" y="155.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="96" y="175.4059">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="22.9951">tmain(bool,int)</text>
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="156.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="176.4248">tmain(bool,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="161" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="168" y="25.0059">tmain(bool,int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="161" y="155.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="168" y="175.4059">tmain(bool,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="22.9951">execute(std::function&lt;int ()&gt;)</text>
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="156.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="176.4248">execute(std::function&lt;int ()&gt;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="196" x="276" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="283" y="25.0059">execute(std::function&lt;int ()&gt;)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="196" x="276" y="155.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="283" y="175.4059">execute(std::function&lt;int ()&gt;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f4g6hjlufk9eo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="156.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="176.4248">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="482" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="489" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="482" y="155.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="489" y="175.4059">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4g6hjlufk9eo)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
+    <rect fill="#FFFFFF" height="20" style="stroke:#181818;stroke-width:1.0;" width="10" x="37" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="115" y="52.7999"/>
+    <rect fill="#FFFFFF" height="71.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="208.5" y="66.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="369" y="80.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="124.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="103,48.7999,113,52.7999,103,56.7999,107,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="109" y1="52.7999" y2="52.7999"/>
     </a>
-    <polygon fill="#A80036" points="60.5,64.2969,50.5,68.2969,60.5,72.2969,56.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="134.5" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="403.5,78.2969,413.5,82.2969,403.5,86.2969,407.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="409.5" y1="82.2969" y2="82.2969"/>
+    <polygon fill="#181818" points="53,62.7999,43,66.7999,53,70.7999,49,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="47" x2="119" y1="66.7999" y2="66.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="357,76.7999,367,80.7999,357,84.7999,361,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="218.5" x2="363" y1="80.7999" y2="80.7999"/>
     </a>
-    <polygon fill="#A80036" points="254.5,92.2969,244.5,96.2969,254.5,100.2969,250.5,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="248.5" x2="419.5" y1="96.2969" y2="96.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="540.5,121.4297,550.5,125.4297,540.5,129.4297,544.5,125.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="546.5" y1="125.4297" y2="125.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="250.5" y="120.3638">value() const</text>
+    <polygon fill="#181818" points="229.5,90.7999,219.5,94.7999,229.5,98.7999,225.5,94.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="223.5" x2="373" y1="94.7999" y2="94.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="476.5,120.3999,486.5,124.3999,476.5,128.3999,480.5,124.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="218.5" x2="482.5" y1="124.3999" y2="124.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="75" x="225.5" y="118.8769">value() const</text>
     </a>
-    <polygon fill="#A80036" points="249.5,135.4297,239.5,139.4297,249.5,143.4297,245.5,139.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="243.5" x2="556.5" y1="139.4297" y2="139.4297"/>
+    <polygon fill="#181818" points="224.5,134.3999,214.5,138.3999,224.5,142.3999,220.5,138.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="218.5" x2="492.5" y1="138.3999" y2="138.3999"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20031_sequence_mermaid.svg b/docs/test_cases/t20031_sequence_mermaid.svg
index c6200e3a..7bf65719 100644
--- a/docs/test_cases/t20031_sequence_mermaid.svg
+++ b/docs/test_cases/t20031_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -127,16 +127,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="155" x="930"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="80" y1="85" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="593">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="705" y1="95" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="110" x="590">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="105" x2="480" y1="105" x1="700"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="120" x="708">value() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="151" x2="935" y1="151" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="166" x="705">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="161" x2="480" y1="161" x1="930"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="83" y1="85" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="591">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="701" y1="95" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="110" x="592">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="105" x2="483" y1="105" x1="700"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="120" x="706">value() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="151" x2="931" y1="151" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="166" x="707">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="161" x2="483" y1="161" x1="930"/>
 </svg>
diff --git a/docs/test_cases/t20032.md b/docs/test_cases/t20032.md
index 636254b7..5bfad6bc 100644
--- a/docs/test_cases/t20032.md
+++ b/docs/test_cases/t20032.md
@@ -15,7 +15,7 @@ diagrams:
       - function: "clanguml::t20032::tmain(int,char **)"
 ```
 ## Source code
-File t20032.cc
+File `tests/t20032/t20032.cc`
 ```cpp
 namespace clanguml {
 namespace t20032 {
diff --git a/docs/test_cases/t20032_sequence.svg b/docs/test_cases/t20032_sequence.svg
index b07f4fc2..fb258bd5 100644
--- a/docs/test_cases/t20032_sequence.svg
+++ b/docs/test_cases/t20032_sequence.svg
@@ -1,96 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="448px" preserveAspectRatio="none" style="width:354px;height:448px;" version="1.1" viewBox="0 0 354 448" width="354px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="459px" preserveAspectRatio="none" style="width:317px;height:459px;background:#FFFFFF;" version="1.1" viewBox="0 0 317 459" width="317px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fts7ibhbgbagn" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="407.8906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="407.8906"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="407.8906"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fts7ibhbgbagn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#fts7ibhbgbagn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="406.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="426.8857">tmain(int,char **)</text>
+    <rect fill="#FFFFFF" height="358.9002" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
+    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="68.3999"/>
+    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="190.7"/>
+    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="313.0001"/>
+    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="98"/>
+    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="220.3"/>
+    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="342.6001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="65" x2="65" y1="36.7999" y2="423.7001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="178.5" x2="178.5" y1="36.7999" y2="423.7001"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="299.5" x2="299.5" y1="36.7999" y2="423.7001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="25.0059">tmain(int,char **)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="422.7001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="442.706">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fts7ibhbgbagn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fts7ibhbgbagn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="406.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="426.8857">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="167.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="174.5" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="167.5" y="422.7001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="174.5" y="442.706">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fts7ibhbgbagn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fts7ibhbgbagn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="406.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="426.8857">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="288.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="295.5" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="288.5" y="422.7001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="295.5" y="442.706">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fts7ibhbgbagn)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
+    <rect fill="#FFFFFF" height="358.9002" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
+    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="68.3999"/>
+    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="190.7"/>
+    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="313.0001"/>
+    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="98"/>
+    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="220.3"/>
+    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="342.6001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162,64.3999,172,68.3999,162,72.3999,166,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="68.3999" y2="68.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="77" y="62.8769">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="283,94,293,98,283,102,287,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="191" y="92.477">a1(int)</text>
     </a>
-    <polygon fill="#A80036" points="216.5,123.6953,206.5,127.6953,216.5,131.6953,212.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="127.6953" y2="127.6953"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="222.5" y="122.6294">int</text>
-    <polygon fill="#A80036" points="91.5,152.8281,81.5,156.8281,91.5,160.8281,87.5,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="156.8281" y2="156.8281"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="97.5" y="151.7622">int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="183.5,181.9609,193.5,185.9609,183.5,189.9609,187.5,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="185.9609" y2="185.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="180.895">b(double)</text>
+    <polygon fill="#181818" points="195,125.55,185,129.55,195,133.55,191,129.55" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="129.55" y2="129.55"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="14" x="201" y="124.3">int</text>
+    <polygon fill="#181818" points="81,157.1,71,161.1,81,165.1,77,161.1" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="178" y1="161.1" y2="161.1"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="14" x="87" y="155.85">int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162,186.7,172,190.7,162,194.7,166,190.7" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="190.7" y2="190.7"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="77" y="185.177">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="316.5,211.0938,326.5,215.0938,316.5,219.0938,320.5,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="215.0938" y2="215.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="210.0278">a2(double)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="283,216.3,293,220.3,283,224.3,287,220.3" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="220.3" y2="220.3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="60" x="191" y="214.777">a2(double)</text>
     </a>
-    <polygon fill="#A80036" points="216.5,240.2266,206.5,244.2266,216.5,248.2266,212.5,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="244.2266" y2="244.2266"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="222.5" y="239.1606">double</text>
-    <polygon fill="#A80036" points="91.5,269.3594,81.5,273.3594,91.5,277.3594,87.5,273.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="273.3594" y2="273.3594"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="97.5" y="268.2935">double</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="183.5,298.4922,193.5,302.4922,183.5,306.4922,187.5,302.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="302.4922" y2="302.4922"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="297.4263">b(const char *)</text>
+    <polygon fill="#181818" points="195,247.85,185,251.85,195,255.85,191,251.85" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="251.85" y2="251.85"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="38" x="201" y="246.6">double</text>
+    <polygon fill="#181818" points="81,279.4,71,283.4,81,287.4,77,283.4" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="178" y1="283.4" y2="283.4"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="38" x="87" y="278.15">double</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="162,309.0001,172,313.0001,162,317.0001,166,313.0001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="313.0001" y2="313.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="77" y="307.4771">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="316.5,327.625,326.5,331.625,316.5,335.625,320.5,331.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="331.625" y2="331.625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="326.5591">a3(const char *)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="283,338.6001,293,342.6001,283,346.6001,287,342.6001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="342.6001" y2="342.6001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="191" y="337.0771">a3(const char *)</text>
     </a>
-    <polygon fill="#A80036" points="216.5,356.7578,206.5,360.7578,216.5,364.7578,212.5,360.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="360.7578" y2="360.7578"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="222.5" y="355.6919">const char *</text>
-    <polygon fill="#A80036" points="86.5,385.8906,76.5,389.8906,86.5,393.8906,82.5,389.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="80.5" x2="199.5" y1="389.8906" y2="389.8906"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="92.5" y="384.8247">const char *</text>
+    <polygon fill="#181818" points="195,370.1501,185,374.1501,195,378.1501,191,374.1501" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="374.1501" y2="374.1501"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="70" x="201" y="368.9001">const char *</text>
+    <polygon fill="#181818" points="76,401.7001,66,405.7001,76,409.7001,72,405.7001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="70" x2="178" y1="405.7001" y2="405.7001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="70" x="82" y="400.4501">const char *</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t20032_sequence_mermaid.svg b/docs/test_cases/t20032_sequence_mermaid.svg
index 86fd4f5a..8e19e3e6 100644
--- a/docs/test_cases/t20032_sequence_mermaid.svg
+++ b/docs/test_cases/t20032_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -103,28 +103,28 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="42" width="10" stroke="#666" fill="#EDF2AE" y="519" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">int</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="201" x2="280" y1="201" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="216" x="175">int</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="245" x2="80" y1="245" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="260" x="178">b(double)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="291" x2="275" y1="291" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="306" x="378">a2(double)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="337" x2="475" y1="337" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="352" x="375">double</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="381" x2="280" y1="381" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="175">double</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="425" x2="80" y1="425" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="440" x="178">b(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="471" x2="275" y1="471" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="486" x="378">a3(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="517" x2="475" y1="517" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="532" x="375">const char *</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="561" x2="280" y1="561" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="576" x="175">const char *</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="605" x2="80" y1="605" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="377">int</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="201" x2="283" y1="201" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="216" x="177">int</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="245" x2="83" y1="245" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="260" x="176">b(double)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="291" x2="271" y1="291" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="306" x="376">a2(double)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="337" x2="471" y1="337" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="352" x="377">double</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="381" x2="283" y1="381" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="177">double</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="425" x2="83" y1="425" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="440" x="176">b(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="471" x2="271" y1="471" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="486" x="376">a3(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="517" x2="471" y1="517" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="532" x="377">const char *</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="561" x2="283" y1="561" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="576" x="177">const char *</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="605" x2="83" y1="605" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20033.md b/docs/test_cases/t20033.md
index bf2f75e8..213cd2bf 100644
--- a/docs/test_cases/t20033.md
+++ b/docs/test_cases/t20033.md
@@ -15,7 +15,7 @@ diagrams:
       - function: "clanguml::t20033::tmain()"
 ```
 ## Source code
-File t20033.cc
+File `tests/t20033/t20033.cc`
 ```cpp
 #include <cmath>
 #include <cstdint>
diff --git a/docs/test_cases/t20033_sequence.svg b/docs/test_cases/t20033_sequence.svg
index cf252279..b2757a42 100644
--- a/docs/test_cases/t20033_sequence.svg
+++ b/docs/test_cases/t20033_sequence.svg
@@ -1,233 +1,222 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1055px" preserveAspectRatio="none" style="width:340px;height:1055px;" version="1.1" viewBox="0 0 340 1055" width="340px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1060px" preserveAspectRatio="none" style="width:270px;height:1060px;background:#FFFFFF;" version="1.1" viewBox="0 0 270 1060" width="270px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f18egxha503o0g" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="72.4297"/>
-    <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="130.3672"/>
-    <rect fill="#FFFFFF" height="144.2031" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="188.3047"/>
-    <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="332.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
-    <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="159" x="13" y="921.5"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="1014.7656"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="122.5" x2="122.5" y1="38.2969" y2="1014.7656"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18egxha503o0g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f18egxha503o0g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="1013.7656"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="1033.7607">tmain()</text>
+    <rect fill="#FFFFFF" height="968.4" style="stroke:#181818;stroke-width:1.0;" width="10" x="44.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="108.1999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="166.9998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="225.7997"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="269.3997"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="312.9997"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="358.5997"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="433.7998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="477.3998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="552.5998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="596.1998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="646.7998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="714.9999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="790.1999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="833.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="908.9999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="986.1999"/>
+    <rect fill="none" height="326.7998" style="stroke:#000000;stroke-width:1.5;" width="253" x="10" y="53.7999"/>
+    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="181" x="10" y="394.5997"/>
+    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="212" x="10" y="513.3998"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="170" x="10" y="675.7998"/>
+    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="215" x="10" y="750.9999"/>
+    <rect fill="none" height="63.2" style="stroke:#000000;stroke-width:1.5;" width="139" x="10" y="869.7999"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="121" x="10" y="946.9999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="49" x2="49" y1="36.7999" y2="1025.1999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="108" x2="108" y1="36.7999" y2="1025.1999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="20" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="27" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="20" y="1024.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="27" y="1044.2059">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18egxha503o0g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f18egxha503o0g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="1013.7656"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="1033.7607">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="97" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="104" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="97" y="1024.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="104" y="1044.2059">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
-    <rect fill="#FFFFFF" filter="url(#f18egxha503o0g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
-    <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="42" x="92" y="67.5073">[false]</text>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="73.4297" y2="73.4297"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="310" x="18" y="83.6401">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 100 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,104.3672,116,108.3672,106,112.3672,110,108.3672" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="108.3672" y2="108.3672"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="103.3013">a1()</text>
+    <rect fill="#FFFFFF" height="968.4" style="stroke:#181818;stroke-width:1.0;" width="10" x="44.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="108.1999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="166.9998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="225.7997"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="269.3997"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="312.9997"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="358.5997"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="433.7998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="477.3998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="552.5998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="596.1998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="646.7998"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="714.9999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="790.1999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="833.7999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="908.9999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="986.1999"/>
+    <path d="M10,53.7999 L70,53.7999 L70,61.3999 L60,71.3999 L10,71.3999 L10,53.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="326.7998" style="stroke:#000000;stroke-width:1.5;" width="253" x="10" y="53.7999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="66.8769">alt</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="33" x="85" y="66.0189">[false]</text>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="263" y1="72.3999" y2="72.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="248" x="15" y="82.6189">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 100 == 0ULL]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,104.1999,101.5,108.1999,91.5,112.1999,95.5,108.1999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="108.1999" y2="108.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="102.6769">a1()</text>
     </a>
-    <polygon fill="#A80036" points="72,118.3672,62,122.3672,72,126.3672,68,122.3672" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="122.3672" y2="122.3672"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="131.3672" y2="131.3672"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="302" x="18" y="141.5776">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 64 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,162.3047,116,166.3047,106,170.3047,110,166.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="166.3047" y2="166.3047"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="161.2388">a2()</text>
+    <polygon fill="#181818" points="65.5,118.1999,55.5,122.1999,65.5,126.1999,61.5,122.1999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="122.1999" y2="122.1999"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="263" y1="131.1999" y2="131.1999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="242" x="15" y="141.4188">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 64 == 0ULL]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,162.9998,101.5,166.9998,91.5,170.9998,95.5,166.9998" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="166.9998" y2="166.9998"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="161.4768">a2()</text>
     </a>
-    <polygon fill="#A80036" points="72,176.3047,62,180.3047,72,184.3047,68,180.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="180.3047" y2="180.3047"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="189.3047" y2="189.3047"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="182" x="18" y="199.5151">[a.a2() == 2 &amp;&amp; a.a3() == 3]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,220.2422,116,224.2422,106,228.2422,110,224.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="224.2422" y2="224.2422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="219.1763">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="219.1763">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="219.1763">]</text>
+    <polygon fill="#181818" points="65.5,176.9998,55.5,180.9998,65.5,184.9998,61.5,180.9998" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="180.9998" y2="180.9998"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="263" y1="189.9998" y2="189.9998"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="136" x="15" y="200.2187">[a.a2() == 2 &amp;&amp; a.a3() == 3]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,221.7997,101.5,225.7997,91.5,229.7997,95.5,225.7997" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="225.7997" y2="225.7997"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="220.2767">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="220.2767">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="220.2767">]</text>
     </a>
-    <polygon fill="#A80036" points="72,234.2422,62,238.2422,72,242.2422,68,238.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="238.2422" y2="238.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,263.375,116,267.375,106,271.375,110,267.375" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="267.375" y2="267.375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="262.3091">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="262.3091">a3()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="262.3091">]</text>
+    <polygon fill="#181818" points="65.5,235.7997,55.5,239.7997,65.5,243.7997,61.5,239.7997" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="239.7997" y2="239.7997"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,265.3997,101.5,269.3997,91.5,273.3997,95.5,269.3997" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="269.3997" y2="269.3997"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="263.8767">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="263.8767">a3()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="263.8767">]</text>
     </a>
-    <polygon fill="#A80036" points="72,277.375,62,281.375,72,285.375,68,281.375" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="281.375" y2="281.375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,306.5078,116,310.5078,106,314.5078,110,310.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="310.5078" y2="310.5078"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="305.4419">a3()</text>
+    <polygon fill="#181818" points="65.5,279.3997,55.5,283.3997,65.5,287.3997,61.5,283.3997" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="283.3997" y2="283.3997"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,308.9997,101.5,312.9997,91.5,316.9997,95.5,312.9997" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="312.9997" y2="312.9997"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="307.4767">a3()</text>
     </a>
-    <polygon fill="#A80036" points="72,320.5078,62,324.5078,72,328.5078,68,324.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="324.5078" y2="324.5078"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="333.5078" y2="333.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,351.6406,116,355.6406,106,359.6406,110,355.6406" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="355.6406" y2="355.6406"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="350.5747">a4()</text>
+    <polygon fill="#181818" points="65.5,322.9997,55.5,326.9997,65.5,330.9997,61.5,326.9997" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="326.9997" y2="326.9997"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="263" y1="335.9997" y2="335.9997"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,354.5997,101.5,358.5997,91.5,362.5997,95.5,358.5997" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="358.5997" y2="358.5997"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="353.0767">a4()</text>
     </a>
-    <polygon fill="#A80036" points="72,365.6406,62,369.6406,72,373.6406,68,369.6406" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="369.6406" y2="369.6406"/>
-    <path d="M13,391.6406 L77,391.6406 L77,398.6406 L67,408.6406 L13,408.6406 L13,391.6406 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="404.7075">alt</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="132" x="92" y="403.8511">[int i = a.a2(); i != 2]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,425.9063,116,429.9063,106,433.9063,110,429.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="429.9063" y2="429.9063"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="424.8403">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="424.8403">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="424.8403">]</text>
+    <polygon fill="#181818" points="65.5,368.5997,55.5,372.5997,65.5,376.5997,61.5,372.5997" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="372.5997" y2="372.5997"/>
+    <path d="M10,394.5997 L70,394.5997 L70,402.1997 L60,412.1997 L10,412.1997 L10,394.5997 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="181" x="10" y="394.5997"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="407.6767">alt</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="101" x="85" y="406.8187">[int i = a.a2(); i != 2]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,429.7998,101.5,433.7998,91.5,437.7998,95.5,433.7998" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="433.7998" y2="433.7998"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="428.2768">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="428.2768">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="428.2768">]</text>
     </a>
-    <polygon fill="#A80036" points="72,439.9063,62,443.9063,72,447.9063,68,443.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="443.9063" y2="443.9063"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,469.0391,116,473.0391,106,477.0391,110,473.0391" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="473.0391" y2="473.0391"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="467.9731">a3()</text>
+    <polygon fill="#181818" points="65.5,443.7998,55.5,447.7998,65.5,451.7998,61.5,447.7998" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="447.7998" y2="447.7998"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,473.3998,101.5,477.3998,91.5,481.3998,95.5,477.3998" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="477.3998" y2="477.3998"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="471.8768">a3()</text>
     </a>
-    <polygon fill="#A80036" points="72,483.0391,62,487.0391,72,491.0391,68,487.0391" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="487.0391" y2="487.0391"/>
-    <path d="M13,509.0391 L90,509.0391 L90,516.0391 L80,526.0391 L13,526.0391 L13,509.0391 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="522.106">loop</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="157" x="105" y="521.2495">[int i = 0; i &lt; a.a2(); i++]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,543.3047,116,547.3047,106,551.3047,110,547.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="547.3047" y2="547.3047"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="542.2388">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="542.2388">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="542.2388">]</text>
+    <polygon fill="#181818" points="65.5,487.3998,55.5,491.3998,65.5,495.3998,61.5,491.3998" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="491.3998" y2="491.3998"/>
+    <path d="M10,513.3998 L83,513.3998 L83,520.9998 L73,530.9998 L10,530.9998 L10,513.3998 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="212" x="10" y="513.3998"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="526.4768">loop</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="119" x="98" y="525.6187">[int i = 0; i &lt; a.a2(); i++]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,548.5998,101.5,552.5998,91.5,556.5998,95.5,552.5998" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="552.5998" y2="552.5998"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="547.0768">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="547.0768">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="547.0768">]</text>
     </a>
-    <polygon fill="#A80036" points="72,557.3047,62,561.3047,72,565.3047,68,561.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="561.3047" y2="561.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,586.4375,116,590.4375,106,594.4375,110,590.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="590.4375" y2="590.4375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="585.3716">a3()</text>
+    <polygon fill="#181818" points="65.5,562.5998,55.5,566.5998,65.5,570.5998,61.5,566.5998" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="566.5998" y2="566.5998"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,592.1998,101.5,596.1998,91.5,600.1998,95.5,596.1998" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="596.1998" y2="596.1998"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="590.6768">a3()</text>
     </a>
-    <polygon fill="#A80036" points="72,600.4375,62,604.4375,72,608.4375,68,604.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="604.4375" y2="604.4375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,636.5703,116,640.5703,106,644.5703,110,640.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="640.5703" y2="640.5703"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="635.5044">a3()</text>
+    <polygon fill="#181818" points="65.5,606.1998,55.5,610.1998,65.5,614.1998,61.5,610.1998" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="610.1998" y2="610.1998"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,642.7998,101.5,646.7998,91.5,650.7998,95.5,646.7998" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="646.7998" y2="646.7998"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="641.2768">a3()</text>
     </a>
-    <polygon fill="#A80036" points="72,650.5703,62,654.5703,72,658.5703,68,654.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="654.5703" y2="654.5703"/>
-    <path d="M13,669.5703 L90,669.5703 L90,676.5703 L80,686.5703 L13,686.5703 L13,669.5703 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="682.6372">loop</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="92" x="105" y="681.7808">[retry_count--]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,703.8359,116,707.8359,106,711.8359,110,707.8359" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="707.8359" y2="707.8359"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="702.77">a2()</text>
+    <polygon fill="#181818" points="65.5,656.7998,55.5,660.7998,65.5,664.7998,61.5,660.7998" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="660.7998" y2="660.7998"/>
+    <path d="M10,675.7998 L83,675.7998 L83,683.3998 L73,693.3998 L10,693.3998 L10,675.7998 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="170" x="10" y="675.7998"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="688.8768">loop</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="77" x="98" y="688.0187">[retry_count--]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,710.9999,101.5,714.9999,91.5,718.9999,95.5,714.9999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="714.9999" y2="714.9999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="709.4768">a2()</text>
     </a>
-    <polygon fill="#A80036" points="72,717.8359,62,721.8359,72,725.8359,68,721.8359" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="721.8359" y2="721.8359"/>
-    <path d="M13,743.8359 L90,743.8359 L90,750.8359 L80,760.8359 L13,760.8359 L13,743.8359 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="756.9028">loop</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="155" x="105" y="756.0464">[retry_count++ &lt; a.a3()]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,778.1016,116,782.1016,106,786.1016,110,782.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="782.1016" y2="782.1016"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="777.0356">a4()</text>
+    <polygon fill="#181818" points="65.5,724.9999,55.5,728.9999,65.5,732.9999,61.5,728.9999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="728.9999" y2="728.9999"/>
+    <path d="M10,750.9999 L83,750.9999 L83,758.5999 L73,768.5999 L10,768.5999 L10,750.9999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="215" x="10" y="750.9999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="764.0769">loop</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="122" x="98" y="763.2188">[retry_count++ &lt; a.a3()]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,786.1999,101.5,790.1999,91.5,794.1999,95.5,790.1999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="790.1999" y2="790.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="784.6769">a4()</text>
     </a>
-    <polygon fill="#A80036" points="72,792.1016,62,796.1016,72,800.1016,68,796.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="796.1016" y2="796.1016"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,821.2344,116,825.2344,106,829.2344,110,825.2344" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="825.2344" y2="825.2344"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="820.1685">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="820.1685">a3()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="820.1685">]</text>
+    <polygon fill="#181818" points="65.5,800.1999,55.5,804.1999,65.5,808.1999,61.5,804.1999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="804.1999" y2="804.1999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,829.7999,101.5,833.7999,91.5,837.7999,95.5,833.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="833.7999" y2="833.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="828.2769">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="828.2769">a3()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="828.2769">]</text>
     </a>
-    <polygon fill="#A80036" points="72,835.2344,62,839.2344,72,843.2344,68,839.2344" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="839.2344" y2="839.2344"/>
-    <path d="M13,861.2344 L77,861.2344 L77,868.2344 L67,878.2344 L13,878.2344 L13,861.2344 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="874.3013">alt</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="75" x="92" y="873.4448">[a.a4() % 6]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,895.5,116,899.5,106,903.5,110,899.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="899.5" y2="899.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="894.4341">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="894.4341">a4()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="894.4341">]</text>
+    <polygon fill="#181818" points="65.5,843.7999,55.5,847.7999,65.5,851.7999,61.5,847.7999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="847.7999" y2="847.7999"/>
+    <path d="M10,869.7999 L70,869.7999 L70,877.3999 L60,887.3999 L10,887.3999 L10,869.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="63.2" style="stroke:#000000;stroke-width:1.5;" width="139" x="10" y="869.7999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="882.8769">alt</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="59" x="85" y="882.0188">[a.a4() % 6]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,904.9999,101.5,908.9999,91.5,912.9999,95.5,908.9999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="908.9999" y2="908.9999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="903.4769">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="903.4769">a4()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="903.4769">]</text>
     </a>
-    <polygon fill="#A80036" points="72,909.5,62,913.5,72,917.5,68,913.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="913.5" y2="913.5"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="172" y1="922.5" y2="922.5"/>
-    <path d="M13,937.5 L90,937.5 L90,944.5 L80,954.5 L13,954.5 L13,937.5 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="950.5669">loop</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="105" y="949.7104">[ints]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="106,971.7656,116,975.7656,106,979.7656,110,975.7656" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="975.7656" y2="975.7656"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="970.6997">a4()</text>
+    <polygon fill="#181818" points="65.5,918.9999,55.5,922.9999,65.5,926.9999,61.5,922.9999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="922.9999" y2="922.9999"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="149" y1="931.9999" y2="931.9999"/>
+    <path d="M10,946.9999 L83,946.9999 L83,954.5999 L73,964.5999 L10,964.5999 L10,946.9999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="121" x="10" y="946.9999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="960.0769">loop</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="28" x="98" y="959.2188">[ints]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="91.5,982.1999,101.5,986.1999,91.5,990.1999,95.5,986.1999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="986.1999" y2="986.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="980.6769">a4()</text>
     </a>
-    <polygon fill="#A80036" points="72,985.7656,62,989.7656,72,993.7656,68,989.7656" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="989.7656" y2="989.7656"/>
+    <polygon fill="#181818" points="65.5,996.1999,55.5,1000.1999,65.5,1004.1999,61.5,1000.1999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="1000.1999" y2="1000.1999"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20033_sequence_mermaid.svg b/docs/test_cases/t20033_sequence_mermaid.svg
index 95d14083..da3436dd 100644
--- a/docs/test_cases/t20033_sequence_mermaid.svg
+++ b/docs/test_cases/t20033_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -102,11 +102,11 @@
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="93" x="200">
       <tspan x="200">[false]</tspan>
     </text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="143" x="175">[reinterpret_cast&lt;uint6-</text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="161" x="175">4_t&gt;(&amp;a) % 100 ==</text>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="143" x="175">[reinterpret_cast&lt;uint-</text>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="161" x="175">64_t&gt;(&amp;a) % 100 ==</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="179" x="175">0ULL]</text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="277" x="175">[reinterpret_cast&lt;uint6-</text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="295" x="175">4_t&gt;(&amp;a) % 64 ==</text>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="277" x="175">[reinterpret_cast&lt;uint-</text>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="295" x="175">64_t&gt;(&amp;a) % 64 ==</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="313" x="175">0ULL]</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="411" x="175">[a.a2() == 2 &amp;&amp;</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="428" x="175">a.a3() == 3]</text>
@@ -217,68 +217,68 @@
       <tspan x="200">[ints]</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="203" x="178">a1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="234" x2="275" y1="234" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="249" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="244" x2="80" y1="244" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="337" x="178">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="368" x2="275" y1="368" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="383" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="378" x2="80" y1="378" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="454" x="178">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="485" x2="275" y1="485" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="500" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="495" x2="80" y1="495" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="510" x="178">[a3()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="541" x2="275" y1="541" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="556" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="551" x2="80" y1="551" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="566" x="178">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="597" x2="275" y1="597" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="612" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="607" x2="80" y1="607" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="647" x="178">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="678" x2="275" y1="678" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="693" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="688" x2="80" y1="688" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="785" x="178">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="816" x2="275" y1="816" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="831" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="826" x2="80" y1="826" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="841" x="178">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="872" x2="275" y1="872" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="887" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="882" x2="80" y1="882" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="979" x="178">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1010" x2="275" y1="1010" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1025" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1020" x2="80" y1="1020" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1035" x="178">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1066" x2="275" y1="1066" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1081" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1076" x2="80" y1="1076" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1113" x="178">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1144" x2="275" y1="1144" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1159" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1154" x2="80" y1="1154" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1214" x="178">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1245" x2="275" y1="1245" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1260" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1255" x2="80" y1="1255" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1353" x="178">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1384" x2="275" y1="1384" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1399" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1394" x2="80" y1="1394" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1409" x="178">[a3()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1440" x2="275" y1="1440" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1455" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1450" x2="80" y1="1450" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1532" x="178">[a4()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1563" x2="275" y1="1563" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1578" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1573" x2="80" y1="1573" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1655" x="178">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1686" x2="275" y1="1686" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1701" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1696" x2="80" y1="1696" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="203" x="176">a1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="234" x2="271" y1="234" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="249" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="244" x2="83" y1="244" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="337" x="176">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="368" x2="271" y1="368" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="383" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="378" x2="83" y1="378" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="454" x="176">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="485" x2="271" y1="485" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="500" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="495" x2="83" y1="495" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="510" x="176">[a3()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="541" x2="271" y1="541" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="556" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="551" x2="83" y1="551" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="566" x="176">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="597" x2="271" y1="597" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="612" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="607" x2="83" y1="607" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="647" x="176">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="678" x2="271" y1="678" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="693" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="688" x2="83" y1="688" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="785" x="176">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="816" x2="271" y1="816" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="831" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="826" x2="83" y1="826" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="841" x="176">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="872" x2="271" y1="872" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="887" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="882" x2="83" y1="882" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="979" x="176">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1010" x2="271" y1="1010" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1025" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1020" x2="83" y1="1020" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1035" x="176">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1066" x2="271" y1="1066" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1081" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1076" x2="83" y1="1076" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1113" x="176">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1144" x2="271" y1="1144" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1159" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1154" x2="83" y1="1154" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1214" x="176">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1245" x2="271" y1="1245" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1260" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1255" x2="83" y1="1255" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1353" x="176">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1384" x2="271" y1="1384" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1399" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1394" x2="83" y1="1394" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1409" x="176">[a3()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1440" x2="271" y1="1440" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1455" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1450" x2="83" y1="1450" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1532" x="176">[a4()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1563" x2="271" y1="1563" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1578" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1573" x2="83" y1="1573" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1655" x="176">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1686" x2="271" y1="1686" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1701" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1696" x2="83" y1="1696" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20034.md b/docs/test_cases/t20034.md
index b7a4b87e..5eab7fee 100644
--- a/docs/test_cases/t20034.md
+++ b/docs/test_cases/t20034.md
@@ -15,7 +15,7 @@ diagrams:
          function: "clanguml::t20034::A::a2()"]
 ```
 ## Source code
-File t20034.cc
+File `tests/t20034/t20034.cc`
 ```cpp
 #include <cstdint>
 
diff --git a/docs/test_cases/t20034_sequence.svg b/docs/test_cases/t20034_sequence.svg
index d58a926d..d12a4ac2 100644
--- a/docs/test_cases/t20034_sequence.svg
+++ b/docs/test_cases/t20034_sequence.svg
@@ -1,170 +1,164 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="934px" preserveAspectRatio="none" style="width:499px;height:934px;" version="1.1" viewBox="0 0 499 934" width="499px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="939px" preserveAspectRatio="none" style="width:446px;height:939px;background:#FFFFFF;" version="1.1" viewBox="0 0 446 939" width="446px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="faq63jbbs5bpy" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="52.5" x2="52.5" y1="38.2969" y2="894.3516"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="102" x2="102" y1="38.2969" y2="894.3516"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="152" x2="152" y1="38.2969" y2="894.3516"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="894.3516"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="353.5" x2="353.5" y1="38.2969" y2="894.3516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="893.3516"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="913.3467">D</text>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="46" x2="46" y1="36.7999" y2="903.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="92" x2="92" y1="36.7999" y2="903.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="137.5" x2="137.5" y1="36.7999" y2="903.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="183.5" x2="183.5" y1="36.7999" y2="903.6002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="319.5" x2="319.5" y1="36.7999" y2="903.6002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="34" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="41" y="25.0059">D</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="34" y="902.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="41" y="922.6062">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="893.3516"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="913.3467">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="80" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="87" y="25.0059">C</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="80" y="902.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="87" y="922.6062">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="893.3516"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="913.3467">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="126.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="133.5" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="126.5" y="902.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="133.5" y="922.6062">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="893.3516"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="913.3467">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="172.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="179.5" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="172.5" y="902.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="179.5" y="922.6062">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda t20034.cc:56:18)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="239" x="232.5" y="22.9951">D::d2()::(lambda t20034.cc:56:18)</text>
-      <rect fill="#FEFECE" filter="url(#faq63jbbs5bpy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="893.3516"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="239" x="232.5" y="913.3467">D::d2()::(lambda t20034.cc:56:18)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda t20034.cc:56:18)" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="205.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215" x="212.5" y="25.0059">D::d2()::(lambda t20034.cc:56:18)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="205.5" y="902.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215" x="212.5" y="922.6062">D::d2()::(lambda t20034.cc:56:18)</text>
     </a>
-    <polygon fill="#A80036" points="41,65.4297,51,69.4297,41,73.4297,45,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="69.4297" y2="69.4297"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="64.3638">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="93.4966">c2()</text>
+    <polygon fill="#181818" points="34,64.3999,44,68.3999,34,72.3999,38,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="68.3999" y2="68.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="62.8769">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,94,90,98,80,102,84,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="92.477">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,123.6,136,127.6,126,131.6,130,127.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="127.6" y2="127.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="122.077">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="190,152.8281,200,156.8281,190,160.8281,194,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="156.8281" y2="156.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="151.7622">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="172,153.2,182,157.2,172,161.2,176,157.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="178" y1="157.2" y2="157.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="151.677">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#faq63jbbs5bpy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="177.8281"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="177.8281" y2="177.8281"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="180.8281" y2="180.8281"/>
-    <polygon fill="#A80036" points="41,209.9609,51,213.9609,41,217.9609,45,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="213.9609" y2="213.9609"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="208.895">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="190,239.0938,200,243.0938,190,247.0938,194,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="196" y1="243.0938" y2="243.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="60" y="238.0278">a2()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="178.2"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="178.2" y2="178.2"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="181.2" y2="181.2"/>
+    <polygon fill="#181818" points="34,210.8,44,214.8,34,218.8,38,214.8" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="214.8" y2="214.8"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="209.277">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="172,240.4,182,244.4,172,248.4,176,244.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="178" y1="244.4" y2="244.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="238.877">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#faq63jbbs5bpy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="264.0938"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="264.0938" y2="264.0938"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="267.0938" y2="267.0938"/>
-    <polygon fill="#A80036" points="41,296.2266,51,300.2266,41,304.2266,45,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="300.2266" y2="300.2266"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="295.1606">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="342,325.3594,352,329.3594,342,333.3594,346,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="348" y1="329.3594" y2="329.3594"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="60" y="324.2935">operator()()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="265.4"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="265.4" y2="265.4"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="268.4" y2="268.4"/>
+    <polygon fill="#181818" points="34,298,44,302,34,306,38,302" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="302" y2="302"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="296.477">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="308,327.6,318,331.6,308,335.6,312,331.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="314" y1="331.6" y2="331.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="53" y="326.077">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="213,354.4922,203,358.4922,213,362.4922,209,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="207" x2="353" y1="358.4922" y2="358.4922"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="219" y="353.4263">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="195,357.2001,185,361.2001,195,365.2001,191,361.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="189" x2="319" y1="361.2001" y2="361.2001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="201" y="355.677">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#faq63jbbs5bpy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="379.4922"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="379.4922" y2="379.4922"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="382.4922" y2="382.4922"/>
-    <polygon fill="#A80036" points="41,411.625,51,415.625,41,419.625,45,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="415.625" y2="415.625"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="410.5591">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="444.7578" y2="444.7578"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="439.6919">c4()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="382.2001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="382.2001" y2="382.2001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="385.2001" y2="385.2001"/>
+    <polygon fill="#181818" points="34,414.8001,44,418.8001,34,422.8001,38,418.8001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="418.8001" y2="418.8001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="413.2771">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,444.4001,90,448.4001,80,452.4001,84,448.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="448.4001" y2="448.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="442.8771">c4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">b4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,474.0001,136,478.0001,126,482.0001,130,478.0001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="478.0001" y2="478.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="472.4771">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="194" y1="503.0234" y2="503.0234"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="194" y1="503.0234" y2="516.0234"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="153" x2="194" y1="516.0234" y2="516.0234"/>
-      <polygon fill="#A80036" points="163,512.0234,153,516.0234,163,520.0234,159,516.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="497.9575">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="180" y1="507.6001" y2="507.6001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="180" x2="180" y1="507.6001" y2="520.6001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="139" x2="180" y1="520.6001" y2="520.6001"/>
+      <polygon fill="#181818" points="149,516.6001,139,520.6001,149,524.6001,145,520.6001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="502.0771">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="190,541.1563,200,545.1563,190,549.1563,194,545.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="545.1563" y2="545.1563"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="540.0903">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="172,546.2001,182,550.2001,172,554.2001,176,550.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="178" y1="550.2001" y2="550.2001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="544.6771">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#faq63jbbs5bpy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="566.1563"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="566.1563" y2="566.1563"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="569.1563" y2="569.1563"/>
-    <polygon fill="#A80036" points="41,598.2891,51,602.2891,41,606.2891,45,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="602.2891" y2="602.2891"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="597.2231">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,627.4219,100,631.4219,90,635.4219,94,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="631.4219" y2="631.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="626.356">c1()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="571.2001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="571.2001" y2="571.2001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="574.2001" y2="574.2001"/>
+    <polygon fill="#181818" points="34,603.8001,44,607.8001,34,611.8001,38,607.8001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="607.8001" y2="607.8001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="602.2771">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,633.4001,90,637.4001,80,641.4001,84,637.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="637.4001" y2="637.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="631.8771">c1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,656.5547,150,660.5547,140,664.5547,144,660.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="660.5547" y2="660.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="655.4888">b1()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,663.0002,136,667.0002,126,671.0002,130,667.0002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="667.0002" y2="667.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="661.4772">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="190,685.6875,200,689.6875,190,693.6875,194,689.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="689.6875" y2="689.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="684.6216">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="172,692.6002,182,696.6002,172,700.6002,176,696.6002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="178" y1="696.6002" y2="696.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="691.0772">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#faq63jbbs5bpy)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="710.6875"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="710.6875" y2="710.6875"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="713.6875" y2="713.6875"/>
-    <polygon fill="#A80036" points="41,742.8203,51,746.8203,41,750.8203,45,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="746.8203" y2="746.8203"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="741.7544">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,771.9531,100,775.9531,90,779.9531,94,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="775.9531" y2="775.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="770.8872">c3()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="717.6002"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="717.6002" y2="717.6002"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="720.6002" y2="720.6002"/>
+    <polygon fill="#181818" points="34,750.2002,44,754.2002,34,758.2002,38,754.2002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="754.2002" y2="754.2002"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="748.6772">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,779.8002,90,783.8002,80,787.8002,84,783.8002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="783.8002" y2="783.8002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="778.2772">c3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="144" y1="805.0859" y2="805.0859"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="144" x2="144" y1="805.0859" y2="818.0859"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="103" x2="144" y1="818.0859" y2="818.0859"/>
-      <polygon fill="#A80036" points="113,814.0859,103,818.0859,113,822.0859,109,818.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="109" y="800.02">c2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="134" y1="813.4002" y2="813.4002"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="134" x2="134" y1="813.4002" y2="826.4002"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="93" x2="134" y1="826.4002" y2="826.4002"/>
+      <polygon fill="#181818" points="103,822.4002,93,826.4002,103,830.4002,99,826.4002" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="807.8772">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,843.2188,150,847.2188,140,851.2188,144,847.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="847.2188" y2="847.2188"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="842.1528">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,852.0002,136,856.0002,126,860.0002,130,856.0002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="856.0002" y2="856.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="850.4772">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="190,872.3516,200,876.3516,190,880.3516,194,876.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="876.3516" y2="876.3516"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="871.2856">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="172,881.6002,182,885.6002,172,889.6002,176,885.6002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="178" y1="885.6002" y2="885.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="880.0772">a2()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20034_sequence_mermaid.svg b/docs/test_cases/t20034_sequence_mermaid.svg
index e8db8167..50735c40 100644
--- a/docs/test_cases/t20034_sequence_mermaid.svg
+++ b/docs/test_cases/t20034_sequence_mermaid.svg
@@ -108,17 +108,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -127,50 +127,50 @@
       <circle r="6" cy="15" cx="15"/>
     </marker>
   </defs>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="375">c2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="575">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="475"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="775">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="675"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="175">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="275" y1="295" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="575">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="875" y1="341" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="175">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="275" y1="387" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="698">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="1120.5" y1="433" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="448" x="998">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="479" x2="875" y1="479" x1="1120.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="494" x="175">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="275" y1="525" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="375">c4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="475" y1="571" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="575">b4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="675" y1="617" x1="475"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="675">b2()</text>
-  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 675,663 C 735,653 735,693 675,683"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="708" x="775">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="739" x2="875" y1="739" x1="675"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="754" x="175">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="785" x2="275" y1="785" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="800" x="375">c1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="831" x2="475" y1="831" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="846" x="575">b1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="877" x2="675" y1="877" x1="475"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="892" x="775">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="923" x2="875" y1="923" x1="675"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="938" x="175">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="969" x2="275" y1="969" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="984" x="375">c3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1015" x2="475" y1="1015" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1030" x="475">c2()</text>
-  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 475,1061 C 535,1051 535,1091 475,1081"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1106" x="575">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1137" x2="675" y1="1137" x1="475"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1152" x="775">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1183" x2="875" y1="1183" x1="675"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="174">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="374">c2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="574">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="774">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="676"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="174">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="271" y1="295" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="574">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="871" y1="341" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="174">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="271" y1="387" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="696">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="1116.5" y1="433" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="448" x="999">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="479" x2="879" y1="479" x1="1119.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="494" x="174">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="271" y1="525" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="374">c4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="471" y1="571" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="574">b4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="671" y1="617" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="676">b2()</text>
+  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 676,663 C 736,653 736,693 676,683"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="708" x="774">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="739" x2="871" y1="739" x1="676"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="754" x="174">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="785" x2="271" y1="785" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="800" x="374">c1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="831" x2="471" y1="831" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="846" x="574">b1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="877" x2="671" y1="877" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="892" x="774">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="923" x2="871" y1="923" x1="676"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="938" x="174">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="969" x2="271" y1="969" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="984" x="374">c3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1015" x2="471" y1="1015" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1030" x="476">c2()</text>
+  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 476,1061 C 536,1051 536,1091 476,1081"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1106" x="574">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1137" x2="671" y1="1137" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1152" x="774">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1183" x2="871" y1="1183" x1="676"/>
 </svg>
diff --git a/docs/test_cases/t20035.md b/docs/test_cases/t20035.md
index 1edc8b2a..65eb29c0 100644
--- a/docs/test_cases/t20035.md
+++ b/docs/test_cases/t20035.md
@@ -15,7 +15,7 @@ diagrams:
          function: "clanguml::t20035::c(int)"]
 ```
 ## Source code
-File t20035.cc
+File `tests/t20035/t20035.cc`
 ```cpp
 namespace clanguml {
 namespace t20035 {
diff --git a/docs/test_cases/t20035_sequence.svg b/docs/test_cases/t20035_sequence.svg
index 2f1a311f..3a9db5a3 100644
--- a/docs/test_cases/t20035_sequence.svg
+++ b/docs/test_cases/t20035_sequence.svg
@@ -1,53 +1,47 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="140px" preserveAspectRatio="none" style="width:349px;height:140px;" version="1.1" viewBox="0 0 349 140" width="349px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="134px" preserveAspectRatio="none" style="width:309px;height:134px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 134" width="309px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fd7iy5kimofd9" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="100.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="179" x2="179" y1="38.2969" y2="100.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="247" x2="247" y1="38.2969" y2="100.2969"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="315" x2="315" y1="38.2969" y2="100.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fd7iy5kimofd9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#fd7iy5kimofd9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="99.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="119.292">tmain(int,char **)</text>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="65" x2="65" y1="36.7999" y2="98.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="158" x2="158" y1="36.7999" y2="98.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="219" x2="219" y1="36.7999" y2="98.7999"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="280" x2="280" y1="36.7999" y2="98.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="25.0059">tmain(int,char **)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="97.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="117.8059">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fd7iy5kimofd9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="22.9951">a(int)</text>
-      <rect fill="#FEFECE" filter="url(#fd7iy5kimofd9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="99.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="119.292">a(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="47" x="135" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="142" y="25.0059">a(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="47" x="135" y="97.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="142" y="117.8059">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fd7iy5kimofd9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="22.9951">b1(int)</text>
-      <rect fill="#FEFECE" filter="url(#fd7iy5kimofd9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="99.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="119.292">b1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="192" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="199" y="25.0059">b1(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="192" y="97.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="199" y="117.8059">b1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fd7iy5kimofd9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="22.9951">c(int)</text>
-      <rect fill="#FEFECE" filter="url(#fd7iy5kimofd9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="99.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="119.292">c(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="46" x="257" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="264" y="25.0059">c(int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="46" x="257" y="97.7999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="264" y="117.8059">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="167.5,50.2969,177.5,54.2969,167.5,58.2969,171.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="75.5" x2="173.5" y1="54.2969" y2="54.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="146.5,48.7999,156.5,52.7999,146.5,56.7999,150.5,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="65" x2="152.5" y1="52.7999" y2="52.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="235.5,64.2969,245.5,68.2969,235.5,72.2969,239.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="179.5" x2="241.5" y1="68.2969" y2="68.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="207.5,62.7999,217.5,66.7999,207.5,70.7999,211.5,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="158.5" x2="213.5" y1="66.7999" y2="66.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="303.5,78.2969,313.5,82.2969,303.5,86.2969,307.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="247.5" x2="309.5" y1="82.2969" y2="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="268,76.7999,278,80.7999,268,84.7999,272,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="219.5" x2="274" y1="80.7999" y2="80.7999"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20035_sequence_mermaid.svg b/docs/test_cases/t20035_sequence_mermaid.svg
index dbd1dab4..f0b89c98 100644
--- a/docs/test_cases/t20035_sequence_mermaid.svg
+++ b/docs/test_cases/t20035_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -97,10 +97,10 @@
       <circle r="6" cy="15" cx="15"/>
     </marker>
   </defs>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="375">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="475" y1="85" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="575">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="675" y1="95" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="174">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="374">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="471" y1="85" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="574">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="671" y1="95" x1="476"/>
 </svg>
diff --git a/docs/test_cases/t20036.md b/docs/test_cases/t20036.md
index 3c20c1dc..0c56f2a7 100644
--- a/docs/test_cases/t20036.md
+++ b/docs/test_cases/t20036.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20036::A::a2()"
 ```
 ## Source code
-File t20036.cc
+File `tests/t20036/t20036.cc`
 ```cpp
 #include <cstdint>
 
diff --git a/docs/test_cases/t20036_sequence.svg b/docs/test_cases/t20036_sequence.svg
index 2578e324..e4b965f7 100644
--- a/docs/test_cases/t20036_sequence.svg
+++ b/docs/test_cases/t20036_sequence.svg
@@ -1,146 +1,140 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="834px" preserveAspectRatio="none" style="width:233px;height:834px;" version="1.1" viewBox="0 0 233 834" width="233px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="837px" preserveAspectRatio="none" style="width:208px;height:837px;background:#FFFFFF;" version="1.1" viewBox="0 0 208 837" width="208px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f14gxv5qlau673" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="52" x2="52" y1="38.2969" y2="793.9531"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="102" x2="102" y1="38.2969" y2="793.9531"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="793.9531"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="793.9531"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14gxv5qlau673)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f14gxv5qlau673)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="792.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="812.9482">C</text>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="46" x2="46" y1="36.7999" y2="801.8002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="91.5" x2="91.5" y1="36.7999" y2="801.8002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="137.5" x2="137.5" y1="36.7999" y2="801.8002"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="184" x2="184" y1="36.7999" y2="801.8002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="34" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="41" y="25.0059">C</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="34" y="800.8002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="41" y="820.8061">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14gxv5qlau673)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f14gxv5qlau673)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="792.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="812.9482">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="80.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="87.5" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="80.5" y="800.8002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="87.5" y="820.8061">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14gxv5qlau673)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f14gxv5qlau673)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="792.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="812.9482">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="126.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="133.5" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="126.5" y="800.8002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="133.5" y="820.8061">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14gxv5qlau673)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f14gxv5qlau673)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="792.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="812.9482">D</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="172" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="179" y="25.0059">D</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="172" y="800.8002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="179" y="820.8061">D</text>
     </a>
-    <polygon fill="#A80036" points="40,65.4297,50,69.4297,40,73.4297,44,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="69.4297" y2="69.4297"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="64.3638">c1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="98.5625" y2="98.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="93.4966">b1()</text>
+    <polygon fill="#181818" points="34,64.3999,44,68.3999,34,72.3999,38,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="68.3999" y2="68.3999"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="62.8769">c1()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,94,90,98,80,102,84,98" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="98" y2="98"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="92.477">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,123.6,136,127.6,126,131.6,130,127.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="127.6" y2="127.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="122.077">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f14gxv5qlau673)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="148.6953"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="148.6953" y2="148.6953"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="151.6953" y2="151.6953"/>
-    <polygon fill="#A80036" points="190,180.8281,200,184.8281,190,188.8281,194,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="184.8281" y2="184.8281"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="179.7622">d1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="63,209.9609,53,213.9609,63,217.9609,59,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="213.9609" y2="213.9609"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="208.895">c2()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="148.6"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="148.6" y2="148.6"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="151.6" y2="151.6"/>
+    <polygon fill="#181818" points="172,181.2,182,185.2,172,189.2,176,185.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="178" y1="185.2" y2="185.2"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="179.677">d1()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="57,210.8,47,214.8,57,218.8,53,214.8" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="51" x2="183" y1="214.8" y2="214.8"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="63" y="209.277">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,239.0938,100,243.0938,90,247.0938,94,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="243.0938" y2="243.0938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="238.0278">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,240.4,90,244.4,80,248.4,84,244.4" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="244.4" y2="244.4"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="238.877">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,268.2266,150,272.2266,140,276.2266,144,272.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="272.2266" y2="272.2266"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="267.1606">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,270,136,274,126,278,130,274" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="274" y2="274"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="268.477">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f14gxv5qlau673)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="293.2266"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="293.2266" y2="293.2266"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="296.2266" y2="296.2266"/>
-    <polygon fill="#A80036" points="190,325.3594,200,329.3594,190,333.3594,194,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="329.3594" y2="329.3594"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="324.2935">d3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="163,354.4922,153,358.4922,163,362.4922,159,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="201" y1="358.4922" y2="358.4922"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="169" y="353.4263">a2()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="295"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="295" y2="295"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="298" y2="298"/>
+    <polygon fill="#181818" points="172,327.6,182,331.6,172,335.6,176,331.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="178" y1="331.6" y2="331.6"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="326.077">d3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="149,357.2001,139,361.2001,149,365.2001,145,361.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="143" x2="183" y1="361.2001" y2="361.2001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="155" y="355.677">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f14gxv5qlau673)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="379.4922"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="379.4922" y2="379.4922"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="382.4922" y2="382.4922"/>
-    <polygon fill="#A80036" points="40,411.625,50,415.625,40,419.625,44,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="415.625" y2="415.625"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="410.5591">c4()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="444.7578" y2="444.7578"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="439.6919">b2()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="382.2001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="382.2001" y2="382.2001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="385.2001" y2="385.2001"/>
+    <polygon fill="#181818" points="34,414.8001,44,418.8001,34,422.8001,38,418.8001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="418.8001" y2="418.8001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="413.2771">c4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,444.4001,90,448.4001,80,452.4001,84,448.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="448.4001" y2="448.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="442.8771">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,474.0001,136,478.0001,126,482.0001,130,478.0001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="478.0001" y2="478.0001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="472.4771">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f14gxv5qlau673)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="494.8906"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="494.8906" y2="494.8906"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="497.8906" y2="497.8906"/>
-    <polygon fill="#A80036" points="40,527.0234,50,531.0234,40,535.0234,44,531.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="531.0234" y2="531.0234"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="525.9575">c3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="94" y1="560.1563" y2="560.1563"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="94" x2="94" y1="560.1563" y2="573.1563"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="94" y1="573.1563" y2="573.1563"/>
-      <polygon fill="#A80036" points="63,569.1563,53,573.1563,63,577.1563,59,573.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="59" y="555.0903">c2()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="499.0001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="499.0001" y2="499.0001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="502.0001" y2="502.0001"/>
+    <polygon fill="#181818" points="34,531.6001,44,535.6001,34,539.6001,38,535.6001" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="535.6001" y2="535.6001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="530.0771">c3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="88" y1="565.2001" y2="565.2001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="88" x2="88" y1="565.2001" y2="578.2001"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="88" y1="578.2001" y2="578.2001"/>
+      <polygon fill="#181818" points="57,574.2001,47,578.2001,57,582.2001,53,578.2001" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="559.6771">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,598.2891,100,602.2891,90,606.2891,94,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="602.2891" y2="602.2891"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="597.2231">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,603.8001,90,607.8001,80,611.8001,84,607.8001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="607.8001" y2="607.8001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="602.2771">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,627.4219,150,631.4219,140,635.4219,144,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="631.4219" y2="631.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="626.356">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,633.4001,136,637.4001,126,641.4001,130,637.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="637.4001" y2="637.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="631.8771">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f14gxv5qlau673)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="652.4219"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="652.4219" y2="652.4219"/>
-    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="655.4219" y2="655.4219"/>
-    <polygon fill="#A80036" points="190,684.5547,200,688.5547,190,692.5547,194,688.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="688.5547" y2="688.5547"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="683.4888">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="63,713.6875,53,717.6875,63,721.6875,59,717.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="717.6875" y2="717.6875"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="712.6216">c2()</text>
+    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="658.4001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="658.4001" y2="658.4001"/>
+    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="661.4001" y2="661.4001"/>
+    <polygon fill="#181818" points="172,691.0002,182,695.0002,172,699.0002,176,695.0002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="178" y1="695.0002" y2="695.0002"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="689.4772">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="57,720.6002,47,724.6002,57,728.6002,53,724.6002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="51" x2="183" y1="724.6002" y2="724.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="63" y="719.0772">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="90,742.8203,100,746.8203,90,750.8203,94,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="746.8203" y2="746.8203"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="741.7544">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="80,750.2002,90,754.2002,80,758.2002,84,754.2002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="754.2002" y2="754.2002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="748.6772">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="140,771.9531,150,775.9531,140,779.9531,144,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="775.9531" y2="775.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="770.8872">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="126,779.8002,136,783.8002,126,787.8002,130,783.8002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="783.8002" y2="783.8002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="778.2772">a2()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20036_sequence_mermaid.svg b/docs/test_cases/t20036_sequence_mermaid.svg
index cd661d11..8614a6c3 100644
--- a/docs/test_cases/t20036_sequence_mermaid.svg
+++ b/docs/test_cases/t20036_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -112,44 +112,44 @@
       <circle r="6" cy="15" cx="15"/>
     </marker>
   </defs>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">c1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="75" y1="111" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="275">b1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="575">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="475"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="575">d1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="475">c2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="75" y1="295" x1="875"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="275">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="475" y1="341" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="575">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="675" y1="387" x1="475"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="575">d3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="875" y1="433" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="448" x="775">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="479" x2="675" y1="479" x1="875"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="494" x="175">c4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="75" y1="525" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="275">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="475" y1="571" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="575">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="675" y1="617" x1="475"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="175">c3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="663" x2="75" y1="663" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="678" x="75">c2()</text>
-  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 75,709 C 135,699 135,739 75,729"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="754" x="275">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="785" x2="475" y1="785" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="800" x="575">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="831" x2="675" y1="831" x1="475"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="846" x="575">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="877" x2="875" y1="877" x1="275"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="892" x="475">c2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="923" x2="75" y1="923" x1="875"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="938" x="275">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="969" x2="475" y1="969" x1="75"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="984" x="575">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1015" x2="675" y1="1015" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="177">c1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="79" y1="111" x1="274"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="274">b1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="574">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="574">d1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="477">c2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="79" y1="295" x1="874"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="274">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="471" y1="341" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="574">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="671" y1="387" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="574">d3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="871" y1="433" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="448" x="777">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="479" x2="679" y1="479" x1="874"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="494" x="177">c4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="79" y1="525" x1="274"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="274">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="471" y1="571" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="574">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="671" y1="617" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="177">c3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="663" x2="79" y1="663" x1="274"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="678" x="76">c2()</text>
+  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 76,709 C 136,699 136,739 76,729"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="754" x="274">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="785" x2="471" y1="785" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="800" x="574">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="831" x2="671" y1="831" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="846" x="574">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="877" x2="871" y1="877" x1="276"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="892" x="477">c2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="923" x2="79" y1="923" x1="874"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="938" x="274">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="969" x2="471" y1="969" x1="76"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="984" x="574">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1015" x2="671" y1="1015" x1="476"/>
 </svg>
diff --git a/docs/test_cases/t20037.md b/docs/test_cases/t20037.md
index d2d11cd7..92392e02 100644
--- a/docs/test_cases/t20037.md
+++ b/docs/test_cases/t20037.md
@@ -14,7 +14,7 @@ diagrams:
       - function: "clanguml::t20037::tmain(int,char **)"
 ```
 ## Source code
-File t20037.cc
+File `tests/t20037/t20037.cc`
 ```cpp
 namespace clanguml {
 namespace t20037 {
diff --git a/docs/test_cases/t20037_sequence.svg b/docs/test_cases/t20037_sequence.svg
index 1447837b..14f65d44 100644
--- a/docs/test_cases/t20037_sequence.svg
+++ b/docs/test_cases/t20037_sequence.svg
@@ -1,147 +1,141 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="483px" preserveAspectRatio="none" style="width:390px;height:483px;" version="1.1" viewBox="0 0 390 483" width="390px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="478px" preserveAspectRatio="none" style="width:348px;height:478px;background:#FFFFFF;" version="1.1" viewBox="0 0 348 478" width="348px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fwz02szk8cqwe" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="442.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="171" x2="171" y1="38.2969" y2="442.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="218.5" x2="218.5" y1="38.2969" y2="442.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="442.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="323.5" x2="323.5" y1="38.2969" y2="442.8281"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365.5" x2="365.5" y1="38.2969" y2="442.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="441.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="461.8232">tmain(int,char **)</text>
+    <rect fill="#FFFFFF" height="378.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
+    <rect fill="#FFFFFF" height="173.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="52.7999"/>
+    <rect fill="#FFFFFF" height="85.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="240"/>
+    <rect fill="#FFFFFF" height="85.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="339.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="192" y="82.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="238.5" y="126.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="170"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="269.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="369.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="198"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="297.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="397.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="65" x2="65" y1="36.7999" y2="443.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="151" x2="151" y1="36.7999" y2="443.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="196.5" x2="196.5" y1="36.7999" y2="443.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="243.5" x2="243.5" y1="36.7999" y2="443.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="289.5" x2="289.5" y1="36.7999" y2="443.2"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="326.5" x2="326.5" y1="36.7999" y2="443.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="25.0059">tmain(int,char **)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="442.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="462.2059">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L23" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L23" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="160" y="22.9951">a()</text>
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="441.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="160" y="461.8232">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L23" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L23" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="135" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="142" y="25.0059">a()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="135" y="442.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="142" y="462.2059">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="212.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="441.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="212.5" y="461.8232">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="185.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.5" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="185.5" y="442.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.5" y="462.2059">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L19" target="_top" title="initb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L19" xlink:show="new" xlink:title="initb" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="249.5" y="22.9951">initb()</text>
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="441.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="249.5" y="461.8232">initb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L19" target="_top" title="initb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L19" xlink:show="new" xlink:title="initb" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="218.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="225.5" y="25.0059">initb()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="218.5" y="442.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="225.5" y="462.2059">initb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="316.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="441.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="316.5" y="461.8232">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="278.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="285.5" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="278.5" y="442.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="285.5" y="462.2059">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L21" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L21" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="354.5" y="22.9951">c()</text>
-      <rect fill="#FEFECE" filter="url(#fwz02szk8cqwe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="441.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="354.5" y="461.8232">c()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L21" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L21" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="31" x="311.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="318.5" y="25.0059">c()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="31" x="311.5" y="442.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="318.5" y="462.2059">c()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fwz02szk8cqwe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="154,50.2969,164,54.2969,154,58.2969,158,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="54.2969" y2="54.2969"/>
+    <rect fill="#FFFFFF" height="378.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
+    <rect fill="#FFFFFF" height="173.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="52.7999"/>
+    <rect fill="#FFFFFF" height="85.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="240"/>
+    <rect fill="#FFFFFF" height="85.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="339.6"/>
+    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="192" y="82.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="238.5" y="126.3999"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="170"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="269.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="369.2"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="198"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="297.6"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="397.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="134,48.7999,144,52.7999,134,56.7999,138,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="140" y1="52.7999" y2="52.7999"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="202,79.4297,212,83.4297,202,87.4297,206,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="208" y1="83.4297" y2="83.4297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="183" y="78.3638">A()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="180,78.3999,190,82.3999,180,86.3999,184,82.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="186" y1="82.3999" y2="82.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="163" y="76.8769">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="254,123.4297,264,127.4297,254,131.4297,258,127.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="260" y1="127.4297" y2="127.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="226.5,122.3999,236.5,126.3999,226.5,130.3999,230.5,126.3999" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="232.5" y1="126.3999" y2="126.3999"/>
     </a>
-    <polygon fill="#A80036" points="187,137.4297,177,141.4297,187,145.4297,183,141.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="270" y1="141.4297" y2="141.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="306.5,166.5625,316.5,170.5625,306.5,174.5625,310.5,170.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="170.5625" y2="170.5625"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="165.4966">get()</text>
+    <polygon fill="#181818" points="167,136.3999,157,140.3999,167,144.3999,163,140.3999" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="242.5" y1="140.3999" y2="140.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="273,166,283,170,273,174,277,170" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="279" y1="170" y2="170"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="163" y="164.477">get()</text>
     </a>
-    <polygon fill="#A80036" points="187,180.5625,177,184.5625,187,188.5625,183,184.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="184.5625" y2="184.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="348.5,194.5625,358.5,198.5625,348.5,202.5625,352.5,198.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="198.5625" y2="198.5625"/>
+    <polygon fill="#181818" points="167,180,157,184,167,188,163,184" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="289" y1="184" y2="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="310,194,320,198,310,202,314,198" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="316" y1="198" y2="198"/>
     </a>
-    <polygon fill="#A80036" points="187,208.5625,177,212.5625,187,216.5625,183,212.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="212.5625" y2="212.5625"/>
-    <polygon fill="#A80036" points="91.5,222.5625,81.5,226.5625,91.5,230.5625,87.5,226.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="170" y1="226.5625" y2="226.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="154,236.5625,164,240.5625,154,244.5625,158,240.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="240.5625" y2="240.5625"/>
+    <polygon fill="#181818" points="167,208,157,212,167,216,163,212" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="326" y1="212" y2="212"/>
+    <polygon fill="#181818" points="81,222,71,226,81,230,77,226" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="150" y1="226" y2="226"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="134,236,144,240,134,244,138,240" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="140" y1="240" y2="240"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="306.5,265.6953,316.5,269.6953,306.5,273.6953,310.5,269.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="269.6953" y2="269.6953"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="264.6294">get()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="273,265.6,283,269.6,273,273.6,277,269.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="279" y1="269.6" y2="269.6"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="163" y="264.077">get()</text>
     </a>
-    <polygon fill="#A80036" points="187,279.6953,177,283.6953,187,287.6953,183,283.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="283.6953" y2="283.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="348.5,293.6953,358.5,297.6953,348.5,301.6953,352.5,297.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="297.6953" y2="297.6953"/>
+    <polygon fill="#181818" points="167,279.6,157,283.6,167,287.6,163,283.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="289" y1="283.6" y2="283.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="310,293.6,320,297.6,310,301.6,314,297.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="316" y1="297.6" y2="297.6"/>
     </a>
-    <polygon fill="#A80036" points="187,307.6953,177,311.6953,187,315.6953,183,311.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="311.6953" y2="311.6953"/>
-    <polygon fill="#A80036" points="91.5,321.6953,81.5,325.6953,91.5,329.6953,87.5,325.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="170" y1="325.6953" y2="325.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="154,335.6953,164,339.6953,154,343.6953,158,339.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="339.6953" y2="339.6953"/>
+    <polygon fill="#181818" points="167,307.6,157,311.6,167,315.6,163,311.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="326" y1="311.6" y2="311.6"/>
+    <polygon fill="#181818" points="81,321.6,71,325.6,81,329.6,77,325.6" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="150" y1="325.6" y2="325.6"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="134,335.6,144,339.6,134,343.6,138,339.6" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="140" y1="339.6" y2="339.6"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="306.5,364.8281,316.5,368.8281,306.5,372.8281,310.5,368.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="368.8281" y2="368.8281"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="363.7622">get()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="273,365.2,283,369.2,273,373.2,277,369.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="279" y1="369.2" y2="369.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="163" y="363.677">get()</text>
     </a>
-    <polygon fill="#A80036" points="187,378.8281,177,382.8281,187,386.8281,183,382.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="382.8281" y2="382.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="348.5,392.8281,358.5,396.8281,348.5,400.8281,352.5,396.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="396.8281" y2="396.8281"/>
+    <polygon fill="#181818" points="167,379.2,157,383.2,167,387.2,163,383.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="289" y1="383.2" y2="383.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="310,393.2,320,397.2,310,401.2,314,397.2" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="316" y1="397.2" y2="397.2"/>
     </a>
-    <polygon fill="#A80036" points="187,406.8281,177,410.8281,187,414.8281,183,410.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="410.8281" y2="410.8281"/>
-    <polygon fill="#A80036" points="86.5,420.8281,76.5,424.8281,86.5,428.8281,82.5,424.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="80.5" x2="170" y1="424.8281" y2="424.8281"/>
+    <polygon fill="#181818" points="167,407.2,157,411.2,167,415.2,163,411.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="326" y1="411.2" y2="411.2"/>
+    <polygon fill="#181818" points="76,421.2,66,425.2,76,429.2,72,425.2" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="70" x2="150" y1="425.2" y2="425.2"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20037_sequence_mermaid.svg b/docs/test_cases/t20037_sequence_mermaid.svg
index eaf8a91c..531e44ec 100644
--- a/docs/test_cases/t20037_sequence_mermaid.svg
+++ b/docs/test_cases/t20037_sequence_mermaid.svg
@@ -108,17 +108,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -163,46 +163,46 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="403" x="1070"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="378">A()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="121" x2="475" y1="121" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="478">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="675" y1="131" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="475">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="141" x2="280" y1="141" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="156" x="578">get()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="187" x2="875" y1="187" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="202" x="575">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="197" x2="280" y1="197" x1="870"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="212" x="678">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="207" x2="1075" y1="207" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="222" x="675">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="217" x2="280" y1="217" x1="1070"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="232" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="227" x2="80" y1="227" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="242" x="178">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="237" x2="275" y1="237" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="252" x="578">get()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="283" x2="875" y1="283" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="298" x="575">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="293" x2="280" y1="293" x1="870"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="308" x="678">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="303" x2="1075" y1="303" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="318" x="675">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="313" x2="280" y1="313" x1="1070"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="328" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="323" x2="80" y1="323" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="338" x="178">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="333" x2="275" y1="333" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="348" x="578">get()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="379" x2="875" y1="379" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="394" x="575">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="389" x2="280" y1="389" x1="870"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="678">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="399" x2="1075" y1="399" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="414" x="675">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="409" x2="280" y1="409" x1="1070"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="424" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="419" x2="80" y1="419" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="376">A()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="121" x2="471" y1="121" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="476">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="671" y1="131" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="477">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="141" x2="283" y1="141" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="156" x="576">get()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="187" x2="871" y1="187" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="202" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="197" x2="283" y1="197" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="212" x="676">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="207" x2="1071" y1="207" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="222" x="677">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="217" x2="283" y1="217" x1="1070"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="232" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="227" x2="83" y1="227" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="242" x="176">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="237" x2="271" y1="237" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="252" x="576">get()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="283" x2="871" y1="283" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="298" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="293" x2="283" y1="293" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="308" x="676">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="303" x2="1071" y1="303" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="318" x="677">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="313" x2="283" y1="313" x1="1070"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="328" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="323" x2="83" y1="323" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="338" x="176">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="333" x2="271" y1="333" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="348" x="576">get()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="379" x2="871" y1="379" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="394" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="389" x2="283" y1="389" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="676">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="399" x2="1071" y1="399" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="414" x="677">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="409" x2="283" y1="409" x1="1070"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="424" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="419" x2="83" y1="419" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20038.md b/docs/test_cases/t20038.md
index 577e54dc..681ad014 100644
--- a/docs/test_cases/t20038.md
+++ b/docs/test_cases/t20038.md
@@ -18,7 +18,7 @@ diagrams:
     using_namespace: clanguml::t20038
 ```
 ## Source code
-File t20038.cc
+File `tests/t20038/t20038.cc`
 ```cpp
 #include <future>
 
@@ -112,6 +112,23 @@ int tmain()
 }
 }
 ```
+File `tests/t20038/include/t20038.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t20038 {
+
+template <typename T> T add_impl(T a, T b) { return a + b; };
+
+template <typename T> T add(T a, T b)
+{
+    // Invoke 'add' implementation
+    return add_impl(a, b);
+};
+}
+}
+```
 ## Generated PlantUML diagrams
 ![t20038_sequence](./t20038_sequence.svg "Sequence diagram comment decorator test case")
 ## Generated Mermaid diagrams
diff --git a/docs/test_cases/t20038_sequence.svg b/docs/test_cases/t20038_sequence.svg
index 4781482e..193c7e9a 100644
--- a/docs/test_cases/t20038_sequence.svg
+++ b/docs/test_cases/t20038_sequence.svg
@@ -1,271 +1,263 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1430px" preserveAspectRatio="none" style="width:917px;height:1430px;" version="1.1" viewBox="0 0 917 1430" width="917px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1405px" preserveAspectRatio="none" style="width:814px;height:1405px;background:#FFFFFF;" version="1.1" viewBox="0 0 814 1405" width="814px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ir0odbduxvzu" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="1331.9141" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="912.0156"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1061.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1306.0781"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1090.5469"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1335.2109"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1104.5469"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="772.6172"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1157.6797"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="979.1484"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
-    <rect fill="#FFFFFF" height="127.3984" style="stroke: none; stroke-width: 1.0;" width="266.5" x="72" y="434.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="105.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="1267.8125"/>
-    <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="222.5" x="106" y="1371.2109"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="149" x2="149" y1="38.2969" y2="1390.2109"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="234" x2="234" y1="38.2969" y2="1390.2109"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="304.5" x2="304.5" y1="38.2969" y2="1390.2109"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="394.5" x2="394.5" y1="38.2969" y2="1390.2109"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="555.5" x2="555.5" y1="38.2969" y2="1390.2109"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="779.5" x2="779.5" y1="38.2969" y2="1390.2109"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L44" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L44" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="123" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="1389.2109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="123" y="1409.2061">tmain()</text>
+    <rect fill="#FFFFFF" height="1313.2005" style="stroke:#181818;stroke-width:1.0;" width="10" x="127.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="360.4001"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="492.2002"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="586.4002"/>
+    <rect fill="#FFFFFF" height="149.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="673.6002"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="903.6003"/>
+    <rect fill="#FFFFFF" height="149.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="1046.4004"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="1285.4004"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="390.0002"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="521.8002"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="616.0002"/>
+    <rect fill="#FFFFFF" height="105.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="703.2003"/>
+    <rect fill="#FFFFFF" height="105.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="1076.0004"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="1315.0004"/>
+    <rect fill="#FFFFFF" height="77.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="348.5" y="717.2003"/>
+    <rect fill="#FFFFFF" height="77.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="348.5" y="1090.0004"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="766.8003"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="1139.6004"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="687.5" y="967.2003"/>
+    <rect fill="none" height="296.8001" style="stroke:#000000;stroke-width:1.5;" width="245" x="62" y="261.0001"/>
+    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="204" x="93" y="321.2001"/>
+    <rect fill="none" height="106.8" style="stroke:#000000;stroke-width:1.5;" width="204" x="93" y="1246.2004"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="132" x2="132" y1="36.7999" y2="1370.0004"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="210" x2="210" y1="36.7999" y2="1370.0004"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="275" x2="275" y1="36.7999" y2="1370.0004"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="353" x2="353" y1="36.7999" y2="1370.0004"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="493" x2="493" y1="36.7999" y2="1370.0004"/>
+    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="692" x2="692" y1="36.7999" y2="1370.0004"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L44" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L44" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="103" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="110" y="25.0059">tmain()</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="103" y="1369.0004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="110" y="1389.0064">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="227" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="1389.2109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="227" y="1409.2061">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="199" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="206" y="25.0059">B</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="199" y="1369.0004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="206" y="1389.0064">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="298.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="1389.2109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="298.5" y="1409.2061">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="264" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="271" y="25.0059">A</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="264" y="1369.0004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="271" y="1389.0064">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L8" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L8" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="335.5" y="22.9951">add&lt;int&gt;(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="1389.2109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="335.5" y="1409.2061">add&lt;int&gt;(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L8" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L8" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="297" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="304" y="25.0059">add&lt;int&gt;(int,int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="297" y="1369.0004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="304" y="1389.0064">add&lt;int&gt;(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="150" x="478.5" y="22.9951">add_impl&lt;int&gt;(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="1389.2109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="150" x="478.5" y="1409.2061">add_impl&lt;int&gt;(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="147" x="420" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="427" y="25.0059">add_impl&lt;int&gt;(int,int)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="147" x="420" y="1369.0004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="427" y="1389.0064">add_impl&lt;int&gt;(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="243" x="656.5" y="22.9951">add_impl&lt;double&gt;(double,double)</text>
-      <rect fill="#FEFECE" filter="url(#f1ir0odbduxvzu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="1389.2109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="243" x="656.5" y="1409.2061">add_impl&lt;double&gt;(double,double)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="231" x="577" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="217" x="584" y="25.0059">add_impl&lt;double&gt;(double,double)</text>
+      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="231" x="577" y="1369.0004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="217" x="584" y="1389.0064">add_impl&lt;double&gt;(double,double)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="1331.9141" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="912.0156"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1061.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1306.0781"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1090.5469"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1335.2109"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1104.5469"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="772.6172"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1157.6797"/>
-    <rect fill="#FFFFFF" filter="url(#f1ir0odbduxvzu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="979.1484"/>
-    <path d="M8,53.2969 L8,244.2969 L286,244.2969 L286,63.2969 L276,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M276,53.2969 L276,63.2969 L286,63.2969 L276,53.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="253" x="14" y="70.3638">Nisl purus in mollis nunc sed id semper.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="220" x="14" y="85.4966">Varius vel pharetra vel turpis. Arcu</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="235" x="14" y="100.6294">cursus vitae congue mauris rhoncus.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="222" x="14" y="115.7622">Risus feugiat in ante metus dictum</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="236" x="14" y="130.895">at tempor. Lacus vel facilisis volutpat</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="244" x="14" y="146.0278">est. Auctor urna nunc id cursus metus</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="227" x="14" y="161.1606">aliquam. Diam sit amet nisl suscipit</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="222" x="14" y="176.2935">adipiscing. Potenti nullam ac tortor</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="257" x="14" y="191.4263">vitae purus faucibus ornare suspendisse</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="248" x="14" y="206.5591">sed. Lobortis feugiat vivamus at augue</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="223" x="14" y="221.6919">eget arcu dictum varius. Non tellus</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="91" x="14" y="236.8247">orci ac auctor.</text>
-    <path d="M72,260.8906 L136,260.8906 L136,267.8906 L126,277.8906 L72,277.8906 L72,260.8906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="87" y="273.9575">alt</text>
-    <path d="M82,283.0234 L82,308.0234 L212,308.0234 L212,293.0234 L202,283.0234 L82,283.0234 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M202,283.0234 L202,293.0234 L212,293.0234 L202,283.0234 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="109" x="88" y="300.0903">Repeat 5 times...</text>
-    <path d="M106,324.1563 L183,324.1563 L183,331.1563 L173,341.1563 L106,341.1563 L106,324.1563 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="121" y="337.2231">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="217,358.4219,227,362.4219,217,366.4219,221,362.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="362.4219" y2="362.4219"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="161" y="357.356">b()</text>
+    <rect fill="#FFFFFF" height="1313.2005" style="stroke:#181818;stroke-width:1.0;" width="10" x="127.5" y="46.7999"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="360.4001"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="492.2002"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="586.4002"/>
+    <rect fill="#FFFFFF" height="149.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="673.6002"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="903.6003"/>
+    <rect fill="#FFFFFF" height="149.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="1046.4004"/>
+    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="1285.4004"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="390.0002"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="521.8002"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="616.0002"/>
+    <rect fill="#FFFFFF" height="105.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="703.2003"/>
+    <rect fill="#FFFFFF" height="105.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="1076.0004"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="1315.0004"/>
+    <rect fill="#FFFFFF" height="77.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="348.5" y="717.2003"/>
+    <rect fill="#FFFFFF" height="77.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="348.5" y="1090.0004"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="766.8003"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="1139.6004"/>
+    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="687.5" y="967.2003"/>
+    <path d="M5,51.7999 L5,248.7999 L260,248.7999 L260,61.7999 L250,51.7999 L5,51.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M250,51.7999 L250,61.7999 L260,61.7999 L250,51.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="232" x="11" y="68.8769">Nisl purus in mollis nunc sed id semper.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="201" x="11" y="84.477">Varius vel pharetra vel turpis. Arcu</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="214" x="11" y="100.077">cursus vitae congue mauris rhoncus.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="202" x="11" y="115.677">Risus feugiat in ante metus dictum</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="217" x="11" y="131.277">at tempor. Lacus vel facilisis volutpat</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="222" x="11" y="146.877">est. Auctor urna nunc id cursus metus</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="207" x="11" y="162.477">aliquam. Diam sit amet nisl suscipit</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="201" x="11" y="178.077">adipiscing. Potenti nullam ac tortor</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="234" x="11" y="193.677">vitae purus faucibus ornare suspendisse</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="225" x="11" y="209.2771">sed. Lobortis feugiat vivamus at augue</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="202" x="11" y="224.8771">eget arcu dictum varius. Non tellus</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="83" x="11" y="240.4771">orci ac auctor.</text>
+    <path d="M62,261.0001 L122,261.0001 L122,268.6001 L112,278.6001 L62,278.6001 L62,261.0001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="296.8001" style="stroke:#000000;stroke-width:1.5;" width="245" x="62" y="261.0001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="77" y="274.0771">alt</text>
+    <path d="M72,283.6001 L72,308.6001 L193,308.6001 L193,293.6001 L183,283.6001 L72,283.6001 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M183,283.6001 L183,293.6001 L193,293.6001 L183,283.6001 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="100" x="78" y="300.6771">Repeat 5 times...</text>
+    <path d="M93,321.2001 L166,321.2001 L166,328.8001 L156,338.8001 L93,338.8001 L93,321.2001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="204" x="93" y="321.2001"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="108" y="334.2771">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="193.5,356.4001,203.5,360.4001,193.5,364.4001,197.5,360.4001" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="360.4001" y2="360.4001"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="144.5" y="354.8771">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="288,387.5547,298,391.5547,288,395.5547,292,391.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="391.5547" y2="391.5547"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="246" y="386.4888">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="258.5,386.0002,268.5,390.0002,258.5,394.0002,262.5,390.0002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="390.0002" y2="390.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="222.5" y="384.4772">a()</text>
     </a>
-    <polygon fill="#A80036" points="250,401.5547,240,405.5547,250,409.5547,246,405.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="405.5547" y2="405.5547"/>
-    <polygon fill="#A80036" points="165,415.5547,155,419.5547,165,423.5547,161,419.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="419.5547" y2="419.5547"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="72" x2="338.5" y1="435.5547" y2="435.5547"/>
-    <path d="M91,441.5547 L91,466.5547 L203,466.5547 L203,451.5547 L193,441.5547 L91,441.5547 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M193,441.5547 L193,451.5547 L203,451.5547 L193,441.5547 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="91" x="97" y="458.6216">... or just once</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="217,492.8203,227,496.8203,217,500.8203,221,496.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="496.8203" y2="496.8203"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="161" y="491.7544">b()</text>
+    <polygon fill="#181818" points="226.5,400.0002,216.5,404.0002,226.5,408.0002,222.5,404.0002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="404.0002" y2="404.0002"/>
+    <polygon fill="#181818" points="148.5,414.0002,138.5,418.0002,148.5,422.0002,144.5,418.0002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="418.0002" y2="418.0002"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="62" x2="307" y1="434.0002" y2="434.0002"/>
+    <path d="M80,440.0002 L80,465.0002 L185,465.0002 L185,450.0002 L175,440.0002 L80,440.0002 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M175,440.0002 L175,450.0002 L185,450.0002 L175,440.0002 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="84" x="86" y="457.0772">... or just once</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="193.5,488.2002,203.5,492.2002,193.5,496.2002,197.5,492.2002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="492.2002" y2="492.2002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="144.5" y="486.6772">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="288,521.9531,298,525.9531,288,529.9531,292,525.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="525.9531" y2="525.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="246" y="520.8872">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="258.5,517.8002,268.5,521.8002,258.5,525.8002,262.5,521.8002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="521.8002" y2="521.8002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="222.5" y="516.2772">a()</text>
     </a>
-    <polygon fill="#A80036" points="250,535.9531,240,539.9531,250,543.9531,246,539.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="539.9531" y2="539.9531"/>
-    <polygon fill="#A80036" points="165,549.9531,155,553.9531,165,557.9531,161,553.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="553.9531" y2="553.9531"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="217,586.0859,227,590.0859,217,594.0859,221,590.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="590.0859" y2="590.0859"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="161" y="585.02">bbb()</text>
+    <polygon fill="#181818" points="226.5,531.8002,216.5,535.8002,226.5,539.8002,222.5,535.8002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="535.8002" y2="535.8002"/>
+    <polygon fill="#181818" points="148.5,545.8002,138.5,549.8002,148.5,553.8002,144.5,549.8002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="549.8002" y2="549.8002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="193.5,582.4002,203.5,586.4002,193.5,590.4002,197.5,586.4002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="586.4002" y2="586.4002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="144.5" y="580.8772">bbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="288,615.2188,298,619.2188,288,623.2188,292,619.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="619.2188" y2="619.2188"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="246" y="614.1528">aaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="258.5,612.0002,268.5,616.0002,258.5,620.0002,262.5,616.0002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="616.0002" y2="616.0002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="222.5" y="610.4772">aaa()</text>
     </a>
-    <polygon fill="#A80036" points="250,629.2188,240,633.2188,250,637.2188,246,633.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="633.2188" y2="633.2188"/>
-    <polygon fill="#A80036" points="165,643.2188,155,647.2188,165,651.2188,161,647.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="647.2188" y2="647.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="217,672.3516,227,676.3516,217,680.3516,221,676.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="676.3516" y2="676.3516"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="161" y="671.2856">bbbb()</text>
+    <polygon fill="#181818" points="226.5,626.0002,216.5,630.0002,226.5,634.0002,222.5,630.0002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="630.0002" y2="630.0002"/>
+    <polygon fill="#181818" points="148.5,640.0002,138.5,644.0002,148.5,648.0002,144.5,644.0002" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="644.0002" y2="644.0002"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="193.5,669.6002,203.5,673.6002,193.5,677.6002,197.5,673.6002" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="673.6002" y2="673.6002"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="144.5" y="668.0772">bbbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="288,701.4844,298,705.4844,288,709.4844,292,705.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="705.4844" y2="705.4844"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="246" y="700.4185">aaaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="258.5,699.2003,268.5,703.2003,258.5,707.2003,262.5,703.2003" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="703.2003" y2="703.2003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="222.5" y="697.6773">aaaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="378,715.4844,388,719.4844,378,723.4844,382,719.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="310" x2="384" y1="719.4844" y2="719.4844"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="336.5,713.2003,346.5,717.2003,336.5,721.2003,340.5,717.2003" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="280.5" x2="342.5" y1="717.2003" y2="717.2003"/>
     </a>
-    <path d="M292,732.4844 L292,757.4844 L493,757.4844 L493,742.4844 L483,732.4844 L292,732.4844 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M483,732.4844 L483,742.4844 L493,742.4844 L483,732.4844 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="180" x="298" y="749.5513">Invoke 'add' implementation</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="538.5,768.6172,548.5,772.6172,538.5,776.6172,542.5,772.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="544.5" y1="772.6172" y2="772.6172"/>
+    <path d="M263,730.2003 L263,755.2003 L444,755.2003 L444,740.2003 L434,730.2003 L263,730.2003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M434,730.2003 L434,740.2003 L444,740.2003 L434,730.2003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="160" x="269" y="747.2773">Invoke 'add' implementation</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="476.5,762.8003,486.5,766.8003,476.5,770.8003,480.5,766.8003" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="358.5" x2="482.5" y1="766.8003" y2="766.8003"/>
     </a>
-    <polygon fill="#A80036" points="411,782.6172,401,786.6172,411,790.6172,407,786.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="405" x2="554.5" y1="786.6172" y2="786.6172"/>
-    <polygon fill="#A80036" points="321,796.6172,311,800.6172,321,804.6172,317,800.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="315" x2="394" y1="800.6172" y2="800.6172"/>
-    <polygon fill="#A80036" points="250,810.6172,240,814.6172,250,818.6172,246,814.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="814.6172" y2="814.6172"/>
-    <polygon fill="#A80036" points="165,824.6172,155,828.6172,165,832.6172,161,828.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="828.6172" y2="828.6172"/>
-    <path d="M12,841.6172 L12,881.6172 L282,881.6172 L282,851.6172 L272,841.6172 L12,841.6172 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M272,841.6172 L272,851.6172 L282,851.6172 L272,841.6172 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="249" x="18" y="858.6841">This comment should be rendered only</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="18" y="873.8169">once</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="217,908.0156,227,912.0156,217,916.0156,221,912.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="912.0156" y2="912.0156"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="56" x="161" y="906.9497">wrap(int)</text>
+    <polygon fill="#181818" points="369.5,776.8003,359.5,780.8003,369.5,784.8003,365.5,780.8003" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="363.5" x2="492.5" y1="780.8003" y2="780.8003"/>
+    <polygon fill="#181818" points="291.5,790.8003,281.5,794.8003,291.5,798.8003,287.5,794.8003" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="285.5" x2="352.5" y1="794.8003" y2="794.8003"/>
+    <polygon fill="#181818" points="226.5,804.8003,216.5,808.8003,226.5,812.8003,222.5,808.8003" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="808.8003" y2="808.8003"/>
+    <polygon fill="#181818" points="148.5,818.8003,138.5,822.8003,148.5,826.8003,144.5,822.8003" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="822.8003" y2="822.8003"/>
+    <path d="M9,835.8003 L9,876.8003 L255,876.8003 L255,845.8003 L245,835.8003 L9,835.8003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M245,835.8003 L245,845.8003 L255,845.8003 L245,835.8003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="225" x="15" y="852.8773">This comment should be rendered only</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="15" y="868.4773">once</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="193.5,899.6003,203.5,903.6003,193.5,907.6003,197.5,903.6003" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="903.6003" y2="903.6003"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="49" x="144.5" y="898.0773">wrap(int)</text>
     </a>
-    <polygon fill="#A80036" points="165,922.0156,155,926.0156,165,930.0156,161,926.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="926.0156" y2="926.0156"/>
-    <path d="M90,939.0156 L90,964.0156 L203,964.0156 L203,949.0156 L193,939.0156 L90,939.0156 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M193,939.0156 L193,949.0156 L203,949.0156 L193,939.0156 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="92" x="96" y="956.0825">What is 2 + 2?</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L79" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L79" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="763,975.1484,773,979.1484,763,983.1484,767,979.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="769" y1="979.1484" y2="979.1484"/>
+    <polygon fill="#181818" points="148.5,913.6003,138.5,917.6003,148.5,921.6003,144.5,917.6003" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="917.6003" y2="917.6003"/>
+    <path d="M79,930.6003 L79,955.6003 L185,955.6003 L185,940.6003 L175,930.6003 L79,930.6003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M175,930.6003 L175,940.6003 L185,940.6003 L175,930.6003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="85" y="947.6773">What is 2 + 2?</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L79" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L79" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="675.5,963.2003,685.5,967.2003,675.5,971.2003,679.5,967.2003" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="681.5" y1="967.2003" y2="967.2003"/>
     </a>
-    <polygon fill="#A80036" points="165,989.1484,155,993.1484,165,997.1484,161,993.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="779" y1="993.1484" y2="993.1484"/>
-    <path d="M80,1006.1484 L80,1031.1484 L214,1031.1484 L214,1016.1484 L204,1006.1484 L80,1006.1484 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M204,1006.1484 L204,1016.1484 L214,1016.1484 L204,1006.1484 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="113" x="86" y="1023.2153">Calling B::bbbbb()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="217,1057.4141,227,1061.4141,217,1065.4141,221,1061.4141" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="1061.4141" y2="1061.4141"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="161" y="1056.3481">bbbbb()</text>
+    <polygon fill="#181818" points="148.5,977.2003,138.5,981.2003,148.5,985.2003,144.5,981.2003" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="691.5" y1="981.2003" y2="981.2003"/>
+    <path d="M70,994.2003 L70,1019.2003 L194,1019.2003 L194,1004.2003 L184,994.2003 L70,994.2003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M184,994.2003 L184,1004.2003 L194,1004.2003 L184,994.2003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="103" x="76" y="1011.2773">Calling B::bbbbb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="193.5,1042.4004,203.5,1046.4004,193.5,1050.4004,197.5,1046.4004" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="1046.4004" y2="1046.4004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="144.5" y="1040.8773">bbbbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="288,1086.5469,298,1090.5469,288,1094.5469,292,1090.5469" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="1090.5469" y2="1090.5469"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="246" y="1085.481">aaaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="258.5,1072.0004,268.5,1076.0004,258.5,1080.0004,262.5,1076.0004" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="1076.0004" y2="1076.0004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="222.5" y="1070.4774">aaaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="378,1100.5469,388,1104.5469,378,1108.5469,382,1104.5469" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="310" x2="384" y1="1104.5469" y2="1104.5469"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="336.5,1086.0004,346.5,1090.0004,336.5,1094.0004,340.5,1090.0004" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="280.5" x2="342.5" y1="1090.0004" y2="1090.0004"/>
     </a>
-    <path d="M292,1117.5469 L292,1142.5469 L493,1142.5469 L493,1127.5469 L483,1117.5469 L292,1117.5469 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M483,1117.5469 L483,1127.5469 L493,1127.5469 L483,1117.5469 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="180" x="298" y="1134.6138">Invoke 'add' implementation</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="538.5,1153.6797,548.5,1157.6797,538.5,1161.6797,542.5,1157.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="544.5" y1="1157.6797" y2="1157.6797"/>
+    <path d="M263,1103.0004 L263,1128.0004 L444,1128.0004 L444,1113.0004 L434,1103.0004 L263,1103.0004 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M434,1103.0004 L434,1113.0004 L444,1113.0004 L434,1103.0004 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="160" x="269" y="1120.0774">Invoke 'add' implementation</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="476.5,1135.6004,486.5,1139.6004,476.5,1143.6004,480.5,1139.6004" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="358.5" x2="482.5" y1="1139.6004" y2="1139.6004"/>
     </a>
-    <polygon fill="#A80036" points="411,1167.6797,401,1171.6797,411,1175.6797,407,1171.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="405" x2="554.5" y1="1171.6797" y2="1171.6797"/>
-    <polygon fill="#A80036" points="321,1181.6797,311,1185.6797,321,1189.6797,317,1185.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="315" x2="394" y1="1185.6797" y2="1185.6797"/>
-    <polygon fill="#A80036" points="250,1195.6797,240,1199.6797,250,1203.6797,246,1199.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="1199.6797" y2="1199.6797"/>
-    <polygon fill="#A80036" points="165,1209.6797,155,1213.6797,165,1217.6797,161,1213.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="1213.6797" y2="1213.6797"/>
-    <path d="M45,1226.6797 L45,1251.6797 L249,1251.6797 L249,1236.6797 L239,1226.6797 L45,1226.6797 " fill="#FBFB77" filter="url(#f1ir0odbduxvzu)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M239,1226.6797 L239,1236.6797 L249,1236.6797 L239,1226.6797 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="183" x="51" y="1243.7466">This is a conditional operator</text>
-    <path d="M106,1267.8125 L170,1267.8125 L170,1274.8125 L160,1284.8125 L106,1284.8125 L106,1267.8125 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="105.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="1267.8125"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="121" y="1280.8794">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="217,1302.0781,227,1306.0781,217,1310.0781,221,1306.0781" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="1306.0781" y2="1306.0781"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="161" y="1301.0122">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="167" y="1301.0122">bbb()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="201" y="1301.0122">]</text>
+    <polygon fill="#181818" points="369.5,1149.6004,359.5,1153.6004,369.5,1157.6004,365.5,1153.6004" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="363.5" x2="492.5" y1="1153.6004" y2="1153.6004"/>
+    <polygon fill="#181818" points="291.5,1163.6004,281.5,1167.6004,291.5,1171.6004,287.5,1167.6004" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="285.5" x2="352.5" y1="1167.6004" y2="1167.6004"/>
+    <polygon fill="#181818" points="226.5,1177.6004,216.5,1181.6004,226.5,1185.6004,222.5,1181.6004" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="1181.6004" y2="1181.6004"/>
+    <polygon fill="#181818" points="148.5,1191.6004,138.5,1195.6004,148.5,1199.6004,144.5,1195.6004" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="1195.6004" y2="1195.6004"/>
+    <path d="M38,1208.6004 L38,1233.6004 L226,1233.6004 L226,1218.6004 L216,1208.6004 L38,1208.6004 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <path d="M216,1208.6004 L216,1218.6004 L226,1218.6004 L216,1208.6004 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="167" x="44" y="1225.6774">This is a conditional operator</text>
+    <path d="M93,1246.2004 L153,1246.2004 L153,1253.8004 L143,1263.8004 L93,1263.8004 L93,1246.2004 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
+    <rect fill="none" height="106.8" style="stroke:#000000;stroke-width:1.5;" width="204" x="93" y="1246.2004"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="108" y="1259.2774">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="193.5,1281.4004,203.5,1285.4004,193.5,1289.4004,197.5,1285.4004" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="1285.4004" y2="1285.4004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="144.5" y="1279.8774">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="148.5" y="1279.8774">bbb()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="177.5" y="1279.8774">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="288,1331.2109,298,1335.2109,288,1339.2109,292,1335.2109" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="1335.2109" y2="1335.2109"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="246" y="1330.145">aaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#181818" points="258.5,1311.0004,268.5,1315.0004,258.5,1319.0004,262.5,1315.0004" style="stroke:#181818;stroke-width:1.0;"/>
+      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="1315.0004" y2="1315.0004"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="222.5" y="1309.4774">aaa()</text>
     </a>
-    <polygon fill="#A80036" points="250,1345.2109,240,1349.2109,250,1353.2109,246,1349.2109" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="1349.2109" y2="1349.2109"/>
-    <polygon fill="#A80036" points="165,1359.2109,155,1363.2109,165,1367.2109,161,1363.2109" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="1363.2109" y2="1363.2109"/>
-    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="106" x2="328.5" y1="1372.2109" y2="1372.2109"/>
+    <polygon fill="#181818" points="226.5,1325.0004,216.5,1329.0004,226.5,1333.0004,222.5,1329.0004" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="1329.0004" y2="1329.0004"/>
+    <polygon fill="#181818" points="148.5,1339.0004,138.5,1343.0004,148.5,1347.0004,144.5,1343.0004" style="stroke:#181818;stroke-width:1.0;"/>
+    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="1343.0004" y2="1343.0004"/>
+    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="93" x2="297" y1="1352.0004" y2="1352.0004"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20038_sequence_mermaid.svg b/docs/test_cases/t20038_sequence_mermaid.svg
index 91eb0a95..25f5c352 100644
--- a/docs/test_cases/t20038_sequence_mermaid.svg
+++ b/docs/test_cases/t20038_sequence_mermaid.svg
@@ -108,17 +108,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -309,76 +309,76 @@
       <tspan x="300">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="411" x="178">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="442" x2="275" y1="442" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="457" x="378">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="488" x2="475" y1="488" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="503" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="498" x2="280" y1="498" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="513" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="508" x2="80" y1="508" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="607" x="178">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="638" x2="275" y1="638" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="653" x="378">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="684" x2="475" y1="684" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="699" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="694" x2="280" y1="694" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="709" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="704" x2="80" y1="704" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="731" x="178">bbb()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="762" x2="275" y1="762" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="777" x="378">aaa()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="808" x2="475" y1="808" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="823" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="818" x2="280" y1="818" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="833" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="828" x2="80" y1="828" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="843" x="178">bbbb()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="874" x2="275" y1="874" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="889" x="378">aaaa()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="920" x2="475" y1="920" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="935" x="578">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="930" x2="675" y1="930" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="992" x="781">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="987" x2="882" y1="987" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1002" x="779">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="997" x2="680" y1="997" x1="877"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1012" x="575">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1007" x2="480" y1="1007" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1022" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1017" x2="280" y1="1017" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1032" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1027" x2="80" y1="1027" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1106" x="178">wrap(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1137" x2="275" y1="1137" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1152" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1147" x2="80" y1="1147" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1209" x="608">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1204" x2="1136" y1="1204" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1219" x="606">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1214" x2="80" y1="1214" x1="1131"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1276" x="178">bbbbb()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1307" x2="275" y1="1307" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1322" x="378">aaaa()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1353" x2="475" y1="1353" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1368" x="578">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1363" x2="675" y1="1363" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1425" x="781">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1420" x2="882" y1="1420" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1435" x="779">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1430" x2="680" y1="1430" x1="877"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1445" x="575">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1440" x2="480" y1="1440" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1455" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1450" x2="280" y1="1450" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1465" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1460" x2="80" y1="1460" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1547" x="178">[bbb()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1578" x2="275" y1="1578" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1593" x="378">aaa()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1624" x2="475" y1="1624" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1639" x="375">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1634" x2="280" y1="1634" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1649" x="175">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1644" x2="80" y1="1644" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="411" x="176">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="442" x2="271" y1="442" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="457" x="376">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="488" x2="471" y1="488" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="503" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="498" x2="283" y1="498" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="513" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="508" x2="83" y1="508" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="607" x="176">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="638" x2="271" y1="638" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="653" x="376">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="684" x2="471" y1="684" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="699" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="694" x2="283" y1="694" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="709" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="704" x2="83" y1="704" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="731" x="176">bbb()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="762" x2="271" y1="762" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="777" x="376">aaa()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="808" x2="471" y1="808" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="823" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="818" x2="283" y1="818" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="833" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="828" x2="83" y1="828" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="843" x="176">bbbb()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="874" x2="271" y1="874" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="889" x="376">aaaa()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="920" x2="471" y1="920" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="935" x="576">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="930" x2="671" y1="930" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="992" x="779">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="987" x2="878" y1="987" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1002" x="780">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="997" x2="683" y1="997" x1="877"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1012" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1007" x2="483" y1="1007" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1022" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1017" x2="283" y1="1017" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1032" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1027" x2="83" y1="1027" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1106" x="176">wrap(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1137" x2="271" y1="1137" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1152" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1147" x2="83" y1="1147" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1209" x="606">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1204" x2="1132" y1="1204" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1219" x="607">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1214" x2="83" y1="1214" x1="1131"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1276" x="176">bbbbb()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1307" x2="271" y1="1307" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1322" x="376">aaaa()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1353" x2="471" y1="1353" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1368" x="576">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1363" x2="671" y1="1363" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1425" x="779">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1420" x2="878" y1="1420" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1435" x="780">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1430" x2="683" y1="1430" x1="877"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1445" x="577">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1440" x2="483" y1="1440" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1455" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1450" x2="283" y1="1450" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1465" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1460" x2="83" y1="1460" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1547" x="176">[bbb()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1578" x2="271" y1="1578" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1593" x="376">aaa()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1624" x2="471" y1="1624" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1639" x="377">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1634" x2="283" y1="1634" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1649" x="177">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1644" x2="83" y1="1644" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t30001.md b/docs/test_cases/t30001.md
index b310a418..911cfd67 100644
--- a/docs/test_cases/t30001.md
+++ b/docs/test_cases/t30001.md
@@ -36,7 +36,7 @@ diagrams:
 
 ```
 ## Source code
-File t30001.cc
+File `tests/t30001/t30001.cc`
 ```cpp
 namespace clanguml {
 namespace t30001 {
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 7d413858..b33ae30d 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -1,76 +1,87 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="284px" preserveAspectRatio="none" style="width:854px;height:284px;" version="1.1" viewBox="0 0 854 284" width="854px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="295px" preserveAspectRatio="none" style="width:818px;height:295px;background:#FFFFFF;" version="1.1" viewBox="0 0 818 295" width="818px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1418gobq3iqoi" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="282" x="292" y="16.708">Basic package diagram example</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="49,69.9531,66,69.9531,73,92.25,370,92.25,370,272.9531,49,272.9531,49,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="49" x2="73" y1="92.25" y2="92.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="53" y="84.9482">A</text>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="220" x="292.25" y="23.0059">Basic package diagram example</text>
+    <g id="cluster_C_0001184614645531659789">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+        <path d="M43,85.3999 L54,85.3999 A3.75,3.75 0 0 1 56.5,87.8999 L63.5,108.1999 L355,108.1999 A2.5,2.5 0 0 1 357.5,110.6999 L357.5,286.4999 A2.5,2.5 0 0 1 355,288.9999 L43,288.9999 A2.5,2.5 0 0 1 40.5,286.4999 L40.5,87.8999 A2.5,2.5 0 0 1 43,85.3999 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="40.5" x2="63.5" y1="108.1999" y2="108.1999"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="44.5" y="100.4059">A</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001528517990989164155">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
+        <path d="M126,136.3999 L147,136.3999 A3.75,3.75 0 0 1 149.5,138.8999 L156.5,159.1999 L323,159.1999 A2.5,2.5 0 0 1 325.5,161.6999 L325.5,254.4999 A2.5,2.5 0 0 1 323,256.9999 L126,256.9999 A2.5,2.5 0 0 1 123.5,254.4999 L123.5,138.8999 A2.5,2.5 0 0 1 126,136.3999 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="123.5" x2="156.5" y1="159.1999" y2="159.1999"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="127.5" y="151.4059">AA</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001931735210112054430">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+        <path d="M497,85.3999 L508,85.3999 A3.75,3.75 0 0 1 510.5,87.8999 L517.5,108.1999 L809,108.1999 A2.5,2.5 0 0 1 811.5,110.6999 L811.5,286.4999 A2.5,2.5 0 0 1 809,288.9999 L497,288.9999 A2.5,2.5 0 0 1 494.5,286.4999 L494.5,87.8999 A2.5,2.5 0 0 1 497,85.3999 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="494.5" x2="517.5" y1="108.1999" y2="108.1999"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="498.5" y="100.4059">B</text>
+      </a>
+    </g>
+    <g id="cluster_C_0000895913707182089871">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
+        <path d="M580,136.3999 L601,136.3999 A3.75,3.75 0 0 1 603.5,138.8999 L610.5,159.1999 L777,159.1999 A2.5,2.5 0 0 1 779.5,161.6999 L779.5,254.4999 A2.5,2.5 0 0 1 777,256.9999 L580,256.9999 A2.5,2.5 0 0 1 577.5,254.4999 L577.5,138.8999 A2.5,2.5 0 0 1 580,136.3999 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="577.5" x2="610.5" y1="159.1999" y2="159.1999"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="581.5" y="151.4059">AA</text>
+      </a>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <path d="M254,179.3999 L285,179.3999 A3.75,3.75 0 0 1 287.5,181.8999 L294.5,202.1999 L299,202.1999 A2.5,2.5 0 0 1 301.5,204.6999 L301.5,230.4998 A2.5,2.5 0 0 1 299,232.9998 L254,232.9998 A2.5,2.5 0 0 1 251.5,230.4998 L251.5,181.8999 A2.5,2.5 0 0 1 254,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="251.5" x2="294.5" y1="202.1999" y2="202.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="255.5" y="194.4059">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="132,120.9531,160,120.9531,167,143.25,338,143.25,338,240.9531,132,240.9531,132,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="132" x2="167" y1="143.25" y2="143.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="136" y="135.9482">AA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <path d="M169,179.3999 L200,179.3999 A3.75,3.75 0 0 1 202.5,181.8999 L209.5,202.1999 L214,202.1999 A2.5,2.5 0 0 1 216.5,204.6999 L216.5,230.4998 A2.5,2.5 0 0 1 214,232.9998 L169,232.9998 A2.5,2.5 0 0 1 166.5,230.4998 L166.5,181.8999 A2.5,2.5 0 0 1 169,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="166.5" x2="209.5" y1="202.1999" y2="202.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="170.5" y="194.4059">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="511,69.9531,527,69.9531,534,92.25,832,92.25,832,272.9531,511,272.9531,511,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="511" x2="534" y1="92.25" y2="92.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="515" y="84.9482">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <path d="M59,179.3999 L80,179.3999 A3.75,3.75 0 0 1 82.5,181.8999 L89.5,202.1999 L94,202.1999 A2.5,2.5 0 0 1 96.5,204.6999 L96.5,230.4998 A2.5,2.5 0 0 1 94,232.9998 L59,232.9998 A2.5,2.5 0 0 1 56.5,230.4998 L56.5,181.8999 A2.5,2.5 0 0 1 59,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="56.5" x2="89.5" y1="202.1999" y2="202.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="60.5" y="194.4059">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="594,120.9531,622,120.9531,629,143.25,800,143.25,800,240.9531,594,240.9531,594,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="594" x2="629" y1="143.25" y2="143.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="598" y="135.9482">AA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <path d="M708,179.3999 L739,179.3999 A3.75,3.75 0 0 1 741.5,181.8999 L748.5,202.1999 L753,202.1999 A2.5,2.5 0 0 1 755.5,204.6999 L755.5,230.4998 A2.5,2.5 0 0 1 753,232.9998 L708,232.9998 A2.5,2.5 0 0 1 705.5,230.4998 L705.5,181.8999 A2.5,2.5 0 0 1 708,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="705.5" x2="748.5" y1="202.1999" y2="202.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="709.5" y="194.4059">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="260.5,163.9531,299.5,163.9531,306.5,186.25,313.5,186.25,313.5,216.5469,260.5,216.5469,260.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="260.5" x2="306.5" y1="186.25" y2="186.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="264.5" y="178.9482">AAA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <path d="M623,179.3999 L654,179.3999 A3.75,3.75 0 0 1 656.5,181.8999 L663.5,202.1999 L668,202.1999 A2.5,2.5 0 0 1 670.5,204.6999 L670.5,230.4998 A2.5,2.5 0 0 1 668,232.9998 L623,232.9998 A2.5,2.5 0 0 1 620.5,230.4998 L620.5,181.8999 A2.5,2.5 0 0 1 623,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="620.5" x2="663.5" y1="202.1999" y2="202.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="624.5" y="194.4059">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="175,163.9531,211,163.9531,218,186.25,225,186.25,225,216.5469,175,216.5469,175,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="218" y1="186.25" y2="186.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="178.9482">BBB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <path d="M513,179.3999 L534,179.3999 A3.75,3.75 0 0 1 536.5,181.8999 L543.5,202.1999 L548,202.1999 A2.5,2.5 0 0 1 550.5,204.6999 L550.5,230.4998 A2.5,2.5 0 0 1 548,232.9998 L513,232.9998 A2.5,2.5 0 0 1 510.5,230.4998 L510.5,181.8999 A2.5,2.5 0 0 1 513,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="510.5" x2="543.5" y1="202.1999" y2="202.1999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="514.5" y="194.4059">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="65,163.9531,91,163.9531,98,186.25,105,186.25,105,216.5469,65,216.5469,65,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="98" y1="186.25" y2="186.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="69" y="178.9482">BB</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="722.5,163.9531,761.5,163.9531,768.5,186.25,775.5,186.25,775.5,216.5469,722.5,216.5469,722.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="722.5" x2="768.5" y1="186.25" y2="186.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="726.5" y="178.9482">AAA</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="637,163.9531,673,163.9531,680,186.25,687,186.25,687,216.5469,637,216.5469,637,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="637" x2="680" y1="186.25" y2="186.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="641" y="178.9482">BBB</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1418gobq3iqoi)" points="527,163.9531,553,163.9531,560,186.25,567,186.25,567,216.5469,527,216.5469,527,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="527" x2="560" y1="186.25" y2="186.25"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="531" y="178.9482">BB</text>
-    </a>
-    <path d="M386,177.9531 L386,203.0859 L492,203.0859 L492,187.9531 L482,177.9531 L386,177.9531 " fill="#FBFB77" filter="url(#f1418gobq3iqoi)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M482,177.9531 L482,187.9531 L492,187.9531 L482,177.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="392" y="195.02">A AAA note...</text>
-    <path d="M6,28.9531 L6,54.0859 L274,54.0859 L274,38.9531 L264,28.9531 L6,28.9531 " fill="#FBFB77" filter="url(#f1418gobq3iqoi)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M264,28.9531 L264,38.9531 L274,38.9531 L264,28.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="12" y="46.02">This is namespace AA in namespace A</text>
-    <path d="M468,28.9531 L468,54.0859 L736,54.0859 L736,38.9531 L726,28.9531 L468,28.9531 " fill="#FBFB77" filter="url(#f1418gobq3iqoi)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M726,28.9531 L726,38.9531 L736,38.9531 L726,28.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="474" y="46.02">This is namespace AA in namespace B</text>
-    <path d="M313.72,190.4531 C337.7,190.4531 361.68,190.4531 385.66,190.4531 " fill="none" id="C_0000274638237740249424-GMN1224" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M140,53.9831 C140,62.5131 140,75.0494 140,89.1034 C140,96.1305 140,103.537 140,111.0118 C140,112.8806 140,114.7536 140,116.626 C140,117.5622 140,118.4982 140,119.4335 C140,119.9012 140,120.3686 140,120.8358 " fill="none" id="GMN1227-C_0001528517990989164155" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M602,53.9831 C602,62.5131 602,75.0494 602,89.1034 C602,96.1305 602,103.537 602,111.0118 C602,112.8806 602,114.7536 602,116.626 C602,117.5622 602,118.4982 602,119.4335 C602,119.9012 602,120.3686 602,120.8358 " fill="none" id="GMN1230-C_0000895913707182089871" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <g id="elem_GMN12">
+      <path d="M373.5,193.3999 L373.5,202.1999 L301.94,206.1999 L373.5,210.1999 L373.5,218.9999 A0,0 0 0 0 373.5,218.9999 L475.5,218.9999 A0,0 0 0 0 475.5,218.9999 L475.5,203.3999 L465.5,193.3999 L373.5,193.3999 A0,0 0 0 0 373.5,193.3999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M465.5,193.3999 L465.5,203.3999 L475.5,203.3999 L465.5,193.3999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="81" x="379.5" y="210.4769">A AAA note...</text>
+    </g>
+    <g id="elem_GMN15">
+      <path d="M6,43.7999 L6,69.3999 L257,69.3999 L257,53.7999 L247,43.7999 L6,43.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M247,43.7999 L247,53.7999 L257,53.7999 L247,43.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="230" x="12" y="60.8769">This is namespace AA in namespace A</text>
+    </g>
+    <g id="elem_GMN18">
+      <path d="M460,43.7999 L460,69.3999 L711,69.3999 L711,53.7999 L701,43.7999 L460,43.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M701,43.7999 L701,53.7999 L711,53.7999 L701,43.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="230" x="466" y="60.8769">This is namespace AA in namespace B</text>
+    </g>
+    <g id="link_GMN15_C_0001528517990989164155">
+      <path d="M131.5,69.6799 C131.5,78.3549 131.5,90.9674 131.5,105.0541 C131.5,112.0975 131.5,119.5094 131.5,126.982 C131.5,128.8501 131.5,130.722 131.5,132.593 C131.5,133.5284 131.5,134.4636 131.5,135.398 C131.5,135.6315 131.5,135.8651 131.5,136.0985 " fill="none" id="GMN15-C_0001528517990989164155" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+    </g>
+    <g id="link_GMN18_C_0000895913707182089871">
+      <path d="M585.5,69.6799 C585.5,78.3549 585.5,90.9674 585.5,105.0541 C585.5,112.0975 585.5,119.5094 585.5,126.982 C585.5,128.8501 585.5,130.722 585.5,132.593 C585.5,133.5284 585.5,134.4636 585.5,135.398 C585.5,135.6315 585.5,135.8651 585.5,136.0985 " fill="none" id="GMN18-C_0000895913707182089871" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30001_package_mermaid.svg b/docs/test_cases/t30001_package_mermaid.svg
index a1082ce0..93264eee 100644
--- a/docs/test_cases/t30001_package_mermaid.svg
+++ b/docs/test_cases/t30001_package_mermaid.svg
@@ -1,23 +1,22 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -49 864.64453125 426" style="max-width: 864.645px; background-color: white;" width="864.64453125" id="my-svg">
-  <title id="chart-title-my-svg">Basic package diagram example</title>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -49 864.64453125 426" style="max-width: 864.645px; background-color: white;" width="864.64453125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
diff --git a/docs/test_cases/t30002.md b/docs/test_cases/t30002.md
index 453879bd..30880dce 100644
--- a/docs/test_cases/t30002.md
+++ b/docs/test_cases/t30002.md
@@ -18,7 +18,7 @@ diagrams:
         - "' t30002 test package diagram"
 ```
 ## Source code
-File t30002.cc
+File `tests/t30002/t30002.cc`
 ```cpp
 #include <array>
 #include <map>
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index b2810611..679b9d8f 100644
--- a/docs/test_cases/t30002_package.svg
+++ b/docs/test_cases/t30002_package.svg
@@ -1,164 +1,202 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1548px;height:402px;" version="1.1" viewBox="0 0 1548 402" width="1548px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:1444px;height:380px;background:#FFFFFF;" version="1.1" viewBox="0 0 1444 380" width="1444px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxvflckrbsr4e" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="22,219,39,219,46,241.2969,1526,241.2969,1526,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="241.2969" y2="241.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="233.9951">A</text>
+    <g id="cluster_C_0001543480715632256641">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+        <path d="M8.5,201.894 L19.5,201.894 A3.75,3.75 0 0 1 22,204.394 L29,224.6939 L1434.5,224.6939 A2.5,2.5 0 0 1 1437,227.1939 L1437,370.994 A2.5,2.5 0 0 1 1434.5,373.494 L8.5,373.494 A2.5,2.5 0 0 1 6,370.994 L6,204.394 A2.5,2.5 0 0 1 8.5,201.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="29" y1="224.6939" y2="224.6939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="10" y="216.8999">A</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001669745471968085401">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
+        <path d="M32.5,244.894 L53.5,244.894 A3.75,3.75 0 0 1 56,247.394 L63,267.6939 L1410.5,267.6939 A2.5,2.5 0 0 1 1413,270.1939 L1413,346.994 A2.5,2.5 0 0 1 1410.5,349.494 L32.5,349.494 A2.5,2.5 0 0 1 30,346.994 L30,247.394 A2.5,2.5 0 0 1 32.5,244.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="63" y1="267.6939" y2="267.6939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="34" y="259.8999">AA</text>
+      </a>
+    </g>
+    <g id="cluster_C_0000145302773464360955">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
+        <path d="M692.5,6.294 L703.5,6.294 A3.75,3.75 0 0 1 706,8.794 L713,29.0939 L817.5,29.0939 A2.5,2.5 0 0 1 820,31.5939 L820,175.394 A2.5,2.5 0 0 1 817.5,177.894 L692.5,177.894 A2.5,2.5 0 0 1 690,175.394 L690,8.794 A2.5,2.5 0 0 1 692.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="690" x2="713" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="694" y="21.2999">B</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001938861639623819235">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
+        <path d="M716.5,49.294 L737.5,49.294 A3.75,3.75 0 0 1 740,51.794 L747,72.0939 L793.5,72.0939 A2.5,2.5 0 0 1 796,74.5939 L796,151.394 A2.5,2.5 0 0 1 793.5,153.894 L716.5,153.894 A2.5,2.5 0 0 1 714,151.394 L714,51.794 A2.5,2.5 0 0 1 716.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="714" x2="747" y1="72.0939" y2="72.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="718" y="64.2999">BB</text>
+      </a>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <path d="M1361.5,279.894 L1380.5,279.894 A3.75,3.75 0 0 1 1383,282.394 L1390,302.6939 L1394.5,302.6939 A2.5,2.5 0 0 1 1397,305.1939 L1397,330.9938 A2.5,2.5 0 0 1 1394.5,333.4938 L1361.5,333.4938 A2.5,2.5 0 0 1 1359,330.9938 L1359,282.394 A2.5,2.5 0 0 1 1361.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1359" x2="1390" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1363" y="294.8999">A1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="46,262,74,262,81,284.2969,1502,284.2969,1502,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="81" y1="284.2969" y2="284.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="50" y="276.9951">AA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <path d="M1288.5,279.894 L1307.5,279.894 A3.75,3.75 0 0 1 1310,282.394 L1317,302.6939 L1321.5,302.6939 A2.5,2.5 0 0 1 1324,305.1939 L1324,330.9938 A2.5,2.5 0 0 1 1321.5,333.4938 L1288.5,333.4938 A2.5,2.5 0 0 1 1286,330.9938 L1286,282.394 A2.5,2.5 0 0 1 1288.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1286" x2="1317" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1290" y="294.8999">A2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="751,24,767,24,774,46.2969,881,46.2969,881,195,751,195,751,24" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="751" x2="774" y1="46.2969" y2="46.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="755" y="38.9951">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
+      <path d="M1215.5,279.894 L1234.5,279.894 A3.75,3.75 0 0 1 1237,282.394 L1244,302.6939 L1248.5,302.6939 A2.5,2.5 0 0 1 1251,305.1939 L1251,330.9938 A2.5,2.5 0 0 1 1248.5,333.4938 L1215.5,333.4938 A2.5,2.5 0 0 1 1213,330.9938 L1213,282.394 A2.5,2.5 0 0 1 1215.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1213" x2="1244" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1217" y="294.8999">A3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="775,67,801,67,808,89.2969,857,89.2969,857,171,775,171,775,67" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="775" x2="808" y1="89.2969" y2="89.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="779" y="81.9951">BB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
+      <path d="M1142.5,279.894 L1161.5,279.894 A3.75,3.75 0 0 1 1164,282.394 L1171,302.6939 L1175.5,302.6939 A2.5,2.5 0 0 1 1178,305.1939 L1178,330.9938 A2.5,2.5 0 0 1 1175.5,333.4938 L1142.5,333.4938 A2.5,2.5 0 0 1 1140,330.9938 L1140,282.394 A2.5,2.5 0 0 1 1142.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1140" x2="1171" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1144" y="294.8999">A4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="1444.5,297,1471.5,297,1478.5,319.2969,1485.5,319.2969,1485.5,349.5938,1444.5,349.5938,1444.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="1444.5" x2="1478.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1448.5" y="311.9951">A1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
+      <path d="M1069.5,279.894 L1088.5,279.894 A3.75,3.75 0 0 1 1091,282.394 L1098,302.6939 L1102.5,302.6939 A2.5,2.5 0 0 1 1105,305.1939 L1105,330.9938 A2.5,2.5 0 0 1 1102.5,333.4938 L1069.5,333.4938 A2.5,2.5 0 0 1 1067,330.9938 L1067,282.394 A2.5,2.5 0 0 1 1069.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1067" x2="1098" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1071" y="294.8999">A5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="1368.5,297,1395.5,297,1402.5,319.2969,1409.5,319.2969,1409.5,349.5938,1368.5,349.5938,1368.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="1368.5" x2="1402.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1372.5" y="311.9951">A2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
+      <path d="M996.5,279.894 L1015.5,279.894 A3.75,3.75 0 0 1 1018,282.394 L1025,302.6939 L1029.5,302.6939 A2.5,2.5 0 0 1 1032,305.1939 L1032,330.9938 A2.5,2.5 0 0 1 1029.5,333.4938 L996.5,333.4938 A2.5,2.5 0 0 1 994,330.9938 L994,282.394 A2.5,2.5 0 0 1 996.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="994" x2="1025" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="998" y="294.8999">A6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="1292.5,297,1319.5,297,1326.5,319.2969,1333.5,319.2969,1333.5,349.5938,1292.5,349.5938,1292.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="1292.5" x2="1326.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1296.5" y="311.9951">A3</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
+      <path d="M923.5,279.894 L942.5,279.894 A3.75,3.75 0 0 1 945,282.394 L952,302.6939 L956.5,302.6939 A2.5,2.5 0 0 1 959,305.1939 L959,330.9938 A2.5,2.5 0 0 1 956.5,333.4938 L923.5,333.4938 A2.5,2.5 0 0 1 921,330.9938 L921,282.394 A2.5,2.5 0 0 1 923.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="921" x2="952" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="925" y="294.8999">A7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="1216.5,297,1243.5,297,1250.5,319.2969,1257.5,319.2969,1257.5,349.5938,1216.5,349.5938,1216.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="1216.5" x2="1250.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1220.5" y="311.9951">A4</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
+      <path d="M850.5,279.894 L869.5,279.894 A3.75,3.75 0 0 1 872,282.394 L879,302.6939 L883.5,302.6939 A2.5,2.5 0 0 1 886,305.1939 L886,330.9938 A2.5,2.5 0 0 1 883.5,333.4938 L850.5,333.4938 A2.5,2.5 0 0 1 848,330.9938 L848,282.394 A2.5,2.5 0 0 1 850.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="848" x2="879" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="852" y="294.8999">A8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="1140.5,297,1167.5,297,1174.5,319.2969,1181.5,319.2969,1181.5,349.5938,1140.5,349.5938,1140.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="1140.5" x2="1174.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1144.5" y="311.9951">A5</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
+      <path d="M777.5,279.894 L796.5,279.894 A3.75,3.75 0 0 1 799,282.394 L806,302.6939 L810.5,302.6939 A2.5,2.5 0 0 1 813,305.1939 L813,330.9938 A2.5,2.5 0 0 1 810.5,333.4938 L777.5,333.4938 A2.5,2.5 0 0 1 775,330.9938 L775,282.394 A2.5,2.5 0 0 1 777.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="775" x2="806" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="779" y="294.8999">A9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="1064.5,297,1091.5,297,1098.5,319.2969,1105.5,319.2969,1105.5,349.5938,1064.5,349.5938,1064.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="1064.5" x2="1098.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1068.5" y="311.9951">A6</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
+      <path d="M696.5,279.894 L723.5,279.894 A3.75,3.75 0 0 1 726,282.394 L733,302.6939 L737.5,302.6939 A2.5,2.5 0 0 1 740,305.1939 L740,330.9938 A2.5,2.5 0 0 1 737.5,333.4938 L696.5,333.4938 A2.5,2.5 0 0 1 694,330.9938 L694,282.394 A2.5,2.5 0 0 1 696.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="694" x2="733" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="698" y="294.8999">A10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="988.5,297,1015.5,297,1022.5,319.2969,1029.5,319.2969,1029.5,349.5938,988.5,349.5938,988.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="988.5" x2="1022.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="992.5" y="311.9951">A7</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
+      <path d="M615.5,279.894 L642.5,279.894 A3.75,3.75 0 0 1 645,282.394 L652,302.6939 L656.5,302.6939 A2.5,2.5 0 0 1 659,305.1939 L659,330.9938 A2.5,2.5 0 0 1 656.5,333.4938 L615.5,333.4938 A2.5,2.5 0 0 1 613,330.9938 L613,282.394 A2.5,2.5 0 0 1 615.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="613" x2="652" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="617" y="294.8999">A11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="912.5,297,939.5,297,946.5,319.2969,953.5,319.2969,953.5,349.5938,912.5,349.5938,912.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="912.5" x2="946.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="916.5" y="311.9951">A8</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
+      <path d="M534.5,279.894 L561.5,279.894 A3.75,3.75 0 0 1 564,282.394 L571,302.6939 L575.5,302.6939 A2.5,2.5 0 0 1 578,305.1939 L578,330.9938 A2.5,2.5 0 0 1 575.5,333.4938 L534.5,333.4938 A2.5,2.5 0 0 1 532,330.9938 L532,282.394 A2.5,2.5 0 0 1 534.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="532" x2="571" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="536" y="294.8999">A12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="836.5,297,863.5,297,870.5,319.2969,877.5,319.2969,877.5,349.5938,836.5,349.5938,836.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="836.5" x2="870.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="840.5" y="311.9951">A9</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
+      <path d="M453.5,279.894 L480.5,279.894 A3.75,3.75 0 0 1 483,282.394 L490,302.6939 L494.5,302.6939 A2.5,2.5 0 0 1 497,305.1939 L497,330.9938 A2.5,2.5 0 0 1 494.5,333.4938 L453.5,333.4938 A2.5,2.5 0 0 1 451,330.9938 L451,282.394 A2.5,2.5 0 0 1 453.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="451" x2="490" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="455" y="294.8999">A13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="750.5,297,787.5,297,794.5,319.2969,801.5,319.2969,801.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="750.5" x2="794.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="754.5" y="311.9951">A10</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
+      <path d="M372.5,279.894 L399.5,279.894 A3.75,3.75 0 0 1 402,282.394 L409,302.6939 L413.5,302.6939 A2.5,2.5 0 0 1 416,305.1939 L416,330.9938 A2.5,2.5 0 0 1 413.5,333.4938 L372.5,333.4938 A2.5,2.5 0 0 1 370,330.9938 L370,282.394 A2.5,2.5 0 0 1 372.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="370" x2="409" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="374" y="294.8999">A14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="664.5" x2="708.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="668.5" y="311.9951">A11</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
+      <path d="M291.5,279.894 L318.5,279.894 A3.75,3.75 0 0 1 321,282.394 L328,302.6939 L332.5,302.6939 A2.5,2.5 0 0 1 335,305.1939 L335,330.9938 A2.5,2.5 0 0 1 332.5,333.4938 L291.5,333.4938 A2.5,2.5 0 0 1 289,330.9938 L289,282.394 A2.5,2.5 0 0 1 291.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="289" x2="328" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="293" y="294.8999">A15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="578.5" x2="622.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="582.5" y="311.9951">A12</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
+      <path d="M210.5,279.894 L237.5,279.894 A3.75,3.75 0 0 1 240,282.394 L247,302.6939 L251.5,302.6939 A2.5,2.5 0 0 1 254,305.1939 L254,330.9938 A2.5,2.5 0 0 1 251.5,333.4938 L210.5,333.4938 A2.5,2.5 0 0 1 208,330.9938 L208,282.394 A2.5,2.5 0 0 1 210.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="208" x2="247" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="212" y="294.8999">A16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="492.5" x2="536.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="496.5" y="311.9951">A13</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
+      <path d="M129.5,279.894 L156.5,279.894 A3.75,3.75 0 0 1 159,282.394 L166,302.6939 L170.5,302.6939 A2.5,2.5 0 0 1 173,305.1939 L173,330.9938 A2.5,2.5 0 0 1 170.5,333.4938 L129.5,333.4938 A2.5,2.5 0 0 1 127,330.9938 L127,282.394 A2.5,2.5 0 0 1 129.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="127" x2="166" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="131" y="294.8999">A17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="450.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="410.5" y="311.9951">A14</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
+      <path d="M48.5,279.894 L75.5,279.894 A3.75,3.75 0 0 1 78,282.394 L85,302.6939 L89.5,302.6939 A2.5,2.5 0 0 1 92,305.1939 L92,330.9938 A2.5,2.5 0 0 1 89.5,333.4938 L48.5,333.4938 A2.5,2.5 0 0 1 46,330.9938 L46,282.394 A2.5,2.5 0 0 1 48.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="46" x2="85" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="50" y="294.8999">A18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A15</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <path d="M732.5,84.294 L763.5,84.294 A3.75,3.75 0 0 1 766,86.794 L773,107.0939 L777.5,107.0939 A2.5,2.5 0 0 1 780,109.5939 L780,135.3938 A2.5,2.5 0 0 1 777.5,137.8938 L732.5,137.8938 A2.5,2.5 0 0 1 730,135.3938 L730,86.794 A2.5,2.5 0 0 1 732.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="730" x2="773" y1="107.0939" y2="107.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="734" y="99.2999">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A16</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A17</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A18</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fxvflckrbsr4e)" points="791,102,827,102,834,124.2969,841,124.2969,841,154.5938,791,154.5938,791,102" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="791" x2="834" y1="124.2969" y2="124.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="795" y="116.9951">BBB</text>
-    </a>
-    <path d="M841.09,150.04 C858.32,165.3 880.6,187.47 895,211 C910.38,236.14 920.49,268.3 926.38,291.62 " fill="none" id="C_0002255521339657425355-&gt;C_0000839146342143718390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="927.65,296.75,929.3746,287.0533,926.4508,291.8959,921.6081,288.9721,927.65,296.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M821.44,155.13 C828.95,190.46 842.45,254.03 850.49,291.83 " fill="none" id="C_0002255521339657425355-&gt;C_0001650835159458422245" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="851.53,296.77,853.5689,287.1345,850.4892,291.8795,845.7441,288.7998,851.53,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M841.31,129.44 C944.9,129.71 1335.4,135.79 1427,211 C1451,230.71 1459.9,266.28 1463.17,291.95 " fill="none" id="C_0002255521339657425355-&gt;C_0001164966689017271053" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1463.75,296.94,1466.6961,287.5421,1463.179,291.9727,1458.7484,288.4556,1463.75,296.94" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M841.03,129.97 C935.9,132.24 1272.01,144.9 1351,211 C1374.67,230.81 1383.64,266.02 1387.01,291.58 " fill="none" id="C_0002255521339657425355-&gt;C_0000695366113361481509" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1387.62,296.56,1390.5096,287.1446,1387.0192,291.5962,1382.5675,288.1059,1387.62,296.56" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M841.26,130.68 C927.5,135.19 1208.66,154.09 1275,211 C1298.33,231.01 1307.36,265.96 1310.85,291.41 " fill="none" id="C_0002255521339657425355-&gt;C_0001267709074800873528" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1311.51,296.69,1314.3461,287.2583,1310.881,291.7297,1306.4096,288.2647,1311.51,296.69" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M841.01,131.63 C917.28,138.61 1145.05,163.1 1199,211 C1221.99,231.41 1231.08,266.29 1234.67,291.61 " fill="none" id="C_0002255521339657425355-&gt;C_0000299262817531370604" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1235.36,296.86,1238.1728,287.4213,1234.7188,291.9013,1230.2388,288.4473,1235.36,296.86" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M790.87,131.14 C708.92,136.96 451.13,159.13 389,211 C364.96,231.07 354.32,266.23 349.64,291.72 " fill="none" id="C_0002255521339657425355-&gt;C_0000561239706327729436" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="348.78,296.68,354.2669,288.5012,349.6391,291.7544,346.3859,287.1266,348.78,296.68" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M790.79,129.14 C679.95,128.03 236.68,128.88 131,211 C106.12,230.33 95.63,265.97 91.21,291.76 " fill="none" id="C_0002255521339657425355-&gt;C_0000405712335116487393" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="90.4,296.78,95.7633,288.5196,91.1849,291.842,87.8625,287.2636,90.4,296.78" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M790.82,130.26 C698.42,133.51 379.51,149.11 303,211 C278.5,230.82 267.94,266.36 263.4,292 " fill="none" id="C_0002255521339657425355-&gt;C_0001415398383158410524" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="262.57,296.99,268.0067,288.7777,263.3989,292.0592,260.1175,287.4514,262.57,296.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M790.83,132.47 C720.33,141.24 522.93,169.07 475,211 C451.43,231.62 440.71,266.68 435.87,291.99 " fill="none" id="C_0002255521339657425355-&gt;C_0000301858476377711436" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="434.98,296.92,440.5129,288.7722,435.8669,291.9993,432.6398,287.3532,434.98,296.92" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M841.2,128.7 C898.93,128.26 1041.97,135.37 1123,211 C1145.33,231.84 1154.54,266.32 1158.34,291.43 " fill="none" id="C_0002255521339657425355-&gt;C_0001207764290216680521" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1159.07,296.64,1161.7723,287.1691,1158.3709,291.6891,1153.8509,288.2877,1159.07,296.64" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M841.18,136.31 C875.31,146.8 936.02,170.11 971,211 C990.61,233.92 1000.24,267.45 1004.88,291.75 " fill="none" id="C_0002255521339657425355-&gt;C_0000563861734550555261" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1005.79,296.79,1008.1082,287.2179,1004.8918,291.8713,1000.2383,288.655,1005.79,296.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M790.92,129.62 C689.14,130.58 308.08,139 217,211 C192.28,230.54 181.76,266.14 177.29,291.87 " fill="none" id="C_0002255521339657425355-&gt;C_0000532437874530119999" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="176.47,296.87,181.8603,288.6272,177.2711,291.9346,173.9637,287.3454,176.47,296.87" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M841.33,131.35 C888.35,136.13 989.57,152.95 1047,211 C1068.35,232.58 1077.72,266.62 1081.82,291.42 " fill="none" id="C_0002255521339657425355-&gt;C_0000899091126727901939" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1082.62,296.56,1085.1843,287.0508,1081.849,291.6198,1077.28,288.2845,1082.62,296.56" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M810.69,155.13 C803.37,190.46 790.19,254.03 782.36,291.83 " fill="none" id="C_0002255521339657425355-&gt;C_0001453242941322376182" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="781.33,296.77,787.0713,288.7676,782.3435,291.8738,779.2373,287.146,781.33,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M790.65,149.33 C772.56,164.58 748.75,187.03 733,211 C716.51,236.09 704.93,268.44 697.97,291.83 " fill="none" id="C_0002255521339657425355-&gt;C_0000384833776371876986" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="696.55,296.68,702.91,289.16,697.95,291.88,695.23,286.92,696.55,296.68" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M790.97,135.3 C754.52,144.98 686.85,167.77 647,211 C626.26,233.5 615.14,267.09 609.45,291.52 " fill="none" id="C_0002255521339657425355-&gt;C_0001199527037490355138" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="608.31,296.59,614.172,288.6757,609.3977,291.7097,606.3636,286.9354,608.31,296.59" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M790.7,130.59 C740.38,134.08 626.94,148.82 561,211 C538.45,232.26 527.58,266.67 522.43,291.65 " fill="none" id="C_0002255521339657425355-&gt;C_0000620689743711615190" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="521.42,296.83,527.0712,288.7638,522.3786,291.9227,519.2196,287.2301,521.42,296.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0002255521339657425355_C_0000839146342143718390">
+      <path codeLine="48" d="M780.29,133.834 C796.75,149.164 817.57,170.984 831,193.894 C846.88,220.984 855.365,250.0899 860.655,273.6399 " fill="none" id="C_0002255521339657425355-to-C_0000839146342143718390" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="861.97,279.494,863.9002,269.8361,860.8742,274.6155,856.0947,271.5895,861.97,279.494" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0001650835159458422245">
+      <path codeLine="49" d="M760.26,138.204 C767.72,175.254 780.1257,236.812 787.5757,273.812 " fill="none" id="C_0002255521339657425355-to-C_0001650835159458422245" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="788.76,279.694,790.9048,270.0815,787.7731,274.7924,783.0622,271.6606,788.76,279.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0001164966689017271053">
+      <path codeLine="50" d="M780.38,112.164 C881.58,112.944 1255.05,120.824 1342,193.894 C1367.13,215.014 1374.3585,247.8176 1376.6585,273.6776 " fill="none" id="C_0002255521339657425355-to-C_0001164966689017271053" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1377.19,279.654,1380.377,270.335,1376.747,274.6736,1372.4084,271.0437,1377.19,279.654" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000695366113361481509">
+      <path codeLine="51" d="M780.35,112.724 C873.33,115.514 1194.13,129.734 1269,193.894 C1293.93,215.254 1301.1907,247.9992 1303.5607,273.7792 " fill="none" id="C_0002255521339657425355-to-C_0000695366113361481509" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1304.11,279.754,1307.2693,270.4256,1303.6523,274.775,1299.3029,271.158,1304.11,279.754" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0001267709074800873528">
+      <path codeLine="52" d="M780.47,113.464 C864.81,118.494 1133.14,138.614 1196,193.894 C1220.5,215.444 1227.8566,247.7524 1230.3666,273.4424 " fill="none" id="C_0002255521339657425355-to-C_0001267709074800873528" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1230.95,279.414,1234.0559,270.0677,1230.4638,274.4377,1226.0938,270.8456,1230.95,279.414" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000299262817531370604">
+      <path codeLine="53" d="M780.38,114.474 C855.06,121.974 1071.96,147.384 1123,193.894 C1147.12,215.874 1154.5356,248.0755 1157.1656,273.6255 " fill="none" id="C_0002255521339657425355-to-C_0000299262817531370604" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1157.78,279.594,1160.8374,270.2317,1157.268,274.6203,1152.8795,271.0509,1157.78,279.594" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000561239706327729436">
+      <path codeLine="54" d="M729.57,114.034 C650.3,120.544 409.47,144.114 352,193.894 C327.07,215.484 318.4997,247.8202 314.9597,273.4902 " fill="none" id="C_0002255521339657425355-to-C_0000561239706327729436" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="314.14,279.434,319.332,271.0648,314.8231,274.4809,311.407,269.9719,314.14,279.434" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000405712335116487393">
+      <path codeLine="55" d="M729.75,111.884 C622.66,111.494 207.06,115.144 109,193.894 C83.12,214.674 74.708,247.5795 71.488,273.5595 " fill="none" id="C_0002255521339657425355-to-C_0000405712335116487393" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="70.75,279.514,75.8266,271.0743,71.365,274.552,67.8874,270.0903,70.75,279.514" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0001415398383158410524">
+      <path codeLine="56" d="M729.66,113.074 C640.36,117.024 341.88,134.514 271,193.894 C245.56,215.204 237.0771,247.9845 233.7071,273.7845 " fill="none" id="C_0002255521339657425355-to-C_0001415398383158410524" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="232.93,279.734,238.062,271.3279,233.5776,274.7761,230.1294,270.2917,232.93,279.734" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000301858476377711436">
+      <path codeLine="57" d="M729.96,115.384 C662.21,124.764 477.38,153.534 433,193.894 C408.6,216.084 399.9348,248.2766 396.2248,273.7466 " fill="none" id="C_0002255521339657425355-to-C_0000301858476377711436" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="395.36,279.684,400.6155,271.3545,396.0807,274.7362,392.699,270.2014,395.36,279.684" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0001207764290216680521">
+      <path codeLine="58" d="M780.16,111.554 C836.4,111.764 973.31,120.294 1050,193.894 C1073.54,216.484 1081.0564,248.5508 1083.8764,273.8908 " fill="none" id="C_0002255521339657425355-to-C_0001207764290216680521" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1084.54,279.854,1087.52,270.4668,1083.987,274.8847,1079.5691,271.3516,1084.54,279.854" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000563861734550555261">
+      <path codeLine="59" d="M780.44,119.514 C813.57,130.464 871.12,154.074 904,193.894 C924.38,218.584 932.3666,249.107 936.2266,273.617 " fill="none" id="C_0002255521339657425355-to-C_0000563861734550555261" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="937.16,279.544,939.7112,270.0313,936.3822,274.6049,931.8086,271.2758,937.16,279.544" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000532437874530119999">
+      <path codeLine="60" d="M729.63,112.394 C631,114.074 274.4,124.874 190,193.894 C164.31,214.904 155.8658,247.7518 152.5758,273.6618 " fill="none" id="C_0002255521339657425355-to-C_0000532437874530119999" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="151.82,279.614,156.9218,271.1895,152.4498,274.6538,148.9856,270.1818,151.82,279.614" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000899091126727901939">
+      <path codeLine="61" d="M780.16,114.284 C825.84,119.614 922.69,137.284 977,193.894 C999.45,217.294 1007.1438,248.8018 1010.3238,273.8318 " fill="none" id="C_0002255521339657425355-to-C_0000899091126727901939" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1011.08,279.784,1013.9138,270.3516,1010.4498,274.8239,1005.9776,271.3599,1011.08,279.784" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0001453242941322376182">
+      <path codeLine="62" d="M749.88,138.204 C742.6,175.254 730.5268,236.8066 723.2568,273.8066 " fill="none" id="C_0002255521339657425355-to-C_0001453242941322376182" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="722.1,279.694,727.7602,271.634,723.064,274.7878,719.9102,270.0916,722.1,279.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000384833776371876986">
+      <path codeLine="63" d="M729.65,133.124 C712.53,148.474 690.48,170.584 676,193.894 C659.25,220.864 649.6982,250.0392 643.5282,273.6292 " fill="none" id="C_0002255521339657425355-to-C_0000384833776371876986" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="642.01,279.434,648.1572,271.739,643.2752,274.5967,640.4175,269.7147,642.01,279.434" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0001199527037490355138">
+      <path codeLine="64" d="M729.7,118.634 C694.69,128.924 631.65,152.174 595,193.894 C573.5,218.364 564.4131,249.3181 559.7631,273.9481 " fill="none" id="C_0002255521339657425355-to-C_0001199527037490355138" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="558.65,279.844,564.2502,271.7423,559.5776,274.9308,556.3891,270.2581,558.65,279.844" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002255521339657425355_C_0000620689743711615190">
+      <path codeLine="65" d="M729.82,113.624 C681.45,117.884 574.95,133.934 514,193.894 C490.63,216.884 481.8135,248.5202 477.7635,273.6802 " fill="none" id="C_0002255521339657425355-to-C_0000620689743711615190" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="476.81,279.604,482.1895,271.3541,477.6046,274.6675,474.2912,270.0827,476.81,279.604" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30002_package_mermaid.svg b/docs/test_cases/t30002_package_mermaid.svg
index 652965df..7f16d003 100644
--- a/docs/test_cases/t30002_package_mermaid.svg
+++ b/docs/test_cases/t30002_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 1677.234375 332" style="max-width: 1677.23px; background-color: white;" width="1677.234375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -63,24 +63,24 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000839146342143718390" id="L-C_0002255521339657425355-C_0000839146342143718390-0" d="M769.91796875,74.05732744273308L752.3209635416666,79.71443953561091C734.7239583333334,85.37155162848872,699.5299479166666,96.68577581424437,681.9329427083334,106.50955457378886C664.3359375,116.33333333333333,664.3359375,124.66666666666667,664.3359375,133C664.3359375,141.33333333333334,664.3359375,149.66666666666666,664.3359375,158C664.3359375,166.33333333333334,664.3359375,174.66666666666666,664.3359375,183C664.3359375,191.33333333333334,664.3359375,199.66666666666666,664.3359375,208C664.3359375,216.33333333333334,664.3359375,224.66666666666666,664.3359375,228.83333333333334L664.3359375,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001650835159458422245" id="L-C_0002255521339657425355-C_0001650835159458422245-0" d="M775.7283509036145,83L771.2593028363453,87.16666666666667C766.7902547690763,91.33333333333333,757.8521586345381,99.66666666666667,753.383110567269,108C748.9140625,116.33333333333333,748.9140625,124.66666666666667,748.9140625,133C748.9140625,141.33333333333334,748.9140625,149.66666666666666,748.9140625,158C748.9140625,166.33333333333334,748.9140625,174.66666666666666,748.9140625,183C748.9140625,191.33333333333334,748.9140625,199.66666666666666,748.9140625,208C748.9140625,216.33333333333334,748.9140625,224.66666666666666,748.9140625,228.83333333333334L748.9140625,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001164966689017271053" id="L-C_0002255521339657425355-C_0001164966689017271053-0" d="M769.91796875,67.85282837967402L653.646484375,74.54402364972835C537.375,81.23521891978268,304.83203125,94.61760945989134,188.560546875,105.47547139661235C72.2890625,116.33333333333333,72.2890625,124.66666666666667,72.2890625,133C72.2890625,141.33333333333334,72.2890625,149.66666666666666,72.2890625,158C72.2890625,166.33333333333334,72.2890625,174.66666666666666,72.2890625,183C72.2890625,191.33333333333334,72.2890625,199.66666666666666,72.2890625,208C72.2890625,216.33333333333334,72.2890625,224.66666666666666,72.2890625,228.83333333333334L72.2890625,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000695366113361481509" id="L-C_0002255521339657425355-C_0000695366113361481509-0" d="M769.91796875,68.03257567854492L667.7428385416666,74.6938130654541C565.5677083333334,81.35505045236327,361.2174479166667,94.67752522618163,259.0423177083333,105.50542927975748C156.8671875,116.33333333333333,156.8671875,124.66666666666667,156.8671875,133C156.8671875,141.33333333333334,156.8671875,149.66666666666666,156.8671875,158C156.8671875,166.33333333333334,156.8671875,174.66666666666666,156.8671875,183C156.8671875,191.33333333333334,156.8671875,199.66666666666666,156.8671875,208C156.8671875,216.33333333333334,156.8671875,224.66666666666666,156.8671875,228.83333333333334L156.8671875,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001267709074800873528" id="L-C_0002255521339657425355-C_0001267709074800873528-0" d="M769.91796875,68.26740713481993L681.8391927083334,74.88950594568327C593.7604166666666,81.51160475654662,417.6028645833333,94.7558023782733,329.5240885416667,105.54456785580332C241.4453125,116.33333333333333,241.4453125,124.66666666666667,241.4453125,133C241.4453125,141.33333333333334,241.4453125,149.66666666666666,241.4453125,158C241.4453125,166.33333333333334,241.4453125,174.66666666666666,241.4453125,183C241.4453125,191.33333333333334,241.4453125,199.66666666666666,241.4453125,208C241.4453125,216.33333333333334,241.4453125,224.66666666666666,241.4453125,228.83333333333334L241.4453125,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000299262817531370604" id="L-C_0002255521339657425355-C_0000299262817531370604-0" d="M769.91796875,68.58722577410055L695.935546875,75.15602147841712C621.953125,81.7248171827337,473.98828125,94.86240859136684,400.005859375,105.59787096235009C326.0234375,116.33333333333333,326.0234375,124.66666666666667,326.0234375,133C326.0234375,141.33333333333334,326.0234375,149.66666666666666,326.0234375,158C326.0234375,166.33333333333334,326.0234375,174.66666666666666,326.0234375,183C326.0234375,191.33333333333334,326.0234375,199.66666666666666,326.0234375,208C326.0234375,216.33333333333334,326.0234375,224.66666666666666,326.0234375,228.83333333333334L326.0234375,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000561239706327729436" id="L-C_0002255521339657425355-C_0000561239706327729436-0" d="M816.93359375,68.41038850769901L898.126953125,75.00865708974918C979.3203125,81.60692567179935,1141.70703125,94.80346283589967,1222.900390625,105.5683980846165C1304.09375,116.33333333333333,1304.09375,124.66666666666667,1304.09375,133C1304.09375,141.33333333333334,1304.09375,149.66666666666666,1304.09375,158C1304.09375,166.33333333333334,1304.09375,174.66666666666666,1304.09375,183C1304.09375,191.33333333333334,1304.09375,199.66666666666666,1304.09375,208C1304.09375,216.33333333333334,1304.09375,224.66666666666666,1304.09375,228.83333333333334L1304.09375,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000405712335116487393" id="L-C_0002255521339657425355-C_0000405712335116487393-0" d="M816.93359375,67.7332271683579L944.861328125,74.44435597363157C1072.7890625,81.15548477890526,1328.64453125,94.57774238945262,1456.572265625,105.45553786139298C1584.5,116.33333333333333,1584.5,124.66666666666667,1584.5,133C1584.5,141.33333333333334,1584.5,149.66666666666666,1584.5,158C1584.5,166.33333333333334,1584.5,174.66666666666666,1584.5,183C1584.5,191.33333333333334,1584.5,199.66666666666666,1584.5,208C1584.5,216.33333333333334,1584.5,224.66666666666666,1584.5,228.83333333333334L1584.5,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001415398383158410524" id="L-C_0002255521339657425355-C_0001415398383158410524-0" d="M816.93359375,68.1148235796171L913.705078125,74.76235298301425C1010.4765625,81.4098823864114,1204.01953125,94.7049411932057,1300.791015625,105.51913726326951C1397.5625,116.33333333333333,1397.5625,124.66666666666667,1397.5625,133C1397.5625,141.33333333333334,1397.5625,149.66666666666666,1397.5625,158C1397.5625,166.33333333333334,1397.5625,174.66666666666666,1397.5625,183C1397.5625,191.33333333333334,1397.5625,199.66666666666666,1397.5625,208C1397.5625,216.33333333333334,1397.5625,224.66666666666666,1397.5625,228.83333333333334L1397.5625,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000301858476377711436" id="L-C_0002255521339657425355-C_0000301858476377711436-0" d="M816.93359375,68.83838937108509L882.548828125,75.36532447590425C948.1640625,81.89225958072339,1079.39453125,94.9461297903617,1145.009765625,105.63973156184751C1210.625,116.33333333333333,1210.625,124.66666666666667,1210.625,133C1210.625,141.33333333333334,1210.625,149.66666666666666,1210.625,158C1210.625,166.33333333333334,1210.625,174.66666666666666,1210.625,183C1210.625,191.33333333333334,1210.625,199.66666666666666,1210.625,208C1210.625,216.33333333333334,1210.625,224.66666666666666,1210.625,228.83333333333334L1210.625,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001207764290216680521" id="L-C_0002255521339657425355-C_0001207764290216680521-0" d="M769.91796875,69.0483607644664L710.0319010416666,75.54030063705532C650.1458333333334,82.03224050964427,530.3736979166666,95.01612025482213,470.4876302083333,105.67472679407774C410.6015625,116.33333333333333,410.6015625,124.66666666666667,410.6015625,133C410.6015625,141.33333333333334,410.6015625,149.66666666666666,410.6015625,158C410.6015625,166.33333333333334,410.6015625,174.66666666666666,410.6015625,183C410.6015625,191.33333333333334,410.6015625,199.66666666666666,410.6015625,208C410.6015625,216.33333333333334,410.6015625,224.66666666666666,410.6015625,228.83333333333334L410.6015625,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000563861734550555261" id="L-C_0002255521339657425355-C_0000563861734550555261-0" d="M769.91796875,71.06584215433554L738.224609375,77.22153512861296C706.53125,83.37722810289036,643.14453125,95.68861405144519,611.451171875,106.01097369238926C579.7578125,116.33333333333333,579.7578125,124.66666666666667,579.7578125,133C579.7578125,141.33333333333334,579.7578125,149.66666666666666,579.7578125,158C579.7578125,166.33333333333334,579.7578125,174.66666666666666,579.7578125,183C579.7578125,191.33333333333334,579.7578125,199.66666666666666,579.7578125,208C579.7578125,216.33333333333334,579.7578125,224.66666666666666,579.7578125,228.83333333333334L579.7578125,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000532437874530119999" id="L-C_0002255521339657425355-C_0000532437874530119999-0" d="M816.93359375,67.89846125417864L929.283203125,74.58205104514887C1041.6328125,81.26564083611909,1266.33203125,94.63282041805955,1378.681640625,105.48307687569644C1491.03125,116.33333333333333,1491.03125,124.66666666666667,1491.03125,133C1491.03125,141.33333333333334,1491.03125,149.66666666666666,1491.03125,158C1491.03125,166.33333333333334,1491.03125,174.66666666666666,1491.03125,183C1491.03125,191.33333333333334,1491.03125,199.66666666666666,1491.03125,208C1491.03125,216.33333333333334,1491.03125,224.66666666666666,1491.03125,228.83333333333334L1491.03125,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000899091126727901939" id="L-C_0002255521339657425355-C_0000899091126727901939-0" d="M769.91796875,69.77103770743015L724.1282552083334,76.14253142285845C678.3385416666666,82.51402513828677,586.7591145833334,95.25701256914338,540.9694010416666,105.79517295123837C495.1796875,116.33333333333333,495.1796875,124.66666666666667,495.1796875,133C495.1796875,141.33333333333334,495.1796875,149.66666666666666,495.1796875,158C495.1796875,166.33333333333334,495.1796875,174.66666666666666,495.1796875,183C495.1796875,191.33333333333334,495.1796875,199.66666666666666,495.1796875,208C495.1796875,216.33333333333334,495.1796875,224.66666666666666,495.1796875,228.83333333333334L495.1796875,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001453242941322376182" id="L-C_0002255521339657425355-C_0001453242941322376182-0" d="M811.1232115963855,83L815.5922596636547,87.16666666666667C820.0613077309237,91.33333333333333,828.9994038654619,99.66666666666667,833.468451932731,108C837.9375,116.33333333333333,837.9375,124.66666666666667,837.9375,133C837.9375,141.33333333333334,837.9375,149.66666666666666,837.9375,158C837.9375,166.33333333333334,837.9375,174.66666666666666,837.9375,183C837.9375,191.33333333333334,837.9375,199.66666666666666,837.9375,208C837.9375,216.33333333333334,837.9375,224.66666666666666,837.9375,228.83333333333334L837.9375,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000384833776371876986" id="L-C_0002255521339657425355-C_0000384833776371876986-0" d="M816.93359375,73.60093542975747L835.9134114583334,79.33411285813122C854.8932291666666,85.06729028650498,892.8528645833334,96.53364514325249,911.8326822916666,106.4334892382929C930.8125,116.33333333333333,930.8125,124.66666666666667,930.8125,133C930.8125,141.33333333333334,930.8125,149.66666666666666,930.8125,158C930.8125,166.33333333333334,930.8125,174.66666666666666,930.8125,183C930.8125,191.33333333333334,930.8125,199.66666666666666,930.8125,208C930.8125,216.33333333333334,930.8125,224.66666666666666,930.8125,228.83333333333334L930.8125,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001199527037490355138" id="L-C_0002255521339657425355-C_0001199527037490355138-0" d="M816.93359375,70.73680594432287L851.392578125,76.94733828693573C885.8515625,83.15787062954858,954.76953125,95.5789353147743,989.228515625,105.95613432405382C1023.6875,116.33333333333333,1023.6875,124.66666666666667,1023.6875,133C1023.6875,141.33333333333334,1023.6875,149.66666666666666,1023.6875,158C1023.6875,166.33333333333334,1023.6875,174.66666666666666,1023.6875,183C1023.6875,191.33333333333334,1023.6875,199.66666666666666,1023.6875,208C1023.6875,216.33333333333334,1023.6875,224.66666666666666,1023.6875,228.83333333333334L1023.6875,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000620689743711615190" id="L-C_0002255521339657425355-C_0000620689743711615190-0" d="M816.93359375,69.51353846153846L866.970703125,75.92794871794872C917.0078125,82.34235897435897,1017.08203125,95.17117948717949,1067.119140625,105.75225641025641C1117.15625,116.33333333333333,1117.15625,124.66666666666667,1117.15625,133C1117.15625,141.33333333333334,1117.15625,149.66666666666666,1117.15625,158C1117.15625,166.33333333333334,1117.15625,174.66666666666666,1117.15625,183C1117.15625,191.33333333333334,1117.15625,199.66666666666666,1117.15625,208C1117.15625,216.33333333333334,1117.15625,224.66666666666666,1117.15625,228.83333333333334L1117.15625,233"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000839146342143718390" id="L-C_0002255521339657425355-C_0000839146342143718390-0" d="M769.91796875,74.05732744273308L752.3209635416666,79.71443953561091C734.7239583333334,85.37155162848872,699.5299479166666,96.68577581424437,681.9329427083334,106.50955457378886C664.3359375,116.33333333333333,664.3359375,124.66666666666667,664.3359375,133C664.3359375,141.33333333333334,664.3359375,149.66666666666666,664.3359375,158C664.3359375,166.33333333333334,664.3359375,174.66666666666666,664.3359375,183C664.3359375,191.33333333333334,664.3359375,199.66666666666666,664.3359375,207.11666666666667C664.3359375,214.5666666666667,664.3359375,221.13333333333333,664.3359375,224.41666666666666L664.3359375,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001650835159458422245" id="L-C_0002255521339657425355-C_0001650835159458422245-0" d="M775.7283509036145,83L771.2593028363453,87.16666666666667C766.7902547690763,91.33333333333333,757.8521586345381,99.66666666666667,753.383110567269,108C748.9140625,116.33333333333333,748.9140625,124.66666666666667,748.9140625,133C748.9140625,141.33333333333334,748.9140625,149.66666666666666,748.9140625,158C748.9140625,166.33333333333334,748.9140625,174.66666666666666,748.9140625,183C748.9140625,191.33333333333334,748.9140625,199.66666666666666,748.9140625,207.11666666666667C748.9140625,214.5666666666667,748.9140625,221.13333333333333,748.9140625,224.41666666666666L748.9140625,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001164966689017271053" id="L-C_0002255521339657425355-C_0001164966689017271053-0" d="M769.91796875,67.85282837967402L653.646484375,74.54402364972835C537.375,81.23521891978268,304.83203125,94.61760945989134,188.560546875,105.47547139661235C72.2890625,116.33333333333333,72.2890625,124.66666666666667,72.2890625,133C72.2890625,141.33333333333334,72.2890625,149.66666666666666,72.2890625,158C72.2890625,166.33333333333334,72.2890625,174.66666666666666,72.2890625,183C72.2890625,191.33333333333334,72.2890625,199.66666666666666,72.2890625,207.11666666666667C72.2890625,214.5666666666667,72.2890625,221.13333333333333,72.2890625,224.41666666666666L72.2890625,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000695366113361481509" id="L-C_0002255521339657425355-C_0000695366113361481509-0" d="M769.91796875,68.03257567854492L667.7428385416666,74.6938130654541C565.5677083333334,81.35505045236327,361.2174479166667,94.67752522618163,259.0423177083333,105.50542927975748C156.8671875,116.33333333333333,156.8671875,124.66666666666667,156.8671875,133C156.8671875,141.33333333333334,156.8671875,149.66666666666666,156.8671875,158C156.8671875,166.33333333333334,156.8671875,174.66666666666666,156.8671875,183C156.8671875,191.33333333333334,156.8671875,199.66666666666666,156.8671875,207.11666666666667C156.8671875,214.5666666666667,156.8671875,221.13333333333333,156.8671875,224.41666666666666L156.8671875,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001267709074800873528" id="L-C_0002255521339657425355-C_0001267709074800873528-0" d="M769.91796875,68.26740713481993L681.8391927083334,74.88950594568327C593.7604166666666,81.51160475654662,417.6028645833333,94.7558023782733,329.5240885416667,105.54456785580332C241.4453125,116.33333333333333,241.4453125,124.66666666666667,241.4453125,133C241.4453125,141.33333333333334,241.4453125,149.66666666666666,241.4453125,158C241.4453125,166.33333333333334,241.4453125,174.66666666666666,241.4453125,183C241.4453125,191.33333333333334,241.4453125,199.66666666666666,241.4453125,207.11666666666667C241.4453125,214.5666666666667,241.4453125,221.13333333333333,241.4453125,224.41666666666666L241.4453125,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000299262817531370604" id="L-C_0002255521339657425355-C_0000299262817531370604-0" d="M769.91796875,68.58722577410055L695.935546875,75.15602147841712C621.953125,81.7248171827337,473.98828125,94.86240859136684,400.005859375,105.59787096235009C326.0234375,116.33333333333333,326.0234375,124.66666666666667,326.0234375,133C326.0234375,141.33333333333334,326.0234375,149.66666666666666,326.0234375,158C326.0234375,166.33333333333334,326.0234375,174.66666666666666,326.0234375,183C326.0234375,191.33333333333334,326.0234375,199.66666666666666,326.0234375,207.11666666666667C326.0234375,214.5666666666667,326.0234375,221.13333333333333,326.0234375,224.41666666666666L326.0234375,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000561239706327729436" id="L-C_0002255521339657425355-C_0000561239706327729436-0" d="M816.93359375,68.41038850769901L898.126953125,75.00865708974918C979.3203125,81.60692567179935,1141.70703125,94.80346283589967,1222.900390625,105.5683980846165C1304.09375,116.33333333333333,1304.09375,124.66666666666667,1304.09375,133C1304.09375,141.33333333333334,1304.09375,149.66666666666666,1304.09375,158C1304.09375,166.33333333333334,1304.09375,174.66666666666666,1304.09375,183C1304.09375,191.33333333333334,1304.09375,199.66666666666666,1304.09375,207.11666666666667C1304.09375,214.5666666666667,1304.09375,221.13333333333333,1304.09375,224.41666666666666L1304.09375,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000405712335116487393" id="L-C_0002255521339657425355-C_0000405712335116487393-0" d="M816.93359375,67.7332271683579L944.861328125,74.44435597363157C1072.7890625,81.15548477890526,1328.64453125,94.57774238945262,1456.572265625,105.45553786139298C1584.5,116.33333333333333,1584.5,124.66666666666667,1584.5,133C1584.5,141.33333333333334,1584.5,149.66666666666666,1584.5,158C1584.5,166.33333333333334,1584.5,174.66666666666666,1584.5,183C1584.5,191.33333333333334,1584.5,199.66666666666666,1584.5,207.11666666666667C1584.5,214.5666666666667,1584.5,221.13333333333333,1584.5,224.41666666666666L1584.5,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001415398383158410524" id="L-C_0002255521339657425355-C_0001415398383158410524-0" d="M816.93359375,68.1148235796171L913.705078125,74.76235298301425C1010.4765625,81.4098823864114,1204.01953125,94.7049411932057,1300.791015625,105.51913726326951C1397.5625,116.33333333333333,1397.5625,124.66666666666667,1397.5625,133C1397.5625,141.33333333333334,1397.5625,149.66666666666666,1397.5625,158C1397.5625,166.33333333333334,1397.5625,174.66666666666666,1397.5625,183C1397.5625,191.33333333333334,1397.5625,199.66666666666666,1397.5625,207.11666666666667C1397.5625,214.5666666666667,1397.5625,221.13333333333333,1397.5625,224.41666666666666L1397.5625,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000301858476377711436" id="L-C_0002255521339657425355-C_0000301858476377711436-0" d="M816.93359375,68.83838937108509L882.548828125,75.36532447590425C948.1640625,81.89225958072339,1079.39453125,94.9461297903617,1145.009765625,105.63973156184751C1210.625,116.33333333333333,1210.625,124.66666666666667,1210.625,133C1210.625,141.33333333333334,1210.625,149.66666666666666,1210.625,158C1210.625,166.33333333333334,1210.625,174.66666666666666,1210.625,183C1210.625,191.33333333333334,1210.625,199.66666666666666,1210.625,207.11666666666667C1210.625,214.5666666666667,1210.625,221.13333333333333,1210.625,224.41666666666666L1210.625,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001207764290216680521" id="L-C_0002255521339657425355-C_0001207764290216680521-0" d="M769.91796875,69.0483607644664L710.0319010416666,75.54030063705532C650.1458333333334,82.03224050964427,530.3736979166666,95.01612025482213,470.4876302083333,105.67472679407774C410.6015625,116.33333333333333,410.6015625,124.66666666666667,410.6015625,133C410.6015625,141.33333333333334,410.6015625,149.66666666666666,410.6015625,158C410.6015625,166.33333333333334,410.6015625,174.66666666666666,410.6015625,183C410.6015625,191.33333333333334,410.6015625,199.66666666666666,410.6015625,207.11666666666667C410.6015625,214.5666666666667,410.6015625,221.13333333333333,410.6015625,224.41666666666666L410.6015625,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000563861734550555261" id="L-C_0002255521339657425355-C_0000563861734550555261-0" d="M769.91796875,71.06584215433554L738.224609375,77.22153512861296C706.53125,83.37722810289036,643.14453125,95.68861405144519,611.451171875,106.01097369238926C579.7578125,116.33333333333333,579.7578125,124.66666666666667,579.7578125,133C579.7578125,141.33333333333334,579.7578125,149.66666666666666,579.7578125,158C579.7578125,166.33333333333334,579.7578125,174.66666666666666,579.7578125,183C579.7578125,191.33333333333334,579.7578125,199.66666666666666,579.7578125,207.11666666666667C579.7578125,214.5666666666667,579.7578125,221.13333333333333,579.7578125,224.41666666666666L579.7578125,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000532437874530119999" id="L-C_0002255521339657425355-C_0000532437874530119999-0" d="M816.93359375,67.89846125417864L929.283203125,74.58205104514887C1041.6328125,81.26564083611909,1266.33203125,94.63282041805955,1378.681640625,105.48307687569644C1491.03125,116.33333333333333,1491.03125,124.66666666666667,1491.03125,133C1491.03125,141.33333333333334,1491.03125,149.66666666666666,1491.03125,158C1491.03125,166.33333333333334,1491.03125,174.66666666666666,1491.03125,183C1491.03125,191.33333333333334,1491.03125,199.66666666666666,1491.03125,207.11666666666667C1491.03125,214.5666666666667,1491.03125,221.13333333333333,1491.03125,224.41666666666666L1491.03125,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000899091126727901939" id="L-C_0002255521339657425355-C_0000899091126727901939-0" d="M769.91796875,69.77103770743015L724.1282552083334,76.14253142285845C678.3385416666666,82.51402513828677,586.7591145833334,95.25701256914338,540.9694010416666,105.79517295123837C495.1796875,116.33333333333333,495.1796875,124.66666666666667,495.1796875,133C495.1796875,141.33333333333334,495.1796875,149.66666666666666,495.1796875,158C495.1796875,166.33333333333334,495.1796875,174.66666666666666,495.1796875,183C495.1796875,191.33333333333334,495.1796875,199.66666666666666,495.1796875,207.11666666666667C495.1796875,214.5666666666667,495.1796875,221.13333333333333,495.1796875,224.41666666666666L495.1796875,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001453242941322376182" id="L-C_0002255521339657425355-C_0001453242941322376182-0" d="M811.1232115963855,83L815.5922596636547,87.16666666666667C820.0613077309237,91.33333333333333,828.9994038654619,99.66666666666667,833.468451932731,108C837.9375,116.33333333333333,837.9375,124.66666666666667,837.9375,133C837.9375,141.33333333333334,837.9375,149.66666666666666,837.9375,158C837.9375,166.33333333333334,837.9375,174.66666666666666,837.9375,183C837.9375,191.33333333333334,837.9375,199.66666666666666,837.9375,207.11666666666667C837.9375,214.5666666666667,837.9375,221.13333333333333,837.9375,224.41666666666666L837.9375,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000384833776371876986" id="L-C_0002255521339657425355-C_0000384833776371876986-0" d="M816.93359375,73.60093542975747L835.9134114583334,79.33411285813122C854.8932291666666,85.06729028650498,892.8528645833334,96.53364514325249,911.8326822916666,106.4334892382929C930.8125,116.33333333333333,930.8125,124.66666666666667,930.8125,133C930.8125,141.33333333333334,930.8125,149.66666666666666,930.8125,158C930.8125,166.33333333333334,930.8125,174.66666666666666,930.8125,183C930.8125,191.33333333333334,930.8125,199.66666666666666,930.8125,207.11666666666667C930.8125,214.5666666666667,930.8125,221.13333333333333,930.8125,224.41666666666666L930.8125,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001199527037490355138" id="L-C_0002255521339657425355-C_0001199527037490355138-0" d="M816.93359375,70.73680594432287L851.392578125,76.94733828693573C885.8515625,83.15787062954858,954.76953125,95.5789353147743,989.228515625,105.95613432405382C1023.6875,116.33333333333333,1023.6875,124.66666666666667,1023.6875,133C1023.6875,141.33333333333334,1023.6875,149.66666666666666,1023.6875,158C1023.6875,166.33333333333334,1023.6875,174.66666666666666,1023.6875,183C1023.6875,191.33333333333334,1023.6875,199.66666666666666,1023.6875,207.11666666666667C1023.6875,214.5666666666667,1023.6875,221.13333333333333,1023.6875,224.41666666666666L1023.6875,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000620689743711615190" id="L-C_0002255521339657425355-C_0000620689743711615190-0" d="M816.93359375,69.51353846153846L866.970703125,75.92794871794872C917.0078125,82.34235897435897,1017.08203125,95.17117948717949,1067.119140625,105.75225641025641C1117.15625,116.33333333333333,1117.15625,124.66666666666667,1117.15625,133C1117.15625,141.33333333333334,1117.15625,149.66666666666666,1117.15625,158C1117.15625,166.33333333333334,1117.15625,174.66666666666666,1117.15625,183C1117.15625,191.33333333333334,1117.15625,199.66666666666666,1117.15625,207.11666666666667C1117.15625,214.5666666666667,1117.15625,221.13333333333333,1117.15625,224.41666666666666L1117.15625,227.7"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30003.md b/docs/test_cases/t30003.md
index 3d3525d2..8d45e2e6 100644
--- a/docs/test_cases/t30003.md
+++ b/docs/test_cases/t30003.md
@@ -15,7 +15,7 @@ diagrams:
         - "' t30003 test package diagram"
 ```
 ## Source code
-File t30003.cc
+File `tests/t30003/t30003.cc`
 ```cpp
 namespace clanguml {
 namespace t30003 {
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index c085f86c..a50afa51 100644
--- a/docs/test_cases/t30003_package.svg
+++ b/docs/test_cases/t30003_package.svg
@@ -1,47 +1,49 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="334px" preserveAspectRatio="none" style="width:292px;height:334px;background:#FFFFFF;" version="1.1" viewBox="0 0 292 334" width="292px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jqlw4aorjibn" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jqlw4aorjibn)" 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>
+    <g id="cluster_C_0000600452871069546589">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+        <path d="M8.5,220.894 L34.5,220.894 A3.75,3.75 0 0 1 37,223.394 L44,243.6939 L282.5,243.6939 A2.5,2.5 0 0 1 285,246.1939 L285,325.094 A2.5,2.5 0 0 1 282.5,327.594 L8.5,327.594 A2.5,2.5 0 0 1 6,325.094 L6,223.394 A2.5,2.5 0 0 1 8.5,220.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="44" y1="243.6939" y2="243.6939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="10" y="235.8999">ns1</text>
+      </a>
+    </g>
+    <g id="cluster_C_0000427104404739526818">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
+        <path d="M157.5,6.294 L183.5,6.294 A3.75,3.75 0 0 1 186,8.794 L193,29.0939 L278.5,29.0939 A2.5,2.5 0 0 1 281,31.5939 L281,194.394 A2.5,2.5 0 0 1 278.5,196.894 L157.5,196.894 A2.5,2.5 0 0 1 155,194.394 L155,8.794 A2.5,2.5 0 0 1 157.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="155" x2="193" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="159" y="21.2999">ns3</text>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="88" x="178" y="46.4938">«deprecated»</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001209144861141334061">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+        <path d="M181.5,68.294 L207.5,68.294 A3.75,3.75 0 0 1 210,70.794 L217,91.0939 L254.5,91.0939 A2.5,2.5 0 0 1 257,93.5939 L257,170.394 A2.5,2.5 0 0 1 254.5,172.894 L181.5,172.894 A2.5,2.5 0 0 1 179,170.394 L179,70.794 A2.5,2.5 0 0 1 181.5,68.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="179" x2="217" y1="91.0939" y2="91.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="183" y="83.2999">ns1</text>
+      </a>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
+      <path d="M170,256.944 L252,256.944 A3.75,3.75 0 0 1 254.5,259.444 L261.5,279.7439 L266,279.7439 A2.5,2.5 0 0 1 268.5,282.2439 L268.5,308.0438 A2.5,2.5 0 0 1 266,310.5438 L170,310.5438 A2.5,2.5 0 0 1 167.5,308.0438 L167.5,259.444 A2.5,2.5 0 0 1 170,256.944 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="167.5" x2="261.5" y1="279.7439" y2="279.7439"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="81" x="171.5" y="271.9499">ns2_v1_0_0</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jqlw4aorjibn)" 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>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
+      <path d="M24.5,255.894 L106.5,255.894 A3.75,3.75 0 0 1 109,258.394 L116,278.6939 L129.5,278.6939 A2.5,2.5 0 0 1 132,281.1939 L132,309.0938 A2.5,2.5 0 0 1 129.5,311.5938 L24.5,311.5938 A2.5,2.5 0 0 1 22,309.0938 L22,258.394 A2.5,2.5 0 0 1 24.5,255.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="22" x2="116" y1="278.6939" y2="278.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="81" x="26" y="270.8999">ns2_v0_9_0</text>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="88" x="37" y="296.0938">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jqlw4aorjibn)" 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>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
+      <path d="M198,103.294 L224,103.294 A3.75,3.75 0 0 1 226.5,105.794 L233.5,126.0939 L238,126.0939 A2.5,2.5 0 0 1 240.5,128.5939 L240.5,154.3938 A2.5,2.5 0 0 1 238,156.8938 L198,156.8938 A2.5,2.5 0 0 1 195.5,154.3938 L195.5,105.794 A2.5,2.5 0 0 1 198,103.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="195.5" x2="233.5" y1="126.0939" y2="126.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="199.5" y="118.2999">ns2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jqlw4aorjibn)" 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>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jqlw4aorjibn)" 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>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jqlw4aorjibn)" 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>
-    </a>
-    <path d="M248,171.29 C248,197.04 248,236.67 248,264.21 " fill="none" id="C_0000820462660523726751-&gt;C_0000647755950450743637" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="248,269.55,252,260.55,248,264.55,244,260.55,248,269.55" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000820462660523726751_C_0000647755950450743637">
+      <path codeLine="14" d="M218,157.164 C218,184.944 218,222.664 218,250.504 " fill="none" id="C_0000820462660523726751-to-C_0000647755950450743637" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="218,256.504,222,247.504,218,251.504,214,247.504,218,256.504" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30003_package_mermaid.svg b/docs/test_cases/t30003_package_mermaid.svg
index 0a3b23e0..a33de6b3 100644
--- a/docs/test_cases/t30003_package_mermaid.svg
+++ b/docs/test_cases/t30003_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 308.984375 222" style="max-width: 308.984px; background-color: white;" width="308.984375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -48,7 +48,7 @@
             </g>
           </g>
           <g class="edgePaths">
-            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000820462660523726751 LE-C_0000647755950450743637" id="L-C_0000820462660523726751-C_0000647755950450743637-0" d="M98.796875,79.5L102.96354166666667,79.5C107.13020833333333,79.5,115.46354166666667,79.5,123.796875,79.5C132.13020833333334,79.5,140.46354166666666,79.5,148.796875,79.5C157.13020833333334,79.5,165.46354166666666,79.5,169.63020833333334,79.5L173.796875,79.5"/>
+            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000820462660523726751 LE-C_0000647755950450743637" id="L-C_0000820462660523726751-C_0000647755950450743637-0" d="M98.796875,79.5L102.96354166666667,79.5C107.13020833333333,79.5,115.46354166666667,79.5,123.796875,79.5C132.13020833333334,79.5,140.46354166666666,79.5,147.91354166666667,79.5C155.36354166666666,79.5,161.93020833333333,79.5,165.21354166666666,79.5L168.496875,79.5"/>
           </g>
           <g class="edgeLabels">
             <g class="edgeLabel">
diff --git a/docs/test_cases/t30004.md b/docs/test_cases/t30004.md
index d24125f7..20c609f3 100644
--- a/docs/test_cases/t30004.md
+++ b/docs/test_cases/t30004.md
@@ -15,7 +15,7 @@ diagrams:
         - "' t30004 test package diagram"
 ```
 ## Source code
-File t30004.cc
+File `tests/t30004/t30004.cc`
 ```cpp
 namespace clanguml {
 namespace t30004 {
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index 9cd60c15..46b98bef 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -1,54 +1,54 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="253px" preserveAspectRatio="none" style="width:614px;height:253px;" version="1.1" viewBox="0 0 614 253" width="614px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:565px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 565 231" width="565px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1k2vy6ao56s54" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#008000" filter="url(#f1k2vy6ao56s54)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text>
+    <g id="cluster_C_0000033410665874039845">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+        <path d="M8.5,6.294 L19.5,6.294 A3.75,3.75 0 0 1 22,8.794 L29,29.0939 L555.5,29.0939 A2.5,2.5 0 0 1 558,31.5939 L558,221.994 A2.5,2.5 0 0 1 555.5,224.494 L8.5,224.494 A2.5,2.5 0 0 1 6,221.994 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="#008000" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="29" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="10" y="21.2999">A</text>
+      </a>
+    </g>
+    <g id="elem_GMN4">
+      <path d="M199.5,168.894 L199.5,194.494 A0,0 0 0 0 199.5,194.494 L306.5,194.494 A0,0 0 0 0 306.5,194.494 L306.5,178.894 L296.5,168.894 L243.97,168.894 L157.37,92.494 L235.97,168.894 L199.5,168.894 A0,0 0 0 0 199.5,168.894 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M296.5,168.894 L296.5,178.894 L306.5,178.894 L296.5,168.894 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="86" x="205.5" y="185.971">Package AAA.</text>
+    </g>
+    <g id="elem_GMN8">
+      <path d="M435.5,55.294 L435.5,64.094 L401.16,68.094 L435.5,72.094 L435.5,80.894 A0,0 0 0 0 435.5,80.894 L542.5,80.894 A0,0 0 0 0 542.5,80.894 L542.5,65.294 L532.5,55.294 L435.5,55.294 A0,0 0 0 0 435.5,55.294 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M532.5,55.294 L532.5,65.294 L542.5,65.294 L532.5,55.294 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="86" x="441.5" y="72.371">Package BBB.</text>
+    </g>
+    <g id="elem_GMN12">
+      <path d="M21.5,168.894 L21.5,194.494 A0,0 0 0 0 21.5,194.494 L164.5,194.494 A0,0 0 0 0 164.5,194.494 L164.5,178.894 L154.5,168.894 L91.94,168.894 L57.78,95.264 L83.94,168.894 L21.5,168.894 A0,0 0 0 0 21.5,168.894 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M154.5,168.894 L154.5,178.894 L164.5,178.894 L154.5,168.894 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="122" x="27.5" y="185.971">CCCC package note.</text>
+    </g>
+    <g id="elem_GMN16">
+      <path d="M192,55.294 L192,80.894 A0,0 0 0 0 192,80.894 L261.88,80.894 L341.19,156.754 L269.88,80.894 L316,80.894 A0,0 0 0 0 316,80.894 L316,65.294 L306,55.294 L192,55.294 A0,0 0 0 0 192,55.294 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M306,55.294 L306,65.294 L316,65.294 L306,55.294 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="103" x="198" y="72.371">We skipped DDD.</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <path d="M109.5,41.294 L140.5,41.294 A3.75,3.75 0 0 1 143,43.794 L150,64.0939 L154.5,64.0939 A2.5,2.5 0 0 1 157,66.5939 L157,92.3938 A2.5,2.5 0 0 1 154.5,94.8938 L109.5,94.8938 A2.5,2.5 0 0 1 107,92.3938 L107,43.794 A2.5,2.5 0 0 1 109.5,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="107" x2="150" y1="64.0939" y2="64.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="111" y="56.2999">AAA</text>
     </a>
-    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1k2vy6ao56s54)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M325,186 L325,196 L335,196 L325,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="231" y="203.0669">Package AAA.</text>
-    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1k2vy6ao56s54)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M566,73 L566,83 L576,83 L566,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="472" y="90.0669">Package BBB.</text>
-    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1k2vy6ao56s54)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M180,186 L180,196 L190,196 L180,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="44" y="203.0669">CCCC package note.</text>
-    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1k2vy6ao56s54)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M335.5,73 L335.5,83 L345.5,83 L335.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="220.5" y="90.0669">We skipped DDD.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1k2vy6ao56s54)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="126.5" x2="172.5" y1="81.2969" y2="81.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="130.5" y="73.9951">AAA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <path d="M353.5,41.294 L384.5,41.294 A3.75,3.75 0 0 1 387,43.794 L394,64.0939 L398.5,64.0939 A2.5,2.5 0 0 1 401,66.5939 L401,92.3938 A2.5,2.5 0 0 1 398.5,94.8938 L353.5,94.8938 A2.5,2.5 0 0 1 351,92.3938 L351,43.794 A2.5,2.5 0 0 1 353.5,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="351" x2="394" y1="64.0939" y2="64.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="355" y="56.2999">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1k2vy6ao56s54)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="381" x2="424" y1="81.2969" y2="81.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="385" y="73.9951">BBB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <path d="M24.5,41.294 L55.5,41.294 A3.75,3.75 0 0 1 58,43.794 L65,64.0939 L69.5,64.0939 A2.5,2.5 0 0 1 72,66.5939 L72,92.3938 A2.5,2.5 0 0 1 69.5,94.8938 L24.5,94.8938 A2.5,2.5 0 0 1 22,92.3938 L22,43.794 A2.5,2.5 0 0 1 24.5,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="22" x2="65" y1="64.0939" y2="64.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="26" y="56.2999">CCC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1k2vy6ao56s54)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">CCC</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
+      <path d="M344,154.894 L372,154.894 A3.75,3.75 0 0 1 374.5,157.394 L381.5,177.6939 L386,177.6939 A2.5,2.5 0 0 1 388.5,180.1939 L388.5,205.9938 A2.5,2.5 0 0 1 386,208.4938 L344,208.4938 A2.5,2.5 0 0 1 341.5,205.9938 L341.5,157.394 A2.5,2.5 0 0 1 344,154.894 " fill="#FFC0CB" style="stroke:#FF0000;stroke-width:2.0;"/>
+      <line style="stroke:#FF0000;stroke-width:2.0;" x1="341.5" x2="381.5" y1="177.6939" y2="177.6939"/>
+      <text fill="#FF0000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="27" x="345.5" y="169.8999">EEE</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
-      <polygon fill="#FFC0CB" filter="url(#f1k2vy6ao56s54)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="370.5" x2="410.5" y1="194.2969" y2="194.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="374.5" y="186.9951">EEE</text>
-    </a>
-    <path d="M179.62,109.77 C206.24,133.04 246.1,167.87 266.66,185.84 " fill="none" id="C_0001517185300862579159-GMN1311" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M431.16,85.5 C442.74,85.5 454.32,85.5 465.9,85.5 " fill="none" id="C_0001982379087062354928-GMN1315" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M76.36,112.24 C86.6,135.43 101.18,168.45 108.84,185.8 " fill="none" id="C_0002304726195556701567-GMN1319" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M292.2,98.38 C310.81,116.5 346.63,151.38 370.43,174.55 " fill="none" id="GMN1323-C_0001084924732216290779" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30004_package_mermaid.svg b/docs/test_cases/t30004_package_mermaid.svg
index b3da38b3..1a3774e1 100644
--- a/docs/test_cases/t30004_package_mermaid.svg
+++ b/docs/test_cases/t30004_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 331.859375 368" style="max-width: 331.859px; background-color: white;" width="331.859375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
diff --git a/docs/test_cases/t30005.md b/docs/test_cases/t30005.md
index daf72e72..ce2481b6 100644
--- a/docs/test_cases/t30005.md
+++ b/docs/test_cases/t30005.md
@@ -15,7 +15,7 @@ diagrams:
         - "' t30005 test package diagram"
 ```
 ## Source code
-File t30005.cc
+File `tests/t30005/t30005.cc`
 ```cpp
 namespace clanguml {
 namespace t30005 {
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index 7ed8aa32..41a8bca1 100644
--- a/docs/test_cases/t30005_package.svg
+++ b/docs/test_cases/t30005_package.svg
@@ -1,62 +1,72 @@
-<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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:297px;height:380px;background:#FFFFFF;" version="1.1" viewBox="0 0 297 380" width="297px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1f4ebpe5gmwpt" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" 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>
+    <g id="cluster_C_0001768303675686131578">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+        <path d="M85.5,201.894 L96.5,201.894 A3.75,3.75 0 0 1 99,204.394 L106,224.6939 L210.5,224.6939 A2.5,2.5 0 0 1 213,227.1939 L213,370.994 A2.5,2.5 0 0 1 210.5,373.494 L85.5,373.494 A2.5,2.5 0 0 1 83,370.994 L83,204.394 A2.5,2.5 0 0 1 85.5,201.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="83" x2="106" y1="224.6939" y2="224.6939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="87" y="216.8999">A</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001777547159021391040">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+        <path d="M109.5,244.894 L130.5,244.894 A3.75,3.75 0 0 1 133,247.394 L140,267.6939 L186.5,267.6939 A2.5,2.5 0 0 1 189,270.1939 L189,346.994 A2.5,2.5 0 0 1 186.5,349.494 L109.5,349.494 A2.5,2.5 0 0 1 107,346.994 L107,247.394 A2.5,2.5 0 0 1 109.5,244.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="107" x2="140" y1="267.6939" y2="267.6939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="111" y="259.8999">AA</text>
+      </a>
+    </g>
+    <g id="cluster_C_0000378529216628023051">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+        <path d="M8.5,6.294 L19.5,6.294 A3.75,3.75 0 0 1 22,8.794 L29,29.0939 L133.5,29.0939 A2.5,2.5 0 0 1 136,31.5939 L136,175.394 A2.5,2.5 0 0 1 133.5,177.894 L8.5,177.894 A2.5,2.5 0 0 1 6,175.394 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="29" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="10" y="21.2999">B</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001696631362104244809">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
+        <path d="M32.5,49.294 L53.5,49.294 A3.75,3.75 0 0 1 56,51.794 L63,72.0939 L109.5,72.0939 A2.5,2.5 0 0 1 112,74.5939 L112,151.394 A2.5,2.5 0 0 1 109.5,153.894 L32.5,153.894 A2.5,2.5 0 0 1 30,151.394 L30,51.794 A2.5,2.5 0 0 1 32.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="63" y1="72.0939" y2="72.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="34" y="64.2999">BB</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001041076320925403190">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+        <path d="M162.5,6.294 L173.5,6.294 A3.75,3.75 0 0 1 176,8.794 L183,29.0939 L287.5,29.0939 A2.5,2.5 0 0 1 290,31.5939 L290,175.394 A2.5,2.5 0 0 1 287.5,177.894 L162.5,177.894 A2.5,2.5 0 0 1 160,175.394 L160,8.794 A2.5,2.5 0 0 1 162.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="160" x2="183" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="164" y="21.2999">C</text>
+      </a>
+    </g>
+    <g id="cluster_C_0002134234141727442046">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
+        <path d="M186.5,49.294 L207.5,49.294 A3.75,3.75 0 0 1 210,51.794 L217,72.0939 L263.5,72.0939 A2.5,2.5 0 0 1 266,74.5939 L266,151.394 A2.5,2.5 0 0 1 263.5,153.894 L186.5,153.894 A2.5,2.5 0 0 1 184,151.394 L184,51.794 A2.5,2.5 0 0 1 186.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="184" x2="217" y1="72.0939" y2="72.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="188" y="64.2999">CC</text>
+      </a>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <path d="M125.5,279.894 L156.5,279.894 A3.75,3.75 0 0 1 159,282.394 L166,302.6939 L170.5,302.6939 A2.5,2.5 0 0 1 173,305.1939 L173,330.9938 A2.5,2.5 0 0 1 170.5,333.4938 L125.5,333.4938 A2.5,2.5 0 0 1 123,330.9938 L123,282.394 A2.5,2.5 0 0 1 125.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="123" x2="166" y1="302.6939" y2="302.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="127" y="294.8999">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="122" x2="157" y1="284.2969" y2="284.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="126" y="276.9951">AA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <path d="M48.5,84.294 L79.5,84.294 A3.75,3.75 0 0 1 82,86.794 L89,107.0939 L93.5,107.0939 A2.5,2.5 0 0 1 96,109.5939 L96,135.3938 A2.5,2.5 0 0 1 93.5,137.8938 L48.5,137.8938 A2.5,2.5 0 0 1 46,135.3938 L46,86.794 A2.5,2.5 0 0 1 48.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="46" x2="89" y1="107.0939" y2="107.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="50" y="99.2999">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="45" y1="46.2969" y2="46.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="26" y="38.9951">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <path d="M202.5,84.294 L233.5,84.294 A3.75,3.75 0 0 1 236,86.794 L243,107.0939 L247.5,107.0939 A2.5,2.5 0 0 1 250,109.5939 L250,135.3938 A2.5,2.5 0 0 1 247.5,137.8938 L202.5,137.8938 A2.5,2.5 0 0 1 200,135.3938 L200,86.794 A2.5,2.5 0 0 1 202.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="200" x2="243" y1="107.0939" y2="107.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="204" y="99.2999">CCC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="79" y1="89.2969" y2="89.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="50" y="81.9951">BB</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="176" x2="200" y1="46.2969" y2="46.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="180" y="38.9951">C</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1f4ebpe5gmwpt)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="216.5" x2="262.5" y1="124.2969" y2="124.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="220.5" y="116.9951">CCC</text>
-    </a>
-    <path d="M97.36,155.13 C111.64,190.46 137.33,254.03 152.61,291.83 " fill="none" id="C_0001871026935460001668-&gt;C_0000914090901927655181" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="154.6,296.77,154.9193,286.9263,152.7185,292.1375,147.5073,289.9367,154.6,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M232.64,155.13 C218.36,190.46 192.67,254.03 177.39,291.83 " fill="none" id="C_0001763279540133487999-&gt;C_0000914090901927655181" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="175.4,296.77,182.4927,289.9367,177.2815,292.1375,175.0807,286.9263,175.4,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0001871026935460001668_C_0000914090901927655181">
+      <path codeLine="20" d="M81.38,138.204 C96.12,175.254 120.7221,237.119 135.4421,274.119 " fill="none" id="C_0001871026935460001668-to-C_0000914090901927655181" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="137.66,279.694,138.0497,269.8528,135.8117,275.0481,130.6164,272.8101,137.66,279.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001763279540133487999_C_0000914090901927655181">
+      <path codeLine="21" d="M214.62,138.204 C199.88,175.254 175.2779,237.119 160.5579,274.119 " fill="none" id="C_0001763279540133487999-to-C_0000914090901927655181" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="158.34,279.694,165.3836,272.8101,160.1883,275.0481,157.9503,269.8528,158.34,279.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30005_package_mermaid.svg b/docs/test_cases/t30005_package_mermaid.svg
index f97615b4..5cf8401d 100644
--- a/docs/test_cases/t30005_package_mermaid.svg
+++ b/docs/test_cases/t30005_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 352.6875 332" style="max-width: 352.688px; background-color: white;" width="352.6875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -83,8 +83,8 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001871026935460001668 LE-C_0000914090901927655181" id="L-C_0001871026935460001668-C_0000914090901927655181-0" d="M78.5078125,83L78.5078125,87.16666666666667C78.5078125,91.33333333333333,78.5078125,99.66666666666667,78.5078125,108C78.5078125,116.33333333333333,78.5078125,124.66666666666667,78.5078125,133C78.5078125,141.33333333333334,78.5078125,149.66666666666666,78.5078125,158C78.5078125,166.33333333333334,78.5078125,174.66666666666666,78.5078125,183C78.5078125,191.33333333333334,78.5078125,199.66666666666666,89.45182291666667,208.92660329420013C100.39583333333333,218.18653992173356,122.28385416666667,228.37307984346708,133.22786458333334,233.46634980433387L144.171875,238.55961976520064"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001763279540133487999 LE-C_0000914090901927655181" id="L-C_0001763279540133487999-C_0000914090901927655181-0" d="M256.8515625,83L256.8515625,87.16666666666667C256.8515625,91.33333333333333,256.8515625,99.66666666666667,256.8515625,108C256.8515625,116.33333333333333,256.8515625,124.66666666666667,256.8515625,133C256.8515625,141.33333333333334,256.8515625,149.66666666666666,256.8515625,158C256.8515625,166.33333333333334,256.8515625,174.66666666666666,256.8515625,183C256.8515625,191.33333333333334,256.8515625,199.66666666666666,245.90755208333334,208.92660329420013C234.96354166666666,218.18653992173356,213.07552083333334,228.37307984346708,202.13151041666666,233.46634980433387L191.1875,238.55961976520064"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001871026935460001668 LE-C_0000914090901927655181" id="L-C_0001871026935460001668-C_0000914090901927655181-0" d="M78.5078125,83L78.5078125,87.16666666666667C78.5078125,91.33333333333333,78.5078125,99.66666666666667,78.5078125,108C78.5078125,116.33333333333333,78.5078125,124.66666666666667,78.5078125,133C78.5078125,141.33333333333334,78.5078125,149.66666666666666,78.5078125,158C78.5078125,166.33333333333334,78.5078125,174.66666666666666,78.5078125,183C78.5078125,191.33333333333334,78.5078125,199.66666666666666,88.65097081349477,208.55389202978367C98.7941291269895,217.44111739290065,119.080445753979,226.88223478580133,129.22360406747376,231.60279348225166L139.3667623809685,236.323352178702"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001763279540133487999 LE-C_0000914090901927655181" id="L-C_0001763279540133487999-C_0000914090901927655181-0" d="M256.8515625,83L256.8515625,87.16666666666667C256.8515625,91.33333333333333,256.8515625,99.66666666666667,256.8515625,108C256.8515625,116.33333333333333,256.8515625,124.66666666666667,256.8515625,133C256.8515625,141.33333333333334,256.8515625,149.66666666666666,256.8515625,158C256.8515625,166.33333333333334,256.8515625,174.66666666666666,256.8515625,183C256.8515625,191.33333333333334,256.8515625,199.66666666666666,246.70840418650525,208.55389202978367C236.56524587301047,217.44111739290065,216.278929246021,226.88223478580133,206.13577093252624,231.60279348225166L195.9926126190315,236.323352178702"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30006.md b/docs/test_cases/t30006.md
index 8433eccb..52d45f23 100644
--- a/docs/test_cases/t30006.md
+++ b/docs/test_cases/t30006.md
@@ -15,7 +15,7 @@ diagrams:
         - "' t30006 test package diagram"
 ```
 ## Source code
-File t30006.cc
+File `tests/t30006/t30006.cc`
 ```cpp
 namespace clanguml {
 namespace t30006 {
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index 0ce8cd11..b66473a9 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -1,36 +1,35 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:124px;height:270px;" version="1.1" viewBox="0 0 124 270" width="124px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="265px" preserveAspectRatio="none" style="width:108px;height:265px;background:#FFFFFF;" version="1.1" viewBox="0 0 108 265" width="108px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f3bz1vcv9mqf5" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3bz1vcv9mqf5)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <path d="M8.5,205.2 L19.5,205.2 A3.75,3.75 0 0 1 22,207.7 L29,227.9999 L33.5,227.9999 A2.5,2.5 0 0 1 36,230.4999 L36,256.2999 A2.5,2.5 0 0 1 33.5,258.7999 L8.5,258.7999 A2.5,2.5 0 0 1 6,256.2999 L6,207.7 A2.5,2.5 0 0 1 8.5,205.2 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="6" x2="29" y1="227.9999" y2="227.9999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="10" y="220.2059">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3bz1vcv9mqf5)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="115.2969" y2="115.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="107.9951">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <path d="M40.5,91.6 L51.5,91.6 A3.75,3.75 0 0 1 54,94.1 L61,114.3999 L65.5,114.3999 A2.5,2.5 0 0 1 68,116.8999 L68,142.6999 A2.5,2.5 0 0 1 65.5,145.1999 L40.5,145.1999 A2.5,2.5 0 0 1 38,142.6999 L38,94.1 A2.5,2.5 0 0 1 40.5,91.6 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="38" x2="61" y1="114.3999" y2="114.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="42" y="106.6059">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3bz1vcv9mqf5)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <path d="M73.5,205.2 L84.5,205.2 A3.75,3.75 0 0 1 87,207.7 L94,227.9999 L98.5,227.9999 A2.5,2.5 0 0 1 101,230.4999 L101,256.2999 A2.5,2.5 0 0 1 98.5,258.7999 L73.5,258.7999 A2.5,2.5 0 0 1 71,256.2999 L71,207.7 A2.5,2.5 0 0 1 73.5,205.2 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="71" x2="94" y1="227.9999" y2="227.9999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="75" y="220.2059">C</text>
     </a>
-    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#f3bz1vcv9mqf5)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M91,8 L91,18 L101,18 L91,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="13" y="25.0669">Top A note.</text>
-    <path d="M54,33.01 C54,47.66 54,73.41 54,92.83 " fill="none" id="GMN1346-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M46.35,146.24 C41.51,162.5 35.25,183.58 30.15,200.71 " fill="none" id="C_0001499919423527579699-&gt;C_0001659090172211944144" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="28.61,205.89,35.0172,198.4102,30.0402,201.0989,27.3514,196.1219,28.61,205.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M61.65,146.24 C66.49,162.5 72.75,183.58 77.85,200.71 " fill="none" id="C_0001499919423527579699-&gt;C_0001380567463986115369" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="79.39,205.89,80.6486,196.1219,77.9598,201.0989,72.9828,198.4102,79.39,205.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="elem_GMN4">
+      <path d="M8.5,6 L8.5,31.6 A0,0 0 0 0 8.5,31.6 L49,31.6 L53,91.39 L57,31.6 L97.5,31.6 A0,0 0 0 0 97.5,31.6 L97.5,16 L87.5,6 L8.5,6 A0,0 0 0 0 8.5,6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M87.5,6 L87.5,16 L97.5,16 L87.5,6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="68" x="14.5" y="23.077">Top A note.</text>
+    </g>
+    <g id="link_C_0001499919423527579699_C_0001659090172211944144">
+      <path codeLine="11" d="M45.5,145.57 C40.36,163.48 35.2317,181.3518 30.1117,199.2318 " fill="none" id="C_0001499919423527579699-to-C_0001659090172211944144" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="28.46,205,34.783,197.4489,29.8364,200.1932,27.0922,195.2466,28.46,205" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001499919423527579699_C_0001380567463986115369">
+      <path codeLine="12" d="M60.74,145.57 C66.03,163.48 71.3307,181.3657 76.6107,199.2457 " fill="none" id="C_0001499919423527579699-to-C_0001380567463986115369" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="78.31,205,79.5973,195.2356,76.8939,200.2047,71.9249,197.5013,78.31,205" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30006_package_mermaid.svg b/docs/test_cases/t30006_package_mermaid.svg
index 6bc8f006..525d94bd 100644
--- a/docs/test_cases/t30006_package_mermaid.svg
+++ b/docs/test_cases/t30006_package_mermaid.svg
@@ -1,30 +1,30 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 118.234375 215" style="max-width: 118.234px; background-color: white;" width="118.234375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
         <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0001499919423527579699" id="L-N_0-C_0001499919423527579699-0" d="M50.89453125,33L50.89453125,37.166666666666664C50.89453125,41.333333333333336,50.89453125,49.666666666666664,50.89453125,58C50.89453125,66.33333333333333,50.89453125,74.66666666666667,50.89453125,78.83333333333333L50.89453125,83"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001659090172211944144" id="L-C_0001499919423527579699-C_0001659090172211944144-0" d="M38.05859375,113.49661295288925L33.854817708333336,118.08051079407437C29.651041666666668,122.6644086352595,21.243489583333332,131.83220431762973,17.039713541666668,140.58276882548154C12.8359375,149.33333333333334,12.8359375,157.66666666666666,12.8359375,161.83333333333334L12.8359375,166"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001380567463986115369" id="L-C_0001499919423527579699-C_0001380567463986115369-0" d="M63.73046875,113.49661295288925L67.93424479166667,118.08051079407437C72.13802083333333,122.6644086352595,80.54557291666667,131.83220431762973,84.74934895833333,140.58276882548154C88.953125,149.33333333333334,88.953125,157.66666666666666,88.953125,161.83333333333334L88.953125,166"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001659090172211944144" id="L-C_0001499919423527579699-C_0001659090172211944144-0" d="M38.05859375,113.49661295288925L33.854817708333336,118.08051079407437C29.651041666666668,122.6644086352595,21.243489583333332,131.83220431762973,17.039713541666668,139.69943549214818C12.8359375,147.56666666666666,12.8359375,154.13333333333333,12.8359375,157.41666666666666L12.8359375,160.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001380567463986115369" id="L-C_0001499919423527579699-C_0001380567463986115369-0" d="M63.73046875,113.49661295288925L67.93424479166667,118.08051079407437C72.13802083333333,122.6644086352595,80.54557291666667,131.83220431762973,84.74934895833333,139.69943549214818C88.953125,147.56666666666666,88.953125,154.13333333333333,88.953125,157.41666666666666L88.953125,160.7"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30007.md b/docs/test_cases/t30007.md
index 93579985..b252925c 100644
--- a/docs/test_cases/t30007.md
+++ b/docs/test_cases/t30007.md
@@ -19,7 +19,7 @@ diagrams:
         - "' t30007 test package diagram"
 ```
 ## Source code
-File t30007.cc
+File `tests/t30007/t30007.cc`
 ```cpp
 namespace clanguml {
 namespace t30007 {
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 8e8531de..9d0544ab 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -1,41 +1,45 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:234px;height:277px;" version="1.1" viewBox="0 0 234 277" width="234px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="272px" preserveAspectRatio="none" style="width:205px;height:272px;background:#FFFFFF;" version="1.1" viewBox="0 0 205 272" width="205px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fy0pp7m98qd90" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fy0pp7m98qd90)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="100.5" x2="124.5" y1="79.2969" y2="79.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="104.5" y="71.9951">A</text>
+    <g id="cluster_C_0000870874615388866345">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+        <path d="M93.5,55.6 L104.5,55.6 A3.75,3.75 0 0 1 107,58.1 L114,78.3999 L195.5,78.3999 A2.5,2.5 0 0 1 198,80.8999 L198,173.7 A2.5,2.5 0 0 1 195.5,176.2 L93.5,176.2 A2.5,2.5 0 0 1 91,173.7 L91,58.1 A2.5,2.5 0 0 1 93.5,55.6 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="91" x2="114" y1="78.3999" y2="78.3999"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="95" y="70.6059">A</text>
+      </a>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <path d="M76.5,212.2 L87.5,212.2 A3.75,3.75 0 0 1 90,214.7 L97,234.9999 L101.5,234.9999 A2.5,2.5 0 0 1 104,237.4999 L104,263.2999 A2.5,2.5 0 0 1 101.5,265.7999 L76.5,265.7999 A2.5,2.5 0 0 1 74,263.2999 L74,214.7 A2.5,2.5 0 0 1 76.5,212.2 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="74" x2="97" y1="234.9999" y2="234.9999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="78" y="227.2059">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fy0pp7m98qd90)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="182.5" x2="205.5" y1="235.2969" y2="235.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="186.5" y="227.9951">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <path d="M136.5,98.6 L157.5,98.6 A3.75,3.75 0 0 1 160,101.1 L167,121.3999 L171.5,121.3999 A2.5,2.5 0 0 1 174,123.8999 L174,149.6999 A2.5,2.5 0 0 1 171.5,152.1999 L136.5,152.1999 A2.5,2.5 0 0 1 134,149.6999 L134,101.1 A2.5,2.5 0 0 1 136.5,98.6 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="134" x2="167" y1="121.3999" y2="121.3999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="138" y="113.6059">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fy0pp7m98qd90)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="143.5" x2="178.5" y1="122.2969" y2="122.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="147.5" y="114.9951">AA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <path d="M141.5,212.2 L152.5,212.2 A3.75,3.75 0 0 1 155,214.7 L162,234.9999 L166.5,234.9999 A2.5,2.5 0 0 1 169,237.4999 L169,263.2999 A2.5,2.5 0 0 1 166.5,265.7999 L141.5,265.7999 A2.5,2.5 0 0 1 139,263.2999 L139,214.7 A2.5,2.5 0 0 1 141.5,212.2 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="162" y1="234.9999" y2="234.9999"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="143" y="227.2059">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fy0pp7m98qd90)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="116" x2="140" y1="235.2969" y2="235.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="120" y="227.9951">C</text>
-    </a>
-    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#fy0pp7m98qd90)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M201,8 L201,18 L211,18 L201,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="12" y="25.0669">Compare layout with t30006.</text>
-    <path d="M108.5,33.03 C108.5,36.3613 108.5,40.2728 108.5,44.5714 C108.5,46.7207 108.5,48.9668 108.5,51.2855 C108.5,52.4448 108.5,53.6223 108.5,54.8149 C108.5,55.4112 108.5,56.0113 108.5,56.6148 " fill="none" id="GMN1358-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M172.15,153.24 C176.99,169.5 183.25,190.58 188.35,207.71 " fill="none" id="C_0000357722505818238170-&gt;C_0001852704221005355550" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="189.89,212.89,191.1486,203.1219,188.4598,208.0989,183.4828,205.4102,189.89,212.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M145.89,153.24 C138.89,169.5 132.42,190.58 129.1,207.71 " fill="none" id="C_0000357722505818238170-&gt;C_0000937791537887318363" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="128.17,212.89,133.6759,204.7239,129.0406,207.9664,125.7981,203.331,128.17,212.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="elem_GMN5">
+      <path d="M6,6 L6,31.6 L192,31.6 L192,16 L182,6 L6,6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M182,6 L182,16 L192,16 L182,6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="165" x="12" y="23.077">Compare layout with t30006.</text>
+    </g>
+    <g id="link_GMN5_C_0000870874615388866345">
+      <path d="M99,31.8 C99,35.18 99,39.1302 99,43.459 C99,45.6234 99,47.8825 99,50.2123 C99,51.3772 99,52.5598 99,53.7571 C99,54.3557 99,54.958 99,55.5636 " fill="none" id="GMN5-C_0000870874615388866345" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+    </g>
+    <g id="link_C_0000357722505818238170_C_0001852704221005355550">
+      <path codeLine="13" d="M147.03,152.42 C143.05,164.95 137.38,179.89 130,192.2 C122.98,203.92 116.9677,211.1224 108.4677,219.6424 " fill="none" id="C_0000357722505818238170-to-C_0001852704221005355550" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="104.23,223.89,113.4182,220.3437,107.7614,220.3503,107.7547,214.6935,104.23,223.89" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000357722505818238170_C_0000937791537887318363">
+      <path codeLine="14" d="M143.01,152.57 C140.66,170.48 139.8716,188.172 142.2416,206.052 " fill="none" id="C_0000357722505818238170-to-C_0000937791537887318363" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="143.03,212,145.8127,202.5524,142.373,207.0434,137.8821,203.6036,143.03,212" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30007_package_mermaid.svg b/docs/test_cases/t30007_package_mermaid.svg
index bb0c362d..2422f95b 100644
--- a/docs/test_cases/t30007_package_mermaid.svg
+++ b/docs/test_cases/t30007_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 234.671875 265" style="max-width: 234.672px; background-color: white;" width="234.671875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -33,8 +33,8 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0001852704221005355550" id="L-C_0000357722505818238170-C_0001852704221005355550-0" d="M94.20420745481928,141L90.38306350401608,145.16666666666666C86.56191955321286,149.33333333333334,78.91963165160642,157.66666666666666,75.09848770080322,166C71.27734375,174.33333333333334,71.27734375,182.66666666666666,71.27734375,191C71.27734375,199.33333333333334,71.27734375,207.66666666666666,71.27734375,211.83333333333334L71.27734375,216"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0000937791537887318363" id="L-C_0000357722505818238170-C_0000937791537887318363-0" d="M124.46766754518072,141L128.28881149598394,145.16666666666666C132.10995544678715,149.33333333333334,139.75224334839356,157.66666666666666,143.57338729919678,166C147.39453125,174.33333333333334,147.39453125,182.66666666666666,147.39453125,191C147.39453125,199.33333333333334,147.39453125,207.66666666666666,147.39453125,211.83333333333334L147.39453125,216"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0001852704221005355550" id="L-C_0000357722505818238170-C_0001852704221005355550-0" d="M94.20420745481928,141L90.38306350401608,145.16666666666666C86.56191955321286,149.33333333333334,78.91963165160642,157.66666666666666,75.09848770080322,166C71.27734375,174.33333333333334,71.27734375,182.66666666666666,71.27734375,190.11666666666667C71.27734375,197.5666666666667,71.27734375,204.13333333333333,71.27734375,207.41666666666666L71.27734375,210.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0000937791537887318363" id="L-C_0000357722505818238170-C_0000937791537887318363-0" d="M124.46766754518072,141L128.28881149598394,145.16666666666666C132.10995544678715,149.33333333333334,139.75224334839356,157.66666666666666,143.57338729919678,166C147.39453125,174.33333333333334,147.39453125,182.66666666666666,147.39453125,190.11666666666667C147.39453125,197.5666666666667,147.39453125,204.13333333333333,147.39453125,207.41666666666666L147.39453125,210.7"/>
         <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0000870874615388866345" id="L-N_0-C_0000870874615388866345-0" d="M109.3359375,33L109.3359375,37.166666666666664C109.3359375,41.333333333333336,109.3359375,49.666666666666664,109.3359375,58C109.3359375,66.33333333333333,109.3359375,74.66666666666667,109.3359375,78.83333333333333L109.3359375,83"/>
       </g>
       <g class="edgeLabels">
diff --git a/docs/test_cases/t30008.md b/docs/test_cases/t30008.md
index 8d96d838..ddde9f23 100644
--- a/docs/test_cases/t30008.md
+++ b/docs/test_cases/t30008.md
@@ -17,7 +17,7 @@ diagrams:
         - "' t30008 test package diagram"
 ```
 ## Source code
-File t30008.cc
+File `tests/t30008/t30008.cc`
 ```cpp
 namespace clanguml {
 namespace t30008 {
diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg
index 402a1dfd..96487672 100644
--- a/docs/test_cases/t30008_package.svg
+++ b/docs/test_cases/t30008_package.svg
@@ -1,61 +1,67 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="366px" preserveAspectRatio="none" style="width:306px;height:366px;" version="1.1" viewBox="0 0 306 366" width="306px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="345px" preserveAspectRatio="none" style="width:248px;height:345px;background:#FFFFFF;" version="1.1" viewBox="0 0 248 345" width="248px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1mnmtwo02pth0" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1mnmtwo02pth0)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
+    <g id="cluster_C_0001601960042765615222">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
+        <path d="M8.5,6.294 L91.5,6.294 A3.75,3.75 0 0 1 94,8.794 L101,29.0939 L101.5,29.0939 A2.5,2.5 0 0 1 104,31.5939 L104,335.594 A2.5,2.5 0 0 1 101.5,338.094 L8.5,338.094 A2.5,2.5 0 0 1 6,335.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="101" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="10" y="21.2999">dependants</text>
+      </a>
+    </g>
+    <g id="cluster_C_0002103969167872217960">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
+        <path d="M130.5,6.294 L228.5,6.294 A3.75,3.75 0 0 1 231,8.794 L238,29.0939 L238.5,29.0939 A2.5,2.5 0 0 1 241,31.5939 L241,335.594 A2.5,2.5 0 0 1 238.5,338.094 L130.5,338.094 A2.5,2.5 0 0 1 128,335.594 L128,8.794 A2.5,2.5 0 0 1 130.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="128" x2="238" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="97" x="132" y="21.2999">dependencies</text>
+      </a>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <path d="M42.5,268.494 L53.5,268.494 A3.75,3.75 0 0 1 56,270.994 L63,291.2939 L67.5,291.2939 A2.5,2.5 0 0 1 70,293.7939 L70,319.5938 A2.5,2.5 0 0 1 67.5,322.0938 L42.5,322.0938 A2.5,2.5 0 0 1 40,319.5938 L40,270.994 A2.5,2.5 0 0 1 42.5,268.494 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="63" y1="291.2939" y2="291.2939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="44" y="283.4999">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1mnmtwo02pth0)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="156" x2="281" y1="46.2969" y2="46.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="160" y="38.9951">dependencies</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <path d="M42.5,154.894 L53.5,154.894 A3.75,3.75 0 0 1 56,157.394 L63,177.6939 L67.5,177.6939 A2.5,2.5 0 0 1 70,180.1939 L70,205.9938 A2.5,2.5 0 0 1 67.5,208.4938 L42.5,208.4938 A2.5,2.5 0 0 1 40,205.9938 L40,157.394 A2.5,2.5 0 0 1 42.5,154.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="63" y1="177.6939" y2="177.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="44" y="169.8999">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1mnmtwo02pth0)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="307.2969" y2="307.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="299.9951">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <path d="M42.5,41.294 L53.5,41.294 A3.75,3.75 0 0 1 56,43.794 L63,64.0939 L67.5,64.0939 A2.5,2.5 0 0 1 70,66.5939 L70,92.3938 A2.5,2.5 0 0 1 67.5,94.8938 L42.5,94.8938 A2.5,2.5 0 0 1 40,92.3938 L40,43.794 A2.5,2.5 0 0 1 42.5,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="63" y1="64.0939" y2="64.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="44" y="56.2999">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1mnmtwo02pth0)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="85" y1="194.2969" y2="194.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="66" y="186.9951">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <path d="M171.5,268.494 L182.5,268.494 A3.75,3.75 0 0 1 185,270.994 L192,291.2939 L196.5,291.2939 A2.5,2.5 0 0 1 199,293.7939 L199,319.5938 A2.5,2.5 0 0 1 196.5,322.0938 L171.5,322.0938 A2.5,2.5 0 0 1 169,319.5938 L169,270.994 A2.5,2.5 0 0 1 171.5,268.494 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="169" x2="192" y1="291.2939" y2="291.2939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="173" y="283.4999">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1mnmtwo02pth0)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="81.2969" y2="81.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="73.9951">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <path d="M172,154.894 L182,154.894 A3.75,3.75 0 0 1 184.5,157.394 L191.5,177.6939 L196,177.6939 A2.5,2.5 0 0 1 198.5,180.1939 L198.5,205.9938 A2.5,2.5 0 0 1 196,208.4938 L172,208.4938 A2.5,2.5 0 0 1 169.5,205.9938 L169.5,157.394 A2.5,2.5 0 0 1 172,154.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="169.5" x2="191.5" y1="177.6939" y2="177.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="9" x="173.5" y="169.8999">E</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1mnmtwo02pth0)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="204.5" x2="228.5" y1="307.2969" y2="307.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="208.5" y="299.9951">D</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <path d="M172,41.294 L182,41.294 A3.75,3.75 0 0 1 184.5,43.794 L191.5,64.0939 L196,64.0939 A2.5,2.5 0 0 1 198.5,66.5939 L198.5,92.3938 A2.5,2.5 0 0 1 196,94.8938 L172,94.8938 A2.5,2.5 0 0 1 169.5,92.3938 L169.5,43.794 A2.5,2.5 0 0 1 172,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="169.5" x2="191.5" y1="64.0939" y2="64.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="9" x="173.5" y="56.2999">F</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1mnmtwo02pth0)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="194.2969" y2="194.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="186.9951">E</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1mnmtwo02pth0)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="81.2969" y2="81.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="73.9951">F</text>
-    </a>
-    <path d="M77,225.24 C77,241.5 77,262.58 77,279.71 " fill="none" id="C_0000500208250168931957-&gt;C_0002096441629244782012" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="77,284.89,81.0257,275.9015,77.0143,279.89,73.0257,275.8786,77,284.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M77,112.24 C77,128.5 77,149.58 77,166.71 " fill="none" id="C_0001095841247154575825-&gt;C_0000500208250168931957" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="77,171.89,81.0257,162.9015,77.0143,166.89,73.0257,162.8786,77,171.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M220,225.24 C220,241.5 220,262.58 220,279.71 " fill="none" id="C_0001114997990364518938-&gt;C_0000912387297717034254" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="220,284.89,224.0257,275.9015,220.0143,279.89,216.0257,275.8786,220,284.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M220,112.24 C220,128.5 220,149.58 220,166.71 " fill="none" id="C_0001062827161678172094-&gt;C_0001114997990364518938" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="220,171.89,224.0257,162.9015,220.0143,166.89,216.0257,162.8786,220,171.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0000500208250168931957_C_0002096441629244782012">
+      <path codeLine="18" d="M55,208.864 C55,226.774 55,244.414 55,262.294 " fill="none" id="C_0000500208250168931957-to-C_0002096441629244782012" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="55,268.294,59,259.294,55,263.294,51,259.294,55,268.294" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001095841247154575825_C_0000500208250168931957">
+      <path codeLine="19" d="M55,95.264 C55,113.174 55,130.814 55,148.694 " fill="none" id="C_0001095841247154575825-to-C_0000500208250168931957" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="55,154.694,59,145.694,55,149.694,51,145.694,55,154.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001114997990364518938_C_0000912387297717034254">
+      <path codeLine="20" d="M184,208.864 C184,226.774 184,244.414 184,262.294 " fill="none" id="C_0001114997990364518938-to-C_0000912387297717034254" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="184,268.294,188,259.294,184,263.294,180,259.294,184,268.294" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001062827161678172094_C_0001114997990364518938">
+      <path codeLine="21" d="M184,95.264 C184,113.174 184,130.814 184,148.694 " fill="none" id="C_0001062827161678172094-to-C_0001114997990364518938" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="184,154.694,188,145.694,184,149.694,180,145.694,184,154.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30008_package_mermaid.svg b/docs/test_cases/t30008_package_mermaid.svg
index 6d9fc16a..7acd7df5 100644
--- a/docs/test_cases/t30008_package_mermaid.svg
+++ b/docs/test_cases/t30008_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 520.921875 119" style="max-width: 520.922px; background-color: white;" width="520.921875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -38,8 +38,8 @@
             </g>
           </g>
           <g class="edgePaths">
-            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001114997990364518938 LE-C_0000912387297717034254" id="L-C_0001114997990364518938-C_0000912387297717034254-0" d="M133.453125,59.5L137.61979166666666,59.5C141.78645833333334,59.5,150.11979166666666,59.5,158.453125,59.5C166.78645833333334,59.5,175.11979166666666,59.5,179.28645833333334,59.5L183.453125,59.5"/>
-            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001062827161678172094 LE-C_0001114997990364518938" id="L-C_0001062827161678172094-C_0001114997990364518938-0" d="M57.78125,59.5L61.947916666666664,59.5C66.11458333333333,59.5,74.44791666666667,59.5,82.78125,59.5C91.11458333333333,59.5,99.44791666666667,59.5,103.61458333333333,59.5L107.78125,59.5"/>
+            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001114997990364518938 LE-C_0000912387297717034254" id="L-C_0001114997990364518938-C_0000912387297717034254-0" d="M133.453125,59.5L137.61979166666666,59.5C141.78645833333334,59.5,150.11979166666666,59.5,157.56979166666667,59.5C165.01979166666666,59.5,171.58645833333333,59.5,174.86979166666666,59.5L178.153125,59.5"/>
+            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001062827161678172094 LE-C_0001114997990364518938" id="L-C_0001062827161678172094-C_0001114997990364518938-0" d="M57.78125,59.5L61.947916666666664,59.5C66.11458333333333,59.5,74.44791666666667,59.5,81.89791666666666,59.5C89.34791666666666,59.5,95.91458333333333,59.5,99.19791666666667,59.5L102.48125,59.5"/>
           </g>
           <g class="edgeLabels">
             <g class="edgeLabel">
@@ -111,8 +111,8 @@
             </g>
           </g>
           <g class="edgePaths">
-            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000500208250168931957 LE-C_0002096441629244782012" id="L-C_0000500208250168931957-C_0002096441629244782012-0" d="M135.234375,59.5L139.40104166666666,59.5C143.56770833333334,59.5,151.90104166666666,59.5,160.234375,59.5C168.56770833333334,59.5,176.90104166666666,59.5,181.06770833333334,59.5L185.234375,59.5"/>
-            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001095841247154575825 LE-C_0000500208250168931957" id="L-C_0001095841247154575825-C_0000500208250168931957-0" d="M59.5625,59.5L63.729166666666664,59.5C67.89583333333333,59.5,76.22916666666667,59.5,84.5625,59.5C92.89583333333333,59.5,101.22916666666667,59.5,105.39583333333333,59.5L109.5625,59.5"/>
+            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000500208250168931957 LE-C_0002096441629244782012" id="L-C_0000500208250168931957-C_0002096441629244782012-0" d="M135.234375,59.5L139.40104166666666,59.5C143.56770833333334,59.5,151.90104166666666,59.5,159.35104166666667,59.5C166.80104166666666,59.5,173.36770833333333,59.5,176.65104166666666,59.5L179.934375,59.5"/>
+            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001095841247154575825 LE-C_0000500208250168931957" id="L-C_0001095841247154575825-C_0000500208250168931957-0" d="M59.5625,59.5L63.729166666666664,59.5C67.89583333333333,59.5,76.22916666666667,59.5,83.67916666666666,59.5C91.12916666666666,59.5,97.69583333333333,59.5,100.97916666666667,59.5L104.2625,59.5"/>
           </g>
           <g class="edgeLabels">
             <g class="edgeLabel">
diff --git a/docs/test_cases/t30009.md b/docs/test_cases/t30009.md
index f89777c4..c74c63b4 100644
--- a/docs/test_cases/t30009.md
+++ b/docs/test_cases/t30009.md
@@ -17,7 +17,7 @@ diagrams:
         - together: [Two::C, Two::D]
 ```
 ## Source code
-File t30009.cc
+File `tests/t30009/t30009.cc`
 ```cpp
 namespace clanguml::t30009 {
 namespace One {
diff --git a/docs/test_cases/t30009_package.svg b/docs/test_cases/t30009_package.svg
index e736667a..82a6186e 100644
--- a/docs/test_cases/t30009_package.svg
+++ b/docs/test_cases/t30009_package.svg
@@ -1,63 +1,61 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:639px;height:188px;" version="1.1" viewBox="0 0 639 188" width="639px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="133px" preserveAspectRatio="none" style="width:567px;height:133px;background:#FFFFFF;" version="1.1" viewBox="0 0 567 133" width="567px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1fh8ixbj43rue" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="22,24,60,24,67,46.2969,308,46.2969,308,176,22,176,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="67" y1="46.2969" y2="46.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="26" y="38.9951">One</text>
+    <g id="cluster_C_0001187941209208108244">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
+        <path d="M8.5,6.294 L37.5,6.294 A3.75,3.75 0 0 1 40,8.794 L47,29.0939 L268.5,29.0939 A2.5,2.5 0 0 1 271,31.5939 L271,124.394 A2.5,2.5 0 0 1 268.5,126.894 L8.5,126.894 A2.5,2.5 0 0 1 6,124.394 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="47" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="28" x="10" y="21.2999">One</text>
+      </a>
+    </g>
+    <g id="cluster_C_0001940839474792549233">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
+        <path d="M297.5,6.294 L327.5,6.294 A3.75,3.75 0 0 1 330,8.794 L337,29.0939 L557.5,29.0939 A2.5,2.5 0 0 1 560,31.5939 L560,124.394 A2.5,2.5 0 0 1 557.5,126.894 L297.5,126.894 A2.5,2.5 0 0 1 295,124.394 L295,8.794 A2.5,2.5 0 0 1 297.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="295" x2="337" y1="29.0939" y2="29.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="29" x="299" y="21.2999">Two</text>
+      </a>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <path d="M89.5,49.294 L100.5,49.294 A3.75,3.75 0 0 1 103,51.794 L110,72.0939 L114.5,72.0939 A2.5,2.5 0 0 1 117,74.5939 L117,100.3938 A2.5,2.5 0 0 1 114.5,102.8938 L89.5,102.8938 A2.5,2.5 0 0 1 87,100.3938 L87,51.794 A2.5,2.5 0 0 1 89.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="87" x2="110" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="91" y="64.2999">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="332,24,372,24,379,46.2969,617,46.2969,617,176,332,176,332,24" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="332" x2="379" y1="46.2969" y2="46.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="336" y="38.9951">Two</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <path d="M24.5,49.294 L35.5,49.294 A3.75,3.75 0 0 1 38,51.794 L45,72.0939 L49.5,72.0939 A2.5,2.5 0 0 1 52,74.5939 L52,100.3938 A2.5,2.5 0 0 1 49.5,102.8938 L24.5,102.8938 A2.5,2.5 0 0 1 22,100.3938 L22,51.794 A2.5,2.5 0 0 1 24.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="22" x2="45" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="26" y="64.2999">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="105,83,121,83,128,105.2969,135,105.2969,135,135.5938,105,135.5938,105,83" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="128" y1="105.2969" y2="105.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="109" y="97.9951">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <path d="M219.5,49.294 L230.5,49.294 A3.75,3.75 0 0 1 233,51.794 L240,72.0939 L244.5,72.0939 A2.5,2.5 0 0 1 247,74.5939 L247,100.3938 A2.5,2.5 0 0 1 244.5,102.8938 L219.5,102.8938 A2.5,2.5 0 0 1 217,100.3938 L217,51.794 A2.5,2.5 0 0 1 219.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="217" x2="240" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="221" y="64.2999">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="38.5,83,55.5,83,62.5,105.2969,69.5,105.2969,69.5,135.5938,38.5,135.5938,38.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="105.2969" y2="105.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="97.9951">D</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <path d="M154.5,49.294 L165.5,49.294 A3.75,3.75 0 0 1 168,51.794 L175,72.0939 L179.5,72.0939 A2.5,2.5 0 0 1 182,74.5939 L182,100.3938 A2.5,2.5 0 0 1 179.5,102.8938 L154.5,102.8938 A2.5,2.5 0 0 1 152,100.3938 L152,51.794 A2.5,2.5 0 0 1 154.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="152" x2="175" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="156" y="64.2999">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="236.5,83,253.5,83,260.5,105.2969,267.5,105.2969,267.5,135.5938,236.5,135.5938,236.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="236.5" x2="260.5" y1="105.2969" y2="105.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="240.5" y="97.9951">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <path d="M313.5,49.294 L324.5,49.294 A3.75,3.75 0 0 1 327,51.794 L334,72.0939 L338.5,72.0939 A2.5,2.5 0 0 1 341,74.5939 L341,100.3938 A2.5,2.5 0 0 1 338.5,102.8938 L313.5,102.8938 A2.5,2.5 0 0 1 311,100.3938 L311,51.794 A2.5,2.5 0 0 1 313.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="311" x2="334" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="315" y="64.2999">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="170.5,83,187.5,83,194.5,105.2969,201.5,105.2969,201.5,135.5938,170.5,135.5938,170.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="170.5" x2="194.5" y1="105.2969" y2="105.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="174.5" y="97.9951">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <path d="M508.5,49.294 L519.5,49.294 A3.75,3.75 0 0 1 522,51.794 L529,72.0939 L533.5,72.0939 A2.5,2.5 0 0 1 536,74.5939 L536,100.3938 A2.5,2.5 0 0 1 533.5,102.8938 L508.5,102.8938 A2.5,2.5 0 0 1 506,100.3938 L506,51.794 A2.5,2.5 0 0 1 508.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="506" x2="529" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="510" y="64.2999">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="348.5,83,365.5,83,372.5,105.2969,379.5,105.2969,379.5,135.5938,348.5,135.5938,348.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="348.5" x2="372.5" y1="105.2969" y2="105.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="352.5" y="97.9951">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <path d="M443.5,49.294 L454.5,49.294 A3.75,3.75 0 0 1 457,51.794 L464,72.0939 L468.5,72.0939 A2.5,2.5 0 0 1 471,74.5939 L471,100.3938 A2.5,2.5 0 0 1 468.5,102.8938 L443.5,102.8938 A2.5,2.5 0 0 1 441,100.3938 L441,51.794 A2.5,2.5 0 0 1 443.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="441" x2="464" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="445" y="64.2999">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="547,83,563,83,570,105.2969,577,105.2969,577,135.5938,547,135.5938,547,83" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="547" x2="570" y1="105.2969" y2="105.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="551" y="97.9951">B</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="480.5,83,497.5,83,504.5,105.2969,511.5,105.2969,511.5,135.5938,480.5,135.5938,480.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="480.5" x2="504.5" y1="105.2969" y2="105.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="484.5" y="97.9951">C</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1fh8ixbj43rue)" points="414.5,83,431.5,83,438.5,105.2969,445.5,105.2969,445.5,135.5938,414.5,135.5938,414.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="414.5" x2="438.5" y1="105.2969" y2="105.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="418.5" y="97.9951">D</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <path d="M378.5,49.294 L389.5,49.294 A3.75,3.75 0 0 1 392,51.794 L399,72.0939 L403.5,72.0939 A2.5,2.5 0 0 1 406,74.5939 L406,100.3938 A2.5,2.5 0 0 1 403.5,102.8938 L378.5,102.8938 A2.5,2.5 0 0 1 376,100.3938 L376,51.794 A2.5,2.5 0 0 1 378.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="376" x2="399" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="380" y="64.2999">D</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t30009_package_mermaid.svg b/docs/test_cases/t30009_package_mermaid.svg
index 903c6979..96147c29 100644
--- a/docs/test_cases/t30009_package_mermaid.svg
+++ b/docs/test_cases/t30009_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 219.125 368" style="max-width: 219.125px; background-color: white;" width="219.125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
diff --git a/docs/test_cases/t30010.md b/docs/test_cases/t30010.md
index ffb10e57..c15a4e41 100644
--- a/docs/test_cases/t30010.md
+++ b/docs/test_cases/t30010.md
@@ -15,7 +15,7 @@ diagrams:
     using_namespace: clanguml::t30010
 ```
 ## Source code
-File t30010.cc
+File `tests/t30010/t30010.cc`
 ```cpp
 #include "app/app.h"
 
@@ -27,6 +27,87 @@ App app;
 } // namespace t30002
 } // namespace clanguml
 
+```
+File `tests/t30010/libraries/lib3/lib3.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t30010 {
+namespace library3 {
+
+enum E { e1, e2, e3 };
+
+}
+}
+}
+```
+File `tests/t30010/libraries/lib4/lib4.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t30010 {
+namespace library4 {
+
+struct C { };
+
+}
+}
+}
+```
+File `tests/t30010/libraries/lib1/lib1.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t30010 {
+namespace library1 {
+
+struct A { };
+
+}
+}
+}
+```
+File `tests/t30010/libraries/lib2/lib2.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t30010 {
+namespace library2 {
+
+template <typename T> struct B {
+    T b;
+};
+
+}
+}
+}
+```
+File `tests/t30010/app/app.h`
+```cpp
+#pragma once
+
+#include "../libraries/lib1/lib1.h"
+#include "../libraries/lib2/lib2.h"
+#include "../libraries/lib3/lib3.h"
+#include "../libraries/lib4/lib4.h"
+
+namespace clanguml {
+namespace t30010 {
+
+struct App {
+    library1::A *a;
+    library2::B<int> *b;
+    library3::E e;
+
+    void c(library4::C *) { }
+};
+
+}
+}
 ```
 ## Generated PlantUML diagrams
 ![t30010_package](./t30010_package.svg "Package diagram with packages from directory structure")
diff --git a/docs/test_cases/t30010_package.svg b/docs/test_cases/t30010_package.svg
index 2517bf98..c9d07b64 100644
--- a/docs/test_cases/t30010_package.svg
+++ b/docs/test_cases/t30010_package.svg
@@ -1,49 +1,53 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="202px" preserveAspectRatio="none" style="width:373px;height:202px;" version="1.1" viewBox="0 0 373 202" width="373px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="196px" preserveAspectRatio="none" style="width:331px;height:196px;background:#FFFFFF;" version="1.1" viewBox="0 0 331 196" width="331px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hvut6x8efb3x" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1hvut6x8efb3x)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="99" y1="108.2969" y2="108.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="26" y="100.9951">libraries</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/libraries/lib1/lib1.h#L7" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/libraries/lib1/lib1.h#L7" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1hvut6x8efb3x)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="287" x2="328" y1="143.2969" y2="143.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="291" y="135.9951">lib1</text>
+    <g id="cluster_C_0000879401191375500756">
+      <path d="M8.5,84.894 L64.5,84.894 A3.75,3.75 0 0 1 67,87.394 L74,107.6939 L321.5,107.6939 A2.5,2.5 0 0 1 324,110.1939 L324,186.994 A2.5,2.5 0 0 1 321.5,189.494 L8.5,189.494 A2.5,2.5 0 0 1 6,186.994 L6,87.394 A2.5,2.5 0 0 1 8.5,84.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="74" y1="107.6939" y2="107.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="55" x="10" y="99.8999">libraries</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib1/lib1.h#L7" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib1/lib1.h#L7" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <path d="M265,119.894 L291,119.894 A3.75,3.75 0 0 1 293.5,122.394 L300.5,142.6939 L305,142.6939 A2.5,2.5 0 0 1 307.5,145.1939 L307.5,170.9938 A2.5,2.5 0 0 1 305,173.4938 L265,173.4938 A2.5,2.5 0 0 1 262.5,170.9938 L262.5,122.394 A2.5,2.5 0 0 1 265,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="262.5" x2="300.5" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="266.5" y="134.8999">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/libraries/lib2/lib2.h#L7" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/libraries/lib2/lib2.h#L7" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1hvut6x8efb3x)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="245" y1="143.2969" y2="143.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="208" y="135.9951">lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib2/lib2.h#L7" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib2/lib2.h#L7" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <path d="M185,119.894 L211,119.894 A3.75,3.75 0 0 1 213.5,122.394 L220.5,142.6939 L225,142.6939 A2.5,2.5 0 0 1 227.5,145.1939 L227.5,170.9938 A2.5,2.5 0 0 1 225,173.4938 L185,173.4938 A2.5,2.5 0 0 1 182.5,170.9938 L182.5,122.394 A2.5,2.5 0 0 1 185,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="182.5" x2="220.5" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="186.5" y="134.8999">lib2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/libraries/lib3/lib3.h#L7" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/libraries/lib3/lib3.h#L7" xlink:show="new" xlink:title="lib3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1hvut6x8efb3x)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="162" y1="143.2969" y2="143.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="125" y="135.9951">lib3</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib3/lib3.h#L7" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib3/lib3.h#L7" xlink:show="new" xlink:title="lib3" xlink:type="simple">
+      <path d="M105,119.894 L131,119.894 A3.75,3.75 0 0 1 133.5,122.394 L140.5,142.6939 L145,142.6939 A2.5,2.5 0 0 1 147.5,145.1939 L147.5,170.9938 A2.5,2.5 0 0 1 145,173.4938 L105,173.4938 A2.5,2.5 0 0 1 102.5,170.9938 L102.5,122.394 A2.5,2.5 0 0 1 105,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="102.5" x2="140.5" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="106.5" y="134.8999">lib3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/libraries/lib4/lib4.h#L7" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/libraries/lib4/lib4.h#L7" xlink:show="new" xlink:title="lib4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1hvut6x8efb3x)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="143.2969" y2="143.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="135.9951">lib4</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib4/lib4.h#L7" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib4/lib4.h#L7" xlink:show="new" xlink:title="lib4" xlink:type="simple">
+      <path d="M25,119.894 L51,119.894 A3.75,3.75 0 0 1 53.5,122.394 L60.5,142.6939 L65,142.6939 A2.5,2.5 0 0 1 67.5,145.1939 L67.5,170.9938 A2.5,2.5 0 0 1 65,173.4938 L25,173.4938 A2.5,2.5 0 0 1 22.5,170.9938 L22.5,122.394 A2.5,2.5 0 0 1 25,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="60.5" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="26.5" y="134.8999">lib4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/app/app.h#L11" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30010/app/app.h#L11" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1hvut6x8efb3x)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="161.5" x2="203.5" y1="30.2969" y2="30.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="165.5" y="22.9951">app</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/app/app.h#L11" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/app/app.h#L11" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <path d="M144.5,6.294 L171.5,6.294 A3.75,3.75 0 0 1 174,8.794 L181,29.0939 L185.5,29.0939 A2.5,2.5 0 0 1 188,31.5939 L188,57.3938 A2.5,2.5 0 0 1 185.5,59.8938 L144.5,59.8938 A2.5,2.5 0 0 1 142,57.3938 L142,8.794 A2.5,2.5 0 0 1 144.5,6.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="142" x2="181" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="146" y="21.2999">app</text>
     </a>
-    <path d="M210.65,43.72 C228.69,50.68 252.9,62.07 270,78 C281.47,88.69 290.81,103.3 297.66,116.29 " fill="none" id="C_0002001320261642080149-&gt;C_0000879212264535378961" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="300.07,120.99,299.5224,111.1564,297.7884,116.5409,292.4039,114.8069,300.07,120.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M195.74,61.24 C201.94,77.64 210.01,98.94 216.52,116.16 " fill="none" id="C_0002001320261642080149-&gt;C_0001522606219626203424" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="218.31,120.89,218.859,111.0565,216.5372,116.2148,211.3788,113.893,218.31,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M176.49,61.24 C170.44,77.64 162.57,98.94 156.21,116.16 " fill="none" id="C_0002001320261642080149-&gt;C_0002263709579652581325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="154.46,120.89,161.3277,113.8306,156.1905,116.199,153.8221,111.0618,154.46,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M161.24,44.2 C143.75,51.27 120.55,62.6 104,78 C92.54,88.66 83.06,103.14 76.02,116.04 " fill="none" id="C_0002001320261642080149-&gt;C_0001103453030023410219" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="73.54,120.71,81.3078,114.6551,75.8952,116.2994,74.2508,110.8868,73.54,120.71" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0002001320261642080149_C_0000879212264535378961">
+      <path codeLine="13" d="M188.17,42.454 C205.41,49.564 228.68,61.144 245,76.894 C257.43,88.884 264.6148,100.1836 271.4248,114.1136 " fill="none" id="C_0002001320261642080149-to-C_0000879212264535378961" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="274.06,119.504,273.7008,109.6617,271.864,115.012,266.5137,113.1753,274.06,119.504" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002001320261642080149_C_0001522606219626203424">
+      <path codeLine="14" d="M174.38,60.264 C180.8,78.174 187.2452,96.166 193.6552,114.046 " fill="none" id="C_0002001320261642080149-to-C_0001522606219626203424" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="195.68,119.694,196.4081,109.8721,193.9926,114.9873,188.8774,112.5718,195.68,119.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002001320261642080149_C_0002263709579652581325">
+      <path codeLine="15" d="M155.62,60.264 C149.2,78.174 142.7548,96.166 136.3448,114.046 " fill="none" id="C_0002001320261642080149-to-C_0002263709579652581325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="134.32,119.694,141.1226,112.5718,136.0074,114.9873,133.5919,109.8721,134.32,119.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002001320261642080149_C_0001103453030023410219">
+      <path codeLine="16" d="M141.83,42.454 C124.59,49.564 101.32,61.144 85,76.894 C72.57,88.884 65.3852,100.1836 58.5752,114.1136 " fill="none" id="C_0002001320261642080149-to-C_0001103453030023410219" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="55.94,119.504,63.4863,113.1753,58.136,115.012,56.2992,109.6617,55.94,119.504" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30010_package_mermaid.svg b/docs/test_cases/t30010_package_mermaid.svg
index 897b1799..8b12ecd0 100644
--- a/docs/test_cases/t30010_package_mermaid.svg
+++ b/docs/test_cases/t30010_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 395.625 182" style="max-width: 395.625px; background-color: white;" width="395.625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -33,10 +33,10 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,83C54.953125,91.33333333333333,54.953125,99.66666666666667,54.953125,103.83333333333333L54.953125,108"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,83C144.859375,91.33333333333333,144.859375,99.66666666666667,144.859375,103.83333333333333L144.859375,108"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,83C234.765625,91.33333333333333,234.765625,99.66666666666667,234.765625,103.83333333333333L234.765625,108"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,83C324.671875,91.33333333333333,324.671875,99.66666666666667,324.671875,103.83333333333333L324.671875,108"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,82.11666666666666C54.953125,89.56666666666666,54.953125,96.13333333333333,54.953125,99.41666666666667L54.953125,102.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,82.11666666666666C144.859375,89.56666666666666,144.859375,96.13333333333333,144.859375,99.41666666666667L144.859375,102.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,82.11666666666666C234.765625,89.56666666666666,234.765625,96.13333333333333,234.765625,99.41666666666667L234.765625,102.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,82.11666666666666C324.671875,89.56666666666666,324.671875,96.13333333333333,324.671875,99.41666666666667L324.671875,102.7"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30011.md b/docs/test_cases/t30011.md
index eb7e87f0..e158714f 100644
--- a/docs/test_cases/t30011.md
+++ b/docs/test_cases/t30011.md
@@ -12,12 +12,64 @@ diagrams:
         - .
 ```
 ## Source code
-File t30011.c
+File `tests/t30011/t30011.c`
 ```cpp
 #include "app/app.h"
 
 struct t30011_App app;
 
+```
+File `tests/t30011/libraries/lib3/lib3.h`
+```cpp
+#pragma once
+
+enum t30011_E { e1, e2, e3 };
+
+```
+File `tests/t30011/libraries/lib4/lib4.h`
+```cpp
+#pragma once
+
+struct t30011_C {
+    int c;
+};
+
+```
+File `tests/t30011/libraries/lib1/lib1.h`
+```cpp
+#pragma once
+
+struct t30011_A {
+    int a;
+};
+
+```
+File `tests/t30011/libraries/lib2/lib2.h`
+```cpp
+#pragma once
+
+struct t30011_B {
+    int b;
+};
+
+```
+File `tests/t30011/app/app.h`
+```cpp
+#pragma once
+
+#include "../libraries/lib1/lib1.h"
+#include "../libraries/lib2/lib2.h"
+#include "../libraries/lib3/lib3.h"
+#include "../libraries/lib4/lib4.h"
+
+struct t30011_App {
+    struct t30011_A a;
+    struct t30011_B *b;
+    enum t30011_E e;
+};
+
+void c(struct t30011_App *app, struct t30011_C *c) { }
+
 ```
 ## Generated PlantUML diagrams
 ![t30011_package](./t30011_package.svg "Package diagram with packages from directory structure for plain C")
diff --git a/docs/test_cases/t30011_package.svg b/docs/test_cases/t30011_package.svg
index 61a22fe2..8af66c7a 100644
--- a/docs/test_cases/t30011_package.svg
+++ b/docs/test_cases/t30011_package.svg
@@ -1,49 +1,53 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="202px" preserveAspectRatio="none" style="width:373px;height:202px;" version="1.1" viewBox="0 0 373 202" width="373px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="196px" preserveAspectRatio="none" style="width:331px;height:196px;background:#FFFFFF;" version="1.1" viewBox="0 0 331 196" width="331px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1g0dqhlaonzsm" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1g0dqhlaonzsm)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="99" y1="108.2969" y2="108.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="26" y="100.9951">libraries</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/libraries/lib1/lib1.h#L3" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/libraries/lib1/lib1.h#L3" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1g0dqhlaonzsm)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="287" x2="328" y1="143.2969" y2="143.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="291" y="135.9951">lib1</text>
+    <g id="cluster_C_0000879401191375500756">
+      <path d="M8.5,84.894 L64.5,84.894 A3.75,3.75 0 0 1 67,87.394 L74,107.6939 L321.5,107.6939 A2.5,2.5 0 0 1 324,110.1939 L324,186.994 A2.5,2.5 0 0 1 321.5,189.494 L8.5,189.494 A2.5,2.5 0 0 1 6,186.994 L6,87.394 A2.5,2.5 0 0 1 8.5,84.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="74" y1="107.6939" y2="107.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="55" x="10" y="99.8999">libraries</text>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib1/lib1.h#L3" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib1/lib1.h#L3" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <path d="M265,119.894 L291,119.894 A3.75,3.75 0 0 1 293.5,122.394 L300.5,142.6939 L305,142.6939 A2.5,2.5 0 0 1 307.5,145.1939 L307.5,170.9938 A2.5,2.5 0 0 1 305,173.4938 L265,173.4938 A2.5,2.5 0 0 1 262.5,170.9938 L262.5,122.394 A2.5,2.5 0 0 1 265,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="262.5" x2="300.5" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="266.5" y="134.8999">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/libraries/lib2/lib2.h#L3" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/libraries/lib2/lib2.h#L3" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1g0dqhlaonzsm)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="245" y1="143.2969" y2="143.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="208" y="135.9951">lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib2/lib2.h#L3" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib2/lib2.h#L3" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <path d="M185,119.894 L211,119.894 A3.75,3.75 0 0 1 213.5,122.394 L220.5,142.6939 L225,142.6939 A2.5,2.5 0 0 1 227.5,145.1939 L227.5,170.9938 A2.5,2.5 0 0 1 225,173.4938 L185,173.4938 A2.5,2.5 0 0 1 182.5,170.9938 L182.5,122.394 A2.5,2.5 0 0 1 185,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="182.5" x2="220.5" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="186.5" y="134.8999">lib2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/libraries/lib3/lib3.h#L3" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/libraries/lib3/lib3.h#L3" xlink:show="new" xlink:title="lib3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1g0dqhlaonzsm)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="162" y1="143.2969" y2="143.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="125" y="135.9951">lib3</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib3/lib3.h#L3" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib3/lib3.h#L3" xlink:show="new" xlink:title="lib3" xlink:type="simple">
+      <path d="M105,119.894 L131,119.894 A3.75,3.75 0 0 1 133.5,122.394 L140.5,142.6939 L145,142.6939 A2.5,2.5 0 0 1 147.5,145.1939 L147.5,170.9938 A2.5,2.5 0 0 1 145,173.4938 L105,173.4938 A2.5,2.5 0 0 1 102.5,170.9938 L102.5,122.394 A2.5,2.5 0 0 1 105,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="102.5" x2="140.5" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="106.5" y="134.8999">lib3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/libraries/lib4/lib4.h#L3" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/libraries/lib4/lib4.h#L3" xlink:show="new" xlink:title="lib4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1g0dqhlaonzsm)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="143.2969" y2="143.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="135.9951">lib4</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib4/lib4.h#L3" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib4/lib4.h#L3" xlink:show="new" xlink:title="lib4" xlink:type="simple">
+      <path d="M25,119.894 L51,119.894 A3.75,3.75 0 0 1 53.5,122.394 L60.5,142.6939 L65,142.6939 A2.5,2.5 0 0 1 67.5,145.1939 L67.5,170.9938 A2.5,2.5 0 0 1 65,173.4938 L25,173.4938 A2.5,2.5 0 0 1 22.5,170.9938 L22.5,122.394 A2.5,2.5 0 0 1 25,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="60.5" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="26.5" y="134.8999">lib4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/app/app.h#L8" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t30011/app/app.h#L8" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1g0dqhlaonzsm)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
-      <line style="stroke: #000000; stroke-width: 1.5;" x1="161.5" x2="203.5" y1="30.2969" y2="30.2969"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="165.5" y="22.9951">app</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/app/app.h#L8" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/app/app.h#L8" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <path d="M144.5,6.294 L171.5,6.294 A3.75,3.75 0 0 1 174,8.794 L181,29.0939 L185.5,29.0939 A2.5,2.5 0 0 1 188,31.5939 L188,57.3938 A2.5,2.5 0 0 1 185.5,59.8938 L144.5,59.8938 A2.5,2.5 0 0 1 142,57.3938 L142,8.794 A2.5,2.5 0 0 1 144.5,6.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="142" x2="181" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="146" y="21.2999">app</text>
     </a>
-    <path d="M210.65,43.72 C228.69,50.68 252.9,62.07 270,78 C281.47,88.69 290.81,103.3 297.66,116.29 " fill="none" id="C_0002001320261642080149-&gt;C_0000879212264535378961" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="300.07,120.99,299.5224,111.1564,297.7884,116.5409,292.4039,114.8069,300.07,120.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M195.74,61.24 C201.94,77.64 210.01,98.94 216.52,116.16 " fill="none" id="C_0002001320261642080149-&gt;C_0001522606219626203424" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="218.31,120.89,218.859,111.0565,216.5372,116.2148,211.3788,113.893,218.31,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M176.49,61.24 C170.44,77.64 162.57,98.94 156.21,116.16 " fill="none" id="C_0002001320261642080149-&gt;C_0002263709579652581325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="154.46,120.89,161.3277,113.8306,156.1905,116.199,153.8221,111.0618,154.46,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M161.24,44.2 C143.75,51.27 120.55,62.6 104,78 C92.54,88.66 83.06,103.14 76.02,116.04 " fill="none" id="C_0002001320261642080149-&gt;C_0001103453030023410219" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="73.54,120.71,81.3078,114.6551,75.8952,116.2994,74.2508,110.8868,73.54,120.71" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="link_C_0002001320261642080149_C_0000879212264535378961">
+      <path codeLine="13" d="M188.17,42.454 C205.41,49.564 228.68,61.144 245,76.894 C257.43,88.884 264.6148,100.1836 271.4248,114.1136 " fill="none" id="C_0002001320261642080149-to-C_0000879212264535378961" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="274.06,119.504,273.7008,109.6617,271.864,115.012,266.5137,113.1753,274.06,119.504" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002001320261642080149_C_0001522606219626203424">
+      <path codeLine="14" d="M174.38,60.264 C180.8,78.174 187.2452,96.166 193.6552,114.046 " fill="none" id="C_0002001320261642080149-to-C_0001522606219626203424" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="195.68,119.694,196.4081,109.8721,193.9926,114.9873,188.8774,112.5718,195.68,119.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002001320261642080149_C_0002263709579652581325">
+      <path codeLine="15" d="M155.62,60.264 C149.2,78.174 142.7548,96.166 136.3448,114.046 " fill="none" id="C_0002001320261642080149-to-C_0002263709579652581325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="134.32,119.694,141.1226,112.5718,136.0074,114.9873,133.5919,109.8721,134.32,119.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002001320261642080149_C_0001103453030023410219">
+      <path codeLine="16" d="M141.83,42.454 C124.59,49.564 101.32,61.144 85,76.894 C72.57,88.884 65.3852,100.1836 58.5752,114.1136 " fill="none" id="C_0002001320261642080149-to-C_0001103453030023410219" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="55.94,119.504,63.4863,113.1753,58.136,115.012,56.2992,109.6617,55.94,119.504" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t30011_package_mermaid.svg b/docs/test_cases/t30011_package_mermaid.svg
index 897b1799..8b12ecd0 100644
--- a/docs/test_cases/t30011_package_mermaid.svg
+++ b/docs/test_cases/t30011_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 395.625 182" style="max-width: 395.625px; background-color: white;" width="395.625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -33,10 +33,10 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,83C54.953125,91.33333333333333,54.953125,99.66666666666667,54.953125,103.83333333333333L54.953125,108"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,83C144.859375,91.33333333333333,144.859375,99.66666666666667,144.859375,103.83333333333333L144.859375,108"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,83C234.765625,91.33333333333333,234.765625,99.66666666666667,234.765625,103.83333333333333L234.765625,108"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,83C324.671875,91.33333333333333,324.671875,99.66666666666667,324.671875,103.83333333333333L324.671875,108"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,82.11666666666666C54.953125,89.56666666666666,54.953125,96.13333333333333,54.953125,99.41666666666667L54.953125,102.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,82.11666666666666C144.859375,89.56666666666666,144.859375,96.13333333333333,144.859375,99.41666666666667L144.859375,102.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,82.11666666666666C234.765625,89.56666666666666,234.765625,96.13333333333333,234.765625,99.41666666666667L234.765625,102.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,82.11666666666666C324.671875,89.56666666666666,324.671875,96.13333333333333,324.671875,99.41666666666667L324.671875,102.7"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30012.md b/docs/test_cases/t30012.md
new file mode 100644
index 00000000..c0933708
--- /dev/null
+++ b/docs/test_cases/t30012.md
@@ -0,0 +1,172 @@
+# t30012 - C++20 modules package diagram test
+## Config
+```yaml
+diagrams:
+  t30012_package:
+    type: package
+    glob:
+      - t30012.cc
+    package_type: module
+    include:
+      modules:
+        - t30012
+    using_module: t30012
+```
+## Source code
+File `tests/t30012/t30012.cc`
+```cpp
+import t30012.app;
+import t30012.app.lib1;
+import t30012.app.lib1.mod1;
+import t30012.app.lib1.mod2;
+import t30012.app.lib2;
+
+namespace clanguml {
+namespace t30012 {
+class R {
+    A *a;
+    B *b;
+    C *c;
+};
+}
+}
+```
+File `tests/t30012/src/lib1.cppm`
+```cpp
+export module t30012.app.lib1;
+
+export namespace clanguml::t30012 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+}
+```
+File `tests/t30012/src/lib2.cppm`
+```cpp
+export module t30012.app.lib2;
+
+export namespace clanguml::t30012 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+namespace detail {
+enum class CCC { ccc1, ccc2 };
+}
+}
+```
+File `tests/t30012/src/lib1mod1.cppm`
+```cpp
+export module t30012.app.lib1.mod1;
+
+export namespace clanguml::t30012 {
+class D { };
+}
+```
+File `tests/t30012/src/t30012_mod.cppm`
+```cpp
+export module t30012.app;
+export import t30012.app.lib1;
+export import t30012.app.lib2;
+
+export namespace clanguml::t30012 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
+```
+File `tests/t30012/src/lib1mod2.cppm`
+```cpp
+export module t30012.app.lib1.mod2;
+
+export namespace clanguml::t30012 {
+class E { };
+}
+```
+## Generated PlantUML diagrams
+![t30012_package](./t30012_package.svg "C++20 modules package diagram test")
+## Generated Mermaid diagrams
+![t30012_package](./t30012_package_mermaid.svg "C++20 modules package diagram test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "app",
+      "elements": [
+        {
+          "display_name": "app.lib1",
+          "elements": [
+            {
+              "display_name": "app.lib1.mod1",
+              "id": "1890617159212924206",
+              "is_deprecated": false,
+              "name": "mod1",
+              "source_location": {
+                "column": 7,
+                "file": "src/lib1mod1.cppm",
+                "line": 4,
+                "translation_unit": "t30012.cc"
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "app.lib1.mod2",
+              "id": "206451677325228178",
+              "is_deprecated": false,
+              "name": "mod2",
+              "source_location": {
+                "column": 7,
+                "file": "src/lib1mod2.cppm",
+                "line": 4,
+                "translation_unit": "t30012.cc"
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "2078388864960203240",
+          "is_deprecated": false,
+          "name": "lib1",
+          "source_location": {
+            "column": 7,
+            "file": "src/lib1.cppm",
+            "line": 4,
+            "translation_unit": "t30012.cc"
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "app.lib2",
+          "id": "765684581621927632",
+          "is_deprecated": false,
+          "name": "lib2",
+          "source_location": {
+            "column": 7,
+            "file": "src/lib2.cppm",
+            "line": 4,
+            "translation_unit": "t30012.cc"
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "381866731754697815",
+      "is_deprecated": false,
+      "name": "app",
+      "type": "namespace"
+    }
+  ],
+  "name": "t30012_package",
+  "relationships": []
+}
+```
diff --git a/docs/test_cases/t30012_package.svg b/docs/test_cases/t30012_package.svg
new file mode 100644
index 00000000..c8c27bbb
--- /dev/null
+++ b/docs/test_cases/t30012_package.svg
@@ -0,0 +1,34 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="184px" preserveAspectRatio="none" style="width:301px;height:184px;background:#FFFFFF;" version="1.1" viewBox="0 0 301 184" width="301px" zoomAndPan="magnify">
+  <defs>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <g id="cluster_C_0000381866731754697815">
+      <path d="M8.5,6.294 L35.5,6.294 A3.75,3.75 0 0 1 38,8.794 L45,29.0939 L291.5,29.0939 A2.5,2.5 0 0 1 294,31.5939 L294,175.394 A2.5,2.5 0 0 1 291.5,177.894 L8.5,177.894 A2.5,2.5 0 0 1 6,175.394 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="45" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="10" y="21.2999">app</text>
+    </g>
+    <g id="cluster_C_0002078388864960203240">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1.cppm#L4" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1.cppm#L4" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+        <path d="M89.5,49.294 L115.5,49.294 A3.75,3.75 0 0 1 118,51.794 L125,72.0939 L267.5,72.0939 A2.5,2.5 0 0 1 270,74.5939 L270,151.394 A2.5,2.5 0 0 1 267.5,153.894 L89.5,153.894 A2.5,2.5 0 0 1 87,151.394 L87,51.794 A2.5,2.5 0 0 1 89.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+        <line style="stroke:#000000;stroke-width:1.5;" x1="87" x2="125" y1="72.0939" y2="72.0939"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="91" y="64.2999">lib1</text>
+      </a>
+    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <path d="M198.5,84.294 L237.5,84.294 A3.75,3.75 0 0 1 240,86.794 L247,107.0939 L251.5,107.0939 A2.5,2.5 0 0 1 254,109.5939 L254,135.3938 A2.5,2.5 0 0 1 251.5,137.8938 L198.5,137.8938 A2.5,2.5 0 0 1 196,135.3938 L196,86.794 A2.5,2.5 0 0 1 198.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="196" x2="247" y1="107.0939" y2="107.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="200" y="99.2999">mod1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
+      <path d="M105.5,84.294 L144.5,84.294 A3.75,3.75 0 0 1 147,86.794 L154,107.0939 L158.5,107.0939 A2.5,2.5 0 0 1 161,109.5939 L161,135.3938 A2.5,2.5 0 0 1 158.5,137.8938 L105.5,137.8938 A2.5,2.5 0 0 1 103,135.3938 L103,86.794 A2.5,2.5 0 0 1 105.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="103" x2="154" y1="107.0939" y2="107.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="107" y="99.2999">mod2</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib2.cppm#L4" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib2.cppm#L4" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <path d="M25,84.294 L51,84.294 A3.75,3.75 0 0 1 53.5,86.794 L60.5,107.0939 L65,107.0939 A2.5,2.5 0 0 1 67.5,109.5939 L67.5,135.3938 A2.5,2.5 0 0 1 65,137.8938 L25,137.8938 A2.5,2.5 0 0 1 22.5,135.3938 L22.5,86.794 A2.5,2.5 0 0 1 25,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="60.5" y1="107.0939" y2="107.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="26.5" y="99.2999">lib2</text>
+    </a>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30012_package_mermaid.svg b/docs/test_cases/t30012_package_mermaid.svg
new file mode 100644
index 00000000..bb6e2a9d
--- /dev/null
+++ b/docs/test_cases/t30012_package_mermaid.svg
@@ -0,0 +1,99 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 296.0625 252" style="max-width: 296.062px; background-color: white;" width="296.0625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths"/>
+      <g class="edgeLabels"/>
+      <g class="nodes">
+        <g transform="translate(-7.5, -8)" class="root">
+          <g class="clusters">
+            <g id="C_0000381866731754697815" class="cluster default flowchart-label">
+              <rect height="236" width="280.0625" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(134.6796875, 8)" class="cluster-label">
+                <foreignObject height="18" width="26.703125">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">app</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths"/>
+          <g class="edgeLabels"/>
+          <g class="nodes">
+            <g transform="translate(25.5, 35)" class="root">
+              <g class="clusters">
+                <g id="C_0002078388864960203240" class="cluster clickable flowchart-label">
+                  <rect height="83" width="230.0625" y="8" x="8" ry="0" rx="0" style=""/>
+                  <g transform="translate(110.578125, 8)" class="cluster-label">
+                    <foreignObject height="18" width="24.90625">
+                      <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                        <span class="nodeLabel">lib1</span>
+                      </div>
+                    </foreignObject>
+                  </g>
+                </g>
+              </g>
+              <g class="edgePaths"/>
+              <g class="edgeLabels"/>
+              <g class="nodes">
+                <g transform="translate(70.515625, 49.5)" title="mod1" id="flowchart-C_0001890617159212924206-4" class="node default clickable flowchart-label">
+                  <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+                  <g transform="translate(-20.015625, -9)" style="" class="label">
+                    <rect/>
+                    <foreignObject height="18" width="40.03125">
+                      <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                        <span class="nodeLabel">mod1</span>
+                      </div>
+                    </foreignObject>
+                  </g>
+                </g>
+                <g transform="translate(175.546875, 49.5)" title="mod2" id="flowchart-C_0000206451677325228178-3" class="node default clickable flowchart-label">
+                  <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+                  <g transform="translate(-20.015625, -9)" style="" class="label">
+                    <rect/>
+                    <foreignObject height="18" width="40.03125">
+                      <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                        <span class="nodeLabel">mod2</span>
+                      </div>
+                    </foreignObject>
+                  </g>
+                </g>
+              </g>
+            </g>
+            <g transform="translate(148.03125, 192.5)" title="lib2" id="flowchart-C_0000765684581621927632-1" class="node default clickable flowchart-label">
+              <rect height="33" width="39.90625" y="-16.5" x="-19.953125" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-12.453125, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="24.90625">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">lib2</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30013.md b/docs/test_cases/t30013.md
new file mode 100644
index 00000000..21727a0a
--- /dev/null
+++ b/docs/test_cases/t30013.md
@@ -0,0 +1,614 @@
+# t30013 - C++20 modules package dependencies diagram test
+## Config
+```yaml
+diagrams:
+  t30013_package:
+    type: package
+    glob:
+      - t30013.cc
+    package_type: module
+    include:
+      modules:
+        - t30013
+    using_module: t30013
+```
+## Source code
+File `tests/t30013/t30013.cc`
+```cpp
+import t30013.app;
+import t30013.mod2;
+import t30013.mod3;
+import t30013.mod4;
+import t30013.mod5;
+import t30013.mod6;
+import t30013.mod7;
+import t30013.mod8;
+import t30013.mod9;
+import t30013.mod10;
+import t30013.mod11;
+import t30013.mod12;
+import t30013.mod13;
+import t30013.mod14;
+import t30013.mod15;
+import t30013.mod16;
+import t30013.mod17;
+import t30013.mod18;
+
+namespace clanguml::t30013 {
+class R {
+    CBA cba;
+};
+} // namespace clanguml::t30013
+```
+File `tests/t30013/src/app.cppm`
+```cpp
+module;
+
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+export module t30013.app;
+
+import t30013.mod1;
+import t30013.mod2;
+import t30013.mod3;
+import t30013.mod4;
+import t30013.mod5;
+import t30013.mod6;
+import t30013.mod7;
+import t30013.mod8;
+import t30013.mod9;
+import t30013.mod10;
+import t30013.mod11;
+import t30013.mod12;
+import t30013.mod13;
+import t30013.mod14;
+import t30013.mod15;
+import t30013.mod16;
+import t30013.mod17;
+import t30013.mod18;
+
+export namespace clanguml::t30013 {
+
+class CBA : public CF {
+public:
+    CA *ca_;
+    CB<int> cb_;
+    std::shared_ptr<CC> cc_;
+    std::map<std::string, std::unique_ptr<CD>> *cd_;
+    std::array<CO, 5> co_;
+    static CP *cp_;
+
+    CBA() = default;
+
+    CBA(CN *cn) { }
+
+    friend CR;
+
+    template <typename... Item> CBA(std::tuple<Item...> &items) { }
+
+    void ce(const std::vector<CE> /*ce_*/) { }
+
+    std::shared_ptr<CG> cg() { return {}; }
+
+    template <typename T> void ch(std::map<T, std::shared_ptr<CH>> &ch_) { }
+
+    template <typename T> std::map<T, std::shared_ptr<CI>> ci(T * /*t*/)
+    {
+        return {};
+    }
+
+    S s;
+};
+
+void cj(std::unique_ptr<CJ> /*cj_*/) { }
+
+std::unique_ptr<CK> ck() { return {}; }
+
+template <typename T> void cl(std::map<T, std::shared_ptr<CL>> & /*ch_*/) { }
+
+template <typename T> std::map<T, std::shared_ptr<CM>> cm() { return {}; }
+
+} // namespace clanguml::t30013
+```
+File `tests/t30013/src/mod9.cppm`
+```cpp
+export module t30013.mod9;
+
+export namespace clanguml::t30013 {
+struct CI { };
+}
+```
+File `tests/t30013/src/mod4.cppm`
+```cpp
+export module t30013.mod4;
+
+export namespace clanguml::t30013 {
+struct CD { };
+}
+```
+File `tests/t30013/src/mod18.cppm`
+```cpp
+export module t30013.mod18;
+
+export namespace clanguml::t30013 {
+enum class S { s1, s2, s3 };
+}
+```
+File `tests/t30013/src/mod7.cppm`
+```cpp
+export module t30013.mod7;
+
+export namespace clanguml::t30013 {
+struct CG { };
+}
+```
+File `tests/t30013/src/mod3.cppm`
+```cpp
+export module t30013.mod3;
+
+export namespace clanguml::t30013 {
+struct CC { };
+}
+```
+File `tests/t30013/src/mod15.cppm`
+```cpp
+export module t30013.mod15;
+
+export namespace clanguml::t30013 {
+struct CO { };
+}
+```
+File `tests/t30013/src/mod16.cppm`
+```cpp
+export module t30013.mod16;
+
+export namespace clanguml::t30013 {
+struct CP { };
+}
+```
+File `tests/t30013/src/mod11.cppm`
+```cpp
+export module t30013.mod11;
+
+export namespace clanguml::t30013 {
+struct CK { };
+}
+```
+File `tests/t30013/src/mod13.cppm`
+```cpp
+export module t30013.mod13;
+
+export namespace clanguml::t30013 {
+struct CM { };
+}
+```
+File `tests/t30013/src/mod2.cppm`
+```cpp
+export module t30013.mod2;
+
+export namespace clanguml::t30013 {
+template <typename T> struct CB {
+    T cb;
+};
+}
+```
+File `tests/t30013/src/mod17.cppm`
+```cpp
+export module t30013.mod17;
+
+export namespace clanguml::t30013 {
+struct CR { };
+}
+```
+File `tests/t30013/src/mod12.cppm`
+```cpp
+export module t30013.mod12;
+
+export namespace clanguml::t30013 {
+struct CL { };
+}
+```
+File `tests/t30013/src/mod8.cppm`
+```cpp
+export module t30013.mod8;
+
+export namespace clanguml::t30013 {
+struct CH { };
+}
+```
+File `tests/t30013/src/mod10.cppm`
+```cpp
+export module t30013.mod10;
+
+export namespace clanguml::t30013 {
+struct CJ { };
+}
+```
+File `tests/t30013/src/mod14.cppm`
+```cpp
+export module t30013.mod14;
+
+export namespace clanguml::t30013 {
+struct CN { };
+}
+```
+File `tests/t30013/src/mod1.cppm`
+```cpp
+export module t30013.mod1;
+
+export namespace clanguml::t30013 {
+struct CA { };
+}
+```
+File `tests/t30013/src/mod6.cppm`
+```cpp
+export module t30013.mod6;
+
+export namespace clanguml::t30013 {
+struct CF { };
+}
+```
+File `tests/t30013/src/mod5.cppm`
+```cpp
+export module t30013.mod5;
+
+export namespace clanguml::t30013 {
+struct CE { };
+}
+```
+## Generated PlantUML diagrams
+![t30013_package](./t30013_package.svg "C++20 modules package dependencies diagram test")
+## Generated Mermaid diagrams
+![t30013_package](./t30013_package_mermaid.svg "C++20 modules package dependencies diagram test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "mod1",
+      "id": "2044296282469444594",
+      "is_deprecated": false,
+      "name": "mod1",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod1.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod2",
+      "id": "1532747677179216874",
+      "is_deprecated": false,
+      "name": "mod2",
+      "source_location": {
+        "column": 30,
+        "file": "src/mod2.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod3",
+      "id": "2181211985644595508",
+      "is_deprecated": false,
+      "name": "mod3",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod3.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod4",
+      "id": "1994575092781206355",
+      "is_deprecated": false,
+      "name": "mod4",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod4.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod5",
+      "id": "83546849245676714",
+      "is_deprecated": false,
+      "name": "mod5",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod5.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod6",
+      "id": "441620369599169965",
+      "is_deprecated": false,
+      "name": "mod6",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod6.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod7",
+      "id": "836435135277319151",
+      "is_deprecated": false,
+      "name": "mod7",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod7.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod8",
+      "id": "420790450869221512",
+      "is_deprecated": false,
+      "name": "mod8",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod8.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod9",
+      "id": "396495954682989840",
+      "is_deprecated": false,
+      "name": "mod9",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod9.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod10",
+      "id": "2177162846045884064",
+      "is_deprecated": false,
+      "name": "mod10",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod10.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod11",
+      "id": "1414886740502603020",
+      "is_deprecated": false,
+      "name": "mod11",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod11.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod12",
+      "id": "1312439587201843275",
+      "is_deprecated": false,
+      "name": "mod12",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod12.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod13",
+      "id": "1087761784810349022",
+      "is_deprecated": false,
+      "name": "mod13",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod13.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod14",
+      "id": "613410583917815311",
+      "is_deprecated": false,
+      "name": "mod14",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod14.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod15",
+      "id": "1226951305255100636",
+      "is_deprecated": false,
+      "name": "mod15",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod15.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod16",
+      "id": "1931818205177002737",
+      "is_deprecated": false,
+      "name": "mod16",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod16.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod17",
+      "id": "1954698286919808752",
+      "is_deprecated": false,
+      "name": "mod17",
+      "source_location": {
+        "column": 8,
+        "file": "src/mod17.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "mod18",
+      "id": "984386744169567889",
+      "is_deprecated": false,
+      "name": "mod18",
+      "source_location": {
+        "column": 12,
+        "file": "src/mod18.cppm",
+        "line": 4,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "app",
+      "id": "45223532970498010",
+      "is_deprecated": false,
+      "name": "app",
+      "source_location": {
+        "column": 7,
+        "file": "src/app.cppm",
+        "line": 32,
+        "translation_unit": "t30013.cc"
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30013_package",
+  "relationships": [
+    {
+      "destination": "420790450869221512",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "396495954682989840",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "2044296282469444594",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "1532747677179216874",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "2181211985644595508",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "1994575092781206355",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "1226951305255100636",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "984386744169567889",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "1931818205177002737",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "613410583917815311",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "83546849245676714",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "836435135277319151",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "1954698286919808752",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "441620369599169965",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "2177162846045884064",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "1414886740502603020",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "1312439587201843275",
+      "source": "45223532970498010",
+      "type": "dependency"
+    },
+    {
+      "destination": "1087761784810349022",
+      "source": "45223532970498010",
+      "type": "dependency"
+    }
+  ]
+}
+```
diff --git a/docs/test_cases/t30013_package.svg b/docs/test_cases/t30013_package.svg
new file mode 100644
index 00000000..2fb2f341
--- /dev/null
+++ b/docs/test_cases/t30013_package.svg
@@ -0,0 +1,174 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="180px" preserveAspectRatio="none" style="width:1724px;height:180px;background:#FFFFFF;" version="1.1" viewBox="0 0 1724 180" width="1724px" zoomAndPan="magnify">
+  <defs>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <path d="M8.5,119.894 L47.5,119.894 A3.75,3.75 0 0 1 50,122.394 L57,142.6939 L61.5,142.6939 A2.5,2.5 0 0 1 64,145.1939 L64,170.9938 A2.5,2.5 0 0 1 61.5,173.4938 L8.5,173.4938 A2.5,2.5 0 0 1 6,170.9938 L6,122.394 A2.5,2.5 0 0 1 8.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="6" x2="57" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="10" y="134.8999">mod1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
+      <path d="M101.5,119.894 L140.5,119.894 A3.75,3.75 0 0 1 143,122.394 L150,142.6939 L154.5,142.6939 A2.5,2.5 0 0 1 157,145.1939 L157,170.9938 A2.5,2.5 0 0 1 154.5,173.4938 L101.5,173.4938 A2.5,2.5 0 0 1 99,170.9938 L99,122.394 A2.5,2.5 0 0 1 101.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="99" x2="150" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="103" y="134.8999">mod2</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod3.cppm#L4" target="_top" title="mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod3.cppm#L4" xlink:show="new" xlink:title="mod3" xlink:type="simple">
+      <path d="M194.5,119.894 L233.5,119.894 A3.75,3.75 0 0 1 236,122.394 L243,142.6939 L247.5,142.6939 A2.5,2.5 0 0 1 250,145.1939 L250,170.9938 A2.5,2.5 0 0 1 247.5,173.4938 L194.5,173.4938 A2.5,2.5 0 0 1 192,170.9938 L192,122.394 A2.5,2.5 0 0 1 194.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="192" x2="243" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="196" y="134.8999">mod3</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod4.cppm#L4" target="_top" title="mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod4.cppm#L4" xlink:show="new" xlink:title="mod4" xlink:type="simple">
+      <path d="M287.5,119.894 L326.5,119.894 A3.75,3.75 0 0 1 329,122.394 L336,142.6939 L340.5,142.6939 A2.5,2.5 0 0 1 343,145.1939 L343,170.9938 A2.5,2.5 0 0 1 340.5,173.4938 L287.5,173.4938 A2.5,2.5 0 0 1 285,170.9938 L285,122.394 A2.5,2.5 0 0 1 287.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="285" x2="336" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="289" y="134.8999">mod4</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod5.cppm#L4" target="_top" title="mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod5.cppm#L4" xlink:show="new" xlink:title="mod5" xlink:type="simple">
+      <path d="M380.5,119.894 L419.5,119.894 A3.75,3.75 0 0 1 422,122.394 L429,142.6939 L433.5,142.6939 A2.5,2.5 0 0 1 436,145.1939 L436,170.9938 A2.5,2.5 0 0 1 433.5,173.4938 L380.5,173.4938 A2.5,2.5 0 0 1 378,170.9938 L378,122.394 A2.5,2.5 0 0 1 380.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="378" x2="429" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="382" y="134.8999">mod5</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod6.cppm#L4" target="_top" title="mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod6.cppm#L4" xlink:show="new" xlink:title="mod6" xlink:type="simple">
+      <path d="M473.5,119.894 L512.5,119.894 A3.75,3.75 0 0 1 515,122.394 L522,142.6939 L526.5,142.6939 A2.5,2.5 0 0 1 529,145.1939 L529,170.9938 A2.5,2.5 0 0 1 526.5,173.4938 L473.5,173.4938 A2.5,2.5 0 0 1 471,170.9938 L471,122.394 A2.5,2.5 0 0 1 473.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="471" x2="522" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="475" y="134.8999">mod6</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod7.cppm#L4" target="_top" title="mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod7.cppm#L4" xlink:show="new" xlink:title="mod7" xlink:type="simple">
+      <path d="M566.5,119.894 L605.5,119.894 A3.75,3.75 0 0 1 608,122.394 L615,142.6939 L619.5,142.6939 A2.5,2.5 0 0 1 622,145.1939 L622,170.9938 A2.5,2.5 0 0 1 619.5,173.4938 L566.5,173.4938 A2.5,2.5 0 0 1 564,170.9938 L564,122.394 A2.5,2.5 0 0 1 566.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="564" x2="615" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="568" y="134.8999">mod7</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod8.cppm#L4" target="_top" title="mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod8.cppm#L4" xlink:show="new" xlink:title="mod8" xlink:type="simple">
+      <path d="M659.5,119.894 L698.5,119.894 A3.75,3.75 0 0 1 701,122.394 L708,142.6939 L712.5,142.6939 A2.5,2.5 0 0 1 715,145.1939 L715,170.9938 A2.5,2.5 0 0 1 712.5,173.4938 L659.5,173.4938 A2.5,2.5 0 0 1 657,170.9938 L657,122.394 A2.5,2.5 0 0 1 659.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="657" x2="708" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="661" y="134.8999">mod8</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod9.cppm#L4" target="_top" title="mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod9.cppm#L4" xlink:show="new" xlink:title="mod9" xlink:type="simple">
+      <path d="M752.5,119.894 L791.5,119.894 A3.75,3.75 0 0 1 794,122.394 L801,142.6939 L805.5,142.6939 A2.5,2.5 0 0 1 808,145.1939 L808,170.9938 A2.5,2.5 0 0 1 805.5,173.4938 L752.5,173.4938 A2.5,2.5 0 0 1 750,170.9938 L750,122.394 A2.5,2.5 0 0 1 752.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="750" x2="801" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="754" y="134.8999">mod9</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod10.cppm#L4" target="_top" title="mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod10.cppm#L4" xlink:show="new" xlink:title="mod10" xlink:type="simple">
+      <path d="M845.5,119.894 L892.5,119.894 A3.75,3.75 0 0 1 895,122.394 L902,142.6939 L906.5,142.6939 A2.5,2.5 0 0 1 909,145.1939 L909,170.9938 A2.5,2.5 0 0 1 906.5,173.4938 L845.5,173.4938 A2.5,2.5 0 0 1 843,170.9938 L843,122.394 A2.5,2.5 0 0 1 845.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="843" x2="902" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="847" y="134.8999">mod10</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod11.cppm#L4" target="_top" title="mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod11.cppm#L4" xlink:show="new" xlink:title="mod11" xlink:type="simple">
+      <path d="M946.5,119.894 L993.5,119.894 A3.75,3.75 0 0 1 996,122.394 L1003,142.6939 L1007.5,142.6939 A2.5,2.5 0 0 1 1010,145.1939 L1010,170.9938 A2.5,2.5 0 0 1 1007.5,173.4938 L946.5,173.4938 A2.5,2.5 0 0 1 944,170.9938 L944,122.394 A2.5,2.5 0 0 1 946.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="944" x2="1003" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="948" y="134.8999">mod11</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod12.cppm#L4" target="_top" title="mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod12.cppm#L4" xlink:show="new" xlink:title="mod12" xlink:type="simple">
+      <path d="M1047.5,119.894 L1094.5,119.894 A3.75,3.75 0 0 1 1097,122.394 L1104,142.6939 L1108.5,142.6939 A2.5,2.5 0 0 1 1111,145.1939 L1111,170.9938 A2.5,2.5 0 0 1 1108.5,173.4938 L1047.5,173.4938 A2.5,2.5 0 0 1 1045,170.9938 L1045,122.394 A2.5,2.5 0 0 1 1047.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1045" x2="1104" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1049" y="134.8999">mod12</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod13.cppm#L4" target="_top" title="mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod13.cppm#L4" xlink:show="new" xlink:title="mod13" xlink:type="simple">
+      <path d="M1148.5,119.894 L1195.5,119.894 A3.75,3.75 0 0 1 1198,122.394 L1205,142.6939 L1209.5,142.6939 A2.5,2.5 0 0 1 1212,145.1939 L1212,170.9938 A2.5,2.5 0 0 1 1209.5,173.4938 L1148.5,173.4938 A2.5,2.5 0 0 1 1146,170.9938 L1146,122.394 A2.5,2.5 0 0 1 1148.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1146" x2="1205" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1150" y="134.8999">mod13</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod14.cppm#L4" target="_top" title="mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod14.cppm#L4" xlink:show="new" xlink:title="mod14" xlink:type="simple">
+      <path d="M1249.5,119.894 L1296.5,119.894 A3.75,3.75 0 0 1 1299,122.394 L1306,142.6939 L1310.5,142.6939 A2.5,2.5 0 0 1 1313,145.1939 L1313,170.9938 A2.5,2.5 0 0 1 1310.5,173.4938 L1249.5,173.4938 A2.5,2.5 0 0 1 1247,170.9938 L1247,122.394 A2.5,2.5 0 0 1 1249.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1247" x2="1306" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1251" y="134.8999">mod14</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod15.cppm#L4" target="_top" title="mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod15.cppm#L4" xlink:show="new" xlink:title="mod15" xlink:type="simple">
+      <path d="M1350.5,119.894 L1397.5,119.894 A3.75,3.75 0 0 1 1400,122.394 L1407,142.6939 L1411.5,142.6939 A2.5,2.5 0 0 1 1414,145.1939 L1414,170.9938 A2.5,2.5 0 0 1 1411.5,173.4938 L1350.5,173.4938 A2.5,2.5 0 0 1 1348,170.9938 L1348,122.394 A2.5,2.5 0 0 1 1350.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1348" x2="1407" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1352" y="134.8999">mod15</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod16.cppm#L4" target="_top" title="mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod16.cppm#L4" xlink:show="new" xlink:title="mod16" xlink:type="simple">
+      <path d="M1451.5,119.894 L1498.5,119.894 A3.75,3.75 0 0 1 1501,122.394 L1508,142.6939 L1512.5,142.6939 A2.5,2.5 0 0 1 1515,145.1939 L1515,170.9938 A2.5,2.5 0 0 1 1512.5,173.4938 L1451.5,173.4938 A2.5,2.5 0 0 1 1449,170.9938 L1449,122.394 A2.5,2.5 0 0 1 1451.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1449" x2="1508" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1453" y="134.8999">mod16</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod17.cppm#L4" target="_top" title="mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod17.cppm#L4" xlink:show="new" xlink:title="mod17" xlink:type="simple">
+      <path d="M1552.5,119.894 L1599.5,119.894 A3.75,3.75 0 0 1 1602,122.394 L1609,142.6939 L1613.5,142.6939 A2.5,2.5 0 0 1 1616,145.1939 L1616,170.9938 A2.5,2.5 0 0 1 1613.5,173.4938 L1552.5,173.4938 A2.5,2.5 0 0 1 1550,170.9938 L1550,122.394 A2.5,2.5 0 0 1 1552.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1550" x2="1609" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1554" y="134.8999">mod17</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod18.cppm#L4" target="_top" title="mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod18.cppm#L4" xlink:show="new" xlink:title="mod18" xlink:type="simple">
+      <path d="M1653.5,119.894 L1700.5,119.894 A3.75,3.75 0 0 1 1703,122.394 L1710,142.6939 L1714.5,142.6939 A2.5,2.5 0 0 1 1717,145.1939 L1717,170.9938 A2.5,2.5 0 0 1 1714.5,173.4938 L1653.5,173.4938 A2.5,2.5 0 0 1 1651,170.9938 L1651,122.394 A2.5,2.5 0 0 1 1653.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="1651" x2="1710" y1="142.6939" y2="142.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1655" y="134.8999">mod18</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/app.cppm#L32" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/app.cppm#L32" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <path d="M806.5,6.294 L833.5,6.294 A3.75,3.75 0 0 1 836,8.794 L843,29.0939 L847.5,29.0939 A2.5,2.5 0 0 1 850,31.5939 L850,57.3938 A2.5,2.5 0 0 1 847.5,59.8938 L806.5,59.8938 A2.5,2.5 0 0 1 804,57.3938 L804,8.794 A2.5,2.5 0 0 1 806.5,6.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="804" x2="843" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="808" y="21.2999">app</text>
+    </a>
+    <g id="link_C_0000045223532970498010_C_0000420790450869221512">
+      <path codeLine="39" d="M803.72,52.524 C779.55,71.654 746.3739,97.8993 720.1439,118.6693 " fill="none" id="C_0000045223532970498010-to-C_0000420790450869221512" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="715.44,122.394,724.979,119.9428,719.3599,119.29,720.0127,113.671,715.44,122.394" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0000396495954682989840">
+      <path codeLine="40" d="M815.75,60.264 C808.04,78.174 800.2406,96.3021 792.5506,114.1821 " fill="none" id="C_0000045223532970498010-to-C_0000396495954682989840" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="790.18,119.694,797.4104,113.0066,792.1555,115.1008,790.0613,109.8458,790.18,119.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0002044296282469444594">
+      <path codeLine="41" d="M803.71,35.534 C693.16,42.544 220.86,74.654 81,119.894 C75.42,121.694 75.0984,121.4751 69.7384,124.2251 " fill="none" id="C_0000045223532970498010-to-C_0002044296282469444594" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="64.4,126.964,74.2335,126.4145,68.8487,124.6816,70.5816,119.2967,64.4,126.964" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0001532747677179216874">
+      <path codeLine="42" d="M803.74,34.004 C717.75,34.334 410.54,41.274 174,119.894 C168.44,121.744 168.1122,121.5331 162.7622,124.2931 " fill="none" id="C_0000045223532970498010-to-C_0001532747677179216874" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="157.43,127.044,167.2623,126.4726,161.8735,124.7516,163.5945,119.3629,157.43,127.044" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0002181211985644595508">
+      <path codeLine="43" d="M803.62,34.704 C725.43,37.354 466.71,51.134 267,119.894 C261.46,121.804 261.1341,121.5974 255.7841,124.3774 " fill="none" id="C_0000045223532970498010-to-C_0002181211985644595508" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="250.46,127.144,260.2905,126.5436,254.8968,124.8385,256.6018,119.4447,250.46,127.144" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0001994575092781206355">
+      <path codeLine="44" d="M803.95,35.644 C734.77,40.844 523.6,60.834 360,119.894 C354.32,121.944 353.8093,121.8591 348.3193,124.7491 " fill="none" id="C_0000045223532970498010-to-C_0001994575092781206355" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="343.01,127.544,352.8372,126.8912,347.4344,125.2149,349.1107,119.8121,343.01,127.544" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0001226951305255100636">
+      <path codeLine="45" d="M850.47,35.524 C923.47,40.504 1152.32,60.184 1331,119.894 C1336.56,121.754 1336.8372,121.5863 1342.3072,124.1763 " fill="none" id="C_0000045223532970498010-to-C_0001226951305255100636" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1347.73,126.744,1341.3075,119.2773,1343.211,124.6043,1337.884,126.5077,1347.73,126.744" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0000984386744169567889">
+      <path codeLine="46" d="M850.21,35.404 C965.91,42.104 1480.98,74.044 1634,119.894 C1639.52,121.544 1639.7052,121.2932 1645.1052,123.7932 " fill="none" id="C_0000045223532970498010-to-C_0000984386744169567889" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1650.55,126.314,1644.0633,118.903,1646.0127,124.2134,1640.7023,126.1627,1650.55,126.314" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0001931818205177002737">
+      <path codeLine="47" d="M850.42,34.614 C932.42,37.034 1213.43,50.214 1432,119.894 C1437.58,121.674 1437.8733,121.4744 1443.3433,124.0544 " fill="none" id="C_0000045223532970498010-to-C_0001931818205177002737" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1448.77,126.614,1442.3364,119.1569,1444.2478,124.481,1438.9236,126.3924,1448.77,126.614" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0000613410583917815311">
+      <path codeLine="48" d="M850.32,36.844 C913.13,44.724 1090.55,70.084 1230,119.894 C1235.52,121.864 1235.7867,121.7463 1241.2467,124.3563 " fill="none" id="C_0000045223532970498010-to-C_0000613410583917815311" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1246.66,126.944,1240.2652,119.4536,1242.1489,124.7876,1236.8149,126.6713,1246.66,126.944" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0000083546849245676714">
+      <path codeLine="49" d="M803.55,37.094 C743.59,45.284 580.41,70.724 453,119.894 C447.36,122.074 446.8652,122.0125 441.3852,124.9325 " fill="none" id="C_0000045223532970498010-to-C_0000083546849245676714" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="436.09,127.754,445.9138,127.0518,440.5027,125.4027,442.1518,119.9916,436.09,127.754" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0000836435135277319151">
+      <path codeLine="50" d="M803.55,44.054 C767.68,59.444 697.23,90.344 639,119.894 C633.61,122.634 633.1899,122.7591 627.7499,125.7691 " fill="none" id="C_0000045223532970498010-to-C_0000836435135277319151" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="622.5,128.674,632.3115,127.8167,626.875,126.2533,628.4384,120.8168,622.5,128.674" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0001954698286919808752">
+      <path codeLine="51" d="M850.47,33.964 C940.87,34.094 1274.27,40.244 1533,119.894 C1538.51,121.594 1538.689,121.3449 1544.089,123.8549 " fill="none" id="C_0000045223532970498010-to-C_0001954698286919808752" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1549.53,126.384,1543.0546,118.9631,1544.9959,124.2765,1539.6825,126.2177,1549.53,126.384" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0000441620369599169965">
+      <path codeLine="52" d="M803.83,39.374 C755,50.884 638.41,80.414 546,119.894 C540.44,122.264 539.975,122.2934 534.505,125.2334 " fill="none" id="C_0000045223532970498010-to-C_0000441620369599169965" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="529.22,128.074,539.0412,127.3365,533.6242,125.7068,535.2538,120.2898,529.22,128.074" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0002177162846045884064">
+      <path codeLine="53" d="M838.49,60.264 C846.35,78.174 854.3306,96.319 862.1706,114.199 " fill="none" id="C_0000045223532970498010-to-C_0002177162846045884064" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="864.58,119.694,864.6292,109.8452,862.5721,115.1148,857.3025,113.0578,864.58,119.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0001414886740502603020">
+      <path codeLine="54" d="M850.44,51.534 C875.49,70.164 910.5957,96.2931 938.8957,117.3431 " fill="none" id="C_0000045223532970498010-to-C_0001414886740502603020" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="943.71,120.924,938.8759,112.3431,939.6981,117.9399,934.1013,118.7621,943.71,120.924" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0001312439587201843275">
+      <path codeLine="55" d="M850.46,43.454 C888.22,58.674 964.66,90.084 1028,119.894 C1033.39,122.434 1033.6952,122.5174 1039.1952,125.2974 " fill="none" id="C_0000045223532970498010-to-C_0001312439587201843275" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1044.55,128.004,1038.3222,120.3742,1040.0876,125.7485,1034.7133,127.5139,1044.55,128.004" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000045223532970498010_C_0001087761784810349022">
+      <path codeLine="56" d="M850.25,39.024 C901.6,50.284 1028.13,80.004 1129,119.894 C1134.45,122.054 1134.698,121.9823 1140.148,124.6423 " fill="none" id="C_0000045223532970498010-to-C_0001087761784810349022" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="1145.54,127.274,1139.2064,119.7317,1141.0466,125.0809,1135.6975,126.9211,1145.54,127.274" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30013_package_mermaid.svg b/docs/test_cases/t30013_package_mermaid.svg
new file mode 100644
index 00000000..9e88cc84
--- /dev/null
+++ b/docs/test_cases/t30013_package_mermaid.svg
@@ -0,0 +1,421 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 1935.390625 132" style="max-width: 1935.39px; background-color: white;" width="1935.390625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths">
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000420790450869221512" id="L-C_0000045223532970498010-C_0000420790450869221512-0" d="M926.1015625,17.44116222554551L776.3372395833334,24.200968521287923C626.5729166666666,30.96077481703034,327.0442708333333,44.48038740851516,177.27994791666666,54.52352703759092C27.515625,64.56666666666666,27.515625,71.13333333333334,27.515625,74.41666666666667L27.515625,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000396495954682989840" id="L-C_0000045223532970498010-C_0000396495954682989840-0" d="M926.1015625,17.56254076973255L793.8424479166666,24.302117308110457C661.5833333333334,31.041693846488368,397.0651041666667,44.520846923244186,264.8059895833333,54.54375679495542C132.546875,64.56666666666666,132.546875,71.13333333333334,132.546875,74.41666666666667L132.546875,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002044296282469444594" id="L-C_0000045223532970498010-C_0002044296282469444594-0" d="M926.1015625,17.71986233480176L811.34765625,24.433218612334798C696.59375,31.14657488986784,467.0859375,44.57328744493392,352.33203125,54.56997705580029C237.578125,64.56666666666666,237.578125,71.13333333333334,237.578125,74.41666666666667L237.578125,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001532747677179216874" id="L-C_0000045223532970498010-C_0001532747677179216874-0" d="M926.1015625,17.9318669527897L828.8528645833334,24.60988912732475C731.6041666666666,31.287911301859804,537.1067708333334,44.643955650929904,439.8580729166667,54.60531115879829C342.609375,64.56666666666666,342.609375,71.13333333333334,342.609375,74.41666666666667L342.609375,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002181211985644595508" id="L-C_0000045223532970498010-C_0002181211985644595508-0" d="M926.1015625,18.233062648641884L846.3580729166666,24.860885540534905C766.6145833333334,31.488708432427924,607.1276041666666,44.744354216213964,527.3841145833334,54.65551044144032C447.640625,64.56666666666666,447.640625,71.13333333333334,447.640625,74.41666666666667L447.640625,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001994575092781206355" id="L-C_0000045223532970498010-C_0001994575092781206355-0" d="M926.1015625,18.694727351985417L863.86328125,25.24560612665452C801.625,31.796484901323613,677.1484375,44.898242450661805,614.91015625,54.73245455866424C552.671875,64.56666666666666,552.671875,71.13333333333334,552.671875,74.41666666666667L552.671875,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001226951305255100636" id="L-C_0000045223532970498010-C_0001226951305255100636-0" d="M926.1015625,19.538362364559045L882.109375,25.948635303799204C838.1171875,32.358908243039366,750.1328125,45.17945412151968,706.140625,54.87306039409318C662.1484375,64.56666666666666,662.1484375,71.13333333333334,662.1484375,74.41666666666667L662.1484375,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000984386744169567889" id="L-C_0000045223532970498010-C_0000984386744169567889-0" d="M926.1015625,21.563937274265076L901.0963541666666,27.636614395220892C876.0911458333334,33.70929151617671,826.0807291666666,45.85464575808836,801.0755208333334,55.21065621237751C776.0703125,64.56666666666666,776.0703125,71.13333333333334,776.0703125,74.41666666666667L776.0703125,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001931818205177002737" id="L-C_0000045223532970498010-C_0001931818205177002737-0" d="M926.1015625,31.691811822795227L920.0833333333334,36.07650985232936C914.0651041666666,40.46120788186349,902.0286458333334,49.230603940931736,896.0104166666666,56.8986353037992C889.9921875,64.56666666666666,889.9921875,71.13333333333334,889.9921875,74.41666666666667L889.9921875,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000613410583917815311" id="L-C_0000045223532970498010-C_0000613410583917815311-0" d="M967.8046875,31.691811822795227L973.8229166666666,36.07650985232936C979.8411458333334,40.46120788186349,991.8776041666666,49.230603940931736,997.8958333333334,56.8986353037992C1003.9140625,64.56666666666666,1003.9140625,71.13333333333334,1003.9140625,74.41666666666667L1003.9140625,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000083546849245676714" id="L-C_0000045223532970498010-C_0000083546849245676714-0" d="M967.8046875,21.699187945925647L992.0690104166666,27.74932328827137C1016.3333333333334,33.799458630617096,1064.8619791666667,45.89972931530855,1089.1263020833333,55.233197990987605C1113.390625,64.56666666666666,1113.390625,71.13333333333334,1113.390625,74.41666666666667L1113.390625,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000836435135277319151" id="L-C_0000045223532970498010-C_0000836435135277319151-0" d="M967.8046875,19.68762230919765L1009.57421875,26.073018590998043C1051.34375,32.458414872798436,1134.8828125,45.229207436399214,1176.65234375,54.89793705153294C1218.421875,64.56666666666666,1218.421875,71.13333333333334,1218.421875,74.41666666666667L1218.421875,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001954698286919808752" id="L-C_0000045223532970498010-C_0001954698286919808752-0" d="M967.8046875,18.771559237915547L1027.8203125,25.309632698262956C1087.8359375,31.847706158610364,1207.8671875,44.92385307930518,1267.8828125,54.74525987298592C1327.8984375,64.56666666666666,1327.8984375,71.13333333333334,1327.8984375,74.41666666666667L1327.8984375,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000441620369599169965" id="L-C_0000045223532970498010-C_0000441620369599169965-0" d="M967.8046875,18.264480517411666L1046.06640625,24.887067097843055C1124.328125,31.509653678274447,1280.8515625,44.75482683913722,1359.11328125,54.66074675290195C1437.375,64.56666666666666,1437.375,71.13333333333334,1437.375,74.41666666666667L1437.375,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002177162846045884064" id="L-C_0000045223532970498010-C_0002177162846045884064-0" d="M967.8046875,17.942477242241527L1064.3125,24.618731035201268C1160.8203125,31.294984828161017,1353.8359375,44.64749241408051,1450.34375,54.60707954037358C1546.8515625,64.56666666666666,1546.8515625,71.13333333333334,1546.8515625,74.41666666666667L1546.8515625,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001414886740502603020" id="L-C_0000045223532970498010-C_0001414886740502603020-0" d="M967.8046875,17.713274840349204L1083.2005208333333,24.427729033624335C1198.5963541666667,31.142183226899466,1429.3880208333333,44.57109161344974,1544.7838541666667,54.56887914005821C1660.1796875,64.56666666666666,1660.1796875,71.13333333333334,1660.1796875,74.41666666666667L1660.1796875,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001312439587201843275" id="L-C_0000045223532970498010-C_0001312439587201843275-0" d="M967.8046875,17.546923883968656L1102.0885416666667,24.289103236640546C1236.3723958333333,31.03128258931244,1504.9401041666667,44.51564129465621,1639.2239583333333,54.54115398066144C1773.5078125,64.56666666666666,1773.5078125,71.13333333333334,1773.5078125,74.41666666666667L1773.5078125,77.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001087761784810349022" id="L-C_0000045223532970498010-C_0001087761784810349022-0" d="M967.8046875,17.420107824324436L1121.0755208333333,24.18342318693703C1274.3463541666667,30.94673854954962,1580.8880208333333,44.47336927477482,1734.1588541666667,54.520017970720744C1887.4296875,64.56666666666666,1887.4296875,71.13333333333334,1887.4296875,74.41666666666667L1887.4296875,77.7"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(946.953125, 16.5)" title="app" id="flowchart-C_0000045223532970498010-0" class="node default clickable flowchart-label">
+          <rect height="33" width="41.703125" y="-16.5" x="-20.8515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-13.3515625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="26.703125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">app</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(27.515625, 99.5)" title="mod8" id="flowchart-C_0000420790450869221512-1" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod8</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(132.546875, 99.5)" title="mod9" id="flowchart-C_0000396495954682989840-3" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod9</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(237.578125, 99.5)" title="mod1" id="flowchart-C_0002044296282469444594-5" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(342.609375, 99.5)" title="mod2" id="flowchart-C_0001532747677179216874-7" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod2</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(447.640625, 99.5)" title="mod3" id="flowchart-C_0002181211985644595508-9" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod3</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(552.671875, 99.5)" title="mod4" id="flowchart-C_0001994575092781206355-11" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod4</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(662.1484375, 99.5)" title="mod15" id="flowchart-C_0001226951305255100636-13" class="node default clickable flowchart-label">
+          <rect height="33" width="63.921875" y="-16.5" x="-31.9609375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-24.4609375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="48.921875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod15</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(776.0703125, 99.5)" title="mod18" id="flowchart-C_0000984386744169567889-15" class="node default clickable flowchart-label">
+          <rect height="33" width="63.921875" y="-16.5" x="-31.9609375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-24.4609375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="48.921875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod18</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(889.9921875, 99.5)" title="mod16" id="flowchart-C_0001931818205177002737-17" class="node default clickable flowchart-label">
+          <rect height="33" width="63.921875" y="-16.5" x="-31.9609375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-24.4609375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="48.921875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod16</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1003.9140625, 99.5)" title="mod14" id="flowchart-C_0000613410583917815311-19" class="node default clickable flowchart-label">
+          <rect height="33" width="63.921875" y="-16.5" x="-31.9609375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-24.4609375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="48.921875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod14</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1113.390625, 99.5)" title="mod5" id="flowchart-C_0000083546849245676714-21" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod5</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1218.421875, 99.5)" title="mod7" id="flowchart-C_0000836435135277319151-23" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod7</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1327.8984375, 99.5)" title="mod17" id="flowchart-C_0001954698286919808752-25" class="node default clickable flowchart-label">
+          <rect height="33" width="63.921875" y="-16.5" x="-31.9609375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-24.4609375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="48.921875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod17</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1437.375, 99.5)" title="mod6" id="flowchart-C_0000441620369599169965-27" class="node default clickable flowchart-label">
+          <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-20.015625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="40.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod6</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1546.8515625, 99.5)" title="mod10" id="flowchart-C_0002177162846045884064-29" class="node default clickable flowchart-label">
+          <rect height="33" width="63.921875" y="-16.5" x="-31.9609375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-24.4609375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="48.921875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod10</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1660.1796875, 99.5)" title="mod11" id="flowchart-C_0001414886740502603020-31" class="node default clickable flowchart-label">
+          <rect height="33" width="62.734375" y="-16.5" x="-31.3671875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-23.8671875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="47.734375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod11</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1773.5078125, 99.5)" title="mod12" id="flowchart-C_0001312439587201843275-33" class="node default clickable flowchart-label">
+          <rect height="33" width="63.921875" y="-16.5" x="-31.9609375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-24.4609375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="48.921875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod12</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1887.4296875, 99.5)" title="mod13" id="flowchart-C_0001087761784810349022-35" class="node default clickable flowchart-label">
+          <rect height="33" width="63.921875" y="-16.5" x="-31.9609375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-24.4609375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="48.921875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">mod13</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t40001.md b/docs/test_cases/t40001.md
index c26034af..93175bae 100644
--- a/docs/test_cases/t40001.md
+++ b/docs/test_cases/t40001.md
@@ -29,6 +29,47 @@ diagrams:
         - 'N_00002(This is a t40001_include1.h include file)-.-{{ alias("include/t40001_include1.h") }}'
 ```
 ## Source code
+File `tests/t40001/src/t40001.cc`
+```cpp
+#include <string>
+#include <vector>
+
+#include "../include/t40001_include1.h"
+
+namespace clanguml {
+namespace t40001 {
+
+} // namespace t40001
+} // namespace clanguml
+
+```
+File `tests/t40001/include/t40001_include1.h`
+```cpp
+#pragma once
+
+#include "lib1/lib1.h"
+
+#include <yaml-cpp/yaml.h>
+
+#include <string>
+
+namespace clanguml::t40001 {
+
+int foo() { return lib1::foo2(); }
+
+}
+
+```
+File `tests/t40001/include/lib1/lib1.h`
+```cpp
+#pragma once
+
+namespace clanguml::t40001::lib1 {
+
+int foo2() { return 0; }
+
+}
+```
 ## Generated PlantUML diagrams
 ![t40001_include](./t40001_include.svg "Basic include graph diagram test case")
 ## Generated Mermaid diagrams
diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg
index 13fa4d9c..8899e51b 100644
--- a/docs/test_cases/t40001_include.svg
+++ b/docs/test_cases/t40001_include.svg
@@ -1,65 +1,97 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="397px" preserveAspectRatio="none" style="width:676px;height:397px;" version="1.1" viewBox="0 0 676 397" width="676px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="394px" preserveAspectRatio="none" style="width:627px;height:394px;background:#FFFFFF;" version="1.1" viewBox="0 0 627 394" width="627px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fftdtnreaae65" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="273" x="204.5" y="16.708">Basic include diagram example</text>
-    <polygon fill="#FFFFFF" filter="url(#fftdtnreaae65)" points="187,44.9531,218,44.9531,225,67.25,309,67.25,309,131.9531,187,131.9531,187,44.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="225" y1="67.25" y2="67.25"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="191" y="59.9482">src</text>
-    <polygon fill="#FFFFFF" filter="url(#fftdtnreaae65)" points="22,155.9531,85,155.9531,92,178.25,211,178.25,211,385.9531,22,385.9531,22,155.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="92" y1="178.25" y2="178.25"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="26" y="170.9482">include</text>
-    <polygon fill="#FFFFFF" filter="url(#fftdtnreaae65)" points="54,250.9531,88,250.9531,95,273.25,179,273.25,179,353.9531,54,353.9531,54,250.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="54" x2="95" y1="273.25" y2="273.25"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="58" y="265.9482">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fftdtnreaae65)" points="203,79.9531,203,116.25,293,116.25,293,89.9531,283,79.9531,203,79.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M283,79.9531 L283,89.9531 L293,89.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="213" y="102.9482">t40001.cc</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fftdtnreaae65)" points="46.5,190.9531,46.5,227.25,195.5,227.25,195.5,200.9531,185.5,190.9531,46.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M185.5,190.9531 L185.5,200.9531 L195.5,200.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="129" x="56.5" y="213.9482">t40001_include1.h</text>
-    </a>
-    <polygon fill="#FEFECE" filter="url(#fftdtnreaae65)" points="97.5,293.9531,97.5,330.25,154.5,330.25,154.5,303.9531,144.5,293.9531,97.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-    <path d="M144.5,293.9531 L144.5,303.9531 L154.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="107.5" y="316.9482">lib1.h</text>
-    <polygon fill="#FEFECE" filter="url(#fftdtnreaae65)" points="393.5,293.9531,393.5,330.25,452.5,330.25,452.5,303.9531,442.5,293.9531,393.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-    <path d="M442.5,293.9531 L442.5,303.9531 L452.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="403.5" y="316.9482">string</text>
-    <polygon fill="#FEFECE" filter="url(#fftdtnreaae65)" points="301.5,190.9531,301.5,227.25,364.5,227.25,364.5,200.9531,354.5,190.9531,301.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-    <path d="M354.5,190.9531 L354.5,200.9531 L364.5,200.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="311.5" y="213.9482">vector</text>
-    <polygon fill="#FEFECE" filter="url(#fftdtnreaae65)" points="227.5,293.9531,227.5,330.25,358.5,330.25,358.5,303.9531,348.5,293.9531,227.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
-    <path d="M348.5,293.9531 L348.5,303.9531 L358.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="111" x="237.5" y="316.9482">yaml-cpp/yaml.h</text>
-    <path d="M487.5,299.4531 L487.5,324.5859 L654.5,324.5859 L654.5,309.4531 L644.5,299.4531 L487.5,299.4531 " fill="#FBFB77" filter="url(#fftdtnreaae65)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M644.5,299.4531 L644.5,309.4531 L654.5,309.4531 L644.5,299.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="146" x="493.5" y="316.52">This is a lib1 include dir</text>
-    <path d="M400,196.4531 L400,221.5859 L664,221.5859 L664,206.4531 L654,196.4531 L400,196.4531 " fill="#FBFB77" filter="url(#fftdtnreaae65)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M654,196.4531 L654,206.4531 L664,206.4531 L654,196.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="406" y="213.52">This is a t40001_include1.h include file</text>
-    <path d="M247.19,116.2831 C246.91,144.4031 250.93,199.5631 284,226.9531 C299.81,240.0431 358.52,224.1931 376,234.9531 C395.8,247.1431 408.53,271.1231 415.68,288.8931 " fill="none" id="C_0001755015016680017839-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="417.55,293.7331,418.0465,283.8968,415.7522,289.0675,410.5815,286.7732,417.55,293.7331" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M261.28,115.9831 C276.16,135.0731 300.31,166.0331 316.42,186.6931 " fill="none" id="C_0001755015016680017839-&gt;C_0000405203884025072971" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="319.53,190.6831,317.1548,181.125,316.4573,186.7387,310.8436,186.0412,319.53,190.6831" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M228.16,115.9831 C205.73,135.2331 169.24,166.5531 145.17,187.2131 " fill="none" id="C_0001755015016680017839-&gt;C_0001926692816440595520" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="141.12,190.6831,150.5565,187.863,144.9163,187.4292,145.3501,181.789,141.12,190.6831" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M121.85,227.0831 C122.69,244.0631 123.98,270.1431 124.9,288.7131 " fill="none" id="C_0001926692816440595520-&gt;C_0002193549214042244690" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="125.15,293.7331,128.6825,284.5396,124.8932,288.7397,120.693,284.9504,125.15,293.7331" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M156.19,227.0231 C161.2,229.6131 166.26,232.2931 171,234.9531 C202.98,252.8531 238.42,275.2331 262.82,291.0531 " fill="none" id="C_0001926692816440595520-&gt;C_0001659736894483045485" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="267.25,293.9331,261.882,285.6757,263.0571,291.2092,257.5237,292.3843,267.25,293.9331" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M195.6,223.5031 C204.48,224.8131 213.43,226.0131 222,226.9531 C239.03,228.8231 361.25,226.2231 376,234.9531 C396.14,246.8731 408.86,271.1231 415.91,289.0431 " fill="none" id="C_0001926692816440595520-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="417.76,293.9131,418.309,284.0796,415.9872,289.238,410.8288,286.9161,417.76,293.9131" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M70.1058,250.8082 C70.2152,250.5729 70.326,250.3383 70.4381,250.1044 C71.3346,248.2331 72.316,246.4084 73.3896,244.6463 C75.537,241.122 78.0538,237.8481 81,234.9531 C86.69,229.3631 90.57,231.8431 98.5,230.9531 C137.59,226.5431 413.41,226.5431 452.5,230.9531 C499.3,236.2331 541.59,277.8631 560.52,299.2931 " fill="none" id="C_0001687675335949018432-GMN1455" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M155.77,190.9031 C191.28,173.8231 248.55,149.9231 301.5,143.9531 C329.32,140.8131 336.68,140.8131 364.5,143.9531 C419.83,150.1931 479.43,179.3331 510.45,196.4031 " fill="none" id="C_0001926692816440595520-GMN1458" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="213" x="200" y="23.0059">Basic include diagram example</text>
+    <g id="cluster_C_0001387619747296316447">
+      <path d="M173.5,44.0939 L195.5,44.0939 A3.75,3.75 0 0 1 198,46.5939 L205,66.8938 L282.5,66.8938 A2.5,2.5 0 0 1 285,69.3938 L285,129.3939 A2.5,2.5 0 0 1 282.5,131.8939 L173.5,131.8939 A2.5,2.5 0 0 1 171,129.3939 L171,46.5939 A2.5,2.5 0 0 1 173.5,44.0939 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="171" x2="205" y1="66.8938" y2="66.8938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="21" x="175" y="59.0999">src</text>
+    </g>
+    <g id="cluster_C_0000989412417490706876">
+      <path d="M8.5,155.8939 L60.5,155.8939 A3.75,3.75 0 0 1 63,158.3939 L70,178.6938 L188.5,178.6938 A2.5,2.5 0 0 1 191,181.1938 L191,384.9939 A2.5,2.5 0 0 1 188.5,387.4939 L8.5,387.4939 A2.5,2.5 0 0 1 6,384.9939 L6,158.3939 A2.5,2.5 0 0 1 8.5,155.8939 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="70" y1="178.6938" y2="178.6938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="51" x="10" y="170.8999">include</text>
+    </g>
+    <g id="cluster_C_0001687675335949018432">
+      <path d="M40.5,251.6939 L66.5,251.6939 A3.75,3.75 0 0 1 69,254.1939 L76,274.4938 L156.5,274.4938 A2.5,2.5 0 0 1 159,276.9938 L159,352.9939 A2.5,2.5 0 0 1 156.5,355.4939 L40.5,355.4939 A2.5,2.5 0 0 1 38,352.9939 L38,254.1939 A2.5,2.5 0 0 1 40.5,251.6939 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="38" x2="76" y1="274.4938" y2="274.4938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="42" y="266.6999">lib1</text>
+    </g>
+    <g id="elem_C_0001755015016680017839">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
+        <path d="M187,81.5939 L187,113.3938 A2.5,2.5 0 0 0 189.5,115.8938 L266.5,115.8938 A2.5,2.5 0 0 0 269,113.3938 L269,89.0939 L259,79.0939 L189.5,79.0939 A2.5,2.5 0 0 0 187,81.5939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M259,79.0939 L259,86.5939 A2.5,2.5 0 0 0 261.5,89.0939 L269,89.0939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="197" y="102.0999">t40001.cc</text>
+      </a>
+    </g>
+    <g id="elem_C_0001926692816440595520">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
+        <path d="M37.5,193.3939 L37.5,225.1938 A2.5,2.5 0 0 0 40,227.6938 L172,227.6938 A2.5,2.5 0 0 0 174.5,225.1938 L174.5,200.8939 L164.5,190.8939 L40,190.8939 A2.5,2.5 0 0 0 37.5,193.3939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M164.5,190.8939 L164.5,198.3939 A2.5,2.5 0 0 0 167,200.8939 L174.5,200.8939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="47.5" y="213.8999">t40001_include1.h</text>
+      </a>
+    </g>
+    <g id="elem_C_0002193549214042244690">
+      <path d="M81,297.1939 L81,328.9938 A2.5,2.5 0 0 0 83.5,331.4938 L132.5,331.4938 A2.5,2.5 0 0 0 135,328.9938 L135,304.6939 L125,294.6939 L83.5,294.6939 A2.5,2.5 0 0 0 81,297.1939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M125,294.6939 L125,302.1939 A2.5,2.5 0 0 0 127.5,304.6939 L135,304.6939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="91" y="317.6999">lib1.h</text>
+    </g>
+    <g id="elem_C_0001687197357150905926">
+      <path d="M365.5,297.1939 L365.5,328.9938 A2.5,2.5 0 0 0 368,331.4938 L418,331.4938 A2.5,2.5 0 0 0 420.5,328.9938 L420.5,304.6939 L410.5,294.6939 L368,294.6939 A2.5,2.5 0 0 0 365.5,297.1939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M410.5,294.6939 L410.5,302.1939 A2.5,2.5 0 0 0 413,304.6939 L420.5,304.6939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="375.5" y="317.6999">string</text>
+    </g>
+    <g id="elem_C_0000405203884025072971">
+      <path d="M280.5,193.3939 L280.5,225.1938 A2.5,2.5 0 0 0 283,227.6938 L337,227.6938 A2.5,2.5 0 0 0 339.5,225.1938 L339.5,200.8939 L329.5,190.8939 L283,190.8939 A2.5,2.5 0 0 0 280.5,193.3939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M329.5,190.8939 L329.5,198.3939 A2.5,2.5 0 0 0 332,200.8939 L339.5,200.8939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="290.5" y="213.8999">vector</text>
+    </g>
+    <g id="elem_C_0001659736894483045485">
+      <path d="M207,297.1939 L207,328.9938 A2.5,2.5 0 0 0 209.5,331.4938 L328.5,331.4938 A2.5,2.5 0 0 0 331,328.9938 L331,304.6939 L321,294.6939 L209.5,294.6939 A2.5,2.5 0 0 0 207,297.1939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M321,294.6939 L321,302.1939 A2.5,2.5 0 0 0 323.5,304.6939 L331,304.6939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="217" y="317.6999">yaml-cpp/yaml.h</text>
+    </g>
+    <g id="elem_GMN17">
+      <path d="M455,300.2939 L455,325.8939 L613,325.8939 L613,310.2939 L603,300.2939 L455,300.2939 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M603,300.2939 L603,310.2939 L613,310.2939 L603,300.2939 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="137" x="461" y="317.3709">This is a lib1 include dir</text>
+    </g>
+    <g id="elem_GMN20">
+      <path d="M374,196.4939 L374,222.0939 L620,222.0939 L620,206.4939 L610,196.4939 L374,196.4939 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M610,196.4939 L610,206.4939 L620,206.4939 L610,196.4939 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="225" x="380" y="213.5709">This is a t40001_include1.h include file</text>
+    </g>
+    <g id="link_C_0001755015016680017839_C_0001687197357150905926">
+      <path d="M227,115.9439 C226.44,144.2639 229.94,199.8439 263,227.6939 C277.51,239.9139 331.99,225.5139 348,235.6939 C369.18,249.1539 379.6678,270.7738 385.9178,288.8338 " fill="none" id="C_0001755015016680017839-to-C_0001687197357150905926" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="387.88,294.5039,388.7167,284.6907,386.2448,289.7789,381.1566,287.307,387.88,294.5039" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001755015016680017839_C_0000405203884025072971">
+      <path d="M241.17,116.1339 C256.48,136.6239 277.9794,165.4169 293.2694,185.8869 " fill="none" id="C_0001755015016680017839-to-C_0000405203884025072971" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="296.86,190.6939,294.6788,181.0896,293.8678,186.688,288.2694,185.8771,296.86,190.6939" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001755015016680017839_C_0001926692816440595520">
+      <path d="M208.13,116.3839 C185.44,136.7939 153.0108,165.9913 130.3208,186.4013 " fill="none" id="C_0001755015016680017839-to-C_0001926692816440595520" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="125.86,190.4139,135.2263,187.3689,129.5774,187.0701,129.8762,181.4211,125.86,190.4139" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001926692816440595520_C_0002193549214042244690">
+      <path d="M106.35,228.0239 C106.71,246.5939 107.1608,269.6051 107.5308,288.2251 " fill="none" id="C_0001926692816440595520-to-C_0002193549214042244690" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="107.65,294.2239,111.4704,285.1462,107.5507,289.2249,103.472,285.3052,107.65,294.2239" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001926692816440595520_C_0001659736894483045485">
+      <path d="M138.1,228.0939 C142.46,230.6039 146.86,233.1839 151,235.6939 C182.95,255.0239 213.8548,275.2201 237.5848,291.0101 " fill="none" id="C_0001926692816440595520-to-C_0001659736894483045485" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="242.58,294.3339,237.3031,286.018,238.4173,291.5641,232.8713,292.6783,242.58,294.3339" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001926692816440595520_C_0001687197357150905926">
+      <path d="M174.8,223.8339 C183.92,225.3139 193.17,226.6539 202,227.6939 C218.14,229.5939 334.12,227.2539 348,235.6939 C369.44,248.7339 379.8927,270.4619 386.0627,288.6519 " fill="none" id="C_0001926692816440595520-to-C_0001687197357150905926" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+      <polygon fill="#181818" points="387.99,294.3339,388.887,284.526,386.3839,289.5989,381.311,287.0958,387.99,294.3339" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001687675335949018432_GMN17">
+      <path d="M54.0669,251.6353 C54.1767,251.3987 54.2877,251.1629 54.4001,250.9277 C55.299,249.0465 56.2833,247.212 57.3605,245.4403 C59.515,241.897 62.0412,238.6052 65,235.6939 C70.69,230.0939 74.57,232.5839 82.5,231.6939 C119.82,227.4839 383.18,227.4839 420.5,231.6939 C465.8,236.8039 505.78,278.3039 523.82,299.9939 " fill="none" id="C_0001687675335949018432-GMN17" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+    </g>
+    <g id="link_C_0001926692816440595520_GMN20">
+      <path d="M140.81,190.4039 C175.14,173.1939 229.7,149.6239 280.5,143.8939 C306.56,140.9539 313.44,140.9539 339.5,143.8939 C391.57,149.7739 446.93,178.7839 476.14,196.1339 " fill="none" id="C_0001926692816440595520-GMN20" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t40001_include_mermaid.svg b/docs/test_cases/t40001_include_mermaid.svg
index 91873c2e..672e1c65 100644
--- a/docs/test_cases/t40001_include_mermaid.svg
+++ b/docs/test_cases/t40001_include_mermaid.svg
@@ -1,23 +1,22 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -49 898.53515625 406" style="max-width: 898.535px; background-color: white;" width="898.53515625" id="my-svg">
-  <title id="chart-title-my-svg">Basic include diagram example</title>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -49 898.53515625 406" style="max-width: 898.535px; background-color: white;" width="898.53515625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -54,12 +53,12 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0001687197357150905926" id="L-C_0001755015016680017839-C_0001687197357150905926-0" d="M622.7975809487951,58L631.3293643323293,62.166666666666664C639.8611477158635,66.33333333333333,656.9247144829318,74.66666666666667,665.4564978664658,83C673.98828125,91.33333333333333,673.98828125,99.66666666666667,673.98828125,108C673.98828125,116.33333333333333,673.98828125,124.66666666666667,673.98828125,135.75C673.98828125,146.83333333333334,673.98828125,160.66666666666666,673.98828125,174.5C673.98828125,188.33333333333334,673.98828125,202.16666666666666,673.98828125,213.25C673.98828125,224.33333333333334,673.98828125,232.66666666666666,673.98828125,241C673.98828125,249.33333333333334,673.98828125,257.6666666666667,673.98828125,261.8333333333333L673.98828125,266"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0000405203884025072971" id="L-C_0001755015016680017839-C_0000405203884025072971-0" d="M546.81640625,51.17106767631006L523.6712239583334,56.47588973025838C500.5260416666667,61.78071178420671,454.2356770833333,72.39035589210336,406.5305989583333,81.86184461271834C358.8255208333333,91.33333333333333,309.7057291666667,99.66666666666667,285.1458333333333,108C260.5859375,116.33333333333333,260.5859375,124.66666666666667,260.5859375,133C260.5859375,141.33333333333334,260.5859375,149.66666666666666,260.5859375,153.83333333333334L260.5859375,158"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001755015016680017839 LE-C_0001926692816440595520" id="L-C_0001755015016680017839-C_0001926692816440595520-0" d="M572.6980892319277,58L568.5784858182732,62.166666666666664C564.4588824046185,66.33333333333333,556.2196755773092,74.66666666666667,552.1000721636547,83C547.98046875,91.33333333333333,547.98046875,99.66666666666667,547.98046875,108C547.98046875,116.33333333333333,547.98046875,124.66666666666667,543.5682887801205,133C539.1561088102409,141.33333333333334,530.3317488704819,149.66666666666666,525.9195689006024,153.83333333333334L521.5073889307229,158"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001926692816440595520 LE-C_0002193549214042244690" id="L-C_0001926692816440595520-C_0002193549214042244690-0" d="M473.53096762048193,191L465.8278896837349,195.16666666666666C458.124811746988,199.33333333333334,442.718655873494,207.66666666666666,435.015577936747,216C427.3125,224.33333333333334,427.3125,232.66666666666666,425.8162807479919,241C424.3200614959839,249.33333333333334,421.32762299196787,257.6666666666667,419.8314037399598,261.8333333333333L418.3351844879518,266"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001659736894483045485" id="L-C_0001926692816440595520-C_0001659736894483045485-0" d="M525.4832925451807,191L530.8994885793172,195.16666666666666C536.3156846134538,199.33333333333334,547.1480766817268,207.66666666666666,552.5642727158635,216C557.98046875,224.33333333333334,557.98046875,232.66666666666666,590.1588541666666,241.99306477903886C622.3372395833334,251.31946289141106,686.6940104166666,261.6389257828222,718.8723958333334,266.7986572285277L751.05078125,271.9583886742333"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001687197357150905926" id="L-C_0001926692816440595520-C_0001687197357150905926-0" d="M500.0592526355422,191L499.05523657128515,195.16666666666666C498.0512205070281,199.33333333333334,496.04318837851406,207.66666666666666,495.03917231425703,216C494.03515625,224.33333333333334,494.03515625,232.66666666666666,519.5169270833334,242.70982750137478C544.9986979166666,252.7529883360829,595.9622395833334,264.5059766721658,621.4440104166666,270.3824708402072L646.92578125,276.25896500824865"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0001687197357150905926" id="L-C_0001755015016680017839-C_0001687197357150905926-0" d="M622.7975809487951,58L631.3293643323293,62.166666666666664C639.8611477158635,66.33333333333333,656.9247144829318,74.66666666666667,665.4564978664658,83C673.98828125,91.33333333333333,673.98828125,99.66666666666667,673.98828125,108C673.98828125,116.33333333333333,673.98828125,124.66666666666667,673.98828125,135.75C673.98828125,146.83333333333334,673.98828125,160.66666666666666,673.98828125,174.5C673.98828125,188.33333333333334,673.98828125,202.16666666666666,673.98828125,213.25C673.98828125,224.33333333333334,673.98828125,232.66666666666666,673.98828125,240.11666666666667C673.98828125,247.5666666666667,673.98828125,254.13333333333333,673.98828125,257.4166666666667L673.98828125,260.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0000405203884025072971" id="L-C_0001755015016680017839-C_0000405203884025072971-0" d="M546.81640625,51.17106767631006L523.6712239583334,56.47588973025838C500.5260416666667,61.78071178420671,454.2356770833333,72.39035589210336,406.5305989583333,81.86184461271834C358.8255208333333,91.33333333333333,309.7057291666667,99.66666666666667,285.1458333333333,108C260.5859375,116.33333333333333,260.5859375,124.66666666666667,260.5859375,132.11666666666667C260.5859375,139.56666666666666,260.5859375,146.13333333333333,260.5859375,149.41666666666666L260.5859375,152.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001755015016680017839 LE-C_0001926692816440595520" id="L-C_0001755015016680017839-C_0001926692816440595520-0" d="M572.6980892319277,58L568.5784858182732,62.166666666666664C564.4588824046185,66.33333333333333,556.2196755773092,74.66666666666667,552.1000721636547,83C547.98046875,91.33333333333333,547.98046875,99.66666666666667,547.98046875,108C547.98046875,116.33333333333333,547.98046875,124.66666666666667,544.2105122275317,132.39351271952913C540.4405557050635,140.12035877239157,532.900642660127,147.24071754478317,529.1306861376587,150.80089693097895L525.3607296151905,154.36107631717474"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001926692816440595520 LE-C_0002193549214042244690" id="L-C_0001926692816440595520-C_0002193549214042244690-0" d="M473.53096762048193,191L465.8278896837349,195.16666666666666C458.124811746988,199.33333333333334,442.718655873494,207.66666666666666,435.015577936747,216C427.3125,224.33333333333334,427.3125,232.66666666666666,426.1148150397421,240.16864264336746C424.91713007948414,247.67061862006827,422.5217601589682,254.3412372401365,421.3240751987103,257.67654655017066L420.1263902384524,261.0118558602048"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001659736894483045485" id="L-C_0001926692816440595520-C_0001659736894483045485-0" d="M525.4832925451807,191L530.8994885793172,195.16666666666666C536.3156846134538,199.33333333333334,547.1480766817268,207.66666666666666,552.5642727158635,216C557.98046875,224.33333333333334,557.98046875,232.66666666666666,589.2866623082919,241.8532107838781C620.5928558665837,251.0397549010895,683.2052429831674,261.07950980217896,714.5114365414591,266.0993872527237L745.817630099751,271.11926470326847"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001687197357150905926" id="L-C_0001926692816440595520-C_0001687197357150905926-0" d="M500.0592526355422,191L499.05523657128515,195.16666666666666C498.0512205070281,199.33333333333334,496.04318837851406,207.66666666666666,495.03917231425703,216C494.03515625,224.33333333333334,494.03515625,232.66666666666666,518.6561858987039,242.51132714656228C543.277215547408,252.3559876264579,592.5192748448161,263.7119752529158,617.14030449352,269.3899690661447L641.7613341422241,275.0679628793737"/>
         <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_00002 LE-C_0001926692816440595520" id="L-N_00002-C_0001926692816440595520-0" d="M169.42578125,58L169.42578125,62.166666666666664C169.42578125,66.33333333333333,169.42578125,74.66666666666667,212.271484375,83C255.1171875,91.33333333333333,340.80859375,99.66666666666667,383.654296875,108C426.5,116.33333333333333,426.5,124.66666666666667,434.28465424196787,133C442.0693084839357,141.33333333333334,457.6386169678715,149.66666666666666,465.42327120983936,153.83333333333334L473.2079254518072,158"/>
         <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_00001 LE-C_0001687675335949018432" id="L-N_00001-C_0001687675335949018432-0" d="M181.296875,186.83255218337814L217.02864583333334,191.69379348614845C252.76041666666666,196.55503478891876,324.2239583333333,206.27751739445935,359.9557291666667,215.30542536389635C395.6875,224.33333333333334,395.6875,232.66666666666666,395.6875,236.83333333333334L395.6875,241"/>
       </g>
@@ -138,7 +137,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40001/include/t40001_include1.h#L0">
+        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/include/t40001_include1.h#L0">
           <g title="t40001_include1.h" id="flowchart-C_0001926692816440595520-3" class="node default clickable flowchart-label">
             <rect height="33" width="145.78125" y="-16.5" x="-72.890625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-65.390625, -9)" style="" class="label">
@@ -151,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/#L0">
+        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L0">
           <g title="lib1.h" id="flowchart-C_0002193549214042244690-4" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -164,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40001/src/t40001.cc#L0">
+        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/src/t40001.cc#L0">
           <g title="t40001.cc" id="flowchart-C_0001755015016680017839-0" class="node default clickable flowchart-label">
             <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-34.6953125, -9)" style="" class="label">
diff --git a/docs/test_cases/t40002.md b/docs/test_cases/t40002.md
index 567dd5e9..74882ee6 100644
--- a/docs/test_cases/t40002.md
+++ b/docs/test_cases/t40002.md
@@ -23,6 +23,94 @@ diagrams:
         - "' t40002 test include diagram"
 ```
 ## Source code
+File `tests/t40002/src/t40002.cc`
+```cpp
+#include "../include/lib1/lib1.h"
+#include "../include/lib2/lib2.h"
+
+namespace clanguml::t40002 {
+
+int foo() { return lib1::foo() + lib2::foo(); }
+
+}
+```
+File `tests/t40002/src/lib1/lib1.cc`
+```cpp
+#include "../../include/lib1/lib1.h"
+
+#include <string>
+
+namespace clanguml::t40002::lib1 {
+
+int foo0() { return 0; }
+
+int foo1() { return 1; }
+
+int foo() { return foo1(); }
+
+}
+```
+File `tests/t40002/src/lib2/lib2.cc`
+```cpp
+#include "../../include/lib2/lib2.h"
+#include "../../include/lib2/lib2_detail.h"
+
+namespace clanguml::t40002::lib2 {
+
+int foo0() { return 0; }
+
+int foo1() { return 1; }
+
+int foo() { return foo1(); }
+
+int foo22() { return 22; }
+
+} // namespace clanguml::t40002::lib2
+```
+File `tests/t40002/include/lib1/lib1.h`
+```cpp
+#pragma once
+
+#include "../lib2/lib2.h"
+
+#include <string>
+
+namespace clanguml::t40002::lib1 {
+
+int foo0();
+
+int foo1();
+
+int foo();
+
+}
+```
+File `tests/t40002/include/lib2/lib2.h`
+```cpp
+#pragma once
+
+#include "lib2_detail.h"
+
+namespace clanguml::t40002::lib2 {
+
+int foo2();
+
+int foo3();
+
+int foo();
+
+}
+```
+File `tests/t40002/include/lib2/lib2_detail.h`
+```cpp
+#pragma once
+
+namespace clanguml::t40002::lib2::detail {
+
+int foo22();
+
+}
+```
 ## Generated PlantUML diagrams
 ![t40002_include](./t40002_include.svg "Cyclic include graph diagram test case")
 ## Generated Mermaid diagrams
diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg
index 7760b594..bd5f1f40 100644
--- a/docs/test_cases/t40002_include.svg
+++ b/docs/test_cases/t40002_include.svg
@@ -1,66 +1,92 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:412px;height:479px;" version="1.1" viewBox="0 0 412 479" width="412px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="458px" preserveAspectRatio="none" style="width:365px;height:458px;background:#FFFFFF;" version="1.1" viewBox="0 0 365 458" width="365px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1mdlcbpra4l3" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1mdlcbpra4l3)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f1mdlcbpra4l3)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="87" y1="89.2969" y2="89.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="50" y="81.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1mdlcbpra4l3)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="270" x2="311" y1="89.2969" y2="89.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="274" y="81.9951">lib2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1mdlcbpra4l3)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="135" y1="224.2969" y2="224.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="69" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f1mdlcbpra4l3)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="267.2969" y2="267.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="259.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1mdlcbpra4l3)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="378.2969" y2="378.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="370.9951">lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1mdlcbpra4l3)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M241,102 L241,112 L251,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="171" y="124.9951">t40002.cc</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1mdlcbpra4l3)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="72" y="124.9951">lib1.cc</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1mdlcbpra4l3)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M340,102 L340,112 L350,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="296" y="124.9951">lib2.cc</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1mdlcbpra4l3)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M152.5,280 L152.5,290 L162.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="302.9951">lib1.h</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1mdlcbpra4l3)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M152.5,391 L152.5,401 L162.5,401 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="413.9951">lib2.h</text>
-    </a>
-    <path d="M198.97,138.2 C185.81,170.35 157.51,239.52 143,275.01 " fill="none" id="C_0001489450289909741706-&gt;C_0002193549214042244690" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="140.96,279.99,148.0781,273.1832,142.8587,275.3645,140.6773,270.1452,140.96,279.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M206.51,138.1 C207.07,175.82 205.4,268.48 179,340 C172.75,356.94 161.55,373.89 151.89,386.62 " fill="none" id="C_0001489450289909741706-&gt;C_0001969674835696841438" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="148.68,390.77,157.3477,386.0933,151.7368,386.8133,151.0169,381.2024,148.68,390.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M97.91,138.2 C105.22,170.35 120.94,239.52 129,275.01 " fill="none" id="C_0001493913207373215402-&gt;C_0002193549214042244690" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="130.13,279.99,132.0225,270.3247,129.0151,275.1159,124.2239,272.1085,130.13,279.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M313.18,138.08 C301.6,176.94 269.34,273.76 218,340 C203.48,358.73 182.85,375.53 165.66,387.75 " fill="none" id="C_0001761875020766116446-&gt;C_0001969674835696841438" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="161.37,390.75,171.0334,388.8476,165.4608,387.875,166.4334,382.3024,161.37,390.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M134,316.03 C134,334.8 134,365.05 134,385.7 " fill="none" id="C_0002193549214042244690-&gt;C_0001969674835696841438" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="134,390.73,138,381.73,134,385.73,130,381.73,134,390.73" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="cluster_C_0001387619747296316447">
+      <path d="M8.5,6.294 L30.5,6.294 A3.75,3.75 0 0 1 33,8.794 L40,29.0939 L355.5,29.0939 A2.5,2.5 0 0 1 358,31.5939 L358,158.594 A2.5,2.5 0 0 1 355.5,161.094 L8.5,161.094 A2.5,2.5 0 0 1 6,158.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="40" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="21" x="10" y="21.2999">src</text>
+    </g>
+    <g id="cluster_C_0001284742705549910910">
+      <path d="M32.5,49.294 L58.5,49.294 A3.75,3.75 0 0 1 61,51.794 L68,72.0939 L119.5,72.0939 A2.5,2.5 0 0 1 122,74.5939 L122,134.594 A2.5,2.5 0 0 1 119.5,137.094 L32.5,137.094 A2.5,2.5 0 0 1 30,134.594 L30,51.794 A2.5,2.5 0 0 1 32.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="68" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="34" y="64.2999">lib1</text>
+    </g>
+    <g id="cluster_C_0001397224709580110803">
+      <path d="M244.5,49.294 L270.5,49.294 A3.75,3.75 0 0 1 273,51.794 L280,72.0939 L331.5,72.0939 A2.5,2.5 0 0 1 334,74.5939 L334,134.594 A2.5,2.5 0 0 1 331.5,137.094 L244.5,137.094 A2.5,2.5 0 0 1 242,134.594 L242,51.794 A2.5,2.5 0 0 1 244.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="242" x2="280" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="246" y="64.2999">lib2</text>
+    </g>
+    <g id="cluster_C_0000989412417490706876">
+      <path d="M46.5,185.094 L98.5,185.094 A3.75,3.75 0 0 1 101,187.594 L108,207.8939 L175.5,207.8939 A2.5,2.5 0 0 1 178,210.3939 L178,449.194 A2.5,2.5 0 0 1 175.5,451.694 L46.5,451.694 A2.5,2.5 0 0 1 44,449.194 L44,187.594 A2.5,2.5 0 0 1 46.5,185.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="44" x2="108" y1="207.8939" y2="207.8939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="51" x="48" y="200.0999">include</text>
+    </g>
+    <g id="cluster_C_0001687675335949018432">
+      <path d="M70.5,228.094 L96.5,228.094 A3.75,3.75 0 0 1 99,230.594 L106,250.8939 L151.5,250.8939 A2.5,2.5 0 0 1 154,253.3939 L154,313.394 A2.5,2.5 0 0 1 151.5,315.894 L70.5,315.894 A2.5,2.5 0 0 1 68,313.394 L68,230.594 A2.5,2.5 0 0 1 70.5,228.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="68" x2="106" y1="250.8939" y2="250.8939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="72" y="243.0999">lib1</text>
+    </g>
+    <g id="cluster_C_0001248530620501446930">
+      <path d="M70.5,339.894 L96.5,339.894 A3.75,3.75 0 0 1 99,342.394 L106,362.6939 L151.5,362.6939 A2.5,2.5 0 0 1 154,365.1939 L154,425.194 A2.5,2.5 0 0 1 151.5,427.694 L70.5,427.694 A2.5,2.5 0 0 1 68,425.194 L68,342.394 A2.5,2.5 0 0 1 70.5,339.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="68" x2="106" y1="362.6939" y2="362.6939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="72" y="354.8999">lib2</text>
+    </g>
+    <g id="elem_C_0001489450289909741706">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
+        <path d="M141,86.794 L141,118.5939 A2.5,2.5 0 0 0 143.5,121.0939 L220.5,121.0939 A2.5,2.5 0 0 0 223,118.5939 L223,94.294 L213,84.294 L143.5,84.294 A2.5,2.5 0 0 0 141,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M213,84.294 L213,91.794 A2.5,2.5 0 0 0 215.5,94.294 L223,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="151" y="107.2999">t40002.cc</text>
+      </a>
+    </g>
+    <g id="elem_C_0001493913207373215402">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
+        <path d="M46,86.794 L46,118.5939 A2.5,2.5 0 0 0 48.5,121.0939 L103.5,121.0939 A2.5,2.5 0 0 0 106,118.5939 L106,94.294 L96,84.294 L48.5,84.294 A2.5,2.5 0 0 0 46,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M96,84.294 L96,91.794 A2.5,2.5 0 0 0 98.5,94.294 L106,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="56" y="107.2999">lib1.cc</text>
+      </a>
+    </g>
+    <g id="elem_C_0001761875020766116446">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
+        <path d="M258,86.794 L258,118.5939 A2.5,2.5 0 0 0 260.5,121.0939 L315.5,121.0939 A2.5,2.5 0 0 0 318,118.5939 L318,94.294 L308,84.294 L260.5,84.294 A2.5,2.5 0 0 0 258,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M308,84.294 L308,91.794 A2.5,2.5 0 0 0 310.5,94.294 L318,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="268" y="107.2999">lib2.cc</text>
+      </a>
+    </g>
+    <g id="elem_C_0002193549214042244690">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+        <path d="M84,265.594 L84,297.3939 A2.5,2.5 0 0 0 86.5,299.8939 L135.5,299.8939 A2.5,2.5 0 0 0 138,297.3939 L138,273.094 L128,263.094 L86.5,263.094 A2.5,2.5 0 0 0 84,265.594 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M128,263.094 L128,270.594 A2.5,2.5 0 0 0 130.5,273.094 L138,273.094 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="94" y="286.0999">lib1.h</text>
+      </a>
+    </g>
+    <g id="elem_C_0001969674835696841438">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
+        <path d="M84,377.394 L84,409.1939 A2.5,2.5 0 0 0 86.5,411.6939 L135.5,411.6939 A2.5,2.5 0 0 0 138,409.1939 L138,384.894 L128,374.894 L86.5,374.894 A2.5,2.5 0 0 0 84,377.394 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M128,374.894 L128,382.394 A2.5,2.5 0 0 0 130.5,384.894 L138,384.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="94" y="397.8999">lib2.h</text>
+      </a>
+    </g>
+    <g id="link_C_0001489450289909741706_C_0002193549214042244690">
+      <path d="M174.93,121.294 C161.36,155.094 134.0168,223.1865 120.3768,257.1365 " fill="none" id="C_0001489450289909741706-to-C_0002193549214042244690" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="118.14,262.704,125.2069,255.844,120.004,258.0644,117.7836,252.8616,118.14,262.704" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001489450289909741706_C_0001969674835696841438">
+      <path d="M182.3,121.424 C182.41,159.614 179.72,252.054 154,323.894 C147.33,342.514 138.543,356.5539 128.773,369.7339 " fill="none" id="C_0001489450289909741706-to-C_0001969674835696841438" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="125.2,374.554,133.7729,369.7058,128.1775,370.5372,127.3461,364.9418,125.2,374.554" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001493913207373215402_C_0002193549214042244690">
+      <path d="M79.48,121.294 C86.18,155.094 99.595,222.8682 106.315,256.8182 " fill="none" id="C_0001493913207373215402-to-C_0002193549214042244690" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="107.48,262.704,109.6563,253.0986,106.5091,257.7991,101.8086,254.652,107.48,262.704" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001761875020766116446_C_0001969674835696841438">
+      <path d="M283.42,121.414 C272.63,160.794 242.7,257.344 193,323.894 C177.91,344.094 160.5941,358.6489 143.1041,371.1289 " fill="none" id="C_0001761875020766116446-to-C_0001969674835696841438" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="138.22,374.614,147.8695,372.6425,142.2901,371.7098,143.2228,366.1303,138.22,374.614" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002193549214042244690_C_0001969674835696841438">
+      <path d="M111,300.134 C111,320.624 111,348.224 111,368.694 " fill="none" id="C_0002193549214042244690-to-C_0001969674835696841438" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="111,374.694,115,365.694,111,369.694,107,365.694,111,374.694" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t40002_include_mermaid.svg b/docs/test_cases/t40002_include_mermaid.svg
index b26d81a5..720ccb7c 100644
--- a/docs/test_cases/t40002_include_mermaid.svg
+++ b/docs/test_cases/t40002_include_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 504.7265625 465" style="max-width: 504.727px; background-color: white;" width="504.7265625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -83,11 +83,11 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0002193549214042244690" id="L-C_0001489450289909741706-C_0002193549214042244690-0" d="M116.15855609939759,83L120.03382279116465,87.16666666666667C123.90908948293172,91.33333333333333,131.65962286646587,99.66666666666667,135.53488955823295,108C139.41015625,116.33333333333333,139.41015625,124.66666666666667,139.41015625,133C139.41015625,141.33333333333334,139.41015625,149.66666666666666,139.41015625,158C139.41015625,166.33333333333334,139.41015625,174.66666666666666,139.41015625,183C139.41015625,191.33333333333334,139.41015625,199.66666666666666,147.20638020833334,208.24113937523282C155.00260416666666,216.81561208379898,170.59505208333334,225.63122416759794,178.39127604166666,230.03903020949744L186.1875,234.44683625139695"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0001969674835696841438" id="L-C_0001489450289909741706-C_0001969674835696841438-0" d="M88.00418862951807,83L84.76976656626506,87.16666666666667C81.53534450301204,91.33333333333333,75.06650037650603,99.66666666666667,71.832078313253,108C68.59765625,116.33333333333333,68.59765625,124.66666666666667,68.59765625,133C68.59765625,141.33333333333334,68.59765625,149.66666666666666,68.59765625,158C68.59765625,166.33333333333334,68.59765625,174.66666666666666,68.59765625,183C68.59765625,191.33333333333334,68.59765625,199.66666666666666,68.59765625,210.75C68.59765625,221.83333333333334,68.59765625,235.66666666666666,68.59765625,249.5C68.59765625,263.3333333333333,68.59765625,277.1666666666667,68.59765625,288.25C68.59765625,299.3333333333333,68.59765625,307.6666666666667,68.59765625,316C68.59765625,324.3333333333333,68.59765625,332.6666666666667,87.82682291666667,342.453125C107.05598958333333,352.2395833333333,145.51432291666666,363.4791666666667,164.74348958333334,369.0989583333333L183.97265625,374.71875"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001493913207373215402 LE-C_0002193549214042244690" id="L-C_0001493913207373215402-C_0002193549214042244690-0" d="M253.1875,83L253.1875,87.16666666666667C253.1875,91.33333333333333,253.1875,99.66666666666667,253.1875,108C253.1875,116.33333333333333,253.1875,124.66666666666667,253.1875,133C253.1875,141.33333333333334,253.1875,149.66666666666666,253.1875,158C253.1875,166.33333333333334,253.1875,174.66666666666666,253.1875,183C253.1875,191.33333333333334,253.1875,199.66666666666666,249.13378514056225,208C245.08007028112448,216.33333333333334,236.97264056224898,224.66666666666666,232.9189257028112,228.83333333333334L228.8652108433735,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001761875020766116446 LE-C_0001969674835696841438" id="L-C_0001761875020766116446-C_0001969674835696841438-0" d="M403.546875,83L403.546875,87.16666666666667C403.546875,91.33333333333333,403.546875,99.66666666666667,403.546875,108C403.546875,116.33333333333333,403.546875,124.66666666666667,403.546875,133C403.546875,141.33333333333334,403.546875,149.66666666666666,403.546875,158C403.546875,166.33333333333334,403.546875,174.66666666666666,403.546875,183C403.546875,191.33333333333334,403.546875,199.66666666666666,403.546875,210.75C403.546875,221.83333333333334,403.546875,235.66666666666666,403.546875,249.5C403.546875,263.3333333333333,403.546875,277.1666666666667,403.546875,288.25C403.546875,299.3333333333333,403.546875,307.6666666666667,403.546875,316C403.546875,324.3333333333333,403.546875,332.6666666666667,375.826171875,342.7955714141108C348.10546875,352.9244761615548,292.6640625,364.84895232310964,264.943359375,370.8111904038871L237.22265625,376.77342848466446"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002193549214042244690 LE-C_0001969674835696841438" id="L-C_0002193549214042244690-C_0001969674835696841438-0" d="M212.8125,266L212.8125,270.1666666666667C212.8125,274.3333333333333,212.8125,282.6666666666667,212.8125,291C212.8125,299.3333333333333,212.8125,307.6666666666667,212.8125,316C212.8125,324.3333333333333,212.8125,332.6666666666667,212.5901261295181,341C212.36775225903614,349.3333333333333,211.92300451807228,357.6666666666667,211.70063064759037,361.8333333333333L211.47825677710844,366"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0002193549214042244690" id="L-C_0001489450289909741706-C_0002193549214042244690-0" d="M116.15855609939759,83L120.03382279116465,87.16666666666667C123.90908948293172,91.33333333333333,131.65962286646587,99.66666666666667,135.53488955823295,108C139.41015625,116.33333333333333,139.41015625,124.66666666666667,139.41015625,133C139.41015625,141.33333333333334,139.41015625,149.66666666666666,139.41015625,158C139.41015625,166.33333333333334,139.41015625,174.66666666666666,139.41015625,183C139.41015625,191.33333333333334,139.41015625,199.66666666666666,146.4374356272157,207.806395762344C153.4647150044314,215.94612485802136,167.51927375886282,223.89224971604276,174.54655313607853,227.86531214505342L181.57383251329424,231.8383745740641"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0001969674835696841438" id="L-C_0001489450289909741706-C_0001969674835696841438-0" d="M88.00418862951807,83L84.76976656626506,87.16666666666667C81.53534450301204,91.33333333333333,75.06650037650603,99.66666666666667,71.832078313253,108C68.59765625,116.33333333333333,68.59765625,124.66666666666667,68.59765625,133C68.59765625,141.33333333333334,68.59765625,149.66666666666666,68.59765625,158C68.59765625,166.33333333333334,68.59765625,174.66666666666666,68.59765625,183C68.59765625,191.33333333333334,68.59765625,199.66666666666666,68.59765625,210.75C68.59765625,221.83333333333334,68.59765625,235.66666666666666,68.59765625,249.5C68.59765625,263.3333333333333,68.59765625,277.1666666666667,68.59765625,288.25C68.59765625,299.3333333333333,68.59765625,307.6666666666667,68.59765625,316C68.59765625,324.3333333333333,68.59765625,332.6666666666667,86.97895678854945,342.20533313861364C105.36025732709892,351.7439996105606,142.12285840419784,362.48799922112113,160.5041589427473,367.8599990264015L178.88545948129678,373.2319988316818"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001493913207373215402 LE-C_0002193549214042244690" id="L-C_0001493913207373215402-C_0002193549214042244690-0" d="M253.1875,83L253.1875,87.16666666666667C253.1875,91.33333333333333,253.1875,99.66666666666667,253.1875,108C253.1875,116.33333333333333,253.1875,124.66666666666667,253.1875,133C253.1875,141.33333333333334,253.1875,149.66666666666666,253.1875,158C253.1875,166.33333333333334,253.1875,174.66666666666666,253.1875,183C253.1875,191.33333333333334,253.1875,199.66666666666666,249.74975554460647,207.36686633392358C246.31201108921297,215.0670660011805,239.43652217842592,222.13413200236099,235.9987777230324,225.66766500295125L232.56103326763886,229.2011980035415"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001761875020766116446 LE-C_0001969674835696841438" id="L-C_0001761875020766116446-C_0001969674835696841438-0" d="M403.546875,83L403.546875,87.16666666666667C403.546875,91.33333333333333,403.546875,99.66666666666667,403.546875,108C403.546875,116.33333333333333,403.546875,124.66666666666667,403.546875,133C403.546875,141.33333333333334,403.546875,149.66666666666666,403.546875,158C403.546875,166.33333333333334,403.546875,174.66666666666666,403.546875,183C403.546875,191.33333333333334,403.546875,199.66666666666666,403.546875,210.75C403.546875,221.83333333333334,403.546875,235.66666666666666,403.546875,249.5C403.546875,263.3333333333333,403.546875,277.1666666666667,403.546875,288.25C403.546875,299.3333333333333,403.546875,307.6666666666667,403.546875,316C403.546875,324.3333333333333,403.546875,332.6666666666667,376.68975611567316,342.60982955819594C349.8326372313464,352.5529924497252,296.1183994626928,364.10598489945033,269.261280578366,369.882481124313L242.40416169403917,375.6589773491756"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002193549214042244690 LE-C_0001969674835696841438" id="L-C_0002193549214042244690-C_0001969674835696841438-0" d="M212.8125,266L212.8125,270.1666666666667C212.8125,274.3333333333333,212.8125,282.6666666666667,212.8125,291C212.8125,299.3333333333333,212.8125,307.6666666666667,212.8125,316C212.8125,324.3333333333333,212.8125,332.6666666666667,212.63720239341396,340.1179219971253C212.46190478682794,347.56917732758393,212.11130957365586,354.1383546551679,211.93601196706982,357.4229433189599L211.76071436048377,360.7075319827519"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -137,7 +137,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/include/lib2/lib2.h#L0">
+        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib2/lib2.h#L0">
           <g title="lib2.h" id="flowchart-C_0001969674835696841438-4" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/include/lib1/lib1.h#L0">
+        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib1/lib1.h#L0">
           <g title="lib1.h" id="flowchart-C_0002193549214042244690-3" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -163,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/t40002.cc#L0">
+        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/t40002.cc#L0">
           <g title="t40002.cc" id="flowchart-C_0001489450289909741706-0" class="node default clickable flowchart-label">
             <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-34.6953125, -9)" style="" class="label">
@@ -176,7 +176,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/lib2/lib2.cc#L0">
+        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib2/lib2.cc#L0">
           <g title="lib2.cc" id="flowchart-C_0001761875020766116446-2" class="node default clickable flowchart-label">
             <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-22.6796875, -9)" style="" class="label">
@@ -189,7 +189,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40002/src/lib1/lib1.cc#L0">
+        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib1/lib1.cc#L0">
           <g title="lib1.cc" id="flowchart-C_0001493913207373215402-1" class="node default clickable flowchart-label">
             <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-22.6796875, -9)" style="" class="label">
diff --git a/docs/test_cases/t40003.md b/docs/test_cases/t40003.md
index 7ec6847c..de50c672 100644
--- a/docs/test_cases/t40003.md
+++ b/docs/test_cases/t40003.md
@@ -22,6 +22,116 @@ diagrams:
         - "' t40003 test include diagram"
 ```
 ## Source code
+File `tests/t40003/src/dependencies/t2.cc`
+```cpp
+#include "../../include/dependencies/t3.h"
+#include "../../include/dependencies/t5.h"
+
+namespace clanguml::t40003::dependencies {
+void t()
+{
+    t3();
+    t5();
+}
+}
+```
+File `tests/t40003/src/dependants/t1.cc`
+```cpp
+#include "../../include/dependants/t3.h"
+#include "../../include/dependants/t4.h"
+
+namespace clanguml::t40003::dependants {
+void t()
+{
+    t3();
+    t4();
+}
+}
+```
+File `tests/t40003/include/dependencies/t2.h`
+```cpp
+#pragma once
+
+#include "t1.h"
+
+namespace clanguml::t40003::dependencies {
+void t2() { t1(); }
+}
+```
+File `tests/t40003/include/dependencies/t1.h`
+```cpp
+#pragma once
+
+namespace clanguml::t40003::dependencies {
+void t1() { }
+}
+```
+File `tests/t40003/include/dependencies/t6.h`
+```cpp
+#pragma once
+
+#include "t1.h"
+
+namespace clanguml::t40003::dependencies {
+void t6() { t1(); }
+}
+```
+File `tests/t40003/include/dependencies/t3.h`
+```cpp
+#pragma once
+
+#include "t2.h"
+
+namespace clanguml::t40003::dependencies {
+void t3() { t2(); }
+}
+```
+File `tests/t40003/include/dependencies/t5.h`
+```cpp
+#pragma once
+
+#include "t1.h"
+
+namespace clanguml::t40003::dependencies {
+void t5() { t1(); }
+}
+```
+File `tests/t40003/include/dependants/t2.h`
+```cpp
+#pragma once
+
+#include "t1.h"
+
+namespace clanguml::t40003::dependants {
+void t2() { t1(); }
+}
+```
+File `tests/t40003/include/dependants/t4.h`
+```cpp
+#pragma once
+
+namespace clanguml::t40003::dependants {
+void t4() { }
+}
+```
+File `tests/t40003/include/dependants/t1.h`
+```cpp
+#pragma once
+
+namespace clanguml::t40003::dependants {
+void t1() { }
+}
+```
+File `tests/t40003/include/dependants/t3.h`
+```cpp
+#pragma once
+
+#include "t2.h"
+
+namespace clanguml::t40003::dependants {
+void t3() { t2(); }
+}
+```
 ## Generated PlantUML diagrams
 ![t40003_include](./t40003_include.svg "Dependants and dependencies include diagram filter test")
 ## Generated Mermaid diagrams
diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg
index 46d652d7..e4a038fc 100644
--- a/docs/test_cases/t40003_include.svg
+++ b/docs/test_cases/t40003_include.svg
@@ -1,88 +1,128 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="560px" preserveAspectRatio="none" style="width:395px;height:560px;" version="1.1" viewBox="0 0 395 560" width="395px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="540px" preserveAspectRatio="none" style="width:344px;height:540px;background:#FFFFFF;" version="1.1" viewBox="0 0 344 540" width="344px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f11rh3i5zrjgsu" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f11rh3i5zrjgsu)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f11rh3i5zrjgsu)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="153" y1="89.2969" y2="89.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="50" y="81.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f11rh3i5zrjgsu)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="180" x2="305" y1="89.2969" y2="89.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="184" y="81.9951">dependencies</text>
-    <polygon fill="#FFFFFF" filter="url(#f11rh3i5zrjgsu)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="29" x2="99" y1="224.2969" y2="224.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="33" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f11rh3i5zrjgsu)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="53" x2="160" y1="267.2969" y2="267.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="57" y="259.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f11rh3i5zrjgsu)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="312" y1="267.2969" y2="267.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="191" y="259.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="82" y="124.9951">t1.cc</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M266,102 L266,112 L276,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="232" y="124.9951">t2.cc</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M112.5,280 L112.5,290 L122.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="302.9951">t3.h</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M112.5,376 L112.5,386 L122.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="398.9951">t2.h</text>
-    </a>
-    <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
-    <path d="M112.5,472 L112.5,482 L122.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="494.9951">t1.h</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M241.5,280 L241.5,290 L251.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="214.5" y="302.9951">t3.h</text>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M240.5,376 L240.5,386 L250.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="213.5" y="398.9951">t2.h</text>
-    </a>
-    <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
-    <path d="M281.5,472 L281.5,482 L291.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="254.5" y="494.9951">t1.h</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f11rh3i5zrjgsu)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
-      <path d="M322.5,376 L322.5,386 L332.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="295.5" y="398.9951">t5.h</text>
-    </a>
-    <path d="M99,138.2 C99,170.22 99,238.95 99,274.57 " fill="none" id="C_0001215324434184692437-&gt;C_0000060001020671836182" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="99,279.99,103,270.99,99,274.99,95,270.99,99,279.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M246.95,138.2 C243.11,170.35 234.86,239.52 230.62,275.01 " fill="none" id="C_0002215849176605856058-&gt;C_0001226843223635488673" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="230.03,279.99,235.0796,271.5341,230.6291,275.026,227.1372,270.5756,230.03,279.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M254.02,138.02 C258.29,152.76 264.42,174.69 269,194 C284.12,257.73 298.37,333.81 305.04,370.72 " fill="none" id="C_0002215849176605856058-&gt;C_0002106129159239499468" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="305.97,375.88,308.315,366.3144,305.0856,370.9588,300.4412,367.7294,305.97,375.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M99,316.24 C99,331.48 99,353.81 99,370.46 " fill="none" id="C_0000060001020671836182-&gt;C_0001921842892192045013" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="99,375.87,103,366.87,99,370.87,95,366.87,99,375.87" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M99,412.24 C99,427.48 99,449.81 99,466.46 " fill="none" id="C_0001921842892192045013-&gt;C_0002295271780650013565" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="99,471.87,103,462.87,99,466.87,95,462.87,99,471.87" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M227.82,316.24 C227.65,331.48 227.42,353.81 227.24,370.46 " fill="none" id="C_0001226843223635488673-&gt;C_0001849348825646635129" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="227.18,375.87,231.2826,366.9163,227.2371,370.8703,223.2831,366.8249,227.18,375.87" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M234.52,412.24 C241.22,427.61 251.07,450.2 258.36,466.89 " fill="none" id="C_0001849348825646635129-&gt;C_0001120257488305564427" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="260.53,471.87,260.6243,462.0216,258.5432,467.2817,253.2831,465.2005,260.53,471.87" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M301.48,412.24 C294.78,427.61 284.93,450.2 277.64,466.89 " fill="none" id="C_0002106129159239499468-&gt;C_0001120257488305564427" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="275.47,471.87,282.7169,465.2005,277.4568,467.2817,275.3757,462.0216,275.47,471.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <g id="cluster_C_0001387619747296316447">
+      <path d="M8.5,6.294 L30.5,6.294 A3.75,3.75 0 0 1 33,8.794 L40,29.0939 L286.5,29.0939 A2.5,2.5 0 0 1 289,31.5939 L289,158.594 A2.5,2.5 0 0 1 286.5,161.094 L8.5,161.094 A2.5,2.5 0 0 1 6,158.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="40" y1="29.0939" y2="29.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="21" x="10" y="21.2999">src</text>
+    </g>
+    <g id="cluster_C_0001128556599972003761">
+      <path d="M32.5,49.294 L115.5,49.294 A3.75,3.75 0 0 1 118,51.794 L125,72.0939 L125.5,72.0939 A2.5,2.5 0 0 1 128,74.5939 L128,134.594 A2.5,2.5 0 0 1 125.5,137.094 L32.5,137.094 A2.5,2.5 0 0 1 30,134.594 L30,51.794 A2.5,2.5 0 0 1 32.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="125" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="34" y="64.2999">dependants</text>
+    </g>
+    <g id="cluster_C_0002015386828772336316">
+      <path d="M154.5,49.294 L252.5,49.294 A3.75,3.75 0 0 1 255,51.794 L262,72.0939 L262.5,72.0939 A2.5,2.5 0 0 1 265,74.5939 L265,134.594 A2.5,2.5 0 0 1 262.5,137.094 L154.5,137.094 A2.5,2.5 0 0 1 152,134.594 L152,51.794 A2.5,2.5 0 0 1 154.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="152" x2="262" y1="72.0939" y2="72.0939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="97" x="156" y="64.2999">dependencies</text>
+    </g>
+    <g id="cluster_C_0000989412417490706876">
+      <path d="M14.5,185.094 L66.5,185.094 A3.75,3.75 0 0 1 69,187.594 L76,207.8939 L334.5,207.8939 A2.5,2.5 0 0 1 337,210.3939 L337,530.994 A2.5,2.5 0 0 1 334.5,533.494 L14.5,533.494 A2.5,2.5 0 0 1 12,530.994 L12,187.594 A2.5,2.5 0 0 1 14.5,185.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="12" x2="76" y1="207.8939" y2="207.8939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="51" x="16" y="200.0999">include</text>
+    </g>
+    <g id="cluster_C_0001763526330848915994">
+      <path d="M38.5,228.094 L121.5,228.094 A3.75,3.75 0 0 1 124,230.594 L131,250.8939 L131.5,250.8939 A2.5,2.5 0 0 1 134,253.3939 L134,506.994 A2.5,2.5 0 0 1 131.5,509.494 L38.5,509.494 A2.5,2.5 0 0 1 36,506.994 L36,230.594 A2.5,2.5 0 0 1 38.5,228.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="36" x2="131" y1="250.8939" y2="250.8939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="40" y="243.0999">dependants</text>
+    </g>
+    <g id="cluster_C_0001833478793852674517">
+      <path d="M160.5,228.094 L258.5,228.094 A3.75,3.75 0 0 1 261,230.594 L268,250.8939 L310.5,250.8939 A2.5,2.5 0 0 1 313,253.3939 L313,506.994 A2.5,2.5 0 0 1 310.5,509.494 L160.5,509.494 A2.5,2.5 0 0 1 158,506.994 L158,230.594 A2.5,2.5 0 0 1 160.5,228.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
+      <line style="stroke:#000000;stroke-width:1.5;" x1="158" x2="268" y1="250.8939" y2="250.8939"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="97" x="162" y="243.0999">dependencies</text>
+    </g>
+    <g id="elem_C_0001215324434184692437">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
+        <path d="M54,86.794 L54,118.5939 A2.5,2.5 0 0 0 56.5,121.0939 L101.5,121.0939 A2.5,2.5 0 0 0 104,118.5939 L104,94.294 L94,84.294 L56.5,84.294 A2.5,2.5 0 0 0 54,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M94,84.294 L94,91.794 A2.5,2.5 0 0 0 96.5,94.294 L104,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="64" y="107.2999">t1.cc</text>
+      </a>
+    </g>
+    <g id="elem_C_0002215849176605856058">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
+        <path d="M187,86.794 L187,118.5939 A2.5,2.5 0 0 0 189.5,121.0939 L234.5,121.0939 A2.5,2.5 0 0 0 237,118.5939 L237,94.294 L227,84.294 L189.5,84.294 A2.5,2.5 0 0 0 187,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M227,84.294 L227,91.794 A2.5,2.5 0 0 0 229.5,94.294 L237,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="197" y="107.2999">t2.cc</text>
+      </a>
+    </g>
+    <g id="elem_C_0000060001020671836182">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+        <path d="M57,265.594 L57,297.3939 A2.5,2.5 0 0 0 59.5,299.8939 L98.5,299.8939 A2.5,2.5 0 0 0 101,297.3939 L101,273.094 L91,263.094 L59.5,263.094 A2.5,2.5 0 0 0 57,265.594 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M91,263.094 L91,270.594 A2.5,2.5 0 0 0 93.5,273.094 L101,273.094 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="67" y="286.0999">t3.h</text>
+      </a>
+    </g>
+    <g id="elem_C_0001921842892192045013">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+        <path d="M57,362.394 L57,394.1939 A2.5,2.5 0 0 0 59.5,396.6939 L98.5,396.6939 A2.5,2.5 0 0 0 101,394.1939 L101,369.894 L91,359.894 L59.5,359.894 A2.5,2.5 0 0 0 57,362.394 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M91,359.894 L91,367.394 A2.5,2.5 0 0 0 93.5,369.894 L101,369.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="67" y="382.8999">t2.h</text>
+      </a>
+    </g>
+    <g id="elem_C_0002295271780650013565">
+      <path d="M57,459.194 L57,490.9939 A2.5,2.5 0 0 0 59.5,493.4939 L98.5,493.4939 A2.5,2.5 0 0 0 101,490.9939 L101,466.694 L91,456.694 L59.5,456.694 A2.5,2.5 0 0 0 57,459.194 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M91,456.694 L91,464.194 A2.5,2.5 0 0 0 93.5,466.694 L101,466.694 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="67" y="479.6999">t1.h</text>
+    </g>
+    <g id="elem_C_0001226843223635488673">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+        <path d="M175,265.594 L175,297.3939 A2.5,2.5 0 0 0 177.5,299.8939 L216.5,299.8939 A2.5,2.5 0 0 0 219,297.3939 L219,273.094 L209,263.094 L177.5,263.094 A2.5,2.5 0 0 0 175,265.594 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M209,263.094 L209,270.594 A2.5,2.5 0 0 0 211.5,273.094 L219,273.094 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="185" y="286.0999">t3.h</text>
+      </a>
+    </g>
+    <g id="elem_C_0001849348825646635129">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+        <path d="M174,362.394 L174,394.1939 A2.5,2.5 0 0 0 176.5,396.6939 L215.5,396.6939 A2.5,2.5 0 0 0 218,394.1939 L218,369.894 L208,359.894 L176.5,359.894 A2.5,2.5 0 0 0 174,362.394 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M208,359.894 L208,367.394 A2.5,2.5 0 0 0 210.5,369.894 L218,369.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="184" y="382.8999">t2.h</text>
+      </a>
+    </g>
+    <g id="elem_C_0001120257488305564427">
+      <path d="M213,459.194 L213,490.9939 A2.5,2.5 0 0 0 215.5,493.4939 L254.5,493.4939 A2.5,2.5 0 0 0 257,490.9939 L257,466.694 L247,456.694 L215.5,456.694 A2.5,2.5 0 0 0 213,459.194 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M247,456.694 L247,464.194 A2.5,2.5 0 0 0 249.5,466.694 L257,466.694 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="223" y="479.6999">t1.h</text>
+    </g>
+    <g id="elem_C_0002106129159239499468">
+      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
+        <path d="M253,362.394 L253,394.1939 A2.5,2.5 0 0 0 255.5,396.6939 L294.5,396.6939 A2.5,2.5 0 0 0 297,394.1939 L297,369.894 L287,359.894 L255.5,359.894 A2.5,2.5 0 0 0 253,362.394 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <path d="M287,359.894 L287,367.394 A2.5,2.5 0 0 0 289.5,369.894 L297,369.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
+        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="263" y="382.8999">t5.h</text>
+      </a>
+    </g>
+    <g id="link_C_0001215324434184692437_C_0000060001020671836182">
+      <path d="M79,121.294 C79,155.094 79,222.754 79,256.704 " fill="none" id="C_0001215324434184692437-to-C_0000060001020671836182" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="79,262.704,83,253.704,79,257.704,75,253.704,79,262.704" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002215849176605856058_C_0001226843223635488673">
+      <path d="M210.51,121.294 C207.64,155.094 201.8972,222.7755 199.0172,256.7255 " fill="none" id="C_0002215849176605856058-to-C_0001226843223635488673" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="198.51,262.704,203.2564,254.0743,198.9326,257.7219,195.2851,253.3981,198.51,262.704" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002215849176605856058_C_0002106129159239499468">
+      <path d="M218.44,121.314 C223.67,136.064 230.98,157.764 236,177.094 C253.28,243.584 265.8283,318.3468 271.3583,353.5268 " fill="none" id="C_0002215849176605856058-to-C_0002106129159239499468" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="272.29,359.454,274.8439,349.942,271.5136,354.5146,266.941,351.1843,272.29,359.454" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0000060001020671836182_C_0001921842892192045013">
+      <path d="M79,300.324 C79,317.274 79,336.624 79,353.544 " fill="none" id="C_0000060001020671836182-to-C_0001921842892192045013" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="79,359.544,83,350.544,79,354.544,75,350.544,79,359.544" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001921842892192045013_C_0002295271780650013565">
+      <path d="M79,397.124 C79,414.074 79,433.424 79,450.344 " fill="none" id="C_0001921842892192045013-to-C_0002295271780650013565" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="79,456.344,83,447.344,79,451.344,75,447.344,79,456.344" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001226843223635488673_C_0001849348825646635129">
+      <path d="M196.81,300.324 C196.63,317.274 196.4338,336.6243 196.2538,353.5443 " fill="none" id="C_0001226843223635488673-to-C_0001849348825646635129" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="196.19,359.544,200.2855,350.587,196.2432,354.5443,192.286,350.5019,196.19,359.544" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0001849348825646635129_C_0001120257488305564427">
+      <path d="M203.34,397.124 C210.31,414.074 218.4575,433.8751 225.4175,450.7951 " fill="none" id="C_0001849348825646635129-to-C_0001120257488305564427" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="227.7,456.344,227.9755,446.499,225.7979,451.7199,220.577,449.5423,227.7,456.344" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_0002106129159239499468_C_0001120257488305564427">
+      <path d="M267.48,397.124 C260.32,414.074 251.9627,433.896 244.8227,450.816 " fill="none" id="C_0002106129159239499468-to-C_0001120257488305564427" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="#181818" points="242.49,456.344,249.6744,449.6072,244.4339,451.7373,242.3038,446.4969,242.49,456.344" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t40003_include_mermaid.svg b/docs/test_cases/t40003_include_mermaid.svg
index 99dc8713..80ef7303 100644
--- a/docs/test_cases/t40003_include_mermaid.svg
+++ b/docs/test_cases/t40003_include_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 398.171875 498" style="max-width: 398.172px; background-color: white;" width="398.171875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -83,14 +83,14 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001215324434184692437 LE-C_0000060001020671836182" id="L-C_0001215324434184692437-C_0000060001020671836182-0" d="M79.3984375,83L79.3984375,87.16666666666667C79.3984375,91.33333333333333,79.3984375,99.66666666666667,79.3984375,108C79.3984375,116.33333333333333,79.3984375,124.66666666666667,79.3984375,133C79.3984375,141.33333333333334,79.3984375,149.66666666666666,79.3984375,158C79.3984375,166.33333333333334,79.3984375,174.66666666666666,79.3984375,183C79.3984375,191.33333333333334,79.3984375,199.66666666666666,79.3984375,208C79.3984375,216.33333333333334,79.3984375,224.66666666666666,79.3984375,228.83333333333334L79.3984375,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0001226843223635488673" id="L-C_0002215849176605856058-C_0001226843223635488673-0" d="M242.25734186746988,83L237.65455572289156,87.16666666666667C233.05176957831327,91.33333333333333,223.84619728915663,99.66666666666667,219.24341114457832,108C214.640625,116.33333333333333,214.640625,124.66666666666667,214.640625,133C214.640625,141.33333333333334,214.640625,149.66666666666666,214.640625,158C214.640625,166.33333333333334,214.640625,174.66666666666666,214.640625,183C214.640625,191.33333333333334,214.640625,199.66666666666666,214.640625,208C214.640625,216.33333333333334,214.640625,224.66666666666666,214.640625,228.83333333333334L214.640625,233"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0002106129159239499468" id="L-C_0002215849176605856058-C_0002106129159239499468-0" d="M278.7114081325301,83L283.3141942771084,87.16666666666667C287.91698042168673,91.33333333333333,297.12255271084337,99.66666666666667,301.7253388554217,108C306.328125,116.33333333333333,306.328125,124.66666666666667,306.328125,133C306.328125,141.33333333333334,306.328125,149.66666666666666,306.328125,158C306.328125,166.33333333333334,306.328125,174.66666666666666,306.328125,183C306.328125,191.33333333333334,306.328125,199.66666666666666,306.328125,210.75C306.328125,221.83333333333334,306.328125,235.66666666666666,306.328125,249.5C306.328125,263.3333333333333,306.328125,277.1666666666667,306.328125,288.25C306.328125,299.3333333333333,306.328125,307.6666666666667,306.328125,311.8333333333333L306.328125,316"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0000060001020671836182 LE-C_0001921842892192045013" id="L-C_0000060001020671836182-C_0001921842892192045013-0" d="M79.3984375,266L79.3984375,270.1666666666667C79.3984375,274.3333333333333,79.3984375,282.6666666666667,79.3984375,291C79.3984375,299.3333333333333,79.3984375,307.6666666666667,79.3984375,311.8333333333333L79.3984375,316"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001921842892192045013 LE-C_0002295271780650013565" id="L-C_0001921842892192045013-C_0002295271780650013565-0" d="M79.3984375,349L79.3984375,353.1666666666667C79.3984375,357.3333333333333,79.3984375,365.6666666666667,79.3984375,374C79.3984375,382.3333333333333,79.3984375,390.6666666666667,79.3984375,394.8333333333333L79.3984375,399"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001226843223635488673 LE-C_0001849348825646635129" id="L-C_0001226843223635488673-C_0001849348825646635129-0" d="M214.640625,266L214.640625,270.1666666666667C214.640625,274.3333333333333,214.640625,282.6666666666667,214.640625,291C214.640625,299.3333333333333,214.640625,307.6666666666667,214.640625,311.8333333333333L214.640625,316"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001849348825646635129 LE-C_0001120257488305564427" id="L-C_0001849348825646635129-C_0001120257488305564427-0" d="M214.640625,349L214.640625,353.1666666666667C214.640625,357.3333333333333,214.640625,365.6666666666667,219.24341114457832,374C223.84619728915663,382.3333333333333,233.05176957831327,390.6666666666667,237.6545557228916,394.8333333333333L242.25734186746988,399"/>
-        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002106129159239499468 LE-C_0001120257488305564427" id="L-C_0002106129159239499468-C_0001120257488305564427-0" d="M306.328125,349L306.328125,353.1666666666667C306.328125,357.3333333333333,306.328125,365.6666666666667,301.7253388554217,374C297.12255271084337,382.3333333333333,287.91698042168673,390.6666666666667,283.3141942771084,394.8333333333333L278.7114081325301,399"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001215324434184692437 LE-C_0000060001020671836182" id="L-C_0001215324434184692437-C_0000060001020671836182-0" d="M79.3984375,83L79.3984375,87.16666666666667C79.3984375,91.33333333333333,79.3984375,99.66666666666667,79.3984375,108C79.3984375,116.33333333333333,79.3984375,124.66666666666667,79.3984375,133C79.3984375,141.33333333333334,79.3984375,149.66666666666666,79.3984375,158C79.3984375,166.33333333333334,79.3984375,174.66666666666666,79.3984375,183C79.3984375,191.33333333333334,79.3984375,199.66666666666666,79.3984375,207.11666666666667C79.3984375,214.5666666666667,79.3984375,221.13333333333333,79.3984375,224.41666666666666L79.3984375,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0001226843223635488673" id="L-C_0002215849176605856058-C_0001226843223635488673-0" d="M242.25734186746988,83L237.65455572289156,87.16666666666667C233.05176957831327,91.33333333333333,223.84619728915663,99.66666666666667,219.24341114457832,108C214.640625,116.33333333333333,214.640625,124.66666666666667,214.640625,133C214.640625,141.33333333333334,214.640625,149.66666666666666,214.640625,158C214.640625,166.33333333333334,214.640625,174.66666666666666,214.640625,183C214.640625,191.33333333333334,214.640625,199.66666666666666,214.640625,207.11666666666667C214.640625,214.5666666666667,214.640625,221.13333333333333,214.640625,224.41666666666666L214.640625,227.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0002106129159239499468" id="L-C_0002215849176605856058-C_0002106129159239499468-0" d="M278.7114081325301,83L283.3141942771084,87.16666666666667C287.91698042168673,91.33333333333333,297.12255271084337,99.66666666666667,301.7253388554217,108C306.328125,116.33333333333333,306.328125,124.66666666666667,306.328125,133C306.328125,141.33333333333334,306.328125,149.66666666666666,306.328125,158C306.328125,166.33333333333334,306.328125,174.66666666666666,306.328125,183C306.328125,191.33333333333334,306.328125,199.66666666666666,306.328125,210.75C306.328125,221.83333333333334,306.328125,235.66666666666666,306.328125,249.5C306.328125,263.3333333333333,306.328125,277.1666666666667,306.328125,287.3666666666667C306.328125,297.56666666666666,306.328125,304.1333333333333,306.328125,307.4166666666667L306.328125,310.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0000060001020671836182 LE-C_0001921842892192045013" id="L-C_0000060001020671836182-C_0001921842892192045013-0" d="M79.3984375,266L79.3984375,270.1666666666667C79.3984375,274.3333333333333,79.3984375,282.6666666666667,79.3984375,290.1166666666667C79.3984375,297.56666666666666,79.3984375,304.1333333333333,79.3984375,307.4166666666667L79.3984375,310.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001921842892192045013 LE-C_0002295271780650013565" id="L-C_0001921842892192045013-C_0002295271780650013565-0" d="M79.3984375,349L79.3984375,353.1666666666667C79.3984375,357.3333333333333,79.3984375,365.6666666666667,79.3984375,373.1166666666666C79.3984375,380.56666666666666,79.3984375,387.1333333333334,79.3984375,390.4166666666667L79.3984375,393.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001226843223635488673 LE-C_0001849348825646635129" id="L-C_0001226843223635488673-C_0001849348825646635129-0" d="M214.640625,266L214.640625,270.1666666666667C214.640625,274.3333333333333,214.640625,282.6666666666667,214.640625,290.1166666666667C214.640625,297.56666666666666,214.640625,304.1333333333333,214.640625,307.4166666666667L214.640625,310.7"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001849348825646635129 LE-C_0001120257488305564427" id="L-C_0001849348825646635129-C_0001120257488305564427-0" d="M214.640625,349L214.640625,353.1666666666667C214.640625,357.3333333333333,214.640625,365.6666666666667,218.58854652888726,373.4071845878407C222.53646805777453,381.14770250901466,230.43231111554908,388.29540501802944,234.38023264443635,391.8692562725368L238.32815417332364,395.44310752704416"/>
+        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002106129159239499468 LE-C_0001120257488305564427" id="L-C_0002106129159239499468-C_0001120257488305564427-0" d="M306.328125,349L306.328125,353.1666666666667C306.328125,357.3333333333333,306.328125,365.6666666666667,302.38020347111274,373.4071845878407C298.4322819422254,381.14770250901466,290.5364388844509,388.29540501802944,286.5885173555636,391.8692562725368L282.6405958266763,395.44310752704416"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -167,7 +167,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t3.h#L0">
+        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t3.h#L0">
           <g title="t3.h" id="flowchart-C_0001226843223635488673-5" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -180,7 +180,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t2.h#L0">
+        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t2.h#L0">
           <g title="t2.h" id="flowchart-C_0001849348825646635129-6" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/#L0">
+        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L0">
           <g title="t1.h" id="flowchart-C_0001120257488305564427-7" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -206,7 +206,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependencies/t5.h#L0">
+        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t5.h#L0">
           <g title="t5.h" id="flowchart-C_0002106129159239499468-8" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -219,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependants/t3.h#L0">
+        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t3.h#L0">
           <g title="t3.h" id="flowchart-C_0000060001020671836182-2" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -232,7 +232,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/include/dependants/t2.h#L0">
+        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t2.h#L0">
           <g title="t2.h" id="flowchart-C_0001921842892192045013-3" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -245,7 +245,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/#L0">
+        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L0">
           <g title="t1.h" id="flowchart-C_0002295271780650013565-4" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -258,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/src/dependencies/t2.cc#L0">
+        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependencies/t2.cc#L0">
           <g title="t2.cc" id="flowchart-C_0002215849176605856058-1" class="node default clickable flowchart-label">
             <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-16.8984375, -9)" style="" class="label">
@@ -271,7 +271,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/cea427e32d9d7aafb723e7542c2fb3f235828ba2/tests/t40003/src/dependants/t1.cc#L0">
+        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependants/t1.cc#L0">
           <g title="t1.cc" id="flowchart-C_0001215324434184692437-0" class="node default clickable flowchart-label">
             <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-16.8984375, -9)" style="" class="label">
diff --git a/docs/test_cases/t90000.md b/docs/test_cases/t90000.md
index bb678889..9fe0d645 100644
--- a/docs/test_cases/t90000.md
+++ b/docs/test_cases/t90000.md
@@ -34,7 +34,7 @@ diagrams:
 
 ```
 ## Source code
-File t90000.cc
+File `tests/t90000/t90000.cc`
 ```cpp
 
 ```
diff --git a/docs/test_cases/t90000_class.svg b/docs/test_cases/t90000_class.svg
index 64b6d962..03f29593 100644
--- a/docs/test_cases/t90000_class.svg
+++ b/docs/test_cases/t90000_class.svg
@@ -1,48 +1,60 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="396px" preserveAspectRatio="none" style="width:455px;height:396px;" version="1.1" viewBox="0 0 455 396" width="455px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="396px" preserveAspectRatio="none" style="width:430px;height:396px;background:#FFFFFF;" version="1.1" viewBox="0 0 430 396" width="430px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fna43uwevhc6s" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FEFECE" filter="url(#fna43uwevhc6s)" height="60.8047" id="C_001" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="74" y="116"/>
-    <ellipse cx="97.55" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M100.5188,137.6406 Q99.9406,137.9375 99.3,138.0781 Q98.6594,138.2344 97.9563,138.2344 Q95.4563,138.2344 94.1281,136.5938 Q92.8156,134.9375 92.8156,131.8125 Q92.8156,128.6875 94.1281,127.0313 Q95.4563,125.375 97.9563,125.375 Q98.6594,125.375 99.3,125.5313 Q99.9563,125.6875 100.5188,125.9844 L100.5188,128.7031 Q99.8938,128.125 99.3,127.8594 Q98.7063,127.5781 98.0813,127.5781 Q96.7375,127.5781 96.05,128.6563 Q95.3625,129.7188 95.3625,131.8125 Q95.3625,133.9063 96.05,134.9844 Q96.7375,136.0469 98.0813,136.0469 Q98.7063,136.0469 99.3,135.7813 Q99.8938,135.5 100.5188,134.9219 L100.5188,137.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="113.45" y="136.1543">Foo</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="75" x2="147" y1="148" y2="148"/>
-    <ellipse cx="85" cy="159" 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="48" x="94" y="162.2104">int value</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="75" x2="147" y1="168.8047" y2="168.8047"/>
-    <rect fill="#FEFECE" filter="url(#fna43uwevhc6s)" height="48" id="ArrayList" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="68.5" y="337"/>
-    <ellipse cx="83.5" cy="353" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M86.4688,358.6406 Q85.8906,358.9375 85.25,359.0781 Q84.6094,359.2344 83.9063,359.2344 Q81.4063,359.2344 80.0781,357.5938 Q78.7656,355.9375 78.7656,352.8125 Q78.7656,349.6875 80.0781,348.0313 Q81.4063,346.375 83.9063,346.375 Q84.6094,346.375 85.25,346.5313 Q85.9063,346.6875 86.4688,346.9844 L86.4688,349.7031 Q85.8438,349.125 85.25,348.8594 Q84.6563,348.5781 84.0313,348.5781 Q82.6875,348.5781 82,349.6563 Q81.3125,350.7188 81.3125,352.8125 Q81.3125,354.9063 82,355.9844 Q82.6875,357.0469 84.0313,357.0469 Q84.6563,357.0469 85.25,356.7813 Q85.8438,356.5 86.4688,355.9219 L86.4688,358.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="53" x="97.5" y="357.1543">ArrayList</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="69.5" x2="152.5" y1="369" y2="369"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="69.5" x2="152.5" y1="377" y2="377"/>
-    <path d="M6,19.5 L6,44.6328 A0,0 0 0 0 6,44.6328 L107,44.6328 L111,115.66 L115,44.6328 L216,44.6328 A0,0 0 0 0 216,44.6328 L216,29.5 L206,19.5 L6,19.5 A0,0 0 0 0 6,19.5 " fill="#FBFB77" filter="url(#fna43uwevhc6s)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M206,19.5 L206,29.5 L216,29.5 L206,19.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="12" y="36.5669">This is a very important class.</text>
-    <path d="M251.5,12 L251.5,52.2656 L352.5,52.2656 L352.5,22 L342.5,12 L251.5,12 " fill="#FBFB77" filter="url(#fna43uwevhc6s)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M342.5,12 L342.5,22 L352.5,22 L342.5,12 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="257.5" y="29.0669">This is a</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="80" x="257.5" y="44.1997">floating note</text>
-    <path d="M97,237 L97,277.2656 L261,277.2656 L261,247 L251,237 L97,237 " fill="#FBFB77" filter="url(#fna43uwevhc6s)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M251,237 L251,247 L261,247 L251,237 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="103" y="254.0669">This note is connected</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="117" x="103" y="269.1997">to several objects.</text>
-    <rect fill="#FEFECE" filter="url(#fna43uwevhc6s)" height="48" id="C_002" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="388" y="8"/>
-    <ellipse cx="403" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M405.9688,29.6406 Q405.3906,29.9375 404.75,30.0781 Q404.1094,30.2344 403.4063,30.2344 Q400.9063,30.2344 399.5781,28.5938 Q398.2656,26.9375 398.2656,23.8125 Q398.2656,20.6875 399.5781,19.0313 Q400.9063,17.375 403.4063,17.375 Q404.1094,17.375 404.75,17.5313 Q405.4063,17.6875 405.9688,17.9844 L405.9688,20.7031 Q405.3438,20.125 404.75,19.8594 Q404.1563,19.5781 403.5313,19.5781 Q402.1875,19.5781 401.5,20.6563 Q400.8125,21.7188 400.8125,23.8125 Q400.8125,25.9063 401.5,26.9844 Q402.1875,28.0469 403.5313,28.0469 Q404.1563,28.0469 404.75,27.7813 Q405.3438,27.5 405.9688,26.9219 L405.9688,29.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="417" y="28.1543">Boo</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="389" x2="443" y1="40" y2="40"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="389" x2="443" y1="48" y2="48"/>
-    <path d="M88.93,195.94 C80.49,220.14 73.97,249.96 79,277 C82.9,297.95 91.89,320.43 99.36,336.71 " fill="none" id="C_001&lt;-ArrayList" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="82.48,193.22,96.26,177.12,95.53,198.29,82.48,193.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M129.58,177.15 C141.54,196.22 156.72,220.44 167.08,236.98 " fill="none" id="C_001-N2" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M166.21,277.19 C154.9,294.15 138.37,318.94 126.35,336.97 " fill="none" id="N2-ArrayList" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <g id="elem_C_001">
+      <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_001" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="79" x="65" y="115"/>
+      <ellipse cx="89.9" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+      <path d="M84.9,132.1563 C84.9,134.6563 87.0406,136.4688 89.9625,136.4688 C91.1969,136.4688 92.3688,136.1719 93.1188,135.6563 C93.7281,135.2344 94.0563,134.8125 94.0563,134.4063 C94.0563,133.9375 93.6344,133.5313 93.1344,133.5313 C92.9,133.5313 92.6813,133.6094 92.4781,133.8125 C92.0406,134.25 92.0406,134.25 91.8688,134.3438 C91.4156,134.5781 90.775,134.7188 90.0094,134.7188 C88.0094,134.7188 86.7281,133.7031 86.7281,132.125 L86.7281,131.0781 C86.7281,129.375 87.9469,128.1719 89.65,128.1719 C90.2281,128.1719 90.8063,128.3125 91.275,128.5625 C91.7438,128.8281 91.9156,129.0156 91.9781,129.375 C92.1031,130.0469 92.3531,130.2969 92.8844,130.2969 C93.1656,130.2969 93.4469,130.1563 93.6344,129.9375 C93.7594,129.7656 93.8063,129.5938 93.8063,129.1563 L93.8063,127.7969 C93.8063,127.375 93.7906,127.2344 93.6656,127.0625 C93.4938,126.8125 93.2125,126.6563 92.8844,126.6563 C92.5719,126.6563 92.3688,126.7656 92.15,127.0313 C90.9781,126.5313 90.5406,126.4219 89.5875,126.4219 C86.9156,126.4219 84.9,128.4375 84.9,131.0625 L84.9,132.1563 Z " fill="#000000"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="106.1" y="135.606">Foo</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="66" x2="143" y1="147" y2="147"/>
+      <ellipse cx="76" cy="160.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53" x="85" y="164.0059">int value</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="66" x2="143" y1="171.7999" y2="171.7999"/>
+    </g>
+    <g id="elem_ArrayList">
+      <rect fill="#F1F1F1" height="48" id="ArrayList" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="88" x="60.5" y="341"/>
+      <ellipse cx="75.5" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+      <path d="M70.5,358.1563 C70.5,360.6563 72.6406,362.4688 75.5625,362.4688 C76.7969,362.4688 77.9688,362.1719 78.7188,361.6563 C79.3281,361.2344 79.6563,360.8125 79.6563,360.4063 C79.6563,359.9375 79.2344,359.5313 78.7344,359.5313 C78.5,359.5313 78.2813,359.6094 78.0781,359.8125 C77.6406,360.25 77.6406,360.25 77.4688,360.3438 C77.0156,360.5781 76.375,360.7188 75.6094,360.7188 C73.6094,360.7188 72.3281,359.7031 72.3281,358.125 L72.3281,357.0781 C72.3281,355.375 73.5469,354.1719 75.25,354.1719 C75.8281,354.1719 76.4063,354.3125 76.875,354.5625 C77.3438,354.8281 77.5156,355.0156 77.5781,355.375 C77.7031,356.0469 77.9531,356.2969 78.4844,356.2969 C78.7656,356.2969 79.0469,356.1563 79.2344,355.9375 C79.3594,355.7656 79.4063,355.5938 79.4063,355.1563 L79.4063,353.7969 C79.4063,353.375 79.3906,353.2344 79.2656,353.0625 C79.0938,352.8125 78.8125,352.6563 78.4844,352.6563 C78.1719,352.6563 77.9688,352.7656 77.75,353.0313 C76.5781,352.5313 76.1406,352.4219 75.1875,352.4219 C72.5156,352.4219 70.5,354.4375 70.5,357.0625 L70.5,358.1563 Z " fill="#000000"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="89.5" y="361.606">ArrayList</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="61.5" x2="147.5" y1="373" y2="373"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="61.5" x2="147.5" y1="381" y2="381"/>
+    </g>
+    <g id="elem_GMN5">
+      <path d="M6,18.2 L6,43.8 A0,0 0 0 0 6,43.8 L100.5,43.8 L104.5,114.87 L108.5,43.8 L203,43.8 A0,0 0 0 0 203,43.8 L203,28.2 L193,18.2 L6,18.2 A0,0 0 0 0 6,18.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M193,18.2 L193,28.2 L203,28.2 L193,18.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="176" x="12" y="35.277">This is a very important class.</text>
+    </g>
+    <g id="elem_N1">
+      <path d="M238.5,10.4 L238.5,51.6 L330.5,51.6 L330.5,20.4 L320.5,10.4 L238.5,10.4 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M320.5,10.4 L320.5,20.4 L330.5,20.4 L320.5,10.4 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="50" x="244.5" y="27.477">This is a</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="71" x="244.5" y="43.077">floating note</text>
+    </g>
+    <g id="elem_N2">
+      <path d="M93,239.8 L93,281 L246,281 L246,249.8 L236,239.8 L93,239.8 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
+      <path d="M236,239.8 L236,249.8 L246,249.8 L236,239.8 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="132" x="99" y="256.877">This note is connected</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="107" x="99" y="272.477">to several objects.</text>
+    </g>
+    <g id="elem_C_002">
+      <rect codeLine="12" fill="#F1F1F1" height="48" id="C_002" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="57" x="366" y="7"/>
+      <ellipse cx="381" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
+      <path d="M376,24.1563 C376,26.6563 378.1406,28.4688 381.0625,28.4688 C382.2969,28.4688 383.4688,28.1719 384.2188,27.6563 C384.8281,27.2344 385.1563,26.8125 385.1563,26.4063 C385.1563,25.9375 384.7344,25.5313 384.2344,25.5313 C384,25.5313 383.7813,25.6094 383.5781,25.8125 C383.1406,26.25 383.1406,26.25 382.9688,26.3438 C382.5156,26.5781 381.875,26.7188 381.1094,26.7188 C379.1094,26.7188 377.8281,25.7031 377.8281,24.125 L377.8281,23.0781 C377.8281,21.375 379.0469,20.1719 380.75,20.1719 C381.3281,20.1719 381.9063,20.3125 382.375,20.5625 C382.8438,20.8281 383.0156,21.0156 383.0781,21.375 C383.2031,22.0469 383.4531,22.2969 383.9844,22.2969 C384.2656,22.2969 384.5469,22.1563 384.7344,21.9375 C384.8594,21.7656 384.9063,21.5938 384.9063,21.1563 L384.9063,19.7969 C384.9063,19.375 384.8906,19.2344 384.7656,19.0625 C384.5938,18.8125 384.3125,18.6563 383.9844,18.6563 C383.6719,18.6563 383.4688,18.7656 383.25,19.0313 C382.0781,18.5313 381.6406,18.4219 380.6875,18.4219 C378.0156,18.4219 376,20.4375 376,23.0625 L376,24.1563 Z " fill="#000000"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="395" y="27.606">Boo</text>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="367" x2="422" y1="39" y2="39"/>
+      <line style="stroke:#181818;stroke-width:0.5;" x1="367" x2="422" y1="47" y2="47"/>
+    </g>
+    <g id="link_C_001_ArrayList">
+      <path codeLine="5" d="M84.2205,196.9667 C74.1505,223.7267 69.61,246.27 75.5,281 C79.02,301.77 87.18,324.26 93.94,340.59 " fill="none" id="C_001-backto-ArrayList" style="stroke:#181818;stroke-width:1.0;"/>
+      <polygon fill="none" points="90.56,180.12,78.6049,194.8535,89.836,199.0798,90.56,180.12" style="stroke:#181818;stroke-width:1.0;"/>
+    </g>
+    <g id="link_C_001_N2">
+      <path codeLine="9" d="M123.13,180.21 C134.31,199.3 148.18,222.99 157.83,239.47 " fill="none" id="C_001-N2" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+    </g>
+    <g id="link_N2_ArrayList">
+      <path codeLine="10" d="M156.97,281.18 C146.2,298.19 130.64,322.73 119.27,340.69 " fill="none" id="N2-ArrayList" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
+    </g>
   </g>
 </svg>
diff --git a/docs/test_cases/t90000_class_mermaid.svg b/docs/test_cases/t90000_class_mermaid.svg
index ea66542d..11234823 100644
--- a/docs/test_cases/t90000_class_mermaid.svg
+++ b/docs/test_cases/t90000_class_mermaid.svg
@@ -1,56 +1,61 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 490.03125 309" style="max-width: 490.031px; background-color: white;" width="490.03125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
+        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M216.9765625,194L216.9765625,198.16666666666666C216.9765625,202.33333333333334,216.9765625,210.66666666666666,216.9765625,219C216.9765625,227.33333333333334,216.9765625,235.66666666666666,216.9765625,239.83333333333334L216.9765625,244"/>
+        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M216.9765625,212L216.9765625,213.16666666666666C216.9765625,214.33333333333334,216.9765625,216.66666666666666,216.9765625,222C216.9765625,227.33333333333334,216.9765625,235.66666666666666,216.9765625,239.83333333333334L216.9765625,244"/>
         <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote2" d="M216.9765625,53L216.9765625,59.166666666666664C216.9765625,65.33333333333333,216.9765625,77.66666666666667,216.9765625,88C216.9765625,98.33333333333333,216.9765625,106.66666666666667,216.9765625,110.83333333333333L216.9765625,115"/>
       </g>
       <g class="edgeLabels">
diff --git a/util/generate_test_cases_docs.py b/util/generate_test_cases_docs.py
index 9504a0f9..0de123d8 100755
--- a/util/generate_test_cases_docs.py
+++ b/util/generate_test_cases_docs.py
@@ -58,14 +58,17 @@ with open(r'tests/test_cases.yaml') as f:
                 tc.write(config)
                 tc.write("\n```\n")
                 tc.write("## Source code\n")
-                for source_file in os.listdir(f'tests/{name}/'):
-                    if source_file.endswith(".h") or source_file.endswith(".cc") or source_file.endswith(".c"):
-                        if source_file == "test_case.h":
-                            continue
-                        tc.write(f'File {source_file}\n')
-                        tc.write("```cpp\n")
-                        tc.write(open(f'tests/{name}/{source_file}', 'r').read())
-                        tc.write("\n```\n")
+                for root, dirs, files in os.walk(f'tests/{name}/'):
+                    for source_file in files:
+                        if source_file.endswith((".h", ".cc", ".c", ".cppm")):
+                            if source_file == "test_case.h":
+                                continue
+                            file_path = os.path.join(root, source_file)
+                            tc.write(f'File `{file_path}`\n')
+                            tc.write("```cpp\n")
+                            with open(file_path, 'r') as file:
+                                tc.write(file.read())
+                            tc.write("\n```\n")
 
                 # Copy and link the diagram image
                 config_dict = yaml.full_load(config)

From 453f265feb393b6330c355dc593b1c5fd956a46d Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sat, 23 Dec 2023 19:23:40 +0100
Subject: [PATCH 09/24] Added package diagram test case with C++20 module
 partitions

---
 src/common/model/diagram_filter.cc |  6 ++-
 src/common/model/element.h         |  2 -
 src/common/model/path.h            | 44 +++++++++++++++++--
 src/config/config.cc               |  8 +++-
 tests/t30014/.clang-uml            | 13 ++++++
 tests/t30014/src/lib1.cppm         | 13 ++++++
 tests/t30014/src/lib1mod1.cppm     |  5 +++
 tests/t30014/src/lib1mod2.cppm     |  5 +++
 tests/t30014/src/lib2.cppm         | 13 ++++++
 tests/t30014/src/t30014_mod.cppm   | 13 ++++++
 tests/t30014/t30014.cc             |  6 +++
 tests/t30014/test_case.h           | 69 ++++++++++++++++++++++++++++++
 tests/test_cases.cc                |  1 +
 tests/test_cases.yaml              |  3 ++
 14 files changed, 191 insertions(+), 10 deletions(-)
 create mode 100644 tests/t30014/.clang-uml
 create mode 100644 tests/t30014/src/lib1.cppm
 create mode 100644 tests/t30014/src/lib1mod1.cppm
 create mode 100644 tests/t30014/src/lib1mod2.cppm
 create mode 100644 tests/t30014/src/lib2.cppm
 create mode 100644 tests/t30014/src/t30014_mod.cppm
 create mode 100644 tests/t30014/t30014.cc
 create mode 100644 tests/t30014/test_case.h

diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc
index 49b3ac0f..3c0c9fd8 100644
--- a/src/common/model/diagram_filter.cc
+++ b/src/common/model/diagram_filter.cc
@@ -301,7 +301,8 @@ tvl::value_t modules_filter::match(
     if (!e.module().has_value())
         return {false};
 
-    auto module_toks = util::split(e.module().value(), ".", true); // NOLINT
+    auto module_toks =
+        path::split(e.module().value(), path_type::kModule); // NOLINT
 
     if (dynamic_cast<const package *>(&e) != nullptr &&
         e.get_namespace().type() == path_type::kModule) {
@@ -312,7 +313,8 @@ tvl::value_t modules_filter::match(
         [&e, &module_toks](const auto &modit) {
             if (std::holds_alternative<std::string>(modit.value())) {
                 const auto &modit_str = std::get<std::string>(modit.value());
-                const auto modit_toks = util::split(modit_str, ".", true);
+                const auto modit_toks =
+                    path::split(modit_str, path_type::kModule);
 
                 return e.module() == modit_str ||
                     util::starts_with(module_toks, modit_toks);
diff --git a/src/common/model/element.h b/src/common/model/element.h
index 2d94d393..38849d13 100644
--- a/src/common/model/element.h
+++ b/src/common/model/element.h
@@ -39,8 +39,6 @@ class element : public diagram_element {
 public:
     element(namespace_ using_namespace, path_type pt = path_type::kNamespace);
 
-    element(path_type pt);
-
     ~element() override = default;
 
     /**
diff --git a/src/common/model/path.h b/src/common/model/path.h
index 3cb030eb..afb20f82 100644
--- a/src/common/model/path.h
+++ b/src/common/model/path.h
@@ -50,9 +50,9 @@ class path {
      *
      * @return Path separator
      */
-    const char *separator() const
+    static const char *separator(path_type pt)
     {
-        switch (path_type_) {
+        switch (pt) {
         case path_type::kNamespace:
             return "::";
         case path_type::kModule:
@@ -68,9 +68,38 @@ class path {
         return "::";
     }
 
+    /**
+     * Returns the path separator based on the type of the instance path.
+     *
+     * @return Path separator
+     */
+    const char *separator() const { return separator(path_type_); }
+
 public:
     using container_type = std::vector<std::string>;
 
+    static container_type split(
+        const std::string &ns, path_type pt = path_type::kNamespace)
+    {
+        container_type result;
+        if (pt == path_type::kModule) {
+            auto path_toks = util::split(ns, separator(pt));
+            for (const auto &pt : path_toks) {
+                const auto subtoks = util::split(pt, ":");
+                if (subtoks.size() == 2) {
+                    result.push_back(subtoks.at(0));
+                    result.push_back(fmt::format(":{}", subtoks.at(1)));
+                }
+                else
+                    result.push_back(subtoks.at(0));
+            }
+        }
+        else
+            result = util::split(ns, separator(pt));
+
+        return result;
+    }
+
     path(path_type pt = path_type::kNamespace)
         : path_type_{pt}
     {
@@ -82,7 +111,7 @@ public:
         if (ns.empty())
             return;
 
-        path_ = util::split(ns, separator());
+        path_ = split(ns, pt);
     }
 
     virtual ~path() = default;
@@ -163,7 +192,14 @@ public:
      */
     std::string to_string() const
     {
-        return fmt::format("{}", fmt::join(path_, std::string{separator()}));
+        auto result =
+            fmt::format("{}", fmt::join(path_, std::string{separator()}));
+
+        if (path_type_ == path_type::kModule) {
+            util::replace_all(result, ".:", ":");
+        }
+
+        return result;
     }
 
     /**
diff --git a/src/config/config.cc b/src/config/config.cc
index 11207f86..8a9e1429 100644
--- a/src/config/config.cc
+++ b/src/config/config.cc
@@ -277,10 +277,14 @@ std::vector<std::string> diagram::make_module_relative(
     if (!maybe_module)
         return {};
 
-    auto module_path = util::split(maybe_module.value(), ".");
+    auto module_path = common::model::path(
+        maybe_module.value(), common::model::path_type::kModule)
+                           .tokens();
 
     if (using_module.has_value) {
-        auto using_module_path = util::split(using_module(), ".");
+        auto using_module_path = common::model::path(
+            using_module(), common::model::path_type::kModule)
+                                     .tokens();
 
         if (util::starts_with(module_path, using_module_path)) {
             util::remove_prefix(module_path, using_module_path);
diff --git a/tests/t30014/.clang-uml b/tests/t30014/.clang-uml
new file mode 100644
index 00000000..9eed5c76
--- /dev/null
+++ b/tests/t30014/.clang-uml
@@ -0,0 +1,13 @@
+diagrams:
+  t30014_package:
+    type: package
+    glob:
+      - t30014.cc
+    package_type: module
+    include:
+      modules:
+        - t30014
+    exclude:
+      modules:
+        - t30014.app:lib1.mod2
+    using_module: t30014
\ No newline at end of file
diff --git a/tests/t30014/src/lib1.cppm b/tests/t30014/src/lib1.cppm
new file mode 100644
index 00000000..8df1bab0
--- /dev/null
+++ b/tests/t30014/src/lib1.cppm
@@ -0,0 +1,13 @@
+export module t30014.app:lib1;
+
+export namespace clanguml::t30014 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+} // namespace clanguml::t30014
\ No newline at end of file
diff --git a/tests/t30014/src/lib1mod1.cppm b/tests/t30014/src/lib1mod1.cppm
new file mode 100644
index 00000000..e0449519
--- /dev/null
+++ b/tests/t30014/src/lib1mod1.cppm
@@ -0,0 +1,5 @@
+export module t30014.app:lib1.mod1;
+
+export namespace clanguml::t30014 {
+class D { };
+} // namespace clanguml::t30014
\ No newline at end of file
diff --git a/tests/t30014/src/lib1mod2.cppm b/tests/t30014/src/lib1mod2.cppm
new file mode 100644
index 00000000..51d3f5a0
--- /dev/null
+++ b/tests/t30014/src/lib1mod2.cppm
@@ -0,0 +1,5 @@
+export module t30014.app:lib1.mod2;
+
+export namespace clanguml::t30014 {
+class E { };
+} // namespace clanguml::t30014
\ No newline at end of file
diff --git a/tests/t30014/src/lib2.cppm b/tests/t30014/src/lib2.cppm
new file mode 100644
index 00000000..d213f45b
--- /dev/null
+++ b/tests/t30014/src/lib2.cppm
@@ -0,0 +1,13 @@
+export module t30014.app:lib2;
+
+export namespace clanguml::t30014 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+namespace detail {
+enum class CCC { ccc1, ccc2 };
+} // namespace detail
+} // namespace clanguml::t30014
\ No newline at end of file
diff --git a/tests/t30014/src/t30014_mod.cppm b/tests/t30014/src/t30014_mod.cppm
new file mode 100644
index 00000000..1c2f1390
--- /dev/null
+++ b/tests/t30014/src/t30014_mod.cppm
@@ -0,0 +1,13 @@
+export module t30014.app;
+import :lib1;
+import :lib1.mod1;
+import :lib1.mod2;
+import :lib2;
+
+export namespace clanguml::t30014 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+} // namespace clanguml::t30014
\ No newline at end of file
diff --git a/tests/t30014/t30014.cc b/tests/t30014/t30014.cc
new file mode 100644
index 00000000..67822f28
--- /dev/null
+++ b/tests/t30014/t30014.cc
@@ -0,0 +1,6 @@
+import t30014.app;
+
+namespace clanguml {
+namespace t30014 {
+}
+}
\ No newline at end of file
diff --git a/tests/t30014/test_case.h b/tests/t30014/test_case.h
new file mode 100644
index 00000000..24db12d4
--- /dev/null
+++ b/tests/t30014/test_case.h
@@ -0,0 +1,69 @@
+/**
+ * tests/t30014/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t30014", "[test-case][package]")
+{
+    auto [config, db] = load_config("t30014");
+
+    auto diagram = config.diagrams["t30014_package"];
+
+    REQUIRE(diagram->name == "t30014_package");
+
+    auto model = generate_package_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t30014_package");
+
+    {
+        auto src = generate_package_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        // Check if all packages exist
+        REQUIRE_THAT(src, IsPackage("app"));
+        REQUIRE_THAT(src, IsPackage(":lib1"));
+        REQUIRE_THAT(src, IsPackage(":lib2"));
+        REQUIRE_THAT(src, IsPackage("mod1"));
+        REQUIRE_THAT(src, !IsPackage("mod2"));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_package_json(diagram, *model);
+
+        using namespace json;
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_package_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsPackage;
+
+        REQUIRE_THAT(src, IsPackage(_A("app")));
+        REQUIRE_THAT(src, IsPackage(_A(":lib1")));
+        REQUIRE_THAT(src, IsPackage(_A(":lib2")));
+        REQUIRE_THAT(src, IsPackage(_A("mod1")));
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index bb5eb37f..8906bbb0 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -475,6 +475,7 @@ using namespace clanguml::test::matchers;
 #if defined(ENABLE_CXX_MODULES_TEST_CASES)
 #include "t30012/test_case.h"
 #include "t30013/test_case.h"
+#include "t30014/test_case.h"
 #endif
 ///
 /// Include diagram tests
diff --git a/tests/test_cases.yaml b/tests/test_cases.yaml
index 2500c49c..5b92936b 100644
--- a/tests/test_cases.yaml
+++ b/tests/test_cases.yaml
@@ -365,6 +365,9 @@ test_cases:
     - name: t30013
       title: C++20 modules package dependencies diagram test
       description:
+    - name: t30014
+      title: C++20 modules package diagram test with partitions
+      description:
   Include diagrams:
     - name: t40001
       title: Basic include graph diagram test case

From 637112cea51df7614163e240140900304ea1ec87 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sun, 24 Dec 2023 16:47:19 +0100
Subject: [PATCH 10/24] Added package diagram test case with C++20 module
 partitions dependencies

---
 .../json/class_diagram_generator.cc           |  13 +-
 src/common/model/path.cc                      |  35 ++++
 src/common/model/path.h                       |   6 +-
 src/config/config.cc                          |   2 +
 .../json/package_diagram_generator.cc         |   8 +-
 src/package_diagram/model/diagram.h           |  26 ++-
 .../visitor/translation_unit_visitor.cc       |   2 +-
 tests/CMakeLists.txt                          |   3 +-
 tests/t30012/test_case.h                      |   6 +
 tests/t30013/t30013.cc                        |   1 +
 tests/t30013/test_case.h                      |  38 ++---
 tests/t30014/test_case.h                      |   6 +
 tests/t30015/.clang-uml                       |  10 ++
 tests/t30015/src/app.cppm                     |  72 ++++++++
 tests/t30015/src/lib1.cppm                    |  24 +++
 tests/t30015/src/mod1.cppm                    |   5 +
 tests/t30015/src/mod10.cppm                   |   5 +
 tests/t30015/src/mod11.cppm                   |   5 +
 tests/t30015/src/mod12.cppm                   |   5 +
 tests/t30015/src/mod13.cppm                   |   5 +
 tests/t30015/src/mod14.cppm                   |   5 +
 tests/t30015/src/mod15.cppm                   |   5 +
 tests/t30015/src/mod16.cppm                   |   5 +
 tests/t30015/src/mod17.cppm                   |   5 +
 tests/t30015/src/mod18.cppm                   |   5 +
 tests/t30015/src/mod2.cppm                    |   7 +
 tests/t30015/src/mod3.cppm                    |   5 +
 tests/t30015/src/mod4.cppm                    |   5 +
 tests/t30015/src/mod5.cppm                    |   5 +
 tests/t30015/src/mod6.cppm                    |   5 +
 tests/t30015/src/mod7.cppm                    |   5 +
 tests/t30015/src/mod8.cppm                    |   5 +
 tests/t30015/src/mod9.cppm                    |   5 +
 tests/t30015/t30015.cc                        |   6 +
 tests/t30015/test_case.h                      | 160 ++++++++++++++++++
 tests/test_cases.cc                           |   3 +-
 tests/test_cases.h                            |  40 ++++-
 tests/test_cases.yaml                         |   3 +
 tests/test_model.cc                           |  51 ++++++
 39 files changed, 545 insertions(+), 62 deletions(-)
 create mode 100644 src/common/model/path.cc
 create mode 100644 tests/t30015/.clang-uml
 create mode 100644 tests/t30015/src/app.cppm
 create mode 100644 tests/t30015/src/lib1.cppm
 create mode 100644 tests/t30015/src/mod1.cppm
 create mode 100644 tests/t30015/src/mod10.cppm
 create mode 100644 tests/t30015/src/mod11.cppm
 create mode 100644 tests/t30015/src/mod12.cppm
 create mode 100644 tests/t30015/src/mod13.cppm
 create mode 100644 tests/t30015/src/mod14.cppm
 create mode 100644 tests/t30015/src/mod15.cppm
 create mode 100644 tests/t30015/src/mod16.cppm
 create mode 100644 tests/t30015/src/mod17.cppm
 create mode 100644 tests/t30015/src/mod18.cppm
 create mode 100644 tests/t30015/src/mod2.cppm
 create mode 100644 tests/t30015/src/mod3.cppm
 create mode 100644 tests/t30015/src/mod4.cppm
 create mode 100644 tests/t30015/src/mod5.cppm
 create mode 100644 tests/t30015/src/mod6.cppm
 create mode 100644 tests/t30015/src/mod7.cppm
 create mode 100644 tests/t30015/src/mod8.cppm
 create mode 100644 tests/t30015/src/mod9.cppm
 create mode 100644 tests/t30015/t30015.cc
 create mode 100644 tests/t30015/test_case.h

diff --git a/src/class_diagram/generators/json/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc
index 9cfad127..14a67dde 100644
--- a/src/class_diagram/generators/json/class_diagram_generator.cc
+++ b/src/class_diagram/generators/json/class_diagram_generator.cc
@@ -184,18 +184,7 @@ void generator::generate(const package &p, nlohmann::json &parent) const
         if (!uns.starts_with({p.full_name(false)})) {
             LOG_DBG("Generating package {}", p.name());
 
-            switch (config().package_type()) {
-            case config::package_type_t::kDirectory:
-                package_object["type"] = "directory";
-                break;
-            case config::package_type_t::kModule:
-                package_object["type"] = "module";
-                break;
-            case config::package_type_t::kNamespace:
-                package_object["type"] = "namespace";
-                break;
-            }
-
+            package_object["type"] = to_string(config().package_type());
             package_object["name"] = p.name();
             package_object["display_name"] = p.full_name(false);
         }
diff --git a/src/common/model/path.cc b/src/common/model/path.cc
new file mode 100644
index 00000000..fd642da0
--- /dev/null
+++ b/src/common/model/path.cc
@@ -0,0 +1,35 @@
+/**
+ * @file src/common/model/path.cc
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "path.h"
+
+namespace clanguml::common::model {
+
+std::string to_string(const path_type pt)
+{
+    switch (pt) {
+    case path_type::kModule:
+        return "module";
+    case path_type::kNamespace:
+        return "namespace";
+    case path_type::kFilesystem:
+        return "directory";
+    }
+}
+
+} // namespace clanguml::common::model
\ No newline at end of file
diff --git a/src/common/model/path.h b/src/common/model/path.h
index afb20f82..090550cb 100644
--- a/src/common/model/path.h
+++ b/src/common/model/path.h
@@ -37,6 +37,8 @@ enum class path_type {
     kModule      /*!< Module path */
 };
 
+std::string to_string(path_type pt);
+
 /**
  * @brief Diagram path
  *
@@ -135,7 +137,8 @@ public:
             return *this;
 
         if (path_type_ != right.path_type_)
-            throw std::runtime_error("");
+            throw std::runtime_error(
+                "Cannot assign a path to a path with another path type.");
 
         path_type_ = right.path_type_;
         path_ = right.path_;
@@ -225,6 +228,7 @@ public:
     path operator|(const path &right) const
     {
         path res{*this};
+        res.path_type_ = right.path_type_;
         res.append(right);
         return res;
     }
diff --git a/src/config/config.cc b/src/config/config.cc
index 8a9e1429..1a663a66 100644
--- a/src/config/config.cc
+++ b/src/config/config.cc
@@ -147,6 +147,8 @@ std::string to_string(package_type_t pt)
         return "namespace";
     case package_type_t::kDirectory:
         return "directory";
+    case package_type_t::kModule:
+        return "module";
     default:
         assert(false);
         return "";
diff --git a/src/package_diagram/generators/json/package_diagram_generator.cc b/src/package_diagram/generators/json/package_diagram_generator.cc
index 15656634..74f9f366 100644
--- a/src/package_diagram/generators/json/package_diagram_generator.cc
+++ b/src/package_diagram/generators/json/package_diagram_generator.cc
@@ -58,12 +58,12 @@ void generator::generate_relationships(
 
 void generator::generate(const package &p, nlohmann::json &parent) const
 {
-    LOG_DBG("Generating package {}", p.name());
+    LOG_DBG("Generating package {}", p.full_name(false));
 
     nlohmann::json j;
     j["id"] = std::to_string(p.id());
     j["name"] = p.name();
-    j["type"] = "namespace";
+    j["type"] = to_string(config().package_type());
     j["display_name"] = p.full_name(false);
     j["is_deprecated"] = p.is_deprecated();
     if (!p.file().empty())
@@ -86,10 +86,12 @@ void generator::generate_diagram(nlohmann::json &parent) const
 {
     if (config().using_namespace)
         parent["using_namespace"] = config().using_namespace().to_string();
+    if (config().using_module)
+        parent["using_module"] = config().using_module();
 
     parent["name"] = model().name();
     parent["diagram_type"] = "package";
-
+    parent["package_type"] = to_string(config().package_type());
     parent["elements"] = std::vector<nlohmann::json>{};
     parent["relationships"] = std::vector<nlohmann::json>{};
 
diff --git a/src/package_diagram/model/diagram.h b/src/package_diagram/model/diagram.h
index f995d86b..0215ae56 100644
--- a/src/package_diagram/model/diagram.h
+++ b/src/package_diagram/model/diagram.h
@@ -260,35 +260,29 @@ bool diagram::add_with_module_path(
 
     // Make sure all parent modules are already packages in the
     // model
-    std::string module_path = p->using_namespace().to_string();
+    auto module_relative_to = path{p->using_namespace()};
+
     for (auto it = parent_path.begin(); it != parent_path.end(); it++) {
         auto pkg = std::make_unique<common::model::package>(
             p->using_namespace(), common::model::path_type::kModule);
         pkg->set_name(*it);
 
-        auto ns = common::model::path(
+        auto module_relative_part = common::model::path(
             parent_path.begin(), it, common::model::path_type::kModule);
-        pkg->set_module(module_path);
-        pkg->set_namespace(ns);
 
-        std::string package_id_path;
-        if (module_path.empty())
-            package_id_path = pkg->name();
-        else
-            package_id_path = module_path + "." + pkg->name();
+        auto module_absolute_path = module_relative_to | module_relative_part;
+        pkg->set_module(module_absolute_path.to_string());
+        pkg->set_namespace(module_absolute_path);
 
-        pkg->set_id(common::to_id(package_id_path));
+        auto package_absolute_path = module_absolute_path | pkg->name();
+
+        pkg->set_id(common::to_id(package_absolute_path.to_string()));
 
         auto p_ref = std::ref(*pkg);
 
-        auto res = add_element(ns, std::move(pkg));
+        auto res = add_element(module_relative_part, std::move(pkg));
         if (res)
             element_view<ElementT>::add(p_ref);
-
-        if (module_path.empty())
-            module_path = *it;
-        else
-            module_path += fmt::format(".{}", *it);
     }
 
     auto p_ref = std::ref(*p);
diff --git a/src/package_diagram/visitor/translation_unit_visitor.cc b/src/package_diagram/visitor/translation_unit_visitor.cc
index e2fd4f7a..9d00d7ca 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.cc
+++ b/src/package_diagram/visitor/translation_unit_visitor.cc
@@ -270,7 +270,7 @@ void translation_unit_visitor::add_relationships(
         // This is for diagram filters
         pkg->set_module(module_path.to_string());
         // This is for rendering nested package structure
-        pkg->set_namespace(parent_path);
+        pkg->set_namespace(module_path);
         set_source_location(*cls, *pkg);
 
         if (diagram().should_include(*pkg))
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2d105273..1ac5a3ed 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,7 +7,8 @@ file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml
                                    test_compilation_database_data/*.json)
 
 set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065 t00069)
-set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071 t30012 t30013)
+set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071
+                                       t30012 t30013 t30014 t30015)
 
 if(ENABLE_CXX_MODULES_TEST_CASES)
     foreach(CXX20_MOD_TC ${TEST_CASES_REQUIRING_CXX20_MODULES})
diff --git a/tests/t30012/test_case.h b/tests/t30012/test_case.h
index de394bda..d5e51c03 100644
--- a/tests/t30012/test_case.h
+++ b/tests/t30012/test_case.h
@@ -50,6 +50,12 @@ TEST_CASE("t30012", "[test-case][package]")
 
         using namespace json;
 
+        REQUIRE(IsPackage(j, "app", "module"));
+        REQUIRE(IsPackage(j, "app.lib1", "module"));
+        REQUIRE(IsPackage(j, "app.lib2", "module"));
+        REQUIRE(IsPackage(j, "app.lib1.mod1", "module"));
+        REQUIRE(IsPackage(j, "app.lib1.mod2", "module"));
+
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
 
diff --git a/tests/t30013/t30013.cc b/tests/t30013/t30013.cc
index 8bba7195..75dcd332 100644
--- a/tests/t30013/t30013.cc
+++ b/tests/t30013/t30013.cc
@@ -1,4 +1,5 @@
 import t30013.app;
+import t30013.mod1;
 import t30013.mod2;
 import t30013.mod3;
 import t30013.mod4;
diff --git a/tests/t30013/test_case.h b/tests/t30013/test_case.h
index 96589efe..c87b21cd 100644
--- a/tests/t30013/test_case.h
+++ b/tests/t30013/test_case.h
@@ -83,25 +83,25 @@ TEST_CASE("t30013", "[test-case][package]")
 
         using namespace json;
 
-        REQUIRE(IsPackage(j, "app"));
-        REQUIRE(IsPackage(j, "mod1"));
-        REQUIRE(IsPackage(j, "mod2"));
-        REQUIRE(IsPackage(j, "mod3"));
-        REQUIRE(IsPackage(j, "mod4"));
-        REQUIRE(IsPackage(j, "mod5"));
-        REQUIRE(IsPackage(j, "mod6"));
-        REQUIRE(IsPackage(j, "mod7"));
-        REQUIRE(IsPackage(j, "mod8"));
-        REQUIRE(IsPackage(j, "mod9"));
-        REQUIRE(IsPackage(j, "mod10"));
-        REQUIRE(IsPackage(j, "mod11"));
-        REQUIRE(IsPackage(j, "mod12"));
-        REQUIRE(IsPackage(j, "mod13"));
-        REQUIRE(IsPackage(j, "mod14"));
-        REQUIRE(IsPackage(j, "mod15"));
-        REQUIRE(IsPackage(j, "mod16"));
-        REQUIRE(IsPackage(j, "mod17"));
-        REQUIRE(IsPackage(j, "mod18"));
+        REQUIRE(IsPackage(j, "app", "module"));
+        REQUIRE(IsPackage(j, "mod1", "module"));
+        REQUIRE(IsPackage(j, "mod2", "module"));
+        REQUIRE(IsPackage(j, "mod3", "module"));
+        REQUIRE(IsPackage(j, "mod4", "module"));
+        REQUIRE(IsPackage(j, "mod5", "module"));
+        REQUIRE(IsPackage(j, "mod6", "module"));
+        REQUIRE(IsPackage(j, "mod7", "module"));
+        REQUIRE(IsPackage(j, "mod8", "module"));
+        REQUIRE(IsPackage(j, "mod9", "module"));
+        REQUIRE(IsPackage(j, "mod10", "module"));
+        REQUIRE(IsPackage(j, "mod11", "module"));
+        REQUIRE(IsPackage(j, "mod12", "module"));
+        REQUIRE(IsPackage(j, "mod13", "module"));
+        REQUIRE(IsPackage(j, "mod14", "module"));
+        REQUIRE(IsPackage(j, "mod15", "module"));
+        REQUIRE(IsPackage(j, "mod16", "module"));
+        REQUIRE(IsPackage(j, "mod17", "module"));
+        REQUIRE(IsPackage(j, "mod18", "module"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30014/test_case.h b/tests/t30014/test_case.h
index 24db12d4..898ca2ba 100644
--- a/tests/t30014/test_case.h
+++ b/tests/t30014/test_case.h
@@ -50,6 +50,12 @@ TEST_CASE("t30014", "[test-case][package]")
 
         using namespace json;
 
+        REQUIRE(IsPackage(j, "app", "module"));
+        REQUIRE(IsPackage(j, "app:lib1", "module"));
+        REQUIRE(IsPackage(j, "app:lib2", "module"));
+        REQUIRE(IsPackage(j, "app:lib1.mod1", "module"));
+        REQUIRE(!IsPackage(j, "app:lib1.mod2", "module"));
+
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
 
diff --git a/tests/t30015/.clang-uml b/tests/t30015/.clang-uml
new file mode 100644
index 00000000..1be20718
--- /dev/null
+++ b/tests/t30015/.clang-uml
@@ -0,0 +1,10 @@
+diagrams:
+  t30015_package:
+    type: package
+    glob:
+      - t30015.cc
+    package_type: module
+    include:
+      modules:
+        - t30015
+    using_module: t30015
\ No newline at end of file
diff --git a/tests/t30015/src/app.cppm b/tests/t30015/src/app.cppm
new file mode 100644
index 00000000..22da8d4e
--- /dev/null
+++ b/tests/t30015/src/app.cppm
@@ -0,0 +1,72 @@
+module;
+
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+export module t30015.app;
+import t30015.lib1;
+
+// import t30015.app;
+// import t30015.mod2;
+// import t30015.mod3;
+// import t30015.mod4;
+// import t30015.mod5;
+// import t30015.mod6;
+// import t30015.mod7;
+// import t30015.mod8;
+// import t30015.mod9;
+// import t30015.mod10;
+// import t30015.mod11;
+// import t30015.mod12;
+// import t30015.mod13;
+// import t30015.mod14;
+// import t30015.mod15;
+// import t30015.mod16;
+// import t30015.mod17;
+// import t30015.mod18;
+
+export namespace clanguml::t30015 {
+
+class CBA : public CF {
+public:
+    CA *ca_;
+    CB<int> cb_;
+    std::shared_ptr<CC> cc_;
+    std::map<std::string, std::unique_ptr<CD>> *cd_;
+    std::array<CO, 5> co_;
+    static CP *cp_;
+
+    CBA() = default;
+
+    CBA(CN *cn) { }
+
+    friend CR;
+
+    template <typename... Item> CBA(std::tuple<Item...> &items) { }
+
+    void ce(const std::vector<CE> /*ce_*/) { }
+
+    std::shared_ptr<CG> cg() { return {}; }
+
+    template <typename T> void ch(std::map<T, std::shared_ptr<CH>> &ch_) { }
+
+    template <typename T> std::map<T, std::shared_ptr<CI>> ci(T * /*t*/)
+    {
+        return {};
+    }
+
+    S s;
+};
+
+void cj(std::unique_ptr<CJ> /*cj_*/) { }
+
+std::unique_ptr<CK> ck() { return {}; }
+
+template <typename T> void cl(std::map<T, std::shared_ptr<CL>> & /*ch_*/) { }
+
+template <typename T> std::map<T, std::shared_ptr<CM>> cm() { return {}; }
+
+} // namespace clanguml::t30013
\ No newline at end of file
diff --git a/tests/t30015/src/lib1.cppm b/tests/t30015/src/lib1.cppm
new file mode 100644
index 00000000..3877d626
--- /dev/null
+++ b/tests/t30015/src/lib1.cppm
@@ -0,0 +1,24 @@
+export module t30015.lib1;
+
+export import :mod1;
+export import :mod2;
+export import :mod3;
+export import :mod4;
+export import :mod5;
+export import :mod6;
+export import :mod7;
+export import :mod8;
+export import :mod9;
+export import :mod10;
+export import :mod11;
+export import :mod12;
+export import :mod13;
+export import :mod14;
+export import :mod15;
+export import :mod16;
+export import :mod17;
+export import :mod18;
+
+export namespace clanguml::t30015 {
+
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod1.cppm b/tests/t30015/src/mod1.cppm
new file mode 100644
index 00000000..5b561d48
--- /dev/null
+++ b/tests/t30015/src/mod1.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod1;
+
+export namespace clanguml::t30015 {
+struct CA { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod10.cppm b/tests/t30015/src/mod10.cppm
new file mode 100644
index 00000000..c52c9f28
--- /dev/null
+++ b/tests/t30015/src/mod10.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod10;
+
+export namespace clanguml::t30015 {
+struct CJ { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod11.cppm b/tests/t30015/src/mod11.cppm
new file mode 100644
index 00000000..756088b6
--- /dev/null
+++ b/tests/t30015/src/mod11.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod11;
+
+export namespace clanguml::t30015 {
+struct CK { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod12.cppm b/tests/t30015/src/mod12.cppm
new file mode 100644
index 00000000..33513171
--- /dev/null
+++ b/tests/t30015/src/mod12.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod12;
+
+export namespace clanguml::t30015 {
+struct CL { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod13.cppm b/tests/t30015/src/mod13.cppm
new file mode 100644
index 00000000..fcac26ef
--- /dev/null
+++ b/tests/t30015/src/mod13.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod13;
+
+export namespace clanguml::t30015 {
+struct CM { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod14.cppm b/tests/t30015/src/mod14.cppm
new file mode 100644
index 00000000..89d748d9
--- /dev/null
+++ b/tests/t30015/src/mod14.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod14;
+
+export namespace clanguml::t30015 {
+struct CN { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod15.cppm b/tests/t30015/src/mod15.cppm
new file mode 100644
index 00000000..49d8c63a
--- /dev/null
+++ b/tests/t30015/src/mod15.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod15;
+
+export namespace clanguml::t30015 {
+struct CO { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod16.cppm b/tests/t30015/src/mod16.cppm
new file mode 100644
index 00000000..6ea292f3
--- /dev/null
+++ b/tests/t30015/src/mod16.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod16;
+
+export namespace clanguml::t30015 {
+struct CP { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod17.cppm b/tests/t30015/src/mod17.cppm
new file mode 100644
index 00000000..b2e6979b
--- /dev/null
+++ b/tests/t30015/src/mod17.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod17;
+
+export namespace clanguml::t30015 {
+struct CR { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod18.cppm b/tests/t30015/src/mod18.cppm
new file mode 100644
index 00000000..8b452b1d
--- /dev/null
+++ b/tests/t30015/src/mod18.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod18;
+
+export namespace clanguml::t30015 {
+enum class S { s1, s2, s3 };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod2.cppm b/tests/t30015/src/mod2.cppm
new file mode 100644
index 00000000..5ddfa19d
--- /dev/null
+++ b/tests/t30015/src/mod2.cppm
@@ -0,0 +1,7 @@
+export module t30015.lib1:mod2;
+
+export namespace clanguml::t30015 {
+template <typename T> struct CB {
+    T cb;
+};
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod3.cppm b/tests/t30015/src/mod3.cppm
new file mode 100644
index 00000000..7711abd6
--- /dev/null
+++ b/tests/t30015/src/mod3.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod3;
+
+export namespace clanguml::t30015 {
+struct CC { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod4.cppm b/tests/t30015/src/mod4.cppm
new file mode 100644
index 00000000..4d07765b
--- /dev/null
+++ b/tests/t30015/src/mod4.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod4;
+
+export namespace clanguml::t30015 {
+struct CD { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod5.cppm b/tests/t30015/src/mod5.cppm
new file mode 100644
index 00000000..31ab043c
--- /dev/null
+++ b/tests/t30015/src/mod5.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod5;
+
+export namespace clanguml::t30015 {
+struct CE { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod6.cppm b/tests/t30015/src/mod6.cppm
new file mode 100644
index 00000000..6c9de47d
--- /dev/null
+++ b/tests/t30015/src/mod6.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod6;
+
+export namespace clanguml::t30015 {
+struct CF { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod7.cppm b/tests/t30015/src/mod7.cppm
new file mode 100644
index 00000000..9e8bda51
--- /dev/null
+++ b/tests/t30015/src/mod7.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod7;
+
+export namespace clanguml::t30015 {
+struct CG { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod8.cppm b/tests/t30015/src/mod8.cppm
new file mode 100644
index 00000000..ca717b6f
--- /dev/null
+++ b/tests/t30015/src/mod8.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod8;
+
+export namespace clanguml::t30015 {
+struct CH { };
+}
\ No newline at end of file
diff --git a/tests/t30015/src/mod9.cppm b/tests/t30015/src/mod9.cppm
new file mode 100644
index 00000000..f9a139b9
--- /dev/null
+++ b/tests/t30015/src/mod9.cppm
@@ -0,0 +1,5 @@
+export module t30015.lib1:mod9;
+
+export namespace clanguml::t30015 {
+struct CI { };
+}
\ No newline at end of file
diff --git a/tests/t30015/t30015.cc b/tests/t30015/t30015.cc
new file mode 100644
index 00000000..edc3de2d
--- /dev/null
+++ b/tests/t30015/t30015.cc
@@ -0,0 +1,6 @@
+import t30015.app;
+
+namespace clanguml {
+namespace t30015 {
+}
+}
\ No newline at end of file
diff --git a/tests/t30015/test_case.h b/tests/t30015/test_case.h
new file mode 100644
index 00000000..8aab68fb
--- /dev/null
+++ b/tests/t30015/test_case.h
@@ -0,0 +1,160 @@
+/**
+ * tests/t30015/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t30015", "[test-case][package]")
+{
+    auto [config, db] = load_config("t30015");
+
+    auto diagram = config.diagrams["t30015_package"];
+
+    REQUIRE(diagram->name == "t30015_package");
+
+    auto model = generate_package_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t30015_package");
+
+    {
+        auto src = generate_package_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        // Check if all packages exist
+        REQUIRE_THAT(src, IsPackage("app"));
+        REQUIRE_THAT(src, IsPackage("lib1"));
+        REQUIRE_THAT(src, IsPackage(":mod1"));
+        REQUIRE_THAT(src, IsPackage(":mod2"));
+        REQUIRE_THAT(src, IsPackage(":mod3"));
+        REQUIRE_THAT(src, IsPackage(":mod4"));
+        REQUIRE_THAT(src, IsPackage(":mod5"));
+        REQUIRE_THAT(src, IsPackage(":mod6"));
+        REQUIRE_THAT(src, IsPackage(":mod7"));
+        REQUIRE_THAT(src, IsPackage(":mod8"));
+        REQUIRE_THAT(src, IsPackage(":mod9"));
+        REQUIRE_THAT(src, IsPackage(":mod10"));
+        REQUIRE_THAT(src, IsPackage(":mod11"));
+        REQUIRE_THAT(src, IsPackage(":mod12"));
+        REQUIRE_THAT(src, IsPackage(":mod13"));
+        REQUIRE_THAT(src, IsPackage(":mod14"));
+        REQUIRE_THAT(src, IsPackage(":mod15"));
+        REQUIRE_THAT(src, IsPackage(":mod16"));
+        REQUIRE_THAT(src, IsPackage(":mod17"));
+        REQUIRE_THAT(src, IsPackage(":mod18"));
+
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod1")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod2")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod3")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod4")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod5")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod6")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod7")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod8")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod9")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod10")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod11")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod12")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod13")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod14")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod15")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod16")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod17")));
+        REQUIRE_THAT(src, IsDependency(_A("app"), _A(":mod18")));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_package_json(diagram, *model);
+
+        using namespace json;
+
+        REQUIRE(IsPackage(j, "app", "module"));
+        REQUIRE(IsPackage(j, "lib1", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod1", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod2", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod3", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod4", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod5", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod6", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod7", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod8", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod9", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod10", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod11", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod12", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod13", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod14", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod15", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod16", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod17", "module"));
+        REQUIRE(IsPackage(j, "lib1:mod18", "module"));
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_package_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsPackage;
+        using mermaid::IsPackageDependency;
+
+        REQUIRE_THAT(src, IsPackage(_A("app")));
+        REQUIRE_THAT(src, IsPackage(_A("lib1")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod1")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod2")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod3")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod4")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod5")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod6")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod7")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod8")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod9")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod10")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod11")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod12")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod13")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod14")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod15")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod16")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod17")));
+        REQUIRE_THAT(src, IsPackage(_A(":mod18")));
+
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod1")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod2")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod3")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod4")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod5")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod6")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod7")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod8")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod9")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod10")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod11")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod12")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod13")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod14")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod15")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod16")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod17")));
+        REQUIRE_THAT(src, IsPackageDependency(_A("app"), _A(":mod18")));
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 8906bbb0..c53a9840 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -476,6 +476,7 @@ using namespace clanguml::test::matchers;
 #include "t30012/test_case.h"
 #include "t30013/test_case.h"
 #include "t30014/test_case.h"
+#include "t30015/test_case.h"
 #endif
 ///
 /// Include diagram tests
@@ -520,4 +521,4 @@ int main(int argc, char *argv[])
     clih.handle_options(argvv.size(), argvv.data());
 
     return session.run();
-}
+}
\ No newline at end of file
diff --git a/tests/test_cases.h b/tests/test_cases.h
index 0c9860ee..ede7b074 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -1210,7 +1210,8 @@ std::optional<nlohmann::json> get_element(
         if (e["display_name"] == name)
             return {e};
 
-        if (e["type"] == "namespace" || e["type"] == "folder") {
+        if (e["type"] == "namespace" || e["type"] == "folder" ||
+            e["type"] == "module") {
             auto maybe_e = get_element(e, name);
             if (maybe_e)
                 return maybe_e;
@@ -1258,13 +1259,35 @@ auto get_relationship(const nlohmann::json &j, const std::string &from,
 
 std::string expand_name(const nlohmann::json &j, const std::string &name)
 {
-    if (!j.contains("using_namespace"))
-        return name;
+    using clanguml::class_diagram::model::path_type;
+    using clanguml::common::model::path;
+    using config::package_type_t;
 
-    if (name.find("::") == 0)
-        return name;
+    if (!j.contains("package_type") ||
+        j["package_type"] == to_string(package_type_t::kNamespace)) {
+        if (!j.contains("using_namespace"))
+            return name;
 
-    return fmt::format("{}::{}", j["using_namespace"].get<std::string>(), name);
+        auto full_path = path{j["using_namespace"].get<std::string>()};
+        full_path |= path{name};
+
+        return full_path.to_string();
+    }
+
+    if (j["package_type"] == to_string(package_type_t::kModule)) {
+        if (!j.contains("using_module"))
+            return name;
+
+        auto full_path =
+            path{j["using_module"].get<std::string>(), path_type::kModule};
+        full_path |= path{name, path_type::kModule};
+
+        auto res = full_path.to_string();
+
+        return res;
+    }
+
+    return name;
 }
 
 bool HasTitle(const nlohmann::json &j, const std::string &title)
@@ -1318,10 +1341,11 @@ bool IsEnum(const nlohmann::json &j, const std::string &name)
     return e && e->at("type") == "enum";
 }
 
-bool IsPackage(const nlohmann::json &j, const std::string &name)
+bool IsPackage(const nlohmann::json &j, const std::string &name,
+    const std::string &type = "namespace")
 {
     auto e = get_element(j, expand_name(j, name));
-    return e && e->at("type") == "namespace";
+    return e && e->at("type") == type;
 }
 
 bool IsFolder(const nlohmann::json &j, const std::string &name)
diff --git a/tests/test_cases.yaml b/tests/test_cases.yaml
index 5b92936b..3f208020 100644
--- a/tests/test_cases.yaml
+++ b/tests/test_cases.yaml
@@ -368,6 +368,9 @@ test_cases:
     - name: t30014
       title: C++20 modules package diagram test with partitions
       description:
+    - name: t30015
+      title: C++20 modules package diagram test with partition dependencies
+      description:
   Include diagrams:
     - name: t40001
       title: Basic include graph diagram test case
diff --git a/tests/test_model.cc b/tests/test_model.cc
index d61c45d5..680d7cc8 100644
--- a/tests/test_model.cc
+++ b/tests/test_model.cc
@@ -21,6 +21,7 @@
 
 #include "class_diagram/model/class.h"
 #include "common/model/namespace.h"
+#include "common/model/package.h"
 #include "common/model/template_parameter.h"
 
 TEST_CASE("Test namespace_", "[unit-test]")
@@ -407,3 +408,53 @@ TEST_CASE(
         CHECK(tp1.calculate_specialization_match(tp2) == 0);
     }
 }
+
+TEST_CASE("Test common::model::package full_name", "[unit-test]")
+{
+    using clanguml::common::model::package;
+    using clanguml::common::model::path;
+    using clanguml::common::model::path_type;
+
+    {
+        auto using_namespace = path{"A::B::C"};
+        auto pkg = package(using_namespace);
+        pkg.set_name("G");
+        pkg.set_namespace(path{"A::B::C::D::E::F"});
+
+        CHECK(pkg.full_name(false) == "A::B::C::D::E::F::G");
+        CHECK(pkg.full_name(true) == "D::E::F::G");
+
+        CHECK(pkg.doxygen_link().value() ==
+            "namespaceA_1_1B_1_1C_1_1D_1_1E_1_1F_1_1G.html");
+    }
+
+    {
+        auto using_namespace = path{"/A/B/C", path_type::kFilesystem};
+        auto pkg = package(using_namespace, path_type::kFilesystem);
+        pkg.set_name("G");
+        pkg.set_namespace(path{"/A/B/C/D/E/F", path_type::kFilesystem});
+
+        CHECK(pkg.full_name(false) == "A/B/C/D/E/F/G");
+        CHECK(pkg.full_name(true) == "D/E/F/G");
+    }
+
+    {
+        auto using_namespace = path{"A.B.C", path_type::kModule};
+        auto pkg = package(using_namespace, path_type::kModule);
+        pkg.set_name("G");
+        pkg.set_namespace(path{"A.B.C.D:E.F", path_type::kModule});
+
+        CHECK(pkg.full_name(false) == "A.B.C.D:E.F.G");
+        CHECK(pkg.full_name(true) == "D:E.F.G");
+    }
+
+    {
+        auto using_namespace = path{"A.B.C", path_type::kModule};
+        auto pkg = package(using_namespace, path_type::kModule);
+        pkg.set_name(":D");
+        pkg.set_namespace(path{"A.B.C", path_type::kModule});
+
+        CHECK(pkg.full_name(false) == "A.B.C:D");
+        CHECK(pkg.full_name(true) == ":D");
+    }
+}
\ No newline at end of file

From edfaabd4fa101b3da43cb667ecd973d3252eadc7 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Mon, 25 Dec 2023 17:21:53 +0100
Subject: [PATCH 11/24] Added class diagram test case with C++20 module
 partitions

---
 .../json/class_diagram_generator.cc           |   5 +
 src/class_diagram/model/diagram.cc            |  12 +++
 src/class_diagram/model/diagram.h             |  57 ++++++++--
 .../visitor/translation_unit_visitor.cc       |   2 +-
 tests/CMakeLists.txt                          |   2 +-
 tests/t00072/.clang-uml                       |  12 +++
 tests/t00072/src/lib1.cppm                    |  13 +++
 tests/t00072/src/lib1mod1.cppm                |   5 +
 tests/t00072/src/lib1mod2.cppm                |   5 +
 tests/t00072/src/lib2.cppm                    |  13 +++
 tests/t00072/src/t00072_mod.cppm              |  13 +++
 tests/t00072/t00072.cc                        |   6 ++
 tests/t00072/test_case.h                      | 102 ++++++++++++++++++
 tests/t30012/test_case.h                      |  10 +-
 tests/t30013/test_case.h                      |  38 +++----
 tests/t30014/test_case.h                      |  10 +-
 tests/t30015/test_case.h                      |  40 +++----
 tests/test_cases.cc                           |   1 +
 tests/test_cases.h                            |  24 +++--
 tests/test_cases.yaml                         |   3 +
 20 files changed, 305 insertions(+), 68 deletions(-)
 create mode 100644 tests/t00072/.clang-uml
 create mode 100644 tests/t00072/src/lib1.cppm
 create mode 100644 tests/t00072/src/lib1mod1.cppm
 create mode 100644 tests/t00072/src/lib1mod2.cppm
 create mode 100644 tests/t00072/src/lib2.cppm
 create mode 100644 tests/t00072/src/t00072_mod.cppm
 create mode 100644 tests/t00072/t00072.cc
 create mode 100644 tests/t00072/test_case.h

diff --git a/src/class_diagram/generators/json/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc
index 14a67dde..e637de97 100644
--- a/src/class_diagram/generators/json/class_diagram_generator.cc
+++ b/src/class_diagram/generators/json/class_diagram_generator.cc
@@ -139,6 +139,11 @@ void generator::generate_diagram(nlohmann::json &parent) const
     if (config().using_namespace)
         parent["using_namespace"] = config().using_namespace().to_string();
 
+    if (config().using_module)
+        parent["using_module"] = config().using_module();
+
+    if (config().generate_packages.has_value)
+        parent["package_type"] = to_string(config().package_type());
     parent["elements"] = std::vector<nlohmann::json>{};
     parent["relationships"] = std::vector<nlohmann::json>{};
 
diff --git a/src/class_diagram/model/diagram.cc b/src/class_diagram/model/diagram.cc
index 64c53dc6..0831b830 100644
--- a/src/class_diagram/model/diagram.cc
+++ b/src/class_diagram/model/diagram.cc
@@ -116,6 +116,18 @@ bool diagram::add_with_filesystem_path<common::model::package>(
     return add_element(ns, std::move(p));
 }
 
+template <>
+bool diagram::add_with_module_path<common::model::package>(
+    const common::model::path & /*parent_path*/,
+    std::unique_ptr<common::model::package> &&p)
+{
+    LOG_DBG("Adding module package: {}, {}", p->name(), p->full_name(true));
+
+    auto ns = p->get_relative_namespace();
+
+    return add_element(ns, std::move(p));
+}
+
 void diagram::get_parents(
     clanguml::common::reference_set<class_> &parents) const
 {
diff --git a/src/class_diagram/model/diagram.h b/src/class_diagram/model/diagram.h
index 546bb717..12906916 100644
--- a/src/class_diagram/model/diagram.h
+++ b/src/class_diagram/model/diagram.h
@@ -203,6 +203,10 @@ public:
             return add_with_namespace_path(std::move(e));
         }
 
+        if (parent_path.type() == common::model::path_type::kModule) {
+            return add_with_module_path(parent_path, std::move(e));
+        }
+
         return add_with_filesystem_path(parent_path, std::move(e));
     }
 
@@ -224,8 +228,6 @@ public:
      */
     void get_parents(clanguml::common::reference_set<class_> &parents) const;
 
-    friend void print_diagram_tree(const diagram &d, int level);
-
     /**
      * @brief Check if diagram contains element by id.
      *
@@ -252,6 +254,10 @@ private:
     template <typename ElementT>
     bool add_with_namespace_path(std::unique_ptr<ElementT> &&e);
 
+    template <typename ElementT>
+    bool add_with_module_path(
+        const common::model::path &parent_path, std::unique_ptr<ElementT> &&e);
+
     template <typename ElementT>
     bool add_with_filesystem_path(
         const common::model::path &parent_path, std::unique_ptr<ElementT> &&e);
@@ -317,19 +323,53 @@ bool diagram::add_with_namespace_path(std::unique_ptr<ElementT> &&e)
     return false;
 }
 
+template <typename ElementT>
+bool diagram::add_with_module_path(
+    const common::model::path &parent_path, std::unique_ptr<ElementT> &&e)
+{
+    const auto element_type = e->type_name();
+
+    // Make sure all parent modules are already packages in the
+    // model
+    for (auto it = parent_path.begin(); it != parent_path.end(); it++) {
+        auto pkg = std::make_unique<common::model::package>(
+            e->using_namespace(), parent_path.type());
+        pkg->set_name(*it);
+        auto ns =
+            common::model::path(parent_path.begin(), it, parent_path.type());
+        // ns.pop_back();
+        pkg->set_namespace(ns);
+        pkg->set_id(common::to_id(pkg->full_name(false)));
+
+        add(ns, std::move(pkg));
+    }
+
+    const auto base_name = e->name();
+    const auto full_name = e->full_name(false);
+    auto &e_ref = *e;
+
+    if (add_element(parent_path, std::move(e))) {
+        element_view<ElementT>::add(std::ref(e_ref));
+        return true;
+    }
+
+    return false;
+}
+
 template <typename ElementT>
 bool diagram::add_with_filesystem_path(
     const common::model::path &parent_path, std::unique_ptr<ElementT> &&e)
 {
     const auto element_type = e->type_name();
 
-    // Make sure all parent directories are already packages in the
+    // Make sure all parent modules are already packages in the
     // model
     for (auto it = parent_path.begin(); it != parent_path.end(); it++) {
-        auto pkg =
-            std::make_unique<common::model::package>(e->using_namespace());
+        auto pkg = std::make_unique<common::model::package>(
+            e->using_namespace(), parent_path.type());
         pkg->set_name(*it);
-        auto ns = common::model::path(parent_path.begin(), it);
+        auto ns =
+            common::model::path(parent_path.begin(), it, parent_path.type());
         // ns.pop_back();
         pkg->set_namespace(ns);
         pkg->set_id(common::to_id(pkg->full_name(false)));
@@ -405,6 +445,11 @@ template <>
 bool diagram::add_with_namespace_path<common::model::package>(
     std::unique_ptr<common::model::package> &&p);
 
+template <>
+bool diagram::add_with_module_path<common::model::package>(
+    const common::model::path &parent_path,
+    std::unique_ptr<common::model::package> &&p);
+
 template <>
 bool diagram::add_with_filesystem_path<common::model::package>(
     const common::model::path &parent_path,
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 489b48b3..907c742f 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -213,7 +213,7 @@ bool translation_unit_visitor::VisitClassTemplateSpecializationDecl(
     }
 
     if (!template_specialization.template_specialization_found()) {
-        // Only do this if we haven't found a bettern specialization during
+        // Only do this if we haven't found a better specialization during
         // construction of the template specialization
         const auto maybe_id =
             id_mapper().get_global_id(cls->getSpecializedTemplate()->getID());
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1ac5a3ed..594857ad 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml
                                    test_compilation_database_data/*.json)
 
 set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065 t00069)
-set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071
+set(TEST_CASES_REQUIRING_CXX20_MODULES t00070 t00071 t00072
                                        t30012 t30013 t30014 t30015)
 
 if(ENABLE_CXX_MODULES_TEST_CASES)
diff --git a/tests/t00072/.clang-uml b/tests/t00072/.clang-uml
new file mode 100644
index 00000000..29b85640
--- /dev/null
+++ b/tests/t00072/.clang-uml
@@ -0,0 +1,12 @@
+diagrams:
+  t00072_class:
+    type: class
+    glob:
+      - t00072.cc
+    generate_packages: true
+    package_type: module
+    include:
+      modules:
+        - t00072
+    using_module: t00072
+    using_namespace: clanguml::t00072
\ No newline at end of file
diff --git a/tests/t00072/src/lib1.cppm b/tests/t00072/src/lib1.cppm
new file mode 100644
index 00000000..8c4cc928
--- /dev/null
+++ b/tests/t00072/src/lib1.cppm
@@ -0,0 +1,13 @@
+export module t00072.app:lib1;
+
+export namespace clanguml::t00072 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+}
\ No newline at end of file
diff --git a/tests/t00072/src/lib1mod1.cppm b/tests/t00072/src/lib1mod1.cppm
new file mode 100644
index 00000000..106b822e
--- /dev/null
+++ b/tests/t00072/src/lib1mod1.cppm
@@ -0,0 +1,5 @@
+export module t00072.app:lib1.mod1;
+
+export namespace clanguml::t00072 {
+class D { };
+}
\ No newline at end of file
diff --git a/tests/t00072/src/lib1mod2.cppm b/tests/t00072/src/lib1mod2.cppm
new file mode 100644
index 00000000..4cb25b28
--- /dev/null
+++ b/tests/t00072/src/lib1mod2.cppm
@@ -0,0 +1,5 @@
+export module t00072.app:lib1.mod2;
+
+export namespace clanguml::t00072 {
+class E { };
+}
\ No newline at end of file
diff --git a/tests/t00072/src/lib2.cppm b/tests/t00072/src/lib2.cppm
new file mode 100644
index 00000000..617c545d
--- /dev/null
+++ b/tests/t00072/src/lib2.cppm
@@ -0,0 +1,13 @@
+export module t00072.app:lib2;
+
+export namespace clanguml::t00072 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+namespace detail {
+enum class CCC { ccc1, ccc2 };
+}
+}
\ No newline at end of file
diff --git a/tests/t00072/src/t00072_mod.cppm b/tests/t00072/src/t00072_mod.cppm
new file mode 100644
index 00000000..ad905d03
--- /dev/null
+++ b/tests/t00072/src/t00072_mod.cppm
@@ -0,0 +1,13 @@
+export module t00072.app;
+export import :lib1;
+export import :lib1.mod1;
+export import :lib1.mod2;
+export import :lib2;
+
+export namespace clanguml::t00072 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
\ No newline at end of file
diff --git a/tests/t00072/t00072.cc b/tests/t00072/t00072.cc
new file mode 100644
index 00000000..d7dc2f1f
--- /dev/null
+++ b/tests/t00072/t00072.cc
@@ -0,0 +1,6 @@
+import t00072.app;
+
+namespace clanguml {
+namespace t00072 {
+}
+}
\ No newline at end of file
diff --git a/tests/t00072/test_case.h b/tests/t00072/test_case.h
new file mode 100644
index 00000000..e67071fc
--- /dev/null
+++ b/tests/t00072/test_case.h
@@ -0,0 +1,102 @@
+/**
+ * tests/t00072/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t00072", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00072");
+
+    auto diagram = config.diagrams["t00072_class"];
+
+    REQUIRE(diagram->name == "t00072_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00072_class");
+
+    {
+        auto src = generate_class_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        // Check if all classes exist
+        REQUIRE_THAT(src, IsPackage("app"));
+        REQUIRE_THAT(src, IsPackage(":lib1"));
+        REQUIRE_THAT(src, IsPackage(":lib2"));
+        REQUIRE_THAT(src, IsPackage("mod1"));
+        REQUIRE_THAT(src, IsPackage("mod2"));
+
+        REQUIRE_THAT(src, IsClass(_A("A")));
+        REQUIRE_THAT(src, IsClass(_A("C")));
+        REQUIRE_THAT(src, IsClassTemplate("CC", "T"));
+        REQUIRE_THAT(src, IsEnum(_A("detail::CCC")));
+
+        REQUIRE_THAT(src, IsClass(_A("B")));
+        REQUIRE_THAT(src, IsClassTemplate("BB", "T"));
+        REQUIRE_THAT(src, IsEnum(_A("detail::BBB")));
+
+        REQUIRE_THAT(src, IsClass(_A("D")));
+        REQUIRE_THAT(src, IsClass(_A("E")));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_class_json(diagram, *model);
+
+        using namespace json;
+
+        REQUIRE(IsClass(j, "clanguml::t00072::A"));
+        REQUIRE(IsClass(j, "clanguml::t00072::B"));
+        REQUIRE(IsClass(j, "clanguml::t00072::C"));
+        REQUIRE(IsClass(j, "clanguml::t00072::D"));
+        REQUIRE(IsEnum(j, "clanguml::t00072::detail::CCC"));
+        REQUIRE(IsEnum(j, "clanguml::t00072::detail::BBB"));
+
+        REQUIRE(IsPackage(j, "app", "module"));
+        REQUIRE(IsPackage(j, "app:lib1", "module"));
+        REQUIRE(IsPackage(j, "app:lib2", "module"));
+        REQUIRE(IsPackage(j, "app:lib1.mod1", "module"));
+        REQUIRE(IsPackage(j, "app:lib1.mod2", "module"));
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_class_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsClass;
+        using mermaid::IsEnum;
+
+        REQUIRE_THAT(src, IsClass(_A("A")));
+        REQUIRE_THAT(src, IsClass(_A("C")));
+        REQUIRE_THAT(src, IsClass(_A("CC<T>")));
+        REQUIRE_THAT(src, IsEnum(_A("detail::CCC")));
+
+        REQUIRE_THAT(src, IsClass(_A("B")));
+        REQUIRE_THAT(src, IsClass(_A("BB<T>")));
+        REQUIRE_THAT(src, IsEnum(_A("detail::BBB")));
+
+        REQUIRE_THAT(src, IsClass(_A("D")));
+        REQUIRE_THAT(src, IsClass(_A("E")));
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/t30012/test_case.h b/tests/t30012/test_case.h
index d5e51c03..a572a28c 100644
--- a/tests/t30012/test_case.h
+++ b/tests/t30012/test_case.h
@@ -50,11 +50,11 @@ TEST_CASE("t30012", "[test-case][package]")
 
         using namespace json;
 
-        REQUIRE(IsPackage(j, "app", "module"));
-        REQUIRE(IsPackage(j, "app.lib1", "module"));
-        REQUIRE(IsPackage(j, "app.lib2", "module"));
-        REQUIRE(IsPackage(j, "app.lib1.mod1", "module"));
-        REQUIRE(IsPackage(j, "app.lib1.mod2", "module"));
+        REQUIRE(IsPackage(j, "t30012.app", "module"));
+        REQUIRE(IsPackage(j, "t30012.app.lib1", "module"));
+        REQUIRE(IsPackage(j, "t30012.app.lib2", "module"));
+        REQUIRE(IsPackage(j, "t30012.app.lib1.mod1", "module"));
+        REQUIRE(IsPackage(j, "t30012.app.lib1.mod2", "module"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30013/test_case.h b/tests/t30013/test_case.h
index c87b21cd..75067652 100644
--- a/tests/t30013/test_case.h
+++ b/tests/t30013/test_case.h
@@ -83,25 +83,25 @@ TEST_CASE("t30013", "[test-case][package]")
 
         using namespace json;
 
-        REQUIRE(IsPackage(j, "app", "module"));
-        REQUIRE(IsPackage(j, "mod1", "module"));
-        REQUIRE(IsPackage(j, "mod2", "module"));
-        REQUIRE(IsPackage(j, "mod3", "module"));
-        REQUIRE(IsPackage(j, "mod4", "module"));
-        REQUIRE(IsPackage(j, "mod5", "module"));
-        REQUIRE(IsPackage(j, "mod6", "module"));
-        REQUIRE(IsPackage(j, "mod7", "module"));
-        REQUIRE(IsPackage(j, "mod8", "module"));
-        REQUIRE(IsPackage(j, "mod9", "module"));
-        REQUIRE(IsPackage(j, "mod10", "module"));
-        REQUIRE(IsPackage(j, "mod11", "module"));
-        REQUIRE(IsPackage(j, "mod12", "module"));
-        REQUIRE(IsPackage(j, "mod13", "module"));
-        REQUIRE(IsPackage(j, "mod14", "module"));
-        REQUIRE(IsPackage(j, "mod15", "module"));
-        REQUIRE(IsPackage(j, "mod16", "module"));
-        REQUIRE(IsPackage(j, "mod17", "module"));
-        REQUIRE(IsPackage(j, "mod18", "module"));
+        REQUIRE(IsPackage(j, "t30013.app", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod1", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod2", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod3", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod4", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod5", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod6", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod7", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod8", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod9", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod10", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod11", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod12", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod13", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod14", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod15", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod16", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod17", "module"));
+        REQUIRE(IsPackage(j, "t30013.mod18", "module"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30014/test_case.h b/tests/t30014/test_case.h
index 898ca2ba..10e90bb0 100644
--- a/tests/t30014/test_case.h
+++ b/tests/t30014/test_case.h
@@ -50,11 +50,11 @@ TEST_CASE("t30014", "[test-case][package]")
 
         using namespace json;
 
-        REQUIRE(IsPackage(j, "app", "module"));
-        REQUIRE(IsPackage(j, "app:lib1", "module"));
-        REQUIRE(IsPackage(j, "app:lib2", "module"));
-        REQUIRE(IsPackage(j, "app:lib1.mod1", "module"));
-        REQUIRE(!IsPackage(j, "app:lib1.mod2", "module"));
+        REQUIRE(IsPackage(j, "t30014.app", "module"));
+        REQUIRE(IsPackage(j, "t30014.app:lib1", "module"));
+        REQUIRE(IsPackage(j, "t30014.app:lib2", "module"));
+        REQUIRE(IsPackage(j, "t30014.app:lib1.mod1", "module"));
+        REQUIRE(!IsPackage(j, "t30014.app:lib1.mod2", "module"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30015/test_case.h b/tests/t30015/test_case.h
index 8aab68fb..3b40ef67 100644
--- a/tests/t30015/test_case.h
+++ b/tests/t30015/test_case.h
@@ -84,26 +84,26 @@ TEST_CASE("t30015", "[test-case][package]")
 
         using namespace json;
 
-        REQUIRE(IsPackage(j, "app", "module"));
-        REQUIRE(IsPackage(j, "lib1", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod1", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod2", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod3", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod4", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod5", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod6", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod7", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod8", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod9", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod10", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod11", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod12", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod13", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod14", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod15", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod16", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod17", "module"));
-        REQUIRE(IsPackage(j, "lib1:mod18", "module"));
+        REQUIRE(IsPackage(j, "t30015.app", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod1", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod2", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod3", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod4", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod5", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod6", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod7", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod8", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod9", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod10", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod11", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod12", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod13", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod14", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod15", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod16", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod17", "module"));
+        REQUIRE(IsPackage(j, "t30015.lib1:mod18", "module"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index c53a9840..e67d3964 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -410,6 +410,7 @@ using namespace clanguml::test::matchers;
 #if defined(ENABLE_CXX_MODULES_TEST_CASES)
 #include "t00070/test_case.h"
 #include "t00071/test_case.h"
+#include "t00072/test_case.h"
 #endif
 
 ///
diff --git a/tests/test_cases.h b/tests/test_cases.h
index ede7b074..4b82c499 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -1211,7 +1211,7 @@ std::optional<nlohmann::json> get_element(
             return {e};
 
         if (e["type"] == "namespace" || e["type"] == "folder" ||
-            e["type"] == "module") {
+            e["type"] == "directory" || e["type"] == "module") {
             auto maybe_e = get_element(e, name);
             if (maybe_e)
                 return maybe_e;
@@ -1275,16 +1275,18 @@ std::string expand_name(const nlohmann::json &j, const std::string &name)
     }
 
     if (j["package_type"] == to_string(package_type_t::kModule)) {
-        if (!j.contains("using_module"))
-            return name;
-
-        auto full_path =
-            path{j["using_module"].get<std::string>(), path_type::kModule};
-        full_path |= path{name, path_type::kModule};
-
-        auto res = full_path.to_string();
-
-        return res;
+        return name;
+        //        if (!j.contains("using_module"))
+        //            return name;
+        //
+        //        auto full_path =
+        //            path{j["using_module"].get<std::string>(),
+        //            path_type::kModule};
+        //        full_path |= path{name, path_type::kModule};
+        //
+        //        auto res = full_path.to_string();
+        //
+        //        return res;
     }
 
     return name;
diff --git a/tests/test_cases.yaml b/tests/test_cases.yaml
index 3f208020..544070c7 100644
--- a/tests/test_cases.yaml
+++ b/tests/test_cases.yaml
@@ -210,6 +210,9 @@ test_cases:
     - name: t00071
       title: Class diagram with C++20 modules generated as packages
       description:
+    - name: t00072
+      title: Class diagram with C++20 module partitions generated as packages
+      description:
   Sequence diagrams:
     - name: t20001
       title: Basic sequence diagram test case

From 9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Wed, 27 Dec 2023 22:04:02 +0100
Subject: [PATCH 12/24] Refactored and unified JSON generators output (#223)

---
 .../json/class_diagram_generator.cc           |   2 +-
 src/common/generators/json/generator.cc       |   2 +-
 src/common/generators/json/generator.h        |   8 +-
 src/common/model/element.h                    |   5 +-
 .../json/package_diagram_generator.cc         |  57 ++++++---
 .../json/sequence_diagram_generator.cc        | 117 +++++++++++------
 .../json/sequence_diagram_generator.h         |   2 +
 src/sequence_diagram/model/participant.cc     |  13 +-
 src/sequence_diagram/model/participant.h      |   8 +-
 .../visitor/translation_unit_visitor.cc       |   4 -
 src/version.h.in                              |   2 +-
 tests/t00002/test_case.h                      |  11 ++
 tests/t00006/test_case.h                      |   7 +-
 tests/t00025/test_case.h                      |   4 +-
 tests/t00027/test_case.h                      |   9 +-
 tests/t00032/test_case.h                      |   4 +-
 tests/t00033/test_case.h                      |  10 +-
 tests/t00036/t00036.cc                        |   6 +-
 tests/t00036/test_case.h                      |  12 +-
 tests/t00044/test_case.h                      |   3 +-
 tests/t00058/test_case.h                      |   3 +-
 tests/t00071/test_case.h                      |   6 +
 tests/t00072/test_case.h                      |  23 ++--
 tests/t20001/test_case.h                      |  23 ++++
 tests/t20014/test_case.h                      |   5 +-
 tests/t20017/test_case.h                      |   8 ++
 tests/t20018/test_case.h                      |   7 +-
 tests/t20019/test_case.h                      |   8 +-
 tests/t20029/test_case.h                      |  13 +-
 tests/t20034/test_case.h                      |  20 ++-
 tests/t20036/test_case.h                      |  18 +--
 tests/t30001/test_case.h                      |  20 +--
 tests/t30002/test_case.h                      |  75 +++++------
 tests/t30003/test_case.h                      |  15 ++-
 tests/t30004/test_case.h                      |  13 +-
 tests/t30005/test_case.h                      |  23 ++--
 tests/t30006/test_case.h                      |   7 +-
 tests/t30007/test_case.h                      |  13 +-
 tests/t30008/test_case.h                      |  25 ++--
 tests/t30009/test_case.h                      |  21 +--
 tests/t30010/test_case.h                      |   7 +
 tests/t30011/test_case.h                      |  12 ++
 tests/t30012/test_case.h                      |  11 +-
 tests/t30013/test_case.h                      |  40 +++---
 tests/t30014/test_case.h                      |  11 +-
 tests/t30015/test_case.h                      |  41 +++---
 tests/test_cases.h                            | 120 ++++++++++++------
 47 files changed, 533 insertions(+), 341 deletions(-)

diff --git a/src/class_diagram/generators/json/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc
index e637de97..1932d4f7 100644
--- a/src/class_diagram/generators/json/class_diagram_generator.cc
+++ b/src/class_diagram/generators/json/class_diagram_generator.cc
@@ -191,7 +191,7 @@ void generator::generate(const package &p, nlohmann::json &parent) const
 
             package_object["type"] = to_string(config().package_type());
             package_object["name"] = p.name();
-            package_object["display_name"] = p.full_name(false);
+            package_object["display_name"] = p.name();
         }
     }
 
diff --git a/src/common/generators/json/generator.cc b/src/common/generators/json/generator.cc
index 9bc7de79..5f9b6c40 100644
--- a/src/common/generators/json/generator.cc
+++ b/src/common/generators/json/generator.cc
@@ -42,7 +42,7 @@ void to_json(nlohmann::json &j, const element &c)
     j = json{{"id", std::to_string(c.id())},
         {"name", detail::render_name(c.name())},
         {"namespace", c.get_namespace().to_string()}, {"type", c.type_name()},
-        {"display_name", detail::render_name(c.full_name(false))}};
+        {"display_name", detail::render_name(c.full_name(true))}};
 
     if (const auto &comment = c.comment(); comment)
         j["comment"] = comment.value();
diff --git a/src/common/generators/json/generator.h b/src/common/generators/json/generator.h
index ca81e4aa..33c71060 100644
--- a/src/common/generators/json/generator.h
+++ b/src/common/generators/json/generator.h
@@ -35,13 +35,13 @@
 namespace clanguml::common::model {
 using nlohmann::json;
 
-void to_json(nlohmann::json &j, const source_location &sl);
+void to_json(json &j, const source_location &sl);
 
-void to_json(nlohmann::json &j, const element &c);
+void to_json(json &j, const element &c);
 
-void to_json(nlohmann::json &j, const template_parameter &c);
+void to_json(json &j, const template_parameter &c);
 
-void to_json(nlohmann::json &j, const relationship &c);
+void to_json(json &j, const relationship &c);
 } // namespace clanguml::common::model
 
 namespace clanguml::common::generators::json {
diff --git a/src/common/model/element.h b/src/common/model/element.h
index 38849d13..d7c4876c 100644
--- a/src/common/model/element.h
+++ b/src/common/model/element.h
@@ -123,8 +123,11 @@ public:
      *
      * @return Fully qualified elements name.
      */
-    std::string full_name(bool /*relative*/) const override
+    std::string full_name(bool relative) const override
     {
+        if (relative)
+            return name();
+
         return name_and_ns();
     }
 
diff --git a/src/package_diagram/generators/json/package_diagram_generator.cc b/src/package_diagram/generators/json/package_diagram_generator.cc
index 74f9f366..cbf4a0fe 100644
--- a/src/package_diagram/generators/json/package_diagram_generator.cc
+++ b/src/package_diagram/generators/json/package_diagram_generator.cc
@@ -60,26 +60,49 @@ void generator::generate(const package &p, nlohmann::json &parent) const
 {
     LOG_DBG("Generating package {}", p.full_name(false));
 
-    nlohmann::json j;
-    j["id"] = std::to_string(p.id());
-    j["name"] = p.name();
-    j["type"] = to_string(config().package_type());
-    j["display_name"] = p.full_name(false);
-    j["is_deprecated"] = p.is_deprecated();
-    if (!p.file().empty())
-        j["source_location"] =
-            dynamic_cast<const common::model::source_location &>(p);
-    if (const auto &comment = p.comment(); comment)
-        j["comment"] = comment.value();
+    const auto &uns = config().using_namespace();
+    if (!uns.starts_with({p.full_name(false)})) {
+        nlohmann::json j;
+        j["id"] = std::to_string(p.id());
+        j["name"] = p.name();
+        j["type"] = to_string(config().package_type());
+        j["display_name"] = p.name();
+        switch (config().package_type()) {
+        case config::package_type_t::kNamespace:
+            j["namespace"] = p.get_namespace().to_string();
+            break;
+        case config::package_type_t::kModule:
+            j["namespace"] = p.get_namespace().to_string();
+            break;
+        case config::package_type_t::kDirectory:
+            j["path"] = p.get_namespace().to_string();
+            break;
+        }
 
-    for (const auto &subpackage : p) {
-        auto &pkg = dynamic_cast<package &>(*subpackage);
-        if (model().should_include(pkg)) {
-            generate(pkg, j);
+        j["is_deprecated"] = p.is_deprecated();
+        if (!p.file().empty())
+            j["source_location"] =
+                dynamic_cast<const common::model::source_location &>(p);
+        if (const auto &comment = p.comment(); comment)
+            j["comment"] = comment.value();
+
+        for (const auto &subpackage : p) {
+            auto &pkg = dynamic_cast<package &>(*subpackage);
+            if (model().should_include(pkg)) {
+                generate(pkg, j);
+            }
+        }
+
+        parent["elements"].push_back(std::move(j));
+    }
+    else {
+        for (const auto &subpackage : p) {
+            auto &pkg = dynamic_cast<package &>(*subpackage);
+            if (model().should_include(pkg)) {
+                generate(pkg, parent);
+            }
         }
     }
-
-    parent["elements"].push_back(std::move(j));
 }
 
 void generator::generate_diagram(nlohmann::json &parent) const
diff --git a/src/sequence_diagram/generators/json/sequence_diagram_generator.cc b/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
index 042ab1e3..642cc98b 100644
--- a/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
@@ -33,14 +33,12 @@ namespace clanguml::sequence_diagram::model {
 
 void to_json(nlohmann::json &j, const participant &c)
 {
-    j["name"] = generators::json::render_name(c.full_name(false));
-    j["id"] = std::to_string(c.id());
+    to_json(j, dynamic_cast<const participant::element &>(c));
     j["type"] = c.type_name();
-    if (!c.file().empty())
-        j["source_location"] =
-            dynamic_cast<const common::model::source_location &>(c);
-    if (const auto &comment = c.comment(); comment)
-        j["comment"] = comment.value();
+
+    if (c.type_name() == "method") {
+        j["name"] = dynamic_cast<const method &>(c).method_name();
+    }
 }
 
 void to_json(nlohmann::json &j, const activity &c)
@@ -105,11 +103,8 @@ void generator::generate_call(const message &m, nlohmann::json &parent) const
 
     msg["name"] = message;
     msg["type"] = "message";
-    msg["from"]["activity_name"] =
-        generators::json::render_name(from.value().full_name(false));
     msg["from"]["activity_id"] = std::to_string(from.value().id());
     msg["to"]["activity_id"] = std::to_string(to.value().id());
-    msg["to"]["activity_name"] = to.value().full_name(false);
     if (const auto &cmt = m.comment(); cmt.has_value())
         msg["comment"] = cmt.value();
 
@@ -132,7 +127,6 @@ void generator::generate_call(const message &m, nlohmann::json &parent) const
         }
         else {
             msg["from"]["participant_id"] = std::to_string(from.value().id());
-            msg["from"]["participant_name"] = from.value().full_name(false);
         }
     }
     else if (from.value().type_name() == "lambda") {
@@ -553,43 +547,92 @@ common::id_t generator::generate_participant(
     const auto &participant =
         model().get_participant<model::participant>(participant_id).value();
 
-    if (participant.type_name() == "method") {
-        participant_id = model()
-                             .get_participant<model::method>(participant_id)
-                             .value()
-                             .class_id();
+    const auto participant_type = participant.type_name();
 
-        if (is_participant_generated(participant_id))
-            return participant_id;
+    if (participant_type == "method") {
+        auto class_participant_id =
+            model()
+                .get_participant<model::method>(participant_id)
+                .value()
+                .class_id();
 
-        const auto &class_participant =
-            model().get_participant<model::participant>(participant_id).value();
+        if (!is_participant_generated(class_participant_id)) {
+            const auto &class_participant =
+                model()
+                    .get_participant<model::participant>(class_participant_id)
+                    .value();
 
-        parent["participants"].push_back(class_participant);
+            generated_participants_.emplace(participant_id);
+            generated_participants_.emplace(class_participant_id);
+
+            json_["participants"].push_back(class_participant);
+            json_["participants"].back()["activities"].push_back(participant);
+
+            return class_participant_id;
+        }
+        else {
+            if (!is_participant_generated(participant_id)) {
+                for (auto &p : json_["participants"]) {
+                    if (p.at("id") == std::to_string(class_participant_id)) {
+                        generated_participants_.emplace(participant_id);
+                        p["activities"].push_back(participant);
+                        return class_participant_id;
+                    }
+                }
+            }
+        }
     }
-    else if ((participant.type_name() == "function" ||
-                 participant.type_name() == "function_template") &&
+    else if ((participant_type == "function" ||
+                 participant_type == "function_template") &&
         config().combine_free_functions_into_file_participants()) {
         // Create a single participant for all functions declared in a
         // single file
+        // participant_id will become activity_id within a file participant
         const auto &function_participant =
             model().get_participant<model::function>(participant_id).value();
 
-        nlohmann::json j = function_participant;
-        j["name"] = util::path_to_url(
-            config().make_path_relative(function_participant.file()).string());
+        const auto file_participant_id =
+            common::to_id(function_participant.file_relative());
 
-        participant_id = common::to_id(function_participant.file_relative());
+        if (!is_participant_generated(file_participant_id)) {
+            nlohmann::json p = function_participant;
 
-        if (is_participant_generated(participant_id))
-            return participant_id;
+            const auto file_path =
+                config().make_path_relative(function_participant.file());
 
-        j["id"] = std::to_string(participant_id);
+            p["display_name"] = util::path_to_url(file_path.string());
+            p["name"] = file_path.filename();
 
-        parent["participants"].push_back(j);
+            if (is_participant_generated(file_participant_id))
+                return participant_id;
+
+            p["id"] = std::to_string(file_participant_id);
+            p["type"] = "file";
+            p.erase("source_location");
+
+            generated_participants_.emplace(participant_id);
+
+            p["activities"].push_back(participant);
+            json_["participants"].push_back(p);
+
+            generated_participants_.emplace(file_participant_id);
+
+            return file_participant_id;
+        }
+        else {
+            if (!is_participant_generated(participant_id)) {
+                for (auto &p : json_["participants"]) {
+                    if (p.at("id") == std::to_string(file_participant_id)) {
+                        generated_participants_.emplace(participant_id);
+                        p["activities"].push_back(participant);
+                    }
+                }
+            }
+            return file_participant_id;
+        }
     }
     else {
-        parent["participants"].push_back(participant);
+        json_["participants"].push_back(participant);
     }
 
     generated_participants_.emplace(participant_id);
@@ -614,7 +657,7 @@ void generator::generate_diagram(nlohmann::json &parent) const
     if (config().participants_order.has_value) {
         for (const auto &p : config().participants_order()) {
             LOG_DBG("Pregenerating participant {}", p);
-            generate_participant(parent, p);
+            generate_participant(json_, p);
         }
     }
 
@@ -661,7 +704,7 @@ void generator::generate_diagram(nlohmann::json &parent) const
 
         block_statements_stack_.pop_back();
 
-        json_["sequences"].push_back(std::move(sequence));
+        parent["sequences"].push_back(std::move(sequence));
     }
 
     for (const auto &to_location : config().to()) {
@@ -697,7 +740,7 @@ void generator::generate_diagram(nlohmann::json &parent) const
 
         block_statements_stack_.pop_back();
 
-        json_["sequences"].push_back(std::move(sequence));
+        parent["sequences"].push_back(std::move(sequence));
     }
 
     for (const auto &sf : config().from()) {
@@ -757,7 +800,7 @@ void generator::generate_diagram(nlohmann::json &parent) const
                 sequence["return_type"] = from.value().return_type();
             }
 
-            json_["sequences"].push_back(std::move(sequence));
+            parent["sequences"].push_back(std::move(sequence));
         }
         else {
             // TODO: Add support for other sequence start location types
@@ -765,6 +808,6 @@ void generator::generate_diagram(nlohmann::json &parent) const
         }
     }
 
-    parent.update(json_);
+    parent["participants"] = json_["participants"];
 }
 } // namespace clanguml::sequence_diagram::generators::json
diff --git a/src/sequence_diagram/generators/json/sequence_diagram_generator.h b/src/sequence_diagram/generators/json/sequence_diagram_generator.h
index 985f3dda..ff90f721 100644
--- a/src/sequence_diagram/generators/json/sequence_diagram_generator.h
+++ b/src/sequence_diagram/generators/json/sequence_diagram_generator.h
@@ -239,6 +239,8 @@ private:
 
     mutable std::set<common::id_t> generated_participants_;
 
+    // Needed to add "participants" array in a temporary object accessible from
+    // all methods of the generator
     mutable nlohmann::json json_;
 
     mutable std::vector<std::reference_wrapper<nlohmann::json>>
diff --git a/src/sequence_diagram/model/participant.cc b/src/sequence_diagram/model/participant.cc
index 5c8f15c8..6024fb75 100644
--- a/src/sequence_diagram/model/participant.cc
+++ b/src/sequence_diagram/model/participant.cc
@@ -69,7 +69,10 @@ std::string class_::full_name(bool relative) const
 
     std::ostringstream ostr;
 
-    ostr << name_and_ns();
+    if (relative)
+        ostr << name();
+    else
+        ostr << name_and_ns();
     render_template_params(ostr, using_namespace(), relative);
 
     std::string res;
@@ -102,7 +105,7 @@ function::function(const common::model::namespace_ &using_namespace)
 
 std::string function::full_name(bool relative) const
 {
-    return fmt::format("{}({}){}", element::full_name(relative),
+    return fmt::format("{}({}){}", participant::full_name(relative),
         fmt::join(parameters_, ","), is_const() ? " const" : "");
 }
 
@@ -195,8 +198,12 @@ void method::set_class_full_name(const std::string &name)
 
 const auto &method::class_full_name() const { return class_full_name_; }
 
-std::string method::full_name(bool /*relative*/) const
+std::string method::full_name(bool relative) const
 {
+    if (relative)
+        return fmt::format("{}({}){}", method_name(),
+            fmt::join(parameters(), ","), is_const() ? " const" : "");
+
     return fmt::format("{}::{}({}){}", class_full_name(), method_name(),
         fmt::join(parameters(), ","), is_const() ? " const" : "");
 }
diff --git a/src/sequence_diagram/model/participant.h b/src/sequence_diagram/model/participant.h
index d6f014a3..c738068d 100644
--- a/src/sequence_diagram/model/participant.h
+++ b/src/sequence_diagram/model/participant.h
@@ -88,7 +88,13 @@ public:
      *
      * @return Type name of the diagram element.
      */
-    std::string type_name() const override { return "class"; }
+    std::string type_name() const override
+    {
+        if (is_lambda())
+            return "lambda";
+
+        return "class";
+    }
 
     /**
      * @brief Check if class is a struct.
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index c8c320a2..0a82c0c8 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -1083,10 +1083,6 @@ bool translation_unit_visitor::VisitCallExpr(clang::CallExpr *expr)
 
 bool translation_unit_visitor::TraverseVarDecl(clang::VarDecl *decl)
 {
-    LOG_TRACE("Traversing cxx variable declaration at {} [caller_id = {}]",
-        decl->getBeginLoc().printToString(source_manager()),
-        context().caller_id());
-
     if (decl->isStaticLocal())
         within_static_variable_declaration_++;
 
diff --git a/src/version.h.in b/src/version.h.in
index 524c6fe4..95dad7e8 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -18,7 +18,7 @@
 #pragma once
 
 namespace clanguml::version {
-static constexpr auto CLANG_UML_JSON_GENERATOR_SCHEMA_VERSION = 1U;
+static constexpr auto CLANG_UML_JSON_GENERATOR_SCHEMA_VERSION = 2U;
 static constexpr auto CLANG_UML_VERSION = "@GIT_VERSION@";
 static constexpr auto CLANG_UML_LIBCLANG_VERSION = "@LIBCLANG_VERSION_STRING@";
 } // namespace clanguml::version
\ No newline at end of file
diff --git a/tests/t00002/test_case.h b/tests/t00002/test_case.h
index 8e58d057..b1554983 100644
--- a/tests/t00002/test_case.h
+++ b/tests/t00002/test_case.h
@@ -93,6 +93,17 @@ TEST_CASE("t00002", "[test-case][class]")
 
         using namespace json;
 
+        const auto &A = get_element(j, "A");
+
+        CHECK(A.has_value());
+
+        CHECK(A.value()["type"] == "class");
+        CHECK(A.value()["name"] == "A");
+        CHECK(A.value()["display_name"] == "A");
+        CHECK(A.value()["namespace"] == "clanguml::t00002");
+        CHECK(A.value()["source_location"]["file"] == "t00002.cc");
+        CHECK(A.value()["source_location"]["line"] == 7);
+
         REQUIRE(HasTitle(j, "Basic class diagram example"));
         REQUIRE(IsClass(j, "A"));
         REQUIRE(IsClass(j, "B"));
diff --git a/tests/t00006/test_case.h b/tests/t00006/test_case.h
index 2c28e1c1..07462187 100644
--- a/tests/t00006/test_case.h
+++ b/tests/t00006/test_case.h
@@ -98,10 +98,9 @@ TEST_CASE("t00006", "[test-case][class]")
         REQUIRE(IsClass(j, "NN"));
         REQUIRE(IsClass(j, "NNN"));
 
-        REQUIRE(IsAggregation(
-            j, "R", "custom_container<clanguml::t00006::E>", "e"));
-        REQUIRE(IsInstantiation(
-            j, "custom_container<T>", "custom_container<clanguml::t00006::E>"));
+        REQUIRE(IsAggregation(j, "R", "custom_container<E>", "e"));
+        REQUIRE(
+            IsInstantiation(j, "custom_container<T>", "custom_container<E>"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t00025/test_case.h b/tests/t00025/test_case.h
index 061dfb95..1e01d5a0 100644
--- a/tests/t00025/test_case.h
+++ b/tests/t00025/test_case.h
@@ -62,8 +62,8 @@ TEST_CASE("t00025", "[test-case][class]")
         REQUIRE(IsClass(j, "Target1"));
         REQUIRE(IsClass(j, "Target2"));
         REQUIRE(IsClassTemplate(j, "Proxy<T>"));
-        REQUIRE(IsDependency(j, "Proxy<clanguml::t00025::Target1>", "Target1"));
-        REQUIRE(IsDependency(j, "Proxy<clanguml::t00025::Target2>", "Target2"));
+        REQUIRE(IsDependency(j, "Proxy<Target1>", "Target1"));
+        REQUIRE(IsDependency(j, "Proxy<Target2>", "Target2"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t00027/test_case.h b/tests/t00027/test_case.h
index df0534a6..85712839 100644
--- a/tests/t00027/test_case.h
+++ b/tests/t00027/test_case.h
@@ -67,12 +67,9 @@ TEST_CASE("t00027", "[test-case][class]")
         REQUIRE(IsAbstractClass(j, "ShapeDecorator"));
 
         REQUIRE(IsClassTemplate(j, "Line<T<>...>"));
-        REQUIRE(IsInstantiation(
-            j, "Line<T<>...>", "Line<clanguml::t00027::Color>"));
-        REQUIRE(IsInstantiation(j, "Line<T<>...>",
-            "Line<clanguml::t00027::Color,clanguml::t00027::Weight>"));
-        REQUIRE(IsAggregation(
-            j, "Window", "Text<clanguml::t00027::Color>", "description"));
+        REQUIRE(IsInstantiation(j, "Line<T<>...>", "Line<Color>"));
+        REQUIRE(IsInstantiation(j, "Line<T<>...>", "Line<Color,Weight>"));
+        REQUIRE(IsAggregation(j, "Window", "Text<Color>", "description"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t00032/test_case.h b/tests/t00032/test_case.h
index b444be75..92e20f72 100644
--- a/tests/t00032/test_case.h
+++ b/tests/t00032/test_case.h
@@ -69,9 +69,7 @@ TEST_CASE("t00032", "[test-case][class]")
 
         using namespace json;
 
-        REQUIRE(IsBaseClass(j, "A",
-            "Overload<clanguml::t00032::TBase,int,clanguml::t00032::A,clanguml:"
-            ":t00032::B,clanguml::t00032::C>"));
+        REQUIRE(IsBaseClass(j, "A", "Overload<TBase,int,A,B,C>"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t00033/test_case.h b/tests/t00033/test_case.h
index f07ce69d..68967f74 100644
--- a/tests/t00033/test_case.h
+++ b/tests/t00033/test_case.h
@@ -61,13 +61,9 @@ TEST_CASE("t00033", "[test-case][class]")
 
         using namespace json;
 
-        REQUIRE(IsClass(j,
-            "A<clanguml::t00033::B<std::unique_ptr<clanguml::t00033::C<"
-            "clanguml::t00033::D>>>>"));
-        REQUIRE(IsDependency(j,
-            "A<clanguml::t00033::B<std::unique_ptr<clanguml::t00033::C<"
-            "clanguml::t00033::D>>>>",
-            "B<std::unique_ptr<clanguml::t00033::C<clanguml::t00033::D>>>"));
+        REQUIRE(IsClass(j, "A<B<std::unique_ptr<C<D>>>>"));
+        REQUIRE(IsDependency(
+            j, "A<B<std::unique_ptr<C<D>>>>", "B<std::unique_ptr<C<D>>>"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t00036/t00036.cc b/tests/t00036/t00036.cc
index 7fa9131c..e54e7e48 100644
--- a/tests/t00036/t00036.cc
+++ b/tests/t00036/t00036.cc
@@ -17,7 +17,7 @@ struct B {
     A<int> a_int;
 };
 
-}
+} // namespace ns111
 } // namespace ns11
 } // namespace ns1
 
@@ -29,8 +29,8 @@ struct C { };
 
 struct D { };
 
-}
-}
+} // namespace ns22
+} // namespace ns2
 
 namespace ns3 {
 namespace ns33 {
diff --git a/tests/t00036/test_case.h b/tests/t00036/test_case.h
index 80643126..c5ddb1b8 100644
--- a/tests/t00036/test_case.h
+++ b/tests/t00036/test_case.h
@@ -55,16 +55,20 @@ TEST_CASE("t00036", "[test-case][class]")
         auto j = generate_class_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
         REQUIRE(IsClass(j, "ns1::ns11::A<T>"));
         REQUIRE(IsClass(j, "ns1::ns11::A<int>"));
         REQUIRE(IsClass(j, "ns1::ns11::ns111::B"));
         REQUIRE(IsClass(j, "ns2::ns22::C"));
         REQUIRE(IsEnum(j, "ns1::E"));
-        REQUIRE(IsPackage(j, "ns1"));
-        REQUIRE(IsPackage(j, "ns1::ns11"));
-        REQUIRE(IsPackage(j, "ns1::ns11::ns111"));
-        REQUIRE(IsPackage(j, "ns2"));
+        REQUIRE(IsNamespacePackage(j, "ns1"s));
+        REQUIRE(IsNamespacePackage(j, "ns1"s, "ns11"s));
+        REQUIRE(IsNamespacePackage(j, "ns1"s, "ns11"s, "ns111"s));
+        REQUIRE(IsNamespacePackage(j, "ns2"s));
+        REQUIRE(IsNamespacePackage(j, "ns2"s, "ns22"s));
+        REQUIRE(IsNamespacePackage(j, "ns3"s));
+        REQUIRE(IsNamespacePackage(j, "ns3"s, "ns33"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t00044/test_case.h b/tests/t00044/test_case.h
index e20a1e6d..3a5f90aa 100644
--- a/tests/t00044/test_case.h
+++ b/tests/t00044/test_case.h
@@ -75,8 +75,7 @@ TEST_CASE("t00044", "[test-case][class]")
         REQUIRE(IsClassTemplate(j, "signal_handler<T,A>"));
         REQUIRE(IsClassTemplate(j, "signal_handler<Ret(Args...),A>"));
         REQUIRE(IsClassTemplate(j, "signal_handler<void(int),bool>"));
-        REQUIRE(IsClassTemplate(
-            j, "sink<clanguml::t00044::signal_handler<Ret(Args...),A>>"));
+        REQUIRE(IsClassTemplate(j, "sink<signal_handler<Ret(Args...),A>>"));
         REQUIRE(IsClass(j, "R"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
diff --git a/tests/t00058/test_case.h b/tests/t00058/test_case.h
index aabb26a5..4a24abd1 100644
--- a/tests/t00058/test_case.h
+++ b/tests/t00058/test_case.h
@@ -75,8 +75,7 @@ TEST_CASE("t00058", "[test-case][class]")
         using namespace json;
 
         REQUIRE(IsClass(j, "A<int,int,double,std::string>"));
-        REQUIRE(IsClass(
-            j, "B<int,std::string,int,double,clanguml::t00058::A<int,int>>"));
+        REQUIRE(IsClass(j, "B<int,std::string,int,double,A<int,int>>"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t00071/test_case.h b/tests/t00071/test_case.h
index 7d946330..b8219023 100644
--- a/tests/t00071/test_case.h
+++ b/tests/t00071/test_case.h
@@ -48,6 +48,12 @@ TEST_CASE("t00071", "[test-case][class]")
         auto j = generate_class_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
+
+        REQUIRE(IsModulePackage(j, "app"s));
+        REQUIRE(IsModulePackage(j, "app"s, "lib1"s));
+        REQUIRE(IsModulePackage(j, "app"s, "lib1"s, "mod1"s));
+        REQUIRE(IsModulePackage(j, "app"s, "lib1"s, "mod2"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t00072/test_case.h b/tests/t00072/test_case.h
index e67071fc..29f22cb4 100644
--- a/tests/t00072/test_case.h
+++ b/tests/t00072/test_case.h
@@ -61,19 +61,20 @@ TEST_CASE("t00072", "[test-case][class]")
         auto j = generate_class_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsClass(j, "clanguml::t00072::A"));
-        REQUIRE(IsClass(j, "clanguml::t00072::B"));
-        REQUIRE(IsClass(j, "clanguml::t00072::C"));
-        REQUIRE(IsClass(j, "clanguml::t00072::D"));
-        REQUIRE(IsEnum(j, "clanguml::t00072::detail::CCC"));
-        REQUIRE(IsEnum(j, "clanguml::t00072::detail::BBB"));
+        REQUIRE(IsClass(j, "A"));
+        REQUIRE(IsClass(j, "B"));
+        REQUIRE(IsClass(j, "C"));
+        REQUIRE(IsClass(j, "D"));
+        REQUIRE(IsEnum(j, "detail::CCC"));
+        REQUIRE(IsEnum(j, "detail::BBB"));
 
-        REQUIRE(IsPackage(j, "app", "module"));
-        REQUIRE(IsPackage(j, "app:lib1", "module"));
-        REQUIRE(IsPackage(j, "app:lib2", "module"));
-        REQUIRE(IsPackage(j, "app:lib1.mod1", "module"));
-        REQUIRE(IsPackage(j, "app:lib1.mod2", "module"));
+        REQUIRE(IsModulePackage(j, "app"s));
+        REQUIRE(IsModulePackage(j, "app"s, ":lib1"s));
+        REQUIRE(IsModulePackage(j, "app"s, ":lib1"s, "mod1"s));
+        REQUIRE(IsModulePackage(j, "app"s, ":lib1"s, "mod2"s));
+        REQUIRE(IsModulePackage(j, "app"s, ":lib2"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t20001/test_case.h b/tests/t20001/test_case.h
index 6f601ad2..dcdb59d1 100644
--- a/tests/t20001/test_case.h
+++ b/tests/t20001/test_case.h
@@ -58,6 +58,28 @@ TEST_CASE("t20001", "[test-case][sequence]")
 
         using namespace json;
 
+        const auto &A = get_participant(j, "A");
+
+        CHECK(A.has_value());
+
+        CHECK(A.value()["type"] == "class");
+        CHECK(A.value()["name"] == "A");
+        CHECK(A.value()["display_name"] == "A");
+        CHECK(A.value()["namespace"] == "clanguml::t20001");
+        CHECK(A.value()["source_location"]["file"] == "t20001.cc");
+        CHECK(A.value()["source_location"]["line"] == 13);
+
+        const auto &tmain = get_participant(j, "tmain()");
+
+        CHECK(tmain.has_value());
+
+        CHECK(tmain.value()["type"] == "function");
+        CHECK(tmain.value()["name"] == "tmain");
+        CHECK(tmain.value()["display_name"] == "tmain()");
+        CHECK(tmain.value()["namespace"] == "clanguml::t20001");
+        CHECK(tmain.value()["source_location"]["file"] == "t20001.cc");
+        CHECK(tmain.value()["source_location"]["line"] == 61);
+
         REQUIRE(HasTitle(j, "Basic sequence diagram example"));
 
         REQUIRE(IsFunctionParticipant(j, "tmain()"));
@@ -76,6 +98,7 @@ TEST_CASE("t20001", "[test-case][sequence]")
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
+
     {
         auto src = generate_sequence_mermaid(diagram, *model);
         mermaid::SequenceDiagramAliasMatcher _A(src);
diff --git a/tests/t20014/test_case.h b/tests/t20014/test_case.h
index 6f99d24e..9b38b110 100644
--- a/tests/t20014/test_case.h
+++ b/tests/t20014/test_case.h
@@ -58,9 +58,8 @@ TEST_CASE("t20014", "[test-case][sequence]")
             FindMessage(j, "B", "A", "a1(int,int)"),
             FindMessage(j, "tmain()", "B", "b2(int,int)"),
             FindMessage(j, "B", "A", "a2(int,int)"),
-            FindMessage(
-                j, "tmain()", "C<clanguml::t20014::B,int>", "c1(int,int)"),
-            FindMessage(j, "C<clanguml::t20014::B,int>", "B", "b1(int,int)")};
+            FindMessage(j, "tmain()", "C<B,int>", "c1(int,int)"),
+            FindMessage(j, "C<B,int>", "B", "b1(int,int)")};
 
         REQUIRE(std::is_sorted(messages.begin(), messages.end()));
 
diff --git a/tests/t20017/test_case.h b/tests/t20017/test_case.h
index aa72a696..daa4d0dd 100644
--- a/tests/t20017/test_case.h
+++ b/tests/t20017/test_case.h
@@ -57,6 +57,14 @@ TEST_CASE("t20017", "[test-case][sequence]")
 
         using namespace json;
 
+        const auto &t20017_cc = get_participant(j, "t20017.cc");
+
+        CHECK(t20017_cc.has_value());
+
+        CHECK(t20017_cc.value()["type"] == "file");
+        CHECK(t20017_cc.value()["name"] == "t20017.cc");
+        CHECK(t20017_cc.value()["display_name"] == "t20017.cc");
+
         std::vector<int> messages = {
             FindMessage(j, File("t20017.cc"), File("include/t20017_a.h"),
                 "a3(int,int)"),
diff --git a/tests/t20018/test_case.h b/tests/t20018/test_case.h
index 5a2448f1..c6b4023f 100644
--- a/tests/t20018/test_case.h
+++ b/tests/t20018/test_case.h
@@ -62,10 +62,9 @@ TEST_CASE("t20018", "[test-case][sequence]")
         using namespace json;
 
         std::vector<int> messages = {
-            FindMessage(j, "tmain()",
-                "Answer<clanguml::t20018::Factorial<5>,120>", "print()"),
-            FindMessage(j, "Answer<clanguml::t20018::Factorial<5>,120>",
-                "Factorial<5>", "print(int)"),
+            FindMessage(j, "tmain()", "Answer<Factorial<5>,120>", "print()"),
+            FindMessage(
+                j, "Answer<Factorial<5>,120>", "Factorial<5>", "print(int)"),
             FindMessage(j, "Factorial<5>", "Factorial<4>", "print(int)"),
             FindMessage(j, "Factorial<4>", "Factorial<3>", "print(int)"),
             FindMessage(j, "Factorial<3>", "Factorial<2>", "print(int)"),
diff --git a/tests/t20019/test_case.h b/tests/t20019/test_case.h
index e7622860..62d55fc3 100644
--- a/tests/t20019/test_case.h
+++ b/tests/t20019/test_case.h
@@ -50,10 +50,10 @@ TEST_CASE("t20019", "[test-case][sequence]")
         using namespace json;
 
         std::vector<int> messages = {
-            FindMessage(j, "tmain()", "Base<clanguml::t20019::D1>", "name()"),
-            FindMessage(j, "Base<clanguml::t20019::D1>", "D1", "impl()"),
-            FindMessage(j, "tmain()", "Base<clanguml::t20019::D2>", "name()"),
-            FindMessage(j, "Base<clanguml::t20019::D2>", "D2", "impl()")};
+            FindMessage(j, "tmain()", "Base<D1>", "name()"),
+            FindMessage(j, "Base<D1>", "D1", "impl()"),
+            FindMessage(j, "tmain()", "Base<D2>", "name()"),
+            FindMessage(j, "Base<D2>", "D2", "impl()")};
 
         REQUIRE(std::is_sorted(messages.begin(), messages.end()));
 
diff --git a/tests/t20029/test_case.h b/tests/t20029/test_case.h
index 8ae6262a..bbfd787b 100644
--- a/tests/t20029/test_case.h
+++ b/tests/t20029/test_case.h
@@ -88,17 +88,12 @@ TEST_CASE("t20029", "[test-case][sequence]")
 
         using namespace json;
 
+        REQUIRE(!j["participants"].is_null());
+
         std::vector<int> messages = {
             FindMessage(j, "tmain()", "ConnectionPool", "connect()"),
-            FindMessage(j, "tmain()",
-                "Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>",
-                "send(std::string &&)")/*,
-            FindMessage(j,
-                "Encoder<clanguml::t20029::Retrier<clanguml::t20029::"
-                "ConnectionPool>>",
-                "encode_b64(std::string &&)", "encode_b64(std::string &&)"),
-            FindMessage(j, "Retrier<clanguml::t20029::ConnectionPool>",
-                "ConnectionPool", "send(const std::string &)")*/};
+            FindMessage(j, "tmain()", "Encoder<Retrier<ConnectionPool>>",
+                "send(std::string &&)")};
 
         REQUIRE(std::is_sorted(messages.begin(), messages.end()));
 
diff --git a/tests/t20034/test_case.h b/tests/t20034/test_case.h
index c08ef64f..9d1b1287 100644
--- a/tests/t20034/test_case.h
+++ b/tests/t20034/test_case.h
@@ -56,20 +56,18 @@ TEST_CASE("t20034", "[test-case][sequence]")
         using namespace json;
 
         REQUIRE(HasMessageChain(j,
-            {{"D::d2()", "C::c3()", "void"}, {"C::c3()", "C::c2()", "void"},
-                {"C::c2()", "B::b2()", "void"},
-                {"B::b2()", "A::a2()", "void"}}));
+            {{"d2()", "c3()", "void"}, {"c3()", "c2()", "void"},
+                {"c2()", "b2()", "void"}, {"b2()", "a2()", "void"}}));
         REQUIRE(HasMessageChain(j,
-            {{"D::d2()", "C::c4()", "void"}, {"C::c4()", "B::b4()", "void"},
-                {"B::b4()", "B::b2()", "void"},
-                {"B::b2()", "A::a2()", "void"}}));
-        REQUIRE(HasMessageChain(j, {{"D::d2()", "A::a2()", "void"}}));
+            {{"d2()", "c4()", "void"}, {"c4()", "b4()", "void"},
+                {"b4()", "b2()", "void"}, {"b2()", "a2()", "void"}}));
+        REQUIRE(HasMessageChain(j, {{"d2()", "a2()", "void"}}));
         REQUIRE(HasMessageChain(j,
-            {{"D::d2()", "C::c1()", "void"}, {"C::c1()", "B::b1()", "void"},
-                {"B::b1()", "A::a2()", "void"}}));
+            {{"d2()", "c1()", "void"}, {"c1()", "b1()", "void"},
+                {"b1()", "a2()", "void"}}));
         REQUIRE(HasMessageChain(j,
-            {{"D::d2()", "C::c2()", "void"}, {"C::c2()", "B::b2()", "void"},
-                {"B::b2()", "A::a2()", "void"}}));
+            {{"d2()", "c2()", "void"}, {"c2()", "b2()", "void"},
+                {"b2()", "a2()", "void"}}));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t20036/test_case.h b/tests/t20036/test_case.h
index 3ecf5714..293614aa 100644
--- a/tests/t20036/test_case.h
+++ b/tests/t20036/test_case.h
@@ -56,16 +56,16 @@ TEST_CASE("t20036", "[test-case][sequence]")
         using namespace json;
 
         REQUIRE(HasMessageChain(j,
-            {{"C::c3()", "C::c2()", "void"}, {"C::c2()", "B::b2()", "void"},
-                {"B::b2()", "A::a2()", "void"}}));
+            {{"c3()", "c2()", "void"}, {"c2()", "b2()", "void"},
+                {"b2()", "a2()", "void"}}));
+        REQUIRE(HasMessageChain(
+            j, {{"c4()", "b2()", "void"}, {"b2()", "a2()", "void"}}));
+        REQUIRE(HasMessageChain(j, {{"d3()", "a2()", "void"}}));
         REQUIRE(HasMessageChain(j,
-            {{"C::c4()", "B::b2()", "void"}, {"B::b2()", "A::a2()", "void"}}));
-        REQUIRE(HasMessageChain(j, {{"D::d3()", "A::a2()", "void"}}));
-        REQUIRE(HasMessageChain(j,
-            {{"D::d1()", "C::c2()", "void"}, {"C::c2()", "B::b2()", "void"},
-                {"B::b2()", "A::a2()", "void"}}));
-        REQUIRE(HasMessageChain(j,
-            {{"C::c1()", "B::b1()", "void"}, {"B::b1()", "A::a2()", "void"}}));
+            {{"d1()", "c2()", "void"}, {"c2()", "b2()", "void"},
+                {"b2()", "a2()", "void"}}));
+        REQUIRE(HasMessageChain(
+            j, {{"c1()", "b1()", "void"}, {"b1()", "a2()", "void"}}));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30001/test_case.h b/tests/t30001/test_case.h
index a0118da7..d8edcb44 100644
--- a/tests/t30001/test_case.h
+++ b/tests/t30001/test_case.h
@@ -70,19 +70,19 @@ TEST_CASE("t30001", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
         REQUIRE(HasTitle(j, "Basic package diagram example"));
 
-        REQUIRE(IsPackage(j, "A"));
-        REQUIRE(IsPackage(j, "A::AA"));
-        REQUIRE(IsPackage(j, "A::AA::AAA"));
-        REQUIRE(IsPackage(j, "A::AA::BBB"));
-        REQUIRE(IsPackage(j, "A::BB"));
-        REQUIRE(IsPackage(j, "B"));
-        REQUIRE(IsPackage(j, "B::AA"));
-        REQUIRE(IsPackage(j, "B::AA::AAA"));
-        REQUIRE(IsPackage(j, "B::AA::BBB"));
-        REQUIRE(IsPackage(j, "B::BB"));
+        REQUIRE(!IsNamespacePackage(j, "clanguml"s));
+        REQUIRE(!IsNamespacePackage(j, "t30001"s));
+        REQUIRE(IsNamespacePackage(j, "A"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "AAA"s));
+        REQUIRE(IsNamespacePackage(j, "B"s, "AA"s, "AAA"s));
+        REQUIRE(IsNamespacePackage(j, "B"s, "AA"s, "BBB"s));
+        REQUIRE(IsNamespacePackage(j, "B"s, "BB"s));
+        REQUIRE(IsNamespacePackage(j, "B"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30002/test_case.h b/tests/t30002/test_case.h
index 4d8c0df0..96bdfcc1 100644
--- a/tests/t30002/test_case.h
+++ b/tests/t30002/test_case.h
@@ -79,45 +79,48 @@ TEST_CASE("t30002", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "A::AA"));
-        REQUIRE(IsPackage(j, "A::AA::A1"));
-        REQUIRE(IsPackage(j, "A::AA::A2"));
-        REQUIRE(IsPackage(j, "A::AA::A3"));
-        REQUIRE(IsPackage(j, "A::AA::A4"));
-        REQUIRE(IsPackage(j, "A::AA::A5"));
-        REQUIRE(IsPackage(j, "A::AA::A6"));
-        REQUIRE(IsPackage(j, "A::AA::A7"));
-        REQUIRE(IsPackage(j, "A::AA::A8"));
-        REQUIRE(IsPackage(j, "A::AA::A9"));
-        REQUIRE(IsPackage(j, "A::AA::A10"));
-        REQUIRE(IsPackage(j, "A::AA::A11"));
-        REQUIRE(IsPackage(j, "A::AA::A12"));
-        REQUIRE(IsPackage(j, "A::AA::A13"));
-        REQUIRE(IsPackage(j, "A::AA::A14"));
-        REQUIRE(IsPackage(j, "A::AA::A15"));
-        REQUIRE(IsPackage(j, "A::AA::A16"));
-        REQUIRE(IsPackage(j, "A::AA::A17"));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A1"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A2"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A3"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A4"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A5"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A6"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A7"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A8"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A9"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A10"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A11"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A12"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A13"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A14"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A15"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A16"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A17"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "A18"s));
 
-        REQUIRE(IsPackage(j, "B::BB::BBB"));
+        REQUIRE(IsNamespacePackage(j, "B"s, "BB"s, "BBB"s));
 
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A1"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A2"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A3"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A4"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A5"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A6"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A7"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A8"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A9"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A10"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A11"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A12"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A13"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A14"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A15"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A16"));
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::A17"));
+        REQUIRE(IsDependency(j, "BBB", "A1"));
+        REQUIRE(IsDependency(j, "BBB", "A2"));
+        REQUIRE(IsDependency(j, "BBB", "A3"));
+        REQUIRE(IsDependency(j, "BBB", "A4"));
+        REQUIRE(IsDependency(j, "BBB", "A5"));
+        REQUIRE(IsDependency(j, "BBB", "A6"));
+        REQUIRE(IsDependency(j, "BBB", "A7"));
+        REQUIRE(IsDependency(j, "BBB", "A8"));
+        REQUIRE(IsDependency(j, "BBB", "A9"));
+        REQUIRE(IsDependency(j, "BBB", "A10"));
+        REQUIRE(IsDependency(j, "BBB", "A11"));
+        REQUIRE(IsDependency(j, "BBB", "A12"));
+        REQUIRE(IsDependency(j, "BBB", "A13"));
+        REQUIRE(IsDependency(j, "BBB", "A14"));
+        REQUIRE(IsDependency(j, "BBB", "A15"));
+        REQUIRE(IsDependency(j, "BBB", "A16"));
+        REQUIRE(IsDependency(j, "BBB", "A17"));
+        REQUIRE(IsDependency(j, "BBB", "A18"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30003/test_case.h b/tests/t30003/test_case.h
index 09082966..43ee3d96 100644
--- a/tests/t30003/test_case.h
+++ b/tests/t30003/test_case.h
@@ -50,15 +50,16 @@ TEST_CASE("t30003", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "ns1"));
-        REQUIRE(IsPackage(j, "ns1::ns2_v1_0_0"));
-        REQUIRE(IsPackage(j, "ns1::ns2_v0_9_0"));
-        REQUIRE(IsPackage(j, "ns3"));
-        REQUIRE(IsPackage(j, "ns3::ns1"));
-        REQUIRE(IsPackage(j, "ns3::ns1::ns2"));
+        REQUIRE(IsNamespacePackage(j, "ns1"s));
+        REQUIRE(IsNamespacePackage(j, "ns1"s, "ns2_v1_0_0"s));
+        REQUIRE(IsNamespacePackage(j, "ns1"s, "ns2_v0_9_0"s));
+        REQUIRE(IsNamespacePackage(j, "ns3"s));
+        REQUIRE(IsNamespacePackage(j, "ns3"s, "ns1"s));
+        REQUIRE(IsNamespacePackage(j, "ns3"s, "ns1"s, "ns2"s));
 
-        REQUIRE(IsDeprecated(j, "ns1::ns2_v0_9_0"));
+        REQUIRE(IsDeprecated(j, "ns2_v0_9_0"));
         REQUIRE(IsDeprecated(j, "ns3"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
diff --git a/tests/t30004/test_case.h b/tests/t30004/test_case.h
index 0eb17be6..f6295698 100644
--- a/tests/t30004/test_case.h
+++ b/tests/t30004/test_case.h
@@ -48,13 +48,14 @@ TEST_CASE("t30004", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "A"));
-        REQUIRE(IsPackage(j, "A::AAA"));
-        REQUIRE(IsPackage(j, "A::BBB"));
-        REQUIRE(IsPackage(j, "A::CCC"));
-        REQUIRE(!IsPackage(j, "A::DDD"));
-        REQUIRE(IsPackage(j, "A::EEE"));
+        REQUIRE(IsNamespacePackage(j, "A"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AAA"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "BBB"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "CCC"s));
+        REQUIRE(!IsNamespacePackage(j, "A"s, "DDD"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "EEE"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30005/test_case.h b/tests/t30005/test_case.h
index 75e5d45c..826500cf 100644
--- a/tests/t30005/test_case.h
+++ b/tests/t30005/test_case.h
@@ -49,19 +49,20 @@ TEST_CASE("t30005", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "A"));
-        REQUIRE(IsPackage(j, "A::AA"));
-        REQUIRE(IsPackage(j, "A::AA::AAA"));
-        REQUIRE(IsPackage(j, "B"));
-        REQUIRE(IsPackage(j, "B::BB"));
-        REQUIRE(IsPackage(j, "B::BB::BBB"));
-        REQUIRE(IsPackage(j, "C"));
-        REQUIRE(IsPackage(j, "C::CC"));
-        REQUIRE(IsPackage(j, "C::CC::CCC"));
+        REQUIRE(IsNamespacePackage(j, "A"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s, "AAA"s));
+        REQUIRE(IsNamespacePackage(j, "B"s));
+        REQUIRE(IsNamespacePackage(j, "B"s, "BB"s));
+        REQUIRE(IsNamespacePackage(j, "B"s, "BB"s, "BBB"s));
+        REQUIRE(IsNamespacePackage(j, "C"s));
+        REQUIRE(IsNamespacePackage(j, "C"s, "CC"s));
+        REQUIRE(IsNamespacePackage(j, "C"s, "CC"s, "CCC"s));
 
-        REQUIRE(IsDependency(j, "B::BB::BBB", "A::AA::AAA"));
-        REQUIRE(IsDependency(j, "C::CC::CCC", "A::AA::AAA"));
+        REQUIRE(IsDependency(j, "BBB", "AAA"));
+        REQUIRE(IsDependency(j, "CCC", "AAA"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30006/test_case.h b/tests/t30006/test_case.h
index bed6eeca..92f77aac 100644
--- a/tests/t30006/test_case.h
+++ b/tests/t30006/test_case.h
@@ -49,10 +49,11 @@ TEST_CASE("t30006", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "A"));
-        REQUIRE(IsPackage(j, "B"));
-        REQUIRE(IsPackage(j, "C"));
+        REQUIRE(IsNamespacePackage(j, "A"s));
+        REQUIRE(IsNamespacePackage(j, "B"s));
+        REQUIRE(IsNamespacePackage(j, "C"s));
 
         REQUIRE(IsDependency(j, "A", "B"));
         REQUIRE(IsDependency(j, "A", "C"));
diff --git a/tests/t30007/test_case.h b/tests/t30007/test_case.h
index 796f453b..77a28066 100644
--- a/tests/t30007/test_case.h
+++ b/tests/t30007/test_case.h
@@ -52,14 +52,15 @@ TEST_CASE("t30007", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "A"));
-        REQUIRE(IsPackage(j, "A::AA"));
-        REQUIRE(IsPackage(j, "B"));
-        REQUIRE(IsPackage(j, "C"));
+        REQUIRE(IsNamespacePackage(j, "A"s));
+        REQUIRE(IsNamespacePackage(j, "A"s, "AA"s));
+        REQUIRE(IsNamespacePackage(j, "B"s));
+        REQUIRE(IsNamespacePackage(j, "C"s));
 
-        REQUIRE(IsDependency(j, "A::AA", "B"));
-        REQUIRE(IsDependency(j, "A::AA", "C"));
+        REQUIRE(IsDependency(j, "AA", "B"));
+        REQUIRE(IsDependency(j, "AA", "C"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30008/test_case.h b/tests/t30008/test_case.h
index 8d724055..25557783 100644
--- a/tests/t30008/test_case.h
+++ b/tests/t30008/test_case.h
@@ -58,22 +58,23 @@ TEST_CASE("t30008", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "dependants::A"));
-        REQUIRE(IsPackage(j, "dependants::B"));
-        REQUIRE(IsPackage(j, "dependants::C"));
-        REQUIRE(!IsPackage(j, "dependants::X"));
+        REQUIRE(IsNamespacePackage(j, "dependants"s, "A"s));
+        REQUIRE(IsNamespacePackage(j, "dependants"s, "B"s));
+        REQUIRE(IsNamespacePackage(j, "dependants"s, "C"s));
+        REQUIRE(!IsNamespacePackage(j, "dependants"s, "X"s));
 
-        REQUIRE(IsDependency(j, "dependants::B", "dependants::A"));
-        REQUIRE(IsDependency(j, "dependants::C", "dependants::B"));
+        REQUIRE(IsDependency(j, "B", "A"));
+        REQUIRE(IsDependency(j, "C", "B"));
 
-        REQUIRE(IsPackage(j, "dependencies::D"));
-        REQUIRE(IsPackage(j, "dependencies::E"));
-        REQUIRE(IsPackage(j, "dependencies::F"));
-        REQUIRE(!IsPackage(j, "dependencies::Y"));
+        REQUIRE(IsNamespacePackage(j, "dependencies"s, "D"s));
+        REQUIRE(IsNamespacePackage(j, "dependencies"s, "E"s));
+        REQUIRE(IsNamespacePackage(j, "dependencies"s, "F"s));
+        REQUIRE(!IsNamespacePackage(j, "dependencies"s, "Y"s));
 
-        REQUIRE(IsDependency(j, "dependencies::E", "dependencies::D"));
-        REQUIRE(IsDependency(j, "dependencies::F", "dependencies::E"));
+        REQUIRE(IsDependency(j, "E", "D"));
+        REQUIRE(IsDependency(j, "F", "E"));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30009/test_case.h b/tests/t30009/test_case.h
index efb4902d..e2727d08 100644
--- a/tests/t30009/test_case.h
+++ b/tests/t30009/test_case.h
@@ -50,17 +50,18 @@ TEST_CASE("t30009", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "One"));
-        REQUIRE(IsPackage(j, "Two"));
-        REQUIRE(IsPackage(j, "One::A"));
-        REQUIRE(IsPackage(j, "One::B"));
-        REQUIRE(IsPackage(j, "One::C"));
-        REQUIRE(IsPackage(j, "One::D"));
-        REQUIRE(IsPackage(j, "Two::A"));
-        REQUIRE(IsPackage(j, "Two::B"));
-        REQUIRE(IsPackage(j, "Two::C"));
-        REQUIRE(IsPackage(j, "Two::D"));
+        REQUIRE(IsNamespacePackage(j, "One"s));
+        REQUIRE(IsNamespacePackage(j, "Two"s));
+        REQUIRE(IsNamespacePackage(j, "One"s, "A"s));
+        REQUIRE(IsNamespacePackage(j, "One"s, "B"s));
+        REQUIRE(IsNamespacePackage(j, "One"s, "C"s));
+        REQUIRE(IsNamespacePackage(j, "One"s, "D"s));
+        REQUIRE(IsNamespacePackage(j, "Two"s, "A"s));
+        REQUIRE(IsNamespacePackage(j, "Two"s, "B"s));
+        REQUIRE(IsNamespacePackage(j, "Two"s, "C"s));
+        REQUIRE(IsNamespacePackage(j, "Two"s, "D"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30010/test_case.h b/tests/t30010/test_case.h
index 03a1e1ca..bdfd1a09 100644
--- a/tests/t30010/test_case.h
+++ b/tests/t30010/test_case.h
@@ -54,6 +54,13 @@ TEST_CASE("t30010", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
+
+        REQUIRE(IsDirectoryPackage(j, "app"s));
+        REQUIRE(IsDirectoryPackage(j, "libraries"s, "lib1"s));
+        REQUIRE(IsDirectoryPackage(j, "libraries"s, "lib2"s));
+        REQUIRE(IsDirectoryPackage(j, "libraries"s, "lib3"s));
+        REQUIRE(IsDirectoryPackage(j, "libraries"s, "lib4"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30011/test_case.h b/tests/t30011/test_case.h
index ac66a448..a9acd471 100644
--- a/tests/t30011/test_case.h
+++ b/tests/t30011/test_case.h
@@ -54,6 +54,18 @@ TEST_CASE("t30011", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
+
+        REQUIRE(IsDirectoryPackage(j, "app"s));
+        REQUIRE(IsDirectoryPackage(j, "libraries"s, "lib1"s));
+        REQUIRE(IsDirectoryPackage(j, "libraries"s, "lib2"s));
+        REQUIRE(IsDirectoryPackage(j, "libraries"s, "lib3"s));
+        REQUIRE(IsDirectoryPackage(j, "libraries"s, "lib4"s));
+
+        REQUIRE(IsDependency(j, "app"s, "lib1"s));
+        REQUIRE(IsDependency(j, "app"s, "lib2"s));
+        REQUIRE(IsDependency(j, "app"s, "lib3"s));
+        REQUIRE(IsDependency(j, "app"s, "lib4"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30012/test_case.h b/tests/t30012/test_case.h
index a572a28c..ad0458ae 100644
--- a/tests/t30012/test_case.h
+++ b/tests/t30012/test_case.h
@@ -49,12 +49,13 @@ TEST_CASE("t30012", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "t30012.app", "module"));
-        REQUIRE(IsPackage(j, "t30012.app.lib1", "module"));
-        REQUIRE(IsPackage(j, "t30012.app.lib2", "module"));
-        REQUIRE(IsPackage(j, "t30012.app.lib1.mod1", "module"));
-        REQUIRE(IsPackage(j, "t30012.app.lib1.mod2", "module"));
+        REQUIRE(IsModulePackage(j, "app"s));
+        REQUIRE(IsModulePackage(j, "app"s, "lib1"s));
+        REQUIRE(IsModulePackage(j, "app"s, "lib1"s, "mod1"s));
+        REQUIRE(IsModulePackage(j, "app"s, "lib1"s, "mod2"s));
+        REQUIRE(IsModulePackage(j, "app"s, "lib2"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30013/test_case.h b/tests/t30013/test_case.h
index 75067652..b05a5477 100644
--- a/tests/t30013/test_case.h
+++ b/tests/t30013/test_case.h
@@ -82,26 +82,26 @@ TEST_CASE("t30013", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
-
-        REQUIRE(IsPackage(j, "t30013.app", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod1", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod2", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod3", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod4", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod5", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod6", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod7", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod8", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod9", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod10", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod11", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod12", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod13", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod14", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod15", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod16", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod17", "module"));
-        REQUIRE(IsPackage(j, "t30013.mod18", "module"));
+        using namespace std::string_literals;
+        REQUIRE(IsModulePackage(j, "app"s));
+        REQUIRE(IsModulePackage(j, "mod1"s));
+        REQUIRE(IsModulePackage(j, "mod2"s));
+        REQUIRE(IsModulePackage(j, "mod3"s));
+        REQUIRE(IsModulePackage(j, "mod4"s));
+        REQUIRE(IsModulePackage(j, "mod5"s));
+        REQUIRE(IsModulePackage(j, "mod6"s));
+        REQUIRE(IsModulePackage(j, "mod7"s));
+        REQUIRE(IsModulePackage(j, "mod8"s));
+        REQUIRE(IsModulePackage(j, "mod9"s));
+        REQUIRE(IsModulePackage(j, "mod10"s));
+        REQUIRE(IsModulePackage(j, "mod11"s));
+        REQUIRE(IsModulePackage(j, "mod12"s));
+        REQUIRE(IsModulePackage(j, "mod13"s));
+        REQUIRE(IsModulePackage(j, "mod14"s));
+        REQUIRE(IsModulePackage(j, "mod15"s));
+        REQUIRE(IsModulePackage(j, "mod16"s));
+        REQUIRE(IsModulePackage(j, "mod17"s));
+        REQUIRE(IsModulePackage(j, "mod18"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30014/test_case.h b/tests/t30014/test_case.h
index 10e90bb0..5e52a48d 100644
--- a/tests/t30014/test_case.h
+++ b/tests/t30014/test_case.h
@@ -49,12 +49,13 @@ TEST_CASE("t30014", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "t30014.app", "module"));
-        REQUIRE(IsPackage(j, "t30014.app:lib1", "module"));
-        REQUIRE(IsPackage(j, "t30014.app:lib2", "module"));
-        REQUIRE(IsPackage(j, "t30014.app:lib1.mod1", "module"));
-        REQUIRE(!IsPackage(j, "t30014.app:lib1.mod2", "module"));
+        REQUIRE(IsModulePackage(j, "app"s));
+        REQUIRE(IsModulePackage(j, "app"s, ":lib1"s));
+        REQUIRE(IsModulePackage(j, "app"s, ":lib2"s));
+        REQUIRE(IsModulePackage(j, "app"s, ":lib1"s, "mod1"s));
+        REQUIRE(!IsModulePackage(j, "app"s, ":lib1"s, "mod2"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/t30015/test_case.h b/tests/t30015/test_case.h
index 3b40ef67..3b9a78a2 100644
--- a/tests/t30015/test_case.h
+++ b/tests/t30015/test_case.h
@@ -83,27 +83,28 @@ TEST_CASE("t30015", "[test-case][package]")
         auto j = generate_package_json(diagram, *model);
 
         using namespace json;
+        using namespace std::string_literals;
 
-        REQUIRE(IsPackage(j, "t30015.app", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod1", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod2", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod3", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod4", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod5", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod6", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod7", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod8", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod9", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod10", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod11", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod12", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod13", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod14", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod15", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod16", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod17", "module"));
-        REQUIRE(IsPackage(j, "t30015.lib1:mod18", "module"));
+        REQUIRE(IsModulePackage(j, "app"s));
+        REQUIRE(IsModulePackage(j, "lib1"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod1"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod2"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod3"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod4"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod5"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod6"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod7"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod8"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod9"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod10"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod11"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod12"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod13"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod14"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod15"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod16"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod17"s));
+        REQUIRE(IsModulePackage(j, "lib1"s, ":mod18"s));
 
         save_json(config.output_directory(), diagram->name + ".json", j);
     }
diff --git a/tests/test_cases.h b/tests/test_cases.h
index 4b82c499..e35da169 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -1227,8 +1227,8 @@ std::optional<nlohmann::json> get_participant(
     if (!j.contains("participants"))
         return {};
 
-    for (const nlohmann::json &e : j["participants"]) {
-        if (e["name"] == name)
+    for (const nlohmann::json &e : j.at("participants")) {
+        if (e["display_name"] == name)
             return {e};
     }
 
@@ -1259,36 +1259,6 @@ auto get_relationship(const nlohmann::json &j, const std::string &from,
 
 std::string expand_name(const nlohmann::json &j, const std::string &name)
 {
-    using clanguml::class_diagram::model::path_type;
-    using clanguml::common::model::path;
-    using config::package_type_t;
-
-    if (!j.contains("package_type") ||
-        j["package_type"] == to_string(package_type_t::kNamespace)) {
-        if (!j.contains("using_namespace"))
-            return name;
-
-        auto full_path = path{j["using_namespace"].get<std::string>()};
-        full_path |= path{name};
-
-        return full_path.to_string();
-    }
-
-    if (j["package_type"] == to_string(package_type_t::kModule)) {
-        return name;
-        //        if (!j.contains("using_module"))
-        //            return name;
-        //
-        //        auto full_path =
-        //            path{j["using_module"].get<std::string>(),
-        //            path_type::kModule};
-        //        full_path |= path{name, path_type::kModule};
-        //
-        //        auto res = full_path.to_string();
-        //
-        //        return res;
-    }
-
     return name;
 }
 
@@ -1350,6 +1320,65 @@ bool IsPackage(const nlohmann::json &j, const std::string &name,
     return e && e->at("type") == type;
 }
 
+struct NamespacePackage { };
+struct ModulePackage { };
+struct DirectoryPackage { };
+
+template <typename PackageT> std::string package_type_name();
+
+template <> std::string package_type_name<NamespacePackage>()
+{
+    return "namespace";
+}
+
+template <> std::string package_type_name<ModulePackage>() { return "module"; }
+
+template <> std::string package_type_name<DirectoryPackage>()
+{
+    return "directory";
+}
+
+template <typename PackageT, typename... Args>
+bool IsPackagePath(
+    const nlohmann::json &j, const std::string &head, Args... args)
+{
+    if constexpr (sizeof...(Args) == 0) {
+        auto e = get_element(j, expand_name(j, head));
+
+        return e && e->at("type") == package_type_name<PackageT>();
+    }
+    else {
+        auto e = get_element(j, head);
+        if (!e.has_value())
+            return false;
+
+        return IsPackagePath<PackageT>(*e, args...);
+    }
+}
+
+template <typename... Args>
+bool IsNamespacePackage(
+    const nlohmann::json &j, const std::string &head, Args... args)
+{
+    return IsPackagePath<NamespacePackage>(
+        j, head, std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+bool IsDirectoryPackage(
+    const nlohmann::json &j, const std::string &head, Args... args)
+{
+    return IsPackagePath<DirectoryPackage>(
+        j, head, std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+bool IsModulePackage(
+    const nlohmann::json &j, const std::string &head, Args... args)
+{
+    return IsPackagePath<ModulePackage>(j, head, std::forward<Args>(args)...);
+}
+
 bool IsFolder(const nlohmann::json &j, const std::string &name)
 {
     auto e = get_element(j, name);
@@ -1624,11 +1653,30 @@ struct message_test_spec_t {
 
 void from_json(const nlohmann::json &j, message_test_spec_t &p)
 {
-    j.at("from").at("activity_name").get_to(p.from);
-    j.at("to").at("activity_name").get_to(p.to);
+    j.at("from").at("activity_id").get_to(p.from);
+    j.at("to").at("activity_id").get_to(p.to);
     j.at("return_type").get_to(p.return_type);
 }
 
+std::string get_activity_id(
+    const nlohmann::json &j, const std::string &display_name)
+{
+    for (const auto &p : j["participants"]) {
+        if (p.contains("activities")) {
+            for (const auto &a : p["activities"]) {
+                if (a["display_name"] == display_name) {
+                    return a["id"];
+                }
+            }
+        }
+        else if (p["display_name"] == display_name) {
+            return p["id"];
+        }
+    }
+
+    return {};
+}
+
 bool HasMessageChain(
     const nlohmann::json &j, std::vector<message_test_spec_t> msgs)
 {
@@ -1637,8 +1685,8 @@ bool HasMessageChain(
         std::back_inserter(full_name_messages),
         [&j](const message_test_spec_t &m) {
             auto res = m;
-            res.from = expand_name(j, m.from);
-            res.to = expand_name(j, m.to);
+            res.from = get_activity_id(j, m.from);
+            res.to = get_activity_id(j, m.to);
             return res;
         });
 

From 7ef684c2cf059756a3de21c12a49719fb30e0b79 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Mon, 1 Jan 2024 21:44:37 +0100
Subject: [PATCH 13/24] Updated test cases documentation

---
 docs/test_cases.md                          |   3 +
 docs/test_cases/t00002.md                   |  11 +-
 docs/test_cases/t00002_class.svg            | 318 +++----
 docs/test_cases/t00002_class_mermaid.svg    | 120 ++-
 docs/test_cases/t00003.md                   |   3 +-
 docs/test_cases/t00003_class.svg            | 454 +++++-----
 docs/test_cases/t00003_class_mermaid.svg    | 141 ++-
 docs/test_cases/t00004.md                   |  33 +-
 docs/test_cases/t00004_class.svg            | 498 +++++-----
 docs/test_cases/t00004_class_mermaid.svg    | 103 +--
 docs/test_cases/t00005.md                   |  25 +-
 docs/test_cases/t00005_class.svg            | 498 +++++-----
 docs/test_cases/t00005_class_mermaid.svg    |  83 +-
 docs/test_cases/t00006.md                   |  39 +-
 docs/test_cases/t00006_class.svg            | 666 ++++++--------
 docs/test_cases/t00006_class_mermaid.svg    | 101 +--
 docs/test_cases/t00007.md                   |   9 +-
 docs/test_cases/t00007_class.svg            | 138 ++-
 docs/test_cases/t00007_class_mermaid.svg    |  41 +-
 docs/test_cases/t00008.md                   |  17 +-
 docs/test_cases/t00008_class.svg            | 376 ++++----
 docs/test_cases/t00008_class_mermaid.svg    |  89 +-
 docs/test_cases/t00009.md                   |  11 +-
 docs/test_cases/t00009_class.svg            | 208 ++---
 docs/test_cases/t00009_class_mermaid.svg    |  51 +-
 docs/test_cases/t00010.md                   |  11 +-
 docs/test_cases/t00010_class.svg            | 192 ++--
 docs/test_cases/t00010_class_mermaid.svg    |  45 +-
 docs/test_cases/t00011.md                   |   7 +-
 docs/test_cases/t00011_class.svg            | 136 ++-
 docs/test_cases/t00011_class_mermaid.svg    |  67 +-
 docs/test_cases/t00012.md                   |  19 +-
 docs/test_cases/t00012_class.svg            | 398 ++++----
 docs/test_cases/t00012_class_mermaid.svg    |  65 +-
 docs/test_cases/t00013.md                   |  21 +-
 docs/test_cases/t00013_class.svg            | 614 ++++++-------
 docs/test_cases/t00013_class_mermaid.svg    | 147 ++-
 docs/test_cases/t00014.md                   |  37 +-
 docs/test_cases/t00014_class.svg            | 908 +++++++++----------
 docs/test_cases/t00014_class_mermaid.svg    | 133 ++-
 docs/test_cases/t00015.md                   |  11 +-
 docs/test_cases/t00015_class.svg            | 106 +--
 docs/test_cases/t00015_class_mermaid.svg    |  43 +-
 docs/test_cases/t00016.md                   |  13 +-
 docs/test_cases/t00016_class.svg            | 182 ++--
 docs/test_cases/t00016_class_mermaid.svg    |  49 +-
 docs/test_cases/t00017.md                   |  25 +-
 docs/test_cases/t00017_class.svg            | 358 ++++----
 docs/test_cases/t00017_class_mermaid.svg    |  93 +-
 docs/test_cases/t00018.md                   |   5 +-
 docs/test_cases/t00018_class.svg            | 258 +++---
 docs/test_cases/t00018_class_mermaid.svg    | 103 +--
 docs/test_cases/t00019.md                   | 143 +--
 docs/test_cases/t00019_class.svg            | 398 ++++----
 docs/test_cases/t00019_class_mermaid.svg    | 127 ++-
 docs/test_cases/t00020.md                   |  19 +-
 docs/test_cases/t00020_class.svg            | 448 +++++----
 docs/test_cases/t00020_class_mermaid.svg    | 181 ++--
 docs/test_cases/t00021.md                   |  15 +-
 docs/test_cases/t00021_class.svg            | 402 ++++-----
 docs/test_cases/t00021_class_mermaid.svg    | 169 ++--
 docs/test_cases/t00022.md                   |   7 +-
 docs/test_cases/t00022_class.svg            | 166 ++--
 docs/test_cases/t00022_class_mermaid.svg    |  85 +-
 docs/test_cases/t00023.md                   |  11 +-
 docs/test_cases/t00023_class.svg            | 232 +++--
 docs/test_cases/t00023_class_mermaid.svg    | 109 ++-
 docs/test_cases/t00024.md                   |   9 +-
 docs/test_cases/t00024_class.svg            | 258 +++---
 docs/test_cases/t00024_class_mermaid.svg    | 113 ++-
 docs/test_cases/t00025.md                   |  13 +-
 docs/test_cases/t00025_class.svg            | 302 +++----
 docs/test_cases/t00025_class_mermaid.svg    | 103 +--
 docs/test_cases/t00026.md                   |  13 +-
 docs/test_cases/t00026_class.svg            | 372 ++++----
 docs/test_cases/t00026_class_mermaid.svg    | 111 ++-
 docs/test_cases/t00027.md                   |  27 +-
 docs/test_cases/t00027_class.svg            | 492 +++++-----
 docs/test_cases/t00027_class_mermaid.svg    | 145 ++-
 docs/test_cases/t00028.md                   |  19 +-
 docs/test_cases/t00028_class.svg            | 416 ++++-----
 docs/test_cases/t00028_class_mermaid.svg    |  65 +-
 docs/test_cases/t00029.md                   |  19 +-
 docs/test_cases/t00029_class.svg            | 252 +++---
 docs/test_cases/t00029_class_mermaid.svg    |  49 +-
 docs/test_cases/t00030.md                   |  13 +-
 docs/test_cases/t00030_class.svg            | 236 +++--
 docs/test_cases/t00030_class_mermaid.svg    |  63 +-
 docs/test_cases/t00031.md                   |  13 +-
 docs/test_cases/t00031_class.svg            | 263 +++---
 docs/test_cases/t00031_class_mermaid.svg    |  59 +-
 docs/test_cases/t00032.md                   |  17 +-
 docs/test_cases/t00032_class.svg            | 260 +++---
 docs/test_cases/t00032_class_mermaid.svg    |  91 +-
 docs/test_cases/t00033.md                   |  17 +-
 docs/test_cases/t00033_class.svg            | 276 +++---
 docs/test_cases/t00033_class_mermaid.svg    |  57 +-
 docs/test_cases/t00034.md                   |  15 +-
 docs/test_cases/t00034_class.svg            | 230 +++--
 docs/test_cases/t00034_class_mermaid.svg    |  71 +-
 docs/test_cases/t00035.md                   |  11 +-
 docs/test_cases/t00035_class.svg            |  88 +-
 docs/test_cases/t00035_class_mermaid.svg    |  37 +-
 docs/test_cases/t00036.md                   |  33 +-
 docs/test_cases/t00036_class.svg            | 184 ++--
 docs/test_cases/t00036_class_mermaid.svg    |  41 +-
 docs/test_cases/t00037.md                   |   9 +-
 docs/test_cases/t00037_class.svg            | 242 +++--
 docs/test_cases/t00037_class_mermaid.svg    |  53 +-
 docs/test_cases/t00038.md                   |  21 +-
 docs/test_cases/t00038_class.svg            | 324 +++----
 docs/test_cases/t00038_class_mermaid.svg    |  77 +-
 docs/test_cases/t00039.md                   |  29 +-
 docs/test_cases/t00039_class.svg            | 396 ++++----
 docs/test_cases/t00039_class_mermaid.svg    |  91 +-
 docs/test_cases/t00040.md                   |   9 +-
 docs/test_cases/t00040_class.svg            | 154 ++--
 docs/test_cases/t00040_class_mermaid.svg    |  77 +-
 docs/test_cases/t00041.md                   |  19 +-
 docs/test_cases/t00041_class.svg            | 272 +++---
 docs/test_cases/t00041_class_mermaid.svg    |  85 +-
 docs/test_cases/t00042.md                   |  13 +-
 docs/test_cases/t00042_class.svg            | 208 ++---
 docs/test_cases/t00042_class_mermaid.svg    |  49 +-
 docs/test_cases/t00043.md                   |  27 +-
 docs/test_cases/t00043_class.svg            | 400 ++++----
 docs/test_cases/t00043_class_mermaid.svg    | 141 ++-
 docs/test_cases/t00044.md                   |  15 +-
 docs/test_cases/t00044_class.svg            | 242 +++--
 docs/test_cases/t00044_class_mermaid.svg    |  65 +-
 docs/test_cases/t00045.md                   |   1 +
 docs/test_cases/t00045_class.svg            | 366 ++++----
 docs/test_cases/t00045_class_mermaid.svg    |  83 +-
 docs/test_cases/t00046.md                   |   3 +-
 docs/test_cases/t00046_class.svg            | 320 +++----
 docs/test_cases/t00046_class_mermaid.svg    |  75 +-
 docs/test_cases/t00047.md                   |   9 +-
 docs/test_cases/t00047_class.svg            | 106 +--
 docs/test_cases/t00047_class_mermaid.svg    |  41 +-
 docs/test_cases/t00048.md                   |  69 +-
 docs/test_cases/t00048_class.svg            | 308 +++----
 docs/test_cases/t00048_class_mermaid.svg    |  97 +-
 docs/test_cases/t00049.md                   |  11 +-
 docs/test_cases/t00049_class.svg            | 250 +++--
 docs/test_cases/t00049_class_mermaid.svg    |  81 +-
 docs/test_cases/t00050.md                   |  17 +-
 docs/test_cases/t00050_class.svg            | 384 ++++----
 docs/test_cases/t00050_class_mermaid.svg    |  43 +-
 docs/test_cases/t00051.md                   |  11 +-
 docs/test_cases/t00051_class.svg            | 346 ++++---
 docs/test_cases/t00051_class_mermaid.svg    | 125 ++-
 docs/test_cases/t00052.md                   |  13 +-
 docs/test_cases/t00052_class.svg            | 228 +++--
 docs/test_cases/t00052_class_mermaid.svg    |  95 +-
 docs/test_cases/t00053.md                   |  35 +-
 docs/test_cases/t00053_class.svg            | 286 +++---
 docs/test_cases/t00053_class_mermaid.svg    |  61 +-
 docs/test_cases/t00054.md                   |  43 +-
 docs/test_cases/t00054_class.svg            | 530 ++++-------
 docs/test_cases/t00054_class_mermaid.svg    |  61 +-
 docs/test_cases/t00055.md                   |  21 +-
 docs/test_cases/t00055_class.svg            | 168 ++--
 docs/test_cases/t00055_class_mermaid.svg    |  47 +-
 docs/test_cases/t00056.md                   |  29 +-
 docs/test_cases/t00056_class.svg            | 564 ++++++------
 docs/test_cases/t00056_class_mermaid.svg    |  99 +-
 docs/test_cases/t00057.md                   |   1 +
 docs/test_cases/t00057_class.svg            | 542 ++++++-----
 docs/test_cases/t00057_class_mermaid.svg    |  73 +-
 docs/test_cases/t00058.md                   |  17 +-
 docs/test_cases/t00058_class.svg            | 302 +++----
 docs/test_cases/t00058_class_mermaid.svg    |  59 +-
 docs/test_cases/t00059.md                   |  23 +-
 docs/test_cases/t00059_class.svg            | 484 +++++-----
 docs/test_cases/t00059_class_mermaid.svg    | 163 ++--
 docs/test_cases/t00060.md                   |  13 +-
 docs/test_cases/t00060_class.svg            | 192 ++--
 docs/test_cases/t00060_class_mermaid.svg    |  51 +-
 docs/test_cases/t00061.md                   |   3 +-
 docs/test_cases/t00061_class.svg            |  24 +-
 docs/test_cases/t00061_class_mermaid.svg    |  29 +-
 docs/test_cases/t00062.md                   |  45 +-
 docs/test_cases/t00062_class.svg            | 952 +++++++++-----------
 docs/test_cases/t00062_class_mermaid.svg    | 113 ++-
 docs/test_cases/t00063.md                   |   3 +-
 docs/test_cases/t00063_class.svg            |  24 +-
 docs/test_cases/t00063_class_mermaid.svg    |  29 +-
 docs/test_cases/t00064.md                   |  47 +-
 docs/test_cases/t00064_class.svg            | 712 +++++++--------
 docs/test_cases/t00064_class_mermaid.svg    | 141 ++-
 docs/test_cases/t00065.md                   |  95 +-
 docs/test_cases/t00065_class.svg            | 532 +++++------
 docs/test_cases/t00065_class_mermaid.svg    | 111 ++-
 docs/test_cases/t00066.md                   |   3 +-
 docs/test_cases/t00066_class.svg            | 444 ++++-----
 docs/test_cases/t00066_class_mermaid.svg    | 137 ++-
 docs/test_cases/t00067.md                   |   3 +-
 docs/test_cases/t00067_class.svg            | 304 ++++---
 docs/test_cases/t00067_class_mermaid.svg    |  97 +-
 docs/test_cases/t00068.md                   |  31 +-
 docs/test_cases/t00068_r0_class.svg         |  54 +-
 docs/test_cases/t00068_r0_class_mermaid.svg |  34 +-
 docs/test_cases/t00068_r1_class.svg         | 188 ++--
 docs/test_cases/t00068_r1_class_mermaid.svg |  52 +-
 docs/test_cases/t00068_r2_class.svg         | 272 +++---
 docs/test_cases/t00068_r2_class_mermaid.svg |  64 +-
 docs/test_cases/t00069.md                   |   9 +-
 docs/test_cases/t00069_class.svg            | 302 +++----
 docs/test_cases/t00069_class_mermaid.svg    | 111 ++-
 docs/test_cases/t00070.md                   |  65 +-
 docs/test_cases/t00070_class.svg            | 122 ++-
 docs/test_cases/t00070_class_mermaid.svg    |  49 +-
 docs/test_cases/t00071.md                   |  92 +-
 docs/test_cases/t00071_class.svg            | 346 ++++---
 docs/test_cases/t00071_class_mermaid.svg    |  73 +-
 docs/test_cases/t00072.md                   | 448 +++++++++
 docs/test_cases/t00072_class.svg            | 136 +++
 docs/test_cases/t00072_class_mermaid.svg    | 269 ++++++
 docs/test_cases/t20001.md                   | 122 ++-
 docs/test_cases/t20001_sequence.svg         | 192 ++--
 docs/test_cases/t20001_sequence_mermaid.svg |  45 +-
 docs/test_cases/t20002.md                   |  31 +-
 docs/test_cases/t20002_sequence.svg         |  90 +-
 docs/test_cases/t20002_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20003.md                   |  31 +-
 docs/test_cases/t20003_sequence.svg         |  90 +-
 docs/test_cases/t20003_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20004.md                   |  85 +-
 docs/test_cases/t20004_sequence.svg         | 258 +++---
 docs/test_cases/t20004_sequence_mermaid.svg |  78 +-
 docs/test_cases/t20005.md                   |  61 +-
 docs/test_cases/t20005_sequence.svg         |  90 +-
 docs/test_cases/t20005_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20006.md                   | 295 ++++--
 docs/test_cases/t20006_sequence.svg         | 344 +++----
 docs/test_cases/t20006_sequence_mermaid.svg |  86 +-
 docs/test_cases/t20007.md                   |  76 +-
 docs/test_cases/t20007_sequence.svg         | 108 +--
 docs/test_cases/t20007_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20008.md                   | 139 ++-
 docs/test_cases/t20008_sequence.svg         | 168 ++--
 docs/test_cases/t20008_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20009.md                   | 139 ++-
 docs/test_cases/t20009_sequence.svg         | 168 ++--
 docs/test_cases/t20009_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20010.md                   | 148 ++-
 docs/test_cases/t20010_sequence.svg         | 144 +--
 docs/test_cases/t20010_sequence_mermaid.svg |  38 +-
 docs/test_cases/t20011.md                   |  82 +-
 docs/test_cases/t20011_sequence.svg         | 180 ++--
 docs/test_cases/t20011_sequence_mermaid.svg |  14 +-
 docs/test_cases/t20012.md                   | 260 ++++--
 docs/test_cases/t20012_sequence.svg         | 460 +++++-----
 docs/test_cases/t20012_sequence_mermaid.svg |  70 +-
 docs/test_cases/t20013.md                   | 115 ++-
 docs/test_cases/t20013_sequence.svg         | 144 +--
 docs/test_cases/t20013_sequence_mermaid.svg |  54 +-
 docs/test_cases/t20014.md                   | 184 ++--
 docs/test_cases/t20014_sequence.svg         | 172 ++--
 docs/test_cases/t20014_sequence_mermaid.svg |  62 +-
 docs/test_cases/t20015.md                   |  28 +-
 docs/test_cases/t20015_sequence.svg         |  48 +-
 docs/test_cases/t20015_sequence_mermaid.svg |  10 +-
 docs/test_cases/t20016.md                   |  82 +-
 docs/test_cases/t20016_sequence.svg         | 104 ++-
 docs/test_cases/t20016_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20017.md                   | 152 +++-
 docs/test_cases/t20017_sequence.svg         | 132 +--
 docs/test_cases/t20017_sequence_mermaid.svg |  54 +-
 docs/test_cases/t20018.md                   | 154 +++-
 docs/test_cases/t20018_sequence.svg         | 192 ++--
 docs/test_cases/t20018_sequence_mermaid.svg |  34 +-
 docs/test_cases/t20019.md                   | 104 ++-
 docs/test_cases/t20019_sequence.svg         | 168 ++--
 docs/test_cases/t20019_sequence_mermaid.svg |  38 +-
 docs/test_cases/t20020.md                   | 256 ++++--
 docs/test_cases/t20020_sequence.svg         | 348 +++----
 docs/test_cases/t20020_sequence_mermaid.svg |  86 +-
 docs/test_cases/t20021.md                   | 204 ++++-
 docs/test_cases/t20021_sequence.svg         | 308 +++----
 docs/test_cases/t20021_sequence_mermaid.svg |  86 +-
 docs/test_cases/t20022.md                   |  67 +-
 docs/test_cases/t20022_sequence.svg         |  86 +-
 docs/test_cases/t20022_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20023.md                   |  88 +-
 docs/test_cases/t20023_sequence.svg         | 171 ++--
 docs/test_cases/t20023_sequence_mermaid.svg |  14 +-
 docs/test_cases/t20024.md                   | 172 +++-
 docs/test_cases/t20024_sequence.svg         | 292 +++---
 docs/test_cases/t20024_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20025.md                   |  37 +-
 docs/test_cases/t20025_sequence.svg         |  78 +-
 docs/test_cases/t20025_sequence_mermaid.svg |  22 +-
 docs/test_cases/t20026.md                   |  28 +-
 docs/test_cases/t20026_sequence.svg         |  48 +-
 docs/test_cases/t20026_sequence_mermaid.svg |  10 +-
 docs/test_cases/t20027.md                   |  28 +-
 docs/test_cases/t20027_sequence.svg         |  48 +-
 docs/test_cases/t20027_sequence_mermaid.svg |  10 +-
 docs/test_cases/t20028.md                   |  82 +-
 docs/test_cases/t20028_sequence.svg         | 115 +--
 docs/test_cases/t20028_sequence_mermaid.svg |  38 +-
 docs/test_cases/t20029.md                   | 109 ++-
 docs/test_cases/t20029_sequence.svg         | 244 ++---
 docs/test_cases/t20029_sequence_mermaid.svg |  42 +-
 docs/test_cases/t20030.md                   | 170 +++-
 docs/test_cases/t20030_sequence.svg         | 258 +++---
 docs/test_cases/t20030_sequence_mermaid.svg |  58 +-
 docs/test_cases/t20031.md                   |  50 +-
 docs/test_cases/t20031_sequence.svg         | 120 +--
 docs/test_cases/t20031_sequence_mermaid.svg |  30 +-
 docs/test_cases/t20032.md                   | 115 ++-
 docs/test_cases/t20032_sequence.svg         | 156 ++--
 docs/test_cases/t20032_sequence_mermaid.svg |  54 +-
 docs/test_cases/t20033.md                   | 142 +--
 docs/test_cases/t20033_sequence.svg         | 407 +++++----
 docs/test_cases/t20033_sequence_mermaid.svg | 142 +--
 docs/test_cases/t20034.md                   | 190 +++-
 docs/test_cases/t20034_sequence.svg         | 278 +++---
 docs/test_cases/t20034_sequence_mermaid.svg |  98 +-
 docs/test_cases/t20035.md                   |  31 +-
 docs/test_cases/t20035_sequence.svg         |  74 +-
 docs/test_cases/t20035_sequence_mermaid.svg |  18 +-
 docs/test_cases/t20036.md                   | 182 +++-
 docs/test_cases/t20036_sequence.svg         | 238 ++---
 docs/test_cases/t20036_sequence_mermaid.svg |  86 +-
 docs/test_cases/t20037.md                   |  89 +-
 docs/test_cases/t20037_sequence.svg         | 242 ++---
 docs/test_cases/t20037_sequence_mermaid.svg |  90 +-
 docs/test_cases/t20038.md                   | 187 ++--
 docs/test_cases/t20038_sequence.svg         | 474 +++++-----
 docs/test_cases/t20038_sequence_mermaid.svg | 150 +--
 docs/test_cases/t30001.md                   |  59 +-
 docs/test_cases/t30001_package.svg          | 139 ++-
 docs/test_cases/t30001_package_mermaid.svg  |  15 +-
 docs/test_cases/t30002.md                   |  98 +-
 docs/test_cases/t30002_package.svg          | 316 +++----
 docs/test_cases/t30002_package_mermaid.svg  |  48 +-
 docs/test_cases/t30003.md                   |  47 +-
 docs/test_cases/t30003_package.svg          |  78 +-
 docs/test_cases/t30003_package_mermaid.svg  |  14 +-
 docs/test_cases/t30004.md                   |  44 +-
 docs/test_cases/t30004_package.svg          |  88 +-
 docs/test_cases/t30004_package_mermaid.svg  |  12 +-
 docs/test_cases/t30005.md                   |  56 +-
 docs/test_cases/t30005_package.svg          | 116 ++-
 docs/test_cases/t30005_package_mermaid.svg  |  16 +-
 docs/test_cases/t30006.md                   |  38 +-
 docs/test_cases/t30006_package.svg          |  53 +-
 docs/test_cases/t30006_package_mermaid.svg  |  16 +-
 docs/test_cases/t30007.md                   |  41 +-
 docs/test_cases/t30007_package.svg          |  68 +-
 docs/test_cases/t30007_package_mermaid.svg  |  16 +-
 docs/test_cases/t30008.md                   |  53 +-
 docs/test_cases/t30008_package.svg          | 104 +--
 docs/test_cases/t30008_package_mermaid.svg  |  20 +-
 docs/test_cases/t30009.md                   |  59 +-
 docs/test_cases/t30009_package.svg          |  96 +-
 docs/test_cases/t30009_package_mermaid.svg  |  12 +-
 docs/test_cases/t30010.md                   |  75 +-
 docs/test_cases/t30010_package.svg          |  80 +-
 docs/test_cases/t30010_package_mermaid.svg  |  20 +-
 docs/test_cases/t30011.md                   |  51 +-
 docs/test_cases/t30011_package.svg          |  80 +-
 docs/test_cases/t30011_package_mermaid.svg  |  20 +-
 docs/test_cases/t30012.md                   |  61 +-
 docs/test_cases/t30012_package.svg          |  52 +-
 docs/test_cases/t30012_package_mermaid.svg  |  12 +-
 docs/test_cases/t30013.md                   | 270 +++---
 docs/test_cases/t30013_package.svg          | 268 +++---
 docs/test_cases/t30013_package_mermaid.svg  |  48 +-
 docs/test_cases/t30014.md                   | 161 ++++
 docs/test_cases/t30014_package.svg          |  31 +
 docs/test_cases/t30014_package_mermaid.svg  |  88 ++
 docs/test_cases/t30015.md                   | 655 ++++++++++++++
 docs/test_cases/t30015_package.svg          | 147 +++
 docs/test_cases/t30015_package_mermaid.svg  | 432 +++++++++
 docs/test_cases/t40001_include.svg          | 150 ++-
 docs/test_cases/t40001_include_mermaid.svg  |  33 +-
 docs/test_cases/t40002.md                   |  20 +-
 docs/test_cases/t40002_include.svg          | 146 ++-
 docs/test_cases/t40002_include_mermaid.svg  |  32 +-
 docs/test_cases/t40003.md                   |  36 +-
 docs/test_cases/t40003_include.svg          | 204 ++---
 docs/test_cases/t40003_include_mermaid.svg  |  46 +-
 docs/test_cases/t90000.md                   |   1 +
 docs/test_cases/t90000_class.svg            |  96 +-
 docs/test_cases/t90000_class_mermaid.svg    |  29 +-
 388 files changed, 26517 insertions(+), 24116 deletions(-)
 create mode 100644 docs/test_cases/t00072.md
 create mode 100644 docs/test_cases/t00072_class.svg
 create mode 100644 docs/test_cases/t00072_class_mermaid.svg
 create mode 100644 docs/test_cases/t30014.md
 create mode 100644 docs/test_cases/t30014_package.svg
 create mode 100644 docs/test_cases/t30014_package_mermaid.svg
 create mode 100644 docs/test_cases/t30015.md
 create mode 100644 docs/test_cases/t30015_package.svg
 create mode 100644 docs/test_cases/t30015_package_mermaid.svg

diff --git a/docs/test_cases.md b/docs/test_cases.md
index 91f72426..32b4da41 100644
--- a/docs/test_cases.md
+++ b/docs/test_cases.md
@@ -76,6 +76,7 @@
  * [t00069](./test_cases/t00069.md) - Coroutine methods in class diagrams
  * [t00070](./test_cases/t00070.md) - Diagram filter based on C++20 modules
  * [t00071](./test_cases/t00071.md) - Class diagram with C++20 modules generated as packages
+ * [t00072](./test_cases/t00072.md) - Class diagram with C++20 module partitions generated as packages
 ## Sequence diagrams
  * [t20001](./test_cases/t20001.md) - Basic sequence diagram test case
  * [t20002](./test_cases/t20002.md) - Free function sequence diagram test case
@@ -129,6 +130,8 @@
  * [t30011](./test_cases/t30011.md) - Package diagram with packages from directory structure for plain C
  * [t30012](./test_cases/t30012.md) - C++20 modules package diagram test
  * [t30013](./test_cases/t30013.md) - C++20 modules package dependencies diagram test
+ * [t30014](./test_cases/t30014.md) - C++20 modules package diagram test with partitions
+ * [t30015](./test_cases/t30015.md) - C++20 modules package diagram test with partition dependencies
 ## Include diagrams
  * [t40001](./test_cases/t40001.md) - Basic include graph diagram test case
  * [t40002](./test_cases/t40002.md) - Cyclic include graph diagram test case
diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md
index bb31a89c..0ae380e7 100644
--- a/docs/test_cases/t00002.md
+++ b/docs/test_cases/t00002.md
@@ -139,7 +139,7 @@ private:
         "raw": "/// \\brief This is class A",
         "text": "\n \n"
       },
-      "display_name": "clanguml::t00002::A",
+      "display_name": "A",
       "id": "987634239855407298",
       "is_abstract": true,
       "is_nested": false,
@@ -248,7 +248,7 @@ private:
         "raw": "/// \\brief This is class B",
         "text": "\n \n"
       },
-      "display_name": "clanguml::t00002::B",
+      "display_name": "B",
       "id": "594234458687375950",
       "is_abstract": false,
       "is_nested": false,
@@ -316,7 +316,7 @@ private:
         "raw": "/// @brief This is class C - class C has a long comment\n///\n/// Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n/// euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n/// erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n/// ad.",
         "text": "\n \n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad.\n"
       },
-      "display_name": "clanguml::t00002::C",
+      "display_name": "C",
       "id": "1142499429598587507",
       "is_abstract": false,
       "is_nested": false,
@@ -394,7 +394,7 @@ private:
         "raw": "/// This is class D\n/// which is a little like B\n/// and a little like C",
         "text": "\n This is class D\n which is a little like B\n and a little like C\n"
       },
-      "display_name": "clanguml::t00002::D",
+      "display_name": "D",
       "id": "60950494980414724",
       "is_abstract": false,
       "is_nested": false,
@@ -519,7 +519,7 @@ private:
           "name": "clanguml::t00002::C"
         }
       ],
-      "display_name": "clanguml::t00002::E",
+      "display_name": "E",
       "id": "2237886670308966220",
       "is_abstract": false,
       "is_nested": false,
@@ -631,6 +631,7 @@ private:
     }
   ],
   "name": "t00002_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index a72d6f50..d6cd675a 100644
--- a/docs/test_cases/t00002_class.svg
+++ b/docs/test_cases/t00002_class.svg
@@ -1,183 +1,157 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="422px" preserveAspectRatio="none" style="width:567px;height:422px;background:#FFFFFF;" version="1.1" viewBox="0 0 567 422" width="567px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="383px" preserveAspectRatio="none" style="width:562px;height:383px;" version="1.1" viewBox="0 0 562 383" width="562px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fwya91ve6c5a5" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="198" x="177.75" y="23.0059">Basic class diagram example</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <g id="elem_C_0000987634239855407298">
-        <rect codeLine="3" fill="#F1F1F1" height="85.7998" id="C_0000987634239855407298" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="292" y="44.7999"/>
-        <ellipse cx="350.25" cy="60.7999" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M351.7813,62.7374 L352.1094,63.5343 L351.8281,63.5343 C351.375,63.5343 351.25,63.5656 351.0781,63.6749 C350.7969,63.8156 350.625,64.1124 350.625,64.4093 C350.625,64.7062 350.7656,64.9562 351,65.1281 C351.1719,65.2531 351.4063,65.2999 351.8281,65.2999 L354.1875,65.2999 C354.5469,65.2999 354.7969,65.2687 354.9375,65.1749 C355.2031,65.0343 355.375,64.7218 355.375,64.4093 C355.375,64.1437 355.2344,63.8781 355,63.7062 C354.8125,63.5812 354.6563,63.5499 354.2031,63.5343 L350.8125,55.7062 L347.0938,55.7062 C346.6406,55.7062 346.5,55.7218 346.3281,55.8312 C346.0625,56.0031 345.8906,56.2843 345.8906,56.5812 C345.8906,56.8624 346.0313,57.1281 346.2813,57.2999 C346.4531,57.4249 346.6406,57.4562 347.0938,57.4562 L348.0625,57.4562 L345.4844,63.5343 C344.7344,63.5343 344.3281,63.8312 344.3281,64.4093 C344.3281,65.0187 344.7188,65.2999 345.5156,65.2999 L347.7813,65.2999 C348.1406,65.2999 348.3906,65.2687 348.5313,65.1749 C348.7969,65.0187 348.9688,64.7218 348.9688,64.4093 C348.9688,64.1437 348.8281,63.8781 348.5938,63.7062 C348.4063,63.5656 348.25,63.5343 347.7813,63.5343 L347.4844,63.5343 L347.8281,62.7374 L351.7813,62.7374 Z M351.0156,60.9874 L348.5625,60.9874 L349.7969,58.1124 L351.0156,60.9874 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="9" x="370.75" y="66.7499">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="293" x2="425" y1="76.7999" y2="76.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="298" y="86.7499"/>
-          <ellipse cx="303" cy="91.7499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="108" x="312" y="96.1999">foo_a() = 0 : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="298" y="105.6498"/>
-          <ellipse cx="303" cy="110.6498" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="107" x="312" y="115.0998">foo_c() = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="293" x2="425" y1="122.5998" y2="122.5998"/>
-      </g>
+    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="250" x="160" y="16.708">Basic class diagram example</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="28.9531"/>
+      <ellipse cx="348.25" cy="44.9531" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M348.3594,40.2969 L347.2031,45.375 L349.5313,45.375 L348.3594,40.2969 Z M346.875,38.0625 L349.8594,38.0625 L353.2188,50.4531 L350.7656,50.4531 L350,47.3906 L346.7188,47.3906 L345.9688,50.4531 L343.5313,50.4531 L346.875,38.0625 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.75" y="49.1074">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="60.9531" y2="60.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <g id="elem_C_0000594234458687375950">
-        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0000594234458687375950" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="61" y="191.5999"/>
-        <ellipse cx="107.25" cy="207.5999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M102.25,208.7562 C102.25,211.2562 104.3906,213.0687 107.3125,213.0687 C108.5469,213.0687 109.7188,212.7718 110.4688,212.2562 C111.0781,211.8343 111.4063,211.4124 111.4063,211.0062 C111.4063,210.5374 110.9844,210.1312 110.4844,210.1312 C110.25,210.1312 110.0313,210.2093 109.8281,210.4124 C109.3906,210.8499 109.3906,210.8499 109.2188,210.9437 C108.7656,211.1781 108.125,211.3187 107.3594,211.3187 C105.3594,211.3187 104.0781,210.3031 104.0781,208.7249 L104.0781,207.6781 C104.0781,205.9749 105.2969,204.7718 107,204.7718 C107.5781,204.7718 108.1563,204.9124 108.625,205.1624 C109.0938,205.4281 109.2656,205.6156 109.3281,205.9749 C109.4531,206.6468 109.7031,206.8968 110.2344,206.8968 C110.5156,206.8968 110.7969,206.7562 110.9844,206.5374 C111.1094,206.3656 111.1563,206.1937 111.1563,205.7562 L111.1563,204.3968 C111.1563,203.9749 111.1406,203.8343 111.0156,203.6624 C110.8438,203.4124 110.5625,203.2562 110.2344,203.2562 C109.9219,203.2562 109.7188,203.3656 109.5,203.6312 C108.3281,203.1312 107.8906,203.0218 106.9375,203.0218 C104.2656,203.0218 102.25,205.0374 102.25,207.6624 L102.25,208.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="127.75" y="212.2059">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="62" x2="170" y1="223.5999" y2="223.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="67" y="232.4999"/>
-          <ellipse cx="72" cy="237.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="81" y="240.6059">foo_a() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="62" x2="170" y1="248.3999" y2="248.3999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="66.9531"/>
+      <ellipse cx="305" cy="71.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
-      <g id="elem_C_0001142499429598587507">
-        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0001142499429598587507" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="304.5" y="191.5999"/>
-        <ellipse cx="349.75" cy="207.5999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M344.75,208.7562 C344.75,211.2562 346.8906,213.0687 349.8125,213.0687 C351.0469,213.0687 352.2188,212.7718 352.9688,212.2562 C353.5781,211.8343 353.9063,211.4124 353.9063,211.0062 C353.9063,210.5374 353.4844,210.1312 352.9844,210.1312 C352.75,210.1312 352.5313,210.2093 352.3281,210.4124 C351.8906,210.8499 351.8906,210.8499 351.7188,210.9437 C351.2656,211.1781 350.625,211.3187 349.8594,211.3187 C347.8594,211.3187 346.5781,210.3031 346.5781,208.7249 L346.5781,207.6781 C346.5781,205.9749 347.7969,204.7718 349.5,204.7718 C350.0781,204.7718 350.6563,204.9124 351.125,205.1624 C351.5938,205.4281 351.7656,205.6156 351.8281,205.9749 C351.9531,206.6468 352.2031,206.8968 352.7344,206.8968 C353.0156,206.8968 353.2969,206.7562 353.4844,206.5374 C353.6094,206.3656 353.6563,206.1937 353.6563,205.7562 L353.6563,204.3968 C353.6563,203.9749 353.6406,203.8343 353.5156,203.6624 C353.3438,203.4124 353.0625,203.2562 352.7344,203.2562 C352.4219,203.2562 352.2188,203.3656 352,203.6312 C350.8281,203.1312 350.3906,203.0218 349.4375,203.0218 C346.7656,203.0218 344.75,205.0374 344.75,207.6624 L344.75,208.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="370.25" y="212.2059">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="305.5" x2="412.5" y1="223.5999" y2="223.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="310.5" y="232.4999"/>
-          <ellipse cx="315.5" cy="237.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="324.5" y="240.6059">foo_c() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="305.5" x2="412.5" y1="248.3999" y2="248.3999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="314" y="75.1636">foo_a() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0000060950494980414724">
-        <rect codeLine="19" fill="#F1F1F1" height="98.3998" id="C_0000060950494980414724" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="39.5" y="317.3999"/>
-        <ellipse cx="106.75" cy="333.3999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M101.75,334.5562 C101.75,337.0562 103.8906,338.8687 106.8125,338.8687 C108.0469,338.8687 109.2188,338.5718 109.9688,338.0562 C110.5781,337.6343 110.9063,337.2124 110.9063,336.8062 C110.9063,336.3374 110.4844,335.9312 109.9844,335.9312 C109.75,335.9312 109.5313,336.0093 109.3281,336.2124 C108.8906,336.6499 108.8906,336.6499 108.7188,336.7437 C108.2656,336.9781 107.625,337.1187 106.8594,337.1187 C104.8594,337.1187 103.5781,336.1031 103.5781,334.5249 L103.5781,333.4781 C103.5781,331.7749 104.7969,330.5718 106.5,330.5718 C107.0781,330.5718 107.6563,330.7124 108.125,330.9624 C108.5938,331.2281 108.7656,331.4156 108.8281,331.7749 C108.9531,332.4468 109.2031,332.6968 109.7344,332.6968 C110.0156,332.6968 110.2969,332.5562 110.4844,332.3374 C110.6094,332.1656 110.6563,331.9937 110.6563,331.5562 L110.6563,330.1968 C110.6563,329.7749 110.6406,329.6343 110.5156,329.4624 C110.3438,329.2124 110.0625,329.0562 109.7344,329.0562 C109.4219,329.0562 109.2188,329.1656 109,329.4312 C107.8281,328.9312 107.3906,328.8218 106.4375,328.8218 C103.7656,328.8218 101.75,330.8374 101.75,333.4624 L101.75,334.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="127.25" y="338.0059">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="40.5" x2="191.5" y1="349.3999" y2="349.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="45.5" y="358.2999"/>
-          <ellipse cx="50.5" cy="363.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="59.5" y="366.4059">foo_a() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="45.5" y="375.0998"/>
-          <ellipse cx="50.5" cy="380.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="59.5" y="383.2058">foo_c() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="40.5" x2="191.5" y1="390.9998" y2="390.9998"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="45.5" y="399.8997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="47.5" y="401.8997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="59.5" y="408.0057">as : std::vector&lt;A *&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="79.7578"/>
+      <ellipse cx="305" cy="84.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0002237886670308966220">
-        <rect codeLine="26" fill="#F1F1F1" height="98.3998" id="C_0002237886670308966220" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="407.5" y="317.3999"/>
-        <ellipse cx="475.25" cy="333.3999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M470.25,334.5562 C470.25,337.0562 472.3906,338.8687 475.3125,338.8687 C476.5469,338.8687 477.7188,338.5718 478.4688,338.0562 C479.0781,337.6343 479.4063,337.2124 479.4063,336.8062 C479.4063,336.3374 478.9844,335.9312 478.4844,335.9312 C478.25,335.9312 478.0313,336.0093 477.8281,336.2124 C477.3906,336.6499 477.3906,336.6499 477.2188,336.7437 C476.7656,336.9781 476.125,337.1187 475.3594,337.1187 C473.3594,337.1187 472.0781,336.1031 472.0781,334.5249 L472.0781,333.4781 C472.0781,331.7749 473.2969,330.5718 475,330.5718 C475.5781,330.5718 476.1563,330.7124 476.625,330.9624 C477.0938,331.2281 477.2656,331.4156 477.3281,331.7749 C477.4531,332.4468 477.7031,332.6968 478.2344,332.6968 C478.5156,332.6968 478.7969,332.5562 478.9844,332.3374 C479.1094,332.1656 479.1563,331.9937 479.1563,331.5562 L479.1563,330.1968 C479.1563,329.7749 479.1406,329.6343 479.0156,329.4624 C478.8438,329.2124 478.5625,329.0562 478.2344,329.0562 C477.9219,329.0562 477.7188,329.1656 477.5,329.4312 C476.3281,328.9312 475.8906,328.8218 474.9375,328.8218 C472.2656,328.8218 470.25,330.8374 470.25,333.4624 L470.25,334.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="495.75" y="338.0059">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="408.5" x2="559.5" y1="349.3999" y2="349.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="413.5" y="358.2999"/>
-          <ellipse cx="418.5" cy="363.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="427.5" y="366.4059">foo_a() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="413.5" y="375.0998"/>
-          <ellipse cx="418.5" cy="380.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="427.5" y="383.2058">foo_c() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="408.5" x2="559.5" y1="390.9998" y2="390.9998"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="413.5" y="399.8997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="415.5" y="401.8997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="427.5" y="408.0057">as : std::vector&lt;A *&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="314" y="87.9683">foo_c() = 0 : void</text>
     </a>
-    <g id="elem_GMN15">
-      <path d="M149,74.8999 L149,100.4999 A0,0 0 0 0 149,100.4999 L257,100.4999 A0,0 0 0 0 257,100.4999 L257,92.8999 L291.82,87.6999 L257,84.8999 L257,84.8999 L247,74.8999 L149,74.8999 A0,0 0 0 0 149,74.8999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M247,74.8999 L247,84.8999 L257,84.8999 L247,74.8999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="87" x="155" y="91.9769">This is class A</text>
-    </g>
-    <g id="elem_GMN18">
-      <path d="M6,74.8999 L6,100.4999 A0,0 0 0 0 6,100.4999 L60.97,100.4999 L102.78,191.2899 L68.97,100.4999 L114,100.4999 A0,0 0 0 0 114,100.4999 L114,84.8999 L104,74.8999 L6,74.8999 A0,0 0 0 0 6,74.8999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M104,74.8999 L104,84.8999 L114,84.8999 L104,74.8999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="87" x="12" y="91.9769">This is class B</text>
-    </g>
-    <g id="elem_GMN21">
-      <path d="M228,322.5999 L228,362.5999 L192.91,366.5999 L228,370.5999 L228,410.6 A0,0 0 0 0 228,410.6 L372,410.6 A0,0 0 0 0 372,410.6 L372,332.5999 L362,322.5999 L228,322.5999 A0,0 0 0 0 228,322.5999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M362,322.5999 L362,332.5999 L372,332.5999 L362,322.5999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="234" y="339.6769">   </text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="87" x="234" y="355.277">This is class D</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="123" x="234" y="370.877">which is a little like B</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="97" x="234" y="386.477">and a little like C</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="234" y="402.077"> </text>
-    </g>
-    <g id="link_C_0000987634239855407298_C_0000594234458687375950">
-      <path codeLine="32" d="M275.8134,130.1859 C238.7334,148.6859 216.01,160.0299 215,160.5999 C198.18,170.0699 180.21,181.0999 164.26,191.2399 " fill="none" id="C_0000987634239855407298-backto-C_0000594234458687375950" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="291.92,122.1499,273.1347,124.817,278.492,135.5547,291.92,122.1499" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000987634239855407298_C_0001142499429598587507">
-      <path codeLine="33" d="M359,148.8299 C359,168.3599 359,173.1999 359,191.2599 " fill="none" id="C_0000987634239855407298-backto-C_0001142499429598587507" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="359,130.8299,353,148.8299,365,148.8299,359,130.8299" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000060950494980414724_C_0000987634239855407298">
-      <path codeLine="34" d="M154.1,317.0699 C182.32,281.6599 222.12,232.8499 259,191.5999 C277.26,171.1699 294.0878,153.5728 312.1278,135.2728 " fill="none" id="C_0000060950494980414724-to-C_0000987634239855407298" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="316.34,130.9999,307.1731,134.6011,312.8299,134.5607,312.8703,140.2174,316.34,130.9999" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="262" y="221.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="272" y="228.5769">as</text>
-    </g>
-    <g id="link_C_0000594234458687375950_C_0000060950494980414724">
-      <path codeLine="35" d="M116,274.5499 C116,292.3699 116,296.9999 116,317.0299 " fill="none" id="C_0000594234458687375950-backto-C_0000060950494980414724" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="116,256.5499,110,274.5499,122,274.5499,116,256.5499" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001142499429598587507_C_0000060950494980414724">
-      <path codeLine="36" d="M299.4477,267.0389 C284.6377,277.1789 282.75,278.0199 267,287.3999 C259.45,291.8899 226.29,309.1099 192.97,326.2399 " fill="none" id="C_0001142499429598587507-backto-C_0000060950494980414724" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="314.3,256.8699,296.058,262.0881,302.8373,271.9897,314.3,256.8699" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002237886670308966220_C_0000987634239855407298">
-      <path codeLine="37" d="M473.6,317.1799 C464.89,281.3899 450.7,232.0599 431,191.5999 C420.69,170.4299 409.8342,153.6366 396.5942,135.7066 " fill="none" id="C_0002237886670308966220-to-C_0000987634239855407298" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="393.03,130.8799,395.1584,140.496,396.0001,134.9022,401.594,135.7438,393.03,130.8799" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="459" y="221.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="469" y="228.5769">as</text>
-    </g>
-    <g id="link_C_0000594234458687375950_C_0002237886670308966220">
-      <path codeLine="38" d="M188.2692,253.0527 C197.1292,256.3827 189.37,253.3799 198,256.3999 C282.51,285.9799 307.21,283.2999 390,317.3999 C395.6,319.7099 401.31,322.2199 407.02,324.8399 " fill="none" id="C_0000594234458687375950-backto-C_0002237886670308966220" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="171.42,246.7199,186.1583,258.6691,190.3801,247.4362,171.42,246.7199" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001142499429598587507_C_0002237886670308966220">
-      <path codeLine="39" d="M399.0085,270.0033 C414.8485,287.8233 423.01,296.9999 440.82,317.0299 " fill="none" id="C_0001142499429598587507-backto-C_0002237886670308966220" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="387.05,256.5499,394.5241,273.9895,403.493,266.0171,387.05,256.5499" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="94.5625" y2="94.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="163.9531"/>
+      <ellipse cx="111.5" cy="179.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M114.4688,185.5938 Q113.8906,185.8906 113.25,186.0313 Q112.6094,186.1875 111.9063,186.1875 Q109.4063,186.1875 108.0781,184.5469 Q106.7656,182.8906 106.7656,179.7656 Q106.7656,176.6406 108.0781,174.9844 Q109.4063,173.3281 111.9063,173.3281 Q112.6094,173.3281 113.25,173.4844 Q113.9063,173.6406 114.4688,173.9375 L114.4688,176.6563 Q113.8438,176.0781 113.25,175.8125 Q112.6563,175.5313 112.0313,175.5313 Q110.6875,175.5313 110,176.6094 Q109.3125,177.6719 109.3125,179.7656 Q109.3125,181.8594 110,182.9375 Q110.6875,184 112.0313,184 Q112.6563,184 113.25,183.7344 Q113.8438,183.4531 114.4688,182.875 L114.4688,185.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.5" y="184.1074">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="195.9531" y2="195.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="75.5" y="201.9531"/>
+      <ellipse cx="80.5" cy="206.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="89.5" y="210.1636">foo_a() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="216.7578" y2="216.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="163.9531"/>
+      <ellipse cx="348.55" cy="179.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M351.5188,185.5938 Q350.9406,185.8906 350.3,186.0313 Q349.6594,186.1875 348.9563,186.1875 Q346.4563,186.1875 345.1281,184.5469 Q343.8156,182.8906 343.8156,179.7656 Q343.8156,176.6406 345.1281,174.9844 Q346.4563,173.3281 348.9563,173.3281 Q349.6594,173.3281 350.3,173.4844 Q350.9563,173.6406 351.5188,173.9375 L351.5188,176.6563 Q350.8938,176.0781 350.3,175.8125 Q349.7063,175.5313 349.0813,175.5313 Q347.7375,175.5313 347.05,176.6094 Q346.3625,177.6719 346.3625,179.7656 Q346.3625,181.8594 347.05,182.9375 Q347.7375,184 349.0813,184 Q349.7063,184 350.3,183.7344 Q350.8938,183.4531 351.5188,182.875 L351.5188,185.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.45" y="184.1074">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="195.9531" y2="195.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="313" y="201.9531"/>
+      <ellipse cx="318" cy="206.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="327" y="210.1636">foo_c() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="216.7578" y2="216.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="285.9531"/>
+      <ellipse cx="98.75" cy="301.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M101.7188,307.5938 Q101.1406,307.8906 100.5,308.0313 Q99.8594,308.1875 99.1563,308.1875 Q96.6563,308.1875 95.3281,306.5469 Q94.0156,304.8906 94.0156,301.7656 Q94.0156,298.6406 95.3281,296.9844 Q96.6563,295.3281 99.1563,295.3281 Q99.8594,295.3281 100.5,295.4844 Q101.1563,295.6406 101.7188,295.9375 L101.7188,298.6563 Q101.0938,298.0781 100.5,297.8125 Q99.9063,297.5313 99.2813,297.5313 Q97.9375,297.5313 97.25,298.6094 Q96.5625,299.6719 96.5625,301.7656 Q96.5625,303.8594 97.25,304.9375 Q97.9375,306 99.2813,306 Q99.9063,306 100.5,305.7344 Q101.0938,305.4531 101.7188,304.875 L101.7188,307.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="119.25" y="306.1074">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="317.9531" y2="317.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="323.9531"/>
+      <ellipse cx="44.5" cy="328.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="53.5" y="332.1636">foo_a() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="336.7578"/>
+      <ellipse cx="44.5" cy="341.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="53.5" y="344.9683">foo_c() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="351.5625" y2="351.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="357.5625"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="41.5" y="359.5625"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="53.5" y="365.7729">as : std::vector&lt;A *&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="285.9531"/>
+      <ellipse cx="469.25" cy="301.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M472.2188,307.5938 Q471.6406,307.8906 471,308.0313 Q470.3594,308.1875 469.6563,308.1875 Q467.1563,308.1875 465.8281,306.5469 Q464.5156,304.8906 464.5156,301.7656 Q464.5156,298.6406 465.8281,296.9844 Q467.1563,295.3281 469.6563,295.3281 Q470.3594,295.3281 471,295.4844 Q471.6563,295.6406 472.2188,295.9375 L472.2188,298.6563 Q471.5938,298.0781 471,297.8125 Q470.4063,297.5313 469.7813,297.5313 Q468.4375,297.5313 467.75,298.6094 Q467.0625,299.6719 467.0625,301.7656 Q467.0625,303.8594 467.75,304.9375 Q468.4375,306 469.7813,306 Q470.4063,306 471,305.7344 Q471.5938,305.4531 472.2188,304.875 L472.2188,307.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="489.75" y="306.1074">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="317.9531" y2="317.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="323.9531"/>
+      <ellipse cx="414.5" cy="328.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="423.5" y="332.1636">foo_a() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="336.7578"/>
+      <ellipse cx="414.5" cy="341.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="423.5" y="344.9683">foo_c() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="351.5625" y2="351.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="357.5625"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="411.5" y="359.5625"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="423.5" y="365.7729">as : std::vector&lt;A *&gt;</text>
+    </a>
+    <path d="M150,53.4531 L150,78.5859 A0,0 0 0 0 150,78.5859 L259,78.5859 A0,0 0 0 0 259,78.5859 L259,71.4531 L293.74,65.9531 L259,63.4531 L259,63.4531 L249,53.4531 L150,53.4531 A0,0 0 0 0 150,53.4531 " fill="#FBFB77" filter="url(#fwya91ve6c5a5)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M249,53.4531 L249,63.4531 L259,63.4531 L249,53.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="156" y="70.52">This is class A</text>
+    <path d="M6,53.4531 L6,78.5859 A0,0 0 0 0 6,78.5859 L61.94,78.5859 L105.69,163.8331 L69.94,78.5859 L115,78.5859 A0,0 0 0 0 115,78.5859 L115,63.4531 L105,53.4531 L6,53.4531 A0,0 0 0 0 6,53.4531 " fill="#FBFB77" filter="url(#fwya91ve6c5a5)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M105,53.4531 L105,63.4531 L115,63.4531 L105,53.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="12" y="70.52">This is class B</text>
+    <path d="M217,285.9531 L217,324.9531 L181.57,328.9531 L217,332.9531 L217,371.6172 A0,0 0 0 0 217,371.6172 L368,371.6172 A0,0 0 0 0 368,371.6172 L368,295.9531 L358,285.9531 L217,285.9531 A0,0 0 0 0 217,285.9531 " fill="#FBFB77" filter="url(#fwya91ve6c5a5)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M358,285.9531 L358,295.9531 L368,295.9531 L358,285.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="235" y="303.02"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="223" y="318.1528">This is class D</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="130" x="223" y="333.2856">which is a little like B</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="105" x="223" y="348.4185">and a little like C</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="227" y="363.5513"/>
+    <path d="M275.32,103.9131 C250.75,115.3331 227.18,126.5731 215.5,132.9531 C198.38,142.3031 180.15,153.4731 164.22,163.6531 " fill="none" id="C_0000987634239855407298&lt;-C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="272.59,97.4631,293.68,95.4331,278.46,110.1731,272.59,97.4631" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M356.5,123.5031 C356.5,137.3331 356.5,151.5931 356.5,163.5931 " fill="none" id="C_0000987634239855407298&lt;-C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="349.5,123.2031,356.5,103.2031,363.5,123.2031,349.5,123.2031" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M146.15,285.8431 C176.88,252.5231 221.11,204.9431 260.5,163.9531 C278.66,145.0531 299.06,124.3731 316.36,106.9831 " fill="none" id="C_0000060950494980414724-&gt;C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="320.23,103.0931,311.0448,106.6472,316.7016,106.6358,316.713,112.2926,320.23,103.0931" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="263.5" y="192.0195"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="273.5" y="199.02">as</text>
+    <path d="M114.96,245.5631 C113.76,258.8031 112.48,272.9731 111.32,285.7531 " fill="none" id="C_0000594234458687375950&lt;-C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="108.03,244.4731,116.81,225.1931,121.97,245.7431,108.03,244.4731" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M299.39,236.4931 C288.99,243.3231 278.07,250.0931 267.5,255.9531 C238.61,271.9731 229.64,272.4231 199.5,285.9531 C193.73,288.5431 187.77,291.2331 181.78,293.9431 " fill="none" id="C_0001142499429598587507&lt;-C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="295.79,230.4731,316.28,225.0731,303.64,242.0731,295.79,230.4731" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M467.23,285.8831 C458.11,251.9631 443.18,203.5431 423.5,163.9531 C413.76,144.3531 400.46,124.2031 388.29,107.3831 " fill="none" id="C_0002237886670308966220-&gt;C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="385.22,103.1831,387.3048,112.8088,388.1719,107.2188,393.7619,108.0858,385.22,103.1831" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="451.5" y="192.0195"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="461.5" y="199.02">as</text>
+    <path d="M188.64,221.4631 C191.97,222.6531 195.27,223.8231 198.5,224.9531 C281.02,253.8031 304.05,254.1931 385.5,285.9531 C391.39,288.2531 397.44,290.7331 403.49,293.3031 " fill="none" id="C_0000594234458687375950&lt;-C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="185.93,227.9231,169.53,214.5031,190.72,214.7731,185.93,227.9231" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M397.5,240.3431 C410.91,255.0331 425.74,271.2831 438.96,285.7531 " fill="none" id="C_0001142499429598587507&lt;-C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="391.97,244.6731,383.65,225.1931,402.31,235.2331,391.97,244.6731" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00002_class_mermaid.svg b/docs/test_cases/t00002_class_mermaid.svg
index 0912a39c..691ba536 100644
--- a/docs/test_cases/t00002_class_mermaid.svg
+++ b/docs/test_cases/t00002_class_mermaid.svg
@@ -1,71 +1,67 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 660.78515625 581" style="max-width: 660.785px; background-color: white;" width="660.78515625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 643.00390625 581" style="max-width: 643.004px; background-color: white;" width="643.00390625" id="my-svg">
+  <title id="chart-title-my-svg">Basic class diagram example</title>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M474.31429457979715,184.6657693554395L496.8406881914976,193.72147446286624C519.3670818031982,202.777179570293,564.419869026599,220.88858978514648,585.5350704241877,234.7776282259066C606.6502718217762,248.66666666666666,603.8278873935523,258.3333333333333,602.4166951794404,263.1666666666667L601.0055029653284,268"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M345.9667272259796,229.23018082356498L344.9410226883163,230.85848401963747C343.9153181506531,232.48678721571,341.86390907532655,235.74339360785498,340.8382045376633,242.20503013726082C339.8125,248.66666666666666,339.8125,258.3333333333333,339.8125,263.1666666666667L339.8125,268"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M108.92578125,421.27951321691216L93.95768229166667,413.73292768076016C78.98958333333333,406.1863421446081,49.053385416666664,391.0931710723041,34.085286458333336,372.1299188694854C19.1171875,353.1666666666667,19.1171875,330.3333333333333,19.1171875,307.5C19.1171875,284.6666666666667,19.1171875,261.8333333333333,70.12126595331993,238.65748300376916C121.12534440663988,215.481632674205,223.13350131327977,191.96326534840998,274.1375797665997,180.20408168551248L325.14165821991963,168.44489802261495"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M509.1758634081611,335.6819822126829L490.03001638180086,342.40165184390236C470.88416935544075,349.12132147512193,432.5924753027204,362.56066073756097,393.13673244302686,377.9083151236693C353.6809895833333,393.2559695097776,313.0611979166667,410.5119390195552,292.7513020833333,419.139923774444L272.44140625,427.7679085293328"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M339.8125,365L339.8125,366.8333333333333C339.8125,368.6666666666667,339.8125,372.3333333333333,328.583984375,380.67959984632984C317.35546875,389.0258663593263,294.8984375,402.0517327186526,283.669921875,408.56466589831575L272.44140625,415.0775990779789"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M470.74534862716763,401L467.08596760597305,396.8333333333333C463.4265865847785,392.6666666666667,456.1078245423892,384.3333333333333,452.4484435211946,368.75C448.7890625,353.1666666666667,448.7890625,330.3333333333333,448.7890625,307.5C448.7890625,284.6666666666667,448.7890625,261.8333333333333,446.69737674691896,247.0961211568647C444.60569099383787,232.3589089803961,440.4223194876757,225.71781796079222,438.33063373459464,222.39727245099027L436.23894798151355,219.07672694118833"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M589.47265625,365L589.47265625,366.8333333333333C589.47265625,368.6666666666667,589.47265625,372.3333333333333,586.3553709055876,378.3333333333333C583.2380855611754,384.3333333333333,577.0035148723507,392.6666666666667,573.8862295279383,396.8333333333333L570.7689441835261,401"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M419.27660699856824,340.7533726363654L433.3144902071402,346.6278105303045C447.3523734157122,352.5022484242436,475.42813983285606,364.2511242121218,490.4898142866111,374.2922287727276C505.5514887403661,384.3333333333333,507.59907123073225,392.6666666666667,508.62286247591527,396.8333333333333L509.6466537210983,401"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M394.30078125,41L394.30078125,45.166666666666664C394.30078125,49.333333333333336,394.30078125,57.666666666666664,394.30078125,66C394.30078125,74.33333333333333,394.30078125,82.66666666666667,394.30078125,86.83333333333333L394.30078125,91"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M589.47265625,169L589.47265625,180.66666666666666C589.47265625,192.33333333333334,589.47265625,215.66666666666666,589.47265625,232.16666666666666C589.47265625,248.66666666666666,589.47265625,258.3333333333333,589.47265625,263.1666666666667L589.47265625,268"/>
-        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote11" d="M146.09375,351L146.09375,355.1666666666667C146.09375,359.3333333333333,146.09375,367.6666666666667,148.24162301300578,376C150.38949602601156,384.3333333333333,154.6852420520231,392.6666666666667,156.8331150650289,396.8333333333333L158.98098807803467,401"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M446.5,176.92166101504392L471.439453125,187.2680508458699C496.37890625,197.61444067669595,546.2578125,218.30722033834797,569.7860734108881,233.4869435025073C593.3143343217762,248.66666666666666,590.4919498935523,258.3333333333333,589.0807576794404,263.1666666666667L587.6695654653284,268"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M350.4728594653179,214L347.9552474710983,218.16666666666666C345.4376354768786,222.33333333333334,340.4024114884393,230.66666666666666,337.88479949421964,239.66666666666666C335.3671875,248.66666666666666,335.3671875,258.3333333333333,335.3671875,263.1666666666667L335.3671875,268"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M104.48046875,420.18307505317534L90.25325520833333,412.8192292109795C76.02604166666667,405.45538336878354,47.571614583333336,390.7276916843918,33.344401041666664,371.94717917552924C19.1171875,353.1666666666667,19.1171875,330.3333333333333,19.1171875,307.5C19.1171875,284.6666666666667,19.1171875,261.8333333333333,70.72526041666667,238.30293795491482C122.33333333333333,214.77254257649636,225.54947916666666,190.54508515299275,277.1575520833333,178.43135644124092L328.765625,166.3176277294891"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M517.26953125,328.8916115796672L495.6634114583333,336.74300964972264C474.0572916666667,344.5944077197781,430.8450520833333,360.29720385988907,389.2994791666667,376.71270088837883C347.75390625,393.1281979168687,307.875,410.2563958337375,287.935546875,418.8204947921718L267.99609375,427.38459375060614"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M335.3671875,347L335.3671875,351.8333333333333C335.3671875,356.6666666666667,335.3671875,366.3333333333333,324.138671875,377.67959984632984C312.91015625,389.0258663593263,290.453125,402.0517327186526,279.224609375,408.56466589831575L267.99609375,415.0775990779789"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M461.21233742774564,401L457.6600207731214,396.8333333333333C454.1077041184971,392.6666666666667,447.0030708092486,384.3333333333333,443.4507541546243,368.75C439.8984375,353.1666666666667,439.8984375,330.3333333333333,439.8984375,307.5C439.8984375,284.6666666666667,439.8984375,261.8333333333333,437.38082550578036,246.25C434.8632135115607,230.66666666666666,429.8279895231214,222.33333333333334,427.3103775289017,218.16666666666666L424.7927655346821,214"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M576.13671875,347L576.13671875,351.8333333333333C576.13671875,356.6666666666667,576.13671875,366.3333333333333,573.126497772158,375.3333333333333C570.116276794316,384.3333333333333,564.095834838632,392.6666666666667,561.08561386079,396.8333333333333L558.075392882948,401"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M393.78125,332.9825861983183L410.2161458333333,340.15215516526524C426.6510416666667,347.32172413221224,459.5208333333333,361.6608620661061,476.9795204118497,372.9970976997197C494.4382074903661,384.3333333333333,496.48578998073225,392.6666666666667,497.50958122591527,396.8333333333333L498.5333724710983,401"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M387.6328125,41L387.6328125,45.166666666666664C387.6328125,49.333333333333336,387.6328125,57.666666666666664,387.6328125,66C387.6328125,74.33333333333333,387.6328125,82.66666666666667,387.6328125,86.83333333333333L387.6328125,91"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M576.13671875,169L576.13671875,180.66666666666666C576.13671875,192.33333333333334,576.13671875,215.66666666666666,576.13671875,232.16666666666666C576.13671875,248.66666666666666,576.13671875,258.3333333333333,576.13671875,263.1666666666667L576.13671875,268"/>
+        <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote11" d="M146.09375,351L146.09375,355.1666666666667C146.09375,359.3333333333333,146.09375,367.6666666666667,148.02749427986512,376C149.96123855973025,384.3333333333333,153.8287271194605,392.6666666666667,155.76247139932562,396.8333333333333L157.69621567919074,401"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -115,7 +111,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(448.7890625, 307.5)" class="edgeLabel">
+        <g transform="translate(439.8984375, 307.5)" class="edgeLabel">
           <g transform="translate(-11.1171875, -9)" class="label">
             <foreignObject height="18" width="22.234375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -173,11 +169,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(394.30078125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L7">
+        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L7">
           <g title="This is class A" id="classId-C_0000987634239855407298-0" class="node default clickable">
-            <rect height="123" width="126.625" y="-61.5" x="-63.3125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.3125" x1="-63.3125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.3125" x1="-63.3125" class="divider"/>
+            <rect height="123" width="117.734375" y="-61.5" x="-58.8671875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -189,24 +185,24 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -55.8125, 14)" height="18" width="111.625">
+              <foreignObject transform="translate( -51.3671875, 14)" height="18" width="102.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+foo_a() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+foo_a() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -55.8125, 36)" height="18" width="110.71875">
+              <foreignObject transform="translate( -51.3671875, 36)" height="18" width="101.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+foo_c() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+foo_c() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(589.47265625, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L16">
+        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L16">
           <g title="This is class B" id="classId-C_0000594234458687375950-1" class="node default clickable">
-            <rect height="79" width="126.625" y="-39.5" x="-63.3125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="63.3125" x1="-63.3125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="63.3125" x1="-63.3125" class="divider"/>
+            <rect height="79" width="117.734375" y="-39.5" x="-58.8671875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -218,19 +214,19 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -55.8125, 14)" height="18" width="111.625">
+              <foreignObject transform="translate( -51.3671875, 14)" height="18" width="102.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_a() : : void</span>
+                  <span class="nodeLabel">+foo_a() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(339.8125, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L27">
+        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L27">
           <g title="This is class C - class C has a long comment" id="classId-C_0001142499429598587507-2" class="node default clickable">
-            <rect height="79" width="125.71875" y="-39.5" x="-62.859375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="62.859375" x1="-62.859375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="62.859375" x1="-62.859375" class="divider"/>
+            <rect height="79" width="116.828125" y="-39.5" x="-58.4140625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="58.4140625" x1="-58.4140625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="58.4140625" x1="-58.4140625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -242,15 +238,15 @@
                   <span class="nodeLabel">C</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -55.359375, 14)" height="18" width="110.71875">
+              <foreignObject transform="translate( -50.9140625, 14)" height="18" width="101.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_c() : : void</span>
+                  <span class="nodeLabel">+foo_c() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(190.68359375, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L36">
+        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L36">
           <g title="D" id="classId-C_0000060950494980414724-3" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -271,20 +267,20 @@
                   <span class="nodeLabel">-as : std::vector&lt;A *&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.2578125, 14)" height="18" width="111.625">
+              <foreignObject transform="translate( -74.2578125, 14)" height="18" width="102.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_a() : : void</span>
+                  <span class="nodeLabel">+foo_a() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.2578125, 36)" height="18" width="110.71875">
+              <foreignObject transform="translate( -74.2578125, 36)" height="18" width="101.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_c() : : void</span>
+                  <span class="nodeLabel">+foo_c() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(524.7578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00002/t00002.cc#L61">
+        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L61">
           <g title="E" id="classId-C_0002237886670308966220-4" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -305,20 +301,20 @@
                   <span class="nodeLabel">-as : std::vector&lt;A *&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.2578125, 14)" height="18" width="111.625">
+              <foreignObject transform="translate( -74.2578125, 14)" height="18" width="102.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_a() : : void</span>
+                  <span class="nodeLabel">+foo_a() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -74.2578125, 36)" height="18" width="110.71875">
+              <foreignObject transform="translate( -74.2578125, 36)" height="18" width="101.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo_c() : : void</span>
+                  <span class="nodeLabel">+foo_c() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <g transform="translate(394.30078125, 24.5)" id="note0" class="node undefined">
+        <g transform="translate(387.6328125, 24.5)" id="note0" class="node undefined">
           <rect height="33" width="116.359375" y="-16.5" x="-58.1796875" ry="0" rx="0"/>
           <g transform="translate(-50.6796875, -9)" style="" class="label">
             <rect/>
@@ -329,7 +325,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(589.47265625, 152.5)" id="note1" class="node undefined">
+        <g transform="translate(576.13671875, 152.5)" id="note1" class="node undefined">
           <rect height="33" width="117.25" y="-16.5" x="-58.625" ry="0" rx="0"/>
           <g transform="translate(-51.125, -9)" style="" class="label">
             <rect/>
@@ -354,5 +350,5 @@
       </g>
     </g>
   </g>
-  <text class="classTitleText" y="-25" x="330.392578125">Basic class diagram example</text>
+  <text class="classTitleText" y="-25" x="321.501953125">Basic class diagram example</text>
 </svg>
diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md
index 5edc1bbf..1814dcc7 100644
--- a/docs/test_cases/t00003.md
+++ b/docs/test_cases/t00003.md
@@ -103,7 +103,7 @@ int A::static_int = 1;
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00003::A",
+      "display_name": "A",
       "id": "1371951663534295727",
       "is_abstract": false,
       "is_nested": false,
@@ -852,6 +852,7 @@ int A::static_int = 1;
     }
   ],
   "name": "t00003_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00003"
 }
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index c03a3812..6c754497 100644
--- a/docs/test_cases/t00003_class.svg
+++ b/docs/test_cases/t00003_class.svg
@@ -1,232 +1,236 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="613px" preserveAspectRatio="none" style="width:369px;height:613px;background:#FFFFFF;" version="1.1" viewBox="0 0 369 613" width="369px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="486px" preserveAspectRatio="none" style="width:347px;height:486px;" version="1.1" viewBox="0 0 347 486" width="347px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fvtcx625gmrdm" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001371951663534295727">
-        <rect codeLine="2" fill="#F1F1F1" height="592.7977" id="C_0001371951663534295727" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="348" x="7" y="7"/>
-        <ellipse cx="172.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M167.25,24.1563 C167.25,26.6563 169.3906,28.4688 172.3125,28.4688 C173.5469,28.4688 174.7188,28.1719 175.4688,27.6563 C176.0781,27.2344 176.4063,26.8125 176.4063,26.4063 C176.4063,25.9375 175.9844,25.5313 175.4844,25.5313 C175.25,25.5313 175.0313,25.6094 174.8281,25.8125 C174.3906,26.25 174.3906,26.25 174.2188,26.3438 C173.7656,26.5781 173.125,26.7188 172.3594,26.7188 C170.3594,26.7188 169.0781,25.7031 169.0781,24.125 L169.0781,23.0781 C169.0781,21.375 170.2969,20.1719 172,20.1719 C172.5781,20.1719 173.1563,20.3125 173.625,20.5625 C174.0938,20.8281 174.2656,21.0156 174.3281,21.375 C174.4531,22.0469 174.7031,22.2969 175.2344,22.2969 C175.5156,22.2969 175.7969,22.1563 175.9844,21.9375 C176.1094,21.7656 176.1563,21.5938 176.1563,21.1563 L176.1563,19.7969 C176.1563,19.375 176.1406,19.2344 176.0156,19.0625 C175.8438,18.8125 175.5625,18.6563 175.2344,18.6563 C174.9219,18.6563 174.7188,18.7656 174.5,19.0313 C173.3281,18.5313 172.8906,18.4219 171.9375,18.4219 C169.2656,18.4219 167.25,20.4375 167.25,23.0625 L167.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.75" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="47.9"/>
-          <ellipse cx="18" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="27" y="56.0059">A() = default : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="64.6999"/>
-          <ellipse cx="18" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="27" y="72.8059">A(int i) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="81.4998"/>
-          <ellipse cx="18" cy="86.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="89.6058">A(A &amp;&amp;) = default : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="98.2997"/>
-          <ellipse cx="18" cy="103.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="180" x="27" y="106.4057">A(const A &amp;) = deleted : void</text>
-        </a>
-        <ellipse cx="18" cy="120.0997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="27" y="123.2057">A&lt;T&gt;(T t) : void</text>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="131.8996"/>
-          <ellipse cx="18" cy="136.8996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124" x="27" y="140.0056">~A() = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="354" y1="147.7996" y2="147.7996"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="156.6995"/>
-          <ellipse cx="18" cy="161.6995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="236" x="27" y="164.8055">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="173.4995"/>
-          <ellipse cx="18" cy="178.4995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="27" y="181.6054">operator=(A &amp; other) noexcept : A &amp;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="354" y1="189.3994" y2="189.3994"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="198.2994"/>
-          <ellipse cx="18" cy="203.2994" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="27" y="206.4054">operator++() : A &amp;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="354" y1="214.1993" y2="214.1993"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.0993"/>
-          <ellipse cx="18" cy="228.0993" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="27" y="231.2053">auto_method() : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="239.8992"/>
-          <ellipse cx="18" cy="244.8992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="27" y="248.0052">basic_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="256.6992"/>
-          <ellipse cx="18" cy="261.6992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="27" y="264.8051">const_method() const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="273.4991"/>
-          <ellipse cx="18" cy="278.4991" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="153" x="27" y="281.6051">create_from_int(int i) : A</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="290.299"/>
-          <ellipse cx="18" cy="295.299" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="27" y="298.405">default_int(int i = 12) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="307.0989"/>
-          <ellipse cx="18" cy="312.0989" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="27" y="315.2049">default_string(int i, std::string s = "abc") : std::string</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="323.8989"/>
-          <ellipse cx="18" cy="328.8989" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="27" y="332.0048">double_int(const int i) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="340.6988"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="342.6988"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="348.8048">private_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="357.4987"/>
-          <polygon fill="#FFFF44" points="18,357.4987,22,361.4987,18,365.4987,14,361.4987" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="164" x="27" y="365.6047">protected_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="374.2986"/>
-          <ellipse cx="18" cy="379.2986" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215" x="27" y="382.4046">size() constexpr const : std::size_t</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="391.0986"/>
-          <ellipse cx="18" cy="396.0986" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="126" x="27" y="399.2046">static_method() : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="407.8985"/>
-          <ellipse cx="18" cy="412.8985" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="258" x="27" y="416.0045">sum(const double a, const double b) : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="423.7985" y2="423.7985"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="432.6984"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="434.6984"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="440.8044">a_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="449.4984"/>
-          <ellipse cx="18" cy="454.4984" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="228" x="27" y="457.6043">auto_member : const unsigned long</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="466.2983"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="468.2983"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="474.4043">b_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="483.0982"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="485.0982"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="27" y="491.2042">c_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="499.8981"/>
-          <polygon fill="#FFFF44" points="18,499.8981,22,503.8981,18,507.8981,14,503.8981" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="255" x="27" y="508.0041">compare : std::function&lt;bool (const int)&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="516.6981"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="518.6981"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="27" y="524.804">private_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="533.498"/>
-          <polygon fill="none" points="18,533.498,22,537.498,18,541.498,14,537.498" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="27" y="541.604">protected_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="550.2979"/>
-          <ellipse cx="18" cy="555.2979" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="27" y="558.4039">public_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="567.0978"/>
-          <ellipse cx="18" cy="572.0978" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="163" x="27" y="575.2038">static_const_int : const int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="583.8978"/>
-          <ellipse cx="18" cy="588.8978" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="83" x="27" y="592.0037">static_int : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvtcx625gmrdm)" height="468.9453" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+      <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
+      <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="53.2104">A() = default : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
+      <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="66.0151">A(int i) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
+      <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="78.8198">A(A &amp;&amp;) = default : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
+      <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="91.6245">A(const A &amp;) = deleted : void</text>
+    </a>
+    <ellipse cx="18" cy="101.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="27" y="104.4292">A&lt;T&gt;(T t) : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
+      <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="117.2339">~A() = default : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="123.8281" y2="123.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="129.8281"/>
+      <ellipse cx="18" cy="134.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="138.0386">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="142.6328"/>
+      <ellipse cx="18" cy="147.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="150.8433">operator=(A &amp; other) noexcept : A &amp;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="157.4375" y2="157.4375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="163.4375"/>
+      <ellipse cx="18" cy="168.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="171.6479">operator++() : A &amp;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="178.2422" y2="178.2422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="184.2422"/>
+      <ellipse cx="18" cy="189.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="192.4526">auto_method() : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="197.0469"/>
+      <ellipse cx="18" cy="202.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="205.2573">basic_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="209.8516"/>
+      <ellipse cx="18" cy="214.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="218.062">const_method() const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="222.6563"/>
+      <ellipse cx="18" cy="227.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="230.8667">create_from_int(int i) : A</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="235.4609"/>
+      <ellipse cx="18" cy="240.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="243.6714">default_int(int i = 12) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="248.2656"/>
+      <ellipse cx="18" cy="253.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="256.4761">default_string(int i, std::string s = "abc") : std::string</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="261.0703"/>
+      <ellipse cx="18" cy="266.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="269.2808">double_int(const int i) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="273.875"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="275.875"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="282.0854">private_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="286.6797"/>
+      <polygon fill="#FFFF44" points="18,286.6797,22,290.6797,18,294.6797,14,290.6797" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="294.8901">protected_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="299.4844"/>
+      <ellipse cx="18" cy="304.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="195" x="27" y="307.6948">size() constexpr const : std::size_t</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="312.2891"/>
+      <ellipse cx="18" cy="317.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="320.4995">static_method() : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="325.0938"/>
+      <ellipse cx="18" cy="330.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="333.3042">sum(const double a, const double b) : int</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="339.8984" y2="339.8984"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="345.8984"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="347.8984"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="354.1089">a_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="358.7031"/>
+      <ellipse cx="18" cy="363.7031" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="366.9136">auto_member : const unsigned long</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="371.5078"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="373.5078"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="379.7183">b_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="384.3125"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="386.3125"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="392.5229">c_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="397.1172"/>
+      <polygon fill="#FFFF44" points="18,397.1172,22,401.1172,18,405.1172,14,401.1172" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="405.3276">compare : std::function&lt;bool (const int)&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="409.9219"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="411.9219"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="418.1323">private_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="422.7266"/>
+      <polygon fill="none" points="18,422.7266,22,426.7266,18,430.7266,14,426.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="430.937">protected_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="435.5313"/>
+      <ellipse cx="18" cy="440.5313" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="443.7417">public_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="448.3359"/>
+      <ellipse cx="18" cy="453.3359" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="456.5464">static_const_int : const int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="461.1406"/>
+      <ellipse cx="18" cy="466.1406" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="469.3511">static_int : int</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00003_class_mermaid.svg b/docs/test_cases/t00003_class_mermaid.svg
index c2accccb..6fc8ac36 100644
--- a/docs/test_cases/t00003_class_mermaid.svg
+++ b/docs/test_cases/t00003_class_mermaid.svg
@@ -1,55 +1,50 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 409.640625 755" style="max-width: 409.641px; background-color: white;" width="409.640625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 755" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,11 +52,11 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(204.8203125, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00003/t00003.cc#L7">
+        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L7">
           <g title="A" id="classId-C_0001371951663534295727-0" class="node default clickable">
-            <rect height="739" width="393.640625" y="-369.5" x="-196.8203125" class="outer title-state"/>
-            <line y2="-339.5" y1="-339.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
-            <line y2="-103.5" y1="-103.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
+            <rect height="739" width="384.75" y="-369.5" x="-192.375" class="outer title-state"/>
+            <line y2="-339.5" y1="-339.5" x2="192.375" x1="-192.375" class="divider"/>
+            <line y2="-103.5" y1="-103.5" x2="192.375" x1="-192.375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -73,159 +68,159 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -328)" height="18" width="53.359375">
+              <foreignObject transform="translate( -184.875, -328)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-a_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -306)" height="18" width="263.734375">
+              <foreignObject transform="translate( -184.875, -306)" height="18" width="263.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+auto_member : const unsigned long</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -284)" height="18" width="53.359375">
+              <foreignObject transform="translate( -184.875, -284)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-b_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -262)" height="18" width="52.46875">
+              <foreignObject transform="translate( -184.875, -262)" height="18" width="52.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-c_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -240)" height="18" width="294.390625">
+              <foreignObject transform="translate( -184.875, -240)" height="18" width="294.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#compare : std::function&lt;bool (const int)&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -218)" height="18" width="151.171875">
+              <foreignObject transform="translate( -184.875, -218)" height="18" width="151.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-private_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -196)" height="18" width="173.421875">
+              <foreignObject transform="translate( -184.875, -196)" height="18" width="173.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#protected_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -174)" height="18" width="148.96875">
+              <foreignObject transform="translate( -184.875, -174)" height="18" width="148.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+public_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -152)" height="18" width="192.546875">
+              <foreignObject transform="translate( -184.875, -152)" height="18" width="192.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_const_int : const int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -130)" height="18" width="102.71875">
+              <foreignObject transform="translate( -184.875, -130)" height="18" width="102.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -96)" height="18" width="143.625">
+              <foreignObject transform="translate( -184.875, -96)" height="18" width="134.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A() : : [default] void</span>
+                  <span class="nodeLabel">+A() : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -74)" height="18" width="107.15625">
+              <foreignObject transform="translate( -184.875, -74)" height="18" width="98.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(int i) : : void</span>
+                  <span class="nodeLabel">+A(int i) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -52)" height="18" width="179.203125">
+              <foreignObject transform="translate( -184.875, -52)" height="18" width="170.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(A &amp;&amp;) : : [default] void</span>
+                  <span class="nodeLabel">+A(A &amp;&amp;) : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -30)" height="18" width="148.96875">
+              <foreignObject transform="translate( -184.875, -30)" height="18" width="140.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(const A &amp;) : : void</span>
+                  <span class="nodeLabel">+A(const A &amp;) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -8)" height="18" width="100.625">
+              <foreignObject transform="translate( -184.875, -8)" height="18" width="91.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(T t) : : void</span>
+                  <span class="nodeLabel">+A(T t) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 14)" height="18" width="152.96875">
+              <foreignObject transform="translate( -184.875, 14)" height="18" width="144.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~A() : : [default] void</span>
+                  <span class="nodeLabel">+~A() : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 36)" height="18" width="211.6875">
+              <foreignObject transform="translate( -184.875, 36)" height="18" width="202.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(A &amp;&amp; other) : : A &amp;</span>
+                  <span class="nodeLabel">+operator=(A &amp;&amp; other) : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 58)" height="18" width="201.015625">
+              <foreignObject transform="translate( -184.875, 58)" height="18" width="192.125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(A &amp; other) : : A &amp;</span>
+                  <span class="nodeLabel">+operator=(A &amp; other) : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 80)" height="18" width="144.53125">
+              <foreignObject transform="translate( -184.875, 80)" height="18" width="135.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator++() : : A &amp;</span>
+                  <span class="nodeLabel">+operator++() : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 102)" height="18" width="152.53125">
+              <foreignObject transform="translate( -184.875, 102)" height="18" width="143.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+auto_method() : : int</span>
+                  <span class="nodeLabel">+auto_method() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 124)" height="18" width="171.203125">
+              <foreignObject transform="translate( -184.875, 124)" height="18" width="162.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+basic_method() : : void</span>
+                  <span class="nodeLabel">+basic_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 146)" height="18" width="223.671875">
+              <foreignObject transform="translate( -184.875, 146)" height="18" width="214.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : : [const] void</span>
+                  <span class="nodeLabel">+const_method() : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 168)" height="18" width="188.078125">
+              <foreignObject transform="translate( -184.875, 168)" height="18" width="179.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+create_from_int(int i) : : A</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+create_from_int(int i) : A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 190)" height="18" width="193.890625">
+              <foreignObject transform="translate( -184.875, 190)" height="18" width="185">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_int(int i = 12) : : int</span>
+                  <span class="nodeLabel">+default_int(int i = 12) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 212)" height="18" width="378.640625">
+              <foreignObject transform="translate( -184.875, 212)" height="18" width="369.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : : std::string</span>
+                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 234)" height="18" width="200.5625">
+              <foreignObject transform="translate( -184.875, 234)" height="18" width="191.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+double_int(const int i) : : int</span>
+                  <span class="nodeLabel">+double_int(const int i) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 256)" height="18" width="177.859375">
+              <foreignObject transform="translate( -184.875, 256)" height="18" width="168.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-private_method() : : void</span>
+                  <span class="nodeLabel">-private_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 278)" height="18" width="200.109375">
+              <foreignObject transform="translate( -184.875, 278)" height="18" width="191.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#protected_method() : : void</span>
+                  <span class="nodeLabel">#protected_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 300)" height="18" width="268.109375">
+              <foreignObject transform="translate( -184.875, 300)" height="18" width="259.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : : [const,constexpr] std::size_t</span>
+                  <span class="nodeLabel">+size() : [const,constexpr] std::size_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 322)" height="18" width="158.734375">
+              <foreignObject transform="translate( -184.875, 322)" height="18" width="149.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+static_method() : : int</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+static_method() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 344)" height="18" width="306.40625">
+              <foreignObject transform="translate( -184.875, 344)" height="18" width="297.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sum(const double a, const double b) : : int</span>
+                  <span class="nodeLabel">+sum(const double a, const double b) : int</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md
index f3fe5e83..3eb44170 100644
--- a/docs/test_cases/t00004.md
+++ b/docs/test_cases/t00004.md
@@ -80,7 +80,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00004::B",
+      "display_name": "B",
       "id": "1232624428734051711",
       "is_abstract": false,
       "is_nested": false,
@@ -106,7 +106,7 @@ public:
         "AA_2",
         "AA_3"
       ],
-      "display_name": "clanguml::t00004::B::AA",
+      "display_name": "B::AA",
       "id": "1630205507215126623",
       "is_nested": true,
       "name": "B::AA",
@@ -121,7 +121,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::A",
+      "display_name": "A",
       "id": "1552274940876611774",
       "is_abstract": false,
       "is_nested": false,
@@ -196,7 +196,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::A::AA",
+      "display_name": "A::AA",
       "id": "1742499843727859552",
       "is_abstract": false,
       "is_nested": true,
@@ -222,7 +222,7 @@ public:
         "Yellow",
         "Red"
       ],
-      "display_name": "clanguml::t00004::A::AA::Lights",
+      "display_name": "A::AA::Lights",
       "id": "590936874508841244",
       "is_nested": true,
       "name": "A::AA::Lights",
@@ -237,7 +237,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::A::AA::AAA",
+      "display_name": "A::AA::AAA",
       "id": "1430186633004282131",
       "is_abstract": false,
       "is_nested": true,
@@ -259,7 +259,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::C::B<int>",
+      "display_name": "C::B<int>",
       "id": "287819369330075965",
       "is_abstract": false,
       "is_nested": false,
@@ -288,7 +288,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::C<T>",
+      "display_name": "C<T>",
       "id": "2278328177727440136",
       "is_abstract": false,
       "is_nested": false,
@@ -342,7 +342,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::C::AA",
+      "display_name": "C::AA",
       "id": "623940132897927654",
       "is_abstract": false,
       "is_nested": true,
@@ -364,7 +364,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::C::AA::AAA",
+      "display_name": "C::AA::AAA",
       "id": "1597801087286500866",
       "is_abstract": false,
       "is_nested": true,
@@ -389,7 +389,7 @@ public:
         "CCC_1",
         "CCC_2"
       ],
-      "display_name": "clanguml::t00004::C::AA::CCC",
+      "display_name": "C::AA::CCC",
       "id": "81819202639599734",
       "is_nested": true,
       "name": "C::AA::CCC",
@@ -404,7 +404,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::C::B<V>",
+      "display_name": "C::B<V>",
       "id": "1381298335849583950",
       "is_abstract": false,
       "is_nested": true,
@@ -449,7 +449,7 @@ public:
         "CC_1",
         "CC_2"
       ],
-      "display_name": "clanguml::t00004::C::CC",
+      "display_name": "C::CC",
       "id": "2037378936100378699",
       "is_nested": true,
       "name": "C::CC",
@@ -464,7 +464,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::detail::D",
+      "display_name": "detail::D",
       "id": "612133170877135796",
       "is_abstract": false,
       "is_nested": false,
@@ -490,7 +490,7 @@ public:
         "AA_2",
         "AA_3"
       ],
-      "display_name": "clanguml::t00004::detail::D::AA",
+      "display_name": "detail::D::AA",
       "id": "1572080057917630922",
       "is_nested": true,
       "name": "D::AA",
@@ -505,7 +505,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00004::detail::D::DD",
+      "display_name": "detail::D::DD",
       "id": "600916232677555492",
       "is_abstract": false,
       "is_nested": true,
@@ -527,6 +527,7 @@ public:
     }
   ],
   "name": "t00004_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index 3672a8d7..f470643d 100644
--- a/docs/test_cases/t00004_class.svg
+++ b/docs/test_cases/t00004_class.svg
@@ -1,297 +1,245 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="397px" preserveAspectRatio="none" style="width:1096px;height:397px;background:#FFFFFF;" version="1.1" viewBox="0 0 1096 397" width="1096px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="374px" preserveAspectRatio="none" style="width:1071px;height:374px;" version="1.1" viewBox="0 0 1071 374" width="1071px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fj1haj28fkml1" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001232624428734051711">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001232624428734051711" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="20" y="183.2"/>
-        <ellipse cx="35" cy="199.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M30,200.3563 C30,202.8563 32.1406,204.6688 35.0625,204.6688 C36.2969,204.6688 37.4688,204.3719 38.2188,203.8563 C38.8281,203.4344 39.1563,203.0125 39.1563,202.6063 C39.1563,202.1375 38.7344,201.7313 38.2344,201.7313 C38,201.7313 37.7813,201.8094 37.5781,202.0125 C37.1406,202.45 37.1406,202.45 36.9688,202.5438 C36.5156,202.7781 35.875,202.9188 35.1094,202.9188 C33.1094,202.9188 31.8281,201.9031 31.8281,200.325 L31.8281,199.2781 C31.8281,197.575 33.0469,196.3719 34.75,196.3719 C35.3281,196.3719 35.9063,196.5125 36.375,196.7625 C36.8438,197.0281 37.0156,197.2156 37.0781,197.575 C37.2031,198.2469 37.4531,198.4969 37.9844,198.4969 C38.2656,198.4969 38.5469,198.3563 38.7344,198.1375 C38.8594,197.9656 38.9063,197.7938 38.9063,197.3563 L38.9063,195.9969 C38.9063,195.575 38.8906,195.4344 38.7656,195.2625 C38.5938,195.0125 38.3125,194.8563 37.9844,194.8563 C37.6719,194.8563 37.4688,194.9656 37.25,195.2313 C36.0781,194.7313 35.6406,194.6219 34.6875,194.6219 C32.0156,194.6219 30,196.6375 30,199.2625 L30,200.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="49" y="203.806">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="21" x2="60" y1="215.2" y2="215.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="21" x2="60" y1="223.2" y2="223.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
+      <ellipse cx="33" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M35.9688,189.6406 Q35.3906,189.9375 34.75,190.0781 Q34.1094,190.2344 33.4063,190.2344 Q30.9063,190.2344 29.5781,188.5938 Q28.2656,186.9375 28.2656,183.8125 Q28.2656,180.6875 29.5781,179.0313 Q30.9063,177.375 33.4063,177.375 Q34.1094,177.375 34.75,177.5313 Q35.4063,177.6875 35.9688,177.9844 L35.9688,180.7031 Q35.3438,180.125 34.75,179.8594 Q34.1563,179.5781 33.5313,179.5781 Q32.1875,179.5781 31.5,180.6563 Q30.8125,181.7188 30.8125,183.8125 Q30.8125,185.9063 31.5,186.9844 Q32.1875,188.0469 33.5313,188.0469 Q34.1563,188.0469 34.75,187.7813 Q35.3438,187.5 35.9688,186.9219 L35.9688,189.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="188.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="200" y2="200"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <g id="elem_C_0001630205507215126623">
-        <rect codeLine="6" fill="#F1F1F1" height="98.3998" id="C_0001630205507215126623" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="67" x="7" y="7"/>
-        <ellipse cx="22" cy="23" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M20.8594,24.0625 L22.1719,24.0625 L22.1719,24.1094 C22.1719,24.5156 22.1875,24.6719 22.2969,24.8281 C22.4688,25.0781 22.7656,25.25 23.0781,25.25 C23.3594,25.25 23.6563,25.1094 23.8281,24.8906 C23.9531,24.7031 24,24.5625 24,24.1094 L24,22.2656 C24,21.9375 23.9844,21.8281 23.9219,21.6563 C23.8125,21.3594 23.4531,21.1094 23.0781,21.1094 C22.7813,21.1094 22.5156,21.25 22.3438,21.4688 C22.2031,21.6563 22.1719,21.8281 22.1719,22.2656 L22.1719,22.3281 L20.8594,22.3281 L20.8594,20.1563 L24.7031,20.1563 L24.7031,20.9063 C24.7031,21.2969 24.7344,21.4844 24.8438,21.6406 C25.0156,21.8906 25.3125,22.0625 25.625,22.0625 C25.9219,22.0625 26.1875,21.9375 26.375,21.7031 C26.5156,21.5156 26.5469,21.375 26.5469,20.9063 L26.5469,18.4063 L18.8438,18.4063 C18.3906,18.4063 18.2656,18.4219 18.0938,18.5313 C17.8281,18.7031 17.6563,18.9688 17.6563,19.2813 C17.6563,19.5625 17.7813,19.8281 18.0313,20 C18.2188,20.125 18.4063,20.1563 18.8438,20.1563 L19.0313,20.1563 L19.0313,26.25 L18.8438,26.25 C18.4219,26.25 18.2656,26.2813 18.0938,26.375 C17.8281,26.5313 17.6563,26.8125 17.6563,27.1094 C17.6563,27.6875 18.0625,28 18.8438,28 L26.9219,28 L26.9219,25.4688 C26.9219,25.0625 26.8906,24.8906 26.7813,24.7344 C26.6094,24.4688 26.3281,24.3125 26,24.3125 C25.7188,24.3125 25.4375,24.4531 25.25,24.6719 C25.1094,24.8594 25.0781,25.0156 25.0781,25.4688 L25.0781,26.25 L20.8594,26.25 L20.8594,24.0625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="36" y="27.606">B::AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="73" y1="39" y2="39"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="13" y="56.0059">AA_1</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="13" y="72.8059">AA_2</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="13" y="89.6058">AA_3</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="73" y1="97.3998" y2="97.3998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
+      <ellipse cx="21" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M25.1094,30 L17.3906,30 L17.3906,17.6094 L25.1094,17.6094 L25.1094,19.7656 L19.8438,19.7656 L19.8438,22.4375 L24.6094,22.4375 L24.6094,24.5938 L19.8438,24.5938 L19.8438,27.8438 L25.1094,27.8438 L25.1094,30 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="35" y="28.1543">B::AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="40" y2="40"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="54.2104">AA_1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="67.0151">AA_2</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="79.8198">AA_3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001552274940876611774">
-        <rect codeLine="12" fill="#F1F1F1" height="81.5999" id="C_0001552274940876611774" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="178.5" y="309"/>
-        <ellipse cx="239.75" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M234.75,326.1563 C234.75,328.6563 236.8906,330.4688 239.8125,330.4688 C241.0469,330.4688 242.2188,330.1719 242.9688,329.6563 C243.5781,329.2344 243.9063,328.8125 243.9063,328.4063 C243.9063,327.9375 243.4844,327.5313 242.9844,327.5313 C242.75,327.5313 242.5313,327.6094 242.3281,327.8125 C241.8906,328.25 241.8906,328.25 241.7188,328.3438 C241.2656,328.5781 240.625,328.7188 239.8594,328.7188 C237.8594,328.7188 236.5781,327.7031 236.5781,326.125 L236.5781,325.0781 C236.5781,323.375 237.7969,322.1719 239.5,322.1719 C240.0781,322.1719 240.6563,322.3125 241.125,322.5625 C241.5938,322.8281 241.7656,323.0156 241.8281,323.375 C241.9531,324.0469 242.2031,324.2969 242.7344,324.2969 C243.0156,324.2969 243.2969,324.1563 243.4844,323.9375 C243.6094,323.7656 243.6563,323.5938 243.6563,323.1563 L243.6563,321.7969 C243.6563,321.375 243.6406,321.2344 243.5156,321.0625 C243.3438,320.8125 243.0625,320.6563 242.7344,320.6563 C242.4219,320.6563 242.2188,320.7656 242,321.0313 C240.8281,320.5313 240.3906,320.4219 239.4375,320.4219 C236.7656,320.4219 234.75,322.4375 234.75,325.0625 L234.75,326.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="260.25" y="329.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="179.5" x2="317.5" y1="341" y2="341"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="184.5" y="349.9"/>
-          <ellipse cx="189.5" cy="354.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="198.5" y="358.0059">foo() const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="184.5" y="366.6999"/>
-          <ellipse cx="189.5" cy="371.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="198.5" y="374.8059">foo2() const : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="179.5" x2="317.5" y1="382.5999" y2="382.5999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
+      <ellipse cx="232.75" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M235.7188,311.6406 Q235.1406,311.9375 234.5,312.0781 Q233.8594,312.2344 233.1563,312.2344 Q230.6563,312.2344 229.3281,310.5938 Q228.0156,308.9375 228.0156,305.8125 Q228.0156,302.6875 229.3281,301.0313 Q230.6563,299.375 233.1563,299.375 Q233.8594,299.375 234.5,299.5313 Q235.1563,299.6875 235.7188,299.9844 L235.7188,302.7031 Q235.0938,302.125 234.5,301.8594 Q233.9063,301.5781 233.2813,301.5781 Q231.9375,301.5781 231.25,302.6563 Q230.5625,303.7188 230.5625,305.8125 Q230.5625,307.9063 231.25,308.9844 Q231.9375,310.0469 233.2813,310.0469 Q233.9063,310.0469 234.5,309.7813 Q235.0938,309.5 235.7188,308.9219 L235.7188,311.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="253.25" y="310.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="322" y2="322"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <g id="elem_C_0001742499843727859552">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001742499843727859552" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="67" x="215" y="183.2"/>
-        <ellipse cx="230" cy="199.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M225,200.3563 C225,202.8563 227.1406,204.6688 230.0625,204.6688 C231.2969,204.6688 232.4688,204.3719 233.2188,203.8563 C233.8281,203.4344 234.1563,203.0125 234.1563,202.6063 C234.1563,202.1375 233.7344,201.7313 233.2344,201.7313 C233,201.7313 232.7813,201.8094 232.5781,202.0125 C232.1406,202.45 232.1406,202.45 231.9688,202.5438 C231.5156,202.7781 230.875,202.9188 230.1094,202.9188 C228.1094,202.9188 226.8281,201.9031 226.8281,200.325 L226.8281,199.2781 C226.8281,197.575 228.0469,196.3719 229.75,196.3719 C230.3281,196.3719 230.9063,196.5125 231.375,196.7625 C231.8438,197.0281 232.0156,197.2156 232.0781,197.575 C232.2031,198.2469 232.4531,198.4969 232.9844,198.4969 C233.2656,198.4969 233.5469,198.3563 233.7344,198.1375 C233.8594,197.9656 233.9063,197.7938 233.9063,197.3563 L233.9063,195.9969 C233.9063,195.575 233.8906,195.4344 233.7656,195.2625 C233.5938,195.0125 233.3125,194.8563 232.9844,194.8563 C232.6719,194.8563 232.4688,194.9656 232.25,195.2313 C231.0781,194.7313 230.6406,194.6219 229.6875,194.6219 C227.0156,194.6219 225,196.6375 225,199.2625 L225,200.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="244" y="203.806">A::AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="216" x2="281" y1="215.2" y2="215.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="216" x2="281" y1="223.2" y2="223.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="328"/>
+      <ellipse cx="187.5" cy="333" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <g id="elem_C_0000590936874508841244">
-        <rect codeLine="22" fill="#F1F1F1" height="98.3998" id="C_0000590936874508841244" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="109" y="7"/>
-        <ellipse cx="124" cy="23" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M122.8594,24.0625 L124.1719,24.0625 L124.1719,24.1094 C124.1719,24.5156 124.1875,24.6719 124.2969,24.8281 C124.4688,25.0781 124.7656,25.25 125.0781,25.25 C125.3594,25.25 125.6563,25.1094 125.8281,24.8906 C125.9531,24.7031 126,24.5625 126,24.1094 L126,22.2656 C126,21.9375 125.9844,21.8281 125.9219,21.6563 C125.8125,21.3594 125.4531,21.1094 125.0781,21.1094 C124.7813,21.1094 124.5156,21.25 124.3438,21.4688 C124.2031,21.6563 124.1719,21.8281 124.1719,22.2656 L124.1719,22.3281 L122.8594,22.3281 L122.8594,20.1563 L126.7031,20.1563 L126.7031,20.9063 C126.7031,21.2969 126.7344,21.4844 126.8438,21.6406 C127.0156,21.8906 127.3125,22.0625 127.625,22.0625 C127.9219,22.0625 128.1875,21.9375 128.375,21.7031 C128.5156,21.5156 128.5469,21.375 128.5469,20.9063 L128.5469,18.4063 L120.8438,18.4063 C120.3906,18.4063 120.2656,18.4219 120.0938,18.5313 C119.8281,18.7031 119.6563,18.9688 119.6563,19.2813 C119.6563,19.5625 119.7813,19.8281 120.0313,20 C120.2188,20.125 120.4063,20.1563 120.8438,20.1563 L121.0313,20.1563 L121.0313,26.25 L120.8438,26.25 C120.4219,26.25 120.2656,26.2813 120.0938,26.375 C119.8281,26.5313 119.6563,26.8125 119.6563,27.1094 C119.6563,27.6875 120.0625,28 120.8438,28 L128.9219,28 L128.9219,25.4688 C128.9219,25.0625 128.8906,24.8906 128.7813,24.7344 C128.6094,24.4688 128.3281,24.3125 128,24.3125 C127.7188,24.3125 127.4375,24.4531 127.25,24.6719 C127.1094,24.8594 127.0781,25.0156 127.0781,25.4688 L127.0781,26.25 L122.8594,26.25 L122.8594,24.0625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="138" y="27.606">A::AA::Lights</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="110" x2="221" y1="39" y2="39"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="115" y="56.0059">Green</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="115" y="72.8059">Yellow</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="26" x="115" y="89.6058">Red</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="110" x2="221" y1="97.3998" y2="97.3998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="196.5" y="336.2104">foo() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <g id="elem_C_0001430186633004282131">
-        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0001430186633004282131" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="102" x="256.5" y="32.2"/>
-        <ellipse cx="271.5" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M266.5,49.3563 C266.5,51.8563 268.6406,53.6688 271.5625,53.6688 C272.7969,53.6688 273.9688,53.3719 274.7188,52.8563 C275.3281,52.4344 275.6563,52.0125 275.6563,51.6063 C275.6563,51.1375 275.2344,50.7313 274.7344,50.7313 C274.5,50.7313 274.2813,50.8094 274.0781,51.0125 C273.6406,51.45 273.6406,51.45 273.4688,51.5438 C273.0156,51.7781 272.375,51.9188 271.6094,51.9188 C269.6094,51.9188 268.3281,50.9031 268.3281,49.325 L268.3281,48.2781 C268.3281,46.575 269.5469,45.3719 271.25,45.3719 C271.8281,45.3719 272.4063,45.5125 272.875,45.7625 C273.3438,46.0281 273.5156,46.2156 273.5781,46.575 C273.7031,47.2469 273.9531,47.4969 274.4844,47.4969 C274.7656,47.4969 275.0469,47.3563 275.2344,47.1375 C275.3594,46.9656 275.4063,46.7938 275.4063,46.3563 L275.4063,44.9969 C275.4063,44.575 275.3906,44.4344 275.2656,44.2625 C275.0938,44.0125 274.8125,43.8563 274.4844,43.8563 C274.1719,43.8563 273.9688,43.9656 273.75,44.2313 C272.5781,43.7313 272.1406,43.6219 271.1875,43.6219 C268.5156,43.6219 266.5,45.6375 266.5,48.2625 L266.5,49.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="70" x="285.5" y="52.806">A::AA::AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="257.5" x2="357.5" y1="64.2" y2="64.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="257.5" x2="357.5" y1="72.2" y2="72.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="340.8047"/>
+      <ellipse cx="187.5" cy="345.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <g id="elem_C_0000287819369330075965">
-        <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0000287819369330075965" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="76" x="428.5" y="32.2"/>
-        <ellipse cx="443.5" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M438.5,49.3563 C438.5,51.8563 440.6406,53.6688 443.5625,53.6688 C444.7969,53.6688 445.9688,53.3719 446.7188,52.8563 C447.3281,52.4344 447.6563,52.0125 447.6563,51.6063 C447.6563,51.1375 447.2344,50.7313 446.7344,50.7313 C446.5,50.7313 446.2813,50.8094 446.0781,51.0125 C445.6406,51.45 445.6406,51.45 445.4688,51.5438 C445.0156,51.7781 444.375,51.9188 443.6094,51.9188 C441.6094,51.9188 440.3281,50.9031 440.3281,49.325 L440.3281,48.2781 C440.3281,46.575 441.5469,45.3719 443.25,45.3719 C443.8281,45.3719 444.4063,45.5125 444.875,45.7625 C445.3438,46.0281 445.5156,46.2156 445.5781,46.575 C445.7031,47.2469 445.9531,47.4969 446.4844,47.4969 C446.7656,47.4969 447.0469,47.3563 447.2344,47.1375 C447.3594,46.9656 447.4063,46.7938 447.4063,46.3563 L447.4063,44.9969 C447.4063,44.575 447.3906,44.4344 447.2656,44.2625 C447.0938,44.0125 446.8125,43.8563 446.4844,43.8563 C446.1719,43.8563 445.9688,43.9656 445.75,44.2313 C444.5781,43.7313 444.1406,43.6219 443.1875,43.6219 C440.5156,43.6219 438.5,45.6375 438.5,48.2625 L438.5,49.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="457.5" y="52.806">C::B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="492.5" y="29.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="493.5" y="43.4001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="429.5" x2="503.5" y1="64.2" y2="64.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="429.5" x2="503.5" y1="72.2" y2="72.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="196.5" y="349.0151">foo2() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0002278328177727440136">
-        <rect codeLine="36" fill="#F1F1F1" height="81.5999" id="C_0002278328177727440136" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="500" y="309"/>
-        <ellipse cx="540.2" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M535.2,326.1563 C535.2,328.6563 537.3406,330.4688 540.2625,330.4688 C541.4969,330.4688 542.6688,330.1719 543.4188,329.6563 C544.0281,329.2344 544.3563,328.8125 544.3563,328.4063 C544.3563,327.9375 543.9344,327.5313 543.4344,327.5313 C543.2,327.5313 542.9813,327.6094 542.7781,327.8125 C542.3406,328.25 542.3406,328.25 542.1688,328.3438 C541.7156,328.5781 541.075,328.7188 540.3094,328.7188 C538.3094,328.7188 537.0281,327.7031 537.0281,326.125 L537.0281,325.0781 C537.0281,323.375 538.2469,322.1719 539.95,322.1719 C540.5281,322.1719 541.1063,322.3125 541.575,322.5625 C542.0438,322.8281 542.2156,323.0156 542.2781,323.375 C542.4031,324.0469 542.6531,324.2969 543.1844,324.2969 C543.4656,324.2969 543.7469,324.1563 543.9344,323.9375 C544.0594,323.7656 544.1063,323.5938 544.1063,323.1563 L544.1063,321.7969 C544.1063,321.375 544.0906,321.2344 543.9656,321.0625 C543.7938,320.8125 543.5125,320.6563 543.1844,320.6563 C542.8719,320.6563 542.6688,320.7656 542.45,321.0313 C541.2781,320.5313 540.8406,320.4219 539.8875,320.4219 C537.2156,320.4219 535.2,322.4375 535.2,325.0625 L535.2,326.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="559.8" y="329.606">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="603" y="306"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="604" y="320.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="501" x2="608" y1="341" y2="341"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="501" x2="608" y1="349" y2="349"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="506" y="357.9"/>
-          <ellipse cx="511" cy="362.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="520" y="366.0059">b_int : B&lt;int&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="506" y="374.6999"/>
-          <ellipse cx="511" cy="379.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="520" y="382.8059">t : T</text>
-        </a>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="355.6094" y2="355.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
+      <ellipse cx="224" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M226.9688,189.6406 Q226.3906,189.9375 225.75,190.0781 Q225.1094,190.2344 224.4063,190.2344 Q221.9063,190.2344 220.5781,188.5938 Q219.2656,186.9375 219.2656,183.8125 Q219.2656,180.6875 220.5781,179.0313 Q221.9063,177.375 224.4063,177.375 Q225.1094,177.375 225.75,177.5313 Q226.4063,177.6875 226.9688,177.9844 L226.9688,180.7031 Q226.3438,180.125 225.75,179.8594 Q225.1563,179.5781 224.5313,179.5781 Q223.1875,179.5781 222.5,180.6563 Q221.8125,181.7188 221.8125,183.8125 Q221.8125,185.9063 222.5,186.9844 Q223.1875,188.0469 224.5313,188.0469 Q225.1563,188.0469 225.75,187.7813 Q226.3438,187.5 226.9688,186.9219 L226.9688,189.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="238" y="188.1543">A::AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="200" y2="200"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <g id="elem_C_0000623940132897927654">
-        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0000623940132897927654" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="593.5" y="183.2"/>
-        <ellipse cx="608.5" cy="199.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M603.5,200.3563 C603.5,202.8563 605.6406,204.6688 608.5625,204.6688 C609.7969,204.6688 610.9688,204.3719 611.7188,203.8563 C612.3281,203.4344 612.6563,203.0125 612.6563,202.6063 C612.6563,202.1375 612.2344,201.7313 611.7344,201.7313 C611.5,201.7313 611.2813,201.8094 611.0781,202.0125 C610.6406,202.45 610.6406,202.45 610.4688,202.5438 C610.0156,202.7781 609.375,202.9188 608.6094,202.9188 C606.6094,202.9188 605.3281,201.9031 605.3281,200.325 L605.3281,199.2781 C605.3281,197.575 606.5469,196.3719 608.25,196.3719 C608.8281,196.3719 609.4063,196.5125 609.875,196.7625 C610.3438,197.0281 610.5156,197.2156 610.5781,197.575 C610.7031,198.2469 610.9531,198.4969 611.4844,198.4969 C611.7656,198.4969 612.0469,198.3563 612.2344,198.1375 C612.3594,197.9656 612.4063,197.7938 612.4063,197.3563 L612.4063,195.9969 C612.4063,195.575 612.3906,195.4344 612.2656,195.2625 C612.0938,195.0125 611.8125,194.8563 611.4844,194.8563 C611.1719,194.8563 610.9688,194.9656 610.75,195.2313 C609.5781,194.7313 609.1406,194.6219 608.1875,194.6219 C605.5156,194.6219 603.5,196.6375 603.5,199.2625 L603.5,200.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="622.5" y="203.806">C::AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="594.5" x2="660.5" y1="215.2" y2="215.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="594.5" x2="660.5" y1="223.2" y2="223.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
+      <ellipse cx="120.5" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M124.6094,30 L116.8906,30 L116.8906,17.6094 L124.6094,17.6094 L124.6094,19.7656 L119.3438,19.7656 L119.3438,22.4375 L124.1094,22.4375 L124.1094,24.5938 L119.3438,24.5938 L119.3438,27.8438 L124.6094,27.8438 L124.6094,30 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="77" x="134.5" y="28.1543">A::AA::Lights</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="40" y2="40"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="111.5" y="54.2104">Green</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="111.5" y="67.0151">Yellow</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="111.5" y="79.8198">Red</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <g id="elem_C_0001597801087286500866">
-        <rect codeLine="46" fill="#F1F1F1" height="48" id="C_0001597801087286500866" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="553" y="32.2"/>
-        <ellipse cx="568" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M563,49.3563 C563,51.8563 565.1406,53.6688 568.0625,53.6688 C569.2969,53.6688 570.4688,53.3719 571.2188,52.8563 C571.8281,52.4344 572.1563,52.0125 572.1563,51.6063 C572.1563,51.1375 571.7344,50.7313 571.2344,50.7313 C571,50.7313 570.7813,50.8094 570.5781,51.0125 C570.1406,51.45 570.1406,51.45 569.9688,51.5438 C569.5156,51.7781 568.875,51.9188 568.1094,51.9188 C566.1094,51.9188 564.8281,50.9031 564.8281,49.325 L564.8281,48.2781 C564.8281,46.575 566.0469,45.3719 567.75,45.3719 C568.3281,45.3719 568.9063,45.5125 569.375,45.7625 C569.8438,46.0281 570.0156,46.2156 570.0781,46.575 C570.2031,47.2469 570.4531,47.4969 570.9844,47.4969 C571.2656,47.4969 571.5469,47.3563 571.7344,47.1375 C571.8594,46.9656 571.9063,46.7938 571.9063,46.3563 L571.9063,44.9969 C571.9063,44.575 571.8906,44.4344 571.7656,44.2625 C571.5938,44.0125 571.3125,43.8563 570.9844,43.8563 C570.6719,43.8563 570.4688,43.9656 570.25,44.2313 C569.0781,43.7313 568.6406,43.6219 567.6875,43.6219 C565.0156,43.6219 563,45.6375 563,48.2625 L563,49.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="582" y="52.806">C::AA::AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="554" x2="655" y1="64.2" y2="64.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="554" x2="655" y1="72.2" y2="72.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
+      <ellipse cx="265" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M267.9688,48.6406 Q267.3906,48.9375 266.75,49.0781 Q266.1094,49.2344 265.4063,49.2344 Q262.9063,49.2344 261.5781,47.5938 Q260.2656,45.9375 260.2656,42.8125 Q260.2656,39.6875 261.5781,38.0313 Q262.9063,36.375 265.4063,36.375 Q266.1094,36.375 266.75,36.5313 Q267.4063,36.6875 267.9688,36.9844 L267.9688,39.7031 Q267.3438,39.125 266.75,38.8594 Q266.1563,38.5781 265.5313,38.5781 Q264.1875,38.5781 263.5,39.6563 Q262.8125,40.7188 262.8125,42.8125 Q262.8125,44.9063 263.5,45.9844 Q264.1875,47.0469 265.5313,47.0469 Q266.1563,47.0469 266.75,46.7813 Q267.3438,46.5 267.9688,45.9219 L267.9688,48.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="279" y="47.1543">A::AA::AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="59" y2="59"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <g id="elem_C_0000081819202639599734">
-        <rect codeLine="50" fill="#F1F1F1" height="81.5999" id="C_0000081819202639599734" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="106" x="691.5" y="15.4"/>
-        <ellipse cx="706.5" cy="31.4" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M705.3594,32.4625 L706.6719,32.4625 L706.6719,32.5094 C706.6719,32.9156 706.6875,33.0719 706.7969,33.2281 C706.9688,33.4781 707.2656,33.65 707.5781,33.65 C707.8594,33.65 708.1563,33.5094 708.3281,33.2906 C708.4531,33.1031 708.5,32.9625 708.5,32.5094 L708.5,30.6656 C708.5,30.3375 708.4844,30.2281 708.4219,30.0563 C708.3125,29.7594 707.9531,29.5094 707.5781,29.5094 C707.2813,29.5094 707.0156,29.65 706.8438,29.8688 C706.7031,30.0563 706.6719,30.2281 706.6719,30.6656 L706.6719,30.7281 L705.3594,30.7281 L705.3594,28.5563 L709.2031,28.5563 L709.2031,29.3063 C709.2031,29.6969 709.2344,29.8844 709.3438,30.0406 C709.5156,30.2906 709.8125,30.4625 710.125,30.4625 C710.4219,30.4625 710.6875,30.3375 710.875,30.1031 C711.0156,29.9156 711.0469,29.775 711.0469,29.3063 L711.0469,26.8063 L703.3438,26.8063 C702.8906,26.8063 702.7656,26.8219 702.5938,26.9313 C702.3281,27.1031 702.1563,27.3688 702.1563,27.6813 C702.1563,27.9625 702.2813,28.2281 702.5313,28.4 C702.7188,28.525 702.9063,28.5563 703.3438,28.5563 L703.5313,28.5563 L703.5313,34.65 L703.3438,34.65 C702.9219,34.65 702.7656,34.6813 702.5938,34.775 C702.3281,34.9313 702.1563,35.2125 702.1563,35.5094 C702.1563,36.0875 702.5625,36.4 703.3438,36.4 L711.4219,36.4 L711.4219,33.8688 C711.4219,33.4625 711.3906,33.2906 711.2813,33.1344 C711.1094,32.8688 710.8281,32.7125 710.5,32.7125 C710.2188,32.7125 709.9375,32.8531 709.75,33.0719 C709.6094,33.2594 709.5781,33.4156 709.5781,33.8688 L709.5781,34.65 L705.3594,34.65 L705.3594,32.4625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="720.5" y="36.006">C::AA::CCC</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="692.5" x2="796.5" y1="47.4" y2="47.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="697.5" y="64.4059">CCC_1</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="697.5" y="81.2059">CCC_2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="692.5" x2="796.5" y1="88.9999" y2="88.9999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
+      <ellipse cx="433" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M435.9688,48.6406 Q435.3906,48.9375 434.75,49.0781 Q434.1094,49.2344 433.4063,49.2344 Q430.9063,49.2344 429.5781,47.5938 Q428.2656,45.9375 428.2656,42.8125 Q428.2656,39.6875 429.5781,38.0313 Q430.9063,36.375 433.4063,36.375 Q434.1094,36.375 434.75,36.5313 Q435.4063,36.6875 435.9688,36.9844 L435.9688,39.7031 Q435.3438,39.125 434.75,38.8594 Q434.1563,38.5781 433.5313,38.5781 Q432.1875,38.5781 431.5,39.6563 Q430.8125,40.7188 430.8125,42.8125 Q430.8125,44.9063 431.5,45.9844 Q432.1875,47.0469 433.5313,47.0469 Q434.1563,47.0469 434.75,46.7813 Q435.3438,46.5 435.9688,45.9219 L435.9688,48.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="447" y="47.1543">C::B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="479" y="24"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="480" y="36.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="59" y2="59"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <g id="elem_C_0001381298335849583950">
-        <rect codeLine="55" fill="#F1F1F1" height="64.7999" id="C_0001381298335849583950" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="376" y="174.8"/>
-        <ellipse cx="391" cy="190.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M386,191.9563 C386,194.4563 388.1406,196.2688 391.0625,196.2688 C392.2969,196.2688 393.4688,195.9719 394.2188,195.4563 C394.8281,195.0344 395.1563,194.6125 395.1563,194.2063 C395.1563,193.7375 394.7344,193.3313 394.2344,193.3313 C394,193.3313 393.7813,193.4094 393.5781,193.6125 C393.1406,194.05 393.1406,194.05 392.9688,194.1438 C392.5156,194.3781 391.875,194.5188 391.1094,194.5188 C389.1094,194.5188 387.8281,193.5031 387.8281,191.925 L387.8281,190.8781 C387.8281,189.175 389.0469,187.9719 390.75,187.9719 C391.3281,187.9719 391.9063,188.1125 392.375,188.3625 C392.8438,188.6281 393.0156,188.8156 393.0781,189.175 C393.2031,189.8469 393.4531,190.0969 393.9844,190.0969 C394.2656,190.0969 394.5469,189.9563 394.7344,189.7375 C394.8594,189.5656 394.9063,189.3938 394.9063,188.9563 L394.9063,187.5969 C394.9063,187.175 394.8906,187.0344 394.7656,186.8625 C394.5938,186.6125 394.3125,186.4563 393.9844,186.4563 C393.6719,186.4563 393.4688,186.5656 393.25,186.8313 C392.0781,186.3313 391.6406,186.2219 390.6875,186.2219 C388.0156,186.2219 386,188.2375 386,190.8625 L386,191.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="405" y="195.406">C::B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="10" x="440" y="171.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="8" x="441" y="186.0001">V</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="377" x2="446" y1="206.8" y2="206.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="377" x2="446" y1="214.8" y2="214.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382" y="223.7"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="384" y="225.7"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="396" y="231.8059">b : V</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
+      <ellipse cx="529.8" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M532.7688,311.6406 Q532.1906,311.9375 531.55,312.0781 Q530.9094,312.2344 530.2063,312.2344 Q527.7063,312.2344 526.3781,310.5938 Q525.0656,308.9375 525.0656,305.8125 Q525.0656,302.6875 526.3781,301.0313 Q527.7063,299.375 530.2063,299.375 Q530.9094,299.375 531.55,299.5313 Q532.2063,299.6875 532.7688,299.9844 L532.7688,302.7031 Q532.1438,302.125 531.55,301.8594 Q530.9563,301.5781 530.3313,301.5781 Q528.9875,301.5781 528.3,302.6563 Q527.6125,303.7188 527.6125,305.8125 Q527.6125,307.9063 528.3,308.9844 Q528.9875,310.0469 530.3313,310.0469 Q530.9563,310.0469 531.55,309.7813 Q532.1438,309.5 532.7688,308.9219 L532.7688,311.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="549.2" y="310.1543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="589.5" y="287"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="590.5" y="299.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="330" y2="330"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <g id="elem_C_0002037378936100378699">
-        <rect codeLine="60" fill="#F1F1F1" height="81.5999" id="C_0002037378936100378699" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="70" x="696.5" y="166.4"/>
-        <ellipse cx="711.5" cy="182.4" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M710.3594,183.4625 L711.6719,183.4625 L711.6719,183.5094 C711.6719,183.9156 711.6875,184.0719 711.7969,184.2281 C711.9688,184.4781 712.2656,184.65 712.5781,184.65 C712.8594,184.65 713.1563,184.5094 713.3281,184.2906 C713.4531,184.1031 713.5,183.9625 713.5,183.5094 L713.5,181.6656 C713.5,181.3375 713.4844,181.2281 713.4219,181.0563 C713.3125,180.7594 712.9531,180.5094 712.5781,180.5094 C712.2813,180.5094 712.0156,180.65 711.8438,180.8688 C711.7031,181.0563 711.6719,181.2281 711.6719,181.6656 L711.6719,181.7281 L710.3594,181.7281 L710.3594,179.5563 L714.2031,179.5563 L714.2031,180.3063 C714.2031,180.6969 714.2344,180.8844 714.3438,181.0406 C714.5156,181.2906 714.8125,181.4625 715.125,181.4625 C715.4219,181.4625 715.6875,181.3375 715.875,181.1031 C716.0156,180.9156 716.0469,180.775 716.0469,180.3063 L716.0469,177.8063 L708.3438,177.8063 C707.8906,177.8063 707.7656,177.8219 707.5938,177.9313 C707.3281,178.1031 707.1563,178.3688 707.1563,178.6813 C707.1563,178.9625 707.2813,179.2281 707.5313,179.4 C707.7188,179.525 707.9063,179.5563 708.3438,179.5563 L708.5313,179.5563 L708.5313,185.65 L708.3438,185.65 C707.9219,185.65 707.7656,185.6813 707.5938,185.775 C707.3281,185.9313 707.1563,186.2125 707.1563,186.5094 C707.1563,187.0875 707.5625,187.4 708.3438,187.4 L716.4219,187.4 L716.4219,184.8688 C716.4219,184.4625 716.3906,184.2906 716.2813,184.1344 C716.1094,183.8688 715.8281,183.7125 715.5,183.7125 C715.2188,183.7125 714.9375,183.8531 714.75,184.0719 C714.6094,184.2594 714.5781,184.4156 714.5781,184.8688 L714.5781,185.65 L710.3594,185.65 L710.3594,183.4625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="725.5" y="187.006">C::CC</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="697.5" x2="765.5" y1="198.4" y2="198.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="702.5" y="215.4059">CC_1</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="702.5" y="232.2059">CC_2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="697.5" x2="765.5" y1="239.9999" y2="239.9999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="336"/>
+      <ellipse cx="501.5" cy="341" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0000612133170877135796">
-        <rect codeLine="65" fill="#F1F1F1" height="48" id="C_0000612133170877135796" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="84" x="918.5" y="183.2"/>
-        <ellipse cx="933.5" cy="199.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M928.5,200.3563 C928.5,202.8563 930.6406,204.6688 933.5625,204.6688 C934.7969,204.6688 935.9688,204.3719 936.7188,203.8563 C937.3281,203.4344 937.6563,203.0125 937.6563,202.6063 C937.6563,202.1375 937.2344,201.7313 936.7344,201.7313 C936.5,201.7313 936.2813,201.8094 936.0781,202.0125 C935.6406,202.45 935.6406,202.45 935.4688,202.5438 C935.0156,202.7781 934.375,202.9188 933.6094,202.9188 C931.6094,202.9188 930.3281,201.9031 930.3281,200.325 L930.3281,199.2781 C930.3281,197.575 931.5469,196.3719 933.25,196.3719 C933.8281,196.3719 934.4063,196.5125 934.875,196.7625 C935.3438,197.0281 935.5156,197.2156 935.5781,197.575 C935.7031,198.2469 935.9531,198.4969 936.4844,198.4969 C936.7656,198.4969 937.0469,198.3563 937.2344,198.1375 C937.3594,197.9656 937.4063,197.7938 937.4063,197.3563 L937.4063,195.9969 C937.4063,195.575 937.3906,195.4344 937.2656,195.2625 C937.0938,195.0125 936.8125,194.8563 936.4844,194.8563 C936.1719,194.8563 935.9688,194.9656 935.75,195.2313 C934.5781,194.7313 934.1406,194.6219 933.1875,194.6219 C930.5156,194.6219 928.5,196.6375 928.5,199.2625 L928.5,200.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="947.5" y="203.806">detail::D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="919.5" x2="1001.5" y1="215.2" y2="215.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="919.5" x2="1001.5" y1="223.2" y2="223.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="510.5" y="344.2104">b_int : B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <g id="elem_C_0001572080057917630922">
-        <rect codeLine="69" fill="#F1F1F1" height="98.3998" id="C_0001572080057917630922" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="832.5" y="7"/>
-        <ellipse cx="847.5" cy="23" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M846.3594,24.0625 L847.6719,24.0625 L847.6719,24.1094 C847.6719,24.5156 847.6875,24.6719 847.7969,24.8281 C847.9688,25.0781 848.2656,25.25 848.5781,25.25 C848.8594,25.25 849.1563,25.1094 849.3281,24.8906 C849.4531,24.7031 849.5,24.5625 849.5,24.1094 L849.5,22.2656 C849.5,21.9375 849.4844,21.8281 849.4219,21.6563 C849.3125,21.3594 848.9531,21.1094 848.5781,21.1094 C848.2813,21.1094 848.0156,21.25 847.8438,21.4688 C847.7031,21.6563 847.6719,21.8281 847.6719,22.2656 L847.6719,22.3281 L846.3594,22.3281 L846.3594,20.1563 L850.2031,20.1563 L850.2031,20.9063 C850.2031,21.2969 850.2344,21.4844 850.3438,21.6406 C850.5156,21.8906 850.8125,22.0625 851.125,22.0625 C851.4219,22.0625 851.6875,21.9375 851.875,21.7031 C852.0156,21.5156 852.0469,21.375 852.0469,20.9063 L852.0469,18.4063 L844.3438,18.4063 C843.8906,18.4063 843.7656,18.4219 843.5938,18.5313 C843.3281,18.7031 843.1563,18.9688 843.1563,19.2813 C843.1563,19.5625 843.2813,19.8281 843.5313,20 C843.7188,20.125 843.9063,20.1563 844.3438,20.1563 L844.5313,20.1563 L844.5313,26.25 L844.3438,26.25 C843.9219,26.25 843.7656,26.2813 843.5938,26.375 C843.3281,26.5313 843.1563,26.8125 843.1563,27.1094 C843.1563,27.6875 843.5625,28 844.3438,28 L852.4219,28 L852.4219,25.4688 C852.4219,25.0625 852.3906,24.8906 852.2813,24.7344 C852.1094,24.4688 851.8281,24.3125 851.5,24.3125 C851.2188,24.3125 850.9375,24.4531 850.75,24.6719 C850.6094,24.8594 850.5781,25.0156 850.5781,25.4688 L850.5781,26.25 L846.3594,26.25 L846.3594,24.0625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="861.5" y="27.606">detail::D::AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="833.5" x2="941.5" y1="39" y2="39"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="838.5" y="56.0059">AA_1</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="838.5" y="72.8059">AA_2</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="838.5" y="89.6058">AA_3</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="833.5" x2="941.5" y1="97.3998" y2="97.3998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="348.8047"/>
+      <ellipse cx="501.5" cy="353.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <g id="elem_C_0000600916232677555492">
-        <rect codeLine="75" fill="#F1F1F1" height="48" id="C_0000600916232677555492" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="977.5" y="32.2"/>
-        <ellipse cx="992.5" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M987.5,49.3563 C987.5,51.8563 989.6406,53.6688 992.5625,53.6688 C993.7969,53.6688 994.9688,53.3719 995.7188,52.8563 C996.3281,52.4344 996.6563,52.0125 996.6563,51.6063 C996.6563,51.1375 996.2344,50.7313 995.7344,50.7313 C995.5,50.7313 995.2813,50.8094 995.0781,51.0125 C994.6406,51.45 994.6406,51.45 994.4688,51.5438 C994.0156,51.7781 993.375,51.9188 992.6094,51.9188 C990.6094,51.9188 989.3281,50.9031 989.3281,49.325 L989.3281,48.2781 C989.3281,46.575 990.5469,45.3719 992.25,45.3719 C992.8281,45.3719 993.4063,45.5125 993.875,45.7625 C994.3438,46.0281 994.5156,46.2156 994.5781,46.575 C994.7031,47.2469 994.9531,47.4969 995.4844,47.4969 C995.7656,47.4969 996.0469,47.3563 996.2344,47.1375 C996.3594,46.9656 996.4063,46.7938 996.4063,46.3563 L996.4063,44.9969 C996.4063,44.575 996.3906,44.4344 996.2656,44.2625 C996.0938,44.0125 995.8125,43.8563 995.4844,43.8563 C995.1719,43.8563 994.9688,43.9656 994.75,44.2313 C993.5781,43.7313 993.1406,43.6219 992.1875,43.6219 C989.5156,43.6219 987.5,45.6375 987.5,48.2625 L987.5,49.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="1006.5" y="52.806">detail::D::DD</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="978.5" x2="1088.5" y1="64.2" y2="64.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="978.5" x2="1088.5" y1="72.2" y2="72.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="510.5" y="357.0151">t : T</text>
     </a>
-    <g id="link_C_0001630205507215126623_C_0001232624428734051711">
-      <path codeLine="78" d="M40.5,105.58 C40.5,131.58 40.5,146.44 40.5,167.07 " fill="none" id="C_0001630205507215126623-to-C_0001232624428734051711" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="40.5" cy="175.07" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="40.5" x2="40.5" y1="167.07" y2="183.07"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="48.5" x2="32.5" y1="175.07" y2="175.07"/>
-    </g>
-    <g id="link_C_0001742499843727859552_C_0001552274940876611774">
-      <path codeLine="79" d="M248.5,231.42 C248.5,252.4 248.5,267.73 248.5,292.75 " fill="none" id="C_0001742499843727859552-to-C_0001552274940876611774" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="248.5" cy="300.75" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="248.5" x2="248.5" y1="292.75" y2="308.75"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="256.5" x2="240.5" y1="300.75" y2="300.75"/>
-    </g>
-    <g id="link_C_0000590936874508841244_C_0001742499843727859552">
-      <path codeLine="80" d="M192.45,105.58 C206.93,131.58 216.3348,148.4618 227.8248,169.0918 " fill="none" id="C_0000590936874508841244-to-C_0001742499843727859552" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="231.7174" cy="176.0809" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="227.8248" x2="235.61" y1="169.0918" y2="183.07"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="238.7065" x2="224.7283" y1="172.1883" y2="179.9735"/>
-    </g>
-    <g id="link_C_0001430186633004282131_C_0001742499843727859552">
-      <path codeLine="81" d="M298.28,80.48 C287.2,108.47 274.6026,140.2846 263.5426,168.2046 " fill="none" id="C_0001430186633004282131-to-C_0001742499843727859552" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="260.5963" cy="175.6423" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="263.5426" x2="257.65" y1="168.2046" y2="183.08"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="268.034" x2="253.1586" y1="178.5886" y2="172.696"/>
-    </g>
-    <g id="link_C_0000287819369330075965_C_0001381298335849583950">
-      <path codeLine="82" d="M457.91,80.48 C448.57,105.77 439.8321,129.4433 429.4321,157.6233 " fill="none" id="C_0000287819369330075965-to-C_0001381298335849583950" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="423.2,174.51,435.061,159.7007,423.8032,155.5459,423.2,174.51" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002278328177727440136_C_0000287819369330075965">
-      <path codeLine="83" d="M538.9129,297.1418 C520.2529,235.3118 488.54,130.24 473.55,80.57 " fill="none" id="C_0002278328177727440136-backto-C_0000287819369330075965" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="542.38,308.63,544.4759,301.7302,538.9129,297.1418,536.817,304.0416,542.38,308.63" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="530.5" cy="208" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="537.5" y="211.777">b_int</text>
-    </g>
-    <g id="link_C_0000623940132897927654_C_0002278328177727440136">
-      <path codeLine="84" d="M615.45,231.42 C604.55,252.4 595.6525,269.5298 582.6625,294.5498 " fill="none" id="C_0000623940132897927654-to-C_0002278328177727440136" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="578.9763" cy="301.6499" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="582.6625" x2="575.29" y1="294.5498" y2="308.75"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="586.0764" x2="571.8762" y1="305.3362" y2="297.9636"/>
-    </g>
-    <g id="link_C_0001597801087286500866_C_0000623940132897927654">
-      <path codeLine="85" d="M608.09,80.48 C612.41,108.47 617.179,139.3473 621.489,167.2673 " fill="none" id="C_0001597801087286500866-to-C_0000623940132897927654" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="622.7095" cy="175.1736" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="621.489" x2="623.93" y1="167.2673" y2="183.08"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="630.6159" x2="614.8031" y1="173.9531" y2="176.3941"/>
-    </g>
-    <g id="link_C_0000081819202639599734_C_0000623940132897927654">
-      <path codeLine="86" d="M713.15,97.13 C691.62,124.54 673.6822,147.3966 655.6822,170.3166 " fill="none" id="C_0000081819202639599734-to-C_0000623940132897927654" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="650.7411" cy="176.6083" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="655.6822" x2="645.8" y1="170.3166" y2="182.9"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="657.0328" x2="644.4494" y1="181.5494" y2="171.6672"/>
-    </g>
-    <g id="link_C_0001381298335849583950_C_0002278328177727440136">
-      <path codeLine="87" d="M443.59,239.75 C464.26,260.08 479.9117,275.4617 502.1217,297.3017 " fill="none" id="C_0001381298335849583950-to-C_0002278328177727440136" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="507.8258" cy="302.9109" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="502.1217" x2="513.53" y1="297.3017" y2="308.52"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="513.435" x2="502.2167" y1="297.2067" y2="308.615"/>
-    </g>
-    <g id="link_C_0002037378936100378699_C_0002278328177727440136">
-      <path codeLine="88" d="M696.11,236.31 C669.98,257.07 646.5782,275.6579 617.4482,298.7979 " fill="none" id="C_0002037378936100378699-to-C_0002278328177727440136" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="611.1841" cy="303.774" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="617.4482" x2="604.92" y1="298.7979" y2="308.75"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="616.1601" x2="606.2081" y1="310.0381" y2="297.5099"/>
-    </g>
-    <g id="link_C_0001572080057917630922_C_0000612133170877135796">
-      <path codeLine="89" d="M911.2,105.58 C923.94,131.58 932.019,148.0725 942.129,168.7025 " fill="none" id="C_0001572080057917630922-to-C_0000612133170877135796" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="945.6495" cy="175.8863" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="942.129" x2="949.17" y1="168.7025" y2="183.07"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="952.8333" x2="938.4658" y1="172.3658" y2="179.4067"/>
-    </g>
-    <g id="link_C_0000600916232677555492_C_0000612133170877135796">
-      <path codeLine="90" d="M1022.09,80.48 C1008.38,108.47 992.5358,140.79 978.8658,168.71 " fill="none" id="C_0000600916232677555492-to-C_0000612133170877135796" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="975.3479" cy="175.895" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="978.8658" x2="971.83" y1="168.71" y2="183.08"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="982.5329" x2="968.1629" y1="179.4129" y2="172.3771"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
+      <ellipse cx="599" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M601.9688,189.6406 Q601.3906,189.9375 600.75,190.0781 Q600.1094,190.2344 599.4063,190.2344 Q596.9063,190.2344 595.5781,188.5938 Q594.2656,186.9375 594.2656,183.8125 Q594.2656,180.6875 595.5781,179.0313 Q596.9063,177.375 599.4063,177.375 Q600.1094,177.375 600.75,177.5313 Q601.4063,177.6875 601.9688,177.9844 L601.9688,180.7031 Q601.3438,180.125 600.75,179.8594 Q600.1563,179.5781 599.5313,179.5781 Q598.1875,179.5781 597.5,180.6563 Q596.8125,181.7188 596.8125,183.8125 Q596.8125,185.9063 597.5,186.9844 Q598.1875,188.0469 599.5313,188.0469 Q600.1563,188.0469 600.75,187.7813 Q601.3438,187.5 601.9688,186.9219 L601.9688,189.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="613" y="188.1543">C::AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="200" y2="200"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="208" y2="208"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
+      <ellipse cx="560" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M562.9688,48.6406 Q562.3906,48.9375 561.75,49.0781 Q561.1094,49.2344 560.4063,49.2344 Q557.9063,49.2344 556.5781,47.5938 Q555.2656,45.9375 555.2656,42.8125 Q555.2656,39.6875 556.5781,38.0313 Q557.9063,36.375 560.4063,36.375 Q561.1094,36.375 561.75,36.5313 Q562.4063,36.6875 562.9688,36.9844 L562.9688,39.7031 Q562.3438,39.125 561.75,38.8594 Q561.1563,38.5781 560.5313,38.5781 Q559.1875,38.5781 558.5,39.6563 Q557.8125,40.7188 557.8125,42.8125 Q557.8125,44.9063 558.5,45.9844 Q559.1875,47.0469 560.5313,47.0469 Q561.1563,47.0469 561.75,46.7813 Q562.3438,46.5 562.9688,45.9219 L562.9688,48.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="574" y="47.1543">C::AA::AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="59" y2="59"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="67" y2="67"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
+      <ellipse cx="691" cy="30" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M695.1094,36 L687.3906,36 L687.3906,23.6094 L695.1094,23.6094 L695.1094,25.7656 L689.8438,25.7656 L689.8438,28.4375 L694.6094,28.4375 L694.6094,30.5938 L689.8438,30.5938 L689.8438,33.8438 L695.1094,33.8438 L695.1094,36 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="705" y="34.1543">C::AA::CCC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="46" y2="46"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="60.2104">CCC_1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="73.0151">CCC_2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="79.6094" y2="79.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
+      <ellipse cx="381" cy="177.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M383.9688,183.1406 Q383.3906,183.4375 382.75,183.5781 Q382.1094,183.7344 381.4063,183.7344 Q378.9063,183.7344 377.5781,182.0938 Q376.2656,180.4375 376.2656,177.3125 Q376.2656,174.1875 377.5781,172.5313 Q378.9063,170.875 381.4063,170.875 Q382.1094,170.875 382.75,171.0313 Q383.4063,171.1875 383.9688,171.4844 L383.9688,174.2031 Q383.3438,173.625 382.75,173.3594 Q382.1563,173.0781 381.5313,173.0781 Q380.1875,173.0781 379.5,174.1563 Q378.8125,175.2188 378.8125,177.3125 Q378.8125,179.4063 379.5,180.4844 Q380.1875,181.5469 381.5313,181.5469 Q382.1563,181.5469 382.75,181.2813 Q383.3438,181 383.9688,180.4219 L383.9688,183.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="395" y="181.6543">C::B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="427" y="158.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="428" y="170.6387">V</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="201.5" y2="201.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372" y="207.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="374" y="209.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="386" y="215.7104">b : V</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
+      <ellipse cx="698" cy="171" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M702.1094,177 L694.3906,177 L694.3906,164.6094 L702.1094,164.6094 L702.1094,166.7656 L696.8438,166.7656 L696.8438,169.4375 L701.6094,169.4375 L701.6094,171.5938 L696.8438,171.5938 L696.8438,174.8438 L702.1094,174.8438 L702.1094,177 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="712" y="175.1543">C::CC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="187" y2="187"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="201.2104">CC_1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="214.0151">CC_2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="220.6094" y2="220.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
+      <ellipse cx="906" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M908.9688,189.6406 Q908.3906,189.9375 907.75,190.0781 Q907.1094,190.2344 906.4063,190.2344 Q903.9063,190.2344 902.5781,188.5938 Q901.2656,186.9375 901.2656,183.8125 Q901.2656,180.6875 902.5781,179.0313 Q903.9063,177.375 906.4063,177.375 Q907.1094,177.375 907.75,177.5313 Q908.4063,177.6875 908.9688,177.9844 L908.9688,180.7031 Q908.3438,180.125 907.75,179.8594 Q907.1563,179.5781 906.5313,179.5781 Q905.1875,179.5781 904.5,180.6563 Q903.8125,181.7188 903.8125,183.8125 Q903.8125,185.9063 904.5,186.9844 Q905.1875,188.0469 906.5313,188.0469 Q907.1563,188.0469 907.75,187.7813 Q908.3438,187.5 908.9688,186.9219 L908.9688,189.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="920" y="188.1543">detail::D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="200" y2="200"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="208" y2="208"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
+      <ellipse cx="822" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M826.1094,30 L818.3906,30 L818.3906,17.6094 L826.1094,17.6094 L826.1094,19.7656 L820.8438,19.7656 L820.8438,22.4375 L825.6094,22.4375 L825.6094,24.5938 L820.8438,24.5938 L820.8438,27.8438 L826.1094,27.8438 L826.1094,30 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="836" y="28.1543">detail::D::AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="40" y2="40"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="54.2104">AA_1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="67.0151">AA_2</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="79.8198">AA_3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="86.4141" y2="86.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
+      <ellipse cx="965" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M967.9688,48.6406 Q967.3906,48.9375 966.75,49.0781 Q966.1094,49.2344 965.4063,49.2344 Q962.9063,49.2344 961.5781,47.5938 Q960.2656,45.9375 960.2656,42.8125 Q960.2656,39.6875 961.5781,38.0313 Q962.9063,36.375 965.4063,36.375 Q966.1094,36.375 966.75,36.5313 Q967.4063,36.6875 967.9688,36.9844 L967.9688,39.7031 Q967.3438,39.125 966.75,38.8594 Q966.1563,38.5781 965.5313,38.5781 Q964.1875,38.5781 963.5,39.6563 Q962.8125,40.7188 962.8125,42.8125 Q962.8125,44.9063 963.5,45.9844 Q964.1875,47.0469 965.5313,47.0469 Q966.1563,47.0469 966.75,46.7813 Q967.3438,46.5 967.9688,45.9219 L967.9688,48.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="78" x="979" y="47.1543">detail::D::DD</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951" x2="1059" y1="59" y2="59"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951" x2="1059" y1="67" y2="67"/>
+    </a>
+    <path d="M38,94.08 C38,112.65 38,134.33 38,152.47 " fill="none" id="C_0001630205507215126623-&gt;C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="38" cy="159.64" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="38" y1="151.64" y2="167.64"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="30" y1="159.64" y2="159.64"/>
+    <path d="M241,216.17 C241,232.28 241,254.4 241,274.57 " fill="none" id="C_0001742499843727859552-&gt;C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="241" cy="281.83" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="241" y1="273.83" y2="289.83"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="249" x2="233" y1="281.83" y2="281.83"/>
+    <path d="M184.52,94.08 C195.78,113.41 209.01,136.1 219.83,154.66 " fill="none" id="C_0000590936874508841244-&gt;C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="223.3652" cy="160.7262" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="219.3404" x2="227.39" y1="153.8124" y2="167.64"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="230.279" x2="216.4514" y1="156.7014" y2="164.751"/>
+    <path d="M288.46,75.27 C279.7,96.61 266.58,128.62 256.35,153.56 " fill="none" id="C_0001430186633004282131-&gt;C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="253.6041" cy="160.2577" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="256.6382" x2="250.57" y1="152.8554" y2="167.66"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="261.0064" x2="246.2018" y1="163.2918" y2="157.2236"/>
+    <path d="M446.63,75.27 C439.26,93.56 428.74,119.67 419.56,142.46 " fill="none" id="C_0000287819369330075965-&gt;C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="425.91,145.42,411.94,161.36,412.92,140.19,425.91,145.42" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M527.6,277.5 C508.75,218.12 477.58,119.97 463.42,75.36 " fill="none" id="C_0002278328177727440136&lt;-C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="531.54,289.91,533.5388,282.9814,527.9119,278.4716,525.9132,285.4002,531.54,289.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="519" cy="192.5664" 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="526" y="196.5669">b_int</text>
+    <path d="M603.28,216.17 C594.14,232.83 581.46,255.93 570.09,276.65 " fill="none" id="C_0000623940132897927654-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="566.6995" cy="282.8171" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="570.549" x2="562.85" y1="275.8041" y2="289.83"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="573.7124" x2="559.6866" y1="286.6666" y2="278.9676"/>
+    <path d="M596.85,75.27 C600.35,96.41 605.58,128.02 609.69,152.86 " fill="none" id="C_0001597801087286500866-&gt;C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="610.8297" cy="159.768" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="609.5195" x2="612.14" y1="151.8761" y2="167.66"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="618.7217" x2="602.9378" y1="158.4578" y2="161.0783"/>
+    <path d="M695.91,88.16 C679.76,108.94 659.56,134.94 643.51,155.59 " fill="none" id="C_0000081819202639599734-&gt;C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="639.0389" cy="161.3531" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="643.9478" x2="634.13" y1="155.0363" y2="167.67"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="645.3558" x2="632.722" y1="166.262" y2="156.4442"/>
+    <path d="M431.74,222.52 C449.79,239.31 472.8,260.71 493.2,279.68 " fill="none" id="C_0001381298335849583950-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="498.3612" cy="284.4826" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="492.5024" x2="504.22" y1="279.0352" y2="289.93"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="503.8086" x2="492.9138" y1="278.6238" y2="290.3414"/>
+    <path d="M682.65,218.02 C659.95,235.57 628.94,259.54 601.92,280.44 " fill="none" id="C_0002037378936100378699-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="596.1479" cy="284.9054" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="602.4759" x2="589.82" y1="280.0108" y2="289.8"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="601.0425" x2="591.2533" y1="291.2333" y2="278.5775"/>
+    <path d="M882.8,94.08 C892.71,113.22 904.33,135.65 913.9,154.12 " fill="none" id="C_0001572080057917630922-&gt;C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="917.219" cy="160.5372" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="913.538" x2="920.9" y1="153.4343" y2="167.64"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="924.3219" x2="910.1162" y1="156.8562" y2="164.2181"/>
+    <path d="M992.95,75.27 C981.79,96.81 965,129.22 952.03,154.26 " fill="none" id="C_0000600916232677555492-&gt;C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="948.771" cy="160.5572" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="952.452" x2="945.09" y1="153.4543" y2="167.66"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="955.8738" x2="941.6681" y1="164.2381" y2="156.8762"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00004_class_mermaid.svg b/docs/test_cases/t00004_class_mermaid.svg
index eaa91c7b..682ada70 100644
--- a/docs/test_cases/t00004_class_mermaid.svg
+++ b/docs/test_cases/t00004_class_mermaid.svg
@@ -1,73 +1,68 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1239.9609375 525" style="max-width: 1239.96px; background-color: white;" width="1239.9609375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1237.73828125 525" style="max-width: 1237.74px; background-color: white;" width="1237.73828125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M68.875,100.5L68.875,107.58333333333333C68.875,114.66666666666667,68.875,128.83333333333334,68.875,141.58333333333334C68.875,154.33333333333334,68.875,165.66666666666666,68.875,171.33333333333334L68.875,177"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M216.8046875,122.5L216.8046875,125.91666666666667C216.8046875,129.33333333333334,216.8046875,136.16666666666666,216.8046875,152.58333333333334C216.8046875,169,216.8046875,195,216.8046875,208L216.8046875,221"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M187.02502436861477,288.75536793025486L179.66082759884566,298.4628066085457C172.29663082907652,308.1702452868366,157.56823728953825,327.5851226434183,150.20404051976914,341.45922798837574C142.83984375,355.3333333333333,142.83984375,363.6666666666667,142.83984375,367.8333333333333L142.83984375,372"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M252.17553801655745,287.9335217836957L261.23547438879785,297.7779348197464C270.2954107610383,307.62234785579716,288.41528350551914,327.31117392789855,297.47521987775957,348.65558696394925C306.53515625,370,306.53515625,393,306.53515625,404.5L306.53515625,416"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M439.30859375,278L439.30859375,289.5C439.30859375,301,439.30859375,324,442.0797258763246,342.38370400806735C444.85085800264915,360.7674080161348,450.3931222552983,374.53481603226965,453.16425438162287,381.418520040337L455.9353865079474,388.3022240484044"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M491.4602667336719,108.14628676523756L482.7683212363933,113.9552389710313C474.0763757391146,119.76419117682504,456.6924847445573,131.3820955884125,448.0005392472787,150.19104779420627C439.30859375,169,439.30859375,195,439.30859375,208L439.30859375,221"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M638.3938980336458,70.22651590329238L713.5346285697048,82.35542991941031C788.6753591057637,94.48434393552826,938.9568201778819,118.74217196776412,1014.097550713941,143.87108598388207C1089.23828125,169,1089.23828125,195,1089.23828125,208L1089.23828125,221"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M1046.7815928755397,268.7739249541037L1018.0621346879498,281.81160412841973C989.3426765003597,294.8492833027358,931.9037601251799,320.9246416513679,903.18430193759,345.46232082568395C874.46484375,370,874.46484375,393,874.46484375,404.5L874.46484375,416"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1121.8428189400033,288.33974899739826L1130.0500053666694,298.11645749783185C1138.2571917933356,307.8931659982655,1154.6715646466678,327.4465829991328,1162.878751073334,343.22329149956636C1171.0859375,359,1171.0859375,371,1171.0859375,377L1171.0859375,383"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M530.4356888973774,120.74206957072454L528.3311730394812,124.45172464227045C526.226657181585,128.16137971381636,522.0176254657925,135.58068985690818,519.9131096078962,157.0403449284541C517.80859375,178.5,517.80859375,214,517.80859375,248C517.80859375,282,517.80859375,314.5,513.917140758547,340.4166666666667C510.02568776709404,366.3333333333333,502.2427817841881,385.6666666666667,498.3513287927351,395.3333333333333L494.45987580128207,405"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M601.0564986026226,120.74206957072454L603.1610144605188,124.45172464227045C605.265530318415,128.16137971381636,609.4745620342075,135.58068985690818,611.5790778921038,146.7903449284541C613.68359375,158,613.68359375,173,613.68359375,180.5L613.68359375,188"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M831.3599453018669,96.59527129852006L823.7055533765557,104.32939274876672C816.0511614512446,112.06351419901337,800.7423776006223,127.53175709950669,793.0879856753112,140.93254521642C785.43359375,154.33333333333334,785.43359375,165.66666666666666,785.43359375,171.33333333333334L785.43359375,177"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M906.7650546981331,96.59527129852006L914.4194466234443,104.32939274876672C922.0738385487554,112.06351419901337,937.3826223993777,127.53175709950669,945.0370143246888,148.26587854975335C952.69140625,169,952.69140625,195,952.69140625,208L952.69140625,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M68.875,87L68.875,96.33333333333333C68.875,105.66666666666667,68.875,124.33333333333333,68.875,139.33333333333334C68.875,154.33333333333334,68.875,165.66666666666666,68.875,171.33333333333334L68.875,177"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M212.359375,109L212.359375,114.66666666666667C212.359375,120.33333333333333,212.359375,131.66666666666666,212.359375,150.33333333333334C212.359375,169,212.359375,195,212.359375,208L212.359375,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M191.38858173076923,278L182.9266826923077,289.5C174.46478365384618,301,157.54098557692308,324,149.07908653846155,339.6666666666667C140.6171875,355.3333333333333,140.6171875,363.6666666666667,140.6171875,367.8333333333333L140.6171875,372"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M239.23798076923077,278L250.08373397435898,289.5C260.9294871794872,301,282.6209935897436,324,293.46674679487177,347C304.3125,370,304.3125,393,304.3125,404.5L304.3125,416"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M437.0859375,278L437.0859375,289.5C437.0859375,301,437.0859375,324,440.977390491453,345.1666666666667C444.86884348290596,366.3333333333333,452.6517494658119,385.6666666666667,456.5432024572649,395.3333333333333L460.43465544871793,405"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M504.203125,98.1446181413742L493.0169270833333,105.62051511781182C481.8307291666667,113.09641209424946,459.4583333333333,128.04820604712472,448.2721354166667,148.52410302356236C437.0859375,169,437.0859375,195,437.0859375,208L437.0859375,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M622.84375,68.07524586983449L700.2057291666666,80.56270489152874C777.5677083333334,93.05016391322299,932.2916666666666,118.02508195661149,1009.6536458333334,143.51254097830574C1087.015625,169,1087.015625,195,1087.015625,208L1087.015625,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M1056.8515625,263.19348150303733L1026.0833333333333,277.1612345858644C995.3151041666666,291.12898766869154,933.7786458333334,319.0644938343458,903.0104166666666,344.53224691717287C872.2421875,370,872.2421875,393,872.2421875,404.5L872.2421875,416"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1110.9403245192307,278L1120.5941506410256,289.5C1130.2479767628204,301,1149.5556290064103,324,1159.209455128205,341.5C1168.86328125,359,1168.86328125,371,1168.86328125,377L1168.86328125,383"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M534.8743990384615,109L531.6596554487179,114.66666666666667C528.4449118589744,120.33333333333333,522.0154246794872,131.66666666666666,518.8006810897435,155.08333333333334C515.5859375,178.5,515.5859375,214,515.5859375,248C515.5859375,282,515.5859375,314.5,511.694484508547,340.4166666666667C507.80303151709404,366.3333333333333,500.0201255341881,385.6666666666667,496.1286725427351,395.3333333333333L492.23721955128207,405"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M592.1724759615385,109L595.3872195512821,114.66666666666667C598.6019631410256,120.33333333333333,605.0314503205128,131.66666666666666,608.2461939102565,144.83333333333334C611.4609375,158,611.4609375,173,611.4609375,180.5L611.4609375,188"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M838.6336446005918,87L829.3965267504932,96.33333333333333C820.1594089003944,105.66666666666667,801.6851732001973,124.33333333333333,792.4480553500986,139.33333333333334C783.2109375,154.33333333333334,783.2109375,165.66666666666666,783.2109375,171.33333333333334L783.2109375,177"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M895.0460428994082,87L904.2831607495068,96.33333333333333C913.5202785996056,105.66666666666667,931.9945142998027,124.33333333333333,941.2316321499014,146.66666666666666C950.46875,169,950.46875,195,950.46875,208L950.46875,221"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -125,7 +120,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(439.30859375, 143)" class="edgeLabel">
+        <g transform="translate(437.0859375, 143)" class="edgeLabel">
           <g transform="translate(-22.0234375, -9)" class="label">
             <foreignObject height="18" width="44.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -215,7 +210,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L4">
+        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L4">
           <g title="B" id="classId-C_0001232624428734051711-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -234,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L6">
+        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L6">
           <g title="B##AA" id="classId-C_0001630205507215126623-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -268,11 +263,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(216.8046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L9">
+        <a transform="translate(212.359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L9">
           <g title="A" id="classId-C_0001552274940876611774-2" class="node default clickable">
-            <rect height="101" width="169.296875" y="-50.5" x="-84.6484375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="84.6484375" x1="-84.6484375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="84.6484375" x1="-84.6484375" class="divider"/>
+            <rect height="101" width="160.40625" y="-50.5" x="-80.203125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="80.203125" x1="-80.203125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="80.203125" x1="-80.203125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -284,20 +279,20 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -77.1484375, 3)" height="18" width="145.40625">
+              <foreignObject transform="translate( -72.703125, 3)" height="18" width="136.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : : [const] void</span>
+                  <span class="nodeLabel">+foo() : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -77.1484375, 25)" height="18" width="154.296875">
+              <foreignObject transform="translate( -72.703125, 25)" height="18" width="145.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo2() : : [const] void</span>
+                  <span class="nodeLabel">+foo2() : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(216.8046875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L13">
+        <a transform="translate(212.359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L13">
           <g title="A##AA" id="classId-C_0001742499843727859552-3" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -316,7 +311,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(142.83984375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L15">
+        <a transform="translate(140.6171875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L15">
           <g title="A##AA##Lights" id="classId-C_0000590936874508841244-4" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -350,7 +345,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(306.53515625, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L17">
+        <a transform="translate(304.3125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L17">
           <g title="A##AA##AAA" id="classId-C_0001430186633004282131-5" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -369,7 +364,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(439.30859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33">
+        <a transform="translate(437.0859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0000287819369330075965-6" class="node default clickable">
             <rect height="57" width="87" y="-28.5" x="-43.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.5" x1="-43.5" class="divider"/>
@@ -388,7 +383,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(565.74609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L23">
+        <a transform="translate(563.5234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L23">
           <g title="C" id="classId-C_0002278328177727440136-7" class="node default clickable">
             <rect height="101" width="118.640625" y="-50.5" x="-59.3203125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.3203125" x1="-59.3203125" class="divider"/>
@@ -417,7 +412,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1089.23828125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L27">
+        <a transform="translate(1087.015625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L27">
           <g title="C##AA" id="classId-C_0000623940132897927654-8" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -436,7 +431,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(874.46484375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L28">
+        <a transform="translate(872.2421875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L28">
           <g title="C##AA##AAA" id="classId-C_0001597801087286500866-9" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -455,7 +450,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1171.0859375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L30">
+        <a transform="translate(1168.86328125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L30">
           <g title="C##AA##CCC" id="classId-C_0000081819202639599734-10" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -484,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.55859375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L33">
+        <a transform="translate(476.3359375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0001381298335849583950-11" class="node default clickable">
             <rect height="79" width="78.125" y="-39.5" x="-39.0625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0625" x1="-39.0625" class="divider"/>
@@ -508,7 +503,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(613.68359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L39">
+        <a transform="translate(611.4609375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L39">
           <g title="C##CC" id="classId-C_0002037378936100378699-12" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -537,7 +532,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(869.0625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L43">
+        <a transform="translate(866.83984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L43">
           <g title="D" id="classId-C_0000612133170877135796-13" class="node default clickable">
             <rect height="57" width="79" y="-28.5" x="-39.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.5" x1="-39.5" class="divider"/>
@@ -556,7 +551,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(785.43359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L45">
+        <a transform="translate(783.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L45">
           <g title="D##AA" id="classId-C_0001572080057917630922-14" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -590,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(952.69140625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00004/t00004.cc#L47">
+        <a transform="translate(950.46875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L47">
           <g title="D##DD" id="classId-C_0000600916232677555492-15" class="node default clickable">
             <rect height="57" width="112.765625" y="-28.5" x="-56.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.3828125" x1="-56.3828125" class="divider"/>
diff --git a/docs/test_cases/t00005.md b/docs/test_cases/t00005.md
index 873b54cd..398e3f3a 100644
--- a/docs/test_cases/t00005.md
+++ b/docs/test_cases/t00005.md
@@ -72,7 +72,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00005::A",
+      "display_name": "A",
       "id": "96355893895780319",
       "is_abstract": false,
       "is_nested": false,
@@ -94,7 +94,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::B",
+      "display_name": "B",
       "id": "1909425857334087541",
       "is_abstract": false,
       "is_nested": false,
@@ -116,7 +116,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::C",
+      "display_name": "C",
       "id": "968176384460064907",
       "is_abstract": false,
       "is_nested": false,
@@ -138,7 +138,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::D",
+      "display_name": "D",
       "id": "1735599590836186693",
       "is_abstract": false,
       "is_nested": false,
@@ -160,7 +160,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::E",
+      "display_name": "E",
       "id": "887960136921844658",
       "is_abstract": false,
       "is_nested": false,
@@ -182,7 +182,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::F",
+      "display_name": "F",
       "id": "772719357856231772",
       "is_abstract": false,
       "is_nested": false,
@@ -204,7 +204,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::G",
+      "display_name": "G",
       "id": "979147885884736437",
       "is_abstract": false,
       "is_nested": false,
@@ -226,7 +226,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::H",
+      "display_name": "H",
       "id": "1440673301054236675",
       "is_abstract": false,
       "is_nested": false,
@@ -248,7 +248,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::I",
+      "display_name": "I",
       "id": "109681731550086430",
       "is_abstract": false,
       "is_nested": false,
@@ -270,7 +270,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::J",
+      "display_name": "J",
       "id": "338330011969650325",
       "is_abstract": false,
       "is_nested": false,
@@ -292,7 +292,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::K",
+      "display_name": "K",
       "id": "2179119389830432509",
       "is_abstract": false,
       "is_nested": false,
@@ -314,7 +314,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00005::R",
+      "display_name": "R",
       "id": "630692407373144211",
       "is_abstract": false,
       "is_nested": false,
@@ -517,6 +517,7 @@ public:
     }
   ],
   "name": "t00005_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index 535d9e11..da677e33 100644
--- a/docs/test_cases/t00005_class.svg
+++ b/docs/test_cases/t00005_class.svg
@@ -1,287 +1,247 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="439px" preserveAspectRatio="none" style="width:812px;height:439px;background:#FFFFFF;" version="1.1" viewBox="0 0 812 439" width="812px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="f18xslhdcacxg2" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000096355893895780319">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000096355893895780319" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="384"/>
-        <ellipse cx="22" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,401.1563 C17,403.6563 19.1406,405.4688 22.0625,405.4688 C23.2969,405.4688 24.4688,405.1719 25.2188,404.6563 C25.8281,404.2344 26.1563,403.8125 26.1563,403.4063 C26.1563,402.9375 25.7344,402.5313 25.2344,402.5313 C25,402.5313 24.7813,402.6094 24.5781,402.8125 C24.1406,403.25 24.1406,403.25 23.9688,403.3438 C23.5156,403.5781 22.875,403.7188 22.1094,403.7188 C20.1094,403.7188 18.8281,402.7031 18.8281,401.125 L18.8281,400.0781 C18.8281,398.375 20.0469,397.1719 21.75,397.1719 C22.3281,397.1719 22.9063,397.3125 23.375,397.5625 C23.8438,397.8281 24.0156,398.0156 24.0781,398.375 C24.2031,399.0469 24.4531,399.2969 24.9844,399.2969 C25.2656,399.2969 25.5469,399.1563 25.7344,398.9375 C25.8594,398.7656 25.9063,398.5938 25.9063,398.1563 L25.9063,396.7969 C25.9063,396.375 25.8906,396.2344 25.7656,396.0625 C25.5938,395.8125 25.3125,395.6563 24.9844,395.6563 C24.6719,395.6563 24.4688,395.7656 24.25,396.0313 C23.0781,395.5313 22.6406,395.4219 21.6875,395.4219 C19.0156,395.4219 17,397.4375 17,400.0625 L17,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="404.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
+      <ellipse cx="21" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,346.6406 Q23.3906,346.9375 22.75,347.0781 Q22.1094,347.2344 21.4063,347.2344 Q18.9063,347.2344 17.5781,345.5938 Q16.2656,343.9375 16.2656,340.8125 Q16.2656,337.6875 17.5781,336.0313 Q18.9063,334.375 21.4063,334.375 Q22.1094,334.375 22.75,334.5313 Q23.4063,334.6875 23.9688,334.9844 L23.9688,337.7031 Q23.3438,337.125 22.75,336.8594 Q22.1563,336.5781 21.5313,336.5781 Q20.1875,336.5781 19.5,337.6563 Q18.8125,338.7188 18.8125,340.8125 Q18.8125,342.9063 19.5,343.9844 Q20.1875,345.0469 21.5313,345.0469 Q22.1563,345.0469 22.75,344.7813 Q23.3438,344.5 23.9688,343.9219 L23.9688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="345.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001909425857334087541">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0001909425857334087541" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="384"/>
-        <ellipse cx="98" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93,401.1563 C93,403.6563 95.1406,405.4688 98.0625,405.4688 C99.2969,405.4688 100.4688,405.1719 101.2188,404.6563 C101.8281,404.2344 102.1563,403.8125 102.1563,403.4063 C102.1563,402.9375 101.7344,402.5313 101.2344,402.5313 C101,402.5313 100.7813,402.6094 100.5781,402.8125 C100.1406,403.25 100.1406,403.25 99.9688,403.3438 C99.5156,403.5781 98.875,403.7188 98.1094,403.7188 C96.1094,403.7188 94.8281,402.7031 94.8281,401.125 L94.8281,400.0781 C94.8281,398.375 96.0469,397.1719 97.75,397.1719 C98.3281,397.1719 98.9063,397.3125 99.375,397.5625 C99.8438,397.8281 100.0156,398.0156 100.0781,398.375 C100.2031,399.0469 100.4531,399.2969 100.9844,399.2969 C101.2656,399.2969 101.5469,399.1563 101.7344,398.9375 C101.8594,398.7656 101.9063,398.5938 101.9063,398.1563 L101.9063,396.7969 C101.9063,396.375 101.8906,396.2344 101.7656,396.0625 C101.5938,395.8125 101.3125,395.6563 100.9844,395.6563 C100.6719,395.6563 100.4688,395.7656 100.25,396.0313 C99.0781,395.5313 98.6406,395.4219 97.6875,395.4219 C95.0156,395.4219 93,397.4375 93,400.0625 L93,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="404.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
+      <ellipse cx="96" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M98.9688,346.6406 Q98.3906,346.9375 97.75,347.0781 Q97.1094,347.2344 96.4063,347.2344 Q93.9063,347.2344 92.5781,345.5938 Q91.2656,343.9375 91.2656,340.8125 Q91.2656,337.6875 92.5781,336.0313 Q93.9063,334.375 96.4063,334.375 Q97.1094,334.375 97.75,334.5313 Q98.4063,334.6875 98.9688,334.9844 L98.9688,337.7031 Q98.3438,337.125 97.75,336.8594 Q97.1563,336.5781 96.5313,336.5781 Q95.1875,336.5781 94.5,337.6563 Q93.8125,338.7188 93.8125,340.8125 Q93.8125,342.9063 94.5,343.9844 Q95.1875,345.0469 96.5313,345.0469 Q97.1563,345.0469 97.75,344.7813 Q98.3438,344.5 98.9688,343.9219 L98.9688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="345.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000968176384460064907">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000968176384460064907" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="384"/>
-        <ellipse cx="173.5" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M168.5,401.1563 C168.5,403.6563 170.6406,405.4688 173.5625,405.4688 C174.7969,405.4688 175.9688,405.1719 176.7188,404.6563 C177.3281,404.2344 177.6563,403.8125 177.6563,403.4063 C177.6563,402.9375 177.2344,402.5313 176.7344,402.5313 C176.5,402.5313 176.2813,402.6094 176.0781,402.8125 C175.6406,403.25 175.6406,403.25 175.4688,403.3438 C175.0156,403.5781 174.375,403.7188 173.6094,403.7188 C171.6094,403.7188 170.3281,402.7031 170.3281,401.125 L170.3281,400.0781 C170.3281,398.375 171.5469,397.1719 173.25,397.1719 C173.8281,397.1719 174.4063,397.3125 174.875,397.5625 C175.3438,397.8281 175.5156,398.0156 175.5781,398.375 C175.7031,399.0469 175.9531,399.2969 176.4844,399.2969 C176.7656,399.2969 177.0469,399.1563 177.2344,398.9375 C177.3594,398.7656 177.4063,398.5938 177.4063,398.1563 L177.4063,396.7969 C177.4063,396.375 177.3906,396.2344 177.2656,396.0625 C177.0938,395.8125 176.8125,395.6563 176.4844,395.6563 C176.1719,395.6563 175.9688,395.7656 175.75,396.0313 C174.5781,395.5313 174.1406,395.4219 173.1875,395.4219 C170.5156,395.4219 168.5,397.4375 168.5,400.0625 L168.5,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="404.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
+      <ellipse cx="171" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.9688,346.6406 Q173.3906,346.9375 172.75,347.0781 Q172.1094,347.2344 171.4063,347.2344 Q168.9063,347.2344 167.5781,345.5938 Q166.2656,343.9375 166.2656,340.8125 Q166.2656,337.6875 167.5781,336.0313 Q168.9063,334.375 171.4063,334.375 Q172.1094,334.375 172.75,334.5313 Q173.4063,334.6875 173.9688,334.9844 L173.9688,337.7031 Q173.3438,337.125 172.75,336.8594 Q172.1563,336.5781 171.5313,336.5781 Q170.1875,336.5781 169.5,337.6563 Q168.8125,338.7188 168.8125,340.8125 Q168.8125,342.9063 169.5,343.9844 Q170.1875,345.0469 171.5313,345.0469 Q172.1563,345.0469 172.75,344.7813 Q173.3438,344.5 173.9688,343.9219 L173.9688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="345.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001735599590836186693">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001735599590836186693" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="235.5" y="384"/>
-        <ellipse cx="250.5" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M245.5,401.1563 C245.5,403.6563 247.6406,405.4688 250.5625,405.4688 C251.7969,405.4688 252.9688,405.1719 253.7188,404.6563 C254.3281,404.2344 254.6563,403.8125 254.6563,403.4063 C254.6563,402.9375 254.2344,402.5313 253.7344,402.5313 C253.5,402.5313 253.2813,402.6094 253.0781,402.8125 C252.6406,403.25 252.6406,403.25 252.4688,403.3438 C252.0156,403.5781 251.375,403.7188 250.6094,403.7188 C248.6094,403.7188 247.3281,402.7031 247.3281,401.125 L247.3281,400.0781 C247.3281,398.375 248.5469,397.1719 250.25,397.1719 C250.8281,397.1719 251.4063,397.3125 251.875,397.5625 C252.3438,397.8281 252.5156,398.0156 252.5781,398.375 C252.7031,399.0469 252.9531,399.2969 253.4844,399.2969 C253.7656,399.2969 254.0469,399.1563 254.2344,398.9375 C254.3594,398.7656 254.4063,398.5938 254.4063,398.1563 L254.4063,396.7969 C254.4063,396.375 254.3906,396.2344 254.2656,396.0625 C254.0938,395.8125 253.8125,395.6563 253.4844,395.6563 C253.1719,395.6563 252.9688,395.7656 252.75,396.0313 C251.5781,395.5313 251.1406,395.4219 250.1875,395.4219 C247.5156,395.4219 245.5,397.4375 245.5,400.0625 L245.5,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="264.5" y="404.606">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
+      <ellipse cx="246.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M249.4688,346.6406 Q248.8906,346.9375 248.25,347.0781 Q247.6094,347.2344 246.9063,347.2344 Q244.4063,347.2344 243.0781,345.5938 Q241.7656,343.9375 241.7656,340.8125 Q241.7656,337.6875 243.0781,336.0313 Q244.4063,334.375 246.9063,334.375 Q247.6094,334.375 248.25,334.5313 Q248.9063,334.6875 249.4688,334.9844 L249.4688,337.7031 Q248.8438,337.125 248.25,336.8594 Q247.6563,336.5781 247.0313,336.5781 Q245.6875,336.5781 245,337.6563 Q244.3125,338.7188 244.3125,340.8125 Q244.3125,342.9063 245,343.9844 Q245.6875,345.0469 247.0313,345.0469 Q247.6563,345.0469 248.25,344.7813 Q248.8438,344.5 249.4688,343.9219 L249.4688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="345.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0000887960136921844658">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000887960136921844658" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="312" y="384"/>
-        <ellipse cx="327" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M322,401.1563 C322,403.6563 324.1406,405.4688 327.0625,405.4688 C328.2969,405.4688 329.4688,405.1719 330.2188,404.6563 C330.8281,404.2344 331.1563,403.8125 331.1563,403.4063 C331.1563,402.9375 330.7344,402.5313 330.2344,402.5313 C330,402.5313 329.7813,402.6094 329.5781,402.8125 C329.1406,403.25 329.1406,403.25 328.9688,403.3438 C328.5156,403.5781 327.875,403.7188 327.1094,403.7188 C325.1094,403.7188 323.8281,402.7031 323.8281,401.125 L323.8281,400.0781 C323.8281,398.375 325.0469,397.1719 326.75,397.1719 C327.3281,397.1719 327.9063,397.3125 328.375,397.5625 C328.8438,397.8281 329.0156,398.0156 329.0781,398.375 C329.2031,399.0469 329.4531,399.2969 329.9844,399.2969 C330.2656,399.2969 330.5469,399.1563 330.7344,398.9375 C330.8594,398.7656 330.9063,398.5938 330.9063,398.1563 L330.9063,396.7969 C330.9063,396.375 330.8906,396.2344 330.7656,396.0625 C330.5938,395.8125 330.3125,395.6563 329.9844,395.6563 C329.6719,395.6563 329.4688,395.7656 329.25,396.0313 C328.0781,395.5313 327.6406,395.4219 326.6875,395.4219 C324.0156,395.4219 322,397.4375 322,400.0625 L322,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="341" y="404.606">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
+      <ellipse cx="323" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M325.9688,346.6406 Q325.3906,346.9375 324.75,347.0781 Q324.1094,347.2344 323.4063,347.2344 Q320.9063,347.2344 319.5781,345.5938 Q318.2656,343.9375 318.2656,340.8125 Q318.2656,337.6875 319.5781,336.0313 Q320.9063,334.375 323.4063,334.375 Q324.1094,334.375 324.75,334.5313 Q325.4063,334.6875 325.9688,334.9844 L325.9688,337.7031 Q325.3438,337.125 324.75,336.8594 Q324.1563,336.5781 323.5313,336.5781 Q322.1875,336.5781 321.5,337.6563 Q320.8125,338.7188 320.8125,340.8125 Q320.8125,342.9063 321.5,343.9844 Q322.1875,345.0469 323.5313,345.0469 Q324.1563,345.0469 324.75,344.7813 Q325.3438,344.5 325.9688,343.9219 L325.9688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="345.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000772719357856231772">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000772719357856231772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="388" y="384"/>
-        <ellipse cx="403" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M398,401.1563 C398,403.6563 400.1406,405.4688 403.0625,405.4688 C404.2969,405.4688 405.4688,405.1719 406.2188,404.6563 C406.8281,404.2344 407.1563,403.8125 407.1563,403.4063 C407.1563,402.9375 406.7344,402.5313 406.2344,402.5313 C406,402.5313 405.7813,402.6094 405.5781,402.8125 C405.1406,403.25 405.1406,403.25 404.9688,403.3438 C404.5156,403.5781 403.875,403.7188 403.1094,403.7188 C401.1094,403.7188 399.8281,402.7031 399.8281,401.125 L399.8281,400.0781 C399.8281,398.375 401.0469,397.1719 402.75,397.1719 C403.3281,397.1719 403.9063,397.3125 404.375,397.5625 C404.8438,397.8281 405.0156,398.0156 405.0781,398.375 C405.2031,399.0469 405.4531,399.2969 405.9844,399.2969 C406.2656,399.2969 406.5469,399.1563 406.7344,398.9375 C406.8594,398.7656 406.9063,398.5938 406.9063,398.1563 L406.9063,396.7969 C406.9063,396.375 406.8906,396.2344 406.7656,396.0625 C406.5938,395.8125 406.3125,395.6563 405.9844,395.6563 C405.6719,395.6563 405.4688,395.7656 405.25,396.0313 C404.0781,395.5313 403.6406,395.4219 402.6875,395.4219 C400.0156,395.4219 398,397.4375 398,400.0625 L398,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="417" y="404.606">F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="428" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="428" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
+      <ellipse cx="398.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M401.4688,346.6406 Q400.8906,346.9375 400.25,347.0781 Q399.6094,347.2344 398.9063,347.2344 Q396.4063,347.2344 395.0781,345.5938 Q393.7656,343.9375 393.7656,340.8125 Q393.7656,337.6875 395.0781,336.0313 Q396.4063,334.375 398.9063,334.375 Q399.6094,334.375 400.25,334.5313 Q400.9063,334.6875 401.4688,334.9844 L401.4688,337.7031 Q400.8438,337.125 400.25,336.8594 Q399.6563,336.5781 399.0313,336.5781 Q397.6875,336.5781 397,337.6563 Q396.3125,338.7188 396.3125,340.8125 Q396.3125,342.9063 397,343.9844 Q397.6875,345.0469 399.0313,345.0469 Q399.6563,345.0469 400.25,344.7813 Q400.8438,344.5 401.4688,343.9219 L401.4688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="345.1543">F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0000979147885884736437">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000979147885884736437" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="464" y="384"/>
-        <ellipse cx="479" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M474,401.1563 C474,403.6563 476.1406,405.4688 479.0625,405.4688 C480.2969,405.4688 481.4688,405.1719 482.2188,404.6563 C482.8281,404.2344 483.1563,403.8125 483.1563,403.4063 C483.1563,402.9375 482.7344,402.5313 482.2344,402.5313 C482,402.5313 481.7813,402.6094 481.5781,402.8125 C481.1406,403.25 481.1406,403.25 480.9688,403.3438 C480.5156,403.5781 479.875,403.7188 479.1094,403.7188 C477.1094,403.7188 475.8281,402.7031 475.8281,401.125 L475.8281,400.0781 C475.8281,398.375 477.0469,397.1719 478.75,397.1719 C479.3281,397.1719 479.9063,397.3125 480.375,397.5625 C480.8438,397.8281 481.0156,398.0156 481.0781,398.375 C481.2031,399.0469 481.4531,399.2969 481.9844,399.2969 C482.2656,399.2969 482.5469,399.1563 482.7344,398.9375 C482.8594,398.7656 482.9063,398.5938 482.9063,398.1563 L482.9063,396.7969 C482.9063,396.375 482.8906,396.2344 482.7656,396.0625 C482.5938,395.8125 482.3125,395.6563 481.9844,395.6563 C481.6719,395.6563 481.4688,395.7656 481.25,396.0313 C480.0781,395.5313 479.6406,395.4219 478.6875,395.4219 C476.0156,395.4219 474,397.4375 474,400.0625 L474,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="493" y="404.606">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="506" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="506" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
+      <ellipse cx="472.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M475.4688,346.6406 Q474.8906,346.9375 474.25,347.0781 Q473.6094,347.2344 472.9063,347.2344 Q470.4063,347.2344 469.0781,345.5938 Q467.7656,343.9375 467.7656,340.8125 Q467.7656,337.6875 469.0781,336.0313 Q470.4063,334.375 472.9063,334.375 Q473.6094,334.375 474.25,334.5313 Q474.9063,334.6875 475.4688,334.9844 L475.4688,337.7031 Q474.8438,337.125 474.25,336.8594 Q473.6563,336.5781 473.0313,336.5781 Q471.6875,336.5781 471,337.6563 Q470.3125,338.7188 470.3125,340.8125 Q470.3125,342.9063 471,343.9844 Q471.6875,345.0469 473.0313,345.0469 Q473.6563,345.0469 474.25,344.7813 Q474.8438,344.5 475.4688,343.9219 L475.4688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="345.1543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <g id="elem_C_0001440673301054236675">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001440673301054236675" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="541.5" y="384"/>
-        <ellipse cx="556.5" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M551.5,401.1563 C551.5,403.6563 553.6406,405.4688 556.5625,405.4688 C557.7969,405.4688 558.9688,405.1719 559.7188,404.6563 C560.3281,404.2344 560.6563,403.8125 560.6563,403.4063 C560.6563,402.9375 560.2344,402.5313 559.7344,402.5313 C559.5,402.5313 559.2813,402.6094 559.0781,402.8125 C558.6406,403.25 558.6406,403.25 558.4688,403.3438 C558.0156,403.5781 557.375,403.7188 556.6094,403.7188 C554.6094,403.7188 553.3281,402.7031 553.3281,401.125 L553.3281,400.0781 C553.3281,398.375 554.5469,397.1719 556.25,397.1719 C556.8281,397.1719 557.4063,397.3125 557.875,397.5625 C558.3438,397.8281 558.5156,398.0156 558.5781,398.375 C558.7031,399.0469 558.9531,399.2969 559.4844,399.2969 C559.7656,399.2969 560.0469,399.1563 560.2344,398.9375 C560.3594,398.7656 560.4063,398.5938 560.4063,398.1563 L560.4063,396.7969 C560.4063,396.375 560.3906,396.2344 560.2656,396.0625 C560.0938,395.8125 559.8125,395.6563 559.4844,395.6563 C559.1719,395.6563 558.9688,395.7656 558.75,396.0313 C557.5781,395.5313 557.1406,395.4219 556.1875,395.4219 C553.5156,395.4219 551.5,397.4375 551.5,400.0625 L551.5,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="570.5" y="404.606">H</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="542.5" x2="582.5" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="542.5" x2="582.5" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
+      <ellipse cx="548.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M551.4688,346.6406 Q550.8906,346.9375 550.25,347.0781 Q549.6094,347.2344 548.9063,347.2344 Q546.4063,347.2344 545.0781,345.5938 Q543.7656,343.9375 543.7656,340.8125 Q543.7656,337.6875 545.0781,336.0313 Q546.4063,334.375 548.9063,334.375 Q549.6094,334.375 550.25,334.5313 Q550.9063,334.6875 551.4688,334.9844 L551.4688,337.7031 Q550.8438,337.125 550.25,336.8594 Q549.6563,336.5781 549.0313,336.5781 Q547.6875,336.5781 547,337.6563 Q546.3125,338.7188 546.3125,340.8125 Q546.3125,342.9063 547,343.9844 Q547.6875,345.0469 549.0313,345.0469 Q549.6563,345.0469 550.25,344.7813 Q550.8438,344.5 551.4688,343.9219 L551.4688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="345.1543">H</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <g id="elem_C_0000109681731550086430">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000109681731550086430" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="618.5" y="384"/>
-        <ellipse cx="633.5" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M628.5,401.1563 C628.5,403.6563 630.6406,405.4688 633.5625,405.4688 C634.7969,405.4688 635.9688,405.1719 636.7188,404.6563 C637.3281,404.2344 637.6563,403.8125 637.6563,403.4063 C637.6563,402.9375 637.2344,402.5313 636.7344,402.5313 C636.5,402.5313 636.2813,402.6094 636.0781,402.8125 C635.6406,403.25 635.6406,403.25 635.4688,403.3438 C635.0156,403.5781 634.375,403.7188 633.6094,403.7188 C631.6094,403.7188 630.3281,402.7031 630.3281,401.125 L630.3281,400.0781 C630.3281,398.375 631.5469,397.1719 633.25,397.1719 C633.8281,397.1719 634.4063,397.3125 634.875,397.5625 C635.3438,397.8281 635.5156,398.0156 635.5781,398.375 C635.7031,399.0469 635.9531,399.2969 636.4844,399.2969 C636.7656,399.2969 637.0469,399.1563 637.2344,398.9375 C637.3594,398.7656 637.4063,398.5938 637.4063,398.1563 L637.4063,396.7969 C637.4063,396.375 637.3906,396.2344 637.2656,396.0625 C637.0938,395.8125 636.8125,395.6563 636.4844,395.6563 C636.1719,395.6563 635.9688,395.7656 635.75,396.0313 C634.5781,395.5313 634.1406,395.4219 633.1875,395.4219 C630.5156,395.4219 628.5,397.4375 628.5,400.0625 L628.5,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="647.5" y="404.606">I</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="619.5" x2="653.5" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="619.5" x2="653.5" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
+      <ellipse cx="624.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M627.4688,346.6406 Q626.8906,346.9375 626.25,347.0781 Q625.6094,347.2344 624.9063,347.2344 Q622.4063,347.2344 621.0781,345.5938 Q619.7656,343.9375 619.7656,340.8125 Q619.7656,337.6875 621.0781,336.0313 Q622.4063,334.375 624.9063,334.375 Q625.6094,334.375 626.25,334.5313 Q626.9063,334.6875 627.4688,334.9844 L627.4688,337.7031 Q626.8438,337.125 626.25,336.8594 Q625.6563,336.5781 625.0313,336.5781 Q623.6875,336.5781 623,337.6563 Q622.3125,338.7188 622.3125,340.8125 Q622.3125,342.9063 623,343.9844 Q623.6875,345.0469 625.0313,345.0469 Q625.6563,345.0469 626.25,344.7813 Q626.8438,344.5 627.4688,343.9219 L627.4688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="345.1543">I</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <g id="elem_C_0000338330011969650325">
-        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0000338330011969650325" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="690" y="384"/>
-        <ellipse cx="705" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M700,401.1563 C700,403.6563 702.1406,405.4688 705.0625,405.4688 C706.2969,405.4688 707.4688,405.1719 708.2188,404.6563 C708.8281,404.2344 709.1563,403.8125 709.1563,403.4063 C709.1563,402.9375 708.7344,402.5313 708.2344,402.5313 C708,402.5313 707.7813,402.6094 707.5781,402.8125 C707.1406,403.25 707.1406,403.25 706.9688,403.3438 C706.5156,403.5781 705.875,403.7188 705.1094,403.7188 C703.1094,403.7188 701.8281,402.7031 701.8281,401.125 L701.8281,400.0781 C701.8281,398.375 703.0469,397.1719 704.75,397.1719 C705.3281,397.1719 705.9063,397.3125 706.375,397.5625 C706.8438,397.8281 707.0156,398.0156 707.0781,398.375 C707.2031,399.0469 707.4531,399.2969 707.9844,399.2969 C708.2656,399.2969 708.5469,399.1563 708.7344,398.9375 C708.8594,398.7656 708.9063,398.5938 708.9063,398.1563 L708.9063,396.7969 C708.9063,396.375 708.8906,396.2344 708.7656,396.0625 C708.5938,395.8125 708.3125,395.6563 707.9844,395.6563 C707.6719,395.6563 707.4688,395.7656 707.25,396.0313 C706.0781,395.5313 705.6406,395.4219 704.6875,395.4219 C702.0156,395.4219 700,397.4375 700,400.0625 L700,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="719" y="404.606">J</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="691" x2="728" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="691" x2="728" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
+      <ellipse cx="694.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M697.4688,346.6406 Q696.8906,346.9375 696.25,347.0781 Q695.6094,347.2344 694.9063,347.2344 Q692.4063,347.2344 691.0781,345.5938 Q689.7656,343.9375 689.7656,340.8125 Q689.7656,337.6875 691.0781,336.0313 Q692.4063,334.375 694.9063,334.375 Q695.6094,334.375 696.25,334.5313 Q696.9063,334.6875 697.4688,334.9844 L697.4688,337.7031 Q696.8438,337.125 696.25,336.8594 Q695.6563,336.5781 695.0313,336.5781 Q693.6875,336.5781 693,337.6563 Q692.3125,338.7188 692.3125,340.8125 Q692.3125,342.9063 693,343.9844 Q693.6875,345.0469 695.0313,345.0469 Q695.6563,345.0469 696.25,344.7813 Q696.8438,344.5 697.4688,343.9219 L697.4688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="345.1543">J</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <g id="elem_C_0002179119389830432509">
-        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0002179119389830432509" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="764" y="384"/>
-        <ellipse cx="779" cy="400" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M774,401.1563 C774,403.6563 776.1406,405.4688 779.0625,405.4688 C780.2969,405.4688 781.4688,405.1719 782.2188,404.6563 C782.8281,404.2344 783.1563,403.8125 783.1563,403.4063 C783.1563,402.9375 782.7344,402.5313 782.2344,402.5313 C782,402.5313 781.7813,402.6094 781.5781,402.8125 C781.1406,403.25 781.1406,403.25 780.9688,403.3438 C780.5156,403.5781 779.875,403.7188 779.1094,403.7188 C777.1094,403.7188 775.8281,402.7031 775.8281,401.125 L775.8281,400.0781 C775.8281,398.375 777.0469,397.1719 778.75,397.1719 C779.3281,397.1719 779.9063,397.3125 780.375,397.5625 C780.8438,397.8281 781.0156,398.0156 781.0781,398.375 C781.2031,399.0469 781.4531,399.2969 781.9844,399.2969 C782.2656,399.2969 782.5469,399.1563 782.7344,398.9375 C782.8594,398.7656 782.9063,398.5938 782.9063,398.1563 L782.9063,396.7969 C782.9063,396.375 782.8906,396.2344 782.7656,396.0625 C782.5938,395.8125 782.3125,395.6563 781.9844,395.6563 C781.6719,395.6563 781.4688,395.7656 781.25,396.0313 C780.0781,395.5313 779.6406,395.4219 778.6875,395.4219 C776.0156,395.4219 774,397.4375 774,400.0625 L774,401.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="793" y="404.606">K</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="765" x2="804" y1="416" y2="416"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="765" x2="804" y1="424" y2="424"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
+      <ellipse cx="764.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M767.4688,346.6406 Q766.8906,346.9375 766.25,347.0781 Q765.6094,347.2344 764.9063,347.2344 Q762.4063,347.2344 761.0781,345.5938 Q759.7656,343.9375 759.7656,340.8125 Q759.7656,337.6875 761.0781,336.0313 Q762.4063,334.375 764.9063,334.375 Q765.6094,334.375 766.25,334.5313 Q766.9063,334.6875 767.4688,334.9844 L767.4688,337.7031 Q766.8438,337.125 766.25,336.8594 Q765.6563,336.5781 765.0313,336.5781 Q763.6875,336.5781 763,337.6563 Q762.3125,338.7188 762.3125,340.8125 Q762.3125,342.9063 763,343.9844 Q763.6875,345.0469 765.0313,345.0469 Q765.6563,345.0469 766.25,344.7813 Q766.8438,344.5 767.4688,343.9219 L767.4688,346.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="345.1543">K</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="357" y2="357"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000630692407373144211">
-        <rect codeLine="46" fill="#F1F1F1" height="299.9989" id="C_0000630692407373144211" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="294" y="7"/>
-        <ellipse cx="399.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M394.25,24.1563 C394.25,26.6563 396.3906,28.4688 399.3125,28.4688 C400.5469,28.4688 401.7188,28.1719 402.4688,27.6563 C403.0781,27.2344 403.4063,26.8125 403.4063,26.4063 C403.4063,25.9375 402.9844,25.5313 402.4844,25.5313 C402.25,25.5313 402.0313,25.6094 401.8281,25.8125 C401.3906,26.25 401.3906,26.25 401.2188,26.3438 C400.7656,26.5781 400.125,26.7188 399.3594,26.7188 C397.3594,26.7188 396.0781,25.7031 396.0781,24.125 L396.0781,23.0781 C396.0781,21.375 397.2969,20.1719 399,20.1719 C399.5781,20.1719 400.1563,20.3125 400.625,20.5625 C401.0938,20.8281 401.2656,21.0156 401.3281,21.375 C401.4531,22.0469 401.7031,22.2969 402.2344,22.2969 C402.5156,22.2969 402.7969,22.1563 402.9844,21.9375 C403.1094,21.7656 403.1563,21.5938 403.1563,21.1563 L403.1563,19.7969 C403.1563,19.375 403.1406,19.2344 403.0156,19.0625 C402.8438,18.8125 402.5625,18.6563 402.2344,18.6563 C401.9219,18.6563 401.7188,18.7656 401.5,19.0313 C400.3281,18.5313 399.8906,18.4219 398.9375,18.4219 C396.2656,18.4219 394.25,20.4375 394.25,23.0625 L394.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="419.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="295" x2="522" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="295" x2="522" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="55.9"/>
-          <ellipse cx="305" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="314" y="64.0059">a : A</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="72.6999"/>
-          <ellipse cx="305" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="314" y="80.8059">b : B *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="89.4998"/>
-          <ellipse cx="305" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="314" y="97.6058">c : C &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="106.2997"/>
-          <ellipse cx="305" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77" x="314" y="114.4057">d : const D *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="123.0997"/>
-          <ellipse cx="305" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="314" y="131.2057">e : const E &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="139.8996"/>
-          <ellipse cx="305" cy="144.8996" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="314" y="148.0056">f : F &amp;&amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="156.6995"/>
-          <ellipse cx="305" cy="161.6995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="314" y="164.8055">g : G **</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="173.4995"/>
-          <ellipse cx="305" cy="178.4995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="314" y="181.6054">h : H ***</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="190.2994"/>
-          <ellipse cx="305" cy="195.2994" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="314" y="198.4054">i : I *&amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="207.0993"/>
-          <ellipse cx="305" cy="212.0993" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="314" y="215.2053">j : volatile J *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="223.8992"/>
-          <ellipse cx="305" cy="228.8992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="314" y="232.0052">k : K *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="240.6992"/>
-          <ellipse cx="305" cy="245.6992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="314" y="248.8051">some_int : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="257.4991"/>
-          <ellipse cx="305" cy="262.4991" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146" x="314" y="265.6051">some_int_pointer : int *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="274.299"/>
-          <ellipse cx="305" cy="279.299" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="314" y="282.405">some_int_pointer_pointer : int **</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300" y="291.0989"/>
-          <ellipse cx="305" cy="296.0989" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="314" y="299.2049">some_int_reference : int &amp;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
+      <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="48" y2="48"/>
     </a>
-    <g id="link_C_0000630692407373144211_C_0000096355893895780319">
-      <path codeLine="64" d="M283.625,239.6149 C196.425,296.6049 94,363.54 48.24,393.44 " fill="none" id="C_0000630692407373144211-backto-C_0000096355893895780319" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="293.67,233.05,286.4592,232.9841,283.625,239.6149,290.8358,239.6808,293.67,233.05" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="131.5" y="350.077">+a</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0001909425857334087541">
-      <path codeLine="65" d="M293.63,251.78 C230.81,303.07 163.5586,357.9765 128.9286,386.2365 " fill="none" id="C_0000630692407373144211-to-C_0001909425857334087541" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="124.28,390.03,133.7819,387.4388,128.1538,386.8687,128.7239,381.2407,124.28,390.03" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="186.5" y="350.077">+b</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0000968176384460064907">
-      <path codeLine="66" d="M293.66,282.87 C258.18,321.45 226.7907,355.5729 205.0307,379.2429 " fill="none" id="C_0000630692407373144211-to-C_0000968176384460064907" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="200.97,383.66,210.0058,379.7415,204.3539,379.9791,204.1163,374.3272,200.97,383.66" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="242.5" y="350.077">+c</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0001735599590836186693">
-      <path codeLine="67" d="M317.45,307.16 C299.24,336.99 285.3568,359.7292 273.9568,378.3992 " fill="none" id="C_0000630692407373144211-to-C_0001735599590836186693" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="270.83,383.52,278.9341,377.9233,273.4357,379.2526,272.1063,373.7542,270.83,383.52" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="298.5" y="350.077">+d</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0000887960136921844658">
-      <path codeLine="68" d="M362.97,307.16 C353.87,336.99 347.122,359.1115 341.422,377.7815 " fill="none" id="C_0000630692407373144211-to-C_0000887960136921844658" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="339.67,383.52,346.1237,376.0802,341.13,378.7379,338.4723,373.7442,339.67,383.52" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="354.5" y="350.077">+e</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0000772719357856231772">
-      <path codeLine="69" d="M408.5,319.16 C408.5,348.99 408.5,364.85 408.5,383.52 " fill="none" id="C_0000630692407373144211-backto-C_0000772719357856231772" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="408.5,307.16,404.5,313.16,408.5,319.16,412.5,313.16,408.5,307.16" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="409.5" y="350.077">+f</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0000979147885884736437">
-      <path codeLine="70" d="M454.62,307.16 C463.85,336.99 470.6984,359.1175 476.4684,377.7875 " fill="none" id="C_0000630692407373144211-to-C_0000979147885884736437" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="478.24,383.52,479.4042,373.7402,476.7636,378.7429,471.7609,376.1024,478.24,383.52" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="470.5" y="350.077">+g</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0001440673301054236675">
-      <path codeLine="71" d="M500.75,307.16 C519.2,336.99 533.2734,359.7475 544.8234,378.4175 " fill="none" id="C_0000630692407373144211-to-C_0001440673301054236675" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="547.98,383.52,546.6467,373.7618,545.3495,379.2679,539.8434,377.9706,547.98,383.52" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="530.5" y="350.077">+h</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0000109681731550086430">
-      <path codeLine="72" d="M523.17,283.23 C560.21,323.68 593.0977,359.6052 614.3077,382.7652 " fill="none" id="C_0000630692407373144211-to-C_0000109681731550086430" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="618.36,387.19,615.2315,377.8512,614.9831,383.5026,609.3317,383.2543,618.36,387.19" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="588.5" y="350.077">+i</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0000338330011969650325">
-      <path codeLine="73" d="M523.15,252.85 C585.29,304.25 651.4564,358.9861 685.1064,386.8161 " fill="none" id="C_0000630692407373144211-to-C_0000338330011969650325" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="689.73,390.64,685.3439,381.8217,685.877,387.4534,680.2453,387.9865,689.73,390.64" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="645.5" y="350.077">+j</text>
-    </g>
-    <g id="link_C_0000630692407373144211_C_0002179119389830432509">
-      <path codeLine="74" d="M523.36,234.06 C608.88,290.7 713.3273,359.8674 758.5273,389.7974 " fill="none" id="C_0000630692407373144211-to-C_0002179119389830432509" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="763.53,393.11,758.2344,384.806,759.3611,390.3495,753.8176,391.4762,763.53,393.11" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="704.5" y="350.077">+k</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="54"/>
+      <ellipse cx="308" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="317" y="62.2104">a : A</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="66.8047"/>
+      <ellipse cx="308" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="317" y="75.0151">b : B *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="79.6094"/>
+      <ellipse cx="308" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="317" y="87.8198">c : C &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="92.4141"/>
+      <ellipse cx="308" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="100.6245">d : const D *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="105.2188"/>
+      <ellipse cx="308" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="317" y="113.4292">e : const E &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="118.0234"/>
+      <ellipse cx="308" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="317" y="126.2339">f : F &amp;&amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="130.8281"/>
+      <ellipse cx="308" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="44" x="317" y="139.0386">g : G **</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="143.6328"/>
+      <ellipse cx="308" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="317" y="151.8433">h : H ***</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="156.4375"/>
+      <ellipse cx="308" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="317" y="164.6479">i : I *&amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="169.2422"/>
+      <ellipse cx="308" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="177.4526">j : volatile J *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="182.0469"/>
+      <ellipse cx="308" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="317" y="190.2573">k : K *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="194.8516"/>
+      <ellipse cx="308" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="317" y="203.062">some_int : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="207.6563"/>
+      <ellipse cx="308" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="317" y="215.8667">some_int_pointer : int *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="220.4609"/>
+      <ellipse cx="308" cy="225.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="317" y="228.6714">some_int_pointer_pointer : int **</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="233.2656"/>
+      <ellipse cx="308" cy="238.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="317" y="241.4761">some_int_reference : int &amp;</text>
+    </a>
+    <path d="M285.16,195.65 C219.46,233.13 136.34,281.08 63,325 C57.55,328.26 51.69,331.86 46.28,335.22 " fill="none" id="C_0000630692407373144211&lt;-C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="296.8,189.02,289.6065,188.517,286.3754,194.9637,293.5689,195.4667,296.8,189.02" 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>
+    <path d="M296.95,205.9 C235.22,250.67 162.45,303.44 125.38,330.32 " fill="none" id="C_0000630692407373144211-&gt;C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="121.04,333.47,130.6752,331.4296,125.0892,330.5368,125.9821,324.9509,121.04,333.47" 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>
+    <path d="M296.81,231.45 C260.45,266.53 223.08,302.58 199.72,325.12 " fill="none" id="C_0000630692407373144211-&gt;C_0000968176384460064907" 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>
+    <path d="M320.87,248.11 C302.09,275.35 283.87,301.78 270.89,320.61 " fill="none" id="C_0000630692407373144211-&gt;C_0001735599590836186693" 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>
+    <path d="M362.21,248.11 C353.04,274.89 344.13,300.89 337.71,319.65 " fill="none" id="C_0000630692407373144211-&gt;C_0000887960136921844658" 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>
+    <path d="M403,261.41 C403,285.83 403,308.67 403,324.75 " fill="none" id="C_0000630692407373144211&lt;-C_0000772719357856231772" 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>
+    <path d="M443.79,248.11 C452.96,274.89 461.87,300.89 468.29,319.65 " fill="none" id="C_0000630692407373144211-&gt;C_0000979147885884736437" 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>
+    <path d="M485.13,248.11 C503.91,275.35 522.13,301.78 535.11,320.61 " fill="none" id="C_0000630692407373144211-&gt;C_0001440673301054236675" 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>
+    <path d="M509.1,232.73 C545.65,268.47 583.05,305.04 605.66,327.13 " fill="none" id="C_0000630692407373144211-&gt;C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="609.43,330.82,605.7835,321.671,605.852,327.3275,600.1955,327.3959,609.43,330.82" 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>
+    <path d="M509.14,208.06 C569.83,253.27 640.62,306 675.43,331.93 " fill="none" id="C_0000630692407373144211-&gt;C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="679.49,334.96,674.69,326.36,675.49,331.96,669.89,332.76,679.49,334.96" 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>
+    <path d="M509.24,191.61 C573.84,229.84 657.88,279.89 732,325 C736.26,327.6 740.79,330.38 745.16,333.09 " fill="none" id="C_0000630692407373144211-&gt;C_0002179119389830432509" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00005_class_mermaid.svg b/docs/test_cases/t00005_class_mermaid.svg
index 4008b39e..7f1235de 100644
--- a/docs/test_cases/t00005_class_mermaid.svg
+++ b/docs/test_cases/t00005_class_mermaid.svg
@@ -1,71 +1,66 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 796.640625 528" style="max-width: 796.641px; background-color: white;" width="796.640625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M263.95139406036645,284.1104200148062L223.50637005030538,308.25868334567184C183.0613460402443,332.4069466765375,102.17129802012215,380.7034733382687,61.726274010061076,410.518403335801C21.28125,440.3333333333333,21.28125,451.6666666666667,21.28125,457.3333333333333L21.28125,463"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M279.40625,293.3359334907113L249.14583333333334,315.9466112422594C218.88541666666666,338.5572889938075,158.36458333333334,383.7786444969038,128.10416666666666,411.0559889151186C97.84375,438.3333333333333,97.84375,447.6666666666667,97.84375,452.3333333333333L97.84375,457"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M279.40625,324.18716577540107L261.90625,341.6559714795009C244.40625,359.12477718360077,209.40625,394.06238859180036,191.90625,416.19786096256684C174.40625,438.3333333333333,174.40625,447.6666666666667,174.40625,452.3333333333333L174.40625,457"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M279.40625,386.2527359074953L274.6666666666667,393.37727992291275C269.9270833333333,400.50182393833023,260.4479166666667,414.7509119691651,255.70833333333334,426.5421226512492C250.96875,438.3333333333333,250.96875,447.6666666666667,250.96875,452.3333333333333L250.96875,457"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M338.3285885989011,395L336.45481341575095,400.6666666666667C334.58103823260075,406.3333333333333,330.83348786630035,417.6666666666667,328.9597126831502,428C327.0859375,438.3333333333333,327.0859375,447.6666666666667,327.0859375,452.3333333333333L327.0859375,457"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M402.3125,413L402.3125,415.6666666666667C402.3125,418.3333333333333,402.3125,423.6666666666667,402.3125,432C402.3125,440.3333333333333,402.3125,451.6666666666667,402.3125,457.3333333333333L402.3125,463"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M467.0539320054945,395L468.94989125457874,400.6666666666667C470.84585050366303,406.3333333333333,474.6377690018315,417.6666666666667,476.5337282509158,428C478.4296875,438.3333333333333,478.4296875,447.6666666666667,478.4296875,452.3333333333333L478.4296875,457"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M525.21875,384.1035714285714L530.2552083333334,391.58630952380946C535.2916666666666,399.0690476190476,545.3645833333334,414.03452380952376,550.4010416666666,426.18392857142857C555.4375,438.3333333333333,555.4375,447.6666666666667,555.4375,452.3333333333333L555.4375,457"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M525.21875,325.1493349455865L542.4231770833334,342.45777912132206C559.6276041666666,359.76622329705765,594.0364583333334,394.38311164852877,611.2408854166666,416.35822249093104C628.4453125,438.3333333333333,628.4453125,447.6666666666667,628.4453125,452.3333333333333L628.4453125,457"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M525.21875,295.38850996852045L554.3697916666666,317.6570916404337C583.5208333333334,339.925673312347,641.8229166666666,384.46283665617347,670.9739583333334,411.3980849947534C700.125,438.3333333333333,700.125,447.6666666666667,700.125,452.3333333333333L700.125,457"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M525.21875,276.45350785340315L566.9088541666666,301.8779232111693C608.5989583333334,327.30233856893545,691.9791666666666,378.1511692844677,733.6692708333334,408.2422513089005C775.359375,438.3333333333333,775.359375,447.6666666666667,775.359375,452.3333333333333L775.359375,457"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M279.40625,274.8828836217502L236.38541666666666,300.5690696847918C193.36458333333334,326.2552557478335,107.32291666666667,377.6276278739167,64.30208333333333,408.980480603625C21.28125,440.3333333333333,21.28125,451.6666666666667,21.28125,457.3333333333333L21.28125,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M279.40625,293.3359334907113L249.14583333333334,315.9466112422594C218.88541666666666,338.5572889938075,158.36458333333334,383.7786444969038,128.10416666666666,412.0559889151186C97.84375,440.3333333333333,97.84375,451.6666666666667,97.84375,457.3333333333333L97.84375,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M279.40625,324.18716577540107L261.90625,341.6559714795009C244.40625,359.12477718360077,209.40625,394.06238859180036,191.90625,417.19786096256684C174.40625,440.3333333333333,174.40625,451.6666666666667,174.40625,457.3333333333333L174.40625,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M279.40625,386.2527359074953L274.6666666666667,393.37727992291275C269.9270833333333,400.50182393833023,260.4479166666667,414.7509119691651,255.70833333333334,427.5421226512492C250.96875,440.3333333333333,250.96875,451.6666666666667,250.96875,457.3333333333333L250.96875,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M338.3285885989011,395L336.45481341575095,400.6666666666667C334.58103823260075,406.3333333333333,330.83348786630035,417.6666666666667,328.9597126831502,429C327.0859375,440.3333333333333,327.0859375,451.6666666666667,327.0859375,457.3333333333333L327.0859375,463"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M402.3125,395L402.3125,400.6666666666667C402.3125,406.3333333333333,402.3125,417.6666666666667,402.3125,429C402.3125,440.3333333333333,402.3125,451.6666666666667,402.3125,457.3333333333333L402.3125,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M467.0539320054945,395L468.94989125457874,400.6666666666667C470.84585050366303,406.3333333333333,474.6377690018315,417.6666666666667,476.5337282509158,429C478.4296875,440.3333333333333,478.4296875,451.6666666666667,478.4296875,457.3333333333333L478.4296875,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M525.21875,384.1035714285714L530.2552083333334,391.58630952380946C535.2916666666666,399.0690476190476,545.3645833333334,414.03452380952376,550.4010416666666,427.18392857142857C555.4375,440.3333333333333,555.4375,451.6666666666667,555.4375,457.3333333333333L555.4375,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M525.21875,325.1493349455865L542.4231770833334,342.45777912132206C559.6276041666666,359.76622329705765,594.0364583333334,394.38311164852877,611.2408854166666,417.35822249093104C628.4453125,440.3333333333333,628.4453125,451.6666666666667,628.4453125,457.3333333333333L628.4453125,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M525.21875,295.38850996852045L554.3697916666666,317.6570916404337C583.5208333333334,339.925673312347,641.8229166666666,384.46283665617347,670.9739583333334,412.3980849947534C700.125,440.3333333333333,700.125,451.6666666666667,700.125,457.3333333333333L700.125,463"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M525.21875,276.45350785340315L566.9088541666666,301.8779232111693C608.5989583333334,327.30233856893545,691.9791666666666,378.1511692844677,733.6692708333334,409.2422513089005C775.359375,440.3333333333333,775.359375,451.6666666666667,775.359375,457.3333333333333L775.359375,463"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(21.28125, 429)" class="edgeLabel">
@@ -191,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L3">
+        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L3">
           <g title="A" id="classId-C_0000096355893895780319-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -210,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L5">
+        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L5">
           <g title="B" id="classId-C_0001909425857334087541-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -229,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L7">
+        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L7">
           <g title="C" id="classId-C_0000968176384460064907-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -248,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L9">
+        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L9">
           <g title="D" id="classId-C_0001735599590836186693-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -267,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L11">
+        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L11">
           <g title="E" id="classId-C_0000887960136921844658-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -286,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L13">
+        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L13">
           <g title="F" id="classId-C_0000772719357856231772-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -305,7 +300,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L15">
+        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L15">
           <g title="G" id="classId-C_0000979147885884736437-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -324,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L17">
+        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L17">
           <g title="H" id="classId-C_0001440673301054236675-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -343,7 +338,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L19">
+        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L19">
           <g title="I" id="classId-C_0000109681731550086430-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -362,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L21">
+        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L21">
           <g title="J" id="classId-C_0000338330011969650325-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -381,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L23">
+        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L23">
           <g title="K" id="classId-C_0002179119389830432509-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -400,7 +395,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00005/t00005.cc#L25">
+        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L25">
           <g title="R" id="classId-C_0000630692407373144211-11" class="node default clickable">
             <rect height="387" width="245.8125" y="-193.5" x="-122.90625" class="outer title-state"/>
             <line y2="-163.5" y1="-163.5" x2="122.90625" x1="-122.90625" class="divider"/>
@@ -423,7 +418,7 @@
               </foreignObject>
               <foreignObject transform="translate( -115.40625, -130)" height="18" width="42.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+b : B</span>
+                  <span style="font-style:italic;" class="nodeLabel">+b : B </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, -108)" height="18" width="57.359375">
@@ -433,7 +428,7 @@
               </foreignObject>
               <foreignObject transform="translate( -115.40625, -86)" height="18" width="85.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+d : const D</span>
+                  <span style="font-style:italic;" class="nodeLabel">+d : const D </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, -64)" height="18" width="100.0625">
@@ -463,12 +458,12 @@
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 46)" height="18" width="88.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+j : volatile J</span>
+                  <span style="font-style:italic;" class="nodeLabel">+j : volatile J </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 68)" height="18" width="41.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+k : K</span>
+                  <span style="font-style:italic;" class="nodeLabel">+k : K </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 90)" height="18" width="104.5">
@@ -478,7 +473,7 @@
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 112)" height="18" width="162.328125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+some_int_pointer : int</span>
+                  <span style="font-style:italic;" class="nodeLabel">+some_int_pointer : int </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -115.40625, 134)" height="18" width="230.8125">
diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md
index 60b7e995..3d1aa118 100644
--- a/docs/test_cases/t00006.md
+++ b/docs/test_cases/t00006.md
@@ -96,7 +96,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00006::A",
+      "display_name": "A",
       "id": "989095304444672400",
       "is_abstract": false,
       "is_nested": false,
@@ -118,7 +118,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::B",
+      "display_name": "B",
       "id": "648285260245005311",
       "is_abstract": false,
       "is_nested": false,
@@ -140,7 +140,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::C",
+      "display_name": "C",
       "id": "323304333007297774",
       "is_abstract": false,
       "is_nested": false,
@@ -162,7 +162,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::D",
+      "display_name": "D",
       "id": "1006912399043633492",
       "is_abstract": false,
       "is_nested": false,
@@ -184,7 +184,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::E",
+      "display_name": "E",
       "id": "1092550394020578978",
       "is_abstract": false,
       "is_nested": false,
@@ -206,7 +206,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::F",
+      "display_name": "F",
       "id": "965398761810782236",
       "is_abstract": false,
       "is_nested": false,
@@ -228,7 +228,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::G",
+      "display_name": "G",
       "id": "1764732000887030464",
       "is_abstract": false,
       "is_nested": false,
@@ -250,7 +250,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::H",
+      "display_name": "H",
       "id": "1669285599837552146",
       "is_abstract": false,
       "is_nested": false,
@@ -272,7 +272,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::I",
+      "display_name": "I",
       "id": "2234750598599000377",
       "is_abstract": false,
       "is_nested": false,
@@ -294,7 +294,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::J",
+      "display_name": "J",
       "id": "1335933649375465369",
       "is_abstract": false,
       "is_nested": false,
@@ -316,7 +316,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::K",
+      "display_name": "K",
       "id": "1603190364864080123",
       "is_abstract": false,
       "is_nested": false,
@@ -338,7 +338,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::L",
+      "display_name": "L",
       "id": "305487238408320046",
       "is_abstract": false,
       "is_nested": false,
@@ -360,7 +360,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::M",
+      "display_name": "M",
       "id": "1664744512423723275",
       "is_abstract": false,
       "is_nested": false,
@@ -382,7 +382,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::N",
+      "display_name": "N",
       "id": "950210019792152600",
       "is_abstract": false,
       "is_nested": false,
@@ -404,7 +404,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::NN",
+      "display_name": "NN",
       "id": "1662349735899726224",
       "is_abstract": false,
       "is_nested": false,
@@ -426,7 +426,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::NNN",
+      "display_name": "NNN",
       "id": "1963145075481599858",
       "is_abstract": false,
       "is_nested": false,
@@ -448,7 +448,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::custom_container<T>",
+      "display_name": "custom_container<T>",
       "id": "916380191954937631",
       "is_abstract": false,
       "is_nested": false,
@@ -490,7 +490,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::custom_container<clanguml::t00006::E>",
+      "display_name": "custom_container<E>",
       "id": "50153113082434858",
       "is_abstract": false,
       "is_nested": false,
@@ -519,7 +519,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00006::R",
+      "display_name": "R",
       "id": "303025561016882526",
       "is_abstract": false,
       "is_nested": false,
@@ -698,6 +698,7 @@ public:
     }
   ],
   "name": "t00006_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index 48d68a6b..4ad1613a 100644
--- a/docs/test_cases/t00006_class.svg
+++ b/docs/test_cases/t00006_class.svg
@@ -1,392 +1,324 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="531px" preserveAspectRatio="none" style="width:1415px;height:531px;background:#FFFFFF;" version="1.1" viewBox="0 0 1415 531" width="1415px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="ft0vqd5osqyw7" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000989095304444672400">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000989095304444672400" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="350.4"/>
-        <ellipse cx="22" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,367.5563 C17,370.0563 19.1406,371.8688 22.0625,371.8688 C23.2969,371.8688 24.4688,371.5719 25.2188,371.0563 C25.8281,370.6344 26.1563,370.2125 26.1563,369.8063 C26.1563,369.3375 25.7344,368.9313 25.2344,368.9313 C25,368.9313 24.7813,369.0094 24.5781,369.2125 C24.1406,369.65 24.1406,369.65 23.9688,369.7438 C23.5156,369.9781 22.875,370.1188 22.1094,370.1188 C20.1094,370.1188 18.8281,369.1031 18.8281,367.525 L18.8281,366.4781 C18.8281,364.775 20.0469,363.5719 21.75,363.5719 C22.3281,363.5719 22.9063,363.7125 23.375,363.9625 C23.8438,364.2281 24.0156,364.4156 24.0781,364.775 C24.2031,365.4469 24.4531,365.6969 24.9844,365.6969 C25.2656,365.6969 25.5469,365.5563 25.7344,365.3375 C25.8594,365.1656 25.9063,364.9938 25.9063,364.5563 L25.9063,363.1969 C25.9063,362.775 25.8906,362.6344 25.7656,362.4625 C25.5938,362.2125 25.3125,362.0563 24.9844,362.0563 C24.6719,362.0563 24.4688,362.1656 24.25,362.4313 C23.0781,361.9313 22.6406,361.8219 21.6875,361.8219 C19.0156,361.8219 17,363.8375 17,366.4625 L17,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="371.006">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
+      <ellipse cx="21" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,320.6406 Q23.3906,320.9375 22.75,321.0781 Q22.1094,321.2344 21.4063,321.2344 Q18.9063,321.2344 17.5781,319.5938 Q16.2656,317.9375 16.2656,314.8125 Q16.2656,311.6875 17.5781,310.0313 Q18.9063,308.375 21.4063,308.375 Q22.1094,308.375 22.75,308.5313 Q23.4063,308.6875 23.9688,308.9844 L23.9688,311.7031 Q23.3438,311.125 22.75,310.8594 Q22.1563,310.5781 21.5313,310.5781 Q20.1875,310.5781 19.5,311.6563 Q18.8125,312.7188 18.8125,314.8125 Q18.8125,316.9063 19.5,317.9844 Q20.1875,319.0469 21.5313,319.0469 Q22.1563,319.0469 22.75,318.7813 Q23.3438,318.5 23.9688,317.9219 L23.9688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="319.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000648285260245005311">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000648285260245005311" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="350.4"/>
-        <ellipse cx="98" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93,367.5563 C93,370.0563 95.1406,371.8688 98.0625,371.8688 C99.2969,371.8688 100.4688,371.5719 101.2188,371.0563 C101.8281,370.6344 102.1563,370.2125 102.1563,369.8063 C102.1563,369.3375 101.7344,368.9313 101.2344,368.9313 C101,368.9313 100.7813,369.0094 100.5781,369.2125 C100.1406,369.65 100.1406,369.65 99.9688,369.7438 C99.5156,369.9781 98.875,370.1188 98.1094,370.1188 C96.1094,370.1188 94.8281,369.1031 94.8281,367.525 L94.8281,366.4781 C94.8281,364.775 96.0469,363.5719 97.75,363.5719 C98.3281,363.5719 98.9063,363.7125 99.375,363.9625 C99.8438,364.2281 100.0156,364.4156 100.0781,364.775 C100.2031,365.4469 100.4531,365.6969 100.9844,365.6969 C101.2656,365.6969 101.5469,365.5563 101.7344,365.3375 C101.8594,365.1656 101.9063,364.9938 101.9063,364.5563 L101.9063,363.1969 C101.9063,362.775 101.8906,362.6344 101.7656,362.4625 C101.5938,362.2125 101.3125,362.0563 100.9844,362.0563 C100.6719,362.0563 100.4688,362.1656 100.25,362.4313 C99.0781,361.9313 98.6406,361.8219 97.6875,361.8219 C95.0156,361.8219 93,363.8375 93,366.4625 L93,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="371.006">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
+      <ellipse cx="96" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M98.9688,320.6406 Q98.3906,320.9375 97.75,321.0781 Q97.1094,321.2344 96.4063,321.2344 Q93.9063,321.2344 92.5781,319.5938 Q91.2656,317.9375 91.2656,314.8125 Q91.2656,311.6875 92.5781,310.0313 Q93.9063,308.375 96.4063,308.375 Q97.1094,308.375 97.75,308.5313 Q98.4063,308.6875 98.9688,308.9844 L98.9688,311.7031 Q98.3438,311.125 97.75,310.8594 Q97.1563,310.5781 96.5313,310.5781 Q95.1875,310.5781 94.5,311.6563 Q93.8125,312.7188 93.8125,314.8125 Q93.8125,316.9063 94.5,317.9844 Q95.1875,319.0469 96.5313,319.0469 Q97.1563,319.0469 97.75,318.7813 Q98.3438,318.5 98.9688,317.9219 L98.9688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="319.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000323304333007297774">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000323304333007297774" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="350.4"/>
-        <ellipse cx="173.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M168.5,367.5563 C168.5,370.0563 170.6406,371.8688 173.5625,371.8688 C174.7969,371.8688 175.9688,371.5719 176.7188,371.0563 C177.3281,370.6344 177.6563,370.2125 177.6563,369.8063 C177.6563,369.3375 177.2344,368.9313 176.7344,368.9313 C176.5,368.9313 176.2813,369.0094 176.0781,369.2125 C175.6406,369.65 175.6406,369.65 175.4688,369.7438 C175.0156,369.9781 174.375,370.1188 173.6094,370.1188 C171.6094,370.1188 170.3281,369.1031 170.3281,367.525 L170.3281,366.4781 C170.3281,364.775 171.5469,363.5719 173.25,363.5719 C173.8281,363.5719 174.4063,363.7125 174.875,363.9625 C175.3438,364.2281 175.5156,364.4156 175.5781,364.775 C175.7031,365.4469 175.9531,365.6969 176.4844,365.6969 C176.7656,365.6969 177.0469,365.5563 177.2344,365.3375 C177.3594,365.1656 177.4063,364.9938 177.4063,364.5563 L177.4063,363.1969 C177.4063,362.775 177.3906,362.6344 177.2656,362.4625 C177.0938,362.2125 176.8125,362.0563 176.4844,362.0563 C176.1719,362.0563 175.9688,362.1656 175.75,362.4313 C174.5781,361.9313 174.1406,361.8219 173.1875,361.8219 C170.5156,361.8219 168.5,363.8375 168.5,366.4625 L168.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="371.006">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
+      <ellipse cx="171" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.9688,320.6406 Q173.3906,320.9375 172.75,321.0781 Q172.1094,321.2344 171.4063,321.2344 Q168.9063,321.2344 167.5781,319.5938 Q166.2656,317.9375 166.2656,314.8125 Q166.2656,311.6875 167.5781,310.0313 Q168.9063,308.375 171.4063,308.375 Q172.1094,308.375 172.75,308.5313 Q173.4063,308.6875 173.9688,308.9844 L173.9688,311.7031 Q173.3438,311.125 172.75,310.8594 Q172.1563,310.5781 171.5313,310.5781 Q170.1875,310.5781 169.5,311.6563 Q168.8125,312.7188 168.8125,314.8125 Q168.8125,316.9063 169.5,317.9844 Q170.1875,319.0469 171.5313,319.0469 Q172.1563,319.0469 172.75,318.7813 Q173.3438,318.5 173.9688,317.9219 L173.9688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="319.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001006912399043633492">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001006912399043633492" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="235.5" y="350.4"/>
-        <ellipse cx="250.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M245.5,367.5563 C245.5,370.0563 247.6406,371.8688 250.5625,371.8688 C251.7969,371.8688 252.9688,371.5719 253.7188,371.0563 C254.3281,370.6344 254.6563,370.2125 254.6563,369.8063 C254.6563,369.3375 254.2344,368.9313 253.7344,368.9313 C253.5,368.9313 253.2813,369.0094 253.0781,369.2125 C252.6406,369.65 252.6406,369.65 252.4688,369.7438 C252.0156,369.9781 251.375,370.1188 250.6094,370.1188 C248.6094,370.1188 247.3281,369.1031 247.3281,367.525 L247.3281,366.4781 C247.3281,364.775 248.5469,363.5719 250.25,363.5719 C250.8281,363.5719 251.4063,363.7125 251.875,363.9625 C252.3438,364.2281 252.5156,364.4156 252.5781,364.775 C252.7031,365.4469 252.9531,365.6969 253.4844,365.6969 C253.7656,365.6969 254.0469,365.5563 254.2344,365.3375 C254.3594,365.1656 254.4063,364.9938 254.4063,364.5563 L254.4063,363.1969 C254.4063,362.775 254.3906,362.6344 254.2656,362.4625 C254.0938,362.2125 253.8125,362.0563 253.4844,362.0563 C253.1719,362.0563 252.9688,362.1656 252.75,362.4313 C251.5781,361.9313 251.1406,361.8219 250.1875,361.8219 C247.5156,361.8219 245.5,363.8375 245.5,366.4625 L245.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="264.5" y="371.006">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
+      <ellipse cx="246.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M249.4688,320.6406 Q248.8906,320.9375 248.25,321.0781 Q247.6094,321.2344 246.9063,321.2344 Q244.4063,321.2344 243.0781,319.5938 Q241.7656,317.9375 241.7656,314.8125 Q241.7656,311.6875 243.0781,310.0313 Q244.4063,308.375 246.9063,308.375 Q247.6094,308.375 248.25,308.5313 Q248.9063,308.6875 249.4688,308.9844 L249.4688,311.7031 Q248.8438,311.125 248.25,310.8594 Q247.6563,310.5781 247.0313,310.5781 Q245.6875,310.5781 245,311.6563 Q244.3125,312.7188 244.3125,314.8125 Q244.3125,316.9063 245,317.9844 Q245.6875,319.0469 247.0313,319.0469 Q247.6563,319.0469 248.25,318.7813 Q248.8438,318.5 249.4688,317.9219 L249.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="319.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001092550394020578978">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001092550394020578978" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1171" y="467.8"/>
-        <ellipse cx="1186" cy="483.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1181,484.9563 C1181,487.4563 1183.1406,489.2688 1186.0625,489.2688 C1187.2969,489.2688 1188.4688,488.9719 1189.2188,488.4563 C1189.8281,488.0344 1190.1563,487.6125 1190.1563,487.2063 C1190.1563,486.7375 1189.7344,486.3313 1189.2344,486.3313 C1189,486.3313 1188.7813,486.4094 1188.5781,486.6125 C1188.1406,487.05 1188.1406,487.05 1187.9688,487.1438 C1187.5156,487.3781 1186.875,487.5188 1186.1094,487.5188 C1184.1094,487.5188 1182.8281,486.5031 1182.8281,484.925 L1182.8281,483.8781 C1182.8281,482.175 1184.0469,480.9719 1185.75,480.9719 C1186.3281,480.9719 1186.9063,481.1125 1187.375,481.3625 C1187.8438,481.6281 1188.0156,481.8156 1188.0781,482.175 C1188.2031,482.8469 1188.4531,483.0969 1188.9844,483.0969 C1189.2656,483.0969 1189.5469,482.9563 1189.7344,482.7375 C1189.8594,482.5656 1189.9063,482.3938 1189.9063,481.9563 L1189.9063,480.5969 C1189.9063,480.175 1189.8906,480.0344 1189.7656,479.8625 C1189.5938,479.6125 1189.3125,479.4563 1188.9844,479.4563 C1188.6719,479.4563 1188.4688,479.5656 1188.25,479.8313 C1187.0781,479.3313 1186.6406,479.2219 1185.6875,479.2219 C1183.0156,479.2219 1181,481.2375 1181,483.8625 L1181,484.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1200" y="488.406">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1172" x2="1211" y1="499.8" y2="499.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1172" x2="1211" y1="507.8" y2="507.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
+      <ellipse cx="1161" cy="430.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1163.9688,436.1406 Q1163.3906,436.4375 1162.75,436.5781 Q1162.1094,436.7344 1161.4063,436.7344 Q1158.9063,436.7344 1157.5781,435.0938 Q1156.2656,433.4375 1156.2656,430.3125 Q1156.2656,427.1875 1157.5781,425.5313 Q1158.9063,423.875 1161.4063,423.875 Q1162.1094,423.875 1162.75,424.0313 Q1163.4063,424.1875 1163.9688,424.4844 L1163.9688,427.2031 Q1163.3438,426.625 1162.75,426.3594 Q1162.1563,426.0781 1161.5313,426.0781 Q1160.1875,426.0781 1159.5,427.1563 Q1158.8125,428.2188 1158.8125,430.3125 Q1158.8125,432.4063 1159.5,433.4844 Q1160.1875,434.5469 1161.5313,434.5469 Q1162.1563,434.5469 1162.75,434.2813 Q1163.3438,434 1163.9688,433.4219 L1163.9688,436.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1175" y="434.6543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="446.5" y2="446.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="454.5" y2="454.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000965398761810782236">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000965398761810782236" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="312" y="350.4"/>
-        <ellipse cx="327" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M322,367.5563 C322,370.0563 324.1406,371.8688 327.0625,371.8688 C328.2969,371.8688 329.4688,371.5719 330.2188,371.0563 C330.8281,370.6344 331.1563,370.2125 331.1563,369.8063 C331.1563,369.3375 330.7344,368.9313 330.2344,368.9313 C330,368.9313 329.7813,369.0094 329.5781,369.2125 C329.1406,369.65 329.1406,369.65 328.9688,369.7438 C328.5156,369.9781 327.875,370.1188 327.1094,370.1188 C325.1094,370.1188 323.8281,369.1031 323.8281,367.525 L323.8281,366.4781 C323.8281,364.775 325.0469,363.5719 326.75,363.5719 C327.3281,363.5719 327.9063,363.7125 328.375,363.9625 C328.8438,364.2281 329.0156,364.4156 329.0781,364.775 C329.2031,365.4469 329.4531,365.6969 329.9844,365.6969 C330.2656,365.6969 330.5469,365.5563 330.7344,365.3375 C330.8594,365.1656 330.9063,364.9938 330.9063,364.5563 L330.9063,363.1969 C330.9063,362.775 330.8906,362.6344 330.7656,362.4625 C330.5938,362.2125 330.3125,362.0563 329.9844,362.0563 C329.6719,362.0563 329.4688,362.1656 329.25,362.4313 C328.0781,361.9313 327.6406,361.8219 326.6875,361.8219 C324.0156,361.8219 322,363.8375 322,366.4625 L322,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="341" y="371.006">F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
+      <ellipse cx="322.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M325.4688,320.6406 Q324.8906,320.9375 324.25,321.0781 Q323.6094,321.2344 322.9063,321.2344 Q320.4063,321.2344 319.0781,319.5938 Q317.7656,317.9375 317.7656,314.8125 Q317.7656,311.6875 319.0781,310.0313 Q320.4063,308.375 322.9063,308.375 Q323.6094,308.375 324.25,308.5313 Q324.9063,308.6875 325.4688,308.9844 L325.4688,311.7031 Q324.8438,311.125 324.25,310.8594 Q323.6563,310.5781 323.0313,310.5781 Q321.6875,310.5781 321,311.6563 Q320.3125,312.7188 320.3125,314.8125 Q320.3125,316.9063 321,317.9844 Q321.6875,319.0469 323.0313,319.0469 Q323.6563,319.0469 324.25,318.7813 Q324.8438,318.5 325.4688,317.9219 L325.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="336.5" y="319.1543">F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0001764732000887030464">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0001764732000887030464" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="388" y="350.4"/>
-        <ellipse cx="403" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M398,367.5563 C398,370.0563 400.1406,371.8688 403.0625,371.8688 C404.2969,371.8688 405.4688,371.5719 406.2188,371.0563 C406.8281,370.6344 407.1563,370.2125 407.1563,369.8063 C407.1563,369.3375 406.7344,368.9313 406.2344,368.9313 C406,368.9313 405.7813,369.0094 405.5781,369.2125 C405.1406,369.65 405.1406,369.65 404.9688,369.7438 C404.5156,369.9781 403.875,370.1188 403.1094,370.1188 C401.1094,370.1188 399.8281,369.1031 399.8281,367.525 L399.8281,366.4781 C399.8281,364.775 401.0469,363.5719 402.75,363.5719 C403.3281,363.5719 403.9063,363.7125 404.375,363.9625 C404.8438,364.2281 405.0156,364.4156 405.0781,364.775 C405.2031,365.4469 405.4531,365.6969 405.9844,365.6969 C406.2656,365.6969 406.5469,365.5563 406.7344,365.3375 C406.8594,365.1656 406.9063,364.9938 406.9063,364.5563 L406.9063,363.1969 C406.9063,362.775 406.8906,362.6344 406.7656,362.4625 C406.5938,362.2125 406.3125,362.0563 405.9844,362.0563 C405.6719,362.0563 405.4688,362.1656 405.25,362.4313 C404.0781,361.9313 403.6406,361.8219 402.6875,361.8219 C400.0156,361.8219 398,363.8375 398,366.4625 L398,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="417" y="371.006">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="430" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="430" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
+      <ellipse cx="396.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M399.4688,320.6406 Q398.8906,320.9375 398.25,321.0781 Q397.6094,321.2344 396.9063,321.2344 Q394.4063,321.2344 393.0781,319.5938 Q391.7656,317.9375 391.7656,314.8125 Q391.7656,311.6875 393.0781,310.0313 Q394.4063,308.375 396.9063,308.375 Q397.6094,308.375 398.25,308.5313 Q398.9063,308.6875 399.4688,308.9844 L399.4688,311.7031 Q398.8438,311.125 398.25,310.8594 Q397.6563,310.5781 397.0313,310.5781 Q395.6875,310.5781 395,311.6563 Q394.3125,312.7188 394.3125,314.8125 Q394.3125,316.9063 395,317.9844 Q395.6875,319.0469 397.0313,319.0469 Q397.6563,319.0469 398.25,318.7813 Q398.8438,318.5 399.4688,317.9219 L399.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="410.5" y="319.1543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <g id="elem_C_0001669285599837552146">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001669285599837552146" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="465.5" y="350.4"/>
-        <ellipse cx="480.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M475.5,367.5563 C475.5,370.0563 477.6406,371.8688 480.5625,371.8688 C481.7969,371.8688 482.9688,371.5719 483.7188,371.0563 C484.3281,370.6344 484.6563,370.2125 484.6563,369.8063 C484.6563,369.3375 484.2344,368.9313 483.7344,368.9313 C483.5,368.9313 483.2813,369.0094 483.0781,369.2125 C482.6406,369.65 482.6406,369.65 482.4688,369.7438 C482.0156,369.9781 481.375,370.1188 480.6094,370.1188 C478.6094,370.1188 477.3281,369.1031 477.3281,367.525 L477.3281,366.4781 C477.3281,364.775 478.5469,363.5719 480.25,363.5719 C480.8281,363.5719 481.4063,363.7125 481.875,363.9625 C482.3438,364.2281 482.5156,364.4156 482.5781,364.775 C482.7031,365.4469 482.9531,365.6969 483.4844,365.6969 C483.7656,365.6969 484.0469,365.5563 484.2344,365.3375 C484.3594,365.1656 484.4063,364.9938 484.4063,364.5563 L484.4063,363.1969 C484.4063,362.775 484.3906,362.6344 484.2656,362.4625 C484.0938,362.2125 483.8125,362.0563 483.4844,362.0563 C483.1719,362.0563 482.9688,362.1656 482.75,362.4313 C481.5781,361.9313 481.1406,361.8219 480.1875,361.8219 C477.5156,361.8219 475.5,363.8375 475.5,366.4625 L475.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="494.5" y="371.006">H</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="466.5" x2="506.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="466.5" x2="506.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
+      <ellipse cx="472.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M475.4688,320.6406 Q474.8906,320.9375 474.25,321.0781 Q473.6094,321.2344 472.9063,321.2344 Q470.4063,321.2344 469.0781,319.5938 Q467.7656,317.9375 467.7656,314.8125 Q467.7656,311.6875 469.0781,310.0313 Q470.4063,308.375 472.9063,308.375 Q473.6094,308.375 474.25,308.5313 Q474.9063,308.6875 475.4688,308.9844 L475.4688,311.7031 Q474.8438,311.125 474.25,310.8594 Q473.6563,310.5781 473.0313,310.5781 Q471.6875,310.5781 471,311.6563 Q470.3125,312.7188 470.3125,314.8125 Q470.3125,316.9063 471,317.9844 Q471.6875,319.0469 473.0313,319.0469 Q473.6563,319.0469 474.25,318.7813 Q474.8438,318.5 475.4688,317.9219 L475.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="319.1543">H</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <g id="elem_C_0002234750598599000377">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0002234750598599000377" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="542.5" y="350.4"/>
-        <ellipse cx="557.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M552.5,367.5563 C552.5,370.0563 554.6406,371.8688 557.5625,371.8688 C558.7969,371.8688 559.9688,371.5719 560.7188,371.0563 C561.3281,370.6344 561.6563,370.2125 561.6563,369.8063 C561.6563,369.3375 561.2344,368.9313 560.7344,368.9313 C560.5,368.9313 560.2813,369.0094 560.0781,369.2125 C559.6406,369.65 559.6406,369.65 559.4688,369.7438 C559.0156,369.9781 558.375,370.1188 557.6094,370.1188 C555.6094,370.1188 554.3281,369.1031 554.3281,367.525 L554.3281,366.4781 C554.3281,364.775 555.5469,363.5719 557.25,363.5719 C557.8281,363.5719 558.4063,363.7125 558.875,363.9625 C559.3438,364.2281 559.5156,364.4156 559.5781,364.775 C559.7031,365.4469 559.9531,365.6969 560.4844,365.6969 C560.7656,365.6969 561.0469,365.5563 561.2344,365.3375 C561.3594,365.1656 561.4063,364.9938 561.4063,364.5563 L561.4063,363.1969 C561.4063,362.775 561.3906,362.6344 561.2656,362.4625 C561.0938,362.2125 560.8125,362.0563 560.4844,362.0563 C560.1719,362.0563 559.9688,362.1656 559.75,362.4313 C558.5781,361.9313 558.1406,361.8219 557.1875,361.8219 C554.5156,361.8219 552.5,363.8375 552.5,366.4625 L552.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="571.5" y="371.006">I</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="543.5" x2="577.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="543.5" x2="577.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
+      <ellipse cx="548.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M551.4688,320.6406 Q550.8906,320.9375 550.25,321.0781 Q549.6094,321.2344 548.9063,321.2344 Q546.4063,321.2344 545.0781,319.5938 Q543.7656,317.9375 543.7656,314.8125 Q543.7656,311.6875 545.0781,310.0313 Q546.4063,308.375 548.9063,308.375 Q549.6094,308.375 550.25,308.5313 Q550.9063,308.6875 551.4688,308.9844 L551.4688,311.7031 Q550.8438,311.125 550.25,310.8594 Q549.6563,310.5781 549.0313,310.5781 Q547.6875,310.5781 547,311.6563 Q546.3125,312.7188 546.3125,314.8125 Q546.3125,316.9063 547,317.9844 Q547.6875,319.0469 549.0313,319.0469 Q549.6563,319.0469 550.25,318.7813 Q550.8438,318.5 551.4688,317.9219 L551.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="562.5" y="319.1543">I</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <g id="elem_C_0001335933649375465369">
-        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0001335933649375465369" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="614" y="350.4"/>
-        <ellipse cx="629" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M624,367.5563 C624,370.0563 626.1406,371.8688 629.0625,371.8688 C630.2969,371.8688 631.4688,371.5719 632.2188,371.0563 C632.8281,370.6344 633.1563,370.2125 633.1563,369.8063 C633.1563,369.3375 632.7344,368.9313 632.2344,368.9313 C632,368.9313 631.7813,369.0094 631.5781,369.2125 C631.1406,369.65 631.1406,369.65 630.9688,369.7438 C630.5156,369.9781 629.875,370.1188 629.1094,370.1188 C627.1094,370.1188 625.8281,369.1031 625.8281,367.525 L625.8281,366.4781 C625.8281,364.775 627.0469,363.5719 628.75,363.5719 C629.3281,363.5719 629.9063,363.7125 630.375,363.9625 C630.8438,364.2281 631.0156,364.4156 631.0781,364.775 C631.2031,365.4469 631.4531,365.6969 631.9844,365.6969 C632.2656,365.6969 632.5469,365.5563 632.7344,365.3375 C632.8594,365.1656 632.9063,364.9938 632.9063,364.5563 L632.9063,363.1969 C632.9063,362.775 632.8906,362.6344 632.7656,362.4625 C632.5938,362.2125 632.3125,362.0563 631.9844,362.0563 C631.6719,362.0563 631.4688,362.1656 631.25,362.4313 C630.0781,361.9313 629.6406,361.8219 628.6875,361.8219 C626.0156,361.8219 624,363.8375 624,366.4625 L624,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="643" y="371.006">J</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="652" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="652" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
+      <ellipse cx="618.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M621.4688,320.6406 Q620.8906,320.9375 620.25,321.0781 Q619.6094,321.2344 618.9063,321.2344 Q616.4063,321.2344 615.0781,319.5938 Q613.7656,317.9375 613.7656,314.8125 Q613.7656,311.6875 615.0781,310.0313 Q616.4063,308.375 618.9063,308.375 Q619.6094,308.375 620.25,308.5313 Q620.9063,308.6875 621.4688,308.9844 L621.4688,311.7031 Q620.8438,311.125 620.25,310.8594 Q619.6563,310.5781 619.0313,310.5781 Q617.6875,310.5781 617,311.6563 Q616.3125,312.7188 616.3125,314.8125 Q616.3125,316.9063 617,317.9844 Q617.6875,319.0469 619.0313,319.0469 Q619.6563,319.0469 620.25,318.7813 Q620.8438,318.5 621.4688,317.9219 L621.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="632.5" y="319.1543">J</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <g id="elem_C_0001603190364864080123">
-        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0001603190364864080123" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="688" y="350.4"/>
-        <ellipse cx="703" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M698,367.5563 C698,370.0563 700.1406,371.8688 703.0625,371.8688 C704.2969,371.8688 705.4688,371.5719 706.2188,371.0563 C706.8281,370.6344 707.1563,370.2125 707.1563,369.8063 C707.1563,369.3375 706.7344,368.9313 706.2344,368.9313 C706,368.9313 705.7813,369.0094 705.5781,369.2125 C705.1406,369.65 705.1406,369.65 704.9688,369.7438 C704.5156,369.9781 703.875,370.1188 703.1094,370.1188 C701.1094,370.1188 699.8281,369.1031 699.8281,367.525 L699.8281,366.4781 C699.8281,364.775 701.0469,363.5719 702.75,363.5719 C703.3281,363.5719 703.9063,363.7125 704.375,363.9625 C704.8438,364.2281 705.0156,364.4156 705.0781,364.775 C705.2031,365.4469 705.4531,365.6969 705.9844,365.6969 C706.2656,365.6969 706.5469,365.5563 706.7344,365.3375 C706.8594,365.1656 706.9063,364.9938 706.9063,364.5563 L706.9063,363.1969 C706.9063,362.775 706.8906,362.6344 706.7656,362.4625 C706.5938,362.2125 706.3125,362.0563 705.9844,362.0563 C705.6719,362.0563 705.4688,362.1656 705.25,362.4313 C704.0781,361.9313 703.6406,361.8219 702.6875,361.8219 C700.0156,361.8219 698,363.8375 698,366.4625 L698,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="717" y="371.006">K</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="689" x2="728" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="689" x2="728" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
+      <ellipse cx="688.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M691.4688,320.6406 Q690.8906,320.9375 690.25,321.0781 Q689.6094,321.2344 688.9063,321.2344 Q686.4063,321.2344 685.0781,319.5938 Q683.7656,317.9375 683.7656,314.8125 Q683.7656,311.6875 685.0781,310.0313 Q686.4063,308.375 688.9063,308.375 Q689.6094,308.375 690.25,308.5313 Q690.9063,308.6875 691.4688,308.9844 L691.4688,311.7031 Q690.8438,311.125 690.25,310.8594 Q689.6563,310.5781 689.0313,310.5781 Q687.6875,310.5781 687,311.6563 Q686.3125,312.7188 686.3125,314.8125 Q686.3125,316.9063 687,317.9844 Q687.6875,319.0469 689.0313,319.0469 Q689.6563,319.0469 690.25,318.7813 Q690.8438,318.5 691.4688,317.9219 L691.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="702.5" y="319.1543">K</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <g id="elem_C_0000305487238408320046">
-        <rect codeLine="46" fill="#F1F1F1" height="48" id="C_0000305487238408320046" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="764.5" y="350.4"/>
-        <ellipse cx="779.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M774.5,367.5563 C774.5,370.0563 776.6406,371.8688 779.5625,371.8688 C780.7969,371.8688 781.9688,371.5719 782.7188,371.0563 C783.3281,370.6344 783.6563,370.2125 783.6563,369.8063 C783.6563,369.3375 783.2344,368.9313 782.7344,368.9313 C782.5,368.9313 782.2813,369.0094 782.0781,369.2125 C781.6406,369.65 781.6406,369.65 781.4688,369.7438 C781.0156,369.9781 780.375,370.1188 779.6094,370.1188 C777.6094,370.1188 776.3281,369.1031 776.3281,367.525 L776.3281,366.4781 C776.3281,364.775 777.5469,363.5719 779.25,363.5719 C779.8281,363.5719 780.4063,363.7125 780.875,363.9625 C781.3438,364.2281 781.5156,364.4156 781.5781,364.775 C781.7031,365.4469 781.9531,365.6969 782.4844,365.6969 C782.7656,365.6969 783.0469,365.5563 783.2344,365.3375 C783.3594,365.1656 783.4063,364.9938 783.4063,364.5563 L783.4063,363.1969 C783.4063,362.775 783.3906,362.6344 783.2656,362.4625 C783.0938,362.2125 782.8125,362.0563 782.4844,362.0563 C782.1719,362.0563 781.9688,362.1656 781.75,362.4313 C780.5781,361.9313 780.1406,361.8219 779.1875,361.8219 C776.5156,361.8219 774.5,363.8375 774.5,366.4625 L774.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="793.5" y="371.006">L</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="765.5" x2="803.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="765.5" x2="803.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
+      <ellipse cx="763" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M765.9688,320.6406 Q765.3906,320.9375 764.75,321.0781 Q764.1094,321.2344 763.4063,321.2344 Q760.9063,321.2344 759.5781,319.5938 Q758.2656,317.9375 758.2656,314.8125 Q758.2656,311.6875 759.5781,310.0313 Q760.9063,308.375 763.4063,308.375 Q764.1094,308.375 764.75,308.5313 Q765.4063,308.6875 765.9688,308.9844 L765.9688,311.7031 Q765.3438,311.125 764.75,310.8594 Q764.1563,310.5781 763.5313,310.5781 Q762.1875,310.5781 761.5,311.6563 Q760.8125,312.7188 760.8125,314.8125 Q760.8125,316.9063 761.5,317.9844 Q762.1875,319.0469 763.5313,319.0469 Q764.1563,319.0469 764.75,318.7813 Q765.3438,318.5 765.9688,317.9219 L765.9688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="6" x="777" y="319.1543">L</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <g id="elem_C_0001664744512423723275">
-        <rect codeLine="50" fill="#F1F1F1" height="48" id="C_0001664744512423723275" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="839.5" y="350.4"/>
-        <ellipse cx="854.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M849.5,367.5563 C849.5,370.0563 851.6406,371.8688 854.5625,371.8688 C855.7969,371.8688 856.9688,371.5719 857.7188,371.0563 C858.3281,370.6344 858.6563,370.2125 858.6563,369.8063 C858.6563,369.3375 858.2344,368.9313 857.7344,368.9313 C857.5,368.9313 857.2813,369.0094 857.0781,369.2125 C856.6406,369.65 856.6406,369.65 856.4688,369.7438 C856.0156,369.9781 855.375,370.1188 854.6094,370.1188 C852.6094,370.1188 851.3281,369.1031 851.3281,367.525 L851.3281,366.4781 C851.3281,364.775 852.5469,363.5719 854.25,363.5719 C854.8281,363.5719 855.4063,363.7125 855.875,363.9625 C856.3438,364.2281 856.5156,364.4156 856.5781,364.775 C856.7031,365.4469 856.9531,365.6969 857.4844,365.6969 C857.7656,365.6969 858.0469,365.5563 858.2344,365.3375 C858.3594,365.1656 858.4063,364.9938 858.4063,364.5563 L858.4063,363.1969 C858.4063,362.775 858.3906,362.6344 858.2656,362.4625 C858.0938,362.2125 857.8125,362.0563 857.4844,362.0563 C857.1719,362.0563 856.9688,362.1656 856.75,362.4313 C855.5781,361.9313 855.1406,361.8219 854.1875,361.8219 C851.5156,361.8219 849.5,363.8375 849.5,366.4625 L849.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12" x="868.5" y="371.006">M</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="840.5" x2="882.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="840.5" x2="882.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
+      <ellipse cx="836" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M838.9688,320.6406 Q838.3906,320.9375 837.75,321.0781 Q837.1094,321.2344 836.4063,321.2344 Q833.9063,321.2344 832.5781,319.5938 Q831.2656,317.9375 831.2656,314.8125 Q831.2656,311.6875 832.5781,310.0313 Q833.9063,308.375 836.4063,308.375 Q837.1094,308.375 837.75,308.5313 Q838.4063,308.6875 838.9688,308.9844 L838.9688,311.7031 Q838.3438,311.125 837.75,310.8594 Q837.1563,310.5781 836.5313,310.5781 Q835.1875,310.5781 834.5,311.6563 Q833.8125,312.7188 833.8125,314.8125 Q833.8125,316.9063 834.5,317.9844 Q835.1875,319.0469 836.5313,319.0469 Q837.1563,319.0469 837.75,318.7813 Q838.3438,318.5 838.9688,317.9219 L838.9688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="10" x="850" y="319.1543">M</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <g id="elem_C_0000950210019792152600">
-        <rect codeLine="54" fill="#F1F1F1" height="48" id="C_0000950210019792152600" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="918.5" y="350.4"/>
-        <ellipse cx="933.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M928.5,367.5563 C928.5,370.0563 930.6406,371.8688 933.5625,371.8688 C934.7969,371.8688 935.9688,371.5719 936.7188,371.0563 C937.3281,370.6344 937.6563,370.2125 937.6563,369.8063 C937.6563,369.3375 937.2344,368.9313 936.7344,368.9313 C936.5,368.9313 936.2813,369.0094 936.0781,369.2125 C935.6406,369.65 935.6406,369.65 935.4688,369.7438 C935.0156,369.9781 934.375,370.1188 933.6094,370.1188 C931.6094,370.1188 930.3281,369.1031 930.3281,367.525 L930.3281,366.4781 C930.3281,364.775 931.5469,363.5719 933.25,363.5719 C933.8281,363.5719 934.4063,363.7125 934.875,363.9625 C935.3438,364.2281 935.5156,364.4156 935.5781,364.775 C935.7031,365.4469 935.9531,365.6969 936.4844,365.6969 C936.7656,365.6969 937.0469,365.5563 937.2344,365.3375 C937.3594,365.1656 937.4063,364.9938 937.4063,364.5563 L937.4063,363.1969 C937.4063,362.775 937.3906,362.6344 937.2656,362.4625 C937.0938,362.2125 936.8125,362.0563 936.4844,362.0563 C936.1719,362.0563 935.9688,362.1656 935.75,362.4313 C934.5781,361.9313 934.1406,361.8219 933.1875,361.8219 C930.5156,361.8219 928.5,363.8375 928.5,366.4625 L928.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="947.5" y="371.006">N</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="919.5" x2="959.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="919.5" x2="959.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
+      <ellipse cx="913.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M916.4688,320.6406 Q915.8906,320.9375 915.25,321.0781 Q914.6094,321.2344 913.9063,321.2344 Q911.4063,321.2344 910.0781,319.5938 Q908.7656,317.9375 908.7656,314.8125 Q908.7656,311.6875 910.0781,310.0313 Q911.4063,308.375 913.9063,308.375 Q914.6094,308.375 915.25,308.5313 Q915.9063,308.6875 916.4688,308.9844 L916.4688,311.7031 Q915.8438,311.125 915.25,310.8594 Q914.6563,310.5781 914.0313,310.5781 Q912.6875,310.5781 912,311.6563 Q911.3125,312.7188 911.3125,314.8125 Q911.3125,316.9063 912,317.9844 Q912.6875,319.0469 914.0313,319.0469 Q914.6563,319.0469 915.25,318.7813 Q915.8438,318.5 916.4688,317.9219 L916.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="927.5" y="319.1543">N</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <g id="elem_C_0001662349735899726224">
-        <rect codeLine="58" fill="#F1F1F1" height="48" id="C_0001662349735899726224" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="52" x="995.5" y="350.4"/>
-        <ellipse cx="1010.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1005.5,367.5563 C1005.5,370.0563 1007.6406,371.8688 1010.5625,371.8688 C1011.7969,371.8688 1012.9688,371.5719 1013.7188,371.0563 C1014.3281,370.6344 1014.6563,370.2125 1014.6563,369.8063 C1014.6563,369.3375 1014.2344,368.9313 1013.7344,368.9313 C1013.5,368.9313 1013.2813,369.0094 1013.0781,369.2125 C1012.6406,369.65 1012.6406,369.65 1012.4688,369.7438 C1012.0156,369.9781 1011.375,370.1188 1010.6094,370.1188 C1008.6094,370.1188 1007.3281,369.1031 1007.3281,367.525 L1007.3281,366.4781 C1007.3281,364.775 1008.5469,363.5719 1010.25,363.5719 C1010.8281,363.5719 1011.4063,363.7125 1011.875,363.9625 C1012.3438,364.2281 1012.5156,364.4156 1012.5781,364.775 C1012.7031,365.4469 1012.9531,365.6969 1013.4844,365.6969 C1013.7656,365.6969 1014.0469,365.5563 1014.2344,365.3375 C1014.3594,365.1656 1014.4063,364.9938 1014.4063,364.5563 L1014.4063,363.1969 C1014.4063,362.775 1014.3906,362.6344 1014.2656,362.4625 C1014.0938,362.2125 1013.8125,362.0563 1013.4844,362.0563 C1013.1719,362.0563 1012.9688,362.1656 1012.75,362.4313 C1011.5781,361.9313 1011.1406,361.8219 1010.1875,361.8219 C1007.5156,361.8219 1005.5,363.8375 1005.5,366.4625 L1005.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="1024.5" y="371.006">NN</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="996.5" x2="1046.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="996.5" x2="1046.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
+      <ellipse cx="990" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M992.9688,320.6406 Q992.3906,320.9375 991.75,321.0781 Q991.1094,321.2344 990.4063,321.2344 Q987.9063,321.2344 986.5781,319.5938 Q985.2656,317.9375 985.2656,314.8125 Q985.2656,311.6875 986.5781,310.0313 Q987.9063,308.375 990.4063,308.375 Q991.1094,308.375 991.75,308.5313 Q992.4063,308.6875 992.9688,308.9844 L992.9688,311.7031 Q992.3438,311.125 991.75,310.8594 Q991.1563,310.5781 990.5313,310.5781 Q989.1875,310.5781 988.5,311.6563 Q987.8125,312.7188 987.8125,314.8125 Q987.8125,316.9063 988.5,317.9844 Q989.1875,319.0469 990.5313,319.0469 Q991.1563,319.0469 991.75,318.7813 Q992.3438,318.5 992.9688,317.9219 L992.9688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="1004" y="319.1543">NN</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <g id="elem_C_0001963145075481599858">
-        <rect codeLine="62" fill="#F1F1F1" height="48" id="C_0001963145075481599858" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="1082.5" y="350.4"/>
-        <ellipse cx="1097.5" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1092.5,367.5563 C1092.5,370.0563 1094.6406,371.8688 1097.5625,371.8688 C1098.7969,371.8688 1099.9688,371.5719 1100.7188,371.0563 C1101.3281,370.6344 1101.6563,370.2125 1101.6563,369.8063 C1101.6563,369.3375 1101.2344,368.9313 1100.7344,368.9313 C1100.5,368.9313 1100.2813,369.0094 1100.0781,369.2125 C1099.6406,369.65 1099.6406,369.65 1099.4688,369.7438 C1099.0156,369.9781 1098.375,370.1188 1097.6094,370.1188 C1095.6094,370.1188 1094.3281,369.1031 1094.3281,367.525 L1094.3281,366.4781 C1094.3281,364.775 1095.5469,363.5719 1097.25,363.5719 C1097.8281,363.5719 1098.4063,363.7125 1098.875,363.9625 C1099.3438,364.2281 1099.5156,364.4156 1099.5781,364.775 C1099.7031,365.4469 1099.9531,365.6969 1100.4844,365.6969 C1100.7656,365.6969 1101.0469,365.5563 1101.2344,365.3375 C1101.3594,365.1656 1101.4063,364.9938 1101.4063,364.5563 L1101.4063,363.1969 C1101.4063,362.775 1101.3906,362.6344 1101.2656,362.4625 C1101.0938,362.2125 1100.8125,362.0563 1100.4844,362.0563 C1100.1719,362.0563 1099.9688,362.1656 1099.75,362.4313 C1098.5781,361.9313 1098.1406,361.8219 1097.1875,361.8219 C1094.5156,361.8219 1092.5,363.8375 1092.5,366.4625 L1092.5,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="1111.5" y="371.006">NNN</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1083.5" x2="1143.5" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1083.5" x2="1143.5" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
+      <ellipse cx="1075.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1078.4688,320.6406 Q1077.8906,320.9375 1077.25,321.0781 Q1076.6094,321.2344 1075.9063,321.2344 Q1073.4063,321.2344 1072.0781,319.5938 Q1070.7656,317.9375 1070.7656,314.8125 Q1070.7656,311.6875 1072.0781,310.0313 Q1073.4063,308.375 1075.9063,308.375 Q1076.6094,308.375 1077.25,308.5313 Q1077.9063,308.6875 1078.4688,308.9844 L1078.4688,311.7031 Q1077.8438,311.125 1077.25,310.8594 Q1076.6563,310.5781 1076.0313,310.5781 Q1074.6875,310.5781 1074,311.6563 Q1073.3125,312.7188 1073.3125,314.8125 Q1073.3125,316.9063 1074,317.9844 Q1074.6875,319.0469 1076.0313,319.0469 Q1076.6563,319.0469 1077.25,318.7813 Q1077.8438,318.5 1078.4688,317.9219 L1078.4688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1089.5" y="319.1543">NNN</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="331" y2="331"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <g id="elem_C_0000916380191954937631">
-        <rect codeLine="66" fill="#F1F1F1" height="64.7999" id="C_0000916380191954937631" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="1247" y="459.4"/>
-        <ellipse cx="1262.45" cy="475.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1257.45,476.5563 C1257.45,479.0563 1259.5906,480.8688 1262.5125,480.8688 C1263.7469,480.8688 1264.9188,480.5719 1265.6688,480.0563 C1266.2781,479.6344 1266.6063,479.2125 1266.6063,478.8063 C1266.6063,478.3375 1266.1844,477.9313 1265.6844,477.9313 C1265.45,477.9313 1265.2313,478.0094 1265.0281,478.2125 C1264.5906,478.65 1264.5906,478.65 1264.4188,478.7438 C1263.9656,478.9781 1263.325,479.1188 1262.5594,479.1188 C1260.5594,479.1188 1259.2781,478.1031 1259.2781,476.525 L1259.2781,475.4781 C1259.2781,473.775 1260.4969,472.5719 1262.2,472.5719 C1262.7781,472.5719 1263.3563,472.7125 1263.825,472.9625 C1264.2938,473.2281 1264.4656,473.4156 1264.5281,473.775 C1264.6531,474.4469 1264.9031,474.6969 1265.4344,474.6969 C1265.7156,474.6969 1265.9969,474.5563 1266.1844,474.3375 C1266.3094,474.1656 1266.3563,473.9938 1266.3563,473.5563 L1266.3563,472.1969 C1266.3563,471.775 1266.3406,471.6344 1266.2156,471.4625 C1266.0438,471.2125 1265.7625,471.0563 1265.4344,471.0563 C1265.1219,471.0563 1264.9188,471.1656 1264.7,471.4313 C1263.5281,470.9313 1263.0906,470.8219 1262.1375,470.8219 C1259.4656,470.8219 1257.45,472.8375 1257.45,475.4625 L1257.45,476.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="1276.55" y="480.006">custom_container</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1398" y="456.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1399" y="470.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1248" x2="1403" y1="491.4" y2="491.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1248" x2="1403" y1="499.4" y2="499.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1253" y="508.3"/>
-          <ellipse cx="1258" cy="513.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="1267" y="516.4059">data : std::vector&lt;T&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
+      <ellipse cx="1236.5" cy="424" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1239.4688,429.6406 Q1238.8906,429.9375 1238.25,430.0781 Q1237.6094,430.2344 1236.9063,430.2344 Q1234.4063,430.2344 1233.0781,428.5938 Q1231.7656,426.9375 1231.7656,423.8125 Q1231.7656,420.6875 1233.0781,419.0313 Q1234.4063,417.375 1236.9063,417.375 Q1237.6094,417.375 1238.25,417.5313 Q1238.9063,417.6875 1239.4688,417.9844 L1239.4688,420.7031 Q1238.8438,420.125 1238.25,419.8594 Q1237.6563,419.5781 1237.0313,419.5781 Q1235.6875,419.5781 1235,420.6563 Q1234.3125,421.7188 1234.3125,423.8125 Q1234.3125,425.9063 1235,426.9844 Q1235.6875,428.0469 1237.0313,428.0469 Q1237.6563,428.0469 1238.25,427.7813 Q1238.8438,427.5 1239.4688,426.9219 L1239.4688,429.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1250.5" y="428.1543">custom_container</text>
+      <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"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="448" y2="448"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <g id="elem_C_0000050153113082434858">
-        <rect codeLine="71" fill="#F1F1F1" height="48" id="C_0000050153113082434858" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="1180" y="350.4"/>
-        <ellipse cx="1195" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1190,367.5563 C1190,370.0563 1192.1406,371.8688 1195.0625,371.8688 C1196.2969,371.8688 1197.4688,371.5719 1198.2188,371.0563 C1198.8281,370.6344 1199.1563,370.2125 1199.1563,369.8063 C1199.1563,369.3375 1198.7344,368.9313 1198.2344,368.9313 C1198,368.9313 1197.7813,369.0094 1197.5781,369.2125 C1197.1406,369.65 1197.1406,369.65 1196.9688,369.7438 C1196.5156,369.9781 1195.875,370.1188 1195.1094,370.1188 C1193.1094,370.1188 1191.8281,369.1031 1191.8281,367.525 L1191.8281,366.4781 C1191.8281,364.775 1193.0469,363.5719 1194.75,363.5719 C1195.3281,363.5719 1195.9063,363.7125 1196.375,363.9625 C1196.8438,364.2281 1197.0156,364.4156 1197.0781,364.775 C1197.2031,365.4469 1197.4531,365.6969 1197.9844,365.6969 C1198.2656,365.6969 1198.5469,365.5563 1198.7344,365.3375 C1198.8594,365.1656 1198.9063,364.9938 1198.9063,364.5563 L1198.9063,363.1969 C1198.9063,362.775 1198.8906,362.6344 1198.7656,362.4625 C1198.5938,362.2125 1198.3125,362.0563 1197.9844,362.0563 C1197.6719,362.0563 1197.4688,362.1656 1197.25,362.4313 C1196.0781,361.9313 1195.6406,361.8219 1194.6875,361.8219 C1192.0156,361.8219 1190,363.8375 1190,366.4625 L1190,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="1209" y="371.006">custom_container</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="10" x="1330" y="347.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="8" x="1331" y="361.6001">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1181" x2="1336" y1="382.4" y2="382.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1181" x2="1336" y1="390.4" y2="390.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1227.5" y="454"/>
+      <ellipse cx="1232.5" cy="459" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000303025561016882526">
-        <rect codeLine="75" fill="#F1F1F1" height="266.399" id="C_0000303025561016882526" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="477.5" y="7"/>
-        <ellipse cx="587.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M582.25,24.1563 C582.25,26.6563 584.3906,28.4688 587.3125,28.4688 C588.5469,28.4688 589.7188,28.1719 590.4688,27.6563 C591.0781,27.2344 591.4063,26.8125 591.4063,26.4063 C591.4063,25.9375 590.9844,25.5313 590.4844,25.5313 C590.25,25.5313 590.0313,25.6094 589.8281,25.8125 C589.3906,26.25 589.3906,26.25 589.2188,26.3438 C588.7656,26.5781 588.125,26.7188 587.3594,26.7188 C585.3594,26.7188 584.0781,25.7031 584.0781,24.125 L584.0781,23.0781 C584.0781,21.375 585.2969,20.1719 587,20.1719 C587.5781,20.1719 588.1563,20.3125 588.625,20.5625 C589.0938,20.8281 589.2656,21.0156 589.3281,21.375 C589.4531,22.0469 589.7031,22.2969 590.2344,22.2969 C590.5156,22.2969 590.7969,22.1563 590.9844,21.9375 C591.1094,21.7656 591.1563,21.5938 591.1563,21.1563 L591.1563,19.7969 C591.1563,19.375 591.1406,19.2344 591.0156,19.0625 C590.8438,18.8125 590.5625,18.6563 590.2344,18.6563 C589.9219,18.6563 589.7188,18.7656 589.5,19.0313 C588.3281,18.5313 587.8906,18.4219 586.9375,18.4219 C584.2656,18.4219 582.25,20.4375 582.25,23.0625 L582.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="607.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="714.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="714.5" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="55.9"/>
-          <ellipse cx="488.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="497.5" y="64.0059">a : std::vector&lt;A&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="72.6999"/>
-          <ellipse cx="488.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="497.5" y="80.8059">b : std::vector&lt;B *&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="89.4998"/>
-          <ellipse cx="488.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="497.5" y="97.6058">c : std::map&lt;int,C&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="106.2997"/>
-          <ellipse cx="488.5" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="497.5" y="114.4057">d : std::map&lt;int,D *&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="123.0997"/>
-          <ellipse cx="488.5" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="158" x="497.5" y="131.2057">e : custom_container&lt;E&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="139.8996"/>
-          <ellipse cx="488.5" cy="144.8996" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="497.5" y="148.0056">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="156.6995"/>
-          <ellipse cx="488.5" cy="161.6995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="212" x="497.5" y="164.8055">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="173.4995"/>
-          <ellipse cx="488.5" cy="178.4995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="497.5" y="181.6054">h : std::array&lt;H,10&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="190.2994"/>
-          <ellipse cx="488.5" cy="195.2994" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="497.5" y="198.4054">i : std::array&lt;I *,5&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="207.0993"/>
-          <ellipse cx="488.5" cy="212.0993" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="497.5" y="215.2053">j : J[10]</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="223.8992"/>
-          <ellipse cx="488.5" cy="228.8992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="497.5" y="232.0052">k : K *[20]</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="240.6992"/>
-          <ellipse cx="488.5" cy="245.6992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="497.5" y="248.8051">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="257.4991"/>
-          <ellipse cx="488.5" cy="262.4991" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169" x="497.5" y="265.6051">ns : std::tuple&lt;N,NN,NNN&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="1241.5" y="462.2104">data : std::vector&lt;T&gt;</text>
     </a>
-    <g id="link_C_0000050153113082434858_C_0001092550394020578978">
-      <path codeLine="91" d="M1244.94,398.75 C1233.32,418.77 1219.6731,442.2814 1208.0531,462.2914 " fill="none" id="C_0000050153113082434858-to-C_0001092550394020578978" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1205.04,467.48,1213.0187,461.7058,1207.5509,463.1562,1206.1005,457.6884,1205.04,467.48" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000050153113082434858_C_0000916380191954937631">
-      <path codeLine="92" d="M1272.06,398.75 C1282.15,416.14 1287.0118,424.5037 1298.1018,443.6037 " fill="none" id="C_0000050153113082434858-to-C_0000916380191954937631" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="1307.14,459.17,1303.2905,440.5909,1292.913,446.6164,1307.14,459.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0000989095304444672400">
-      <path codeLine="93" d="M466.188,190.5667 C382.138,222.6267 278.24,262.77 177.5,303.4 C127.43,323.59 113.61,325.91 65.5,350.4 C59.86,353.27 53.94,356.66 48.49,359.94 " fill="none" id="C_0000303025561016882526-backto-C_0000989095304444672400" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="477.4,186.29,470.3684,184.691,466.188,190.5667,473.2196,192.1657,477.4,186.29" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="178.5" y="316.477">+a</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0000648285260245005311">
-      <path codeLine="94" d="M477.35,191.56 C384.51,231.86 253.07,291.23 141.5,350.4 C135.78,353.43 134.8552,353.8467 129.2952,357.2067 " fill="none" id="C_0000303025561016882526-to-C_0000648285260245005311" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="124.16,360.31,133.9316,359.0785,128.4393,357.724,129.7939,352.2317,124.16,360.31" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="228.5" y="316.477">+b</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0000323304333007297774">
-      <path codeLine="95" d="M466.7564,211.8566 C392.1164,252.7566 304.62,301.18 218.5,350.4 C212.77,353.68 206.6,357.28 200.89,360.64 " fill="none" id="C_0000303025561016882526-backto-C_0000323304333007297774" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="477.28,206.09,470.096,205.4654,466.7564,211.8566,473.9404,212.4812,477.28,206.09" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="302.5" y="316.477">+c</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0001006912399043633492">
-      <path codeLine="96" d="M477.11,222.74 C404.01,272.66 322.1444,328.5657 282.7644,355.4657 " fill="none" id="C_0000303025561016882526-to-C_0001006912399043633492" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="277.81,358.85,287.4979,357.0765,281.9387,356.0297,282.9854,350.4706,277.81,358.85" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="358.5" y="316.477">+d</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0000050153113082434858">
-      <path codeLine="97" d="M727.3238,187.0913 C866.6138,235.9413 1080.55,310.98 1191.87,350.03 " fill="none" id="C_0000303025561016882526-backto-C_0000050153113082434858" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="716,183.12,720.3381,188.8803,727.3238,187.0913,722.9857,181.3311,716,183.12" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1100.5" y="316.477">+e</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0000965398761810782236">
-      <path codeLine="98" d="M468.2299,254.0158 C420.9499,295.6058 380.48,331.2 353.37,355.04 " fill="none" id="C_0000303025561016882526-backto-C_0000965398761810782236" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="477.24,246.09,470.093,247.0495,468.2299,254.0158,475.3769,253.0563,477.24,246.09" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="412.5" y="316.477">+f</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0001764732000887030464">
-      <path codeLine="99" d="M489.89,273.58 C466.1,303.11 447.2336,326.5472 432.0836,345.3572 " fill="none" id="C_0000303025561016882526-to-C_0001764732000887030464" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="428.32,350.03,437.0806,345.5298,431.4563,346.136,430.8502,340.5117,428.32,350.03" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="466.5" y="316.477">+g</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0001669285599837552146">
-      <path codeLine="100" d="M528.6523,284.4246 C514.6623,313.9546 506.48,331.22 497.57,350.03 " fill="none" id="C_0000303025561016882526-backto-C_0001669285599837552146" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="533.79,273.58,527.6063,277.2897,528.6523,284.4246,534.836,280.7148,533.79,273.58" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="520.5" y="316.477">+h</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0002234750598599000377">
-      <path codeLine="101" d="M575.98,273.58 C571.4,303.11 567.9604,325.291 565.0404,344.101 " fill="none" id="C_0000303025561016882526-to-C_0002234750598599000377" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="564.12,350.03,569.4533,341.7501,564.887,345.0892,561.5479,340.5229,564.12,350.03" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="572.5" y="316.477">+i</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0001335933649375465369">
-      <path codeLine="102" d="M619.4801,285.4302 C624.1901,314.9602 626.78,331.22 629.78,350.03 " fill="none" id="C_0000303025561016882526-backto-C_0001335933649375465369" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="617.59,273.58,614.585,280.1351,619.4801,285.4302,622.4851,278.8751,617.59,273.58" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="626.5" y="316.477">+j</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0001603190364864080123">
-      <path codeLine="103" d="M660.35,273.58 C674.6,303.11 685.5417,325.8166 694.6217,344.6266 " fill="none" id="C_0000303025561016882526-to-C_0001603190364864080123" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="697.23,350.03,696.9198,340.186,695.0564,345.5272,689.7152,343.6638,697.23,350.03" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="682.5" y="316.477">+k</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0000305487238408320046">
-      <path codeLine="104" d="M711.2313,282.9062 C735.1413,312.4362 750.35,331.22 765.58,350.03 " fill="none" id="C_0000303025561016882526-backto-C_0000305487238408320046" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="703.68,273.58,704.3469,280.7602,711.2313,282.9062,710.5644,275.726,703.68,273.58" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="745.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="752.5" y="316.477">lm</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0001664744512423723275">
-      <path codeLine="105" d="M724.8453,253.6585 C771.5553,294.5885 811.44,329.54 839.04,353.72 " fill="none" id="C_0000303025561016882526-backto-C_0001664744512423723275" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="715.82,245.75,717.6965,252.7127,724.8453,253.6585,722.9688,246.6958,715.82,245.75" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="803.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="810.5" y="316.477">lm</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0000950210019792152600">
-      <path codeLine="106" d="M725.9171,228.8172 C799.9671,278.9472 878.37,332.02 918.19,358.97 " fill="none" id="C_0000303025561016882526-backto-C_0000950210019792152600" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="715.98,222.09,718.7062,228.7659,725.9171,228.8172,723.1909,222.1412,715.98,222.09" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="863.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="870.5" y="316.477">ns</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0001662349735899726224">
-      <path codeLine="107" d="M726.2624,212.0506 C780.5124,241.6706 834.99,271.42 893.5,303.4 C928.62,322.59 969.14,344.76 995.03,358.92 " fill="none" id="C_0000303025561016882526-backto-C_0001662349735899726224" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="715.73,206.3,719.0793,212.6861,726.2624,212.0506,722.913,205.6645,715.73,206.3" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="928.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="935.5" y="316.477">ns</text>
-    </g>
-    <g id="link_C_0000303025561016882526_C_0001963145075481599858">
-      <path codeLine="108" d="M726.5227,198.5481 C821.2727,240.4981 946.17,296.19 1064.5,350.4 C1070.22,353.02 1076.31,355.85 1082.17,358.59 " fill="none" id="C_0000303025561016882526-backto-C_0001963145075481599858" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="715.55,193.69,719.417,199.7766,726.5227,198.5481,722.6557,192.4615,715.55,193.69" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="994.5" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="1001.5" y="316.477">ns</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
+      <ellipse cx="1170" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1172.9688,320.6406 Q1172.3906,320.9375 1171.75,321.0781 Q1171.1094,321.2344 1170.4063,321.2344 Q1167.9063,321.2344 1166.5781,319.5938 Q1165.2656,317.9375 1165.2656,314.8125 Q1165.2656,311.6875 1166.5781,310.0313 Q1167.9063,308.375 1170.4063,308.375 Q1171.1094,308.375 1171.75,308.5313 Q1172.4063,308.6875 1172.9688,308.9844 L1172.9688,311.7031 Q1172.3438,311.125 1171.75,310.8594 Q1171.1563,310.5781 1170.5313,310.5781 Q1169.1875,310.5781 1168.5,311.6563 Q1167.8125,312.7188 1167.8125,314.8125 Q1167.8125,316.9063 1168.5,317.9844 Q1169.1875,319.0469 1170.5313,319.0469 Q1171.1563,319.0469 1171.75,318.7813 Q1172.3438,318.5 1172.9688,317.9219 L1172.9688,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1184" y="319.1543">custom_container</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
+      <ellipse cx="577.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M580.7188,29.6406 Q580.1406,29.9375 579.5,30.0781 Q578.8594,30.2344 578.1563,30.2344 Q575.6563,30.2344 574.3281,28.5938 Q573.0156,26.9375 573.0156,23.8125 Q573.0156,20.6875 574.3281,19.0313 Q575.6563,17.375 578.1563,17.375 Q578.8594,17.375 579.5,17.5313 Q580.1563,17.6875 580.7188,17.9844 L580.7188,20.7031 Q580.0938,20.125 579.5,19.8594 Q578.9063,19.5781 578.2813,19.5781 Q576.9375,19.5781 576.25,20.6563 Q575.5625,21.7188 575.5625,23.8125 Q575.5625,25.9063 576.25,26.9844 Q576.9375,28.0469 578.2813,28.0469 Q578.9063,28.0469 579.5,27.7813 Q580.0938,27.5 580.7188,26.9219 L580.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="598.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="54"/>
+      <ellipse cx="482" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="491" y="62.2104">a : std::vector&lt;A&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="66.8047"/>
+      <ellipse cx="482" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="491" y="75.0151">b : std::vector&lt;B *&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="79.6094"/>
+      <ellipse cx="482" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="87.8198">c : std::map&lt;int,C&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="92.4141"/>
+      <ellipse cx="482" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="124" x="491" y="100.6245">d : std::map&lt;int,D *&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="105.2188"/>
+      <ellipse cx="482" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="491" y="113.4292">e : custom_container&lt;E&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="118.0234"/>
+      <ellipse cx="482" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="180" x="491" y="126.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="130.8281"/>
+      <ellipse cx="482" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="491" y="139.0386">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="143.6328"/>
+      <ellipse cx="482" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="491" y="151.8433">h : std::array&lt;H,10&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="156.4375"/>
+      <ellipse cx="482" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="164.6479">i : std::array&lt;I *,5&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="169.2422"/>
+      <ellipse cx="482" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="491" y="177.4526">j : J[10]</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="182.0469"/>
+      <ellipse cx="482" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="491" y="190.2573">k : K *[20]</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="194.8516"/>
+      <ellipse cx="482" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="491" y="203.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="207.6563"/>
+      <ellipse cx="482" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="491" y="215.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text>
+    </a>
+    <path d="M1219.28,347.24 C1208.62,365.3 1193.8,390.41 1182.5,409.56 " fill="none" id="C_0000050153113082434858-&gt;C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <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;"/>
+    <path d="M1246.52,347.24 C1253.75,359.69 1262.94,375.49 1271.6,390.38 " fill="none" id="C_0000050153113082434858-&gt;C_0000916380191954937631" 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;"/>
+    <path d="M458.29,155.44 C376.7,181.33 268.96,216.8 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_0000303025561016882526&lt;-C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="470.89,151.45,463.9642,149.4417,459.4466,155.0623,466.3724,157.0706,470.89,151.45" 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>
+    <path d="M470.77,160.82 C404.5,186.88 319.81,220.66 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_0000303025561016882526-&gt;C_0000648285260245005311" 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>
+    <path d="M458.79,175.2 C386.27,209.78 294.14,255.14 214,299 C208.18,302.18 201.98,305.82 196.32,309.25 " fill="none" id="C_0000303025561016882526&lt;-C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="470.71,169.52,463.5735,168.4851,459.8735,174.6746,467.0099,175.7095,470.71,169.52" 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>
+    <path d="M470.59,187.18 C400.73,230.27 317.51,281.59 276.85,306.67 " fill="none" id="C_0000303025561016882526-&gt;C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="272.58,309.31,282.3425,308.0089,276.8407,306.6935,278.1561,301.1917,272.58,309.31" 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>
+    <path d="M713.81,155.54 C800.34,182.44 917.17,218.99 1020,252 C1068,267.41 1121.94,285.14 1163.53,298.9 " fill="none" id="C_0000303025561016882526&lt;-C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="701.27,151.65,705.813,157.2501,712.7296,155.2105,708.1866,149.6104,701.27,151.65" 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>
+    <path d="M460.61,215.73 C416.52,250.8 371.79,286.38 346.9,306.17 " fill="none" id="C_0000303025561016882526&lt;-C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="470.89,207.55,463.7046,208.1587,461.5029,215.0254,468.6882,214.4168,470.89,207.55" 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>
+    <path d="M491.31,222.02 C467.24,248.96 443.42,275.63 426.44,294.64 " fill="none" id="C_0000303025561016882526-&gt;C_0001764732000887030464" 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>
+    <path d="M524.21,233.86 C511.21,258.66 498.82,282.28 490.15,298.82 " fill="none" id="C_0000303025561016882526&lt;-C_0001669285599837552146" 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>
+    <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_0000303025561016882526-&gt;C_0002234750598599000377" 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>
+    <path d="M606.2,234.87 C610.35,259.3 614.29,282.51 617.06,298.82 " fill="none" id="C_0000303025561016882526&lt;-C_0001335933649375465369" 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>
+    <path d="M641.07,222.02 C654.95,248.74 668.68,275.18 678.54,294.16 " fill="none" id="C_0000303025561016882526-&gt;C_0001603190364864080123" 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>
+    <path d="M688.02,232.11 C711.05,258.33 733.08,283.39 747.99,300.36 " fill="none" id="C_0000303025561016882526&lt;-C_0000305487238408320046" 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>
+    <path d="M711.74,215.61 C727.02,227.83 742.39,240.17 757,252 C778.84,269.68 803.63,290.14 820.77,304.35 " fill="none" id="C_0000303025561016882526&lt;-C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="701.19,207.18,703.3811,214.0501,710.5656,214.6699,708.3744,207.7998,701.19,207.18" 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>
+    <path d="M712.39,189.86 C745.64,209.71 781.34,231.39 814,252 C843.65,270.71 877.25,293.37 898.28,307.74 " fill="none" id="C_0000303025561016882526&lt;-C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="701.21,183.2,704.3166,189.7076,711.5185,189.3429,708.4119,182.8353,701.21,183.2" 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>
+    <path d="M713.07,172.33 C764.72,195.97 824.69,224.35 878,252 C912.03,269.65 950.21,291.98 974.65,306.61 " fill="none" id="C_0000303025561016882526&lt;-C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="701.15,166.9,704.947,173.0305,712.0663,171.8835,708.2693,165.753,701.15,166.9" 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>
+    <path d="M713.66,161.01 C783,186.26 869.88,219.2 946,252 C986.21,269.32 1031.45,291.83 1060.31,306.58 " fill="none" id="C_0000303025561016882526&lt;-C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="701.37,156.54,705.6494,162.344,712.6529,160.6261,708.3735,154.8221,701.37,156.54" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00006_class_mermaid.svg b/docs/test_cases/t00006_class_mermaid.svg
index 76109ab0..7de39c54 100644
--- a/docs/test_cases/t00006_class_mermaid.svg
+++ b/docs/test_cases/t00006_class_mermaid.svg
@@ -1,78 +1,73 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1446.88671875 613" style="max-width: 1446.89px; background-color: white;" width="1446.88671875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1230.6285411799065,476L1224.652039524922,480.1666666666667C1218.6755378699377,484.3333333333333,1206.7225345599688,492.6666666666667,1200.7460329049843,501.8333333333333C1194.76953125,511,1194.76953125,521,1194.76953125,526L1194.76953125,531"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1312.3870838200935,476L1318.363585475078,480.1666666666667C1324.3400871300623,484.3333333333333,1336.2930904400312,492.6666666666667,1342.2695920950157,498C1348.24609375,503.3333333333333,1348.24609375,505.6666666666667,1348.24609375,506.8333333333333L1348.24609375,508"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M439.9002612954139,233.3670900236914L370.13042607951155,258.6392416864095C300.3605908636093,283.9113933491276,160.82092043180464,334.4556966745638,91.05108521590232,365.3945150039485C21.28125,396.3333333333333,21.28125,407.6666666666667,21.28125,413.3333333333333L21.28125,419"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M456.82421875,234.68405406050766L396.994140625,259.7367117170897C337.1640625,284.7893693736718,217.50390625,334.8946846868359,157.673828125,364.6140090100846C97.84375,394.3333333333333,97.84375,403.6666666666667,97.84375,408.3333333333333L97.84375,413"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M440.69963758880505,252.88420518996335L396.3174063240042,274.90350432496945C351.93517505920335,296.92280345997557,263.17071252960164,340.9614017299878,218.78848126480082,368.64736753166056C174.40625,396.3333333333333,174.40625,407.6666666666667,174.40625,413.3333333333333L174.40625,419"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M456.82421875,259.7105464095237L422.5149739583333,280.59212200793644C388.2057291666667,301.47369760634916,319.5872395833333,343.23684880317455,285.2779947916667,368.78509106825396C250.96875,394.3333333333333,250.96875,403.6666666666667,250.96875,408.3333333333333L250.96875,413"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M737.6388227493442,224.3455030413823L826.6169877077868,251.12125253448525C915.5951526662294,277.8970020275882,1093.5514825831149,331.4485010137941,1182.5296475415573,363.89091717356376C1271.5078125,396.3333333333333,1271.5078125,407.6666666666667,1271.5078125,413.3333333333333L1271.5078125,419"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M442.6616776518023,293.9892561260566L423.32483554316855,309.15771343838054C403.98799343453487,324.3261707507044,365.3143092172674,354.66308537535224,345.9774671086337,375.4982093543428C326.640625,396.3333333333333,326.640625,407.6666666666667,326.640625,413.3333333333333L326.640625,419"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M456.82421875,325.21888858530025L447.8131510416667,335.18240715441686C438.8020833333333,345.1459257235335,420.7799479166667,365.0729628617667,411.7688802083333,379.70314809755C402.7578125,394.3333333333333,402.7578125,403.6666666666667,402.7578125,408.3333333333333L402.7578125,413"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M489.34926730635937,366.9064685285142L487.7519935886328,369.9220571070952C486.15471987090626,372.93764568567616,482.9601724354531,378.9688228428381,481.3628987177265,387.65107808808574C479.765625,396.3333333333333,479.765625,407.6666666666667,479.765625,413.3333333333333L479.765625,419"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M558.7031440085158,351L557.7148595904298,356.6666666666667C556.7265751723438,362.3333333333333,554.7500063361719,373.6666666666667,553.761721918086,384C552.7734375,394.3333333333333,552.7734375,403.6666666666667,552.7734375,408.3333333333333L552.7734375,413"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M621.6159945845262,368.73234257250704L622.0888496537718,371.44361881042255C622.5617047230174,374.154895048338,623.5074148615087,379.57744752416903,623.9802699307544,387.9553904287512C624.453125,396.3333333333333,624.453125,407.6666666666667,624.453125,413.3333333333333L624.453125,419"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M681.3102569951338,351L684.3731308292781,356.6666666666667C687.4360046634225,362.3333333333333,693.5617523317113,373.6666666666667,696.6246261658556,384C699.6875,394.3333333333333,699.6875,403.6666666666667,699.6875,408.3333333333333L699.6875,413"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M732.507895294273,337.84517655659454L739.649808578561,345.7043137971621C746.7917218628487,353.5634510377297,761.0755484314244,369.2817255188649,768.2174617157121,382.8075294260991C775.359375,396.3333333333333,775.359375,407.6666666666667,775.359375,413.3333333333333L775.359375,419"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M734.59210754455,293.43300339297804L754.1457667037917,308.69416949414835C773.6994258630333,323.9553355953187,812.8067441815166,354.4776677976593,832.3604033407584,375.40550056549637C851.9140625,396.3333333333333,851.9140625,407.6666666666667,851.9140625,413.3333333333333L851.9140625,419"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M735.8161752545873,268.276350698643L768.0733752121561,287.73029224886915C800.3305751697249,307.18423379909535,864.8449750848625,346.09211689954765,897.1021750424312,371.2127251164405C929.359375,396.3333333333333,929.359375,407.6666666666667,929.359375,413.3333333333333L929.359375,419"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id17" d="M736.593445283185,251.37713365886302L782.4437564859876,273.64761138238583C828.29406768879,295.9180891059087,919.9946900943951,340.45904455295437,965.8450012971975,368.39618894314384C1011.6953125,396.3333333333333,1011.6953125,407.6666666666667,1011.6953125,413.3333333333333L1011.6953125,419"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M737.1292676808903,238.53607249353038L798.5387126507418,262.946727077942C859.9481576205935,287.3573816623536,982.7670475602968,336.17869083117677,1044.1764925301484,366.25601208225504C1105.5859375,396.3333333333333,1105.5859375,407.6666666666667,1105.5859375,413.3333333333333L1105.5859375,419"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1230.6285411799065,476L1224.652039524922,480.1666666666667C1218.6755378699377,484.3333333333333,1206.7225345599688,492.6666666666667,1200.7460329049843,502.8333333333333C1194.76953125,513,1194.76953125,525,1194.76953125,531L1194.76953125,537"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1312.3870838200935,476L1318.363585475078,480.1666666666667C1324.3400871300623,484.3333333333333,1336.2930904400312,492.6666666666667,1342.2695920950157,501C1348.24609375,509.3333333333333,1348.24609375,517.6666666666666,1348.24609375,521.8333333333334L1348.24609375,526"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M456.82421875,227.2368645730771L384.2337239583333,253.53072047756424C311.6432291666667,279.8245763820514,166.46223958333334,332.4122881910257,93.87174479166667,364.37281076217954C21.28125,396.3333333333333,21.28125,407.6666666666667,21.28125,413.3333333333333L21.28125,419"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M456.82421875,234.68405406050766L396.994140625,259.7367117170897C337.1640625,284.7893693736718,217.50390625,334.8946846868359,157.673828125,365.6140090100846C97.84375,396.3333333333333,97.84375,407.6666666666667,97.84375,413.3333333333333L97.84375,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M456.82421875,244.8843375425559L409.7545572916667,268.2369479521299C362.6848958333333,291.58955836170395,268.5455729166667,338.29477918085195,221.47591145833334,367.31405625709266C174.40625,396.3333333333333,174.40625,407.6666666666667,174.40625,413.3333333333333L174.40625,419"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M456.82421875,259.7105464095237L422.5149739583333,280.59212200793644C388.2057291666667,301.47369760634916,319.5872395833333,343.23684880317455,285.2779947916667,369.78509106825396C250.96875,396.3333333333333,250.96875,407.6666666666667,250.96875,413.3333333333333L250.96875,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M720.40234375,219.1586165277627L812.2532552083334,246.7988471064689C904.1041666666666,274.4390776851751,1087.8059895833333,329.71953884258755,1179.6569010416667,363.02643608796046C1271.5078125,396.3333333333333,1271.5078125,407.6666666666667,1271.5078125,413.3333333333333L1271.5078125,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M456.82421875,282.8796913442183L435.126953125,299.8997427868486C413.4296875,316.9197942294789,370.03515625,350.9598971147395,348.337890625,373.6466152240364C326.640625,396.3333333333333,326.640625,407.6666666666667,326.640625,413.3333333333333L326.640625,419"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M456.82421875,325.21888858530025L447.8131510416667,335.18240715441686C438.8020833333333,345.1459257235335,420.7799479166667,365.0729628617667,411.7688802083333,380.70314809755C402.7578125,396.3333333333333,402.7578125,407.6666666666667,402.7578125,413.3333333333333L402.7578125,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M497.77448296836985,351L494.7730066403082,356.6666666666667C491.77153031224657,362.3333333333333,485.7685776561232,373.6666666666667,482.76710132806164,385C479.765625,396.3333333333333,479.765625,407.6666666666667,479.765625,413.3333333333333L479.765625,419"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M558.7031440085158,351L557.7148595904298,356.6666666666667C556.7265751723438,362.3333333333333,554.7500063361719,373.6666666666667,553.761721918086,385C552.7734375,396.3333333333333,552.7734375,407.6666666666667,552.7734375,413.3333333333333L552.7734375,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M618.5234184914842,351L619.5117029095702,356.6666666666667C620.4999873276562,362.3333333333333,622.4765561638281,373.6666666666667,623.464840581914,385C624.453125,396.3333333333333,624.453125,407.6666666666667,624.453125,413.3333333333333L624.453125,419"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M681.3102569951338,351L684.3731308292781,356.6666666666667C687.4360046634225,362.3333333333333,693.5617523317113,373.6666666666667,696.6246261658556,385C699.6875,396.3333333333333,699.6875,407.6666666666667,699.6875,413.3333333333333L699.6875,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M720.40234375,324.5239295500659L729.5618489583334,334.6032746250549C738.7213541666666,344.6826197000439,757.0403645833334,364.841309850022,766.1998697916666,380.58732159167766C775.359375,396.3333333333333,775.359375,407.6666666666667,775.359375,413.3333333333333L775.359375,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M720.40234375,282.3582301016245L742.3209635416666,299.46519175135376C764.2395833333334,316.57215340108297,808.0768229166666,350.7860767005415,829.9954427083334,373.5597050169374C851.9140625,396.3333333333333,851.9140625,407.6666666666667,851.9140625,413.3333333333333L851.9140625,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M720.40234375,258.98044846442207L755.228515625,279.98370705368507C790.0546875,300.98696564294806,859.70703125,342.99348282147406,894.533203125,369.66340807740363C929.359375,396.3333333333333,929.359375,407.6666666666667,929.359375,413.3333333333333L929.359375,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id17" d="M720.40234375,243.5127690219649L768.951171875,267.09397418497076C817.5,290.6751793479766,914.59765625,337.8375896739883,963.146484375,367.08546150366084C1011.6953125,396.3333333333333,1011.6953125,407.6666666666667,1011.6953125,413.3333333333333L1011.6953125,419"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M720.40234375,231.88701122067323L784.599609375,257.4058426838944C848.796875,282.92467414711547,977.19140625,333.96233707355776,1041.388671875,365.14783520344554C1105.5859375,396.3333333333333,1105.5859375,407.6666666666667,1105.5859375,413.3333333333333L1105.5859375,419"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -275,7 +270,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L7">
+        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L7">
           <g title="A" id="classId-C_0000989095304444672400-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -294,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L9">
+        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L9">
           <g title="B" id="classId-C_0000648285260245005311-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -313,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L11">
+        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L11">
           <g title="C" id="classId-C_0000323304333007297774-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -332,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L13">
+        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L13">
           <g title="D" id="classId-C_0001006912399043633492-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -351,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L15">
+        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L15">
           <g title="E" id="classId-C_0001092550394020578978-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -370,7 +365,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L17">
+        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L17">
           <g title="F" id="classId-C_0000965398761810782236-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -389,7 +384,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L19">
+        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L19">
           <g title="G" id="classId-C_0001764732000887030464-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -408,7 +403,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L21">
+        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L21">
           <g title="H" id="classId-C_0001669285599837552146-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -427,7 +422,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L23">
+        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L23">
           <g title="I" id="classId-C_0002234750598599000377-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -446,7 +441,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L25">
+        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L25">
           <g title="J" id="classId-C_0001335933649375465369-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -465,7 +460,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L27">
+        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L27">
           <g title="K" id="classId-C_0001603190364864080123-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -484,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L29">
+        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L29">
           <g title="L" id="classId-C_0000305487238408320046-11" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -503,7 +498,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L31">
+        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L31">
           <g title="M" id="classId-C_0001664744512423723275-12" class="node default clickable">
             <rect height="57" width="28.328125" y="-28.5" x="-14.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="14.1640625" x1="-14.1640625" class="divider"/>
@@ -522,7 +517,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L33">
+        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L33">
           <g title="N" id="classId-C_0000950210019792152600-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -541,7 +536,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L35">
+        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L35">
           <g title="NN" id="classId-C_0001662349735899726224-14" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -560,7 +555,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L37">
+        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L37">
           <g title="NNN" id="classId-C_0001963145075481599858-15" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -579,7 +574,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000916380191954937631-16" class="node default clickable">
             <rect height="79" width="181.28125" y="-39.5" x="-90.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="90.640625" x1="-90.640625" class="divider"/>
@@ -603,7 +598,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000050153113082434858-17" class="node default clickable">
             <rect height="57" width="182.171875" y="-28.5" x="-91.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="91.0859375" x1="-91.0859375" class="divider"/>
@@ -622,7 +617,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00006/t00006.cc#L44">
+        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L44">
           <g title="R" id="classId-C_0000303025561016882526-18" class="node default clickable">
             <rect height="343" width="263.578125" y="-171.5" x="-131.7890625" class="outer title-state"/>
             <line y2="-141.5" y1="-141.5" x2="131.7890625" x1="-131.7890625" class="divider"/>
diff --git a/docs/test_cases/t00007.md b/docs/test_cases/t00007.md
index a7185e9b..73bb122d 100644
--- a/docs/test_cases/t00007.md
+++ b/docs/test_cases/t00007.md
@@ -46,7 +46,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00007::A",
+      "display_name": "A",
       "id": "98876622534017019",
       "is_abstract": false,
       "is_nested": false,
@@ -68,7 +68,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00007::B",
+      "display_name": "B",
       "id": "696381312773707784",
       "is_abstract": false,
       "is_nested": false,
@@ -90,7 +90,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00007::C",
+      "display_name": "C",
       "id": "972031178679364068",
       "is_abstract": false,
       "is_nested": false,
@@ -112,7 +112,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00007::R",
+      "display_name": "R",
       "id": "66905874721300157",
       "is_abstract": false,
       "is_nested": false,
@@ -171,6 +171,7 @@ public:
     }
   ],
   "name": "t00007_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index 455aa85b..f55a19ec 100644
--- a/docs/test_cases/t00007_class.svg
+++ b/docs/test_cases/t00007_class.svg
@@ -1,83 +1,75 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="237px" preserveAspectRatio="none" style="width:207px;height:237px;background:#FFFFFF;" version="1.1" viewBox="0 0 207 237" width="207px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="ff919vm8vkghf" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000098876622534017019">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000098876622534017019" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="182.4"/>
-        <ellipse cx="22" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,199.5563 C17,202.0563 19.1406,203.8688 22.0625,203.8688 C23.2969,203.8688 24.4688,203.5719 25.2188,203.0563 C25.8281,202.6344 26.1563,202.2125 26.1563,201.8063 C26.1563,201.3375 25.7344,200.9313 25.2344,200.9313 C25,200.9313 24.7813,201.0094 24.5781,201.2125 C24.1406,201.65 24.1406,201.65 23.9688,201.7438 C23.5156,201.9781 22.875,202.1188 22.1094,202.1188 C20.1094,202.1188 18.8281,201.1031 18.8281,199.525 L18.8281,198.4781 C18.8281,196.775 20.0469,195.5719 21.75,195.5719 C22.3281,195.5719 22.9063,195.7125 23.375,195.9625 C23.8438,196.2281 24.0156,196.4156 24.0781,196.775 C24.2031,197.4469 24.4531,197.6969 24.9844,197.6969 C25.2656,197.6969 25.5469,197.5563 25.7344,197.3375 C25.8594,197.1656 25.9063,196.9938 25.9063,196.5563 L25.9063,195.1969 C25.9063,194.775 25.8906,194.6344 25.7656,194.4625 C25.5938,194.2125 25.3125,194.0563 24.9844,194.0563 C24.6719,194.0563 24.4688,194.1656 24.25,194.4313 C23.0781,193.9313 22.6406,193.8219 21.6875,193.8219 C19.0156,193.8219 17,195.8375 17,198.4625 L17,199.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="203.006">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff919vm8vkghf)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
+      <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="203" y2="203"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000696381312773707784">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000696381312773707784" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="182.4"/>
-        <ellipse cx="98" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93,199.5563 C93,202.0563 95.1406,203.8688 98.0625,203.8688 C99.2969,203.8688 100.4688,203.5719 101.2188,203.0563 C101.8281,202.6344 102.1563,202.2125 102.1563,201.8063 C102.1563,201.3375 101.7344,200.9313 101.2344,200.9313 C101,200.9313 100.7813,201.0094 100.5781,201.2125 C100.1406,201.65 100.1406,201.65 99.9688,201.7438 C99.5156,201.9781 98.875,202.1188 98.1094,202.1188 C96.1094,202.1188 94.8281,201.1031 94.8281,199.525 L94.8281,198.4781 C94.8281,196.775 96.0469,195.5719 97.75,195.5719 C98.3281,195.5719 98.9063,195.7125 99.375,195.9625 C99.8438,196.2281 100.0156,196.4156 100.0781,196.775 C100.2031,197.4469 100.4531,197.6969 100.9844,197.6969 C101.2656,197.6969 101.5469,197.5563 101.7344,197.3375 C101.8594,197.1656 101.9063,196.9938 101.9063,196.5563 L101.9063,195.1969 C101.9063,194.775 101.8906,194.6344 101.7656,194.4625 C101.5938,194.2125 101.3125,194.0563 100.9844,194.0563 C100.6719,194.0563 100.4688,194.1656 100.25,194.4313 C99.0781,193.9313 98.6406,193.8219 97.6875,193.8219 C95.0156,193.8219 93,195.8375 93,198.4625 L93,199.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="203.006">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff919vm8vkghf)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
+      <ellipse cx="96" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M98.9688,192.6406 Q98.3906,192.9375 97.75,193.0781 Q97.1094,193.2344 96.4063,193.2344 Q93.9063,193.2344 92.5781,191.5938 Q91.2656,189.9375 91.2656,186.8125 Q91.2656,183.6875 92.5781,182.0313 Q93.9063,180.375 96.4063,180.375 Q97.1094,180.375 97.75,180.5313 Q98.4063,180.6875 98.9688,180.9844 L98.9688,183.7031 Q98.3438,183.125 97.75,182.8594 Q97.1563,182.5781 96.5313,182.5781 Q95.1875,182.5781 94.5,183.6563 Q93.8125,184.7188 93.8125,186.8125 Q93.8125,188.9063 94.5,189.9844 Q95.1875,191.0469 96.5313,191.0469 Q97.1563,191.0469 97.75,190.7813 Q98.3438,190.5 98.9688,189.9219 L98.9688,192.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="191.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="203" y2="203"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000972031178679364068">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000972031178679364068" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="182.4"/>
-        <ellipse cx="173.5" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M168.5,199.5563 C168.5,202.0563 170.6406,203.8688 173.5625,203.8688 C174.7969,203.8688 175.9688,203.5719 176.7188,203.0563 C177.3281,202.6344 177.6563,202.2125 177.6563,201.8063 C177.6563,201.3375 177.2344,200.9313 176.7344,200.9313 C176.5,200.9313 176.2813,201.0094 176.0781,201.2125 C175.6406,201.65 175.6406,201.65 175.4688,201.7438 C175.0156,201.9781 174.375,202.1188 173.6094,202.1188 C171.6094,202.1188 170.3281,201.1031 170.3281,199.525 L170.3281,198.4781 C170.3281,196.775 171.5469,195.5719 173.25,195.5719 C173.8281,195.5719 174.4063,195.7125 174.875,195.9625 C175.3438,196.2281 175.5156,196.4156 175.5781,196.775 C175.7031,197.4469 175.9531,197.6969 176.4844,197.6969 C176.7656,197.6969 177.0469,197.5563 177.2344,197.3375 C177.3594,197.1656 177.4063,196.9938 177.4063,196.5563 L177.4063,195.1969 C177.4063,194.775 177.3906,194.6344 177.2656,194.4625 C177.0938,194.2125 176.8125,194.0563 176.4844,194.0563 C176.1719,194.0563 175.9688,194.1656 175.75,194.4313 C174.5781,193.9313 174.1406,193.8219 173.1875,193.8219 C170.5156,193.8219 168.5,195.8375 168.5,198.4625 L168.5,199.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="203.006">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff919vm8vkghf)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
+      <ellipse cx="171" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.9688,192.6406 Q173.3906,192.9375 172.75,193.0781 Q172.1094,193.2344 171.4063,193.2344 Q168.9063,193.2344 167.5781,191.5938 Q166.2656,189.9375 166.2656,186.8125 Q166.2656,183.6875 167.5781,182.0313 Q168.9063,180.375 171.4063,180.375 Q172.1094,180.375 172.75,180.5313 Q173.4063,180.6875 173.9688,180.9844 L173.9688,183.7031 Q173.3438,183.125 172.75,182.8594 Q172.1563,182.5781 171.5313,182.5781 Q170.1875,182.5781 169.5,183.6563 Q168.8125,184.7188 168.8125,186.8125 Q168.8125,188.9063 169.5,189.9844 Q170.1875,191.0469 171.5313,191.0469 Q172.1563,191.0469 172.75,190.7813 Q173.3438,190.5 173.9688,189.9219 L173.9688,192.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="191.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="203" y2="203"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000066905874721300157">
-        <rect codeLine="14" fill="#F1F1F1" height="98.3998" id="C_0000066905874721300157" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="167" x="20" y="7"/>
-        <ellipse cx="94.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M89.25,24.1563 C89.25,26.6563 91.3906,28.4688 94.3125,28.4688 C95.5469,28.4688 96.7188,28.1719 97.4688,27.6563 C98.0781,27.2344 98.4063,26.8125 98.4063,26.4063 C98.4063,25.9375 97.9844,25.5313 97.4844,25.5313 C97.25,25.5313 97.0313,25.6094 96.8281,25.8125 C96.3906,26.25 96.3906,26.25 96.2188,26.3438 C95.7656,26.5781 95.125,26.7188 94.3594,26.7188 C92.3594,26.7188 91.0781,25.7031 91.0781,24.125 L91.0781,23.0781 C91.0781,21.375 92.2969,20.1719 94,20.1719 C94.5781,20.1719 95.1563,20.3125 95.625,20.5625 C96.0938,20.8281 96.2656,21.0156 96.3281,21.375 C96.4531,22.0469 96.7031,22.2969 97.2344,22.2969 C97.5156,22.2969 97.7969,22.1563 97.9844,21.9375 C98.1094,21.7656 98.1563,21.5938 98.1563,21.1563 L98.1563,19.7969 C98.1563,19.375 98.1406,19.2344 98.0156,19.0625 C97.8438,18.8125 97.5625,18.6563 97.2344,18.6563 C96.9219,18.6563 96.7188,18.7656 96.5,19.0313 C95.3281,18.5313 94.8906,18.4219 93.9375,18.4219 C91.2656,18.4219 89.25,20.4375 89.25,23.0625 L89.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="114.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="21" x2="186" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="21" x2="186" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="26" y="55.9"/>
-          <ellipse cx="31" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="140" x="40" y="64.0059">a : std::unique_ptr&lt;A&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="26" y="72.6999"/>
-          <ellipse cx="31" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="141" x="40" y="80.8059">b : std::shared_ptr&lt;B&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="26" y="89.4998"/>
-          <ellipse cx="31" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="130" x="40" y="97.6058">c : std::weak_ptr&lt;C&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff919vm8vkghf)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
+      <ellipse cx="92.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M95.7188,29.6406 Q95.1406,29.9375 94.5,30.0781 Q93.8594,30.2344 93.1563,30.2344 Q90.6563,30.2344 89.3281,28.5938 Q88.0156,26.9375 88.0156,23.8125 Q88.0156,20.6875 89.3281,19.0313 Q90.6563,17.375 93.1563,17.375 Q93.8594,17.375 94.5,17.5313 Q95.1563,17.6875 95.7188,17.9844 L95.7188,20.7031 Q95.0938,20.125 94.5,19.8594 Q93.9063,19.5781 93.2813,19.5781 Q91.9375,19.5781 91.25,20.6563 Q90.5625,21.7188 90.5625,23.8125 Q90.5625,25.9063 91.25,26.9844 Q91.9375,28.0469 93.2813,28.0469 Q93.9063,28.0469 94.5,27.7813 Q95.0938,27.5 95.7188,26.9219 L95.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="48" y2="48"/>
     </a>
-    <g id="link_C_0000066905874721300157_C_0000098876622534017019">
-      <path codeLine="20" d="M73.1339,116.4076 C59.9739,142.0676 49.9,161.72 39.44,182.12 " fill="none" id="C_0000066905874721300157-backto-C_0000098876622534017019" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="78.61,105.73,72.3127,109.2434,73.1339,116.4076,79.4311,112.8942,78.61,105.73" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="64.5" y="148.477">+a</text>
-    </g>
-    <g id="link_C_0000066905874721300157_C_0000696381312773707784">
-      <path codeLine="21" d="M103.5,105.73 C103.5,131.39 103.5,155.72 103.5,176.12 " fill="none" id="C_0000066905874721300157-to-C_0000696381312773707784" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="103.5,182.12,107.5,173.12,103.5,177.12,99.5,173.12,103.5,182.12" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="104.5" y="148.477">+b</text>
-    </g>
-    <g id="link_C_0000066905874721300157_C_0000972031178679364068">
-      <path codeLine="22" d="M128.39,105.73 C141.55,131.39 154.3624,156.3809 164.8224,176.7809 " fill="none" id="C_0000066905874721300157-to-C_0000972031178679364068" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="167.56,182.12,167.013,172.2863,165.2787,177.6708,159.8942,175.9365,167.56,182.12" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="151.5" y="148.477">+c</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="54"/>
+      <ellipse cx="32.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="41.5" y="62.2104">a : std::unique_ptr&lt;A&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="66.8047"/>
+      <ellipse cx="32.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="41.5" y="75.0151">b : std::shared_ptr&lt;B&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="79.6094"/>
+      <ellipse cx="32.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="41.5" y="87.8198">c : std::weak_ptr&lt;C&gt;</text>
+    </a>
+    <path d="M72.48,106 C60.66,128.37 47.58,153.14 38.31,170.69 " fill="none" id="C_0000066905874721300157&lt;-C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <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>
+    <path d="M101,94.22 C101,117.28 101,145.22 101,165.66 " fill="none" id="C_0000066905874721300157-&gt;C_0000696381312773707784" 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>
+    <path d="M123.3,94.22 C135.58,117.48 150.49,145.69 161.31,166.18 " fill="none" id="C_0000066905874721300157-&gt;C_0000972031178679364068" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00007_class_mermaid.svg b/docs/test_cases/t00007_class_mermaid.svg
index 861520b8..106cf3fb 100644
--- a/docs/test_cases/t00007_class_mermaid.svg
+++ b/docs/test_cases/t00007_class_mermaid.svg
@@ -1,63 +1,58 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 198.671875 264" style="max-width: 198.672px; background-color: white;" width="198.671875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M38.772214861128596,145.0439740344453L36.10575196760716,148.36997836203776C33.43928907408573,151.6959826896302,28.106363287042864,158.3479913448151,25.43990039352143,167.3406623390742C22.7734375,176.33333333333334,22.7734375,187.66666666666666,22.7734375,193.33333333333334L22.7734375,199"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M99.3359375,131L99.3359375,136.66666666666666C99.3359375,142.33333333333334,99.3359375,153.66666666666666,99.3359375,164C99.3359375,174.33333333333334,99.3359375,183.66666666666666,99.3359375,188.33333333333334L99.3359375,193"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M148.64058409685865,131L153.1835596640489,136.66666666666666C157.7265352312391,142.33333333333334,166.81248636561955,153.66666666666666,171.3554619328098,164C175.8984375,174.33333333333334,175.8984375,183.66666666666666,175.8984375,188.33333333333334L175.8984375,193"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M50.03129090314136,131L45.488315335951135,136.66666666666666C40.94533976876091,142.33333333333334,31.85938863438045,153.66666666666666,27.316413067190226,165C22.7734375,176.33333333333334,22.7734375,187.66666666666666,22.7734375,193.33333333333334L22.7734375,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M99.3359375,131L99.3359375,136.66666666666666C99.3359375,142.33333333333334,99.3359375,153.66666666666666,99.3359375,165C99.3359375,176.33333333333334,99.3359375,187.66666666666666,99.3359375,193.33333333333334L99.3359375,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M148.64058409685865,131L153.1835596640489,136.66666666666666C157.7265352312391,142.33333333333334,166.81248636561955,153.66666666666666,171.3554619328098,165C175.8984375,176.33333333333334,175.8984375,187.66666666666666,175.8984375,193.33333333333334L175.8984375,199"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(22.7734375, 165)" class="edgeLabel">
@@ -95,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L5">
+        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L5">
           <g title="A" id="classId-C_0000098876622534017019-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -114,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L7">
+        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L7">
           <g title="B" id="classId-C_0000696381312773707784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -133,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L9">
+        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L9">
           <g title="C" id="classId-C_0000972031178679364068-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -152,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00007/t00007.cc#L11">
+        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L11">
           <g title="R" id="classId-C_0000066905874721300157-3" class="node default clickable">
             <rect height="123" width="182.671875" y="-61.5" x="-91.3359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="91.3359375" x1="-91.3359375" class="divider"/>
diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md
index de097b7a..5acd5616 100644
--- a/docs/test_cases/t00008.md
+++ b/docs/test_cases/t00008.md
@@ -79,7 +79,7 @@ template <> struct E::nested_template<char> {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00008::A<T,P=T,CMP=nullptr,int N=3>",
+      "display_name": "A<T,P=T,CMP=nullptr,int N=3>",
       "id": "2293517130897538130",
       "is_abstract": false,
       "is_nested": false,
@@ -203,7 +203,7 @@ template <> struct E::nested_template<char> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00008::Vector<T>",
+      "display_name": "Vector<T>",
       "id": "1677407014842680311",
       "is_abstract": false,
       "is_nested": false,
@@ -245,7 +245,7 @@ template <> struct E::nested_template<char> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00008::B<T,C<>>",
+      "display_name": "B<T,C<>>",
       "id": "1968575752686868237",
       "is_abstract": false,
       "is_nested": false,
@@ -293,7 +293,7 @@ template <> struct E::nested_template<char> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00008::B<int,clanguml::t00008::Vector>",
+      "display_name": "B<int,Vector>",
       "id": "1449136415707203971",
       "is_abstract": false,
       "is_nested": false,
@@ -328,7 +328,7 @@ template <> struct E::nested_template<char> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00008::D",
+      "display_name": "D",
       "id": "1562396858816419857",
       "is_abstract": false,
       "is_nested": false,
@@ -420,7 +420,7 @@ template <> struct E::nested_template<char> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00008::E",
+      "display_name": "E",
       "id": "1787658457052431115",
       "is_abstract": false,
       "is_nested": false,
@@ -442,7 +442,7 @@ template <> struct E::nested_template<char> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00008::E::nested_template<ET>",
+      "display_name": "E::nested_template<ET>",
       "id": "1549419203490064906",
       "is_abstract": false,
       "is_nested": true,
@@ -503,7 +503,7 @@ template <> struct E::nested_template<char> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00008::E::nested_template<char>",
+      "display_name": "E::nested_template<char>",
       "id": "33637089897037832",
       "is_abstract": false,
       "is_nested": true,
@@ -564,6 +564,7 @@ template <> struct E::nested_template<char> {
     }
   ],
   "name": "t00008_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index 643c6dc6..2287d43f 100644
--- a/docs/test_cases/t00008_class.svg
+++ b/docs/test_cases/t00008_class.svg
@@ -1,212 +1,192 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="433px" preserveAspectRatio="none" style="width:1048px;height:433px;background:#FFFFFF;" version="1.1" viewBox="0 0 1048 433" width="1048px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="403px" preserveAspectRatio="none" style="width:1039px;height:403px;" version="1.1" viewBox="0 0 1039 403" width="1039px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fqjohe2et0vne" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002293517130897538130">
-        <rect codeLine="2" fill="#F1F1F1" height="148.7996" id="C_0002293517130897538130" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="190" x="7" y="10"/>
-        <ellipse cx="22" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,27.1563 C17,29.6563 19.1406,31.4688 22.0625,31.4688 C23.2969,31.4688 24.4688,31.1719 25.2188,30.6563 C25.8281,30.2344 26.1563,29.8125 26.1563,29.4063 C26.1563,28.9375 25.7344,28.5313 25.2344,28.5313 C25,28.5313 24.7813,28.6094 24.5781,28.8125 C24.1406,29.25 24.1406,29.25 23.9688,29.3438 C23.5156,29.5781 22.875,29.7188 22.1094,29.7188 C20.1094,29.7188 18.8281,28.7031 18.8281,27.125 L18.8281,26.0781 C18.8281,24.375 20.0469,23.1719 21.75,23.1719 C22.3281,23.1719 22.9063,23.3125 23.375,23.5625 C23.8438,23.8281 24.0156,24.0156 24.0781,24.375 C24.2031,25.0469 24.4531,25.2969 24.9844,25.2969 C25.2656,25.2969 25.5469,25.1563 25.7344,24.9375 C25.8594,24.7656 25.9063,24.5938 25.9063,24.1563 L25.9063,22.7969 C25.9063,22.375 25.8906,22.2344 25.7656,22.0625 C25.5938,21.8125 25.3125,21.6563 24.9844,21.6563 C24.6719,21.6563 24.4688,21.7656 24.25,22.0313 C23.0781,21.5313 22.6406,21.4219 21.6875,21.4219 C19.0156,21.4219 17,23.4375 17,26.0625 L17,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="30.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="147" x="53" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="145" x="54" y="21.2001">T,P=T,CMP=nullptr,int N=3</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="196" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="196" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="58.9"/>
-          <ellipse cx="18" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="27" y="67.0059">comparator : CMP</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="75.6999"/>
-          <ellipse cx="18" cy="80.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139" x="27" y="83.8059">ints : std::array&lt;int,N&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="92.4998"/>
-          <ellipse cx="18" cy="97.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="27" y="100.6058">pointer : T *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="109.2997"/>
-          <ellipse cx="18" cy="114.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="27" y="117.4057">reference : T &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="126.0997"/>
-          <ellipse cx="18" cy="131.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="27" y="134.2057">value : T</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="142.8996"/>
-          <ellipse cx="18" cy="147.8996" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="144" x="27" y="151.0056">values : std::vector&lt;P&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="124.8281" id="C_0002293517130897538130" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
+      <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="167" x="51" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="165" x="52" y="17.1387">T,P=T,CMP=nullptr,int N=3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <g id="elem_C_0001677407014842680311">
-        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0001677407014842680311" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="170" x="232" y="52"/>
-        <ellipse cx="286.75" cy="68" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M281.75,69.1563 C281.75,71.6563 283.8906,73.4688 286.8125,73.4688 C288.0469,73.4688 289.2188,73.1719 289.9688,72.6563 C290.5781,72.2344 290.9063,71.8125 290.9063,71.4063 C290.9063,70.9375 290.4844,70.5313 289.9844,70.5313 C289.75,70.5313 289.5313,70.6094 289.3281,70.8125 C288.8906,71.25 288.8906,71.25 288.7188,71.3438 C288.2656,71.5781 287.625,71.7188 286.8594,71.7188 C284.8594,71.7188 283.5781,70.7031 283.5781,69.125 L283.5781,68.0781 C283.5781,66.375 284.7969,65.1719 286.5,65.1719 C287.0781,65.1719 287.6563,65.3125 288.125,65.5625 C288.5938,65.8281 288.7656,66.0156 288.8281,66.375 C288.9531,67.0469 289.2031,67.2969 289.7344,67.2969 C290.0156,67.2969 290.2969,67.1563 290.4844,66.9375 C290.6094,66.7656 290.6563,66.5938 290.6563,66.1563 L290.6563,64.7969 C290.6563,64.375 290.6406,64.2344 290.5156,64.0625 C290.3438,63.8125 290.0625,63.6563 289.7344,63.6563 C289.4219,63.6563 289.2188,63.7656 289,64.0313 C287.8281,63.5313 287.3906,63.4219 286.4375,63.4219 C283.7656,63.4219 281.75,65.4375 281.75,68.0625 L281.75,69.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="307.25" y="72.606">Vector</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="396" y="49"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="397" y="63.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="233" x2="401" y1="84" y2="84"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="233" x2="401" y1="92" y2="92"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="238" y="100.9"/>
-          <ellipse cx="243" cy="105.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="144" x="252" y="109.0059">values : std::vector&lt;T&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
+      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001968575752686868237">
-        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0001968575752686868237" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="191" x="479.5" y="361.6"/>
-        <ellipse cx="547.75" cy="377.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M542.75,378.7562 C542.75,381.2562 544.8906,383.0687 547.8125,383.0687 C549.0469,383.0687 550.2188,382.7719 550.9688,382.2562 C551.5781,381.8344 551.9063,381.4125 551.9063,381.0062 C551.9063,380.5375 551.4844,380.1312 550.9844,380.1312 C550.75,380.1312 550.5313,380.2094 550.3281,380.4125 C549.8906,380.85 549.8906,380.85 549.7188,380.9437 C549.2656,381.1781 548.625,381.3187 547.8594,381.3187 C545.8594,381.3187 544.5781,380.3031 544.5781,378.725 L544.5781,377.6781 C544.5781,375.975 545.7969,374.7719 547.5,374.7719 C548.0781,374.7719 548.6563,374.9125 549.125,375.1625 C549.5938,375.4281 549.7656,375.6156 549.8281,375.975 C549.9531,376.6469 550.2031,376.8969 550.7344,376.8969 C551.0156,376.8969 551.2969,376.7562 551.4844,376.5375 C551.6094,376.3656 551.6563,376.1937 551.6563,375.7562 L551.6563,374.3969 C551.6563,373.975 551.6406,373.8344 551.5156,373.6625 C551.3438,373.4125 551.0625,373.2562 550.7344,373.2562 C550.4219,373.2562 550.2188,373.3656 550,373.6312 C548.8281,373.1312 548.3906,373.0219 547.4375,373.0219 C544.7656,373.0219 542.75,375.0375 542.75,377.6625 L542.75,378.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="568.25" y="382.206">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="35" x="638.5" y="358.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="33" x="639.5" y="372.8001">T,C&lt;&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="480.5" x2="669.5" y1="393.6" y2="393.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="480.5" x2="669.5" y1="401.6" y2="401.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="485.5" y="410.5"/>
-          <ellipse cx="490.5" cy="415.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="499.5" y="418.6059">template_template : C&lt;T&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="62.2104">comparator : CMP</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001449136415707203971">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001449136415707203971" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="96" x="527" y="244.2"/>
-        <ellipse cx="542" cy="260.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M537,261.3563 C537,263.8563 539.1406,265.6688 542.0625,265.6688 C543.2969,265.6688 544.4688,265.3719 545.2188,264.8563 C545.8281,264.4344 546.1563,264.0125 546.1563,263.6063 C546.1563,263.1375 545.7344,262.7313 545.2344,262.7313 C545,262.7313 544.7813,262.8094 544.5781,263.0125 C544.1406,263.45 544.1406,263.45 543.9688,263.5438 C543.5156,263.7781 542.875,263.9188 542.1094,263.9188 C540.1094,263.9188 538.8281,262.9031 538.8281,261.325 L538.8281,260.2781 C538.8281,258.575 540.0469,257.3719 541.75,257.3719 C542.3281,257.3719 542.9063,257.5125 543.375,257.7625 C543.8438,258.0281 544.0156,258.2156 544.0781,258.575 C544.2031,259.2469 544.4531,259.4969 544.9844,259.4969 C545.2656,259.4969 545.5469,259.3563 545.7344,259.1375 C545.8594,258.9656 545.9063,258.7938 545.9063,258.3563 L545.9063,256.9969 C545.9063,256.575 545.8906,256.4344 545.7656,256.2625 C545.5938,256.0125 545.3125,255.8563 544.9844,255.8563 C544.6719,255.8563 544.4688,255.9656 544.25,256.2313 C543.0781,255.7313 542.6406,255.6219 541.6875,255.6219 C539.0156,255.6219 537,257.6375 537,260.2625 L537,261.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="556" y="264.806">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="53" x="573" y="241.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="51" x="574" y="255.4001">int,Vector</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="528" x2="622" y1="276.2" y2="276.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="528" x2="622" y1="284.2" y2="284.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
+      <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001562396858816419857">
-        <rect codeLine="26" fill="#F1F1F1" height="106.3998" id="C_0001562396858816419857" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="277" x="436.5" y="31.2"/>
-        <ellipse cx="565.75" cy="47.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M560.75,48.3562 C560.75,50.8562 562.8906,52.6687 565.8125,52.6687 C567.0469,52.6687 568.2188,52.3719 568.9688,51.8562 C569.5781,51.4344 569.9063,51.0125 569.9063,50.6062 C569.9063,50.1375 569.4844,49.7312 568.9844,49.7312 C568.75,49.7312 568.5313,49.8094 568.3281,50.0125 C567.8906,50.45 567.8906,50.45 567.7188,50.5437 C567.2656,50.7781 566.625,50.9187 565.8594,50.9187 C563.8594,50.9187 562.5781,49.9031 562.5781,48.325 L562.5781,47.2781 C562.5781,45.575 563.7969,44.3719 565.5,44.3719 C566.0781,44.3719 566.6563,44.5125 567.125,44.7625 C567.5938,45.0281 567.7656,45.2156 567.8281,45.575 C567.9531,46.2469 568.2031,46.4969 568.7344,46.4969 C569.0156,46.4969 569.2969,46.3562 569.4844,46.1375 C569.6094,45.9656 569.6563,45.7937 569.6563,45.3562 L569.6563,43.9969 C569.6563,43.575 569.6406,43.4344 569.5156,43.2625 C569.3438,43.0125 569.0625,42.8562 568.7344,42.8562 C568.4219,42.8562 568.2188,42.9656 568,43.2312 C566.8281,42.7312 566.3906,42.6219 565.4375,42.6219 C562.7656,42.6219 560.75,44.6375 560.75,47.2625 L560.75,48.3562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="586.25" y="51.806">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="437.5" x2="712.5" y1="63.2" y2="63.2"/>
-        <ellipse cx="447.5" cy="77.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="251" x="456.5" y="80.2059">D&lt;Items...&gt;(std::tuple&lt;Items...&gt; *) : void</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="437.5" x2="712.5" y1="87.9999" y2="87.9999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="442.5" y="96.8999"/>
-          <ellipse cx="447.5" cy="101.8999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="94" x="456.5" y="105.0059">add(int i) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="437.5" x2="712.5" y1="112.7999" y2="112.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="442.5" y="121.6998"/>
-          <ellipse cx="447.5" cy="126.6998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="456.5" y="129.8058">ints : B&lt;int,Vector&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="26" y="75.0151">ints : std::array&lt;int,N&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001787658457052431115">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0001787658457052431115" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="834.5" y="370"/>
-        <ellipse cx="849.5" cy="386" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M844.5,387.1563 C844.5,389.6563 846.6406,391.4688 849.5625,391.4688 C850.7969,391.4688 851.9688,391.1719 852.7188,390.6563 C853.3281,390.2344 853.6563,389.8125 853.6563,389.4063 C853.6563,388.9375 853.2344,388.5313 852.7344,388.5313 C852.5,388.5313 852.2813,388.6094 852.0781,388.8125 C851.6406,389.25 851.6406,389.25 851.4688,389.3438 C851.0156,389.5781 850.375,389.7188 849.6094,389.7188 C847.6094,389.7188 846.3281,388.7031 846.3281,387.125 L846.3281,386.0781 C846.3281,384.375 847.5469,383.1719 849.25,383.1719 C849.8281,383.1719 850.4063,383.3125 850.875,383.5625 C851.3438,383.8281 851.5156,384.0156 851.5781,384.375 C851.7031,385.0469 851.9531,385.2969 852.4844,385.2969 C852.7656,385.2969 853.0469,385.1563 853.2344,384.9375 C853.3594,384.7656 853.4063,384.5938 853.4063,384.1563 L853.4063,382.7969 C853.4063,382.375 853.3906,382.2344 853.2656,382.0625 C853.0938,381.8125 852.8125,381.6563 852.4844,381.6563 C852.1719,381.6563 851.9688,381.7656 851.75,382.0313 C850.5781,381.5313 850.1406,381.4219 849.1875,381.4219 C846.5156,381.4219 844.5,383.4375 844.5,386.0625 L844.5,387.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="863.5" y="390.606">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="835.5" x2="874.5" y1="402" y2="402"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="835.5" x2="874.5" y1="410" y2="410"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="79.6094"/>
+      <ellipse cx="17" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <g id="elem_C_0001549419203490064906">
-        <rect codeLine="38" fill="#F1F1F1" height="64.7999" id="C_0001549419203490064906" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="174" x="863" y="235.8"/>
-        <ellipse cx="878" cy="251.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M873,252.9562 C873,255.4562 875.1406,257.2687 878.0625,257.2687 C879.2969,257.2687 880.4688,256.9719 881.2188,256.4562 C881.8281,256.0344 882.1563,255.6125 882.1563,255.2062 C882.1563,254.7375 881.7344,254.3312 881.2344,254.3312 C881,254.3312 880.7813,254.4094 880.5781,254.6125 C880.1406,255.05 880.1406,255.05 879.9688,255.1437 C879.5156,255.3781 878.875,255.5187 878.1094,255.5187 C876.1094,255.5187 874.8281,254.5031 874.8281,252.925 L874.8281,251.8781 C874.8281,250.175 876.0469,248.9719 877.75,248.9719 C878.3281,248.9719 878.9063,249.1125 879.375,249.3625 C879.8438,249.6281 880.0156,249.8156 880.0781,250.175 C880.2031,250.8469 880.4531,251.0969 880.9844,251.0969 C881.2656,251.0969 881.5469,250.9562 881.7344,250.7375 C881.8594,250.5656 881.9063,250.3937 881.9063,249.9562 L881.9063,248.5969 C881.9063,248.175 881.8906,248.0344 881.7656,247.8625 C881.5938,247.6125 881.3125,247.4562 880.9844,247.4562 C880.6719,247.4562 880.4688,247.5656 880.25,247.8312 C879.0781,247.3312 878.6406,247.2219 877.6875,247.2219 C875.0156,247.2219 873,249.2375 873,251.8625 L873,252.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="892" y="256.406">E::nested_template</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="17" x="1023" y="232.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="15" x="1024" y="247.0001">ET</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="864" x2="1036" y1="267.8" y2="267.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="869" y="276.7"/>
-          <ellipse cx="874" cy="281.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="109" x="883" y="284.8059">get(ET * d) : DT *</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="864" x2="1036" y1="292.5999" y2="292.5999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="26" y="87.8198">pointer : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <g id="elem_C_0000033637089897037832">
-        <rect codeLine="43" fill="#F1F1F1" height="64.7999" id="C_0000033637089897037832" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="748.5" y="52"/>
-        <ellipse cx="777" cy="68" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M772,69.1563 C772,71.6563 774.1406,73.4688 777.0625,73.4688 C778.2969,73.4688 779.4688,73.1719 780.2188,72.6563 C780.8281,72.2344 781.1563,71.8125 781.1563,71.4063 C781.1563,70.9375 780.7344,70.5313 780.2344,70.5313 C780,70.5313 779.7813,70.6094 779.5781,70.8125 C779.1406,71.25 779.1406,71.25 778.9688,71.3438 C778.5156,71.5781 777.875,71.7188 777.1094,71.7188 C775.1094,71.7188 773.8281,70.7031 773.8281,69.125 L773.8281,68.0781 C773.8281,66.375 775.0469,65.1719 776.75,65.1719 C777.3281,65.1719 777.9063,65.3125 778.375,65.5625 C778.8438,65.8281 779.0156,66.0156 779.0781,66.375 C779.2031,67.0469 779.4531,67.2969 779.9844,67.2969 C780.2656,67.2969 780.5469,67.1563 780.7344,66.9375 C780.8594,66.7656 780.9063,66.5938 780.9063,66.1563 L780.9063,64.7969 C780.9063,64.375 780.8906,64.2344 780.7656,64.0625 C780.5938,63.8125 780.3125,63.6563 779.9844,63.6563 C779.6719,63.6563 779.4688,63.7656 779.25,64.0313 C778.0781,63.5313 777.6406,63.4219 776.6875,63.4219 C774.0156,63.4219 772,65.4375 772,68.0625 L772,69.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="794" y="72.606">E::nested_template</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="26" x="938.5" y="49"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="24" x="939.5" y="63.2001">char</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="749.5" x2="960.5" y1="84" y2="84"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="754.5" y="92.9"/>
-          <ellipse cx="759.5" cy="97.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="187" x="768.5" y="101.0059">getDecl(char * c) : DeclType *</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="749.5" x2="960.5" y1="108.7999" y2="108.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="92.4141"/>
+      <ellipse cx="17" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0001449136415707203971_C_0001968575752686868237">
-      <path codeLine="47" d="M575,292.49 C575,311.96 575,321.92 575,343.41 " fill="none" id="C_0001449136415707203971-to-C_0001968575752686868237" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="575,361.41,581,343.41,569,343.41,575,361.41" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001562396858816419857_C_0001449136415707203971">
-      <path codeLine="48" d="M575,149.98 C575,185.01 575,217.33 575,243.91 " fill="none" id="C_0001562396858816419857-backto-C_0001449136415707203971" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="575,137.98,571,143.98,575,149.98,579,143.98,575,137.98" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="581" cy="198.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="588" y="201.877">ints</text>
-    </g>
-    <g id="link_C_0001549419203490064906_C_0001787658457052431115">
-      <path codeLine="49" d="M925.54,301.08 C909.04,322.57 897.4008,337.7468 882.5208,357.1368 " fill="none" id="C_0001549419203490064906-to-C_0001787658457052431115" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="877.6504" cy="363.4834" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="882.5208" x2="872.78" y1="357.1368" y2="369.83"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="883.997" x2="871.3038" y1="368.3538" y2="358.613"/>
-    </g>
-    <g id="link_C_0000033637089897037832_C_0001787658457052431115">
-      <path codeLine="50" d="M851.54,117.13 C847.41,159.12 841.48,235.43 845,300.6 C846.27,324.12 847.2884,335.0021 849.6984,353.6421 " fill="none" id="C_0000033637089897037832-to-C_0001787658457052431115" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="850.7242" cy="361.576" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="849.6984" x2="851.75" y1="353.6421" y2="369.51"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="858.6582" x2="842.7902" y1="360.5502" y2="362.6018"/>
-    </g>
-    <g id="link_C_0000033637089897037832_C_0001549419203490064906">
-      <path codeLine="51" d="M871.55,117.07 C888.93,150.33 907.7735,186.3969 925.1435,219.6369 " fill="none" id="C_0000033637089897037832-to-C_0001549419203490064906" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="933.48,235.59,930.4612,216.858,919.8258,222.4157,933.48,235.59" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="88" x="26" y="100.6245">reference : T &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="105.2188"/>
+      <ellipse cx="17" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="113.4292">value : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="118.0234"/>
+      <ellipse cx="17" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="26" y="126.2339">values : std::vector&lt;P&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="250" y="40"/>
+      <ellipse cx="300.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M303.2188,61.6406 Q302.6406,61.9375 302,62.0781 Q301.3594,62.2344 300.6563,62.2344 Q298.1563,62.2344 296.8281,60.5938 Q295.5156,58.9375 295.5156,55.8125 Q295.5156,52.6875 296.8281,51.0313 Q298.1563,49.375 300.6563,49.375 Q301.3594,49.375 302,49.5313 Q302.6563,49.6875 303.2188,49.9844 L303.2188,52.7031 Q302.5938,52.125 302,51.8594 Q301.4063,51.5781 300.7813,51.5781 Q299.4375,51.5781 298.75,52.6563 Q298.0625,53.7188 298.0625,55.8125 Q298.0625,57.9063 298.75,58.9844 Q299.4375,60.0469 300.7813,60.0469 Q301.4063,60.0469 302,59.7813 Q302.5938,59.5 303.2188,58.9219 L303.2188,61.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="320.75" y="60.1543">Vector</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="405" y="37"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="406" y="49.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="72" y2="72"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="80" y2="80"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="86"/>
+      <ellipse cx="261" cy="91" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="270" y="94.2104">values : std::vector&lt;T&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="490" y="332"/>
+      <ellipse cx="548.75" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M551.7188,353.6406 Q551.1406,353.9375 550.5,354.0781 Q549.8594,354.2344 549.1563,354.2344 Q546.6563,354.2344 545.3281,352.5938 Q544.0156,350.9375 544.0156,347.8125 Q544.0156,344.6875 545.3281,343.0313 Q546.6563,341.375 549.1563,341.375 Q549.8594,341.375 550.5,341.5313 Q551.1563,341.6875 551.7188,341.9844 L551.7188,344.7031 Q551.0938,344.125 550.5,343.8594 Q549.9063,343.5781 549.2813,343.5781 Q547.9375,343.5781 547.25,344.6563 Q546.5625,345.7188 546.5625,347.8125 Q546.5625,349.9063 547.25,350.9844 Q547.9375,352.0469 549.2813,352.0469 Q549.9063,352.0469 550.5,351.7813 Q551.0938,351.5 551.7188,350.9219 L551.7188,353.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="569.25" y="352.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="41" x="629" y="329"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="630" y="341.1387">T,C&lt;&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="364" y2="364"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="372" y2="372"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496" y="378"/>
+      <ellipse cx="501" cy="383" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="510" y="386.2104">template_template : C&lt;T&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="526" y="216.5"/>
+      <ellipse cx="541" cy="232.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M543.9688,238.1406 Q543.3906,238.4375 542.75,238.5781 Q542.1094,238.7344 541.4063,238.7344 Q538.9063,238.7344 537.5781,237.0938 Q536.2656,235.4375 536.2656,232.3125 Q536.2656,229.1875 537.5781,227.5313 Q538.9063,225.875 541.4063,225.875 Q542.1094,225.875 542.75,226.0313 Q543.4063,226.1875 543.9688,226.4844 L543.9688,229.2031 Q543.3438,228.625 542.75,228.3594 Q542.1563,228.0781 541.5313,228.0781 Q540.1875,228.0781 539.5,229.1563 Q538.8125,230.2188 538.8125,232.3125 Q538.8125,234.4063 539.5,235.4844 Q540.1875,236.5469 541.5313,236.5469 Q542.1563,236.5469 542.75,236.2813 Q543.3438,236 543.9688,235.4219 L543.9688,238.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="555" y="236.6543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="63" x="571" y="213.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="572" y="225.6387">int,Vector</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="248.5" y2="248.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="256.5" y2="256.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="94.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="446" y="23.5"/>
+      <ellipse cx="569.75" cy="39.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M572.7188,45.1406 Q572.1406,45.4375 571.5,45.5781 Q570.8594,45.7344 570.1563,45.7344 Q567.6563,45.7344 566.3281,44.0938 Q565.0156,42.4375 565.0156,39.3125 Q565.0156,36.1875 566.3281,34.5313 Q567.6563,32.875 570.1563,32.875 Q570.8594,32.875 571.5,33.0313 Q572.1563,33.1875 572.7188,33.4844 L572.7188,36.2031 Q572.0938,35.625 571.5,35.3594 Q570.9063,35.0781 570.2813,35.0781 Q568.9375,35.0781 568.25,36.1563 Q567.5625,37.2188 567.5625,39.3125 Q567.5625,41.4063 568.25,42.4844 Q568.9375,43.5469 570.2813,43.5469 Q570.9063,43.5469 571.5,43.2813 Q572.0938,43 572.7188,42.4219 L572.7188,45.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="590.25" y="43.6543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="710" y1="55.5" y2="55.5"/>
+      <ellipse cx="457" cy="66.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="239" x="466" y="69.7104">D&lt;Items...&gt;(std::tuple&lt;Items...&gt; *) : void</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="447" x2="710" y1="76.3047" y2="76.3047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="82.3047"/>
+      <ellipse cx="457" cy="87.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="466" y="90.5151">add(int i) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="710" y1="97.1094" y2="97.1094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="103.1094"/>
+      <ellipse cx="457" cy="108.1094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="466" y="111.3198">ints : B&lt;int,Vector&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="823.5" y="338.5"/>
+      <ellipse cx="838.5" cy="354.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M841.4688,360.1406 Q840.8906,360.4375 840.25,360.5781 Q839.6094,360.7344 838.9063,360.7344 Q836.4063,360.7344 835.0781,359.0938 Q833.7656,357.4375 833.7656,354.3125 Q833.7656,351.1875 835.0781,349.5313 Q836.4063,347.875 838.9063,347.875 Q839.6094,347.875 840.25,348.0313 Q840.9063,348.1875 841.4688,348.4844 L841.4688,351.2031 Q840.8438,350.625 840.25,350.3594 Q839.6563,350.0781 839.0313,350.0781 Q837.6875,350.0781 837,351.1563 Q836.3125,352.2188 836.3125,354.3125 Q836.3125,356.4063 837,357.4844 Q837.6875,358.5469 839.0313,358.5469 Q839.6563,358.5469 840.25,358.2813 Q840.8438,358 841.4688,357.4219 L841.4688,360.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="852.5" y="358.6543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="370.5" y2="370.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="378.5" y2="378.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="852" y="210"/>
+      <ellipse cx="867" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M869.9688,231.6406 Q869.3906,231.9375 868.75,232.0781 Q868.1094,232.2344 867.4063,232.2344 Q864.9063,232.2344 863.5781,230.5938 Q862.2656,228.9375 862.2656,225.8125 Q862.2656,222.6875 863.5781,221.0313 Q864.9063,219.375 867.4063,219.375 Q868.1094,219.375 868.75,219.5313 Q869.4063,219.6875 869.9688,219.9844 L869.9688,222.7031 Q869.3438,222.125 868.75,221.8594 Q868.1563,221.5781 867.5313,221.5781 Q866.1875,221.5781 865.5,222.6563 Q864.8125,223.7188 864.8125,225.8125 Q864.8125,227.9063 865.5,228.9844 Q866.1875,230.0469 867.5313,230.0469 Q868.1563,230.0469 868.75,229.7813 Q869.3438,229.5 869.9688,228.9219 L869.9688,231.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="881" y="230.1543">E::nested_template</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="17" x="1011" y="207"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="15" x="1012" y="219.1387">ET</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="242" y2="242"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="858" y="248"/>
+      <ellipse cx="863" cy="253" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="98" x="872" y="256.2104">get(ET * d) : DT *</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="262.8047" y2="262.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="60.8047" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="746.5" y="40"/>
+      <ellipse cx="765.1" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M768.0688,61.6406 Q767.4906,61.9375 766.85,62.0781 Q766.2094,62.2344 765.5063,62.2344 Q763.0063,62.2344 761.6781,60.5938 Q760.3656,58.9375 760.3656,55.8125 Q760.3656,52.6875 761.6781,51.0313 Q763.0063,49.375 765.5063,49.375 Q766.2094,49.375 766.85,49.5313 Q767.5063,49.6875 768.0688,49.9844 L768.0688,52.7031 Q767.4438,52.125 766.85,51.8594 Q766.2563,51.5781 765.6313,51.5781 Q764.2875,51.5781 763.6,52.6563 Q762.9125,53.7188 762.9125,55.8125 Q762.9125,57.9063 763.6,58.9844 Q764.2875,60.0469 765.6313,60.0469 Q766.2563,60.0469 766.85,59.7813 Q767.4438,59.5 768.0688,58.9219 L768.0688,61.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="779.9" y="60.1543">E::nested_template</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="30" x="913.5" y="37"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="914.5" y="49.1387">char</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="72" y2="72"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="752.5" y="78"/>
+      <ellipse cx="757.5" cy="83" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="168" x="766.5" y="86.2104">getDecl(char * c) : DeclType *</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="92.8047" y2="92.8047"/>
+    <path d="M578.5,264.64 C578.5,277.97 578.5,295.27 578.5,311.55 " fill="none" id="C_0001449136415707203971-&gt;C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="585.5,311.61,578.5,331.61,571.5,311.61,585.5,311.61" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M578.5,131.05 C578.5,160.58 578.5,194.53 578.5,216.46 " fill="none" id="C_0001562396858816419857&lt;-C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="578.5,117.85,574.5,123.85,578.5,129.85,582.5,123.85,578.5,117.85" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="584.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="591.5" y="176.0669">ints</text>
+    <path d="M915.02,271.16 C901.78,287.89 885.16,308.88 871.28,326.42 " fill="none" id="C_0001549419203490064906-&gt;C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="866.9278" cy="331.9193" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="871.8955" x2="861.96" y1="325.6487" y2="338.19"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="873.1984" x2="860.6571" y1="336.8871" y2="326.9516"/>
+    <path d="M840.4,101.25 C836.74,140.24 831.51,210.75 834.5,271 C835.36,288.27 837.13,307.32 838.87,323.47 " fill="none" id="C_0000033637089897037832-&gt;C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="839.6807" cy="330.5307" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="838.7813" x2="840.58" y1="322.5814" y2="338.48"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="847.6299" x2="831.7314" y1="329.6314" y2="331.4301"/>
+    <path d="M860.27,101.15 C874.53,126.38 895.29,163.08 911.83,192.34 " fill="none" id="C_0000033637089897037832-&gt;C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="917.99,189.01,921.74,209.87,905.8,195.9,917.99,189.01" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00008_class_mermaid.svg b/docs/test_cases/t00008_class_mermaid.svg
index 7a9afd27..8ac8aafc 100644
--- a/docs/test_cases/t00008_class_mermaid.svg
+++ b/docs/test_cases/t00008_class_mermaid.svg
@@ -1,65 +1,60 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1086.59375 481" style="max-width: 1086.59px; background-color: white;" width="1086.59375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1075.48046875 481" style="max-width: 1075.48px; background-color: white;" width="1075.48046875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M623.2421875,333L623.2421875,339C623.2421875,345,623.2421875,357,623.2421875,364.1666666666667C623.2421875,371.3333333333333,623.2421875,373.6666666666667,623.2421875,374.8333333333333L623.2421875,376"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M623.2421875,182L623.2421875,190.16666666666666C623.2421875,198.33333333333334,623.2421875,214.66666666666666,623.2421875,230.33333333333334C623.2421875,246,623.2421875,261,623.2421875,268.5L623.2421875,276"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M858.7560452999094,134.36355046037843L848.6378502499246,150.4696253836487C838.5196551999396,166.57570030691895,818.2832650999699,198.78785015345946,808.1650700499849,227.14392507672974C798.046875,255.5,798.046875,280,798.046875,303C798.046875,326,798.046875,347.5,803.2617692183462,362.4166666666667C808.4766634366924,377.3333333333333,818.906451873385,385.6666666666667,824.1213460917312,389.8333333333333L829.3362403100775,394"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M898.6323276087663,135.10195872931308L908.3680855073053,151.0849656077609C918.1038434058443,167.06797248620873,937.5753592029222,199.03398624310435,947.311117101461,220.68365978821885C957.046875,242.33333333333334,957.046875,253.66666666666666,957.046875,259.3333333333333L957.046875,265"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M957.046875,344L957.046875,348.1666666666667C957.046875,352.3333333333333,957.046875,360.6666666666667,954.305668334283,367.0921817445679C951.564461668566,373.5176968224692,946.082048337132,378.03539364493844,943.3408416714151,380.294242056173L940.5996350056981,382.55309046740757"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M618.796875,333L618.796875,339C618.796875,345,618.796875,357,618.796875,367.1666666666667C618.796875,377.3333333333333,618.796875,385.6666666666667,618.796875,389.8333333333333L618.796875,394"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M618.796875,164L618.796875,175.16666666666666C618.796875,186.33333333333334,618.796875,208.66666666666666,618.796875,227.33333333333334C618.796875,246,618.796875,261,618.796875,268.5L618.796875,276"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M861.4921875,122.9321591019065L850.1770833333334,140.94346591825544C838.8619791666666,158.95477273460435,816.2317708333334,194.9773863673022,804.9166666666666,225.2386931836511C793.6015625,255.5,793.6015625,280,793.6015625,303C793.6015625,326,793.6015625,347.5,798.8164567183462,362.4166666666667C804.0313509366924,377.3333333333333,814.461139373385,385.6666666666667,819.6760335917312,389.8333333333333L824.8909278100775,394"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M887.1640625,124.18837639324053L897.6998697916666,141.99031366103378C908.2356770833334,159.79225092882703,929.3072916666666,195.39612546441353,939.8430989583334,218.86472939887344C950.37890625,242.33333333333334,950.37890625,253.66666666666666,950.37890625,259.3333333333333L950.37890625,265"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M950.37890625,344L950.37890625,348.1666666666667C950.37890625,352.3333333333333,950.37890625,360.6666666666667,945.4660650839793,369C940.5532239179587,377.3333333333333,930.7275415859173,385.6666666666667,925.8147004198967,389.8333333333333L920.901859253876,394"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -73,7 +68,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(623.2421875, 231)" class="edgeLabel">
+        <g transform="translate(618.796875, 231)" class="edgeLabel">
           <g transform="translate(-17.125, -9)" class="label">
             <foreignObject height="18" width="34.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -119,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L9">
+        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L9">
           <g title="A" id="classId-C_0002293517130897538130-0" class="node default clickable">
             <rect height="189" width="242.171875" y="-94.5" x="-121.0859375" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="121.0859375" x1="-121.0859375" class="divider"/>
@@ -147,7 +142,7 @@
               </foreignObject>
               <foreignObject transform="translate( -113.5859375, -9)" height="18" width="81.375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+pointer : T</span>
+                  <span style="font-style:italic;" class="nodeLabel">+pointer : T </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -113.5859375, 13)" height="18" width="114.59375">
@@ -168,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L20">
+        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L20">
           <g title="Vector" id="classId-C_0001677407014842680311-1" class="node default clickable">
             <rect height="79" width="186.203125" y="-39.5" x="-93.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="93.1015625" x1="-93.1015625" class="divider"/>
@@ -192,7 +187,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(623.2421875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24">
+        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001968575752686868237-2" class="node default clickable">
             <rect height="79" width="209.328125" y="-39.5" x="-104.6640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="104.6640625" x1="-104.6640625" class="divider"/>
@@ -216,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(623.2421875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L24">
+        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001449136415707203971-3" class="node default clickable">
             <rect height="57" width="118.15625" y="-28.5" x="-59.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.078125" x1="-59.078125" class="divider"/>
@@ -235,11 +230,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(623.2421875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L28">
+        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L28">
           <g title="D" id="classId-C_0001562396858816419857-4" class="node default clickable">
-            <rect height="123" width="173.734375" y="-61.5" x="-86.8671875" class="outer title-state"/>
-            <line y2="-31.5" y1="-31.5" x2="86.8671875" x1="-86.8671875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="86.8671875" x1="-86.8671875" class="divider"/>
+            <rect height="123" width="164.84375" y="-61.5" x="-82.421875" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="82.421875" x1="-82.421875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="82.421875" x1="-82.421875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -251,25 +246,25 @@
                   <span class="nodeLabel">D</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -79.3671875, -20)" height="18" width="143.640625">
+              <foreignObject transform="translate( -74.921875, -20)" height="18" width="143.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+ints : B&lt;int,Vector&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -79.3671875, 14)" height="18" width="158.734375">
+              <foreignObject transform="translate( -74.921875, 14)" height="18" width="149.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+D(std::tuple *) : : void</span>
+                  <span class="nodeLabel">+D(std::tuple *) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -79.3671875, 36)" height="18" width="123.171875">
+              <foreignObject transform="translate( -74.921875, 36)" height="18" width="114.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+add(int i) : : void</span>
+                  <span class="nodeLabel">+add(int i) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(878.7734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L36">
+        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L36">
           <g title="E" id="classId-C_0001787658457052431115-5" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -288,7 +283,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(878.7734375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L37">
+        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L37">
           <g title="E##nested_template" id="classId-C_0001549419203490064906-6" class="node default clickable">
             <rect height="79" width="201.734375" y="-39.5" x="-100.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="100.8671875" x1="-100.8671875" class="divider"/>
@@ -304,19 +299,19 @@
                   <span class="nodeLabel">E::nested_template&lt;ET&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -93.3671875, 14)" height="18" width="140.359375">
+              <foreignObject transform="translate( -93.3671875, 14)" height="18" width="131.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+get(ET * d) : : DT *</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+get(ET * d) : DT *</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(957.046875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00008/t00008.cc#L44">
+        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L44">
           <g title="E##nested_template" id="classId-C_0000033637089897037832-7" class="node default clickable">
-            <rect height="79" width="243.09375" y="-39.5" x="-121.546875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="121.546875" x1="-121.546875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="121.546875" x1="-121.546875" class="divider"/>
+            <rect height="79" width="234.203125" y="-39.5" x="-117.1015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="117.1015625" x1="-117.1015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="117.1015625" x1="-117.1015625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -328,9 +323,9 @@
                   <span class="nodeLabel">E::nested_template&lt;char&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -114.046875, 14)" height="18" width="228.09375">
+              <foreignObject transform="translate( -109.6015625, 14)" height="18" width="219.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+getDecl(char * c) : : DeclType *</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+getDecl(char * c) : DeclType *</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00009.md b/docs/test_cases/t00009.md
index b77d0453..2bccfcb8 100644
--- a/docs/test_cases/t00009.md
+++ b/docs/test_cases/t00009.md
@@ -47,7 +47,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00009::A<T>",
+      "display_name": "A<T>",
       "id": "412228989111660105",
       "is_abstract": false,
       "is_nested": false,
@@ -89,7 +89,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00009::A<int>",
+      "display_name": "A<int>",
       "id": "1894387438043499",
       "is_abstract": false,
       "is_nested": false,
@@ -118,7 +118,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00009::A<std::string>",
+      "display_name": "A<std::string>",
       "id": "1340793233843139195",
       "is_abstract": false,
       "is_nested": false,
@@ -147,7 +147,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00009::A<std::vector<std::string>>",
+      "display_name": "A<std::vector<std::string>>",
       "id": "1370808797762248850",
       "is_abstract": false,
       "is_nested": false,
@@ -183,7 +183,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00009::B",
+      "display_name": "B",
       "id": "176239714450247310",
       "is_abstract": false,
       "is_nested": false,
@@ -242,6 +242,7 @@ public:
     }
   ],
   "name": "t00009_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index 410bafe7..c8124296 100644
--- a/docs/test_cases/t00009_class.svg
+++ b/docs/test_cases/t00009_class.svg
@@ -1,123 +1,107 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:410px;height:363px;background:#FFFFFF;" version="1.1" viewBox="0 0 410 363" width="410px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="fe3xriptox7v2" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000412228989111660105">
-        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000412228989111660105" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="108.5" y="291.4"/>
-        <ellipse cx="136.55" cy="307.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M131.55,308.5563 C131.55,311.0563 133.6906,312.8688 136.6125,312.8688 C137.8469,312.8688 139.0188,312.5719 139.7688,312.0563 C140.3781,311.6344 140.7063,311.2125 140.7063,310.8063 C140.7063,310.3375 140.2844,309.9313 139.7844,309.9313 C139.55,309.9313 139.3313,310.0094 139.1281,310.2125 C138.6906,310.65 138.6906,310.65 138.5188,310.7438 C138.0656,310.9781 137.425,311.1188 136.6594,311.1188 C134.6594,311.1188 133.3781,310.1031 133.3781,308.525 L133.3781,307.4781 C133.3781,305.775 134.5969,304.5719 136.3,304.5719 C136.8781,304.5719 137.4563,304.7125 137.925,304.9625 C138.3938,305.2281 138.5656,305.4156 138.6281,305.775 C138.7531,306.4469 139.0031,306.6969 139.5344,306.6969 C139.8156,306.6969 140.0969,306.5563 140.2844,306.3375 C140.4094,306.1656 140.4563,305.9938 140.4563,305.5563 L140.4563,304.1969 C140.4563,303.775 140.4406,303.6344 140.3156,303.4625 C140.1438,303.2125 139.8625,303.0563 139.5344,303.0563 C139.2219,303.0563 139.0188,303.1656 138.8,303.4313 C137.6281,302.9313 137.1906,302.8219 136.2375,302.8219 C133.5656,302.8219 131.55,304.8375 131.55,307.4625 L131.55,308.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="153.45" y="312.006">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="183.5" y="288.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="184.5" y="302.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="109.5" x2="188.5" y1="323.4" y2="323.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="109.5" x2="188.5" y1="331.4" y2="331.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="114.5" y="340.3"/>
-          <ellipse cx="119.5" cy="345.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="128.5" y="348.4059">value : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
+      <ellipse cx="142.3" cy="296" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M145.2688,301.6406 Q144.6906,301.9375 144.05,302.0781 Q143.4094,302.2344 142.7063,302.2344 Q140.2063,302.2344 138.8781,300.5938 Q137.5656,298.9375 137.5656,295.8125 Q137.5656,292.6875 138.8781,291.0313 Q140.2063,289.375 142.7063,289.375 Q143.4094,289.375 144.05,289.5313 Q144.7063,289.6875 145.2688,289.9844 L145.2688,292.7031 Q144.6438,292.125 144.05,291.8594 Q143.4563,291.5781 142.8313,291.5781 Q141.4875,291.5781 140.8,292.6563 Q140.1125,293.7188 140.1125,295.8125 Q140.1125,297.9063 140.8,298.9844 Q141.4875,300.0469 142.8313,300.0469 Q143.4563,300.0469 144.05,299.7813 Q144.6438,299.5 145.2688,298.9219 L145.2688,301.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="158.7" y="300.1543">A</text>
+      <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"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="320" y2="320"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000001894387438043499">
-        <rect codeLine="7" fill="#F1F1F1" height="48" id="C_0000001894387438043499" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="7" y="182.4"/>
-        <ellipse cx="22" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,199.5562 C17,202.0562 19.1406,203.8687 22.0625,203.8687 C23.2969,203.8687 24.4688,203.5719 25.2188,203.0562 C25.8281,202.6344 26.1563,202.2125 26.1563,201.8062 C26.1563,201.3375 25.7344,200.9312 25.2344,200.9312 C25,200.9312 24.7813,201.0094 24.5781,201.2125 C24.1406,201.65 24.1406,201.65 23.9688,201.7437 C23.5156,201.9781 22.875,202.1187 22.1094,202.1187 C20.1094,202.1187 18.8281,201.1031 18.8281,199.525 L18.8281,198.4781 C18.8281,196.775 20.0469,195.5719 21.75,195.5719 C22.3281,195.5719 22.9063,195.7125 23.375,195.9625 C23.8438,196.2281 24.0156,196.4156 24.0781,196.775 C24.2031,197.4469 24.4531,197.6969 24.9844,197.6969 C25.2656,197.6969 25.5469,197.5562 25.7344,197.3375 C25.8594,197.1656 25.9063,196.9937 25.9063,196.5562 L25.9063,195.1969 C25.9063,194.775 25.8906,194.6344 25.7656,194.4625 C25.5938,194.2125 25.3125,194.0562 24.9844,194.0562 C24.6719,194.0562 24.4688,194.1656 24.25,194.4312 C23.0781,193.9312 22.6406,193.8219 21.6875,193.8219 C19.0156,193.8219 17,195.8375 17,198.4625 L17,199.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="203.006">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="53" y="179.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="54" y="193.6001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="64" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="64" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122.5" y="326"/>
+      <ellipse cx="127.5" cy="331" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001340793233843139195">
-        <rect codeLine="11" fill="#F1F1F1" height="48" id="C_0001340793233843139195" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="100.5" y="182.4"/>
-        <ellipse cx="115.5" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M110.5,199.5562 C110.5,202.0562 112.6406,203.8687 115.5625,203.8687 C116.7969,203.8687 117.9688,203.5719 118.7188,203.0562 C119.3281,202.6344 119.6563,202.2125 119.6563,201.8062 C119.6563,201.3375 119.2344,200.9312 118.7344,200.9312 C118.5,200.9312 118.2813,201.0094 118.0781,201.2125 C117.6406,201.65 117.6406,201.65 117.4688,201.7437 C117.0156,201.9781 116.375,202.1187 115.6094,202.1187 C113.6094,202.1187 112.3281,201.1031 112.3281,199.525 L112.3281,198.4781 C112.3281,196.775 113.5469,195.5719 115.25,195.5719 C115.8281,195.5719 116.4063,195.7125 116.875,195.9625 C117.3438,196.2281 117.5156,196.4156 117.5781,196.775 C117.7031,197.4469 117.9531,197.6969 118.4844,197.6969 C118.7656,197.6969 119.0469,197.5562 119.2344,197.3375 C119.3594,197.1656 119.4063,196.9937 119.4063,196.5562 L119.4063,195.1969 C119.4063,194.775 119.3906,194.6344 119.2656,194.4625 C119.0938,194.2125 118.8125,194.0562 118.4844,194.0562 C118.1719,194.0562 117.9688,194.1656 117.75,194.4312 C116.5781,193.9312 116.1406,193.8219 115.1875,193.8219 C112.5156,193.8219 110.5,195.8375 110.5,198.4625 L110.5,199.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="129.5" y="203.006">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="146.5" y="179.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="147.5" y="193.6001">std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="101.5" x2="196.5" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="101.5" x2="196.5" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="136.5" y="334.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001370808797762248850">
-        <rect codeLine="15" fill="#F1F1F1" height="48" id="C_0001370808797762248850" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="233" y="182.4"/>
-        <ellipse cx="248" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M243,199.5562 C243,202.0562 245.1406,203.8687 248.0625,203.8687 C249.2969,203.8687 250.4688,203.5719 251.2188,203.0562 C251.8281,202.6344 252.1563,202.2125 252.1563,201.8062 C252.1563,201.3375 251.7344,200.9312 251.2344,200.9312 C251,200.9312 250.7813,201.0094 250.5781,201.2125 C250.1406,201.65 250.1406,201.65 249.9688,201.7437 C249.5156,201.9781 248.875,202.1187 248.1094,202.1187 C246.1094,202.1187 244.8281,201.1031 244.8281,199.525 L244.8281,198.4781 C244.8281,196.775 246.0469,195.5719 247.75,195.5719 C248.3281,195.5719 248.9063,195.7125 249.375,195.9625 C249.8438,196.2281 250.0156,196.4156 250.0781,196.775 C250.2031,197.4469 250.4531,197.6969 250.9844,197.6969 C251.2656,197.6969 251.5469,197.5562 251.7344,197.3375 C251.8594,197.1656 251.9063,196.9937 251.9063,196.5562 L251.9063,195.1969 C251.9063,194.775 251.8906,194.6344 251.7656,194.4625 C251.5938,194.2125 251.3125,194.0562 250.9844,194.0562 C250.6719,194.0562 250.4688,194.1656 250.25,194.4312 C249.0781,193.9312 248.6406,193.8219 247.6875,193.8219 C245.0156,193.8219 243,195.8375 243,198.4625 L243,199.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="262" y="203.006">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="123" x="279" y="179.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="121" x="280" y="193.6001">std::vector&lt;std::string&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="234" x2="398" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="234" x2="398" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
+      <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
+      <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000176239714450247310">
-        <rect codeLine="19" fill="#F1F1F1" height="98.3998" id="C_0000176239714450247310" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="267" x="15.5" y="7"/>
-        <ellipse cx="140.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M135.25,24.1563 C135.25,26.6563 137.3906,28.4688 140.3125,28.4688 C141.5469,28.4688 142.7188,28.1719 143.4688,27.6563 C144.0781,27.2344 144.4063,26.8125 144.4063,26.4063 C144.4063,25.9375 143.9844,25.5313 143.4844,25.5313 C143.25,25.5313 143.0313,25.6094 142.8281,25.8125 C142.3906,26.25 142.3906,26.25 142.2188,26.3438 C141.7656,26.5781 141.125,26.7188 140.3594,26.7188 C138.3594,26.7188 137.0781,25.7031 137.0781,24.125 L137.0781,23.0781 C137.0781,21.375 138.2969,20.1719 140,20.1719 C140.5781,20.1719 141.1563,20.3125 141.625,20.5625 C142.0938,20.8281 142.2656,21.0156 142.3281,21.375 C142.4531,22.0469 142.7031,22.2969 143.2344,22.2969 C143.5156,22.2969 143.7969,22.1563 143.9844,21.9375 C144.1094,21.7656 144.1563,21.5938 144.1563,21.1563 L144.1563,19.7969 C144.1563,19.375 144.1406,19.2344 144.0156,19.0625 C143.8438,18.8125 143.5625,18.6563 143.2344,18.6563 C142.9219,18.6563 142.7188,18.7656 142.5,19.0313 C141.3281,18.5313 140.8906,18.4219 139.9375,18.4219 C137.2656,18.4219 135.25,20.4375 135.25,23.0625 L135.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="160.75" y="27.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="16.5" x2="281.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="16.5" x2="281.5" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.5" y="55.9"/>
-          <ellipse cx="26.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="35.5" y="64.0059">aint : A&lt;int&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.5" y="72.6999"/>
-          <ellipse cx="26.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="151" x="35.5" y="80.8059">astring : A&lt;std::string&gt; *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.5" y="89.4998"/>
-          <ellipse cx="26.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="241" x="35.5" y="97.6058">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
+      <ellipse cx="116" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M118.9688,192.6406 Q118.3906,192.9375 117.75,193.0781 Q117.1094,193.2344 116.4063,193.2344 Q113.9063,193.2344 112.5781,191.5938 Q111.2656,189.9375 111.2656,186.8125 Q111.2656,183.6875 112.5781,182.0313 Q113.9063,180.375 116.4063,180.375 Q117.1094,180.375 117.75,180.5313 Q118.4063,180.6875 118.9688,180.9844 L118.9688,183.7031 Q118.3438,183.125 117.75,182.8594 Q117.1563,182.5781 116.5313,182.5781 Q115.1875,182.5781 114.5,183.6563 Q113.8125,184.7188 113.8125,186.8125 Q113.8125,188.9063 114.5,189.9844 Q115.1875,191.0469 116.5313,191.0469 Q117.1563,191.0469 117.75,190.7813 Q118.3438,190.5 118.9688,189.9219 L118.9688,192.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="130" y="191.1543">A</text>
+      <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"/>
     </a>
-    <g id="link_C_0000001894387438043499_C_0000412228989111660105">
-      <path codeLine="25" d="M58.87,230.75 C75.89,248.14 86.724,259.2115 105.434,278.3115 " fill="none" id="C_0000001894387438043499-to-C_0000412228989111660105" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="118.03,291.17,109.7202,274.1128,101.1479,282.5101,118.03,291.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001340793233843139195_C_0000412228989111660105">
-      <path codeLine="26" d="M149,230.75 C149,248.14 149,254.07 149,273.17 " fill="none" id="C_0001340793233843139195-to-C_0000412228989111660105" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="149,291.17,155,273.17,143,273.17,149,291.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001370808797762248850_C_0000412228989111660105">
-      <path codeLine="27" d="M282.21,230.75 C255.52,249.19 232.986,264.7537 204.636,284.3537 " fill="none" id="C_0001370808797762248850-to-C_0000412228989111660105" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="189.83,294.59,208.0481,289.2891,201.2239,279.4184,189.83,294.59" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000176239714450247310_C_0000001894387438043499">
-      <path codeLine="28" d="M104.7229,115.2717 C85.1529,140.9317 69.31,161.72 53.75,182.12 " fill="none" id="C_0000176239714450247310-backto-C_0000001894387438043499" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="112,105.73,105.1809,108.0751,104.7229,115.2717,111.542,112.9265,112,105.73" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="96" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="103" y="148.477">aint</text>
-    </g>
-    <g id="link_C_0000176239714450247310_C_0001340793233843139195">
-      <path codeLine="29" d="M149,105.73 C149,131.39 149,155.72 149,176.12 " fill="none" id="C_0000176239714450247310-to-C_0001340793233843139195" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="149,182.12,153,173.12,149,177.12,145,173.12,149,182.12" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="155" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="162" y="148.477">astring</text>
-    </g>
-    <g id="link_C_0000176239714450247310_C_0001370808797762248850">
-      <path codeLine="30" d="M203.68,105.73 C232.6,131.39 262.2812,157.7387 285.2812,178.1387 " fill="none" id="C_0000176239714450247310-to-C_0001370808797762248850" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="289.77,182.12,285.6911,173.1555,286.0294,178.8022,280.3826,179.1405,289.77,182.12" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="258" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="265" y="148.477">avector</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
+      <ellipse cx="257" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M259.9688,192.6406 Q259.3906,192.9375 258.75,193.0781 Q258.1094,193.2344 257.4063,193.2344 Q254.9063,193.2344 253.5781,191.5938 Q252.2656,189.9375 252.2656,186.8125 Q252.2656,183.6875 253.5781,182.0313 Q254.9063,180.375 257.4063,180.375 Q258.1094,180.375 258.75,180.5313 Q259.4063,180.6875 259.9688,180.9844 L259.9688,183.7031 Q259.3438,183.125 258.75,182.8594 Q258.1563,182.5781 257.5313,182.5781 Q256.1875,182.5781 255.5,183.6563 Q254.8125,184.7188 254.8125,186.8125 Q254.8125,188.9063 255.5,189.9844 Q256.1875,191.0469 257.5313,191.0469 Q258.1563,191.0469 258.75,190.7813 Q259.3438,190.5 259.9688,189.9219 L259.9688,192.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="191.1543">A</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
+      <ellipse cx="145.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M148.7188,29.6406 Q148.1406,29.9375 147.5,30.0781 Q146.8594,30.2344 146.1563,30.2344 Q143.6563,30.2344 142.3281,28.5938 Q141.0156,26.9375 141.0156,23.8125 Q141.0156,20.6875 142.3281,19.0313 Q143.6563,17.375 146.1563,17.375 Q146.8594,17.375 147.5,17.5313 Q148.1563,17.6875 148.7188,17.9844 L148.7188,20.7031 Q148.0938,20.125 147.5,19.8594 Q146.9063,19.5781 146.2813,19.5781 Q144.9375,19.5781 144.25,20.6563 Q143.5625,21.7188 143.5625,23.8125 Q143.5625,25.9063 144.25,26.9844 Q144.9375,28.0469 146.2813,28.0469 Q146.9063,28.0469 147.5,27.7813 Q148.0938,27.5 148.7188,26.9219 L148.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.25" y="28.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="54"/>
+      <ellipse cx="36.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="45.5" y="62.2104">aint : A&lt;int&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="66.8047"/>
+      <ellipse cx="36.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="45.5" y="75.0151">astring : A&lt;std::string&gt; *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="79.6094"/>
+      <ellipse cx="36.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="231" x="45.5" y="87.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
+    </a>
+    <path d="M60.16,219.24 C74.1,232.65 92.08,249.94 108.57,265.8 " fill="none" id="C_0000001894387438043499-&gt;C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <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;"/>
+    <path d="M154,219.24 C154,230.87 154,245.42 154,259.43 " fill="none" id="C_0001340793233843139195-&gt;C_0000412228989111660105" 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;"/>
+    <path d="M300.32,219.24 C274.03,235.46 238.51,257.37 209.05,275.54 " fill="none" id="C_0001370808797762248850-&gt;C_0000412228989111660105" 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;"/>
+    <path d="M110.41,104.45 C91.49,127.23 70.29,152.74 55.37,170.69 " fill="none" id="C_0000176239714450247310&lt;-C_0000001894387438043499" 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>
+    <path d="M154,94.22 C154,117.28 154,145.22 154,165.66 " fill="none" id="C_0000176239714450247310-&gt;C_0001340793233843139195" 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>
+    <path d="M208.71,94.22 C239.58,118.04 277.19,147.07 303.87,167.66 " fill="none" id="C_0000176239714450247310-&gt;C_0001370808797762248850" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00009_class_mermaid.svg b/docs/test_cases/t00009_class_mermaid.svg
index 5bb62d6e..1a4eb5d8 100644
--- a/docs/test_cases/t00009_class_mermaid.svg
+++ b/docs/test_cases/t00009_class_mermaid.svg
@@ -1,66 +1,61 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 530.859375 393" style="max-width: 530.859px; background-color: white;" width="530.859375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M40.3984375,256L40.3984375,260.1666666666667C40.3984375,264.3333333333333,40.3984375,272.6666666666667,54.63530201463541,283.1851060127621C68.87216652927081,293.7035453588576,97.34589555854164,306.4070907177152,111.58276007317704,312.758863397144L125.81962458781246,319.1106360765728"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.96875,256L184.96875,260.1666666666667C184.96875,264.3333333333333,184.96875,272.6666666666667,184.96875,278C184.96875,283.3333333333333,184.96875,285.6666666666667,184.96875,286.8333333333333L184.96875,288"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M410,256L410,260.1666666666667C410,264.3333333333333,410,272.6666666666667,382.49715688931127,284.71638682319053C354.9943137786225,296.7661069797144,299.988627557245,312.53221395942876,272.48578444655624,320.415267449286L244.9829413358675,328.29832093914314"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M76.84952080548504,140.92120819636588L70.77434025457087,144.93434016363824C64.69915970365669,148.9474721309106,52.548798601828345,156.9737360654553,46.473618050914176,166.65353469939433C40.3984375,176.33333333333334,40.3984375,187.66666666666666,40.3984375,193.33333333333334L40.3984375,199"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M184.96875,131L184.96875,136.66666666666666C184.96875,142.33333333333334,184.96875,153.66666666666666,184.96875,164C184.96875,174.33333333333334,184.96875,183.66666666666666,184.96875,188.33333333333334L184.96875,193"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M329.8841623036649,131L343.2368019197208,136.66666666666666C356.5894415357766,142.33333333333334,383.2947207678883,153.66666666666666,396.6473603839442,164C410,174.33333333333334,410,183.66666666666666,410,188.33333333333334L410,193"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M40.3984375,256L40.3984375,260.1666666666667C40.3984375,264.3333333333333,40.3984375,272.6666666666667,57.375,284.40742141763485C74.3515625,296.1481761686031,108.3046875,311.29635233720614,125.28125,318.8704404215077L142.2578125,326.4445285058092"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.96875,256L184.96875,260.1666666666667C184.96875,264.3333333333333,184.96875,272.6666666666667,184.96875,281C184.96875,289.3333333333333,184.96875,297.6666666666667,184.96875,301.8333333333333L184.96875,306"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M410,256L410,260.1666666666667C410,264.3333333333333,410,272.6666666666667,379.61328125,285.5429830347637C349.2265625,298.41929940286076,288.453125,315.83859880572146,258.06640625,324.5482485071518L227.6796875,333.25789820858216"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M91.86849640052355,131L83.29015325043629,136.66666666666666C74.71181010034904,142.33333333333334,57.55512380017452,153.66666666666666,48.97678065008726,165C40.3984375,176.33333333333334,40.3984375,187.66666666666666,40.3984375,193.33333333333334L40.3984375,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M184.96875,131L184.96875,136.66666666666666C184.96875,142.33333333333334,184.96875,153.66666666666666,184.96875,165C184.96875,176.33333333333334,184.96875,187.66666666666666,184.96875,193.33333333333334L184.96875,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M329.8841623036649,131L343.2368019197208,136.66666666666666C356.5894415357766,142.33333333333334,383.2947207678883,153.66666666666666,396.6473603839442,165C410,176.33333333333334,410,187.66666666666666,410,193.33333333333334L410,199"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -131,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000412228989111660105-0" class="node default clickable">
             <rect height="79" width="85.421875" y="-39.5" x="-42.7109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.7109375" x1="-42.7109375" class="divider"/>
@@ -155,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7">
+        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000001894387438043499-1" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -174,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001340793233843139195-2" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -193,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L7">
+        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001370808797762248850-3" class="node default clickable">
             <rect height="57" width="225.71875" y="-28.5" x="-112.859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.859375" x1="-112.859375" class="divider"/>
@@ -212,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00009/t00009.cc#L12">
+        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L12">
           <g title="B" id="classId-C_0000176239714450247310-4" class="node default clickable">
             <rect height="123" width="295.59375" y="-61.5" x="-147.796875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="147.796875" x1="-147.796875" class="divider"/>
@@ -235,7 +230,7 @@
               </foreignObject>
               <foreignObject transform="translate( -140.296875, 2)" height="18" width="168.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+astring : A&lt;std::string&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+astring : A&lt;std::string&gt; </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -140.296875, 24)" height="18" width="280.59375">
diff --git a/docs/test_cases/t00010.md b/docs/test_cases/t00010.md
index 8e8e006d..0ae27f3b 100644
--- a/docs/test_cases/t00010.md
+++ b/docs/test_cases/t00010.md
@@ -51,7 +51,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00010::A<T,P>",
+      "display_name": "A<T,P>",
       "id": "2222216618904514099",
       "is_abstract": false,
       "is_nested": false,
@@ -111,7 +111,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00010::A<T,std::string>",
+      "display_name": "A<T,std::string>",
       "id": "1861520693741915300",
       "is_abstract": false,
       "is_nested": false,
@@ -146,7 +146,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00010::B<T>",
+      "display_name": "B<T>",
       "id": "2303611426082708583",
       "is_abstract": false,
       "is_nested": false,
@@ -188,7 +188,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00010::B<int>",
+      "display_name": "B<int>",
       "id": "1498376939480949099",
       "is_abstract": false,
       "is_nested": false,
@@ -217,7 +217,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00010::C",
+      "display_name": "C",
       "id": "1880966578968892571",
       "is_abstract": false,
       "is_nested": false,
@@ -252,6 +252,7 @@ public:
     }
   ],
   "name": "t00010_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index 3a91d9be..385fde7e 100644
--- a/docs/test_cases/t00010_class.svg
+++ b/docs/test_cases/t00010_class.svg
@@ -1,113 +1,101 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="597px" preserveAspectRatio="none" style="width:199px;height:597px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 597" width="199px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="f1azx6hcbi5gzm" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002222216618904514099">
-        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0002222216618904514099" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="51" y="508.6"/>
-        <ellipse cx="79.5" cy="524.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M74.5,525.7563 C74.5,528.2563 76.6406,530.0688 79.5625,530.0688 C80.7969,530.0688 81.9688,529.7719 82.7188,529.2563 C83.3281,528.8344 83.6563,528.4125 83.6563,528.0063 C83.6563,527.5375 83.2344,527.1313 82.7344,527.1313 C82.5,527.1313 82.2813,527.2094 82.0781,527.4125 C81.6406,527.85 81.6406,527.85 81.4688,527.9438 C81.0156,528.1781 80.375,528.3188 79.6094,528.3188 C77.6094,528.3188 76.3281,527.3031 76.3281,525.725 L76.3281,524.6781 C76.3281,522.975 77.5469,521.7719 79.25,521.7719 C79.8281,521.7719 80.4063,521.9125 80.875,522.1625 C81.3438,522.4281 81.5156,522.6156 81.5781,522.975 C81.7031,523.6469 81.9531,523.8969 82.4844,523.8969 C82.7656,523.8969 83.0469,523.7563 83.2344,523.5375 C83.3594,523.3656 83.4063,523.1938 83.4063,522.7563 L83.4063,521.3969 C83.4063,520.975 83.3906,520.8344 83.2656,520.6625 C83.0938,520.4125 82.8125,520.2563 82.4844,520.2563 C82.1719,520.2563 81.9688,520.3656 81.75,520.6313 C80.5781,520.1313 80.1406,520.0219 79.1875,520.0219 C76.5156,520.0219 74.5,522.0375 74.5,524.6625 L74.5,525.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="96.5" y="529.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="127" y="505.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="128" y="519.8001">T,P</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="52" x2="143" y1="540.6" y2="540.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="52" x2="143" y1="548.6" y2="548.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="57" y="557.5"/>
-          <ellipse cx="62" cy="562.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="71" y="565.6059">first : T</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="57" y="574.2999"/>
-          <ellipse cx="62" cy="579.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="67" x="71" y="582.4059">second : P</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
+      <ellipse cx="75.3" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M78.2688,523.6406 Q77.6906,523.9375 77.05,524.0781 Q76.4094,524.2344 75.7063,524.2344 Q73.2063,524.2344 71.8781,522.5938 Q70.5656,520.9375 70.5656,517.8125 Q70.5656,514.6875 71.8781,513.0313 Q73.2063,511.375 75.7063,511.375 Q76.4094,511.375 77.05,511.5313 Q77.7063,511.6875 78.2688,511.9844 L78.2688,514.7031 Q77.6438,514.125 77.05,513.8594 Q76.4563,513.5781 75.8313,513.5781 Q74.4875,513.5781 73.8,514.6563 Q73.1125,515.7188 73.1125,517.8125 Q73.1125,519.9063 73.8,520.9844 Q74.4875,522.0469 75.8313,522.0469 Q76.4563,522.0469 77.05,521.7813 Q77.6438,521.5 78.2688,520.9219 L78.2688,523.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.7" y="522.1543">A</text>
+      <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"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="542" y2="542"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001861520693741915300">
-        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0001861520693741915300" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="44" y="399.6"/>
-        <ellipse cx="59" cy="415.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M54,416.7563 C54,419.2563 56.1406,421.0688 59.0625,421.0688 C60.2969,421.0688 61.4688,420.7719 62.2188,420.2563 C62.8281,419.8344 63.1563,419.4125 63.1563,419.0063 C63.1563,418.5375 62.7344,418.1313 62.2344,418.1313 C62,418.1313 61.7813,418.2094 61.5781,418.4125 C61.1406,418.85 61.1406,418.85 60.9688,418.9438 C60.5156,419.1781 59.875,419.3188 59.1094,419.3188 C57.1094,419.3188 55.8281,418.3031 55.8281,416.725 L55.8281,415.6781 C55.8281,413.975 57.0469,412.7719 58.75,412.7719 C59.3281,412.7719 59.9063,412.9125 60.375,413.1625 C60.8438,413.4281 61.0156,413.6156 61.0781,413.975 C61.2031,414.6469 61.4531,414.8969 61.9844,414.8969 C62.2656,414.8969 62.5469,414.7563 62.7344,414.5375 C62.8594,414.3656 62.9063,414.1938 62.9063,413.7563 L62.9063,412.3969 C62.9063,411.975 62.8906,411.8344 62.7656,411.6625 C62.5938,411.4125 62.3125,411.2563 61.9844,411.2563 C61.6719,411.2563 61.4688,411.3656 61.25,411.6313 C60.0781,411.1313 59.6406,411.0219 58.6875,411.0219 C56.0156,411.0219 54,413.0375 54,415.6625 L54,416.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="73" y="420.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="64" x="90" y="396.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="62" x="91" y="410.8001">T,std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="45" x2="150" y1="431.6" y2="431.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="45" x2="150" y1="439.6" y2="439.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="548"/>
+      <ellipse cx="60.5" cy="553" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0002303611426082708583">
-        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0002303611426082708583" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="181" x="7" y="257.8"/>
-        <ellipse cx="83.25" cy="273.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M78.25,274.9563 C78.25,277.4563 80.3906,279.2688 83.3125,279.2688 C84.5469,279.2688 85.7188,278.9719 86.4688,278.4563 C87.0781,278.0344 87.4063,277.6125 87.4063,277.2063 C87.4063,276.7375 86.9844,276.3313 86.4844,276.3313 C86.25,276.3313 86.0313,276.4094 85.8281,276.6125 C85.3906,277.05 85.3906,277.05 85.2188,277.1438 C84.7656,277.3781 84.125,277.5188 83.3594,277.5188 C81.3594,277.5188 80.0781,276.5031 80.0781,274.925 L80.0781,273.8781 C80.0781,272.175 81.2969,270.9719 83,270.9719 C83.5781,270.9719 84.1563,271.1125 84.625,271.3625 C85.0938,271.6281 85.2656,271.8156 85.3281,272.175 C85.4531,272.8469 85.7031,273.0969 86.2344,273.0969 C86.5156,273.0969 86.7969,272.9563 86.9844,272.7375 C87.1094,272.5656 87.1563,272.3938 87.1563,271.9563 L87.1563,270.5969 C87.1563,270.175 87.1406,270.0344 87.0156,269.8625 C86.8438,269.6125 86.5625,269.4563 86.2344,269.4563 C85.9219,269.4563 85.7188,269.5656 85.5,269.8313 C84.3281,269.3313 83.8906,269.2219 82.9375,269.2219 C80.2656,269.2219 78.25,271.2375 78.25,273.8625 L78.25,274.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="103.75" y="278.406">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="182" y="254.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="183" y="269.0001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="187" y1="289.8" y2="289.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="187" y1="297.8" y2="297.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="306.7"/>
-          <ellipse cx="18" cy="311.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="27" y="314.8059">astring : A&lt;T,std::string&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="69.5" y="556.2104">first : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001498376939480949099">
-        <rect codeLine="17" fill="#F1F1F1" height="48" id="C_0001498376939480949099" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="68.5" y="148.8"/>
-        <ellipse cx="83.5" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M78.5,165.9563 C78.5,168.4563 80.6406,170.2688 83.5625,170.2688 C84.7969,170.2688 85.9688,169.9719 86.7188,169.4563 C87.3281,169.0344 87.6563,168.6125 87.6563,168.2063 C87.6563,167.7375 87.2344,167.3313 86.7344,167.3313 C86.5,167.3313 86.2813,167.4094 86.0781,167.6125 C85.6406,168.05 85.6406,168.05 85.4688,168.1438 C85.0156,168.3781 84.375,168.5188 83.6094,168.5188 C81.6094,168.5188 80.3281,167.5031 80.3281,165.925 L80.3281,164.8781 C80.3281,163.175 81.5469,161.9719 83.25,161.9719 C83.8281,161.9719 84.4063,162.1125 84.875,162.3625 C85.3438,162.6281 85.5156,162.8156 85.5781,163.175 C85.7031,163.8469 85.9531,164.0969 86.4844,164.0969 C86.7656,164.0969 87.0469,163.9563 87.2344,163.7375 C87.3594,163.5656 87.4063,163.3938 87.4063,162.9563 L87.4063,161.5969 C87.4063,161.175 87.3906,161.0344 87.2656,160.8625 C87.0938,160.6125 86.8125,160.4563 86.4844,160.4563 C86.1719,160.4563 85.9688,160.5656 85.75,160.8313 C84.5781,160.3313 84.1406,160.2219 83.1875,160.2219 C80.5156,160.2219 78.5,162.2375 78.5,164.8625 L78.5,165.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="97.5" y="169.406">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="114.5" y="145.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="115.5" y="160.0001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="69.5" x2="125.5" y1="180.8" y2="180.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="69.5" x2="125.5" y1="188.8" y2="188.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="560.8047"/>
+      <ellipse cx="60.5" cy="565.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001880966578968892571">
-        <rect codeLine="21" fill="#F1F1F1" height="64.7999" id="C_0001880966578968892571" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="136" x="29.5" y="7"/>
-        <ellipse cx="88.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M83.25,24.1563 C83.25,26.6563 85.3906,28.4688 88.3125,28.4688 C89.5469,28.4688 90.7188,28.1719 91.4688,27.6563 C92.0781,27.2344 92.4063,26.8125 92.4063,26.4063 C92.4063,25.9375 91.9844,25.5313 91.4844,25.5313 C91.25,25.5313 91.0313,25.6094 90.8281,25.8125 C90.3906,26.25 90.3906,26.25 90.2188,26.3438 C89.7656,26.5781 89.125,26.7188 88.3594,26.7188 C86.3594,26.7188 85.0781,25.7031 85.0781,24.125 L85.0781,23.0781 C85.0781,21.375 86.2969,20.1719 88,20.1719 C88.5781,20.1719 89.1563,20.3125 89.625,20.5625 C90.0938,20.8281 90.2656,21.0156 90.3281,21.375 C90.4531,22.0469 90.7031,22.2969 91.2344,22.2969 C91.5156,22.2969 91.7969,22.1563 91.9844,21.9375 C92.1094,21.7656 92.1563,21.5938 92.1563,21.1563 L92.1563,19.7969 C92.1563,19.375 92.1406,19.2344 92.0156,19.0625 C91.8438,18.8125 91.5625,18.6563 91.2344,18.6563 C90.9219,18.6563 90.7188,18.7656 90.5,19.0313 C89.3281,18.5313 88.8906,18.4219 87.9375,18.4219 C85.2656,18.4219 83.25,20.4375 83.25,23.0625 L83.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="108.75" y="27.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="30.5" x2="164.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="30.5" x2="164.5" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="35.5" y="55.9"/>
-          <ellipse cx="40.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110" x="49.5" y="64.0059">aintstring : B&lt;int&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="69.5" y="569.0151">second : P</text>
     </a>
-    <g id="link_C_0001861520693741915300_C_0002222216618904514099">
-      <path codeLine="25" d="M97.5,447.89 C97.5,464.84 97.5,470.22 97.5,490.17 " fill="none" id="C_0001861520693741915300-to-C_0002222216618904514099" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="97.5,508.17,103.5,490.17,91.5,490.17,97.5,508.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002303611426082708583_C_0001861520693741915300">
-      <path codeLine="26" d="M97.5,335.01 C97.5,358.55 97.5,378.1 97.5,399.32 " fill="none" id="C_0002303611426082708583-backto-C_0001861520693741915300" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="97.5,323.01,93.5,329.01,97.5,335.01,101.5,329.01,97.5,323.01" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="103.5" cy="361.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="110.5" y="365.677">astring</text>
-    </g>
-    <g id="link_C_0001498376939480949099_C_0002303611426082708583">
-      <path codeLine="27" d="M97.5,197.15 C97.5,214.54 97.5,220.47 97.5,239.57 " fill="none" id="C_0001498376939480949099-to-C_0002303611426082708583" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="97.5,257.57,103.5,239.57,91.5,239.57,97.5,257.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001880966578968892571_C_0001498376939480949099">
-      <path codeLine="28" d="M97.5,84.21 C97.5,107.75 97.5,127.3 97.5,148.52 " fill="none" id="C_0001880966578968892571-backto-C_0001498376939480949099" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="97.5,72.21,93.5,78.21,97.5,84.21,101.5,78.21,97.5,72.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="103.5" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="110.5" y="114.877">aintstring</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
+      <ellipse cx="49" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M51.9688,414.6406 Q51.3906,414.9375 50.75,415.0781 Q50.1094,415.2344 49.4063,415.2344 Q46.9063,415.2344 45.5781,413.5938 Q44.2656,411.9375 44.2656,408.8125 Q44.2656,405.6875 45.5781,404.0313 Q46.9063,402.375 49.4063,402.375 Q50.1094,402.375 50.75,402.5313 Q51.4063,402.6875 51.9688,402.9844 L51.9688,405.7031 Q51.3438,405.125 50.75,404.8594 Q50.1563,404.5781 49.5313,404.5781 Q48.1875,404.5781 47.5,405.6563 Q46.8125,406.7188 46.8125,408.8125 Q46.8125,410.9063 47.5,411.9844 Q48.1875,413.0469 49.5313,413.0469 Q50.1563,413.0469 50.75,412.7813 Q51.3438,412.5 51.9688,411.9219 L51.9688,414.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="63" y="413.1543">A</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
+      <ellipse cx="78.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M81.7188,276.6406 Q81.1406,276.9375 80.5,277.0781 Q79.8594,277.2344 79.1563,277.2344 Q76.6563,277.2344 75.3281,275.5938 Q74.0156,273.9375 74.0156,270.8125 Q74.0156,267.6875 75.3281,266.0313 Q76.6563,264.375 79.1563,264.375 Q79.8594,264.375 80.5,264.5313 Q81.1563,264.6875 81.7188,264.9844 L81.7188,267.7031 Q81.0938,267.125 80.5,266.8594 Q79.9063,266.5781 79.2813,266.5781 Q77.9375,266.5781 77.25,267.6563 Q76.5625,268.7188 76.5625,270.8125 Q76.5625,272.9063 77.25,273.9844 Q77.9375,275.0469 79.2813,275.0469 Q79.9063,275.0469 80.5,274.7813 Q81.0938,274.5 81.7188,273.9219 L81.7188,276.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="99.25" y="275.1543">B</text>
+      <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"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="295" y2="295"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="301"/>
+      <ellipse cx="17" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="26" y="309.2104">astring : A&lt;T,std::string&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
+      <ellipse cx="77.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M80.4688,167.6406 Q79.8906,167.9375 79.25,168.0781 Q78.6094,168.2344 77.9063,168.2344 Q75.4063,168.2344 74.0781,166.5938 Q72.7656,164.9375 72.7656,161.8125 Q72.7656,158.6875 74.0781,157.0313 Q75.4063,155.375 77.9063,155.375 Q78.6094,155.375 79.25,155.5313 Q79.9063,155.6875 80.4688,155.9844 L80.4688,158.7031 Q79.8438,158.125 79.25,157.8594 Q78.6563,157.5781 78.0313,157.5781 Q76.6875,157.5781 76,158.6563 Q75.3125,159.7188 75.3125,161.8125 Q75.3125,163.9063 76,164.9844 Q76.6875,166.0469 78.0313,166.0469 Q78.6563,166.0469 79.25,165.7813 Q79.8438,165.5 80.4688,164.9219 L80.4688,167.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.5" y="166.1543">B</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
+      <ellipse cx="84.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M87.2188,29.6406 Q86.6406,29.9375 86,30.0781 Q85.3594,30.2344 84.6563,30.2344 Q82.1563,30.2344 80.8281,28.5938 Q79.5156,26.9375 79.5156,23.8125 Q79.5156,20.6875 80.8281,19.0313 Q82.1563,17.375 84.6563,17.375 Q85.3594,17.375 86,17.5313 Q86.6563,17.6875 87.2188,17.9844 L87.2188,20.7031 Q86.5938,20.125 86,19.8594 Q85.4063,19.5781 84.7813,19.5781 Q83.4375,19.5781 82.75,20.6563 Q82.0625,21.7188 82.0625,23.8125 Q82.0625,25.9063 82.75,26.9844 Q83.4375,28.0469 84.7813,28.0469 Q85.4063,28.0469 86,27.7813 Q86.5938,27.5 87.2188,26.9219 L87.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="104.75" y="28.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="32.5" y="54"/>
+      <ellipse cx="37.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="46.5" y="62.2104">aintstring : B&lt;int&gt;</text>
+    </a>
+    <path d="M92.5,441.14 C92.5,452.67 92.5,467.17 92.5,481.41 " fill="none" id="C_0001861520693741915300-&gt;C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <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;"/>
+    <path d="M92.5,329.5 C92.5,350.65 92.5,375.32 92.5,392.88 " fill="none" id="C_0002303611426082708583&lt;-C_0001861520693741915300" 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>
+    <path d="M92.5,194.24 C92.5,205.87 92.5,220.42 92.5,234.43 " fill="none" id="C_0001498376939480949099-&gt;C_0002303611426082708583" 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;"/>
+    <path d="M92.5,82.5 C92.5,103.65 92.5,128.32 92.5,145.88 " fill="none" id="C_0001880966578968892571&lt;-C_0001498376939480949099" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00010_class_mermaid.svg b/docs/test_cases/t00010_class_mermaid.svg
index 3b4dca23..85ea2f92 100644
--- a/docs/test_cases/t00010_class_mermaid.svg
+++ b/docs/test_cases/t00010_class_mermaid.svg
@@ -1,64 +1,59 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 211.984375 625" style="max-width: 211.984px; background-color: white;" width="211.984375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M105.9921875,466L105.9921875,470.1666666666667C105.9921875,474.3333333333333,105.9921875,482.6666666666667,105.9921875,488C105.9921875,493.3333333333333,105.9921875,495.6666666666667,105.9921875,496.8333333333333L105.9921875,498"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M105.9921875,359L105.9921875,361.6666666666667C105.9921875,364.3333333333333,105.9921875,369.6666666666667,105.9921875,378C105.9921875,386.3333333333333,105.9921875,397.6666666666667,105.9921875,403.3333333333333L105.9921875,409"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M105.9921875,212L105.9921875,216.16666666666666C105.9921875,220.33333333333334,105.9921875,228.66666666666666,105.9921875,234C105.9921875,239.33333333333334,105.9921875,241.66666666666666,105.9921875,242.83333333333334L105.9921875,244"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M105.9921875,105L105.9921875,107.66666666666667C105.9921875,110.33333333333333,105.9921875,115.66666666666667,105.9921875,124C105.9921875,132.33333333333334,105.9921875,143.66666666666666,105.9921875,149.33333333333334L105.9921875,155"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M105.9921875,466L105.9921875,470.1666666666667C105.9921875,474.3333333333333,105.9921875,482.6666666666667,105.9921875,491C105.9921875,499.3333333333333,105.9921875,507.6666666666667,105.9921875,511.8333333333333L105.9921875,516"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M105.9921875,341L105.9921875,346.6666666666667C105.9921875,352.3333333333333,105.9921875,363.6666666666667,105.9921875,375C105.9921875,386.3333333333333,105.9921875,397.6666666666667,105.9921875,403.3333333333333L105.9921875,409"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M105.9921875,212L105.9921875,216.16666666666666C105.9921875,220.33333333333334,105.9921875,228.66666666666666,105.9921875,237C105.9921875,245.33333333333334,105.9921875,253.66666666666666,105.9921875,257.8333333333333L105.9921875,262"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M105.9921875,87L105.9921875,92.66666666666667C105.9921875,98.33333333333333,105.9921875,109.66666666666667,105.9921875,121C105.9921875,132.33333333333334,105.9921875,143.66666666666666,105.9921875,149.33333333333334L105.9921875,155"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -107,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0002222216618904514099-0" class="node default clickable">
             <rect height="101" width="99.953125" y="-50.5" x="-49.9765625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9765625" x1="-49.9765625" class="divider"/>
@@ -136,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0001861520693741915300-1" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -155,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0002303611426082708583-2" class="node default clickable">
             <rect height="79" width="195.984375" y="-39.5" x="-97.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.9921875" x1="-97.9921875" class="divider"/>
@@ -179,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0001498376939480949099-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -198,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00010/t00010.cc#L18">
+        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L18">
           <g title="C" id="classId-C_0001880966578968892571-4" class="node default clickable">
             <rect height="79" width="148.859375" y="-39.5" x="-74.4296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.4296875" x1="-74.4296875" class="divider"/>
diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md
index 5e8a5007..fee12b52 100644
--- a/docs/test_cases/t00011.md
+++ b/docs/test_cases/t00011.md
@@ -60,7 +60,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00011::D<T>",
+      "display_name": "D<T>",
       "id": "1150639902748052276",
       "is_abstract": false,
       "is_nested": false,
@@ -102,7 +102,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00011::A",
+      "display_name": "A",
       "id": "1420516952857803719",
       "is_abstract": false,
       "is_nested": false,
@@ -151,7 +151,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00011::B",
+      "display_name": "B",
       "id": "1687427603952049829",
       "is_abstract": false,
       "is_nested": false,
@@ -213,6 +213,7 @@ public:
     }
   ],
   "name": "t00011_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index bfc3d35a..8c8c4d1d 100644
--- a/docs/test_cases/t00011_class.svg
+++ b/docs/test_cases/t00011_class.svg
@@ -1,79 +1,75 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="240px" preserveAspectRatio="none" style="width:228px;height:240px;background:#FFFFFF;" version="1.1" viewBox="0 0 228 240" width="228px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:226px;height:230px;" version="1.1" viewBox="0 0 226 230" width="226px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fsnescz82vglh" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001150639902748052276">
-        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0001150639902748052276" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="7" y="10"/>
-        <ellipse cx="34.6" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M29.6,27.1563 C29.6,29.6563 31.7406,31.4688 34.6625,31.4688 C35.8969,31.4688 37.0688,31.1719 37.8188,30.6563 C38.4281,30.2344 38.7563,29.8125 38.7563,29.4063 C38.7563,28.9375 38.3344,28.5313 37.8344,28.5313 C37.6,28.5313 37.3813,28.6094 37.1781,28.8125 C36.7406,29.25 36.7406,29.25 36.5688,29.3438 C36.1156,29.5781 35.475,29.7188 34.7094,29.7188 C32.7094,29.7188 31.4281,28.7031 31.4281,27.125 L31.4281,26.0781 C31.4281,24.375 32.6469,23.1719 34.35,23.1719 C34.9281,23.1719 35.5063,23.3125 35.975,23.5625 C36.4438,23.8281 36.6156,24.0156 36.6781,24.375 C36.8031,25.0469 37.0531,25.2969 37.5844,25.2969 C37.8656,25.2969 38.1469,25.1563 38.3344,24.9375 C38.4594,24.7656 38.5063,24.5938 38.5063,24.1563 L38.5063,22.7969 C38.5063,22.375 38.4906,22.2344 38.3656,22.0625 C38.1938,21.8125 37.9125,21.6563 37.5844,21.6563 C37.2719,21.6563 37.0688,21.7656 36.85,22.0313 C35.6781,21.5313 35.2406,21.4219 34.2875,21.4219 C31.6156,21.4219 29.6,23.4375 29.6,26.0625 L29.6,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="51.4" y="30.606">D</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="82" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="83" y="21.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="87" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="87" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="58.9"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="60.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="27" y="67.0059">value : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsnescz82vglh)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
+      <ellipse cx="31.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M34.3188,29.6406 Q33.7406,29.9375 33.1,30.0781 Q32.4594,30.2344 31.7563,30.2344 Q29.2563,30.2344 27.9281,28.5938 Q26.6156,26.9375 26.6156,23.8125 Q26.6156,20.6875 27.9281,19.0313 Q29.2563,17.375 31.7563,17.375 Q32.4594,17.375 33.1,17.5313 Q33.7563,17.6875 34.3188,17.9844 L34.3188,20.7031 Q33.6938,20.125 33.1,19.8594 Q32.5063,19.5781 31.8813,19.5781 Q30.5375,19.5781 29.85,20.6563 Q29.1625,21.7188 29.1625,23.8125 Q29.1625,25.9063 29.85,26.9844 Q30.5375,28.0469 31.8813,28.0469 Q32.5063,28.0469 33.1,27.7813 Q33.6938,27.5 34.3188,26.9219 L34.3188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="47.65" y="28.1543">D</text>
+      <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"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001420516952857803719">
-        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001420516952857803719" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="123.5" y="10"/>
-        <ellipse cx="162.35" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M157.35,27.1563 C157.35,29.6563 159.4906,31.4688 162.4125,31.4688 C163.6469,31.4688 164.8188,31.1719 165.5688,30.6563 C166.1781,30.2344 166.5063,29.8125 166.5063,29.4063 C166.5063,28.9375 166.0844,28.5313 165.5844,28.5313 C165.35,28.5313 165.1313,28.6094 164.9281,28.8125 C164.4906,29.25 164.4906,29.25 164.3188,29.3438 C163.8656,29.5781 163.225,29.7188 162.4594,29.7188 C160.4594,29.7188 159.1781,28.7031 159.1781,27.125 L159.1781,26.0781 C159.1781,24.375 160.3969,23.1719 162.1,23.1719 C162.6781,23.1719 163.2563,23.3125 163.725,23.5625 C164.1938,23.8281 164.3656,24.0156 164.4281,24.375 C164.5531,25.0469 164.8031,25.2969 165.3344,25.2969 C165.6156,25.2969 165.8969,25.1563 166.0844,24.9375 C166.2094,24.7656 166.2563,24.5938 166.2563,24.1563 L166.2563,22.7969 C166.2563,22.375 166.2406,22.2344 166.1156,22.0625 C165.9438,21.8125 165.6625,21.6563 165.3344,21.6563 C165.0219,21.6563 164.8188,21.7656 164.6,22.0313 C163.4281,21.5313 162.9906,21.4219 162.0375,21.4219 C159.3656,21.4219 157.35,23.4375 157.35,26.0625 L157.35,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="181.65" y="30.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="216.5" y1="42" y2="42"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="50.9"/>
-          <ellipse cx="134.5" cy="55.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="143.5" y="59.0059">foo() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="216.5" y1="66.7999" y2="66.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001687427603952049829">
-        <rect codeLine="12" fill="#F1F1F1" height="81.5999" id="C_0001687427603952049829" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="123.5" y="151.8"/>
-        <ellipse cx="162.35" cy="167.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M157.35,168.9563 C157.35,171.4563 159.4906,173.2688 162.4125,173.2688 C163.6469,173.2688 164.8188,172.9719 165.5688,172.4563 C166.1781,172.0344 166.5063,171.6125 166.5063,171.2063 C166.5063,170.7375 166.0844,170.3313 165.5844,170.3313 C165.35,170.3313 165.1313,170.4094 164.9281,170.6125 C164.4906,171.05 164.4906,171.05 164.3188,171.1438 C163.8656,171.3781 163.225,171.5188 162.4594,171.5188 C160.4594,171.5188 159.1781,170.5031 159.1781,168.925 L159.1781,167.8781 C159.1781,166.175 160.3969,164.9719 162.1,164.9719 C162.6781,164.9719 163.2563,165.1125 163.725,165.3625 C164.1938,165.6281 164.3656,165.8156 164.4281,166.175 C164.5531,166.8469 164.8031,167.0969 165.3344,167.0969 C165.6156,167.0969 165.8969,166.9563 166.0844,166.7375 C166.2094,166.5656 166.2563,166.3938 166.2563,165.9563 L166.2563,164.5969 C166.2563,164.175 166.2406,164.0344 166.1156,163.8625 C165.9438,163.6125 165.6625,163.4563 165.3344,163.4563 C165.0219,163.4563 164.8188,163.5656 164.6,163.8313 C163.4281,163.3313 162.9906,163.2219 162.0375,163.2219 C159.3656,163.2219 157.35,165.2375 157.35,167.8625 L157.35,168.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="181.65" y="172.406">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="216.5" y1="183.8" y2="183.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="192.7"/>
-          <ellipse cx="134.5" cy="197.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="143.5" y="200.8059">foo() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="216.5" y1="208.5999" y2="208.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="217.4999"/>
-          <ellipse cx="134.5" cy="222.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="143.5" y="225.6059">m_a : A *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="62.2104">value : T</text>
     </a>
-    <g id="link_C_0001420516952857803719_C_0001687427603952049829">
-      <path codeLine="17" d="M127.9244,79.7762 C116.3144,93.2562 111.89,105.14 117.5,121.8 C121,132.18 126.72,142.25 133.14,151.35 " fill="none" id="C_0001420516952857803719-backto-C_0001687427603952049829" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="131.84,75.23,122.9358,79.439,128.577,79.0185,128.9975,84.6597,131.84,75.23" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="123.5" cy="114.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="130.5" y="117.877">«friend»</text>
-    </g>
-    <g id="link_C_0001687427603952049829_C_0001420516952857803719">
-      <path codeLine="18" d="M179.21,151.48 C181.43,136.82 182.86,120.08 181.5,104.8 C180.64,95.09 180.095,90.5229 178.365,81.0229 " fill="none" id="C_0001687427603952049829-to-C_0001420516952857803719" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="177.29,75.12,174.9671,84.691,178.1858,80.0391,182.8377,83.2577,177.29,75.12" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="188.5" cy="114.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="25" x="195.5" y="117.877">m_a</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsnescz82vglh)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
+      <ellipse cx="152.15" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M155.1188,29.6406 Q154.5406,29.9375 153.9,30.0781 Q153.2594,30.2344 152.5563,30.2344 Q150.0563,30.2344 148.7281,28.5938 Q147.4156,26.9375 147.4156,23.8125 Q147.4156,20.6875 148.7281,19.0313 Q150.0563,17.375 152.5563,17.375 Q153.2594,17.375 153.9,17.5313 Q154.5563,17.6875 155.1188,17.9844 L155.1188,20.7031 Q154.4938,20.125 153.9,19.8594 Q153.3063,19.5781 152.6813,19.5781 Q151.3375,19.5781 150.65,20.6563 Q149.9625,21.7188 149.9625,23.8125 Q149.9625,25.9063 150.65,26.9844 Q151.3375,28.0469 152.6813,28.0469 Q153.3063,28.0469 153.9,27.7813 Q154.4938,27.5 155.1188,26.9219 L155.1188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="28.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="46"/>
+      <ellipse cx="127" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="54.2104">foo() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsnescz82vglh)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
+      <ellipse cx="152.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M155.1188,167.6406 Q154.5406,167.9375 153.9,168.0781 Q153.2594,168.2344 152.5563,168.2344 Q150.0563,168.2344 148.7281,166.5938 Q147.4156,164.9375 147.4156,161.8125 Q147.4156,158.6875 148.7281,157.0313 Q150.0563,155.375 152.5563,155.375 Q153.2594,155.375 153.9,155.5313 Q154.5563,155.6875 155.1188,155.9844 L155.1188,158.7031 Q154.4938,158.125 153.9,157.8594 Q153.3063,157.5781 152.6813,157.5781 Q151.3375,157.5781 150.65,158.6563 Q149.9625,159.7188 149.9625,161.8125 Q149.9625,163.9063 150.65,164.9844 Q151.3375,166.0469 152.6813,166.0469 Q153.3063,166.0469 153.9,165.7813 Q154.4938,165.5 155.1188,164.9219 L155.1188,167.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="166.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="178" y2="178"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="184"/>
+      <ellipse cx="127" cy="189" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="192.2104">foo() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="204.8047"/>
+      <ellipse cx="127" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="136" y="213.0151">m_a : A *</text>
+    </a>
+    <path d="M116.04,73.01 C105.09,85.59 97.85,100.6 103.5,116 C107.44,126.72 113.97,136.89 121.21,145.9 " fill="none" id="C_0001420516952857803719&lt;-C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="119.54,69.18,110.5057,73.102,116.1575,72.8622,116.3973,78.514,119.54,69.18" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="109.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="52" x="116.5" y="112.0669">«friend»</text>
+    <path d="M170.13,145.75 C173.19,131.26 175.29,114.39 173.5,99 C172.56,90.88 170.92,82.26 169.08,74.18 " fill="none" id="C_0001687427603952049829-&gt;C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="167.92,69.22,166.0877,78.8969,169.0652,74.0871,173.875,77.0646,167.92,69.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="179.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="186.5" y="112.0669">m_a</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00011_class_mermaid.svg b/docs/test_cases/t00011_class_mermaid.svg
index c0fc4ffd..0131f95e 100644
--- a/docs/test_cases/t00011_class_mermaid.svg
+++ b/docs/test_cases/t00011_class_mermaid.svg
@@ -1,65 +1,60 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 256.73828125 264" style="max-width: 256.738px; background-color: white;" width="256.73828125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 252.29296875 264" style="max-width: 252.293px; background-color: white;" width="252.29296875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M172.62028580978097,92.42619689189787L170.3730246331508,97.18849740991489C168.12576345652064,101.9507979279319,163.63124110326032,111.47539896396596,163.70990140098914,121.90436614864966C163.78856169871793,132.33333333333334,168.44040464743588,143.66666666666666,170.7663261217949,149.33333333333334L173.09224759615384,155"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M214.54837740384616,155L216.8742988782051,149.33333333333334C219.20022035256412,143.66666666666666,223.85206330128207,132.33333333333334,223.9307235990109,121.90436614864966C224.00938389673968,111.47539896396596,219.51486154347936,101.9507979279319,217.26760036684922,97.18849740991489L215.02033919021903,92.42619689189787"/>
+        <path marker-start="url(#classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M170.73551764455783,87L168.0614990787982,92.66666666666667C165.38748051303855,98.33333333333333,160.03944338151928,109.66666666666667,159.69134629011862,121C159.34324919871793,132.33333333333334,163.99509214743588,143.66666666666666,166.32101362179486,149.33333333333334L168.64693509615384,155"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M210.10306490384616,155L212.4289863782051,149.33333333333334C214.75490785256412,143.66666666666666,219.40675080128207,132.33333333333334,219.05865370988138,121C218.71055661848072,109.66666666666667,213.36251948696145,98.33333333333333,210.6885009212018,92.66666666666667L208.01448235544217,87"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(159.13671875, 121)" class="edgeLabel">
+        <g transform="translate(154.69140625, 121)" class="edgeLabel">
           <g transform="translate(-29.1328125, -9)" class="label">
             <foreignObject height="18" width="58.265625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -70,7 +65,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(228.50390625, 121)" class="edgeLabel">
+        <g transform="translate(224.05859375, 121)" class="edgeLabel">
           <g transform="translate(-20.234375, -9)" class="label">
             <foreignObject height="18" width="40.46875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -83,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L10">
+        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L10">
           <g title="D" id="classId-C_0001150639902748052276-0" class="node default clickable">
             <rect height="79" width="81.40625" y="-39.5" x="-40.703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.703125" x1="-40.703125" class="divider"/>
@@ -107,11 +102,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(193.8203125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L14">
+        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L14">
           <g title="A" id="classId-C_0001420516952857803719-1" class="node default clickable">
-            <rect height="79" width="108.828125" y="-39.5" x="-54.4140625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <rect height="79" width="99.9375" y="-39.5" x="-49.96875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="49.96875" x1="-49.96875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -123,19 +118,19 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, 14)" height="18" width="93.828125">
+              <foreignObject transform="translate( -42.46875, 14)" height="18" width="84.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : : void</span>
+                  <span class="nodeLabel">+foo() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(193.8203125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00011/t00011.cc#L26">
+        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L26">
           <g title="B" id="classId-C_0001687427603952049829-2" class="node default clickable">
-            <rect height="101" width="108.828125" y="-50.5" x="-54.4140625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="49.96875" x1="-49.96875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -147,14 +142,14 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, -9)" height="18" width="63.890625">
+              <foreignObject transform="translate( -42.46875, -9)" height="18" width="63.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m_a : A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+m_a : A </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, 25)" height="18" width="93.828125">
+              <foreignObject transform="translate( -42.46875, 25)" height="18" width="84.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : : void</span>
+                  <span class="nodeLabel">+foo() : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00012.md b/docs/test_cases/t00012.md
index 4b024e4e..47106719 100644
--- a/docs/test_cases/t00012.md
+++ b/docs/test_cases/t00012.md
@@ -67,7 +67,7 @@ class R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00012::A<T,Ts...>",
+      "display_name": "A<T,Ts...>",
       "id": "1773299890023132282",
       "is_abstract": false,
       "is_nested": false,
@@ -127,7 +127,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00012::B<int... Is>",
+      "display_name": "B<int... Is>",
       "id": "2061171077567279746",
       "is_abstract": false,
       "is_nested": false,
@@ -170,7 +170,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00012::C<T,int... Is>",
+      "display_name": "C<T,int... Is>",
       "id": "627809578407650629",
       "is_abstract": false,
       "is_nested": false,
@@ -219,7 +219,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00012::A<int,std::string,float>",
+      "display_name": "A<int,std::string,float>",
       "id": "286972398942005457",
       "is_abstract": false,
       "is_nested": false,
@@ -260,7 +260,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00012::A<int,std::string,bool>",
+      "display_name": "A<int,std::string,bool>",
       "id": "299466181098300963",
       "is_abstract": false,
       "is_nested": false,
@@ -301,7 +301,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00012::B<3,2,1>",
+      "display_name": "B<3,2,1>",
       "id": "489063277971613593",
       "is_abstract": false,
       "is_nested": false,
@@ -342,7 +342,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00012::B<1,1,1,1>",
+      "display_name": "B<1,1,1,1>",
       "id": "14232362483200599",
       "is_abstract": false,
       "is_nested": false,
@@ -389,7 +389,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00012::C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>",
+      "display_name": "C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>",
       "id": "1478239414632239754",
       "is_abstract": false,
       "is_nested": false,
@@ -470,7 +470,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00012::R",
+      "display_name": "R",
       "id": "559263385732885469",
       "is_abstract": false,
       "is_nested": false,
@@ -553,6 +553,7 @@ class R {
     }
   ],
   "name": "t00012_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index 754f03b0..7370ba01 100644
--- a/docs/test_cases/t00012_class.svg
+++ b/docs/test_cases/t00012_class.svg
@@ -1,231 +1,197 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="413px" preserveAspectRatio="none" style="width:1220px;height:413px;background:#FFFFFF;" version="1.1" viewBox="0 0 1220 413" width="1220px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="f1hwvc3mblsfi7" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001773299890023132282">
-        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0001773299890023132282" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="193" x="698" y="325"/>
-        <ellipse cx="767.75" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M762.75,342.1563 C762.75,344.6563 764.8906,346.4688 767.8125,346.4688 C769.0469,346.4688 770.2188,346.1719 770.9688,345.6563 C771.5781,345.2344 771.9063,344.8125 771.9063,344.4063 C771.9063,343.9375 771.4844,343.5313 770.9844,343.5313 C770.75,343.5313 770.5313,343.6094 770.3281,343.8125 C769.8906,344.25 769.8906,344.25 769.7188,344.3438 C769.2656,344.5781 768.625,344.7188 767.8594,344.7188 C765.8594,344.7188 764.5781,343.7031 764.5781,342.125 L764.5781,341.0781 C764.5781,339.375 765.7969,338.1719 767.5,338.1719 C768.0781,338.1719 768.6563,338.3125 769.125,338.5625 C769.5938,338.8281 769.7656,339.0156 769.8281,339.375 C769.9531,340.0469 770.2031,340.2969 770.7344,340.2969 C771.0156,340.2969 771.2969,340.1563 771.4844,339.9375 C771.6094,339.7656 771.6563,339.5938 771.6563,339.1563 L771.6563,337.7969 C771.6563,337.375 771.6406,337.2344 771.5156,337.0625 C771.3438,336.8125 771.0625,336.6563 770.7344,336.6563 C770.4219,336.6563 770.2188,336.7656 770,337.0313 C768.8281,336.5313 768.3906,336.4219 767.4375,336.4219 C764.7656,336.4219 762.75,338.4375 762.75,341.0625 L762.75,342.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="788.25" y="345.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="34" x="860" y="322"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="32" x="861" y="336.2001">T,Ts...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="699" x2="890" y1="357" y2="357"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="699" x2="890" y1="365" y2="365"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="704" y="373.9"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="706" y="375.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="718" y="382.0059">value : T</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="704" y="390.6999"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="706" y="392.6999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="718" y="398.8059">values : std::variant&lt;Ts...&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
+      <ellipse cx="885.75" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M888.7188,327.6406 Q888.1406,327.9375 887.5,328.0781 Q886.8594,328.2344 886.1563,328.2344 Q883.6563,328.2344 882.3281,326.5938 Q881.0156,324.9375 881.0156,321.8125 Q881.0156,318.6875 882.3281,317.0313 Q883.6563,315.375 886.1563,315.375 Q886.8594,315.375 887.5,315.5313 Q888.1563,315.6875 888.7188,315.9844 L888.7188,318.7031 Q888.0938,318.125 887.5,317.8594 Q886.9063,317.5781 886.2813,317.5781 Q884.9375,317.5781 884.25,318.6563 Q883.5625,319.7188 883.5625,321.8125 Q883.5625,323.9063 884.25,324.9844 Q884.9375,326.0469 886.2813,326.0469 Q886.9063,326.0469 887.5,325.7813 Q888.0938,325.5 888.7188,324.9219 L888.7188,327.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="906.25" y="326.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="38" x="971" y="303"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="972" y="315.1387">T,Ts...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="338" y2="338"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0002061171077567279746">
-        <rect codeLine="8" fill="#F1F1F1" height="64.7999" id="C_0002061171077567279746" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="225" x="984" y="333.4"/>
-        <ellipse cx="1068.75" cy="349.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1063.75,350.5563 C1063.75,353.0563 1065.8906,354.8688 1068.8125,354.8688 C1070.0469,354.8688 1071.2188,354.5719 1071.9688,354.0563 C1072.5781,353.6344 1072.9063,353.2125 1072.9063,352.8063 C1072.9063,352.3375 1072.4844,351.9313 1071.9844,351.9313 C1071.75,351.9313 1071.5313,352.0094 1071.3281,352.2125 C1070.8906,352.65 1070.8906,352.65 1070.7188,352.7438 C1070.2656,352.9781 1069.625,353.1188 1068.8594,353.1188 C1066.8594,353.1188 1065.5781,352.1031 1065.5781,350.525 L1065.5781,349.4781 C1065.5781,347.775 1066.7969,346.5719 1068.5,346.5719 C1069.0781,346.5719 1069.6563,346.7125 1070.125,346.9625 C1070.5938,347.2281 1070.7656,347.4156 1070.8281,347.775 C1070.9531,348.4469 1071.2031,348.6969 1071.7344,348.6969 C1072.0156,348.6969 1072.2969,348.5563 1072.4844,348.3375 C1072.6094,348.1656 1072.6563,347.9938 1072.6563,347.5563 L1072.6563,346.1969 C1072.6563,345.775 1072.6406,345.6344 1072.5156,345.4625 C1072.3438,345.2125 1072.0625,345.0563 1071.7344,345.0563 C1071.4219,345.0563 1071.2188,345.1656 1071,345.4313 C1069.8281,344.9313 1069.3906,344.8219 1068.4375,344.8219 C1065.7656,344.8219 1063.75,346.8375 1063.75,349.4625 L1063.75,350.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1089.25" y="354.006">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="36" x="1176" y="330.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="34" x="1177" y="344.6001">int... Is</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="985" x2="1208" y1="365.4" y2="365.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="985" x2="1208" y1="373.4" y2="373.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="990" y="382.3"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="992" y="384.3"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="1004" y="390.4059">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="352"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000627809578407650629">
-        <rect codeLine="13" fill="#F1F1F1" height="64.7999" id="C_0000627809578407650629" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="219" x="103" y="333.4"/>
-        <ellipse cx="179.25" cy="349.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M174.25,350.5563 C174.25,353.0563 176.3906,354.8688 179.3125,354.8688 C180.5469,354.8688 181.7188,354.5719 182.4688,354.0563 C183.0781,353.6344 183.4063,353.2125 183.4063,352.8063 C183.4063,352.3375 182.9844,351.9313 182.4844,351.9313 C182.25,351.9313 182.0313,352.0094 181.8281,352.2125 C181.3906,352.65 181.3906,352.65 181.2188,352.7438 C180.7656,352.9781 180.125,353.1188 179.3594,353.1188 C177.3594,353.1188 176.0781,352.1031 176.0781,350.525 L176.0781,349.4781 C176.0781,347.775 177.2969,346.5719 179,346.5719 C179.5781,346.5719 180.1563,346.7125 180.625,346.9625 C181.0938,347.2281 181.2656,347.4156 181.3281,347.775 C181.4531,348.4469 181.7031,348.6969 182.2344,348.6969 C182.5156,348.6969 182.7969,348.5563 182.9844,348.3375 C183.1094,348.1656 183.1563,347.9938 183.1563,347.5563 L183.1563,346.1969 C183.1563,345.775 183.1406,345.6344 183.0156,345.4625 C182.8438,345.2125 182.5625,345.0563 182.2344,345.0563 C181.9219,345.0563 181.7188,345.1656 181.5,345.4313 C180.3281,344.9313 179.8906,344.8219 178.9375,344.8219 C176.2656,344.8219 174.25,346.8375 174.25,349.4625 L174.25,350.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="199.75" y="354.006">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="279" y="330.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="280" y="344.6001">T,int... Is</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="321" y1="365.4" y2="365.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="321" y1="373.4" y2="373.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="382.3"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="111" y="384.3"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="193" x="123" y="390.4059">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="842" y="360.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000286972398942005457">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000286972398942005457" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="655" y="216"/>
-        <ellipse cx="670" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M665,233.1563 C665,235.6563 667.1406,237.4688 670.0625,237.4688 C671.2969,237.4688 672.4688,237.1719 673.2188,236.6563 C673.8281,236.2344 674.1563,235.8125 674.1563,235.4063 C674.1563,234.9375 673.7344,234.5313 673.2344,234.5313 C673,234.5313 672.7813,234.6094 672.5781,234.8125 C672.1406,235.25 672.1406,235.25 671.9688,235.3438 C671.5156,235.5781 670.875,235.7188 670.1094,235.7188 C668.1094,235.7188 666.8281,234.7031 666.8281,233.125 L666.8281,232.0781 C666.8281,230.375 668.0469,229.1719 669.75,229.1719 C670.3281,229.1719 670.9063,229.3125 671.375,229.5625 C671.8438,229.8281 672.0156,230.0156 672.0781,230.375 C672.2031,231.0469 672.4531,231.2969 672.9844,231.2969 C673.2656,231.2969 673.5469,231.1563 673.7344,230.9375 C673.8594,230.7656 673.9063,230.5938 673.9063,230.1563 L673.9063,228.7969 C673.9063,228.375 673.8906,228.2344 673.7656,228.0625 C673.5938,227.8125 673.3125,227.6563 672.9844,227.6563 C672.6719,227.6563 672.4688,227.7656 672.25,228.0313 C671.0781,227.5313 670.6406,227.4219 669.6875,227.4219 C667.0156,227.4219 665,229.4375 665,232.0625 L665,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="684" y="236.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="96" x="701" y="213"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="94" x="702" y="227.2001">int,std::string,float</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="656" x2="793" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="656" x2="793" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="364.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="366.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000299466181098300963">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000299466181098300963" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="829.5" y="216"/>
-        <ellipse cx="844.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M839.5,233.1563 C839.5,235.6563 841.6406,237.4688 844.5625,237.4688 C845.7969,237.4688 846.9688,237.1719 847.7188,236.6563 C848.3281,236.2344 848.6563,235.8125 848.6563,235.4063 C848.6563,234.9375 848.2344,234.5313 847.7344,234.5313 C847.5,234.5313 847.2813,234.6094 847.0781,234.8125 C846.6406,235.25 846.6406,235.25 846.4688,235.3438 C846.0156,235.5781 845.375,235.7188 844.6094,235.7188 C842.6094,235.7188 841.3281,234.7031 841.3281,233.125 L841.3281,232.0781 C841.3281,230.375 842.5469,229.1719 844.25,229.1719 C844.8281,229.1719 845.4063,229.3125 845.875,229.5625 C846.3438,229.8281 846.5156,230.0156 846.5781,230.375 C846.7031,231.0469 846.9531,231.2969 847.4844,231.2969 C847.7656,231.2969 848.0469,231.1563 848.2344,230.9375 C848.3594,230.7656 848.4063,230.5938 848.4063,230.1563 L848.4063,228.7969 C848.4063,228.375 848.3906,228.2344 848.2656,228.0625 C848.0938,227.8125 847.8125,227.6563 847.4844,227.6563 C847.1719,227.6563 846.9688,227.7656 846.75,228.0313 C845.5781,227.5313 845.1406,227.4219 844.1875,227.4219 C841.5156,227.4219 839.5,229.4375 839.5,232.0625 L839.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="858.5" y="236.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="97" x="875.5" y="213"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="95" x="876.5" y="227.2001">int,std::string,bool</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="830.5" x2="968.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="830.5" x2="968.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="842" y="373.0151">values : std::variant&lt;Ts...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000489063277971613593">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000489063277971613593" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="72" x="1004.5" y="216"/>
-        <ellipse cx="1019.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1014.5,233.1563 C1014.5,235.6563 1016.6406,237.4688 1019.5625,237.4688 C1020.7969,237.4688 1021.9688,237.1719 1022.7188,236.6563 C1023.3281,236.2344 1023.6563,235.8125 1023.6563,235.4063 C1023.6563,234.9375 1023.2344,234.5313 1022.7344,234.5313 C1022.5,234.5313 1022.2813,234.6094 1022.0781,234.8125 C1021.6406,235.25 1021.6406,235.25 1021.4688,235.3438 C1021.0156,235.5781 1020.375,235.7188 1019.6094,235.7188 C1017.6094,235.7188 1016.3281,234.7031 1016.3281,233.125 L1016.3281,232.0781 C1016.3281,230.375 1017.5469,229.1719 1019.25,229.1719 C1019.8281,229.1719 1020.4063,229.3125 1020.875,229.5625 C1021.3438,229.8281 1021.5156,230.0156 1021.5781,230.375 C1021.7031,231.0469 1021.9531,231.2969 1022.4844,231.2969 C1022.7656,231.2969 1023.0469,231.1563 1023.2344,230.9375 C1023.3594,230.7656 1023.4063,230.5938 1023.4063,230.1563 L1023.4063,228.7969 C1023.4063,228.375 1023.3906,228.2344 1023.2656,228.0625 C1023.0938,227.8125 1022.8125,227.6563 1022.4844,227.6563 C1022.1719,227.6563 1021.9688,227.7656 1021.75,228.0313 C1020.5781,227.5313 1020.1406,227.4219 1019.1875,227.4219 C1016.5156,227.4219 1014.5,229.4375 1014.5,232.0625 L1014.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1033.5" y="236.606">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="29" x="1050.5" y="213"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="27" x="1051.5" y="227.2001">3,2,1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1005.5" x2="1075.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1005.5" x2="1075.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
+      <ellipse cx="1209.75" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1212.7188,334.1406 Q1212.1406,334.4375 1211.5,334.5781 Q1210.8594,334.7344 1210.1563,334.7344 Q1207.6563,334.7344 1206.3281,333.0938 Q1205.0156,331.4375 1205.0156,328.3125 Q1205.0156,325.1875 1206.3281,323.5313 Q1207.6563,321.875 1210.1563,321.875 Q1210.8594,321.875 1211.5,322.0313 Q1212.1563,322.1875 1212.7188,322.4844 L1212.7188,325.2031 Q1212.0938,324.625 1211.5,324.3594 Q1210.9063,324.0781 1210.2813,324.0781 Q1208.9375,324.0781 1208.25,325.1563 Q1207.5625,326.2188 1207.5625,328.3125 Q1207.5625,330.4063 1208.25,331.4844 Q1208.9375,332.5469 1210.2813,332.5469 Q1210.9063,332.5469 1211.5,332.2813 Q1212.0938,332 1212.7188,331.4219 L1212.7188,334.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1230.25" y="332.6543">B</text>
+      <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000014232362483200599">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000014232362483200599" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="1111.5" y="216"/>
-        <ellipse cx="1126.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1121.5,233.1563 C1121.5,235.6563 1123.6406,237.4688 1126.5625,237.4688 C1127.7969,237.4688 1128.9688,237.1719 1129.7188,236.6563 C1130.3281,236.2344 1130.6563,235.8125 1130.6563,235.4063 C1130.6563,234.9375 1130.2344,234.5313 1129.7344,234.5313 C1129.5,234.5313 1129.2813,234.6094 1129.0781,234.8125 C1128.6406,235.25 1128.6406,235.25 1128.4688,235.3438 C1128.0156,235.5781 1127.375,235.7188 1126.6094,235.7188 C1124.6094,235.7188 1123.3281,234.7031 1123.3281,233.125 L1123.3281,232.0781 C1123.3281,230.375 1124.5469,229.1719 1126.25,229.1719 C1126.8281,229.1719 1127.4063,229.3125 1127.875,229.5625 C1128.3438,229.8281 1128.5156,230.0156 1128.5781,230.375 C1128.7031,231.0469 1128.9531,231.2969 1129.4844,231.2969 C1129.7656,231.2969 1130.0469,231.1563 1130.2344,230.9375 C1130.3594,230.7656 1130.4063,230.5938 1130.4063,230.1563 L1130.4063,228.7969 C1130.4063,228.375 1130.3906,228.2344 1130.2656,228.0625 C1130.0938,227.8125 1129.8125,227.6563 1129.4844,227.6563 C1129.1719,227.6563 1128.9688,227.7656 1128.75,228.0313 C1127.5781,227.5313 1127.1406,227.4219 1126.1875,227.4219 C1123.5156,227.4219 1121.5,229.4375 1121.5,232.0625 L1121.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1140.5" y="236.606">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="39" x="1157.5" y="213"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="37" x="1158.5" y="227.2001">1,1,1,1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1112.5" x2="1192.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1112.5" x2="1192.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1140" y="358.5"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001478239414632239754">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0001478239414632239754" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="411" x="7" y="216"/>
-        <ellipse cx="22" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,233.1563 C17,235.6563 19.1406,237.4688 22.0625,237.4688 C23.2969,237.4688 24.4688,237.1719 25.2188,236.6563 C25.8281,236.2344 26.1563,235.8125 26.1563,235.4063 C26.1563,234.9375 25.7344,234.5313 25.2344,234.5313 C25,234.5313 24.7813,234.6094 24.5781,234.8125 C24.1406,235.25 24.1406,235.25 23.9688,235.3438 C23.5156,235.5781 22.875,235.7188 22.1094,235.7188 C20.1094,235.7188 18.8281,234.7031 18.8281,233.125 L18.8281,232.0781 C18.8281,230.375 20.0469,229.1719 21.75,229.1719 C22.3281,229.1719 22.9063,229.3125 23.375,229.5625 C23.8438,229.8281 24.0156,230.0156 24.0781,230.375 C24.2031,231.0469 24.4531,231.2969 24.9844,231.2969 C25.2656,231.2969 25.5469,231.1563 25.7344,230.9375 C25.8594,230.7656 25.9063,230.5938 25.9063,230.1563 L25.9063,228.7969 C25.9063,228.375 25.8906,228.2344 25.7656,228.0625 C25.5938,227.8125 25.3125,227.6563 24.9844,227.6563 C24.6719,227.6563 24.4688,227.7656 24.25,228.0313 C23.0781,227.5313 22.6406,227.4219 21.6875,227.4219 C19.0156,227.4219 17,229.4375 17,232.0625 L17,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="36" y="236.606">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="367" x="54" y="213"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="365" x="55" y="227.2001">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:#181818;stroke-width:0.5;" x1="8" x2="417" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="417" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="1154" y="366.7104">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000559263385732885469">
-        <rect codeLine="38" fill="#F1F1F1" height="131.9996" id="C_0000559263385732885469" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="513" x="643" y="7"/>
-        <ellipse cx="890.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M885.25,24.1563 C885.25,26.6563 887.3906,28.4688 890.3125,28.4688 C891.5469,28.4688 892.7188,28.1719 893.4688,27.6563 C894.0781,27.2344 894.4063,26.8125 894.4063,26.4063 C894.4063,25.9375 893.9844,25.5313 893.4844,25.5313 C893.25,25.5313 893.0313,25.6094 892.8281,25.8125 C892.3906,26.25 892.3906,26.25 892.2188,26.3438 C891.7656,26.5781 891.125,26.7188 890.3594,26.7188 C888.3594,26.7188 887.0781,25.7031 887.0781,24.125 L887.0781,23.0781 C887.0781,21.375 888.2969,20.1719 890,20.1719 C890.5781,20.1719 891.1563,20.3125 891.625,20.5625 C892.0938,20.8281 892.2656,21.0156 892.3281,21.375 C892.4531,22.0469 892.7031,22.2969 893.2344,22.2969 C893.5156,22.2969 893.7969,22.1563 893.9844,21.9375 C894.1094,21.7656 894.1563,21.5938 894.1563,21.1563 L894.1563,19.7969 C894.1563,19.375 894.1406,19.2344 894.0156,19.0625 C893.8438,18.8125 893.5625,18.6563 893.2344,18.6563 C892.9219,18.6563 892.7188,18.7656 892.5,19.0313 C891.3281,18.5313 890.8906,18.4219 889.9375,18.4219 C887.2656,18.4219 885.25,20.4375 885.25,23.0625 L885.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="910.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="644" x2="1155" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="644" x2="1155" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="55.9"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="57.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="663" y="64.0059">a1 : A&lt;int,std::string,float&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="72.6999"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="74.6999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="663" y="80.8059">a2 : A&lt;int,std::string,bool&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="89.4998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="91.4998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="663" y="97.6058">b1 : B&lt;3,2,1&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="106.2997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="108.2997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="663" y="114.4057">b2 : B&lt;1,1,1,1&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="649" y="123.0997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="651" y="125.0997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="487" x="663" y="131.2057">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
+      <ellipse cx="216.25" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M219.2188,334.1406 Q218.6406,334.4375 218,334.5781 Q217.3594,334.7344 216.6563,334.7344 Q214.1563,334.7344 212.8281,333.0938 Q211.5156,331.4375 211.5156,328.3125 Q211.5156,325.1875 212.8281,323.5313 Q214.1563,321.875 216.6563,321.875 Q217.3594,321.875 218,322.0313 Q218.6563,322.1875 219.2188,322.4844 L219.2188,325.2031 Q218.5938,324.625 218,324.3594 Q217.4063,324.0781 216.7813,324.0781 Q215.4375,324.0781 214.75,325.1563 Q214.0625,326.2188 214.0625,328.3125 Q214.0625,330.4063 214.75,331.4844 Q215.4375,332.5469 216.7813,332.5469 Q217.4063,332.5469 218,332.2813 Q218.5938,332 219.2188,331.4219 L219.2188,334.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="236.75" y="332.6543">C</text>
+      <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"/>
     </a>
-    <g id="elem_GMN21">
-      <path d="M453,227.2 L453,236 L418.48,240 L453,244 L453,252.8 A0,0 0 0 0 453,252.8 L620,252.8 A0,0 0 0 0 620,252.8 L620,237.2 L610,227.2 L453,227.2 A0,0 0 0 0 453,227.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M610,227.2 L610,237.2 L620,237.2 L610,227.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="146" x="459" y="244.277">Long template annotation</text>
-    </g>
-    <g id="link_C_0000286972398942005457_C_0001773299890023132282">
-      <path codeLine="46" d="M737.67,264.29 C747.25,281.24 751.6106,288.9512 762.8906,308.9012 " fill="none" id="C_0000286972398942005457-to-C_0001773299890023132282" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="771.75,324.57,768.1136,305.9481,757.6677,311.8543,771.75,324.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000299466181098300963_C_0001773299890023132282">
-      <path codeLine="47" d="M879.75,264.29 C865.37,281.24 857.1827,290.8924 840.2627,310.8424 " fill="none" id="C_0000299466181098300963-to-C_0001773299890023132282" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="828.62,324.57,844.8386,314.7233,835.6868,306.9615,828.62,324.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000489063277971613593_C_0002061171077567279746">
-      <path codeLine="48" d="M1051.03,264.29 C1059.84,283.76 1065.072,295.3196 1074.792,316.8096 " fill="none" id="C_0000489063277971613593-to-C_0002061171077567279746" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="1082.21,333.21,1080.2588,314.3369,1069.3252,319.2822,1082.21,333.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000014232362483200599_C_0002061171077567279746">
-      <path codeLine="49" d="M1141.97,264.29 C1133.16,283.76 1127.928,295.3196 1118.208,316.8096 " fill="none" id="C_0000014232362483200599-to-C_0002061171077567279746" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="1110.79,333.21,1123.6748,319.2822,1112.7412,314.3369,1110.79,333.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001478239414632239754_C_0000627809578407650629">
-      <path codeLine="50" d="M212.5,264.29 C212.5,283.76 212.5,293.72 212.5,315.21 " fill="none" id="C_0001478239414632239754-to-C_0000627809578407650629" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="212.5,333.21,218.5,315.21,206.5,315.21,212.5,333.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000559263385732885469_C_0000286972398942005457">
-      <path codeLine="51" d="M821.3498,147.683 C792.7298,174.673 770.13,195.98 749.09,215.81 " fill="none" id="C_0000559263385732885469-backto-C_0000286972398942005457" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="830.08,139.45,822.9705,140.6564,821.3498,147.683,828.4592,146.4766,830.08,139.45" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="799.5" y="175.3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="809.5" y="182.077">a1</text>
-    </g>
-    <g id="link_C_0000559263385732885469_C_0000299466181098300963">
-      <path codeLine="52" d="M899.5,151.21 C899.5,178.24 899.5,195.85 899.5,215.74 " fill="none" id="C_0000559263385732885469-backto-C_0000299466181098300963" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="899.5,139.21,895.5,145.21,899.5,151.21,903.5,145.21,899.5,139.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="902.5" y="175.3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="912.5" y="182.077">a2</text>
-    </g>
-    <g id="link_C_0000559263385732885469_C_0000489063277971613593">
-      <path codeLine="53" d="M963.0242,148.3342 C986.1142,175.3642 1003.63,195.85 1020.63,215.74 " fill="none" id="C_0000559263385732885469-backto-C_0000489063277971613593" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="955.23,139.21,956.0857,146.3702,963.0242,148.3342,962.1685,141.174,955.23,139.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="998.5" y="175.3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="1008.5" y="182.077">b1</text>
-    </g>
-    <g id="link_C_0000559263385732885469_C_0000014232362483200599">
-      <path codeLine="54" d="M1009.9116,146.0048 C1051.1616,172.9048 1086.23,195.78 1116.64,215.62 " fill="none" id="C_0000559263385732885469-backto-C_0000014232362483200599" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="999.86,139.45,1002.7008,146.0779,1009.9116,146.0048,1007.0707,139.3769,999.86,139.45" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="1073.5" y="175.3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="1083.5" y="182.077">b2</text>
-    </g>
-    <g id="link_C_0000559263385732885469_C_0001478239414632239754">
-      <path codeLine="55" d="M631.042,138.4731 C514.992,166.3531 396.48,194.81 310.03,215.58 " fill="none" id="C_0000559263385732885469-backto-C_0001478239414632239754" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="642.71,135.67,635.9416,133.1822,631.042,138.4731,637.8104,140.9609,642.71,135.67" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="497.5" y="175.3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="507.5" y="182.077">c1</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="155.5" y="358.5"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="169.5" y="366.7104">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
+      <ellipse cx="773" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M775.9688,218.6406 Q775.3906,218.9375 774.75,219.0781 Q774.1094,219.2344 773.4063,219.2344 Q770.9063,219.2344 769.5781,217.5938 Q768.2656,215.9375 768.2656,212.8125 Q768.2656,209.6875 769.5781,208.0313 Q770.9063,206.375 773.4063,206.375 Q774.1094,206.375 774.75,206.5313 Q775.4063,206.6875 775.9688,206.9844 L775.9688,209.7031 Q775.3438,209.125 774.75,208.8594 Q774.1563,208.5781 773.5313,208.5781 Q772.1875,208.5781 771.5,209.6563 Q770.8125,210.7188 770.8125,212.8125 Q770.8125,214.9063 771.5,215.9844 Q772.1875,217.0469 773.5313,217.0469 Q774.1563,217.0469 774.75,216.7813 Q775.3438,216.5 775.9688,215.9219 L775.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="787" y="217.1543">A</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
+      <ellipse cx="966.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M969.4688,218.6406 Q968.8906,218.9375 968.25,219.0781 Q967.6094,219.2344 966.9063,219.2344 Q964.4063,219.2344 963.0781,217.5938 Q961.7656,215.9375 961.7656,212.8125 Q961.7656,209.6875 963.0781,208.0313 Q964.4063,206.375 966.9063,206.375 Q967.6094,206.375 968.25,206.5313 Q968.9063,206.6875 969.4688,206.9844 L969.4688,209.7031 Q968.8438,209.125 968.25,208.8594 Q967.6563,208.5781 967.0313,208.5781 Q965.6875,208.5781 965,209.6563 Q964.3125,210.7188 964.3125,212.8125 Q964.3125,214.9063 965,215.9844 Q965.6875,217.0469 967.0313,217.0469 Q967.6563,217.0469 968.25,216.7813 Q968.8438,216.5 969.4688,215.9219 L969.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="980.5" y="217.1543">A</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
+      <ellipse cx="1159" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1161.9688,218.6406 Q1161.3906,218.9375 1160.75,219.0781 Q1160.1094,219.2344 1159.4063,219.2344 Q1156.9063,219.2344 1155.5781,217.5938 Q1154.2656,215.9375 1154.2656,212.8125 Q1154.2656,209.6875 1155.5781,208.0313 Q1156.9063,206.375 1159.4063,206.375 Q1160.1094,206.375 1160.75,206.5313 Q1161.4063,206.6875 1161.9688,206.9844 L1161.9688,209.7031 Q1161.3438,209.125 1160.75,208.8594 Q1160.1563,208.5781 1159.5313,208.5781 Q1158.1875,208.5781 1157.5,209.6563 Q1156.8125,210.7188 1156.8125,212.8125 Q1156.8125,214.9063 1157.5,215.9844 Q1158.1875,217.0469 1159.5313,217.0469 Q1160.1563,217.0469 1160.75,216.7813 Q1161.3438,216.5 1161.9688,215.9219 L1161.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1173" y="217.1543">B</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
+      <ellipse cx="1270" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1272.9688,218.6406 Q1272.3906,218.9375 1271.75,219.0781 Q1271.1094,219.2344 1270.4063,219.2344 Q1267.9063,219.2344 1266.5781,217.5938 Q1265.2656,215.9375 1265.2656,212.8125 Q1265.2656,209.6875 1266.5781,208.0313 Q1267.9063,206.375 1270.4063,206.375 Q1271.1094,206.375 1271.75,206.5313 Q1272.4063,206.6875 1272.9688,206.9844 L1272.9688,209.7031 Q1272.3438,209.125 1271.75,208.8594 Q1271.1563,208.5781 1270.5313,208.5781 Q1269.1875,208.5781 1268.5,209.6563 Q1267.8125,210.7188 1267.8125,212.8125 Q1267.8125,214.9063 1268.5,215.9844 Q1269.1875,217.0469 1270.5313,217.0469 Q1271.1563,217.0469 1271.75,216.7813 Q1272.3438,216.5 1272.9688,215.9219 L1272.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1284" y="217.1543">B</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
+      <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">C</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
+      <ellipse cx="1021.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1024.7188,29.6406 Q1024.1406,29.9375 1023.5,30.0781 Q1022.8594,30.2344 1022.1563,30.2344 Q1019.6563,30.2344 1018.3281,28.5938 Q1017.0156,26.9375 1017.0156,23.8125 Q1017.0156,20.6875 1018.3281,19.0313 Q1019.6563,17.375 1022.1563,17.375 Q1022.8594,17.375 1023.5,17.5313 Q1024.1563,17.6875 1024.7188,17.9844 L1024.7188,20.7031 Q1024.0938,20.125 1023.5,19.8594 Q1022.9063,19.5781 1022.2813,19.5781 Q1020.9375,19.5781 1020.25,20.6563 Q1019.5625,21.7188 1019.5625,23.8125 Q1019.5625,25.9063 1020.25,26.9844 Q1020.9375,28.0469 1022.2813,28.0469 Q1022.9063,28.0469 1023.5,27.7813 Q1024.0938,27.5 1024.7188,26.9219 L1024.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1042.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="54"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="56"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="62.2104">a1 : A&lt;int,std::string,float&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="66.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="68.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="75.0151">a2 : A&lt;int,std::string,bool&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="79.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="81.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="87.8198">b1 : B&lt;3,2,1&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="92.4141"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="94.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="100.6245">b2 : B&lt;1,1,1,1&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="105.2188"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="107.2188"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="113.4292">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
+    </a>
+    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f1hwvc3mblsfi7)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M712.5,208.5 L712.5,218.5 L722.5,218.5 L712.5,208.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="166" x="541.5" y="225.5669">Long template annotation</text>
+    <path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000286972398942005457-&gt;C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <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;"/>
+    <path d="M1007.63,245.14 C995.06,258.14 978.84,274.92 963.44,290.85 " fill="none" id="C_0000299466181098300963-&gt;C_0001773299890023132282" 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;"/>
+    <path d="M1193.38,245.14 C1200.19,258.99 1209.11,277.13 1217.38,293.96 " fill="none" id="C_0000489063277971613593-&gt;C_0002061171077567279746" 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;"/>
+    <path d="M1287.82,245.14 C1281.12,258.99 1272.35,277.13 1264.22,293.96 " fill="none" id="C_0000014232362483200599-&gt;C_0002061171077567279746" 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;"/>
+    <path d="M253,245.14 C253,258.47 253,275.77 253,292.05 " fill="none" id="C_0001478239414632239754-&gt;C_0000627809578407650629" 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;"/>
+    <path d="M950.89,128.54 C920.8,152.7 888.38,178.73 865.86,196.83 " fill="none" id="C_0000559263385732885469&lt;-C_0000286972398942005457" 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>
+    <path d="M1030,133.26 C1030,155.95 1030,179.72 1030,196.62 " fill="none" id="C_0000559263385732885469&lt;-C_0000299466181098300963" 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>
+    <path d="M1093.21,129.46 C1116.56,153.27 1141.57,178.77 1159.08,196.62 " fill="none" id="C_0000559263385732885469&lt;-C_0000489063277971613593" 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>
+    <path d="M1136.98,126.64 C1179.82,151.33 1226.56,178.26 1258.78,196.83 " fill="none" id="C_0000559263385732885469&lt;-C_0000014232362483200599" 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>
+    <path d="M770.25,116.82 C634.09,143.98 474.14,175.89 368.56,196.95 " fill="none" id="C_0000559263385732885469&lt;-C_0001478239414632239754" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00012_class_mermaid.svg b/docs/test_cases/t00012_class_mermaid.svg
index 8663f35d..fa787783 100644
--- a/docs/test_cases/t00012_class_mermaid.svg
+++ b/docs/test_cases/t00012_class_mermaid.svg
@@ -1,70 +1,65 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1342.828125 459" style="max-width: 1342.83px; background-color: white;" width="1342.828125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M101.28125,300L101.28125,304.1666666666667C101.28125,308.3333333333333,101.28125,316.6666666666667,105.27996766846813,323.3858355657767C109.27868533693625,330.1050044648867,117.27612067387251,335.2100089297734,121.27483834234063,337.76251116221675L125.27355601080875,340.31501339466007"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M337.8359375,300L337.8359375,304.1666666666667C337.8359375,308.3333333333333,337.8359375,316.6666666666667,333.83721983153185,323.3858355657767C329.83850216306377,330.1050044648867,321.8410668261275,335.2100089297734,317.8423491576594,337.76251116221675L313.84363148919124,340.31501339466007"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M521.5234375,300L521.5234375,304.1666666666667C521.5234375,308.3333333333333,521.5234375,316.6666666666667,524.9671680465517,324.61517560627374C528.4108985931034,332.5636845458808,535.2983596862068,340.12736909176164,538.7420902327585,343.90921136470206L542.1858207793102,347.6910536376425"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M659.0234375,300L659.0234375,304.1666666666667C659.0234375,308.3333333333333,659.0234375,316.6666666666667,655.5797069534483,324.61517560627374C652.1359764068966,332.5636845458808,645.2485153137932,340.12736909176164,641.8047847672415,343.90921136470206L638.3610542206898,347.6910536376425"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M1045.46875,300L1045.46875,304.1666666666667C1045.46875,308.3333333333333,1045.46875,316.6666666666667,1045.46875,323.8333333333333C1045.46875,331,1045.46875,337,1045.46875,340L1045.46875,343"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M219.65703899316415,175.9020492934285L199.92774082763677,181.4183744111904C180.19844266210944,186.93469952895234,140.73984633105474,197.96734976447615,121.01054816552737,209.15034154890475C101.28125,220.33333333333334,101.28125,231.66666666666666,101.28125,237.33333333333334L101.28125,243"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M375.8249315866398,184.69945257472511L369.4934325721999,188.7495438122709C363.16193355775994,192.79963504981674,350.49893552887994,200.89981752490837,344.16743651443994,210.61657542912084C337.8359375,220.33333333333334,337.8359375,231.66666666666666,337.8359375,237.33333333333334L337.8359375,243"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M521.5234375,193L521.5234375,195.66666666666666C521.5234375,198.33333333333334,521.5234375,203.66666666666666,521.5234375,212C521.5234375,220.33333333333334,521.5234375,231.66666666666666,521.5234375,237.33333333333334L521.5234375,243"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M632.9203695065175,186.69374189647863L637.2708808387646,190.41145158039885C641.6213921710117,194.1291612643191,650.3224148355058,201.56458063215953,654.672926167753,210.9489569827464C659.0234375,220.33333333333334,659.0234375,231.66666666666666,659.0234375,237.33333333333334L659.0234375,243"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M823.6184420318964,159.24783968030601L860.5934933599137,167.53986640025502C897.568544687931,175.831893120204,971.5186473439654,192.41594656010201,1008.4936986719828,206.37463994671768C1045.46875,220.33333333333334,1045.46875,231.66666666666666,1045.46875,237.33333333333334L1045.46875,243"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M101.28125,300L101.28125,304.1666666666667C101.28125,308.3333333333333,101.28125,316.6666666666667,107.8086972268212,325C114.33614445364238,333.3333333333333,127.39103890728477,341.6666666666667,133.91848613410596,345.8333333333333L140.44593336092714,350"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M337.8359375,300L337.8359375,304.1666666666667C337.8359375,308.3333333333333,337.8359375,316.6666666666667,331.30849027317885,325C324.78104304635764,333.3333333333333,311.7261485927152,341.6666666666667,305.19870136589407,345.8333333333333L298.67125413907286,350"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M521.5234375,300L521.5234375,304.1666666666667C521.5234375,308.3333333333333,521.5234375,316.6666666666667,526.9870136589403,326.8333333333333C532.4505898178808,337,543.3777421357617,349,548.841318294702,355L554.3048944536424,361"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M659.0234375,300L659.0234375,304.1666666666667C659.0234375,308.3333333333333,659.0234375,316.6666666666667,653.5598613410597,326.8333333333333C648.0962851821192,337,637.1691328642383,349,631.705556705298,355L626.2419805463576,361"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M1045.46875,300L1045.46875,304.1666666666667C1045.46875,308.3333333333333,1045.46875,316.6666666666667,1045.46875,326.8333333333333C1045.46875,337,1045.46875,349,1045.46875,355L1045.46875,361"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M236.9921875,171.05513004034134L214.37369791666666,177.37927503361777C191.75520833333334,183.70342002689424,146.51822916666666,196.3517100134471,123.89973958333333,208.34252167339022C101.28125,220.33333333333334,101.28125,231.66666666666666,101.28125,237.33333333333334L101.28125,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M390.9880651595745,175L382.1293772163121,180.66666666666666C373.27068927304964,186.33333333333334,355.55331338652485,197.66666666666666,346.6946254432624,209C337.8359375,220.33333333333334,337.8359375,231.66666666666666,337.8359375,237.33333333333334L337.8359375,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M521.5234375,175L521.5234375,180.66666666666666C521.5234375,186.33333333333334,521.5234375,197.66666666666666,521.5234375,209C521.5234375,220.33333333333334,521.5234375,231.66666666666666,521.5234375,237.33333333333334L521.5234375,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M619.2362034574468,175L625.8674091312056,180.66666666666666C632.4986148049645,186.33333333333334,645.7610261524823,197.66666666666666,652.3922318262411,209C659.0234375,220.33333333333334,659.0234375,231.66666666666666,659.0234375,237.33333333333334L659.0234375,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M806.0546875,155.30899127711922L845.95703125,164.25749273093268C885.859375,173.20599418474615,965.6640625,191.1029970923731,1005.56640625,205.71816521285322C1045.46875,220.33333333333334,1045.46875,231.66666666666666,1045.46875,237.33333333333334L1045.46875,243"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -179,7 +174,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11">
+        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0001773299890023132282-0" class="node default clickable">
             <rect height="101" width="206.203125" y="-50.5" x="-103.1015625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="103.1015625" x1="-103.1015625" class="divider"/>
@@ -208,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16">
+        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0002061171077567279746-1" class="node default clickable">
             <rect height="79" width="243.515625" y="-39.5" x="-121.7578125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.7578125" x1="-121.7578125" class="divider"/>
@@ -232,7 +227,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0000627809578407650629-2" class="node default clickable">
             <rect height="79" width="234.625" y="-39.5" x="-117.3125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="117.3125" x1="-117.3125" class="divider"/>
@@ -256,7 +251,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11">
+        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000286972398942005457-3" class="node default clickable">
             <rect height="57" width="186.5625" y="-28.5" x="-93.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.28125" x1="-93.28125" class="divider"/>
@@ -275,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L11">
+        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000299466181098300963-4" class="node default clickable">
             <rect height="57" width="186.546875" y="-28.5" x="-93.2734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.2734375" x1="-93.2734375" class="divider"/>
@@ -294,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16">
+        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000489063277971613593-5" class="node default clickable">
             <rect height="57" width="80.828125" y="-28.5" x="-40.4140625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="40.4140625" x1="-40.4140625" class="divider"/>
@@ -313,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L16">
+        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000014232362483200599-6" class="node default clickable">
             <rect height="57" width="94.171875" y="-28.5" x="-47.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0859375" x1="-47.0859375" class="divider"/>
@@ -332,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0001478239414632239754-7" class="node default clickable">
             <rect height="57" width="578.71875" y="-28.5" x="-289.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="289.359375" x1="-289.359375" class="divider"/>
@@ -351,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00012/t00012.cc#L24">
+        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L24">
           <g title="R" id="classId-C_0000559263385732885469-8" class="node default clickable">
             <rect height="167" width="569.0625" y="-83.5" x="-284.53125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="284.53125" x1="-284.53125" class="divider"/>
diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md
index 0163deb8..1e54e3d5 100644
--- a/docs/test_cases/t00013.md
+++ b/docs/test_cases/t00013.md
@@ -166,7 +166,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::A",
+      "display_name": "A",
       "id": "519995486237427479",
       "is_abstract": false,
       "is_nested": false,
@@ -201,7 +201,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::B",
+      "display_name": "B",
       "id": "1177487653597650440",
       "is_abstract": false,
       "is_nested": false,
@@ -236,7 +236,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::C",
+      "display_name": "C",
       "id": "1028245818073128358",
       "is_abstract": false,
       "is_nested": false,
@@ -271,7 +271,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::D",
+      "display_name": "D",
       "id": "409373870621931875",
       "is_abstract": false,
       "is_nested": false,
@@ -338,7 +338,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::E<T>",
+      "display_name": "E<T>",
       "id": "864055993755439230",
       "is_abstract": false,
       "is_nested": false,
@@ -380,7 +380,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::G<T,Args...>",
+      "display_name": "G<T,Args...>",
       "id": "205927019127027617",
       "is_abstract": false,
       "is_nested": false,
@@ -440,7 +440,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::E<int>",
+      "display_name": "E<int>",
       "id": "1977486318799565722",
       "is_abstract": false,
       "is_nested": false,
@@ -469,7 +469,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::G<int,float,std::string>",
+      "display_name": "G<int,float,std::string>",
       "id": "1526733274613822014",
       "is_abstract": false,
       "is_nested": false,
@@ -510,7 +510,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::E<std::string>",
+      "display_name": "E<std::string>",
       "id": "531523220915557686",
       "is_abstract": false,
       "is_nested": false,
@@ -539,7 +539,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00013::R",
+      "display_name": "R",
       "id": "2198686676355573844",
       "is_abstract": false,
       "is_nested": false,
@@ -916,6 +916,7 @@ private:
     }
   ],
   "name": "t00013_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index 8a68cb28..9e01ec4e 100644
--- a/docs/test_cases/t00013_class.svg
+++ b/docs/test_cases/t00013_class.svg
@@ -1,349 +1,301 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="581px" preserveAspectRatio="none" style="width:1135px;height:581px;background:#FFFFFF;" version="1.1" viewBox="0 0 1135 581" width="1135px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="518px" preserveAspectRatio="none" style="width:1138px;height:518px;" version="1.1" viewBox="0 0 1138 518" width="1138px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fnkll5h6sumim" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000952770730316239752">
-        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000952770730316239752" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="98" x="168" y="501.4"/>
-        <ellipse cx="183" cy="517.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M178,518.5563 C178,521.0563 180.1406,522.8688 183.0625,522.8688 C184.2969,522.8688 185.4688,522.5719 186.2188,522.0563 C186.8281,521.6344 187.1563,521.2125 187.1563,520.8063 C187.1563,520.3375 186.7344,519.9313 186.2344,519.9313 C186,519.9313 185.7813,520.0094 185.5781,520.2125 C185.1406,520.65 185.1406,520.65 184.9688,520.7438 C184.5156,520.9781 183.875,521.1188 183.1094,521.1188 C181.1094,521.1188 179.8281,520.1031 179.8281,518.525 L179.8281,517.4781 C179.8281,515.775 181.0469,514.5719 182.75,514.5719 C183.3281,514.5719 183.9063,514.7125 184.375,514.9625 C184.8438,515.2281 185.0156,515.4156 185.0781,515.775 C185.2031,516.4469 185.4531,516.6969 185.9844,516.6969 C186.2656,516.6969 186.5469,516.5563 186.7344,516.3375 C186.8594,516.1656 186.9063,515.9938 186.9063,515.5563 L186.9063,514.1969 C186.9063,513.775 186.8906,513.6344 186.7656,513.4625 C186.5938,513.2125 186.3125,513.0563 185.9844,513.0563 C185.6719,513.0563 185.4688,513.1656 185.25,513.4313 C184.0781,512.9313 183.6406,512.8219 182.6875,512.8219 C180.0156,512.8219 178,514.8375 178,517.4625 L178,518.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="197" y="522.006">ABCD::F</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="260" y="498.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="261" y="512.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="169" x2="265" y1="533.4" y2="533.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="169" x2="265" y1="541.4" y2="541.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="174" y="550.3"/>
-          <ellipse cx="179" cy="555.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="188" y="558.4059">f : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
+      <ellipse cx="176" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M178.9688,462.1406 Q178.3906,462.4375 177.75,462.5781 Q177.1094,462.7344 176.4063,462.7344 Q173.9063,462.7344 172.5781,461.0938 Q171.2656,459.4375 171.2656,456.3125 Q171.2656,453.1875 172.5781,451.5313 Q173.9063,449.875 176.4063,449.875 Q177.1094,449.875 177.75,450.0313 Q178.4063,450.1875 178.9688,450.4844 L178.9688,453.2031 Q178.3438,452.625 177.75,452.3594 Q177.1563,452.0781 176.5313,452.0781 Q175.1875,452.0781 174.5,453.1563 Q173.8125,454.2188 173.8125,456.3125 Q173.8125,458.4063 174.5,459.4844 Q175.1875,460.5469 176.5313,460.5469 Q177.1563,460.5469 177.75,460.2813 Q178.3438,460 178.9688,459.4219 L178.9688,462.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="190" y="460.6543">ABCD::F</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="246" y="437.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="247" y="449.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="472.5" y2="472.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="480.5" y2="480.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0002304215469403389354">
-        <rect codeLine="7" fill="#F1F1F1" height="48" id="C_0002304215469403389354" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="243" y="367.2"/>
-        <ellipse cx="258" cy="383.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M253,384.3563 C253,386.8563 255.1406,388.6688 258.0625,388.6688 C259.2969,388.6688 260.4688,388.3719 261.2188,387.8563 C261.8281,387.4344 262.1563,387.0125 262.1563,386.6063 C262.1563,386.1375 261.7344,385.7313 261.2344,385.7313 C261,385.7313 260.7813,385.8094 260.5781,386.0125 C260.1406,386.45 260.1406,386.45 259.9688,386.5438 C259.5156,386.7781 258.875,386.9188 258.1094,386.9188 C256.1094,386.9188 254.8281,385.9031 254.8281,384.325 L254.8281,383.2781 C254.8281,381.575 256.0469,380.3719 257.75,380.3719 C258.3281,380.3719 258.9063,380.5125 259.375,380.7625 C259.8438,381.0281 260.0156,381.2156 260.0781,381.575 C260.2031,382.2469 260.4531,382.4969 260.9844,382.4969 C261.2656,382.4969 261.5469,382.3563 261.7344,382.1375 C261.8594,381.9656 261.9063,381.7938 261.9063,381.3563 L261.9063,379.9969 C261.9063,379.575 261.8906,379.4344 261.7656,379.2625 C261.5938,379.0125 261.3125,378.8563 260.9844,378.8563 C260.6719,378.8563 260.4688,378.9656 260.25,379.2313 C259.0781,378.7313 258.6406,378.6219 257.6875,378.6219 C255.0156,378.6219 253,380.6375 253,383.2625 L253,384.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="272" y="387.806">ABCD::F</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="335" y="364.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="336" y="378.4001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="244" x2="346" y1="399.2" y2="399.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="244" x2="346" y1="407.2" y2="407.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167" y="486.5"/>
+      <ellipse cx="172" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000519995486237427479">
-        <rect codeLine="11" fill="#F1F1F1" height="64.7999" id="C_0000519995486237427479" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="381.5" y="358.8"/>
-        <ellipse cx="405.5" cy="374.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M400.5,375.9563 C400.5,378.4563 402.6406,380.2688 405.5625,380.2688 C406.7969,380.2688 407.9688,379.9719 408.7188,379.4563 C409.3281,379.0344 409.6563,378.6125 409.6563,378.2063 C409.6563,377.7375 409.2344,377.3313 408.7344,377.3313 C408.5,377.3313 408.2813,377.4094 408.0781,377.6125 C407.6406,378.05 407.6406,378.05 407.4688,378.1438 C407.0156,378.3781 406.375,378.5188 405.6094,378.5188 C403.6094,378.5188 402.3281,377.5031 402.3281,375.925 L402.3281,374.8781 C402.3281,373.175 403.5469,371.9719 405.25,371.9719 C405.8281,371.9719 406.4063,372.1125 406.875,372.3625 C407.3438,372.6281 407.5156,372.8156 407.5781,373.175 C407.7031,373.8469 407.9531,374.0969 408.4844,374.0969 C408.7656,374.0969 409.0469,373.9563 409.2344,373.7375 C409.3594,373.5656 409.4063,373.3938 409.4063,372.9563 L409.4063,371.5969 C409.4063,371.175 409.3906,371.0344 409.2656,370.8625 C409.0938,370.6125 408.8125,370.4563 408.4844,370.4563 C408.1719,370.4563 407.9688,370.5656 407.75,370.8313 C406.5781,370.3313 406.1406,370.2219 405.1875,370.2219 C402.5156,370.2219 400.5,372.2375 400.5,374.8625 L400.5,375.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="421.5" y="379.406">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="382.5" x2="441.5" y1="390.8" y2="390.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="382.5" x2="441.5" y1="398.8" y2="398.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="387.5" y="407.7"/>
-          <ellipse cx="392.5" cy="412.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="401.5" y="415.8059">a : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="181" y="494.7104">f : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001177487653597650440">
-        <rect codeLine="16" fill="#F1F1F1" height="64.7999" id="C_0001177487653597650440" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="477.5" y="358.8"/>
-        <ellipse cx="501.5" cy="374.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M496.5,375.9563 C496.5,378.4563 498.6406,380.2688 501.5625,380.2688 C502.7969,380.2688 503.9688,379.9719 504.7188,379.4563 C505.3281,379.0344 505.6563,378.6125 505.6563,378.2063 C505.6563,377.7375 505.2344,377.3313 504.7344,377.3313 C504.5,377.3313 504.2813,377.4094 504.0781,377.6125 C503.6406,378.05 503.6406,378.05 503.4688,378.1438 C503.0156,378.3781 502.375,378.5188 501.6094,378.5188 C499.6094,378.5188 498.3281,377.5031 498.3281,375.925 L498.3281,374.8781 C498.3281,373.175 499.5469,371.9719 501.25,371.9719 C501.8281,371.9719 502.4063,372.1125 502.875,372.3625 C503.3438,372.6281 503.5156,372.8156 503.5781,373.175 C503.7031,373.8469 503.9531,374.0969 504.4844,374.0969 C504.7656,374.0969 505.0469,373.9563 505.2344,373.7375 C505.3594,373.5656 505.4063,373.3938 505.4063,372.9563 L505.4063,371.5969 C505.4063,371.175 505.3906,371.0344 505.2656,370.8625 C505.0938,370.6125 504.8125,370.4563 504.4844,370.4563 C504.1719,370.4563 503.9688,370.5656 503.75,370.8313 C502.5781,370.3313 502.1406,370.2219 501.1875,370.2219 C498.5156,370.2219 496.5,372.2375 496.5,374.8625 L496.5,375.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="517.5" y="379.406">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="537.5" y1="390.8" y2="390.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="537.5" y1="398.8" y2="398.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483.5" y="407.7"/>
-          <ellipse cx="488.5" cy="412.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="497.5" y="415.8059">b : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
+      <ellipse cx="248.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M251.4688,333.6406 Q250.8906,333.9375 250.25,334.0781 Q249.6094,334.2344 248.9063,334.2344 Q246.4063,334.2344 245.0781,332.5938 Q243.7656,330.9375 243.7656,327.8125 Q243.7656,324.6875 245.0781,323.0313 Q246.4063,321.375 248.9063,321.375 Q249.6094,321.375 250.25,321.5313 Q250.9063,321.6875 251.4688,321.9844 L251.4688,324.7031 Q250.8438,324.125 250.25,323.8594 Q249.6563,323.5781 249.0313,323.5781 Q247.6875,323.5781 247,324.6563 Q246.3125,325.7188 246.3125,327.8125 Q246.3125,329.9063 247,330.9844 Q247.6875,332.0469 249.0313,332.0469 Q249.6563,332.0469 250.25,331.7813 Q250.8438,331.5 251.4688,330.9219 L251.4688,333.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="262.5" y="332.1543">ABCD::F</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="318.5" y="309"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="319.5" y="321.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="344" y2="344"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001028245818073128358">
-        <rect codeLine="21" fill="#F1F1F1" height="64.7999" id="C_0001028245818073128358" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="60" x="573" y="358.8"/>
-        <ellipse cx="596.1" cy="374.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M591.1,375.9563 C591.1,378.4563 593.2406,380.2688 596.1625,380.2688 C597.3969,380.2688 598.5688,379.9719 599.3188,379.4563 C599.9281,379.0344 600.2563,378.6125 600.2563,378.2063 C600.2563,377.7375 599.8344,377.3313 599.3344,377.3313 C599.1,377.3313 598.8813,377.4094 598.6781,377.6125 C598.2406,378.05 598.2406,378.05 598.0688,378.1438 C597.6156,378.3781 596.975,378.5188 596.2094,378.5188 C594.2094,378.5188 592.9281,377.5031 592.9281,375.925 L592.9281,374.8781 C592.9281,373.175 594.1469,371.9719 595.85,371.9719 C596.4281,371.9719 597.0063,372.1125 597.475,372.3625 C597.9438,372.6281 598.1156,372.8156 598.1781,373.175 C598.3031,373.8469 598.5531,374.0969 599.0844,374.0969 C599.3656,374.0969 599.6469,373.9563 599.8344,373.7375 C599.9594,373.5656 600.0063,373.3938 600.0063,372.9563 L600.0063,371.5969 C600.0063,371.175 599.9906,371.0344 599.8656,370.8625 C599.6938,370.6125 599.4125,370.4563 599.0844,370.4563 C598.7719,370.4563 598.5688,370.5656 598.35,370.8313 C597.1781,370.3313 596.7406,370.2219 595.7875,370.2219 C593.1156,370.2219 591.1,372.2375 591.1,374.8625 L591.1,375.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="611.9" y="379.406">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="574" x2="632" y1="390.8" y2="390.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="574" x2="632" y1="398.8" y2="398.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="579" y="407.7"/>
-          <ellipse cx="584" cy="412.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="593" y="415.8059">c : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
+      <ellipse cx="392.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M395.5188,327.1406 Q394.9406,327.4375 394.3,327.5781 Q393.6594,327.7344 392.9563,327.7344 Q390.4563,327.7344 389.1281,326.0938 Q387.8156,324.4375 387.8156,321.3125 Q387.8156,318.1875 389.1281,316.5313 Q390.4563,314.875 392.9563,314.875 Q393.6594,314.875 394.3,315.0313 Q394.9563,315.1875 395.5188,315.4844 L395.5188,318.2031 Q394.8938,317.625 394.3,317.3594 Q393.7063,317.0781 393.0813,317.0781 Q391.7375,317.0781 391.05,318.1563 Q390.3625,319.2188 390.3625,321.3125 Q390.3625,323.4063 391.05,324.4844 Q391.7375,325.5469 393.0813,325.5469 Q393.7063,325.5469 394.3,325.2813 Q394.8938,325 395.5188,324.4219 L395.5188,327.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="408.45" y="325.6543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="337.5" y2="337.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0000409373870621931875">
-        <rect codeLine="26" fill="#F1F1F1" height="81.5999" id="C_0000409373870621931875" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="130" x="7" y="350.4"/>
-        <ellipse cx="62.75" cy="366.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M57.75,367.5563 C57.75,370.0563 59.8906,371.8688 62.8125,371.8688 C64.0469,371.8688 65.2188,371.5719 65.9688,371.0563 C66.5781,370.6344 66.9063,370.2125 66.9063,369.8063 C66.9063,369.3375 66.4844,368.9313 65.9844,368.9313 C65.75,368.9313 65.5313,369.0094 65.3281,369.2125 C64.8906,369.65 64.8906,369.65 64.7188,369.7438 C64.2656,369.9781 63.625,370.1188 62.8594,370.1188 C60.8594,370.1188 59.5781,369.1031 59.5781,367.525 L59.5781,366.4781 C59.5781,364.775 60.7969,363.5719 62.5,363.5719 C63.0781,363.5719 63.6563,363.7125 64.125,363.9625 C64.5938,364.2281 64.7656,364.4156 64.8281,364.775 C64.9531,365.4469 65.2031,365.6969 65.7344,365.6969 C66.0156,365.6969 66.2969,365.5563 66.4844,365.3375 C66.6094,365.1656 66.6563,364.9938 66.6563,364.5563 L66.6563,363.1969 C66.6563,362.775 66.6406,362.6344 66.5156,362.4625 C66.3438,362.2125 66.0625,362.0563 65.7344,362.0563 C65.4219,362.0563 65.2188,362.1656 65,362.4313 C63.8281,361.9313 63.3906,361.8219 62.4375,361.8219 C59.7656,361.8219 57.75,363.8375 57.75,366.4625 L57.75,367.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="83.25" y="371.006">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="136" y1="382.4" y2="382.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="391.3"/>
-          <ellipse cx="18" cy="396.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="27" y="399.4059">print(R * r) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="136" y1="407.1999" y2="407.1999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="416.0999"/>
-          <ellipse cx="18" cy="421.0999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="27" y="424.2059">d : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="375" y="351.5"/>
+      <ellipse cx="380" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0000864055993755439230">
-        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0000864055993755439230" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="801.5" y="501.4"/>
-        <ellipse cx="817.85" cy="517.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M812.85,518.5563 C812.85,521.0563 814.9906,522.8688 817.9125,522.8688 C819.1469,522.8688 820.3188,522.5719 821.0688,522.0563 C821.6781,521.6344 822.0063,521.2125 822.0063,520.8063 C822.0063,520.3375 821.5844,519.9313 821.0844,519.9313 C820.85,519.9313 820.6313,520.0094 820.4281,520.2125 C819.9906,520.65 819.9906,520.65 819.8188,520.7438 C819.3656,520.9781 818.725,521.1188 817.9594,521.1188 C815.9594,521.1188 814.6781,520.1031 814.6781,518.525 L814.6781,517.4781 C814.6781,515.775 815.8969,514.5719 817.6,514.5719 C818.1781,514.5719 818.7563,514.7125 819.225,514.9625 C819.6938,515.2281 819.8656,515.4156 819.9281,515.775 C820.0531,516.4469 820.3031,516.6969 820.8344,516.6969 C821.1156,516.6969 821.3969,516.5563 821.5844,516.3375 C821.7094,516.1656 821.7563,515.9938 821.7563,515.5563 L821.7563,514.1969 C821.7563,513.775 821.7406,513.6344 821.6156,513.4625 C821.4438,513.2125 821.1625,513.0563 820.8344,513.0563 C820.5219,513.0563 820.3188,513.1656 820.1,513.4313 C818.9281,512.9313 818.4906,512.8219 817.5375,512.8219 C814.8656,512.8219 812.85,514.8375 812.85,517.4625 L812.85,518.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="832.15" y="522.006">E</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="850.5" y="498.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="851.5" y="512.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="802.5" x2="855.5" y1="533.4" y2="533.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="802.5" x2="855.5" y1="541.4" y2="541.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="807.5" y="550.3"/>
-          <ellipse cx="812.5" cy="555.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="821.5" y="558.4059">e : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="389" y="359.7104">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0000205927019127027617">
-        <rect codeLine="37" fill="#F1F1F1" height="81.5999" id="C_0000205927019127027617" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="181" x="943.5" y="493"/>
-        <ellipse cx="1000.25" cy="509" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M995.25,510.1563 C995.25,512.6563 997.3906,514.4688 1000.3125,514.4688 C1001.5469,514.4688 1002.7188,514.1719 1003.4688,513.6563 C1004.0781,513.2344 1004.4063,512.8125 1004.4063,512.4063 C1004.4063,511.9375 1003.9844,511.5313 1003.4844,511.5313 C1003.25,511.5313 1003.0313,511.6094 1002.8281,511.8125 C1002.3906,512.25 1002.3906,512.25 1002.2188,512.3438 C1001.7656,512.5781 1001.125,512.7188 1000.3594,512.7188 C998.3594,512.7188 997.0781,511.7031 997.0781,510.125 L997.0781,509.0781 C997.0781,507.375 998.2969,506.1719 1000,506.1719 C1000.5781,506.1719 1001.1563,506.3125 1001.625,506.5625 C1002.0938,506.8281 1002.2656,507.0156 1002.3281,507.375 C1002.4531,508.0469 1002.7031,508.2969 1003.2344,508.2969 C1003.5156,508.2969 1003.7969,508.1563 1003.9844,507.9375 C1004.1094,507.7656 1004.1563,507.5938 1004.1563,507.1563 L1004.1563,505.7969 C1004.1563,505.375 1004.1406,505.2344 1004.0156,505.0625 C1003.8438,504.8125 1003.5625,504.6563 1003.2344,504.6563 C1002.9219,504.6563 1002.7188,504.7656 1002.5,505.0313 C1001.3281,504.5313 1000.8906,504.4219 999.9375,504.4219 C997.2656,504.4219 995.25,506.4375 995.25,509.0625 L995.25,510.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="1020.75" y="513.606">G</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="1081.5" y="490"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="1082.5" y="504.2001">T,Args...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="944.5" x2="1123.5" y1="525" y2="525"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="944.5" x2="1123.5" y1="533" y2="533"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="949.5" y="541.9"/>
-          <ellipse cx="954.5" cy="546.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="963.5" y="550.0059">args : std::tuple&lt;Args...&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="949.5" y="558.6999"/>
-          <ellipse cx="954.5" cy="563.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="963.5" y="566.8059">g : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
+      <ellipse cx="486.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M489.5188,327.1406 Q488.9406,327.4375 488.3,327.5781 Q487.6594,327.7344 486.9563,327.7344 Q484.4563,327.7344 483.1281,326.0938 Q481.8156,324.4375 481.8156,321.3125 Q481.8156,318.1875 483.1281,316.5313 Q484.4563,314.875 486.9563,314.875 Q487.6594,314.875 488.3,315.0313 Q488.9563,315.1875 489.5188,315.4844 L489.5188,318.2031 Q488.8938,317.625 488.3,317.3594 Q487.7063,317.0781 487.0813,317.0781 Q485.7375,317.0781 485.05,318.1563 Q484.3625,319.2188 484.3625,321.3125 Q484.3625,323.4063 485.05,324.4844 Q485.7375,325.5469 487.0813,325.5469 Q487.7063,325.5469 488.3,325.2813 Q488.8938,325 489.5188,324.4219 L489.5188,327.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.45" y="325.6543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="337.5" y2="337.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001977486318799565722">
-        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0001977486318799565722" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="800" y="367.2"/>
-        <ellipse cx="815" cy="383.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M810,384.3563 C810,386.8563 812.1406,388.6688 815.0625,388.6688 C816.2969,388.6688 817.4688,388.3719 818.2188,387.8563 C818.8281,387.4344 819.1563,387.0125 819.1563,386.6063 C819.1563,386.1375 818.7344,385.7313 818.2344,385.7313 C818,385.7313 817.7813,385.8094 817.5781,386.0125 C817.1406,386.45 817.1406,386.45 816.9688,386.5438 C816.5156,386.7781 815.875,386.9188 815.1094,386.9188 C813.1094,386.9188 811.8281,385.9031 811.8281,384.325 L811.8281,383.2781 C811.8281,381.575 813.0469,380.3719 814.75,380.3719 C815.3281,380.3719 815.9063,380.5125 816.375,380.7625 C816.8438,381.0281 817.0156,381.2156 817.0781,381.575 C817.2031,382.2469 817.4531,382.4969 817.9844,382.4969 C818.2656,382.4969 818.5469,382.3563 818.7344,382.1375 C818.8594,381.9656 818.9063,381.7938 818.9063,381.3563 L818.9063,379.9969 C818.9063,379.575 818.8906,379.4344 818.7656,379.2625 C818.5938,379.0125 818.3125,378.8563 817.9844,378.8563 C817.6719,378.8563 817.4688,378.9656 817.25,379.2313 C816.0781,378.7313 815.6406,378.6219 814.6875,378.6219 C812.0156,378.6219 810,380.6375 810,383.2625 L810,384.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="829" y="387.806">E</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="846" y="364.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="847" y="378.4001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="801" x2="857" y1="399.2" y2="399.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="801" x2="857" y1="407.2" y2="407.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="469" y="351.5"/>
+      <ellipse cx="474" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0001526733274613822014">
-        <rect codeLine="47" fill="#F1F1F1" height="48" id="C_0001526733274613822014" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="141" x="963.5" y="367.2"/>
-        <ellipse cx="978.5" cy="383.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M973.5,384.3563 C973.5,386.8563 975.6406,388.6688 978.5625,388.6688 C979.7969,388.6688 980.9688,388.3719 981.7188,387.8563 C982.3281,387.4344 982.6563,387.0125 982.6563,386.6063 C982.6563,386.1375 982.2344,385.7313 981.7344,385.7313 C981.5,385.7313 981.2813,385.8094 981.0781,386.0125 C980.6406,386.45 980.6406,386.45 980.4688,386.5438 C980.0156,386.7781 979.375,386.9188 978.6094,386.9188 C976.6094,386.9188 975.3281,385.9031 975.3281,384.325 L975.3281,383.2781 C975.3281,381.575 976.5469,380.3719 978.25,380.3719 C978.8281,380.3719 979.4063,380.5125 979.875,380.7625 C980.3438,381.0281 980.5156,381.2156 980.5781,381.575 C980.7031,382.2469 980.9531,382.4969 981.4844,382.4969 C981.7656,382.4969 982.0469,382.3563 982.2344,382.1375 C982.3594,381.9656 982.4063,381.7938 982.4063,381.3563 L982.4063,379.9969 C982.4063,379.575 982.3906,379.4344 982.2656,379.2625 C982.0938,379.0125 981.8125,378.8563 981.4844,378.8563 C981.1719,378.8563 980.9688,378.9656 980.75,379.2313 C979.5781,378.7313 979.1406,378.6219 978.1875,378.6219 C975.5156,378.6219 973.5,380.6375 973.5,383.2625 L973.5,384.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="992.5" y="387.806">G</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="96" x="1011.5" y="364.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="94" x="1012.5" y="378.4001">int,float,std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="964.5" x2="1103.5" y1="399.2" y2="399.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="964.5" x2="1103.5" y1="407.2" y2="407.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="483" y="359.7104">b : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0000531523220915557686">
-        <rect codeLine="51" fill="#F1F1F1" height="48" id="C_0000531523220915557686" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="667.5" y="367.2"/>
-        <ellipse cx="682.5" cy="383.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M677.5,384.3563 C677.5,386.8563 679.6406,388.6688 682.5625,388.6688 C683.7969,388.6688 684.9688,388.3719 685.7188,387.8563 C686.3281,387.4344 686.6563,387.0125 686.6563,386.6063 C686.6563,386.1375 686.2344,385.7313 685.7344,385.7313 C685.5,385.7313 685.2813,385.8094 685.0781,386.0125 C684.6406,386.45 684.6406,386.45 684.4688,386.5438 C684.0156,386.7781 683.375,386.9188 682.6094,386.9188 C680.6094,386.9188 679.3281,385.9031 679.3281,384.325 L679.3281,383.2781 C679.3281,381.575 680.5469,380.3719 682.25,380.3719 C682.8281,380.3719 683.4063,380.5125 683.875,380.7625 C684.3438,381.0281 684.5156,381.2156 684.5781,381.575 C684.7031,382.2469 684.9531,382.4969 685.4844,382.4969 C685.7656,382.4969 686.0469,382.3563 686.2344,382.1375 C686.3594,381.9656 686.4063,381.7938 686.4063,381.3563 L686.4063,379.9969 C686.4063,379.575 686.3906,379.4344 686.2656,379.2625 C686.0938,379.0125 685.8125,378.8563 685.4844,378.8563 C685.1719,378.8563 684.9688,378.9656 684.75,379.2313 C683.5781,378.7313 683.1406,378.6219 682.1875,378.6219 C679.5156,378.6219 677.5,380.6375 677.5,383.2625 L677.5,384.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="696.5" y="387.806">E</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="713.5" y="364.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="714.5" y="378.4001">std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="668.5" x2="763.5" y1="399.2" y2="399.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="668.5" x2="763.5" y1="407.2" y2="407.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
+      <ellipse cx="580.6" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M583.5688,327.1406 Q582.9906,327.4375 582.35,327.5781 Q581.7094,327.7344 581.0063,327.7344 Q578.5063,327.7344 577.1781,326.0938 Q575.8656,324.4375 575.8656,321.3125 Q575.8656,318.1875 577.1781,316.5313 Q578.5063,314.875 581.0063,314.875 Q581.7094,314.875 582.35,315.0313 Q583.0063,315.1875 583.5688,315.4844 L583.5688,318.2031 Q582.9438,317.625 582.35,317.3594 Q581.7563,317.0781 581.1313,317.0781 Q579.7875,317.0781 579.1,318.1563 Q578.4125,319.2188 578.4125,321.3125 Q578.4125,323.4063 579.1,324.4844 Q579.7875,325.5469 581.1313,325.5469 Q581.7563,325.5469 582.35,325.2813 Q582.9438,325 583.5688,324.4219 L583.5688,327.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="596.4" y="325.6543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="337.5" y2="337.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0002198686676355573844">
-        <rect codeLine="55" fill="#F1F1F1" height="266.399" id="C_0002198686676355573844" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="263" x="376.5" y="7"/>
-        <ellipse cx="498.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M493.75,24.1563 C493.75,26.6563 495.8906,28.4688 498.8125,28.4688 C500.0469,28.4688 501.2188,28.1719 501.9688,27.6563 C502.5781,27.2344 502.9063,26.8125 502.9063,26.4063 C502.9063,25.9375 502.4844,25.5313 501.9844,25.5313 C501.75,25.5313 501.5313,25.6094 501.3281,25.8125 C500.8906,26.25 500.8906,26.25 500.7188,26.3438 C500.2656,26.5781 499.625,26.7188 498.8594,26.7188 C496.8594,26.7188 495.5781,25.7031 495.5781,24.125 L495.5781,23.0781 C495.5781,21.375 496.7969,20.1719 498.5,20.1719 C499.0781,20.1719 499.6563,20.3125 500.125,20.5625 C500.5938,20.8281 500.7656,21.0156 500.8281,21.375 C500.9531,22.0469 501.2031,22.2969 501.7344,22.2969 C502.0156,22.2969 502.2969,22.1563 502.4844,21.9375 C502.6094,21.7656 502.6563,21.5938 502.6563,21.1563 L502.6563,19.7969 C502.6563,19.375 502.6406,19.2344 502.5156,19.0625 C502.3438,18.8125 502.0625,18.6563 501.7344,18.6563 C501.4219,18.6563 501.2188,18.7656 501,19.0313 C499.8281,18.5313 499.3906,18.4219 498.4375,18.4219 C495.7656,18.4219 493.75,20.4375 493.75,23.0625 L493.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="519.25" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="377.5" x2="638.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="47.9"/>
-          <ellipse cx="387.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="396.5" y="56.0059">get_a(A * a) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="64.6999"/>
-          <ellipse cx="387.5" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="396.5" y="72.8059">get_b(B &amp; b) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="81.4998"/>
-          <ellipse cx="387.5" cy="86.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="396.5" y="89.6058">get_c(C c) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="98.2997"/>
-          <ellipse cx="387.5" cy="103.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="396.5" y="106.4057">get_const_b(const B &amp; b) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="115.0997"/>
-          <ellipse cx="387.5" cy="120.0997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="396.5" y="123.2057">get_d(D &amp;&amp; d) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="131.8996"/>
-          <ellipse cx="387.5" cy="136.8996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="396.5" y="140.0056">get_d2(D &amp;&amp; d) : int</text>
-        </a>
-        <ellipse cx="387.5" cy="153.6995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="138" x="396.5" y="156.8055">get_e&lt;T&gt;(E&lt;T&gt; e) : T</text>
-        <ellipse cx="387.5" cy="170.4995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181" x="396.5" y="173.6054">get_f&lt;T&gt;(const F&lt;T&gt; &amp; f) : T</text>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="182.2994"/>
-          <ellipse cx="387.5" cy="187.2994" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="396.5" y="190.4054">get_int_e(const E&lt;int&gt; &amp; e) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="199.0993"/>
-          <ellipse cx="387.5" cy="204.0993" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169" x="396.5" y="207.2053">get_int_e2(E&lt;int&gt; &amp; e) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="215.8992"/>
-          <ellipse cx="387.5" cy="220.8992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="237" x="396.5" y="224.0052">get_int_f(const ABCD::F&lt;int&gt; &amp; f) : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="377.5" x2="638.5" y1="231.7992" y2="231.7992"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="240.6992"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="384.5" y="242.6992"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142" x="396.5" y="248.8051">estring : E&lt;std::string&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="382.5" y="257.4991"/>
-          <ellipse cx="387.5" cy="262.4991" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="209" x="396.5" y="265.6051">gintstring : G&lt;int,float,std::string&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="563.5" y="351.5"/>
+      <ellipse cx="568.5" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0002304215469403389354_C_0000952770730316239752">
-      <path codeLine="71" d="M282.12,415.42 C269.14,438.82 257.7393,459.3483 243.2993,485.3883 " fill="none" id="C_0002304215469403389354-to-C_0000952770730316239752" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="234.57,501.13,248.5465,488.2981,238.052,482.4786,234.57,501.13" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000409373870621931875_C_0002198686676355573844">
-      <path codeLine="72" d="M125.7,350.11 C142.97,334.3 162.41,316.76 182,303.4 C242.42,262.2 309.4636,228.7414 370.8536,201.2614 " fill="none" id="C_0000409373870621931875-to-C_0002198686676355573844" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="376.33,198.81,366.4812,198.8362,371.7664,200.8528,369.7497,206.138,376.33,198.81" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0000409373870621931875">
-      <path codeLine="79" d="M376.39,185.42 C305.18,214.13 217.78,255.14 147,303.4 C127.41,316.76 112.0481,329.899 97.3981,345.709 " fill="none" id="C_0002198686676355573844-to-C_0000409373870621931875" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="93.32,350.11,102.3712,346.2272,96.7184,346.4425,96.5032,340.7897,93.32,350.11" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001977486318799565722_C_0000864055993755439230">
-      <path codeLine="73" d="M829,415.42 C829,438.82 829,457.09 829,483.13 " fill="none" id="C_0001977486318799565722-to-C_0000864055993755439230" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="829,501.13,835,483.13,823,483.13,829,501.13" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001526733274613822014_C_0000205927019127027617">
-      <path codeLine="74" d="M1034,415.42 C1034,436.4 1034,449.73 1034,474.75 " fill="none" id="C_0001526733274613822014-to-C_0000205927019127027617" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="1034,492.75,1040,474.75,1028,474.75,1034,492.75" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000531523220915557686_C_0000864055993755439230">
-      <path codeLine="75" d="M734.66,415.42 C753.47,438.82 771.3466,461.0575 792.2666,487.0975 " fill="none" id="C_0000531523220915557686-to-C_0000864055993755439230" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="803.54,501.13,796.9441,483.3397,787.5891,490.8553,803.54,501.13" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0000519995486237427479">
-      <path codeLine="76" d="M456.91,273.72 C444.64,305.54 434.7973,331.0612 426.2973,353.1212 " fill="none" id="C_0002198686676355573844-to-C_0000519995486237427479" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="424.14,358.72,431.1084,351.76,425.9377,354.0544,423.6434,348.8837,424.14,358.72" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0001177487653597650440">
-      <path codeLine="77" d="M508,273.72 C508,305.54 508,330.66 508,352.72 " fill="none" id="C_0002198686676355573844-to-C_0001177487653597650440" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="508,358.72,512,349.72,508,353.72,504,349.72,508,358.72" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0001028245818073128358">
-      <path codeLine="78" d="M558.56,273.72 C570.7,305.54 580.4304,331.0544 588.8504,353.1144 " fill="none" id="C_0002198686676355573844-to-C_0001028245818073128358" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="590.99,358.72,591.5177,348.8853,589.207,354.0487,584.0436,351.738,590.99,358.72" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0001977486318799565722">
-      <path codeLine="80" d="M639.71,239.63 C685.17,274.17 736.18,313.55 782,350.4 C788.5,355.63 790.814,357.491 797.274,362.941 " fill="none" id="C_0002198686676355573844-to-C_0001977486318799565722" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="801.86,366.81,797.5604,357.9492,798.0384,363.5859,792.4017,364.0639,801.86,366.81" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0002304215469403389354">
-      <path codeLine="81" d="M394.64,273.72 C363.84,309.72 337.7096,340.2701 318.8096,362.3701 " fill="none" id="C_0002198686676355573844-to-C_0002304215469403389354" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="314.91,366.93,323.7994,362.6899,318.1597,363.1301,317.7195,357.4904,314.91,366.93" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0000864055993755439230">
-      <path codeLine="82" d="M639.8,178.37 C723.54,209.58 825.37,263.38 876,350.4 C903.96,398.45 877.1902,458.0012 853.9402,496.0212 " fill="none" id="C_0002198686676355573844-to-C_0000864055993755439230" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="850.81,501.14,858.9178,495.5487,853.4185,496.8744,852.0928,491.375,850.81,501.14" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0000952770730316239752">
-      <path codeLine="83" d="M376.04,205.19 C319.57,239.87 259.12,288.44 226,350.4 C200.59,397.93 204.0593,456.838 209.8593,495.038 " fill="none" id="C_0002198686676355573844-to-C_0000952770730316239752" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="210.76,500.97,213.3637,491.4715,210.0094,496.0267,205.4543,492.6724,210.76,500.97" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0001526733274613822014">
-      <path codeLine="84" d="M651.4122,180.7622 C739.3422,208.0122 843.93,246.88 937,303.4 C965.97,320.99 994.3,347.77 1012.78,366.93 " fill="none" id="C_0002198686676355573844-backto-C_0001526733274613822014" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="639.95,177.21,644.497,182.8068,651.4122,180.7622,646.8652,175.1654,639.95,177.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="967" cy="312.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="974" y="316.477">gintstring</text>
-    </g>
-    <g id="link_C_0002198686676355573844_C_0000531523220915557686">
-      <path codeLine="85" d="M626.3928,282.9298 C656.4628,318.9298 678.1,344.83 696.56,366.93 " fill="none" id="C_0002198686676355573844-backto-C_0000531523220915557686" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="618.7,273.72,619.4764,280.8892,626.3928,282.9298,625.6163,275.7607,618.7,273.72" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="658" y="309.7"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="668" y="316.477">estring</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="577.5" y="359.7104">c : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
+      <ellipse cx="57.75" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M60.7188,320.6406 Q60.1406,320.9375 59.5,321.0781 Q58.8594,321.2344 58.1563,321.2344 Q55.6563,321.2344 54.3281,319.5938 Q53.0156,317.9375 53.0156,314.8125 Q53.0156,311.6875 54.3281,310.0313 Q55.6563,308.375 58.1563,308.375 Q58.8594,308.375 59.5,308.5313 Q60.1563,308.6875 60.7188,308.9844 L60.7188,311.7031 Q60.0938,311.125 59.5,310.8594 Q58.9063,310.5781 58.2813,310.5781 Q56.9375,310.5781 56.25,311.6563 Q55.5625,312.7188 55.5625,314.8125 Q55.5625,316.9063 56.25,317.9844 Q56.9375,319.0469 58.2813,319.0469 Q58.9063,319.0469 59.5,318.7813 Q60.0938,318.5 60.7188,317.9219 L60.7188,320.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="78.25" y="319.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="331" y2="331"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="337"/>
+      <ellipse cx="17" cy="342" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="95" x="26" y="345.2104">print(R * r) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="351.8047" y2="351.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="357.8047"/>
+      <ellipse cx="17" cy="362.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="366.0151">d : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
+      <ellipse cx="810.95" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M813.9188,462.1406 Q813.3406,462.4375 812.7,462.5781 Q812.0594,462.7344 811.3563,462.7344 Q808.8563,462.7344 807.5281,461.0938 Q806.2156,459.4375 806.2156,456.3125 Q806.2156,453.1875 807.5281,451.5313 Q808.8563,449.875 811.3563,449.875 Q812.0594,449.875 812.7,450.0313 Q813.3563,450.1875 813.9188,450.4844 L813.9188,453.2031 Q813.2938,452.625 812.7,452.3594 Q812.1063,452.0781 811.4813,452.0781 Q810.1375,452.0781 809.45,453.1563 Q808.7625,454.2188 808.7625,456.3125 Q808.7625,458.4063 809.45,459.4844 Q810.1375,460.5469 811.4813,460.5469 Q812.1063,460.5469 812.7,460.2813 Q813.2938,460 813.9188,459.4219 L813.9188,462.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.05" y="460.6543">E</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="841.5" y="437.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="842.5" y="449.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="472.5" y2="472.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="480.5" y2="480.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="486.5"/>
+      <ellipse cx="806.5" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="815.5" y="494.7104">e : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
+      <ellipse cx="1001.75" cy="450" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1004.7188,455.6406 Q1004.1406,455.9375 1003.5,456.0781 Q1002.8594,456.2344 1002.1563,456.2344 Q999.6563,456.2344 998.3281,454.5938 Q997.0156,452.9375 997.0156,449.8125 Q997.0156,446.6875 998.3281,445.0313 Q999.6563,443.375 1002.1563,443.375 Q1002.8594,443.375 1003.5,443.5313 Q1004.1563,443.6875 1004.7188,443.9844 L1004.7188,446.7031 Q1004.0938,446.125 1003.5,445.8594 Q1002.9063,445.5781 1002.2813,445.5781 Q1000.9375,445.5781 1000.25,446.6563 Q999.5625,447.7188 999.5625,449.8125 Q999.5625,451.9063 1000.25,452.9844 Q1000.9375,454.0469 1002.2813,454.0469 Q1002.9063,454.0469 1003.5,453.7813 Q1004.0938,453.5 1004.7188,452.9219 L1004.7188,455.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1022.25" y="454.1543">G</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="52" x="1075.5" y="431"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="1076.5" y="443.1387">T,Args...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="466" y2="466"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="474" y2="474"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="480"/>
+      <ellipse cx="961.5" cy="485" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="970.5" y="488.2104">args : std::tuple&lt;Args...&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="492.8047"/>
+      <ellipse cx="961.5" cy="497.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="970.5" y="501.0151">g : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
+      <ellipse cx="806.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M809.4688,333.6406 Q808.8906,333.9375 808.25,334.0781 Q807.6094,334.2344 806.9063,334.2344 Q804.4063,334.2344 803.0781,332.5938 Q801.7656,330.9375 801.7656,327.8125 Q801.7656,324.6875 803.0781,323.0313 Q804.4063,321.375 806.9063,321.375 Q807.6094,321.375 808.25,321.5313 Q808.9063,321.6875 809.4688,321.9844 L809.4688,324.7031 Q808.8438,324.125 808.25,323.8594 Q807.6563,323.5781 807.0313,323.5781 Q805.6875,323.5781 805,324.6563 Q804.3125,325.7188 804.3125,327.8125 Q804.3125,329.9063 805,330.9844 Q805.6875,332.0469 807.0313,332.0469 Q807.6563,332.0469 808.25,331.7813 Q808.8438,331.5 809.4688,330.9219 L809.4688,333.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="332.1543">E</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="836.5" y="309"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="837.5" y="321.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="344" y2="344"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="352" y2="352"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
+      <ellipse cx="973" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M975.9688,333.6406 Q975.3906,333.9375 974.75,334.0781 Q974.1094,334.2344 973.4063,334.2344 Q970.9063,334.2344 969.5781,332.5938 Q968.2656,330.9375 968.2656,327.8125 Q968.2656,324.6875 969.5781,323.0313 Q970.9063,321.375 973.4063,321.375 Q974.1094,321.375 974.75,321.5313 Q975.4063,321.6875 975.9688,321.9844 L975.9688,324.7031 Q975.3438,324.125 974.75,323.8594 Q974.1563,323.5781 973.5313,323.5781 Q972.1875,323.5781 971.5,324.6563 Q970.8125,325.7188 970.8125,327.8125 Q970.8125,329.9063 971.5,330.9844 Q972.1875,332.0469 973.5313,332.0469 Q974.1563,332.0469 974.75,331.7813 Q975.3438,331.5 975.9688,330.9219 L975.9688,333.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="987" y="332.1543">G</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="116" x="1004" y="309"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="1005" y="321.1387">int,float,std::string</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="344" y2="344"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="352" y2="352"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
+      <ellipse cx="665.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M668.4688,333.6406 Q667.8906,333.9375 667.25,334.0781 Q666.6094,334.2344 665.9063,334.2344 Q663.4063,334.2344 662.0781,332.5938 Q660.7656,330.9375 660.7656,327.8125 Q660.7656,324.6875 662.0781,323.0313 Q663.4063,321.375 665.9063,321.375 Q666.6094,321.375 667.25,321.5313 Q667.9063,321.6875 668.4688,321.9844 L668.4688,324.7031 Q667.8438,324.125 667.25,323.8594 Q666.6563,323.5781 666.0313,323.5781 Q664.6875,323.5781 664,324.6563 Q663.3125,325.7188 663.3125,327.8125 Q663.3125,329.9063 664,330.9844 Q664.6875,332.0469 666.0313,332.0469 Q666.6563,332.0469 667.25,331.7813 Q667.8438,331.5 668.4688,330.9219 L668.4688,333.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="679.5" y="332.1543">E</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="695.5" y="309"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="696.5" y="321.1387">std::string</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="344" y2="344"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="352" y2="352"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
+      <ellipse cx="484.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M487.2188,29.6406 Q486.6406,29.9375 486,30.0781 Q485.3594,30.2344 484.6563,30.2344 Q482.1563,30.2344 480.8281,28.5938 Q479.5156,26.9375 479.5156,23.8125 Q479.5156,20.6875 480.8281,19.0313 Q482.1563,17.375 484.6563,17.375 Q485.3594,17.375 486,17.5313 Q486.6563,17.6875 487.2188,17.9844 L487.2188,20.7031 Q486.5938,20.125 486,19.8594 Q485.4063,19.5781 484.7813,19.5781 Q483.4375,19.5781 482.75,20.6563 Q482.0625,21.7188 482.0625,23.8125 Q482.0625,25.9063 482.75,26.9844 Q483.4375,28.0469 484.7813,28.0469 Q485.4063,28.0469 486,27.7813 Q486.5938,27.5 487.2188,26.9219 L487.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="504.75" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="46"/>
+      <ellipse cx="382.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="391.5" y="54.2104">get_a(A * a) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="58.8047"/>
+      <ellipse cx="382.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="391.5" y="67.0151">get_b(B &amp; b) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="71.6094"/>
+      <ellipse cx="382.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="391.5" y="79.8198">get_c(C c) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="84.4141"/>
+      <ellipse cx="382.5" cy="89.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="391.5" y="92.6245">get_const_b(const B &amp; b) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="97.2188"/>
+      <ellipse cx="382.5" cy="102.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="391.5" y="105.4292">get_d(D &amp;&amp; d) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="110.0234"/>
+      <ellipse cx="382.5" cy="115.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="391.5" y="118.2339">get_d2(D &amp;&amp; d) : int</text>
+    </a>
+    <ellipse cx="382.5" cy="127.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="391.5" y="131.0386">get_e&lt;T&gt;(E&lt;T&gt; e) : T</text>
+    <ellipse cx="382.5" cy="140.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="168" x="391.5" y="143.8433">get_f&lt;T&gt;(const F&lt;T&gt; &amp; f) : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="148.4375"/>
+      <ellipse cx="382.5" cy="153.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="184" x="391.5" y="156.6479">get_int_e(const E&lt;int&gt; &amp; e) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="161.2422"/>
+      <ellipse cx="382.5" cy="166.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="391.5" y="169.4526">get_int_e2(E&lt;int&gt; &amp; e) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="174.0469"/>
+      <ellipse cx="382.5" cy="179.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="391.5" y="182.2573">get_int_f(const ABCD::F&lt;int&gt; &amp; f) : int</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="188.8516" y2="188.8516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="194.8516"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="379.5" y="196.8516"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="391.5" y="203.062">estring : E&lt;std::string&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="207.6563"/>
+      <ellipse cx="382.5" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="391.5" y="215.8667">gintstring : G&lt;int,float,std::string&gt;</text>
+    </a>
+    <path d="M270.09,360.17 C260.11,377.41 246.14,401.53 233.84,422.78 " fill="none" id="C_0002304215469403389354-&gt;C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="239.89,426.3,223.81,440.1,227.77,419.28,239.89,426.3" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M115.49,298.63 C132.68,282.78 152.34,264.91 172.5,252 C232.6,213.53 305.37,182.56 366.43,159.94 " fill="none" id="C_0000409373870621931875-&gt;C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="371.17,158.19,361.3418,157.5521,366.479,159.9205,364.1106,165.0577,371.17,158.19" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M371.44,147.45 C299.82,170.53 209.55,205.88 137.5,252 C118.91,263.9 100.75,280.02 86.98,294.88 " fill="none" id="C_0002198686676355573844-&gt;C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="83.58,298.63,92.5908,294.6543,86.9405,294.9277,86.6671,289.2775,83.58,298.63" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M821.5,360.17 C821.5,376.63 821.5,399.36 821.5,419.88 " fill="none" id="C_0001977486318799565722-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="828.5,420.1,821.5,440.1,814.5,420.1,828.5,420.1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1037.5,360.17 C1037.5,375.01 1037.5,394.95 1037.5,413.77 " fill="none" id="C_0001526733274613822014-&gt;C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1044.5,413.83,1037.5,433.83,1030.5,413.83,1044.5,413.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M724.05,360.17 C739.99,378.13 762.57,403.57 781.97,425.45 " fill="none" id="C_0000531523220915557686-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="787.37,420.98,795.4,440.59,776.89,430.27,787.37,420.98" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M446.88,222.29 C434.7,250.66 422.4,279.32 413.25,300.64 " fill="none" id="C_0002198686676355573844-&gt;C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="411.23,305.34,418.4519,298.6434,413.1996,300.7443,411.0987,295.492,411.23,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M492.5,222.29 C492.5,250.42 492.5,278.84 492.5,300.1 " fill="none" id="C_0002198686676355573844-&gt;C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="492.5,305.34,496.5,296.34,492.5,300.34,488.5,296.34,492.5,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M538.12,222.29 C550.3,250.66 562.6,279.32 571.75,300.64 " fill="none" id="C_0002198686676355573844-&gt;C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="573.77,305.34,573.9013,295.492,571.8004,300.7443,566.5481,298.6434,573.77,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M613.67,192.38 C663.67,224.55 721.88,262.85 773.5,299 C777.94,302.11 782.56,305.45 787.11,308.78 " fill="none" id="C_0002198686676355573844-&gt;C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="791.25,311.84,786.396,303.2704,787.2312,308.8652,781.6363,309.7005,791.25,311.84" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M391.06,222.29 C360.58,254.23 329.76,286.53 308.97,308.32 " fill="none" id="C_0002198686676355573844-&gt;C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="305.46,311.99,314.5716,308.2511,308.9161,308.3768,308.7904,302.7213,305.46,311.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M613.6,139.54 C701.02,163.54 813.06,210.37 868.5,299 C895.25,341.77 868.51,399.83 845.79,436.1 " fill="none" id="C_0002198686676355573844-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="843.04,440.41,851.2501,434.9699,845.7272,436.1935,844.5036,430.6705,843.04,440.41" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M371.19,164.68 C313.65,194.46 250.07,238.59 215.5,299 C191.5,340.93 194.35,398.53 199.62,435.01 " fill="none" id="C_0002198686676355573844-&gt;C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="200.42,440.24,203.0112,430.7381,199.6629,435.2976,195.1034,431.9494,200.42,440.24" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M626.37,144.32 C715.69,166.35 833.99,201.71 930.5,252 C961.36,268.08 992.3,293.31 1012.91,311.73 " fill="none" id="C_0002198686676355573844&lt;-C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="613.69,141.23,618.5761,146.5334,625.3508,144.0629,620.4647,138.7595,613.69,141.23" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="962.5" 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="60" x="969.5" y="265.0669">gintstring</text>
+    <path d="M604.06,231.79 C633.53,262.38 662.36,292.3 681.33,311.99 " fill="none" id="C_0002198686676355573844&lt;-C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="594.91,222.29,596.1866,229.3872,603.2289,230.9385,601.9523,223.8413,594.91,222.29" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="638.5" y="258.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="648.5" y="265.0669">estring</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00013_class_mermaid.svg b/docs/test_cases/t00013_class_mermaid.svg
index dfd27b4b..cba04955 100644
--- a/docs/test_cases/t00013_class_mermaid.svg
+++ b/docs/test_cases/t00013_class_mermaid.svg
@@ -1,75 +1,70 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1083.6953125 808" style="max-width: 1083.7px; background-color: white;" width="1083.6953125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M714.8671875,638L714.8671875,644C714.8671875,650,714.8671875,662,717.0429602535486,671.4603254982791C719.2187330070971,680.9206509965583,723.5702785141942,687.8413019931164,725.7460512677426,691.3016274913954L727.9218240212912,694.7619529896746"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M516.4987582781457,109L515.9468818984548,113.16666666666667C515.3950055187638,117.33333333333333,514.2912527593819,125.66666666666667,513.9005956714298,133.00129241599993C513.5099385834775,140.33591816533317,513.8323771669551,146.67183633066634,513.9935964586938,149.83979541333292L514.1548157504326,153.0077544959995"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M39.953125,638L39.953125,644C39.953125,650,39.953125,662,112.85627137394931,679.3903063109556C185.75941774789862,696.7806126219111,331.5657104957973,719.5612252438223,404.4688568697466,730.9515315547778L477.37200324369593,742.3418378657334"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M976.3671875,638L976.3671875,644C976.3671875,650,976.3671875,662,976.3671875,669.1666666666666C976.3671875,676.3333333333334,976.3671875,678.6666666666666,976.3671875,679.8333333333334L976.3671875,681"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M523.1875,638L523.1875,644C523.1875,650,523.1875,662,523.1875,671C523.1875,680,523.1875,686,523.1875,689L523.1875,692"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M390.96875,404.0266062028287L351.4153645833333,426.0221718356906C311.8619791666667,448.01773746855247,232.75520833333334,492.0088687342762,193.20182291666666,518.6711010338048C153.6484375,545.3333333333334,153.6484375,554.6666666666666,153.6484375,559.3333333333334L153.6484375,564"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M390.96875,436.61386727688785L370.3294270833333,453.1782227307399C349.6901041666667,469.7425781845919,308.4114583333333,502.87128909229597,287.7721354166667,524.1023112128147C267.1328125,545.3333333333334,267.1328125,554.6666666666666,267.1328125,559.3333333333334L267.1328125,564"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M403.82730763381994,502L399.88343344484997,507.6666666666667C395.93955925587994,513.3333333333334,388.05181087794,524.6666666666666,384.10793668897,535C380.1640625,545.3333333333334,380.1640625,554.6666666666666,380.1640625,559.3333333333334L380.1640625,564"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M531.9152353689567,159L532.1272794741307,154.83333333333334C532.3393235793045,150.66666666666666,532.7634117896522,142.33333333333334,532.5548831182064,134.99134220318743C532.3463544467604,127.64935107304154,531.505208893521,121.29870214608309,531.0846361169012,118.12337768260386L530.6640633402814,114.94805321912463"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M390.96875,386.7272771364827L332.4661458333333,411.6060642804023C273.9635416666667,436.4848514243218,156.95833333333334,486.2424257121609,98.45572916666667,517.6212128560804C39.953125,549,39.953125,562,39.953125,568.5L39.953125,575"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M655.40625,472.25186468310574L665.31640625,482.8765539025881C675.2265625,493.5012431220705,695.046875,514.7506215610352,704.95703125,531.8753107805177C714.8671875,549,714.8671875,562,714.8671875,568.5L714.8671875,575"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M603.9171608880779,502L606.5846132400649,507.6666666666667C609.252065592052,513.3333333333334,614.5869702960259,524.6666666666666,617.254422648013,542.5833333333334C619.921875,560.5,619.921875,585,619.921875,608C619.921875,631,619.921875,652.5,609.2596699501518,671.5717210145157C598.5974649003034,690.6434420290315,577.2730548006069,707.2868840580628,566.6108497507587,715.6086050725786L555.9486447009104,723.9303260870943"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M655.40625,425.29617313563017L681.140625,443.74681094635844C706.875,462.19744875708676,758.34375,499.0987243785434,784.078125,529.7993621892716C809.8125,560.5,809.8125,585,809.8125,608C809.8125,631,809.8125,652.5,806.5721347995899,668.4034418327597C803.3317695991796,684.3068836655193,796.8510391983591,694.6137673310387,793.610673997949,699.7672091637984L790.3703087975387,704.9206509965582"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M671.7995277476867,397.8899835860354L722.5608043730723,420.9083196550295C773.3220809984577,443.92665572402365,874.8446342492289,489.9633278620118,925.6059108746144,520.4816639310059C976.3671875,551,976.3671875,566,976.3671875,573.5L976.3671875,581"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M523.1875,520L523.1875,522.6666666666666C523.1875,525.3333333333334,523.1875,530.6666666666666,523.1875,540.8333333333334C523.1875,551,523.1875,566,523.1875,573.5L523.1875,581"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M714.8671875,638L714.8671875,644C714.8671875,650,714.8671875,662,718.639848923841,674C722.4125103476821,686,729.9578331953643,698,733.7304946192053,704L737.5031560430464,710"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M516.4987582781457,109L515.9468818984548,113.16666666666667C515.3950055187638,117.33333333333333,514.2912527593819,125.66666666666667,513.9514204848648,134C513.6115882103478,142.33333333333334,514.0356764206955,150.66666666666666,514.2477205258693,154.83333333333334L514.4597646310433,159"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M39.953125,638L39.953125,644C39.953125,650,39.953125,662,115.8203125,679.8534047919294C191.6875,697.7068095838587,343.421875,721.4136191677175,419.2890625,733.2670239596468L495.15625,745.1204287515762"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M976.3671875,638L976.3671875,644C976.3671875,650,976.3671875,662,976.3671875,672.1666666666666C976.3671875,682.3333333333334,976.3671875,690.6666666666666,976.3671875,694.8333333333334L976.3671875,699"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M523.1875,638L523.1875,644C523.1875,650,523.1875,662,523.1875,674C523.1875,686,523.1875,698,523.1875,704L523.1875,710"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M393.625,402.5494704128877L353.62890625,424.7912253440731C313.6328125,447.03298027525847,233.640625,491.51649013762926,193.64453125,519.4249117354813C153.6484375,547.3333333333334,153.6484375,558.6666666666666,153.6484375,564.3333333333334L153.6484375,570"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M393.625,434.4820594965675L372.54296875,451.4017162471396C351.4609375,468.32137299771165,309.296875,502.1606864988558,288.21484375,524.7470099160946C267.1328125,547.3333333333334,267.1328125,558.6666666666666,267.1328125,564.3333333333334L267.1328125,570"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M403.82730763381994,502L399.88343344484997,507.6666666666667C395.93955925587994,513.3333333333334,388.05181087794,524.6666666666666,384.10793668897,536C380.1640625,547.3333333333334,380.1640625,558.6666666666666,380.1640625,564.3333333333334L380.1640625,570"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M531.9152353689567,159L532.1272794741307,154.83333333333334C532.3393235793045,150.66666666666666,532.7634117896522,142.33333333333334,532.4235795151352,134C532.0837472406181,125.66666666666667,530.9799944812362,117.33333333333333,530.4281181015452,113.16666666666667L529.8762417218543,109"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M393.625,385.5976816374042L334.6796875,410.6647346978368C275.734375,435.7317877582695,157.84375,485.8658938791347,98.8984375,518.4329469395674C39.953125,551,39.953125,566,39.953125,573.5L39.953125,581"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M652.75,469.4040961891176L663.1028645833334,480.50341349093134C673.4557291666666,491.60273079274504,694.1614583333334,513.8013653963725,704.5143229166666,532.4006826981863C714.8671875,551,714.8671875,566,714.8671875,573.5L714.8671875,581"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M603.9171608880779,502L606.5846132400649,507.6666666666667C609.252065592052,513.3333333333334,614.5869702960259,524.6666666666666,617.254422648013,542.5833333333334C619.921875,560.5,619.921875,585,619.921875,608C619.921875,631,619.921875,652.5,608.4713541666666,672.1869918699186C597.0208333333334,691.8739837398374,574.1197916666666,709.7479674796747,562.6692708333334,718.6849593495936L551.21875,727.6219512195122"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M652.75,423.3917357174008L678.9270833333334,442.1597797645007C705.1041666666666,460.92782381160055,757.4583333333334,498.46391190580033,783.6354166666666,529.4819559529002C809.8125,560.5,809.8125,585,809.8125,608C809.8125,631,809.8125,652.5,806.039838576159,669.25C802.2671771523179,686,794.7218543046357,698,790.9491928807947,704L787.1765314569536,710"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M652.75,389.25173685934453L706.6861979166666,413.7097807161204C760.6223958333334,438.16782457289634,868.4947916666666,487.08391228644814,922.4309895833334,519.0419561432241C976.3671875,551,976.3671875,566,976.3671875,573.5L976.3671875,581"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M523.1875,502L523.1875,507.6666666666667C523.1875,513.3333333333334,523.1875,524.6666666666666,523.1875,537.8333333333334C523.1875,551,523.1875,566,523.1875,573.5L523.1875,581"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -239,7 +234,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7">
+        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0000952770730316239752-0" class="node default clickable">
             <rect height="79" width="110.109375" y="-39.5" x="-55.0546875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
@@ -263,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L7">
+        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0002304215469403389354-1" class="node default clickable">
             <rect height="57" width="119.890625" y="-28.5" x="-59.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.9453125" x1="-59.9453125" class="divider"/>
@@ -282,7 +277,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L14">
+        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L14">
           <g title="A" id="classId-C_0000519995486237427479-2" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -306,7 +301,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L18">
+        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L18">
           <g title="B" id="classId-C_0001177487653597650440-3" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -330,7 +325,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L22">
+        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L22">
           <g title="C" id="classId-C_0001028245818073128358-4" class="node default clickable">
             <rect height="79" width="62.578125" y="-39.5" x="-31.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.2890625" x1="-31.2890625" class="divider"/>
@@ -354,11 +349,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L28">
+        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L28">
           <g title="D" id="classId-C_0000409373870621931875-5" class="node default clickable">
-            <rect height="101" width="149.703125" y="-50.5" x="-74.8515625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="74.8515625" x1="-74.8515625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="74.8515625" x1="-74.8515625" class="divider"/>
+            <rect height="101" width="140.8125" y="-50.5" x="-70.40625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="70.40625" x1="-70.40625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="70.40625" x1="-70.40625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -370,20 +365,20 @@
                   <span class="nodeLabel">D</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -67.3515625, -9)" height="18" width="48.484375">
+              <foreignObject transform="translate( -62.90625, -9)" height="18" width="48.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+d : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -67.3515625, 25)" height="18" width="134.703125">
+              <foreignObject transform="translate( -62.90625, 25)" height="18" width="125.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+print(R * r) : : void</span>
+                  <span class="nodeLabel">+print(R * r) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000864055993755439230-6" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -407,7 +402,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0000205927019127027617-7" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -436,7 +431,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33">
+        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0001977486318799565722-8" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -455,7 +450,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0001526733274613822014-9" class="node default clickable">
             <rect height="57" width="187.453125" y="-28.5" x="-93.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.7265625" x1="-93.7265625" class="divider"/>
@@ -474,7 +469,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000531523220915557686-10" class="node default clickable">
             <rect height="57" width="123.46875" y="-28.5" x="-61.734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.734375" x1="-61.734375" class="divider"/>
@@ -493,11 +488,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00013/t00013.cc#L43">
+        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L43">
           <g title="R" id="classId-C_0002198686676355573844-11" class="node default clickable">
-            <rect height="343" width="264.4375" y="-171.5" x="-132.21875" class="outer title-state"/>
-            <line y2="-141.5" y1="-141.5" x2="132.21875" x1="-132.21875" class="divider"/>
-            <line y2="-81.5" y1="-81.5" x2="132.21875" x1="-132.21875" class="divider"/>
+            <rect height="343" width="259.125" y="-171.5" x="-129.5625" class="outer title-state"/>
+            <line y2="-141.5" y1="-141.5" x2="129.5625" x1="-129.5625" class="divider"/>
+            <line y2="-81.5" y1="-81.5" x2="129.5625" x1="-129.5625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -509,69 +504,69 @@
                   <span class="nodeLabel">R</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, -130)" height="18" width="165.40625">
+              <foreignObject transform="translate( -122.0625, -130)" height="18" width="165.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-estring : E&lt;std::string&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, -108)" height="18" width="244.125">
+              <foreignObject transform="translate( -122.0625, -108)" height="18" width="244.125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+gintstring : G&lt;int,float,std::string&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, -74)" height="18" width="132.96875">
+              <foreignObject transform="translate( -122.0625, -74)" height="18" width="124.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_a(A * a) : : int</span>
+                  <span class="nodeLabel">+get_a(A * a) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, -52)" height="18" width="138.296875">
+              <foreignObject transform="translate( -122.0625, -52)" height="18" width="129.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_b(B &amp; b) : : int</span>
+                  <span class="nodeLabel">+get_b(B &amp; b) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, -30)" height="18" width="122.265625">
+              <foreignObject transform="translate( -122.0625, -30)" height="18" width="113.375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_c(C c) : : int</span>
+                  <span class="nodeLabel">+get_c(C c) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, -8)" height="18" width="228.125">
+              <foreignObject transform="translate( -122.0625, -8)" height="18" width="219.234375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_const_b(const B &amp; b) : : int</span>
+                  <span class="nodeLabel">+get_const_b(const B &amp; b) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, 14)" height="18" width="149.859375">
+              <foreignObject transform="translate( -122.0625, 14)" height="18" width="140.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_d(D &amp;&amp; d) : : int</span>
+                  <span class="nodeLabel">+get_d(D &amp;&amp; d) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, 36)" height="18" width="158.75">
+              <foreignObject transform="translate( -122.0625, 36)" height="18" width="149.859375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_d2(D &amp;&amp; d) : : int</span>
+                  <span class="nodeLabel">+get_d2(D &amp;&amp; d) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, 58)" height="18" width="115.765625">
+              <foreignObject transform="translate( -122.0625, 58)" height="18" width="106.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_e(E e) : : T</span>
+                  <span class="nodeLabel">+get_e(E e) : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, 80)" height="18" width="163.765625">
+              <foreignObject transform="translate( -122.0625, 80)" height="18" width="154.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_f(const F &amp; f) : : T</span>
+                  <span class="nodeLabel">+get_f(const F &amp; f) : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, 102)" height="18" width="206.78125">
+              <foreignObject transform="translate( -122.0625, 102)" height="18" width="197.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_int_e(const E &amp; e) : : int</span>
+                  <span class="nodeLabel">+get_int_e(const E &amp; e) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, 124)" height="18" width="173">
+              <foreignObject transform="translate( -122.0625, 124)" height="18" width="164.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_int_e2(E &amp; e) : : int</span>
+                  <span class="nodeLabel">+get_int_e2(E &amp; e) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.71875, 146)" height="18" width="249.4375">
+              <foreignObject transform="translate( -122.0625, 146)" height="18" width="240.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_int_f(const ABCD::F &amp; f) : : int</span>
+                  <span class="nodeLabel">+get_int_f(const ABCD::F &amp; f) : int</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00014.md b/docs/test_cases/t00014.md
index 93ed171b..bc04bc1c 100644
--- a/docs/test_cases/t00014.md
+++ b/docs/test_cases/t00014.md
@@ -115,7 +115,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<T,P>",
+      "display_name": "A<T,P>",
       "id": "765890579167335652",
       "is_abstract": false,
       "is_nested": false,
@@ -175,7 +175,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::B",
+      "display_name": "B",
       "id": "934136012292043506",
       "is_abstract": false,
       "is_nested": false,
@@ -210,7 +210,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<T,std::string>",
+      "display_name": "A<T,std::string>",
       "id": "2186387853087008570",
       "is_abstract": false,
       "is_nested": false,
@@ -245,7 +245,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<T,std::unique_ptr<std::string>>",
+      "display_name": "A<T,std::unique_ptr<std::string>>",
       "id": "947292733740993297",
       "is_abstract": false,
       "is_nested": false,
@@ -287,7 +287,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<long,T>",
+      "display_name": "A<long,T>",
       "id": "1700006390494465667",
       "is_abstract": false,
       "is_nested": false,
@@ -322,7 +322,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<double,T>",
+      "display_name": "A<double,T>",
       "id": "2017665567517853203",
       "is_abstract": false,
       "is_nested": false,
@@ -357,7 +357,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<long,U>",
+      "display_name": "A<long,U>",
       "id": "906557320263235873",
       "is_abstract": false,
       "is_nested": false,
@@ -392,7 +392,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<long,bool>",
+      "display_name": "A<long,bool>",
       "id": "378898020828430636",
       "is_abstract": false,
       "is_nested": false,
@@ -427,7 +427,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<double,bool>",
+      "display_name": "A<double,bool>",
       "id": "2082013375525130414",
       "is_abstract": false,
       "is_nested": false,
@@ -462,7 +462,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<long,float>",
+      "display_name": "A<long,float>",
       "id": "51978493292659230",
       "is_abstract": false,
       "is_nested": false,
@@ -497,7 +497,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<double,float>",
+      "display_name": "A<double,float>",
       "id": "197769253782961588",
       "is_abstract": false,
       "is_nested": false,
@@ -532,7 +532,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<bool,std::string>",
+      "display_name": "A<bool,std::string>",
       "id": "895940711566401184",
       "is_abstract": false,
       "is_nested": false,
@@ -567,7 +567,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<float,std::unique_ptr<std::string>>",
+      "display_name": "A<float,std::unique_ptr<std::string>>",
       "id": "1751732625010742161",
       "is_abstract": false,
       "is_nested": false,
@@ -609,7 +609,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<int,std::string>",
+      "display_name": "A<int,std::string>",
       "id": "887121441210847583",
       "is_abstract": false,
       "is_nested": false,
@@ -644,7 +644,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<std::string,std::string>",
+      "display_name": "A<std::string,std::string>",
       "id": "1119452495635561975",
       "is_abstract": false,
       "is_nested": false,
@@ -679,7 +679,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<char,std::string>",
+      "display_name": "A<char,std::string>",
       "id": "340562099063642390",
       "is_abstract": false,
       "is_nested": false,
@@ -714,7 +714,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::A<wchar_t,std::string>",
+      "display_name": "A<wchar_t,std::string>",
       "id": "1388877149159894665",
       "is_abstract": false,
       "is_nested": false,
@@ -749,7 +749,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00014::R<T>",
+      "display_name": "R<T>",
       "id": "1758213171584933144",
       "is_abstract": false,
       "is_nested": false,
@@ -971,6 +971,7 @@ public:
     }
   ],
   "name": "t00014_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index 60207025..8dbf31b8 100644
--- a/docs/test_cases/t00014_class.svg
+++ b/docs/test_cases/t00014_class.svg
@@ -1,526 +1,426 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1134px" preserveAspectRatio="none" style="width:1041px;height:1134px;background:#FFFFFF;" version="1.1" viewBox="0 0 1041 1134" width="1041px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1143px" preserveAspectRatio="none" style="width:1085px;height:1143px;" version="1.1" viewBox="0 0 1085 1143" width="1085px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f3vsg35wjon5m" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000765890579167335652">
-        <rect codeLine="3" fill="#F1F1F1" height="81.5999" id="C_0000765890579167335652" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="967" y="573.223"/>
-        <ellipse cx="982" cy="589.223" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M977,590.3793 C977,592.8793 979.1406,594.6918 982.0625,594.6918 C983.2969,594.6918 984.4688,594.3949 985.2188,593.8793 C985.8281,593.4574 986.1563,593.0355 986.1563,592.6293 C986.1563,592.1605 985.7344,591.7543 985.2344,591.7543 C985,591.7543 984.7813,591.8324 984.5781,592.0355 C984.1406,592.473 984.1406,592.473 983.9688,592.5668 C983.5156,592.8011 982.875,592.9418 982.1094,592.9418 C980.1094,592.9418 978.8281,591.9261 978.8281,590.348 L978.8281,589.3011 C978.8281,587.598 980.0469,586.3949 981.75,586.3949 C982.3281,586.3949 982.9063,586.5355 983.375,586.7855 C983.8438,587.0511 984.0156,587.2386 984.0781,587.598 C984.2031,588.2699 984.4531,588.5199 984.9844,588.5199 C985.2656,588.5199 985.5469,588.3793 985.7344,588.1605 C985.8594,587.9886 985.9063,587.8168 985.9063,587.3793 L985.9063,586.0199 C985.9063,585.598 985.8906,585.4574 985.7656,585.2855 C985.5938,585.0355 985.3125,584.8793 984.9844,584.8793 C984.6719,584.8793 984.4688,584.9886 984.25,585.2543 C983.0781,584.7543 982.6406,584.6449 981.6875,584.6449 C979.0156,584.6449 977,586.6605 977,589.2855 L977,590.3793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="996" y="593.829">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="1013" y="570.223"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="1014" y="584.4231">T,P</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="968" x2="1029" y1="605.223" y2="605.223"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="968" x2="1029" y1="613.223" y2="613.223"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="973" y="622.123"/>
-          <ellipse cx="978" cy="627.123" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="987" y="630.2289">p : P</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="973" y="638.9229"/>
-          <ellipse cx="978" cy="643.9229" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="987" y="647.0289">t : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1009" y="589"/>
+      <ellipse cx="1024" cy="605" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1026.9688,610.6406 Q1026.3906,610.9375 1025.75,611.0781 Q1025.1094,611.2344 1024.4063,611.2344 Q1021.9063,611.2344 1020.5781,609.5938 Q1019.2656,607.9375 1019.2656,604.8125 Q1019.2656,601.6875 1020.5781,600.0313 Q1021.9063,598.375 1024.4063,598.375 Q1025.1094,598.375 1025.75,598.5313 Q1026.4063,598.6875 1026.9688,598.9844 L1026.9688,601.7031 Q1026.3438,601.125 1025.75,600.8594 Q1025.1563,600.5781 1024.5313,600.5781 Q1023.1875,600.5781 1022.5,601.6563 Q1021.8125,602.7188 1021.8125,604.8125 Q1021.8125,606.9063 1022.5,607.9844 Q1023.1875,609.0469 1024.5313,609.0469 Q1025.1563,609.0469 1025.75,608.7813 Q1026.3438,608.5 1026.9688,607.9219 L1026.9688,610.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1038" y="609.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="1054" y="586"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="1055" y="598.1387">T,P</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="621" y2="621"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="629" y2="629"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000934136012292043506">
-        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0000934136012292043506" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="467" y="45.623"/>
-        <ellipse cx="525.25" cy="61.623" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M520.25,62.7793 C520.25,65.2793 522.3906,67.0918 525.3125,67.0918 C526.5469,67.0918 527.7188,66.7949 528.4688,66.2793 C529.0781,65.8574 529.4063,65.4355 529.4063,65.0293 C529.4063,64.5605 528.9844,64.1543 528.4844,64.1543 C528.25,64.1543 528.0313,64.2324 527.8281,64.4355 C527.3906,64.873 527.3906,64.873 527.2188,64.9668 C526.7656,65.2011 526.125,65.3418 525.3594,65.3418 C523.3594,65.3418 522.0781,64.3261 522.0781,62.748 L522.0781,61.7011 C522.0781,59.998 523.2969,58.7949 525,58.7949 C525.5781,58.7949 526.1563,58.9355 526.625,59.1855 C527.0938,59.4511 527.2656,59.6386 527.3281,59.998 C527.4531,60.6699 527.7031,60.9199 528.2344,60.9199 C528.5156,60.9199 528.7969,60.7793 528.9844,60.5605 C529.1094,60.3886 529.1563,60.2168 529.1563,59.7793 L529.1563,58.4199 C529.1563,57.998 529.1406,57.8574 529.0156,57.6855 C528.8438,57.4355 528.5625,57.2793 528.2344,57.2793 C527.9219,57.2793 527.7188,57.3886 527.5,57.6543 C526.3281,57.1543 525.8906,57.0449 524.9375,57.0449 C522.2656,57.0449 520.25,59.0605 520.25,61.6855 L520.25,62.7793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="545.75" y="66.229">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="468" x2="600" y1="77.623" y2="77.623"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="468" x2="600" y1="85.623" y2="85.623"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="473" y="94.523"/>
-          <ellipse cx="478" cy="99.523" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="487" y="102.6289">value : std::string</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1015" y="635"/>
+      <ellipse cx="1020" cy="640" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002186387853087008570">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0002186387853087008570" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="751.5" y="870.023"/>
-        <ellipse cx="766.5" cy="886.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M761.5,887.1793 C761.5,889.6793 763.6406,891.4918 766.5625,891.4918 C767.7969,891.4918 768.9688,891.1949 769.7188,890.6793 C770.3281,890.2574 770.6563,889.8355 770.6563,889.4293 C770.6563,888.9605 770.2344,888.5543 769.7344,888.5543 C769.5,888.5543 769.2813,888.6324 769.0781,888.8355 C768.6406,889.273 768.6406,889.273 768.4688,889.3668 C768.0156,889.6011 767.375,889.7418 766.6094,889.7418 C764.6094,889.7418 763.3281,888.7261 763.3281,887.148 L763.3281,886.1011 C763.3281,884.398 764.5469,883.1949 766.25,883.1949 C766.8281,883.1949 767.4063,883.3355 767.875,883.5855 C768.3438,883.8511 768.5156,884.0386 768.5781,884.398 C768.7031,885.0699 768.9531,885.3199 769.4844,885.3199 C769.7656,885.3199 770.0469,885.1793 770.2344,884.9605 C770.3594,884.7886 770.4063,884.6168 770.4063,884.1793 L770.4063,882.8199 C770.4063,882.398 770.3906,882.2574 770.2656,882.0855 C770.0938,881.8355 769.8125,881.6793 769.4844,881.6793 C769.1719,881.6793 768.9688,881.7886 768.75,882.0543 C767.5781,881.5543 767.1406,881.4449 766.1875,881.4449 C763.5156,881.4449 761.5,883.4605 761.5,886.0855 L761.5,887.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="780.5" y="890.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="64" x="797.5" y="867.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="62" x="798.5" y="881.2231">T,std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="752.5" x2="857.5" y1="902.023" y2="902.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="752.5" x2="857.5" y1="910.023" y2="910.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="1029" y="643.2104">p : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000947292733740993297">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000947292733740993297" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="202" x="704" y="651.023"/>
-        <ellipse cx="719" cy="667.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M714,668.1793 C714,670.6793 716.1406,672.4918 719.0625,672.4918 C720.2969,672.4918 721.4688,672.1949 722.2188,671.6793 C722.8281,671.2574 723.1563,670.8355 723.1563,670.4293 C723.1563,669.9605 722.7344,669.5543 722.2344,669.5543 C722,669.5543 721.7813,669.6324 721.5781,669.8355 C721.1406,670.273 721.1406,670.273 720.9688,670.3668 C720.5156,670.6011 719.875,670.7418 719.1094,670.7418 C717.1094,670.7418 715.8281,669.7261 715.8281,668.148 L715.8281,667.1011 C715.8281,665.398 717.0469,664.1949 718.75,664.1949 C719.3281,664.1949 719.9063,664.3355 720.375,664.5855 C720.8438,664.8511 721.0156,665.0386 721.0781,665.398 C721.2031,666.0699 721.4531,666.3199 721.9844,666.3199 C722.2656,666.3199 722.5469,666.1793 722.7344,665.9605 C722.8594,665.7886 722.9063,665.6168 722.9063,665.1793 L722.9063,663.8199 C722.9063,663.398 722.8906,663.2574 722.7656,663.0855 C722.5938,662.8355 722.3125,662.6793 721.9844,662.6793 C721.6719,662.6793 721.4688,662.7886 721.25,663.0543 C720.0781,662.5543 719.6406,662.4449 718.6875,662.4449 C716.0156,662.4449 714,664.4605 714,667.0855 L714,668.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="733" y="671.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="159" x="750" y="648.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="157" x="751" y="662.2231">T,std::unique_ptr&lt;std::string&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="705" x2="905" y1="683.023" y2="683.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="705" x2="905" y1="691.023" y2="691.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1015" y="647.8047"/>
+      <ellipse cx="1020" cy="652.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001700006390494465667">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001700006390494465667" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="79" x="765.5" y="524.023"/>
-        <ellipse cx="780.5" cy="540.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M775.5,541.1793 C775.5,543.6793 777.6406,545.4918 780.5625,545.4918 C781.7969,545.4918 782.9688,545.1949 783.7188,544.6793 C784.3281,544.2574 784.6563,543.8355 784.6563,543.4293 C784.6563,542.9605 784.2344,542.5543 783.7344,542.5543 C783.5,542.5543 783.2813,542.6324 783.0781,542.8355 C782.6406,543.273 782.6406,543.273 782.4688,543.3668 C782.0156,543.6011 781.375,543.7418 780.6094,543.7418 C778.6094,543.7418 777.3281,542.7261 777.3281,541.148 L777.3281,540.1011 C777.3281,538.398 778.5469,537.1949 780.25,537.1949 C780.8281,537.1949 781.4063,537.3355 781.875,537.5855 C782.3438,537.8511 782.5156,538.0386 782.5781,538.398 C782.7031,539.0699 782.9531,539.3199 783.4844,539.3199 C783.7656,539.3199 784.0469,539.1793 784.2344,538.9605 C784.3594,538.7886 784.4063,538.6168 784.4063,538.1793 L784.4063,536.8199 C784.4063,536.398 784.3906,536.2574 784.2656,536.0855 C784.0938,535.8355 783.8125,535.6793 783.4844,535.6793 C783.1719,535.6793 782.9688,535.7886 782.75,536.0543 C781.5781,535.5543 781.1406,535.4449 780.1875,535.4449 C777.5156,535.4449 775.5,537.4605 775.5,540.0855 L775.5,541.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="794.5" y="544.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="36" x="811.5" y="521.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="34" x="812.5" y="535.2231">long,T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="766.5" x2="843.5" y1="556.023" y2="556.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="766.5" x2="843.5" y1="564.023" y2="564.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="1029" y="656.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002017665567517853203">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0002017665567517853203" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="758.5" y="270.023"/>
-        <ellipse cx="773.5" cy="286.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M768.5,287.1793 C768.5,289.6793 770.6406,291.4918 773.5625,291.4918 C774.7969,291.4918 775.9688,291.1949 776.7188,290.6793 C777.3281,290.2574 777.6563,289.8355 777.6563,289.4293 C777.6563,288.9605 777.2344,288.5543 776.7344,288.5543 C776.5,288.5543 776.2813,288.6324 776.0781,288.8355 C775.6406,289.273 775.6406,289.273 775.4688,289.3668 C775.0156,289.6011 774.375,289.7418 773.6094,289.7418 C771.6094,289.7418 770.3281,288.7261 770.3281,287.148 L770.3281,286.1011 C770.3281,284.398 771.5469,283.1949 773.25,283.1949 C773.8281,283.1949 774.4063,283.3355 774.875,283.5855 C775.3438,283.8511 775.5156,284.0386 775.5781,284.398 C775.7031,285.0699 775.9531,285.3199 776.4844,285.3199 C776.7656,285.3199 777.0469,285.1793 777.2344,284.9605 C777.3594,284.7886 777.4063,284.6168 777.4063,284.1793 L777.4063,282.8199 C777.4063,282.398 777.3906,282.2574 777.2656,282.0855 C777.0938,281.8355 776.8125,281.6793 776.4844,281.6793 C776.1719,281.6793 775.9688,281.7886 775.75,282.0543 C774.5781,281.5543 774.1406,281.4449 773.1875,281.4449 C770.5156,281.4449 768.5,283.4605 768.5,286.0855 L768.5,287.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="787.5" y="290.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="50" x="804.5" y="267.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="805.5" y="281.2231">double,T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="759.5" x2="850.5" y1="302.023" y2="302.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="759.5" x2="850.5" y1="310.023" y2="310.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="466.5" y="51.5"/>
+      <ellipse cx="521.75" cy="67.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M524.7188,73.1406 Q524.1406,73.4375 523.5,73.5781 Q522.8594,73.7344 522.1563,73.7344 Q519.6563,73.7344 518.3281,72.0938 Q517.0156,70.4375 517.0156,67.3125 Q517.0156,64.1875 518.3281,62.5313 Q519.6563,60.875 522.1563,60.875 Q522.8594,60.875 523.5,61.0313 Q524.1563,61.1875 524.7188,61.4844 L524.7188,64.2031 Q524.0938,63.625 523.5,63.3594 Q522.9063,63.0781 522.2813,63.0781 Q520.9375,63.0781 520.25,64.1563 Q519.5625,65.2188 519.5625,67.3125 Q519.5625,69.4063 520.25,70.4844 Q520.9375,71.5469 522.2813,71.5469 Q522.9063,71.5469 523.5,71.2813 Q524.0938,71 524.7188,70.4219 L524.7188,73.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.25" y="71.6543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="83.5" y2="83.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="91.5" y2="91.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000906557320263235873">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000906557320263235873" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="493.5" y="581.023"/>
-        <ellipse cx="508.5" cy="597.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M503.5,598.1793 C503.5,600.6793 505.6406,602.4918 508.5625,602.4918 C509.7969,602.4918 510.9688,602.1949 511.7188,601.6793 C512.3281,601.2574 512.6563,600.8355 512.6563,600.4293 C512.6563,599.9605 512.2344,599.5543 511.7344,599.5543 C511.5,599.5543 511.2813,599.6324 511.0781,599.8355 C510.6406,600.273 510.6406,600.273 510.4688,600.3668 C510.0156,600.6011 509.375,600.7418 508.6094,600.7418 C506.6094,600.7418 505.3281,599.7261 505.3281,598.148 L505.3281,597.1011 C505.3281,595.398 506.5469,594.1949 508.25,594.1949 C508.8281,594.1949 509.4063,594.3355 509.875,594.5855 C510.3438,594.8511 510.5156,595.0386 510.5781,595.398 C510.7031,596.0699 510.9531,596.3199 511.4844,596.3199 C511.7656,596.3199 512.0469,596.1793 512.2344,595.9605 C512.3594,595.7886 512.4063,595.6168 512.4063,595.1793 L512.4063,593.8199 C512.4063,593.398 512.3906,593.2574 512.2656,593.0855 C512.0938,592.8355 511.8125,592.6793 511.4844,592.6793 C511.1719,592.6793 510.9688,592.7886 510.75,593.0543 C509.5781,592.5543 509.1406,592.4449 508.1875,592.4449 C505.5156,592.4449 503.5,594.4605 503.5,597.0855 L503.5,598.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="522.5" y="601.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="38" x="539.5" y="578.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="36" x="540.5" y="592.2231">long,U</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="494.5" x2="573.5" y1="613.023" y2="613.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="494.5" x2="573.5" y1="621.023" y2="621.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="472.5" y="97.5"/>
+      <ellipse cx="477.5" cy="102.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000378898020828430636">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000378898020828430636" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="96" x="486" y="498.023"/>
-        <ellipse cx="501" cy="514.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M496,515.1793 C496,517.6793 498.1406,519.4918 501.0625,519.4918 C502.2969,519.4918 503.4688,519.1949 504.2188,518.6793 C504.8281,518.2574 505.1563,517.8355 505.1563,517.4293 C505.1563,516.9605 504.7344,516.5543 504.2344,516.5543 C504,516.5543 503.7813,516.6324 503.5781,516.8355 C503.1406,517.273 503.1406,517.273 502.9688,517.3668 C502.5156,517.6011 501.875,517.7418 501.1094,517.7418 C499.1094,517.7418 497.8281,516.7261 497.8281,515.148 L497.8281,514.1011 C497.8281,512.398 499.0469,511.1949 500.75,511.1949 C501.3281,511.1949 501.9063,511.3355 502.375,511.5855 C502.8438,511.8511 503.0156,512.0386 503.0781,512.398 C503.2031,513.0699 503.4531,513.3199 503.9844,513.3199 C504.2656,513.3199 504.5469,513.1793 504.7344,512.9605 C504.8594,512.7886 504.9063,512.6168 504.9063,512.1793 L504.9063,510.8199 C504.9063,510.398 504.8906,510.2574 504.7656,510.0855 C504.5938,509.8355 504.3125,509.6793 503.9844,509.6793 C503.6719,509.6793 503.4688,509.7886 503.25,510.0543 C502.0781,509.5543 501.6406,509.4449 500.6875,509.4449 C498.0156,509.4449 496,511.4605 496,514.0855 L496,515.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="515" y="518.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="53" x="532" y="495.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="51" x="533" y="509.2231">long,bool</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="487" x2="581" y1="530.023" y2="530.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="487" x2="581" y1="538.023" y2="538.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="486.5" y="105.7104">value : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002082013375525130414">
-        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0002082013375525130414" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="479" y="249.023"/>
-        <ellipse cx="494" cy="265.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M489,266.1793 C489,268.6793 491.1406,270.4918 494.0625,270.4918 C495.2969,270.4918 496.4688,270.1949 497.2188,269.6793 C497.8281,269.2574 498.1563,268.8355 498.1563,268.4293 C498.1563,267.9605 497.7344,267.5543 497.2344,267.5543 C497,267.5543 496.7813,267.6324 496.5781,267.8355 C496.1406,268.273 496.1406,268.273 495.9688,268.3668 C495.5156,268.6011 494.875,268.7418 494.1094,268.7418 C492.1094,268.7418 490.8281,267.7261 490.8281,266.148 L490.8281,265.1011 C490.8281,263.398 492.0469,262.1949 493.75,262.1949 C494.3281,262.1949 494.9063,262.3355 495.375,262.5855 C495.8438,262.8511 496.0156,263.0386 496.0781,263.398 C496.2031,264.0699 496.4531,264.3199 496.9844,264.3199 C497.2656,264.3199 497.5469,264.1793 497.7344,263.9605 C497.8594,263.7886 497.9063,263.6168 497.9063,263.1793 L497.9063,261.8199 C497.9063,261.398 497.8906,261.2574 497.7656,261.0855 C497.5938,260.8355 497.3125,260.6793 496.9844,260.6793 C496.6719,260.6793 496.4688,260.7886 496.25,261.0543 C495.0781,260.5543 494.6406,260.4449 493.6875,260.4449 C491.0156,260.4449 489,262.4605 489,265.0855 L489,266.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="508" y="269.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="67" x="525" y="246.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="65" x="526" y="260.2231">double,bool</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="480" x2="588" y1="281.023" y2="281.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="480" x2="588" y1="289.023" y2="289.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="774" y="870"/>
+      <ellipse cx="789" cy="886" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M791.9688,891.6406 Q791.3906,891.9375 790.75,892.0781 Q790.1094,892.2344 789.4063,892.2344 Q786.9063,892.2344 785.5781,890.5938 Q784.2656,888.9375 784.2656,885.8125 Q784.2656,882.6875 785.5781,881.0313 Q786.9063,879.375 789.4063,879.375 Q790.1094,879.375 790.75,879.5313 Q791.4063,879.6875 791.9688,879.9844 L791.9688,882.7031 Q791.3438,882.125 790.75,881.8594 Q790.1563,881.5781 789.5313,881.5781 Q788.1875,881.5781 787.5,882.6563 Q786.8125,883.7188 786.8125,885.8125 Q786.8125,887.9063 787.5,888.9844 Q788.1875,890.0469 789.5313,890.0469 Q790.1563,890.0469 790.75,889.7813 Q791.3438,889.5 791.9688,888.9219 L791.9688,891.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="803" y="890.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="819" y="867"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="820" y="879.1387">T,std::string</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="902" y2="902"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="910" y2="910"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000051978493292659230">
-        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0000051978493292659230" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="95" x="486.5" y="415.023"/>
-        <ellipse cx="501.5" cy="431.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M496.5,432.1793 C496.5,434.6793 498.6406,436.4918 501.5625,436.4918 C502.7969,436.4918 503.9688,436.1949 504.7188,435.6793 C505.3281,435.2574 505.6563,434.8355 505.6563,434.4293 C505.6563,433.9605 505.2344,433.5543 504.7344,433.5543 C504.5,433.5543 504.2813,433.6324 504.0781,433.8355 C503.6406,434.273 503.6406,434.273 503.4688,434.3668 C503.0156,434.6011 502.375,434.7418 501.6094,434.7418 C499.6094,434.7418 498.3281,433.7261 498.3281,432.148 L498.3281,431.1011 C498.3281,429.398 499.5469,428.1949 501.25,428.1949 C501.8281,428.1949 502.4063,428.3355 502.875,428.5855 C503.3438,428.8511 503.5156,429.0386 503.5781,429.398 C503.7031,430.0699 503.9531,430.3199 504.4844,430.3199 C504.7656,430.3199 505.0469,430.1793 505.2344,429.9605 C505.3594,429.7886 505.4063,429.6168 505.4063,429.1793 L505.4063,427.8199 C505.4063,427.398 505.3906,427.2574 505.2656,427.0855 C505.0938,426.8355 504.8125,426.6793 504.4844,426.6793 C504.1719,426.6793 503.9688,426.7886 503.75,427.0543 C502.5781,426.5543 502.1406,426.4449 501.1875,426.4449 C498.5156,426.4449 496.5,428.4605 496.5,431.0855 L496.5,432.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="515.5" y="435.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="52" x="532.5" y="412.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="50" x="533.5" y="426.2231">long,float</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="487.5" x2="580.5" y1="447.023" y2="447.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="487.5" x2="580.5" y1="455.023" y2="455.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="717" y="653"/>
+      <ellipse cx="732" cy="669" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M734.9688,674.6406 Q734.3906,674.9375 733.75,675.0781 Q733.1094,675.2344 732.4063,675.2344 Q729.9063,675.2344 728.5781,673.5938 Q727.2656,671.9375 727.2656,668.8125 Q727.2656,665.6875 728.5781,664.0313 Q729.9063,662.375 732.4063,662.375 Q733.1094,662.375 733.75,662.5313 Q734.4063,662.6875 734.9688,662.9844 L734.9688,665.7031 Q734.3438,665.125 733.75,664.8594 Q733.1563,664.5781 732.5313,664.5781 Q731.1875,664.5781 730.5,665.6563 Q729.8125,666.7188 729.8125,668.8125 Q729.8125,670.9063 730.5,671.9844 Q731.1875,673.0469 732.5313,673.0469 Q733.1563,673.0469 733.75,672.7813 Q734.3438,672.5 734.9688,671.9219 L734.9688,674.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="746" y="673.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="189" x="762" y="650"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="187" x="763" y="662.1387">T,std::unique_ptr&lt;std::string&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="685" y2="685"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="693" y2="693"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000197769253782961588">
-        <rect codeLine="46" fill="#F1F1F1" height="48" id="C_0000197769253782961588" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="479.5" y="332.023"/>
-        <ellipse cx="494.5" cy="348.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M489.5,349.1793 C489.5,351.6793 491.6406,353.4918 494.5625,353.4918 C495.7969,353.4918 496.9688,353.1949 497.7188,352.6793 C498.3281,352.2574 498.6563,351.8355 498.6563,351.4293 C498.6563,350.9605 498.2344,350.5543 497.7344,350.5543 C497.5,350.5543 497.2813,350.6324 497.0781,350.8355 C496.6406,351.273 496.6406,351.273 496.4688,351.3668 C496.0156,351.6011 495.375,351.7418 494.6094,351.7418 C492.6094,351.7418 491.3281,350.7261 491.3281,349.148 L491.3281,348.1011 C491.3281,346.398 492.5469,345.1949 494.25,345.1949 C494.8281,345.1949 495.4063,345.3355 495.875,345.5855 C496.3438,345.8511 496.5156,346.0386 496.5781,346.398 C496.7031,347.0699 496.9531,347.3199 497.4844,347.3199 C497.7656,347.3199 498.0469,347.1793 498.2344,346.9605 C498.3594,346.7886 498.4063,346.6168 498.4063,346.1793 L498.4063,344.8199 C498.4063,344.398 498.3906,344.2574 498.2656,344.0855 C498.0938,343.8355 497.8125,343.6793 497.4844,343.6793 C497.1719,343.6793 496.9688,343.7886 496.75,344.0543 C495.5781,343.5543 495.1406,343.4449 494.1875,343.4449 C491.5156,343.4449 489.5,345.4605 489.5,348.0855 L489.5,349.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="508.5" y="352.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="66" x="525.5" y="329.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="64" x="526.5" y="343.2231">double,float</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="480.5" x2="587.5" y1="364.023" y2="364.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="480.5" x2="587.5" y1="372.023" y2="372.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="791.5" y="529"/>
+      <ellipse cx="806.5" cy="545" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M809.4688,550.6406 Q808.8906,550.9375 808.25,551.0781 Q807.6094,551.2344 806.9063,551.2344 Q804.4063,551.2344 803.0781,549.5938 Q801.7656,547.9375 801.7656,544.8125 Q801.7656,541.6875 803.0781,540.0313 Q804.4063,538.375 806.9063,538.375 Q807.6094,538.375 808.25,538.5313 Q808.9063,538.6875 809.4688,538.9844 L809.4688,541.7031 Q808.8438,541.125 808.25,540.8594 Q807.6563,540.5781 807.0313,540.5781 Q805.6875,540.5781 805,541.6563 Q804.3125,542.7188 804.3125,544.8125 Q804.3125,546.9063 805,547.9844 Q805.6875,549.0469 807.0313,549.0469 Q807.6563,549.0469 808.25,548.7813 Q808.8438,548.5 809.4688,547.9219 L809.4688,550.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="549.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="40" x="836.5" y="526"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="837.5" y="538.1387">long,T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="561" y2="561"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="569" y2="569"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000895940711566401184">
-        <rect codeLine="50" fill="#F1F1F1" height="48" id="C_0000895940711566401184" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="472" y="747.023"/>
-        <ellipse cx="487" cy="763.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M482,764.1793 C482,766.6793 484.1406,768.4918 487.0625,768.4918 C488.2969,768.4918 489.4688,768.1949 490.2188,767.6793 C490.8281,767.2574 491.1563,766.8355 491.1563,766.4293 C491.1563,765.9605 490.7344,765.5543 490.2344,765.5543 C490,765.5543 489.7813,765.6324 489.5781,765.8355 C489.1406,766.273 489.1406,766.273 488.9688,766.3668 C488.5156,766.6011 487.875,766.7418 487.1094,766.7418 C485.1094,766.7418 483.8281,765.7261 483.8281,764.148 L483.8281,763.1011 C483.8281,761.398 485.0469,760.1949 486.75,760.1949 C487.3281,760.1949 487.9063,760.3355 488.375,760.5855 C488.8438,760.8511 489.0156,761.0386 489.0781,761.398 C489.2031,762.0699 489.4531,762.3199 489.9844,762.3199 C490.2656,762.3199 490.5469,762.1793 490.7344,761.9605 C490.8594,761.7886 490.9063,761.6168 490.9063,761.1793 L490.9063,759.8199 C490.9063,759.398 490.8906,759.2574 490.7656,759.0855 C490.5938,758.8355 490.3125,758.6793 489.9844,758.6793 C489.6719,758.6793 489.4688,758.7886 489.25,759.0543 C488.0781,758.5543 487.6406,758.4449 486.6875,758.4449 C484.0156,758.4449 482,760.4605 482,763.0855 L482,764.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="501" y="767.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="81" x="518" y="744.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="519" y="758.2231">bool,std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="473" x2="595" y1="779.023" y2="779.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="473" x2="595" y1="787.023" y2="787.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="783.5" y="295"/>
+      <ellipse cx="798.5" cy="311" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M801.4688,316.6406 Q800.8906,316.9375 800.25,317.0781 Q799.6094,317.2344 798.9063,317.2344 Q796.4063,317.2344 795.0781,315.5938 Q793.7656,313.9375 793.7656,310.8125 Q793.7656,307.6875 795.0781,306.0313 Q796.4063,304.375 798.9063,304.375 Q799.6094,304.375 800.25,304.5313 Q800.9063,304.6875 801.4688,304.9844 L801.4688,307.7031 Q800.8438,307.125 800.25,306.8594 Q799.6563,306.5781 799.0313,306.5781 Q797.6875,306.5781 797,307.6563 Q796.3125,308.7188 796.3125,310.8125 Q796.3125,312.9063 797,313.9844 Q797.6875,315.0469 799.0313,315.0469 Q799.6563,315.0469 800.25,314.7813 Q800.8438,314.5 801.4688,313.9219 L801.4688,316.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.5" y="315.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="56" x="828.5" y="292"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="829.5" y="304.1387">double,T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="327" y2="327"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="335" y2="335"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001751732625010742161">
-        <rect codeLine="54" fill="#F1F1F1" height="48" id="C_0001751732625010742161" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="218" x="425" y="664.023"/>
-        <ellipse cx="440" cy="680.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M435,681.1793 C435,683.6793 437.1406,685.4918 440.0625,685.4918 C441.2969,685.4918 442.4688,685.1949 443.2188,684.6793 C443.8281,684.2574 444.1563,683.8355 444.1563,683.4293 C444.1563,682.9605 443.7344,682.5543 443.2344,682.5543 C443,682.5543 442.7813,682.6324 442.5781,682.8355 C442.1406,683.273 442.1406,683.273 441.9688,683.3668 C441.5156,683.6011 440.875,683.7418 440.1094,683.7418 C438.1094,683.7418 436.8281,682.7261 436.8281,681.148 L436.8281,680.1011 C436.8281,678.398 438.0469,677.1949 439.75,677.1949 C440.3281,677.1949 440.9063,677.3355 441.375,677.5855 C441.8438,677.8511 442.0156,678.0386 442.0781,678.398 C442.2031,679.0699 442.4531,679.3199 442.9844,679.3199 C443.2656,679.3199 443.5469,679.1793 443.7344,678.9605 C443.8594,678.7886 443.9063,678.6168 443.9063,678.1793 L443.9063,676.8199 C443.9063,676.398 443.8906,676.2574 443.7656,676.0855 C443.5938,675.8355 443.3125,675.6793 442.9844,675.6793 C442.6719,675.6793 442.4688,675.7886 442.25,676.0543 C441.0781,675.5543 440.6406,675.4449 439.6875,675.4449 C437.0156,675.4449 435,677.4605 435,680.0855 L435,681.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="454" y="684.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="175" x="471" y="661.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="173" x="472" y="675.2231">float,std::unique_ptr&lt;std::string&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="426" x2="642" y1="696.023" y2="696.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="426" x2="642" y1="704.023" y2="704.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="488" y="585"/>
+      <ellipse cx="503" cy="601" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M505.9688,606.6406 Q505.3906,606.9375 504.75,607.0781 Q504.1094,607.2344 503.4063,607.2344 Q500.9063,607.2344 499.5781,605.5938 Q498.2656,603.9375 498.2656,600.8125 Q498.2656,597.6875 499.5781,596.0313 Q500.9063,594.375 503.4063,594.375 Q504.1094,594.375 504.75,594.5313 Q505.4063,594.6875 505.9688,594.9844 L505.9688,597.7031 Q505.3438,597.125 504.75,596.8594 Q504.1563,596.5781 503.5313,596.5781 Q502.1875,596.5781 501.5,597.6563 Q500.8125,598.7188 500.8125,600.8125 Q500.8125,602.9063 501.5,603.9844 Q502.1875,605.0469 503.5313,605.0469 Q504.1563,605.0469 504.75,604.7813 Q505.3438,604.5 505.9688,603.9219 L505.9688,606.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="517" y="605.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="42" x="533" y="582"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="534" y="594.1387">long,U</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="617" y2="617"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="625" y2="625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000887121441210847583">
-        <rect codeLine="58" fill="#F1F1F1" height="48" id="C_0000887121441210847583" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="477.5" y="913.023"/>
-        <ellipse cx="492.5" cy="929.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M487.5,930.1793 C487.5,932.6793 489.6406,934.4918 492.5625,934.4918 C493.7969,934.4918 494.9688,934.1949 495.7188,933.6793 C496.3281,933.2574 496.6563,932.8355 496.6563,932.4293 C496.6563,931.9605 496.2344,931.5543 495.7344,931.5543 C495.5,931.5543 495.2813,931.6324 495.0781,931.8355 C494.6406,932.273 494.6406,932.273 494.4688,932.3668 C494.0156,932.6011 493.375,932.7418 492.6094,932.7418 C490.6094,932.7418 489.3281,931.7261 489.3281,930.148 L489.3281,929.1011 C489.3281,927.398 490.5469,926.1949 492.25,926.1949 C492.8281,926.1949 493.4063,926.3355 493.875,926.5855 C494.3438,926.8511 494.5156,927.0386 494.5781,927.398 C494.7031,928.0699 494.9531,928.3199 495.4844,928.3199 C495.7656,928.3199 496.0469,928.1793 496.2344,927.9605 C496.3594,927.7886 496.4063,927.6168 496.4063,927.1793 L496.4063,925.8199 C496.4063,925.398 496.3906,925.2574 496.2656,925.0855 C496.0938,924.8355 495.8125,924.6793 495.4844,924.6793 C495.1719,924.6793 494.9688,924.7886 494.75,925.0543 C493.5781,924.5543 493.1406,924.4449 492.1875,924.4449 C489.5156,924.4449 487.5,926.4605 487.5,929.0855 L487.5,930.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="506.5" y="933.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="70" x="523.5" y="910.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="68" x="524.5" y="924.2231">int,std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="589.5" y1="945.023" y2="945.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="478.5" x2="589.5" y1="953.023" y2="953.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="479" y="502"/>
+      <ellipse cx="494" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M496.9688,523.6406 Q496.3906,523.9375 495.75,524.0781 Q495.1094,524.2344 494.4063,524.2344 Q491.9063,524.2344 490.5781,522.5938 Q489.2656,520.9375 489.2656,517.8125 Q489.2656,514.6875 490.5781,513.0313 Q491.9063,511.375 494.4063,511.375 Q495.1094,511.375 495.75,511.5313 Q496.4063,511.6875 496.9688,511.9844 L496.9688,514.7031 Q496.3438,514.125 495.75,513.8594 Q495.1563,513.5781 494.5313,513.5781 Q493.1875,513.5781 492.5,514.6563 Q491.8125,515.7188 491.8125,517.8125 Q491.8125,519.9063 492.5,520.9844 Q493.1875,522.0469 494.5313,522.0469 Q495.1563,522.0469 495.75,521.7813 Q496.3438,521.5 496.9688,520.9219 L496.9688,523.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508" 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="60" x="524" y="499"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="58" x="525" y="511.1387">long,bool</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="534" y2="534"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="542" y2="542"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001119452495635561975">
-        <rect codeLine="62" fill="#F1F1F1" height="48" id="C_0001119452495635561975" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="152" x="458" y="996.023"/>
-        <ellipse cx="473" cy="1012.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M468,1013.1793 C468,1015.6793 470.1406,1017.4918 473.0625,1017.4918 C474.2969,1017.4918 475.4688,1017.1949 476.2188,1016.6793 C476.8281,1016.2574 477.1563,1015.8355 477.1563,1015.4293 C477.1563,1014.9605 476.7344,1014.5543 476.2344,1014.5543 C476,1014.5543 475.7813,1014.6324 475.5781,1014.8355 C475.1406,1015.273 475.1406,1015.273 474.9688,1015.3668 C474.5156,1015.6011 473.875,1015.7418 473.1094,1015.7418 C471.1094,1015.7418 469.8281,1014.7261 469.8281,1013.148 L469.8281,1012.1011 C469.8281,1010.398 471.0469,1009.1949 472.75,1009.1949 C473.3281,1009.1949 473.9063,1009.3355 474.375,1009.5855 C474.8438,1009.8511 475.0156,1010.0386 475.0781,1010.398 C475.2031,1011.0699 475.4531,1011.3199 475.9844,1011.3199 C476.2656,1011.3199 476.5469,1011.1793 476.7344,1010.9605 C476.8594,1010.7886 476.9063,1010.6168 476.9063,1010.1793 L476.9063,1008.8199 C476.9063,1008.398 476.8906,1008.2574 476.7656,1008.0855 C476.5938,1007.8355 476.3125,1007.6793 475.9844,1007.6793 C475.6719,1007.6793 475.4688,1007.7886 475.25,1008.0543 C474.0781,1007.5543 473.6406,1007.4449 472.6875,1007.4449 C470.0156,1007.4449 468,1009.4605 468,1012.0855 L468,1013.1793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="487" y="1016.629">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="109" x="504" y="993.023"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="107" x="505" y="1007.2231">std::string,std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="459" x2="609" y1="1028.023" y2="1028.023"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="459" x2="609" y1="1036.023" y2="1036.023"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="471" y="253"/>
+      <ellipse cx="486" cy="269" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M488.9688,274.6406 Q488.3906,274.9375 487.75,275.0781 Q487.1094,275.2344 486.4063,275.2344 Q483.9063,275.2344 482.5781,273.5938 Q481.2656,271.9375 481.2656,268.8125 Q481.2656,265.6875 482.5781,264.0313 Q483.9063,262.375 486.4063,262.375 Q487.1094,262.375 487.75,262.5313 Q488.4063,262.6875 488.9688,262.9844 L488.9688,265.7031 Q488.3438,265.125 487.75,264.8594 Q487.1563,264.5781 486.5313,264.5781 Q485.1875,264.5781 484.5,265.6563 Q483.8125,266.7188 483.8125,268.8125 Q483.8125,270.9063 484.5,271.9844 Q485.1875,273.0469 486.5313,273.0469 Q487.1563,273.0469 487.75,272.7813 Q488.3438,272.5 488.9688,271.9219 L488.9688,274.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="500" y="273.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="76" x="516" y="250"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="74" x="517" y="262.1387">double,bool</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="285" y2="285"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="293" y2="293"/>
     </a>
-    <g id="elem_C_0000340562099063642390">
-      <rect codeLine="66" fill="#F1F1F1" height="48" id="C_0000340562099063642390" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="472" y="1079.023"/>
-      <ellipse cx="487" cy="1095.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-      <path d="M482,1096.1793 C482,1098.6793 484.1406,1100.4918 487.0625,1100.4918 C488.2969,1100.4918 489.4688,1100.1949 490.2188,1099.6793 C490.8281,1099.2574 491.1563,1098.8355 491.1563,1098.4293 C491.1563,1097.9605 490.7344,1097.5543 490.2344,1097.5543 C490,1097.5543 489.7813,1097.6324 489.5781,1097.8355 C489.1406,1098.273 489.1406,1098.273 488.9688,1098.3668 C488.5156,1098.6011 487.875,1098.7418 487.1094,1098.7418 C485.1094,1098.7418 483.8281,1097.7261 483.8281,1096.148 L483.8281,1095.1011 C483.8281,1093.398 485.0469,1092.1949 486.75,1092.1949 C487.3281,1092.1949 487.9063,1092.3355 488.375,1092.5855 C488.8438,1092.8511 489.0156,1093.0386 489.0781,1093.398 C489.2031,1094.0699 489.4531,1094.3199 489.9844,1094.3199 C490.2656,1094.3199 490.5469,1094.1793 490.7344,1093.9605 C490.8594,1093.7886 490.9063,1093.6168 490.9063,1093.1793 L490.9063,1091.8199 C490.9063,1091.398 490.8906,1091.2574 490.7656,1091.0855 C490.5938,1090.8355 490.3125,1090.6793 489.9844,1090.6793 C489.6719,1090.6793 489.4688,1090.7886 489.25,1091.0543 C488.0781,1090.5543 487.6406,1090.4449 486.6875,1090.4449 C484.0156,1090.4449 482,1092.4605 482,1095.0855 L482,1096.1793 Z " fill="#000000"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="501" y="1099.629">A</text>
-      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="81" x="518" y="1076.023"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="519" y="1090.2231">char,std::string</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="473" x2="595" y1="1111.023" y2="1111.023"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="473" x2="595" y1="1119.023" y2="1119.023"/>
-    </g>
-    <g id="elem_C_0001388877149159894665">
-      <rect codeLine="70" fill="#F1F1F1" height="48" id="C_0001388877149159894665" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="462.5" y="830.023"/>
-      <ellipse cx="477.5" cy="846.023" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-      <path d="M472.5,847.1793 C472.5,849.6793 474.6406,851.4918 477.5625,851.4918 C478.7969,851.4918 479.9688,851.1949 480.7188,850.6793 C481.3281,850.2574 481.6563,849.8355 481.6563,849.4293 C481.6563,848.9605 481.2344,848.5543 480.7344,848.5543 C480.5,848.5543 480.2813,848.6324 480.0781,848.8355 C479.6406,849.273 479.6406,849.273 479.4688,849.3668 C479.0156,849.6011 478.375,849.7418 477.6094,849.7418 C475.6094,849.7418 474.3281,848.7261 474.3281,847.148 L474.3281,846.1011 C474.3281,844.398 475.5469,843.1949 477.25,843.1949 C477.8281,843.1949 478.4063,843.3355 478.875,843.5855 C479.3438,843.8511 479.5156,844.0386 479.5781,844.398 C479.7031,845.0699 479.9531,845.3199 480.4844,845.3199 C480.7656,845.3199 481.0469,845.1793 481.2344,844.9605 C481.3594,844.7886 481.4063,844.6168 481.4063,844.1793 L481.4063,842.8199 C481.4063,842.398 481.3906,842.2574 481.2656,842.0855 C481.0938,841.8355 480.8125,841.6793 480.4844,841.6793 C480.1719,841.6793 479.9688,841.7886 479.75,842.0543 C478.5781,841.5543 478.1406,841.4449 477.1875,841.4449 C474.5156,841.4449 472.5,843.4605 472.5,846.0855 L472.5,847.1793 Z " fill="#000000"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="491.5" y="850.629">A</text>
-      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="100" x="508.5" y="827.023"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="98" x="509.5" y="841.2231">wchar_t,std::string</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="463.5" x2="604.5" y1="862.023" y2="862.023"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="463.5" x2="604.5" y1="870.023" y2="870.023"/>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001758213171584933144">
-        <rect codeLine="74" fill="#F1F1F1" height="316.7988" id="C_0001758213171584933144" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="271" x="9" y="371.623"/>
-        <ellipse cx="129.75" cy="387.623" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M124.75,388.7793 C124.75,391.2793 126.8906,393.0918 129.8125,393.0918 C131.0469,393.0918 132.2188,392.7949 132.9688,392.2793 C133.5781,391.8574 133.9063,391.4355 133.9063,391.0293 C133.9063,390.5605 133.4844,390.1543 132.9844,390.1543 C132.75,390.1543 132.5313,390.2324 132.3281,390.4355 C131.8906,390.873 131.8906,390.873 131.7188,390.9668 C131.2656,391.2011 130.625,391.3418 129.8594,391.3418 C127.8594,391.3418 126.5781,390.3261 126.5781,388.748 L126.5781,387.7011 C126.5781,385.998 127.7969,384.7949 129.5,384.7949 C130.0781,384.7949 130.6563,384.9355 131.125,385.1855 C131.5938,385.4511 131.7656,385.6386 131.8281,385.998 C131.9531,386.6699 132.2031,386.9199 132.7344,386.9199 C133.0156,386.9199 133.2969,386.7793 133.4844,386.5605 C133.6094,386.3886 133.6563,386.2168 133.6563,385.7793 L133.6563,384.4199 C133.6563,383.998 133.6406,383.8574 133.5156,383.6855 C133.3438,383.4355 133.0625,383.2793 132.7344,383.2793 C132.4219,383.2793 132.2188,383.3886 132,383.6543 C130.8281,383.1543 130.3906,383.0449 129.4375,383.0449 C126.7656,383.0449 124.75,385.0605 124.75,387.6855 L124.75,388.7793 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="150.25" y="392.229">R</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="274" y="368.623"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="275" y="382.8231">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="279" y1="403.623" y2="403.623"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="279" y1="411.623" y2="411.623"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="420.523"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="422.523"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="29" y="428.6289">abool : APtr&lt;bool&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="437.3229"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="439.3229"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="184" x="29" y="445.4289">aboolfloat : AAPtr&lt;bool,float&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="454.1228"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="456.1228"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="29" y="462.2288">afloat : ASharedPtr&lt;float&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="470.9227"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="472.9227"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="29" y="479.0287">atfloat : AAPtr&lt;T,float&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="487.7227"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="489.7227"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="29" y="495.8287">bapair : PairPairBA&lt;bool&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="504.5226"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="506.5226"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="192" x="29" y="512.6286">boolstring : A&lt;bool,std::string&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="521.3225"/>
-          <polygon fill="none" points="20,521.3225,24,525.3225,20,529.3225,16,525.3225" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77" x="29" y="529.4285">bs : BVector</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="538.1225"/>
-          <ellipse cx="20" cy="543.1225" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="29" y="546.2284">bs2 : BVector2</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="554.9224"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="556.9224"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="29" y="563.0284">bstringstring : BStringString</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="571.7223"/>
-          <ellipse cx="20" cy="576.7223" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="217" x="29" y="579.8283">cb : SimpleCallback&lt;ACharString&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="588.5222"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="590.5222"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="181" x="29" y="596.6282">floatstring : AStringPtr&lt;float&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="605.3222"/>
-          <ellipse cx="20" cy="610.3222" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245" x="29" y="613.4281">gcb : GenericCallback&lt;AWCharString&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="622.1221"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="624.1221"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124" x="29" y="630.2281">intstring : AIntString</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="638.922"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="17" y="640.922"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="165" x="29" y="647.028">stringstring : AStringString</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="655.7219"/>
-          <ellipse cx="20" cy="660.7219" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="29" y="663.8279">vcb : VoidCallback</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="672.5219"/>
-          <ellipse cx="20" cy="677.5219" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="29" y="680.6278">vps : VectorPtr&lt;B&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="478.5" y="419"/>
+      <ellipse cx="493.5" cy="435" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M496.4688,440.6406 Q495.8906,440.9375 495.25,441.0781 Q494.6094,441.2344 493.9063,441.2344 Q491.4063,441.2344 490.0781,439.5938 Q488.7656,437.9375 488.7656,434.8125 Q488.7656,431.6875 490.0781,430.0313 Q491.4063,428.375 493.9063,428.375 Q494.6094,428.375 495.25,428.5313 Q495.9063,428.6875 496.4688,428.9844 L496.4688,431.7031 Q495.8438,431.125 495.25,430.8594 Q494.6563,430.5781 494.0313,430.5781 Q492.6875,430.5781 492,431.6563 Q491.3125,432.7188 491.3125,434.8125 Q491.3125,436.9063 492,437.9844 Q492.6875,439.0469 494.0313,439.0469 Q494.6563,439.0469 495.25,438.7813 Q495.8438,438.5 496.4688,437.9219 L496.4688,440.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="507.5" y="439.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="61" x="523.5" y="416"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="524.5" y="428.1387">long,float</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="451" y2="451"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="459" y2="459"/>
     </a>
-    <g id="link_C_0002186387853087008570_C_0000765890579167335652">
-      <path codeLine="93" d="M822.66,869.663 C855.51,821.633 918.7988,729.1006 959.2588,669.9406 " fill="none" id="C_0002186387853087008570-to-C_0000765890579167335652" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="969.42,655.083,954.3062,666.5535,964.2113,673.3277,969.42,655.083" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000947292733740993297_C_0000765890579167335652">
-      <path codeLine="94" d="M882.79,650.563 C912.13,641.213 926.7988,636.5454 949.4688,629.3254 " fill="none" id="C_0000947292733740993297-to-C_0000765890579167335652" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="966.62,623.863,947.648,623.6083,951.2896,635.0424,966.62,623.863" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001700006390494465667_C_0000765890579167335652">
-      <path codeLine="95" d="M844.75,561.383 C880.71,573.773 916.5126,586.1072 949.6726,597.5372 " fill="none" id="C_0001700006390494465667-to-C_0000765890579167335652" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="966.69,603.403,951.6278,591.8648,947.7173,603.2097,966.69,603.403" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002017665567517853203_C_0000765890579167335652">
-      <path codeLine="96" d="M820.55,318.333 C853.15,372.813 923.1052,489.7185 963.5752,557.3285 " fill="none" id="C_0002017665567517853203-to-C_0000765890579167335652" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="972.82,572.773,968.7234,554.2469,958.427,560.4101,972.82,572.773" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000906557320263235873_C_0001700006390494465667">
-      <path codeLine="97" d="M574.98,596.553 C626.21,585.693 696.8109,570.7339 747.5009,559.9939 " fill="none" id="C_0000906557320263235873-to-C_0001700006390494465667" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="765.11,556.263,746.2573,554.1243,748.7446,565.8636,765.11,556.263" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000378898020828430636_C_0001700006390494465667">
-      <path codeLine="98" d="M582.47,526.613 C634.51,531.643 699.0836,537.88 747.3636,542.55 " fill="none" id="C_0000378898020828430636-to-C_0001700006390494465667" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="765.28,544.283,747.9413,536.5779,746.786,548.5221,765.28,544.283" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002082013375525130414_C_0002017665567517853203">
-      <path codeLine="99" d="M589.44,277.273 C639.02,281.143 693.4947,285.3904 740.1947,289.0404 " fill="none" id="C_0002082013375525130414-to-C_0002017665567517853203" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="758.14,290.443,740.6623,283.0587,739.7272,295.0222,758.14,290.443" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000051978493292659230_C_0001700006390494465667">
-      <path codeLine="100" d="M581.93,456.413 C600.95,463.563 623.08,472.043 643,480.023 C684.96,496.843 716.0896,509.9993 748.5996,524.0093 " fill="none" id="C_0000051978493292659230-to-C_0001700006390494465667" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="765.13,531.133,750.9742,518.4992,746.2251,529.5195,765.13,531.133" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000197769253782961588_C_0002017665567517853203">
-      <path codeLine="101" d="M588.79,343.623 C638.47,332.173 693.9099,319.3958 740.8099,308.5858 " fill="none" id="C_0000197769253782961588-to-C_0002017665567517853203" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="758.35,304.543,739.4623,302.7391,742.1575,314.4325,758.35,304.543" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000895940711566401184_C_0002186387853087008570">
-      <path codeLine="102" d="M596.3,792.973 C611.68,798.843 628.05,805.403 643,812.023 C683.01,829.743 711.3365,844.0345 743.2965,861.0745 " fill="none" id="C_0000895940711566401184-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="759.18,869.543,746.1194,855.78,740.4737,866.369,759.18,869.543" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001751732625010742161_C_0000947292733740993297">
-      <path codeLine="103" d="M643.25,682.793 C663.25,681.823 666.0812,681.6969 685.8312,680.7369 " fill="none" id="C_0001751732625010742161-to-C_0000947292733740993297" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="703.81,679.863,685.5399,674.744,686.1225,686.7298,703.81,679.863" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000887121441210847583_C_0002186387853087008570">
-      <path codeLine="104" d="M590.74,928.113 C637.83,920.583 687.0359,912.7256 733.3059,905.3256 " fill="none" id="C_0000887121441210847583-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="751.08,902.483,732.3583,899.4009,734.2534,911.2503,751.08,902.483" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001119452495635561975_C_0002186387853087008570">
-      <path codeLine="105" d="M603.22,995.583 C616.53,990.403 630.3,984.763 643,979.023 C684.05,960.483 713.5544,945.0012 745.6044,927.1512 " fill="none" id="C_0001119452495635561975-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="761.33,918.393,742.685,921.9094,748.5238,932.3931,761.33,918.393" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000340562099063642390_C_0002186387853087008570">
-      <path codeLine="106" d="M596.44,1085.073 C612.3,1079.023 628.87,1071.373 643,1062.023 C703.97,1021.663 748.3672,968.7608 775.4972,932.8108 " fill="none" id="C_0000340562099063642390-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="786.34,918.443,770.7079,929.1965,780.2865,936.4251,786.34,918.443" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001388877149159894665_C_0002186387853087008570">
-      <path codeLine="107" d="M605.68,864.533 C651.29,871.313 691.8356,877.3467 733.4156,883.5267 " fill="none" id="C_0001388877149159894665-to-C_0002186387853087008570" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="751.22,886.173,734.2977,877.5919,732.5335,889.4616,751.22,886.173" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000934136012292043506">
-      <path codeLine="108" d="M154.4986,359.2533 C169.0386,247.5233 206.78,117.113 310,43.023 C356.16,9.893 421.58,25.523 469.62,45.303 " fill="none" id="C_0001758213171584933144-backto-C_0000934136012292043506" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="152.95,371.153,157.6908,365.7194,154.4986,359.2533,149.7577,364.687,152.95,371.153" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="331" y="13.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="341" y="20.1">bapair</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000934136012292043506">
-      <path codeLine="121" d="M167.1354,359.4775 C187.2054,265.4675 225.81,164.273 310,100.023 C354.15,66.333 418.4,63.373 466.61,67.353 " fill="none" id="C_0001758213171584933144-backto-C_0000934136012292043506-1" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="164.63,371.213,169.7945,366.1804,167.1354,359.4775,161.9709,364.5101,164.63,371.213" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="344.5,56.323,348.5,60.323,344.5,64.323,340.5,60.323" style="stroke:#B38D22;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="351.5" y="65.1">bs</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000934136012292043506">
-      <path codeLine="122" d="M187.8594,359.8706 C212.8994,286.1506 248.78,213.823 310,157.023 C313.06,154.183 402.09,123.123 466.71,100.803 " fill="none" id="C_0001758213171584933144-backto-C_0000934136012292043506-2" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="184,371.233,189.7172,366.8383,187.8594,359.8706,182.1422,364.2653,184,371.233" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="341" cy="120.323" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="348" y="124.1">bs2</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000934136012292043506">
-      <path codeLine="127" d="M205.7061,360.3202 C231.6261,304.5302 262.45,256.183 310,214.023 C340.2,187.243 360.7,203.313 395,182.023 C410.5,172.403 410.84,165.523 425,154.023 C443.42,139.063 464.6,123.773 483.3,110.873 " fill="none" id="C_0001758213171584933144-backto-C_0000934136012292043506-3" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="200.65,371.203,206.8057,367.447,205.7061,360.3202,199.5505,364.0762,200.65,371.203" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="341" cy="174.323" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="348" y="178.1">vps</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000378898020828430636">
-      <path codeLine="109" d="M292.1661,561.1909 C329.3661,565.8709 357.82,566.173 395,561.023 C425.83,556.753 459.45,547.353 485.79,538.853 " fill="none" id="C_0001758213171584933144-backto-C_0000378898020828430636" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="280.26,559.693,285.7138,564.4107,292.1661,561.1909,286.7124,556.4732,280.26,559.693" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="331" y="550.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="341" y="557.1">bapair</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0002082013375525130414">
-      <path codeLine="110" d="M249.9457,362.1253 C269.8857,339.3553 284.72,327.483 310,312.023 C361.3,280.653 430.94,272.853 478.67,271.653 " fill="none" id="C_0001758213171584933144-backto-C_0002082013375525130414" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="242.04,371.153,249.0021,369.2744,249.9457,362.1253,242.9836,364.0039,242.04,371.153" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="333" y="271.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="343" y="278.1">abool</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0002082013375525130414">
-      <path codeLine="111" d="M289.9065,398.7073 C299.7065,390.9873 300.18,390.963 310,384.023 C345.25,359.103 358.88,360.663 395,337.023 C409.06,327.823 410.32,322.203 425,314.023 C441.73,304.703 461.01,296.623 478.6,290.163 " fill="none" id="C_0001758213171584933144-backto-C_0002082013375525130414-1" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="280.48,406.133,287.6685,405.5623,289.9065,398.7073,282.718,399.278,280.48,406.133" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="320.5" y="326.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="56" x="330.5" y="333.1">aboolfloat</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000051978493292659230">
-      <path codeLine="112" d="M292.3137,528.8215 C330.4637,525.1115 359.34,518.653 395,504.023 C410.8,497.543 410.17,488.493 425,480.023 C444.07,469.133 466.59,460.063 486.11,453.243 " fill="none" id="C_0001758213171584933144-backto-C_0000051978493292659230" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="280.37,529.983,286.729,533.3835,292.3137,528.8215,285.9547,525.421,280.37,529.983" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="320.5" y="493.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="56" x="330.5" y="500.1">aboolfloat</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000051978493292659230">
-      <path codeLine="120" d="M291.9753,487.4608 C301.9753,484.8308 300.33,485.353 310,483.023 C370.42,468.453 440.9,455.163 486.2,447.083 " fill="none" id="C_0001758213171584933144-backto-C_0000051978493292659230-1" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="280.37,490.513,287.1901,492.8553,291.9753,487.4608,285.1553,485.1185,280.37,490.513" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="330.5" y="455.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="340.5" y="462.1">atfloat</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000197769253782961588">
-      <path codeLine="113" d="M280.34,455.263 C290.3,450.293 300.26,445.493 310,441.023 C359.73,418.173 373.86,416.513 425,397.023 C442.62,390.313 456.2502,385.1214 473.5402,378.5614 " fill="none" id="C_0001758213171584933144-to-C_0000197769253782961588" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="479.15,376.433,469.3164,375.8858,474.4752,378.2067,472.1542,383.3655,479.15,376.433" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="332.5" y="398.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="342.5" y="405.1">afloat</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000895940711566401184">
-      <path codeLine="114" d="M290.1194,646.0131 C300.0094,653.3031 300.27,653.303 310,660.023 C346.25,685.063 357.5,687.903 395,711.023 C408.43,719.303 410.88,722.963 425,730.023 C439.71,737.383 456.08,744.233 471.53,750.143 " fill="none" id="C_0001758213171584933144-backto-C_0000895940711566401184" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="280.46,638.893,282.9164,645.6728,290.1194,646.0131,287.6631,639.2332,280.46,638.893" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="320.5" y="649.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="56" x="330.5" y="656.1">boolstring</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0001751732625010742161">
-      <path codeLine="115" d="M291.2424,592.123 C337.0624,611.383 377.61,628.113 425,647.023 C438.69,652.483 453.42,658.193 467.47,663.553 " fill="none" id="C_0001758213171584933144-backto-C_0001751732625010742161" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="280.18,587.473,284.1612,593.4855,291.2424,592.123,287.2612,586.1105,280.18,587.473" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="320" y="592.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="57" x="330" y="599.1">floatstring</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000887121441210847583">
-      <path codeLine="116" d="M211.8967,699.471 C237.6767,750.671 266.56,793.603 310,833.023 C340.38,860.593 360.39,846.993 395,869.023 C410.13,878.653 409.69,886.683 425,896.023 C441.01,905.793 459.73,913.893 477.05,920.243 " fill="none" id="C_0001758213171584933144-backto-C_0000887121441210847583" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="206.5,688.753,205.6257,695.9109,211.8967,699.471,212.771,692.3131,206.5,688.753" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="325.5" y="822.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="335.5" y="829.1">intstring</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0001119452495635561975">
-      <path codeLine="117" d="M192.6845,699.9619 C218.3745,770.1519 253.22,838.023 310,894.023 C339.34,922.953 363.79,904.123 395,931.023 C414.06,947.443 405.56,963.053 425,979.023 C434.69,986.973 446.08,993.493 457.77,998.793 " fill="none" id="C_0001758213171584933144-backto-C_0001119452495635561975" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="188.56,688.693,186.8659,695.7023,192.6845,699.9619,194.3786,692.9526,188.56,688.693" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="316.5" y="883.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="64" x="326.5" y="890.1">stringstring</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0001119452495635561975">
-      <path codeLine="118" d="M173.7603,700.4322 C196.0003,790.3822 234.32,886.793 310,956.023 C350.12,992.723 409.94,1008.513 457.53,1015.243 " fill="none" id="C_0001758213171584933144-backto-C_0001119452495635561975-1" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="170.88,688.783,168.4371,695.5677,173.7603,700.4322,176.2032,693.6475,170.88,688.783" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="313" y="945.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="71" x="323" y="952.1">bstringstring</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0002017665567517853203">
-      <path codeLine="119" d="M218.419,360.9392 C243.359,318.2092 269.62,286.183 310,257.023 C430.35,170.113 497.12,203.503 643,231.023 C683.41,238.643 726.68,256.153 758.17,270.783 " fill="none" id="C_0001758213171584933144-backto-C_0002017665567517853203" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="212.37,371.303,218.8491,368.1374,218.419,360.9392,211.9399,364.1047,212.37,371.303" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="512" y="191.323"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="522" y="198.1">atfloat</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000340562099063642390">
-      <path codeLine="123" d="M167.6,688.663 C188.97,790.333 230.41,919.373 310,1008.023 C352.17,1054.993 415.6518,1078.1076 465.8218,1090.3776 " fill="none" id="C_0001758213171584933144-to-C_0000340562099063642390" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="471.65,1091.803,463.8579,1085.7794,466.7931,1090.6152,461.9574,1093.5504,471.65,1091.803" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0000340562099063642390">
-      <path codeLine="124" d="M171.45,688.713 C198.99,835.683 247.19,1038.893 310,1089.023 C355.02,1124.963 416.9139,1124.7861 465.9339,1117.5761 " fill="none" id="C_0001758213171584933144-to-C_0000340562099063642390-1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="471.87,1116.703,462.3837,1114.0552,466.9232,1117.4306,463.5479,1121.9701,471.87,1116.703" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="344.5" cy="1081.323" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="351.5" y="1085.1">cb</text>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0001388877149159894665">
-      <path codeLine="125" d="M280.28,683.373 C290.01,692.073 299.96,700.373 310,708.023 C343.83,733.813 365.23,721.633 395,752.023 C416.14,773.603 402.65,792.693 425,813.023 C435.61,822.673 443.1953,827.769 456.5853,833.509 " fill="none" id="C_0001758213171584933144-to-C_0001388877149159894665" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="462.1,835.873,455.404,828.6505,457.5045,833.903,452.252,836.0034,462.1,835.873" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001758213171584933144_C_0001388877149159894665">
-      <path codeLine="126" d="M228.93,688.813 C251.75,721.383 278.91,753.003 310,777.023 C316.38,781.953 393.6241,808.0771 456.5041,828.8971 " fill="none" id="C_0001758213171584933144-to-C_0001388877149159894665-1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="462.2,830.783,454.9135,824.1568,457.4534,829.2114,452.3989,831.7513,462.2,830.783" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="341" cy="769.323" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="348" y="773.1">gcb</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="470.5" y="336"/>
+      <ellipse cx="485.5" cy="352" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M488.4688,357.6406 Q487.8906,357.9375 487.25,358.0781 Q486.6094,358.2344 485.9063,358.2344 Q483.4063,358.2344 482.0781,356.5938 Q480.7656,354.9375 480.7656,351.8125 Q480.7656,348.6875 482.0781,347.0313 Q483.4063,345.375 485.9063,345.375 Q486.6094,345.375 487.25,345.5313 Q487.9063,345.6875 488.4688,345.9844 L488.4688,348.7031 Q487.8438,348.125 487.25,347.8594 Q486.6563,347.5781 486.0313,347.5781 Q484.6875,347.5781 484,348.6563 Q483.3125,349.7188 483.3125,351.8125 Q483.3125,353.9063 484,354.9844 Q484.6875,356.0469 486.0313,356.0469 Q486.6563,356.0469 487.25,355.7813 Q487.8438,355.5 488.4688,354.9219 L488.4688,357.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="499.5" y="356.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="77" x="515.5" y="333"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="75" x="516.5" y="345.1387">double,float</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="368" y2="368"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="376" y2="376"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="461.5" y="751"/>
+      <ellipse cx="476.5" cy="767" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M479.4688,772.6406 Q478.8906,772.9375 478.25,773.0781 Q477.6094,773.2344 476.9063,773.2344 Q474.4063,773.2344 473.0781,771.5938 Q471.7656,769.9375 471.7656,766.8125 Q471.7656,763.6875 473.0781,762.0313 Q474.4063,760.375 476.9063,760.375 Q477.6094,760.375 478.25,760.5313 Q478.9063,760.6875 479.4688,760.9844 L479.4688,763.7031 Q478.8438,763.125 478.25,762.8594 Q477.6563,762.5781 477.0313,762.5781 Q475.6875,762.5781 475,763.6563 Q474.3125,764.7188 474.3125,766.8125 Q474.3125,768.9063 475,769.9844 Q475.6875,771.0469 477.0313,771.0469 Q477.6563,771.0469 478.25,770.7813 Q478.8438,770.5 479.4688,769.9219 L479.4688,772.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490.5" y="771.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="506.5" y="748"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="507.5" y="760.1387">bool,std::string</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="783" y2="783"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="791" y2="791"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="404" y="668"/>
+      <ellipse cx="419" cy="684" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M421.9688,689.6406 Q421.3906,689.9375 420.75,690.0781 Q420.1094,690.2344 419.4063,690.2344 Q416.9063,690.2344 415.5781,688.5938 Q414.2656,686.9375 414.2656,683.8125 Q414.2656,680.6875 415.5781,679.0313 Q416.9063,677.375 419.4063,677.375 Q420.1094,677.375 420.75,677.5313 Q421.4063,677.6875 421.9688,677.9844 L421.9688,680.7031 Q421.3438,680.125 420.75,679.8594 Q420.1563,679.5781 419.5313,679.5781 Q418.1875,679.5781 417.5,680.6563 Q416.8125,681.7188 416.8125,683.8125 Q416.8125,685.9063 417.5,686.9844 Q418.1875,688.0469 419.5313,688.0469 Q420.1563,688.0469 420.75,687.7813 Q421.3438,687.5 421.9688,686.9219 L421.9688,689.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="433" y="688.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="210" x="449" y="665"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="208" x="450" y="677.1387">float,std::unique_ptr&lt;std::string&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="700" y2="700"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="708" y2="708"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="467" y="917"/>
+      <ellipse cx="482" cy="933" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M484.9688,938.6406 Q484.3906,938.9375 483.75,939.0781 Q483.1094,939.2344 482.4063,939.2344 Q479.9063,939.2344 478.5781,937.5938 Q477.2656,935.9375 477.2656,932.8125 Q477.2656,929.6875 478.5781,928.0313 Q479.9063,926.375 482.4063,926.375 Q483.1094,926.375 483.75,926.5313 Q484.4063,926.6875 484.9688,926.9844 L484.9688,929.7031 Q484.3438,929.125 483.75,928.8594 Q483.1563,928.5781 482.5313,928.5781 Q481.1875,928.5781 480.5,929.6563 Q479.8125,930.7188 479.8125,932.8125 Q479.8125,934.9063 480.5,935.9844 Q481.1875,937.0469 482.5313,937.0469 Q483.1563,937.0469 483.75,936.7813 Q484.3438,936.5 484.9688,935.9219 L484.9688,938.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="496" y="937.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="84" x="512" y="914"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="513" y="926.1387">int,std::string</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="949" y2="949"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="957" y2="957"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="444" y="1000"/>
+      <ellipse cx="459" cy="1016" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M461.9688,1021.6406 Q461.3906,1021.9375 460.75,1022.0781 Q460.1094,1022.2344 459.4063,1022.2344 Q456.9063,1022.2344 455.5781,1020.5938 Q454.2656,1018.9375 454.2656,1015.8125 Q454.2656,1012.6875 455.5781,1011.0313 Q456.9063,1009.375 459.4063,1009.375 Q460.1094,1009.375 460.75,1009.5313 Q461.4063,1009.6875 461.9688,1009.9844 L461.9688,1012.7031 Q461.3438,1012.125 460.75,1011.8594 Q460.1563,1011.5781 459.5313,1011.5781 Q458.1875,1011.5781 457.5,1012.6563 Q456.8125,1013.7188 456.8125,1015.8125 Q456.8125,1017.9063 457.5,1018.9844 Q458.1875,1020.0469 459.5313,1020.0469 Q460.1563,1020.0469 460.75,1019.7813 Q461.3438,1019.5 461.9688,1018.9219 L461.9688,1021.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="473" y="1020.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="130" x="489" y="997"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="128" x="490" y="1009.1387">std::string,std::string</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1032" y2="1032"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1040" y2="1040"/>
+    </a>
+    <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1083"/>
+    <ellipse cx="476" cy="1099" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M478.9688,1104.6406 Q478.3906,1104.9375 477.75,1105.0781 Q477.1094,1105.2344 476.4063,1105.2344 Q473.9063,1105.2344 472.5781,1103.5938 Q471.2656,1101.9375 471.2656,1098.8125 Q471.2656,1095.6875 472.5781,1094.0313 Q473.9063,1092.375 476.4063,1092.375 Q477.1094,1092.375 477.75,1092.5313 Q478.4063,1092.6875 478.9688,1092.9844 L478.9688,1095.7031 Q478.3438,1095.125 477.75,1094.8594 Q477.1563,1094.5781 476.5313,1094.5781 Q475.1875,1094.5781 474.5,1095.6563 Q473.8125,1096.7188 473.8125,1098.8125 Q473.8125,1100.9063 474.5,1101.9844 Q475.1875,1103.0469 476.5313,1103.0469 Q477.1563,1103.0469 477.75,1102.7813 Q478.3438,1102.5 478.9688,1101.9219 L478.9688,1104.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490" y="1103.1543">A</text>
+    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="96" x="506" y="1080"/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="94" x="507" y="1092.1387">char,std::string</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1115" y2="1115"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1123" y2="1123"/>
+    <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="834"/>
+    <ellipse cx="465.5" cy="850" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M468.4688,855.6406 Q467.8906,855.9375 467.25,856.0781 Q466.6094,856.2344 465.9063,856.2344 Q463.4063,856.2344 462.0781,854.5938 Q460.7656,852.9375 460.7656,849.8125 Q460.7656,846.6875 462.0781,845.0313 Q463.4063,843.375 465.9063,843.375 Q466.6094,843.375 467.25,843.5313 Q467.9063,843.6875 468.4688,843.9844 L468.4688,846.7031 Q467.8438,846.125 467.25,845.8594 Q466.6563,845.5781 466.0313,845.5781 Q464.6875,845.5781 464,846.6563 Q463.3125,847.7188 463.3125,849.8125 Q463.3125,851.9063 464,852.9844 Q464.6875,854.0469 466.0313,854.0469 Q466.6563,854.0469 467.25,853.7813 Q467.8438,853.5 468.4688,852.9219 L468.4688,855.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479.5" y="854.1543">A</text>
+    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="117" x="495.5" y="831"/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="115" x="496.5" y="843.1387">wchar_t,std::string</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="866" y2="866"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="874" y2="874"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="252.875" id="C_0001758213171584933144" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="6" y="407.5"/>
+      <ellipse cx="114.25" cy="423.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M117.2188,429.1406 Q116.6406,429.4375 116,429.5781 Q115.3594,429.7344 114.6563,429.7344 Q112.1563,429.7344 110.8281,428.0938 Q109.5156,426.4375 109.5156,423.3125 Q109.5156,420.1875 110.8281,418.5313 Q112.1563,416.875 114.6563,416.875 Q115.3594,416.875 116,417.0313 Q116.6563,417.1875 117.2188,417.4844 L117.2188,420.2031 Q116.5938,419.625 116,419.3594 Q115.4063,419.0781 114.7813,419.0781 Q113.4375,419.0781 112.75,420.1563 Q112.0625,421.2188 112.0625,423.3125 Q112.0625,425.4063 112.75,426.4844 Q113.4375,427.5469 114.7813,427.5469 Q115.4063,427.5469 116,427.2813 Q116.5938,427 117.2188,426.4219 L117.2188,429.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="134.75" y="427.6543">R</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="244" y="404.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="245" y="416.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="439.5" y2="439.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="447.5" y2="447.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="453.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="455.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="26" y="461.7104">abool : APtr&lt;bool&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="466.3047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="468.3047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="474.5151">aboolfloat : AAPtr&lt;bool,float&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="479.1094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="481.1094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="26" y="487.3198">afloat : ASharedPtr&lt;float&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="491.9141"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="493.9141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="132" x="26" y="500.1245">atfloat : AAPtr&lt;T,float&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="504.7188"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="506.7188"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="26" y="512.9292">bapair : PairPairBA&lt;bool&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="517.5234"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="519.5234"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="26" y="525.7339">boolstring : A&lt;bool,std::string&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="530.3281"/>
+      <polygon fill="none" points="17,530.3281,21,534.3281,17,538.3281,13,534.3281" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="26" y="538.5386">bs : BVector</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="543.1328"/>
+      <ellipse cx="17" cy="548.1328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="84" x="26" y="551.3433">bs2 : BVector2</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="555.9375"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="557.9375"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="26" y="564.1479">bstringstring : BStringString</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="568.7422"/>
+      <ellipse cx="17" cy="573.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="576.9526">cb : SimpleCallback&lt;ACharString&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="581.5469"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="583.5469"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="589.7573">floatstring : AStringPtr&lt;float&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="594.3516"/>
+      <ellipse cx="17" cy="599.3516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="26" y="602.562">gcb : GenericCallback&lt;AWCharString&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="607.1563"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="609.1563"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="26" y="615.3667">intstring : AIntString</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="619.9609"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="621.9609"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="26" y="628.1714">stringstring : AStringString</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="632.7656"/>
+      <ellipse cx="17" cy="637.7656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="640.9761">vcb : VoidCallback</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="645.5703"/>
+      <ellipse cx="17" cy="650.5703" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="26" y="653.7808">vps : VectorPtr&lt;B&gt;</text>
+    </a>
+    <path d="M852.1,869.74 C884.92,826.94 953.84,737.07 998.19,679.23 " fill="none" id="C_0002186387853087008570-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="992.82,674.72,1010.55,663.11,1003.93,683.24,992.82,674.72" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M930.23,652.99 C950.73,647.91 971.56,642.74 989.42,638.3 " fill="none" id="C_0000947292733740993297-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="987.74,631.51,1008.83,633.49,991.11,645.1,987.74,631.51" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M873.61,567.25 C906.96,579.1 954.56,596 990.13,608.64 " fill="none" id="C_0001700006390494465667-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="992.49,602.05,1008.99,615.34,987.8,615.24,992.49,602.05" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M849.63,343.09 C882.46,392.14 957.77,504.65 1002.9,572.07 " fill="none" id="C_0002017665567517853203-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1008.92,568.47,1014.22,588.99,997.28,576.26,1008.92,568.47" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M572.15,601.33 C623.66,591.73 712.28,575.22 771.38,564.2 " fill="none" id="C_0000906557320263235873-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="770.38,557.27,791.32,560.49,772.94,571.03,770.38,557.27" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M581.3,530.52 C633.59,535.22 715.46,542.57 771.2,547.58 " fill="none" id="C_0000378898020828430636-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="771.87,540.61,791.16,549.38,770.62,554.56,771.87,540.61" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M589.3,285.15 C639.06,292.1 710.69,302.11 763.14,309.45 " fill="none" id="C_0002082013375525130414-&gt;C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="764.44,302.56,783.27,312.26,762.5,316.42,764.44,302.56" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M581.71,458.9 C604.52,466.24 631.72,475.25 656,484 C695.14,498.1 738.66,515.2 772.57,528.85 " fill="none" id="C_0000051978493292659230-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="775.41,522.45,791.32,536.44,770.16,535.42,775.41,522.45" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M589.65,352 C639.45,345.2 710.96,335.45 763.31,328.3 " fill="none" id="C_0000197769253782961588-&gt;C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="762.63,321.33,783.39,325.56,764.52,335.2,762.63,321.33" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M598.58,795.78 C617.32,801.92 637.56,808.9 656,816 C691.6,829.71 730.43,846.74 762.49,861.39 " fill="none" id="C_0000895940711566401184-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="765.77,855.19,781,869.92,759.91,867.91,765.77,855.19" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M656.26,685.75 C669.52,685.09 683.05,684.41 696.42,683.74 " fill="none" id="C_0001751732625010742161-&gt;C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="696.2,676.75,716.52,682.74,696.9,690.73,696.2,676.75" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M593.26,931.26 C639.95,923.96 704.14,913.92 754.13,906.1 " fill="none" id="C_0000887121441210847583-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="753.06,899.18,773.9,903.01,755.22,913.02,753.06,899.18" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M608.31,999.92 C624.24,994.43 640.78,988.33 656,982 C694.58,965.94 736.47,945.07 769.64,927.69 " fill="none" id="C_0001119452495635561975-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="766.63,921.36,787.58,918.19,773.19,933.74,766.63,921.36" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M599.31,1090.15 C618.43,1083.84 638.71,1075.56 656,1065 C713.85,1029.67 767.67,972.08 800.07,933.62 " fill="none" id="C_0000340562099063642390-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="794.67,929.17,812.79,918.19,805.47,938.07,794.67,929.17" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M609.56,867.41 C654,872.74 709.36,879.37 753.67,884.68 " fill="none" id="C_0001388877149159894665-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="754.79,877.76,773.81,887.09,753.12,891.66,754.79,877.76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M153.36,394.42 C179,265.78 223.46,88.66 280,47 C334.65,6.73 414.78,28.3 469.27,51.43 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="150.79,407.5,155.8747,402.3867,153.1104,395.7265,148.0257,400.8398,150.79,407.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="303" y="14.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="40" x="313" y="21.0669">bapair</text>
+    <path d="M139.5,394.41 C154.71,297.07 191.51,172.76 280,104 C308.06,82.2 402.1,79.29 466.23,80.02 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="137.58,407.35,142.4142,401.9992,139.3343,395.4789,134.5001,400.8297,137.58,407.35" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="318.5,70.0664,322.5,74.0664,318.5,78.0664,314.5,74.0664" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="325.5" y="79.0669">bs</text>
+    <path d="M154.98,394.13 C176.27,315.85 214.06,222.02 280,161 C283.56,157.7 393.78,123.47 466.37,101.16 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="151.58,407.06,156.9774,402.2779,154.6391,395.4565,149.2417,400.2385,151.58,407.06" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="314.5" cy="124.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="321.5" y="128.0669">bs2</text>
+    <path d="M168.06,395.16 C191.62,333.59 227.49,264.67 280,218 C312.99,188.68 336.14,208.67 374,186 C389.65,176.63 389.47,169.02 404,158 C425.66,141.58 451.05,125.61 473.27,112.58 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-3" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="163.51,407.37,169.3539,403.1452,167.7018,396.1259,161.8579,400.3507,163.51,407.37" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="315" cy="178.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="322" y="182.0669">vps</text>
+    <path d="M263.37,563.02 C268.97,563.78 274.53,564.44 280,565 C321.56,569.22 332.54,570.14 374,565 C409.66,560.58 448.91,550.65 478.99,541.92 " fill="none" id="C_0001758213171584933144&lt;-C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="250.23,561.11,255.592,565.9317,262.1051,562.8366,256.7431,558.0149,250.23,561.11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="303" y="554.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="40" x="313" y="561.0669">bapair</text>
+    <path d="M199.24,396.4 C221.13,365.53 248.08,336.02 280,316 C337.73,279.79 417.38,273.2 470.91,273.6 " fill="none" id="C_0001758213171584933144&lt;-C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="191.71,407.37,198.4038,404.6881,198.5027,397.4777,191.8089,400.1596,191.71,407.37" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="305.5" y="272.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="315.5" y="279.0669">abool</text>
+    <path d="M260.36,401.68 C266.86,396.55 273.42,391.63 280,387 C318.03,360.22 334.46,365.49 374,341 C388.28,332.15 389.14,325.84 404,318 C424.81,307.02 449.1,298.24 470.72,291.67 " fill="none" id="C_0001758213171584933144&lt;-C_0002082013375525130414-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="250.21,409.89,257.3909,409.2308,259.5443,402.3487,252.3634,403.0079,250.21,409.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="330.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="337.0669">aboolfloat</text>
+    <path d="M263.07,533.5 C300.07,529.73 339.5,522.19 374,508 C389.79,501.5 388.98,492.12 404,484 C427.2,471.45 454.91,461.88 478.34,455.15 " fill="none" id="C_0001758213171584933144&lt;-C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="250.1,534.69,256.4396,538.1266,262.0501,533.5964,255.7105,530.1599,250.1,534.69" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="497.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="504.0669">aboolfloat</text>
+    <path d="M262.87,491.36 C268.64,489.83 274.37,488.37 280,487 C347.83,470.52 427.45,457.54 478.06,450.07 " fill="none" id="C_0001758213171584933144&lt;-C_0000051978493292659230-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="250.19,494.81,257.03,497.0936,261.7687,491.6582,254.9287,489.3745,250.19,494.81" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="302.5" y="458.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="41" x="312.5" y="465.0669">atfloat</text>
+    <path d="M250.23,458.89 C260.18,453.61 270.18,448.57 280,444 C332.88,419.38 348.73,419.65 404,401 C423.95,394.27 445.74,387.07 465.46,380.61 " fill="none" id="C_0001758213171584933144-&gt;C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="470.43,378.99,460.6313,377.997,465.6795,380.5497,463.1268,385.5978,470.43,378.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="305" y="401.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="36" x="315" y="408.0669">afloat</text>
+    <path d="M260.78,650.18 C267.19,654.96 273.62,659.6 280,664 C319.12,690.99 332.72,691.43 374,715 C387.5,722.71 389.88,726.49 404,733 C422.19,741.39 442.55,748.95 461.47,755.27 " fill="none" id="C_0001758213171584933144&lt;-C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="250.02,642,252.3721,648.8167,259.5691,649.2674,257.217,642.4506,250.02,642" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="653.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="660.0669">boolstring</text>
+    <path d="M262.21,592.56 C306.98,611.61 357.39,632.37 404,650 C420.17,656.12 437.67,662.28 454.31,667.93 " fill="none" id="C_0001758213171584933144&lt;-C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="250.05,587.37,253.9996,593.4033,261.0879,592.0779,257.1383,586.0447,250.05,587.37" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291" y="591.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="301" y="598.0669">floatstring</text>
+    <path d="M172.75,672.79 C196.68,729.99 231.55,793.02 280,837 C313.12,867.07 335.63,850 374,873 C389.13,882.07 388.68,890.25 404,899 C423.38,910.07 446.13,918.8 466.87,925.37 " fill="none" id="C_0001758213171584933144&lt;-C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="167.81,660.68,166.3763,667.7472,172.3485,671.7887,173.7821,664.7215,167.81,660.68" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="297" y="826.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="307" y="833.0669">intstring</text>
+    <path d="M158.7,673.61 C180.97,748.53 218.51,837.62 280,898 C312.04,929.46 339.34,906.46 374,935 C393.13,950.75 384.47,966.74 404,982 C415.81,991.23 429.77,998.49 443.99,1004.18 " fill="none" id="C_0001758213171584933144&lt;-C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="154.99,660.75,152.8161,667.6256,158.3267,672.2768,160.5006,665.4012,154.99,660.75" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="287" y="887.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="72" x="297" y="894.0669">stringstring</text>
+    <path d="M144.37,673.55 C161.94,767.18 199.54,886.41 280,960 C304.04,981.99 381.65,999.72 443.91,1010.89 " fill="none" id="C_0001758213171584933144&lt;-C_0001119452495635561975-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="142.03,660.52,139.1542,667.1328,144.1523,672.3308,147.0281,665.718,142.03,660.52" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="283" y="949.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="80" x="293" y="956.0669">bstringstring</text>
+    <path d="M176.19,395.44 C199.88,345.31 233.65,292.79 280,259 C354.44,204.74 647.38,233.04 656,235 C706.56,246.48 759.59,274.39 793.94,294.9 " fill="none" id="C_0001758213171584933144&lt;-C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="170.68,407.44,176.816,403.652,175.6794,396.531,169.5434,400.319,170.68,407.44" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="505.5" y="215.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="41" x="515.5" y="222.0669">atfloat</text>
+    <path d="M142.26,660.51 C158.96,763.5 196.4,907.18 280,1004 C324.81,1055.9 399.94,1082.14 455.97,1095.08 " fill="none" id="C_0001758213171584933144-&gt;C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="460.99,1096.22,453.0921,1090.3359,456.1128,1095.1187,451.33,1098.1394,460.99,1096.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M146.03,660.75 C168.64,808.06 213.61,1037.94 280,1092 C328.39,1131.4 401.2,1131.2 455.61,1123.49 " fill="none" id="C_0001758213171584933144-&gt;C_0000340562099063642390-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="460.81,1122.72,451.324,1120.0712,455.8631,1123.4471,452.4873,1127.9862,460.81,1122.72" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="318.5" cy="1084.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="325.5" y="1088.0669">cb</text>
+    <path d="M224.6,660.83 C241.81,679.32 260.52,697.11 280,712 C316.65,740.01 340.96,723.81 374,756 C395.35,776.81 381.5,796.44 404,816 C415.87,826.32 430.38,834.13 445.26,840.03 " fill="none" id="C_0001758213171584933144-&gt;C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="450.31,841.96,443.3315,835.0101,445.6396,840.1747,440.475,842.4827,450.31,841.96" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M183.43,660.76 C207.5,704.15 239.63,749.61 280,781 C286.88,786.35 375.65,813.14 445.26,833.64 " fill="none" id="C_0001758213171584933144-&gt;C_0001388877149159894665-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="450.24,835.1,442.7375,828.7194,445.4439,833.6869,440.4764,836.3932,450.24,835.1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="314.5" cy="773.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="321.5" y="777.0669">gcb</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00014_class_mermaid.svg b/docs/test_cases/t00014_class_mermaid.svg
index d5b58ad7..4bcc9089 100644
--- a/docs/test_cases/t00014_class_mermaid.svg
+++ b/docs/test_cases/t00014_class_mermaid.svg
@@ -1,95 +1,90 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1199.421875 1349.5" style="max-width: 1199.42px; background-color: white;" width="1199.421875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1005.0625,406L1020.5625,406C1036.0625,406,1067.0625,406,1090.851104698673,465.94493990918755C1114.6397093973458,525.8898798183751,1131.2169187946915,645.7797596367502,1139.5055234933645,705.7246995459377L1147.7941281920373,765.6696394551253"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1073.0625,725L1077.2291666666667,725C1081.3958333333333,725,1089.7291666666667,725,1097.7579993515283,732.11352347008C1105.7868320363898,739.22704694016,1113.5111640727798,753.4540938803199,1117.3733300909748,760.5676173503999L1121.2354961091698,767.68114082048"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M983.28125,941L1002.4114583333334,941C1021.5416666666666,941,1059.8020833333333,941,1082.6885104460423,934.2085580987027C1105.574937558751,927.4171161974054,1113.087375117502,913.8342323948109,1116.8435938968776,907.0427904935136L1120.599812676253,900.2513485922165"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M992.6171875,1262L1010.19140625,1262C1027.765625,1262,1062.9140625,1262,1088.776885948673,1202.0550600908125C1114.6397093973458,1142.1101201816248,1131.2169187946915,1022.2202403632497,1139.5055234933645,962.2753004540622L1147.7941281920373,902.3303605448747"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M648.484375,832L669.6145833333334,832C690.7447916666666,832,733.0052083333334,832,771.5155925500004,843.7376549651132C810.0259767666676,855.4753099302264,844.7863285333351,878.9506198604527,862.1665044166689,890.6882748255658L879.5466803000028,902.425929790679"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M659.5859375,939L678.8658854166666,939C698.1458333333334,939,736.7057291666666,939,772.1161157212528,939.199883454732C807.5265022758389,939.3997669094639,839.7873795516775,939.7995338189279,855.9178181895969,939.9994172736598L872.0482568275163,940.1993007283917"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M668.921875,1153L686.6458333333334,1153C704.3697916666666,1153,739.8177083333334,1153,774.9218425500004,1164.7376549651133C810.0259767666676,1176.4753099302263,844.7863285333351,1199.9506198604527,862.1665044166689,1211.688274825566L879.5466803000028,1223.425929790679"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M659.59375,1046L678.8723958333334,1046C698.1510416666666,1046,736.7083333333334,1046,773.0706781906943,1034.8859618140796C809.4330230480551,1023.7719236281591,843.6004210961104,1001.5438472563181,860.6841201201379,990.4298090703977L877.7678191441656,979.3157708844772"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M668.9296875,1260L686.65234375,1260C704.375,1260,739.8203125,1260,772.1174178045861,1260.180602108426C804.4145231091721,1260.3612042168522,833.5634212183442,1260.7224084337042,848.1378702729303,1260.9030105421305L862.7123193275163,1261.0836126505565"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M682.2578125,190L697.7591145833334,190C713.2604166666666,190,744.2630208333334,190,781.3190776690757,218.8467911997001C818.3751345048181,247.69358239940027,861.4846440096362,305.38716479880054,883.0393987620452,334.2339559985007L904.5941535144542,363.0807471982008"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M750.265625,725L754.4322916666666,725C758.5989583333334,725,766.9322916666666,725,772.265625,725C777.5989583333334,725,779.9322916666666,725,781.0989583333334,725L782.265625,725"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M675.1484375,297L691.8346354166666,297C708.5208333333334,297,741.8932291666666,297,775.9596029666671,308.73765496511317C810.0259767666676,320.47530993022633,844.7863285333351,343.95061986045266,862.1665044166689,355.6882748255659L879.5466803000028,367.42592979067905"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M704.921875,404L716.6458333333334,404C728.3697916666666,404,751.8177083333334,404,776.0418969712528,404.1548990250242C800.2660856091721,404.30979805004836,825.2665462183442,404.61959610009666,837.7667765229303,404.77449512512084L850.2670068275163,404.92939415014496"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M681.828125,511L697.4010416666666,511C712.9739583333334,511,744.1197916666666,511,776.7764073573609,499.88596181407956C809.4330230480551,488.7719236281591,843.6004210961104,466.5438472563181,860.6841201201379,455.42980907039765L877.7678191441656,444.31577088447716"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M695.609375,618L708.8854166666666,618C722.1614583333334,618,748.7135416666666,618,783.455847960115,589.8036421456824C818.1981542535633,561.6072842913649,861.1306835071267,505.21456858272956,882.5969481339083,477.018210728412L904.06321276069,448.82185287409436"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M248.22341237694872,343.3174658622142L270.2603957307906,288.93122155184517C292.2973790846325,234.54497724147612,336.3713457923163,125.77248862073806,383.05546456282474,77.53318470052538C429.7395833333333,29.29388078031269,479.0338541666667,41.58776156062538,503.6809895833333,47.73470195078173L528.328125,53.88164234093807"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id17" d="M288.9158024522113,784.4867377922666L304.1707207935094,810.2389481602222C319.42563913480757,835.9911585281776,349.93547581740376,887.4955792640889,392.17737332536854,913.2477896320444C434.4192708333333,939,488.3932291666667,939,515.3802083333334,939L542.3671875,939"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M247.1829085348524,785.7100440211105L269.39330919571034,841.1750366842589C291.6037098565683,896.6400293474071,336.0245111782842,1007.5700146737036,383.66590142247543,1067.0134418699395C431.3072916666667,1126.4568690661754,482.1692708333333,1134.413738132351,507.6002604166667,1138.3921726654387L533.03125,1142.3706071985264"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id19" d="M237.4600735386465,785.9570046579034L261.2909466988721,852.8808372149196C285.1218198590977,919.8046697719356,332.7835661795488,1053.6523348859678,382.04542892310775,1116.5977329098962C431.3072916666667,1179.5431309338246,482.1692708333333,1171.586261867649,507.6002604166667,1167.6078273345613L533.03125,1163.6293928014736"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id20" d="M268.0958532197089,785.1235152070313L286.8207630997574,822.8529293391927C305.54567297980594,860.5823434713542,342.995492739903,936.041171735677,388.70607970328484,977.9922363567148C434.4166666666667,1019.9433009777525,488.3880208333333,1028.386601955505,515.3736979166666,1032.6082524443814L542.359375,1036.8299029332577"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id21" d="M223.83096131380302,769L249.9333531781692,850.8333333333334C276.0357450425353,932.6666666666666,328.2405287712677,1096.3333333333333,378.77260813563385,1178.1666666666667C429.3046875,1260,478.1640625,1260,502.59375,1260L527.0234375,1260"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id22" d="M288.9158024522113,344.5132622077334L304.1707207935094,318.76105183977785C319.42563913480757,293.0088414718223,349.93547581740376,241.50442073591114,388.3987274920352,215.7522103679556C426.8619791666667,190,473.2786458333333,190,496.4869791666667,190L519.6953125,190"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id23" d="M323.78662470078376,684.008449001722L333.22973933398646,690.8403741681017C342.67285396718916,697.6722993344814,361.55908323359455,711.3361496672406,382.87589578346393,718.1680748336203C404.1927083333333,725,427.9401041666667,725,439.8138020833333,725L451.6875,725"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id24" d="M320.69361509329826,369.04881388947274L330.65223132774855,357.0406782412272C340.61084756219884,345.0325425929818,360.5280800310995,321.0162712964909,394.8799254322164,309.00813564824546C429.2317708333333,297,478.0182291666667,297,502.4114583333333,297L526.8046875,297"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id25" d="M322.7226909025641,420.23801363121567L332.3431278354701,411.781678026013C341.9635647683761,403.3253424208104,361.2044386341881,386.4126712104052,390.2558651504273,380.996127655649C419.3072916666667,375.57958410089276,458.1692708333333,381.65916820178546,477.6002604166667,384.69896025223187L497.03125,387.7387523026782"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id26" d="M324.9904339754749,473.37168160351507L334.2329137295624,468.30973466959585C343.4753934836499,463.2477877356767,361.96035299182495,453.1238938678384,390.6338223292458,444.6256602681972C419.3072916666667,436.1274266685561,458.1692708333333,429.2548533371121,477.6002604166667,425.8185666713901L497.03125,422.3822800056681"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id27" d="M222.66847560222905,786.2929928722892L248.96461508519087,877.3274940602411C275.26075456815266,968.3619952481928,327.85303353407636,1150.4309976240963,390.9043813503715,1241.4654988120483C453.9557291666667,1332.5,527.4661458333334,1332.5,593.26953125,1332.5C659.0729166666666,1332.5,717.1692708333334,1332.5,763.7916666666666,1324.8234546686674C810.4140625,1317.1469093373348,845.5625,1301.7938186746696,863.13671875,1294.117273343337L880.7109375,1286.4407280120045"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M253.63171504185672,785.5364669349398L274.7673146182139,834.6970557791165C295.90291419457117,883.8576446232931,338.1741133472856,982.1788223116465,386.2953900069761,1027.117760666947C434.4166666666667,1072.0566990222476,488.3880208333333,1063.613398044495,515.3736979166666,1059.3917475556186L542.359375,1055.1700970667423"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id29" d="M254.82969387603376,343.4965552958368L275.76563031336144,295.41379607986397C296.70156675068915,247.3310368638912,338.5734396253446,151.1655184319456,384.15651147933903,104.98272260929384C429.7395833333333,58.7999267866421,479.0338541666667,62.59985357328421,503.6809895833333,64.49981696660525L528.328125,66.39978035992631"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id30" d="M262.48336858738014,343.71274964834606L282.14369257281675,301.9272913736217C301.8040165582534,260.1418330988974,341.12466452912673,176.5709165494487,385.43212393123,132.4384446712101C429.7395833333333,88.30597279297153,479.0338541666667,83.61194558594303,503.6809895833333,81.26493198242879L528.328125,78.91791837891455"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id31" d="M309.203125,501.7051521341034L321.0768229166667,496.7542934450862C332.9505208333333,491.80343475606895,356.6979166666667,481.90171737803445,390.8668422198936,480.8936734956528C425.03576777312054,479.8856296132711,469.62622304624097,487.7712592265422,491.9214506828012,491.7140740331777L514.2166783193614,495.65688883981335"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id32" d="M309.203125,554.6564833075081L321.0768229166667,553.8804027562568C332.9505208333333,553.1043222050054,356.6979166666667,551.5521611025027,390.8668422198936,546.8332657446158C425.03576777312054,542.1143703867289,469.62622304624097,534.2287407734577,491.9214506828012,530.2859259668222L514.2166783193614,526.3431111601866"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id33" d="M309.203125,574.3435166924919L321.0768229166667,575.1195972437432C332.9505208333333,575.8956777949946,356.6979166666667,577.4478388974973,388.5699672198936,581.760541822339C420.44201777312054,586.0732447471808,460.43872304624097,593.1464894943615,480.4370756828012,596.6831118679519L500.43542831936145,600.2197342415423"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id34" d="M309.203125,624.2399633751232L321.0768229166667,628.9499694792694C332.9505208333333,633.6599755834155,356.6979166666667,643.0799877917078,388.5667041774065,644.6619538063177C420.4354916881463,646.2439198209277,460.4256708762926,639.9878396418553,480.4207604703658,636.8597995523191L500.415850064439,633.731759462783"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id35" d="M271.4546150804234,343.9763283003756L289.61973131701956,308.48027358364635C307.78484755361563,272.98421886691705,344.11508002680785,201.99210943345852,386.9273316800706,159.90206411637973C429.7395833333333,117.81201879930093,479.0338541666667,104.62403759860187,503.6809895833333,98.03004699825232L528.328125,91.43605639790279"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1005.0625,406L1020.5625,406C1036.0625,406,1067.0625,406,1091.2620062426986,468.9166666666667C1115.4615124853972,531.8333333333334,1132.8605249707944,657.6666666666666,1141.560031213493,720.5833333333334L1150.2595374561915,783.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1073.0625,725L1077.2291666666667,725C1081.3958333333333,725,1089.7291666666667,725,1099.1894292335626,734.75C1108.6496918004586,744.5,1119.2368836009175,764,1124.5304795011468,773.75L1129.8240754013761,783.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M983.28125,941L1002.4114583333334,941C1021.5416666666666,941,1059.8020833333333,941,1084.140472887461,931.5833333333334C1108.4788624415887,922.1666666666666,1118.8952248831777,903.3333333333334,1124.103406103972,893.9166666666666L1129.3115873247664,884.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M992.6171875,1262L1010.19140625,1262C1027.765625,1262,1062.9140625,1262,1089.1877874926986,1199.0833333333333C1115.4615124853972,1136.1666666666667,1132.8605249707944,1010.3333333333334,1141.560031213493,947.4166666666666L1150.2595374561915,884.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M648.484375,832L669.6145833333334,832C690.7447916666666,832,733.0052083333334,832,774.0017381020642,845.4166666666666C814.9982678707951,858.8333333333334,854.7309107415903,885.6666666666666,874.5972321769877,899.0833333333334L894.4635536123853,912.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M659.5859375,939L678.8658854166666,939C698.1458333333334,939,736.7057291666666,939,775.1158854166666,939.2370556819466C813.5260416666666,939.474111363893,851.7864583333334,939.9482227277862,870.9166666666666,940.1852784097327L890.046875,940.4223340916792"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M668.921875,1153L686.6458333333334,1153C704.3697916666666,1153,739.8177083333334,1153,777.4079881020642,1166.4166666666667C814.9982678707951,1179.8333333333333,854.7309107415903,1206.6666666666667,874.5972321769877,1220.0833333333333L894.4635536123853,1233.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M659.59375,1046L678.8723958333334,1046C698.1510416666666,1046,736.7083333333334,1046,775.5853608630952,1033.25C814.4623883928571,1020.5,853.6591517857142,995,873.2575334821428,982.25L892.8559151785714,969.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M668.9296875,1260L686.65234375,1260C704.375,1260,739.8203125,1260,775.1171875,1260.2177743356406C810.4140625,1260.4355486712814,845.5625,1260.8710973425625,863.13671875,1261.088871678203L880.7109375,1261.3066460138439"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M682.2578125,190L697.7591145833334,190C713.2604166666666,190,744.2630208333334,190,783.1147913049768,221.25C821.9665617766204,252.5,868.6674985532408,315,892.017966941551,346.25L915.3684353298611,377.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M750.265625,725L754.4322916666666,725C758.5989583333334,725,766.9322916666666,725,775.265625,725C783.5989583333334,725,791.9322916666666,725,796.0989583333334,725L800.265625,725"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M675.1484375,297L691.8346354166666,297C708.5208333333334,297,741.8932291666666,297,778.4457485187309,310.4166666666667C814.9982678707951,323.8333333333333,854.7309107415903,350.6666666666667,874.5972321769877,364.0833333333333L894.4635536123853,377.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M704.921875,404L716.6458333333334,404C728.3697916666666,404,751.8177083333334,404,779.0416666666666,404.19207125223875C806.265625,404.3841425044775,837.265625,404.768285008955,852.765625,404.9603562611937L868.265625,405.15242751343243"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M681.828125,511L697.4010416666666,511C712.9739583333334,511,744.1197916666666,511,779.2910900297619,498.25C814.4623883928571,485.5,853.6591517857142,460,873.2575334821428,447.25L892.8559151785714,434.5"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M695.609375,618L708.8854166666666,618C722.1614583333334,618,748.7135416666666,618,785.2730843406054,587.4166666666666C821.8326270145441,556.8333333333334,868.399629029088,495.6666666666667,891.6831300363601,465.0833333333333L914.9666310436321,434.5"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M241.46374857305938,360L264.6273425608828,302.8333333333333C287.79093654870627,245.66666666666666,334.1181245243531,131.33333333333334,381.9288539288432,80.31360705682302C429.7395833333333,29.29388078031269,479.0338541666667,41.58776156062538,503.6809895833333,47.73470195078173L528.328125,53.88164234093807"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id17" d="M279.74187458277703,769L296.5257809023142,797.3333333333334C313.30968722185133,825.6666666666666,346.87749986092564,882.3333333333334,390.64838534712953,910.6666666666666C434.4192708333333,939,488.3932291666667,939,515.3802083333334,939L542.3671875,939"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id18" d="M240.49153880866425,769L263.8171677572202,827.25C287.14279670577616,885.5,333.7940546028881,1002,382.55067313477736,1064.2284345330877C431.3072916666667,1126.4568690661754,482.1692708333333,1134.413738132351,507.6002604166667,1138.3921726654387L533.03125,1142.3706071985264"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id19" d="M231.4218624598716,769L256.25910413322634,838.75C281.09634580658104,908.5,330.77082915329055,1048,381.0390604099786,1113.7715654669123C431.3072916666667,1179.5431309338246,482.1692708333333,1171.586261867649,507.6002604166667,1167.6078273345613L533.03125,1163.6293928014736"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id20" d="M260.0938373881432,769L280.1524165734526,809.4166666666666C300.2109957587621,849.8333333333334,340.32815412938106,930.6666666666666,387.3724103980239,975.3049838222096C434.4166666666667,1019.9433009777525,488.3880208333333,1028.386601955505,515.3736979166666,1032.6082524443814L542.359375,1036.8299029332577"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id21" d="M223.83096131380302,769L249.9333531781692,850.8333333333334C276.0357450425353,932.6666666666666,328.2405287712677,1096.3333333333333,379.77260813563385,1178.1666666666667C431.3046875,1260,482.1640625,1260,507.59375,1260L533.0234375,1260"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id22" d="M279.74187458277703,360L296.5257809023142,331.6666666666667C313.30968722185133,303.3333333333333,346.87749986092564,246.66666666666666,386.8697395137962,218.33333333333334C426.8619791666667,190,473.2786458333333,190,496.4869791666667,190L519.6953125,190"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id23" d="M309.203125,673.4575468375828L321.0768229166667,682.0479556979857C332.9505208333333,690.6383645583886,356.6979166666667,707.8191822791943,380.4453125,716.4095911395971C404.1927083333333,725,427.9401041666667,725,439.8138020833333,725L451.6875,725"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id24" d="M309.203125,382.90408860402874L321.0768229166667,368.5867405033573C332.9505208333333,354.2693924026858,356.6979166666667,325.63469620134293,392.96484375,311.3173481006715C429.2317708333333,297,478.0182291666667,297,502.4114583333333,297L526.8046875,297"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id25" d="M309.203125,432.12167206648826L321.0768229166667,421.68472672207355C332.9505208333333,411.24778137765884,356.6979166666667,390.3738906888295,388.0026041666667,382.9767373948611C419.3072916666667,375.57958410089276,458.1692708333333,381.65916820178546,477.6002604166667,384.69896025223187L497.03125,387.7387523026782"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id26" d="M309.203125,482.0181187491196L321.0768229166667,475.5150989575997C332.9505208333333,469.01207916607973,356.6979166666667,456.00603958303986,388.0026041666667,446.066733125798C419.3072916666667,436.1274266685561,458.1692708333333,429.2548533371121,477.6002604166667,425.8185666713901L497.03125,422.3822800056681"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id27" d="M217.6732381184896,769L244.80191718207467,862.9166666666666C271.93059624565973,956.8333333333334,326.1879543728299,1144.6666666666667,390.07184176974823,1238.5833333333333C453.9557291666667,1332.5,527.4661458333334,1332.5,593.26953125,1332.5C659.0729166666666,1332.5,717.1692708333334,1332.5,763.7916666666666,1324.8234546686674C810.4140625,1317.1469093373348,845.5625,1301.7938186746696,863.13671875,1294.117273343337L880.7109375,1286.4407280120045"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M246.5221959786822,769L268.8427153989018,820.9166666666666C291.16323481912144,872.8333333333334,335.80427365956075,976.6666666666666,385.1104701631137,1024.3616828444572C434.4166666666667,1072.0566990222476,488.3880208333333,1063.613398044495,515.3736979166666,1059.3917475556186L542.359375,1055.1700970667423"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id29" d="M247.64385273552503,360L269.77742936293754,309.1666666666667C291.91100599035,258.3333333333333,336.178159245175,156.66666666666666,382.95887128925415,107.73329672665439C429.7395833333333,58.7999267866421,479.0338541666667,62.59985357328421,503.6809895833333,64.49981696660525L528.328125,66.39978035992631"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id30" d="M254.82011366648993,360L275.7576468054083,315.5C296.69517994432664,271,338.57024622216335,182,384.1549147777484,135.15298639648577C429.7395833333333,88.30597279297153,479.0338541666667,83.61194558594303,503.6809895833333,81.26493198242879L528.328125,78.91791837891455"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id31" d="M309.203125,501.7051521341034L321.0768229166667,496.7542934450862C332.9505208333333,491.80343475606895,356.6979166666667,481.90171737803445,391.8515625,481.0678170282549C427.0052083333333,480.2339166784753,473.5651041666667,488.4678333569505,496.8450520833333,492.5847916961882L520.125,496.7017500354258"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id32" d="M309.203125,554.6564833075081L321.0768229166667,553.8804027562568C332.9505208333333,553.1043222050054,356.6979166666667,551.5521611025027,391.8515625,546.6591222120137C427.0052083333333,541.7660833215247,473.5651041666667,533.5321666430494,496.8450520833333,529.4152083038118L520.125,525.2982499645742"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id33" d="M309.203125,574.3435166924919L321.0768229166667,575.1195972437432C332.9505208333333,575.8956777949946,356.6979166666667,577.4478388974973,389.5546875,581.934685354941C422.4114583333333,586.4215318123848,464.3776041666667,593.8430636247698,485.3606770833333,597.5538295309622L506.34375,601.2645954371546"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id34" d="M309.203125,624.2399633751232L321.0768229166667,628.9499694792694C332.9505208333333,633.6599755834155,356.6979166666667,643.0799877917078,389.5546875,644.5073932865298C422.4114583333333,645.9347987813518,464.3776041666667,639.3695975627037,485.3606770833333,636.0869969533796L506.34375,632.8043963440556"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id35" d="M263.2544964677047,360L282.7862991397539,321.8333333333333C302.31810181180316,283.6666666666667,341.38170715590155,207.33333333333334,385.56064524461743,162.57267606631714C429.7395833333333,117.81201879930093,479.0338541666667,104.62403759860187,503.6809895833333,98.03004699825232L528.328125,91.43605639790279"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -479,7 +474,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21">
+        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000765890579167335652-0" class="node default clickable">
             <rect height="101" width="68.359375" y="-50.5" x="-34.1796875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.1796875" x1="-34.1796875" class="divider"/>
@@ -508,7 +503,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L26">
+        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L26">
           <g title="B" id="classId-C_0000934136012292043506-1" class="node default clickable">
             <rect height="79" width="145.296875" y="-39.5" x="-72.6484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="72.6484375" x1="-72.6484375" class="divider"/>
@@ -532,7 +527,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30">
+        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0002186387853087008570-2" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -551,7 +546,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31">
+        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31">
           <g title="A" id="classId-C_0000947292733740993297-3" class="node default clickable">
             <rect height="57" width="272.796875" y="-28.5" x="-136.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="136.3984375" x1="-136.3984375" class="divider"/>
@@ -570,7 +565,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34">
+        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34">
           <g title="A" id="classId-C_0001700006390494465667-4" class="node default clickable">
             <rect height="57" width="93.234375" y="-28.5" x="-46.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="46.6171875" x1="-46.6171875" class="divider"/>
@@ -589,7 +584,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37">
+        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37">
           <g title="A" id="classId-C_0002017665567517853203-5" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
@@ -608,7 +603,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41">
+        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41">
           <g title="A" id="classId-C_0000906557320263235873-6" class="node default clickable">
             <rect height="57" width="95.015625" y="-28.5" x="-47.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.5078125" x1="-47.5078125" class="divider"/>
@@ -627,7 +622,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L34">
+        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34">
           <g title="A" id="classId-C_0000378898020828430636-7" class="node default clickable">
             <rect height="57" width="117.21875" y="-28.5" x="-58.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.609375" x1="-58.609375" class="divider"/>
@@ -646,7 +641,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L37">
+        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37">
           <g title="A" id="classId-C_0002082013375525130414-8" class="node default clickable">
             <rect height="57" width="135.890625" y="-28.5" x="-67.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.9453125" x1="-67.9453125" class="divider"/>
@@ -665,7 +660,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L41">
+        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41">
           <g title="A" id="classId-C_0000051978493292659230-9" class="node default clickable">
             <rect height="57" width="117.234375" y="-28.5" x="-58.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -684,7 +679,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L38">
+        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L38">
           <g title="A" id="classId-C_0000197769253782961588-10" class="node default clickable">
             <rect height="57" width="135.90625" y="-28.5" x="-67.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.953125" x1="-67.953125" class="divider"/>
@@ -703,7 +698,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L21">
+        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000895940711566401184-11" class="node default clickable">
             <rect height="57" width="162.5625" y="-28.5" x="-81.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.28125" x1="-81.28125" class="divider"/>
@@ -722,7 +717,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L31">
+        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31">
           <g title="A" id="classId-C_0001751732625010742161-12" class="node default clickable">
             <rect height="57" width="298.578125" y="-28.5" x="-149.2890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.2890625" x1="-149.2890625" class="divider"/>
@@ -741,7 +736,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30">
+        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0000887121441210847583-13" class="node default clickable">
             <rect height="57" width="148.34375" y="-28.5" x="-74.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.171875" x1="-74.171875" class="divider"/>
@@ -760,7 +755,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L30">
+        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0001119452495635561975-14" class="node default clickable">
             <rect height="57" width="207.890625" y="-28.5" x="-103.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="103.9453125" x1="-103.9453125" class="divider"/>
@@ -779,7 +774,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L111">
+        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L111">
           <g title="A" id="classId-C_0000340562099063642390-15" class="node default clickable">
             <rect height="57" width="161.703125" y="-28.5" x="-80.8515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="80.8515625" x1="-80.8515625" class="divider"/>
@@ -798,7 +793,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L111">
+        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L111">
           <g title="A" id="classId-C_0001388877149159894665-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -817,7 +812,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00014/t00014.cc#L56">
+        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L56">
           <g title="R" id="classId-C_0001758213171584933144-17" class="node default clickable">
             <rect height="409" width="301.203125" y="-204.5" x="-150.6015625" class="outer title-state"/>
             <line y2="-174.5" y1="-174.5" x2="150.6015625" x1="-150.6015625" class="divider"/>
diff --git a/docs/test_cases/t00015.md b/docs/test_cases/t00015.md
index 395b6ddb..f2490582 100644
--- a/docs/test_cases/t00015.md
+++ b/docs/test_cases/t00015.md
@@ -55,7 +55,7 @@ class B : public ns1::ns2::Anon { };
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00015::ns1::A",
+      "display_name": "ns1::A",
       "id": "1410694888805149453",
       "is_abstract": false,
       "is_nested": false,
@@ -77,7 +77,7 @@ class B : public ns1::ns2::Anon { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00015::ns1::ns2_v0_9_0::A",
+      "display_name": "ns1::ns2_v0_9_0::A",
       "id": "485552648049088863",
       "is_abstract": false,
       "is_nested": false,
@@ -106,7 +106,7 @@ class B : public ns1::ns2::Anon { };
           "name": "clanguml::t00015::ns1::A"
         }
       ],
-      "display_name": "clanguml::t00015::ns1::Anon",
+      "display_name": "ns1::Anon",
       "id": "1060731132374575329",
       "is_abstract": false,
       "is_nested": false,
@@ -135,7 +135,7 @@ class B : public ns1::ns2::Anon { };
           "name": "clanguml::t00015::ns1::A"
         }
       ],
-      "display_name": "clanguml::t00015::ns3::ns1::ns2::Anon",
+      "display_name": "ns3::ns1::ns2::Anon",
       "id": "1797521288354158629",
       "is_abstract": false,
       "is_nested": false,
@@ -164,7 +164,7 @@ class B : public ns1::ns2::Anon { };
           "name": "clanguml::t00015::ns3::ns1::ns2::Anon"
         }
       ],
-      "display_name": "clanguml::t00015::ns3::B",
+      "display_name": "ns3::B",
       "id": "870882387819356092",
       "is_abstract": false,
       "is_nested": false,
@@ -186,6 +186,7 @@ class B : public ns1::ns2::Anon { };
     }
   ],
   "name": "t00015_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index a5b82925..073d3408 100644
--- a/docs/test_cases/t00015_class.svg
+++ b/docs/test_cases/t00015_class.svg
@@ -1,69 +1,59 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="278px" preserveAspectRatio="none" style="width:372px;height:278px;background:#FFFFFF;" version="1.1" viewBox="0 0 372 278" width="372px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="f14y5f2nw2sqyw" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001410694888805149453">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001410694888805149453" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="72" x="100" y="7"/>
-        <ellipse cx="115" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M110,24.1563 C110,26.6563 112.1406,28.4688 115.0625,28.4688 C116.2969,28.4688 117.4688,28.1719 118.2188,27.6563 C118.8281,27.2344 119.1563,26.8125 119.1563,26.4063 C119.1563,25.9375 118.7344,25.5313 118.2344,25.5313 C118,25.5313 117.7813,25.6094 117.5781,25.8125 C117.1406,26.25 117.1406,26.25 116.9688,26.3438 C116.5156,26.5781 115.875,26.7188 115.1094,26.7188 C113.1094,26.7188 111.8281,25.7031 111.8281,24.125 L111.8281,23.0781 C111.8281,21.375 113.0469,20.1719 114.75,20.1719 C115.3281,20.1719 115.9063,20.3125 116.375,20.5625 C116.8438,20.8281 117.0156,21.0156 117.0781,21.375 C117.2031,22.0469 117.4531,22.2969 117.9844,22.2969 C118.2656,22.2969 118.5469,22.1563 118.7344,21.9375 C118.8594,21.7656 118.9063,21.5938 118.9063,21.1563 L118.9063,19.7969 C118.9063,19.375 118.8906,19.2344 118.7656,19.0625 C118.5938,18.8125 118.3125,18.6563 117.9844,18.6563 C117.6719,18.6563 117.4688,18.7656 117.25,19.0313 C116.0781,18.5313 115.6406,18.4219 114.6875,18.4219 C112.0156,18.4219 110,20.4375 110,23.0625 L110,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="129" y="27.606">ns1::A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="101" x2="171" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="101" x2="171" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
+      <ellipse cx="113" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M115.9688,29.6406 Q115.3906,29.9375 114.75,30.0781 Q114.1094,30.2344 113.4063,30.2344 Q110.9063,30.2344 109.5781,28.5938 Q108.2656,26.9375 108.2656,23.8125 Q108.2656,20.6875 109.5781,19.0313 Q110.9063,17.375 113.4063,17.375 Q114.1094,17.375 114.75,17.5313 Q115.4063,17.6875 115.9688,17.9844 L115.9688,20.7031 Q115.3438,20.125 114.75,19.8594 Q114.1563,19.5781 113.5313,19.5781 Q112.1875,19.5781 111.5,20.6563 Q110.8125,21.7188 110.8125,23.8125 Q110.8125,25.9063 111.5,26.9844 Q112.1875,28.0469 113.5313,28.0469 Q114.1563,28.0469 114.75,27.7813 Q115.3438,27.5 115.9688,26.9219 L115.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="127" y="28.1543">ns1::A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000485552648049088863">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000485552648049088863" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="158" x="207" y="7"/>
-        <ellipse cx="222" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M217,24.1563 C217,26.6563 219.1406,28.4688 222.0625,28.4688 C223.2969,28.4688 224.4688,28.1719 225.2188,27.6563 C225.8281,27.2344 226.1563,26.8125 226.1563,26.4063 C226.1563,25.9375 225.7344,25.5313 225.2344,25.5313 C225,25.5313 224.7813,25.6094 224.5781,25.8125 C224.1406,26.25 224.1406,26.25 223.9688,26.3438 C223.5156,26.5781 222.875,26.7188 222.1094,26.7188 C220.1094,26.7188 218.8281,25.7031 218.8281,24.125 L218.8281,23.0781 C218.8281,21.375 220.0469,20.1719 221.75,20.1719 C222.3281,20.1719 222.9063,20.3125 223.375,20.5625 C223.8438,20.8281 224.0156,21.0156 224.0781,21.375 C224.2031,22.0469 224.4531,22.2969 224.9844,22.2969 C225.2656,22.2969 225.5469,22.1563 225.7344,21.9375 C225.8594,21.7656 225.9063,21.5938 225.9063,21.1563 L225.9063,19.7969 C225.9063,19.375 225.8906,19.2344 225.7656,19.0625 C225.5938,18.8125 225.3125,18.6563 224.9844,18.6563 C224.6719,18.6563 224.4688,18.7656 224.25,19.0313 C223.0781,18.5313 222.6406,18.4219 221.6875,18.4219 C219.0156,18.4219 217,20.4375 217,23.0625 L217,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="236" y="27.606">ns1::ns2_v0_9_0::A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="208" x2="364" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="208" x2="364" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
+      <ellipse cx="219.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M222.4688,29.6406 Q221.8906,29.9375 221.25,30.0781 Q220.6094,30.2344 219.9063,30.2344 Q217.4063,30.2344 216.0781,28.5938 Q214.7656,26.9375 214.7656,23.8125 Q214.7656,20.6875 216.0781,19.0313 Q217.4063,17.375 219.9063,17.375 Q220.6094,17.375 221.25,17.5313 Q221.9063,17.6875 222.4688,17.9844 L222.4688,20.7031 Q221.8438,20.125 221.25,19.8594 Q220.6563,19.5781 220.0313,19.5781 Q218.6875,19.5781 218,20.6563 Q217.3125,21.7188 217.3125,23.8125 Q217.3125,25.9063 218,26.9844 Q218.6875,28.0469 220.0313,28.0469 Q220.6563,28.0469 221.25,27.7813 Q221.8438,27.5 222.4688,26.9219 L222.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="233.5" y="28.1543">ns1::ns2_v0_9_0::A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <g id="elem_C_0001060731132374575329">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001060731132374575329" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="96" x="7" y="115"/>
-        <ellipse cx="22" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,132.1563 C17,134.6563 19.1406,136.4688 22.0625,136.4688 C23.2969,136.4688 24.4688,136.1719 25.2188,135.6563 C25.8281,135.2344 26.1563,134.8125 26.1563,134.4063 C26.1563,133.9375 25.7344,133.5313 25.2344,133.5313 C25,133.5313 24.7813,133.6094 24.5781,133.8125 C24.1406,134.25 24.1406,134.25 23.9688,134.3438 C23.5156,134.5781 22.875,134.7188 22.1094,134.7188 C20.1094,134.7188 18.8281,133.7031 18.8281,132.125 L18.8281,131.0781 C18.8281,129.375 20.0469,128.1719 21.75,128.1719 C22.3281,128.1719 22.9063,128.3125 23.375,128.5625 C23.8438,128.8281 24.0156,129.0156 24.0781,129.375 C24.2031,130.0469 24.4531,130.2969 24.9844,130.2969 C25.2656,130.2969 25.5469,130.1563 25.7344,129.9375 C25.8594,129.7656 25.9063,129.5938 25.9063,129.1563 L25.9063,127.7969 C25.9063,127.375 25.8906,127.2344 25.7656,127.0625 C25.5938,126.8125 25.3125,126.6563 24.9844,126.6563 C24.6719,126.6563 24.4688,126.7656 24.25,127.0313 C23.0781,126.5313 22.6406,126.4219 21.6875,126.4219 C19.0156,126.4219 17,128.4375 17,131.0625 L17,132.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="36" y="135.606">ns1::Anon</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="102" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="102" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
+      <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="35" y="136.1543">ns1::Anon</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <g id="elem_C_0001797521288354158629">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001797521288354158629" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="158" x="138" y="115"/>
-        <ellipse cx="153" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M148,132.1563 C148,134.6563 150.1406,136.4688 153.0625,136.4688 C154.2969,136.4688 155.4688,136.1719 156.2188,135.6563 C156.8281,135.2344 157.1563,134.8125 157.1563,134.4063 C157.1563,133.9375 156.7344,133.5313 156.2344,133.5313 C156,133.5313 155.7813,133.6094 155.5781,133.8125 C155.1406,134.25 155.1406,134.25 154.9688,134.3438 C154.5156,134.5781 153.875,134.7188 153.1094,134.7188 C151.1094,134.7188 149.8281,133.7031 149.8281,132.125 L149.8281,131.0781 C149.8281,129.375 151.0469,128.1719 152.75,128.1719 C153.3281,128.1719 153.9063,128.3125 154.375,128.5625 C154.8438,128.8281 155.0156,129.0156 155.0781,129.375 C155.2031,130.0469 155.4531,130.2969 155.9844,130.2969 C156.2656,130.2969 156.5469,130.1563 156.7344,129.9375 C156.8594,129.7656 156.9063,129.5938 156.9063,129.1563 L156.9063,127.7969 C156.9063,127.375 156.8906,127.2344 156.7656,127.0625 C156.5938,126.8125 156.3125,126.6563 155.9844,126.6563 C155.6719,126.6563 155.4688,126.7656 155.25,127.0313 C154.0781,126.5313 153.6406,126.4219 152.6875,126.4219 C150.0156,126.4219 148,128.4375 148,131.0625 L148,132.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="167" y="135.606">ns3::ns1::ns2::Anon</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="295" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="295" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
+      <ellipse cx="151" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M153.9688,137.6406 Q153.3906,137.9375 152.75,138.0781 Q152.1094,138.2344 151.4063,138.2344 Q148.9063,138.2344 147.5781,136.5938 Q146.2656,134.9375 146.2656,131.8125 Q146.2656,128.6875 147.5781,127.0313 Q148.9063,125.375 151.4063,125.375 Q152.1094,125.375 152.75,125.5313 Q153.4063,125.6875 153.9688,125.9844 L153.9688,128.7031 Q153.3438,128.125 152.75,127.8594 Q152.1563,127.5781 151.5313,127.5781 Q150.1875,127.5781 149.5,128.6563 Q148.8125,129.7188 148.8125,131.8125 Q148.8125,133.9063 149.5,134.9844 Q150.1875,136.0469 151.5313,136.0469 Q152.1563,136.0469 152.75,135.7813 Q153.3438,135.5 153.9688,134.9219 L153.9688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="125" x="165" y="136.1543">ns3::ns1::ns2::Anon</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000870882387819356092">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000870882387819356092" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="72" x="181" y="223"/>
-        <ellipse cx="196" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M191,240.1563 C191,242.6563 193.1406,244.4688 196.0625,244.4688 C197.2969,244.4688 198.4688,244.1719 199.2188,243.6563 C199.8281,243.2344 200.1563,242.8125 200.1563,242.4063 C200.1563,241.9375 199.7344,241.5313 199.2344,241.5313 C199,241.5313 198.7813,241.6094 198.5781,241.8125 C198.1406,242.25 198.1406,242.25 197.9688,242.3438 C197.5156,242.5781 196.875,242.7188 196.1094,242.7188 C194.1094,242.7188 192.8281,241.7031 192.8281,240.125 L192.8281,239.0781 C192.8281,237.375 194.0469,236.1719 195.75,236.1719 C196.3281,236.1719 196.9063,236.3125 197.375,236.5625 C197.8438,236.8281 198.0156,237.0156 198.0781,237.375 C198.2031,238.0469 198.4531,238.2969 198.9844,238.2969 C199.2656,238.2969 199.5469,238.1563 199.7344,237.9375 C199.8594,237.7656 199.9063,237.5938 199.9063,237.1563 L199.9063,235.7969 C199.9063,235.375 199.8906,235.2344 199.7656,235.0625 C199.5938,234.8125 199.3125,234.6563 198.9844,234.6563 C198.6719,234.6563 198.4688,234.7656 198.25,235.0313 C197.0781,234.5313 196.6406,234.4219 195.6875,234.4219 C193.0156,234.4219 191,236.4375 191,239.0625 L191,240.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="210" y="243.606">ns3::B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="182" x2="252" y1="255" y2="255"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="182" x2="252" y1="263" y2="263"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
+      <ellipse cx="194" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M196.9688,245.6406 Q196.3906,245.9375 195.75,246.0781 Q195.1094,246.2344 194.4063,246.2344 Q191.9063,246.2344 190.5781,244.5938 Q189.2656,242.9375 189.2656,239.8125 Q189.2656,236.6875 190.5781,235.0313 Q191.9063,233.375 194.4063,233.375 Q195.1094,233.375 195.75,233.5313 Q196.4063,233.6875 196.9688,233.9844 L196.9688,236.7031 Q196.3438,236.125 195.75,235.8594 Q195.1563,235.5781 194.5313,235.5781 Q193.1875,235.5781 192.5,236.6563 Q191.8125,237.7188 191.8125,239.8125 Q191.8125,241.9063 192.5,242.9844 Q193.1875,244.0469 194.5313,244.0469 Q195.1563,244.0469 195.75,243.7813 Q196.3438,243.5 196.9688,242.9219 L196.9688,245.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="208" y="244.1543">ns3::B</text>
+      <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"/>
     </a>
-    <g id="link_C_0001410694888805149453_C_0001060731132374575329">
-      <path codeLine="21" d="M107.2961,69.5662 C93.7961,87.2462 86.23,97.13 72.73,114.79 " fill="none" id="C_0001410694888805149453-backto-C_0001060731132374575329" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="118.22,55.26,102.5274,65.925,112.0649,73.2075,118.22,55.26" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001410694888805149453_C_0001797521288354158629">
-      <path codeLine="22" d="M164.7039,69.5662 C178.2039,87.2462 185.77,97.13 199.27,114.79 " fill="none" id="C_0001410694888805149453-backto-C_0001797521288354158629" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="153.78,55.26,159.9351,73.2075,169.4726,65.925,153.78,55.26" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001797521288354158629_C_0000870882387819356092">
-      <path codeLine="23" d="M217,181.26 C217,198.94 217,205.13 217,222.79 " fill="none" id="C_0001797521288354158629-backto-C_0000870882387819356092" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="217,163.26,211,181.26,223,181.26,217,163.26" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <path d="M103.93,72.18 C92.9,86.8 80.72,102.93 71.1,115.68 " fill="none" id="C_0001410694888805149453&lt;-C_0001060731132374575329" 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;"/>
+    <path d="M163.44,72.18 C174.61,86.8 186.94,102.93 196.68,115.68 " fill="none" id="C_0001410694888805149453&lt;-C_0001797521288354158629" 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;"/>
+    <path d="M214.5,184.02 C214.5,197.58 214.5,212.04 214.5,223.68 " fill="none" id="C_0001797521288354158629&lt;-C_0000870882387819356092" 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;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00015_class_mermaid.svg b/docs/test_cases/t00015_class_mermaid.svg
index 23dbeb0b..94093f80 100644
--- a/docs/test_cases/t00015_class_mermaid.svg
+++ b/docs/test_cases/t00015_class_mermaid.svg
@@ -1,63 +1,58 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 401.91015625 287" style="max-width: 401.91px; background-color: white;" width="401.91015625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M98.30768237624903,64.6178920337158L91.09884989687419,68.84824336142984C83.89001741749935,73.07859468914387,69.47235245874968,81.53929734457193,62.26351997937484,89.93631533895264C55.0546875,98.33333333333333,55.0546875,106.66666666666667,55.0546875,110.83333333333333L55.0546875,115"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M194.13763012375097,64.6178920337158L201.34646260312581,68.84824336142984C208.55529508250063,73.07859468914387,222.97296004125033,81.53929734457193,230.18179252062518,89.93631533895264C237.390625,98.33333333333333,237.390625,106.66666666666667,237.390625,110.83333333333333L237.390625,115"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M237.390625,190L237.390625,191.16666666666666C237.390625,192.33333333333334,237.390625,194.66666666666666,237.390625,200C237.390625,205.33333333333334,237.390625,213.66666666666666,237.390625,217.83333333333334L237.390625,222"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M113.83203125,55.50775525943699L104.03580729166667,61.25646271619749C94.23958333333333,67.00517017295799,74.64713541666667,78.50258508647899,64.85091145833333,88.41795920990616C55.0546875,98.33333333333333,55.0546875,106.66666666666667,55.0546875,110.83333333333333L55.0546875,115"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M178.61328125,55.50775525943699L188.40950520833334,61.25646271619749C198.20572916666666,67.00517017295799,217.79817708333334,78.50258508647899,227.59440104166666,88.41795920990616C237.390625,98.33333333333333,237.390625,106.66666666666667,237.390625,110.83333333333333L237.390625,115"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M237.390625,172L237.390625,176.16666666666666C237.390625,180.33333333333334,237.390625,188.66666666666666,237.390625,197C237.390625,205.33333333333334,237.390625,213.66666666666666,237.390625,217.83333333333334L237.390625,222"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -89,7 +84,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L6">
+        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L6">
           <g title="A" id="classId-C_0001410694888805149453-0" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -108,7 +103,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L10">
+        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L10">
           <g title="A" id="classId-C_0000485552648049088863-1" class="node default clickable">
             <rect height="57" width="165.296875" y="-28.5" x="-82.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.6484375" x1="-82.6484375" class="divider"/>
@@ -127,7 +122,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L14">
+        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L14">
           <g title="Anon" id="classId-C_0001060731132374575329-2" class="node default clickable">
             <rect height="57" width="94.109375" y="-28.5" x="-47.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0546875" x1="-47.0546875" class="divider"/>
@@ -146,7 +141,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L21">
+        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L21">
           <g title="Anon" id="classId-C_0001797521288354158629-3" class="node default clickable">
             <rect height="57" width="170.5625" y="-28.5" x="-85.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.28125" x1="-85.28125" class="divider"/>
@@ -165,7 +160,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00015/t00015.cc#L24">
+        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L24">
           <g title="B" id="classId-C_0000870882387819356092-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
diff --git a/docs/test_cases/t00016.md b/docs/test_cases/t00016.md
index 756dbe38..3f32887d 100644
--- a/docs/test_cases/t00016.md
+++ b/docs/test_cases/t00016.md
@@ -56,7 +56,7 @@ template <> struct is_numeric<bool> {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00016::is_numeric<typename>",
+      "display_name": "is_numeric<typename>",
       "id": "932856332558460389",
       "is_abstract": false,
       "is_nested": false,
@@ -92,7 +92,7 @@ template <> struct is_numeric<bool> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00016::is_numeric<float>",
+      "display_name": "is_numeric<float>",
       "id": "95618295648274199",
       "is_abstract": false,
       "is_nested": false,
@@ -128,7 +128,7 @@ template <> struct is_numeric<bool> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00016::is_numeric<char>",
+      "display_name": "is_numeric<char>",
       "id": "979129381790761728",
       "is_abstract": false,
       "is_nested": false,
@@ -164,7 +164,7 @@ template <> struct is_numeric<bool> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00016::is_numeric<unsigned int>",
+      "display_name": "is_numeric<unsigned int>",
       "id": "2090787690027341836",
       "is_abstract": false,
       "is_nested": false,
@@ -200,7 +200,7 @@ template <> struct is_numeric<bool> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00016::is_numeric<int>",
+      "display_name": "is_numeric<int>",
       "id": "500603075237446075",
       "is_abstract": false,
       "is_nested": false,
@@ -236,7 +236,7 @@ template <> struct is_numeric<bool> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00016::is_numeric<bool>",
+      "display_name": "is_numeric<bool>",
       "id": "2111316837513419920",
       "is_abstract": false,
       "is_nested": false,
@@ -272,6 +272,7 @@ template <> struct is_numeric<bool> {
     }
   ],
   "name": "t00016_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index c3606a89..f049ef76 100644
--- a/docs/test_cases/t00016_class.svg
+++ b/docs/test_cases/t00016_class.svg
@@ -1,111 +1,95 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="206px" preserveAspectRatio="none" style="width:835px;height:206px;background:#FFFFFF;" version="1.1" viewBox="0 0 835 206" width="835px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:847px;height:200px;" version="1.1" viewBox="0 0 847 200" width="847px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fnxs8fx9fwrnu" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <g id="elem_C_0000932856332558460389">
-        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000932856332558460389" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="159" x="341.5" y="134.8"/>
-        <ellipse cx="356.5" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M351.5,151.9562 C351.5,154.4562 353.6406,156.2687 356.5625,156.2687 C357.7969,156.2687 358.9688,155.9719 359.7188,155.4562 C360.3281,155.0344 360.6563,154.6125 360.6563,154.2062 C360.6563,153.7375 360.2344,153.3312 359.7344,153.3312 C359.5,153.3312 359.2813,153.4094 359.0781,153.6125 C358.6406,154.05 358.6406,154.05 358.4688,154.1437 C358.0156,154.3781 357.375,154.5187 356.6094,154.5187 C354.6094,154.5187 353.3281,153.5031 353.3281,151.925 L353.3281,150.8781 C353.3281,149.175 354.5469,147.9719 356.25,147.9719 C356.8281,147.9719 357.4063,148.1125 357.875,148.3625 C358.3438,148.6281 358.5156,148.8156 358.5781,149.175 C358.7031,149.8469 358.9531,150.0969 359.4844,150.0969 C359.7656,150.0969 360.0469,149.9562 360.2344,149.7375 C360.3594,149.5656 360.4063,149.3937 360.4063,148.9562 L360.4063,147.5969 C360.4063,147.175 360.3906,147.0344 360.2656,146.8625 C360.0938,146.6125 359.8125,146.4562 359.4844,146.4562 C359.1719,146.4562 358.9688,146.5656 358.75,146.8312 C357.5781,146.3312 357.1406,146.2219 356.1875,146.2219 C353.5156,146.2219 351.5,148.2375 351.5,150.8625 L351.5,151.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="370.5" y="155.406">is_numeric</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56" x="447.5" y="131.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54" x="448.5" y="146.0001">typename</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="342.5" x2="499.5" y1="166.8" y2="166.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="342.5" x2="499.5" y1="174.8" y2="174.8"/>
-        <ellipse cx="352.5" cy="188.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="361.5" y="191.8059">value : enum</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="343.5" y="129"/>
+      <ellipse cx="358.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M361.4688,150.6406 Q360.8906,150.9375 360.25,151.0781 Q359.6094,151.2344 358.9063,151.2344 Q356.4063,151.2344 355.0781,149.5938 Q353.7656,147.9375 353.7656,144.8125 Q353.7656,141.6875 355.0781,140.0313 Q356.4063,138.375 358.9063,138.375 Q359.6094,138.375 360.25,138.5313 Q360.9063,138.6875 361.4688,138.9844 L361.4688,141.7031 Q360.8438,141.125 360.25,140.8594 Q359.6563,140.5781 359.0313,140.5781 Q357.6875,140.5781 357,141.6563 Q356.3125,142.7188 356.3125,144.8125 Q356.3125,146.9063 357,147.9844 Q357.6875,149.0469 359.0313,149.0469 Q359.6563,149.0469 360.25,148.7813 Q360.8438,148.5 361.4688,147.9219 L361.4688,150.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="372.5" y="149.1543">is_numeric</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="65" x="446.5" y="126"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="63" x="447.5" y="138.1387">typename</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="344.5" x2="507.5" y1="161" y2="161"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="344.5" x2="507.5" y1="169" y2="169"/>
+      <ellipse cx="354.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="363.5" y="183.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <g id="elem_C_0000095618295648274199">
-        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0000095618295648274199" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="128" x="7" y="10"/>
-        <ellipse cx="22" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,27.1563 C17,29.6563 19.1406,31.4688 22.0625,31.4688 C23.2969,31.4688 24.4688,31.1719 25.2188,30.6563 C25.8281,30.2344 26.1563,29.8125 26.1563,29.4063 C26.1563,28.9375 25.7344,28.5313 25.2344,28.5313 C25,28.5313 24.7813,28.6094 24.5781,28.8125 C24.1406,29.25 24.1406,29.25 23.9688,29.3438 C23.5156,29.5781 22.875,29.7188 22.1094,29.7188 C20.1094,29.7188 18.8281,28.7031 18.8281,27.125 L18.8281,26.0781 C18.8281,24.375 20.0469,23.1719 21.75,23.1719 C22.3281,23.1719 22.9063,23.3125 23.375,23.5625 C23.8438,23.8281 24.0156,24.0156 24.0781,24.375 C24.2031,25.0469 24.4531,25.2969 24.9844,25.2969 C25.2656,25.2969 25.5469,25.1563 25.7344,24.9375 C25.8594,24.7656 25.9063,24.5938 25.9063,24.1563 L25.9063,22.7969 C25.9063,22.375 25.8906,22.2344 25.7656,22.0625 C25.5938,21.8125 25.3125,21.6563 24.9844,21.6563 C24.6719,21.6563 24.4688,21.7656 24.25,22.0313 C23.0781,21.5313 22.6406,21.4219 21.6875,21.4219 C19.0156,21.4219 17,23.4375 17,26.0625 L17,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="36" y="30.606">is_numeric</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="25" x="113" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="23" x="114" y="21.2001">float</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="134" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="134" y1="50" y2="50"/>
-        <ellipse cx="18" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="27" y="67.0059">value : enum</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
+      <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="35" y="28.1543">is_numeric</text>
+      <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">float</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="48" y2="48"/>
+      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="26" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <g id="elem_C_0000979129381790761728">
-        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0000979129381790761728" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="170.5" y="10"/>
-        <ellipse cx="185.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M180.5,27.1563 C180.5,29.6563 182.6406,31.4688 185.5625,31.4688 C186.7969,31.4688 187.9688,31.1719 188.7188,30.6563 C189.3281,30.2344 189.6563,29.8125 189.6563,29.4063 C189.6563,28.9375 189.2344,28.5313 188.7344,28.5313 C188.5,28.5313 188.2813,28.6094 188.0781,28.8125 C187.6406,29.25 187.6406,29.25 187.4688,29.3438 C187.0156,29.5781 186.375,29.7188 185.6094,29.7188 C183.6094,29.7188 182.3281,28.7031 182.3281,27.125 L182.3281,26.0781 C182.3281,24.375 183.5469,23.1719 185.25,23.1719 C185.8281,23.1719 186.4063,23.3125 186.875,23.5625 C187.3438,23.8281 187.5156,24.0156 187.5781,24.375 C187.7031,25.0469 187.9531,25.2969 188.4844,25.2969 C188.7656,25.2969 189.0469,25.1563 189.2344,24.9375 C189.3594,24.7656 189.4063,24.5938 189.4063,24.1563 L189.4063,22.7969 C189.4063,22.375 189.3906,22.2344 189.2656,22.0625 C189.0938,21.8125 188.8125,21.6563 188.4844,21.6563 C188.1719,21.6563 187.9688,21.7656 187.75,22.0313 C186.5781,21.5313 186.1406,21.4219 185.1875,21.4219 C182.5156,21.4219 180.5,23.4375 180.5,26.0625 L180.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="199.5" y="30.606">is_numeric</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="26" x="276.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="24" x="277.5" y="21.2001">char</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="298.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="298.5" y1="50" y2="50"/>
-        <ellipse cx="181.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="190.5" y="67.0059">value : enum</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
+      <ellipse cx="186" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M188.9688,29.6406 Q188.3906,29.9375 187.75,30.0781 Q187.1094,30.2344 186.4063,30.2344 Q183.9063,30.2344 182.5781,28.5938 Q181.2656,26.9375 181.2656,23.8125 Q181.2656,20.6875 182.5781,19.0313 Q183.9063,17.375 186.4063,17.375 Q187.1094,17.375 187.75,17.5313 Q188.4063,17.6875 188.9688,17.9844 L188.9688,20.7031 Q188.3438,20.125 187.75,19.8594 Q187.1563,19.5781 186.5313,19.5781 Q185.1875,19.5781 184.5,20.6563 Q183.8125,21.7188 183.8125,23.8125 Q183.8125,25.9063 184.5,26.9844 Q185.1875,28.0469 186.5313,28.0469 Q187.1563,28.0469 187.75,27.7813 Q188.3438,27.5 188.9688,26.9219 L188.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="28.1543">is_numeric</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="30" x="274" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="275" y="17.1387">char</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="172" x2="300" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="172" x2="300" y1="48" y2="48"/>
+      <ellipse cx="182" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="191" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <g id="elem_C_0002090787690027341836">
-        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0002090787690027341836" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="172" x="335" y="10"/>
-        <ellipse cx="350" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M345,27.1563 C345,29.6563 347.1406,31.4688 350.0625,31.4688 C351.2969,31.4688 352.4688,31.1719 353.2188,30.6563 C353.8281,30.2344 354.1563,29.8125 354.1563,29.4063 C354.1563,28.9375 353.7344,28.5313 353.2344,28.5313 C353,28.5313 352.7813,28.6094 352.5781,28.8125 C352.1406,29.25 352.1406,29.25 351.9688,29.3438 C351.5156,29.5781 350.875,29.7188 350.1094,29.7188 C348.1094,29.7188 346.8281,28.7031 346.8281,27.125 L346.8281,26.0781 C346.8281,24.375 348.0469,23.1719 349.75,23.1719 C350.3281,23.1719 350.9063,23.3125 351.375,23.5625 C351.8438,23.8281 352.0156,24.0156 352.0781,24.375 C352.2031,25.0469 352.4531,25.2969 352.9844,25.2969 C353.2656,25.2969 353.5469,25.1563 353.7344,24.9375 C353.8594,24.7656 353.9063,24.5938 353.9063,24.1563 L353.9063,22.7969 C353.9063,22.375 353.8906,22.2344 353.7656,22.0625 C353.5938,21.8125 353.3125,21.6563 352.9844,21.6563 C352.6719,21.6563 352.4688,21.7656 352.25,22.0313 C351.0781,21.5313 350.6406,21.4219 349.6875,21.4219 C347.0156,21.4219 345,23.4375 345,26.0625 L345,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="364" y="30.606">is_numeric</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="69" x="441" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="67" x="442" y="21.2001">unsigned int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="336" x2="506" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="336" x2="506" y1="50" y2="50"/>
-        <ellipse cx="346" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="355" y="67.0059">value : enum</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
+      <ellipse cx="351.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M354.4688,29.6406 Q353.8906,29.9375 353.25,30.0781 Q352.6094,30.2344 351.9063,30.2344 Q349.4063,30.2344 348.0781,28.5938 Q346.7656,26.9375 346.7656,23.8125 Q346.7656,20.6875 348.0781,19.0313 Q349.4063,17.375 351.9063,17.375 Q352.6094,17.375 353.25,17.5313 Q353.9063,17.6875 354.4688,17.9844 L354.4688,20.7031 Q353.8438,20.125 353.25,19.8594 Q352.6563,19.5781 352.0313,19.5781 Q350.6875,19.5781 350,20.6563 Q349.3125,21.7188 349.3125,23.8125 Q349.3125,25.9063 350,26.9844 Q350.6875,28.0469 352.0313,28.0469 Q352.6563,28.0469 353.25,27.7813 Q353.8438,27.5 354.4688,26.9219 L354.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="365.5" y="28.1543">is_numeric</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="79" x="439.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="77" x="440.5" y="17.1387">unsigned int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="514.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="514.5" y1="48" y2="48"/>
+      <ellipse cx="347.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="356.5" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <g id="elem_C_0000500603075237446075">
-        <rect codeLine="22" fill="#F1F1F1" height="64.7999" id="C_0000500603075237446075" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="542" y="10"/>
-        <ellipse cx="557" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M552,27.1563 C552,29.6563 554.1406,31.4688 557.0625,31.4688 C558.2969,31.4688 559.4688,31.1719 560.2188,30.6563 C560.8281,30.2344 561.1563,29.8125 561.1563,29.4063 C561.1563,28.9375 560.7344,28.5313 560.2344,28.5313 C560,28.5313 559.7813,28.6094 559.5781,28.8125 C559.1406,29.25 559.1406,29.25 558.9688,29.3438 C558.5156,29.5781 557.875,29.7188 557.1094,29.7188 C555.1094,29.7188 553.8281,28.7031 553.8281,27.125 L553.8281,26.0781 C553.8281,24.375 555.0469,23.1719 556.75,23.1719 C557.3281,23.1719 557.9063,23.3125 558.375,23.5625 C558.8438,23.8281 559.0156,24.0156 559.0781,24.375 C559.2031,25.0469 559.4531,25.2969 559.9844,25.2969 C560.2656,25.2969 560.5469,25.1563 560.7344,24.9375 C560.8594,24.7656 560.9063,24.5938 560.9063,24.1563 L560.9063,22.7969 C560.9063,22.375 560.8906,22.2344 560.7656,22.0625 C560.5938,21.8125 560.3125,21.6563 559.9844,21.6563 C559.6719,21.6563 559.4688,21.7656 559.25,22.0313 C558.0781,21.5313 557.6406,21.4219 556.6875,21.4219 C554.0156,21.4219 552,23.4375 552,26.0625 L552,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="571" y="30.606">is_numeric</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="648" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="649" y="21.2001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="543" x2="659" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="543" x2="659" y1="50" y2="50"/>
-        <ellipse cx="553" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="562" y="67.0059">value : enum</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
+      <ellipse cx="566" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M568.9688,29.6406 Q568.3906,29.9375 567.75,30.0781 Q567.1094,30.2344 566.4063,30.2344 Q563.9063,30.2344 562.5781,28.5938 Q561.2656,26.9375 561.2656,23.8125 Q561.2656,20.6875 562.5781,19.0313 Q563.9063,17.375 566.4063,17.375 Q567.1094,17.375 567.75,17.5313 Q568.4063,17.6875 568.9688,17.9844 L568.9688,20.7031 Q568.3438,20.125 567.75,19.8594 Q567.1563,19.5781 566.5313,19.5781 Q565.1875,19.5781 564.5,20.6563 Q563.8125,21.7188 563.8125,23.8125 Q563.8125,25.9063 564.5,26.9844 Q565.1875,28.0469 566.5313,28.0469 Q567.1563,28.0469 567.75,27.7813 Q568.3438,27.5 568.9688,26.9219 L568.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580" y="28.1543">is_numeric</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="654" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="655" y="17.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="552" x2="668" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="552" x2="668" y1="48" y2="48"/>
+      <ellipse cx="562" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="571" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <g id="elem_C_0002111316837513419920">
-        <rect codeLine="27" fill="#F1F1F1" height="64.7999" id="C_0002111316837513419920" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="695.5" y="10"/>
-        <ellipse cx="710.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M705.5,27.1563 C705.5,29.6563 707.6406,31.4688 710.5625,31.4688 C711.7969,31.4688 712.9688,31.1719 713.7188,30.6563 C714.3281,30.2344 714.6563,29.8125 714.6563,29.4063 C714.6563,28.9375 714.2344,28.5313 713.7344,28.5313 C713.5,28.5313 713.2813,28.6094 713.0781,28.8125 C712.6406,29.25 712.6406,29.25 712.4688,29.3438 C712.0156,29.5781 711.375,29.7188 710.6094,29.7188 C708.6094,29.7188 707.3281,28.7031 707.3281,27.125 L707.3281,26.0781 C707.3281,24.375 708.5469,23.1719 710.25,23.1719 C710.8281,23.1719 711.4063,23.3125 711.875,23.5625 C712.3438,23.8281 712.5156,24.0156 712.5781,24.375 C712.7031,25.0469 712.9531,25.2969 713.4844,25.2969 C713.7656,25.2969 714.0469,25.1563 714.2344,24.9375 C714.3594,24.7656 714.4063,24.5938 714.4063,24.1563 L714.4063,22.7969 C714.4063,22.375 714.3906,22.2344 714.2656,22.0625 C714.0938,21.8125 713.8125,21.6563 713.4844,21.6563 C713.1719,21.6563 712.9688,21.7656 712.75,22.0313 C711.5781,21.5313 711.1406,21.4219 710.1875,21.4219 C707.5156,21.4219 705.5,23.4375 705.5,26.0625 L705.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="724.5" y="30.606">is_numeric</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="26" x="801.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="24" x="802.5" y="21.2001">bool</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="696.5" x2="823.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="696.5" x2="823.5" y1="50" y2="50"/>
-        <ellipse cx="706.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="715.5" y="67.0059">value : enum</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
+      <ellipse cx="719.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M722.4688,29.6406 Q721.8906,29.9375 721.25,30.0781 Q720.6094,30.2344 719.9063,30.2344 Q717.4063,30.2344 716.0781,28.5938 Q714.7656,26.9375 714.7656,23.8125 Q714.7656,20.6875 716.0781,19.0313 Q717.4063,17.375 719.9063,17.375 Q720.6094,17.375 721.25,17.5313 Q721.9063,17.6875 722.4688,17.9844 L722.4688,20.7031 Q721.8438,20.125 721.25,19.8594 Q720.6563,19.5781 720.0313,19.5781 Q718.6875,19.5781 718,20.6563 Q717.3125,21.7188 717.3125,23.8125 Q717.3125,25.9063 718,26.9844 Q718.6875,28.0469 720.0313,28.0469 Q720.6563,28.0469 721.25,27.7813 Q721.8438,27.5 722.4688,26.9219 L722.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="733.5" y="28.1543">is_numeric</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="807.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="808.5" y="17.1387">bool</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="705.5" x2="832.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="705.5" x2="832.5" y1="48" y2="48"/>
+      <ellipse cx="715.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="724.5" y="62.2104">value : enum</text>
     </a>
-    <g id="link_C_0000095618295648274199_C_0000932856332558460389">
-      <path codeLine="31" d="M135.37,68.31 C141.32,70.53 147.27,72.73 153,74.8 C215.98,97.59 270.7682,116.3045 324.2082,134.1645 " fill="none" id="C_0000095618295648274199-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="341.28,139.87,326.11,128.4739,322.3063,139.8551,341.28,139.87" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000979129381790761728_C_0000932856332558460389">
-      <path codeLine="32" d="M282.9,75.02 C310.56,93.29 330.2282,106.2731 357.9182,124.5531 " fill="none" id="C_0000979129381790761728-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="372.94,134.47,361.2238,119.5458,354.6125,129.5604,372.94,134.47" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002090787690027341836_C_0000932856332558460389">
-      <path codeLine="33" d="M421,75.02 C421,93.36 421,98.37 421,116.68 " fill="none" id="C_0002090787690027341836-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="421,134.68,427,116.68,415,116.68,421,134.68" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000500603075237446075_C_0000932856332558460389">
-      <path codeLine="34" d="M554.65,75.02 C527.88,93.29 509.1802,106.0472 482.3802,124.3272 " fill="none" id="C_0000500603075237446075-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="467.51,134.47,485.7612,129.2839,478.9993,119.3704,467.51,134.47" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002111316837513419920_C_0000932856332558460389">
-      <path codeLine="35" d="M695.15,68.4 C689.36,70.58 683.58,72.74 678,74.8 C618.8,96.66 568.5812,114.55 517.7512,132.42 " fill="none" id="C_0002111316837513419920-to-C_0000932856332558460389" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="500.77,138.39,519.7411,138.0804,515.7612,126.7597,500.77,138.39" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <path d="M136.29,63.18 C141.93,65.17 147.56,67.13 153,69 C209.46,88.41 272.82,109.24 324.27,125.91 " fill="none" id="C_0000095618295648274199-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="326.49,119.27,343.36,132.09,322.18,132.59,326.49,119.27" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M283.45,69.22 C307.12,84.04 336.09,102.19 361.72,118.24 " fill="none" id="C_0000979129381790761728-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="365.59,112.4,378.82,128.95,358.16,124.27,365.59,112.4" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M426,69.22 C426,81.15 426,95.23 426,108.63 " fill="none" id="C_0002090787690027341836-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="433,108.74,426,128.74,419,108.74,433,108.74" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M564.04,69.22 C541.24,83.97 513.34,102.01 488.61,118.01 " fill="none" id="C_0000500603075237446075-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="492.28,123.97,471.69,128.95,484.68,112.21,492.28,123.97" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M704.13,62.94 C698.34,65 692.57,67.04 687,69 C634.55,87.43 576.02,107.54 527.69,124.02 " fill="none" id="C_0002111316837513419920-&gt;C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="529.88,130.67,508.69,130.5,525.36,117.42,529.88,130.67" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00016_class_mermaid.svg b/docs/test_cases/t00016_class_mermaid.svg
index 39c39051..5301198e 100644
--- a/docs/test_cases/t00016_class_mermaid.svg
+++ b/docs/test_cases/t00016_class_mermaid.svg
@@ -1,65 +1,60 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1022.859375 224" style="max-width: 1022.86px; background-color: white;" width="1022.859375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M83.9765625,87L83.9765625,91.16666666666667C83.9765625,95.33333333333333,83.9765625,103.66666666666667,137.36714084731958,115.75741003772994C190.75771919463918,127.84815340879322,297.53887588927836,143.69630681758647,350.929454236598,151.6203835219831L404.32003258391757,159.5444602263797"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M285.9375,87L285.9375,91.16666666666667C285.9375,95.33333333333333,285.9375,103.66666666666667,305.744484916316,113.32522168197336C325.5514698326321,122.98377669728005,365.16543966526416,133.9675533945601,384.9724245815803,139.45944174320013L404.7794094978963,144.95133009184013"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M518.5625,87L518.5625,91.16666666666667C518.5625,95.33333333333333,518.5625,103.66666666666667,518.5625,109C518.5625,114.33333333333333,518.5625,116.66666666666667,518.5625,117.83333333333333L518.5625,119"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M744.0625,87L744.0625,91.16666666666667C744.0625,95.33333333333333,744.0625,103.66666666666667,725.4364137163183,113.1609722038321C706.8103274326364,122.65527774099753,669.558154865273,133.3105554819951,650.9320685815911,138.63819435249385L632.3059822979094,143.96583322299264"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M938.890625,87L938.890625,91.16666666666667C938.890625,95.33333333333333,938.890625,103.66666666666667,887.8741448971663,115.66189100273215C836.8576647943327,127.65711533879762,734.8247045886652,143.31423067759525,683.8082244858315,151.14278834699405L632.7917443829979,158.97134601639286"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M83.9765625,87L83.9765625,91.16666666666667C83.9765625,95.33333333333333,83.9765625,103.66666666666667,140.33463541666666,116.19783708151317C196.69270833333334,128.72900749635969,309.4088541666667,145.45801499271937,365.7669270833333,153.8225187408992L422.125,162.18702248907906"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M285.9375,87L285.9375,91.16666666666667C285.9375,95.33333333333333,285.9375,103.66666666666667,308.6354166666667,114.12679115171055C331.3333333333333,124.58691563675443,376.7291666666667,137.17383127350885,399.4270833333333,143.46728909188607L422.125,149.7607469102633"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M518.5625,87L518.5625,91.16666666666667C518.5625,95.33333333333333,518.5625,103.66666666666667,518.5625,112C518.5625,120.33333333333333,518.5625,128.66666666666666,518.5625,132.83333333333334L518.5625,137"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M744.0625,87L744.0625,91.16666666666667C744.0625,95.33333333333333,744.0625,103.66666666666667,722.5520833333334,113.98598022912047C701.0416666666666,124.30529379157429,658.0208333333334,136.61058758314854,636.5104166666666,142.7632344789357L615,148.91588137472283"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M938.890625,87L938.890625,91.16666666666667C938.890625,95.33333333333333,938.890625,103.66666666666667,884.9088541666666,116.11691944537377C830.9270833333334,128.56717222408088,722.9635416666666,145.13434444816178,668.9817708333334,153.41793056020222L615,161.70151667224266"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -119,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L4">
+        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L4">
           <g title="is_numeric" id="classId-C_0000932856332558460389-0" class="node default clickable">
             <rect height="79" width="192.875" y="-39.5" x="-96.4375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="96.4375" x1="-96.4375" class="divider"/>
@@ -143,7 +138,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L8">
+        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L8">
           <g title="is_numeric" id="classId-C_0000095618295648274199-1" class="node default clickable">
             <rect height="79" width="151.953125" y="-39.5" x="-75.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.9765625" x1="-75.9765625" class="divider"/>
@@ -167,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L12">
+        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L12">
           <g title="is_numeric" id="classId-C_0000979129381790761728-2" class="node default clickable">
             <rect height="79" width="151.96875" y="-39.5" x="-75.984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.984375" x1="-75.984375" class="divider"/>
@@ -191,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L16">
+        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L16">
           <g title="is_numeric" id="classId-C_0002090787690027341836-3" class="node default clickable">
             <rect height="79" width="213.28125" y="-39.5" x="-106.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="106.640625" x1="-106.640625" class="divider"/>
@@ -215,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L20">
+        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L20">
           <g title="is_numeric" id="classId-C_0000500603075237446075-4" class="node default clickable">
             <rect height="79" width="137.71875" y="-39.5" x="-68.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.859375" x1="-68.859375" class="divider"/>
@@ -239,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00016/t00016.cc#L24">
+        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L24">
           <g title="is_numeric" id="classId-C_0002111316837513419920-5" class="node default clickable">
             <rect height="79" width="151.9375" y="-39.5" x="-75.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.96875" x1="-75.96875" class="divider"/>
diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md
index 23094b05..ca028a62 100644
--- a/docs/test_cases/t00017.md
+++ b/docs/test_cases/t00017.md
@@ -84,7 +84,7 @@ private:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00017::A",
+      "display_name": "A",
       "id": "121332093434690887",
       "is_abstract": false,
       "is_nested": false,
@@ -106,7 +106,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::B",
+      "display_name": "B",
       "id": "1424864837456200487",
       "is_abstract": false,
       "is_nested": false,
@@ -128,7 +128,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::C",
+      "display_name": "C",
       "id": "2151170391844743478",
       "is_abstract": false,
       "is_nested": false,
@@ -150,7 +150,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::D",
+      "display_name": "D",
       "id": "1378112127131766972",
       "is_abstract": false,
       "is_nested": false,
@@ -172,7 +172,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::E",
+      "display_name": "E",
       "id": "1535300935831802489",
       "is_abstract": false,
       "is_nested": false,
@@ -194,7 +194,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::F",
+      "display_name": "F",
       "id": "1803800465279710134",
       "is_abstract": false,
       "is_nested": false,
@@ -216,7 +216,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::G",
+      "display_name": "G",
       "id": "1135797791892670246",
       "is_abstract": false,
       "is_nested": false,
@@ -238,7 +238,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::H",
+      "display_name": "H",
       "id": "1243547836571712317",
       "is_abstract": false,
       "is_nested": false,
@@ -260,7 +260,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::I",
+      "display_name": "I",
       "id": "387733199705628658",
       "is_abstract": false,
       "is_nested": false,
@@ -282,7 +282,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::J",
+      "display_name": "J",
       "id": "747991828672433537",
       "is_abstract": false,
       "is_nested": false,
@@ -304,7 +304,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::K",
+      "display_name": "K",
       "id": "1783571342994833467",
       "is_abstract": false,
       "is_nested": false,
@@ -326,7 +326,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00017::R",
+      "display_name": "R",
       "id": "287495916564113342",
       "is_abstract": false,
       "is_nested": false,
@@ -577,6 +577,7 @@ private:
     }
   ],
   "name": "t00017_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "private",
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index 27975de0..4b59c1d3 100644
--- a/docs/test_cases/t00017_class.svg
+++ b/docs/test_cases/t00017_class.svg
@@ -1,217 +1,177 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="271px" preserveAspectRatio="none" style="width:812px;height:271px;background:#FFFFFF;" version="1.1" viewBox="0 0 812 271" width="812px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="fzgundkcoqnlf" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000121332093434690887">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000121332093434690887" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="216"/>
-        <ellipse cx="22" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,233.1563 C17,235.6563 19.1406,237.4688 22.0625,237.4688 C23.2969,237.4688 24.4688,237.1719 25.2188,236.6563 C25.8281,236.2344 26.1563,235.8125 26.1563,235.4063 C26.1563,234.9375 25.7344,234.5313 25.2344,234.5313 C25,234.5313 24.7813,234.6094 24.5781,234.8125 C24.1406,235.25 24.1406,235.25 23.9688,235.3438 C23.5156,235.5781 22.875,235.7188 22.1094,235.7188 C20.1094,235.7188 18.8281,234.7031 18.8281,233.125 L18.8281,232.0781 C18.8281,230.375 20.0469,229.1719 21.75,229.1719 C22.3281,229.1719 22.9063,229.3125 23.375,229.5625 C23.8438,229.8281 24.0156,230.0156 24.0781,230.375 C24.2031,231.0469 24.4531,231.2969 24.9844,231.2969 C25.2656,231.2969 25.5469,231.1563 25.7344,230.9375 C25.8594,230.7656 25.9063,230.5938 25.9063,230.1563 L25.9063,228.7969 C25.9063,228.375 25.8906,228.2344 25.7656,228.0625 C25.5938,227.8125 25.3125,227.6563 24.9844,227.6563 C24.6719,227.6563 24.4688,227.7656 24.25,228.0313 C23.0781,227.5313 22.6406,227.4219 21.6875,227.4219 C19.0156,227.4219 17,229.4375 17,232.0625 L17,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="236.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+      <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001424864837456200487">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0001424864837456200487" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="216"/>
-        <ellipse cx="98" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93,233.1563 C93,235.6563 95.1406,237.4688 98.0625,237.4688 C99.2969,237.4688 100.4688,237.1719 101.2188,236.6563 C101.8281,236.2344 102.1563,235.8125 102.1563,235.4063 C102.1563,234.9375 101.7344,234.5313 101.2344,234.5313 C101,234.5313 100.7813,234.6094 100.5781,234.8125 C100.1406,235.25 100.1406,235.25 99.9688,235.3438 C99.5156,235.5781 98.875,235.7188 98.1094,235.7188 C96.1094,235.7188 94.8281,234.7031 94.8281,233.125 L94.8281,232.0781 C94.8281,230.375 96.0469,229.1719 97.75,229.1719 C98.3281,229.1719 98.9063,229.3125 99.375,229.5625 C99.8438,229.8281 100.0156,230.0156 100.0781,230.375 C100.2031,231.0469 100.4531,231.2969 100.9844,231.2969 C101.2656,231.2969 101.5469,231.1563 101.7344,230.9375 C101.8594,230.7656 101.9063,230.5938 101.9063,230.1563 L101.9063,228.7969 C101.9063,228.375 101.8906,228.2344 101.7656,228.0625 C101.5938,227.8125 101.3125,227.6563 100.9844,227.6563 C100.6719,227.6563 100.4688,227.7656 100.25,228.0313 C99.0781,227.5313 98.6406,227.4219 97.6875,227.4219 C95.0156,227.4219 93,229.4375 93,232.0625 L93,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="236.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
+      <ellipse cx="96" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M98.9688,218.6406 Q98.3906,218.9375 97.75,219.0781 Q97.1094,219.2344 96.4063,219.2344 Q93.9063,219.2344 92.5781,217.5938 Q91.2656,215.9375 91.2656,212.8125 Q91.2656,209.6875 92.5781,208.0313 Q93.9063,206.375 96.4063,206.375 Q97.1094,206.375 97.75,206.5313 Q98.4063,206.6875 98.9688,206.9844 L98.9688,209.7031 Q98.3438,209.125 97.75,208.8594 Q97.1563,208.5781 96.5313,208.5781 Q95.1875,208.5781 94.5,209.6563 Q93.8125,210.7188 93.8125,212.8125 Q93.8125,214.9063 94.5,215.9844 Q95.1875,217.0469 96.5313,217.0469 Q97.1563,217.0469 97.75,216.7813 Q98.3438,216.5 98.9688,215.9219 L98.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="217.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0002151170391844743478">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0002151170391844743478" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="216"/>
-        <ellipse cx="173.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M168.5,233.1563 C168.5,235.6563 170.6406,237.4688 173.5625,237.4688 C174.7969,237.4688 175.9688,237.1719 176.7188,236.6563 C177.3281,236.2344 177.6563,235.8125 177.6563,235.4063 C177.6563,234.9375 177.2344,234.5313 176.7344,234.5313 C176.5,234.5313 176.2813,234.6094 176.0781,234.8125 C175.6406,235.25 175.6406,235.25 175.4688,235.3438 C175.0156,235.5781 174.375,235.7188 173.6094,235.7188 C171.6094,235.7188 170.3281,234.7031 170.3281,233.125 L170.3281,232.0781 C170.3281,230.375 171.5469,229.1719 173.25,229.1719 C173.8281,229.1719 174.4063,229.3125 174.875,229.5625 C175.3438,229.8281 175.5156,230.0156 175.5781,230.375 C175.7031,231.0469 175.9531,231.2969 176.4844,231.2969 C176.7656,231.2969 177.0469,231.1563 177.2344,230.9375 C177.3594,230.7656 177.4063,230.5938 177.4063,230.1563 L177.4063,228.7969 C177.4063,228.375 177.3906,228.2344 177.2656,228.0625 C177.0938,227.8125 176.8125,227.6563 176.4844,227.6563 C176.1719,227.6563 175.9688,227.7656 175.75,228.0313 C174.5781,227.5313 174.1406,227.4219 173.1875,227.4219 C170.5156,227.4219 168.5,229.4375 168.5,232.0625 L168.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="236.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
+      <ellipse cx="171" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.9688,218.6406 Q173.3906,218.9375 172.75,219.0781 Q172.1094,219.2344 171.4063,219.2344 Q168.9063,219.2344 167.5781,217.5938 Q166.2656,215.9375 166.2656,212.8125 Q166.2656,209.6875 167.5781,208.0313 Q168.9063,206.375 171.4063,206.375 Q172.1094,206.375 172.75,206.5313 Q173.4063,206.6875 173.9688,206.9844 L173.9688,209.7031 Q173.3438,209.125 172.75,208.8594 Q172.1563,208.5781 171.5313,208.5781 Q170.1875,208.5781 169.5,209.6563 Q168.8125,210.7188 168.8125,212.8125 Q168.8125,214.9063 169.5,215.9844 Q170.1875,217.0469 171.5313,217.0469 Q172.1563,217.0469 172.75,216.7813 Q173.3438,216.5 173.9688,215.9219 L173.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="217.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001378112127131766972">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001378112127131766972" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="235.5" y="216"/>
-        <ellipse cx="250.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M245.5,233.1563 C245.5,235.6563 247.6406,237.4688 250.5625,237.4688 C251.7969,237.4688 252.9688,237.1719 253.7188,236.6563 C254.3281,236.2344 254.6563,235.8125 254.6563,235.4063 C254.6563,234.9375 254.2344,234.5313 253.7344,234.5313 C253.5,234.5313 253.2813,234.6094 253.0781,234.8125 C252.6406,235.25 252.6406,235.25 252.4688,235.3438 C252.0156,235.5781 251.375,235.7188 250.6094,235.7188 C248.6094,235.7188 247.3281,234.7031 247.3281,233.125 L247.3281,232.0781 C247.3281,230.375 248.5469,229.1719 250.25,229.1719 C250.8281,229.1719 251.4063,229.3125 251.875,229.5625 C252.3438,229.8281 252.5156,230.0156 252.5781,230.375 C252.7031,231.0469 252.9531,231.2969 253.4844,231.2969 C253.7656,231.2969 254.0469,231.1563 254.2344,230.9375 C254.3594,230.7656 254.4063,230.5938 254.4063,230.1563 L254.4063,228.7969 C254.4063,228.375 254.3906,228.2344 254.2656,228.0625 C254.0938,227.8125 253.8125,227.6563 253.4844,227.6563 C253.1719,227.6563 252.9688,227.7656 252.75,228.0313 C251.5781,227.5313 251.1406,227.4219 250.1875,227.4219 C247.5156,227.4219 245.5,229.4375 245.5,232.0625 L245.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="264.5" y="236.606">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
+      <ellipse cx="246.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M249.4688,218.6406 Q248.8906,218.9375 248.25,219.0781 Q247.6094,219.2344 246.9063,219.2344 Q244.4063,219.2344 243.0781,217.5938 Q241.7656,215.9375 241.7656,212.8125 Q241.7656,209.6875 243.0781,208.0313 Q244.4063,206.375 246.9063,206.375 Q247.6094,206.375 248.25,206.5313 Q248.9063,206.6875 249.4688,206.9844 L249.4688,209.7031 Q248.8438,209.125 248.25,208.8594 Q247.6563,208.5781 247.0313,208.5781 Q245.6875,208.5781 245,209.6563 Q244.3125,210.7188 244.3125,212.8125 Q244.3125,214.9063 245,215.9844 Q245.6875,217.0469 247.0313,217.0469 Q247.6563,217.0469 248.25,216.7813 Q248.8438,216.5 249.4688,215.9219 L249.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="217.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001535300935831802489">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001535300935831802489" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="312" y="216"/>
-        <ellipse cx="327" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M322,233.1563 C322,235.6563 324.1406,237.4688 327.0625,237.4688 C328.2969,237.4688 329.4688,237.1719 330.2188,236.6563 C330.8281,236.2344 331.1563,235.8125 331.1563,235.4063 C331.1563,234.9375 330.7344,234.5313 330.2344,234.5313 C330,234.5313 329.7813,234.6094 329.5781,234.8125 C329.1406,235.25 329.1406,235.25 328.9688,235.3438 C328.5156,235.5781 327.875,235.7188 327.1094,235.7188 C325.1094,235.7188 323.8281,234.7031 323.8281,233.125 L323.8281,232.0781 C323.8281,230.375 325.0469,229.1719 326.75,229.1719 C327.3281,229.1719 327.9063,229.3125 328.375,229.5625 C328.8438,229.8281 329.0156,230.0156 329.0781,230.375 C329.2031,231.0469 329.4531,231.2969 329.9844,231.2969 C330.2656,231.2969 330.5469,231.1563 330.7344,230.9375 C330.8594,230.7656 330.9063,230.5938 330.9063,230.1563 L330.9063,228.7969 C330.9063,228.375 330.8906,228.2344 330.7656,228.0625 C330.5938,227.8125 330.3125,227.6563 329.9844,227.6563 C329.6719,227.6563 329.4688,227.7656 329.25,228.0313 C328.0781,227.5313 327.6406,227.4219 326.6875,227.4219 C324.0156,227.4219 322,229.4375 322,232.0625 L322,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="341" y="236.606">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
+      <ellipse cx="323" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M325.9688,218.6406 Q325.3906,218.9375 324.75,219.0781 Q324.1094,219.2344 323.4063,219.2344 Q320.9063,219.2344 319.5781,217.5938 Q318.2656,215.9375 318.2656,212.8125 Q318.2656,209.6875 319.5781,208.0313 Q320.9063,206.375 323.4063,206.375 Q324.1094,206.375 324.75,206.5313 Q325.4063,206.6875 325.9688,206.9844 L325.9688,209.7031 Q325.3438,209.125 324.75,208.8594 Q324.1563,208.5781 323.5313,208.5781 Q322.1875,208.5781 321.5,209.6563 Q320.8125,210.7188 320.8125,212.8125 Q320.8125,214.9063 321.5,215.9844 Q322.1875,217.0469 323.5313,217.0469 Q324.1563,217.0469 324.75,216.7813 Q325.3438,216.5 325.9688,215.9219 L325.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="217.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0001803800465279710134">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001803800465279710134" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="388" y="216"/>
-        <ellipse cx="403" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M398,233.1563 C398,235.6563 400.1406,237.4688 403.0625,237.4688 C404.2969,237.4688 405.4688,237.1719 406.2188,236.6563 C406.8281,236.2344 407.1563,235.8125 407.1563,235.4063 C407.1563,234.9375 406.7344,234.5313 406.2344,234.5313 C406,234.5313 405.7813,234.6094 405.5781,234.8125 C405.1406,235.25 405.1406,235.25 404.9688,235.3438 C404.5156,235.5781 403.875,235.7188 403.1094,235.7188 C401.1094,235.7188 399.8281,234.7031 399.8281,233.125 L399.8281,232.0781 C399.8281,230.375 401.0469,229.1719 402.75,229.1719 C403.3281,229.1719 403.9063,229.3125 404.375,229.5625 C404.8438,229.8281 405.0156,230.0156 405.0781,230.375 C405.2031,231.0469 405.4531,231.2969 405.9844,231.2969 C406.2656,231.2969 406.5469,231.1563 406.7344,230.9375 C406.8594,230.7656 406.9063,230.5938 406.9063,230.1563 L406.9063,228.7969 C406.9063,228.375 406.8906,228.2344 406.7656,228.0625 C406.5938,227.8125 406.3125,227.6563 405.9844,227.6563 C405.6719,227.6563 405.4688,227.7656 405.25,228.0313 C404.0781,227.5313 403.6406,227.4219 402.6875,227.4219 C400.0156,227.4219 398,229.4375 398,232.0625 L398,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="417" y="236.606">F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="428" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="389" x2="428" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
+      <ellipse cx="398.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M401.4688,218.6406 Q400.8906,218.9375 400.25,219.0781 Q399.6094,219.2344 398.9063,219.2344 Q396.4063,219.2344 395.0781,217.5938 Q393.7656,215.9375 393.7656,212.8125 Q393.7656,209.6875 395.0781,208.0313 Q396.4063,206.375 398.9063,206.375 Q399.6094,206.375 400.25,206.5313 Q400.9063,206.6875 401.4688,206.9844 L401.4688,209.7031 Q400.8438,209.125 400.25,208.8594 Q399.6563,208.5781 399.0313,208.5781 Q397.6875,208.5781 397,209.6563 Q396.3125,210.7188 396.3125,212.8125 Q396.3125,214.9063 397,215.9844 Q397.6875,217.0469 399.0313,217.0469 Q399.6563,217.0469 400.25,216.7813 Q400.8438,216.5 401.4688,215.9219 L401.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="217.1543">F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0001135797791892670246">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0001135797791892670246" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="464" y="216"/>
-        <ellipse cx="479" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M474,233.1563 C474,235.6563 476.1406,237.4688 479.0625,237.4688 C480.2969,237.4688 481.4688,237.1719 482.2188,236.6563 C482.8281,236.2344 483.1563,235.8125 483.1563,235.4063 C483.1563,234.9375 482.7344,234.5313 482.2344,234.5313 C482,234.5313 481.7813,234.6094 481.5781,234.8125 C481.1406,235.25 481.1406,235.25 480.9688,235.3438 C480.5156,235.5781 479.875,235.7188 479.1094,235.7188 C477.1094,235.7188 475.8281,234.7031 475.8281,233.125 L475.8281,232.0781 C475.8281,230.375 477.0469,229.1719 478.75,229.1719 C479.3281,229.1719 479.9063,229.3125 480.375,229.5625 C480.8438,229.8281 481.0156,230.0156 481.0781,230.375 C481.2031,231.0469 481.4531,231.2969 481.9844,231.2969 C482.2656,231.2969 482.5469,231.1563 482.7344,230.9375 C482.8594,230.7656 482.9063,230.5938 482.9063,230.1563 L482.9063,228.7969 C482.9063,228.375 482.8906,228.2344 482.7656,228.0625 C482.5938,227.8125 482.3125,227.6563 481.9844,227.6563 C481.6719,227.6563 481.4688,227.7656 481.25,228.0313 C480.0781,227.5313 479.6406,227.4219 478.6875,227.4219 C476.0156,227.4219 474,229.4375 474,232.0625 L474,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="493" y="236.606">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="506" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="506" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
+      <ellipse cx="472.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M475.4688,218.6406 Q474.8906,218.9375 474.25,219.0781 Q473.6094,219.2344 472.9063,219.2344 Q470.4063,219.2344 469.0781,217.5938 Q467.7656,215.9375 467.7656,212.8125 Q467.7656,209.6875 469.0781,208.0313 Q470.4063,206.375 472.9063,206.375 Q473.6094,206.375 474.25,206.5313 Q474.9063,206.6875 475.4688,206.9844 L475.4688,209.7031 Q474.8438,209.125 474.25,208.8594 Q473.6563,208.5781 473.0313,208.5781 Q471.6875,208.5781 471,209.6563 Q470.3125,210.7188 470.3125,212.8125 Q470.3125,214.9063 471,215.9844 Q471.6875,217.0469 473.0313,217.0469 Q473.6563,217.0469 474.25,216.7813 Q474.8438,216.5 475.4688,215.9219 L475.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="217.1543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <g id="elem_C_0001243547836571712317">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001243547836571712317" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="541.5" y="216"/>
-        <ellipse cx="556.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M551.5,233.1563 C551.5,235.6563 553.6406,237.4688 556.5625,237.4688 C557.7969,237.4688 558.9688,237.1719 559.7188,236.6563 C560.3281,236.2344 560.6563,235.8125 560.6563,235.4063 C560.6563,234.9375 560.2344,234.5313 559.7344,234.5313 C559.5,234.5313 559.2813,234.6094 559.0781,234.8125 C558.6406,235.25 558.6406,235.25 558.4688,235.3438 C558.0156,235.5781 557.375,235.7188 556.6094,235.7188 C554.6094,235.7188 553.3281,234.7031 553.3281,233.125 L553.3281,232.0781 C553.3281,230.375 554.5469,229.1719 556.25,229.1719 C556.8281,229.1719 557.4063,229.3125 557.875,229.5625 C558.3438,229.8281 558.5156,230.0156 558.5781,230.375 C558.7031,231.0469 558.9531,231.2969 559.4844,231.2969 C559.7656,231.2969 560.0469,231.1563 560.2344,230.9375 C560.3594,230.7656 560.4063,230.5938 560.4063,230.1563 L560.4063,228.7969 C560.4063,228.375 560.3906,228.2344 560.2656,228.0625 C560.0938,227.8125 559.8125,227.6563 559.4844,227.6563 C559.1719,227.6563 558.9688,227.7656 558.75,228.0313 C557.5781,227.5313 557.1406,227.4219 556.1875,227.4219 C553.5156,227.4219 551.5,229.4375 551.5,232.0625 L551.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="570.5" y="236.606">H</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="542.5" x2="582.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="542.5" x2="582.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
+      <ellipse cx="548.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M551.4688,218.6406 Q550.8906,218.9375 550.25,219.0781 Q549.6094,219.2344 548.9063,219.2344 Q546.4063,219.2344 545.0781,217.5938 Q543.7656,215.9375 543.7656,212.8125 Q543.7656,209.6875 545.0781,208.0313 Q546.4063,206.375 548.9063,206.375 Q549.6094,206.375 550.25,206.5313 Q550.9063,206.6875 551.4688,206.9844 L551.4688,209.7031 Q550.8438,209.125 550.25,208.8594 Q549.6563,208.5781 549.0313,208.5781 Q547.6875,208.5781 547,209.6563 Q546.3125,210.7188 546.3125,212.8125 Q546.3125,214.9063 547,215.9844 Q547.6875,217.0469 549.0313,217.0469 Q549.6563,217.0469 550.25,216.7813 Q550.8438,216.5 551.4688,215.9219 L551.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="217.1543">H</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <g id="elem_C_0000387733199705628658">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000387733199705628658" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="618.5" y="216"/>
-        <ellipse cx="633.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M628.5,233.1563 C628.5,235.6563 630.6406,237.4688 633.5625,237.4688 C634.7969,237.4688 635.9688,237.1719 636.7188,236.6563 C637.3281,236.2344 637.6563,235.8125 637.6563,235.4063 C637.6563,234.9375 637.2344,234.5313 636.7344,234.5313 C636.5,234.5313 636.2813,234.6094 636.0781,234.8125 C635.6406,235.25 635.6406,235.25 635.4688,235.3438 C635.0156,235.5781 634.375,235.7188 633.6094,235.7188 C631.6094,235.7188 630.3281,234.7031 630.3281,233.125 L630.3281,232.0781 C630.3281,230.375 631.5469,229.1719 633.25,229.1719 C633.8281,229.1719 634.4063,229.3125 634.875,229.5625 C635.3438,229.8281 635.5156,230.0156 635.5781,230.375 C635.7031,231.0469 635.9531,231.2969 636.4844,231.2969 C636.7656,231.2969 637.0469,231.1563 637.2344,230.9375 C637.3594,230.7656 637.4063,230.5938 637.4063,230.1563 L637.4063,228.7969 C637.4063,228.375 637.3906,228.2344 637.2656,228.0625 C637.0938,227.8125 636.8125,227.6563 636.4844,227.6563 C636.1719,227.6563 635.9688,227.7656 635.75,228.0313 C634.5781,227.5313 634.1406,227.4219 633.1875,227.4219 C630.5156,227.4219 628.5,229.4375 628.5,232.0625 L628.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="647.5" y="236.606">I</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="619.5" x2="653.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="619.5" x2="653.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
+      <ellipse cx="624.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M627.4688,218.6406 Q626.8906,218.9375 626.25,219.0781 Q625.6094,219.2344 624.9063,219.2344 Q622.4063,219.2344 621.0781,217.5938 Q619.7656,215.9375 619.7656,212.8125 Q619.7656,209.6875 621.0781,208.0313 Q622.4063,206.375 624.9063,206.375 Q625.6094,206.375 626.25,206.5313 Q626.9063,206.6875 627.4688,206.9844 L627.4688,209.7031 Q626.8438,209.125 626.25,208.8594 Q625.6563,208.5781 625.0313,208.5781 Q623.6875,208.5781 623,209.6563 Q622.3125,210.7188 622.3125,212.8125 Q622.3125,214.9063 623,215.9844 Q623.6875,217.0469 625.0313,217.0469 Q625.6563,217.0469 626.25,216.7813 Q626.8438,216.5 627.4688,215.9219 L627.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="217.1543">I</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <g id="elem_C_0000747991828672433537">
-        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0000747991828672433537" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="690" y="216"/>
-        <ellipse cx="705" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M700,233.1563 C700,235.6563 702.1406,237.4688 705.0625,237.4688 C706.2969,237.4688 707.4688,237.1719 708.2188,236.6563 C708.8281,236.2344 709.1563,235.8125 709.1563,235.4063 C709.1563,234.9375 708.7344,234.5313 708.2344,234.5313 C708,234.5313 707.7813,234.6094 707.5781,234.8125 C707.1406,235.25 707.1406,235.25 706.9688,235.3438 C706.5156,235.5781 705.875,235.7188 705.1094,235.7188 C703.1094,235.7188 701.8281,234.7031 701.8281,233.125 L701.8281,232.0781 C701.8281,230.375 703.0469,229.1719 704.75,229.1719 C705.3281,229.1719 705.9063,229.3125 706.375,229.5625 C706.8438,229.8281 707.0156,230.0156 707.0781,230.375 C707.2031,231.0469 707.4531,231.2969 707.9844,231.2969 C708.2656,231.2969 708.5469,231.1563 708.7344,230.9375 C708.8594,230.7656 708.9063,230.5938 708.9063,230.1563 L708.9063,228.7969 C708.9063,228.375 708.8906,228.2344 708.7656,228.0625 C708.5938,227.8125 708.3125,227.6563 707.9844,227.6563 C707.6719,227.6563 707.4688,227.7656 707.25,228.0313 C706.0781,227.5313 705.6406,227.4219 704.6875,227.4219 C702.0156,227.4219 700,229.4375 700,232.0625 L700,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="719" y="236.606">J</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="691" x2="728" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="691" x2="728" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
+      <ellipse cx="694.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M697.4688,218.6406 Q696.8906,218.9375 696.25,219.0781 Q695.6094,219.2344 694.9063,219.2344 Q692.4063,219.2344 691.0781,217.5938 Q689.7656,215.9375 689.7656,212.8125 Q689.7656,209.6875 691.0781,208.0313 Q692.4063,206.375 694.9063,206.375 Q695.6094,206.375 696.25,206.5313 Q696.9063,206.6875 697.4688,206.9844 L697.4688,209.7031 Q696.8438,209.125 696.25,208.8594 Q695.6563,208.5781 695.0313,208.5781 Q693.6875,208.5781 693,209.6563 Q692.3125,210.7188 692.3125,212.8125 Q692.3125,214.9063 693,215.9844 Q693.6875,217.0469 695.0313,217.0469 Q695.6563,217.0469 696.25,216.7813 Q696.8438,216.5 697.4688,215.9219 L697.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="217.1543">J</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <g id="elem_C_0001783571342994833467">
-        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0001783571342994833467" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="764" y="216"/>
-        <ellipse cx="779" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M774,233.1563 C774,235.6563 776.1406,237.4688 779.0625,237.4688 C780.2969,237.4688 781.4688,237.1719 782.2188,236.6563 C782.8281,236.2344 783.1563,235.8125 783.1563,235.4063 C783.1563,234.9375 782.7344,234.5313 782.2344,234.5313 C782,234.5313 781.7813,234.6094 781.5781,234.8125 C781.1406,235.25 781.1406,235.25 780.9688,235.3438 C780.5156,235.5781 779.875,235.7188 779.1094,235.7188 C777.1094,235.7188 775.8281,234.7031 775.8281,233.125 L775.8281,232.0781 C775.8281,230.375 777.0469,229.1719 778.75,229.1719 C779.3281,229.1719 779.9063,229.3125 780.375,229.5625 C780.8438,229.8281 781.0156,230.0156 781.0781,230.375 C781.2031,231.0469 781.4531,231.2969 781.9844,231.2969 C782.2656,231.2969 782.5469,231.1563 782.7344,230.9375 C782.8594,230.7656 782.9063,230.5938 782.9063,230.1563 L782.9063,228.7969 C782.9063,228.375 782.8906,228.2344 782.7656,228.0625 C782.5938,227.8125 782.3125,227.6563 781.9844,227.6563 C781.6719,227.6563 781.4688,227.7656 781.25,228.0313 C780.0781,227.5313 779.6406,227.4219 778.6875,227.4219 C776.0156,227.4219 774,229.4375 774,232.0625 L774,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="793" y="236.606">K</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="765" x2="804" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="765" x2="804" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
+      <ellipse cx="764.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M767.4688,218.6406 Q766.8906,218.9375 766.25,219.0781 Q765.6094,219.2344 764.9063,219.2344 Q762.4063,219.2344 761.0781,217.5938 Q759.7656,215.9375 759.7656,212.8125 Q759.7656,209.6875 761.0781,208.0313 Q762.4063,206.375 764.9063,206.375 Q765.6094,206.375 766.25,206.5313 Q766.9063,206.6875 767.4688,206.9844 L767.4688,209.7031 Q766.8438,209.125 766.25,208.8594 Q765.6563,208.5781 765.0313,208.5781 Q763.6875,208.5781 763,209.6563 Q762.3125,210.7188 762.3125,212.8125 Q762.3125,214.9063 763,215.9844 Q763.6875,217.0469 765.0313,217.0469 Q765.6563,217.0469 766.25,216.7813 Q766.8438,216.5 767.4688,215.9219 L767.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="217.1543">K</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000287495916564113342">
-        <rect codeLine="46" fill="#F1F1F1" height="131.9996" id="C_0000287495916564113342" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="402" x="207.5" y="7"/>
-        <ellipse cx="399.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M394.25,24.1563 C394.25,26.6563 396.3906,28.4688 399.3125,28.4688 C400.5469,28.4688 401.7188,28.1719 402.4688,27.6563 C403.0781,27.2344 403.4063,26.8125 403.4063,26.4063 C403.4063,25.9375 402.9844,25.5313 402.4844,25.5313 C402.25,25.5313 402.0313,25.6094 401.8281,25.8125 C401.3906,26.25 401.3906,26.25 401.2188,26.3438 C400.7656,26.5781 400.125,26.7188 399.3594,26.7188 C397.3594,26.7188 396.0781,25.7031 396.0781,24.125 L396.0781,23.0781 C396.0781,21.375 397.2969,20.1719 399,20.1719 C399.5781,20.1719 400.1563,20.3125 400.625,20.5625 C401.0938,20.8281 401.2656,21.0156 401.3281,21.375 C401.4531,22.0469 401.7031,22.2969 402.2344,22.2969 C402.5156,22.2969 402.7969,22.1563 402.9844,21.9375 C403.1094,21.7656 403.1563,21.5938 403.1563,21.1563 L403.1563,19.7969 C403.1563,19.375 403.1406,19.2344 403.0156,19.0625 C402.8438,18.8125 402.5625,18.6563 402.2344,18.6563 C401.9219,18.6563 401.7188,18.7656 401.5,19.0313 C400.3281,18.5313 399.8906,18.4219 398.9375,18.4219 C396.2656,18.4219 394.25,20.4375 394.25,23.0625 L394.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="419.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="208.5" x2="608.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="47.9"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="49.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="376" x="227.5" y="56.0059">R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="208.5" x2="608.5" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="72.6999"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="74.6999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="227.5" y="80.8059">some_int : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="89.4998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="91.4998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="146" x="227.5" y="97.6058">some_int_pointer : int *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="106.2997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="108.2997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="227.5" y="114.4057">some_int_pointer_pointer : int **</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="123.0997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="125.0997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="227.5" y="131.2057">some_int_reference : int &amp;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="213.5" y="8"/>
+      <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="40" y2="40"/>
     </a>
-    <g id="link_C_0000287495916564113342_C_0000121332093434690887">
-      <path codeLine="54" d="M224.9586,143.8818 C169.6686,166.4318 119.82,188.46 65.5,216 C59.86,218.86 53.93,222.25 48.48,225.53 " fill="none" id="C_0000287495916564113342-backto-C_0000121332093434690887" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="236.07,139.35,229.0037,137.9121,224.9586,143.8818,232.0249,145.3197,236.07,139.35" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="159.5" y="182.077">-a</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0001424864837456200487">
-      <path codeLine="55" d="M282.08,139.4 C237.37,163 186.92,190.2 141.5,216 C135.87,219.2 134.9752,219.6767 129.4152,223.0367 " fill="none" id="C_0000287495916564113342-to-C_0001424864837456200487" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="124.28,226.14,134.0516,224.9085,128.5593,223.554,129.9139,218.0617,124.28,226.14" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="223.5" y="182.077">-b</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0002151170391844743478">
-      <path codeLine="56" d="M317.66,139.45 C274.96,170.22 232.5278,200.7923 205.8278,220.0323 " fill="none" id="C_0000287495916564113342-to-C_0002151170391844743478" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="200.96,223.54,210.6002,221.5236,205.0165,220.6169,205.9232,215.0332,200.96,223.54" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="274.5" y="182.077">-c</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0001378112127131766972">
-      <path codeLine="57" d="M348.43,139.21 C323.53,166.24 300.3149,191.4368 281.9949,211.3268 " fill="none" id="C_0000287495916564113342-to-C_0001378112127131766972" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="277.93,215.74,286.9695,211.8301,281.3174,212.0623,281.0852,206.4102,277.93,215.74" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="320.5" y="182.077">-d</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0001535300935831802489">
-      <path codeLine="58" d="M378.46,139.21 C366.02,166.24 354.8798,190.4002 345.7198,210.2902 " fill="none" id="C_0000287495916564113342-to-C_0001535300935831802489" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="343.21,215.74,350.608,209.2385,345.3015,211.1985,343.3415,205.892,343.21,215.74" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="365.5" y="182.077">-e</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0001803800465279710134">
-      <path codeLine="59" d="M408.5,151.21 C408.5,178.24 408.5,195.85 408.5,215.74 " fill="none" id="C_0000287495916564113342-backto-C_0001803800465279710134" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="408.5,139.21,404.5,145.21,408.5,151.21,412.5,145.21,408.5,139.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="409.5" y="182.077">-f</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0001135797791892670246">
-      <path codeLine="60" d="M438.93,139.21 C451.54,166.24 462.8209,190.4137 472.1109,210.3037 " fill="none" id="C_0000287495916564113342-to-C_0001135797791892670246" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="474.65,215.74,474.4655,205.8929,472.5341,211.2098,467.2172,209.2783,474.65,215.74" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="462.5" y="182.077">-g</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0001243547836571712317">
-      <path codeLine="61" d="M469.36,139.21 C494.76,166.42 518.5066,191.8632 537.0666,211.7532 " fill="none" id="C_0000287495916564113342-to-C_0001243547836571712317" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="541.16,216.14,537.9444,206.8309,537.7488,212.4844,532.0953,212.2888,541.16,216.14" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="514.5" y="182.077">-h</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0000387733199705628658">
-      <path codeLine="62" d="M498.94,139.45 C543.2,171.48 587.5594,203.5823 613.4394,222.3123 " fill="none" id="C_0000287495916564113342-to-C_0000387733199705628658" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="618.3,225.83,613.3543,217.313,614.2495,222.8985,608.6639,223.7938,618.3,225.83" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="564.5" y="182.077">-i</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0000747991828672433537">
-      <path codeLine="63" d="M532.62,139.4 C576.73,163.06 626.57,190.3 671.5,216 C677.52,219.45 678.8813,220.1961 684.7613,223.7661 " fill="none" id="C_0000287495916564113342-to-C_0000747991828672433537" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="689.89,226.88,684.2728,218.79,685.6161,224.2851,680.121,225.6283,689.89,226.88" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="615.5" y="182.077">-j</text>
-    </g>
-    <g id="link_C_0000287495916564113342_C_0001783571342994833467">
-      <path codeLine="64" d="M577.9,139.47 C632.5,162.07 692.76,188.63 746.5,216 C752.13,218.87 752.9192,219.1661 758.3692,222.4461 " fill="none" id="C_0000287495916564113342-to-C_0001783571342994833467" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="763.51,225.54,757.8614,217.4719,759.226,222.9617,753.7362,224.3263,763.51,225.54" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="684.5" y="182.077">-k</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="46"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="353" x="233.5" y="54.2104">R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="66.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="68.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="233.5" y="75.0151">some_int : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="79.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="81.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="233.5" y="87.8198">some_int_pointer : int *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="92.4141"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="94.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="233.5" y="100.6245">some_int_pointer_pointer : int **</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="105.2188"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="107.2188"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="233.5" y="113.4292">some_int_reference : int &amp;</text>
+    </a>
+    <path d="M227.33,124.78 C173.51,145.32 114.85,170.01 63,197 C57.36,199.93 51.44,203.42 46.03,206.78 " fill="none" id="C_0000287495916564113342&lt;-C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="239.82,120.06,232.7927,118.4422,228.5966,124.3067,235.6239,125.9245,239.82,120.06" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="164" y="163.0669">-a</text>
+    <path d="M286.66,120.01 C239.94,142.86 185.91,170.26 138,197 C133.93,199.27 129.67,201.79 125.55,204.29 " fill="none" id="C_0000287495916564113342-&gt;C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="121.15,207,130.9093,205.6752,125.4044,204.3731,126.7064,198.8682,121.15,207" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="226" y="163.0669">-b</text>
+    <path d="M322.33,120.08 C279.51,149.32 229.87,183.22 200.8,203.07 " fill="none" id="C_0000287495916564113342-&gt;C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="196.32,206.13,206.0096,204.3659,200.4514,203.3138,201.5036,197.7556,196.32,206.13" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="277" y="163.0669">-c</text>
+    <path d="M349.34,120.08 C324.54,145.54 296.31,174.52 276.66,194.69 " fill="none" id="C_0000287495916564113342-&gt;C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="272.85,198.6,281.9915,194.9348,276.3352,195.0148,276.2552,189.3585,272.85,198.6" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="320" y="163.0669">-d</text>
+    <path d="M376.35,120.08 C364.57,144.41 351.24,171.96 341.57,191.97 " fill="none" id="C_0000287495916564113342-&gt;C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="339.31,196.62,346.8402,190.272,341.4945,192.1225,339.6441,186.7768,339.31,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="363" y="163.0669">-e</text>
+    <path d="M403,133.26 C403,155.95 403,179.72 403,196.62 " fill="none" id="C_0000287495916564113342&lt;-C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="403,120.08,399,126.08,403,132.08,407,126.08,403,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="9" x="404" y="163.0669">-f</text>
+    <path d="M429.65,120.08 C441.43,144.41 454.76,171.96 464.43,191.97 " fill="none" id="C_0000287495916564113342-&gt;C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="466.69,196.62,466.3559,186.7768,464.5055,192.1225,459.1598,190.272,466.69,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="453" y="163.0669">-g</text>
+    <path d="M456.66,120.08 C481.46,145.54 509.69,174.52 529.34,194.69 " fill="none" id="C_0000287495916564113342-&gt;C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="533.15,198.6,529.7448,189.3585,529.6648,195.0148,524.0085,194.9348,533.15,198.6" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="502" y="163.0669">-h</text>
+    <path d="M482.6,120.08 C526.05,150.15 576.62,185.14 604.91,204.71 " fill="none" id="C_0000287495916564113342-&gt;C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="609.25,207.72,604.1332,199.3046,605.1411,204.871,599.5748,205.8789,609.25,207.72" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="550" y="163.0669">-i</text>
+    <path d="M517.59,120.01 C563.14,142.75 615.64,170.06 662,197 C666.34,199.52 670.88,202.35 675.2,205.15 " fill="none" id="C_0000287495916564113342-&gt;C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="679.43,207.91,674.0946,199.6315,675.2479,205.1695,669.7099,206.3228,679.43,207.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="608" y="163.0669">-j</text>
+    <path d="M559.13,120.02 C614.82,141.62 677.28,168.16 732,197 C736.23,199.23 740.62,201.76 744.84,204.3 " fill="none" id="C_0000287495916564113342-&gt;C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="749.33,207.05,743.7539,198.9317,745.0693,204.4335,739.5675,205.7489,749.33,207.05" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="664" y="163.0669">-k</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00017_class_mermaid.svg b/docs/test_cases/t00017_class_mermaid.svg
index adea92c5..312c0448 100644
--- a/docs/test_cases/t00017_class_mermaid.svg
+++ b/docs/test_cases/t00017_class_mermaid.svg
@@ -1,71 +1,66 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 796.640625 308" style="max-width: 796.641px; background-color: white;" width="796.640625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M157.68208786076138,166.93757480878676L134.94861488396782,173.9479790073223C112.21514190717426,180.9583832058578,66.74819595358713,194.97919160292892,44.014722976793564,207.65626246813113C21.28125,220.33333333333334,21.28125,231.66666666666666,21.28125,237.33333333333334L21.28125,243"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M185.94534574468085,175L171.2617464539007,180.66666666666666C156.57814716312058,186.33333333333334,127.21094858156027,197.66666666666666,112.52734929078014,208C97.84375,218.33333333333334,97.84375,227.66666666666666,97.84375,232.33333333333334L97.84375,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M240.3535904255319,175L229.36236702127658,180.66666666666666C218.3711436170213,186.33333333333334,196.38869680851064,197.66666666666666,185.3974734042553,208C174.40625,218.33333333333334,174.40625,227.66666666666666,174.40625,232.33333333333334L174.40625,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M294.761835106383,175L287.4629875886525,180.66666666666666C280.164140070922,186.33333333333334,265.56644503546096,197.66666666666666,258.2675975177305,208C250.96875,218.33333333333334,250.96875,227.66666666666666,250.96875,232.33333333333334L250.96875,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M348.85362367021276,175L345.22567597517735,180.66666666666666C341.59772828014184,186.33333333333334,334.3418328900709,197.66666666666666,330.71388519503546,208C327.0859375,218.33333333333334,327.0859375,227.66666666666666,327.0859375,232.33333333333334L327.0859375,237"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M402.3125,193L402.3125,195.66666666666666C402.3125,198.33333333333334,402.3125,203.66666666666666,402.3125,212C402.3125,220.33333333333334,402.3125,231.66666666666666,402.3125,237.33333333333334L402.3125,243"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M456.40428856382977,175L460.0751883865248,180.66666666666666C463.74608820921986,186.33333333333334,471.08788785460996,197.66666666666666,474.75878767730495,208C478.4296875,218.33333333333334,478.4296875,227.66666666666666,478.4296875,232.33333333333334L478.4296875,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M511.1289893617021,175L518.5137411347517,180.66666666666666C525.8984929078014,186.33333333333334,540.6679964539007,197.66666666666666,548.0527482269504,208C555.4375,218.33333333333334,555.4375,227.66666666666666,555.4375,232.33333333333334L555.4375,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M563.0111369680851,175L573.916832890071,180.66666666666666C584.8225288120567,186.33333333333334,606.6339206560284,197.66666666666666,617.5396165780143,208C628.4453125,218.33333333333334,628.4453125,227.66666666666666,628.4453125,232.33333333333334L628.4453125,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M613.9494680851064,175L628.3120567375887,180.66666666666666C642.674645390071,186.33333333333334,671.3998226950355,197.66666666666666,685.7624113475177,208C700.125,218.33333333333334,700.125,227.66666666666666,700.125,232.33333333333334L700.125,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M629.7421875,163.13439790575916L654.01171875,170.77866492146597C678.28125,178.42293193717276,726.8203125,193.7114659685864,751.08984375,206.02239965095987C775.359375,218.33333333333334,775.359375,227.66666666666666,775.359375,232.33333333333334L775.359375,237"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M179.328125,160.26250717624868L152.98697916666666,168.38542264687388C126.64583333333333,176.5083381174991,73.96354166666667,192.75416905874954,47.622395833333336,206.54375119604143C21.28125,220.33333333333334,21.28125,231.66666666666666,21.28125,237.33333333333334L21.28125,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M185.94534574468085,175L171.2617464539007,180.66666666666666C156.57814716312058,186.33333333333334,127.21094858156027,197.66666666666666,112.52734929078014,209C97.84375,220.33333333333334,97.84375,231.66666666666666,97.84375,237.33333333333334L97.84375,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M240.3535904255319,175L229.36236702127658,180.66666666666666C218.3711436170213,186.33333333333334,196.38869680851064,197.66666666666666,185.3974734042553,209C174.40625,220.33333333333334,174.40625,231.66666666666666,174.40625,237.33333333333334L174.40625,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M294.761835106383,175L287.4629875886525,180.66666666666666C280.164140070922,186.33333333333334,265.56644503546096,197.66666666666666,258.2675975177305,209C250.96875,220.33333333333334,250.96875,231.66666666666666,250.96875,237.33333333333334L250.96875,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M348.85362367021276,175L345.22567597517735,180.66666666666666C341.59772828014184,186.33333333333334,334.3418328900709,197.66666666666666,330.71388519503546,209C327.0859375,220.33333333333334,327.0859375,231.66666666666666,327.0859375,237.33333333333334L327.0859375,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M402.3125,175L402.3125,180.66666666666666C402.3125,186.33333333333334,402.3125,197.66666666666666,402.3125,209C402.3125,220.33333333333334,402.3125,231.66666666666666,402.3125,237.33333333333334L402.3125,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M456.40428856382977,175L460.0751883865248,180.66666666666666C463.74608820921986,186.33333333333334,471.08788785460996,197.66666666666666,474.75878767730495,209C478.4296875,220.33333333333334,478.4296875,231.66666666666666,478.4296875,237.33333333333334L478.4296875,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M511.1289893617021,175L518.5137411347517,180.66666666666666C525.8984929078014,186.33333333333334,540.6679964539007,197.66666666666666,548.0527482269504,209C555.4375,220.33333333333334,555.4375,231.66666666666666,555.4375,237.33333333333334L555.4375,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M563.0111369680851,175L573.916832890071,180.66666666666666C584.8225288120567,186.33333333333334,606.6339206560284,197.66666666666666,617.5396165780143,209C628.4453125,220.33333333333334,628.4453125,231.66666666666666,628.4453125,237.33333333333334L628.4453125,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M613.9494680851064,175L628.3120567375887,180.66666666666666C642.674645390071,186.33333333333334,671.3998226950355,197.66666666666666,685.7624113475177,209C700.125,220.33333333333334,700.125,231.66666666666666,700.125,237.33333333333334L700.125,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M625.296875,161.73424083769635L650.3072916666666,169.61186736474696C675.3177083333334,177.48949389179757,725.3385416666666,193.24474694589878,750.3489583333334,206.78904013961605C775.359375,220.33333333333334,775.359375,231.66666666666666,775.359375,237.33333333333334L775.359375,243"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(21.28125, 209)" class="edgeLabel">
@@ -191,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L5">
+        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L5">
           <g title="A" id="classId-C_0000121332093434690887-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -210,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L7">
+        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L7">
           <g title="B" id="classId-C_0001424864837456200487-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -229,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L9">
+        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L9">
           <g title="C" id="classId-C_0002151170391844743478-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -248,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L11">
+        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L11">
           <g title="D" id="classId-C_0001378112127131766972-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -267,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L13">
+        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L13">
           <g title="E" id="classId-C_0001535300935831802489-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -286,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L15">
+        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L15">
           <g title="F" id="classId-C_0001803800465279710134-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -305,7 +300,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L17">
+        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L17">
           <g title="G" id="classId-C_0001135797791892670246-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -324,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L19">
+        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L19">
           <g title="H" id="classId-C_0001243547836571712317-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -343,7 +338,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L21">
+        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L21">
           <g title="I" id="classId-C_0000387733199705628658-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -362,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L23">
+        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L23">
           <g title="J" id="classId-C_0000747991828672433537-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -381,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L25">
+        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L25">
           <g title="K" id="classId-C_0001783571342994833467-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -400,11 +395,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00017/t00017.cc#L27">
+        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L27">
           <g title="R" id="classId-C_0000287495916564113342-11" class="node default clickable">
-            <rect height="167" width="454.859375" y="-83.5" x="-227.4296875" class="outer title-state"/>
-            <line y2="-53.5" y1="-53.5" x2="227.4296875" x1="-227.4296875" class="divider"/>
-            <line y2="50.5" y1="50.5" x2="227.4296875" x1="-227.4296875" class="divider"/>
+            <rect height="167" width="445.96875" y="-83.5" x="-222.984375" class="outer title-state"/>
+            <line y2="-53.5" y1="-53.5" x2="222.984375" x1="-222.984375" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="222.984375" x1="-222.984375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -416,29 +411,29 @@
                   <span class="nodeLabel">R</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -219.9296875, -42)" height="18" width="100.484375">
+              <foreignObject transform="translate( -215.484375, -42)" height="18" width="100.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-some_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -219.9296875, -20)" height="18" width="158.3125">
+              <foreignObject transform="translate( -215.484375, -20)" height="18" width="158.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-some_int_pointer : int</span>
+                  <span style="font-style:italic;" class="nodeLabel">-some_int_pointer : int </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -219.9296875, 2)" height="18" width="226.796875">
+              <foreignObject transform="translate( -215.484375, 2)" height="18" width="226.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
                   <span style="font-style:italic;" class="nodeLabel">-some_int_pointer_pointer : int *</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -219.9296875, 24)" height="18" width="192.09375">
+              <foreignObject transform="translate( -215.484375, 24)" height="18" width="192.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-some_int_reference : int &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -219.9296875, 58)" height="18" width="439.859375">
+              <foreignObject transform="translate( -215.484375, 58)" height="18" width="430.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : : void</span>
+                  <span class="nodeLabel">-R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md
index d9e5d875..3b358daa 100644
--- a/docs/test_cases/t00018.md
+++ b/docs/test_cases/t00018.md
@@ -141,7 +141,7 @@ void widget::draw(const clanguml::t00018::widget &w)
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00018::impl::widget",
+      "display_name": "impl::widget",
       "id": "130502639682787993",
       "is_abstract": false,
       "is_nested": false,
@@ -270,7 +270,7 @@ void widget::draw(const clanguml::t00018::widget &w)
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00018::widget",
+      "display_name": "widget",
       "id": "1005661284373854088",
       "is_abstract": false,
       "is_nested": false,
@@ -565,6 +565,7 @@ void widget::draw(const clanguml::t00018::widget &w)
     }
   ],
   "name": "t00018_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index a7fbcc88..e057e753 100644
--- a/docs/test_cases/t00018_class.svg
+++ b/docs/test_cases/t00018_class.svg
@@ -1,138 +1,136 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="446px" preserveAspectRatio="none" style="width:333px;height:446px;background:#FFFFFF;" version="1.1" viewBox="0 0 333 446" width="333px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="395px" preserveAspectRatio="none" style="width:317px;height:395px;" version="1.1" viewBox="0 0 317 395" width="317px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f10awcl9lcodyh" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <g id="elem_C_0000130502639682787993">
-        <rect codeLine="2" fill="#F1F1F1" height="123.1997" id="C_0000130502639682787993" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="249" x="42" y="7"/>
-        <ellipse cx="124.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M119.75,24.1563 C119.75,26.6563 121.8906,28.4688 124.8125,28.4688 C126.0469,28.4688 127.2188,28.1719 127.9688,27.6563 C128.5781,27.2344 128.9063,26.8125 128.9063,26.4063 C128.9063,25.9375 128.4844,25.5313 127.9844,25.5313 C127.75,25.5313 127.5313,25.6094 127.3281,25.8125 C126.8906,26.25 126.8906,26.25 126.7188,26.3438 C126.2656,26.5781 125.625,26.7188 124.8594,26.7188 C122.8594,26.7188 121.5781,25.7031 121.5781,24.125 L121.5781,23.0781 C121.5781,21.375 122.7969,20.1719 124.5,20.1719 C125.0781,20.1719 125.6563,20.3125 126.125,20.5625 C126.5938,20.8281 126.7656,21.0156 126.8281,21.375 C126.9531,22.0469 127.2031,22.2969 127.7344,22.2969 C128.0156,22.2969 128.2969,22.1563 128.4844,21.9375 C128.6094,21.7656 128.6563,21.5938 128.6563,21.1563 L128.6563,19.7969 C128.6563,19.375 128.6406,19.2344 128.5156,19.0625 C128.3438,18.8125 128.0625,18.6563 127.7344,18.6563 C127.4219,18.6563 127.2188,18.7656 127,19.0313 C125.8281,18.5313 125.3906,18.4219 124.4375,18.4219 C121.7656,18.4219 119.75,20.4375 119.75,23.0625 L119.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="145.25" y="27.606">impl::widget</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="43" x2="290" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="48" y="47.9"/>
-          <ellipse cx="53" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="62" y="56.0059">widget(int n) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="43" x2="290" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="48" y="72.6999"/>
-          <ellipse cx="53" cy="77.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="223" x="62" y="80.8059">draw(const widget &amp; w) const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="48" y="89.4998"/>
-          <ellipse cx="53" cy="94.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="185" x="62" y="97.6058">draw(const widget &amp; w) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="43" x2="290" y1="105.3998" y2="105.3998"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="48" y="114.2997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="50" y="116.2997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="62" y="122.4057">n : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10awcl9lcodyh)" height="107.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="40.5" y="8"/>
+      <ellipse cx="114.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M117.7188,29.6406 Q117.1406,29.9375 116.5,30.0781 Q115.8594,30.2344 115.1563,30.2344 Q112.6563,30.2344 111.3281,28.5938 Q110.0156,26.9375 110.0156,23.8125 Q110.0156,20.6875 111.3281,19.0313 Q112.6563,17.375 115.1563,17.375 Q115.8594,17.375 116.5,17.5313 Q117.1563,17.6875 117.7188,17.9844 L117.7188,20.7031 Q117.0938,20.125 116.5,19.8594 Q115.9063,19.5781 115.2813,19.5781 Q113.9375,19.5781 113.25,20.6563 Q112.5625,21.7188 112.5625,23.8125 Q112.5625,25.9063 113.25,26.9844 Q113.9375,28.0469 115.2813,28.0469 Q115.9063,28.0469 116.5,27.7813 Q117.0938,27.5 117.7188,26.9219 L117.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="135.25" y="28.1543">impl::widget</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <g id="elem_C_0001005661284373854088">
-        <rect codeLine="11" fill="#F1F1F1" height="231.9993" id="C_0001005661284373854088" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="319" x="7" y="207.2"/>
-        <ellipse cx="141.75" cy="223.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M136.75,224.3563 C136.75,226.8563 138.8906,228.6688 141.8125,228.6688 C143.0469,228.6688 144.2188,228.3719 144.9688,227.8563 C145.5781,227.4344 145.9063,227.0125 145.9063,226.6063 C145.9063,226.1375 145.4844,225.7313 144.9844,225.7313 C144.75,225.7313 144.5313,225.8094 144.3281,226.0125 C143.8906,226.45 143.8906,226.45 143.7188,226.5438 C143.2656,226.7781 142.625,226.9188 141.8594,226.9188 C139.8594,226.9188 138.5781,225.9031 138.5781,224.325 L138.5781,223.2781 C138.5781,221.575 139.7969,220.3719 141.5,220.3719 C142.0781,220.3719 142.6563,220.5125 143.125,220.7625 C143.5938,221.0281 143.7656,221.2156 143.8281,221.575 C143.9531,222.2469 144.2031,222.4969 144.7344,222.4969 C145.0156,222.4969 145.2969,222.3563 145.4844,222.1375 C145.6094,221.9656 145.6563,221.7938 145.6563,221.3563 L145.6563,219.9969 C145.6563,219.575 145.6406,219.4344 145.5156,219.2625 C145.3438,219.0125 145.0625,218.8563 144.7344,218.8563 C144.4219,218.8563 144.2188,218.9656 144,219.2313 C142.8281,218.7313 142.3906,218.6219 141.4375,218.6219 C138.7656,218.6219 136.75,220.6375 136.75,223.2625 L136.75,224.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="162.25" y="227.806">widget</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="325" y1="239.2" y2="239.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="248.1"/>
-          <ellipse cx="18" cy="253.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="27" y="256.2059">widget(int) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="264.8999"/>
-          <ellipse cx="18" cy="269.8999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152" x="27" y="273.0059">widget(widget &amp;&amp;) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="281.6998"/>
-          <ellipse cx="18" cy="286.6998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="244" x="27" y="289.8058">widget(const widget &amp;) = deleted : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="298.4997"/>
-          <ellipse cx="18" cy="303.4997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="27" y="306.6057">~widget() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="325" y1="314.3997" y2="314.3997"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="323.2997"/>
-          <ellipse cx="18" cy="328.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="27" y="331.4057">operator=(widget &amp;&amp;) : widget &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="340.0996"/>
-          <ellipse cx="18" cy="345.0996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="293" x="27" y="348.2056">operator=(const widget &amp;) = deleted : widget &amp;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="325" y1="355.9996" y2="355.9996"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="364.8995"/>
-          <ellipse cx="18" cy="369.8995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="27" y="373.0055">draw() const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="381.6995"/>
-          <ellipse cx="18" cy="386.6995" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="27" y="389.8054">draw() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="398.4994"/>
-          <ellipse cx="18" cy="403.4994" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="128" x="27" y="406.6054">shown() const : bool</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="325" y1="414.3993" y2="414.3993"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="423.2993"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="425.2993"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="233" x="27" y="431.4053">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="46"/>
+      <ellipse cx="51.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0000130502639682787993_C_0001005661284373854088">
-      <path codeLine="26" d="M161.15,130.48 C160.46,140.41 159.87,150.58 159.5,160.2 C158.92,175.25 158.771,185.0912 159.081,200.7212 " fill="none" id="C_0000130502639682787993-to-C_0001005661284373854088" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="159.2,206.72,163.0207,197.6425,159.1009,201.721,155.0223,197.8011,159.2,206.72" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001005661284373854088_C_0000130502639682787993">
-      <path codeLine="27" d="M166.5,194.77 C166.5,168.41 166.5,153.42 166.5,130.43 " fill="none" id="C_0001005661284373854088-backto-C_0000130502639682787993" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="166.5,206.77,170.5,200.77,166.5,194.77,162.5,200.77,166.5,206.77" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="169.5" y="166.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="179.5" y="173.277">pImpl</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="60.5" y="54.2104">widget(int n) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="41.5" x2="270.5" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="66.8047"/>
+      <ellipse cx="51.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="205" x="60.5" y="75.0151">draw(const widget &amp; w) const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="79.6094"/>
+      <ellipse cx="51.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="60.5" y="87.8198">draw(const widget &amp; w) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="94.4141" y2="94.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="100.4141"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="102.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="60.5" y="108.6245">n : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10awcl9lcodyh)" height="192.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="6" y="192"/>
+      <ellipse cx="131.25" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M134.2188,213.6406 Q133.6406,213.9375 133,214.0781 Q132.3594,214.2344 131.6563,214.2344 Q129.1563,214.2344 127.8281,212.5938 Q126.5156,210.9375 126.5156,207.8125 Q126.5156,204.6875 127.8281,203.0313 Q129.1563,201.375 131.6563,201.375 Q132.3594,201.375 133,201.5313 Q133.6563,201.6875 134.2188,201.9844 L134.2188,204.7031 Q133.5938,204.125 133,203.8594 Q132.4063,203.5781 131.7813,203.5781 Q130.4375,203.5781 129.75,204.6563 Q129.0625,205.7188 129.0625,207.8125 Q129.0625,209.9063 129.75,210.9844 Q130.4375,212.0469 131.7813,212.0469 Q132.4063,212.0469 133,211.7813 Q133.5938,211.5 134.2188,210.9219 L134.2188,213.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="151.75" y="212.1543">widget</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="224" y2="224"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="230"/>
+      <ellipse cx="17" cy="235" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="238.2104">widget(int) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="242.8047"/>
+      <ellipse cx="17" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="26" y="251.0151">widget(widget &amp;&amp;) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="255.6094"/>
+      <ellipse cx="17" cy="260.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="26" y="263.8198">widget(const widget &amp;) = deleted : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="268.4141"/>
+      <ellipse cx="17" cy="273.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="26" y="276.6245">~widget() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="283.2188" y2="283.2188"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="289.2188"/>
+      <ellipse cx="17" cy="294.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="26" y="297.4292">operator=(widget &amp;&amp;) : widget &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="302.0234"/>
+      <ellipse cx="17" cy="307.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="274" x="26" y="310.2339">operator=(const widget &amp;) = deleted : widget &amp;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="316.8281" y2="316.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.8281"/>
+      <ellipse cx="17" cy="327.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="331.0386">draw() const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.6328"/>
+      <ellipse cx="17" cy="340.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="26" y="343.8433">draw() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="348.4375"/>
+      <ellipse cx="17" cy="353.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="26" y="356.6479">shown() const : bool</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="363.2422" y2="363.2422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="369.2422"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="371.2422"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="377.4526">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
+    </a>
+    <path d="M150.85,115.27 C150.08,125.14 149.41,135.38 149,145 C148.43,158.51 148.42,172.74 148.76,186.76 " fill="none" id="C_0000130502639682787993-&gt;C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="148.91,191.91,152.6773,182.8102,148.7815,186.9117,144.68,183.0158,148.91,191.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M156,178.29 C156,156.29 156,134.11 156,115.14 " fill="none" id="C_0001005661284373854088&lt;-C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="156,191.57,160,185.57,156,179.57,152,185.57,156,191.57" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="159" y="151.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="169" y="158.0669">pImpl</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00018_class_mermaid.svg b/docs/test_cases/t00018_class_mermaid.svg
index 322ffe3d..5a941d07 100644
--- a/docs/test_cases/t00018_class_mermaid.svg
+++ b/docs/test_cases/t00018_class_mermaid.svg
@@ -1,62 +1,57 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 308.890625 506" style="max-width: 308.891px; background-color: white;" width="308.890625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 300 506" style="max-width: 300px; background-color: white;" width="300" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M140.07242150821597,153L138.94902313184664,158.66666666666666C137.82562475547732,164.33333333333334,135.57882800273865,175.66666666666666,135.02751679828825,186.0074072485858C134.47620559383785,196.34814783050493,135.6203799376757,205.69629566100983,136.19246710959462,210.3703695762623L136.76455428151354,215.04444349151476"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M173.5839413221261,203.1333304745443L173.91305006010506,200.44444206212026C174.24215879808403,197.75555364969622,174.90037627404203,192.3777768248481,174.10608663565168,184.0222217457574C173.31179699726135,175.66666666666666,171.0650002445227,164.33333333333334,169.94160186815336,158.66666666666666L168.81820349178403,153"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M135.62710900821597,153L134.50371063184664,158.66666666666666C133.38031225547732,164.33333333333334,131.13351550273865,175.66666666666666,130.7036935152582,187C130.2738715277778,198.33333333333334,131.66102430555557,209.66666666666666,132.35460069444446,215.33333333333334L133.04817708333334,221"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M166.95182291666666,221L167.64539930555554,215.33333333333334C168.33897569444443,209.66666666666666,169.7261284722222,198.33333333333334,169.2963064847418,187C168.86648449726135,175.66666666666666,166.61968774452268,164.33333333333334,165.49628936815336,158.66666666666666L164.37289099178403,153"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -70,7 +65,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(175.55859375, 187)" class="edgeLabel">
+        <g transform="translate(171.11328125, 187)" class="edgeLabel">
           <g transform="translate(-22.2265625, -9)" class="label">
             <foreignObject height="18" width="44.453125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -83,11 +78,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(154.4453125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018_impl.h#L9">
+        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L9">
           <g title="widget" id="classId-C_0000130502639682787993-0" class="node default clickable">
-            <rect height="145" width="292.890625" y="-72.5" x="-146.4453125" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="146.4453125" x1="-146.4453125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="146.4453125" x1="-146.4453125" class="divider"/>
+            <rect height="145" width="284" y="-72.5" x="-142" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="142" x1="-142" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="142" x1="-142" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -99,34 +94,34 @@
                   <span class="nodeLabel">impl::widget</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.9453125, -31)" height="18" width="44.46875">
+              <foreignObject transform="translate( -134.5, -31)" height="18" width="44.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-n : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.9453125, 3)" height="18" width="148.078125">
+              <foreignObject transform="translate( -134.5, 3)" height="18" width="139.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+widget(int n) : : void</span>
+                  <span class="nodeLabel">+widget(int n) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.9453125, 25)" height="18" width="277.890625">
+              <foreignObject transform="translate( -134.5, 25)" height="18" width="269">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw(const widget &amp; w) : : [const] void</span>
+                  <span class="nodeLabel">+draw(const widget &amp; w) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.9453125, 47)" height="18" width="226.3125">
+              <foreignObject transform="translate( -134.5, 47)" height="18" width="217.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw(const widget &amp; w) : : void</span>
+                  <span class="nodeLabel">+draw(const widget &amp; w) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(154.4453125, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00018/t00018.h#L17">
+        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L17">
           <g title="widget" id="classId-C_0001005661284373854088-1" class="node default clickable">
-            <rect height="277" width="291.59375" y="-138.5" x="-145.796875" class="outer title-state"/>
-            <line y2="-108.5" y1="-108.5" x2="145.796875" x1="-145.796875" class="divider"/>
-            <line y2="-70.5" y1="-70.5" x2="145.796875" x1="-145.796875" class="divider"/>
+            <rect height="277" width="282.703125" y="-138.5" x="-141.3515625" class="outer title-state"/>
+            <line y2="-108.5" y1="-108.5" x2="141.3515625" x1="-141.3515625" class="divider"/>
+            <line y2="-70.5" y1="-70.5" x2="141.3515625" x1="-141.3515625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -138,54 +133,54 @@
                   <span class="nodeLabel">widget</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, -97)" height="18" width="266.8125">
+              <foreignObject transform="translate( -133.8515625, -97)" height="18" width="266.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-pImpl : std::unique_ptr&lt;impl::widget&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, -63)" height="18" width="134.734375">
+              <foreignObject transform="translate( -133.8515625, -63)" height="18" width="125.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+widget(int) : : void</span>
+                  <span class="nodeLabel">+widget(int) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, -41)" height="18" width="189.875">
+              <foreignObject transform="translate( -133.8515625, -41)" height="18" width="180.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+widget(widget &amp;&amp;) : : void</span>
+                  <span class="nodeLabel">+widget(widget &amp;&amp;) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, -19)" height="18" width="221.890625">
+              <foreignObject transform="translate( -133.8515625, -19)" height="18" width="213">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+widget(const widget &amp;) : : void</span>
+                  <span class="nodeLabel">+widget(const widget &amp;) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, 3)" height="18" width="127.171875">
+              <foreignObject transform="translate( -133.8515625, 3)" height="18" width="118.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~widget() : : void</span>
+                  <span class="nodeLabel">+~widget() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, 25)" height="18" width="244.578125">
+              <foreignObject transform="translate( -133.8515625, 25)" height="18" width="235.6875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(widget &amp;&amp;) : : widget &amp;</span>
+                  <span class="nodeLabel">+operator=(widget &amp;&amp;) : widget &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, 47)" height="18" width="276.59375">
+              <foreignObject transform="translate( -133.8515625, 47)" height="18" width="267.703125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(const widget &amp;) : : widget &amp;</span>
+                  <span class="nodeLabel">+operator=(const widget &amp;) : widget &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, 69)" height="18" width="157.84375">
+              <foreignObject transform="translate( -133.8515625, 69)" height="18" width="148.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw() : : [const] void</span>
+                  <span class="nodeLabel">+draw() : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, 91)" height="18" width="106.265625">
+              <foreignObject transform="translate( -133.8515625, 91)" height="18" width="97.375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+draw() : : void</span>
+                  <span class="nodeLabel">+draw() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -138.296875, 113)" height="18" width="170.3125">
+              <foreignObject transform="translate( -133.8515625, 113)" height="18" width="161.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+shown() : : [const] bool</span>
+                  <span class="nodeLabel">+shown() : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md
index e376b36b..94c5ffe0 100644
--- a/docs/test_cases/t00019.md
+++ b/docs/test_cases/t00019.md
@@ -14,43 +14,6 @@ diagrams:
 
 ```
 ## Source code
-File `tests/t00019/t00019_layer3.h`
-```cpp
-#pragma once
-
-#include <string>
-
-namespace clanguml {
-namespace t00019 {
-
-template <typename LowerLayer> class Layer3 : public LowerLayer {
-
-    using LowerLayer::LowerLayer;
-
-    virtual int m1() override
-    {
-        m_m1_calls++;
-        return LowerLayer::m1();
-    }
-
-    virtual std::string m2() override
-    {
-        m_m2_calls++;
-        return LowerLayer::m2();
-    }
-
-    int m1_calls() const { return m_m1_calls; }
-
-    int m2_calls() const { return m_m2_calls; }
-
-private:
-    int m_m1_calls{};
-    int m_m2_calls{};
-};
-}
-}
-
-```
 File `tests/t00019/t00019_layer1.h`
 ```cpp
 #pragma once
@@ -100,29 +63,6 @@ public:
 }
 }
 
-```
-File `tests/t00019/t00019_base.h`
-```cpp
-#pragma once
-
-#include <string>
-
-namespace clanguml {
-namespace t00019 {
-
-class Base {
-
-    Base() = default;
-
-    virtual ~Base() = default;
-
-    virtual int m1() { return 2; }
-
-    virtual std::string m2() { return "two"; }
-};
-}
-}
-
 ```
 File `tests/t00019/t00019_layer2.h`
 ```cpp
@@ -147,6 +87,66 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
 }
 }
 
+```
+File `tests/t00019/t00019_layer3.h`
+```cpp
+#pragma once
+
+#include <string>
+
+namespace clanguml {
+namespace t00019 {
+
+template <typename LowerLayer> class Layer3 : public LowerLayer {
+
+    using LowerLayer::LowerLayer;
+
+    virtual int m1() override
+    {
+        m_m1_calls++;
+        return LowerLayer::m1();
+    }
+
+    virtual std::string m2() override
+    {
+        m_m2_calls++;
+        return LowerLayer::m2();
+    }
+
+    int m1_calls() const { return m_m1_calls; }
+
+    int m2_calls() const { return m_m2_calls; }
+
+private:
+    int m_m1_calls{};
+    int m_m2_calls{};
+};
+}
+}
+
+```
+File `tests/t00019/t00019_base.h`
+```cpp
+#pragma once
+
+#include <string>
+
+namespace clanguml {
+namespace t00019 {
+
+class Base {
+
+    Base() = default;
+
+    virtual ~Base() = default;
+
+    virtual int m1() { return 2; }
+
+    virtual std::string m2() { return "two"; }
+};
+}
+}
+
 ```
 ## Generated PlantUML diagrams
 ![t00019_class](./t00019_class.svg "Layercake pattern")
@@ -159,7 +159,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00019::Base",
+      "display_name": "Base",
       "id": "261668487476634123",
       "is_abstract": false,
       "is_nested": false,
@@ -286,7 +286,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00019::Layer1<LowerLayer>",
+      "display_name": "Layer1<LowerLayer>",
       "id": "902631298537519271",
       "is_abstract": false,
       "is_nested": false,
@@ -368,7 +368,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00019::Layer2<LowerLayer>",
+      "display_name": "Layer2<LowerLayer>",
       "id": "1115150925302580647",
       "is_abstract": false,
       "is_nested": false,
@@ -424,7 +424,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00019::Layer3<LowerLayer>",
+      "display_name": "Layer3<LowerLayer>",
       "id": "1853410560073854945",
       "is_abstract": false,
       "is_nested": false,
@@ -590,7 +590,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
           "name": "clanguml::t00019::Base"
         }
       ],
-      "display_name": "clanguml::t00019::Layer3<clanguml::t00019::Base>",
+      "display_name": "Layer3<Base>",
       "id": "972890420743280319",
       "is_abstract": false,
       "is_nested": false,
@@ -604,7 +604,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
       "source_location": {
         "column": 11,
         "file": "",
-        "line": 277,
+        "line": 269,
         "translation_unit": "t00019.cc"
       },
       "template_parameters": [
@@ -626,7 +626,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
           "name": "clanguml::t00019::Layer3<clanguml::t00019::Base>"
         }
       ],
-      "display_name": "clanguml::t00019::Layer2<clanguml::t00019::Layer3<clanguml::t00019::Base>>",
+      "display_name": "Layer2<Layer3<Base>>",
       "id": "129784999866998870",
       "is_abstract": false,
       "is_nested": false,
@@ -640,7 +640,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
       "source_location": {
         "column": 11,
         "file": "",
-        "line": 277,
+        "line": 269,
         "translation_unit": "t00019.cc"
       },
       "template_parameters": [
@@ -669,7 +669,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
           "name": "clanguml::t00019::Layer2<clanguml::t00019::Layer3<clanguml::t00019::Base>>"
         }
       ],
-      "display_name": "clanguml::t00019::Layer1<clanguml::t00019::Layer2<clanguml::t00019::Layer3<clanguml::t00019::Base>>>",
+      "display_name": "Layer1<Layer2<Layer3<Base>>>",
       "id": "659076058325663708",
       "is_abstract": false,
       "is_nested": false,
@@ -683,7 +683,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
       "source_location": {
         "column": 11,
         "file": "",
-        "line": 277,
+        "line": 269,
         "translation_unit": "t00019.cc"
       },
       "template_parameters": [
@@ -712,7 +712,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00019::A",
+      "display_name": "A",
       "id": "1015164998787089197",
       "is_abstract": false,
       "is_nested": false,
@@ -747,6 +747,7 @@ template <typename LowerLayer> class Layer2 : public LowerLayer {
     }
   ],
   "name": "t00019_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index a028924b..973774db 100644
--- a/docs/test_cases/t00019_class.svg
+++ b/docs/test_cases/t00019_class.svg
@@ -1,222 +1,198 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="740px" preserveAspectRatio="none" style="width:822px;height:740px;background:#FFFFFF;" version="1.1" viewBox="0 0 822 740" width="822px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="693px" preserveAspectRatio="none" style="width:797px;height:693px;" version="1.1" viewBox="0 0 797 693" width="797px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fzwb2c6j0fdad" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <g id="elem_C_0000261668487476634123">
-        <rect codeLine="2" fill="#F1F1F1" height="123.1997" id="C_0000261668487476634123" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="239" x="7" y="7"/>
-        <ellipse cx="106.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M101.25,24.1563 C101.25,26.6563 103.3906,28.4688 106.3125,28.4688 C107.5469,28.4688 108.7188,28.1719 109.4688,27.6563 C110.0781,27.2344 110.4063,26.8125 110.4063,26.4063 C110.4063,25.9375 109.9844,25.5313 109.4844,25.5313 C109.25,25.5313 109.0313,25.6094 108.8281,25.8125 C108.3906,26.25 108.3906,26.25 108.2188,26.3438 C107.7656,26.5781 107.125,26.7188 106.3594,26.7188 C104.3594,26.7188 103.0781,25.7031 103.0781,24.125 L103.0781,23.0781 C103.0781,21.375 104.2969,20.1719 106,20.1719 C106.5781,20.1719 107.1563,20.3125 107.625,20.5625 C108.0938,20.8281 108.2656,21.0156 108.3281,21.375 C108.4531,22.0469 108.7031,22.2969 109.2344,22.2969 C109.5156,22.2969 109.7969,22.1563 109.9844,21.9375 C110.1094,21.7656 110.1563,21.5938 110.1563,21.1563 L110.1563,19.7969 C110.1563,19.375 110.1406,19.2344 110.0156,19.0625 C109.8438,18.8125 109.5625,18.6563 109.2344,18.6563 C108.9219,18.6563 108.7188,18.7656 108.5,19.0313 C107.3281,18.5313 106.8906,18.4219 105.9375,18.4219 C103.2656,18.4219 101.25,20.4375 101.25,23.0625 L101.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="126.75" y="27.606">Base</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="245" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="47.9"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="49.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139" x="27" y="56.0059">Base() = default : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="64.6999"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="66.6999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213" x="27" y="72.8059">~Base() constexpr = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="245" y1="80.5999" y2="80.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="89.4998"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="91.4998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="27" y="97.6058">m1() : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="106.2997"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="108.2997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="27" y="114.4057">m2() : std::string</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="245" y1="122.1997" y2="122.1997"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="107.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="6" y="8"/>
+      <ellipse cx="97.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M100.7188,29.6406 Q100.1406,29.9375 99.5,30.0781 Q98.8594,30.2344 98.1563,30.2344 Q95.6563,30.2344 94.3281,28.5938 Q93.0156,26.9375 93.0156,23.8125 Q93.0156,20.6875 94.3281,19.0313 Q95.6563,17.375 98.1563,17.375 Q98.8594,17.375 99.5,17.5313 Q100.1563,17.6875 100.7188,17.9844 L100.7188,20.7031 Q100.0938,20.125 99.5,19.8594 Q98.9063,19.5781 98.2813,19.5781 Q96.9375,19.5781 96.25,20.6563 Q95.5625,21.7188 95.5625,23.8125 Q95.5625,25.9063 96.25,26.9844 Q96.9375,28.0469 98.2813,28.0469 Q98.9063,28.0469 99.5,27.7813 Q100.0938,27.5 100.7188,26.9219 L100.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="118.25" y="28.1543">Base</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="228" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <g id="elem_C_0000902631298537519271">
-        <rect codeLine="11" fill="#F1F1F1" height="81.5999" id="C_0000902631298537519271" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="145" x="505" y="651.8"/>
-        <ellipse cx="520" cy="667.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M515,668.9563 C515,671.4563 517.1406,673.2688 520.0625,673.2688 C521.2969,673.2688 522.4688,672.9719 523.2188,672.4563 C523.8281,672.0344 524.1563,671.6125 524.1563,671.2063 C524.1563,670.7375 523.7344,670.3313 523.2344,670.3313 C523,670.3313 522.7813,670.4094 522.5781,670.6125 C522.1406,671.05 522.1406,671.05 521.9688,671.1438 C521.5156,671.3781 520.875,671.5188 520.1094,671.5188 C518.1094,671.5188 516.8281,670.5031 516.8281,668.925 L516.8281,667.8781 C516.8281,666.175 518.0469,664.9719 519.75,664.9719 C520.3281,664.9719 520.9063,665.1125 521.375,665.3625 C521.8438,665.6281 522.0156,665.8156 522.0781,666.175 C522.2031,666.8469 522.4531,667.0969 522.9844,667.0969 C523.2656,667.0969 523.5469,666.9563 523.7344,666.7375 C523.8594,666.5656 523.9063,666.3938 523.9063,665.9563 L523.9063,664.5969 C523.9063,664.175 523.8906,664.0344 523.7656,663.8625 C523.5938,663.6125 523.3125,663.4563 522.9844,663.4563 C522.6719,663.4563 522.4688,663.5656 522.25,663.8313 C521.0781,663.3313 520.6406,663.2219 519.6875,663.2219 C517.0156,663.2219 515,665.2375 515,667.8625 L515,668.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="534" y="672.406">Layer1</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="67" x="586" y="648.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="65" x="587" y="663.0001">LowerLayer</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="506" x2="649" y1="683.8" y2="683.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="511" y="692.7"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="513" y="694.7"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="525" y="700.8059">m1() : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="511" y="709.4999"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="513" y="711.4999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="525" y="717.6059">m2() : std::string</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="506" x2="649" y1="725.3999" y2="725.3999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <g id="elem_C_0001115150925302580647">
-        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0001115150925302580647" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="194" x="203.5" y="526"/>
-        <ellipse cx="240.55" cy="542" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M235.55,543.1563 C235.55,545.6563 237.6906,547.4688 240.6125,547.4688 C241.8469,547.4688 243.0188,547.1719 243.7688,546.6563 C244.3781,546.2344 244.7063,545.8125 244.7063,545.4063 C244.7063,544.9375 244.2844,544.5313 243.7844,544.5313 C243.55,544.5313 243.3313,544.6094 243.1281,544.8125 C242.6906,545.25 242.6906,545.25 242.5188,545.3438 C242.0656,545.5781 241.425,545.7188 240.6594,545.7188 C238.6594,545.7188 237.3781,544.7031 237.3781,543.125 L237.3781,542.0781 C237.3781,540.375 238.5969,539.1719 240.3,539.1719 C240.8781,539.1719 241.4563,539.3125 241.925,539.5625 C242.3938,539.8281 242.5656,540.0156 242.6281,540.375 C242.7531,541.0469 243.0031,541.2969 243.5344,541.2969 C243.8156,541.2969 244.0969,541.1563 244.2844,540.9375 C244.4094,540.7656 244.4563,540.5938 244.4563,540.1563 L244.4563,538.7969 C244.4563,538.375 244.4406,538.2344 244.3156,538.0625 C244.1438,537.8125 243.8625,537.6563 243.5344,537.6563 C243.2219,537.6563 243.0188,537.7656 242.8,538.0313 C241.6281,537.5313 241.1906,537.4219 240.2375,537.4219 C237.5656,537.4219 235.55,539.4375 235.55,542.0625 L235.55,543.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="259.45" y="546.606">Layer2</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="67" x="333.5" y="523"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="65" x="334.5" y="537.2001">LowerLayer</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="204.5" x2="396.5" y1="558" y2="558"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="209.5" y="566.9"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="211.5" y="568.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="168" x="223.5" y="575.0059">all_calls_count() const : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="204.5" x2="396.5" y1="582.7999" y2="582.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="128" x="26" y="54.2104">Base() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <g id="elem_C_0001853410560073854945">
-        <rect codeLine="22" fill="#F1F1F1" height="148.7996" id="C_0001853410560073854945" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="28" y="300.2"/>
-        <ellipse cx="48.4" cy="316.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M43.4,317.3563 C43.4,319.8563 45.5406,321.6688 48.4625,321.6688 C49.6969,321.6688 50.8688,321.3719 51.6188,320.8563 C52.2281,320.4344 52.5563,320.0125 52.5563,319.6063 C52.5563,319.1375 52.1344,318.7313 51.6344,318.7313 C51.4,318.7313 51.1813,318.8094 50.9781,319.0125 C50.5406,319.45 50.5406,319.45 50.3688,319.5438 C49.9156,319.7781 49.275,319.9188 48.5094,319.9188 C46.5094,319.9188 45.2281,318.9031 45.2281,317.325 L45.2281,316.2781 C45.2281,314.575 46.4469,313.3719 48.15,313.3719 C48.7281,313.3719 49.3063,313.5125 49.775,313.7625 C50.2438,314.0281 50.4156,314.2156 50.4781,314.575 C50.6031,315.2469 50.8531,315.4969 51.3844,315.4969 C51.6656,315.4969 51.9469,315.3563 52.1344,315.1375 C52.2594,314.9656 52.3063,314.7938 52.3063,314.3563 L52.3063,312.9969 C52.3063,312.575 52.2906,312.4344 52.1656,312.2625 C51.9938,312.0125 51.7125,311.8563 51.3844,311.8563 C51.0719,311.8563 50.8688,311.9656 50.65,312.2313 C49.4781,311.7313 49.0406,311.6219 48.0875,311.6219 C45.4156,311.6219 43.4,313.6375 43.4,316.2625 L43.4,317.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="63.6" y="320.806">Layer3</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="67" x="121" y="297.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="65" x="122" y="311.4001">LowerLayer</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="29" x2="184" y1="332.2" y2="332.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="341.1"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="343.1"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="48" y="349.2059">m1() : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="357.8999"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="359.8999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="48" y="366.0059">m1_calls() const : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="374.6998"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="376.6998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="48" y="382.8058">m2() : std::string</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="391.4997"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="393.4997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="48" y="399.6057">m2_calls() const : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="29" x2="184" y1="407.3997" y2="407.3997"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="416.2997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="418.2997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="48" y="424.4057">m_m1_calls : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="433.0996"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="435.0996"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="48" y="441.2056">m_m2_calls : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="60.8047"/>
     </a>
-    <g id="elem_C_0000972890420743280319">
-      <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0000972890420743280319" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="72.5" y="191.2"/>
-      <ellipse cx="87.5" cy="207.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-      <path d="M82.5,208.3562 C82.5,210.8562 84.6406,212.6687 87.5625,212.6687 C88.7969,212.6687 89.9688,212.3719 90.7188,211.8562 C91.3281,211.4344 91.6563,211.0125 91.6563,210.6062 C91.6563,210.1375 91.2344,209.7312 90.7344,209.7312 C90.5,209.7312 90.2813,209.8094 90.0781,210.0125 C89.6406,210.45 89.6406,210.45 89.4688,210.5437 C89.0156,210.7781 88.375,210.9187 87.6094,210.9187 C85.6094,210.9187 84.3281,209.9031 84.3281,208.325 L84.3281,207.2781 C84.3281,205.575 85.5469,204.3719 87.25,204.3719 C87.8281,204.3719 88.4063,204.5125 88.875,204.7625 C89.3438,205.0281 89.5156,205.2156 89.5781,205.575 C89.7031,206.2469 89.9531,206.4969 90.4844,206.4969 C90.7656,206.4969 91.0469,206.3562 91.2344,206.1375 C91.3594,205.9656 91.4063,205.7937 91.4063,205.3562 L91.4063,203.9969 C91.4063,203.575 91.3906,203.4344 91.2656,203.2625 C91.0938,203.0125 90.8125,202.8562 90.4844,202.8562 C90.1719,202.8562 89.9688,202.9656 89.75,203.2312 C88.5781,202.7312 88.1406,202.6219 87.1875,202.6219 C84.5156,202.6219 82.5,204.6375 82.5,207.2625 L82.5,208.3562 Z " fill="#000000"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="101.5" y="211.806">Layer3</text>
-      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="30" x="153.5" y="188.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="28" x="154.5" y="202.4001">Base</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="73.5" x2="179.5" y1="223.2" y2="223.2"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="73.5" x2="179.5" y1="231.2" y2="231.2"/>
-    </g>
-    <g id="elem_C_0000129784999866998870">
-      <rect codeLine="36" fill="#F1F1F1" height="48" id="C_0000129784999866998870" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="160" x="220.5" y="350.6"/>
-      <ellipse cx="235.5" cy="366.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-      <path d="M230.5,367.7562 C230.5,370.2562 232.6406,372.0687 235.5625,372.0687 C236.7969,372.0687 237.9688,371.7719 238.7188,371.2562 C239.3281,370.8344 239.6563,370.4125 239.6563,370.0062 C239.6563,369.5375 239.2344,369.1312 238.7344,369.1312 C238.5,369.1312 238.2813,369.2094 238.0781,369.4125 C237.6406,369.85 237.6406,369.85 237.4688,369.9437 C237.0156,370.1781 236.375,370.3187 235.6094,370.3187 C233.6094,370.3187 232.3281,369.3031 232.3281,367.725 L232.3281,366.6781 C232.3281,364.975 233.5469,363.7719 235.25,363.7719 C235.8281,363.7719 236.4063,363.9125 236.875,364.1625 C237.3438,364.4281 237.5156,364.6156 237.5781,364.975 C237.7031,365.6469 237.9531,365.8969 238.4844,365.8969 C238.7656,365.8969 239.0469,365.7562 239.2344,365.5375 C239.3594,365.3656 239.4063,365.1937 239.4063,364.7562 L239.4063,363.3969 C239.4063,362.975 239.3906,362.8344 239.2656,362.6625 C239.0938,362.4125 238.8125,362.2562 238.4844,362.2562 C238.1719,362.2562 237.9688,362.3656 237.75,362.6312 C236.5781,362.1312 236.1406,362.0219 235.1875,362.0219 C232.5156,362.0219 230.5,364.0375 230.5,366.6625 L230.5,367.7562 Z " fill="#000000"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="249.5" y="371.206">Layer2</text>
-      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="82" x="301.5" y="347.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="80" x="302.5" y="361.8001">Layer3&lt;Base&gt;</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="221.5" x2="379.5" y1="382.6" y2="382.6"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="221.5" x2="379.5" y1="390.6" y2="390.6"/>
-    </g>
-    <g id="elem_C_0000659076058325663708">
-      <rect codeLine="40" fill="#F1F1F1" height="48" id="C_0000659076058325663708" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="471.5" y="534.4"/>
-      <ellipse cx="486.5" cy="550.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-      <path d="M481.5,551.5563 C481.5,554.0563 483.6406,555.8688 486.5625,555.8688 C487.7969,555.8688 488.9688,555.5719 489.7188,555.0563 C490.3281,554.6344 490.6563,554.2125 490.6563,553.8063 C490.6563,553.3375 490.2344,552.9313 489.7344,552.9313 C489.5,552.9313 489.2813,553.0094 489.0781,553.2125 C488.6406,553.65 488.6406,553.65 488.4688,553.7438 C488.0156,553.9781 487.375,554.1188 486.6094,554.1188 C484.6094,554.1188 483.3281,553.1031 483.3281,551.525 L483.3281,550.4781 C483.3281,548.775 484.5469,547.5719 486.25,547.5719 C486.8281,547.5719 487.4063,547.7125 487.875,547.9625 C488.3438,548.2281 488.5156,548.4156 488.5781,548.775 C488.7031,549.4469 488.9531,549.6969 489.4844,549.6969 C489.7656,549.6969 490.0469,549.5563 490.2344,549.3375 C490.3594,549.1656 490.4063,548.9938 490.4063,548.5563 L490.4063,547.1969 C490.4063,546.775 490.3906,546.6344 490.2656,546.4625 C490.0938,546.2125 489.8125,546.0563 489.4844,546.0563 C489.1719,546.0563 488.9688,546.1656 488.75,546.4313 C487.5781,545.9313 487.1406,545.8219 486.1875,545.8219 C483.5156,545.8219 481.5,547.8375 481.5,550.4625 L481.5,551.5563 Z " fill="#000000"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="500.5" y="555.006">Layer1</text>
-      <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="134" x="552.5" y="531.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="132" x="553.5" y="545.6001">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="472.5" x2="682.5" y1="566.4" y2="566.4"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="472.5" x2="682.5" y1="574.4" y2="574.4"/>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001015164998787089197">
-        <rect codeLine="44" fill="#F1F1F1" height="64.7999" id="C_0001015164998787089197" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="399" x="416" y="342.2"/>
-        <ellipse cx="606.75" cy="358.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M601.75,359.3563 C601.75,361.8563 603.8906,363.6688 606.8125,363.6688 C608.0469,363.6688 609.2188,363.3719 609.9688,362.8563 C610.5781,362.4344 610.9063,362.0125 610.9063,361.6063 C610.9063,361.1375 610.4844,360.7313 609.9844,360.7313 C609.75,360.7313 609.5313,360.8094 609.3281,361.0125 C608.8906,361.45 608.8906,361.45 608.7188,361.5438 C608.2656,361.7781 607.625,361.9188 606.8594,361.9188 C604.8594,361.9188 603.5781,360.9031 603.5781,359.325 L603.5781,358.2781 C603.5781,356.575 604.7969,355.3719 606.5,355.3719 C607.0781,355.3719 607.6563,355.5125 608.125,355.7625 C608.5938,356.0281 608.7656,356.2156 608.8281,356.575 C608.9531,357.2469 609.2031,357.4969 609.7344,357.4969 C610.0156,357.4969 610.2969,357.3563 610.4844,357.1375 C610.6094,356.9656 610.6563,356.7938 610.6563,356.3563 L610.6563,354.9969 C610.6563,354.575 610.6406,354.4344 610.5156,354.2625 C610.3438,354.0125 610.0625,353.8563 609.7344,353.8563 C609.4219,353.8563 609.2188,353.9656 609,354.2313 C607.8281,353.7313 607.3906,353.6219 606.4375,353.6219 C603.7656,353.6219 601.75,355.6375 601.75,358.2625 L601.75,359.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="627.25" y="362.806">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="417" x2="814" y1="374.2" y2="374.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="417" x2="814" y1="382.2" y2="382.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="422" y="391.1"/>
-          <ellipse cx="427" cy="396.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="373" x="436" y="399.2059">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="67.0151">~Base() constexpr = default : void</text>
     </a>
-    <g id="link_C_0000972890420743280319_C_0001853410560073854945">
-      <path codeLine="48" d="M123.55,239.43 C121.51,255.5 120.9218,260.0027 118.1518,281.8727 " fill="none" id="C_0000972890420743280319-to-C_0001853410560073854945" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="115.89,299.73,124.1042,282.6266,112.1993,281.1187,115.89,299.73" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000261668487476634123_C_0000972890420743280319">
-      <path codeLine="49" d="M126.5,148.51 C126.5,169.81 126.5,174.46 126.5,190.83 " fill="none" id="C_0000261668487476634123-backto-C_0000972890420743280319" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="126.5,130.51,120.5,148.51,132.5,148.51,126.5,130.51" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000129784999866998870_C_0001115150925302580647">
-      <path codeLine="50" d="M300.5,399 C300.5,431.22 300.5,471.37 300.5,507.54 " fill="none" id="C_0000129784999866998870-to-C_0001115150925302580647" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="300.5,525.54,306.5,507.54,294.5,507.54,300.5,525.54" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000972890420743280319_C_0000129784999866998870">
-      <path codeLine="51" d="M165.521,251.5027 C198.421,281.2527 241.77,320.48 274.72,350.28 " fill="none" id="C_0000972890420743280319-backto-C_0000129784999866998870" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="152.17,239.43,161.4968,255.9531,169.5452,247.0524,152.17,239.43" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000659076058325663708_C_0000902631298537519271">
-      <path codeLine="52" d="M577.5,582.73 C577.5,601.71 577.5,610.92 577.5,633.4 " fill="none" id="C_0000659076058325663708-to-C_0000902631298537519271" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="577.5,651.4,583.5,633.4,571.5,633.4,577.5,651.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000129784999866998870_C_0000659076058325663708">
-      <path codeLine="53" d="M344.2063,409.8749 C363.3863,424.7149 374.89,433.07 398.5,449 C444.57,480.1 499.51,512.74 536.26,533.98 " fill="none" id="C_0000129784999866998870-backto-C_0000659076058325663708" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="329.97,398.86,340.5346,414.6203,347.8779,405.1295,329.97,398.86" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001015164998787089197_C_0000659076058325663708">
-      <path codeLine="54" d="M606.4244,419.0161 C598.8544,455.2261 589.1,501.92 582.36,534.17 " fill="none" id="C_0001015164998787089197-backto-C_0000659076058325663708" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="608.88,407.27,603.7368,412.3245,606.4244,419.0161,611.5675,413.9616,608.88,407.27" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="599.5" cy="488.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="606.5" y="492.077">layers</text>
-    </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="228" y1="73.6094" y2="73.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="79.6094"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="81.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="87.8198">m1() : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="92.4141"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="94.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="100.6245">m2() : std::string</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="228" y1="107.2188" y2="107.2188"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="491.5" y="609"/>
+      <ellipse cx="506.5" cy="625" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M509.4688,630.6406 Q508.8906,630.9375 508.25,631.0781 Q507.6094,631.2344 506.9063,631.2344 Q504.4063,631.2344 503.0781,629.5938 Q501.7656,627.9375 501.7656,624.8125 Q501.7656,621.6875 503.0781,620.0313 Q504.4063,618.375 506.9063,618.375 Q507.6094,618.375 508.25,618.5313 Q508.9063,618.6875 509.4688,618.9844 L509.4688,621.7031 Q508.8438,621.125 508.25,620.8594 Q507.6563,620.5781 507.0313,620.5781 Q505.6875,620.5781 505,621.6563 Q504.3125,622.7188 504.3125,624.8125 Q504.3125,626.9063 505,627.9844 Q505.6875,629.0469 507.0313,629.0469 Q507.6563,629.0469 508.25,628.7813 Q508.8438,628.5 509.4688,627.9219 L509.4688,630.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="520.5" y="629.1543">Layer1</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="569.5" y="606"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="570.5" y="618.1387">LowerLayer</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="640.5" y1="641" y2="641"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="497.5" y="647"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="499.5" y="649"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="511.5" y="655.2104">m1() : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="497.5" y="659.8047"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="499.5" y="661.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="511.5" y="668.0151">m2() : std::string</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="640.5" y1="674.6094" y2="674.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="204" y="487"/>
+      <ellipse cx="231.15" cy="503" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M234.1188,508.6406 Q233.5406,508.9375 232.9,509.0781 Q232.2594,509.2344 231.5563,509.2344 Q229.0563,509.2344 227.7281,507.5938 Q226.4156,505.9375 226.4156,502.8125 Q226.4156,499.6875 227.7281,498.0313 Q229.0563,496.375 231.5563,496.375 Q232.2594,496.375 232.9,496.5313 Q233.5563,496.6875 234.1188,496.9844 L234.1188,499.7031 Q233.4938,499.125 232.9,498.8594 Q232.3063,498.5781 231.6813,498.5781 Q230.3375,498.5781 229.65,499.6563 Q228.9625,500.7188 228.9625,502.8125 Q228.9625,504.9063 229.65,505.9844 Q230.3375,507.0469 231.6813,507.0469 Q232.3063,507.0469 232.9,506.7813 Q233.4938,506.5 234.1188,505.9219 L234.1188,508.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="247.85" y="507.1543">Layer2</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="309" y="484"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="310" y="496.1387">LowerLayer</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="380" y1="519" y2="519"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="210" y="525"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="212" y="527"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="533.2104">all_calls_count() const : int</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="380" y1="539.8047" y2="539.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="22.5" y="285"/>
+      <ellipse cx="37.5" cy="301" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M40.4688,306.6406 Q39.8906,306.9375 39.25,307.0781 Q38.6094,307.2344 37.9063,307.2344 Q35.4063,307.2344 34.0781,305.5938 Q32.7656,303.9375 32.7656,300.8125 Q32.7656,297.6875 34.0781,296.0313 Q35.4063,294.375 37.9063,294.375 Q38.6094,294.375 39.25,294.5313 Q39.9063,294.6875 40.4688,294.9844 L40.4688,297.7031 Q39.8438,297.125 39.25,296.8594 Q38.6563,296.5781 38.0313,296.5781 Q36.6875,296.5781 36,297.6563 Q35.3125,298.7188 35.3125,300.8125 Q35.3125,302.9063 36,303.9844 Q36.6875,305.0469 38.0313,305.0469 Q38.6563,305.0469 39.25,304.7813 Q39.8438,304.5 40.4688,303.9219 L40.4688,306.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="51.5" y="305.1543">Layer3</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="100.5" y="282"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="101.5" y="294.1387">LowerLayer</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.5" x2="171.5" y1="317" y2="317"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="323"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="325"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="42.5" y="331.2104">m1() : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="335.8047"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="337.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="42.5" y="344.0151">m1_calls() const : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="348.6094"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="350.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="42.5" y="356.8198">m2() : std::string</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="361.4141"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="363.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="42.5" y="369.6245">m2_calls() const : int</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.5" x2="171.5" y1="376.2188" y2="376.2188"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="382.2188"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="384.2188"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="42.5" y="390.4292">m_m1_calls : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="395.0234"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="397.0234"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="42.5" y="403.2339">m_m2_calls : int</text>
+    </a>
+    <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="64" y="176"/>
+    <ellipse cx="79" cy="192" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M81.9688,197.6406 Q81.3906,197.9375 80.75,198.0781 Q80.1094,198.2344 79.4063,198.2344 Q76.9063,198.2344 75.5781,196.5938 Q74.2656,194.9375 74.2656,191.8125 Q74.2656,188.6875 75.5781,187.0313 Q76.9063,185.375 79.4063,185.375 Q80.1094,185.375 80.75,185.5313 Q81.4063,185.6875 81.9688,185.9844 L81.9688,188.7031 Q81.3438,188.125 80.75,187.8594 Q80.1563,187.5781 79.5313,187.5781 Q78.1875,187.5781 77.5,188.6563 Q76.8125,189.7188 76.8125,191.8125 Q76.8125,193.9063 77.5,194.9844 Q78.1875,196.0469 79.5313,196.0469 Q80.1563,196.0469 80.75,195.7813 Q81.3438,195.5 81.9688,194.9219 L81.9688,197.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="93" y="196.1543">Layer3</text>
+    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="32" x="142" y="173"/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="143" y="185.1387">Base</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="65" x2="170" y1="208" y2="208"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="65" x2="170" y1="216" y2="216"/>
+    <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="207.5" y="323.5"/>
+    <ellipse cx="222.5" cy="339.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225.4688,345.1406 Q224.8906,345.4375 224.25,345.5781 Q223.6094,345.7344 222.9063,345.7344 Q220.4063,345.7344 219.0781,344.0938 Q217.7656,342.4375 217.7656,339.3125 Q217.7656,336.1875 219.0781,334.5313 Q220.4063,332.875 222.9063,332.875 Q223.6094,332.875 224.25,333.0313 Q224.9063,333.1875 225.4688,333.4844 L225.4688,336.2031 Q224.8438,335.625 224.25,335.3594 Q223.6563,335.0781 223.0313,335.0781 Q221.6875,335.0781 221,336.1563 Q220.3125,337.2188 220.3125,339.3125 Q220.3125,341.4063 221,342.4844 Q221.6875,343.5469 223.0313,343.5469 Q223.6563,343.5469 224.25,343.2813 Q224.8438,343 225.4688,342.4219 L225.4688,345.1406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="236.5" y="343.6543">Layer2</text>
+    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="285.5" y="320.5"/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="286.5" y="332.6387">Layer3&lt;Base&gt;</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="208.5" x2="376.5" y1="355.5" y2="355.5"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="208.5" x2="376.5" y1="363.5" y2="363.5"/>
+    <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="450" y="493.5"/>
+    <ellipse cx="465" cy="509.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M467.9688,515.1406 Q467.3906,515.4375 466.75,515.5781 Q466.1094,515.7344 465.4063,515.7344 Q462.9063,515.7344 461.5781,514.0938 Q460.2656,512.4375 460.2656,509.3125 Q460.2656,506.1875 461.5781,504.5313 Q462.9063,502.875 465.4063,502.875 Q466.1094,502.875 466.75,503.0313 Q467.4063,503.1875 467.9688,503.4844 L467.9688,506.2031 Q467.3438,505.625 466.75,505.3594 Q466.1563,505.0781 465.5313,505.0781 Q464.1875,505.0781 463.5,506.1563 Q462.8125,507.2188 462.8125,509.3125 Q462.8125,511.4063 463.5,512.4844 Q464.1875,513.5469 465.5313,513.5469 Q466.1563,513.5469 466.75,513.2813 Q467.3438,513 467.9688,512.4219 L467.9688,515.1406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="479" y="513.6543">Layer1</text>
+    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="158" x="528" y="490.5"/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="529" y="502.6387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="682" y1="525.5" y2="525.5"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="682" y1="533.5" y2="533.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="412.5" y="317"/>
+      <ellipse cx="591.25" cy="333" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M594.2188,338.6406 Q593.6406,338.9375 593,339.0781 Q592.3594,339.2344 591.6563,339.2344 Q589.1563,339.2344 587.8281,337.5938 Q586.5156,335.9375 586.5156,332.8125 Q586.5156,329.6875 587.8281,328.0313 Q589.1563,326.375 591.6563,326.375 Q592.3594,326.375 593,326.5313 Q593.6563,326.6875 594.2188,326.9844 L594.2188,329.7031 Q593.5938,329.125 593,328.8594 Q592.4063,328.5781 591.7813,328.5781 Q590.4375,328.5781 589.75,329.6563 Q589.0625,330.7188 589.0625,332.8125 Q589.0625,334.9063 589.75,335.9844 Q590.4375,337.0469 591.7813,337.0469 Q592.4063,337.0469 593,336.7813 Q593.5938,336.5 594.2188,335.9219 L594.2188,338.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="611.75" y="337.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="413.5" x2="785.5" y1="349" y2="349"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="413.5" x2="785.5" y1="357" y2="357"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="418.5" y="363"/>
+      <ellipse cx="423.5" cy="368" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="348" x="432.5" y="371.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
+    </a>
+    <path d="M114.33,224.05 C112.76,235.48 110.76,250.03 108.69,265.08 " fill="none" id="C_0000972890420743280319-&gt;C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="115.62,266.08,105.96,284.94,101.75,264.18,115.62,266.08" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M117.5,135.31 C117.5,150.07 117.5,164.54 117.5,175.95 " fill="none" id="C_0000261668487476634123&lt;-C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="110.5,135.27,117.5,115.27,124.5,135.27,110.5,135.27" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M292.5,371.51 C292.5,395.89 292.5,435.16 292.5,466.69 " fill="none" id="C_0000129784999866998870-&gt;C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="299.5,466.99,292.5,486.99,285.5,466.99,299.5,466.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M161.05,237.21 C193.46,264.15 236.73,300.13 264.61,323.31 " fill="none" id="C_0000972890420743280319&lt;-C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="156.13,242.22,145.23,224.05,165.08,231.46,156.13,242.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M566.5,541.7 C566.5,554.84 566.5,571.9 566.5,588.35 " fill="none" id="C_0000659076058325663708-&gt;C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="573.5,588.53,566.5,608.53,559.5,588.53,573.5,588.53" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M347.13,381.99 C400.86,414.94 481.47,464.36 528.55,493.23 " fill="none" id="C_0000129784999866998870&lt;-C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="343.42,387.93,330.02,371.51,350.73,375.99,343.42,387.93" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M591.09,391.31 C584.72,423.76 576.2,467.11 571.05,493.36 " fill="none" id="C_0001015164998787089197&lt;-C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="593.68,378.15,588.6008,383.2688,591.3723,389.926,596.4515,384.8072,593.68,378.15" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="587.5" cy="449.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="594.5" y="453.0669">layers</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00019_class_mermaid.svg b/docs/test_cases/t00019_class_mermaid.svg
index d5c02ec1..ab2d4cc5 100644
--- a/docs/test_cases/t00019_class_mermaid.svg
+++ b/docs/test_cases/t00019_class_mermaid.svg
@@ -1,67 +1,62 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 938.84375 805" style="max-width: 938.844px; background-color: white;" width="938.84375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 929.953125 805" style="max-width: 929.953px; background-color: white;" width="929.953125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M158.30859375,259.11538210426664L148.65950520833334,263.42948508688886C139.01041666666666,267.7435880695111,119.71223958333333,276.37179403475557,110.06315104166667,281.85256368404447C100.4140625,287.3333333333333,100.4140625,289.6666666666667,100.4140625,290.8333333333333L100.4140625,292"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M220.07421875,171L220.07421875,172.16666666666666C220.07421875,173.33333333333334,220.07421875,175.66666666666666,220.07421875,181C220.07421875,186.33333333333334,220.07421875,194.66666666666666,220.07421875,198.83333333333334L220.07421875,203"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M337.51647616731515,433L336.219459306096,449.6666666666667C334.92244244487676,466.3333333333333,332.3284087224384,499.6666666666667,331.0313918612192,519C329.734375,538.3333333333334,329.734375,543.6666666666666,329.734375,546.3333333333334L329.734375,549"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M298.2722189167969,266.46228937043225L305.1825782639974,269.55190780869356C312.0929376111979,272.6415262469548,325.913656305599,278.82076312347743,332.82401565279946,297.0770482284054C339.734375,315.3333333333333,339.734375,345.6666666666667,339.734375,360.8333333333333L339.734375,376"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M685.734375,635L685.734375,641C685.734375,647,685.734375,659,685.734375,666.1666666666666C685.734375,673.3333333333334,685.734375,675.6666666666666,685.734375,676.8333333333334L685.734375,678"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M389.6378130241424,444.2074111032627L408.23658897845206,459.0061759193856C426.8353649327616,473.8049407355085,464.03291684138077,503.40247036775423,501.4586220048741,525.7012351838771C538.8843271683673,548,576.5381855867347,563,595.3651147959184,570.5L614.192044005102,578"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M708.7421875,462L708.7421875,473.8333333333333C708.7421875,485.6666666666667,708.7421875,509.3333333333333,706.3944515306122,528.6666666666666C704.0467155612245,548,699.351243622449,563,697.0035076530612,570.5L694.6557716836735,578"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M151.640625,259.63803885045235L142.36197916666666,263.865032375377C133.08333333333334,268.09202590030156,114.52604166666667,276.5460129501508,105.24739583333333,284.93967314174205C95.96875,293.3333333333333,95.96875,301.6666666666667,95.96875,305.8333333333333L95.96875,310"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M213.40625,153L213.40625,157.16666666666666C213.40625,161.33333333333334,213.40625,169.66666666666666,213.40625,178C213.40625,186.33333333333334,213.40625,194.66666666666666,213.40625,198.83333333333334L213.40625,203"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M328.62585116731515,433L327.328834306096,449.6666666666667C326.03181744487676,466.3333333333333,323.4377837224384,499.6666666666667,322.1407668612192,522C320.84375,544.3333333333334,320.84375,555.6666666666666,320.84375,561.3333333333334L320.84375,567"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M275.171875,259.63803885045235L284.4505208333333,263.865032375377C293.7291666666667,268.09202590030156,312.2864583333333,276.5460129501508,321.5651041666667,295.93967314174205C330.84375,315.3333333333333,330.84375,345.6666666666667,330.84375,360.8333333333333L330.84375,376"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M676.84375,635L676.84375,641C676.84375,647,676.84375,659,676.84375,669.1666666666666C676.84375,679.3333333333334,676.84375,687.6666666666666,676.84375,691.8333333333334L676.84375,696"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M366.6619497811284,433L387.608265442607,449.6666666666667C408.5545811040856,466.3333333333333,450.4472124270428,499.6666666666667,490.2204572977051,523.8333333333334C529.9937021683673,548,567.6475605867347,563,586.4744897959184,570.5L605.301419005102,578"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M699.8515625,444L699.8515625,458.8333333333333C699.8515625,473.6666666666667,699.8515625,503.3333333333333,697.5038265306122,525.6666666666666C695.1560905612245,548,690.460618622449,563,688.1128826530612,570.5L685.7651466836735,578"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -124,7 +119,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(708.7421875, 533)" class="edgeLabel">
+        <g transform="translate(699.8515625, 533)" class="edgeLabel">
           <g transform="translate(-26.015625, -9)" class="label">
             <foreignObject height="18" width="52.03125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -137,11 +132,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(220.07421875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_base.h#L8">
+        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L8">
           <g title="Base" id="classId-C_0000261668487476634123-0" class="node default clickable">
-            <rect height="145" width="263.5625" y="-72.5" x="-131.78125" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="131.78125" x1="-131.78125" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="131.78125" x1="-131.78125" class="divider"/>
+            <rect height="145" width="254.671875" y="-72.5" x="-127.3359375" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -153,30 +148,30 @@
                   <span class="nodeLabel">Base</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.28125, -19)" height="18" width="165.40625">
+              <foreignObject transform="translate( -119.8359375, -19)" height="18" width="156.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-Base() : : [default] void</span>
+                  <span class="nodeLabel">-Base() : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.28125, 3)" height="18" width="248.5625">
+              <foreignObject transform="translate( -119.8359375, 3)" height="18" width="239.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-~Base() : : [default,constexpr] void</span>
+                  <span class="nodeLabel">-~Base() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.28125, 25)" height="18" width="77.34375">
+              <foreignObject transform="translate( -119.8359375, 25)" height="18" width="68.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1() : : int</span>
+                  <span class="nodeLabel">-m1() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -124.28125, 47)" height="18" width="129.796875">
+              <foreignObject transform="translate( -119.8359375, 47)" height="18" width="120.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2() : : std::string</span>
+                  <span class="nodeLabel">-m2() : std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(685.734375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer1.h#L9">
+        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L9">
           <g title="Layer1" id="classId-C_0000902631298537519271-1" class="node default clickable">
             <rect height="101" width="175.09375" y="-50.5" x="-87.546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="87.546875" x1="-87.546875" class="divider"/>
@@ -192,24 +187,24 @@
                   <span class="nodeLabel">Layer1&lt;LowerLayer&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 3)" height="18" width="77.34375">
+              <foreignObject transform="translate( -80.046875, 3)" height="18" width="68.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1() : : int</span>
+                  <span class="nodeLabel">-m1() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -80.046875, 25)" height="18" width="129.796875">
+              <foreignObject transform="translate( -80.046875, 25)" height="18" width="120.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2() : : std::string</span>
+                  <span class="nodeLabel">-m2() : std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(329.734375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer2.h#L6">
+        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L6">
           <g title="Layer2" id="classId-C_0001115150925302580647-2" class="node default clickable">
-            <rect height="79" width="226.640625" y="-39.5" x="-113.3203125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="113.3203125" x1="-113.3203125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="113.3203125" x1="-113.3203125" class="divider"/>
+            <rect height="79" width="217.75" y="-39.5" x="-108.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="108.875" x1="-108.875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="108.875" x1="-108.875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -221,19 +216,19 @@
                   <span class="nodeLabel">Layer2&lt;LowerLayer&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -105.8203125, 14)" height="18" width="211.640625">
+              <foreignObject transform="translate( -101.375, 14)" height="18" width="202.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-all_calls_count() : : [const] int</span>
+                  <span class="nodeLabel">-all_calls_count() : [const] int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(100.4140625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019_layer3.h#L8">
+        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L8">
           <g title="Layer3" id="classId-C_0001853410560073854945-3" class="node default clickable">
-            <rect height="189" width="184.828125" y="-94.5" x="-92.4140625" class="outer title-state"/>
-            <line y2="-64.5" y1="-64.5" x2="92.4140625" x1="-92.4140625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="92.4140625" x1="-92.4140625" class="divider"/>
+            <rect height="189" width="175.9375" y="-94.5" x="-87.96875" class="outer title-state"/>
+            <line y2="-64.5" y1="-64.5" x2="87.96875" x1="-87.96875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="87.96875" x1="-87.96875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -245,40 +240,40 @@
                   <span class="nodeLabel">Layer3&lt;LowerLayer&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -84.9140625, -53)" height="18" width="120.921875">
+              <foreignObject transform="translate( -80.46875, -53)" height="18" width="120.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_m1_calls : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -84.9140625, -31)" height="18" width="120.921875">
+              <foreignObject transform="translate( -80.46875, -31)" height="18" width="120.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_m2_calls : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -84.9140625, 3)" height="18" width="77.34375">
+              <foreignObject transform="translate( -80.46875, 3)" height="18" width="68.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1() : : int</span>
+                  <span class="nodeLabel">-m1() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -84.9140625, 25)" height="18" width="169.828125">
+              <foreignObject transform="translate( -80.46875, 25)" height="18" width="160.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m1_calls() : : [const] int</span>
+                  <span class="nodeLabel">-m1_calls() : [const] int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -84.9140625, 47)" height="18" width="129.796875">
+              <foreignObject transform="translate( -80.46875, 47)" height="18" width="120.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2() : : std::string</span>
+                  <span class="nodeLabel">-m2() : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -84.9140625, 69)" height="18" width="169.828125">
+              <foreignObject transform="translate( -80.46875, 69)" height="18" width="160.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-m2_calls() : : [const] int</span>
+                  <span class="nodeLabel">-m2_calls() : [const] int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(220.07421875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L277">
+        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L269">
           <g title="Layer3" id="classId-C_0000972890420743280319-4" class="node default clickable">
             <rect height="57" width="123.53125" y="-28.5" x="-61.765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.765625" x1="-61.765625" class="divider"/>
@@ -297,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(339.734375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L277">
+        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L269">
           <g title="Layer2" id="classId-C_0000129784999866998870-5" class="node default clickable">
             <rect height="57" width="193.8125" y="-28.5" x="-96.90625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="96.90625" x1="-96.90625" class="divider"/>
@@ -316,7 +311,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(685.734375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L277">
+        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L269">
           <g title="Layer1" id="classId-C_0000659076058325663708-6" class="node default clickable">
             <rect height="57" width="264.09375" y="-28.5" x="-132.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="132.046875" x1="-132.046875" class="divider"/>
@@ -335,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(708.7421875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00019/t00019.cc#L11">
+        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L11">
           <g title="A" id="classId-C_0001015164998787089197-7" class="node default clickable">
             <rect height="79" width="444.203125" y="-39.5" x="-222.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="222.1015625" x1="-222.1015625" class="divider"/>
diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md
index 80829fbb..7a3b031a 100644
--- a/docs/test_cases/t00020.md
+++ b/docs/test_cases/t00020.md
@@ -104,7 +104,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00020::ProductA",
+      "display_name": "ProductA",
       "id": "425267229659464944",
       "is_abstract": true,
       "is_nested": false,
@@ -191,7 +191,7 @@ public:
           "name": "clanguml::t00020::ProductA"
         }
       ],
-      "display_name": "clanguml::t00020::ProductA1",
+      "display_name": "ProductA1",
       "id": "1756496029797864207",
       "is_abstract": false,
       "is_nested": false,
@@ -252,7 +252,7 @@ public:
           "name": "clanguml::t00020::ProductA"
         }
       ],
-      "display_name": "clanguml::t00020::ProductA2",
+      "display_name": "ProductA2",
       "id": "1531708592885216981",
       "is_abstract": false,
       "is_nested": false,
@@ -306,7 +306,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00020::ProductB",
+      "display_name": "ProductB",
       "id": "2235759006374865842",
       "is_abstract": true,
       "is_nested": false,
@@ -393,7 +393,7 @@ public:
           "name": "clanguml::t00020::ProductB"
         }
       ],
-      "display_name": "clanguml::t00020::ProductB1",
+      "display_name": "ProductB1",
       "id": "1465493024233223845",
       "is_abstract": false,
       "is_nested": false,
@@ -454,7 +454,7 @@ public:
           "name": "clanguml::t00020::ProductB"
         }
       ],
-      "display_name": "clanguml::t00020::ProductB2",
+      "display_name": "ProductB2",
       "id": "2154665562370057871",
       "is_abstract": false,
       "is_nested": false,
@@ -508,7 +508,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00020::AbstractFactory",
+      "display_name": "AbstractFactory",
       "id": "1705546469218961425",
       "is_abstract": true,
       "is_nested": false,
@@ -590,7 +590,7 @@ public:
           "name": "clanguml::t00020::AbstractFactory"
         }
       ],
-      "display_name": "clanguml::t00020::Factory1",
+      "display_name": "Factory1",
       "id": "692346848484854107",
       "is_abstract": false,
       "is_nested": false,
@@ -672,7 +672,7 @@ public:
           "name": "clanguml::t00020::AbstractFactory"
         }
       ],
-      "display_name": "clanguml::t00020::Factory2",
+      "display_name": "Factory2",
       "id": "1566325870805013023",
       "is_abstract": false,
       "is_nested": false,
@@ -747,6 +747,7 @@ public:
     }
   ],
   "name": "t00020_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 4f36cd93..9a9567ae 100644
--- a/docs/test_cases/t00020_class.svg
+++ b/docs/test_cases/t00020_class.svg
@@ -1,261 +1,217 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="935px" preserveAspectRatio="none" style="width:812px;height:935px;background:#FFFFFF;" version="1.1" viewBox="0 0 812 935" width="812px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="886px" preserveAspectRatio="none" style="width:763px;height:886px;" version="1.1" viewBox="0 0 763 886" width="763px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fnj1q0g58eo19" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <g id="elem_C_0000425267229659464944">
-        <rect codeLine="2" fill="#F1F1F1" height="91.6998" id="C_0000425267229659464944" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="265" x="311.82" y="152.8"/>
-        <ellipse cx="411.07" cy="168.8" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M412.6013,170.7375 L412.9294,171.5344 L412.6481,171.5344 C412.195,171.5344 412.07,171.5656 411.8981,171.675 C411.6169,171.8156 411.445,172.1125 411.445,172.4094 C411.445,172.7062 411.5856,172.9562 411.82,173.1281 C411.9919,173.2531 412.2263,173.3 412.6481,173.3 L415.0075,173.3 C415.3669,173.3 415.6169,173.2687 415.7575,173.175 C416.0231,173.0344 416.195,172.7219 416.195,172.4094 C416.195,172.1437 416.0544,171.8781 415.82,171.7062 C415.6325,171.5812 415.4763,171.55 415.0231,171.5344 L411.6325,163.7062 L407.9138,163.7062 C407.4606,163.7062 407.32,163.7219 407.1481,163.8312 C406.8825,164.0031 406.7106,164.2844 406.7106,164.5812 C406.7106,164.8625 406.8513,165.1281 407.1013,165.3 C407.2731,165.425 407.4606,165.4562 407.9138,165.4562 L408.8825,165.4562 L406.3044,171.5344 C405.5544,171.5344 405.1481,171.8312 405.1481,172.4094 C405.1481,173.0187 405.5388,173.3 406.3356,173.3 L408.6013,173.3 C408.9606,173.3 409.2106,173.2687 409.3513,173.175 C409.6169,173.0187 409.7888,172.7219 409.7888,172.4094 C409.7888,172.1437 409.6481,171.8781 409.4138,171.7062 C409.2263,171.5656 409.07,171.5344 408.6013,171.5344 L408.3044,171.5344 L408.6481,170.7375 L412.6013,170.7375 Z M411.8356,168.9875 L409.3825,168.9875 L410.6169,166.1125 L411.8356,168.9875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="58" x="431.57" y="174.75">ProductA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="312.82" x2="575.82" y1="184.8" y2="184.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="317.82" y="193.7"/>
-          <ellipse cx="322.82" cy="198.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="239" x="331.82" y="201.8059">~ProductA() constexpr = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="312.82" x2="575.82" y1="209.5999" y2="209.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="317.82" y="219.5499"/>
-          <ellipse cx="322.82" cy="224.5499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="182" x="331.82" y="228.9999">sell(int price) const = 0 : bool</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="312.82" x2="575.82" y1="236.4998" y2="236.4998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="81.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="280.5" y="142"/>
+      <ellipse cx="370.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M370.3594,153.3438 L369.2031,158.4219 L371.5313,158.4219 L370.3594,153.3438 Z M368.875,151.1094 L371.8594,151.1094 L375.2188,163.5 L372.7656,163.5 L372,160.4375 L368.7188,160.4375 L367.9688,163.5 L365.5313,163.5 L368.875,151.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="390.75" y="162.1543">ProductA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <g id="elem_C_0001756496029797864207">
-        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0001756496029797864207" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="207.32" y="304.5"/>
-        <ellipse cx="262.07" cy="320.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M257.07,321.6563 C257.07,324.1563 259.2106,325.9688 262.1325,325.9688 C263.3669,325.9688 264.5388,325.6719 265.2888,325.1563 C265.8981,324.7344 266.2263,324.3125 266.2263,323.9063 C266.2263,323.4375 265.8044,323.0313 265.3044,323.0313 C265.07,323.0313 264.8513,323.1094 264.6481,323.3125 C264.2106,323.75 264.2106,323.75 264.0388,323.8438 C263.5856,324.0781 262.945,324.2188 262.1794,324.2188 C260.1794,324.2188 258.8981,323.2031 258.8981,321.625 L258.8981,320.5781 C258.8981,318.875 260.1169,317.6719 261.82,317.6719 C262.3981,317.6719 262.9763,317.8125 263.445,318.0625 C263.9138,318.3281 264.0856,318.5156 264.1481,318.875 C264.2731,319.5469 264.5231,319.7969 265.0544,319.7969 C265.3356,319.7969 265.6169,319.6563 265.8044,319.4375 C265.9294,319.2656 265.9763,319.0938 265.9763,318.6563 L265.9763,317.2969 C265.9763,316.875 265.9606,316.7344 265.8356,316.5625 C265.6638,316.3125 265.3825,316.1563 265.0544,316.1563 C264.7419,316.1563 264.5388,316.2656 264.32,316.5313 C263.1481,316.0313 262.7106,315.9219 261.7575,315.9219 C259.0856,315.9219 257.07,317.9375 257.07,320.5625 L257.07,321.6563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="282.57" y="325.106">ProductA1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="208.32" x2="390.32" y1="336.5" y2="336.5"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.32" y="345.4"/>
-          <ellipse cx="218.32" cy="350.4" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="158" x="227.32" y="353.5059">sell(int price) const : bool</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="208.32" x2="390.32" y1="361.2999" y2="361.2999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="180"/>
+      <ellipse cx="291.5" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <g id="elem_C_0001531708592885216981">
-        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0001531708592885216981" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="568.32" y="437.7"/>
-        <ellipse cx="623.07" cy="453.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M618.07,454.8563 C618.07,457.3563 620.2106,459.1688 623.1325,459.1688 C624.3669,459.1688 625.5388,458.8719 626.2888,458.3563 C626.8981,457.9344 627.2263,457.5125 627.2263,457.1063 C627.2263,456.6375 626.8044,456.2313 626.3044,456.2313 C626.07,456.2313 625.8513,456.3094 625.6481,456.5125 C625.2106,456.95 625.2106,456.95 625.0388,457.0438 C624.5856,457.2781 623.945,457.4188 623.1794,457.4188 C621.1794,457.4188 619.8981,456.4031 619.8981,454.825 L619.8981,453.7781 C619.8981,452.075 621.1169,450.8719 622.82,450.8719 C623.3981,450.8719 623.9763,451.0125 624.445,451.2625 C624.9138,451.5281 625.0856,451.7156 625.1481,452.075 C625.2731,452.7469 625.5231,452.9969 626.0544,452.9969 C626.3356,452.9969 626.6169,452.8563 626.8044,452.6375 C626.9294,452.4656 626.9763,452.2938 626.9763,451.8563 L626.9763,450.4969 C626.9763,450.075 626.9606,449.9344 626.8356,449.7625 C626.6638,449.5125 626.3825,449.3563 626.0544,449.3563 C625.7419,449.3563 625.5388,449.4656 625.32,449.7313 C624.1481,449.2313 623.7106,449.1219 622.7575,449.1219 C620.0856,449.1219 618.07,451.1375 618.07,453.7625 L618.07,454.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="643.57" y="458.306">ProductA2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="569.32" x2="751.32" y1="469.7" y2="469.7"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="574.32" y="478.6"/>
-          <ellipse cx="579.32" cy="483.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="158" x="588.32" y="486.7059">sell(int price) const : bool</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="569.32" x2="751.32" y1="494.4999" y2="494.4999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="300.5" y="188.2104">~ProductA() constexpr = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <g id="elem_C_0002235759006374865842">
-        <rect codeLine="19" fill="#F1F1F1" height="91.6998" id="C_0002235759006374865842" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="265" x="15.82" y="570.9"/>
-        <ellipse cx="115.07" cy="586.9" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M116.6013,588.8375 L116.9294,589.6344 L116.6481,589.6344 C116.195,589.6344 116.07,589.6656 115.8981,589.775 C115.6169,589.9156 115.445,590.2125 115.445,590.5094 C115.445,590.8063 115.5856,591.0563 115.82,591.2281 C115.9919,591.3531 116.2263,591.4 116.6481,591.4 L119.0075,591.4 C119.3669,591.4 119.6169,591.3688 119.7575,591.275 C120.0231,591.1344 120.195,590.8219 120.195,590.5094 C120.195,590.2438 120.0544,589.9781 119.82,589.8063 C119.6325,589.6813 119.4763,589.65 119.0231,589.6344 L115.6325,581.8063 L111.9138,581.8063 C111.4606,581.8063 111.32,581.8219 111.1481,581.9313 C110.8825,582.1031 110.7106,582.3844 110.7106,582.6813 C110.7106,582.9625 110.8513,583.2281 111.1013,583.4 C111.2731,583.525 111.4606,583.5563 111.9138,583.5563 L112.8825,583.5563 L110.3044,589.6344 C109.5544,589.6344 109.1481,589.9313 109.1481,590.5094 C109.1481,591.1188 109.5388,591.4 110.3356,591.4 L112.6013,591.4 C112.9606,591.4 113.2106,591.3688 113.3513,591.275 C113.6169,591.1188 113.7888,590.8219 113.7888,590.5094 C113.7888,590.2438 113.6481,589.9781 113.4138,589.8063 C113.2263,589.6656 113.07,589.6344 112.6013,589.6344 L112.3044,589.6344 L112.6481,588.8375 L116.6013,588.8375 Z M115.8356,587.0875 L113.3825,587.0875 L114.6169,584.2125 L115.8356,587.0875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="58" x="135.57" y="592.85">ProductB</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="16.82" x2="279.82" y1="602.9" y2="602.9"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.82" y="611.8"/>
-          <ellipse cx="26.82" cy="616.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="239" x="35.82" y="619.9059">~ProductB() constexpr = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="16.82" x2="279.82" y1="627.6999" y2="627.6999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21.82" y="637.6499"/>
-          <ellipse cx="26.82" cy="642.6499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="184" x="35.82" y="647.0999">buy(int price) const = 0 : bool</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="16.82" x2="279.82" y1="654.5998" y2="654.5998"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="281.5" x2="523.5" y1="194.8047" y2="194.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="200.8047"/>
+      <ellipse cx="291.5" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <g id="elem_C_0001465493024233223845">
-        <rect codeLine="26" fill="#F1F1F1" height="64.7999" id="C_0001465493024233223845" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="186" x="276.32" y="722.6"/>
-        <ellipse cx="332.07" cy="738.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M327.07,739.7563 C327.07,742.2563 329.2106,744.0688 332.1325,744.0688 C333.3669,744.0688 334.5388,743.7719 335.2888,743.2563 C335.8981,742.8344 336.2263,742.4125 336.2263,742.0063 C336.2263,741.5375 335.8044,741.1313 335.3044,741.1313 C335.07,741.1313 334.8513,741.2094 334.6481,741.4125 C334.2106,741.85 334.2106,741.85 334.0388,741.9438 C333.5856,742.1781 332.945,742.3188 332.1794,742.3188 C330.1794,742.3188 328.8981,741.3031 328.8981,739.725 L328.8981,738.6781 C328.8981,736.975 330.1169,735.7719 331.82,735.7719 C332.3981,735.7719 332.9763,735.9125 333.445,736.1625 C333.9138,736.4281 334.0856,736.6156 334.1481,736.975 C334.2731,737.6469 334.5231,737.8969 335.0544,737.8969 C335.3356,737.8969 335.6169,737.7563 335.8044,737.5375 C335.9294,737.3656 335.9763,737.1938 335.9763,736.7563 L335.9763,735.3969 C335.9763,734.975 335.9606,734.8344 335.8356,734.6625 C335.6638,734.4125 335.3825,734.2563 335.0544,734.2563 C334.7419,734.2563 334.5388,734.3656 334.32,734.6313 C333.1481,734.1313 332.7106,734.0219 331.7575,734.0219 C329.0856,734.0219 327.07,736.0375 327.07,738.6625 L327.07,739.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="352.57" y="743.206">ProductB1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="277.32" x2="461.32" y1="754.6" y2="754.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="282.32" y="763.5"/>
-          <ellipse cx="287.32" cy="768.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="296.32" y="771.6059">buy(int price) const : bool</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="277.32" x2="461.32" y1="779.3999" y2="779.3999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="300.5" y="209.0151">sell(int price) const = 0 : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <g id="elem_C_0002154665562370057871">
-        <rect codeLine="31" fill="#F1F1F1" height="64.7999" id="C_0002154665562370057871" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="186" x="55.32" y="722.6"/>
-        <ellipse cx="111.07" cy="738.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M106.07,739.7563 C106.07,742.2563 108.2106,744.0688 111.1325,744.0688 C112.3669,744.0688 113.5388,743.7719 114.2888,743.2563 C114.8981,742.8344 115.2263,742.4125 115.2263,742.0063 C115.2263,741.5375 114.8044,741.1313 114.3044,741.1313 C114.07,741.1313 113.8513,741.2094 113.6481,741.4125 C113.2106,741.85 113.2106,741.85 113.0388,741.9438 C112.5856,742.1781 111.945,742.3188 111.1794,742.3188 C109.1794,742.3188 107.8981,741.3031 107.8981,739.725 L107.8981,738.6781 C107.8981,736.975 109.1169,735.7719 110.82,735.7719 C111.3981,735.7719 111.9763,735.9125 112.445,736.1625 C112.9138,736.4281 113.0856,736.6156 113.1481,736.975 C113.2731,737.6469 113.5231,737.8969 114.0544,737.8969 C114.3356,737.8969 114.6169,737.7563 114.8044,737.5375 C114.9294,737.3656 114.9763,737.1938 114.9763,736.7563 L114.9763,735.3969 C114.9763,734.975 114.9606,734.8344 114.8356,734.6625 C114.6638,734.4125 114.3825,734.2563 114.0544,734.2563 C113.7419,734.2563 113.5388,734.3656 113.32,734.6313 C112.1481,734.1313 111.7106,734.0219 110.7575,734.0219 C108.0856,734.0219 106.07,736.0375 106.07,738.6625 L106.07,739.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="131.57" y="743.206">ProductB2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="56.32" x2="240.32" y1="754.6" y2="754.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="61.32" y="763.5"/>
-          <ellipse cx="66.32" cy="768.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="75.32" y="771.6059">buy(int price) const : bool</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="56.32" x2="240.32" y1="779.3999" y2="779.3999"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="215.6094" y2="215.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="178" y="284"/>
+      <ellipse cx="226.75" cy="300" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M229.7188,305.6406 Q229.1406,305.9375 228.5,306.0781 Q227.8594,306.2344 227.1563,306.2344 Q224.6563,306.2344 223.3281,304.5938 Q222.0156,302.9375 222.0156,299.8125 Q222.0156,296.6875 223.3281,295.0313 Q224.6563,293.375 227.1563,293.375 Q227.8594,293.375 228.5,293.5313 Q229.1563,293.6875 229.7188,293.9844 L229.7188,296.7031 Q229.0938,296.125 228.5,295.8594 Q227.9063,295.5781 227.2813,295.5781 Q225.9375,295.5781 225.25,296.6563 Q224.5625,297.7188 224.5625,299.8125 Q224.5625,301.9063 225.25,302.9844 Q225.9375,304.0469 227.2813,304.0469 Q227.9063,304.0469 228.5,303.7813 Q229.0938,303.5 229.7188,302.9219 L229.7188,305.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="247.25" y="304.1543">ProductA1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="316" y2="316"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <g id="elem_C_0001705546469218961425">
-        <rect codeLine="36" fill="#F1F1F1" height="85.7998" id="C_0001705546469218961425" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="330" x="134.32" y="7"/>
-        <ellipse cx="245.07" cy="23" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M246.6013,24.9375 L246.9294,25.7344 L246.6481,25.7344 C246.195,25.7344 246.07,25.7656 245.8981,25.875 C245.6169,26.0156 245.445,26.3125 245.445,26.6094 C245.445,26.9063 245.5856,27.1563 245.82,27.3281 C245.9919,27.4531 246.2263,27.5 246.6481,27.5 L249.0075,27.5 C249.3669,27.5 249.6169,27.4688 249.7575,27.375 C250.0231,27.2344 250.195,26.9219 250.195,26.6094 C250.195,26.3438 250.0544,26.0781 249.82,25.9063 C249.6325,25.7813 249.4763,25.75 249.0231,25.7344 L245.6325,17.9063 L241.9138,17.9063 C241.4606,17.9063 241.32,17.9219 241.1481,18.0313 C240.8825,18.2031 240.7106,18.4844 240.7106,18.7813 C240.7106,19.0625 240.8513,19.3281 241.1013,19.5 C241.2731,19.625 241.4606,19.6563 241.9138,19.6563 L242.8825,19.6563 L240.3044,25.7344 C239.5544,25.7344 239.1481,26.0313 239.1481,26.6094 C239.1481,27.2188 239.5388,27.5 240.3356,27.5 L242.6013,27.5 C242.9606,27.5 243.2106,27.4688 243.3513,27.375 C243.6169,27.2188 243.7888,26.9219 243.7888,26.6094 C243.7888,26.3438 243.6481,26.0781 243.4138,25.9063 C243.2263,25.7656 243.07,25.7344 242.6013,25.7344 L242.3044,25.7344 L242.6481,24.9375 L246.6013,24.9375 Z M245.8356,23.1875 L243.3825,23.1875 L244.6169,20.3125 L245.8356,23.1875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="100" x="265.57" y="28.95">AbstractFactory</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="135.32" x2="463.32" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="140.32" y="48.95"/>
-          <ellipse cx="145.32" cy="53.95" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="304" x="154.32" y="58.3999">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="140.32" y="67.8499"/>
-          <ellipse cx="145.32" cy="72.8499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="304" x="154.32" y="77.2999">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="135.32" x2="463.32" y1="84.7998" y2="84.7998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="184" y="322"/>
+      <ellipse cx="189" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <g id="elem_C_0000692346848484854107">
-        <rect codeLine="42" fill="#F1F1F1" height="81.5999" id="C_0000692346848484854107" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="306" x="146.32" y="429.3"/>
-        <ellipse cx="267.07" cy="445.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M262.07,446.4563 C262.07,448.9563 264.2106,450.7688 267.1325,450.7688 C268.3669,450.7688 269.5388,450.4719 270.2888,449.9563 C270.8981,449.5344 271.2263,449.1125 271.2263,448.7063 C271.2263,448.2375 270.8044,447.8313 270.3044,447.8313 C270.07,447.8313 269.8513,447.9094 269.6481,448.1125 C269.2106,448.55 269.2106,448.55 269.0388,448.6438 C268.5856,448.8781 267.945,449.0188 267.1794,449.0188 C265.1794,449.0188 263.8981,448.0031 263.8981,446.425 L263.8981,445.3781 C263.8981,443.675 265.1169,442.4719 266.82,442.4719 C267.3981,442.4719 267.9763,442.6125 268.445,442.8625 C268.9138,443.1281 269.0856,443.3156 269.1481,443.675 C269.2731,444.3469 269.5231,444.5969 270.0544,444.5969 C270.3356,444.5969 270.6169,444.4563 270.8044,444.2375 C270.9294,444.0656 270.9763,443.8938 270.9763,443.4563 L270.9763,442.0969 C270.9763,441.675 270.9606,441.5344 270.8356,441.3625 C270.6638,441.1125 270.3825,440.9563 270.0544,440.9563 C269.7419,440.9563 269.5388,441.0656 269.32,441.3313 C268.1481,440.8313 267.7106,440.7219 266.7575,440.7219 C264.0856,440.7219 262.07,442.7375 262.07,445.3625 L262.07,446.4563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="287.57" y="449.906">Factory1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="147.32" x2="451.32" y1="461.3" y2="461.3"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="152.32" y="470.2"/>
-          <ellipse cx="157.32" cy="475.2" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="166.32" y="478.3059">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="152.32" y="486.9999"/>
-          <ellipse cx="157.32" cy="491.9999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="166.32" y="495.1059">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="147.32" x2="451.32" y1="502.8999" y2="502.8999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="198" y="330.2104">sell(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <g id="elem_C_0001566325870805013023">
-        <rect codeLine="48" fill="#F1F1F1" height="81.5999" id="C_0001566325870805013023" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="306" x="362.32" y="847.4"/>
-        <ellipse cx="483.07" cy="863.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M478.07,864.5563 C478.07,867.0563 480.2106,868.8688 483.1325,868.8688 C484.3669,868.8688 485.5388,868.5719 486.2888,868.0563 C486.8981,867.6344 487.2263,867.2125 487.2263,866.8063 C487.2263,866.3375 486.8044,865.9313 486.3044,865.9313 C486.07,865.9313 485.8513,866.0094 485.6481,866.2125 C485.2106,866.65 485.2106,866.65 485.0388,866.7438 C484.5856,866.9781 483.945,867.1188 483.1794,867.1188 C481.1794,867.1188 479.8981,866.1031 479.8981,864.525 L479.8981,863.4781 C479.8981,861.775 481.1169,860.5719 482.82,860.5719 C483.3981,860.5719 483.9763,860.7125 484.445,860.9625 C484.9138,861.2281 485.0856,861.4156 485.1481,861.775 C485.2731,862.4469 485.5231,862.6969 486.0544,862.6969 C486.3356,862.6969 486.6169,862.5563 486.8044,862.3375 C486.9294,862.1656 486.9763,861.9938 486.9763,861.5563 L486.9763,860.1969 C486.9763,859.775 486.9606,859.6344 486.8356,859.4625 C486.6638,859.2125 486.3825,859.0563 486.0544,859.0563 C485.7419,859.0563 485.5388,859.1656 485.32,859.4313 C484.1481,858.9313 483.7106,858.8219 482.7575,858.8219 C480.0856,858.8219 478.07,860.8375 478.07,863.4625 L478.07,864.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="503.57" y="868.006">Factory2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="363.32" x2="667.32" y1="879.4" y2="879.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="368.32" y="888.3"/>
-          <ellipse cx="373.32" cy="893.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="382.32" y="896.4059">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="368.32" y="905.0999"/>
-          <ellipse cx="373.32" cy="910.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="280" x="382.32" y="913.2059">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="363.32" x2="667.32" y1="920.9999" y2="920.9999"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="336.8047" y2="336.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="527" y="411.5"/>
+      <ellipse cx="575.75" cy="427.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M578.7188,433.1406 Q578.1406,433.4375 577.5,433.5781 Q576.8594,433.7344 576.1563,433.7344 Q573.6563,433.7344 572.3281,432.0938 Q571.0156,430.4375 571.0156,427.3125 Q571.0156,424.1875 572.3281,422.5313 Q573.6563,420.875 576.1563,420.875 Q576.8594,420.875 577.5,421.0313 Q578.1563,421.1875 578.7188,421.4844 L578.7188,424.2031 Q578.0938,423.625 577.5,423.3594 Q576.9063,423.0781 576.2813,423.0781 Q574.9375,423.0781 574.25,424.1563 Q573.5625,425.2188 573.5625,427.3125 Q573.5625,429.4063 574.25,430.4844 Q574.9375,431.5469 576.2813,431.5469 Q576.9063,431.5469 577.5,431.2813 Q578.0938,431 578.7188,430.4219 L578.7188,433.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="596.25" y="431.6543">ProductA2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="443.5" y2="443.5"/>
     </a>
-    <g id="link_C_0000425267229659464944_C_0001756496029797864207">
-      <path codeLine="53" d="M383.3207,256.9642 C362.5307,276.4942 351.8,286.59 332.94,304.31 " fill="none" id="C_0000425267229659464944-backto-C_0001756496029797864207" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="396.44,244.64,379.2127,252.5911,387.4288,261.3372,396.44,244.64" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000425267229659464944_C_0001531708592885216981">
-      <path codeLine="54" d="M500.6252,257.8789 C517.6852,276.0089 524.74,284.26 541.32,304.5 C577.74,348.97 616.03,403.54 639.04,437.32 " fill="none" id="C_0000425267229659464944-backto-C_0001531708592885216981" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="488.29,244.77,496.2556,261.9906,504.9948,253.7671,488.29,244.77" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002235759006374865842_C_0001465493024233223845">
-      <path codeLine="55" d="M236.9232,672.3746 C268.4632,691.8146 289.26,704.64 317.88,722.29 " fill="none" id="C_0002235759006374865842-backto-C_0001465493024233223845" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="221.6,662.93,233.775,677.4823,240.0714,667.2669,221.6,662.93" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002235759006374865842_C_0002154665562370057871">
-      <path codeLine="56" d="M148.32,680.74 C148.32,700.27 148.32,704.69 148.32,722.41 " fill="none" id="C_0002235759006374865842-backto-C_0002154665562370057871" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="148.32,662.74,142.32,680.74,154.32,680.74,148.32,662.74" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001705546469218961425_C_0000425267229659464944">
-      <path codeLine="57" d="M340.87,92.95 C359.28,111.59 376.7522,129.2727 395.5022,148.2427 " fill="none" id="C_0001705546469218961425-to-C_0000425267229659464944" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="399.72,152.51,396.2381,143.2971,396.2051,148.9539,390.5484,148.9209,399.72,152.51" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001705546469218961425_C_0002235759006374865842">
-      <path codeLine="58" d="M232.67,93.29 C212.22,109.51 191.63,129.72 178.32,152.8 C98.07,291.95 114.94,350.91 129.32,510.9 C131.09,530.62 133.5485,546.2815 137.1485,564.6915 " fill="none" id="C_0001705546469218961425-to-C_0002235759006374865842" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="138.3,570.58,140.4984,560.9796,137.3404,565.6729,132.6472,562.5149,138.3,570.58" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000692346848484854107_C_0000425267229659464944">
-      <path codeLine="59" d="M356.69,429 C376.17,412.63 396.28,392.14 409.32,369.3 C431.24,330.91 439.0043,286.6478 442.0943,250.8278 " fill="none" id="C_0000692346848484854107-to-C_0000425267229659464944" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="442.61,244.85,437.8513,253.4729,442.1803,249.8315,445.8217,254.1605,442.61,244.85" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000692346848484854107_C_0002235759006374865842">
-      <path codeLine="60" d="M257.26,511.39 C238.06,529.78 219.5837,547.4904 199.8037,566.4304 " fill="none" id="C_0000692346848484854107-to-C_0002235759006374865842" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="195.47,570.58,204.7369,567.2447,199.0814,567.122,199.2041,561.4665,195.47,570.58" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001705546469218961425_C_0000692346848484854107">
-      <path codeLine="61" d="M253.736,107.6345 C207.396,169.4745 146.74,273.18 189.32,369.3 C199.66,392.64 218.45,412.85 237.61,428.87 " fill="none" id="C_0001705546469218961425-backto-C_0000692346848484854107" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="264.53,93.23,248.9345,104.0365,258.5375,111.2325,264.53,93.23" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001566325870805013023_C_0000425267229659464944">
-      <path codeLine="62" d="M515.32,847.03 C515.32,794.37 515.32,699.15 515.32,617.75 C515.32,469.1 515.32,469.1 515.32,469.1 C515.32,388.07 487.1391,303.2946 466.1291,250.5146 " fill="none" id="C_0001566325870805013023-to-C_0000425267229659464944" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="463.91,244.94,463.5222,254.7812,465.7592,249.5855,470.955,251.8225,463.91,244.94" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001566325870805013023_C_0002235759006374865842">
-      <path codeLine="63" d="M361.96,875.75 C238.37,862.96 78.73,837.14 38.32,787.4 C6,747.62 41.7995,701.9738 82.4195,666.7038 " fill="none" id="C_0001566325870805013023-to-C_0002235759006374865842" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="86.95,662.77,77.5317,665.6504,83.1746,666.0482,82.7768,671.691,86.95,662.77" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001705546469218961425_C_0001566325870805013023">
-      <path codeLine="64" d="M482.2622,77.8264 C629.8822,108.9764 805.32,176.47 805.32,335.9 C805.32,335.9 805.32,335.9 805.32,617.75 C805.32,726.51 694.5,803.77 609.88,846.92 " fill="none" id="C_0001705546469218961425-backto-C_0001566325870805013023" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="464.65,74.11,481.0234,83.6971,483.501,71.9557,464.65,74.11" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001756496029797864207_C_0000692346848484854107">
-      <path codeLine="65" d="M299.32,375.66 C299.32,393.56 299.32,410.08 299.32,429.17 " fill="none" id="C_0001756496029797864207-backto-C_0000692346848484854107" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="299.32,369.66,295.32,378.66,299.32,374.66,303.32,378.66,299.32,369.66" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001465493024233223845_C_0000692346848484854107">
-      <path codeLine="66" d="M360.0183,716.3958 C347.2083,664.6458 323.32,568.08 309.27,511.33 " fill="none" id="C_0001465493024233223845-backto-C_0000692346848484854107" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="361.46,722.22,363.1803,712.5225,360.2586,717.3665,355.4146,714.4448,361.46,722.22" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001531708592885216981_C_0001566325870805013023">
-      <path codeLine="67" d="M647.326,508.386 C621.326,583.016 558.12,764.37 529.35,846.94 " fill="none" id="C_0001531708592885216981-backto-C_0001566325870805013023" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="649.3,502.72,642.5617,509.903,647.655,507.4417,650.1164,512.535,649.3,502.72" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002154665562370057871_C_0001566325870805013023">
-      <path codeLine="68" d="M242.81,789.7792 C292.56,807.5592 349.43,827.9 402.6,846.9 " fill="none" id="C_0002154665562370057871-backto-C_0001566325870805013023" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="237.16,787.76,244.2889,794.5555,241.8683,789.4427,246.9812,787.0222,237.16,787.76" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="533" y="449.5"/>
+      <ellipse cx="538" cy="454.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="547" y="457.7104">sell(int price) const : bool</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="464.3047" y2="464.3047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="81.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="539"/>
+      <ellipse cx="96.25" cy="555" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M96.3594,550.3438 L95.2031,555.4219 L97.5313,555.4219 L96.3594,550.3438 Z M94.875,548.1094 L97.8594,548.1094 L101.2188,560.5 L98.7656,560.5 L98,557.4375 L94.7188,557.4375 L93.9688,560.5 L91.5313,560.5 L94.875,548.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="116.75" y="559.1543">ProductB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="571" y2="571"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="577"/>
+      <ellipse cx="17" cy="582" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="26" y="585.2104">~ProductB() constexpr = default : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="250" y1="591.8047" y2="591.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="597.8047"/>
+      <ellipse cx="17" cy="602.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="606.0151">buy(int price) const = 0 : bool</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="612.6094" y2="612.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="249" y="681"/>
+      <ellipse cx="297.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M300.7188,702.6406 Q300.1406,702.9375 299.5,703.0781 Q298.8594,703.2344 298.1563,703.2344 Q295.6563,703.2344 294.3281,701.5938 Q293.0156,699.9375 293.0156,696.8125 Q293.0156,693.6875 294.3281,692.0313 Q295.6563,690.375 298.1563,690.375 Q298.8594,690.375 299.5,690.5313 Q300.1563,690.6875 300.7188,690.9844 L300.7188,693.7031 Q300.0938,693.125 299.5,692.8594 Q298.9063,692.5781 298.2813,692.5781 Q296.9375,692.5781 296.25,693.6563 Q295.5625,694.7188 295.5625,696.8125 Q295.5625,698.9063 296.25,699.9844 Q296.9375,701.0469 298.2813,701.0469 Q298.9063,701.0469 299.5,700.7813 Q300.0938,700.5 300.7188,699.9219 L300.7188,702.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="318.25" y="701.1543">ProductB1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="713" y2="713"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="255" y="719"/>
+      <ellipse cx="260" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="269" y="727.2104">buy(int price) const : bool</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="733.8047" y2="733.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="43" y="681"/>
+      <ellipse cx="91.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M94.7188,702.6406 Q94.1406,702.9375 93.5,703.0781 Q92.8594,703.2344 92.1563,703.2344 Q89.6563,703.2344 88.3281,701.5938 Q87.0156,699.9375 87.0156,696.8125 Q87.0156,693.6875 88.3281,692.0313 Q89.6563,690.375 92.1563,690.375 Q92.8594,690.375 93.5,690.5313 Q94.1563,690.6875 94.7188,690.9844 L94.7188,693.7031 Q94.0938,693.125 93.5,692.8594 Q92.9063,692.5781 92.2813,692.5781 Q90.9375,692.5781 90.25,693.6563 Q89.5625,694.7188 89.5625,696.8125 Q89.5625,698.9063 90.25,699.9844 Q90.9375,701.0469 92.2813,701.0469 Q92.9063,701.0469 93.5,700.7813 Q94.0938,700.5 94.7188,699.9219 L94.7188,702.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="112.25" y="701.1543">ProductB2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="713" y2="713"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="719"/>
+      <ellipse cx="54" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="63" y="727.2104">buy(int price) const : bool</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="733.8047" y2="733.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="112.5" y="8"/>
+      <ellipse cx="209.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M209.8594,19.3438 L208.7031,24.4219 L211.0313,24.4219 L209.8594,19.3438 Z M208.375,17.1094 L211.3594,17.1094 L214.7188,29.5 L212.2656,29.5 L211.5,26.4375 L208.2188,26.4375 L207.4688,29.5 L205.0313,29.5 L208.375,17.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="230.25" y="28.1543">AbstractFactory</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="46"/>
+      <ellipse cx="123.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="54.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="58.8047"/>
+      <ellipse cx="123.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="67.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="73.6094" y2="73.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="123.5" y="405"/>
+      <ellipse cx="232.25" cy="421" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M235.2188,426.6406 Q234.6406,426.9375 234,427.0781 Q233.3594,427.2344 232.6563,427.2344 Q230.1563,427.2344 228.8281,425.5938 Q227.5156,423.9375 227.5156,420.8125 Q227.5156,417.6875 228.8281,416.0313 Q230.1563,414.375 232.6563,414.375 Q233.3594,414.375 234,414.5313 Q234.6563,414.6875 235.2188,414.9844 L235.2188,417.7031 Q234.5938,417.125 234,416.8594 Q233.4063,416.5781 232.7813,416.5781 Q231.4375,416.5781 230.75,417.6563 Q230.0625,418.7188 230.0625,420.8125 Q230.0625,422.9063 230.75,423.9844 Q231.4375,425.0469 232.7813,425.0469 Q233.4063,425.0469 234,424.7813 Q234.5938,424.5 235.2188,423.9219 L235.2188,426.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="252.75" y="425.1543">Factory1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="437" y2="437"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="443"/>
+      <ellipse cx="134.5" cy="448" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="143.5" y="451.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="455.8047"/>
+      <ellipse cx="134.5" cy="460.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="143.5" y="464.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="470.6094" y2="470.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="333.5" y="802"/>
+      <ellipse cx="442.25" cy="818" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M445.2188,823.6406 Q444.6406,823.9375 444,824.0781 Q443.3594,824.2344 442.6563,824.2344 Q440.1563,824.2344 438.8281,822.5938 Q437.5156,820.9375 437.5156,817.8125 Q437.5156,814.6875 438.8281,813.0313 Q440.1563,811.375 442.6563,811.375 Q443.3594,811.375 444,811.5313 Q444.6563,811.6875 445.2188,811.9844 L445.2188,814.7031 Q444.5938,814.125 444,813.8594 Q443.4063,813.5781 442.7813,813.5781 Q441.4375,813.5781 440.75,814.6563 Q440.0625,815.7188 440.0625,817.8125 Q440.0625,819.9063 440.75,820.9844 Q441.4375,822.0469 442.7813,822.0469 Q443.4063,822.0469 444,821.7813 Q444.5938,821.5 445.2188,820.9219 L445.2188,823.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="462.75" y="822.1543">Factory2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="834" y2="834"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="840"/>
+      <ellipse cx="344.5" cy="845" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="353.5" y="848.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="852.8047"/>
+      <ellipse cx="344.5" cy="857.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="353.5" y="861.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="867.6094" y2="867.6094"/>
+    <path d="M344.48,238.05 C327.61,253.77 309.81,270.35 295.21,283.96 " fill="none" id="C_0000425267229659464944&lt;-C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="339.88,232.78,359.28,224.26,349.42,243.02,339.88,232.78" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M458.18,238.52 C472.11,252.92 486.71,268.72 499.5,284 C534.96,326.36 571.51,379.11 593.1,411.4 " fill="none" id="C_0000425267229659464944&lt;-C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="453.03,243.27,444.02,224.09,463.02,233.46,453.03,243.27" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M209.28,631.78 C235.74,648.42 264.25,666.34 287.38,680.88 " fill="none" id="C_0002235759006374865842&lt;-C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="205.48,637.66,192.27,621.09,212.93,625.81,205.48,637.66" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M128.5,641.55 C128.5,655.26 128.5,669.22 128.5,680.96 " fill="none" id="C_0002235759006374865842&lt;-C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="121.5,641.26,128.5,621.26,135.5,641.26,121.5,641.26" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M300.38,82.09 C318.03,99.35 339.3,120.16 357.85,138.31 " fill="none" id="C_0001705546469218961425-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="361.52,141.91,357.8918,132.7538,357.9489,138.4104,352.2924,138.4675,361.52,141.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M205.31,82.14 C184.51,97.98 162.92,118.38 149.5,142 C74.94,273.3 90.18,328.89 106.5,479 C108.47,497.1 112.38,516.72 116.37,533.75 " fill="none" id="C_0001705546469218961425-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="117.61,538.94,119.3884,529.253,116.4377,534.0794,111.6114,531.1287,117.61,538.94" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M313.81,404.81 C332.99,388.57 353.38,367.91 366.5,345 C386.91,309.38 395.75,263.18 399.58,229.41 " fill="none" id="C_0000692346848484854107-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="400.15,224.1,395.1967,232.6126,399.6072,229.0705,403.1494,233.481,400.15,224.1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M227.68,479.09 C210.54,496.35 189.88,517.16 171.86,535.31 " fill="none" id="C_0000692346848484854107-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="168.3,538.91,177.478,535.3373,171.8212,535.3602,171.7983,529.7034,168.3,538.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M221.83,98.4 C179.15,158.85 123.85,260.73 160.5,345 C170.79,368.65 190.09,389.11 209.23,404.99 " fill="none" id="C_0001705546469218961425&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="216.27,94.14,233.73,82.13,227.57,102.41,216.27,94.14" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M473.5,801.82 C473.5,752.08 473.5,659.75 473.5,581 C473.5,441 473.5,441 473.5,441 C473.5,364.32 443.77,279.26 422.79,228.78 " fill="none" id="C_0001566325870805013023-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="420.78,224,420.56,233.8464,422.7081,228.6133,427.9413,230.7614,420.78,224" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M333.44,826.93 C216.81,814.45 63.82,789.4 25.5,742 C-4.69,704.65 32.17,658.08 69.93,624.64 " fill="none" id="C_0001566325870805013023-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="74.05,621.04,64.6428,623.9562,70.2871,624.3325,69.9108,629.9768,74.05,621.04" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M434.59,68.78 C575.25,98.26 751.5,164.86 751.5,313.5 C751.5,313.5 751.5,313.5 751.5,581 C751.5,686.99 641.2,761.42 559.56,802 " fill="none" id="C_0001705546469218961425&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="432.81,75.56,414.56,64.78,435.55,61.84,432.81,75.56" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M263.5,350.38 C263.5,367.31 263.5,387.65 263.5,404.76 " fill="none" id="C_0001756496029797864207&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="263.5,345.24,259.5,354.24,263.5,350.24,267.5,354.24,263.5,345.24" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M325.25,675.67 C311.75,624.79 286.76,530.64 273.08,479.08 " fill="none" id="C_0001465493024233223845&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="326.6,680.75,328.1496,671.0238,325.3135,675.9184,320.4189,673.0823,326.6,680.75" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M600.38,477.43 C574.28,551.62 512.92,725.99 486.25,801.77 " fill="none" id="C_0001531708592885216981&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="602.05,472.69,595.2725,479.836,600.3792,477.4026,602.8126,482.5093,602.05,472.69" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M214.77,743.88 C263.21,761.5 323.86,783.56 374.26,801.9 " fill="none" id="C_0002154665562370057871&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="209.82,742.08,216.9045,748.9218,214.5173,743.7933,219.6458,741.4061,209.82,742.08" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00020_class_mermaid.svg b/docs/test_cases/t00020_class_mermaid.svg
index 5e5b2c89..c7cc3dad 100644
--- a/docs/test_cases/t00020_class_mermaid.svg
+++ b/docs/test_cases/t00020_class_mermaid.svg
@@ -1,72 +1,67 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1094.62109375 592" style="max-width: 1094.62px; background-color: white;" width="1094.62109375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1061.28125 592" style="max-width: 1061.28px; background-color: white;" width="1061.28125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M183.2948258278622,455.3871718571809L172.33683402321853,459.4893098809841C161.37884221857482,463.59144790478723,139.4628586092874,471.79572395239364,128.5048668046437,480.0645286428635C117.546875,488.3333333333333,117.546875,496.6666666666667,117.546875,500.8333333333333L117.546875,505"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M382.8941460304957,471.4779629891419L383.51855919207975,472.8983024909516C384.14297235366377,474.31864199276123,385.3917986768319,477.1593209963806,386.016211838416,482.74632716485695C386.640625,488.3333333333333,386.640625,496.6666666666667,386.640625,500.8333333333333L386.640625,505"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M723.2556297239986,455.1525123421932L712.1505247699988,459.293760285161C701.045419815999,463.43500822812877,678.8352099079995,471.7175041140644,667.7301049539998,480.0254187236989C656.625,488.3333333333333,656.625,496.6666666666667,656.625,500.8333333333333L656.625,505"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M923.6374867075972,471.41508638492735L924.2812389229977,472.8459053207728C924.9249911383981,474.27672425661825,926.2124955691992,477.1383621283091,926.8562477845995,482.7358477308212C927.5,488.3333333333333,927.5,496.6666666666667,927.5,500.8333333333333L927.5,505"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M333.59375,110.45207279450717L300.5904947916667,118.04339399542265C267.5872395833333,125.6347151963381,201.58072916666666,140.81735759816905,168.57747395833334,160.99201213241787C135.57421875,181.16666666666666,135.57421875,206.33333333333334,135.57421875,231.5C135.57421875,256.6666666666667,135.57421875,281.8333333333333,145.41070156435057,298.4105622154763C155.24718437870112,314.9877910976192,174.92015000740227,322.9755821952385,184.75663282175285,326.9694777440481L194.5931156361034,330.9633732928577"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M587.3663520592486,131L592.4973506743738,135.16666666666666C597.628349289499,139.33333333333334,607.8903465197495,147.66666666666666,613.0213451348748,164.41666666666666C618.15234375,181.16666666666666,618.15234375,206.33333333333334,618.15234375,231.5C618.15234375,256.6666666666667,618.15234375,281.8333333333333,637.5280062717978,300.6141918852524C656.9036687935957,319.3950504371715,695.6549938371913,331.790100874343,715.0306563589892,337.9876260929288L734.406318880787,344.1851513115145"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M366.640625,282L366.640625,286.1666666666667C366.640625,290.3333333333333,366.640625,298.6666666666667,365.9762807109617,306.0210342946471C365.31193642192346,313.3754019226276,363.983247843847,319.7508038452552,363.3189035548087,322.938504806569L362.65455926577044,326.12620576788277"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M544.6796875,258.7643209152709L597.1770833333334,266.80360076272575C649.6744791666666,274.8428806101806,754.6692708333334,290.9214403050903,808.2425695978251,302.1789822770315C861.8158683623169,313.4365242489727,863.9676742246338,319.8730484979454,865.0435771557923,323.09131062243176L866.1194800869506,326.3095727469181"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M393.0877604795467,140.22206562694427L388.67990456628894,142.8517213557869C384.2720486530311,145.48137708462951,375.45633682651555,150.74068854231476,371.04848091325783,157.53701093782405C366.640625,164.33333333333334,366.640625,172.66666666666666,366.640625,176.83333333333334L366.640625,181"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M730.54296875,265.3631456715772L694.0579427083334,272.30262139298094C657.5729166666666,279.24209711438476,584.6028645833334,293.1210485571924,541.1486093434798,303.75847581250576C497.6943541036264,314.39590306781923,483.75589570725265,321.7918061356384,476.7866665090658,325.48975766954806L469.817437310879,329.18770920345764"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M908.58203125,282L908.58203125,286.1666666666667C908.58203125,290.3333333333333,908.58203125,298.6666666666667,907.843910908901,306.0257038085862C907.1057905678022,313.38474095050566,905.6295498856043,319.7694819010113,904.8914295445053,322.9618523762642L904.1533092034065,326.154222851517"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M707.2591464108872,112.12932658383458L740.8129605507393,119.44110548652883C774.3667746905916,126.75288438922307,841.4744029702957,141.37644219461154,875.0282171101479,152.8548877639724C908.58203125,164.33333333333334,908.58203125,172.66666666666666,908.58203125,176.83333333333334L908.58203125,181"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M193.484375,449.0144309438429L180.08723958333334,454.1786924532025C166.69010416666666,459.3429539625619,139.89583333333334,469.67147698128093,126.49869791666667,479.0024051573071C113.1015625,488.3333333333333,113.1015625,496.6666666666667,113.1015625,500.8333333333333L113.1015625,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M362.95651192196533,455L364.68120785163774,459.1666666666667C366.4059037813102,463.3333333333333,369.85529564065513,471.6666666666667,371.57999157032754,480C373.3046875,488.3333333333333,373.3046875,496.6666666666667,373.3046875,500.8333333333333L373.3046875,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M715.671875,448.794968269931L702.1263020833334,453.99580689160916C688.5807291666666,459.19664551328736,661.4895833333334,469.59832275664365,647.9440104166666,478.9658280449885C634.3984375,488.3333333333333,634.3984375,496.6666666666667,634.3984375,500.8333333333333L634.3984375,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M885.7772308526012,455L887.5448277938343,459.1666666666667C889.3124247350675,463.3333333333333,892.8476186175336,471.6666666666667,894.6152155587669,480C896.3828125,488.3333333333333,896.3828125,496.6666666666667,896.3828125,500.8333333333333L896.3828125,505"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M320.2578125,110.64550553379145L288.3658854166667,118.2045879448262C256.4739583333333,125.76367035586095,192.69010416666666,140.88183517793047,160.79817708333334,161.0242509222986C128.90625,181.16666666666666,128.90625,206.33333333333334,128.90625,231.5C128.90625,256.6666666666667,128.90625,281.8333333333333,139.66927083333334,298.8798938826467C150.43229166666666,315.92645443196005,171.95833333333334,324.8529088639201,182.72135416666666,329.3161360799001L193.484375,333.77936329588016"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M568.0048320086705,131L573.0287662572255,135.16666666666666C578.0527005057803,139.33333333333334,588.1005690028902,147.66666666666666,593.1245032514452,164.41666666666666C598.1484375,181.16666666666666,598.1484375,206.33333333333334,598.1484375,231.5C598.1484375,256.6666666666667,598.1484375,281.8333333333333,617.7356770833334,300.89484322569723C637.3229166666666,319.95635311806114,676.4973958333334,332.91270623612235,696.0846354166666,339.3908827951529L715.671875,345.8690593541835"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M353.3046875,282L353.3046875,286.1666666666667C353.3046875,290.3333333333333,353.3046875,298.6666666666667,352.54338270712907,307C351.7820779142582,315.3333333333333,350.25946832851633,323.6666666666667,349.4981635356455,327.8333333333333L348.7368587427746,332"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M526.8984375,258.82263843648207L577.9140625,266.8521986970684C628.9296875,274.8817589576547,730.9609375,290.94087947882736,783.2624638728324,303.13710640608036C835.5639902456647,315.3333333333333,838.1357929913296,323.6666666666667,839.4216943641619,327.8333333333333L840.7075957369942,332"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M393.9251716040462,131L387.1550909200385,135.16666666666666C380.38501023603084,139.33333333333334,366.8448488680154,147.66666666666666,360.0747681840077,156C353.3046875,164.33333333333334,353.3046875,172.66666666666666,353.3046875,176.83333333333334L353.3046875,181"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M706.09375,265.4686557191164L670.7200520833334,272.390546432597C635.3463541666666,279.31243714607757,564.5989583333334,293.1562185730388,521.6938749397881,304.2447759531861C478.78879154624275,315.3333333333333,463.72602059248555,323.6666666666667,456.1946351156069,327.8333333333333L448.6632496387283,332"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M879.6875,282L879.6875,286.1666666666667C879.6875,290.3333333333333,879.6875,298.6666666666667,878.7241088631985,307C877.7607177263968,315.3333333333333,875.8339354527939,323.6666666666667,874.8705443159923,327.8333333333333L873.9071531791908,332"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M667.4453125,108.41773138680219L702.8190104166666,116.34810948900183C738.1927083333334,124.27848759120145,808.9401041666666,140.13924379560072,844.3138020833334,152.23628856446703C879.6875,164.33333333333334,879.6875,172.66666666666666,879.6875,176.83333333333334L879.6875,181"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -191,11 +186,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(348.61328125, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L6">
+        <a transform="translate(337.5, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L6">
           <g title="ProductA" id="classId-C_0000425267229659464944-0" class="node default clickable">
-            <rect height="123" width="296.921875" y="-61.5" x="-148.4609375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="148.4609375" x1="-148.4609375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="148.4609375" x1="-148.4609375" class="divider"/>
+            <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="144.015625" x1="-144.015625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -207,24 +202,24 @@
                   <span class="nodeLabel">ProductA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.9609375, 14)" height="18" width="281.921875">
+              <foreignObject transform="translate( -136.515625, 14)" height="18" width="273.03125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~ProductA() : : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~ProductA() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.9609375, 36)" height="18" width="204.09375">
+              <foreignObject transform="translate( -136.515625, 36)" height="18" width="195.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+sell(int price) : : [const] bool</span>
+                  <span style="font-style:italic;" class="nodeLabel">+sell(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(117.546875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L12">
+        <a transform="translate(113.1015625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L12">
           <g title="ProductA1" id="classId-C_0001756496029797864207-1" class="node default clickable">
-            <rect height="79" width="219.09375" y="-39.5" x="-109.546875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="109.546875" x1="-109.546875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="109.546875" x1="-109.546875" class="divider"/>
+            <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -236,19 +231,19 @@
                   <span class="nodeLabel">ProductA1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -102.046875, 14)" height="18" width="204.09375">
+              <foreignObject transform="translate( -97.6015625, 14)" height="18" width="195.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sell(int price) : : [const] bool</span>
+                  <span class="nodeLabel">+sell(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(386.640625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L17">
+        <a transform="translate(373.3046875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L17">
           <g title="ProductA2" id="classId-C_0001531708592885216981-2" class="node default clickable">
-            <rect height="79" width="219.09375" y="-39.5" x="-109.546875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="109.546875" x1="-109.546875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="109.546875" x1="-109.546875" class="divider"/>
+            <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -260,19 +255,19 @@
                   <span class="nodeLabel">ProductA2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -102.046875, 14)" height="18" width="204.09375">
+              <foreignObject transform="translate( -97.6015625, 14)" height="18" width="195.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sell(int price) : : [const] bool</span>
+                  <span class="nodeLabel">+sell(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(888.58203125, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L22">
+        <a transform="translate(859.6875, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L22">
           <g title="ProductB" id="classId-C_0002235759006374865842-3" class="node default clickable">
-            <rect height="123" width="296.921875" y="-61.5" x="-148.4609375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="148.4609375" x1="-148.4609375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="148.4609375" x1="-148.4609375" class="divider"/>
+            <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="144.015625" x1="-144.015625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -284,24 +279,24 @@
                   <span class="nodeLabel">ProductB</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.9609375, 14)" height="18" width="281.921875">
+              <foreignObject transform="translate( -136.515625, 14)" height="18" width="273.03125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~ProductB() : : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~ProductB() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -140.9609375, 36)" height="18" width="205.875">
+              <foreignObject transform="translate( -136.515625, 36)" height="18" width="196.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+buy(int price) : : [const] bool</span>
+                  <span style="font-style:italic;" class="nodeLabel">+buy(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(656.625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L28">
+        <a transform="translate(634.3984375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L28">
           <g title="ProductB1" id="classId-C_0001465493024233223845-4" class="node default clickable">
-            <rect height="79" width="220.875" y="-39.5" x="-110.4375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="110.4375" x1="-110.4375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="110.4375" x1="-110.4375" class="divider"/>
+            <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -313,19 +308,19 @@
                   <span class="nodeLabel">ProductB1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -102.9375, 14)" height="18" width="205.875">
+              <foreignObject transform="translate( -98.4921875, 14)" height="18" width="196.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+buy(int price) : : [const] bool</span>
+                  <span class="nodeLabel">+buy(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(927.5, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L33">
+        <a transform="translate(896.3828125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L33">
           <g title="ProductB2" id="classId-C_0002154665562370057871-5" class="node default clickable">
-            <rect height="79" width="220.875" y="-39.5" x="-110.4375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="110.4375" x1="-110.4375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="110.4375" x1="-110.4375" class="divider"/>
+            <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -337,19 +332,19 @@
                   <span class="nodeLabel">ProductB2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -102.9375, 14)" height="18" width="205.875">
+              <foreignObject transform="translate( -98.4921875, 14)" height="18" width="196.984375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+buy(int price) : : [const] bool</span>
+                  <span class="nodeLabel">+buy(int price) : [const] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(511.6328125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L38">
+        <a transform="translate(493.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L38">
           <g title="AbstractFactory" id="classId-C_0001705546469218961425-6" class="node default clickable">
-            <rect height="123" width="356.078125" y="-61.5" x="-178.0390625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
+            <rect height="123" width="347.1875" y="-61.5" x="-173.59375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="173.59375" x1="-173.59375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -361,24 +356,24 @@
                   <span class="nodeLabel">AbstractFactory</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -170.5390625, 14)" height="18" width="341.078125">
+              <foreignObject transform="translate( -166.09375, 14)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+make_a() : : [const] std::unique_ptr&lt;ProductA&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -170.5390625, 36)" height="18" width="341.078125">
+              <foreignObject transform="translate( -166.09375, 36)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+make_b() : : [const] std::unique_ptr&lt;ProductB&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(366.640625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L44">
+        <a transform="translate(353.3046875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L44">
           <g title="Factory1" id="classId-C_0000692346848484854107-7" class="node default clickable">
-            <rect height="101" width="356.078125" y="-50.5" x="-178.0390625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
+            <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="173.59375" x1="-173.59375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -390,24 +385,24 @@
                   <span class="nodeLabel">Factory1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -170.5390625, 3)" height="18" width="341.078125">
+              <foreignObject transform="translate( -166.09375, 3)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_a() : : [const] std::unique_ptr&lt;ProductA&gt;</span>
+                  <span class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -170.5390625, 25)" height="18" width="341.078125">
+              <foreignObject transform="translate( -166.09375, 25)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_b() : : [const] std::unique_ptr&lt;ProductB&gt;</span>
+                  <span class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(908.58203125, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00020/t00020.cc#L57">
+        <a transform="translate(879.6875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L57">
           <g title="Factory2" id="classId-C_0001566325870805013023-8" class="node default clickable">
-            <rect height="101" width="356.078125" y="-50.5" x="-178.0390625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="178.0390625" x1="-178.0390625" class="divider"/>
+            <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="173.59375" x1="-173.59375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -419,14 +414,14 @@
                   <span class="nodeLabel">Factory2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -170.5390625, 3)" height="18" width="341.078125">
+              <foreignObject transform="translate( -166.09375, 3)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_a() : : [const] std::unique_ptr&lt;ProductA&gt;</span>
+                  <span class="nodeLabel">+make_a() : [const] std::unique_ptr&lt;ProductA&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -170.5390625, 25)" height="18" width="341.078125">
+              <foreignObject transform="translate( -166.09375, 25)" height="18" width="332.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+make_b() : : [const] std::unique_ptr&lt;ProductB&gt;</span>
+                  <span class="nodeLabel">+make_b() : [const] std::unique_ptr&lt;ProductB&gt;</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md
index 9cce1b0a..f67c0a26 100644
--- a/docs/test_cases/t00021.md
+++ b/docs/test_cases/t00021.md
@@ -78,7 +78,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00021::Visitor",
+      "display_name": "Visitor",
       "id": "1668671110672744395",
       "is_abstract": true,
       "is_nested": false,
@@ -196,7 +196,7 @@ public:
           "name": "clanguml::t00021::Visitor"
         }
       ],
-      "display_name": "clanguml::t00021::Visitor1",
+      "display_name": "Visitor1",
       "id": "1028369219400401946",
       "is_abstract": false,
       "is_nested": false,
@@ -288,7 +288,7 @@ public:
           "name": "clanguml::t00021::Visitor"
         }
       ],
-      "display_name": "clanguml::t00021::Visitor2",
+      "display_name": "Visitor2",
       "id": "1710373315476287130",
       "is_abstract": false,
       "is_nested": false,
@@ -380,7 +380,7 @@ public:
           "name": "clanguml::t00021::Visitor"
         }
       ],
-      "display_name": "clanguml::t00021::Visitor3",
+      "display_name": "Visitor3",
       "id": "1399026228179178025",
       "is_abstract": false,
       "is_nested": false,
@@ -465,7 +465,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00021::Item",
+      "display_name": "Item",
       "id": "1491568826758947722",
       "is_abstract": true,
       "is_nested": false,
@@ -552,7 +552,7 @@ public:
           "name": "clanguml::t00021::Item"
         }
       ],
-      "display_name": "clanguml::t00021::A",
+      "display_name": "A",
       "id": "1494142745564026823",
       "is_abstract": false,
       "is_nested": false,
@@ -613,7 +613,7 @@ public:
           "name": "clanguml::t00021::Item"
         }
       ],
-      "display_name": "clanguml::t00021::B",
+      "display_name": "B",
       "id": "1452948650450999568",
       "is_abstract": false,
       "is_nested": false,
@@ -667,6 +667,7 @@ public:
     }
   ],
   "name": "t00021_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index 0002d50e..f70b1f1f 100644
--- a/docs/test_cases/t00021_class.svg
+++ b/docs/test_cases/t00021_class.svg
@@ -1,234 +1,194 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="542px" preserveAspectRatio="none" style="width:1049px;height:542px;background:#FFFFFF;" version="1.1" viewBox="0 0 1049 542" width="1049px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="509px" preserveAspectRatio="none" style="width:990px;height:509px;" version="1.1" viewBox="0 0 990 509" width="990px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fb6xyuqzhdrh3" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <g id="elem_C_0001668671110672744395">
-        <rect codeLine="2" fill="#F1F1F1" height="110.5998" id="C_0001668671110672744395" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="268" x="390.5" y="158.7"/>
-        <ellipse cx="500.75" cy="174.7" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M502.2813,176.6375 L502.6094,177.4344 L502.3281,177.4344 C501.875,177.4344 501.75,177.4656 501.5781,177.575 C501.2969,177.7156 501.125,178.0125 501.125,178.3094 C501.125,178.6063 501.2656,178.8563 501.5,179.0281 C501.6719,179.1531 501.9063,179.2 502.3281,179.2 L504.6875,179.2 C505.0469,179.2 505.2969,179.1688 505.4375,179.075 C505.7031,178.9344 505.875,178.6219 505.875,178.3094 C505.875,178.0438 505.7344,177.7781 505.5,177.6063 C505.3125,177.4813 505.1563,177.45 504.7031,177.4344 L501.3125,169.6063 L497.5938,169.6063 C497.1406,169.6063 497,169.6219 496.8281,169.7313 C496.5625,169.9031 496.3906,170.1844 496.3906,170.4813 C496.3906,170.7625 496.5313,171.0281 496.7813,171.2 C496.9531,171.325 497.1406,171.3563 497.5938,171.3563 L498.5625,171.3563 L495.9844,177.4344 C495.2344,177.4344 494.8281,177.7313 494.8281,178.3094 C494.8281,178.9188 495.2188,179.2 496.0156,179.2 L498.2813,179.2 C498.6406,179.2 498.8906,179.1688 499.0313,179.075 C499.2969,178.9188 499.4688,178.6219 499.4688,178.3094 C499.4688,178.0438 499.3281,177.7781 499.0938,177.6063 C498.9063,177.4656 498.75,177.4344 498.2813,177.4344 L497.9844,177.4344 L498.3281,176.6375 L502.2813,176.6375 Z M501.5156,174.8875 L499.0625,174.8875 L500.2969,172.0125 L501.5156,174.8875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="39" x="521.25" y="180.65">Visitor</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="391.5" x2="657.5" y1="190.7" y2="190.7"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="396.5" y="199.6"/>
-          <ellipse cx="401.5" cy="204.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="220" x="410.5" y="207.7059">~Visitor() constexpr = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="391.5" x2="657.5" y1="215.4999" y2="215.4999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="396.5" y="225.4499"/>
-          <ellipse cx="401.5" cy="230.4499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="242" x="410.5" y="234.8999">visit_A(const A &amp; item) const = 0 : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="396.5" y="244.3498"/>
-          <ellipse cx="401.5" cy="249.3498" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="242" x="410.5" y="253.7998">visit_B(const B &amp; item) const = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="391.5" x2="657.5" y1="261.2998" y2="261.2998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="94.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="150"/>
+      <ellipse cx="469.25" cy="166" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M469.3594,161.3438 L468.2031,166.4219 L470.5313,166.4219 L469.3594,161.3438 Z M467.875,159.1094 L470.8594,159.1094 L474.2188,171.5 L471.7656,171.5 L471,168.4375 L467.7188,168.4375 L466.9688,171.5 L464.5313,171.5 L467.875,159.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="489.75" y="170.1543">Visitor</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <g id="elem_C_0001028369219400401946">
-        <rect codeLine="10" fill="#F1F1F1" height="81.5999" id="C_0001028369219400401946" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="123.5" y="329.3"/>
-        <ellipse cx="217.75" cy="345.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M212.75,346.4563 C212.75,348.9563 214.8906,350.7688 217.8125,350.7688 C219.0469,350.7688 220.2188,350.4719 220.9688,349.9563 C221.5781,349.5344 221.9063,349.1125 221.9063,348.7063 C221.9063,348.2375 221.4844,347.8313 220.9844,347.8313 C220.75,347.8313 220.5313,347.9094 220.3281,348.1125 C219.8906,348.55 219.8906,348.55 219.7188,348.6438 C219.2656,348.8781 218.625,349.0188 217.8594,349.0188 C215.8594,349.0188 214.5781,348.0031 214.5781,346.425 L214.5781,345.3781 C214.5781,343.675 215.7969,342.4719 217.5,342.4719 C218.0781,342.4719 218.6563,342.6125 219.125,342.8625 C219.5938,343.1281 219.7656,343.3156 219.8281,343.675 C219.9531,344.3469 220.2031,344.5969 220.7344,344.5969 C221.0156,344.5969 221.2969,344.4563 221.4844,344.2375 C221.6094,344.0656 221.6563,343.8938 221.6563,343.4563 L221.6563,342.0969 C221.6563,341.675 221.6406,341.5344 221.5156,341.3625 C221.3438,341.1125 221.0625,340.9563 220.7344,340.9563 C220.4219,340.9563 220.2188,341.0656 220,341.3313 C218.8281,340.8313 218.3906,340.7219 217.4375,340.7219 C214.7656,340.7219 212.75,342.7375 212.75,345.3625 L212.75,346.4563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="238.25" y="349.906">Visitor1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="366.5" y1="361.3" y2="361.3"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="370.2"/>
-          <ellipse cx="134.5" cy="375.2" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="143.5" y="378.3059">visit_A(const A &amp; item) const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="386.9999"/>
-          <ellipse cx="134.5" cy="391.9999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="143.5" y="395.1059">visit_B(const B &amp; item) const : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="366.5" y1="402.8999" y2="402.8999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="188"/>
+      <ellipse cx="379" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <g id="elem_C_0001710373315476287130">
-        <rect codeLine="16" fill="#F1F1F1" height="81.5999" id="C_0001710373315476287130" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="402.5" y="329.3"/>
-        <ellipse cx="496.75" cy="345.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M491.75,346.4563 C491.75,348.9563 493.8906,350.7688 496.8125,350.7688 C498.0469,350.7688 499.2188,350.4719 499.9688,349.9563 C500.5781,349.5344 500.9063,349.1125 500.9063,348.7063 C500.9063,348.2375 500.4844,347.8313 499.9844,347.8313 C499.75,347.8313 499.5313,347.9094 499.3281,348.1125 C498.8906,348.55 498.8906,348.55 498.7188,348.6438 C498.2656,348.8781 497.625,349.0188 496.8594,349.0188 C494.8594,349.0188 493.5781,348.0031 493.5781,346.425 L493.5781,345.3781 C493.5781,343.675 494.7969,342.4719 496.5,342.4719 C497.0781,342.4719 497.6563,342.6125 498.125,342.8625 C498.5938,343.1281 498.7656,343.3156 498.8281,343.675 C498.9531,344.3469 499.2031,344.5969 499.7344,344.5969 C500.0156,344.5969 500.2969,344.4563 500.4844,344.2375 C500.6094,344.0656 500.6563,343.8938 500.6563,343.4563 L500.6563,342.0969 C500.6563,341.675 500.6406,341.5344 500.5156,341.3625 C500.3438,341.1125 500.0625,340.9563 499.7344,340.9563 C499.4219,340.9563 499.2188,341.0656 499,341.3313 C497.8281,340.8313 497.3906,340.7219 496.4375,340.7219 C493.7656,340.7219 491.75,342.7375 491.75,345.3625 L491.75,346.4563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="517.25" y="349.906">Visitor2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="403.5" x2="645.5" y1="361.3" y2="361.3"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="408.5" y="370.2"/>
-          <ellipse cx="413.5" cy="375.2" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="422.5" y="378.3059">visit_A(const A &amp; item) const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="408.5" y="386.9999"/>
-          <ellipse cx="413.5" cy="391.9999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="422.5" y="395.1059">visit_B(const B &amp; item) const : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="403.5" x2="645.5" y1="402.8999" y2="402.8999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="388" y="196.2104">~Visitor() constexpr = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <g id="elem_C_0001399026228179178025">
-        <rect codeLine="22" fill="#F1F1F1" height="81.5999" id="C_0001399026228179178025" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="681.5" y="329.3"/>
-        <ellipse cx="775.75" cy="345.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M770.75,346.4563 C770.75,348.9563 772.8906,350.7688 775.8125,350.7688 C777.0469,350.7688 778.2188,350.4719 778.9688,349.9563 C779.5781,349.5344 779.9063,349.1125 779.9063,348.7063 C779.9063,348.2375 779.4844,347.8313 778.9844,347.8313 C778.75,347.8313 778.5313,347.9094 778.3281,348.1125 C777.8906,348.55 777.8906,348.55 777.7188,348.6438 C777.2656,348.8781 776.625,349.0188 775.8594,349.0188 C773.8594,349.0188 772.5781,348.0031 772.5781,346.425 L772.5781,345.3781 C772.5781,343.675 773.7969,342.4719 775.5,342.4719 C776.0781,342.4719 776.6563,342.6125 777.125,342.8625 C777.5938,343.1281 777.7656,343.3156 777.8281,343.675 C777.9531,344.3469 778.2031,344.5969 778.7344,344.5969 C779.0156,344.5969 779.2969,344.4563 779.4844,344.2375 C779.6094,344.0656 779.6563,343.8938 779.6563,343.4563 L779.6563,342.0969 C779.6563,341.675 779.6406,341.5344 779.5156,341.3625 C779.3438,341.1125 779.0625,340.9563 778.7344,340.9563 C778.4219,340.9563 778.2188,341.0656 778,341.3313 C776.8281,340.8313 776.3906,340.7219 775.4375,340.7219 C772.7656,340.7219 770.75,342.7375 770.75,345.3625 L770.75,346.4563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="796.25" y="349.906">Visitor3</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="682.5" x2="924.5" y1="361.3" y2="361.3"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="687.5" y="370.2"/>
-          <ellipse cx="692.5" cy="375.2" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="701.5" y="378.3059">visit_A(const A &amp; item) const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="687.5" y="386.9999"/>
-          <ellipse cx="692.5" cy="391.9999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="218" x="701.5" y="395.1059">visit_B(const B &amp; item) const : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="682.5" x2="924.5" y1="402.8999" y2="402.8999"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="369" x2="616" y1="202.8047" y2="202.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="208.8047"/>
+      <ellipse cx="379" cy="213.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <g id="elem_C_0001491568826758947722">
-        <rect codeLine="28" fill="#F1F1F1" height="91.6998" id="C_0001491568826758947722" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="309" x="370" y="7"/>
-        <ellipse cx="506.25" cy="23" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M507.7813,24.9375 L508.1094,25.7344 L507.8281,25.7344 C507.375,25.7344 507.25,25.7656 507.0781,25.875 C506.7969,26.0156 506.625,26.3125 506.625,26.6094 C506.625,26.9063 506.7656,27.1563 507,27.3281 C507.1719,27.4531 507.4063,27.5 507.8281,27.5 L510.1875,27.5 C510.5469,27.5 510.7969,27.4688 510.9375,27.375 C511.2031,27.2344 511.375,26.9219 511.375,26.6094 C511.375,26.3438 511.2344,26.0781 511,25.9063 C510.8125,25.7813 510.6563,25.75 510.2031,25.7344 L506.8125,17.9063 L503.0938,17.9063 C502.6406,17.9063 502.5,17.9219 502.3281,18.0313 C502.0625,18.2031 501.8906,18.4844 501.8906,18.7813 C501.8906,19.0625 502.0313,19.3281 502.2813,19.5 C502.4531,19.625 502.6406,19.6563 503.0938,19.6563 L504.0625,19.6563 L501.4844,25.7344 C500.7344,25.7344 500.3281,26.0313 500.3281,26.6094 C500.3281,27.2188 500.7188,27.5 501.5156,27.5 L503.7813,27.5 C504.1406,27.5 504.3906,27.4688 504.5313,27.375 C504.7969,27.2188 504.9688,26.9219 504.9688,26.6094 C504.9688,26.3438 504.8281,26.0781 504.5938,25.9063 C504.4063,25.7656 504.25,25.7344 503.7813,25.7344 L503.4844,25.7344 L503.8281,24.9375 L507.7813,24.9375 Z M507.0156,23.1875 L504.5625,23.1875 L505.7969,20.3125 L507.0156,23.1875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="28" x="526.75" y="28.95">Item</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="371" x2="678" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="376" y="47.9"/>
-          <ellipse cx="381" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="209" x="390" y="56.0059">~Item() constexpr = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="371" x2="678" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="376" y="73.7499"/>
-          <ellipse cx="381" cy="78.7499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="283" x="390" y="83.1999">accept(const Visitor &amp; visitor) const = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="371" x2="678" y1="90.6998" y2="90.6998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="217.0151">visit_A(const A &amp; item) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001494142745564026823">
-        <rect codeLine="35" fill="#F1F1F1" height="64.7999" id="C_0001494142745564026823" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="285" x="7" y="470.9"/>
-        <ellipse cx="140.75" cy="486.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M135.75,488.0563 C135.75,490.5563 137.8906,492.3688 140.8125,492.3688 C142.0469,492.3688 143.2188,492.0719 143.9688,491.5563 C144.5781,491.1344 144.9063,490.7125 144.9063,490.3063 C144.9063,489.8375 144.4844,489.4313 143.9844,489.4313 C143.75,489.4313 143.5313,489.5094 143.3281,489.7125 C142.8906,490.15 142.8906,490.15 142.7188,490.2438 C142.2656,490.4781 141.625,490.6188 140.8594,490.6188 C138.8594,490.6188 137.5781,489.6031 137.5781,488.025 L137.5781,486.9781 C137.5781,485.275 138.7969,484.0719 140.5,484.0719 C141.0781,484.0719 141.6563,484.2125 142.125,484.4625 C142.5938,484.7281 142.7656,484.9156 142.8281,485.275 C142.9531,485.9469 143.2031,486.1969 143.7344,486.1969 C144.0156,486.1969 144.2969,486.0563 144.4844,485.8375 C144.6094,485.6656 144.6563,485.4938 144.6563,485.0563 L144.6563,483.6969 C144.6563,483.275 144.6406,483.1344 144.5156,482.9625 C144.3438,482.7125 144.0625,482.5563 143.7344,482.5563 C143.4219,482.5563 143.2188,482.6656 143,482.9313 C141.8281,482.4313 141.3906,482.3219 140.4375,482.3219 C137.7656,482.3219 135.75,484.3375 135.75,486.9625 L135.75,488.0563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="161.25" y="491.506">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="291" y1="502.9" y2="502.9"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="511.8"/>
-          <ellipse cx="18" cy="516.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="259" x="27" y="519.9059">accept(const Visitor &amp; visitor) const : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="291" y1="527.6999" y2="527.6999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="221.6094"/>
+      <ellipse cx="379" cy="226.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001452948650450999568">
-        <rect codeLine="40" fill="#F1F1F1" height="64.7999" id="C_0001452948650450999568" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="285" x="757" y="470.9"/>
-        <ellipse cx="890.75" cy="486.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M885.75,488.0563 C885.75,490.5563 887.8906,492.3688 890.8125,492.3688 C892.0469,492.3688 893.2188,492.0719 893.9688,491.5563 C894.5781,491.1344 894.9063,490.7125 894.9063,490.3063 C894.9063,489.8375 894.4844,489.4313 893.9844,489.4313 C893.75,489.4313 893.5313,489.5094 893.3281,489.7125 C892.8906,490.15 892.8906,490.15 892.7188,490.2438 C892.2656,490.4781 891.625,490.6188 890.8594,490.6188 C888.8594,490.6188 887.5781,489.6031 887.5781,488.025 L887.5781,486.9781 C887.5781,485.275 888.7969,484.0719 890.5,484.0719 C891.0781,484.0719 891.6563,484.2125 892.125,484.4625 C892.5938,484.7281 892.7656,484.9156 892.8281,485.275 C892.9531,485.9469 893.2031,486.1969 893.7344,486.1969 C894.0156,486.1969 894.2969,486.0563 894.4844,485.8375 C894.6094,485.6656 894.6563,485.4938 894.6563,485.0563 L894.6563,483.6969 C894.6563,483.275 894.6406,483.1344 894.5156,482.9625 C894.3438,482.7125 894.0625,482.5563 893.7344,482.5563 C893.4219,482.5563 893.2188,482.6656 893,482.9313 C891.8281,482.4313 891.3906,482.3219 890.4375,482.3219 C887.7656,482.3219 885.75,484.3375 885.75,486.9625 L885.75,488.0563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="911.25" y="491.506">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="758" x2="1041" y1="502.9" y2="502.9"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="763" y="511.8"/>
-          <ellipse cx="768" cy="516.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="259" x="777" y="519.9059">accept(const Visitor &amp; visitor) const : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="758" x2="1041" y1="527.6999" y2="527.6999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="229.8198">visit_B(const B &amp; item) const = 0 : void</text>
     </a>
-    <g id="link_C_0001668671110672744395_C_0001494142745564026823">
-      <path codeLine="44" d="M390.2,231.61 C275.79,249.52 124.66,281.96 88.5,329.3 C56.62,371.05 82.5916,428.5867 111.1916,465.9267 " fill="none" id="C_0001668671110672744395-to-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="114.84,470.69,112.543,461.1128,111.7997,466.7206,106.1919,465.9773,114.84,470.69" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001494142745564026823_C_0001668671110672744395">
-      <path codeLine="56" d="M139.68,470.69 C121.24,433.35 91.62,371.05 123.5,329.3 C156.71,285.82 281.0152,255.9646 384.2952,237.3446 " fill="none" id="C_0001494142745564026823-to-C_0001668671110672744395" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="390.2,236.28,380.6331,233.9403,385.2793,237.1671,382.0525,241.8134,390.2,236.28" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001668671110672744395_C_0001452948650450999568">
-      <path codeLine="45" d="M658.82,236.14 C762.41,254.74 893.21,285.71 926.5,329.3 C958.38,371.05 931.4502,427.9869 912.7202,465.3269 " fill="none" id="C_0001668671110672744395-to-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="910.03,470.69,917.6407,464.4388,912.2718,466.2207,910.4899,460.8519,910.03,470.69" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001452948650450999568_C_0001668671110672744395">
-      <path codeLine="58" d="M934.87,470.69 C963.76,433.35 993.38,371.05 961.5,329.3 C925.26,281.85 779.4185,250.2833 664.6785,232.4133 " fill="none" id="C_0001452948650450999568-to-C_0001668671110672744395" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="658.75,231.49,667.0272,236.8273,663.6904,232.2594,668.2583,228.9226,658.75,231.49" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001028369219400401946_C_0001494142745564026823">
-      <path codeLine="46" d="M216.18,411.18 C202.17,430.32 189.1917,448.0468 176.1017,465.9468 " fill="none" id="C_0001028369219400401946-to-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="172.56,470.79,181.1014,465.8864,175.5114,466.754,174.6438,461.1641,172.56,470.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001028369219400401946_C_0001452948650450999568">
-      <path codeLine="47" d="M367.73,406.86 C373.39,408.27 379,409.63 384.5,410.9 C509.25,439.75 646.884,463.6109 750.684,480.0609 " fill="none" id="C_0001028369219400401946-to-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="756.61,481,748.347,475.6406,751.6716,480.2174,747.0948,483.542,756.61,481" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001668671110672744395_C_0001028369219400401946">
-      <path codeLine="48" d="M409.5948,278.4647 C374.3548,297.9347 351.11,310.77 318.46,328.8 " fill="none" id="C_0001668671110672744395-backto-C_0001028369219400401946" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="425.35,269.76,406.6932,273.213,412.4963,283.7165,425.35,269.76" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001710373315476287130_C_0001494142745564026823">
-      <path codeLine="49" d="M409.44,411.36 C355.18,430.34 297.0335,450.6889 246.2035,468.4689 " fill="none" id="C_0001710373315476287130-to-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="240.54,470.45,250.356,471.2541,245.2596,468.7991,247.7146,463.7027,240.54,470.45" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001710373315476287130_C_0001452948650450999568">
-      <path codeLine="50" d="M639.56,411.36 C693.82,430.34 751.9665,450.6889 802.7965,468.4689 " fill="none" id="C_0001710373315476287130-to-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="808.46,470.45,801.2854,463.7027,803.7404,468.7991,798.644,471.2541,808.46,470.45" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001668671110672744395_C_0001710373315476287130">
-      <path codeLine="51" d="M524.5,287.76 C524.5,307.32 524.5,310.96 524.5,329.04 " fill="none" id="C_0001668671110672744395-backto-C_0001710373315476287130" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="524.5,269.76,518.5,287.76,530.5,287.76,524.5,269.76" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001399026228179178025_C_0001494142745564026823">
-      <path codeLine="52" d="M681.27,406.86 C675.61,408.27 670,409.63 664.5,410.9 C539.75,439.75 402.116,463.6109 298.316,480.0609 " fill="none" id="C_0001399026228179178025-to-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="292.39,481,301.9052,483.542,297.3284,480.2174,300.653,475.6406,292.39,481" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001399026228179178025_C_0001452948650450999568">
-      <path codeLine="53" d="M832.82,411.18 C846.83,430.32 859.8083,448.0468 872.8983,465.9468 " fill="none" id="C_0001399026228179178025-to-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="876.44,470.79,874.3562,461.1641,873.4886,466.754,867.8986,465.8864,876.44,470.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001668671110672744395_C_0001399026228179178025">
-      <path codeLine="54" d="M639.4052,278.4647 C674.6452,297.9347 697.89,310.77 730.54,328.8 " fill="none" id="C_0001668671110672744395-backto-C_0001399026228179178025" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="623.65,269.76,636.5037,283.7165,642.3068,273.213,623.65,269.76" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001491568826758947722_C_0001668671110672744395">
-      <path codeLine="55" d="M524.5,99.03 C524.5,117.5 524.5,133.04 524.5,152.38 " fill="none" id="C_0001491568826758947722-to-C_0001668671110672744395" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="524.5,158.38,528.5,149.38,524.5,153.38,520.5,149.38,524.5,158.38" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001491568826758947722_C_0001494142745564026823">
-      <path codeLine="57" d="M368.6948,105.9231 C265.2448,147.7931 148.13,214.39 84.5,329.3 C66.93,361.03 73.47,376.35 84.5,410.9 C91.55,432.97 106.09,454.27 119.63,470.75 " fill="none" id="C_0001491568826758947722-backto-C_0001494142745564026823" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="385.38,99.17,366.4438,100.3614,370.9458,111.4848,385.38,99.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001491568826758947722_C_0001452948650450999568">
-      <path codeLine="59" d="M695.5763,105.5104 C804.4863,146.5004 925.64,212.37 992.5,329.3 C1010.5,360.78 1006.52,377.45 992.5,410.9 C982.61,434.49 963.33,455.06 944.88,470.69 " fill="none" id="C_0001491568826758947722-backto-C_0001452948650450999568" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="678.73,99.17,693.4629,111.1258,697.6898,99.8949,678.73,99.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="236.4141" y2="236.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="304"/>
+      <ellipse cx="202.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M205.7188,325.6406 Q205.1406,325.9375 204.5,326.0781 Q203.8594,326.2344 203.1563,326.2344 Q200.6563,326.2344 199.3281,324.5938 Q198.0156,322.9375 198.0156,319.8125 Q198.0156,316.6875 199.3281,315.0313 Q200.6563,313.375 203.1563,313.375 Q203.8594,313.375 204.5,313.5313 Q205.1563,313.6875 205.7188,313.9844 L205.7188,316.7031 Q205.0938,316.125 204.5,315.8594 Q203.9063,315.5781 203.2813,315.5781 Q201.9375,315.5781 201.25,316.6563 Q200.5625,317.7188 200.5625,319.8125 Q200.5625,321.9063 201.25,322.9844 Q201.9375,324.0469 203.2813,324.0469 Q203.9063,324.0469 204.5,323.7813 Q205.0938,323.5 205.7188,322.9219 L205.7188,325.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="223.25" y="324.1543">Visitor1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="336" y2="336"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="342"/>
+      <ellipse cx="128" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="137" y="350.2104">visit_A(const A &amp; item) const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="354.8047"/>
+      <ellipse cx="128" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="137" y="363.0151">visit_B(const B &amp; item) const : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="369.6094" y2="369.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="304"/>
+      <ellipse cx="464.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M467.7188,325.6406 Q467.1406,325.9375 466.5,326.0781 Q465.8594,326.2344 465.1563,326.2344 Q462.6563,326.2344 461.3281,324.5938 Q460.0156,322.9375 460.0156,319.8125 Q460.0156,316.6875 461.3281,315.0313 Q462.6563,313.375 465.1563,313.375 Q465.8594,313.375 466.5,313.5313 Q467.1563,313.6875 467.7188,313.9844 L467.7188,316.7031 Q467.0938,316.125 466.5,315.8594 Q465.9063,315.5781 465.2813,315.5781 Q463.9375,315.5781 463.25,316.6563 Q462.5625,317.7188 462.5625,319.8125 Q462.5625,321.9063 463.25,322.9844 Q463.9375,324.0469 465.2813,324.0469 Q465.9063,324.0469 466.5,323.7813 Q467.0938,323.5 467.7188,322.9219 L467.7188,325.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="485.25" y="324.1543">Visitor2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="336" y2="336"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="342"/>
+      <ellipse cx="390" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="399" y="350.2104">visit_A(const A &amp; item) const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="354.8047"/>
+      <ellipse cx="390" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="399" y="363.0151">visit_B(const B &amp; item) const : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="369.6094" y2="369.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="304"/>
+      <ellipse cx="726.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M729.7188,325.6406 Q729.1406,325.9375 728.5,326.0781 Q727.8594,326.2344 727.1563,326.2344 Q724.6563,326.2344 723.3281,324.5938 Q722.0156,322.9375 722.0156,319.8125 Q722.0156,316.6875 723.3281,315.0313 Q724.6563,313.375 727.1563,313.375 Q727.8594,313.375 728.5,313.5313 Q729.1563,313.6875 729.7188,313.9844 L729.7188,316.7031 Q729.0938,316.125 728.5,315.8594 Q727.9063,315.5781 727.2813,315.5781 Q725.9375,315.5781 725.25,316.6563 Q724.5625,317.7188 724.5625,319.8125 Q724.5625,321.9063 725.25,322.9844 Q725.9375,324.0469 727.2813,324.0469 Q727.9063,324.0469 728.5,323.7813 Q729.0938,323.5 729.7188,322.9219 L729.7188,325.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="747.25" y="324.1543">Visitor3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="336" y2="336"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="342"/>
+      <ellipse cx="652" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="661" y="350.2104">visit_A(const A &amp; item) const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="354.8047"/>
+      <ellipse cx="652" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="661" y="363.0151">visit_B(const B &amp; item) const : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="369.6094" y2="369.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="81.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
+      <ellipse cx="474.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M474.3594,19.3438 L473.2031,24.4219 L475.5313,24.4219 L474.3594,19.3438 Z M472.875,17.1094 L475.8594,17.1094 L479.2188,29.5 L476.7656,29.5 L476,26.4375 L472.7188,26.4375 L471.9688,29.5 L469.5313,29.5 L472.875,17.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="494.75" y="28.1543">Item</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="46"/>
+      <ellipse cx="360" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="193" x="369" y="54.2104">~Item() constexpr = default : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="350" x2="635" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="66.8047"/>
+      <ellipse cx="360" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="261" x="369" y="75.0151">accept(const Visitor &amp; visitor) const = 0 : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="81.6094" y2="81.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="438"/>
+      <ellipse cx="130.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M133.2188,459.6406 Q132.6406,459.9375 132,460.0781 Q131.3594,460.2344 130.6563,460.2344 Q128.1563,460.2344 126.8281,458.5938 Q125.5156,456.9375 125.5156,453.8125 Q125.5156,450.6875 126.8281,449.0313 Q128.1563,447.375 130.6563,447.375 Q131.3594,447.375 132,447.5313 Q132.6563,447.6875 133.2188,447.9844 L133.2188,450.7031 Q132.5938,450.125 132,449.8594 Q131.4063,449.5781 130.7813,449.5781 Q129.4375,449.5781 128.75,450.6563 Q128.0625,451.7188 128.0625,453.8125 Q128.0625,455.9063 128.75,456.9844 Q129.4375,458.0469 130.7813,458.0469 Q131.4063,458.0469 132,457.7813 Q132.5938,457.5 133.2188,456.9219 L133.2188,459.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="150.75" y="458.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="470" y2="470"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="476"/>
+      <ellipse cx="17" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="26" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="490.8047" y2="490.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="438"/>
+      <ellipse cx="838.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M841.2188,459.6406 Q840.6406,459.9375 840,460.0781 Q839.3594,460.2344 838.6563,460.2344 Q836.1563,460.2344 834.8281,458.5938 Q833.5156,456.9375 833.5156,453.8125 Q833.5156,450.6875 834.8281,449.0313 Q836.1563,447.375 838.6563,447.375 Q839.3594,447.375 840,447.5313 Q840.6563,447.6875 841.2188,447.9844 L841.2188,450.7031 Q840.5938,450.125 840,449.8594 Q839.4063,449.5781 838.7813,449.5781 Q837.4375,449.5781 836.75,450.6563 Q836.0625,451.7188 836.0625,453.8125 Q836.0625,455.9063 836.75,456.9844 Q837.4375,458.0469 838.7813,458.0469 Q839.4063,458.0469 840,457.7813 Q840.5938,457.5 841.2188,456.9219 L841.2188,459.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="858.75" y="458.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="470" y2="470"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="720" y="476"/>
+      <ellipse cx="725" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="734" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="490.8047" y2="490.8047"/>
+    <path d="M367.78,212.91 C259.99,229.31 116.66,259.4 82.5,304 C53.51,341.84 77.4,397.97 102.9,433.63 " fill="none" id="C_0001668671110672744395-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="106.02,437.88,103.9189,428.2579,103.0613,433.8493,97.4699,432.9918,106.02,437.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M130.77,437.88 C114.43,402.56 87.33,343.38 117.5,304 C148.16,263.97 266.75,235.63 362.59,218.39 " fill="none" id="C_0001494142745564026823-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="367.72,217.48,358.161,215.1081,362.7964,218.3506,359.5539,222.9859,367.72,217.48" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M617.1,217.3 C714.14,234.43 837.18,263.12 868.5,304 C897.37,341.69 873.79,397.51 857.14,433.19 " fill="none" id="C_0001668671110672744395-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="854.94,437.88,862.3718,431.4172,857.0552,433.3494,855.1229,428.0328,854.94,437.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M879.69,437.88 C906.57,402.56 933.67,343.38 903.5,304 C869.79,259.99 729.8,230.11 622.31,213.57 " fill="none" id="C_0001452948650450999568-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="617.22,212.8,625.5106,218.1166,622.1624,213.5571,626.7219,210.2088,617.22,212.8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M203.89,378.3 C191.17,395.65 176.03,416.31 163.52,433.37 " fill="none" id="C_0001028369219400401946-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="160.4,437.62,168.9501,432.7318,163.3587,433.5893,162.5011,427.9979,160.4,437.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M344.31,373.91 C350.11,375.34 355.87,376.71 361.5,378 C477.83,404.67 611.25,428.83 708.68,445.3 " fill="none" id="C_0001028369219400401946-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="713.87,446.18,705.6577,440.7433,708.9392,445.3511,704.3314,448.6325,713.87,446.18" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M389.49,253.83 C358.5,270.63 325.3,288.62 297.31,303.79 " fill="none" id="C_0001668671110672744395&lt;-C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="386.52,247.48,407.44,244.1,393.19,259.79,386.52,247.48" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M390.58,378.13 C338.74,396.51 276.35,418.63 226.61,436.26 " fill="none" id="C_0001710373315476287130-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="221.83,437.96,231.65,438.7132,226.541,436.2847,228.9695,431.1756,221.83,437.96" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M594.42,378.13 C646.26,396.51 708.65,418.63 758.39,436.26 " fill="none" id="C_0001710373315476287130-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="763.17,437.96,756.0305,431.1756,758.459,436.2847,753.35,438.7132,763.17,437.96" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M492.5,264.22 C492.5,277.76 492.5,291.54 492.5,303.56 " fill="none" id="C_0001668671110672744395&lt;-C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="485.5,264.1,492.5,244.1,499.5,264.1,485.5,264.1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M640.69,373.91 C634.89,375.34 629.13,376.71 623.5,378 C507.17,404.67 373.75,428.83 276.32,445.3 " fill="none" id="C_0001399026228179178025-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="271.13,446.18,280.6686,448.6325,276.0608,445.3511,279.3423,440.7433,271.13,446.18" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M781.11,378.3 C793.83,395.65 808.97,416.31 821.48,433.37 " fill="none" id="C_0001399026228179178025-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="824.6,437.62,822.4989,427.9979,821.6413,433.5893,816.0499,432.7318,824.6,437.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M595.51,253.83 C626.5,270.63 659.7,288.62 687.69,303.79 " fill="none" id="C_0001668671110672744395&lt;-C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="591.81,259.79,577.56,244.1,598.48,247.48,591.81,259.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M492.5,90.28 C492.5,107.03 492.5,126.68 492.5,144.47 " fill="none" id="C_0001491568826758947722-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="492.5,149.92,496.5,140.92,492.5,144.92,488.5,140.92,492.5,149.92" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M345.55,97.58 C250.88,136.76 135.26,202.59 78.5,304 C53.84,348.06 86.89,404.22 112.84,437.93 " fill="none" id="C_0001491568826758947722&lt;-C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="343.01,91.06,364.18,90.1,348.23,104.05,343.01,91.06" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M654.92,97.14 C754.72,135.45 874.58,200.46 934.5,304 C950.97,332.47 946.96,347.56 934.5,378 C924.84,401.6 905.63,422.32 887.62,437.86 " fill="none" id="C_0001491568826758947722&lt;-C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="652.2,103.6,635.89,90.07,657.08,90.48,652.2,103.6" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00021_class_mermaid.svg b/docs/test_cases/t00021_class_mermaid.svg
index a8fb772c..40c75c43 100644
--- a/docs/test_cases/t00021_class_mermaid.svg
+++ b/docs/test_cases/t00021_class_mermaid.svg
@@ -1,76 +1,71 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-35 0 1278.0625 614" style="max-width: 1278.06px; background-color: white;" width="1278.0625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-35 0 1246.9453125 614" style="max-width: 1246.95px; background-color: white;" width="1246.9453125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M545.65625,273.1147558849172L450.2135416666667,286.0956299040977C354.7708333333333,299.07650392327815,163.88541666666666,325.0382519616391,68.44270833333333,350.60245931415284C-27,376.1666666666667,-27,401.3333333333333,-27,426.5C-27,451.6666666666667,-27,476.8333333333333,-13.797919228905092,493.30107075954476C-0.5958384578101814,509.7688081857562,25.808323084379637,517.5376163715124,39.01040385547454,521.4220204643906L52.212484626569456,525.3064245572687"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M834.09375,292.72951176983435L869.796875,302.4412598081953C905.5,312.15300784655625,976.90625,331.5765039232781,1012.609375,353.87158529497236C1048.3125,376.1666666666667,1048.3125,401.3333333333333,1048.3125,426.5C1048.3125,451.6666666666667,1048.3125,476.8333333333333,1049.3083233436862,492.6281969500546C1050.3041466873724,508.4230605667758,1052.2957933747448,514.8461211335517,1053.291616718431,518.0576514169396L1054.2874400621172,521.2691817003275"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M152.21875,477L152.21875,481.1666666666667C152.21875,485.3333333333333,152.21875,493.6666666666667,154.27569448873456,501.1501563214178C156.3326389774691,508.6336459761689,160.4465279549382,515.2672919523378,162.50347244367276,518.5841149404223L164.56041693240732,521.9009379285068"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M296.4375,438.38580931263857L425.0833333333333,448.9881744271988C553.7291666666666,459.59053954175903,811.0208333333334,480.79526977087954,939.6666666666666,494.56430155210643C1068.3125,508.3333333333333,1068.3125,514.6666666666666,1068.3125,517.8333333333334L1068.3125,521"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M527.945111132795,282.86479240137635L465.3240509439958,294.22066033448027C402.70299075519665,305.57652826758425,277.4608703775983,328.2882641337921,214.83981018879913,343.8107987335627C152.21875,359.3333333333333,152.21875,367.6666666666667,152.21875,371.8333333333333L152.21875,376"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M366.4375,465.55099467637996L344.0026041666667,471.62582889698325C321.5677083333333,477.70066311758666,276.6979166666667,489.85033155879336,252.2275781608848,499.23968544482767C227.75723965510292,508.629039330862,223.68635431020581,515.258078661724,221.65091163775728,518.572598327155L219.6154689653087,521.887117992586"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M654.875,445.349472545307L727.1145833333334,454.79122712108915C799.3541666666666,464.2329816968713,943.8333333333334,483.11649084843566,1015.0770933229805,495.76977570760573C1086.3208533126276,508.4230605667758,1084.3292066252552,514.8461211335517,1083.333383281569,518.0576514169396L1082.3375599378828,521.2691817003275"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M540.7981820976892,334.6019480131142L535.7745267480743,337.3349566775952C530.7508713984595,340.06796534207615,520.7035606992298,345.5339826710381,515.6799053496148,352.4336580021857C510.65625,359.3333333333333,510.65625,367.6666666666667,510.65625,371.8333333333333L510.65625,376"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M724.875,444.13991899759526L646.0338541666666,453.7832658313294C567.1927083333334,463.4266126650635,409.5104166666667,482.7133063325318,327.49725195544835,495.7889189402919C245.4840872442301,508.86453154805196,239.14004948846022,515.7290630961039,235.96803061057525,519.1613288701299L232.79601173269032,522.5935946441558"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1013.3125,472.01698236446765L1029.1458333333333,477.0141519703897C1044.9791666666667,482.01132157631173,1076.6458333333333,492.00566078815586,1090.422222177932,500.3196533821624C1104.198611022531,508.6336459761689,1100.0847220450617,515.2672919523378,1098.0277775563272,518.5841149404223L1095.9708330675926,521.9009379285068"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M838.9518179023108,334.6019480131142L843.9754732519258,337.3349566775952C848.9991286015405,340.06796534207615,859.0464393007702,345.5339826710381,864.0700946503852,352.4336580021857C869.09375,359.3333333333333,869.09375,367.6666666666667,869.09375,371.8333333333333L869.09375,376"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M689.875,131L689.875,135.16666666666666C689.875,139.33333333333334,689.875,147.66666666666666,689.875,155C689.875,162.33333333333334,689.875,168.66666666666666,689.875,171.83333333333334L689.875,175"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M358.96875,544.8879434850863L414.1197916666667,537.7399529042386C469.2708333333333,530.5919623233909,579.5729166666666,516.2959811616955,634.7239583333334,496.5646572475144C689.875,476.8333333333333,689.875,451.6666666666667,689.875,426.5C689.875,401.3333333333333,689.875,376.1666666666667,689.875,360.4166666666667C689.875,344.6666666666667,689.875,338.3333333333333,689.875,335.1666666666667L689.875,332"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M505.62730429629374,113.96361130844454L476.5956702469114,120.96967609037046C447.5640361975291,127.97574087229636,389.5007680987646,141.9878704361482,360.4691340493823,165.24393521807409C331.4375,188.5,331.4375,221,331.4375,253.5C331.4375,286,331.4375,318.5,331.4375,347.3333333333333C331.4375,376.1666666666667,331.4375,401.3333333333333,331.4375,426.5C331.4375,451.6666666666667,331.4375,476.8333333333333,322.44404069767444,493.5833333333333C313.4505813953488,510.3333333333333,295.4636627906977,518.6666666666666,286.4702034883721,522.8333333333334L277.4767441860465,527"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1117.3047480620155,527L1122.4727067183462,522.8333333333334C1127.640665374677,518.6666666666666,1137.9765826873384,510.3333333333333,1143.1445413436693,493.5833333333333C1148.3125,476.8333333333333,1148.3125,451.6666666666667,1148.3125,426.5C1148.3125,401.3333333333333,1148.3125,376.1666666666667,1096.9208315846283,352.65340794437907C1045.5291631692567,329.1401492220914,942.7458263385133,307.2802984441828,891.3541579231415,296.3503730552285L839.9624895077699,285.4204476662742"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M874.2845904515291,105.88244806627459L916.6225753762742,114.23537338856215C958.9605603010194,122.58829871084974,1043.6365301505095,139.29414935542488,1085.9745150752549,163.89707467771242C1128.3125,188.5,1128.3125,221,1128.3125,253.5C1128.3125,286,1128.3125,318.5,1128.3125,347.3333333333333C1128.3125,376.1666666666667,1128.3125,401.3333333333333,1128.3125,426.5C1128.3125,451.6666666666667,1128.3125,476.8333333333333,1124.436531007752,493.5833333333333C1120.5605620155038,510.3333333333333,1112.8086240310079,518.6666666666666,1108.9326550387598,522.8333333333334L1105.0566860465117,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M532.3203125,272.99368043449107L439.1002604166667,285.99473369540925C345.8802083333333,298.9957869563274,159.44010416666666,324.9978934781637,66.22005208333333,350.5822800724152C-27,376.1666666666667,-27,401.3333333333333,-27,426.5C-27,451.6666666666667,-27,476.8333333333333,-13.125746931524546,493.5833333333333C0.7485061369509083,510.3333333333333,28.497012273901817,518.6666666666666,42.37126534237727,522.8333333333334L56.245518410852725,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M811.8671875,292.48736086898214L846.8294270833334,302.23946739081845C881.7916666666666,311.99157391265476,951.7161458333334,331.4957869563274,986.6783854166666,353.83122681149706C1021.640625,376.1666666666667,1021.640625,401.3333333333333,1021.640625,426.5C1021.640625,451.6666666666667,1021.640625,476.8333333333333,1022.9326146640827,493.5833333333333C1024.2246043281655,510.3333333333333,1026.8085836563307,518.6666666666666,1028.1005733204136,522.8333333333334L1029.3925629844962,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M147.7734375,477L147.7734375,481.1666666666667C147.7734375,485.3333333333333,147.7734375,493.6666666666667,150.35741682816538,502C152.94139615633074,510.3333333333333,158.1093548126615,518.6666666666666,160.69333414082686,522.8333333333334L163.27731346899225,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M287.546875,438.30588646593543L413.2291666666667,448.9215720549462C538.9114583333334,459.53725764395693,790.2760416666666,480.76862882197844,915.9583333333334,495.55098107765593C1041.640625,510.3333333333333,1041.640625,518.6666666666666,1041.640625,522.8333333333334L1041.640625,527"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M532.3203125,279.49157391265476L468.2291666666667,291.4096449272123C404.1380208333333,303.32771594176984,275.9557291666667,327.1638579708849,211.86458333333334,343.2485956521091C147.7734375,359.3333333333333,147.7734375,367.6666666666667,147.7734375,371.8333333333333L147.7734375,376"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M357.546875,465.2745755170583L335.482421875,471.39547959754856C313.41796875,477.5163836780389,269.2890625,489.75819183901945,244.8094466650517,500.04576258617635C220.32983083010336,510.3333333333333,215.49950541020675,518.6666666666666,213.08434270025842,522.8333333333334L210.66917999031008,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M637.09375,445.2001855107776L707.8515625,454.6668212589813C778.609375,464.1334570071851,920.125,483.0667285035925,989.5908228359173,496.7000309184629C1059.0566456718345,510.3333333333333,1056.4726663436693,518.6666666666666,1055.1806766795864,522.8333333333334L1053.8886870155038,527"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M542.1340144230769,326L534.6650641025641,330.1666666666667C527.1961137820513,334.3333333333333,512.2582131410256,342.6666666666667,504.7892628205129,351C497.3203125,359.3333333333333,497.3203125,367.6666666666667,497.3203125,371.8333333333333L497.3203125,376"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M707.09375,444.0382602881126L630.1048177083334,453.6985502400939C553.1158854166666,463.3588401920751,399.1380208333333,482.6794200960376,318.4419361676357,496.5063767146855C237.74585150193798,510.3333333333333,230.33154675387595,518.6666666666666,226.62439437984494,522.8333333333334L222.91724200581396,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M986.640625,471.4492695750557L1002.4739583333334,476.5410579792131C1018.3072916666666,481.63284638337046,1049.9739583333333,491.81642319168526,1063.2233123385013,501.07487826250934C1076.4726663436693,510.3333333333333,1071.3047076873384,518.6666666666666,1068.720728359173,522.8333333333334L1066.1367490310076,527"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M802.0534855769231,326L809.5224358974359,330.1666666666667C816.9913862179487,334.3333333333333,831.9292868589743,342.6666666666667,839.3982371794872,351C846.8671875,359.3333333333333,846.8671875,367.6666666666667,846.8671875,371.8333333333333L846.8671875,376"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M672.09375,131L672.09375,135.16666666666666C672.09375,139.33333333333334,672.09375,147.66666666666666,672.09375,156C672.09375,164.33333333333334,672.09375,172.66666666666666,672.09375,176.83333333333334L672.09375,181"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M350.078125,544.884857967835L403.7473958333333,537.7373816398625C457.4166666666667,530.58990531189,564.7552083333334,516.294952655945,618.4244791666666,496.5641429946392C672.09375,476.8333333333333,672.09375,451.6666666666667,672.09375,426.5C672.09375,401.3333333333333,672.09375,376.1666666666667,672.09375,359.4166666666667C672.09375,342.6666666666667,672.09375,334.3333333333333,672.09375,330.1666666666667L672.09375,326"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M509.7890625,109.66444280541774L478.58203125,117.38703567118144C447.375,125.10962853694515,384.9609375,140.55481426847257,353.75390625,164.52740713423628C322.546875,188.5,322.546875,221,322.546875,253.5C322.546875,286,322.546875,318.5,322.546875,347.3333333333333C322.546875,376.1666666666667,322.546875,401.3333333333333,322.546875,426.5C322.546875,451.6666666666667,322.546875,476.8333333333333,313.8405805878553,493.5833333333333C305.1342861757106,510.3333333333333,287.7216973514212,518.6666666666666,279.0154029392765,522.8333333333334L270.3091085271318,527"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1090.6328730620155,527L1095.8008317183462,522.8333333333334C1100.968790374677,518.6666666666666,1111.3047076873384,510.3333333333333,1116.4726663436693,493.5833333333333C1121.640625,476.8333333333333,1121.640625,451.6666666666667,1121.640625,426.5C1121.640625,401.3333333333333,1121.640625,376.1666666666667,1070.01171875,352.38579501349733C1018.3828125,328.6049233603281,915.125,306.20984672065623,863.49609375,295.01230840082025L811.8671875,283.8147700809843"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M834.3984375,102.1841057073224L878.9388020833334,111.15342142276866C923.4791666666666,120.12273713821493,1012.5598958333334,138.06136856910746,1057.1002604166667,163.28068428455373C1101.640625,188.5,1101.640625,221,1101.640625,253.5C1101.640625,286,1101.640625,318.5,1101.640625,347.3333333333333C1101.640625,376.1666666666667,1101.640625,401.3333333333333,1101.640625,426.5C1101.640625,451.6666666666667,1101.640625,476.8333333333333,1097.764656007752,493.5833333333333C1093.8886870155038,510.3333333333333,1086.1367490310079,518.6666666666666,1082.2607800387598,522.8333333333334L1078.3848110465117,527"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -241,11 +236,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(689.875, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L9">
+        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L9">
           <g title="Visitor" id="classId-C_0001668671110672744395-0" class="node default clickable">
-            <rect height="145" width="288.4375" y="-72.5" x="-144.21875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="144.21875" x1="-144.21875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="144.21875" x1="-144.21875" class="divider"/>
+            <rect height="145" width="279.546875" y="-72.5" x="-139.7734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -65)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -257,29 +252,29 @@
                   <span class="nodeLabel">Visitor</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 3)" height="18" width="260.28125">
+              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="251.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Visitor() : : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~Visitor() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 25)" height="18" width="272.25">
+              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="263.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+visit_A(const A &amp; item) : : [const] void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 47)" height="18" width="273.4375">
+              <foreignObject transform="translate( -132.2734375, 47)" height="18" width="264.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+visit_B(const B &amp; item) : : [const] void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(152.21875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L16">
+        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L16">
           <g title="Visitor1" id="classId-C_0001028369219400401946-1" class="node default clickable">
-            <rect height="101" width="288.4375" y="-50.5" x="-144.21875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="144.21875" x1="-144.21875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="144.21875" x1="-144.21875" class="divider"/>
+            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -291,24 +286,24 @@
                   <span class="nodeLabel">Visitor1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 3)" height="18" width="271.671875">
+              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : : [const] void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 25)" height="18" width="273.4375">
+              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : : [const] void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(510.65625, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L22">
+        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L22">
           <g title="Visitor2" id="classId-C_0001710373315476287130-2" class="node default clickable">
-            <rect height="101" width="288.4375" y="-50.5" x="-144.21875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="144.21875" x1="-144.21875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="144.21875" x1="-144.21875" class="divider"/>
+            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -320,24 +315,24 @@
                   <span class="nodeLabel">Visitor2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 3)" height="18" width="271.671875">
+              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : : [const] void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 25)" height="18" width="273.4375">
+              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : : [const] void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(869.09375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L28">
+        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L28">
           <g title="Visitor3" id="classId-C_0001399026228179178025-3" class="node default clickable">
-            <rect height="101" width="288.4375" y="-50.5" x="-144.21875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="144.21875" x1="-144.21875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="144.21875" x1="-144.21875" class="divider"/>
+            <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -349,24 +344,24 @@
                   <span class="nodeLabel">Visitor3</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 3)" height="18" width="271.671875">
+              <foreignObject transform="translate( -132.2734375, 3)" height="18" width="262.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_A(const A &amp; item) : : [const] void</span>
+                  <span class="nodeLabel">+visit_A(const A &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -136.71875, 25)" height="18" width="273.4375">
+              <foreignObject transform="translate( -132.2734375, 25)" height="18" width="264.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+visit_B(const B &amp; item) : : [const] void</span>
+                  <span class="nodeLabel">+visit_B(const B &amp; item) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(689.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L34">
+        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L34">
           <g title="Item" id="classId-C_0001491568826758947722-4" class="node default clickable">
-            <rect height="123" width="333.5" y="-61.5" x="-166.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="166.75" x1="-166.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="166.75" x1="-166.75" class="divider"/>
+            <rect height="123" width="324.609375" y="-61.5" x="-162.3046875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -378,24 +373,24 @@
                   <span class="nodeLabel">Item</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -159.25, 14)" height="18" width="247.234375">
+              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="238.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Item() : : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~Item() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -159.25, 36)" height="18" width="318.5">
+              <foreignObject transform="translate( -154.8046875, 36)" height="18" width="309.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+accept(const Visitor &amp; visitor) : : [const] void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(192.21875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L40">
+        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L40">
           <g title="A" id="classId-C_0001494142745564026823-5" class="node default clickable">
-            <rect height="79" width="333.5" y="-39.5" x="-166.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="166.75" x1="-166.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="166.75" x1="-166.75" class="divider"/>
+            <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -407,19 +402,19 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -159.25, 14)" height="18" width="318.5">
+              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="309.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : : [const] void</span>
+                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1068.3125, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00021/t00021.cc#L45">
+        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L45">
           <g title="B" id="classId-C_0001452948650450999568-6" class="node default clickable">
-            <rect height="79" width="333.5" y="-39.5" x="-166.75" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="166.75" x1="-166.75" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="166.75" x1="-166.75" class="divider"/>
+            <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -431,9 +426,9 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -159.25, 14)" height="18" width="318.5">
+              <foreignObject transform="translate( -154.8046875, 14)" height="18" width="309.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : : [const] void</span>
+                  <span class="nodeLabel">+accept(const Visitor &amp; visitor) : [const] void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md
index ed51033b..f3f741e2 100644
--- a/docs/test_cases/t00022.md
+++ b/docs/test_cases/t00022.md
@@ -59,7 +59,7 @@ protected:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00022::A",
+      "display_name": "A",
       "id": "2012435893382068755",
       "is_abstract": true,
       "is_nested": false,
@@ -167,7 +167,7 @@ protected:
           "name": "clanguml::t00022::A"
         }
       ],
-      "display_name": "clanguml::t00022::A1",
+      "display_name": "A1",
       "id": "2282061426381077447",
       "is_abstract": false,
       "is_nested": false,
@@ -249,7 +249,7 @@ protected:
           "name": "clanguml::t00022::A"
         }
       ],
-      "display_name": "clanguml::t00022::A2",
+      "display_name": "A2",
       "id": "158819862916671538",
       "is_abstract": false,
       "is_nested": false,
@@ -324,6 +324,7 @@ protected:
     }
   ],
   "name": "t00022_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index c76e6ef0..0ae05e6a 100644
--- a/docs/test_cases/t00022_class.svg
+++ b/docs/test_cases/t00022_class.svg
@@ -1,94 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="258px" preserveAspectRatio="none" style="width:311px;height:258px;background:#FFFFFF;" version="1.1" viewBox="0 0 311 258" width="311px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="fjptq3s84e4hr" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002012435893382068755">
-        <rect codeLine="2" fill="#F1F1F1" height="102.5998" id="C_0002012435893382068755" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="185" x="63.5" y="7"/>
-        <ellipse cx="147.25" cy="23" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M148.7813,24.9375 L149.1094,25.7344 L148.8281,25.7344 C148.375,25.7344 148.25,25.7656 148.0781,25.875 C147.7969,26.0156 147.625,26.3125 147.625,26.6094 C147.625,26.9063 147.7656,27.1563 148,27.3281 C148.1719,27.4531 148.4063,27.5 148.8281,27.5 L151.1875,27.5 C151.5469,27.5 151.7969,27.4688 151.9375,27.375 C152.2031,27.2344 152.375,26.9219 152.375,26.6094 C152.375,26.3438 152.2344,26.0781 152,25.9063 C151.8125,25.7813 151.6563,25.75 151.2031,25.7344 L147.8125,17.9063 L144.0938,17.9063 C143.6406,17.9063 143.5,17.9219 143.3281,18.0313 C143.0625,18.2031 142.8906,18.4844 142.8906,18.7813 C142.8906,19.0625 143.0313,19.3281 143.2813,19.5 C143.4531,19.625 143.6406,19.6563 144.0938,19.6563 L145.0625,19.6563 L142.4844,25.7344 C141.7344,25.7344 141.3281,26.0313 141.3281,26.6094 C141.3281,27.2188 141.7188,27.5 142.5156,27.5 L144.7813,27.5 C145.1406,27.5 145.3906,27.4688 145.5313,27.375 C145.7969,27.2188 145.9688,26.9219 145.9688,26.6094 C145.9688,26.3438 145.8281,26.0781 145.5938,25.9063 C145.4063,25.7656 145.25,25.7344 144.7813,25.7344 L144.4844,25.7344 L144.8281,24.9375 L148.7813,24.9375 Z M148.0156,23.1875 L145.5625,23.1875 L146.7969,20.3125 L148.0156,23.1875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="9" x="167.75" y="28.95">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="64.5" x2="247.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="48.95"/>
-          <polygon fill="#FFFF44" points="74.5,48.95,78.5,52.95,74.5,56.95,70.5,52.95" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="128" x="83.5" y="58.3999">method1() = 0 : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="67.8499"/>
-          <polygon fill="#FFFF44" points="74.5,67.8499,78.5,71.8499,74.5,75.8499,70.5,71.8499" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="128" x="83.5" y="77.2999">method2() = 0 : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="85.6998"/>
-          <ellipse cx="74.5" cy="90.6998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="83.5" y="93.8058">template_method() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="64.5" x2="247.5" y1="101.5998" y2="101.5998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjptq3s84e4hr)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
+      <ellipse cx="134.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M134.3594,19.3438 L133.2031,24.4219 L135.5313,24.4219 L134.3594,19.3438 Z M132.875,17.1094 L135.8594,17.1094 L139.2188,29.5 L136.7656,29.5 L136,26.4375 L132.7188,26.4375 L131.9688,29.5 L129.5313,29.5 L132.875,17.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="154.75" y="28.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <g id="elem_C_0002282061426381077447">
-        <rect codeLine="9" fill="#F1F1F1" height="81.5999" id="C_0002282061426381077447" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="130" x="9" y="169.6"/>
-        <ellipse cx="61.25" cy="185.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M56.25,186.7563 C56.25,189.2563 58.3906,191.0688 61.3125,191.0688 C62.5469,191.0688 63.7188,190.7719 64.4688,190.2563 C65.0781,189.8344 65.4063,189.4125 65.4063,189.0063 C65.4063,188.5375 64.9844,188.1313 64.4844,188.1313 C64.25,188.1313 64.0313,188.2094 63.8281,188.4125 C63.3906,188.85 63.3906,188.85 63.2188,188.9438 C62.7656,189.1781 62.125,189.3188 61.3594,189.3188 C59.3594,189.3188 58.0781,188.3031 58.0781,186.725 L58.0781,185.6781 C58.0781,183.975 59.2969,182.7719 61,182.7719 C61.5781,182.7719 62.1563,182.9125 62.625,183.1625 C63.0938,183.4281 63.2656,183.6156 63.3281,183.975 C63.4531,184.6469 63.7031,184.8969 64.2344,184.8969 C64.5156,184.8969 64.7969,184.7563 64.9844,184.5375 C65.1094,184.3656 65.1563,184.1938 65.1563,183.7563 L65.1563,182.3969 C65.1563,181.975 65.1406,181.8344 65.0156,181.6625 C64.8438,181.4125 64.5625,181.2563 64.2344,181.2563 C63.9219,181.2563 63.7188,181.3656 63.5,181.6313 C62.3281,181.1313 61.8906,181.0219 60.9375,181.0219 C58.2656,181.0219 56.25,183.0375 56.25,185.6625 L56.25,186.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="81.75" y="190.206">A1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="138" y1="201.6" y2="201.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="210.5"/>
-          <polygon fill="#FFFF44" points="20,210.5,24,214.5,20,218.5,16,214.5" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="29" y="218.6059">method1() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="15" y="227.2999"/>
-          <polygon fill="#FFFF44" points="20,227.2999,24,231.2999,20,235.2999,16,231.2999" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="29" y="235.4059">method2() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="138" y1="243.1999" y2="243.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="46"/>
+      <polygon fill="#FFFF44" points="69.5,46,73.5,50,69.5,54,65.5,50" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <g id="elem_C_0000158819862916671538">
-        <rect codeLine="15" fill="#F1F1F1" height="81.5999" id="C_0000158819862916671538" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="130" x="174" y="169.6"/>
-        <ellipse cx="226.25" cy="185.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M221.25,186.7563 C221.25,189.2563 223.3906,191.0688 226.3125,191.0688 C227.5469,191.0688 228.7188,190.7719 229.4688,190.2563 C230.0781,189.8344 230.4063,189.4125 230.4063,189.0063 C230.4063,188.5375 229.9844,188.1313 229.4844,188.1313 C229.25,188.1313 229.0313,188.2094 228.8281,188.4125 C228.3906,188.85 228.3906,188.85 228.2188,188.9438 C227.7656,189.1781 227.125,189.3188 226.3594,189.3188 C224.3594,189.3188 223.0781,188.3031 223.0781,186.725 L223.0781,185.6781 C223.0781,183.975 224.2969,182.7719 226,182.7719 C226.5781,182.7719 227.1563,182.9125 227.625,183.1625 C228.0938,183.4281 228.2656,183.6156 228.3281,183.975 C228.4531,184.6469 228.7031,184.8969 229.2344,184.8969 C229.5156,184.8969 229.7969,184.7563 229.9844,184.5375 C230.1094,184.3656 230.1563,184.1938 230.1563,183.7563 L230.1563,182.3969 C230.1563,181.975 230.1406,181.8344 230.0156,181.6625 C229.8438,181.4125 229.5625,181.2563 229.2344,181.2563 C228.9219,181.2563 228.7188,181.3656 228.5,181.6313 C227.3281,181.1313 226.8906,181.0219 225.9375,181.0219 C223.2656,181.0219 221.25,183.0375 221.25,185.6625 L221.25,186.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="246.75" y="190.206">A2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="175" x2="303" y1="201.6" y2="201.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="180" y="210.5"/>
-          <polygon fill="#FFFF44" points="185,210.5,189,214.5,185,218.5,181,214.5" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="194" y="218.6059">method1() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="180" y="227.2999"/>
-          <polygon fill="#FFFF44" points="185,227.2999,189,231.2999,185,235.2999,181,231.2999" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="194" y="235.4059">method2() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="175" x2="303" y1="243.1999" y2="243.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="54.2104">method1() = 0 : void</text>
     </a>
-    <g id="link_C_0002012435893382068755_C_0002282061426381077447">
-      <path codeLine="20" d="M119.8398,125.4962 C109.2298,144.9162 105.9,151.01 95.89,169.33 " fill="none" id="C_0002012435893382068755-backto-C_0002282061426381077447" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="128.47,109.7,114.5744,122.6195,125.1052,128.3729,128.47,109.7" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002012435893382068755_C_0000158819862916671538">
-      <path codeLine="21" d="M192.5813,125.4516 C203.3213,144.8716 206.71,151.01 216.84,169.33 " fill="none" id="C_0002012435893382068755-backto-C_0000158819862916671538" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="183.87,109.7,187.3307,128.3554,197.8318,122.5479,183.87,109.7" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="58.8047"/>
+      <polygon fill="#FFFF44" points="69.5,58.8047,73.5,62.8047,69.5,66.8047,65.5,62.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="67.0151">method2() = 0 : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="71.6094"/>
+      <ellipse cx="69.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="78.5" y="79.8198">template_method() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="86.4141" y2="86.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjptq3s84e4hr)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
+      <ellipse cx="53.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M56.2188,175.6406 Q55.6406,175.9375 55,176.0781 Q54.3594,176.2344 53.6563,176.2344 Q51.1563,176.2344 49.8281,174.5938 Q48.5156,172.9375 48.5156,169.8125 Q48.5156,166.6875 49.8281,165.0313 Q51.1563,163.375 53.6563,163.375 Q54.3594,163.375 55,163.5313 Q55.6563,163.6875 56.2188,163.9844 L56.2188,166.7031 Q55.5938,166.125 55,165.8594 Q54.4063,165.5781 53.7813,165.5781 Q52.4375,165.5781 51.75,166.6563 Q51.0625,167.7188 51.0625,169.8125 Q51.0625,171.9063 51.75,172.9844 Q52.4375,174.0469 53.7813,174.0469 Q54.4063,174.0469 55,173.7813 Q55.5938,173.5 56.2188,172.9219 L56.2188,175.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="73.75" y="174.1543">A1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="186" y2="186"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="192"/>
+      <polygon fill="#FFFF44" points="17,192,21,196,17,200,13,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="200.2104">method1() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="204.8047"/>
+      <polygon fill="#FFFF44" points="17,204.8047,21,208.8047,17,212.8047,13,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="213.0151">method2() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="219.6094" y2="219.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjptq3s84e4hr)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
+      <ellipse cx="207.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M210.2188,175.6406 Q209.6406,175.9375 209,176.0781 Q208.3594,176.2344 207.6563,176.2344 Q205.1563,176.2344 203.8281,174.5938 Q202.5156,172.9375 202.5156,169.8125 Q202.5156,166.6875 203.8281,165.0313 Q205.1563,163.375 207.6563,163.375 Q208.3594,163.375 209,163.5313 Q209.6563,163.6875 210.2188,163.9844 L210.2188,166.7031 Q209.5938,166.125 209,165.8594 Q208.4063,165.5781 207.7813,165.5781 Q206.4375,165.5781 205.75,166.6563 Q205.0625,167.7188 205.0625,169.8125 Q205.0625,171.9063 205.75,172.9844 Q206.4375,174.0469 207.7813,174.0469 Q208.4063,174.0469 209,173.7813 Q209.5938,173.5 210.2188,172.9219 L210.2188,175.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="227.75" y="174.1543">A2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="186" y2="186"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="192"/>
+      <polygon fill="#FFFF44" points="171,192,175,196,171,200,167,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="200.2104">method1() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="204.8047"/>
+      <polygon fill="#FFFF44" points="171,204.8047,175,208.8047,171,212.8047,167,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="213.0151">method2() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="219.6094" y2="219.6094"/>
+    <path d="M109.15,111.76 C101.19,126.04 92.92,140.85 85.76,153.7 " fill="none" id="C_0002012435893382068755&lt;-C_0002282061426381077447" 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;"/>
+    <path d="M175.85,111.76 C183.81,126.04 192.08,140.85 199.24,153.7 " fill="none" id="C_0002012435893382068755&lt;-C_0000158819862916671538" 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;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00022_class_mermaid.svg b/docs/test_cases/t00022_class_mermaid.svg
index e25823f5..0d7761de 100644
--- a/docs/test_cases/t00022_class_mermaid.svg
+++ b/docs/test_cases/t00022_class_mermaid.svg
@@ -1,62 +1,57 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 362.8125 312" style="max-width: 362.812px; background-color: white;" width="362.8125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 345.03125 312" style="max-width: 345.031px; background-color: white;" width="345.03125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M94.802180011649,165.61724629505596L92.70233750970749,167.68103857921332C90.602495007766,169.74483086337065,86.402810003883,173.87241543168534,84.3029675019415,180.10287438250933C82.203125,186.33333333333334,82.203125,194.66666666666666,82.203125,198.83333333333334L82.203125,203"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M268.010319988351,165.61724629505596L270.1101624902925,167.68103857921332C272.210004992234,169.74483086337065,276.40968999611704,173.87241543168534,278.5095324980585,180.10287438250933C280.609375,186.33333333333334,280.609375,194.66666666666666,280.609375,198.83333333333334L280.609375,203"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M102.0546875,153L98.00520833333333,157.16666666666666C93.95572916666667,161.33333333333334,85.85677083333333,169.66666666666666,81.80729166666667,178C77.7578125,186.33333333333334,77.7578125,194.66666666666666,77.7578125,198.83333333333334L77.7578125,203"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M242.9765625,153L247.02604166666666,157.16666666666666C251.07552083333334,161.33333333333334,259.1744791666667,169.66666666666666,263.2239583333333,178C267.2734375,186.33333333333334,267.2734375,194.66666666666666,267.2734375,198.83333333333334L267.2734375,203"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -79,11 +74,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(181.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L6">
+        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L6">
           <g title="A" id="classId-C_0002012435893382068755-0" class="node default clickable">
-            <rect height="145" width="210.21875" y="-72.5" x="-105.109375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="105.109375" x1="-105.109375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="105.109375" x1="-105.109375" class="divider"/>
+            <rect height="145" width="201.328125" y="-72.5" x="-100.6640625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="100.6640625" x1="-100.6640625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="100.6640625" x1="-100.6640625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -65)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -95,29 +90,29 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -97.609375, 3)" height="18" width="133.40625">
+              <foreignObject transform="translate( -93.1640625, 3)" height="18" width="124.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">#method1() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">#method1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -97.609375, 25)" height="18" width="133.40625">
+              <foreignObject transform="translate( -93.1640625, 25)" height="18" width="124.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">#method2() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">#method2() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -97.609375, 47)" height="18" width="195.21875">
+              <foreignObject transform="translate( -93.1640625, 47)" height="18" width="186.328125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+template_method() : : void</span>
+                  <span class="nodeLabel">+template_method() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(82.203125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L19">
+        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L19">
           <g title="A1" id="classId-C_0002282061426381077447-1" class="node default clickable">
-            <rect height="101" width="148.40625" y="-50.5" x="-74.203125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="74.203125" x1="-74.203125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="74.203125" x1="-74.203125" class="divider"/>
+            <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -129,24 +124,24 @@
                   <span class="nodeLabel">A1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -66.703125, 3)" height="18" width="133.40625">
+              <foreignObject transform="translate( -62.2578125, 3)" height="18" width="124.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#method1() : : void</span>
+                  <span class="nodeLabel">#method1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -66.703125, 25)" height="18" width="133.40625">
+              <foreignObject transform="translate( -62.2578125, 25)" height="18" width="124.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#method2() : : void</span>
+                  <span class="nodeLabel">#method2() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(280.609375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00022/t00022.cc#L25">
+        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L25">
           <g title="A2" id="classId-C_0000158819862916671538-2" class="node default clickable">
-            <rect height="101" width="148.40625" y="-50.5" x="-74.203125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="74.203125" x1="-74.203125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="74.203125" x1="-74.203125" class="divider"/>
+            <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -158,14 +153,14 @@
                   <span class="nodeLabel">A2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -66.703125, 3)" height="18" width="133.40625">
+              <foreignObject transform="translate( -62.2578125, 3)" height="18" width="124.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#method1() : : void</span>
+                  <span class="nodeLabel">#method1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -66.703125, 25)" height="18" width="133.40625">
+              <foreignObject transform="translate( -62.2578125, 25)" height="18" width="124.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#method2() : : void</span>
+                  <span class="nodeLabel">#method2() : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md
index 9b9afebd..2ac5d7d8 100644
--- a/docs/test_cases/t00023.md
+++ b/docs/test_cases/t00023.md
@@ -68,7 +68,7 @@ private:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00023::Strategy",
+      "display_name": "Strategy",
       "id": "1469857696438841976",
       "is_abstract": true,
       "is_nested": false,
@@ -150,7 +150,7 @@ private:
           "name": "clanguml::t00023::Strategy"
         }
       ],
-      "display_name": "clanguml::t00023::StrategyA",
+      "display_name": "StrategyA",
       "id": "1245533075819635385",
       "is_abstract": false,
       "is_nested": false,
@@ -206,7 +206,7 @@ private:
           "name": "clanguml::t00023::Strategy"
         }
       ],
-      "display_name": "clanguml::t00023::StrategyB",
+      "display_name": "StrategyB",
       "id": "264986406899645",
       "is_abstract": false,
       "is_nested": false,
@@ -262,7 +262,7 @@ private:
           "name": "clanguml::t00023::Strategy"
         }
       ],
-      "display_name": "clanguml::t00023::StrategyC",
+      "display_name": "StrategyC",
       "id": "174795176193483089",
       "is_abstract": false,
       "is_nested": false,
@@ -311,7 +311,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00023::Context",
+      "display_name": "Context",
       "id": "2038594012979479050",
       "is_abstract": false,
       "is_nested": false,
@@ -404,6 +404,7 @@ private:
     }
   ],
   "name": "t00023_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index cd26f024..e21c22a4 100644
--- a/docs/test_cases/t00023_class.svg
+++ b/docs/test_cases/t00023_class.svg
@@ -1,133 +1,121 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="414px" preserveAspectRatio="none" style="width:483px;height:414px;background:#FFFFFF;" version="1.1" viewBox="0 0 483 414" width="483px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="393px" preserveAspectRatio="none" style="width:456px;height:393px;" version="1.1" viewBox="0 0 456 393" width="456px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1d6jg5w0zuo6i" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <g id="elem_C_0001469857696438841976">
-        <rect codeLine="2" fill="#F1F1F1" height="91.6998" id="C_0001469857696438841976" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="260" x="111.5" y="190.4"/>
-        <ellipse cx="210.75" cy="206.4" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M212.2813,208.3375 L212.6094,209.1344 L212.3281,209.1344 C211.875,209.1344 211.75,209.1656 211.5781,209.275 C211.2969,209.4156 211.125,209.7125 211.125,210.0094 C211.125,210.3062 211.2656,210.5562 211.5,210.7281 C211.6719,210.8531 211.9063,210.9 212.3281,210.9 L214.6875,210.9 C215.0469,210.9 215.2969,210.8687 215.4375,210.775 C215.7031,210.6344 215.875,210.3219 215.875,210.0094 C215.875,209.7437 215.7344,209.4781 215.5,209.3062 C215.3125,209.1812 215.1563,209.15 214.7031,209.1344 L211.3125,201.3062 L207.5938,201.3062 C207.1406,201.3062 207,201.3219 206.8281,201.4312 C206.5625,201.6031 206.3906,201.8844 206.3906,202.1812 C206.3906,202.4625 206.5313,202.7281 206.7813,202.9 C206.9531,203.025 207.1406,203.0562 207.5938,203.0562 L208.5625,203.0562 L205.9844,209.1344 C205.2344,209.1344 204.8281,209.4312 204.8281,210.0094 C204.8281,210.6187 205.2188,210.9 206.0156,210.9 L208.2813,210.9 C208.6406,210.9 208.8906,210.8687 209.0313,210.775 C209.2969,210.6187 209.4688,210.3219 209.4688,210.0094 C209.4688,209.7437 209.3281,209.4781 209.0938,209.3062 C208.9063,209.1656 208.75,209.1344 208.2813,209.1344 L207.9844,209.1344 L208.3281,208.3375 L212.2813,208.3375 Z M211.5156,206.5875 L209.0625,206.5875 L210.2969,203.7125 L211.5156,206.5875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="53" x="231.25" y="212.35">Strategy</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="112.5" x2="370.5" y1="222.4" y2="222.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="117.5" y="231.3"/>
-          <ellipse cx="122.5" cy="236.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="234" x="131.5" y="239.4059">~Strategy() constexpr = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="112.5" x2="370.5" y1="247.1999" y2="247.1999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="117.5" y="257.1499"/>
-          <ellipse cx="122.5" cy="262.1499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="131" x="131.5" y="266.5999">algorithm() = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="112.5" x2="370.5" y1="274.0998" y2="274.0998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="81.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="104.5" y="179"/>
+      <ellipse cx="194.25" cy="195" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M194.3594,190.3438 L193.2031,195.4219 L195.5313,195.4219 L194.3594,190.3438 Z M192.875,188.1094 L195.8594,188.1094 L199.2188,200.5 L196.7656,200.5 L196,197.4375 L192.7188,197.4375 L191.9688,200.5 L189.5313,200.5 L192.875,188.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.75" y="199.1543">Strategy</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <g id="elem_C_0001245533075819635385">
-        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0001245533075819635385" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="133" x="7" y="343.1"/>
-        <ellipse cx="39.55" cy="359.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M34.55,360.2562 C34.55,362.7562 36.6906,364.5687 39.6125,364.5687 C40.8469,364.5687 42.0188,364.2719 42.7688,363.7562 C43.3781,363.3344 43.7063,362.9125 43.7063,362.5062 C43.7063,362.0375 43.2844,361.6312 42.7844,361.6312 C42.55,361.6312 42.3313,361.7094 42.1281,361.9125 C41.6906,362.35 41.6906,362.35 41.5188,362.4437 C41.0656,362.6781 40.425,362.8187 39.6594,362.8187 C37.6594,362.8187 36.3781,361.8031 36.3781,360.225 L36.3781,359.1781 C36.3781,357.475 37.5969,356.2719 39.3,356.2719 C39.8781,356.2719 40.4563,356.4125 40.925,356.6625 C41.3938,356.9281 41.5656,357.1156 41.6281,357.475 C41.7531,358.1469 42.0031,358.3969 42.5344,358.3969 C42.8156,358.3969 43.0969,358.2562 43.2844,358.0375 C43.4094,357.8656 43.4563,357.6937 43.4563,357.2562 L43.4563,355.8969 C43.4563,355.475 43.4406,355.3344 43.3156,355.1625 C43.1438,354.9125 42.8625,354.7562 42.5344,354.7562 C42.2219,354.7562 42.0188,354.8656 41.8,355.1312 C40.6281,354.6312 40.1906,354.5219 39.2375,354.5219 C36.5656,354.5219 34.55,356.5375 34.55,359.1625 L34.55,360.2562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="57.45" y="363.706">StrategyA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="139" y1="375.1" y2="375.1"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="384"/>
-          <ellipse cx="18" cy="389" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="27" y="392.1059">algorithm() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="139" y1="399.8999" y2="399.8999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="217"/>
+      <ellipse cx="115.5" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <g id="elem_C_0000000264986406899645">
-        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0000000264986406899645" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="133" x="175" y="343.1"/>
-        <ellipse cx="207.55" cy="359.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M202.55,360.2562 C202.55,362.7562 204.6906,364.5687 207.6125,364.5687 C208.8469,364.5687 210.0188,364.2719 210.7688,363.7562 C211.3781,363.3344 211.7063,362.9125 211.7063,362.5062 C211.7063,362.0375 211.2844,361.6312 210.7844,361.6312 C210.55,361.6312 210.3313,361.7094 210.1281,361.9125 C209.6906,362.35 209.6906,362.35 209.5188,362.4437 C209.0656,362.6781 208.425,362.8187 207.6594,362.8187 C205.6594,362.8187 204.3781,361.8031 204.3781,360.225 L204.3781,359.1781 C204.3781,357.475 205.5969,356.2719 207.3,356.2719 C207.8781,356.2719 208.4563,356.4125 208.925,356.6625 C209.3938,356.9281 209.5656,357.1156 209.6281,357.475 C209.7531,358.1469 210.0031,358.3969 210.5344,358.3969 C210.8156,358.3969 211.0969,358.2562 211.2844,358.0375 C211.4094,357.8656 211.4563,357.6937 211.4563,357.2562 L211.4563,355.8969 C211.4563,355.475 211.4406,355.3344 211.3156,355.1625 C211.1438,354.9125 210.8625,354.7562 210.5344,354.7562 C210.2219,354.7562 210.0188,354.8656 209.8,355.1312 C208.6281,354.6312 208.1906,354.5219 207.2375,354.5219 C204.5656,354.5219 202.55,356.5375 202.55,359.1625 L202.55,360.2562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="225.45" y="363.706">StrategyB</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="176" x2="307" y1="375.1" y2="375.1"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="181" y="384"/>
-          <ellipse cx="186" cy="389" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="195" y="392.1059">algorithm() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="176" x2="307" y1="399.8999" y2="399.8999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="124.5" y="225.2104">~Strategy() constexpr = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <g id="elem_C_0000174795176193483089">
-        <rect codeLine="19" fill="#F1F1F1" height="64.7999" id="C_0000174795176193483089" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="133" x="343" y="343.1"/>
-        <ellipse cx="375.1" cy="359.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M370.1,360.2562 C370.1,362.7562 372.2406,364.5687 375.1625,364.5687 C376.3969,364.5687 377.5688,364.2719 378.3188,363.7562 C378.9281,363.3344 379.2563,362.9125 379.2563,362.5062 C379.2563,362.0375 378.8344,361.6312 378.3344,361.6312 C378.1,361.6312 377.8813,361.7094 377.6781,361.9125 C377.2406,362.35 377.2406,362.35 377.0688,362.4437 C376.6156,362.6781 375.975,362.8187 375.2094,362.8187 C373.2094,362.8187 371.9281,361.8031 371.9281,360.225 L371.9281,359.1781 C371.9281,357.475 373.1469,356.2719 374.85,356.2719 C375.4281,356.2719 376.0063,356.4125 376.475,356.6625 C376.9438,356.9281 377.1156,357.1156 377.1781,357.475 C377.3031,358.1469 377.5531,358.3969 378.0844,358.3969 C378.3656,358.3969 378.6469,358.2562 378.8344,358.0375 C378.9594,357.8656 379.0063,357.6937 379.0063,357.2562 L379.0063,355.8969 C379.0063,355.475 378.9906,355.3344 378.8656,355.1625 C378.6938,354.9125 378.4125,354.7562 378.0844,354.7562 C377.7719,354.7562 377.5688,354.8656 377.35,355.1312 C376.1781,354.6312 375.7406,354.5219 374.7875,354.5219 C372.1156,354.5219 370.1,356.5375 370.1,359.1625 L370.1,360.2562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="392.9" y="363.706">StrategyC</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="344" x2="475" y1="375.1" y2="375.1"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="349" y="384"/>
-          <ellipse cx="354" cy="389" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="363" y="392.1059">algorithm() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="344" x2="475" y1="399.8999" y2="399.8999"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="105.5" x2="345.5" y1="231.8047" y2="231.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="237.8047"/>
+      <ellipse cx="115.5" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <g id="elem_C_0002038594012979479050">
-        <rect codeLine="24" fill="#F1F1F1" height="106.3998" id="C_0002038594012979479050" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="342" x="70.5" y="7"/>
-        <ellipse cx="212.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M207.75,24.1563 C207.75,26.6563 209.8906,28.4688 212.8125,28.4688 C214.0469,28.4688 215.2188,28.1719 215.9688,27.6563 C216.5781,27.2344 216.9063,26.8125 216.9063,26.4063 C216.9063,25.9375 216.4844,25.5313 215.9844,25.5313 C215.75,25.5313 215.5313,25.6094 215.3281,25.8125 C214.8906,26.25 214.8906,26.25 214.7188,26.3438 C214.2656,26.5781 213.625,26.7188 212.8594,26.7188 C210.8594,26.7188 209.5781,25.7031 209.5781,24.125 L209.5781,23.0781 C209.5781,21.375 210.7969,20.1719 212.5,20.1719 C213.0781,20.1719 213.6563,20.3125 214.125,20.5625 C214.5938,20.8281 214.7656,21.0156 214.8281,21.375 C214.9531,22.0469 215.2031,22.2969 215.7344,22.2969 C216.0156,22.2969 216.2969,22.1563 216.4844,21.9375 C216.6094,21.7656 216.6563,21.5938 216.6563,21.1563 L216.6563,19.7969 C216.6563,19.375 216.6406,19.2344 216.5156,19.0625 C216.3438,18.8125 216.0625,18.6563 215.7344,18.6563 C215.4219,18.6563 215.2188,18.7656 215,19.0313 C213.8281,18.5313 213.3906,18.4219 212.4375,18.4219 C209.7656,18.4219 207.75,20.4375 207.75,23.0625 L207.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="233.25" y="27.606">Context</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="71.5" x2="411.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="76.5" y="47.9"/>
-          <ellipse cx="81.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="316" x="90.5" y="56.0059">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="71.5" x2="411.5" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="76.5" y="72.6999"/>
-          <ellipse cx="81.5" cy="77.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="90.5" y="80.8059">apply() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="71.5" x2="411.5" y1="88.5999" y2="88.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="76.5" y="97.4998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="78.5" y="99.4998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="247" x="90.5" y="105.6058">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="124.5" y="246.0151">algorithm() = 0 : void</text>
     </a>
-    <g id="link_C_0001469857696438841976_C_0001245533075819635385">
-      <path codeLine="31" d="M172.0826,293.9607 C148.0026,313.6407 134.3,324.82 112.45,342.68 " fill="none" id="C_0001469857696438841976-backto-C_0001245533075819635385" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="186.02,282.57,168.2857,289.3149,175.8795,298.6065,186.02,282.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001469857696438841976_C_0000000264986406899645">
-      <path codeLine="32" d="M241.5,300.57 C241.5,320.25 241.5,324.82 241.5,342.68 " fill="none" id="C_0001469857696438841976-backto-C_0000000264986406899645" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="241.5,282.57,235.5,300.57,247.5,300.57,241.5,282.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001469857696438841976_C_0000174795176193483089">
-      <path codeLine="33" d="M310.9174,293.9607 C334.9974,313.6407 348.7,324.82 370.55,342.68 " fill="none" id="C_0001469857696438841976-backto-C_0000174795176193483089" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="296.98,282.57,307.1205,298.6065,314.7143,289.3149,296.98,282.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002038594012979479050_C_0001469857696438841976">
-      <path codeLine="34" d="M241.5,125.89 C241.5,150.21 241.5,166.78 241.5,190.09 " fill="none" id="C_0002038594012979479050-backto-C_0001469857696438841976" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="241.5,113.89,237.5,119.89,241.5,125.89,245.5,119.89,241.5,113.89" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="244.5" y="149.7"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="65" x="254.5" y="156.477">m_strategy</text>
-    </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="252.6094" y2="252.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="322"/>
+      <ellipse cx="34.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M37.4688,343.6406 Q36.8906,343.9375 36.25,344.0781 Q35.6094,344.2344 34.9063,344.2344 Q32.4063,344.2344 31.0781,342.5938 Q29.7656,340.9375 29.7656,337.8125 Q29.7656,334.6875 31.0781,333.0313 Q32.4063,331.375 34.9063,331.375 Q35.6094,331.375 36.25,331.5313 Q36.9063,331.6875 37.4688,331.9844 L37.4688,334.7031 Q36.8438,334.125 36.25,333.8594 Q35.6563,333.5781 35.0313,333.5781 Q33.6875,333.5781 33,334.6563 Q32.3125,335.7188 32.3125,337.8125 Q32.3125,339.9063 33,340.9844 Q33.6875,342.0469 35.0313,342.0469 Q35.6563,342.0469 36.25,341.7813 Q36.8438,341.5 37.4688,340.9219 L37.4688,343.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="342.1543">StrategyA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="354" y2="354"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="360"/>
+      <ellipse cx="17" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="368.2104">algorithm() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="374.8047" y2="374.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="322"/>
+      <ellipse cx="192.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M195.4688,343.6406 Q194.8906,343.9375 194.25,344.0781 Q193.6094,344.2344 192.9063,344.2344 Q190.4063,344.2344 189.0781,342.5938 Q187.7656,340.9375 187.7656,337.8125 Q187.7656,334.6875 189.0781,333.0313 Q190.4063,331.375 192.9063,331.375 Q193.6094,331.375 194.25,331.5313 Q194.9063,331.6875 195.4688,331.9844 L195.4688,334.7031 Q194.8438,334.125 194.25,333.8594 Q193.6563,333.5781 193.0313,333.5781 Q191.6875,333.5781 191,334.6563 Q190.3125,335.7188 190.3125,337.8125 Q190.3125,339.9063 191,340.9844 Q191.6875,342.0469 193.0313,342.0469 Q193.6563,342.0469 194.25,341.7813 Q194.8438,341.5 195.4688,340.9219 L195.4688,343.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="342.1543">StrategyB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="354" y2="354"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="170" y="360"/>
+      <ellipse cx="175" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184" y="368.2104">algorithm() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="374.8047" y2="374.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="322"/>
+      <ellipse cx="350.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M353.4688,343.6406 Q352.8906,343.9375 352.25,344.0781 Q351.6094,344.2344 350.9063,344.2344 Q348.4063,344.2344 347.0781,342.5938 Q345.7656,340.9375 345.7656,337.8125 Q345.7656,334.6875 347.0781,333.0313 Q348.4063,331.375 350.9063,331.375 Q351.6094,331.375 352.25,331.5313 Q352.9063,331.6875 353.4688,331.9844 L353.4688,334.7031 Q352.8438,334.125 352.25,333.8594 Q351.6563,333.5781 351.0313,333.5781 Q349.6875,333.5781 349,334.6563 Q348.3125,335.7188 348.3125,337.8125 Q348.3125,339.9063 349,340.9844 Q349.6875,342.0469 351.0313,342.0469 Q351.6563,342.0469 352.25,341.7813 Q352.8438,341.5 353.4688,340.9219 L353.4688,343.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="342.1543">StrategyC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="354" y2="354"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="328" y="360"/>
+      <ellipse cx="333" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="342" y="368.2104">algorithm() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="374.8047" y2="374.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="94.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
+      <ellipse cx="197.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M200.2188,29.6406 Q199.6406,29.9375 199,30.0781 Q198.3594,30.2344 197.6563,30.2344 Q195.1563,30.2344 193.8281,28.5938 Q192.5156,26.9375 192.5156,23.8125 Q192.5156,20.6875 193.8281,19.0313 Q195.1563,17.375 197.6563,17.375 Q198.3594,17.375 199,17.5313 Q199.6563,17.6875 200.2188,17.9844 L200.2188,20.7031 Q199.5938,20.125 199,19.8594 Q198.4063,19.5781 197.7813,19.5781 Q196.4375,19.5781 195.75,20.6563 Q195.0625,21.7188 195.0625,23.8125 Q195.0625,25.9063 195.75,26.9844 Q196.4375,28.0469 197.7813,28.0469 Q198.4063,28.0469 199,27.7813 Q199.5938,27.5 200.2188,26.9219 L200.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="217.75" y="28.1543">Context</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="46"/>
+      <ellipse cx="79" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="289" x="88" y="54.2104">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="69" x2="382" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="66.8047"/>
+      <ellipse cx="79" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="88" y="75.0151">apply() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="81.6094" y2="81.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="87.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="89.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="95.8198">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
+    </a>
+    <path d="M161.3,274.03 C141.49,290.39 120.4,307.81 103.24,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="156.93,268.56,176.81,261.22,165.84,279.35,156.93,268.56" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225.5,281.37 C225.5,295.49 225.5,309.91 225.5,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="218.5,281.22,225.5,261.22,232.5,281.22,218.5,281.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M289.7,274.03 C309.51,290.39 330.6,307.81 347.76,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="285.16,279.35,274.19,261.22,294.07,268.56,285.16,279.35" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225.5,115.44 C225.5,136.58 225.5,159.86 225.5,178.98 " fill="none" id="C_0002038594012979479050&lt;-C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="225.5,102.27,221.5,108.27,225.5,114.27,229.5,108.27,225.5,102.27" 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="138.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="238.5" y="145.0669">m_strategy</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00023_class_mermaid.svg b/docs/test_cases/t00023_class_mermaid.svg
index 48aa8304..d9ca6f01 100644
--- a/docs/test_cases/t00023_class_mermaid.svg
+++ b/docs/test_cases/t00023_class_mermaid.svg
@@ -1,64 +1,59 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 573.171875 459" style="max-width: 573.172px; background-color: white;" width="573.171875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 546.5 459" style="max-width: 546.5px; background-color: white;" width="546.5" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M126.13803837451695,329.0740422727302L119.14758406209747,332.0617018939418C112.15712974967796,335.04936151515346,98.17622112483899,341.02468075757673,91.1857668124195,348.1790070454551C84.1953125,355.3333333333333,84.1953125,363.6666666666667,84.1953125,367.8333333333333L84.1953125,372"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M286.5859375,340L286.5859375,341.1666666666667C286.5859375,342.3333333333333,286.5859375,344.6666666666667,286.5859375,350C286.5859375,355.3333333333333,286.5859375,363.6666666666667,286.5859375,367.8333333333333L286.5859375,372"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M447.03383662548305,329.0740422727302L454.02429093790255,332.0617018939418C461.014745250322,335.04936151515346,474.995653875161,341.02468075757673,481.98610818758056,348.1790070454551C488.9765625,355.3333333333333,488.9765625,363.6666666666667,488.9765625,367.8333333333333L488.9765625,372"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M286.5859375,149L286.5859375,151.66666666666666C286.5859375,154.33333333333334,286.5859375,159.66666666666666,286.5859375,168C286.5859375,176.33333333333334,286.5859375,187.66666666666666,286.5859375,193.33333333333334L286.5859375,199"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M135.67485549132948,322L126.35404624277457,326.1666666666667C117.03323699421965,330.3333333333333,98.39161849710983,338.6666666666667,89.07080924855491,347C79.75,355.3333333333333,79.75,363.6666666666667,79.75,367.8333333333333L79.75,372"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M273.25,322L273.25,326.1666666666667C273.25,330.3333333333333,273.25,338.6666666666667,273.25,347C273.25,355.3333333333333,273.25,363.6666666666667,273.25,367.8333333333333L273.25,372"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M410.8251445086705,322L420.14595375722547,326.1666666666667C429.46676300578036,330.3333333333333,448.10838150289015,338.6666666666667,457.4291907514451,347C466.75,355.3333333333333,466.75,363.6666666666667,466.75,367.8333333333333L466.75,372"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M273.25,131L273.25,136.66666666666666C273.25,142.33333333333334,273.25,153.66666666666666,273.25,165C273.25,176.33333333333334,273.25,187.66666666666666,273.25,193.33333333333334L273.25,199"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -88,7 +83,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(286.5859375, 165)" class="edgeLabel">
+        <g transform="translate(273.25, 165)" class="edgeLabel">
           <g transform="translate(-42.234375, -9)" class="label">
             <foreignObject height="18" width="84.46875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -101,11 +96,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(286.5859375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L6">
+        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L6">
           <g title="Strategy" id="classId-C_0001469857696438841976-0" class="node default clickable">
-            <rect height="123" width="290.703125" y="-61.5" x="-145.3515625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="145.3515625" x1="-145.3515625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="145.3515625" x1="-145.3515625" class="divider"/>
+            <rect height="123" width="281.8125" y="-61.5" x="-140.90625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="140.90625" x1="-140.90625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="140.90625" x1="-140.90625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -117,24 +112,24 @@
                   <span class="nodeLabel">Strategy</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -137.8515625, 14)" height="18" width="275.703125">
+              <foreignObject transform="translate( -133.40625, 14)" height="18" width="266.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Strategy() : : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~Strategy() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -137.8515625, 36)" height="18" width="137.390625">
+              <foreignObject transform="translate( -133.40625, 36)" height="18" width="128.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+algorithm() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+algorithm() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(84.1953125, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L12">
+        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L12">
           <g title="StrategyA" id="classId-C_0001245533075819635385-1" class="node default clickable">
-            <rect height="79" width="152.390625" y="-39.5" x="-76.1953125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
+            <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -146,19 +141,19 @@
                   <span class="nodeLabel">StrategyA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -68.6953125, 14)" height="18" width="137.390625">
+              <foreignObject transform="translate( -64.25, 14)" height="18" width="128.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+algorithm() : : void</span>
+                  <span class="nodeLabel">+algorithm() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(286.5859375, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L17">
+        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L17">
           <g title="StrategyB" id="classId-C_0000000264986406899645-2" class="node default clickable">
-            <rect height="79" width="152.390625" y="-39.5" x="-76.1953125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
+            <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -170,19 +165,19 @@
                   <span class="nodeLabel">StrategyB</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -68.6953125, 14)" height="18" width="137.390625">
+              <foreignObject transform="translate( -64.25, 14)" height="18" width="128.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+algorithm() : : void</span>
+                  <span class="nodeLabel">+algorithm() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(488.9765625, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L22">
+        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L22">
           <g title="StrategyC" id="classId-C_0000174795176193483089-3" class="node default clickable">
-            <rect height="79" width="152.390625" y="-39.5" x="-76.1953125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="76.1953125" x1="-76.1953125" class="divider"/>
+            <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -194,19 +189,19 @@
                   <span class="nodeLabel">StrategyC</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -68.6953125, 14)" height="18" width="137.390625">
+              <foreignObject transform="translate( -64.25, 14)" height="18" width="128.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+algorithm() : : void</span>
+                  <span class="nodeLabel">+algorithm() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(286.5859375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00023/t00023.cc#L27">
+        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L27">
           <g title="Context" id="classId-C_0002038594012979479050-4" class="node default clickable">
-            <rect height="123" width="308.9375" y="-61.5" x="-154.46875" class="outer title-state"/>
-            <line y2="-31.5" y1="-31.5" x2="154.46875" x1="-154.46875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="154.46875" x1="-154.46875" class="divider"/>
+            <rect height="123" width="300.046875" y="-61.5" x="-150.0234375" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="150.0234375" x1="-150.0234375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="150.0234375" x1="-150.0234375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -218,19 +213,19 @@
                   <span class="nodeLabel">Context</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.96875, -20)" height="18" width="281.9375">
+              <foreignObject transform="translate( -142.5234375, -20)" height="18" width="281.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_strategy : std::unique_ptr&lt;Strategy&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.96875, 14)" height="18" width="293.9375">
+              <foreignObject transform="translate( -142.5234375, 14)" height="18" width="285.046875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Context(std::unique_ptr strategy) : : void</span>
+                  <span class="nodeLabel">+Context(std::unique_ptr strategy) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -146.96875, 36)" height="18" width="109.828125">
+              <foreignObject transform="translate( -142.5234375, 36)" height="18" width="100.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+apply() : : void</span>
+                  <span class="nodeLabel">+apply() : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md
index adc1e13a..e16bb8c6 100644
--- a/docs/test_cases/t00024.md
+++ b/docs/test_cases/t00024.md
@@ -67,7 +67,7 @@ private:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00024::Target",
+      "display_name": "Target",
       "id": "1116408959993110019",
       "is_abstract": true,
       "is_nested": false,
@@ -175,7 +175,7 @@ private:
           "name": "clanguml::t00024::Target"
         }
       ],
-      "display_name": "clanguml::t00024::Target1",
+      "display_name": "Target1",
       "id": "669517069151826610",
       "is_abstract": false,
       "is_nested": false,
@@ -257,7 +257,7 @@ private:
           "name": "clanguml::t00024::Target"
         }
       ],
-      "display_name": "clanguml::t00024::Target2",
+      "display_name": "Target2",
       "id": "1210513233906695933",
       "is_abstract": false,
       "is_nested": false,
@@ -339,7 +339,7 @@ private:
           "name": "clanguml::t00024::Target"
         }
       ],
-      "display_name": "clanguml::t00024::Proxy",
+      "display_name": "Proxy",
       "id": "594707401639991215",
       "is_abstract": false,
       "is_nested": false,
@@ -458,6 +458,7 @@ private:
     }
   ],
   "name": "t00024_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index 27d5b4bf..e92b81cf 100644
--- a/docs/test_cases/t00024_class.svg
+++ b/docs/test_cases/t00024_class.svg
@@ -1,144 +1,134 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="326px" preserveAspectRatio="none" style="width:577px;height:326px;background:#FFFFFF;" version="1.1" viewBox="0 0 577 326" width="577px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="297px" preserveAspectRatio="none" style="width:542px;height:297px;" version="1.1" viewBox="0 0 542 297" width="542px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f19xr1msw7mglh" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <g id="elem_C_0001116408959993110019">
-        <rect codeLine="2" fill="#F1F1F1" height="112.6998" id="C_0001116408959993110019" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="148" x="129" y="7"/>
-        <ellipse cx="177.75" cy="23" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M179.2813,24.9375 L179.6094,25.7344 L179.3281,25.7344 C178.875,25.7344 178.75,25.7656 178.5781,25.875 C178.2969,26.0156 178.125,26.3125 178.125,26.6094 C178.125,26.9063 178.2656,27.1563 178.5,27.3281 C178.6719,27.4531 178.9063,27.5 179.3281,27.5 L181.6875,27.5 C182.0469,27.5 182.2969,27.4688 182.4375,27.375 C182.7031,27.2344 182.875,26.9219 182.875,26.6094 C182.875,26.3438 182.7344,26.0781 182.5,25.9063 C182.3125,25.7813 182.1563,25.75 181.7031,25.7344 L178.3125,17.9063 L174.5938,17.9063 C174.1406,17.9063 174,17.9219 173.8281,18.0313 C173.5625,18.2031 173.3906,18.4844 173.3906,18.7813 C173.3906,19.0625 173.5313,19.3281 173.7813,19.5 C173.9531,19.625 174.1406,19.6563 174.5938,19.6563 L175.5625,19.6563 L172.9844,25.7344 C172.2344,25.7344 171.8281,26.0313 171.8281,26.6094 C171.8281,27.2188 172.2188,27.5 173.0156,27.5 L175.2813,27.5 C175.6406,27.5 175.8906,27.4688 176.0313,27.375 C176.2969,27.2188 176.4688,26.9219 176.4688,26.6094 C176.4688,26.3438 176.3281,26.0781 176.0938,25.9063 C175.9063,25.7656 175.75,25.7344 175.2813,25.7344 L174.9844,25.7344 L175.3281,24.9375 L179.2813,24.9375 Z M178.5156,23.1875 L176.0625,23.1875 L177.2969,20.3125 L178.5156,23.1875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="42" x="198.25" y="28.95">Target</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="130" x2="276" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="135" y="48.95"/>
-          <ellipse cx="140" cy="53.95" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="122" x="149" y="58.3999">~Target() = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="130" x2="276" y1="65.8999" y2="65.8999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="135" y="75.8499"/>
-          <ellipse cx="140" cy="80.8499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="149" y="85.2999">m1() = 0 : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="135" y="94.7498"/>
-          <ellipse cx="140" cy="99.7498" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="149" y="104.1998">m2() = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="130" x2="276" y1="111.6998" y2="111.6998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19xr1msw7mglh)" height="94.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="136.5" y="8"/>
+      <ellipse cx="181.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M181.8594,19.3438 L180.7031,24.4219 L183.0313,24.4219 L181.8594,19.3438 Z M180.375,17.1094 L183.3594,17.1094 L186.7188,29.5 L184.2656,29.5 L183.5,26.4375 L180.2188,26.4375 L179.4688,29.5 L177.0313,29.5 L180.375,17.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="202.25" y="28.1543">Target</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <g id="elem_C_0000669517069151826610">
-        <rect codeLine="10" fill="#F1F1F1" height="81.5999" id="C_0000669517069151826610" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="7" y="217.5"/>
-        <ellipse cx="27.4" cy="233.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M22.4,234.6562 C22.4,237.1562 24.5406,238.9687 27.4625,238.9687 C28.6969,238.9687 29.8688,238.6719 30.6188,238.1562 C31.2281,237.7344 31.5563,237.3125 31.5563,236.9062 C31.5563,236.4375 31.1344,236.0312 30.6344,236.0312 C30.4,236.0312 30.1813,236.1094 29.9781,236.3125 C29.5406,236.75 29.5406,236.75 29.3688,236.8437 C28.9156,237.0781 28.275,237.2187 27.5094,237.2187 C25.5094,237.2187 24.2281,236.2031 24.2281,234.625 L24.2281,233.5781 C24.2281,231.875 25.4469,230.6719 27.15,230.6719 C27.7281,230.6719 28.3063,230.8125 28.775,231.0625 C29.2438,231.3281 29.4156,231.5156 29.4781,231.875 C29.6031,232.5469 29.8531,232.7969 30.3844,232.7969 C30.6656,232.7969 30.9469,232.6562 31.1344,232.4375 C31.2594,232.2656 31.3063,232.0937 31.3063,231.6562 L31.3063,230.2969 C31.3063,229.875 31.2906,229.7344 31.1656,229.5625 C30.9938,229.3125 30.7125,229.1562 30.3844,229.1562 C30.0719,229.1562 29.8688,229.2656 29.65,229.5312 C28.4781,229.0312 28.0406,228.9219 27.0875,228.9219 C24.4156,228.9219 22.4,230.9375 22.4,233.5625 L22.4,234.6562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="42.6" y="238.106">Target1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="249.5" y2="249.5"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="258.4"/>
-          <ellipse cx="18" cy="263.4" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="266.5059">m1() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="275.1999"/>
-          <ellipse cx="18" cy="280.1999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="283.3059">m2() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="291.0999" y2="291.0999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="46"/>
+      <ellipse cx="147.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <g id="elem_C_0001210513233906695933">
-        <rect codeLine="16" fill="#F1F1F1" height="81.5999" id="C_0001210513233906695933" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="136" y="217.5"/>
-        <ellipse cx="156.4" cy="233.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M151.4,234.6562 C151.4,237.1562 153.5406,238.9687 156.4625,238.9687 C157.6969,238.9687 158.8688,238.6719 159.6188,238.1562 C160.2281,237.7344 160.5563,237.3125 160.5563,236.9062 C160.5563,236.4375 160.1344,236.0312 159.6344,236.0312 C159.4,236.0312 159.1813,236.1094 158.9781,236.3125 C158.5406,236.75 158.5406,236.75 158.3688,236.8437 C157.9156,237.0781 157.275,237.2187 156.5094,237.2187 C154.5094,237.2187 153.2281,236.2031 153.2281,234.625 L153.2281,233.5781 C153.2281,231.875 154.4469,230.6719 156.15,230.6719 C156.7281,230.6719 157.3063,230.8125 157.775,231.0625 C158.2438,231.3281 158.4156,231.5156 158.4781,231.875 C158.6031,232.5469 158.8531,232.7969 159.3844,232.7969 C159.6656,232.7969 159.9469,232.6562 160.1344,232.4375 C160.2594,232.2656 160.3063,232.0937 160.3063,231.6562 L160.3063,230.2969 C160.3063,229.875 160.2906,229.7344 160.1656,229.5625 C159.9938,229.3125 159.7125,229.1562 159.3844,229.1562 C159.0719,229.1562 158.8688,229.2656 158.65,229.5312 C157.4781,229.0312 157.0406,228.9219 156.0875,228.9219 C153.4156,228.9219 151.4,230.9375 151.4,233.5625 L151.4,234.6562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="171.6" y="238.106">Target2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="229" y1="249.5" y2="249.5"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="258.4"/>
-          <ellipse cx="147" cy="263.4" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="266.5059">m1() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="275.1999"/>
-          <ellipse cx="147" cy="280.1999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="283.3059">m2() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="229" y1="291.0999" y2="291.0999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="156.5" y="54.2104">~Target() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <g id="elem_C_0000594707401639991215">
-        <rect codeLine="22" fill="#F1F1F1" height="123.1997" id="C_0000594707401639991215" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="305" x="265.5" y="196.7"/>
-        <ellipse cx="395.75" cy="212.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M390.75,213.8563 C390.75,216.3563 392.8906,218.1688 395.8125,218.1688 C397.0469,218.1688 398.2188,217.8719 398.9688,217.3563 C399.5781,216.9344 399.9063,216.5125 399.9063,216.1063 C399.9063,215.6375 399.4844,215.2313 398.9844,215.2313 C398.75,215.2313 398.5313,215.3094 398.3281,215.5125 C397.8906,215.95 397.8906,215.95 397.7188,216.0438 C397.2656,216.2781 396.625,216.4188 395.8594,216.4188 C393.8594,216.4188 392.5781,215.4031 392.5781,213.825 L392.5781,212.7781 C392.5781,211.075 393.7969,209.8719 395.5,209.8719 C396.0781,209.8719 396.6563,210.0125 397.125,210.2625 C397.5938,210.5281 397.7656,210.7156 397.8281,211.075 C397.9531,211.7469 398.2031,211.9969 398.7344,211.9969 C399.0156,211.9969 399.2969,211.8563 399.4844,211.6375 C399.6094,211.4656 399.6563,211.2938 399.6563,210.8563 L399.6563,209.4969 C399.6563,209.075 399.6406,208.9344 399.5156,208.7625 C399.3438,208.5125 399.0625,208.3563 398.7344,208.3563 C398.4219,208.3563 398.2188,208.4656 398,208.7313 C396.8281,208.2313 396.3906,208.1219 395.4375,208.1219 C392.7656,208.1219 390.75,210.1375 390.75,212.7625 L390.75,213.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="416.25" y="217.306">Proxy</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="266.5" x2="569.5" y1="228.7" y2="228.7"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="271.5" y="237.6"/>
-          <ellipse cx="276.5" cy="242.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="279" x="285.5" y="245.7059">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="266.5" x2="569.5" y1="253.4999" y2="253.4999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="271.5" y="262.3999"/>
-          <ellipse cx="276.5" cy="267.3999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="285.5" y="270.5059">m1() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="271.5" y="279.1998"/>
-          <ellipse cx="276.5" cy="284.1998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="285.5" y="287.3058">m2() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="266.5" x2="569.5" y1="295.0998" y2="295.0998"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="271.5" y="303.9997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="273.5" y="305.9997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="223" x="285.5" y="312.1057">m_target : std::shared_ptr&lt;Target&gt;</text>
-        </a>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="137.5" x2="275.5" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="66.8047"/>
+      <ellipse cx="147.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0001116408959993110019_C_0000669517069151826610">
-      <path codeLine="30" d="M148.8977,134.4061 C124.9177,165.4561 106.63,189.14 84.94,217.24 " fill="none" id="C_0001116408959993110019-backto-C_0000669517069151826610" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="159.9,120.16,144.149,130.7386,153.6464,138.0735,159.9,120.16" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001116408959993110019_C_0001210513233906695933">
-      <path codeLine="31" d="M195.3633,138.064 C192.1433,169.114 190.06,189.14 187.15,217.24 " fill="none" id="C_0001116408959993110019-backto-C_0001210513233906695933" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="197.22,120.16,189.3953,137.4451,201.3313,138.6829,197.22,120.16" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000594707401639991215_C_0001116408959993110019">
-      <path codeLine="32" d="M364.85,196.2 C350.21,180.49 333.96,163.99 318,149.7 C305.31,138.34 295.9527,130.5862 282.0527,119.9962 " fill="none" id="C_0000594707401639991215-to-C_0001116408959993110019" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="277.28,116.36,282.0149,124.996,281.2572,119.3901,286.8631,118.6325,277.28,116.36" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="338" y="156"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="51" x="348" y="162.777">m_target</text>
-    </g>
-    <g id="link_C_0001116408959993110019_C_0000594707401639991215">
-      <path codeLine="33" d="M276.1517,132.3734 C292.6217,147.5634 297.31,151.74 314,166.7 C324.79,176.37 336.29,186.53 347.55,196.41 " fill="none" id="C_0001116408959993110019-backto-C_0000594707401639991215" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="262.92,120.17,272.0839,136.7839,280.2195,127.9628,262.92,120.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="75.0151">m1() = 0 : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="79.6094"/>
+      <ellipse cx="147.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="87.8198">m2() = 0 : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="94.4141" y2="94.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19xr1msw7mglh)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="195.5"/>
+      <ellipse cx="23.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M26.6688,217.1406 Q26.0906,217.4375 25.45,217.5781 Q24.8094,217.7344 24.1063,217.7344 Q21.6063,217.7344 20.2781,216.0938 Q18.9656,214.4375 18.9656,211.3125 Q18.9656,208.1875 20.2781,206.5313 Q21.6063,204.875 24.1063,204.875 Q24.8094,204.875 25.45,205.0313 Q26.1063,205.1875 26.6688,205.4844 L26.6688,208.2031 Q26.0438,207.625 25.45,207.3594 Q24.8563,207.0781 24.2313,207.0781 Q22.8875,207.0781 22.2,208.1563 Q21.5125,209.2188 21.5125,211.3125 Q21.5125,213.4063 22.2,214.4844 Q22.8875,215.5469 24.2313,215.5469 Q24.8563,215.5469 25.45,215.2813 Q26.0438,215 26.6688,214.4219 L26.6688,217.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="215.6543">Target1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="227.5" y2="227.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="233.5"/>
+      <ellipse cx="17" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="241.7104">m1() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="246.3047"/>
+      <ellipse cx="17" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="254.5151">m2() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="261.1094" y2="261.1094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19xr1msw7mglh)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="195.5"/>
+      <ellipse cx="145.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M148.6688,217.1406 Q148.0906,217.4375 147.45,217.5781 Q146.8094,217.7344 146.1063,217.7344 Q143.6063,217.7344 142.2781,216.0938 Q140.9656,214.4375 140.9656,211.3125 Q140.9656,208.1875 142.2781,206.5313 Q143.6063,204.875 146.1063,204.875 Q146.8094,204.875 147.45,205.0313 Q148.1063,205.1875 148.6688,205.4844 L148.6688,208.2031 Q148.0438,207.625 147.45,207.3594 Q146.8563,207.0781 146.2313,207.0781 Q144.8875,207.0781 144.2,208.1563 Q143.5125,209.2188 143.5125,211.3125 Q143.5125,213.4063 144.2,214.4844 Q144.8875,215.5469 146.2313,215.5469 Q146.8563,215.5469 147.45,215.2813 Q148.0438,215 148.6688,214.4219 L148.6688,217.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="215.6543">Target2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="227.5" y2="227.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="233.5"/>
+      <ellipse cx="139" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="241.7104">m1() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="246.3047"/>
+      <ellipse cx="139" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="254.5151">m2() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="261.1094" y2="261.1094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19xr1msw7mglh)" height="107.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="179"/>
+      <ellipse cx="369.75" cy="195" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M372.7188,200.6406 Q372.1406,200.9375 371.5,201.0781 Q370.8594,201.2344 370.1563,201.2344 Q367.6563,201.2344 366.3281,199.5938 Q365.0156,197.9375 365.0156,194.8125 Q365.0156,191.6875 366.3281,190.0313 Q367.6563,188.375 370.1563,188.375 Q370.8594,188.375 371.5,188.5313 Q372.1563,188.6875 372.7188,188.9844 L372.7188,191.7031 Q372.0938,191.125 371.5,190.8594 Q370.9063,190.5781 370.2813,190.5781 Q368.9375,190.5781 368.25,191.6563 Q367.5625,192.7188 367.5625,194.8125 Q367.5625,196.9063 368.25,197.9844 Q368.9375,199.0469 370.2813,199.0469 Q370.9063,199.0469 371.5,198.7813 Q372.0938,198.5 372.7188,197.9219 L372.7188,200.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="199.1543">Proxy</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="211" y2="211"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="217"/>
+      <ellipse cx="261" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="255" x="270" y="225.2104">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="251" x2="530" y1="231.8047" y2="231.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="237.8047"/>
+      <ellipse cx="261" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="246.0151">m1() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="250.6094"/>
+      <ellipse cx="261" cy="255.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="258.8198">m2() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="265.4141" y2="265.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="271.4141"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="273.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="279.6245">m_target : std::shared_ptr&lt;Target&gt;</text>
+    </a>
+    <path d="M151.91,117.02 C128.52,143.17 102,172.81 81.81,195.39 " fill="none" id="C_0001116408959993110019&lt;-C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="146.7,112.35,165.25,102.11,157.13,121.68,146.7,112.35" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M193.37,121.82 C188.4,146.74 182.93,174.19 178.7,195.39 " fill="none" id="C_0001116408959993110019&lt;-C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="186.53,120.36,197.3,102.11,200.26,123.09,186.53,120.36" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M335.33,178.87 C311.02,155.69 282.6,128.58 258.65,105.74 " fill="none" id="C_0000594707401639991215-&gt;C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="254.84,102.11,258.5789,111.2216,258.4532,105.5661,264.1087,105.4404,254.84,102.11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="301.5" y="138.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="59" x="311.5" y="145.0669">m_target</text>
+    <path d="M250.78,118.21 C259.47,128.93 268.89,139.62 278.5,149 C289.13,159.38 301.11,169.53 313.19,178.96 " fill="none" id="C_0001116408959993110019&lt;-C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="244.99,122.17,238.2,102.1,256.03,113.56,244.99,122.17" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00024_class_mermaid.svg b/docs/test_cases/t00024_class_mermaid.svg
index 7e9583fb..5fde8140 100644
--- a/docs/test_cases/t00024_class_mermaid.svg
+++ b/docs/test_cases/t00024_class_mermaid.svg
@@ -1,64 +1,59 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 613.1875 374" style="max-width: 613.188px; background-color: white;" width="613.1875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 586.515625 374" style="max-width: 586.516px; background-color: white;" width="586.515625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M145.64356762080973,134.48745308187347L131.77068135067478,143.23954423489457C117.89779508053982,151.99163538791564,90.15202254026991,169.49581769395783,76.27913627013496,187.58124218031222C62.40625,205.66666666666666,62.40625,224.33333333333334,62.40625,233.66666666666666L62.40625,243"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M222.7284991519119,170.92117153213803L222.47687429325993,173.6009762767817C222.22524943460795,176.28078102142535,221.721999717304,181.64039051071268,221.47037485865198,193.65352858868968C221.21875,205.66666666666666,221.21875,224.33333333333334,221.21875,233.66666666666666L221.21875,243"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M483.8663072183099,221L485.30916226525824,215.33333333333334C486.7520173122066,209.66666666666666,489.6377274061033,198.33333333333334,460.18110130043965,180.07295939628645C430.724475194776,161.81258545923959,368.92551288955195,136.62517091847914,338.02603173693996,124.03146364809895L307.1265505843279,111.43775637771873"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M315.1349580451977,153.69847376965285L321.4978817043314,159.24872814137737C327.86080536346515,164.7989825131019,340.5866526817326,175.89949125655096,352.9138760278772,187.11641229494217C365.24109937402187,198.33333333333334,377.1696987480438,209.66666666666666,383.13399843505476,215.33333333333334L389.0982981220657,221"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M151.9765625,124.39027845627749L136.30729166666666,134.8252320468979C120.63802083333333,145.26018563751833,89.29947916666667,166.13009281875915,73.63020833333333,185.8983797427129C57.9609375,205.66666666666666,57.9609375,224.33333333333334,57.9609375,233.66666666666666L57.9609375,243"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M211.07530076291079,153L210.543219385759,158.66666666666666C210.0111380086072,164.33333333333334,208.94697525430357,175.66666666666666,208.4148938771518,190.66666666666666C207.8828125,205.66666666666666,207.8828125,224.33333333333334,207.8828125,233.66666666666666L207.8828125,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M461.6397447183099,221L463.08259976525824,215.33333333333334C464.5254548122066,209.66666666666666,467.4111649061033,198.33333333333334,437.76938453638496,179.55125764750792C408.1276041666667,160.7691819616825,345.9583333333333,134.538363923365,314.8736979166667,121.42295490420626L283.7890625,108.30754588504752"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M283.7890625,140.16093366093367L292.4127604166667,147.96744471744472C301.0364583333333,155.77395577395578,318.2838541666667,171.3869778869779,332.6353249706573,184.8601556101556C346.9867957746479,198.33333333333334,358.4423415492958,209.66666666666666,364.17011443661977,215.33333333333334L369.8978873239437,221"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -79,7 +74,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(492.5234375, 187)" class="edgeLabel">
+        <g transform="translate(470.296875, 187)" class="edgeLabel">
           <g transform="translate(-34.234375, -9)" class="label">
             <foreignObject height="18" width="68.46875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -101,11 +96,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(231.21875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L6">
+        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L6">
           <g title="Target" id="classId-C_0001116408959993110019-0" class="node default clickable">
-            <rect height="145" width="140.703125" y="-72.5" x="-70.3515625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="70.3515625" x1="-70.3515625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="70.3515625" x1="-70.3515625" class="divider"/>
+            <rect height="145" width="131.8125" y="-72.5" x="-65.90625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="65.90625" x1="-65.90625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="65.90625" x1="-65.90625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -65)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -117,29 +112,29 @@
                   <span class="nodeLabel">Target</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.8515625, 3)" height="18" width="125.703125">
+              <foreignObject transform="translate( -58.40625, 3)" height="18" width="116.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+~Target() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+~Target() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.8515625, 25)" height="18" width="93.8125">
+              <foreignObject transform="translate( -58.40625, 25)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m1() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+m1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -62.8515625, 47)" height="18" width="93.8125">
+              <foreignObject transform="translate( -58.40625, 47)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m2() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+m2() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(62.40625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L14">
+        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L14">
           <g title="Target1" id="classId-C_0000669517069151826610-1" class="node default clickable">
-            <rect height="101" width="108.8125" y="-50.5" x="-54.40625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="54.40625" x1="-54.40625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="54.40625" x1="-54.40625" class="divider"/>
+            <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -151,24 +146,24 @@
                   <span class="nodeLabel">Target1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.90625, 3)" height="18" width="93.8125">
+              <foreignObject transform="translate( -42.4609375, 3)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : : void</span>
+                  <span class="nodeLabel">+m1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.90625, 25)" height="18" width="93.8125">
+              <foreignObject transform="translate( -42.4609375, 25)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : : void</span>
+                  <span class="nodeLabel">+m2() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(221.21875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L20">
+        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L20">
           <g title="Target2" id="classId-C_0001210513233906695933-2" class="node default clickable">
-            <rect height="101" width="108.8125" y="-50.5" x="-54.40625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="54.40625" x1="-54.40625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="54.40625" x1="-54.40625" class="divider"/>
+            <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -180,24 +175,24 @@
                   <span class="nodeLabel">Target2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.90625, 3)" height="18" width="93.8125">
+              <foreignObject transform="translate( -42.4609375, 3)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : : void</span>
+                  <span class="nodeLabel">+m1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.90625, 25)" height="18" width="93.8125">
+              <foreignObject transform="translate( -42.4609375, 25)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : : void</span>
+                  <span class="nodeLabel">+m2() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(465.40625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00024/t00024.cc#L26">
+        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L26">
           <g title="Proxy" id="classId-C_0000594707401639991215-3" class="node default clickable">
-            <rect height="145" width="279.5625" y="-72.5" x="-139.78125" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="139.78125" x1="-139.78125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="139.78125" x1="-139.78125" class="divider"/>
+            <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -209,24 +204,24 @@
                   <span class="nodeLabel">Proxy</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.28125, -31)" height="18" width="251.6875">
+              <foreignObject transform="translate( -127.8359375, -31)" height="18" width="251.6875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_target : std::shared_ptr&lt;Target&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.28125, 3)" height="18" width="264.5625">
+              <foreignObject transform="translate( -127.8359375, 3)" height="18" width="255.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Proxy(std::shared_ptr target) : : void</span>
+                  <span class="nodeLabel">+Proxy(std::shared_ptr target) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.28125, 25)" height="18" width="93.8125">
+              <foreignObject transform="translate( -127.8359375, 25)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : : void</span>
+                  <span class="nodeLabel">+m1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.28125, 47)" height="18" width="93.8125">
+              <foreignObject transform="translate( -127.8359375, 47)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : : void</span>
+                  <span class="nodeLabel">+m2() : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md
index 473ac3d2..8b63bdf3 100644
--- a/docs/test_cases/t00025.md
+++ b/docs/test_cases/t00025.md
@@ -65,7 +65,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00025::Target1",
+      "display_name": "Target1",
       "id": "1573849034571194138",
       "is_abstract": false,
       "is_nested": false,
@@ -140,7 +140,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00025::Target2",
+      "display_name": "Target2",
       "id": "751896409461834669",
       "is_abstract": false,
       "is_nested": false,
@@ -215,7 +215,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00025::Proxy<T>",
+      "display_name": "Proxy<T>",
       "id": "1483353300536405088",
       "is_abstract": false,
       "is_nested": false,
@@ -341,7 +341,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00025::Proxy<clanguml::t00025::Target1>",
+      "display_name": "Proxy<Target1>",
       "id": "1644966842838139424",
       "is_abstract": false,
       "is_nested": false,
@@ -370,7 +370,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00025::Proxy<clanguml::t00025::Target2>",
+      "display_name": "Proxy<Target2>",
       "id": "1190103100236298763",
       "is_abstract": false,
       "is_nested": false,
@@ -399,7 +399,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00025::ProxyHolder",
+      "display_name": "ProxyHolder",
       "id": "1906317303950647748",
       "is_abstract": false,
       "is_nested": false,
@@ -446,6 +446,7 @@ public:
     }
   ],
   "name": "t00025_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index b6270f3d..5afc8ebd 100644
--- a/docs/test_cases/t00025_class.svg
+++ b/docs/test_cases/t00025_class.svg
@@ -1,172 +1,154 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="404px" preserveAspectRatio="none" style="width:544px;height:404px;background:#FFFFFF;" version="1.1" viewBox="0 0 544 404" width="544px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="386px" preserveAspectRatio="none" style="width:512px;height:386px;" version="1.1" viewBox="0 0 512 386" width="512px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f8rzr3bnh81sz" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <g id="elem_C_0001573849034571194138">
-        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0001573849034571194138" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="7" y="295.4"/>
-        <ellipse cx="27.4" cy="311.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M22.4,312.5563 C22.4,315.0563 24.5406,316.8688 27.4625,316.8688 C28.6969,316.8688 29.8688,316.5719 30.6188,316.0563 C31.2281,315.6344 31.5563,315.2125 31.5563,314.8063 C31.5563,314.3375 31.1344,313.9313 30.6344,313.9313 C30.4,313.9313 30.1813,314.0094 29.9781,314.2125 C29.5406,314.65 29.5406,314.65 29.3688,314.7438 C28.9156,314.9781 28.275,315.1188 27.5094,315.1188 C25.5094,315.1188 24.2281,314.1031 24.2281,312.525 L24.2281,311.4781 C24.2281,309.775 25.4469,308.5719 27.15,308.5719 C27.7281,308.5719 28.3063,308.7125 28.775,308.9625 C29.2438,309.2281 29.4156,309.4156 29.4781,309.775 C29.6031,310.4469 29.8531,310.6969 30.3844,310.6969 C30.6656,310.6969 30.9469,310.5563 31.1344,310.3375 C31.2594,310.1656 31.3063,309.9938 31.3063,309.5563 L31.3063,308.1969 C31.3063,307.775 31.2906,307.6344 31.1656,307.4625 C30.9938,307.2125 30.7125,307.0563 30.3844,307.0563 C30.0719,307.0563 29.8688,307.1656 29.65,307.4313 C28.4781,306.9313 28.0406,306.8219 27.0875,306.8219 C24.4156,306.8219 22.4,308.8375 22.4,311.4625 L22.4,312.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="42.6" y="316.006">Target1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="327.4" y2="327.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="336.3"/>
-          <ellipse cx="18" cy="341.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="344.4059">m1() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="353.0999"/>
-          <ellipse cx="18" cy="358.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="361.2059">m2() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="368.9999" y2="368.9999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="284.5"/>
+      <ellipse cx="23.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M26.6688,306.1406 Q26.0906,306.4375 25.45,306.5781 Q24.8094,306.7344 24.1063,306.7344 Q21.6063,306.7344 20.2781,305.0938 Q18.9656,303.4375 18.9656,300.3125 Q18.9656,297.1875 20.2781,295.5313 Q21.6063,293.875 24.1063,293.875 Q24.8094,293.875 25.45,294.0313 Q26.1063,294.1875 26.6688,294.4844 L26.6688,297.2031 Q26.0438,296.625 25.45,296.3594 Q24.8563,296.0781 24.2313,296.0781 Q22.8875,296.0781 22.2,297.1563 Q21.5125,298.2188 21.5125,300.3125 Q21.5125,302.4063 22.2,303.4844 Q22.8875,304.5469 24.2313,304.5469 Q24.8563,304.5469 25.45,304.2813 Q26.0438,304 26.6688,303.4219 L26.6688,306.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="304.6543">Target1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="316.5" y2="316.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <g id="elem_C_0000751896409461834669">
-        <rect codeLine="8" fill="#F1F1F1" height="81.5999" id="C_0000751896409461834669" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="443" y="295.4"/>
-        <ellipse cx="463.4" cy="311.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M458.4,312.5563 C458.4,315.0563 460.5406,316.8688 463.4625,316.8688 C464.6969,316.8688 465.8688,316.5719 466.6188,316.0563 C467.2281,315.6344 467.5563,315.2125 467.5563,314.8063 C467.5563,314.3375 467.1344,313.9313 466.6344,313.9313 C466.4,313.9313 466.1813,314.0094 465.9781,314.2125 C465.5406,314.65 465.5406,314.65 465.3688,314.7438 C464.9156,314.9781 464.275,315.1188 463.5094,315.1188 C461.5094,315.1188 460.2281,314.1031 460.2281,312.525 L460.2281,311.4781 C460.2281,309.775 461.4469,308.5719 463.15,308.5719 C463.7281,308.5719 464.3063,308.7125 464.775,308.9625 C465.2438,309.2281 465.4156,309.4156 465.4781,309.775 C465.6031,310.4469 465.8531,310.6969 466.3844,310.6969 C466.6656,310.6969 466.9469,310.5563 467.1344,310.3375 C467.2594,310.1656 467.3063,309.9938 467.3063,309.5563 L467.3063,308.1969 C467.3063,307.775 467.2906,307.6344 467.1656,307.4625 C466.9938,307.2125 466.7125,307.0563 466.3844,307.0563 C466.0719,307.0563 465.8688,307.1656 465.65,307.4313 C464.4781,306.9313 464.0406,306.8219 463.0875,306.8219 C460.4156,306.8219 458.4,308.8375 458.4,311.4625 L458.4,312.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="478.6" y="316.006">Target2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="444" x2="536" y1="327.4" y2="327.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="449" y="336.3"/>
-          <ellipse cx="454" cy="341.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="463" y="344.4059">m1() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="449" y="353.0999"/>
-          <ellipse cx="454" cy="358.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="463" y="361.2059">m2() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="444" x2="536" y1="368.9999" y2="368.9999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.5"/>
+      <ellipse cx="17" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <g id="elem_C_0001483353300536405088">
-        <rect codeLine="14" fill="#F1F1F1" height="123.1997" id="C_0001483353300536405088" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="272" x="136" y="274.6"/>
-        <ellipse cx="244.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M239.25,291.7563 C239.25,294.2563 241.3906,296.0688 244.3125,296.0688 C245.5469,296.0688 246.7188,295.7719 247.4688,295.2563 C248.0781,294.8344 248.4063,294.4125 248.4063,294.0063 C248.4063,293.5375 247.9844,293.1313 247.4844,293.1313 C247.25,293.1313 247.0313,293.2094 246.8281,293.4125 C246.3906,293.85 246.3906,293.85 246.2188,293.9438 C245.7656,294.1781 245.125,294.3188 244.3594,294.3188 C242.3594,294.3188 241.0781,293.3031 241.0781,291.725 L241.0781,290.6781 C241.0781,288.975 242.2969,287.7719 244,287.7719 C244.5781,287.7719 245.1563,287.9125 245.625,288.1625 C246.0938,288.4281 246.2656,288.6156 246.3281,288.975 C246.4531,289.6469 246.7031,289.8969 247.2344,289.8969 C247.5156,289.8969 247.7969,289.7563 247.9844,289.5375 C248.1094,289.3656 248.1563,289.1938 248.1563,288.7563 L248.1563,287.3969 C248.1563,286.975 248.1406,286.8344 248.0156,286.6625 C247.8438,286.4125 247.5625,286.2563 247.2344,286.2563 C246.9219,286.2563 246.7188,286.3656 246.5,286.6313 C245.3281,286.1313 244.8906,286.0219 243.9375,286.0219 C241.2656,286.0219 239.25,288.0375 239.25,290.6625 L239.25,291.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="264.75" y="295.206">Proxy</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="402" y="271.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="403" y="285.8001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="407" y1="306.6" y2="306.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="315.5"/>
-          <ellipse cx="147" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="246" x="156" y="323.6059">Proxy(std::shared_ptr&lt;T&gt; target) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="137" x2="407" y1="331.3999" y2="331.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="340.2999"/>
-          <ellipse cx="147" cy="345.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="348.4059">m1() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="357.0998"/>
-          <ellipse cx="147" cy="362.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="365.2058">m2() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="407" y1="372.9998" y2="372.9998"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="381.8997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="144" y="383.8997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="190" x="156" y="390.0057">m_target : std::shared_ptr&lt;T&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="330.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <g id="elem_C_0001644966842838139424">
-        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0001644966842838139424" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="141" y="165.6"/>
-        <ellipse cx="156" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M151,182.7563 C151,185.2563 153.1406,187.0688 156.0625,187.0688 C157.2969,187.0688 158.4688,186.7719 159.2188,186.2563 C159.8281,185.8344 160.1563,185.4125 160.1563,185.0063 C160.1563,184.5375 159.7344,184.1313 159.2344,184.1313 C159,184.1313 158.7813,184.2094 158.5781,184.4125 C158.1406,184.85 158.1406,184.85 157.9688,184.9438 C157.5156,185.1781 156.875,185.3188 156.1094,185.3188 C154.1094,185.3188 152.8281,184.3031 152.8281,182.725 L152.8281,181.6781 C152.8281,179.975 154.0469,178.7719 155.75,178.7719 C156.3281,178.7719 156.9063,178.9125 157.375,179.1625 C157.8438,179.4281 158.0156,179.6156 158.0781,179.975 C158.2031,180.6469 158.4531,180.8969 158.9844,180.8969 C159.2656,180.8969 159.5469,180.7563 159.7344,180.5375 C159.8594,180.3656 159.9063,180.1938 159.9063,179.7563 L159.9063,178.3969 C159.9063,177.975 159.8906,177.8344 159.7656,177.6625 C159.5938,177.4125 159.3125,177.2563 158.9844,177.2563 C158.6719,177.2563 158.4688,177.3656 158.25,177.6313 C157.0781,177.1313 156.6406,177.0219 155.6875,177.0219 C153.0156,177.0219 151,179.0375 151,181.6625 L151,182.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="170" y="186.206">Proxy</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="44" x="214" y="162.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="215" y="176.8001">Target1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="142" x2="254" y1="197.6" y2="197.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="142" x2="254" y1="205.6" y2="205.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.3047"/>
+      <ellipse cx="17" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <g id="elem_C_0001190103100236298763">
-        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0001190103100236298763" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="290" y="165.6"/>
-        <ellipse cx="305" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M300,182.7563 C300,185.2563 302.1406,187.0688 305.0625,187.0688 C306.2969,187.0688 307.4688,186.7719 308.2188,186.2563 C308.8281,185.8344 309.1563,185.4125 309.1563,185.0063 C309.1563,184.5375 308.7344,184.1313 308.2344,184.1313 C308,184.1313 307.7813,184.2094 307.5781,184.4125 C307.1406,184.85 307.1406,184.85 306.9688,184.9438 C306.5156,185.1781 305.875,185.3188 305.1094,185.3188 C303.1094,185.3188 301.8281,184.3031 301.8281,182.725 L301.8281,181.6781 C301.8281,179.975 303.0469,178.7719 304.75,178.7719 C305.3281,178.7719 305.9063,178.9125 306.375,179.1625 C306.8438,179.4281 307.0156,179.6156 307.0781,179.975 C307.2031,180.6469 307.4531,180.8969 307.9844,180.8969 C308.2656,180.8969 308.5469,180.7563 308.7344,180.5375 C308.8594,180.3656 308.9063,180.1938 308.9063,179.7563 L308.9063,178.3969 C308.9063,177.975 308.8906,177.8344 308.7656,177.6625 C308.5938,177.4125 308.3125,177.2563 307.9844,177.2563 C307.6719,177.2563 307.4688,177.3656 307.25,177.6313 C306.0781,177.1313 305.6406,177.0219 304.6875,177.0219 C302.0156,177.0219 300,179.0375 300,181.6625 L300,182.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="319" y="186.206">Proxy</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="44" x="363" y="162.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="364" y="176.8001">Target2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="291" x2="403" y1="197.6" y2="197.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="291" x2="403" y1="205.6" y2="205.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="343.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <g id="elem_C_0001906317303950647748">
-        <rect codeLine="31" fill="#F1F1F1" height="81.5999" id="C_0001906317303950647748" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="183" x="180.5" y="7"/>
-        <ellipse cx="228.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M223.75,24.1563 C223.75,26.6563 225.8906,28.4688 228.8125,28.4688 C230.0469,28.4688 231.2188,28.1719 231.9688,27.6563 C232.5781,27.2344 232.9063,26.8125 232.9063,26.4063 C232.9063,25.9375 232.4844,25.5313 231.9844,25.5313 C231.75,25.5313 231.5313,25.6094 231.3281,25.8125 C230.8906,26.25 230.8906,26.25 230.7188,26.3438 C230.2656,26.5781 229.625,26.7188 228.8594,26.7188 C226.8594,26.7188 225.5781,25.7031 225.5781,24.125 L225.5781,23.0781 C225.5781,21.375 226.7969,20.1719 228.5,20.1719 C229.0781,20.1719 229.6563,20.3125 230.125,20.5625 C230.5938,20.8281 230.7656,21.0156 230.8281,21.375 C230.9531,22.0469 231.2031,22.2969 231.7344,22.2969 C232.0156,22.2969 232.2969,22.1563 232.4844,21.9375 C232.6094,21.7656 232.6563,21.5938 232.6563,21.1563 L232.6563,19.7969 C232.6563,19.375 232.6406,19.2344 232.5156,19.0625 C232.3438,18.8125 232.0625,18.6563 231.7344,18.6563 C231.4219,18.6563 231.2188,18.7656 231,19.0313 C229.8281,18.5313 229.3906,18.4219 228.4375,18.4219 C225.7656,18.4219 223.75,20.4375 223.75,23.0625 L223.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="249.25" y="27.606">ProxyHolder</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="181.5" x2="362.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="181.5" x2="362.5" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="186.5" y="55.9"/>
-          <ellipse cx="191.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="200.5" y="64.0059">proxy1 : Proxy&lt;Target1&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="186.5" y="72.6999"/>
-          <ellipse cx="191.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="200.5" y="80.8059">proxy2 : Proxy&lt;Target2&gt;</text>
-        </a>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="350.1094" y2="350.1094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="284.5"/>
+      <ellipse cx="431.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M434.6688,306.1406 Q434.0906,306.4375 433.45,306.5781 Q432.8094,306.7344 432.1063,306.7344 Q429.6063,306.7344 428.2781,305.0938 Q426.9656,303.4375 426.9656,300.3125 Q426.9656,297.1875 428.2781,295.5313 Q429.6063,293.875 432.1063,293.875 Q432.8094,293.875 433.45,294.0313 Q434.1063,294.1875 434.6688,294.4844 L434.6688,297.2031 Q434.0438,296.625 433.45,296.3594 Q432.8563,296.0781 432.2313,296.0781 Q430.8875,296.0781 430.2,297.1563 Q429.5125,298.2188 429.5125,300.3125 Q429.5125,302.4063 430.2,303.4844 Q430.8875,304.5469 432.2313,304.5469 Q432.8563,304.5469 433.45,304.2813 Q434.0438,304 434.6688,303.4219 L434.6688,306.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="446.3" y="304.6543">Target2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="316.5" y2="316.5"/>
     </a>
-    <g id="link_C_0001644966842838139424_C_0001573849034571194138">
-      <path codeLine="36" d="M174.86,213.83 C153.08,235.71 124.2337,264.6784 98.1837,290.8384 " fill="none" id="C_0001644966842838139424-to-C_0001573849034571194138" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="93.95,295.09,103.1349,291.5351,97.4781,291.547,97.4662,285.8902,93.95,295.09" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001644966842838139424_C_0001483353300536405088">
-      <path codeLine="37" d="M209.89,213.83 C218.26,230.2 221.6874,236.8976 232.6174,258.2476 " fill="none" id="C_0001644966842838139424-to-C_0001483353300536405088" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="240.82,274.27,237.9582,255.5134,227.2766,260.9818,240.82,274.27" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001190103100236298763_C_0000751896409461834669">
-      <path codeLine="38" d="M369.98,213.83 C391.61,235.71 420.2411,264.6638 446.1111,290.8238 " fill="none" id="C_0001190103100236298763-to-C_0000751896409461834669" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="450.33,295.09,446.8458,285.878,446.8142,291.5348,441.1575,291.5033,450.33,295.09" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001190103100236298763_C_0001483353300536405088">
-      <path codeLine="39" d="M334.95,213.83 C326.46,230.2 322.9714,236.9434 311.8914,258.2934 " fill="none" id="C_0001190103100236298763-to-C_0001483353300536405088" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="303.6,274.27,317.2169,261.0572,306.5658,255.5296,303.6,274.27" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001906317303950647748_C_0001644966842838139424">
-      <path codeLine="40" d="M245.1791,99.4674 C232.1191,124.1574 221.42,144.35 210.42,165.15 " fill="none" id="C_0001906317303950647748-backto-C_0001644966842838139424" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="250.79,88.86,244.4487,92.2934,245.1791,99.4674,251.5204,96.034,250.79,88.86" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="241" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="248" y="131.677">proxy1</text>
-    </g>
-    <g id="link_C_0001906317303950647748_C_0001190103100236298763">
-      <path codeLine="41" d="M299.1644,99.4336 C312.4144,124.1236 323.26,144.35 334.42,165.15 " fill="none" id="C_0001906317303950647748-backto-C_0001190103100236298763" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="293.49,88.86,292.8027,96.0383,299.1644,99.4336,299.8517,92.2553,293.49,88.86" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="324" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="331" y="131.677">proxy2</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="322.5"/>
+      <ellipse cx="425" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="330.7104">m1() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="335.3047"/>
+      <ellipse cx="425" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="343.5151">m2() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="350.1094" y2="350.1094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="107.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="251" x="128" y="268"/>
+      <ellipse cx="227.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M230.2188,289.6406 Q229.6406,289.9375 229,290.0781 Q228.3594,290.2344 227.6563,290.2344 Q225.1563,290.2344 223.8281,288.5938 Q222.5156,286.9375 222.5156,283.8125 Q222.5156,280.6875 223.8281,279.0313 Q225.1563,277.375 227.6563,277.375 Q228.3594,277.375 229,277.5313 Q229.6563,277.6875 230.2188,277.9844 L230.2188,280.7031 Q229.5938,280.125 229,279.8594 Q228.4063,279.5781 227.7813,279.5781 Q226.4375,279.5781 225.75,280.6563 Q225.0625,281.7188 225.0625,283.8125 Q225.0625,285.9063 225.75,286.9844 Q226.4375,288.0469 227.7813,288.0469 Q228.4063,288.0469 229,287.7813 Q229.5938,287.5 230.2188,286.9219 L230.2188,289.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="247.75" y="288.1543">Proxy</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="306"/>
+      <ellipse cx="139" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="148" y="314.2104">Proxy(std::shared_ptr&lt;T&gt; target) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="129" x2="378" y1="320.8047" y2="320.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="326.8047"/>
+      <ellipse cx="139" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="335.0151">m1() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="339.6094"/>
+      <ellipse cx="139" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="347.8198">m2() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="354.4141" y2="354.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="360.4141"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136" y="362.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148" y="368.6245">m_target : std::shared_ptr&lt;T&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="90.5" y="159"/>
+      <ellipse cx="105.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M108.4688,180.6406 Q107.8906,180.9375 107.25,181.0781 Q106.6094,181.2344 105.9063,181.2344 Q103.4063,181.2344 102.0781,179.5938 Q100.7656,177.9375 100.7656,174.8125 Q100.7656,171.6875 102.0781,170.0313 Q103.4063,168.375 105.9063,168.375 Q106.6094,168.375 107.25,168.5313 Q107.9063,168.6875 108.4688,168.9844 L108.4688,171.7031 Q107.8438,171.125 107.25,170.8594 Q106.6563,170.5781 106.0313,170.5781 Q104.6875,170.5781 104,171.6563 Q103.3125,172.7188 103.3125,174.8125 Q103.3125,176.9063 104,177.9844 Q104.6875,179.0469 106.0313,179.0469 Q106.6563,179.0469 107.25,178.7813 Q107.8438,178.5 108.4688,177.9219 L108.4688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="119.5" y="179.1543">Proxy</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="243.5" y="159"/>
+      <ellipse cx="258.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M261.4688,180.6406 Q260.8906,180.9375 260.25,181.0781 Q259.6094,181.2344 258.9063,181.2344 Q256.4063,181.2344 255.0781,179.5938 Q253.7656,177.9375 253.7656,174.8125 Q253.7656,171.6875 255.0781,170.0313 Q256.4063,168.375 258.9063,168.375 Q259.6094,168.375 260.25,168.5313 Q260.9063,168.6875 261.4688,168.9844 L261.4688,171.7031 Q260.8438,171.125 260.25,170.8594 Q259.6563,170.5781 259.0313,170.5781 Q257.6875,170.5781 257,171.6563 Q256.3125,172.7188 256.3125,174.8125 Q256.3125,176.9063 257,177.9844 Q257.6875,179.0469 259.0313,179.0469 Q259.6563,179.0469 260.25,178.7813 Q260.8438,178.5 261.4688,177.9219 L261.4688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="272.5" y="179.1543">Proxy</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="141" y="8"/>
+      <ellipse cx="184.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M187.3188,29.6406 Q186.7406,29.9375 186.1,30.0781 Q185.4594,30.2344 184.7563,30.2344 Q182.2563,30.2344 180.9281,28.5938 Q179.6156,26.9375 179.6156,23.8125 Q179.6156,20.6875 180.9281,19.0313 Q182.2563,17.375 184.7563,17.375 Q185.4594,17.375 186.1,17.5313 Q186.7563,17.6875 187.3188,17.9844 L187.3188,20.7031 Q186.6938,20.125 186.1,19.8594 Q185.5063,19.5781 184.8813,19.5781 Q183.5375,19.5781 182.85,20.6563 Q182.1625,21.7188 182.1625,23.8125 Q182.1625,25.9063 182.85,26.9844 Q183.5375,28.0469 184.8813,28.0469 Q185.5063,28.0469 186.1,27.7813 Q186.6938,27.5 187.3188,26.9219 L187.3188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="204.65" y="28.1543">ProxyHolder</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="147" y="54"/>
+      <ellipse cx="152" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="161" y="62.2104">proxy1 : Proxy&lt;Target1&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="147" y="66.8047"/>
+      <ellipse cx="152" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="161" y="75.0151">proxy2 : Proxy&lt;Target2&gt;</text>
+    </a>
+    <path d="M132.54,207.16 C117.89,227.14 96.41,256.47 78.96,280.29 " fill="none" id="C_0001644966842838139424-&gt;C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="75.97,284.37,84.5201,279.4818,78.9287,280.3393,78.0711,274.7479,75.97,284.37" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M167.14,207.16 C176.66,219.65 188.96,235.79 201.28,251.96 " fill="none" id="C_0001644966842838139424-&gt;C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="206.94,247.84,213.49,267.99,195.81,256.33,206.94,247.84" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M328.79,207.16 C351.68,227.31 385.35,256.96 412.51,280.88 " fill="none" id="C_0001190103100236298763-&gt;C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="416.47,284.37,412.3646,275.4176,412.7196,281.0633,407.0739,281.4183,416.47,284.37" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M294.19,207.16 C289.98,218.87 284.63,233.79 279.19,248.93 " fill="none" id="C_0001190103100236298763-&gt;C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="285.69,251.53,272.35,267.99,272.52,246.8,285.69,251.53" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <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_0001906317303950647748&lt;-C_0001644966842838139424" 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>
+    <path d="M252.45,93.59 C264.91,115.61 279.15,140.76 289.25,158.6 " fill="none" id="C_0001906317303950647748&lt;-C_0001190103100236298763" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00025_class_mermaid.svg b/docs/test_cases/t00025_class_mermaid.svg
index b0775ddf..39f224bc 100644
--- a/docs/test_cases/t00025_class_mermaid.svg
+++ b/docs/test_cases/t00025_class_mermaid.svg
@@ -1,66 +1,61 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 619.140625 437" style="max-width: 619.141px; background-color: white;" width="619.140625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 601.359375 437" style="max-width: 601.359px; background-color: white;" width="601.359375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M70.05570969626169,234L69.27689349688474,238.16666666666666C68.49807729750779,242.33333333333334,66.9404448987539,250.66666666666666,66.16162869937695,261.6666666666667C65.3828125,272.6666666666667,65.3828125,286.3333333333333,65.3828125,293.1666666666667L65.3828125,300"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M140.42340829439252,234L149.93226732866043,238.16666666666666C159.44112636292834,242.33333333333334,178.45884443146417,250.66666666666666,190.4944898251218,257.0311514100816C202.53013521877946,263.39563615349647,207.58370793755887,267.79127230699294,210.1104942969486,269.98909038374114L212.6372806563383,272.1869084604894"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M549.0849153037383,234L549.8637315031152,238.16666666666666C550.6425477024922,242.33333333333334,552.2001801012461,250.66666666666666,552.9789963006231,261.6666666666667C553.7578125,272.6666666666667,553.7578125,286.3333333333333,553.7578125,293.1666666666667L553.7578125,300"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M478.7172167056075,234L469.20835767133957,238.16666666666666C459.69949863707166,242.33333333333334,440.68178056853577,250.66666666666666,428.6461351748782,257.0311514100816C416.61048978122056,263.39563615349647,411.5569170624411,267.79127230699294,409.0301307030514,269.98909038374114L406.5033443436617,272.1869084604894"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M193.31065405319333,100.44904142516216L173.65601379432778,107.5408678543018C154.00137353546222,114.63269428344144,114.69209301773111,128.8163471417207,95.03745275886554,141.574840237527C75.3828125,154.33333333333334,75.3828125,165.66666666666666,75.3828125,171.33333333333334L75.3828125,177"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M425.82997094680667,100.44904142516216L445.48461120567225,107.5408678543018C465.13925146453784,114.63269428344144,504.4485319822689,128.8163471417207,524.1031722411344,141.574840237527C543.7578125,154.33333333333334,543.7578125,165.66666666666666,543.7578125,171.33333333333334L543.7578125,177"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M70.05570969626169,234L69.27689349688474,238.16666666666666C68.49807729750779,242.33333333333334,66.9404448987539,250.66666666666666,66.16162869937695,262.6666666666667C65.3828125,274.6666666666667,65.3828125,290.3333333333333,65.3828125,298.1666666666667L65.3828125,306"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M138.05534462616822,234L147.21799552180684,238.16666666666666C156.3806464174455,242.33333333333334,174.70594820872273,250.66666666666666,188.46895968128445,259C202.23197115384616,267.3333333333333,211.4326923076923,275.6666666666667,216.0330528846154,279.8333333333333L220.63341346153845,284"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M531.3036653037383,234L532.0824815031152,238.16666666666666C532.8612977024922,242.33333333333334,534.4189301012461,250.66666666666666,535.1977463006231,262.6666666666667C535.9765625,274.6666666666667,535.9765625,290.3333333333333,535.9765625,298.1666666666667L535.9765625,306"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M463.3040303738318,234L454.14137947819313,238.16666666666666C444.97872858255454,242.33333333333334,426.65342679127724,250.66666666666666,412.8904153187155,259C399.1274038461538,267.3333333333333,389.9266826923077,275.6666666666667,385.3263221153846,279.8333333333333L380.72596153846155,284"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M201.3515625,95.75407448505445L180.35677083333334,103.62839540421203C159.36197916666666,111.50271632336963,117.37239583333333,127.25135816168482,96.37760416666667,140.79234574750907C75.3828125,154.33333333333334,75.3828125,165.66666666666666,75.3828125,171.33333333333334L75.3828125,177"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M400.0078125,95.75407448505445L421.0026041666667,103.62839540421203C441.9973958333333,111.50271632336963,483.9869791666667,127.25135816168482,504.9817708333333,140.79234574750907C525.9765625,154.33333333333334,525.9765625,165.66666666666666,525.9765625,171.33333333333334L525.9765625,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -118,7 +113,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(543.7578125, 143)" class="edgeLabel">
+        <g transform="translate(525.9765625, 143)" class="edgeLabel">
           <g transform="translate(-28.6875, -9)" class="label">
             <foreignObject height="18" width="57.375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -131,11 +126,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L6">
+        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L6">
           <g title="Target1" id="classId-C_0001573849034571194138-0" class="node default clickable">
-            <rect height="101" width="108.8125" y="-50.5" x="-54.40625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="54.40625" x1="-54.40625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="54.40625" x1="-54.40625" class="divider"/>
+            <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -147,24 +142,24 @@
                   <span class="nodeLabel">Target1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.90625, 3)" height="18" width="93.8125">
+              <foreignObject transform="translate( -42.4609375, 3)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : : void</span>
+                  <span class="nodeLabel">+m1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.90625, 25)" height="18" width="93.8125">
+              <foreignObject transform="translate( -42.4609375, 25)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : : void</span>
+                  <span class="nodeLabel">+m2() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(553.7578125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L12">
+        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L12">
           <g title="Target2" id="classId-C_0000751896409461834669-1" class="node default clickable">
-            <rect height="101" width="108.8125" y="-50.5" x="-54.40625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="54.40625" x1="-54.40625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="54.40625" x1="-54.40625" class="divider"/>
+            <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -176,24 +171,24 @@
                   <span class="nodeLabel">Target2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.90625, 3)" height="18" width="93.8125">
+              <foreignObject transform="translate( -42.4609375, 3)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : : void</span>
+                  <span class="nodeLabel">+m1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.90625, 25)" height="18" width="93.8125">
+              <foreignObject transform="translate( -42.4609375, 25)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : : void</span>
+                  <span class="nodeLabel">+m2() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(309.5703125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18">
+        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001483353300536405088-2" class="node default clickable">
-            <rect height="145" width="279.5625" y="-72.5" x="-139.78125" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="139.78125" x1="-139.78125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="139.78125" x1="-139.78125" class="divider"/>
+            <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -205,30 +200,30 @@
                   <span class="nodeLabel">Proxy&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.28125, -31)" height="18" width="217">
+              <foreignObject transform="translate( -127.8359375, -31)" height="18" width="217">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_target : std::shared_ptr&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.28125, 3)" height="18" width="264.5625">
+              <foreignObject transform="translate( -127.8359375, 3)" height="18" width="255.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Proxy(std::shared_ptr target) : : void</span>
+                  <span class="nodeLabel">+Proxy(std::shared_ptr target) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.28125, 25)" height="18" width="93.8125">
+              <foreignObject transform="translate( -127.8359375, 25)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m1() : : void</span>
+                  <span class="nodeLabel">+m1() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -132.28125, 47)" height="18" width="93.8125">
+              <foreignObject transform="translate( -127.8359375, 47)" height="18" width="84.921875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+m2() : : void</span>
+                  <span class="nodeLabel">+m2() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18">
+        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001644966842838139424-3" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -247,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(543.7578125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L18">
+        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001190103100236298763-4" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -266,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(309.5703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00025/t00025.cc#L31">
+        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L31">
           <g title="ProxyHolder" id="classId-C_0001906317303950647748-5" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md
index bfecdf4d..e0e52803 100644
--- a/docs/test_cases/t00026.md
+++ b/docs/test_cases/t00026.md
@@ -86,7 +86,7 @@ struct StringMemento {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00026::Memento<T>",
+      "display_name": "Memento<T>",
       "id": "1241204213727905390",
       "is_abstract": false,
       "is_nested": false,
@@ -186,7 +186,7 @@ struct StringMemento {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00026::Originator<T>",
+      "display_name": "Originator<T>",
       "id": "1324770803720816727",
       "is_abstract": false,
       "is_nested": false,
@@ -374,7 +374,7 @@ struct StringMemento {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00026::Caretaker<T>",
+      "display_name": "Caretaker<T>",
       "id": "2032715387182792204",
       "is_abstract": false,
       "is_nested": false,
@@ -483,7 +483,7 @@ struct StringMemento {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00026::Caretaker<std::string>",
+      "display_name": "Caretaker<std::string>",
       "id": "1708482137721157489",
       "is_abstract": false,
       "is_nested": false,
@@ -512,7 +512,7 @@ struct StringMemento {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00026::Originator<std::string>",
+      "display_name": "Originator<std::string>",
       "id": "1014247960805363560",
       "is_abstract": false,
       "is_nested": false,
@@ -541,7 +541,7 @@ struct StringMemento {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00026::StringMemento",
+      "display_name": "StringMemento",
       "id": "851750942915129289",
       "is_abstract": false,
       "is_nested": false,
@@ -588,6 +588,7 @@ struct StringMemento {
     }
   ],
   "name": "t00026_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index 3c7eadb6..d20c58a1 100644
--- a/docs/test_cases/t00026_class.svg
+++ b/docs/test_cases/t00026_class.svg
@@ -1,207 +1,189 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="621px" preserveAspectRatio="none" style="width:745px;height:621px;background:#FFFFFF;" version="1.1" viewBox="0 0 745 621" width="745px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="583px" preserveAspectRatio="none" style="width:690px;height:583px;" version="1.1" viewBox="0 0 690 583" width="690px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fxe5ew2pzjmr5" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <g id="elem_C_0001241204213727905390">
-        <rect codeLine="2" fill="#F1F1F1" height="106.3998" id="C_0001241204213727905390" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="176" x="352.5" y="508.4"/>
-        <ellipse cx="400.75" cy="524.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M395.75,525.5563 C395.75,528.0563 397.8906,529.8688 400.8125,529.8688 C402.0469,529.8688 403.2188,529.5719 403.9688,529.0563 C404.5781,528.6344 404.9063,528.2125 404.9063,527.8063 C404.9063,527.3375 404.4844,526.9313 403.9844,526.9313 C403.75,526.9313 403.5313,527.0094 403.3281,527.2125 C402.8906,527.65 402.8906,527.65 402.7188,527.7438 C402.2656,527.9781 401.625,528.1188 400.8594,528.1188 C398.8594,528.1188 397.5781,527.1031 397.5781,525.525 L397.5781,524.4781 C397.5781,522.775 398.7969,521.5719 400.5,521.5719 C401.0781,521.5719 401.6563,521.7125 402.125,521.9625 C402.5938,522.2281 402.7656,522.4156 402.8281,522.775 C402.9531,523.4469 403.2031,523.6969 403.7344,523.6969 C404.0156,523.6969 404.2969,523.5563 404.4844,523.3375 C404.6094,523.1656 404.6563,522.9938 404.6563,522.5563 L404.6563,521.1969 C404.6563,520.775 404.6406,520.6344 404.5156,520.4625 C404.3438,520.2125 404.0625,520.0563 403.7344,520.0563 C403.4219,520.0563 403.2188,520.1656 403,520.4313 C401.8281,519.9313 401.3906,519.8219 400.4375,519.8219 C397.7656,519.8219 395.75,521.8375 395.75,524.4625 L395.75,525.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="421.25" y="529.006">Memento</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="522.5" y="505.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="523.5" y="519.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="353.5" x2="527.5" y1="540.4" y2="540.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="358.5" y="549.3"/>
-          <ellipse cx="363.5" cy="554.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="372.5" y="557.4059">Memento(T &amp;&amp; v) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="353.5" x2="527.5" y1="565.1999" y2="565.1999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="358.5" y="574.0999"/>
-          <ellipse cx="363.5" cy="579.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="372.5" y="582.2059">value() const : T</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="353.5" x2="527.5" y1="589.9999" y2="589.9999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="358.5" y="598.8998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="360.5" y="600.8998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="372.5" y="607.0058">m_value : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="94.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="324" y="478"/>
+      <ellipse cx="366.45" cy="494" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M369.4188,499.6406 Q368.8406,499.9375 368.2,500.0781 Q367.5594,500.2344 366.8563,500.2344 Q364.3563,500.2344 363.0281,498.5938 Q361.7156,496.9375 361.7156,493.8125 Q361.7156,490.6875 363.0281,489.0313 Q364.3563,487.375 366.8563,487.375 Q367.5594,487.375 368.2,487.5313 Q368.8563,487.6875 369.4188,487.9844 L369.4188,490.7031 Q368.7938,490.125 368.2,489.8594 Q367.6063,489.5781 366.9813,489.5781 Q365.6375,489.5781 364.95,490.6563 Q364.2625,491.7188 364.2625,493.8125 Q364.2625,495.9063 364.95,496.9844 Q365.6375,498.0469 366.9813,498.0469 Q367.6063,498.0469 368.2,497.7813 Q368.7938,497.5 369.4188,496.9219 L369.4188,499.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="386.55" y="498.1543">Memento</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="480" y="475"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="481" y="487.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="510" y2="510"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <g id="elem_C_0001324770803720816727">
-        <rect codeLine="10" fill="#F1F1F1" height="156.7996" id="C_0001324770803720816727" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="271" x="463" y="274.6"/>
-        <ellipse cx="557.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M552.25,291.7562 C552.25,294.2562 554.3906,296.0687 557.3125,296.0687 C558.5469,296.0687 559.7188,295.7719 560.4688,295.2562 C561.0781,294.8344 561.4063,294.4125 561.4063,294.0062 C561.4063,293.5375 560.9844,293.1312 560.4844,293.1312 C560.25,293.1312 560.0313,293.2094 559.8281,293.4125 C559.3906,293.85 559.3906,293.85 559.2188,293.9437 C558.7656,294.1781 558.125,294.3187 557.3594,294.3187 C555.3594,294.3187 554.0781,293.3031 554.0781,291.725 L554.0781,290.6781 C554.0781,288.975 555.2969,287.7719 557,287.7719 C557.5781,287.7719 558.1563,287.9125 558.625,288.1625 C559.0938,288.4281 559.2656,288.6156 559.3281,288.975 C559.4531,289.6469 559.7031,289.8969 560.2344,289.8969 C560.5156,289.8969 560.7969,289.7562 560.9844,289.5375 C561.1094,289.3656 561.1563,289.1937 561.1563,288.7562 L561.1563,287.3969 C561.1563,286.975 561.1406,286.8344 561.0156,286.6625 C560.8438,286.4125 560.5625,286.2562 560.2344,286.2562 C559.9219,286.2562 559.7188,286.3656 559.5,286.6312 C558.3281,286.1312 557.8906,286.0219 556.9375,286.0219 C554.2656,286.0219 552.25,288.0375 552.25,290.6625 L552.25,291.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="577.75" y="295.206">Originator</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="728" y="271.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="729" y="285.8001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="464" x2="733" y1="306.6" y2="306.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="315.5"/>
-          <ellipse cx="474" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="483" y="323.6059">Originator(T &amp;&amp; v) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="464" x2="733" y1="331.3999" y2="331.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="340.2999"/>
-          <ellipse cx="474" cy="345.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="483" y="348.4059">load(const Memento&lt;T&gt; &amp; m) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="357.0998"/>
-          <ellipse cx="474" cy="362.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="245" x="483" y="365.2058">memoize_value() const : Memento&lt;T&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="373.8997"/>
-          <ellipse cx="474" cy="378.8997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="483" y="382.0057">print() const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="390.6997"/>
-          <ellipse cx="474" cy="395.6997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109" x="483" y="398.8057">set(T &amp;&amp; v) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="464" x2="733" y1="406.5996" y2="406.5996"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="469" y="415.4996"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="471" y="417.4996"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="483" y="423.6056">m_value : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="516"/>
+      <ellipse cx="335" cy="521" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <g id="elem_C_0002032715387182792204">
-        <rect codeLine="21" fill="#F1F1F1" height="98.3998" id="C_0002032715387182792204" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="421" x="7" y="303.8"/>
-        <ellipse cx="176.25" cy="319.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M171.25,320.9562 C171.25,323.4562 173.3906,325.2687 176.3125,325.2687 C177.5469,325.2687 178.7188,324.9719 179.4688,324.4562 C180.0781,324.0344 180.4063,323.6125 180.4063,323.2062 C180.4063,322.7375 179.9844,322.3312 179.4844,322.3312 C179.25,322.3312 179.0313,322.4094 178.8281,322.6125 C178.3906,323.05 178.3906,323.05 178.2188,323.1437 C177.7656,323.3781 177.125,323.5187 176.3594,323.5187 C174.3594,323.5187 173.0781,322.5031 173.0781,320.925 L173.0781,319.8781 C173.0781,318.175 174.2969,316.9719 176,316.9719 C176.5781,316.9719 177.1563,317.1125 177.625,317.3625 C178.0938,317.6281 178.2656,317.8156 178.3281,318.175 C178.4531,318.8469 178.7031,319.0969 179.2344,319.0969 C179.5156,319.0969 179.7969,318.9562 179.9844,318.7375 C180.1094,318.5656 180.1563,318.3937 180.1563,317.9562 L180.1563,316.5969 C180.1563,316.175 180.1406,316.0344 180.0156,315.8625 C179.8438,315.6125 179.5625,315.4562 179.2344,315.4562 C178.9219,315.4562 178.7188,315.5656 178.5,315.8312 C177.3281,315.3312 176.8906,315.2219 175.9375,315.2219 C173.2656,315.2219 171.25,317.2375 171.25,319.8625 L171.25,320.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="196.75" y="324.406">Caretaker</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="422" y="300.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="423" y="315.0001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="427" y1="335.8" y2="335.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="344.7"/>
-          <ellipse cx="18" cy="349.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="361" x="27" y="352.8059">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="361.4999"/>
-          <ellipse cx="18" cy="366.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="276" x="27" y="369.6059">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="427" y1="377.3999" y2="377.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="386.2998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="388.2998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="395" x="27" y="394.4058">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="344" y="524.2104">Memento(T &amp;&amp; v) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <g id="elem_C_0001708482137721157489">
-        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0001708482137721157489" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="151" x="288" y="165.6"/>
-        <ellipse cx="303" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M298,182.7562 C298,185.2562 300.1406,187.0687 303.0625,187.0687 C304.2969,187.0687 305.4688,186.7719 306.2188,186.2562 C306.8281,185.8344 307.1563,185.4125 307.1563,185.0062 C307.1563,184.5375 306.7344,184.1312 306.2344,184.1312 C306,184.1312 305.7813,184.2094 305.5781,184.4125 C305.1406,184.85 305.1406,184.85 304.9688,184.9437 C304.5156,185.1781 303.875,185.3187 303.1094,185.3187 C301.1094,185.3187 299.8281,184.3031 299.8281,182.725 L299.8281,181.6781 C299.8281,179.975 301.0469,178.7719 302.75,178.7719 C303.3281,178.7719 303.9063,178.9125 304.375,179.1625 C304.8438,179.4281 305.0156,179.6156 305.0781,179.975 C305.2031,180.6469 305.4531,180.8969 305.9844,180.8969 C306.2656,180.8969 306.5469,180.7562 306.7344,180.5375 C306.8594,180.3656 306.9063,180.1937 306.9063,179.7562 L306.9063,178.3969 C306.9063,177.975 306.8906,177.8344 306.7656,177.6625 C306.5938,177.4125 306.3125,177.2562 305.9844,177.2562 C305.6719,177.2562 305.4688,177.3656 305.25,177.6312 C304.0781,177.1312 303.6406,177.0219 302.6875,177.0219 C300.0156,177.0219 298,179.0375 298,181.6625 L298,182.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="317" y="186.206">Caretaker</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="388" y="162.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="389" y="176.8001">std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="289" x2="438" y1="197.6" y2="197.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="289" x2="438" y1="205.6" y2="205.6"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="325" x2="485" y1="530.8047" y2="530.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="536.8047"/>
+      <ellipse cx="335" cy="541.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <g id="elem_C_0001014247960805363560">
-        <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0001014247960805363560" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="151" x="498" y="165.6"/>
-        <ellipse cx="513" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M508,182.7562 C508,185.2562 510.1406,187.0687 513.0625,187.0687 C514.2969,187.0687 515.4688,186.7719 516.2188,186.2562 C516.8281,185.8344 517.1563,185.4125 517.1563,185.0062 C517.1563,184.5375 516.7344,184.1312 516.2344,184.1312 C516,184.1312 515.7813,184.2094 515.5781,184.4125 C515.1406,184.85 515.1406,184.85 514.9688,184.9437 C514.5156,185.1781 513.875,185.3187 513.1094,185.3187 C511.1094,185.3187 509.8281,184.3031 509.8281,182.725 L509.8281,181.6781 C509.8281,179.975 511.0469,178.7719 512.75,178.7719 C513.3281,178.7719 513.9063,178.9125 514.375,179.1625 C514.8438,179.4281 515.0156,179.6156 515.0781,179.975 C515.2031,180.6469 515.4531,180.8969 515.9844,180.8969 C516.2656,180.8969 516.5469,180.7562 516.7344,180.5375 C516.8594,180.3656 516.9063,180.1937 516.9063,179.7562 L516.9063,178.3969 C516.9063,177.975 516.8906,177.8344 516.7656,177.6625 C516.5938,177.4125 516.3125,177.2562 515.9844,177.2562 C515.6719,177.2562 515.4688,177.3656 515.25,177.6312 C514.0781,177.1312 513.6406,177.0219 512.6875,177.0219 C510.0156,177.0219 508,179.0375 508,181.6625 L508,182.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="527" y="186.206">Originator</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="598" y="162.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="599" y="176.8001">std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="499" x2="648" y1="197.6" y2="197.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="499" x2="648" y1="205.6" y2="205.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="344" y="545.0151">value() const : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <g id="elem_C_0000851750942915129289">
-        <rect codeLine="36" fill="#F1F1F1" height="81.5999" id="C_0000851750942915129289" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="239" x="337" y="7"/>
-        <ellipse cx="403.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M398.75,24.1563 C398.75,26.6563 400.8906,28.4688 403.8125,28.4688 C405.0469,28.4688 406.2188,28.1719 406.9688,27.6563 C407.5781,27.2344 407.9063,26.8125 407.9063,26.4063 C407.9063,25.9375 407.4844,25.5313 406.9844,25.5313 C406.75,25.5313 406.5313,25.6094 406.3281,25.8125 C405.8906,26.25 405.8906,26.25 405.7188,26.3438 C405.2656,26.5781 404.625,26.7188 403.8594,26.7188 C401.8594,26.7188 400.5781,25.7031 400.5781,24.125 L400.5781,23.0781 C400.5781,21.375 401.7969,20.1719 403.5,20.1719 C404.0781,20.1719 404.6563,20.3125 405.125,20.5625 C405.5938,20.8281 405.7656,21.0156 405.8281,21.375 C405.9531,22.0469 406.2031,22.2969 406.7344,22.2969 C407.0156,22.2969 407.2969,22.1563 407.4844,21.9375 C407.6094,21.7656 407.6563,21.5938 407.6563,21.1563 L407.6563,19.7969 C407.6563,19.375 407.6406,19.2344 407.5156,19.0625 C407.3438,18.8125 407.0625,18.6563 406.7344,18.6563 C406.4219,18.6563 406.2188,18.7656 406,19.0313 C404.8281,18.5313 404.3906,18.4219 403.4375,18.4219 C400.7656,18.4219 398.75,20.4375 398.75,23.0625 L398.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="424.25" y="27.606">StringMemento</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="338" x2="575" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="338" x2="575" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="343" y="55.9"/>
-          <ellipse cx="348" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213" x="357" y="64.0059">caretaker : Caretaker&lt;std::string&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="343" y="72.6999"/>
-          <ellipse cx="348" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="213" x="357" y="80.8059">originator : Originator&lt;std::string&gt;</text>
-        </a>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="551.6094" y2="551.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="557.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="332" y="559.6094"/>
     </a>
-    <g id="link_C_0001324770803720816727_C_0001241204213727905390">
-      <path codeLine="41" d="M538.99,431.81 C519.48,457.32 501.9359,480.2748 484.2159,503.4348 " fill="none" id="C_0001324770803720816727-to-C_0001241204213727905390" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="480.57,508.2,489.2157,503.4828,483.6083,504.229,482.8621,498.6216,480.57,508.2" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002032715387182792204_C_0001241204213727905390">
-      <path codeLine="42" d="M278.8729,410.8553 C313.1229,442.5853 348.98,475.81 383.99,508.25 " fill="none" id="C_0002032715387182792204-backto-C_0001241204213727905390" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="270.07,402.7,271.7531,409.7119,278.8729,410.8553,277.1899,403.8433,270.07,402.7" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="352.5" y="467.7"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="79" x="362.5" y="474.477">m_mementos</text>
-    </g>
-    <g id="link_C_0001708482137721157489_C_0002032715387182792204">
-      <path codeLine="43" d="M342.27,214.07 C321.15,237.41 300.206,260.5719 273.436,290.1619 " fill="none" id="C_0001708482137721157489-to-C_0002032715387182792204" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="261.36,303.51,277.8853,294.1873,268.9866,286.1366,261.36,303.51" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001014247960805363560_C_0001324770803720816727">
-      <path codeLine="44" d="M577.14,214.07 C579.61,230.07 580.2965,234.4619 583.6865,256.3619 " fill="none" id="C_0001014247960805363560-to-C_0001324770803720816727" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="586.44,274.15,589.6159,255.444,577.7571,257.2797,586.44,274.15" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000851750942915129289_C_0001708482137721157489">
-      <path codeLine="45" d="M423.2048,98.8521 C406.7848,123.5421 392.93,144.36 379.1,165.15 " fill="none" id="C_0000851750942915129289-backto-C_0001708482137721157489" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="429.85,88.86,423.1967,91.641,423.2048,98.8521,429.8581,96.0711,429.85,88.86" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="416.5" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="423.5" y="131.677">caretaker</text>
-    </g>
-    <g id="link_C_0000851750942915129289_C_0001014247960805363560">
-      <path codeLine="46" d="M497.7309,98.0631 C518.3909,122.7531 536.47,144.36 553.87,165.15 " fill="none" id="C_0000851750942915129289-backto-C_0001014247960805363560" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="490.03,88.86,490.8128,96.0285,497.7309,98.0631,496.9481,90.8946,490.03,88.86" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="534.5" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="541.5" y="131.677">originator</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="344" y="565.8198">m_value : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="132.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
+      <ellipse cx="513.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M516.2188,289.6406 Q515.6406,289.9375 515,290.0781 Q514.3594,290.2344 513.6563,290.2344 Q511.1563,290.2344 509.8281,288.5938 Q508.5156,286.9375 508.5156,283.8125 Q508.5156,280.6875 509.8281,279.0313 Q511.1563,277.375 513.6563,277.375 Q514.3594,277.375 515,277.5313 Q515.6563,277.6875 516.2188,277.9844 L516.2188,280.7031 Q515.5938,280.125 515,279.8594 Q514.4063,279.5781 513.7813,279.5781 Q512.4375,279.5781 511.75,280.6563 Q511.0625,281.7188 511.0625,283.8125 Q511.0625,285.9063 511.75,286.9844 Q512.4375,288.0469 513.7813,288.0469 Q514.4063,288.0469 515,287.7813 Q515.5938,287.5 516.2188,286.9219 L516.2188,289.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="533.75" y="288.1543">Originator</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="306"/>
+      <ellipse cx="442.5" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="451.5" y="314.2104">Originator(T &amp;&amp; v) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="326.8047"/>
+      <ellipse cx="442.5" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="451.5" y="335.0151">load(const Memento&lt;T&gt; &amp; m) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="339.6094"/>
+      <ellipse cx="442.5" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="451.5" y="347.8198">memoize_value() const : Memento&lt;T&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="352.4141"/>
+      <ellipse cx="442.5" cy="357.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="104" x="451.5" y="360.6245">print() const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="365.2188"/>
+      <ellipse cx="442.5" cy="370.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="451.5" y="373.4292">set(T &amp;&amp; v) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="380.0234" y2="380.0234"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="386.0234"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="388.0234"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="394.2339">m_value : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="291.5"/>
+      <ellipse cx="160.25" cy="307.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M163.2188,313.1406 Q162.6406,313.4375 162,313.5781 Q161.3594,313.7344 160.6563,313.7344 Q158.1563,313.7344 156.8281,312.0938 Q155.5156,310.4375 155.5156,307.3125 Q155.5156,304.1875 156.8281,302.5313 Q158.1563,300.875 160.6563,300.875 Q161.3594,300.875 162,301.0313 Q162.6563,301.1875 163.2188,301.4844 L163.2188,304.2031 Q162.5938,303.625 162,303.3594 Q161.4063,303.0781 160.7813,303.0781 Q159.4375,303.0781 158.75,304.1563 Q158.0625,305.2188 158.0625,307.3125 Q158.0625,309.4063 158.75,310.4844 Q159.4375,311.5469 160.7813,311.5469 Q161.4063,311.5469 162,311.2813 Q162.5938,311 163.2188,310.4219 L163.2188,313.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="311.6543">Caretaker</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="390" y="288.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="300.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="323.5" y2="323.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="329.5"/>
+      <ellipse cx="17" cy="334.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="339" x="26" y="337.7104">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="342.3047"/>
+      <ellipse cx="17" cy="347.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="259" x="26" y="350.5151">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="357.1094" y2="357.1094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="363.1094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="365.1094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="371.3198">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
+      <ellipse cx="254" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M256.9688,180.6406 Q256.3906,180.9375 255.75,181.0781 Q255.1094,181.2344 254.4063,181.2344 Q251.9063,181.2344 250.5781,179.5938 Q249.2656,177.9375 249.2656,174.8125 Q249.2656,171.6875 250.5781,170.0313 Q251.9063,168.375 254.4063,168.375 Q255.1094,168.375 255.75,168.5313 Q256.4063,168.6875 256.9688,168.9844 L256.9688,171.7031 Q256.3438,171.125 255.75,170.8594 Q255.1563,170.5781 254.5313,170.5781 Q253.1875,170.5781 252.5,171.6563 Q251.8125,172.7188 251.8125,174.8125 Q251.8125,176.9063 252.5,177.9844 Q253.1875,179.0469 254.5313,179.0469 Q255.1563,179.0469 255.75,178.7813 Q256.3438,178.5 256.9688,177.9219 L256.9688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="268" y="179.1543">Caretaker</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
+      <ellipse cx="469" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M471.9688,180.6406 Q471.3906,180.9375 470.75,181.0781 Q470.1094,181.2344 469.4063,181.2344 Q466.9063,181.2344 465.5781,179.5938 Q464.2656,177.9375 464.2656,174.8125 Q464.2656,171.6875 465.5781,170.0313 Q466.9063,168.375 469.4063,168.375 Q470.1094,168.375 470.75,168.5313 Q471.4063,168.6875 471.9688,168.9844 L471.9688,171.7031 Q471.3438,171.125 470.75,170.8594 Q470.1563,170.5781 469.5313,170.5781 Q468.1875,170.5781 467.5,171.6563 Q466.8125,172.7188 466.8125,174.8125 Q466.8125,176.9063 467.5,177.9844 Q468.1875,179.0469 469.5313,179.0469 Q470.1563,179.0469 470.75,178.7813 Q471.3438,178.5 471.9688,177.9219 L471.9688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="483" y="179.1543">Originator</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
+      <ellipse cx="364.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M367.2188,29.6406 Q366.6406,29.9375 366,30.0781 Q365.3594,30.2344 364.6563,30.2344 Q362.1563,30.2344 360.8281,28.5938 Q359.5156,26.9375 359.5156,23.8125 Q359.5156,20.6875 360.8281,19.0313 Q362.1563,17.375 364.6563,17.375 Q365.3594,17.375 366,17.5313 Q366.6563,17.6875 367.2188,17.9844 L367.2188,20.7031 Q366.5938,20.125 366,19.8594 Q365.4063,19.5781 364.7813,19.5781 Q363.4375,19.5781 362.75,20.6563 Q362.0625,21.7188 362.0625,23.8125 Q362.0625,25.9063 362.75,26.9844 Q363.4375,28.0469 364.7813,28.0469 Q365.4063,28.0469 366,27.7813 Q366.5938,27.5 367.2188,26.9219 L367.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="384.75" y="28.1543">StringMemento</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="54"/>
+      <ellipse cx="313.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="322.5" y="62.2104">caretaker : Caretaker&lt;std::string&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="66.8047"/>
+      <ellipse cx="313.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="322.5" y="75.0151">originator : Originator&lt;std::string&gt;</text>
+    </a>
+    <path d="M502.1,401.16 C483.28,424.97 462.34,451.46 444.73,473.73 " fill="none" id="C_0001324770803720816727-&gt;C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="441.49,477.84,450.2052,473.2526,444.5873,473.9149,443.925,468.2969,441.49,477.84" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M256.25,386.55 C287.03,414.99 325.06,450.14 354.96,477.77 " fill="none" id="C_0002032715387182792204&lt;-C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="246.53,377.57,248.2235,384.5794,255.3451,385.7121,253.6516,378.7027,246.53,377.57" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="325" y="437.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="335" y="444.0669">m_mementos</text>
+    <path d="M300.82,207.03 C286.43,225.27 265.68,251.55 246.82,275.44 " fill="none" id="C_0001708482137721157489-&gt;C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="252.06,280.11,234.17,291.47,241.07,271.44,252.06,280.11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M537.08,207.03 C538.6,218.36 540.53,232.81 542.54,247.85 " fill="none" id="C_0001014247960805363560-&gt;C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="549.49,247.02,545.21,267.77,535.62,248.87,549.49,247.02" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M382.71,92.68 C366.85,114.91 348.59,140.52 335.69,158.6 " fill="none" id="C_0000851750942915129289&lt;-C_0001708482137721157489" 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>
+    <path d="M455.98,92.08 C475.38,114.44 497.86,140.35 513.7,158.6 " fill="none" id="C_0000851750942915129289&lt;-C_0001014247960805363560" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00026_class_mermaid.svg b/docs/test_cases/t00026_class_mermaid.svg
index 3a16234c..91fc675c 100644
--- a/docs/test_cases/t00026_class_mermaid.svg
+++ b/docs/test_cases/t00026_class_mermaid.svg
@@ -1,66 +1,61 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 843.453125 672" style="max-width: 843.453px; background-color: white;" width="843.453125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 834.5625 672" style="max-width: 834.562px; background-color: white;" width="834.5625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M166.0078125,473L166.0078125,478.6666666666667C166.0078125,484.3333333333333,166.0078125,495.6666666666667,184.9014799492206,509.55870829635745C203.79514739844117,523.4507499260482,241.58248229688238,539.9014998520964,260.476149746103,548.1268748151205L279.36981719532355,556.3522497781446"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M604.734375,458L604.734375,466.1666666666667C604.734375,474.3333333333333,604.734375,490.6666666666667,584.923828125,507.4578725715405C565.11328125,524.2490784764144,525.4921875,541.4981569528287,505.681640625,550.1226961910359L485.87109375,558.747235429243"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M604.734375,234L604.734375,238.16666666666666C604.734375,242.33333333333334,604.734375,250.66666666666666,604.734375,261.5C604.734375,272.3333333333333,604.734375,285.6666666666667,604.734375,292.3333333333333L604.734375,299"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M166.0078125,234L166.0078125,238.16666666666666C166.0078125,242.33333333333334,166.0078125,250.66666666666666,166.0078125,256C166.0078125,261.3333333333333,166.0078125,263.6666666666667,166.0078125,264.8333333333333L166.0078125,266"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M533.2667556145851,115.47026118657878L545.1780255121542,120.05855098881564C557.0892954097234,124.64684079105253,580.9118352048617,133.82342039552626,592.8231051024309,144.0783768644298C604.734375,154.33333333333334,604.734375,165.66666666666666,604.734375,171.33333333333334L604.734375,177"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M237.47543188541493,115.47026118657878L225.56416198784578,120.05855098881564C213.65289209027662,124.64684079105253,189.83035229513834,133.82342039552626,177.91908239756916,144.0783768644298C166.0078125,154.33333333333334,166.0078125,165.66666666666666,166.0078125,171.33333333333334L166.0078125,177"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M161.5625,473L161.5625,478.6666666666667C161.5625,484.3333333333333,161.5625,495.6666666666667,181.74348958333334,510.2090768990909C201.92447916666666,524.7514871315152,242.28645833333334,542.5029742630304,262.4674479166667,551.378717828788L282.6484375,560.2544613945456"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M595.84375,440L595.84375,451.1666666666667C595.84375,462.3333333333333,595.84375,484.6666666666667,575.6627604166666,504.7090768990909C555.4817708333334,524.7514871315152,515.1197916666666,542.5029742630304,494.9388020833333,551.378717828788L474.7578125,560.2544613945456"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M595.84375,234L595.84375,238.16666666666666C595.84375,242.33333333333334,595.84375,250.66666666666666,595.84375,264.5C595.84375,278.3333333333333,595.84375,297.6666666666667,595.84375,307.3333333333333L595.84375,317"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M161.5625,234L161.5625,238.16666666666666C161.5625,242.33333333333334,161.5625,250.66666666666666,161.5625,259C161.5625,267.3333333333333,161.5625,275.6666666666667,161.5625,279.8333333333333L161.5625,284"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M508.4735576923077,109L523.0352564102565,114.66666666666667C537.5969551282051,120.33333333333333,566.7203525641025,131.66666666666666,581.2820512820513,143C595.84375,154.33333333333334,595.84375,165.66666666666666,595.84375,171.33333333333334L595.84375,177"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M248.93269230769232,109L234.37099358974362,114.66666666666667C219.8092948717949,120.33333333333333,190.68589743589746,131.66666666666666,176.12419871794873,143C161.5625,154.33333333333334,161.5625,165.66666666666666,161.5625,171.33333333333334L161.5625,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -74,7 +69,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(604.734375, 507)" class="edgeLabel">
+        <g transform="translate(595.84375, 507)" class="edgeLabel">
           <g transform="translate(-51.125, -9)" class="label">
             <foreignObject height="18" width="102.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -107,7 +102,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(604.734375, 143)" class="edgeLabel">
+        <g transform="translate(595.84375, 143)" class="edgeLabel">
           <g transform="translate(-38.0234375, -9)" class="label">
             <foreignObject height="18" width="76.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -118,7 +113,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(166.0078125, 143)" class="edgeLabel">
+        <g transform="translate(161.5625, 143)" class="edgeLabel">
           <g transform="translate(-38.0234375, -9)" class="label">
             <foreignObject height="18" width="76.046875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -131,11 +126,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(385.37109375, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L8">
+        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L8">
           <g title="Memento" id="classId-C_0001241204213727905390-0" class="node default clickable">
-            <rect height="123" width="201" y="-61.5" x="-100.5" class="outer title-state"/>
-            <line y2="-31.5" y1="-31.5" x2="100.5" x1="-100.5" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="100.5" x1="-100.5" class="divider"/>
+            <rect height="123" width="192.109375" y="-61.5" x="-96.0546875" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="96.0546875" x1="-96.0546875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="96.0546875" x1="-96.0546875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -147,29 +142,29 @@
                   <span class="nodeLabel">Memento&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -93, -20)" height="18" width="88.625">
+              <foreignObject transform="translate( -88.5546875, -20)" height="18" width="88.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_value : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -93, 14)" height="18" width="186">
+              <foreignObject transform="translate( -88.5546875, 14)" height="18" width="177.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Memento(T &amp;&amp; v) : : void</span>
+                  <span class="nodeLabel">+Memento(T &amp;&amp; v) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -93, 36)" height="18" width="141.546875">
+              <foreignObject transform="translate( -88.5546875, 36)" height="18" width="132.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+value() : : [const] T</span>
+                  <span class="nodeLabel">+value() : [const] T</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(166.0078125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21">
+        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001324770803720816727-1" class="node default clickable">
-            <rect height="189" width="316.015625" y="-94.5" x="-158.0078125" class="outer title-state"/>
-            <line y2="-64.5" y1="-64.5" x2="158.0078125" x1="-158.0078125" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="158.0078125" x1="-158.0078125" class="divider"/>
+            <rect height="189" width="307.125" y="-94.5" x="-153.5625" class="outer title-state"/>
+            <line y2="-64.5" y1="-64.5" x2="153.5625" x1="-153.5625" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="153.5625" x1="-153.5625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -181,40 +176,40 @@
                   <span class="nodeLabel">Originator&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -150.5078125, -53)" height="18" width="88.625">
+              <foreignObject transform="translate( -146.0625, -53)" height="18" width="88.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-m_value : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -150.5078125, -19)" height="18" width="189.546875">
+              <foreignObject transform="translate( -146.0625, -19)" height="18" width="180.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+Originator(T &amp;&amp; v) : : void</span>
+                  <span class="nodeLabel">+Originator(T &amp;&amp; v) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -150.5078125, 3)" height="18" width="244.109375">
+              <foreignObject transform="translate( -146.0625, 3)" height="18" width="235.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+load(const Memento &amp; m) : : void</span>
+                  <span class="nodeLabel">+load(const Memento &amp; m) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -150.5078125, 25)" height="18" width="301.015625">
+              <foreignObject transform="translate( -146.0625, 25)" height="18" width="292.125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+memoize_value() : : [const] Memento&lt;T&gt;</span>
+                  <span class="nodeLabel">+memoize_value() : [const] Memento&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -150.5078125, 47)" height="18" width="154.28125">
+              <foreignObject transform="translate( -146.0625, 47)" height="18" width="145.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+print() : : [const] void</span>
+                  <span class="nodeLabel">+print() : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -150.5078125, 69)" height="18" width="140.640625">
+              <foreignObject transform="translate( -146.0625, 69)" height="18" width="131.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+set(T &amp;&amp; v) : : void</span>
+                  <span class="nodeLabel">+set(T &amp;&amp; v) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(604.734375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40">
+        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0002032715387182792204-2" class="node default clickable">
             <rect height="123" width="461.4375" y="-61.5" x="-230.71875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="230.71875" x1="-230.71875" class="divider"/>
@@ -235,20 +230,20 @@
                   <span class="nodeLabel">-m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -223.21875, 14)" height="18" width="395.265625">
+              <foreignObject transform="translate( -223.21875, 14)" height="18" width="386.375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+set_state(const std::string &amp; s, Memento &amp;&amp; m) : : void</span>
+                  <span class="nodeLabel">+set_state(const std::string &amp; s, Memento &amp;&amp; m) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -223.21875, 36)" height="18" width="327.703125">
+              <foreignObject transform="translate( -223.21875, 36)" height="18" width="318.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+state(const std::string &amp; n) : : Memento&lt;T&gt; &amp;</span>
+                  <span class="nodeLabel">+state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(604.734375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L40">
+        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0001708482137721157489-3" class="node default clickable">
             <rect height="57" width="186.625" y="-28.5" x="-93.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.3125" x1="-93.3125" class="divider"/>
@@ -267,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(166.0078125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L21">
+        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001014247960805363560-4" class="node default clickable">
             <rect height="57" width="190.125" y="-28.5" x="-95.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.0625" x1="-95.0625" class="divider"/>
@@ -286,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(385.37109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00026/t00026.cc#L53">
+        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L53">
           <g title="StringMemento" id="classId-C_0000851750942915129289-5" class="node default clickable">
             <rect height="101" width="262.6875" y="-50.5" x="-131.34375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="131.34375" x1="-131.34375" class="divider"/>
diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md
index fb7f645b..c289e0ad 100644
--- a/docs/test_cases/t00027.md
+++ b/docs/test_cases/t00027.md
@@ -83,7 +83,7 @@ struct Window {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00027::Shape",
+      "display_name": "Shape",
       "id": "1593092483959332221",
       "is_abstract": true,
       "is_nested": false,
@@ -158,7 +158,7 @@ struct Window {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00027::Line",
+      "display_name": "Line",
       "id": "1568932879061562228",
       "is_abstract": false,
       "is_nested": false,
@@ -193,7 +193,7 @@ struct Window {
           "name": "T<Line<>>"
         }
       ],
-      "display_name": "clanguml::t00027::Line<T<>...>",
+      "display_name": "Line<T<>...>",
       "id": "142374082478337852",
       "is_abstract": false,
       "is_nested": false,
@@ -249,7 +249,7 @@ struct Window {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00027::Text",
+      "display_name": "Text",
       "id": "1833467466291294724",
       "is_abstract": false,
       "is_nested": false,
@@ -284,7 +284,7 @@ struct Window {
           "name": "T<Text<>>"
         }
       ],
-      "display_name": "clanguml::t00027::Text<T<>...>",
+      "display_name": "Text<T<>...>",
       "id": "1114634647721878603",
       "is_abstract": false,
       "is_nested": false,
@@ -340,7 +340,7 @@ struct Window {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00027::ShapeDecorator",
+      "display_name": "ShapeDecorator",
       "id": "2049188825706164566",
       "is_abstract": true,
       "is_nested": false,
@@ -396,7 +396,7 @@ struct Window {
           "name": "clanguml::t00027::ShapeDecorator"
         }
       ],
-      "display_name": "clanguml::t00027::Color<T>",
+      "display_name": "Color<T>",
       "id": "1473536569433029444",
       "is_abstract": false,
       "is_nested": false,
@@ -459,7 +459,7 @@ struct Window {
           "name": "clanguml::t00027::ShapeDecorator"
         }
       ],
-      "display_name": "clanguml::t00027::Weight<T>",
+      "display_name": "Weight<T>",
       "id": "2049455532387561338",
       "is_abstract": false,
       "is_nested": false,
@@ -515,7 +515,7 @@ struct Window {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00027::Line<clanguml::t00027::Color,clanguml::t00027::Weight>",
+      "display_name": "Line<Color,Weight>",
       "id": "2082936326417164202",
       "is_abstract": false,
       "is_nested": false,
@@ -550,7 +550,7 @@ struct Window {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00027::Line<clanguml::t00027::Color>",
+      "display_name": "Line<Color>",
       "id": "675132943535054947",
       "is_abstract": false,
       "is_nested": false,
@@ -579,7 +579,7 @@ struct Window {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00027::Text<clanguml::t00027::Color,clanguml::t00027::Weight>",
+      "display_name": "Text<Color,Weight>",
       "id": "1678874302644303776",
       "is_abstract": false,
       "is_nested": false,
@@ -614,7 +614,7 @@ struct Window {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00027::Text<clanguml::t00027::Color>",
+      "display_name": "Text<Color>",
       "id": "1887786688778664182",
       "is_abstract": false,
       "is_nested": false,
@@ -643,7 +643,7 @@ struct Window {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00027::Window",
+      "display_name": "Window",
       "id": "1373544984027721472",
       "is_abstract": false,
       "is_nested": false,
@@ -714,6 +714,7 @@ struct Window {
     }
   ],
   "name": "t00027_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index f0685bf4..cc60c721 100644
--- a/docs/test_cases/t00027_class.svg
+++ b/docs/test_cases/t00027_class.svg
@@ -1,287 +1,243 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="423px" preserveAspectRatio="none" style="width:1307px;height:423px;background:#FFFFFF;" version="1.1" viewBox="0 0 1307 423" width="1307px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="398px" preserveAspectRatio="none" style="width:1289px;height:398px;" version="1.1" viewBox="0 0 1289 398" width="1289px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fg3j2j814kxbm" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <g id="elem_C_0001593092483959332221">
-        <rect codeLine="2" fill="#F1F1F1" height="91.6998" id="C_0001593092483959332221" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="248" x="304.5" y="199.2"/>
-        <ellipse cx="403.75" cy="215.2" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M405.2813,217.1375 L405.6094,217.9344 L405.3281,217.9344 C404.875,217.9344 404.75,217.9656 404.5781,218.075 C404.2969,218.2156 404.125,218.5125 404.125,218.8094 C404.125,219.1063 404.2656,219.3563 404.5,219.5281 C404.6719,219.6531 404.9063,219.7 405.3281,219.7 L407.6875,219.7 C408.0469,219.7 408.2969,219.6688 408.4375,219.575 C408.7031,219.4344 408.875,219.1219 408.875,218.8094 C408.875,218.5438 408.7344,218.2781 408.5,218.1063 C408.3125,217.9813 408.1563,217.95 407.7031,217.9344 L404.3125,210.1063 L400.5938,210.1063 C400.1406,210.1063 400,210.1219 399.8281,210.2313 C399.5625,210.4031 399.3906,210.6844 399.3906,210.9813 C399.3906,211.2625 399.5313,211.5281 399.7813,211.7 C399.9531,211.825 400.1406,211.8563 400.5938,211.8563 L401.5625,211.8563 L398.9844,217.9344 C398.2344,217.9344 397.8281,218.2313 397.8281,218.8094 C397.8281,219.4188 398.2188,219.7 399.0156,219.7 L401.2813,219.7 C401.6406,219.7 401.8906,219.6688 402.0313,219.575 C402.2969,219.4188 402.4688,219.1219 402.4688,218.8094 C402.4688,218.5438 402.3281,218.2781 402.0938,218.1063 C401.9063,217.9656 401.75,217.9344 401.2813,217.9344 L400.9844,217.9344 L401.3281,217.1375 L405.2813,217.1375 Z M404.5156,215.3875 L402.0625,215.3875 L403.2969,212.5125 L404.5156,215.3875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="41" x="424.25" y="221.15">Shape</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="305.5" x2="551.5" y1="231.2" y2="231.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="310.5" y="240.1"/>
-          <ellipse cx="315.5" cy="245.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="222" x="324.5" y="248.2059">~Shape() constexpr = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="305.5" x2="551.5" y1="255.9999" y2="255.9999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="310.5" y="265.9499"/>
-          <ellipse cx="315.5" cy="270.9499" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="116" x="324.5" y="275.3999">display() = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="305.5" x2="551.5" y1="282.8998" y2="282.8998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="81.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="310.5" y="184"/>
+      <ellipse cx="401.25" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M401.3594,195.3438 L400.2031,200.4219 L402.5313,200.4219 L401.3594,195.3438 Z M399.875,193.1094 L402.8594,193.1094 L406.2188,205.5 L403.7656,205.5 L403,202.4375 L399.7188,202.4375 L398.9688,205.5 L396.5313,205.5 L399.875,193.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="421.75" y="204.1543">Shape</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="216" y2="216"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <g id="elem_C_0001568932879061562228">
-        <rect codeLine="9" fill="#F1F1F1" height="48" id="C_0001568932879061562228" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="772" y="40.6"/>
-        <ellipse cx="787" cy="56.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M782,57.7562 C782,60.2562 784.1406,62.0687 787.0625,62.0687 C788.2969,62.0687 789.4688,61.7719 790.2188,61.2562 C790.8281,60.8344 791.1563,60.4125 791.1563,60.0062 C791.1563,59.5375 790.7344,59.1312 790.2344,59.1312 C790,59.1312 789.7813,59.2094 789.5781,59.4125 C789.1406,59.85 789.1406,59.85 788.9688,59.9437 C788.5156,60.1781 787.875,60.3187 787.1094,60.3187 C785.1094,60.3187 783.8281,59.3031 783.8281,57.725 L783.8281,56.6781 C783.8281,54.975 785.0469,53.7719 786.75,53.7719 C787.3281,53.7719 787.9063,53.9125 788.375,54.1625 C788.8438,54.4281 789.0156,54.6156 789.0781,54.975 C789.2031,55.6469 789.4531,55.8969 789.9844,55.8969 C790.2656,55.8969 790.5469,55.7562 790.7344,55.5375 C790.8594,55.3656 790.9063,55.1937 790.9063,54.7562 L790.9063,53.3969 C790.9063,52.975 790.8906,52.8344 790.7656,52.6625 C790.5938,52.4125 790.3125,52.2562 789.9844,52.2562 C789.6719,52.2562 789.4688,52.3656 789.25,52.6312 C788.0781,52.1312 787.6406,52.0219 786.6875,52.0219 C784.0156,52.0219 782,54.0375 782,56.6625 L782,57.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="801" y="61.206">Line</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="773" x2="830" y1="72.6" y2="72.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="773" x2="830" y1="80.6" y2="80.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="222"/>
+      <ellipse cx="321.5" cy="227" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <g id="elem_C_0000142374082478337852">
-        <rect codeLine="13" fill="#F1F1F1" height="64.7999" id="C_0000142374082478337852" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="143.5" y="351.9"/>
-        <ellipse cx="169.75" cy="367.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M164.75,369.0563 C164.75,371.5563 166.8906,373.3688 169.8125,373.3688 C171.0469,373.3688 172.2188,373.0719 172.9688,372.5563 C173.5781,372.1344 173.9063,371.7125 173.9063,371.3063 C173.9063,370.8375 173.4844,370.4313 172.9844,370.4313 C172.75,370.4313 172.5313,370.5094 172.3281,370.7125 C171.8906,371.15 171.8906,371.15 171.7188,371.2438 C171.2656,371.4781 170.625,371.6188 169.8594,371.6188 C167.8594,371.6188 166.5781,370.6031 166.5781,369.025 L166.5781,367.9781 C166.5781,366.275 167.7969,365.0719 169.5,365.0719 C170.0781,365.0719 170.6563,365.2125 171.125,365.4625 C171.5938,365.7281 171.7656,365.9156 171.8281,366.275 C171.9531,366.9469 172.2031,367.1969 172.7344,367.1969 C173.0156,367.1969 173.2969,367.0563 173.4844,366.8375 C173.6094,366.6656 173.6563,366.4938 173.6563,366.0563 L173.6563,364.6969 C173.6563,364.275 173.6406,364.1344 173.5156,363.9625 C173.3438,363.7125 173.0625,363.5563 172.7344,363.5563 C172.4219,363.5563 172.2188,363.6656 172,363.9313 C170.8281,363.4313 170.3906,363.3219 169.4375,363.3219 C166.7656,363.3219 164.75,365.3375 164.75,367.9625 L164.75,369.0563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="186.25" y="372.506">Line</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="232.5" y="348.9"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="233.5" y="363.1001">T&lt;&gt;...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="144.5" x2="260.5" y1="383.9" y2="383.9"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="149.5" y="392.8"/>
-          <ellipse cx="154.5" cy="397.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="163.5" y="400.9059">display() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="144.5" x2="260.5" y1="408.6999" y2="408.6999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="330.5" y="230.2104">~Shape() constexpr = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <g id="elem_C_0001833467466291294724">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001833467466291294724" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="60" x="951.5" y="40.6"/>
-        <ellipse cx="966.5" cy="56.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M961.5,57.7562 C961.5,60.2562 963.6406,62.0687 966.5625,62.0687 C967.7969,62.0687 968.9688,61.7719 969.7188,61.2562 C970.3281,60.8344 970.6563,60.4125 970.6563,60.0062 C970.6563,59.5375 970.2344,59.1312 969.7344,59.1312 C969.5,59.1312 969.2813,59.2094 969.0781,59.4125 C968.6406,59.85 968.6406,59.85 968.4688,59.9437 C968.0156,60.1781 967.375,60.3187 966.6094,60.3187 C964.6094,60.3187 963.3281,59.3031 963.3281,57.725 L963.3281,56.6781 C963.3281,54.975 964.5469,53.7719 966.25,53.7719 C966.8281,53.7719 967.4063,53.9125 967.875,54.1625 C968.3438,54.4281 968.5156,54.6156 968.5781,54.975 C968.7031,55.6469 968.9531,55.8969 969.4844,55.8969 C969.7656,55.8969 970.0469,55.7562 970.2344,55.5375 C970.3594,55.3656 970.4063,55.1937 970.4063,54.7562 L970.4063,53.3969 C970.4063,52.975 970.3906,52.8344 970.2656,52.6625 C970.0938,52.4125 969.8125,52.2562 969.4844,52.2562 C969.1719,52.2562 968.9688,52.3656 968.75,52.6312 C967.5781,52.1312 967.1406,52.0219 966.1875,52.0219 C963.5156,52.0219 961.5,54.0375 961.5,56.6625 L961.5,57.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="980.5" y="61.206">Text</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="952.5" x2="1010.5" y1="72.6" y2="72.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="952.5" x2="1010.5" y1="80.6" y2="80.6"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="311.5" x2="539.5" y1="236.8047" y2="236.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="242.8047"/>
+      <ellipse cx="321.5" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <g id="elem_C_0001114634647721878603">
-        <rect codeLine="22" fill="#F1F1F1" height="64.7999" id="C_0001114634647721878603" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="595.5" y="351.9"/>
-        <ellipse cx="621.3" cy="367.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M616.3,369.0563 C616.3,371.5563 618.4406,373.3688 621.3625,373.3688 C622.5969,373.3688 623.7688,373.0719 624.5188,372.5563 C625.1281,372.1344 625.4563,371.7125 625.4563,371.3063 C625.4563,370.8375 625.0344,370.4313 624.5344,370.4313 C624.3,370.4313 624.0813,370.5094 623.8781,370.7125 C623.4406,371.15 623.4406,371.15 623.2688,371.2438 C622.8156,371.4781 622.175,371.6188 621.4094,371.6188 C619.4094,371.6188 618.1281,370.6031 618.1281,369.025 L618.1281,367.9781 C618.1281,366.275 619.3469,365.0719 621.05,365.0719 C621.6281,365.0719 622.2063,365.2125 622.675,365.4625 C623.1438,365.7281 623.3156,365.9156 623.3781,366.275 C623.5031,366.9469 623.7531,367.1969 624.2844,367.1969 C624.5656,367.1969 624.8469,367.0563 625.0344,366.8375 C625.1594,366.6656 625.2063,366.4938 625.2063,366.0563 L625.2063,364.6969 C625.2063,364.275 625.1906,364.1344 625.0656,363.9625 C624.8938,363.7125 624.6125,363.5563 624.2844,363.5563 C623.9719,363.5563 623.7688,363.6656 623.55,363.9313 C622.3781,363.4313 621.9406,363.3219 620.9875,363.3219 C618.3156,363.3219 616.3,365.3375 616.3,367.9625 L616.3,369.0563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="637.7" y="372.506">Text</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="684.5" y="348.9"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="685.5" y="363.1001">T&lt;&gt;...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="596.5" x2="712.5" y1="383.9" y2="383.9"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="601.5" y="392.8"/>
-          <ellipse cx="606.5" cy="397.8" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="615.5" y="400.9059">display() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="596.5" x2="712.5" y1="408.6999" y2="408.6999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="330.5" y="251.0151">display() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <g id="elem_C_0002049188825706164566">
-        <rect codeLine="27" fill="#F1F1F1" height="66.8999" id="C_0002049188825706164566" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="142" x="1089.5" y="31.15"/>
-        <ellipse cx="1107.2" cy="47.15" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1108.7313,49.0875 L1109.0594,49.8844 L1108.7781,49.8844 C1108.325,49.8844 1108.2,49.9156 1108.0281,50.025 C1107.7469,50.1656 1107.575,50.4625 1107.575,50.7594 C1107.575,51.0562 1107.7156,51.3062 1107.95,51.4781 C1108.1219,51.6031 1108.3563,51.65 1108.7781,51.65 L1111.1375,51.65 C1111.4969,51.65 1111.7469,51.6187 1111.8875,51.525 C1112.1531,51.3844 1112.325,51.0719 1112.325,50.7594 C1112.325,50.4937 1112.1844,50.2281 1111.95,50.0562 C1111.7625,49.9312 1111.6063,49.9 1111.1531,49.8844 L1107.7625,42.0562 L1104.0438,42.0562 C1103.5906,42.0562 1103.45,42.0719 1103.2781,42.1812 C1103.0125,42.3531 1102.8406,42.6344 1102.8406,42.9312 C1102.8406,43.2125 1102.9813,43.4781 1103.2313,43.65 C1103.4031,43.775 1103.5906,43.8062 1104.0438,43.8062 L1105.0125,43.8062 L1102.4344,49.8844 C1101.6844,49.8844 1101.2781,50.1812 1101.2781,50.7594 C1101.2781,51.3687 1101.6688,51.65 1102.4656,51.65 L1104.7313,51.65 C1105.0906,51.65 1105.3406,51.6187 1105.4813,51.525 C1105.7469,51.3687 1105.9188,51.0719 1105.9188,50.7594 C1105.9188,50.4937 1105.7781,50.2281 1105.5438,50.0562 C1105.3563,49.9156 1105.2,49.8844 1104.7313,49.8844 L1104.4344,49.8844 L1104.7781,49.0875 L1108.7313,49.0875 Z M1107.9656,47.3375 L1105.5125,47.3375 L1106.7469,44.4625 L1107.9656,47.3375 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="104" x="1121.8" y="53.1">ShapeDecorator</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1090.5" x2="1230.5" y1="63.15" y2="63.15"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1095.5" y="73.1"/>
-          <ellipse cx="1100.5" cy="78.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="116" x="1109.5" y="82.5499">display() = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1090.5" x2="1230.5" y1="90.0499" y2="90.0499"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="257.6094" y2="257.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="764" y="33.5"/>
+      <ellipse cx="779" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M781.9688,55.1406 Q781.3906,55.4375 780.75,55.5781 Q780.1094,55.7344 779.4063,55.7344 Q776.9063,55.7344 775.5781,54.0938 Q774.2656,52.4375 774.2656,49.3125 Q774.2656,46.1875 775.5781,44.5313 Q776.9063,42.875 779.4063,42.875 Q780.1094,42.875 780.75,43.0313 Q781.4063,43.1875 781.9688,43.4844 L781.9688,46.2031 Q781.3438,45.625 780.75,45.3594 Q780.1563,45.0781 779.5313,45.0781 Q778.1875,45.0781 777.5,46.1563 Q776.8125,47.2188 776.8125,49.3125 Q776.8125,51.4063 777.5,52.4844 Q778.1875,53.5469 779.5313,53.5469 Q780.1563,53.5469 780.75,53.2813 Q781.3438,53 781.9688,52.4219 L781.9688,55.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="793" y="53.6543">Line</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="65.5" y2="65.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <g id="elem_C_0001473536569433029444">
-        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0001473536569433029444" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="1025.5" y="212.65"/>
-        <ellipse cx="1058.95" cy="228.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1053.95,229.8062 C1053.95,232.3062 1056.0906,234.1187 1059.0125,234.1187 C1060.2469,234.1187 1061.4188,233.8219 1062.1688,233.3062 C1062.7781,232.8844 1063.1063,232.4625 1063.1063,232.0562 C1063.1063,231.5875 1062.6844,231.1812 1062.1844,231.1812 C1061.95,231.1812 1061.7313,231.2594 1061.5281,231.4625 C1061.0906,231.9 1061.0906,231.9 1060.9188,231.9937 C1060.4656,232.2281 1059.825,232.3687 1059.0594,232.3687 C1057.0594,232.3687 1055.7781,231.3531 1055.7781,229.775 L1055.7781,228.7281 C1055.7781,227.025 1056.9969,225.8219 1058.7,225.8219 C1059.2781,225.8219 1059.8563,225.9625 1060.325,226.2125 C1060.7938,226.4781 1060.9656,226.6656 1061.0281,227.025 C1061.1531,227.6969 1061.4031,227.9469 1061.9344,227.9469 C1062.2156,227.9469 1062.4969,227.8062 1062.6844,227.5875 C1062.8094,227.4156 1062.8563,227.2437 1062.8563,226.8062 L1062.8563,225.4469 C1062.8563,225.025 1062.8406,224.8844 1062.7156,224.7125 C1062.5438,224.4625 1062.2625,224.3062 1061.9344,224.3062 C1061.6219,224.3062 1061.4188,224.4156 1061.2,224.6812 C1060.0281,224.1812 1059.5906,224.0719 1058.6375,224.0719 C1055.9656,224.0719 1053.95,226.0875 1053.95,228.7125 L1053.95,229.8062 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="1077.05" y="233.256">Color</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1137.5" y="209.65"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1138.5" y="223.8501">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1026.5" x2="1142.5" y1="244.65" y2="244.65"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1031.5" y="253.55"/>
-          <ellipse cx="1036.5" cy="258.55" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="1045.5" y="261.6559">display() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1026.5" x2="1142.5" y1="269.4499" y2="269.4499"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="327"/>
+      <ellipse cx="169.05" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M172.0188,348.6406 Q171.4406,348.9375 170.8,349.0781 Q170.1594,349.2344 169.4563,349.2344 Q166.9563,349.2344 165.6281,347.5938 Q164.3156,345.9375 164.3156,342.8125 Q164.3156,339.6875 165.6281,338.0313 Q166.9563,336.375 169.4563,336.375 Q170.1594,336.375 170.8,336.5313 Q171.4563,336.6875 172.0188,336.9844 L172.0188,339.7031 Q171.3938,339.125 170.8,338.8594 Q170.2063,338.5781 169.5813,338.5781 Q168.2375,338.5781 167.55,339.6563 Q166.8625,340.7188 166.8625,342.8125 Q166.8625,344.9063 167.55,345.9844 Q168.2375,347.0469 169.5813,347.0469 Q170.2063,347.0469 170.8,346.7813 Q171.3938,346.5 172.0188,345.9219 L172.0188,348.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="183.95" y="347.1543">Line</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="41" x="221" y="324"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="222" y="336.1387">T&lt;&gt;...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="359" y2="359"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <g id="elem_C_0002049455532387561338">
-        <rect codeLine="37" fill="#F1F1F1" height="64.7999" id="C_0002049455532387561338" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="1178.5" y="212.65"/>
-        <ellipse cx="1207.45" cy="228.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1202.45,229.8062 C1202.45,232.3062 1204.5906,234.1187 1207.5125,234.1187 C1208.7469,234.1187 1209.9188,233.8219 1210.6688,233.3062 C1211.2781,232.8844 1211.6063,232.4625 1211.6063,232.0562 C1211.6063,231.5875 1211.1844,231.1812 1210.6844,231.1812 C1210.45,231.1812 1210.2313,231.2594 1210.0281,231.4625 C1209.5906,231.9 1209.5906,231.9 1209.4188,231.9937 C1208.9656,232.2281 1208.325,232.3687 1207.5594,232.3687 C1205.5594,232.3687 1204.2781,231.3531 1204.2781,229.775 L1204.2781,228.7281 C1204.2781,227.025 1205.4969,225.8219 1207.2,225.8219 C1207.7781,225.8219 1208.3563,225.9625 1208.825,226.2125 C1209.2938,226.4781 1209.4656,226.6656 1209.5281,227.025 C1209.6531,227.6969 1209.9031,227.9469 1210.4344,227.9469 C1210.7156,227.9469 1210.9969,227.8062 1211.1844,227.5875 C1211.3094,227.4156 1211.3563,227.2437 1211.3563,226.8062 L1211.3563,225.4469 C1211.3563,225.025 1211.3406,224.8844 1211.2156,224.7125 C1211.0438,224.4625 1210.7625,224.3062 1210.4344,224.3062 C1210.1219,224.3062 1209.9188,224.4156 1209.7,224.6812 C1208.5281,224.1812 1208.0906,224.0719 1207.1375,224.0719 C1204.4656,224.0719 1202.45,226.0875 1202.45,228.7125 L1202.45,229.8062 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="1224.55" y="233.256">Weight</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1290.5" y="209.65"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1291.5" y="223.8501">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1179.5" x2="1295.5" y1="244.65" y2="244.65"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1184.5" y="253.55"/>
-          <ellipse cx="1189.5" cy="258.55" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="1198.5" y="261.6559">display() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1179.5" x2="1295.5" y1="269.4499" y2="269.4499"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="156" y="365"/>
+      <ellipse cx="161" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <g id="elem_C_0002082936326417164202">
-        <rect codeLine="42" fill="#F1F1F1" height="48" id="C_0002082936326417164202" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="135.5" y="221.05"/>
-        <ellipse cx="150.5" cy="237.05" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M145.5,238.2062 C145.5,240.7062 147.6406,242.5187 150.5625,242.5187 C151.7969,242.5187 152.9688,242.2219 153.7188,241.7062 C154.3281,241.2844 154.6563,240.8625 154.6563,240.4562 C154.6563,239.9875 154.2344,239.5812 153.7344,239.5812 C153.5,239.5812 153.2813,239.6594 153.0781,239.8625 C152.6406,240.3 152.6406,240.3 152.4688,240.3937 C152.0156,240.6281 151.375,240.7687 150.6094,240.7687 C148.6094,240.7687 147.3281,239.7531 147.3281,238.175 L147.3281,237.1281 C147.3281,235.425 148.5469,234.2219 150.25,234.2219 C150.8281,234.2219 151.4063,234.3625 151.875,234.6125 C152.3438,234.8781 152.5156,235.0656 152.5781,235.425 C152.7031,236.0969 152.9531,236.3469 153.4844,236.3469 C153.7656,236.3469 154.0469,236.2062 154.2344,235.9875 C154.3594,235.8156 154.4063,235.6437 154.4063,235.2062 L154.4063,233.8469 C154.4063,233.425 154.3906,233.2844 154.2656,233.1125 C154.0938,232.8625 153.8125,232.7062 153.4844,232.7062 C153.1719,232.7062 152.9688,232.8156 152.75,233.0812 C151.5781,232.5812 151.1406,232.4719 150.1875,232.4719 C147.5156,232.4719 145.5,234.4875 145.5,237.1125 L145.5,238.2062 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="164.5" y="241.656">Line</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="73" x="199.5" y="218.05"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="71" x="200.5" y="232.2501">Color,Weight</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="136.5" x2="268.5" y1="253.05" y2="253.05"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="136.5" x2="268.5" y1="261.05" y2="261.05"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="170" y="373.2104">display() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <g id="elem_C_0000675132943535054947">
-        <rect codeLine="46" fill="#F1F1F1" height="48" id="C_0000675132943535054947" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="7" y="221.05"/>
-        <ellipse cx="22" cy="237.05" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,238.2062 C17,240.7062 19.1406,242.5187 22.0625,242.5187 C23.2969,242.5187 24.4688,242.2219 25.2188,241.7062 C25.8281,241.2844 26.1563,240.8625 26.1563,240.4562 C26.1563,239.9875 25.7344,239.5812 25.2344,239.5812 C25,239.5812 24.7813,239.6594 24.5781,239.8625 C24.1406,240.3 24.1406,240.3 23.9688,240.3937 C23.5156,240.6281 22.875,240.7687 22.1094,240.7687 C20.1094,240.7687 18.8281,239.7531 18.8281,238.175 L18.8281,237.1281 C18.8281,235.425 20.0469,234.2219 21.75,234.2219 C22.3281,234.2219 22.9063,234.3625 23.375,234.6125 C23.8438,234.8781 24.0156,235.0656 24.0781,235.425 C24.2031,236.0969 24.4531,236.3469 24.9844,236.3469 C25.2656,236.3469 25.5469,236.2062 25.7344,235.9875 C25.8594,235.8156 25.9063,235.6437 25.9063,235.2062 L25.9063,233.8469 C25.9063,233.425 25.8906,233.2844 25.7656,233.1125 C25.5938,232.8625 25.3125,232.7062 24.9844,232.7062 C24.6719,232.7062 24.4688,232.8156 24.25,233.0812 C23.0781,232.5812 22.6406,232.4719 21.6875,232.4719 C19.0156,232.4719 17,234.4875 17,237.1125 L17,238.2062 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="36" y="241.656">Line</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="71" y="218.05"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="72" y="232.2501">Color</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="99" y1="253.05" y2="253.05"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="99" y1="261.05" y2="261.05"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="379.8047" y2="379.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="943.5" y="33.5"/>
+      <ellipse cx="958.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M961.4688,55.1406 Q960.8906,55.4375 960.25,55.5781 Q959.6094,55.7344 958.9063,55.7344 Q956.4063,55.7344 955.0781,54.0938 Q953.7656,52.4375 953.7656,49.3125 Q953.7656,46.1875 955.0781,44.5313 Q956.4063,42.875 958.9063,42.875 Q959.6094,42.875 960.25,43.0313 Q960.9063,43.1875 961.4688,43.4844 L961.4688,46.2031 Q960.8438,45.625 960.25,45.3594 Q959.6563,45.0781 959.0313,45.0781 Q957.6875,45.0781 957,46.1563 Q956.3125,47.2188 956.3125,49.3125 Q956.3125,51.4063 957,52.4844 Q957.6875,53.5469 959.0313,53.5469 Q959.6563,53.5469 960.25,53.2813 Q960.8438,53 961.4688,52.4219 L961.4688,55.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="972.5" y="53.6543">Text</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="65.5" y2="65.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <g id="elem_C_0001678874302644303776">
-        <rect codeLine="50" fill="#F1F1F1" height="48" id="C_0001678874302644303776" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="587" y="221.05"/>
-        <ellipse cx="602" cy="237.05" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M597,238.2062 C597,240.7062 599.1406,242.5187 602.0625,242.5187 C603.2969,242.5187 604.4688,242.2219 605.2188,241.7062 C605.8281,241.2844 606.1563,240.8625 606.1563,240.4562 C606.1563,239.9875 605.7344,239.5812 605.2344,239.5812 C605,239.5812 604.7813,239.6594 604.5781,239.8625 C604.1406,240.3 604.1406,240.3 603.9688,240.3937 C603.5156,240.6281 602.875,240.7687 602.1094,240.7687 C600.1094,240.7687 598.8281,239.7531 598.8281,238.175 L598.8281,237.1281 C598.8281,235.425 600.0469,234.2219 601.75,234.2219 C602.3281,234.2219 602.9063,234.3625 603.375,234.6125 C603.8438,234.8781 604.0156,235.0656 604.0781,235.425 C604.2031,236.0969 604.4531,236.3469 604.9844,236.3469 C605.2656,236.3469 605.5469,236.2062 605.7344,235.9875 C605.8594,235.8156 605.9063,235.6437 605.9063,235.2062 L605.9063,233.8469 C605.9063,233.425 605.8906,233.2844 605.7656,233.1125 C605.5938,232.8625 605.3125,232.7062 604.9844,232.7062 C604.6719,232.7062 604.4688,232.8156 604.25,233.0812 C603.0781,232.5812 602.6406,232.4719 601.6875,232.4719 C599.0156,232.4719 597,234.4875 597,237.1125 L597,238.2062 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="616" y="241.656">Text</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="73" x="652" y="218.05"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="71" x="653" y="232.2501">Color,Weight</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="588" x2="721" y1="253.05" y2="253.05"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="588" x2="721" y1="261.05" y2="261.05"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="592" y="327"/>
+      <ellipse cx="610.6" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M613.5688,348.6406 Q612.9906,348.9375 612.35,349.0781 Q611.7094,349.2344 611.0063,349.2344 Q608.5063,349.2344 607.1781,347.5938 Q605.8656,345.9375 605.8656,342.8125 Q605.8656,339.6875 607.1781,338.0313 Q608.5063,336.375 611.0063,336.375 Q611.7094,336.375 612.35,336.5313 Q613.0063,336.6875 613.5688,336.9844 L613.5688,339.7031 Q612.9438,339.125 612.35,338.8594 Q611.7563,338.5781 611.1313,338.5781 Q609.7875,338.5781 609.1,339.6563 Q608.4125,340.7188 608.4125,342.8125 Q608.4125,344.9063 609.1,345.9844 Q609.7875,347.0469 611.1313,347.0469 Q611.7563,347.0469 612.35,346.7813 Q612.9438,346.5 613.5688,345.9219 L613.5688,348.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="625.4" y="347.1543">Text</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="41" x="663" y="324"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="664" y="336.1387">T&lt;&gt;...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="359" y2="359"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <g id="elem_C_0001887786688778664182">
-        <rect codeLine="54" fill="#F1F1F1" height="48" id="C_0001887786688778664182" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="757.5" y="221.05"/>
-        <ellipse cx="772.5" cy="237.05" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M767.5,238.2062 C767.5,240.7062 769.6406,242.5187 772.5625,242.5187 C773.7969,242.5187 774.9688,242.2219 775.7188,241.7062 C776.3281,241.2844 776.6563,240.8625 776.6563,240.4562 C776.6563,239.9875 776.2344,239.5812 775.7344,239.5812 C775.5,239.5812 775.2813,239.6594 775.0781,239.8625 C774.6406,240.3 774.6406,240.3 774.4688,240.3937 C774.0156,240.6281 773.375,240.7687 772.6094,240.7687 C770.6094,240.7687 769.3281,239.7531 769.3281,238.175 L769.3281,237.1281 C769.3281,235.425 770.5469,234.2219 772.25,234.2219 C772.8281,234.2219 773.4063,234.3625 773.875,234.6125 C774.3438,234.8781 774.5156,235.0656 774.5781,235.425 C774.7031,236.0969 774.9531,236.3469 775.4844,236.3469 C775.7656,236.3469 776.0469,236.2062 776.2344,235.9875 C776.3594,235.8156 776.4063,235.6437 776.4063,235.2062 L776.4063,233.8469 C776.4063,233.425 776.3906,233.2844 776.2656,233.1125 C776.0938,232.8625 775.8125,232.7062 775.4844,232.7062 C775.1719,232.7062 774.9688,232.8156 774.75,233.0812 C773.5781,232.5812 773.1406,232.4719 772.1875,232.4719 C769.5156,232.4719 767.5,234.4875 767.5,237.1125 L767.5,238.2062 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="786.5" y="241.656">Text</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="822.5" y="218.05"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="823.5" y="232.2501">Color</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="758.5" x2="850.5" y1="253.05" y2="253.05"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="758.5" x2="850.5" y1="261.05" y2="261.05"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598" y="365"/>
+      <ellipse cx="603" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <g id="elem_C_0001373544984027721472">
-        <rect codeLine="58" fill="#F1F1F1" height="115.1997" id="C_0001373544984027721472" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="205" x="359" y="7"/>
-        <ellipse cx="432.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M427.25,24.1563 C427.25,26.6563 429.3906,28.4688 432.3125,28.4688 C433.5469,28.4688 434.7188,28.1719 435.4688,27.6563 C436.0781,27.2344 436.4063,26.8125 436.4063,26.4063 C436.4063,25.9375 435.9844,25.5313 435.4844,25.5313 C435.25,25.5313 435.0313,25.6094 434.8281,25.8125 C434.3906,26.25 434.3906,26.25 434.2188,26.3438 C433.7656,26.5781 433.125,26.7188 432.3594,26.7188 C430.3594,26.7188 429.0781,25.7031 429.0781,24.125 L429.0781,23.0781 C429.0781,21.375 430.2969,20.1719 432,20.1719 C432.5781,20.1719 433.1563,20.3125 433.625,20.5625 C434.0938,20.8281 434.2656,21.0156 434.3281,21.375 C434.4531,22.0469 434.7031,22.2969 435.2344,22.2969 C435.5156,22.2969 435.7969,22.1563 435.9844,21.9375 C436.1094,21.7656 436.1563,21.5938 436.1563,21.1563 L436.1563,19.7969 C436.1563,19.375 436.1406,19.2344 436.0156,19.0625 C435.8438,18.8125 435.5625,18.6563 435.2344,18.6563 C434.9219,18.6563 434.7188,18.7656 434.5,19.0313 C433.3281,18.5313 432.8906,18.4219 431.9375,18.4219 C429.2656,18.4219 427.25,20.4375 427.25,23.0625 L427.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="452.75" y="27.606">Window</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="360" x2="563" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="360" x2="563" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="365" y="55.9"/>
-          <ellipse cx="370" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="179" x="379" y="64.0059">border : Line&lt;Color,Weight&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="365" y="72.6999"/>
-          <ellipse cx="370" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="379" y="80.8059">description : Text&lt;Color&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="365" y="89.4998"/>
-          <ellipse cx="370" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="379" y="97.6058">divider : Line&lt;Color&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="365" y="106.2997"/>
-          <ellipse cx="370" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="379" y="114.4057">title : Text&lt;Color,Weight&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="612" y="373.2104">display() : void</text>
     </a>
-    <g id="link_C_0001593092483959332221_C_0000142374082478337852">
-      <path codeLine="65" d="M338.4856,300.7146 C306.0856,320.3946 284.3,333.62 254.89,351.48 " fill="none" id="C_0001593092483959332221-backto-C_0000142374082478337852" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="353.87,291.37,335.3708,295.5865,341.6005,305.8427,353.87,291.37" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001593092483959332221_C_0001114634647721878603">
-      <path codeLine="66" d="M518.5144,300.7146 C550.9144,320.3946 572.7,333.62 602.11,351.48 " fill="none" id="C_0001593092483959332221-backto-C_0001114634647721878603" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="503.13,291.37,515.3995,305.8427,521.6292,295.5865,503.13,291.37" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002049188825706164566_C_0001473536569433029444">
-      <path codeLine="67" d="M1139.5076,114.8909 C1125.6676,147.3909 1111.64,180.32 1097.97,212.43 " fill="none" id="C_0002049188825706164566-backto-C_0001473536569433029444" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="1146.56,98.33,1133.9873,112.5401,1145.0279,117.2417,1146.56,98.33" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002049188825706164566_C_0002049455532387561338">
-      <path codeLine="68" d="M1181.7541,114.8559 C1195.7841,147.3559 1210,180.32 1223.85,212.43 " fill="none" id="C_0002049188825706164566-backto-C_0002049455532387561338" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="1174.62,98.33,1176.2455,117.2339,1187.2627,112.4778,1174.62,98.33" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002082936326417164202_C_0000142374082478337852">
-      <path codeLine="69" d="M202.5,269.33 C202.5,291.97 202.5,308.52 202.5,333.65 " fill="none" id="C_0002082936326417164202-to-C_0000142374082478337852" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="202.5,351.65,208.5,333.65,196.5,333.65,202.5,351.65" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000675132943535054947_C_0000142374082478337852">
-      <path codeLine="70" d="M78.78,269.33 C103.35,291.97 127.6211,314.3245 154.9011,339.4545 " fill="none" id="C_0000675132943535054947-to-C_0000142374082478337852" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="168.14,351.65,158.9663,335.0415,150.8359,343.8674,168.14,351.65" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001678874302644303776_C_0001114634647721878603">
-      <path codeLine="71" d="M654.5,269.33 C654.5,291.97 654.5,308.52 654.5,333.65 " fill="none" id="C_0001678874302644303776-to-C_0001114634647721878603" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="654.5,351.65,660.5,333.65,648.5,333.65,654.5,351.65" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001887786688778664182_C_0001114634647721878603">
-      <path codeLine="72" d="M779.05,269.33 C754.31,291.97 729.8288,314.3679 702.3688,339.4979 " fill="none" id="C_0001887786688778664182-to-C_0001114634647721878603" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="689.09,351.65,706.4195,343.9242,698.3181,335.0716,689.09,351.65" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001373544984027721472_C_0002082936326417164202">
-      <path codeLine="73" d="M368.9593,129.3596 C320.6993,162.6196 272.28,195.97 236.3,220.76 " fill="none" id="C_0001373544984027721472-backto-C_0002082936326417164202" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="378.84,122.55,371.6298,122.6612,368.9593,129.3596,376.1695,129.2484,378.84,122.55" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="338.5" cy="161.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="345.5" y="165.277">border</text>
-    </g>
-    <g id="link_C_0001373544984027721472_C_0000675132943535054947">
-      <path codeLine="74" d="M347.237,102.5563 C277.637,126.5863 195.99,158.1 118.5,199.2 C106.87,205.37 94.83,213.22 84.31,220.62 " fill="none" id="C_0001373544984027721472-backto-C_0000675132943535054947" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="358.58,98.64,351.6031,96.8171,347.237,102.5563,354.2139,104.3791,358.58,98.64" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="216.5" cy="161.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="38" x="223.5" y="165.277">divider</text>
-    </g>
-    <g id="link_C_0001373544984027721472_C_0001678874302644303776">
-      <path codeLine="75" d="M531.9096,130.6981 C567.8696,163.9581 602.5,195.97 629.31,220.76 " fill="none" id="C_0001373544984027721472-backto-C_0001678874302644303776" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="523.1,122.55,524.7887,129.5606,531.9096,130.6981,530.2208,123.6875,523.1,122.55" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="576.5" cy="161.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="583.5" y="165.277">title</text>
-    </g>
-    <g id="link_C_0001373544984027721472_C_0001887786688778664182">
-      <path codeLine="76" d="M575.3942,115.418 C628.6742,139.768 683.23,166.54 739.5,199.2 C750.65,205.67 762.37,213.44 772.75,220.67 " fill="none" id="C_0001373544984027721472-backto-C_0001887786688778664182" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="564.48,110.43,568.2744,116.5621,575.3942,115.418,571.5998,109.2859,564.48,110.43" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="686.5" cy="161.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="693.5" y="165.277">description</text>
-    </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="379.8047" y2="379.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1081" y="27"/>
+      <ellipse cx="1096" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1096.1094,38.3438 L1094.9531,43.4219 L1097.2813,43.4219 L1096.1094,38.3438 Z M1094.625,36.1094 L1097.6094,36.1094 L1100.9688,48.5 L1098.5156,48.5 L1097.75,45.4375 L1094.4688,45.4375 L1093.7188,48.5 L1091.2813,48.5 L1094.625,36.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1110" y="47.1543">ShapeDecorator</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="59" y2="59"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1087" y="65"/>
+      <ellipse cx="1092" cy="70" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="1101" y="73.2104">display() = 0 : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="79.8047" y2="79.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1022" y="194.5"/>
+      <ellipse cx="1052.3" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1055.2688,216.1406 Q1054.6906,216.4375 1054.05,216.5781 Q1053.4094,216.7344 1052.7063,216.7344 Q1050.2063,216.7344 1048.8781,215.0938 Q1047.5656,213.4375 1047.5656,210.3125 Q1047.5656,207.1875 1048.8781,205.5313 Q1050.2063,203.875 1052.7063,203.875 Q1053.4094,203.875 1054.05,204.0313 Q1054.7063,204.1875 1055.2688,204.4844 L1055.2688,207.2031 Q1054.6438,206.625 1054.05,206.3594 Q1053.4563,206.0781 1052.8313,206.0781 Q1051.4875,206.0781 1050.8,207.1563 Q1050.1125,208.2188 1050.1125,210.3125 Q1050.1125,212.4063 1050.8,213.4844 Q1051.4875,214.5469 1052.8313,214.5469 Q1053.4563,214.5469 1054.05,214.2813 Q1054.6438,214 1055.2688,213.4219 L1055.2688,216.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1069.7" y="214.6543">Color</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1125" y="191.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1126" y="203.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="226.5" y2="226.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1028" y="232.5"/>
+      <ellipse cx="1033" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1042" y="240.7104">display() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="247.3047" y2="247.3047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1166" y="194.5"/>
+      <ellipse cx="1191.35" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1194.3188,216.1406 Q1193.7406,216.4375 1193.1,216.5781 Q1192.4594,216.7344 1191.7563,216.7344 Q1189.2563,216.7344 1187.9281,215.0938 Q1186.6156,213.4375 1186.6156,210.3125 Q1186.6156,207.1875 1187.9281,205.5313 Q1189.2563,203.875 1191.7563,203.875 Q1192.4594,203.875 1193.1,204.0313 Q1193.7563,204.1875 1194.3188,204.4844 L1194.3188,207.2031 Q1193.6938,206.625 1193.1,206.3594 Q1192.5063,206.0781 1191.8813,206.0781 Q1190.5375,206.0781 1189.85,207.1563 Q1189.1625,208.2188 1189.1625,210.3125 Q1189.1625,212.4063 1189.85,213.4844 Q1190.5375,214.5469 1191.8813,214.5469 Q1192.5063,214.5469 1193.1,214.2813 Q1193.6938,214 1194.3188,213.4219 L1194.3188,216.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1207.65" y="214.6543">Weight</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1269" y="191.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1270" y="203.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="226.5" y2="226.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1172" y="232.5"/>
+      <ellipse cx="1177" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1186" y="240.7104">display() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="247.3047" y2="247.3047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="201"/>
+      <ellipse cx="149" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M151.9688,222.6406 Q151.3906,222.9375 150.75,223.0781 Q150.1094,223.2344 149.4063,223.2344 Q146.9063,223.2344 145.5781,221.5938 Q144.2656,219.9375 144.2656,216.8125 Q144.2656,213.6875 145.5781,212.0313 Q146.9063,210.375 149.4063,210.375 Q150.1094,210.375 150.75,210.5313 Q151.4063,210.6875 151.9688,210.9844 L151.9688,213.7031 Q151.3438,213.125 150.75,212.8594 Q150.1563,212.5781 149.5313,212.5781 Q148.1875,212.5781 147.5,213.6563 Q146.8125,214.7188 146.8125,216.8125 Q146.8125,218.9063 147.5,219.9844 Q148.1875,221.0469 149.5313,221.0469 Q150.1563,221.0469 150.75,220.7813 Q151.3438,220.5 151.9688,219.9219 L151.9688,222.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="221.1543">Line</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="196" y="198"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="197" y="210.1387">Color,Weight</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="233" y2="233"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="241" y2="241"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="201"/>
+      <ellipse cx="21" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,222.6406 Q23.3906,222.9375 22.75,223.0781 Q22.1094,223.2344 21.4063,223.2344 Q18.9063,223.2344 17.5781,221.5938 Q16.2656,219.9375 16.2656,216.8125 Q16.2656,213.6875 17.5781,212.0313 Q18.9063,210.375 21.4063,210.375 Q22.1094,210.375 22.75,210.5313 Q23.4063,210.6875 23.9688,210.9844 L23.9688,213.7031 Q23.3438,213.125 22.75,212.8594 Q22.1563,212.5781 21.5313,212.5781 Q20.1875,212.5781 19.5,213.6563 Q18.8125,214.7188 18.8125,216.8125 Q18.8125,218.9063 19.5,219.9844 Q20.1875,221.0469 21.5313,221.0469 Q22.1563,221.0469 22.75,220.7813 Q23.3438,220.5 23.9688,219.9219 L23.9688,222.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="221.1543">Line</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="68" y="198"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="69" y="210.1387">Color</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="233" y2="233"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="241" y2="241"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="575.5" y="201"/>
+      <ellipse cx="590.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M593.4688,222.6406 Q592.8906,222.9375 592.25,223.0781 Q591.6094,223.2344 590.9063,223.2344 Q588.4063,223.2344 587.0781,221.5938 Q585.7656,219.9375 585.7656,216.8125 Q585.7656,213.6875 587.0781,212.0313 Q588.4063,210.375 590.9063,210.375 Q591.6094,210.375 592.25,210.5313 Q592.9063,210.6875 593.4688,210.9844 L593.4688,213.7031 Q592.8438,213.125 592.25,212.8594 Q591.6563,212.5781 591.0313,212.5781 Q589.6875,212.5781 589,213.6563 Q588.3125,214.7188 588.3125,216.8125 Q588.3125,218.9063 589,219.9844 Q589.6875,221.0469 591.0313,221.0469 Q591.6563,221.0469 592.25,220.7813 Q592.8438,220.5 593.4688,219.9219 L593.4688,222.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="604.5" y="221.1543">Text</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="638.5" y="198"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="639.5" y="210.1387">Color,Weight</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="233" y2="233"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="241" y2="241"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="752.5" y="201"/>
+      <ellipse cx="767.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M770.4688,222.6406 Q769.8906,222.9375 769.25,223.0781 Q768.6094,223.2344 767.9063,223.2344 Q765.4063,223.2344 764.0781,221.5938 Q762.7656,219.9375 762.7656,216.8125 Q762.7656,213.6875 764.0781,212.0313 Q765.4063,210.375 767.9063,210.375 Q768.6094,210.375 769.25,210.5313 Q769.9063,210.6875 770.4688,210.9844 L770.4688,213.7031 Q769.8438,213.125 769.25,212.8594 Q768.6563,212.5781 768.0313,212.5781 Q766.6875,212.5781 766,213.6563 Q765.3125,214.7188 765.3125,216.8125 Q765.3125,218.9063 766,219.9844 Q766.6875,221.0469 768.0313,221.0469 Q768.6563,221.0469 769.25,220.7813 Q769.8438,220.5 770.4688,219.9219 L770.4688,222.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="781.5" y="221.1543">Text</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="815.5" y="198"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="816.5" y="210.1387">Color</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="233" y2="233"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="241" y2="241"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="366.5" y="8"/>
+      <ellipse cx="432.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M435.7188,29.6406 Q435.1406,29.9375 434.5,30.0781 Q433.8594,30.2344 433.1563,30.2344 Q430.6563,30.2344 429.3281,28.5938 Q428.0156,26.9375 428.0156,23.8125 Q428.0156,20.6875 429.3281,19.0313 Q430.6563,17.375 433.1563,17.375 Q433.8594,17.375 434.5,17.5313 Q435.1563,17.6875 435.7188,17.9844 L435.7188,20.7031 Q435.0938,20.125 434.5,19.8594 Q433.9063,19.5781 433.2813,19.5781 Q431.9375,19.5781 431.25,20.6563 Q430.5625,21.7188 430.5625,23.8125 Q430.5625,25.9063 431.25,26.9844 Q431.9375,28.0469 433.2813,28.0469 Q433.9063,28.0469 434.5,27.7813 Q435.0938,27.5 435.7188,26.9219 L435.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="453.25" y="28.1543">Window</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="54"/>
+      <ellipse cx="377.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="386.5" y="62.2104">border : Line&lt;Color,Weight&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="66.8047"/>
+      <ellipse cx="377.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="386.5" y="75.0151">description : Text&lt;Color&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="79.6094"/>
+      <ellipse cx="377.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="386.5" y="87.8198">divider : Line&lt;Color&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="92.4141"/>
+      <ellipse cx="377.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="386.5" y="100.6245">title : Text&lt;Color,Weight&gt;</text>
+    </a>
+    <path d="M340.09,276.44 C311.19,293.5 279.87,311.99 254.63,326.9 " fill="none" id="C_0001593092483959332221&lt;-C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="336.91,270.18,357.69,266.04,344.03,282.24,336.91,270.18" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M510.91,276.44 C539.81,293.5 571.13,311.99 596.37,326.9 " fill="none" id="C_0001593092483959332221&lt;-C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="506.97,282.24,493.31,266.04,514.09,270.18,506.97,282.24" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1127.63,106.48 C1115.27,134.89 1100,169.98 1089.38,194.39 " fill="none" id="C_0002049188825706164566&lt;-C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="1121.23,103.64,1135.63,88.09,1134.07,109.22,1121.23,103.64" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1169.37,106.48 C1181.73,134.89 1197,169.98 1207.62,194.39 " fill="none" id="C_0002049188825706164566&lt;-C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="1162.93,109.22,1161.37,88.09,1175.77,103.64,1162.93,109.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M204.5,249.03 C204.5,265.02 204.5,286.94 204.5,306.81 " fill="none" id="C_0002082936326417164202-&gt;C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="211.5,306.82,204.5,326.82,197.5,306.82,211.5,306.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M79.32,249.03 C100.12,266.88 129.52,292.12 154.6,313.66 " fill="none" id="C_0000675132943535054947-&gt;C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="159.32,308.48,169.93,326.82,150.2,319.1,159.32,308.48" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M646.5,249.03 C646.5,265.02 646.5,286.94 646.5,306.81 " fill="none" id="C_0001678874302644303776-&gt;C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="653.5,306.82,646.5,326.82,639.5,306.82,653.5,306.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M772.5,249.03 C751.57,266.88 721.98,292.12 696.73,313.66 " fill="none" id="C_0001887786688778664182-&gt;C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="701.06,319.17,681.3,326.82,691.97,308.52,701.06,319.17" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M374.27,114.25 C328.47,143.86 274.65,178.65 240.08,201 " fill="none" id="C_0001373544984027721472&lt;-C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="385.42,107.04,378.2097,106.9346,375.3392,113.5497,382.5495,113.6551,385.42,107.04" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="338.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="345.5" y="150.0669">border</text>
+    <path d="M353.7,91.06 C284.55,113.69 193.4,146.45 116.5,184 C106.49,188.89 96.07,194.94 86.62,200.84 " fill="none" id="C_0001373544984027721472&lt;-C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="366.35,86.96,359.4084,85.0071,354.9358,90.6637,361.8775,92.6166,366.35,86.96" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="224.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="231.5" y="150.0669">divider</text>
+    <path d="M525.06,115.94 C557.91,145.18 596.01,179.08 620.65,201 " fill="none" id="C_0001373544984027721472&lt;-C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="515.05,107.04,516.8738,114.0167,524.0153,115.0165,522.1915,108.0398,515.05,107.04" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="571.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="578.5" y="150.0669">title</text>
+    <path d="M566.91,103.61 C618.27,126.3 680.35,155.07 734.5,184 C744.2,189.18 754.44,195.21 763.86,200.99 " fill="none" id="C_0001373544984027721472&lt;-C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="554.77,98.28,558.648,104.3596,565.7514,103.1182,561.8734,97.0386,554.77,98.28" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="674.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="681.5" y="150.0669">description</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00027_class_mermaid.svg b/docs/test_cases/t00027_class_mermaid.svg
index 3d24f677..c6ff8433 100644
--- a/docs/test_cases/t00027_class_mermaid.svg
+++ b/docs/test_cases/t00027_class_mermaid.svg
@@ -1,72 +1,67 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1410.40625 481" style="max-width: 1410.41px; background-color: white;" width="1410.40625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1383.734375 481" style="max-width: 1383.73px; background-color: white;" width="1383.734375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M137.51051644471434,361.880907753221L137.37334703726194,363.06742312768415C137.23617762980956,364.2539385021473,136.96183881490478,366.62696925107366,234.44966940745238,377.44244346909454C331.9375,388.2579176871154,527.1875,407.5158353742309,624.8125,417.1447942177886L722.4375,426.7737530613464"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M302.7206011993314,325.76296867160823L328.7105270411095,332.9691405596735C354.70045288288765,340.1753124477388,406.6803045664438,354.5876562238694,538.7529126998885,371.50351514249434C670.8255208333334,388.4193740611194,882.9908854166666,407.83874812223877,989.0735677083334,417.54843515279845L1095.15625,427.2581221833582"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M440.72077475584746,144.5458880483098L434.52903104653956,151.62157337359147C428.33728733723166,158.69725869887318,415.95379991861586,172.84862934943658,409.7620562093079,189.25764800805163C403.5703125,205.66666666666666,403.5703125,224.33333333333334,403.5703125,233.66666666666666L403.5703125,243"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M552.8104752441526,144.5458880483098L559.0022189534606,151.62157337359147C565.1939626627684,158.69725869887318,577.5774500813842,172.84862934943658,583.7691937906922,189.25764800805163C589.9609375,205.66666666666666,589.9609375,224.33333333333334,589.9609375,233.66666666666666L589.9609375,243"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M790.6328125,311L790.6328125,320.6666666666667C790.6328125,330.3333333333333,790.6328125,349.6666666666667,790.6328125,360.5C790.6328125,371.3333333333333,790.6328125,373.6666666666667,790.6328125,374.8333333333333L790.6328125,376"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M977.2890625,311L977.2890625,320.6666666666667C977.2890625,330.3333333333333,977.2890625,349.6666666666667,960.3810556163503,365.1759796095518C943.4730487327006,380.685292552437,909.6570349654012,392.37058510487395,892.7490280817515,398.2132313810924L875.8410211981018,404.0558776573109"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1163.3515625,311L1163.3515625,320.6666666666667C1163.3515625,330.3333333333333,1163.3515625,349.6666666666667,1163.3515625,360.5C1163.3515625,371.3333333333333,1163.3515625,373.6666666666667,1163.3515625,374.8333333333333L1163.3515625,376"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1348.8203125,311L1348.8203125,320.6666666666667C1348.8203125,330.3333333333333,1348.8203125,349.6666666666667,1332.1082814965011,365.14523425856027C1315.396250493002,380.62380185045384,1281.9721884860044,392.24760370090763,1265.2601574825055,398.05950462613464L1248.5481264790064,403.87140555136153"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M941.412643169267,129.5857359864959L916.2826713910558,139.15477998874658C891.1526996128447,148.72382399099726,840.8927560564224,167.86191199549864,815.7627842782111,188.59762266441598C790.6328125,209.33333333333334,790.6328125,231.66666666666666,790.6328125,242.83333333333334L790.6328125,254"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M995.1473655021362,166.5562322367215L992.1709816684469,169.9635268639346C989.1945978347575,173.37082149114767,983.2418301673788,180.18541074557382,980.2654463336894,194.75937203945355C977.2890625,209.33333333333334,977.2890625,231.66666666666666,977.2890625,242.83333333333334L977.2890625,254"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M1145.4932594978638,166.5562322367215L1148.4696433315532,169.9635268639346C1151.4460271652426,173.37082149114767,1157.3987948326212,180.18541074557382,1160.3751786663106,194.75937203945355C1163.3515625,209.33333333333334,1163.3515625,231.66666666666666,1163.3515625,242.83333333333334L1163.3515625,254"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M1199.218886861951,129.79155536641932L1224.1524578016258,139.32629613868275C1249.0860287413007,148.8610369109462,1298.9531706206503,167.9305184554731,1323.8867415603252,188.63192589440322C1348.8203125,209.33333333333334,1348.8203125,231.66666666666666,1348.8203125,242.83333333333334L1348.8203125,254"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M135.13236091040463,344L134.65066534200386,348.1666666666667C134.1689697736031,352.3333333333333,133.20557863680153,360.6666666666667,227.3853414017341,374.4984953417429C321.5651041666667,388.33032401681913,510.8880208333333,407.6606480336384,605.5494791666666,417.325810042048L700.2109375,426.9909720504576"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M276.484375,321.0959361204882L304.25390625,329.0799467670735C332.0234375,337.0639574136588,387.5625,353.0319787068294,520.3033854166666,370.7779067203299C653.0442708333334,388.5238347338304,862.9869791666666,408.04766946766085,967.9583333333334,417.80958683457607L1072.9296875,427.57150420149134"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M436.9010416666667,131L429.1232638888889,140.33333333333334C421.34548611111114,149.66666666666666,405.7899305555556,168.33333333333334,398.0121527777778,187C390.234375,205.66666666666666,390.234375,224.33333333333334,390.234375,233.66666666666666L390.234375,243"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M521.0677083333334,131L528.8454861111112,140.33333333333334C536.6232638888889,149.66666666666666,552.1788194444445,168.33333333333334,559.9565972222223,187C567.734375,205.66666666666666,567.734375,224.33333333333334,567.734375,233.66666666666666L567.734375,243"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M763.9609375,311L763.9609375,320.6666666666667C763.9609375,330.3333333333333,763.9609375,349.6666666666667,763.9609375,363.5C763.9609375,377.3333333333333,763.9609375,385.6666666666667,763.9609375,389.8333333333333L763.9609375,394"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M950.6171875,311L950.6171875,320.6666666666667C950.6171875,330.3333333333333,950.6171875,349.6666666666667,930.1328125,366.4118114850159C909.6484375,383.1569563033651,868.6796875,397.3139126067303,848.1953125,404.39239075841283L827.7109375,411.4708689100954"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1136.6796875,311L1136.6796875,320.6666666666667C1136.6796875,330.3333333333333,1136.6796875,349.6666666666667,1136.6796875,363.5C1136.6796875,377.3333333333333,1136.6796875,385.6666666666667,1136.6796875,389.8333333333333L1136.6796875,394"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1322.1484375,311L1322.1484375,320.6666666666667C1322.1484375,330.3333333333333,1322.1484375,349.6666666666667,1301.8619791666667,366.3883038472339C1281.5755208333333,383.10994102780114,1241.0026041666667,397.21988205560234,1220.7161458333333,404.2748525695029L1200.4296875,411.32982308340354"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M931.5625,123.18032122905028L903.62890625,133.8169343575419C875.6953125,144.4535474860335,819.828125,165.72677374301676,791.89453125,187.53005353817503C763.9609375,209.33333333333334,763.9609375,231.66666666666666,763.9609375,242.83333333333334L763.9609375,254"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M980.317304870892,153L975.3672853090767,158.66666666666666C970.4172657472614,164.33333333333334,960.5172266236308,175.66666666666666,955.5672070618153,192.5C950.6171875,209.33333333333334,950.6171875,231.66666666666666,950.6171875,242.83333333333334L950.6171875,254"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M1106.979570129108,153L1111.9295896909232,158.66666666666666C1116.8796092527386,164.33333333333334,1126.7796483763693,175.66666666666666,1131.7296679381845,192.5C1136.6796875,209.33333333333334,1136.6796875,231.66666666666666,1136.6796875,242.83333333333334L1136.6796875,254"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M1155.734375,123.36230644075404L1183.4700520833333,133.96858870062837C1211.2057291666667,144.5748709605027,1266.6770833333333,165.78743548025133,1294.4127604166667,187.56038440679234C1322.1484375,209.33333333333334,1322.1484375,231.66666666666666,1322.1484375,242.83333333333334L1322.1484375,254"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -149,7 +144,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(790.6328125, 187)" class="edgeLabel">
+        <g transform="translate(763.9609375, 187)" class="edgeLabel">
           <g transform="translate(-27.796875, -9)" class="label">
             <foreignObject height="18" width="55.59375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -160,7 +155,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(977.2890625, 187)" class="edgeLabel">
+        <g transform="translate(950.6171875, 187)" class="edgeLabel">
           <g transform="translate(-28.2421875, -9)" class="label">
             <foreignObject height="18" width="56.484375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -171,7 +166,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1163.3515625, 187)" class="edgeLabel">
+        <g transform="translate(1136.6796875, 187)" class="edgeLabel">
           <g transform="translate(-17.125, -9)" class="label">
             <foreignObject height="18" width="34.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -182,7 +177,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1348.8203125, 187)" class="edgeLabel">
+        <g transform="translate(1322.1484375, 187)" class="edgeLabel">
           <g transform="translate(-43.359375, -9)" class="label">
             <foreignObject height="18" width="86.71875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -195,11 +190,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(146.6875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L8">
+        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L8">
           <g title="Shape" id="classId-C_0001593092483959332221-0" class="node default clickable">
-            <rect height="123" width="277.375" y="-61.5" x="-138.6875" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="138.6875" x1="-138.6875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="138.6875" x1="-138.6875" class="divider"/>
+            <rect height="123" width="268.484375" y="-61.5" x="-134.2421875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -211,20 +206,20 @@
                   <span class="nodeLabel">Shape</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -131.1875, 14)" height="18" width="262.375">
+              <foreignObject transform="translate( -126.7421875, 14)" height="18" width="253.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~Shape() : : [default,constexpr] void</span>
+                  <span class="nodeLabel">+~Shape() : [default,constexpr] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -131.1875, 36)" height="18" width="121.390625">
+              <foreignObject transform="translate( -126.7421875, 36)" height="18" width="112.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+display() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+display() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(256.8046875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15">
+        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0001568932879061562228-1" class="node default clickable">
             <rect height="57" width="47.890625" y="-28.5" x="-23.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.9453125" x1="-23.9453125" class="divider"/>
@@ -243,11 +238,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(790.6328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15">
+        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000142374082478337852-2" class="node default clickable">
-            <rect height="79" width="136.390625" y="-39.5" x="-68.1953125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
+            <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -259,15 +254,15 @@
                   <span class="nodeLabel">Line&lt;T&lt;&gt;...&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.6953125, 14)" height="18" width="121.390625">
+              <foreignObject transform="translate( -56.25, 14)" height="18" width="112.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+display() : : void</span>
+                  <span class="nodeLabel">+display() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(354.109375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25">
+        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001833467466291294724-3" class="node default clickable">
             <rect height="57" width="46.71875" y="-28.5" x="-23.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.359375" x1="-23.359375" class="divider"/>
@@ -286,11 +281,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1163.3515625, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001114634647721878603-4" class="node default clickable">
-            <rect height="79" width="136.390625" y="-39.5" x="-68.1953125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
+            <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -302,15 +297,15 @@
                   <span class="nodeLabel">Text&lt;T&lt;&gt;...&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.6953125, 14)" height="18" width="121.390625">
+              <foreignObject transform="translate( -56.25, 14)" height="18" width="112.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+display() : : void</span>
+                  <span class="nodeLabel">+display() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(496.765625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L34">
+        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L34">
           <g title="ShapeDecorator" id="classId-C_0002049188825706164566-5" class="node default clickable">
             <rect height="101" width="138.59375" y="-50.5" x="-69.296875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="69.296875" x1="-69.296875" class="divider"/>
@@ -326,19 +321,19 @@
                   <span class="nodeLabel">ShapeDecorator</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -61.796875, 25)" height="18" width="121.390625">
+              <foreignObject transform="translate( -61.796875, 25)" height="18" width="112.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+display() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+display() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(403.5703125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L38">
+        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L38">
           <g title="Color" id="classId-C_0001473536569433029444-6" class="node default clickable">
-            <rect height="79" width="136.390625" y="-39.5" x="-68.1953125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
+            <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -350,19 +345,19 @@
                   <span class="nodeLabel">Color&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.6953125, 14)" height="18" width="121.390625">
+              <foreignObject transform="translate( -56.25, 14)" height="18" width="112.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+display() : : void</span>
+                  <span class="nodeLabel">+display() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(589.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L43">
+        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L43">
           <g title="Weight" id="classId-C_0002049455532387561338-7" class="node default clickable">
-            <rect height="79" width="136.390625" y="-39.5" x="-68.1953125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="68.1953125" x1="-68.1953125" class="divider"/>
+            <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -374,15 +369,15 @@
                   <span class="nodeLabel">Weight&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.6953125, 14)" height="18" width="121.390625">
+              <foreignObject transform="translate( -56.25, 14)" height="18" width="112.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+display() : : void</span>
+                  <span class="nodeLabel">+display() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(790.6328125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15">
+        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0002082936326417164202-8" class="node default clickable">
             <rect height="57" width="164.953125" y="-28.5" x="-82.4765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.4765625" x1="-82.4765625" class="divider"/>
@@ -401,7 +396,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(977.2890625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L15">
+        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000675132943535054947-9" class="node default clickable">
             <rect height="57" width="108.359375" y="-28.5" x="-54.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="54.1796875" x1="-54.1796875" class="divider"/>
@@ -420,7 +415,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1163.3515625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001678874302644303776-10" class="node default clickable">
             <rect height="57" width="163.765625" y="-28.5" x="-81.8828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.8828125" x1="-81.8828125" class="divider"/>
@@ -439,7 +434,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1348.8203125, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001887786688778664182-11" class="node default clickable">
             <rect height="57" width="107.171875" y="-28.5" x="-53.5859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="53.5859375" x1="-53.5859375" class="divider"/>
@@ -458,7 +453,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1070.3203125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00027/t00027.cc#L48">
+        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L48">
           <g title="Window" id="classId-C_0001373544984027721472-12" class="node default clickable">
             <rect height="145" width="224.171875" y="-72.5" x="-112.0859375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="112.0859375" x1="-112.0859375" class="divider"/>
diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md
index 3eea0c92..e66b4280 100644
--- a/docs/test_cases/t00028.md
+++ b/docs/test_cases/t00028.md
@@ -96,7 +96,7 @@ class R {
         "formatted": "\\uml{note[top] A class note.}",
         "raw": "/// \\uml{note[top] A class note.}"
       },
-      "display_name": "clanguml::t00028::A",
+      "display_name": "A",
       "id": "1519850480962783588",
       "is_abstract": false,
       "is_nested": false,
@@ -122,7 +122,7 @@ class R {
         "formatted": "\\uml{note[] B class note.}",
         "raw": "/// \\uml{note[] B class note.}"
       },
-      "display_name": "clanguml::t00028::B",
+      "display_name": "B",
       "id": "1980597091567213070",
       "is_abstract": false,
       "is_nested": false,
@@ -148,7 +148,7 @@ class R {
         "formatted": "\n @uml{note:t00028_class[bottom] C class note.}\n This is class C.",
         "raw": "///\n/// @uml{note:t00028_class[bottom] C class note.}\n/// This is class C."
       },
-      "display_name": "clanguml::t00028::C",
+      "display_name": "C",
       "id": "984577258575112753",
       "is_abstract": false,
       "is_nested": false,
@@ -174,7 +174,7 @@ class R {
         "formatted": "\\uml{note\nD\nclass\nnote.}",
         "raw": "/// \\uml{note\n/// D\n/// class\n/// note.}"
       },
-      "display_name": "clanguml::t00028::D",
+      "display_name": "D",
       "id": "1263778658518784070",
       "is_abstract": false,
       "is_nested": false,
@@ -200,7 +200,7 @@ class R {
         "formatted": "\\uml{note E template class note.}",
         "raw": "/// \\uml{note E template class note.}"
       },
-      "display_name": "clanguml::t00028::E<T>",
+      "display_name": "E<T>",
       "id": "1014136565447389473",
       "is_abstract": false,
       "is_nested": false,
@@ -246,7 +246,7 @@ class R {
         "formatted": "\\uml{note:other_diagram[left] G class note.}",
         "raw": "/// \\uml{note:other_diagram[left] G class note.}"
       },
-      "display_name": "clanguml::t00028::G",
+      "display_name": "G",
       "id": "764713728396057122",
       "is_abstract": false,
       "is_nested": false,
@@ -276,7 +276,7 @@ class R {
         "two",
         "three"
       ],
-      "display_name": "clanguml::t00028::F",
+      "display_name": "F",
       "id": "589227897266388677",
       "is_nested": false,
       "name": "F",
@@ -291,7 +291,7 @@ class R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00028::E<int>",
+      "display_name": "E<int>",
       "id": "1949673179441298667",
       "is_abstract": false,
       "is_nested": false,
@@ -324,7 +324,7 @@ class R {
         "formatted": "\\uml{note[right] R class note.}",
         "raw": "/// \\uml{note[right] R class note.}"
       },
-      "display_name": "clanguml::t00028::R",
+      "display_name": "R",
       "id": "1189142882239313116",
       "is_abstract": false,
       "is_nested": false,
@@ -459,6 +459,7 @@ class R {
     }
   ],
   "name": "t00028_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index 3f5d3d01..e7c750d5 100644
--- a/docs/test_cases/t00028_class.svg
+++ b/docs/test_cases/t00028_class.svg
@@ -1,243 +1,203 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="439px" preserveAspectRatio="none" style="width:1034px;height:439px;background:#FFFFFF;" version="1.1" viewBox="0 0 1034 439" width="1034px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="410px" preserveAspectRatio="none" style="width:1066px;height:410px;" version="1.1" viewBox="0 0 1066 410" width="1066px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1oyr1thx0ty7l" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001519850480962783588">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001519850480962783588" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="84.5" y="254"/>
-        <ellipse cx="99.5" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M94.5,271.1563 C94.5,273.6563 96.6406,275.4688 99.5625,275.4688 C100.7969,275.4688 101.9688,275.1719 102.7188,274.6563 C103.3281,274.2344 103.6563,273.8125 103.6563,273.4063 C103.6563,272.9375 103.2344,272.5313 102.7344,272.5313 C102.5,272.5313 102.2813,272.6094 102.0781,272.8125 C101.6406,273.25 101.6406,273.25 101.4688,273.3438 C101.0156,273.5781 100.375,273.7188 99.6094,273.7188 C97.6094,273.7188 96.3281,272.7031 96.3281,271.125 L96.3281,270.0781 C96.3281,268.375 97.5469,267.1719 99.25,267.1719 C99.8281,267.1719 100.4063,267.3125 100.875,267.5625 C101.3438,267.8281 101.5156,268.0156 101.5781,268.375 C101.7031,269.0469 101.9531,269.2969 102.4844,269.2969 C102.7656,269.2969 103.0469,269.1563 103.2344,268.9375 C103.3594,268.7656 103.4063,268.5938 103.4063,268.1563 L103.4063,266.7969 C103.4063,266.375 103.3906,266.2344 103.2656,266.0625 C103.0938,265.8125 102.8125,265.6563 102.4844,265.6563 C102.1719,265.6563 101.9688,265.7656 101.75,266.0313 C100.5781,265.5313 100.1406,265.4219 99.1875,265.4219 C96.5156,265.4219 94.5,267.4375 94.5,270.0625 L94.5,271.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="113.5" y="274.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="124.5" y1="286" y2="286"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="124.5" y1="294" y2="294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="63.5" y="226.5"/>
+      <ellipse cx="78.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M81.4688,248.1406 Q80.8906,248.4375 80.25,248.5781 Q79.6094,248.7344 78.9063,248.7344 Q76.4063,248.7344 75.0781,247.0938 Q73.7656,245.4375 73.7656,242.3125 Q73.7656,239.1875 75.0781,237.5313 Q76.4063,235.875 78.9063,235.875 Q79.6094,235.875 80.25,236.0313 Q80.9063,236.1875 81.4688,236.4844 L81.4688,239.2031 Q80.8438,238.625 80.25,238.3594 Q79.6563,238.0781 79.0313,238.0781 Q77.6875,238.0781 77,239.1563 Q76.3125,240.2188 76.3125,242.3125 Q76.3125,244.4063 77,245.4844 Q77.6875,246.5469 79.0313,246.5469 Q79.6563,246.5469 80.25,246.2813 Q80.8438,246 81.4688,245.4219 L81.4688,248.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="92.5" y="246.6543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="258.5" y2="258.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="266.5" y2="266.5"/>
     </a>
-    <g id="elem_GMN3">
-      <path d="M6,77 L6,102.6 A0,0 0 0 0 6,102.6 L54.28,102.6 L98.76,253.77 L62.28,102.6 L104,102.6 A0,0 0 0 0 104,102.6 L104,87 L94,77 L6,77 A0,0 0 0 0 6,77 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M94,77 L94,87 L104,87 L94,77 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="12" y="94.077">A class note.</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001980597091567213070">
-        <rect codeLine="9" fill="#F1F1F1" height="48" id="C_0001980597091567213070" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="689.5" y="254"/>
-        <ellipse cx="704.5" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M699.5,271.1563 C699.5,273.6563 701.6406,275.4688 704.5625,275.4688 C705.7969,275.4688 706.9688,275.1719 707.7188,274.6563 C708.3281,274.2344 708.6563,273.8125 708.6563,273.4063 C708.6563,272.9375 708.2344,272.5313 707.7344,272.5313 C707.5,272.5313 707.2813,272.6094 707.0781,272.8125 C706.6406,273.25 706.6406,273.25 706.4688,273.3438 C706.0156,273.5781 705.375,273.7188 704.6094,273.7188 C702.6094,273.7188 701.3281,272.7031 701.3281,271.125 L701.3281,270.0781 C701.3281,268.375 702.5469,267.1719 704.25,267.1719 C704.8281,267.1719 705.4063,267.3125 705.875,267.5625 C706.3438,267.8281 706.5156,268.0156 706.5781,268.375 C706.7031,269.0469 706.9531,269.2969 707.4844,269.2969 C707.7656,269.2969 708.0469,269.1563 708.2344,268.9375 C708.3594,268.7656 708.4063,268.5938 708.4063,268.1563 L708.4063,266.7969 C708.4063,266.375 708.3906,266.2344 708.2656,266.0625 C708.0938,265.8125 707.8125,265.6563 707.4844,265.6563 C707.1719,265.6563 706.9688,265.7656 706.75,266.0313 C705.5781,265.5313 705.1406,265.4219 704.1875,265.4219 C701.5156,265.4219 699.5,267.4375 699.5,270.0625 L699.5,271.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="718.5" y="274.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="690.5" x2="729.5" y1="286" y2="286"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="690.5" x2="729.5" y1="294" y2="294"/>
-      </g>
+    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L55.25,89.6328 L80,226.42 L63.25,89.6328 L109,89.6328 A0,0 0 0 0 109,89.6328 L109,74.5 L99,64.5 L6,64.5 A0,0 0 0 0 6,64.5 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M99,64.5 L99,74.5 L109,74.5 L99,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="12" y="81.5669">A class note.</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="707.5" y="226.5"/>
+      <ellipse cx="722.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M725.4688,248.1406 Q724.8906,248.4375 724.25,248.5781 Q723.6094,248.7344 722.9063,248.7344 Q720.4063,248.7344 719.0781,247.0938 Q717.7656,245.4375 717.7656,242.3125 Q717.7656,239.1875 719.0781,237.5313 Q720.4063,235.875 722.9063,235.875 Q723.6094,235.875 724.25,236.0313 Q724.9063,236.1875 725.4688,236.4844 L725.4688,239.2031 Q724.8438,238.625 724.25,238.3594 Q723.6563,238.0781 723.0313,238.0781 Q721.6875,238.0781 721,239.1563 Q720.3125,240.2188 720.3125,242.3125 Q720.3125,244.4063 721,245.4844 Q721.6875,246.5469 723.0313,246.5469 Q723.6563,246.5469 724.25,246.2813 Q724.8438,246 725.4688,245.4219 L725.4688,248.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="736.5" y="246.6543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="258.5" y2="258.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="266.5" y2="266.5"/>
     </a>
-    <g id="elem_GMN7">
-      <path d="M557,265.2 L557,290.8 A0,0 0 0 0 557,290.8 L655,290.8 A0,0 0 0 0 655,290.8 L655,283.2 L689.01,278 L655,275.2 L655,275.2 L645,265.2 L557,265.2 A0,0 0 0 0 557,265.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M645,265.2 L645,275.2 L655,275.2 L645,265.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="563" y="282.277">B class note.</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000984577258575112753">
-        <rect codeLine="16" fill="#F1F1F1" height="48" id="C_0000984577258575112753" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="259" y="254"/>
-        <ellipse cx="274" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M269,271.1563 C269,273.6563 271.1406,275.4688 274.0625,275.4688 C275.2969,275.4688 276.4688,275.1719 277.2188,274.6563 C277.8281,274.2344 278.1563,273.8125 278.1563,273.4063 C278.1563,272.9375 277.7344,272.5313 277.2344,272.5313 C277,272.5313 276.7813,272.6094 276.5781,272.8125 C276.1406,273.25 276.1406,273.25 275.9688,273.3438 C275.5156,273.5781 274.875,273.7188 274.1094,273.7188 C272.1094,273.7188 270.8281,272.7031 270.8281,271.125 L270.8281,270.0781 C270.8281,268.375 272.0469,267.1719 273.75,267.1719 C274.3281,267.1719 274.9063,267.3125 275.375,267.5625 C275.8438,267.8281 276.0156,268.0156 276.0781,268.375 C276.2031,269.0469 276.4531,269.2969 276.9844,269.2969 C277.2656,269.2969 277.5469,269.1563 277.7344,268.9375 C277.8594,268.7656 277.9063,268.5938 277.9063,268.1563 L277.9063,266.7969 C277.9063,266.375 277.8906,266.2344 277.7656,266.0625 C277.5938,265.8125 277.3125,265.6563 276.9844,265.6563 C276.6719,265.6563 276.4688,265.7656 276.25,266.0313 C275.0781,265.5313 274.6406,265.4219 273.6875,265.4219 C271.0156,265.4219 269,267.4375 269,270.0625 L269,271.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="288" y="274.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="260" x2="300" y1="286" y2="286"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="260" x2="300" y1="294" y2="294"/>
-      </g>
+    <path d="M569,238 L569,263.1328 A0,0 0 0 0 569,263.1328 L672,263.1328 A0,0 0 0 0 672,263.1328 L672,256 L707.24,250.5 L672,248 L672,248 L662,238 L569,238 A0,0 0 0 0 569,238 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M662,238 L662,248 L672,248 L662,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="575" y="255.0669">B class note.</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="269.5" y="226.5"/>
+      <ellipse cx="284.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M287.4688,248.1406 Q286.8906,248.4375 286.25,248.5781 Q285.6094,248.7344 284.9063,248.7344 Q282.4063,248.7344 281.0781,247.0938 Q279.7656,245.4375 279.7656,242.3125 Q279.7656,239.1875 281.0781,237.5313 Q282.4063,235.875 284.9063,235.875 Q285.6094,235.875 286.25,236.0313 Q286.9063,236.1875 287.4688,236.4844 L287.4688,239.2031 Q286.8438,238.625 286.25,238.3594 Q285.6563,238.0781 285.0313,238.0781 Q283.6875,238.0781 283,239.1563 Q282.3125,240.2188 282.3125,242.3125 Q282.3125,244.4063 283,245.4844 Q283.6875,246.5469 285.0313,246.5469 Q285.6563,246.5469 286.25,246.2813 Q286.8438,246 287.4688,245.4219 L287.4688,248.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="298.5" y="246.6543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="258.5" y2="258.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="266.5" y2="266.5"/>
     </a>
-    <g id="elem_GMN11">
-      <path d="M180,387 L180,412.6 A0,0 0 0 0 180,412.6 L278,412.6 A0,0 0 0 0 278,412.6 L278,397 L268,387 L238.11,387 L270.05,302.38 L230.11,387 L180,387 A0,0 0 0 0 180,387 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M268,387 L268,397 L278,397 L268,387 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="186" y="404.077">C class note.</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001263778658518784070">
-        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0001263778658518784070" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="852" y="254"/>
-        <ellipse cx="867" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M862,271.1563 C862,273.6563 864.1406,275.4688 867.0625,275.4688 C868.2969,275.4688 869.4688,275.1719 870.2188,274.6563 C870.8281,274.2344 871.1563,273.8125 871.1563,273.4063 C871.1563,272.9375 870.7344,272.5313 870.2344,272.5313 C870,272.5313 869.7813,272.6094 869.5781,272.8125 C869.1406,273.25 869.1406,273.25 868.9688,273.3438 C868.5156,273.5781 867.875,273.7188 867.1094,273.7188 C865.1094,273.7188 863.8281,272.7031 863.8281,271.125 L863.8281,270.0781 C863.8281,268.375 865.0469,267.1719 866.75,267.1719 C867.3281,267.1719 867.9063,267.3125 868.375,267.5625 C868.8438,267.8281 869.0156,268.0156 869.0781,268.375 C869.2031,269.0469 869.4531,269.2969 869.9844,269.2969 C870.2656,269.2969 870.5469,269.1563 870.7344,268.9375 C870.8594,268.7656 870.9063,268.5938 870.9063,268.1563 L870.9063,266.7969 C870.9063,266.375 870.8906,266.2344 870.7656,266.0625 C870.5938,265.8125 870.3125,265.6563 869.9844,265.6563 C869.6719,265.6563 869.4688,265.7656 869.25,266.0313 C868.0781,265.5313 867.6406,265.4219 866.6875,265.4219 C864.0156,265.4219 862,267.4375 862,270.0625 L862,271.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="881" y="274.606">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="853" x2="893" y1="286" y2="286"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="853" x2="893" y1="294" y2="294"/>
-      </g>
+    <path d="M182,357 L182,382.1328 A0,0 0 0 0 182,382.1328 L285,382.1328 A0,0 0 0 0 285,382.1328 L285,367 L275,357 L243.08,357 L278.44,274.62 L235.08,357 L182,357 A0,0 0 0 0 182,357 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M275,357 L275,367 L285,367 L275,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="188" y="374.0669">C class note.</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="872" y="226.5"/>
+      <ellipse cx="887" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M889.9688,248.1406 Q889.3906,248.4375 888.75,248.5781 Q888.1094,248.7344 887.4063,248.7344 Q884.9063,248.7344 883.5781,247.0938 Q882.2656,245.4375 882.2656,242.3125 Q882.2656,239.1875 883.5781,237.5313 Q884.9063,235.875 887.4063,235.875 Q888.1094,235.875 888.75,236.0313 Q889.4063,236.1875 889.9688,236.4844 L889.9688,239.2031 Q889.3438,238.625 888.75,238.3594 Q888.1563,238.0781 887.5313,238.0781 Q886.1875,238.0781 885.5,239.1563 Q884.8125,240.2188 884.8125,242.3125 Q884.8125,244.4063 885.5,245.4844 Q886.1875,246.5469 887.5313,246.5469 Q888.1563,246.5469 888.75,246.2813 Q889.3438,246 889.9688,245.4219 L889.9688,248.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="901" y="246.6543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="258.5" y2="258.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="266.5" y2="266.5"/>
     </a>
-    <g id="elem_GMN15">
-      <path d="M765,249.6 L765,306.4 A0,0 0 0 0 765,306.4 L817,306.4 A0,0 0 0 0 817,306.4 L817,282 L851.66,278 L817,274 L817,259.6 L807,249.6 L765,249.6 A0,0 0 0 0 765,249.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M807,249.6 L807,259.6 L817,259.6 L807,249.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="9" x="771" y="266.677">D</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="771" y="282.277">class</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="771" y="297.877">note.</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001014136565447389473">
-        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0001014136565447389473" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="88" x="500" y="367.4"/>
-        <ellipse cx="531.2" cy="383.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M526.2,384.5563 C526.2,387.0563 528.3406,388.8688 531.2625,388.8688 C532.4969,388.8688 533.6688,388.5719 534.4188,388.0563 C535.0281,387.6344 535.3563,387.2125 535.3563,386.8063 C535.3563,386.3375 534.9344,385.9313 534.4344,385.9313 C534.2,385.9313 533.9813,386.0094 533.7781,386.2125 C533.3406,386.65 533.3406,386.65 533.1688,386.7438 C532.7156,386.9781 532.075,387.1188 531.3094,387.1188 C529.3094,387.1188 528.0281,386.1031 528.0281,384.525 L528.0281,383.4781 C528.0281,381.775 529.2469,380.5719 530.95,380.5719 C531.5281,380.5719 532.1063,380.7125 532.575,380.9625 C533.0438,381.2281 533.2156,381.4156 533.2781,381.775 C533.4031,382.4469 533.6531,382.6969 534.1844,382.6969 C534.4656,382.6969 534.7469,382.5563 534.9344,382.3375 C535.0594,382.1656 535.1063,381.9938 535.1063,381.5563 L535.1063,380.1969 C535.1063,379.775 535.0906,379.6344 534.9656,379.4625 C534.7938,379.2125 534.5125,379.0563 534.1844,379.0563 C533.8719,379.0563 533.6688,379.1656 533.45,379.4313 C532.2781,378.9313 531.8406,378.8219 530.8875,378.8219 C528.2156,378.8219 526.2,380.8375 526.2,383.4625 L526.2,384.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="548.8" y="388.006">E</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="582" y="364.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="583" y="378.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="501" x2="587" y1="399.4" y2="399.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="501" x2="587" y1="407.4" y2="407.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="506" y="416.3"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="508" y="418.3"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="520" y="424.4059">param : T</text>
-        </a>
-      </g>
+    <path d="M782.5,223 L782.5,278.3984 A0,0 0 0 0 782.5,278.3984 L836.5,278.3984 A0,0 0 0 0 836.5,278.3984 L836.5,254.5 L871.59,250.5 L836.5,246.5 L836.5,233 L826.5,223 L782.5,223 A0,0 0 0 0 782.5,223 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M826.5,223 L826.5,233 L836.5,233 L826.5,223 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="788.5" y="240.0669">D</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="788.5" y="255.1997">class</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="788.5" y="270.3325">note.</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="519.5" y="339"/>
+      <ellipse cx="548.45" cy="355" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M551.4188,360.6406 Q550.8406,360.9375 550.2,361.0781 Q549.5594,361.2344 548.8563,361.2344 Q546.3563,361.2344 545.0281,359.5938 Q543.7156,357.9375 543.7156,354.8125 Q543.7156,351.6875 545.0281,350.0313 Q546.3563,348.375 548.8563,348.375 Q549.5594,348.375 550.2,348.5313 Q550.8563,348.6875 551.4188,348.9844 L551.4188,351.7031 Q550.7938,351.125 550.2,350.8594 Q549.6063,350.5781 548.9813,350.5781 Q547.6375,350.5781 546.95,351.6563 Q546.2625,352.7188 546.2625,354.8125 Q546.2625,356.9063 546.95,357.9844 Q547.6375,359.0469 548.9813,359.0469 Q549.6063,359.0469 550.2,358.7813 Q550.7938,358.5 551.4188,357.9219 L551.4188,360.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="565.55" y="359.1543">E</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="595.5" y="336"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="596.5" y="348.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="371" y2="371"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="379" y2="379"/>
     </a>
-    <g id="elem_GMN19">
-      <path d="M313,387 L313,412.6 A0,0 0 0 0 313,412.6 L465,412.6 A0,0 0 0 0 465,412.6 L465,405 L499.73,399.8 L465,397 L465,397 L455,387 L313,387 A0,0 0 0 0 313,387 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M455,387 L455,397 L465,397 L455,387 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="131" x="319" y="404.077">E template class note.</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0000764713728396057122">
-        <rect codeLine="40" fill="#F1F1F1" height="48" id="C_0000764713728396057122" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="385.5" y="254"/>
-        <ellipse cx="400.5" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M395.5,271.1563 C395.5,273.6563 397.6406,275.4688 400.5625,275.4688 C401.7969,275.4688 402.9688,275.1719 403.7188,274.6563 C404.3281,274.2344 404.6563,273.8125 404.6563,273.4063 C404.6563,272.9375 404.2344,272.5313 403.7344,272.5313 C403.5,272.5313 403.2813,272.6094 403.0781,272.8125 C402.6406,273.25 402.6406,273.25 402.4688,273.3438 C402.0156,273.5781 401.375,273.7188 400.6094,273.7188 C398.6094,273.7188 397.3281,272.7031 397.3281,271.125 L397.3281,270.0781 C397.3281,268.375 398.5469,267.1719 400.25,267.1719 C400.8281,267.1719 401.4063,267.3125 401.875,267.5625 C402.3438,267.8281 402.5156,268.0156 402.5781,268.375 C402.7031,269.0469 402.9531,269.2969 403.4844,269.2969 C403.7656,269.2969 404.0469,269.1563 404.2344,268.9375 C404.3594,268.7656 404.4063,268.5938 404.4063,268.1563 L404.4063,266.7969 C404.4063,266.375 404.3906,266.2344 404.2656,266.0625 C404.0938,265.8125 403.8125,265.6563 403.4844,265.6563 C403.1719,265.6563 402.9688,265.7656 402.75,266.0313 C401.5781,265.5313 401.1406,265.4219 400.1875,265.4219 C397.5156,265.4219 395.5,267.4375 395.5,270.0625 L395.5,271.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="414.5" y="274.606">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="386.5" x2="427.5" y1="286" y2="286"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="386.5" x2="427.5" y1="294" y2="294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="525.5" y="385"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="527.5" y="387"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000589227897266388677">
-        <rect codeLine="44" fill="#F1F1F1" height="98.3998" id="C_0000589227897266388677" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="45" x="955.5" y="40.6"/>
-        <ellipse cx="972.3" cy="56.6" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M971.1594,57.6625 L972.4719,57.6625 L972.4719,57.7094 C972.4719,58.1156 972.4875,58.2719 972.5969,58.4281 C972.7688,58.6781 973.0656,58.85 973.3781,58.85 C973.6594,58.85 973.9563,58.7094 974.1281,58.4906 C974.2531,58.3031 974.3,58.1625 974.3,57.7094 L974.3,55.8656 C974.3,55.5375 974.2844,55.4281 974.2219,55.2562 C974.1125,54.9594 973.7531,54.7094 973.3781,54.7094 C973.0813,54.7094 972.8156,54.85 972.6438,55.0687 C972.5031,55.2562 972.4719,55.4281 972.4719,55.8656 L972.4719,55.9281 L971.1594,55.9281 L971.1594,53.7562 L975.0031,53.7562 L975.0031,54.5062 C975.0031,54.8969 975.0344,55.0844 975.1438,55.2406 C975.3156,55.4906 975.6125,55.6625 975.925,55.6625 C976.2219,55.6625 976.4875,55.5375 976.675,55.3031 C976.8156,55.1156 976.8469,54.975 976.8469,54.5062 L976.8469,52.0062 L969.1438,52.0062 C968.6906,52.0062 968.5656,52.0219 968.3938,52.1312 C968.1281,52.3031 967.9563,52.5687 967.9563,52.8812 C967.9563,53.1625 968.0813,53.4281 968.3313,53.6 C968.5188,53.725 968.7063,53.7562 969.1438,53.7562 L969.3313,53.7562 L969.3313,59.85 L969.1438,59.85 C968.7219,59.85 968.5656,59.8812 968.3938,59.975 C968.1281,60.1312 967.9563,60.4125 967.9563,60.7094 C967.9563,61.2875 968.3625,61.6 969.1438,61.6 L977.2219,61.6 L977.2219,59.0687 C977.2219,58.6625 977.1906,58.4906 977.0813,58.3344 C976.9094,58.0687 976.6281,57.9125 976.3,57.9125 C976.0188,57.9125 975.7375,58.0531 975.55,58.2719 C975.4094,58.4594 975.3781,58.6156 975.3781,59.0687 L975.3781,59.85 L971.1594,59.85 L971.1594,57.6625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="986.7" y="61.206">F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="956.5" x2="999.5" y1="72.6" y2="72.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="961.5" y="89.6059">one</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="22" x="961.5" y="106.4059">two</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="961.5" y="123.2058">three</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="956.5" x2="999.5" y1="130.9998" y2="130.9998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="539.5" y="393.2104">param : T</text>
     </a>
-    <g id="elem_GMN24">
-      <path d="M929,265.2 L929,290.8 A0,0 0 0 0 929,290.8 L1027,290.8 A0,0 0 0 0 1027,290.8 L1027,275.2 L1017,265.2 L982,265.2 L978,139.24 L974,265.2 L929,265.2 A0,0 0 0 0 929,265.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M1017,265.2 L1017,275.2 L1027,275.2 L1017,265.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="935" y="282.277">F enum note.</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001949673179441298667">
-        <rect codeLine="53" fill="#F1F1F1" height="48" id="C_0001949673179441298667" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="464" y="254"/>
-        <ellipse cx="479" cy="270" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M474,271.1563 C474,273.6563 476.1406,275.4688 479.0625,275.4688 C480.2969,275.4688 481.4688,275.1719 482.2188,274.6563 C482.8281,274.2344 483.1563,273.8125 483.1563,273.4063 C483.1563,272.9375 482.7344,272.5313 482.2344,272.5313 C482,272.5313 481.7813,272.6094 481.5781,272.8125 C481.1406,273.25 481.1406,273.25 480.9688,273.3438 C480.5156,273.5781 479.875,273.7188 479.1094,273.7188 C477.1094,273.7188 475.8281,272.7031 475.8281,271.125 L475.8281,270.0781 C475.8281,268.375 477.0469,267.1719 478.75,267.1719 C479.3281,267.1719 479.9063,267.3125 480.375,267.5625 C480.8438,267.8281 481.0156,268.0156 481.0781,268.375 C481.2031,269.0469 481.4531,269.2969 481.9844,269.2969 C482.2656,269.2969 482.5469,269.1563 482.7344,268.9375 C482.8594,268.7656 482.9063,268.5938 482.9063,268.1563 L482.9063,266.7969 C482.9063,266.375 482.8906,266.2344 482.7656,266.0625 C482.5938,265.8125 482.3125,265.6563 481.9844,265.6563 C481.6719,265.6563 481.4688,265.7656 481.25,266.0313 C480.0781,265.5313 479.6406,265.4219 478.6875,265.4219 C476.0156,265.4219 474,267.4375 474,270.0625 L474,271.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="493" y="274.606">E</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="510" y="251"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="511" y="265.2001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="521" y1="286" y2="286"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="465" x2="521" y1="294" y2="294"/>
-      </g>
+    <path d="M320.5,357 L320.5,382.1328 A0,0 0 0 0 320.5,382.1328 L484.5,382.1328 A0,0 0 0 0 484.5,382.1328 L484.5,375 L519.28,369.5 L484.5,367 L484.5,367 L474.5,357 L320.5,357 A0,0 0 0 0 320.5,357 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M474.5,357 L474.5,367 L484.5,367 L474.5,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="326.5" y="374.0669">E template class note.</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="397" y="226.5"/>
+      <ellipse cx="412" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M414.9688,248.1406 Q414.3906,248.4375 413.75,248.5781 Q413.1094,248.7344 412.4063,248.7344 Q409.9063,248.7344 408.5781,247.0938 Q407.2656,245.4375 407.2656,242.3125 Q407.2656,239.1875 408.5781,237.5313 Q409.9063,235.875 412.4063,235.875 Q413.1094,235.875 413.75,236.0313 Q414.4063,236.1875 414.9688,236.4844 L414.9688,239.2031 Q414.3438,238.625 413.75,238.3594 Q413.1563,238.0781 412.5313,238.0781 Q411.1875,238.0781 410.5,239.1563 Q409.8125,240.2188 409.8125,242.3125 Q409.8125,244.4063 410.5,245.4844 Q411.1875,246.5469 412.5313,246.5469 Q413.1563,246.5469 413.75,246.2813 Q414.3438,246 414.9688,245.4219 L414.9688,248.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="426" y="246.6543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="258.5" y2="258.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001189142882239313116">
-        <rect codeLine="57" fill="#F1F1F1" height="165.5995" id="C_0001189142882239313116" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="266" x="360" y="7"/>
-        <ellipse cx="483.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M478.75,24.1563 C478.75,26.6563 480.8906,28.4688 483.8125,28.4688 C485.0469,28.4688 486.2188,28.1719 486.9688,27.6563 C487.5781,27.2344 487.9063,26.8125 487.9063,26.4063 C487.9063,25.9375 487.4844,25.5313 486.9844,25.5313 C486.75,25.5313 486.5313,25.6094 486.3281,25.8125 C485.8906,26.25 485.8906,26.25 485.7188,26.3438 C485.2656,26.5781 484.625,26.7188 483.8594,26.7188 C481.8594,26.7188 480.5781,25.7031 480.5781,24.125 L480.5781,23.0781 C480.5781,21.375 481.7969,20.1719 483.5,20.1719 C484.0781,20.1719 484.6563,20.3125 485.125,20.5625 C485.5938,20.8281 485.7656,21.0156 485.8281,21.375 C485.9531,22.0469 486.2031,22.2969 486.7344,22.2969 C487.0156,22.2969 487.2969,22.1563 487.4844,21.9375 C487.6094,21.7656 487.6563,21.5938 487.6563,21.1563 L487.6563,19.7969 C487.6563,19.375 487.6406,19.2344 487.5156,19.0625 C487.3438,18.8125 487.0625,18.6563 486.7344,18.6563 C486.4219,18.6563 486.2188,18.7656 486,19.0313 C484.8281,18.5313 484.3906,18.4219 483.4375,18.4219 C480.7656,18.4219 478.75,20.4375 478.75,23.0625 L478.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="504.25" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="361" x2="625" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="47.9"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="49.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="380" y="56.0059">R(C &amp; c) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="361" x2="625" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="72.6999"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="74.6999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="380" y="80.8059">aaa : A</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="89.4998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="91.4998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="380" y="97.6058">bbb : B *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="106.2997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="108.2997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="380" y="114.4057">ccc : C &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="123.0997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="125.0997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="240" x="380" y="131.2057">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="139.8996"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="141.8996"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="380" y="148.0056">eee : E&lt;int&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="366" y="156.6995"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="368" y="158.6995"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="380" y="164.8055">ggg : G **</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="980.5" y="34"/>
+      <ellipse cx="996.85" cy="50" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1000.9594,56 L993.2406,56 L993.2406,43.6094 L1000.9594,43.6094 L1000.9594,45.7656 L995.6938,45.7656 L995.6938,48.4375 L1000.4594,48.4375 L1000.4594,50.5938 L995.6938,50.5938 L995.6938,53.8438 L1000.9594,53.8438 L1000.9594,56 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1011.15" y="54.1543">F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="981.5" x2="1021.5" y1="66" y2="66"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="986.5" y="80.2104">one</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="986.5" y="93.0151">two</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="986.5" y="105.8198">three</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="981.5" x2="1021.5" y1="112.4141" y2="112.4141"/>
     </a>
-    <g id="elem_GMN29">
-      <path d="M661,77 L661,85.8 L626.08,89.8 L661,93.8 L661,102.6 A0,0 0 0 0 661,102.6 L759,102.6 A0,0 0 0 0 759,102.6 L759,87 L749,77 L661,77 A0,0 0 0 0 661,77 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M749,77 L749,87 L759,87 L749,77 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="77" x="667" y="94.077">R class note.</text>
-    </g>
-    <path d="M139,54.2 L139,79.8 A0,0 0 0 0 139,79.8 L325,79.8 A0,0 0 0 0 325,79.8 L325,72.2 L364,76.1999 L325,64.2 L325,64.2 L315,54.2 L139,54.2 A0,0 0 0 0 139,54.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M315,54.2 L315,64.2 L325,64.2 L315,54.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="165" x="145" y="71.277">R contains an instance of A.</text>
-    <path d="M139,89.8 L139,115.4 A0,0 0 0 0 139,115.4 L251,115.4 A0,0 0 0 0 251,115.4 L251,107.8 L364,109.7997 L251,99.8 L251,99.8 L241,89.8 L139,89.8 A0,0 0 0 0 139,89.8 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M241,89.8 L241,99.8 L251,99.8 L241,89.8 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="91" x="145" y="106.877">Reference to C.</text>
-    <g id="link_C_0001949673179441298667_C_0001014136565447389473">
-      <path codeLine="73" d="M502.95,302.38 C510.84,320.9 514.8748,330.4003 523.5448,350.7503 " fill="none" id="C_0001949673179441298667-to-C_0001014136565447389473" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="530.6,367.31,529.0647,348.3985,518.0249,353.102,530.6,367.31" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001189142882239313116_C_0001519850480962783588">
-      <path codeLine="74" d="M348.8061,169.2845 C342.9061,172.2745 347.76,169.78 342,172.6 C263.47,211.09 167.46,251.36 125.87,268.48 " fill="none" id="C_0001189142882239313116-backto-C_0001519850480962783588" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="359.51,163.86,352.3498,163.0043,348.8061,169.2845,355.9662,170.1403,359.51,163.86" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="281" y="208.9"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="291" y="215.677">aaa</text>
-    </g>
-    <g id="link_C_0001189142882239313116_C_0001980597091567213070">
-      <path codeLine="75" d="M588.81,173.01 C626.28,205.16 661.2361,235.1633 684.5961,255.2033 " fill="none" id="C_0001189142882239313116-to-C_0001980597091567213070" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="689.15,259.11,684.9236,250.2141,685.3551,255.8544,679.7147,256.2859,689.15,259.11" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="643" y="208.9"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="653" y="215.677">bbb</text>
-    </g>
-    <g id="link_C_0001189142882239313116_C_0000984577258575112753">
-      <path codeLine="76" d="M398.96,173.01 C362.62,204.77 328.8476,234.3015 305.8276,254.4215 " fill="none" id="C_0001189142882239313116-to-C_0000984577258575112753" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="301.31,258.37,310.7188,255.459,305.0747,255.0796,305.4541,249.4354,301.31,258.37" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="365" y="208.9"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="375" y="215.677">ccc</text>
-    </g>
-    <g id="link_C_0001189142882239313116_C_0001263778658518784070">
-      <path codeLine="77" d="M637.1448,169.4029 C643.0648,172.3329 638.2,169.87 644,172.6 C726.41,211.47 753.98,206.02 834,249.6 C839.96,252.85 846.1,256.82 851.7,260.73 " fill="none" id="C_0001189142882239313116-backto-C_0001263778658518784070" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="626.39,164.08,629.9931,170.3264,637.1448,169.4029,633.5417,163.1565,626.39,164.08" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="770" y="208.9"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="780" y="215.677">ddd</text>
-    </g>
-    <g id="link_C_0001189142882239313116_C_0001949673179441298667">
-      <path codeLine="78" d="M493,185.01 C493,214.43 493,233.33 493,253.72 " fill="none" id="C_0001189142882239313116-backto-C_0001949673179441298667" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="493,173.01,489,179.01,493,185.01,497,179.01,493,173.01" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="496" y="208.9"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="506" y="215.677">eee</text>
-    </g>
-    <g id="link_C_0001189142882239313116_C_0000764713728396057122">
-      <path codeLine="79" d="M455.03,173.01 C441.44,202.43 429.6864,227.8832 420.2664,248.2732 " fill="none" id="C_0001189142882239313116-to-C_0000764713728396057122" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="417.75,253.72,425.1558,247.2274,419.847,249.181,417.8934,243.8722,417.75,253.72" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="443" y="208.9"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="453" y="215.677">ggg</text>
-    </g>
+    <path d="M948.5,238 L948.5,263.1328 A0,0 0 0 0 948.5,263.1328 L1054.5,263.1328 A0,0 0 0 0 1054.5,263.1328 L1054.5,248 L1044.5,238 L1005.5,238 L1001.5,120.39 L997.5,238 L948.5,238 A0,0 0 0 0 948.5,238 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1044.5,238 L1044.5,248 L1054.5,248 L1044.5,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="954.5" y="255.0669">F enum note.</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="473.5" y="226.5"/>
+      <ellipse cx="488.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M491.4688,248.1406 Q490.8906,248.4375 490.25,248.5781 Q489.6094,248.7344 488.9063,248.7344 Q486.4063,248.7344 485.0781,247.0938 Q483.7656,245.4375 483.7656,242.3125 Q483.7656,239.1875 485.0781,237.5313 Q486.4063,235.875 488.9063,235.875 Q489.6094,235.875 490.25,236.0313 Q490.9063,236.1875 491.4688,236.4844 L491.4688,239.2031 Q490.8438,238.625 490.25,238.3594 Q489.6563,238.0781 489.0313,238.0781 Q487.6875,238.0781 487,239.1563 Q486.3125,240.2188 486.3125,242.3125 Q486.3125,244.4063 487,245.4844 Q487.6875,246.5469 489.0313,246.5469 Q489.6563,246.5469 490.25,246.2813 Q490.8438,246 491.4688,245.4219 L491.4688,248.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.5" y="246.6543">E</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="518.5" y="223.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="519.5" y="235.6387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="258.5" y2="258.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="266.5" y2="266.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="377.5" y="8"/>
+      <ellipse cx="495.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M498.2188,29.6406 Q497.6406,29.9375 497,30.0781 Q496.3594,30.2344 495.6563,30.2344 Q493.1563,30.2344 491.8281,28.5938 Q490.5156,26.9375 490.5156,23.8125 Q490.5156,20.6875 491.8281,19.0313 Q493.1563,17.375 495.6563,17.375 Q496.3594,17.375 497,17.5313 Q497.6563,17.6875 498.2188,17.9844 L498.2188,20.7031 Q497.5938,20.125 497,19.8594 Q496.4063,19.5781 495.7813,19.5781 Q494.4375,19.5781 493.75,20.6563 Q493.0625,21.7188 493.0625,23.8125 Q493.0625,25.9063 493.75,26.9844 Q494.4375,28.0469 495.7813,28.0469 Q496.4063,28.0469 497,27.7813 Q497.5938,27.5 498.2188,26.9219 L498.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="515.75" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="46"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="397.5" y="54.2104">R(C &amp; c) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="66.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="68.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="397.5" y="75.0151">aaa : A</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="79.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="81.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="397.5" y="87.8198">bbb : B *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="92.4141"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="94.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="397.5" y="100.6245">ccc : C &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="105.2188"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="107.2188"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="397.5" y="113.4292">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="118.0234"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="120.0234"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="397.5" y="126.2339">eee : E&lt;int&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="130.8281"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="132.8281"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="397.5" y="139.0386">ggg : G **</text>
+    </a>
+    <path d="M664.5,64.5 L664.5,73 L629.79,77 L664.5,81 L664.5,89.6328 A0,0 0 0 0 664.5,89.6328 L766.5,89.6328 A0,0 0 0 0 766.5,89.6328 L766.5,74.5 L756.5,64.5 L664.5,64.5 A0,0 0 0 0 664.5,64.5 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M756.5,64.5 L756.5,74.5 L766.5,74.5 L756.5,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="670.5" y="81.5669">R class note.</text>
+    <path d="M144.5,42 L144.5,67.1328 A0,0 0 0 0 144.5,67.1328 L342.5,67.1328 A0,0 0 0 0 342.5,67.1328 L342.5,60 L381.5,71.207 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M332.5,42 L332.5,52 L342.5,52 L332.5,42 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="177" x="150.5" y="59.0669">R contains an instance of A.</text>
+    <path d="M144.5,77.1328 L144.5,102.2656 A0,0 0 0 0 144.5,102.2656 L263.5,102.2656 A0,0 0 0 0 263.5,102.2656 L263.5,95.1328 L381.5,96.8164 L263.5,87.1328 L263.5,87.1328 L253.5,77.1328 L144.5,77.1328 A0,0 0 0 0 144.5,77.1328 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M253.5,77.1328 L253.5,87.1328 L263.5,87.1328 L253.5,77.1328 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="150.5" y="94.1997">Reference to C.</text>
+    <path d="M514.76,274.62 C521.16,287.75 529.42,304.71 537.16,320.59 " fill="none" id="C_0001949673179441298667-&gt;C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="543.55,317.72,546.01,338.76,530.96,323.85,543.55,317.72" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M365.3,143.53 C363.36,144.36 361.42,145.19 359.5,146 C265.23,185.85 149.8,226.61 103.81,242.53 " fill="none" id="C_0001189142882239313116&lt;-C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="377.33,138.3,370.2322,137.0269,366.327,143.0891,373.4249,144.3622,377.33,138.3" 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="182.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="297.5" y="189.0669">aaa</text>
+    <path d="M592.35,146.03 C632.47,176.74 676.73,210.63 703.31,230.98 " fill="none" id="C_0001189142882239313116-&gt;C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="707.42,234.13,702.689,225.4918,703.4442,231.0981,697.8379,231.8532,707.42,234.13" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="652.5" y="182.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="662.5" y="189.0669">bbb</text>
+    <path d="M418.61,146.03 C380.73,176.39 338.98,209.85 313.5,230.27 " fill="none" id="C_0001189142882239313116-&gt;C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="309.55,233.43,319.0732,230.9185,313.4502,230.3013,314.0673,224.6782,309.55,233.43" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="380.5" y="182.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="390.5" y="189.0669">ccc</text>
+    <path d="M641.51,143.88 C643.18,144.59 644.85,145.3 646.5,146 C736.91,184.22 766.27,177.98 853.5,223 C859.61,226.15 865.91,230.09 871.62,233.96 " fill="none" id="C_0001189142882239313116&lt;-C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="629.55,138.68,633.4551,144.7422,640.553,143.4691,636.6478,137.4069,629.55,138.68" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="787.5" y="182.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="797.5" y="189.0669">ddd</text>
+    <path d="M503.5,159.39 C503.5,183.89 503.5,208.87 503.5,226.29 " fill="none" id="C_0001189142882239313116&lt;-C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="503.5,146.27,499.5,152.27,503.5,158.27,507.5,152.27,503.5,146.27" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="506.5" y="182.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="516.5" y="189.0669">eee</text>
+    <path d="M469.26,146.27 C456.02,172.67 441.63,201.38 431.39,221.81 " fill="none" id="C_0001189142882239313116-&gt;C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="429.14,226.29,436.7506,220.0387,431.3818,221.8207,429.5998,216.4519,429.14,226.29" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="456.5" y="182.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="466.5" y="189.0669">ggg</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00028_class_mermaid.svg b/docs/test_cases/t00028_class_mermaid.svg
index f5be132f..0daf7d52 100644
--- a/docs/test_cases/t00028_class_mermaid.svg
+++ b/docs/test_cases/t00028_class_mermaid.svg
@@ -1,67 +1,62 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1386.984375 564" style="max-width: 1386.98px; background-color: white;" width="1386.984375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1347.03125,427L1347.03125,431.1666666666667C1347.03125,435.3333333333333,1347.03125,443.6666666666667,1341.224369743343,451.82082425897244C1335.4174894866862,459.97498185127824,1323.8037289733722,467.94996370255654,1317.9968487167155,471.93745462819567L1312.1899684600585,475.92494555383485"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M632.2671669638494,243.2732636790528L578.6712068448745,258.727719732544C525.0752467258995,274.1821757860352,417.8833264879498,305.0910878930176,353.48723616064154,329.19040278553695C289.0911458333333,353.2897176780563,267.4908854166667,370.5794353561125,256.6907552083333,379.22429419514066L245.890625,387.8691530341688"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M649.5625,258.2871845077485L619.1848958333334,271.23932042312373C588.8072916666666,284.191456338499,528.0520833333334,310.0957281692495,490.4976932207672,330.459984865311C452.94330310820106,350.8242415613725,438.5897312164021,365.64848312274506,431.41294527050263,373.0606039034313L424.23615932460314,380.47272468411757"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.890610999104,302L725.3678268742533,307.6666666666667C721.8450427494026,313.3333333333333,714.7994744997013,324.6666666666667,696.5210277924547,338.9526097861221C678.2425810852079,353.2385529055775,648.731255920416,370.4771058111549,633.97559333802,379.09638226394355L619.219930755624,387.7156587167323"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M936.9052675859521,313.4209920242171L941.4894156966267,317.18416002018097C946.0735638073014,320.94732801614475,955.2418600286506,328.4736640080724,958.193299805992,337.90349867070285C961.1447395833334,347.3333333333333,957.8793229166668,358.6666666666667,956.2466145833333,364.3333333333333L954.61390625,370"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M956.8430260636914,237.49163789490964L1021.8743967197428,253.90969824575802C1086.9057673757943,270.32775859660643,1216.9685086878972,303.16387929830324,1281.9998793439486,325.2486063158183C1347.03125,347.3333333333333,1347.03125,358.6666666666667,1347.03125,364.3333333333333L1347.03125,370"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M939.390625,282.7241086304565L954.3138020833334,291.60342385871377C969.2369791666666,300.482739086971,999.0833333333334,318.2413695434855,1014.0065104166666,331.7873514384094C1028.9296875,345.3333333333333,1028.9296875,354.6666666666667,1028.9296875,359.3333333333333L1028.9296875,364"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1347.03125,427L1347.03125,431.1666666666667C1347.03125,435.3333333333333,1347.03125,443.6666666666667,1338.7513020833333,453.5190398957554C1330.4713541666667,463.3714131248441,1313.9114583333333,474.7428262496881,1305.6315104166667,480.4285328121102L1297.3515625,486.11423937453213"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M649.5625,238.28613472858078L593.083984375,254.571778940484C536.60546875,270.8574231523872,423.6484375,303.4287115761936,356.3697916666667,328.3592146271249C289.0911458333333,353.2897176780563,267.4908854166667,370.5794353561125,256.6907552083333,379.22429419514066L245.890625,387.8691530341688"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M649.5625,258.2871845077485L619.1848958333334,271.23932042312373C588.8072916666666,284.191456338499,528.0520833333334,310.0957281692495,489.8020833333333,331.17840457864315C451.5520833333333,352.26108098803684,435.8072916666667,368.5221619760737,427.9348958333333,376.65270247009204L420.0625,384.7832429641105"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.890610999104,302L725.3678268742533,307.6666666666667C721.8450427494026,313.3333333333333,714.7994744997013,324.6666666666667,695.6575497498507,339.45699621530184C676.515625,354.247325763937,645.27734375,372.4946515278741,629.658203125,381.61831440984264L614.0390625,390.74197729181117"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M922.9926495295699,302L929.8955673163082,307.6666666666667C936.7984851030466,313.3333333333333,950.6043206765233,324.6666666666667,955.8745301299282,336C961.1447395833334,347.3333333333333,957.8793229166668,358.6666666666667,956.2466145833333,364.3333333333333L954.61390625,370"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M939.390625,233.0855401756048L1007.3307291666666,250.2379501463373C1075.2708333333333,267.39036011706986,1211.1510416666667,301.69518005853496,1279.0911458333333,324.51425669593414C1347.03125,347.3333333333333,1347.03125,358.6666666666667,1347.03125,364.3333333333333L1347.03125,370"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M939.390625,282.7241086304565L954.3138020833334,291.60342385871377C969.2369791666666,300.482739086971,999.0833333333334,318.2413695434855,1014.0065104166666,332.7873514384094C1028.9296875,347.3333333333333,1028.9296875,358.6666666666667,1028.9296875,364.3333333333333L1028.9296875,370"/>
         <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote8" d="M232.609375,213L232.609375,233.5C232.609375,254,232.609375,295,232.609375,321.1666666666667C232.609375,347.3333333333333,232.609375,358.6666666666667,232.609375,364.3333333333333L232.609375,370"/>
         <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote9" d="M388.7734375,213L388.7734375,233.5C388.7734375,254,388.7734375,295,390.4061458333333,321.1666666666667C392.0388541666666,347.3333333333333,395.3042708333333,358.6666666666667,396.9369791666666,364.3333333333333L398.5696875,370"/>
         <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote10" d="M545.8203125,213L545.8203125,233.5C545.8203125,254,545.8203125,295,552.7630208333334,323.39841676147137C559.7057291666666,351.79683352294273,573.5911458333334,367.59366704588547,580.5338541666666,375.4920838073569L587.4765625,383.3905005688282"/>
@@ -223,7 +218,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L8">
+        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L8">
           <g title="A" id="classId-C_0001519850480962783588-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -242,7 +237,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L11">
+        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L11">
           <g title="B" id="classId-C_0001980597091567213070-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -261,7 +256,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L16">
+        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L16">
           <g title="C" id="classId-C_0000984577258575112753-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -280,7 +275,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L22">
+        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L22">
           <g title="D" id="classId-C_0001263778658518784070-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -299,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001014136565447389473-4" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -323,7 +318,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L30">
+        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L30">
           <g title="G" id="classId-C_0000764713728396057122-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -342,7 +337,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L33">
+        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L33">
           <g title="F" id="classId-C_0000589227897266388677-6" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -376,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001949673179441298667-7" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -395,7 +390,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00028/t00028.cc#L36">
+        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L36">
           <g title="R" id="classId-C_0001189142882239313116-8" class="node default clickable">
             <rect height="211" width="289.828125" y="-105.5" x="-144.9140625" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="144.9140625" x1="-144.9140625" class="divider"/>
@@ -418,7 +413,7 @@
               </foreignObject>
               <foreignObject transform="translate( -137.4140625, -42)" height="18" width="56.03125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-bbb : B</span>
+                  <span style="font-style:italic;" class="nodeLabel">-bbb : B </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -137.4140625, -20)" height="18" width="69.34375">
@@ -441,9 +436,9 @@
                   <span style="font-style:italic;" class="nodeLabel">-ggg : G *</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -137.4140625, 80)" height="18" width="118.234375">
+              <foreignObject transform="translate( -137.4140625, 80)" height="18" width="109.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-R(C &amp; c) : : void</span>
+                  <span class="nodeLabel">-R(C &amp; c) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00029.md b/docs/test_cases/t00029.md
index caa23a4e..2574fbed 100644
--- a/docs/test_cases/t00029.md
+++ b/docs/test_cases/t00029.md
@@ -75,7 +75,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00029::A",
+      "display_name": "A",
       "id": "1970994826766369014",
       "is_abstract": false,
       "is_nested": false,
@@ -97,7 +97,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00029::C<T>",
+      "display_name": "C<T>",
       "id": "543766389270348470",
       "is_abstract": false,
       "is_nested": false,
@@ -143,7 +143,7 @@ struct R {
         "formatted": "@uml{skip:t00029_class}",
         "raw": "/// @uml{skip:t00029_class}"
       },
-      "display_name": "clanguml::t00029::D",
+      "display_name": "D",
       "id": "1496914969429483234",
       "is_abstract": false,
       "is_nested": false,
@@ -182,7 +182,7 @@ struct R {
         "two",
         "three"
       ],
-      "display_name": "clanguml::t00029::E",
+      "display_name": "E",
       "id": "1936873082456592219",
       "is_nested": false,
       "name": "E",
@@ -197,7 +197,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00029::G1",
+      "display_name": "G1",
       "id": "1980718063838190763",
       "is_abstract": false,
       "is_nested": false,
@@ -219,7 +219,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00029::G2",
+      "display_name": "G2",
       "id": "2204627213593766591",
       "is_abstract": false,
       "is_nested": false,
@@ -241,7 +241,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00029::G3",
+      "display_name": "G3",
       "id": "767180516665070631",
       "is_abstract": false,
       "is_nested": false,
@@ -263,7 +263,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00029::G4",
+      "display_name": "G4",
       "id": "715074622924270214",
       "is_abstract": false,
       "is_nested": false,
@@ -285,7 +285,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00029::R",
+      "display_name": "R",
       "id": "348749731659902910",
       "is_abstract": false,
       "is_nested": false,
@@ -348,6 +348,7 @@ struct R {
     }
   ],
   "name": "t00029_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index 0b9c73e3..e92ca254 100644
--- a/docs/test_cases/t00029_class.svg
+++ b/docs/test_cases/t00029_class.svg
@@ -1,149 +1,133 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="287px" preserveAspectRatio="none" style="width:522px;height:287px;background:#FFFFFF;" version="1.1" viewBox="0 0 522 287" width="522px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="268px" preserveAspectRatio="none" style="width:501px;height:268px;" version="1.1" viewBox="0 0 501 268" width="501px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f2kmotld7n70" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001970994826766369014">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001970994826766369014" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="9" y="32.2"/>
-        <ellipse cx="24" cy="48.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M19,49.3563 C19,51.8563 21.1406,53.6688 24.0625,53.6688 C25.2969,53.6688 26.4688,53.3719 27.2188,52.8563 C27.8281,52.4344 28.1563,52.0125 28.1563,51.6063 C28.1563,51.1375 27.7344,50.7313 27.2344,50.7313 C27,50.7313 26.7813,50.8094 26.5781,51.0125 C26.1406,51.45 26.1406,51.45 25.9688,51.5438 C25.5156,51.7781 24.875,51.9188 24.1094,51.9188 C22.1094,51.9188 20.8281,50.9031 20.8281,49.325 L20.8281,48.2781 C20.8281,46.575 22.0469,45.3719 23.75,45.3719 C24.3281,45.3719 24.9063,45.5125 25.375,45.7625 C25.8438,46.0281 26.0156,46.2156 26.0781,46.575 C26.2031,47.2469 26.4531,47.4969 26.9844,47.4969 C27.2656,47.4969 27.5469,47.3563 27.7344,47.1375 C27.8594,46.9656 27.9063,46.7938 27.9063,46.3563 L27.9063,44.9969 C27.9063,44.575 27.8906,44.4344 27.7656,44.2625 C27.5938,44.0125 27.3125,43.8563 26.9844,43.8563 C26.6719,43.8563 26.4688,43.9656 26.25,44.2313 C25.0781,43.7313 24.6406,43.6219 23.6875,43.6219 C21.0156,43.6219 19,45.6375 19,48.2625 L19,49.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="38" y="52.806">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="49" y1="64.2" y2="64.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="10" x2="49" y1="72.2" y2="72.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="27"/>
+      <ellipse cx="22" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M24.9688,48.6406 Q24.3906,48.9375 23.75,49.0781 Q23.1094,49.2344 22.4063,49.2344 Q19.9063,49.2344 18.5781,47.5938 Q17.2656,45.9375 17.2656,42.8125 Q17.2656,39.6875 18.5781,38.0313 Q19.9063,36.375 22.4063,36.375 Q23.1094,36.375 23.75,36.5313 Q24.4063,36.6875 24.9688,36.9844 L24.9688,39.7031 Q24.3438,39.125 23.75,38.8594 Q23.1563,38.5781 22.5313,38.5781 Q21.1875,38.5781 20.5,39.6563 Q19.8125,40.7188 19.8125,42.8125 Q19.8125,44.9063 20.5,45.9844 Q21.1875,47.0469 22.5313,47.0469 Q23.1563,47.0469 23.75,46.7813 Q24.3438,46.5 24.9688,45.9219 L24.9688,48.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="47.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="59" y2="59"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000543766389270348470">
-        <rect codeLine="6" fill="#F1F1F1" height="64.7999" id="C_0000543766389270348470" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="88" x="84.5" y="23.8"/>
-        <ellipse cx="115.25" cy="39.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M110.25,40.9563 C110.25,43.4563 112.3906,45.2688 115.3125,45.2688 C116.5469,45.2688 117.7188,44.9719 118.4688,44.4563 C119.0781,44.0344 119.4063,43.6125 119.4063,43.2063 C119.4063,42.7375 118.9844,42.3313 118.4844,42.3313 C118.25,42.3313 118.0313,42.4094 117.8281,42.6125 C117.3906,43.05 117.3906,43.05 117.2188,43.1438 C116.7656,43.3781 116.125,43.5188 115.3594,43.5188 C113.3594,43.5188 112.0781,42.5031 112.0781,40.925 L112.0781,39.8781 C112.0781,38.175 113.2969,36.9719 115,36.9719 C115.5781,36.9719 116.1563,37.1125 116.625,37.3625 C117.0938,37.6281 117.2656,37.8156 117.3281,38.175 C117.4531,38.8469 117.7031,39.0969 118.2344,39.0969 C118.5156,39.0969 118.7969,38.9563 118.9844,38.7375 C119.1094,38.5656 119.1563,38.3938 119.1563,37.9563 L119.1563,36.5969 C119.1563,36.175 119.1406,36.0344 119.0156,35.8625 C118.8438,35.6125 118.5625,35.4563 118.2344,35.4563 C117.9219,35.4563 117.7188,35.5656 117.5,35.8313 C116.3281,35.3313 115.8906,35.2219 114.9375,35.2219 C112.2656,35.2219 110.25,37.2375 110.25,39.8625 L110.25,40.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="132.75" y="44.406">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="166.5" y="20.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="167.5" y="35.0001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="171.5" y1="55.8" y2="55.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="171.5" y1="63.8" y2="63.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="90.5" y="72.7"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="92.5" y="74.7"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="104.5" y="80.8059">param : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="82" y="20.5"/>
+      <ellipse cx="110.95" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M113.9188,42.1406 Q113.3406,42.4375 112.7,42.5781 Q112.0594,42.7344 111.3563,42.7344 Q108.8563,42.7344 107.5281,41.0938 Q106.2156,39.4375 106.2156,36.3125 Q106.2156,33.1875 107.5281,31.5313 Q108.8563,29.875 111.3563,29.875 Q112.0594,29.875 112.7,30.0313 Q113.3563,30.1875 113.9188,30.4844 L113.9188,33.2031 Q113.2938,32.625 112.7,32.3594 Q112.1063,32.0781 111.4813,32.0781 Q110.1375,32.0781 109.45,33.1563 Q108.7625,34.2188 108.7625,36.3125 Q108.7625,38.4063 109.45,39.4844 Q110.1375,40.5469 111.4813,40.5469 Q112.1063,40.5469 112.7,40.2813 Q113.2938,40 113.9188,39.4219 L113.9188,42.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="128.05" 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="158" y="17.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="159" y="29.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="83" x2="163" y1="52.5" y2="52.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="83" x2="163" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001496914969429483234">
-        <rect codeLine="11" fill="#F1F1F1" height="64.7999" id="C_0001496914969429483234" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="88" x="207.5" y="23.8"/>
-        <ellipse cx="243.2" cy="39.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M238.2,40.9563 C238.2,43.4563 240.3406,45.2688 243.2625,45.2688 C244.4969,45.2688 245.6688,44.9719 246.4188,44.4563 C247.0281,44.0344 247.3563,43.6125 247.3563,43.2063 C247.3563,42.7375 246.9344,42.3313 246.4344,42.3313 C246.2,42.3313 245.9813,42.4094 245.7781,42.6125 C245.3406,43.05 245.3406,43.05 245.1688,43.1438 C244.7156,43.3781 244.075,43.5188 243.3094,43.5188 C241.3094,43.5188 240.0281,42.5031 240.0281,40.925 L240.0281,39.8781 C240.0281,38.175 241.2469,36.9719 242.95,36.9719 C243.5281,36.9719 244.1063,37.1125 244.575,37.3625 C245.0438,37.6281 245.2156,37.8156 245.2781,38.175 C245.4031,38.8469 245.6531,39.0969 246.1844,39.0969 C246.4656,39.0969 246.7469,38.9563 246.9344,38.7375 C247.0594,38.5656 247.1063,38.3938 247.1063,37.9563 L247.1063,36.5969 C247.1063,36.175 247.0906,36.0344 246.9656,35.8625 C246.7938,35.6125 246.5125,35.4563 246.1844,35.4563 C245.8719,35.4563 245.6688,35.5656 245.45,35.8313 C244.2781,35.3313 243.8406,35.2219 242.8875,35.2219 C240.2156,35.2219 238.2,37.2375 238.2,39.8625 L238.2,40.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="261.8" y="44.406">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="208.5" x2="294.5" y1="55.8" y2="55.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="208.5" x2="294.5" y1="63.8" y2="63.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="213.5" y="72.7"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="215.5" y="74.7"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="227.5" y="80.8059">param : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="88" y="66.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="90" y="68.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001936873082456592219">
-        <rect codeLine="16" fill="#F1F1F1" height="98.3998" id="C_0001936873082456592219" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="45" x="7" y="182.4"/>
-        <ellipse cx="23.8" cy="198.4" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M22.6594,199.4625 L23.9719,199.4625 L23.9719,199.5094 C23.9719,199.9156 23.9875,200.0719 24.0969,200.2281 C24.2688,200.4781 24.5656,200.65 24.8781,200.65 C25.1594,200.65 25.4563,200.5094 25.6281,200.2906 C25.7531,200.1031 25.8,199.9625 25.8,199.5094 L25.8,197.6656 C25.8,197.3375 25.7844,197.2281 25.7219,197.0563 C25.6125,196.7594 25.2531,196.5094 24.8781,196.5094 C24.5813,196.5094 24.3156,196.65 24.1438,196.8688 C24.0031,197.0563 23.9719,197.2281 23.9719,197.6656 L23.9719,197.7281 L22.6594,197.7281 L22.6594,195.5563 L26.5031,195.5563 L26.5031,196.3063 C26.5031,196.6969 26.5344,196.8844 26.6438,197.0406 C26.8156,197.2906 27.1125,197.4625 27.425,197.4625 C27.7219,197.4625 27.9875,197.3375 28.175,197.1031 C28.3156,196.9156 28.3469,196.775 28.3469,196.3063 L28.3469,193.8063 L20.6438,193.8063 C20.1906,193.8063 20.0656,193.8219 19.8938,193.9313 C19.6281,194.1031 19.4563,194.3688 19.4563,194.6813 C19.4563,194.9625 19.5813,195.2281 19.8313,195.4 C20.0188,195.525 20.2063,195.5563 20.6438,195.5563 L20.8313,195.5563 L20.8313,201.65 L20.6438,201.65 C20.2219,201.65 20.0656,201.6813 19.8938,201.775 C19.6281,201.9313 19.4563,202.2125 19.4563,202.5094 C19.4563,203.0875 19.8625,203.4 20.6438,203.4 L28.7219,203.4 L28.7219,200.8688 C28.7219,200.4625 28.6906,200.2906 28.5813,200.1344 C28.4094,199.8688 28.1281,199.7125 27.8,199.7125 C27.5188,199.7125 27.2375,199.8531 27.05,200.0719 C26.9094,200.2594 26.8781,200.4156 26.8781,200.8688 L26.8781,201.65 L22.6594,201.65 L22.6594,199.4625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="38.2" y="203.006">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="51" y1="214.4" y2="214.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="13" y="231.4059">one</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="22" x="13" y="248.2059">two</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="13" y="265.0058">three</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="51" y1="272.7998" y2="272.7998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="102" y="74.7104">param : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <g id="elem_C_0001980718063838190763">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001980718063838190763" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="354" y="207.6"/>
-        <ellipse cx="369" cy="223.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M364,224.7563 C364,227.2563 366.1406,229.0688 369.0625,229.0688 C370.2969,229.0688 371.4688,228.7719 372.2188,228.2563 C372.8281,227.8344 373.1563,227.4125 373.1563,227.0063 C373.1563,226.5375 372.7344,226.1313 372.2344,226.1313 C372,226.1313 371.7813,226.2094 371.5781,226.4125 C371.1406,226.85 371.1406,226.85 370.9688,226.9438 C370.5156,227.1781 369.875,227.3188 369.1094,227.3188 C367.1094,227.3188 365.8281,226.3031 365.8281,224.725 L365.8281,223.6781 C365.8281,221.975 367.0469,220.7719 368.75,220.7719 C369.3281,220.7719 369.9063,220.9125 370.375,221.1625 C370.8438,221.4281 371.0156,221.6156 371.0781,221.975 C371.2031,222.6469 371.4531,222.8969 371.9844,222.8969 C372.2656,222.8969 372.5469,222.7563 372.7344,222.5375 C372.8594,222.3656 372.9063,222.1938 372.9063,221.7563 L372.9063,220.3969 C372.9063,219.975 372.8906,219.8344 372.7656,219.6625 C372.5938,219.4125 372.3125,219.2563 371.9844,219.2563 C371.6719,219.2563 371.4688,219.3656 371.25,219.6313 C370.0781,219.1313 369.6406,219.0219 368.6875,219.0219 C366.0156,219.0219 364,221.0375 364,223.6625 L364,224.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="383" y="228.206">G1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="355" x2="404" y1="239.6" y2="239.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="355" x2="404" y1="247.6" y2="247.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="60.8047" id="C_0001496914969429483234" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="199" y="20.5"/>
+      <ellipse cx="232.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M235.4188,42.1406 Q234.8406,42.4375 234.2,42.5781 Q233.5594,42.7344 232.8563,42.7344 Q230.3563,42.7344 229.0281,41.0938 Q227.7156,39.4375 227.7156,36.3125 Q227.7156,33.1875 229.0281,31.5313 Q230.3563,29.875 232.8563,29.875 Q233.5594,29.875 234.2,30.0313 Q234.8563,30.1875 235.4188,30.4844 L235.4188,33.2031 Q234.7938,32.625 234.2,32.3594 Q233.6063,32.0781 232.9813,32.0781 Q231.6375,32.0781 230.95,33.1563 Q230.2625,34.2188 230.2625,36.3125 Q230.2625,38.4063 230.95,39.4844 Q231.6375,40.5469 232.9813,40.5469 Q233.6063,40.5469 234.2,40.2813 Q234.7938,40 235.4188,39.4219 L235.4188,42.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="250.55" y="40.6543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="200" x2="280" y1="52.5" y2="52.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="200" x2="280" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <g id="elem_C_0002204627213593766591">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0002204627213593766591" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="87" y="207.6"/>
-        <ellipse cx="102" cy="223.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M97,224.7563 C97,227.2563 99.1406,229.0688 102.0625,229.0688 C103.2969,229.0688 104.4688,228.7719 105.2188,228.2563 C105.8281,227.8344 106.1563,227.4125 106.1563,227.0063 C106.1563,226.5375 105.7344,226.1313 105.2344,226.1313 C105,226.1313 104.7813,226.2094 104.5781,226.4125 C104.1406,226.85 104.1406,226.85 103.9688,226.9438 C103.5156,227.1781 102.875,227.3188 102.1094,227.3188 C100.1094,227.3188 98.8281,226.3031 98.8281,224.725 L98.8281,223.6781 C98.8281,221.975 100.0469,220.7719 101.75,220.7719 C102.3281,220.7719 102.9063,220.9125 103.375,221.1625 C103.8438,221.4281 104.0156,221.6156 104.0781,221.975 C104.2031,222.6469 104.4531,222.8969 104.9844,222.8969 C105.2656,222.8969 105.5469,222.7563 105.7344,222.5375 C105.8594,222.3656 105.9063,222.1938 105.9063,221.7563 L105.9063,220.3969 C105.9063,219.975 105.8906,219.8344 105.7656,219.6625 C105.5938,219.4125 105.3125,219.2563 104.9844,219.2563 C104.6719,219.2563 104.4688,219.3656 104.25,219.6313 C103.0781,219.1313 102.6406,219.0219 101.6875,219.0219 C99.0156,219.0219 97,221.0375 97,223.6625 L97,224.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="116" y="228.206">G2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="88" x2="137" y1="239.6" y2="239.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="88" x2="137" y1="247.6" y2="247.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="205" y="66.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="207" y="68.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <g id="elem_C_0000767180516665070631">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000767180516665070631" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="173" y="207.6"/>
-        <ellipse cx="188" cy="223.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M183,224.7563 C183,227.2563 185.1406,229.0688 188.0625,229.0688 C189.2969,229.0688 190.4688,228.7719 191.2188,228.2563 C191.8281,227.8344 192.1563,227.4125 192.1563,227.0063 C192.1563,226.5375 191.7344,226.1313 191.2344,226.1313 C191,226.1313 190.7813,226.2094 190.5781,226.4125 C190.1406,226.85 190.1406,226.85 189.9688,226.9438 C189.5156,227.1781 188.875,227.3188 188.1094,227.3188 C186.1094,227.3188 184.8281,226.3031 184.8281,224.725 L184.8281,223.6781 C184.8281,221.975 186.0469,220.7719 187.75,220.7719 C188.3281,220.7719 188.9063,220.9125 189.375,221.1625 C189.8438,221.4281 190.0156,221.6156 190.0781,221.975 C190.2031,222.6469 190.4531,222.8969 190.9844,222.8969 C191.2656,222.8969 191.5469,222.7563 191.7344,222.5375 C191.8594,222.3656 191.9063,222.1938 191.9063,221.7563 L191.9063,220.3969 C191.9063,219.975 191.8906,219.8344 191.7656,219.6625 C191.5938,219.4125 191.3125,219.2563 190.9844,219.2563 C190.6719,219.2563 190.4688,219.3656 190.25,219.6313 C189.0781,219.1313 188.6406,219.0219 187.6875,219.0219 C185.0156,219.0219 183,221.0375 183,223.6625 L183,224.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="202" y="228.206">G3</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="174" x2="223" y1="239.6" y2="239.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="174" x2="223" y1="247.6" y2="247.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="219" y="74.7104">param : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <g id="elem_C_0000715074622924270214">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000715074622924270214" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="440" y="207.6"/>
-        <ellipse cx="455" cy="223.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M450,224.7563 C450,227.2563 452.1406,229.0688 455.0625,229.0688 C456.2969,229.0688 457.4688,228.7719 458.2188,228.2563 C458.8281,227.8344 459.1563,227.4125 459.1563,227.0063 C459.1563,226.5375 458.7344,226.1313 458.2344,226.1313 C458,226.1313 457.7813,226.2094 457.5781,226.4125 C457.1406,226.85 457.1406,226.85 456.9688,226.9438 C456.5156,227.1781 455.875,227.3188 455.1094,227.3188 C453.1094,227.3188 451.8281,226.3031 451.8281,224.725 L451.8281,223.6781 C451.8281,221.975 453.0469,220.7719 454.75,220.7719 C455.3281,220.7719 455.9063,220.9125 456.375,221.1625 C456.8438,221.4281 457.0156,221.6156 457.0781,221.975 C457.2031,222.6469 457.4531,222.8969 457.9844,222.8969 C458.2656,222.8969 458.5469,222.7563 458.7344,222.5375 C458.8594,222.3656 458.9063,222.1938 458.9063,221.7563 L458.9063,220.3969 C458.9063,219.975 458.8906,219.8344 458.7656,219.6625 C458.5938,219.4125 458.3125,219.2563 457.9844,219.2563 C457.6719,219.2563 457.4688,219.3656 457.25,219.6313 C456.0781,219.1313 455.6406,219.0219 454.6875,219.0219 C452.0156,219.0219 450,221.0375 450,223.6625 L450,224.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="469" y="228.206">G4</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="441" x2="490" y1="239.6" y2="239.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="441" x2="490" y1="247.6" y2="247.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="6" y="171"/>
+      <ellipse cx="21.9" cy="187" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M26.0094,193 L18.2906,193 L18.2906,180.6094 L26.0094,180.6094 L26.0094,182.7656 L20.7438,182.7656 L20.7438,185.4375 L25.5094,185.4375 L25.5094,187.5938 L20.7438,187.5938 L20.7438,190.8438 L26.0094,190.8438 L26.0094,193 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36.1" y="191.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="47" y1="203" y2="203"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="12" y="217.2104">one</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="12" y="230.0151">two</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="12" y="242.8198">three</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="47" y1="249.4141" y2="249.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000348749731659902910">
-        <rect codeLine="38" fill="#F1F1F1" height="98.3998" id="C_0000348749731659902910" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="185" x="330" y="7"/>
-        <ellipse cx="413.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M408.25,24.1563 C408.25,26.6563 410.3906,28.4688 413.3125,28.4688 C414.5469,28.4688 415.7188,28.1719 416.4688,27.6563 C417.0781,27.2344 417.4063,26.8125 417.4063,26.4063 C417.4063,25.9375 416.9844,25.5313 416.4844,25.5313 C416.25,25.5313 416.0313,25.6094 415.8281,25.8125 C415.3906,26.25 415.3906,26.25 415.2188,26.3438 C414.7656,26.5781 414.125,26.7188 413.3594,26.7188 C411.3594,26.7188 410.0781,25.7031 410.0781,24.125 L410.0781,23.0781 C410.0781,21.375 411.2969,20.1719 413,20.1719 C413.5781,20.1719 414.1563,20.3125 414.625,20.5625 C415.0938,20.8281 415.2656,21.0156 415.3281,21.375 C415.4531,22.0469 415.7031,22.2969 416.2344,22.2969 C416.5156,22.2969 416.7969,22.1563 416.9844,21.9375 C417.1094,21.7656 417.1563,21.5938 417.1563,21.1563 L417.1563,19.7969 C417.1563,19.375 417.1406,19.2344 417.0156,19.0625 C416.8438,18.8125 416.5625,18.6563 416.2344,18.6563 C415.9219,18.6563 415.7188,18.7656 415.5,19.0313 C414.3281,18.5313 413.8906,18.4219 412.9375,18.4219 C410.2656,18.4219 408.25,20.4375 408.25,23.0625 L408.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="433.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="331" x2="514" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="331" x2="514" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="336" y="55.9"/>
-          <ellipse cx="341" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="350" y="64.0059">g1 : G1</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="336" y="72.6999"/>
-          <ellipse cx="341" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="350" y="80.8059">g3 : G3 &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="336" y="89.4998"/>
-          <ellipse cx="341" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="350" y="97.6058">g4 : std::shared_ptr&lt;G4&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="336.5" y="190"/>
+      <ellipse cx="351.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M354.4688,211.6406 Q353.8906,211.9375 353.25,212.0781 Q352.6094,212.2344 351.9063,212.2344 Q349.4063,212.2344 348.0781,210.5938 Q346.7656,208.9375 346.7656,205.8125 Q346.7656,202.6875 348.0781,201.0313 Q349.4063,199.375 351.9063,199.375 Q352.6094,199.375 353.25,199.5313 Q353.9063,199.6875 354.4688,199.9844 L354.4688,202.7031 Q353.8438,202.125 353.25,201.8594 Q352.6563,201.5781 352.0313,201.5781 Q350.6875,201.5781 350,202.6563 Q349.3125,203.7188 349.3125,205.8125 Q349.3125,207.9063 350,208.9844 Q350.6875,210.0469 352.0313,210.0469 Q352.6563,210.0469 353.25,209.7813 Q353.8438,209.5 354.4688,208.9219 L354.4688,211.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="365.5" y="210.1543">G1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="384.5" y1="222" y2="222"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="384.5" y1="230" y2="230"/>
     </a>
-    <g id="link_C_0000348749731659902910_C_0001980718063838190763">
-      <path codeLine="44" d="M399.677,116.9141 C396.307,126.6841 397,125.62 394.5,135.4 C388.33,159.56 384.26,187.84 381.94,207.27 " fill="none" id="C_0000348749731659902910-backto-C_0001980718063838190763" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="403.59,105.57,397.8522,109.9377,399.677,116.9141,405.4149,112.5464,403.59,105.57" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="400.5" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="407.5" y="148.477">g1</text>
-    </g>
-    <g id="link_C_0000348749731659902910_C_0000715074622924270214">
-      <path codeLine="45" d="M434.48,105.5 C442.73,138.77 451.8759,175.6664 458.3059,201.5964 " fill="none" id="C_0000348749731659902910-to-C_0000715074622924270214" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="459.75,207.42,461.4662,197.7218,458.5466,202.567,453.7014,199.6473,459.75,207.42" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="451.5" cy="144.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="458.5" y="148.477">g4</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="83.5" y="190"/>
+      <ellipse cx="98.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M101.4688,211.6406 Q100.8906,211.9375 100.25,212.0781 Q99.6094,212.2344 98.9063,212.2344 Q96.4063,212.2344 95.0781,210.5938 Q93.7656,208.9375 93.7656,205.8125 Q93.7656,202.6875 95.0781,201.0313 Q96.4063,199.375 98.9063,199.375 Q99.6094,199.375 100.25,199.5313 Q100.9063,199.6875 101.4688,199.9844 L101.4688,202.7031 Q100.8438,202.125 100.25,201.8594 Q99.6563,201.5781 99.0313,201.5781 Q97.6875,201.5781 97,202.6563 Q96.3125,203.7188 96.3125,205.8125 Q96.3125,207.9063 97,208.9844 Q97.6875,210.0469 99.0313,210.0469 Q99.6563,210.0469 100.25,209.7813 Q100.8438,209.5 101.4688,208.9219 L101.4688,211.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="112.5" y="210.1543">G2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="84.5" x2="131.5" y1="222" y2="222"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="84.5" x2="131.5" y1="230" y2="230"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="167.5" y="190"/>
+      <ellipse cx="182.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M185.4688,211.6406 Q184.8906,211.9375 184.25,212.0781 Q183.6094,212.2344 182.9063,212.2344 Q180.4063,212.2344 179.0781,210.5938 Q177.7656,208.9375 177.7656,205.8125 Q177.7656,202.6875 179.0781,201.0313 Q180.4063,199.375 182.9063,199.375 Q183.6094,199.375 184.25,199.5313 Q184.9063,199.6875 185.4688,199.9844 L185.4688,202.7031 Q184.8438,202.125 184.25,201.8594 Q183.6563,201.5781 183.0313,201.5781 Q181.6875,201.5781 181,202.6563 Q180.3125,203.7188 180.3125,205.8125 Q180.3125,207.9063 181,208.9844 Q181.6875,210.0469 183.0313,210.0469 Q183.6563,210.0469 184.25,209.7813 Q184.8438,209.5 185.4688,208.9219 L185.4688,211.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="196.5" y="210.1543">G3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="168.5" x2="215.5" y1="222" y2="222"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="168.5" x2="215.5" y1="230" y2="230"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="420.5" y="190"/>
+      <ellipse cx="435.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M438.4688,211.6406 Q437.8906,211.9375 437.25,212.0781 Q436.6094,212.2344 435.9063,212.2344 Q433.4063,212.2344 432.0781,210.5938 Q430.7656,208.9375 430.7656,205.8125 Q430.7656,202.6875 432.0781,201.0313 Q433.4063,199.375 435.9063,199.375 Q436.6094,199.375 437.25,199.5313 Q437.9063,199.6875 438.4688,199.9844 L438.4688,202.7031 Q437.8438,202.125 437.25,201.8594 Q436.6563,201.5781 436.0313,201.5781 Q434.6875,201.5781 434,202.6563 Q433.3125,203.7188 433.3125,205.8125 Q433.3125,207.9063 434,208.9844 Q434.6875,210.0469 436.0313,210.0469 Q436.6563,210.0469 437.25,209.7813 Q437.8438,209.5 438.4688,208.9219 L438.4688,211.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="449.5" y="210.1543">G4</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="421.5" x2="468.5" y1="222" y2="222"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="421.5" x2="468.5" y1="230" y2="230"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="316" 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="317" x2="489" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="317" x2="489" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="54"/>
+      <ellipse cx="327" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="336" y="62.2104">g1 : G1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="66.8047"/>
+      <ellipse cx="327" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="336" y="75.0151">g3 : G3 &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="79.6094"/>
+      <ellipse cx="327" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="336" y="87.8198">g4 : std::shared_ptr&lt;G4&gt;</text>
+    </a>
+    <path d="M377.56,106.71 C375.45,112.47 373.54,118.3 372,124 C366.05,145.94 363.31,171.8 362.05,189.98 " fill="none" id="C_0000348749731659902910&lt;-C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="382.43,94.31,376.5162,98.4364,378.0507,105.4824,383.9645,101.3559,382.43,94.31" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="378" 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="385" y="137.0669">g1</text>
+    <path d="M414.04,94.3 C421.51,122.95 431.17,160 437.7,185.03 " fill="none" id="C_0000348749731659902910-&gt;C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="438.97,189.87,440.5803,180.1537,437.7137,185.0304,432.837,182.1638,438.97,189.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="432" 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="439" y="137.0669">g4</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00029_class_mermaid.svg b/docs/test_cases/t00029_class_mermaid.svg
index 4529e08a..6687ad63 100644
--- a/docs/test_cases/t00029_class_mermaid.svg
+++ b/docs/test_cases/t00029_class_mermaid.svg
@@ -1,62 +1,57 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 916.234375 286" style="max-width: 916.234px; background-color: white;" width="916.234375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M775.4247691533425,158.68151409729188L773.5115263777853,163.40126174774323C771.5982836022282,168.1210093981946,767.7717980511142,177.56050469909732,765.858555275557,187.94691901621533C763.9453125,198.33333333333334,763.9453125,209.66666666666666,763.9453125,215.33333333333334L763.9453125,221"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M832.0474251760563,142L835.0876980633802,149.5C838.1279709507043,157,844.2085167253521,172,847.248789612676,184.16666666666666C850.2890625,196.33333333333334,850.2890625,205.66666666666666,850.2890625,210.33333333333334L850.2890625,215"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M782.1869498239437,142L779.1466769366198,149.5C776.1064040492957,157,770.0258582746479,172,766.985585387324,185.16666666666666C763.9453125,198.33333333333334,763.9453125,209.66666666666666,763.9453125,215.33333333333334L763.9453125,221"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M832.0474251760563,142L835.0876980633802,149.5C838.1279709507043,157,844.2085167253521,172,847.248789612676,185.16666666666666C850.2890625,198.33333333333334,850.2890625,209.66666666666666,850.2890625,215.33333333333334L850.2890625,221"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(763.9453125, 187)" class="edgeLabel">
@@ -83,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L7">
+        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L7">
           <g title="A" id="classId-C_0001970994826766369014-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -102,7 +97,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L12">
+        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L12">
           <g title="C" id="classId-C_0000543766389270348470-1" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -126,7 +121,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.3125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L17">
+        <a transform="translate(267.3125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L17">
           <g title="D" id="classId-C_0001496914969429483234-2" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -150,7 +145,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(422.4375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L21">
+        <a transform="translate(422.4375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L21">
           <g title="E" id="classId-C_0001936873082456592219-3" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -184,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L26">
+        <a transform="translate(763.9453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L26">
           <g title="G1" id="classId-C_0001980718063838190763-4" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -203,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(551.484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L28">
+        <a transform="translate(551.484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L28">
           <g title="G2" id="classId-C_0002204627213593766591-5" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -222,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(637.828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L30">
+        <a transform="translate(637.828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L30">
           <g title="G3" id="classId-C_0000767180516665070631-6" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -241,7 +236,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(850.2890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L32">
+        <a transform="translate(850.2890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L32">
           <g title="G4" id="classId-C_0000715074622924270214-7" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -260,7 +255,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(807.1171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00029/t00029.cc#L34">
+        <a transform="translate(807.1171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L34">
           <g title="R" id="classId-C_0000348749731659902910-8" class="node default clickable">
             <rect height="123" width="202.234375" y="-61.5" x="-101.1171875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="101.1171875" x1="-101.1171875" class="divider"/>
diff --git a/docs/test_cases/t00030.md b/docs/test_cases/t00030.md
index f7b750b7..c05d7c5b 100644
--- a/docs/test_cases/t00030.md
+++ b/docs/test_cases/t00030.md
@@ -63,7 +63,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00030::A",
+      "display_name": "A",
       "id": "64769484767514424",
       "is_abstract": false,
       "is_nested": false,
@@ -85,7 +85,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00030::B",
+      "display_name": "B",
       "id": "156923198106222307",
       "is_abstract": false,
       "is_nested": false,
@@ -107,7 +107,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00030::C",
+      "display_name": "C",
       "id": "1651557398557662399",
       "is_abstract": false,
       "is_nested": false,
@@ -129,7 +129,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00030::D",
+      "display_name": "D",
       "id": "1089781072752262158",
       "is_abstract": false,
       "is_nested": false,
@@ -151,7 +151,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00030::E",
+      "display_name": "E",
       "id": "425964641881054607",
       "is_abstract": false,
       "is_nested": false,
@@ -173,7 +173,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00030::R",
+      "display_name": "R",
       "id": "263468735940481091",
       "is_abstract": false,
       "is_nested": false,
@@ -276,6 +276,7 @@ struct R {
     }
   ],
   "name": "t00030_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index 73fc0628..6b46e951 100644
--- a/docs/test_cases/t00030_class.svg
+++ b/docs/test_cases/t00030_class.svg
@@ -1,138 +1,122 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="271px" preserveAspectRatio="none" style="width:360px;height:271px;background:#FFFFFF;" version="1.1" viewBox="0 0 360 271" width="360px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:366px;height:256px;" version="1.1" viewBox="0 0 366 256" width="366px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fgi6faca77s8z" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000064769484767514424">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000064769484767514424" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="216"/>
-        <ellipse cx="22" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,233.1563 C17,235.6563 19.1406,237.4688 22.0625,237.4688 C23.2969,237.4688 24.4688,237.1719 25.2188,236.6563 C25.8281,236.2344 26.1563,235.8125 26.1563,235.4063 C26.1563,234.9375 25.7344,234.5313 25.2344,234.5313 C25,234.5313 24.7813,234.6094 24.5781,234.8125 C24.1406,235.25 24.1406,235.25 23.9688,235.3438 C23.5156,235.5781 22.875,235.7188 22.1094,235.7188 C20.1094,235.7188 18.8281,234.7031 18.8281,233.125 L18.8281,232.0781 C18.8281,230.375 20.0469,229.1719 21.75,229.1719 C22.3281,229.1719 22.9063,229.3125 23.375,229.5625 C23.8438,229.8281 24.0156,230.0156 24.0781,230.375 C24.2031,231.0469 24.4531,231.2969 24.9844,231.2969 C25.2656,231.2969 25.5469,231.1563 25.7344,230.9375 C25.8594,230.7656 25.9063,230.5938 25.9063,230.1563 L25.9063,228.7969 C25.9063,228.375 25.8906,228.2344 25.7656,228.0625 C25.5938,227.8125 25.3125,227.6563 24.9844,227.6563 C24.6719,227.6563 24.4688,227.7656 24.25,228.0313 C23.0781,227.5313 22.6406,227.4219 21.6875,227.4219 C19.0156,227.4219 17,229.4375 17,232.0625 L17,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="236.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+      <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000156923198106222307">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000156923198106222307" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="216"/>
-        <ellipse cx="98" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93,233.1563 C93,235.6563 95.1406,237.4688 98.0625,237.4688 C99.2969,237.4688 100.4688,237.1719 101.2188,236.6563 C101.8281,236.2344 102.1563,235.8125 102.1563,235.4063 C102.1563,234.9375 101.7344,234.5313 101.2344,234.5313 C101,234.5313 100.7813,234.6094 100.5781,234.8125 C100.1406,235.25 100.1406,235.25 99.9688,235.3438 C99.5156,235.5781 98.875,235.7188 98.1094,235.7188 C96.1094,235.7188 94.8281,234.7031 94.8281,233.125 L94.8281,232.0781 C94.8281,230.375 96.0469,229.1719 97.75,229.1719 C98.3281,229.1719 98.9063,229.3125 99.375,229.5625 C99.8438,229.8281 100.0156,230.0156 100.0781,230.375 C100.2031,231.0469 100.4531,231.2969 100.9844,231.2969 C101.2656,231.2969 101.5469,231.1563 101.7344,230.9375 C101.8594,230.7656 101.9063,230.5938 101.9063,230.1563 L101.9063,228.7969 C101.9063,228.375 101.8906,228.2344 101.7656,228.0625 C101.5938,227.8125 101.3125,227.6563 100.9844,227.6563 C100.6719,227.6563 100.4688,227.7656 100.25,228.0313 C99.0781,227.5313 98.6406,227.4219 97.6875,227.4219 C95.0156,227.4219 93,229.4375 93,232.0625 L93,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="236.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
+      <ellipse cx="99" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M101.9688,218.6406 Q101.3906,218.9375 100.75,219.0781 Q100.1094,219.2344 99.4063,219.2344 Q96.9063,219.2344 95.5781,217.5938 Q94.2656,215.9375 94.2656,212.8125 Q94.2656,209.6875 95.5781,208.0313 Q96.9063,206.375 99.4063,206.375 Q100.1094,206.375 100.75,206.5313 Q101.4063,206.6875 101.9688,206.9844 L101.9688,209.7031 Q101.3438,209.125 100.75,208.8594 Q100.1563,208.5781 99.5313,208.5781 Q98.1875,208.5781 97.5,209.6563 Q96.8125,210.7188 96.8125,212.8125 Q96.8125,214.9063 97.5,215.9844 Q98.1875,217.0469 99.5313,217.0469 Q100.1563,217.0469 100.75,216.7813 Q101.3438,216.5 101.9688,215.9219 L101.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="217.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001651557398557662399">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001651557398557662399" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="216"/>
-        <ellipse cx="173.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M168.5,233.1563 C168.5,235.6563 170.6406,237.4688 173.5625,237.4688 C174.7969,237.4688 175.9688,237.1719 176.7188,236.6563 C177.3281,236.2344 177.6563,235.8125 177.6563,235.4063 C177.6563,234.9375 177.2344,234.5313 176.7344,234.5313 C176.5,234.5313 176.2813,234.6094 176.0781,234.8125 C175.6406,235.25 175.6406,235.25 175.4688,235.3438 C175.0156,235.5781 174.375,235.7188 173.6094,235.7188 C171.6094,235.7188 170.3281,234.7031 170.3281,233.125 L170.3281,232.0781 C170.3281,230.375 171.5469,229.1719 173.25,229.1719 C173.8281,229.1719 174.4063,229.3125 174.875,229.5625 C175.3438,229.8281 175.5156,230.0156 175.5781,230.375 C175.7031,231.0469 175.9531,231.2969 176.4844,231.2969 C176.7656,231.2969 177.0469,231.1563 177.2344,230.9375 C177.3594,230.7656 177.4063,230.5938 177.4063,230.1563 L177.4063,228.7969 C177.4063,228.375 177.3906,228.2344 177.2656,228.0625 C177.0938,227.8125 176.8125,227.6563 176.4844,227.6563 C176.1719,227.6563 175.9688,227.7656 175.75,228.0313 C174.5781,227.5313 174.1406,227.4219 173.1875,227.4219 C170.5156,227.4219 168.5,229.4375 168.5,232.0625 L168.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="236.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
+      <ellipse cx="176" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M178.9688,218.6406 Q178.3906,218.9375 177.75,219.0781 Q177.1094,219.2344 176.4063,219.2344 Q173.9063,219.2344 172.5781,217.5938 Q171.2656,215.9375 171.2656,212.8125 Q171.2656,209.6875 172.5781,208.0313 Q173.9063,206.375 176.4063,206.375 Q177.1094,206.375 177.75,206.5313 Q178.4063,206.6875 178.9688,206.9844 L178.9688,209.7031 Q178.3438,209.125 177.75,208.8594 Q177.1563,208.5781 176.5313,208.5781 Q175.1875,208.5781 174.5,209.6563 Q173.8125,210.7188 173.8125,212.8125 Q173.8125,214.9063 174.5,215.9844 Q175.1875,217.0469 176.5313,217.0469 Q177.1563,217.0469 177.75,216.7813 Q178.3438,216.5 178.9688,215.9219 L178.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190" y="217.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001089781072752262158">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001089781072752262158" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="235.5" y="216"/>
-        <ellipse cx="250.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M245.5,233.1563 C245.5,235.6563 247.6406,237.4688 250.5625,237.4688 C251.7969,237.4688 252.9688,237.1719 253.7188,236.6563 C254.3281,236.2344 254.6563,235.8125 254.6563,235.4063 C254.6563,234.9375 254.2344,234.5313 253.7344,234.5313 C253.5,234.5313 253.2813,234.6094 253.0781,234.8125 C252.6406,235.25 252.6406,235.25 252.4688,235.3438 C252.0156,235.5781 251.375,235.7188 250.6094,235.7188 C248.6094,235.7188 247.3281,234.7031 247.3281,233.125 L247.3281,232.0781 C247.3281,230.375 248.5469,229.1719 250.25,229.1719 C250.8281,229.1719 251.4063,229.3125 251.875,229.5625 C252.3438,229.8281 252.5156,230.0156 252.5781,230.375 C252.7031,231.0469 252.9531,231.2969 253.4844,231.2969 C253.7656,231.2969 254.0469,231.1563 254.2344,230.9375 C254.3594,230.7656 254.4063,230.5938 254.4063,230.1563 L254.4063,228.7969 C254.4063,228.375 254.3906,228.2344 254.2656,228.0625 C254.0938,227.8125 253.8125,227.6563 253.4844,227.6563 C253.1719,227.6563 252.9688,227.7656 252.75,228.0313 C251.5781,227.5313 251.1406,227.4219 250.1875,227.4219 C247.5156,227.4219 245.5,229.4375 245.5,232.0625 L245.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="264.5" y="236.606">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236.5" x2="276.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
+      <ellipse cx="251.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M254.4688,218.6406 Q253.8906,218.9375 253.25,219.0781 Q252.6094,219.2344 251.9063,219.2344 Q249.4063,219.2344 248.0781,217.5938 Q246.7656,215.9375 246.7656,212.8125 Q246.7656,209.6875 248.0781,208.0313 Q249.4063,206.375 251.9063,206.375 Q252.6094,206.375 253.25,206.5313 Q253.9063,206.6875 254.4688,206.9844 L254.4688,209.7031 Q253.8438,209.125 253.25,208.8594 Q252.6563,208.5781 252.0313,208.5781 Q250.6875,208.5781 250,209.6563 Q249.3125,210.7188 249.3125,212.8125 Q249.3125,214.9063 250,215.9844 Q250.6875,217.0469 252.0313,217.0469 Q252.6563,217.0469 253.25,216.7813 Q253.8438,216.5 254.4688,215.9219 L254.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="265.5" y="217.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0000425964641881054607">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000425964641881054607" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="312" y="216"/>
-        <ellipse cx="327" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M322,233.1563 C322,235.6563 324.1406,237.4688 327.0625,237.4688 C328.2969,237.4688 329.4688,237.1719 330.2188,236.6563 C330.8281,236.2344 331.1563,235.8125 331.1563,235.4063 C331.1563,234.9375 330.7344,234.5313 330.2344,234.5313 C330,234.5313 329.7813,234.6094 329.5781,234.8125 C329.1406,235.25 329.1406,235.25 328.9688,235.3438 C328.5156,235.5781 327.875,235.7188 327.1094,235.7188 C325.1094,235.7188 323.8281,234.7031 323.8281,233.125 L323.8281,232.0781 C323.8281,230.375 325.0469,229.1719 326.75,229.1719 C327.3281,229.1719 327.9063,229.3125 328.375,229.5625 C328.8438,229.8281 329.0156,230.0156 329.0781,230.375 C329.2031,231.0469 329.4531,231.2969 329.9844,231.2969 C330.2656,231.2969 330.5469,231.1563 330.7344,230.9375 C330.8594,230.7656 330.9063,230.5938 330.9063,230.1563 L330.9063,228.7969 C330.9063,228.375 330.8906,228.2344 330.7656,228.0625 C330.5938,227.8125 330.3125,227.6563 329.9844,227.6563 C329.6719,227.6563 329.4688,227.7656 329.25,228.0313 C328.0781,227.5313 327.6406,227.4219 326.6875,227.4219 C324.0156,227.4219 322,229.4375 322,232.0625 L322,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="341" y="236.606">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313" x2="352" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
+      <ellipse cx="330" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M332.9688,218.6406 Q332.3906,218.9375 331.75,219.0781 Q331.1094,219.2344 330.4063,219.2344 Q327.9063,219.2344 326.5781,217.5938 Q325.2656,215.9375 325.2656,212.8125 Q325.2656,209.6875 326.5781,208.0313 Q327.9063,206.375 330.4063,206.375 Q331.1094,206.375 331.75,206.5313 Q332.4063,206.6875 332.9688,206.9844 L332.9688,209.7031 Q332.3438,209.125 331.75,208.8594 Q331.1563,208.5781 330.5313,208.5781 Q329.1875,208.5781 328.5,209.6563 Q327.8125,210.7188 327.8125,212.8125 Q327.8125,214.9063 328.5,215.9844 Q329.1875,217.0469 330.5313,217.0469 Q331.1563,217.0469 331.75,216.7813 Q332.3438,216.5 332.9688,215.9219 L332.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="344" y="217.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000263468735940481091">
-        <rect codeLine="22" fill="#F1F1F1" height="131.9996" id="C_0000263468735940481091" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="103" y="7"/>
-        <ellipse cx="170.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M165.25,24.1563 C165.25,26.6563 167.3906,28.4688 170.3125,28.4688 C171.5469,28.4688 172.7188,28.1719 173.4688,27.6563 C174.0781,27.2344 174.4063,26.8125 174.4063,26.4063 C174.4063,25.9375 173.9844,25.5313 173.4844,25.5313 C173.25,25.5313 173.0313,25.6094 172.8281,25.8125 C172.3906,26.25 172.3906,26.25 172.2188,26.3438 C171.7656,26.5781 171.125,26.7188 170.3594,26.7188 C168.3594,26.7188 167.0781,25.7031 167.0781,24.125 L167.0781,23.0781 C167.0781,21.375 168.2969,20.1719 170,20.1719 C170.5781,20.1719 171.1563,20.3125 171.625,20.5625 C172.0938,20.8281 172.2656,21.0156 172.3281,21.375 C172.4531,22.0469 172.7031,22.2969 173.2344,22.2969 C173.5156,22.2969 173.7969,22.1563 173.9844,21.9375 C174.1094,21.7656 174.1563,21.5938 174.1563,21.1563 L174.1563,19.7969 C174.1563,19.375 174.1406,19.2344 174.0156,19.0625 C173.8438,18.8125 173.5625,18.6563 173.2344,18.6563 C172.9219,18.6563 172.7188,18.7656 172.5,19.0313 C171.3281,18.5313 170.8906,18.4219 169.9375,18.4219 C167.2656,18.4219 165.25,20.4375 165.25,23.0625 L165.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="190.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="255" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="255" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="55.9"/>
-          <ellipse cx="114" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="123" y="64.0059">aaa : A</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="72.6999"/>
-          <ellipse cx="114" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="123" y="80.8059">bbb : std::vector&lt;B&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="89.4998"/>
-          <ellipse cx="114" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="123" y="97.6058">ccc : std::vector&lt;C&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="106.2997"/>
-          <ellipse cx="114" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="123" y="114.4057">ddd : D</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="109" y="123.0997"/>
-          <ellipse cx="114" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="123" y="131.2057">eee : E *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
+      <ellipse cx="173.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M176.7188,29.6406 Q176.1406,29.9375 175.5,30.0781 Q174.8594,30.2344 174.1563,30.2344 Q171.6563,30.2344 170.3281,28.5938 Q169.0156,26.9375 169.0156,23.8125 Q169.0156,20.6875 170.3281,19.0313 Q171.6563,17.375 174.1563,17.375 Q174.8594,17.375 175.5,17.5313 Q176.1563,17.6875 176.7188,17.9844 L176.7188,20.7031 Q176.0938,20.125 175.5,19.8594 Q174.9063,19.5781 174.2813,19.5781 Q172.9375,19.5781 172.25,20.6563 Q171.5625,21.7188 171.5625,23.8125 Q171.5625,25.9063 172.25,26.9844 Q172.9375,28.0469 174.2813,28.0469 Q174.9063,28.0469 175.5,27.7813 Q176.0938,27.5 176.7188,26.9219 L176.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="194.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="48" y2="48"/>
     </a>
-    <g id="link_C_0000263468735940481091_C_0000064769484767514424">
-      <path codeLine="30" d="M113.25,139.46 C103.8,149.23 94.3,159.28 85.5,169 C71.83,184.09 60.9788,197.0813 49.8388,210.8813 " fill="none" id="C_0000263468735940481091-to-C_0000064769484767514424" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="46.07,215.55,54.8356,211.0595,49.2106,211.6594,48.6107,206.0345,46.07,215.55" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="91.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="98.5" y="182.077">aaa</text>
-    </g>
-    <g id="link_C_0000263468735940481091_C_0000156923198106222307">
-      <path codeLine="31" d="M144.1299,150.2849 C139.5499,160.2049 139.91,159.42 135.5,169 C128.35,184.54 120.35,202.04 114.14,215.65 " fill="none" id="C_0000263468735940481091-backto-C_0000156923198106222307" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="149.16,139.39,143.0133,143.1607,144.1299,150.2849,150.2766,146.5141,149.16,139.39" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="141.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="148.5" y="182.077">bbb</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="122.8968" y="159.1179">0..1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="20" x="94.304" y="204.6423">1..*</text>
-    </g>
-    <g id="link_C_0000263468735940481091_C_0001651557398557662399">
-      <path codeLine="32" d="M178.4158,151.4396 C178.2958,166.7196 178.36,170.93 178.5,186 C178.59,195.66 178.78,206.32 178.96,215.52 " fill="none" id="C_0000263468735940481091-backto-C_0001651557398557662399" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="178.51,139.44,174.463,145.4084,178.4158,151.4396,182.4628,145.4712,178.51,139.44" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="184.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="191.5" y="182.077">ccc</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="155.2735" y="159.173">0..1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="154.0029" y="204.479">1..5</text>
-    </g>
-    <g id="link_C_0000263468735940481091_C_0001089781072752262158">
-      <path codeLine="33" d="M209.93,139.21 C222.54,166.24 233.8209,190.4137 243.1109,210.3037 " fill="none" id="C_0000263468735940481091-to-C_0001089781072752262158" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="245.65,215.74,245.4655,205.8929,243.5341,211.2098,238.2172,209.2783,245.65,215.74" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="238.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="245.5" y="182.077">ddd</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="234.7934" y="204.3621">1</text>
-    </g>
-    <g id="link_C_0000263468735940481091_C_0000425964641881054607">
-      <path codeLine="34" d="M255.7295,147.8405 C265.3695,157.6305 266.6,159.19 275.5,169 C289.19,184.09 303.68,201.9 314.62,215.78 " fill="none" id="C_0000263468735940481091-backto-C_0000425964641881054607" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="247.31,139.29,248.6696,146.3718,255.7295,147.8405,254.3699,140.7588,247.31,139.29" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="295.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="302.5" y="182.077">eee</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="301.8741" y="204.4129">1</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="54"/>
+      <ellipse cx="120" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="129" y="62.2104">aaa : A</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="66.8047"/>
+      <ellipse cx="120" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="129" y="75.0151">bbb : std::vector&lt;B&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="79.6094"/>
+      <ellipse cx="120" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="117" x="129" y="87.8198">ccc : std::vector&lt;C&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="92.4141"/>
+      <ellipse cx="120" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="129" y="100.6245">ddd : D</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="105.2188"/>
+      <ellipse cx="120" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="129" y="113.4292">eee : E *</text>
+    </a>
+    <path d="M111.59,120.19 C100.65,129.74 89.75,139.87 80,150 C67.26,163.23 54.64,179.38 44.8,192.83 " fill="none" id="C_0000263468735940481091-&gt;C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="41.84,196.91,50.3591,191.9679,44.7732,192.8608,43.8804,187.2748,41.84,196.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="86" cy="159.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="93" y="163.0669">aaa</text>
+    <path d="M142.39,131.84 C139.12,137.93 135.94,144.04 133,150 C125.44,165.34 118.08,183.15 112.67,196.97 " fill="none" id="C_0000263468735940481091&lt;-C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="148.79,120.22,142.3933,123.549,143.006,130.734,149.4027,127.405,148.79,120.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="139" cy="159.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="146" y="163.0669">bbb</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="119.28" y="140.0594">0..1</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="88.9448" y="185.9743">1..*</text>
+    <path d="M179.08,133.13 C178.86,144.44 178.79,156.05 179,167 C179.18,176.76 179.56,187.52 179.93,196.79 " fill="none" id="C_0000263468735940481091&lt;-C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="179.41,120.05,175.2595,125.9469,179.1065,132.0462,183.257,126.1493,179.41,120.05" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="185" cy="159.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="192" y="163.0669">ccc</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="153.5407" y="140.2662">0..1</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="152.5808" y="185.7482">1..5</text>
+    <path d="M208.65,120.08 C220.43,144.41 233.76,171.96 243.43,191.97 " fill="none" id="C_0000263468735940481091-&gt;C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="245.69,196.62,245.3559,186.7768,243.5055,192.1225,238.1598,190.272,245.69,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="237" cy="159.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="244" y="163.0669">ddd</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="233.9582" y="185.9323">1</text>
+    <path d="M256.17,129.39 C263.35,136.2 270.4,143.15 277,150 C291.34,164.89 306.19,182.88 317.28,196.88 " fill="none" id="C_0000263468735940481091&lt;-C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="246.34,120.2,247.9895,127.2199,255.1039,128.3972,253.4543,121.3773,246.34,120.2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="298" cy="159.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="305" y="163.0669">eee</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="303.7143" y="185.8613">1</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00030_class_mermaid.svg b/docs/test_cases/t00030_class_mermaid.svg
index 74a57f33..1e97b1d1 100644
--- a/docs/test_cases/t00030_class_mermaid.svg
+++ b/docs/test_cases/t00030_class_mermaid.svg
@@ -1,65 +1,60 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 358.4279479980469 308" style="max-width: 358.428px; background-color: white;" width="358.4279479980469" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M95.375,155.78329081632654L83.81640625,164.6527423469388C72.2578125,173.52219387755102,49.140625,191.26109693877552,37.58203125,204.79721513605443C26.0234375,218.33333333333334,26.0234375,227.66666666666666,26.0234375,232.33333333333334L26.0234375,237"/>
-        <path marker-start="url(#my-svg_classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M114.91349099713536,190.0809791227637L112.8588987476128,193.23414926896976C110.80430649809023,196.38731941517577,106.69512199904511,202.6936597075879,104.64052974952256,211.51349652046062C102.5859375,220.33333333333334,102.5859375,231.66666666666666,102.5859375,237.33333333333334L102.5859375,243"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M179.1484375,193L179.1484375,195.66666666666666C179.1484375,198.33333333333334,179.1484375,203.66666666666666,179.1484375,212C179.1484375,220.33333333333334,179.1484375,231.66666666666666,179.1484375,237.33333333333334L179.1484375,243"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M233.55668218085106,175L237.2490580673759,180.66666666666666C240.9414339539007,186.33333333333334,248.32618572695037,197.66666666666666,252.01856161347519,208C255.7109375,218.33333333333334,255.7109375,227.66666666666666,255.7109375,232.33333333333334L255.7109375,237"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M277.1866643455093,166.94875053760734L286.2935744545911,173.95729211467278C295.4004845636729,180.96583369173823,313.61430478183644,194.9829168458691,322.72121489091825,207.6581250896012C331.828125,220.33333333333334,331.828125,231.66666666666666,331.828125,237.33333333333334L331.828125,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M95.375,155.78329081632654L83.81640625,164.6527423469388C72.2578125,173.52219387755102,49.140625,191.26109693877552,37.58203125,205.79721513605443C26.0234375,220.33333333333334,26.0234375,231.66666666666666,26.0234375,237.33333333333334L26.0234375,243"/>
+        <path marker-start="url(#classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M124.74019281914894,175L121.04781693262412,180.66666666666666C117.3554410460993,186.33333333333334,109.97068927304964,197.66666666666666,106.27831338652481,209C102.5859375,220.33333333333334,102.5859375,231.66666666666666,102.5859375,237.33333333333334L102.5859375,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M179.1484375,175L179.1484375,180.66666666666666C179.1484375,186.33333333333334,179.1484375,197.66666666666666,179.1484375,209C179.1484375,220.33333333333334,179.1484375,231.66666666666666,179.1484375,237.33333333333334L179.1484375,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M233.55668218085106,175L237.2490580673759,180.66666666666666C240.9414339539007,186.33333333333334,248.32618572695037,197.66666666666666,252.01856161347519,209C255.7109375,220.33333333333334,255.7109375,231.66666666666666,255.7109375,237.33333333333334L255.7109375,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M262.921875,155.9707823773218L274.40625,164.80898531443484C285.890625,173.64718825154787,308.859375,191.32359412577395,320.34375,205.82846372955365C331.828125,220.33333333333334,331.828125,231.66666666666666,331.828125,237.33333333333334L331.828125,243"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(26.0234375, 209)" class="edgeLabel">
@@ -84,7 +79,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(102.61897272808127, 181.47314847121535)" class="edgeTerminals">
+        <g transform="translate(102.61897233433264, 181.47314485100895)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner">
             <foreignObject style="width: 36px; height: 12px;">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -93,7 +88,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(112.85706231246161, 220.81611634952438)" class="edgeTerminals">
+        <g transform="translate(112.85706003335923, 220.81611325920693)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner"/>
           <foreignObject style="width: 36px; height: 12px;">
             <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -112,7 +107,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(164.14843875000003, 192.50000107142858)" class="edgeTerminals">
+        <g transform="translate(164.1484375, 192.5)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner">
             <foreignObject style="width: 36px; height: 12px;">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -121,7 +116,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(189.14843874999997, 220.50000107142858)" class="edgeTerminals">
+        <g transform="translate(189.1484375, 220.5)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner"/>
           <foreignObject style="width: 36px; height: 12px;">
             <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -140,7 +135,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(265.4361323461854, 220.346055802515)" class="edgeTerminals">
+        <g transform="translate(265.4361321543585, 220.34605456730625)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner"/>
           <foreignObject style="width: 9px; height: 12px;">
             <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -159,7 +154,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(341.42795177924654, 220.35168031829014)" class="edgeTerminals">
+        <g transform="translate(341.42795009741303, 220.35168030193194)" class="edgeTerminals">
           <g transform="translate(0, 0)" class="inner"/>
           <foreignObject style="width: 9px; height: 12px;">
             <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -169,7 +164,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L7">
+        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L7">
           <g title="A" id="classId-C_0000064769484767514424-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -188,7 +183,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L9">
+        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L9">
           <g title="B" id="classId-C_0000156923198106222307-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -207,7 +202,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L11">
+        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L11">
           <g title="C" id="classId-C_0001651557398557662399-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -226,7 +221,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L13">
+        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L13">
           <g title="D" id="classId-C_0001089781072752262158-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -245,7 +240,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L15">
+        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L15">
           <g title="E" id="classId-C_0000425964641881054607-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -264,7 +259,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00030/t00030.cc#L17">
+        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L17">
           <g title="R" id="classId-C_0000263468735940481091-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
@@ -302,7 +297,7 @@
               </foreignObject>
               <foreignObject transform="translate( -76.2734375, 46)" height="18" width="60.046875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+eee : E</span>
+                  <span style="font-style:italic;" class="nodeLabel">+eee : E </span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md
index 3d4b3846..ae7ed19d 100644
--- a/docs/test_cases/t00031.md
+++ b/docs/test_cases/t00031.md
@@ -71,7 +71,7 @@ struct R {
         "formatted": "@uml{style[#back:lightgreen|yellow;header:blue/red]}",
         "raw": "/// @uml{style[#back:lightgreen|yellow;header:blue/red]}"
       },
-      "display_name": "clanguml::t00031::A",
+      "display_name": "A",
       "id": "847775539502907247",
       "is_abstract": false,
       "is_nested": false,
@@ -101,7 +101,7 @@ struct R {
         "two",
         "three"
       ],
-      "display_name": "clanguml::t00031::B",
+      "display_name": "B",
       "id": "1441796358326382179",
       "is_nested": false,
       "name": "B",
@@ -120,7 +120,7 @@ struct R {
         "formatted": "@uml{style[#pink;line:red;line.bold;text:red]}",
         "raw": "/// @uml{style[#pink;line:red;line.bold;text:red]}"
       },
-      "display_name": "clanguml::t00031::C<T>",
+      "display_name": "C<T>",
       "id": "116209144733282955",
       "is_abstract": false,
       "is_nested": false,
@@ -162,7 +162,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00031::D",
+      "display_name": "D",
       "id": "2266534344475505157",
       "is_abstract": false,
       "is_nested": false,
@@ -184,7 +184,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00031::C<int>",
+      "display_name": "C<int>",
       "id": "208700529175860645",
       "is_abstract": false,
       "is_nested": false,
@@ -213,7 +213,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00031::R",
+      "display_name": "R",
       "id": "484712092364868032",
       "is_abstract": false,
       "is_nested": false,
@@ -332,6 +332,7 @@ struct R {
     }
   ],
   "name": "t00031_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index 42a52250..124465ef 100644
--- a/docs/test_cases/t00031_class.svg
+++ b/docs/test_cases/t00031_class.svg
@@ -1,159 +1,140 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="447px" preserveAspectRatio="none" style="width:344px;height:447px;background:#FFFFFF;" version="1.1" viewBox="0 0 344 447" width="344px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="415px" preserveAspectRatio="none" style="width:353px;height:415px;" version="1.1" viewBox="0 0 353 415" width="353px" zoomAndPan="magnify">
   <defs>
-    <linearGradient id="gxnv4lsmfylvj0" x1="0%" x2="100%" y1="50%" y2="50%">
+    <linearGradient id="g1w9w99rpyeptj0" x1="0%" x2="100%" y1="50%" y2="50%">
       <stop offset="0%" stop-color="#90EE90"/>
       <stop offset="100%" stop-color="#FFFF00"/>
     </linearGradient>
-    <linearGradient id="gxnv4lsmfylvj1" x1="0%" x2="100%" y1="0%" y2="100%">
+    <filter height="300%" id="f1w9w99rpyeptj" 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="g1w9w99rpyeptj1" x1="0%" x2="100%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#0000FF"/>
       <stop offset="100%" stop-color="#FF0000"/>
     </linearGradient>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000847775539502907247">
-        <rect codeLine="2" fill="url(#gxnv4lsmfylvj0)" height="48" id="C_0000847775539502907247" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="241.2"/>
-        <rect fill="url(#gxnv4lsmfylvj1)" height="32" rx="2.5" ry="2.5" style="stroke:url(#gxnv4lsmfylvj1);stroke-width:0.5;" width="41" x="7" y="241.2"/>
-        <rect fill="url(#gxnv4lsmfylvj1)" height="2.5" style="stroke:url(#gxnv4lsmfylvj1);stroke-width:0.5;" width="41" x="7" y="270.7"/>
-        <rect codeLine="2" fill="none" height="48" id="C_0000847775539502907247" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="241.2"/>
-        <ellipse cx="22" cy="257.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,258.3563 C17,260.8563 19.1406,262.6688 22.0625,262.6688 C23.2969,262.6688 24.4688,262.3719 25.2188,261.8563 C25.8281,261.4344 26.1563,261.0125 26.1563,260.6063 C26.1563,260.1375 25.7344,259.7313 25.2344,259.7313 C25,259.7313 24.7813,259.8094 24.5781,260.0125 C24.1406,260.45 24.1406,260.45 23.9688,260.5438 C23.5156,260.7781 22.875,260.9188 22.1094,260.9188 C20.1094,260.9188 18.8281,259.9031 18.8281,258.325 L18.8281,257.2781 C18.8281,255.575 20.0469,254.3719 21.75,254.3719 C22.3281,254.3719 22.9063,254.5125 23.375,254.7625 C23.8438,255.0281 24.0156,255.2156 24.0781,255.575 C24.2031,256.2469 24.4531,256.4969 24.9844,256.4969 C25.2656,256.4969 25.5469,256.3563 25.7344,256.1375 C25.8594,255.9656 25.9063,255.7938 25.9063,255.3563 L25.9063,253.9969 C25.9063,253.575 25.8906,253.4344 25.7656,253.2625 C25.5938,253.0125 25.3125,252.8563 24.9844,252.8563 C24.6719,252.8563 24.4688,252.9656 24.25,253.2313 C23.0781,252.7313 22.6406,252.6219 21.6875,252.6219 C19.0156,252.6219 17,254.6375 17,257.2625 L17,258.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="261.806">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="273.2" y2="273.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="281.2" y2="281.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="url(#g1w9w99rpyeptj0)" filter="url(#f1w9w99rpyeptj)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
+      <rect fill="url(#g1w9w99rpyeptj1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
+      <ellipse cx="21" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,237.6406 Q23.3906,237.9375 22.75,238.0781 Q22.1094,238.2344 21.4063,238.2344 Q18.9063,238.2344 17.5781,236.5938 Q16.2656,234.9375 16.2656,231.8125 Q16.2656,228.6875 17.5781,227.0313 Q18.9063,225.375 21.4063,225.375 Q22.1094,225.375 22.75,225.5313 Q23.4063,225.6875 23.9688,225.9844 L23.9688,228.7031 Q23.3438,228.125 22.75,227.8594 Q22.1563,227.5781 21.5313,227.5781 Q20.1875,227.5781 19.5,228.6563 Q18.8125,229.7188 18.8125,231.8125 Q18.8125,233.9063 19.5,234.9844 Q20.1875,236.0469 21.5313,236.0469 Q22.1563,236.0469 22.75,235.7813 Q23.3438,235.5 23.9688,234.9219 L23.9688,237.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="236.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="248" y2="248"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001441796358326382179">
-        <rect codeLine="6" fill="#F1F1F1" height="98.3998" id="C_0001441796358326382179" rx="2.5" ry="2.5" style="stroke:#0000FF;stroke-width:1.0;stroke-dasharray:1.0,3.0;" width="45" x="101" y="216"/>
-        <ellipse cx="117.8" cy="232" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M116.6594,233.0625 L117.9719,233.0625 L117.9719,233.1094 C117.9719,233.5156 117.9875,233.6719 118.0969,233.8281 C118.2688,234.0781 118.5656,234.25 118.8781,234.25 C119.1594,234.25 119.4563,234.1094 119.6281,233.8906 C119.7531,233.7031 119.8,233.5625 119.8,233.1094 L119.8,231.2656 C119.8,230.9375 119.7844,230.8281 119.7219,230.6563 C119.6125,230.3594 119.2531,230.1094 118.8781,230.1094 C118.5813,230.1094 118.3156,230.25 118.1438,230.4688 C118.0031,230.6563 117.9719,230.8281 117.9719,231.2656 L117.9719,231.3281 L116.6594,231.3281 L116.6594,229.1563 L120.5031,229.1563 L120.5031,229.9063 C120.5031,230.2969 120.5344,230.4844 120.6438,230.6406 C120.8156,230.8906 121.1125,231.0625 121.425,231.0625 C121.7219,231.0625 121.9875,230.9375 122.175,230.7031 C122.3156,230.5156 122.3469,230.375 122.3469,229.9063 L122.3469,227.4063 L114.6438,227.4063 C114.1906,227.4063 114.0656,227.4219 113.8938,227.5313 C113.6281,227.7031 113.4563,227.9688 113.4563,228.2813 C113.4563,228.5625 113.5813,228.8281 113.8313,229 C114.0188,229.125 114.2063,229.1563 114.6438,229.1563 L114.8313,229.1563 L114.8313,235.25 L114.6438,235.25 C114.2219,235.25 114.0656,235.2813 113.8938,235.375 C113.6281,235.5313 113.4563,235.8125 113.4563,236.1094 C113.4563,236.6875 113.8625,237 114.6438,237 L122.7219,237 L122.7219,234.4688 C122.7219,234.0625 122.6906,233.8906 122.5813,233.7344 C122.4094,233.4688 122.1281,233.3125 121.8,233.3125 C121.5188,233.3125 121.2375,233.4531 121.05,233.6719 C120.9094,233.8594 120.8781,234.0156 120.8781,234.4688 L120.8781,235.25 L116.6594,235.25 L116.6594,233.0625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="132.2" y="236.606">B</text>
-        <line style="stroke:#0000FF;stroke-width:1.0;stroke-dasharray:1.0,3.0;" x1="102" x2="145" y1="248" y2="248"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="107" y="265.0059">one</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="22" x="107" y="281.8059">two</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="107" y="298.6058">three</text>
-        <line style="stroke:#0000FF;stroke-width:1.0;stroke-dasharray:1.0,3.0;" x1="102" x2="145" y1="306.3998" y2="306.3998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w9w99rpyeptj)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="103" y="197"/>
+      <ellipse cx="118.9" cy="213" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
+      <path d="M123.0094,219 L115.2906,219 L115.2906,206.6094 L123.0094,206.6094 L123.0094,208.7656 L117.7438,208.7656 L117.7438,211.4375 L122.5094,211.4375 L122.5094,213.5938 L117.7438,213.5938 L117.7438,216.8438 L123.0094,216.8438 L123.0094,219 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="133.1" y="217.1543">B</text>
+      <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="104" x2="144" y1="229" y2="229"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="109" y="243.2104">one</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="20" x="109" y="256.0151">two</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="109" y="268.8198">three</text>
+      <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="104" x2="144" y1="275.4141" y2="275.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000116209144733282955">
-        <rect codeLine="12" fill="#FFC0CB" height="64.7999" id="C_0000116209144733282955" rx="2.5" ry="2.5" style="stroke:#FF0000;stroke-width:2.0;" width="59" x="274" y="375.4"/>
-        <ellipse cx="291.7" cy="391.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M286.7,392.5563 C286.7,395.0563 288.8406,396.8688 291.7625,396.8688 C292.9969,396.8688 294.1688,396.5719 294.9188,396.0563 C295.5281,395.6344 295.8563,395.2125 295.8563,394.8063 C295.8563,394.3375 295.4344,393.9313 294.9344,393.9313 C294.7,393.9313 294.4813,394.0094 294.2781,394.2125 C293.8406,394.65 293.8406,394.65 293.6688,394.7438 C293.2156,394.9781 292.575,395.1188 291.8094,395.1188 C289.8094,395.1188 288.5281,394.1031 288.5281,392.525 L288.5281,391.4781 C288.5281,389.775 289.7469,388.5719 291.45,388.5719 C292.0281,388.5719 292.6063,388.7125 293.075,388.9625 C293.5438,389.2281 293.7156,389.4156 293.7781,389.775 C293.9031,390.4469 294.1531,390.6969 294.6844,390.6969 C294.9656,390.6969 295.2469,390.5563 295.4344,390.3375 C295.5594,390.1656 295.6063,389.9938 295.6063,389.5563 L295.6063,388.1969 C295.6063,387.775 295.5906,387.6344 295.4656,387.4625 C295.2938,387.2125 295.0125,387.0563 294.6844,387.0563 C294.3719,387.0563 294.1688,387.1656 293.95,387.4313 C292.7781,386.9313 292.3406,386.8219 291.3875,386.8219 C288.7156,386.8219 286.7,388.8375 286.7,391.4625 L286.7,392.5563 Z " fill="#000000"/>
-        <text fill="#FF0000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="306.3" y="396.006">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="327" y="372.4"/>
-        <text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="328" y="386.6001">T</text>
-        <line style="stroke:#FF0000;stroke-width:0.5;" x1="275" x2="332" y1="407.4" y2="407.4"/>
-        <line style="stroke:#FF0000;stroke-width:0.5;" x1="275" x2="332" y1="415.4" y2="415.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
-          <rect fill="#FFC0CB" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="280" y="424.3"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="282" y="426.3"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
-          <text fill="#FF0000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="294" y="432.4059">ttt : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FFC0CB" filter="url(#f1w9w99rpyeptj)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
+      <rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
+      <ellipse cx="298.2" cy="360" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/>
+      <path d="M301.1688,365.6406 Q300.5906,365.9375 299.95,366.0781 Q299.3094,366.2344 298.6063,366.2344 Q296.1063,366.2344 294.7781,364.5938 Q293.4656,362.9375 293.4656,359.8125 Q293.4656,356.6875 294.7781,355.0313 Q296.1063,353.375 298.6063,353.375 Q299.3094,353.375 299.95,353.5313 Q300.6063,353.6875 301.1688,353.9844 L301.1688,356.7031 Q300.5438,356.125 299.95,355.8594 Q299.3563,355.5781 298.7313,355.5781 Q297.3875,355.5781 296.7,356.6563 Q296.0125,357.7188 296.0125,359.8125 Q296.0125,361.9063 296.7,362.9844 Q297.3875,364.0469 298.7313,364.0469 Q299.3563,364.0469 299.95,363.7813 Q300.5438,363.5 301.1688,362.9219 L301.1688,365.6406 Z "/>
+      <text fill="#FF0000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="312.8" y="364.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="331.5" y="341"/>
+      <text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="332.5" y="353.1387">T</text>
+      <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="376" y2="376"/>
+      <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="384" y2="384"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0002266534344475505157">
-        <rect codeLine="17" fill="#F1F1F1" height="48" id="C_0002266534344475505157" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="197.5" y="241.2"/>
-        <ellipse cx="212.5" cy="257.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M207.5,258.3563 C207.5,260.8563 209.6406,262.6688 212.5625,262.6688 C213.7969,262.6688 214.9688,262.3719 215.7188,261.8563 C216.3281,261.4344 216.6563,261.0125 216.6563,260.6063 C216.6563,260.1375 216.2344,259.7313 215.7344,259.7313 C215.5,259.7313 215.2813,259.8094 215.0781,260.0125 C214.6406,260.45 214.6406,260.45 214.4688,260.5438 C214.0156,260.7781 213.375,260.9188 212.6094,260.9188 C210.6094,260.9188 209.3281,259.9031 209.3281,258.325 L209.3281,257.2781 C209.3281,255.575 210.5469,254.3719 212.25,254.3719 C212.8281,254.3719 213.4063,254.5125 213.875,254.7625 C214.3438,255.0281 214.5156,255.2156 214.5781,255.575 C214.7031,256.2469 214.9531,256.4969 215.4844,256.4969 C215.7656,256.4969 216.0469,256.3563 216.2344,256.1375 C216.3594,255.9656 216.4063,255.7938 216.4063,255.3563 L216.4063,253.9969 C216.4063,253.575 216.3906,253.4344 216.2656,253.2625 C216.0938,253.0125 215.8125,252.8563 215.4844,252.8563 C215.1719,252.8563 214.9688,252.9656 214.75,253.2313 C213.5781,252.7313 213.1406,252.6219 212.1875,252.6219 C209.5156,252.6219 207.5,254.6375 207.5,257.2625 L207.5,258.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="226.5" y="261.806">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="198.5" x2="238.5" y1="273.2" y2="273.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="198.5" x2="238.5" y1="281.2" y2="281.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+      <rect fill="#FFC0CB" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="390"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="288.5" y="392"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000208700529175860645">
-        <rect codeLine="21" fill="#F1F1F1" height="48" id="C_0000208700529175860645" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="274" y="241.2"/>
-        <ellipse cx="289" cy="257.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M284,258.3563 C284,260.8563 286.1406,262.6688 289.0625,262.6688 C290.2969,262.6688 291.4688,262.3719 292.2188,261.8563 C292.8281,261.4344 293.1563,261.0125 293.1563,260.6063 C293.1563,260.1375 292.7344,259.7313 292.2344,259.7313 C292,259.7313 291.7813,259.8094 291.5781,260.0125 C291.1406,260.45 291.1406,260.45 290.9688,260.5438 C290.5156,260.7781 289.875,260.9188 289.1094,260.9188 C287.1094,260.9188 285.8281,259.9031 285.8281,258.325 L285.8281,257.2781 C285.8281,255.575 287.0469,254.3719 288.75,254.3719 C289.3281,254.3719 289.9063,254.5125 290.375,254.7625 C290.8438,255.0281 291.0156,255.2156 291.0781,255.575 C291.2031,256.2469 291.4531,256.4969 291.9844,256.4969 C292.2656,256.4969 292.5469,256.3563 292.7344,256.1375 C292.8594,255.9656 292.9063,255.7938 292.9063,255.3563 L292.9063,253.9969 C292.9063,253.575 292.8906,253.4344 292.7656,253.2625 C292.5938,253.0125 292.3125,252.8563 291.9844,252.8563 C291.6719,252.8563 291.4688,252.9656 291.25,253.2313 C290.0781,252.7313 289.6406,252.6219 288.6875,252.6219 C286.0156,252.6219 284,254.6375 284,257.2625 L284,258.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="303" y="261.806">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="321" y="238.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="322" y="252.4001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="275" x2="332" y1="273.2" y2="273.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="275" x2="332" y1="281.2" y2="281.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+      <text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="300.5" y="398.2104">ttt : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000484712092364868032">
-        <rect codeLine="25" fill="#F1F1F1" height="131.9996" id="C_0000484712092364868032" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="67" y="7"/>
-        <ellipse cx="134.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M129.25,24.1563 C129.25,26.6563 131.3906,28.4688 134.3125,28.4688 C135.5469,28.4688 136.7188,28.1719 137.4688,27.6563 C138.0781,27.2344 138.4063,26.8125 138.4063,26.4063 C138.4063,25.9375 137.9844,25.5313 137.4844,25.5313 C137.25,25.5313 137.0313,25.6094 136.8281,25.8125 C136.3906,26.25 136.3906,26.25 136.2188,26.3438 C135.7656,26.5781 135.125,26.7188 134.3594,26.7188 C132.3594,26.7188 131.0781,25.7031 131.0781,24.125 L131.0781,23.0781 C131.0781,21.375 132.2969,20.1719 134,20.1719 C134.5781,20.1719 135.1563,20.3125 135.625,20.5625 C136.0938,20.8281 136.2656,21.0156 136.3281,21.375 C136.4531,22.0469 136.7031,22.2969 137.2344,22.2969 C137.5156,22.2969 137.7969,22.1563 137.9844,21.9375 C138.1094,21.7656 138.1563,21.5938 138.1563,21.1563 L138.1563,19.7969 C138.1563,19.375 138.1406,19.2344 138.0156,19.0625 C137.8438,18.8125 137.5625,18.6563 137.2344,18.6563 C136.9219,18.6563 136.7188,18.7656 136.5,19.0313 C135.3281,18.5313 134.8906,18.4219 133.9375,18.4219 C131.2656,18.4219 129.25,20.4375 129.25,23.0625 L129.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="154.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="68" x2="219" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="47.9"/>
-          <ellipse cx="78" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="109" x="87" y="56.0059">add_b(B b) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="68" x2="219" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="72.6999"/>
-          <ellipse cx="78" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="87" y="80.8059">aaa : A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="89.4998"/>
-          <ellipse cx="78" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="87" y="97.6058">bbb : std::vector&lt;B&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="106.2997"/>
-          <ellipse cx="78" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="87" y="114.4057">ccc : C&lt;int&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="73" y="123.0997"/>
-          <ellipse cx="78" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="87" y="131.2057">ddd : D *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w9w99rpyeptj)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="202.5" y="216"/>
+      <ellipse cx="217.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M220.4688,237.6406 Q219.8906,237.9375 219.25,238.0781 Q218.6094,238.2344 217.9063,238.2344 Q215.4063,238.2344 214.0781,236.5938 Q212.7656,234.9375 212.7656,231.8125 Q212.7656,228.6875 214.0781,227.0313 Q215.4063,225.375 217.9063,225.375 Q218.6094,225.375 219.25,225.5313 Q219.9063,225.6875 220.4688,225.9844 L220.4688,228.7031 Q219.8438,228.125 219.25,227.8594 Q218.6563,227.5781 218.0313,227.5781 Q216.6875,227.5781 216,228.6563 Q215.3125,229.7188 215.3125,231.8125 Q215.3125,233.9063 216,234.9844 Q216.6875,236.0469 218.0313,236.0469 Q218.6563,236.0469 219.25,235.7813 Q219.8438,235.5 220.4688,234.9219 L220.4688,237.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="231.5" y="236.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="248" y2="248"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="256" y2="256"/>
     </a>
-    <g id="link_C_0000208700529175860645_C_0000116209144733282955">
-      <path codeLine="33" d="M303.5,289.42 C303.5,312.82 303.5,331.09 303.5,357.13 " fill="none" id="C_0000208700529175860645-to-C_0000116209144733282955" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="303.5,375.13,309.5,357.13,297.5,357.13,303.5,375.13" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000484712092364868032_C_0001441796358326382179">
-      <path codeLine="34" d="M115.26,139.3 C112.05,149.1 109.29,159.2 107.5,169 C104.72,184.17 104.9159,194.8306 107.6959,209.8206 " fill="none" id="C_0000484712092364868032-to-C_0001441796358326382179" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="108.79,215.72,111.0818,206.1415,107.8783,210.8038,103.2159,207.6003,108.79,215.72" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000484712092364868032_C_0001441796358326382179">
-      <path codeLine="36" d="M135.3613,151.3938 C132.7213,176.4238 131.03,192.58 128.59,215.75 " fill="none" id="C_0000484712092364868032-backto-C_0001441796358326382179" style="stroke:#008000;stroke-width:4.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#008000" points="136.62,139.46,132.0127,145.0073,135.3613,151.3938,139.9686,145.8465,136.62,139.46" style="stroke:#008000;stroke-width:4.0;"/>
-      <ellipse cx="139.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="146.5" y="182.077">bbb</text>
-    </g>
-    <g id="link_C_0000484712092364868032_C_0000847775539502907247">
-      <path codeLine="35" d="M83.68,139.35 C76.36,148.93 69.39,158.96 63.5,169 C50,192.01 41.6365,215.2568 35.6165,235.1668 " fill="none" id="C_0000484712092364868032-to-C_0000847775539502907247" style="stroke:#FF0000;stroke-width:2.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#FF0000" points="33.88,240.91,40.3136,233.4529,35.3271,236.124,32.656,231.1375,33.88,240.91" style="stroke:#FF0000;stroke-width:2.0;"/>
-      <ellipse cx="69.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="76.5" y="182.077">aaa</text>
-    </g>
-    <g id="link_C_0000484712092364868032_C_0000208700529175860645">
-      <path codeLine="37" d="M210.9613,148.4653 C219.6013,158.2753 220.39,159.34 228.5,169 C248.66,193.01 270.76,221.32 285.71,240.79 " fill="none" id="C_0000484712092364868032-backto-C_0000208700529175860645" style="stroke:#0000FF;stroke-width:8.0;stroke-dasharray:1.0,3.0;"/>
-      <polygon fill="none" points="203.03,139.46,203.9939,146.6064,210.9613,148.4653,209.9974,141.3189,203.03,139.46" style="stroke:#0000FF;stroke-width:8.0;"/>
-      <ellipse cx="247.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="254.5" y="182.077">ccc</text>
-    </g>
-    <g id="link_C_0000484712092364868032_C_0002266534344475505157">
-      <path codeLine="38" d="M169.31,139.46 C183.21,174.7 197.29,210.3979 207.19,235.5179 " fill="none" id="C_0000484712092364868032-to-C_0002266534344475505157" style="stroke:#0000FF;stroke-width:16.0;"/>
-      <polygon fill="#0000FF" points="209.39,241.1,209.8115,231.2602,207.5567,236.4482,202.3686,234.1934,209.39,241.1" style="stroke:#0000FF;stroke-width:16.0;"/>
-      <ellipse cx="191.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="198.5" y="182.077">ddd</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w9w99rpyeptj)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="279" y="216"/>
+      <ellipse cx="294" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M296.9688,237.6406 Q296.3906,237.9375 295.75,238.0781 Q295.1094,238.2344 294.4063,238.2344 Q291.9063,238.2344 290.5781,236.5938 Q289.2656,234.9375 289.2656,231.8125 Q289.2656,228.6875 290.5781,227.0313 Q291.9063,225.375 294.4063,225.375 Q295.1094,225.375 295.75,225.5313 Q296.4063,225.6875 296.9688,225.9844 L296.9688,228.7031 Q296.3438,228.125 295.75,227.8594 Q295.1563,227.5781 294.5313,227.5781 Q293.1875,227.5781 292.5,228.6563 Q291.8125,229.7188 291.8125,231.8125 Q291.8125,233.9063 292.5,234.9844 Q293.1875,236.0469 294.5313,236.0469 Q295.1563,236.0469 295.75,235.7813 Q296.3438,235.5 296.9688,234.9219 L296.9688,237.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="308" y="236.1543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="324" y="213"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="325" y="225.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="248" y2="248"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="256" y2="256"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w9w99rpyeptj)" height="112.0234" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="72" y="8"/>
+      <ellipse cx="136.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M139.7188,29.6406 Q139.1406,29.9375 138.5,30.0781 Q137.8594,30.2344 137.1563,30.2344 Q134.6563,30.2344 133.3281,28.5938 Q132.0156,26.9375 132.0156,23.8125 Q132.0156,20.6875 133.3281,19.0313 Q134.6563,17.375 137.1563,17.375 Q137.8594,17.375 138.5,17.5313 Q139.1563,17.6875 139.7188,17.9844 L139.7188,20.7031 Q139.0938,20.125 138.5,19.8594 Q137.9063,19.5781 137.2813,19.5781 Q135.9375,19.5781 135.25,20.6563 Q134.5625,21.7188 134.5625,23.8125 Q134.5625,25.9063 135.25,26.9844 Q135.9375,28.0469 137.2813,28.0469 Q137.9063,28.0469 138.5,27.7813 Q139.0938,27.5 139.7188,26.9219 L139.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="46"/>
+      <ellipse cx="83" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="92" y="54.2104">add_b(B b) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="66.8047"/>
+      <ellipse cx="83" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="92" y="75.0151">aaa : A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="79.6094"/>
+      <ellipse cx="83" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="92" y="87.8198">bbb : std::vector&lt;B&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="92.4141"/>
+      <ellipse cx="83" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="92" y="100.6245">ccc : C&lt;int&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="105.2188"/>
+      <ellipse cx="83" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="92" y="113.4292">ddd : D *</text>
+    </a>
+    <path d="M309,264.08 C309,280.48 309,303.13 309,323.57 " fill="none" id="C_0000208700529175860645-&gt;C_0000116209144733282955" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="316,323.71,309,343.71,302,323.71,316,323.71" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M117.89,120.22 C114.21,129.93 111.01,140.11 109,150 C106.25,163.54 107.17,178.31 109.57,191.86 " fill="none" id="C_0000484712092364868032-&gt;C_0001441796358326382179" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="110.51,196.79,112.7425,187.1975,109.5679,191.8796,104.8858,188.7049,110.51,196.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M136.77,133.2 C134.17,154.72 131.38,177.86 129.07,196.99 " fill="none" id="C_0000484712092364868032&lt;-C_0001441796358326382179" style="stroke: #008000; stroke-width: 4.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#008000" points="138.36,120.05,133.6698,125.5274,136.9219,131.9635,141.6121,126.4861,138.36,120.05" style="stroke: #008000; stroke-width: 4.0;"/>
+    <ellipse cx="141" cy="159.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="148" y="163.0669">bbb</text>
+    <path d="M85.02,120.44 C76.66,129.81 68.66,139.81 62,150 C49.66,168.87 40.31,192.65 34.24,210.88 " fill="none" id="C_0000484712092364868032-&gt;C_0000847775539502907247" style="stroke: #FF0000; stroke-width: 2.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#FF0000" points="32.61,215.87,39.2178,208.5668,34.1697,211.1195,31.617,206.0713,32.61,215.87" style="stroke: #FF0000; stroke-width: 2.0;"/>
+    <ellipse cx="68" cy="159.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="75" y="163.0669">aaa</text>
+    <path d="M214.95,129.47 C221.84,136.29 228.63,143.21 235,150 C255.08,171.39 276.32,197.33 290.88,215.67 " fill="none" id="C_0000484712092364868032&lt;-C_0000208700529175860645" style="stroke: #0000FF; stroke-width: 8.0; stroke-dasharray: 1.0,3.0;"/>
+    <polygon fill="#FFFFFF" points="205.53,120.26,207.021,127.3153,214.107,128.6526,212.616,121.5973,205.53,120.26" style="stroke: #0000FF; stroke-width: 8.0;"/>
+    <ellipse cx="256" cy="159.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="263" y="163.0669">ccc</text>
+    <path d="M169.68,120.05 C183.24,150.3 199.47,186.52 210.44,210.98 " fill="none" id="C_0000484712092364868032-&gt;C_0002266534344475505157" style="stroke: #0000FF; stroke-width: 16.0;"/>
+    <polygon fill="#0000FF" points="212.56,215.71,212.5285,205.8612,210.5147,211.1475,205.2285,209.1336,212.56,215.71" style="stroke: #0000FF; stroke-width: 16.0;"/>
+    <ellipse cx="195" cy="159.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="202" y="163.0669">ddd</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00031_class_mermaid.svg b/docs/test_cases/t00031_class_mermaid.svg
index 360b468d..8094d804 100644
--- a/docs/test_cases/t00031_class_mermaid.svg
+++ b/docs/test_cases/t00031_class_mermaid.svg
@@ -1,66 +1,61 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 410.4140625 525" style="max-width: 410.414px; background-color: white;" width="410.4140625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M370.015625,344L370.015625,355.5C370.015625,367,370.015625,390,370.015625,402.6666666666667C370.015625,415.3333333333333,370.015625,417.6666666666667,370.015625,418.8333333333333L370.015625,420"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M129.4291722074468,175L125.70985704787233,180.66666666666666C121.99054188829787,186.33333333333334,114.55191156914894,197.66666666666666,112.74919163622992,208.0729299101619C110.94647170331093,218.47919315365712,114.7796621566219,227.9583863073142,116.69625738327737,232.6979828841428L118.61285260993284,237.43757946097134"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M100.4609375,153.71680410843908L88.0546875,162.9306700903659C75.6484375,172.1445360722927,50.8359375,190.57226803614637,38.4296875,211.7861340180732C26.0234375,233,26.0234375,257,26.0234375,269L26.0234375,281"/>
-        <path marker-start="url(#my-svg_classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M184.234375,193L184.234375,195.66666666666666C184.234375,198.33333333333334,184.234375,203.66666666666666,182.42238849765258,212C180.61040199530518,220.33333333333334,176.98642899061034,231.66666666666666,175.1744424882629,237.33333333333334L173.3624559859155,243"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M283.220529132409,154.10520429568678L297.6863784436742,163.2543369130723C312.15222775493936,172.40346953045787,341.08392637746965,190.70173476522893,355.5497756887348,212.85086738261444C370.015625,235,370.015625,261,370.015625,274L370.015625,287"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M248.2639960106383,175L252.6093195921986,180.66666666666666C256.9546431737588,186.33333333333334,265.64529033687944,197.66666666666666,269.9906139184397,215.33333333333334C274.3359375,233,274.3359375,257,274.3359375,269L274.3359375,281"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M370.015625,344L370.015625,355.5C370.015625,367,370.015625,390,370.015625,405.6666666666667C370.015625,421.3333333333333,370.015625,429.6666666666667,370.015625,433.8333333333333L370.015625,438"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M129.4291722074468,175L125.70985704787233,180.66666666666666C121.99054188829787,186.33333333333334,114.55191156914894,197.66666666666666,113.12407968422235,209C111.69624779929579,220.33333333333334,116.27921434859155,231.66666666666666,118.57069762323944,237.33333333333334L120.86218089788733,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M100.4609375,153.71680410843908L88.0546875,162.9306700903659C75.6484375,172.1445360722927,50.8359375,190.57226803614637,38.4296875,212.7861340180732C26.0234375,235,26.0234375,261,26.0234375,274L26.0234375,287"/>
+        <path marker-start="url(#classDiagram-compositionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M184.234375,175L184.234375,180.66666666666666C184.234375,186.33333333333334,184.234375,197.66666666666666,182.42238849765258,209C180.61040199530518,220.33333333333334,176.98642899061034,231.66666666666666,175.1744424882629,237.33333333333334L173.3624559859155,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M268.0078125,144.4837047939445L285.0091145833333,155.23642066162043C302.0104166666667,165.98913652929633,336.0130208333333,187.49456826464817,353.0143229166667,211.2472841323241C370.015625,235,370.015625,261,370.015625,274L370.015625,287"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M248.2639960106383,175L252.6093195921986,180.66666666666666C256.9546431737588,186.33333333333334,265.64529033687944,197.66666666666666,269.9906139184397,216.33333333333334C274.3359375,235,274.3359375,261,274.3359375,274L274.3359375,287"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -131,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L8">
+        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L8">
           <g title="A" id="classId-C_0000847775539502907247-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -150,7 +145,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L11">
+        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L11">
           <g title="B" id="classId-C_0001441796358326382179-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -184,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000116209144733282955-2" class="node default clickable">
             <rect height="79" width="56.484375" y="-39.5" x="-28.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.2421875" x1="-28.2421875" class="divider"/>
@@ -208,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L18">
+        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L18">
           <g title="D" id="classId-C_0002266534344475505157-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -227,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000208700529175860645-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -246,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00031/t00031.cc#L20">
+        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L20">
           <g title="R" id="classId-C_0000484712092364868032-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
@@ -264,7 +259,7 @@
               </foreignObject>
               <foreignObject transform="translate( -76.2734375, -42)" height="18" width="59.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+aaa : A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+aaa : A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -76.2734375, -20)" height="18" width="152.546875">
@@ -279,12 +274,12 @@
               </foreignObject>
               <foreignObject transform="translate( -76.2734375, 24)" height="18" width="60.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ddd : D</span>
+                  <span style="font-style:italic;" class="nodeLabel">+ddd : D </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -76.2734375, 58)" height="18" width="140.09375">
+              <foreignObject transform="translate( -76.2734375, 58)" height="18" width="131.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+add_b(B b) : : void</span>
+                  <span class="nodeLabel">+add_b(B b) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md
index 8c155730..e4d15f16 100644
--- a/docs/test_cases/t00032.md
+++ b/docs/test_cases/t00032.md
@@ -64,7 +64,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00032::Base",
+      "display_name": "Base",
       "id": "1619396229227632210",
       "is_abstract": false,
       "is_nested": false,
@@ -86,7 +86,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00032::TBase",
+      "display_name": "TBase",
       "id": "543776954602127752",
       "is_abstract": false,
       "is_nested": false,
@@ -108,7 +108,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00032::A",
+      "display_name": "A",
       "id": "687909853333071234",
       "is_abstract": false,
       "is_nested": false,
@@ -157,7 +157,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00032::B",
+      "display_name": "B",
       "id": "737235057776029746",
       "is_abstract": false,
       "is_nested": false,
@@ -206,7 +206,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00032::C",
+      "display_name": "C",
       "id": "1497964256865073382",
       "is_abstract": false,
       "is_nested": false,
@@ -262,7 +262,7 @@ struct R {
           "name": "clanguml::t00032::Base"
         }
       ],
-      "display_name": "clanguml::t00032::Overload<T,L,Ts...>",
+      "display_name": "Overload<T,L,Ts...>",
       "id": "1463422997970691679",
       "is_abstract": false,
       "is_nested": false,
@@ -341,7 +341,7 @@ struct R {
           "name": "clanguml::t00032::C"
         }
       ],
-      "display_name": "clanguml::t00032::Overload<clanguml::t00032::TBase,int,clanguml::t00032::A,clanguml::t00032::B,clanguml::t00032::C>",
+      "display_name": "Overload<TBase,int,A,B,C>",
       "id": "1706455047176879286",
       "is_abstract": false,
       "is_nested": false,
@@ -394,7 +394,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00032::R",
+      "display_name": "R",
       "id": "85539867332573320",
       "is_abstract": false,
       "is_nested": false,
@@ -429,6 +429,7 @@ struct R {
     }
   ],
   "name": "t00032_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index 8b17c560..82e2a80d 100644
--- a/docs/test_cases/t00032_class.svg
+++ b/docs/test_cases/t00032_class.svg
@@ -1,156 +1,132 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="329px" preserveAspectRatio="none" style="width:909px;height:329px;background:#FFFFFF;" version="1.1" viewBox="0 0 909 329" width="909px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="326px" preserveAspectRatio="none" style="width:850px;height:326px;" version="1.1" viewBox="0 0 850 326" width="850px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1fanmvv5y9fa4" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <g id="elem_C_0001619396229227632210">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001619396229227632210" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="64" x="168.5" y="148.8"/>
-        <ellipse cx="183.5" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M178.5,165.9563 C178.5,168.4563 180.6406,170.2688 183.5625,170.2688 C184.7969,170.2688 185.9688,169.9719 186.7188,169.4563 C187.3281,169.0344 187.6563,168.6125 187.6563,168.2063 C187.6563,167.7375 187.2344,167.3313 186.7344,167.3313 C186.5,167.3313 186.2813,167.4094 186.0781,167.6125 C185.6406,168.05 185.6406,168.05 185.4688,168.1438 C185.0156,168.3781 184.375,168.5188 183.6094,168.5188 C181.6094,168.5188 180.3281,167.5031 180.3281,165.925 L180.3281,164.8781 C180.3281,163.175 181.5469,161.9719 183.25,161.9719 C183.8281,161.9719 184.4063,162.1125 184.875,162.3625 C185.3438,162.6281 185.5156,162.8156 185.5781,163.175 C185.7031,163.8469 185.9531,164.0969 186.4844,164.0969 C186.7656,164.0969 187.0469,163.9563 187.2344,163.7375 C187.3594,163.5656 187.4063,163.3938 187.4063,162.9563 L187.4063,161.5969 C187.4063,161.175 187.3906,161.0344 187.2656,160.8625 C187.0938,160.6125 186.8125,160.4563 186.4844,160.4563 C186.1719,160.4563 185.9688,160.5656 185.75,160.8313 C184.5781,160.3313 184.1406,160.2219 183.1875,160.2219 C180.5156,160.2219 178.5,162.2375 178.5,164.8625 L178.5,165.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="197.5" y="169.406">Base</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="169.5" x2="231.5" y1="180.8" y2="180.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="169.5" x2="231.5" y1="188.8" y2="188.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="144.5" y="146"/>
+      <ellipse cx="159.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M162.4688,167.6406 Q161.8906,167.9375 161.25,168.0781 Q160.6094,168.2344 159.9063,168.2344 Q157.4063,168.2344 156.0781,166.5938 Q154.7656,164.9375 154.7656,161.8125 Q154.7656,158.6875 156.0781,157.0313 Q157.4063,155.375 159.9063,155.375 Q160.6094,155.375 161.25,155.5313 Q161.9063,155.6875 162.4688,155.9844 L162.4688,158.7031 Q161.8438,158.125 161.25,157.8594 Q160.6563,157.5781 160.0313,157.5781 Q158.6875,157.5781 158,158.6563 Q157.3125,159.7188 157.3125,161.8125 Q157.3125,163.9063 158,164.9844 Q158.6875,166.0469 160.0313,166.0469 Q160.6563,166.0469 161.25,165.7813 Q161.8438,165.5 162.4688,164.9219 L162.4688,167.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="173.5" y="166.1543">Base</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="178" y2="178"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
-      <g id="elem_C_0000543776954602127752">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000543776954602127752" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="73" x="7" y="15.4"/>
-        <ellipse cx="22" cy="31.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,32.5563 C17,35.0563 19.1406,36.8688 22.0625,36.8688 C23.2969,36.8688 24.4688,36.5719 25.2188,36.0563 C25.8281,35.6344 26.1563,35.2125 26.1563,34.8063 C26.1563,34.3375 25.7344,33.9313 25.2344,33.9313 C25,33.9313 24.7813,34.0094 24.5781,34.2125 C24.1406,34.65 24.1406,34.65 23.9688,34.7438 C23.5156,34.9781 22.875,35.1188 22.1094,35.1188 C20.1094,35.1188 18.8281,34.1031 18.8281,32.525 L18.8281,31.4781 C18.8281,29.775 20.0469,28.5719 21.75,28.5719 C22.3281,28.5719 22.9063,28.7125 23.375,28.9625 C23.8438,29.2281 24.0156,29.4156 24.0781,29.775 C24.2031,30.4469 24.4531,30.6969 24.9844,30.6969 C25.2656,30.6969 25.5469,30.5563 25.7344,30.3375 C25.8594,30.1656 25.9063,29.9938 25.9063,29.5563 L25.9063,28.1969 C25.9063,27.775 25.8906,27.6344 25.7656,27.4625 C25.5938,27.2125 25.3125,27.0563 24.9844,27.0563 C24.6719,27.0563 24.4688,27.1656 24.25,27.4313 C23.0781,26.9313 22.6406,26.8219 21.6875,26.8219 C19.0156,26.8219 17,28.8375 17,31.4625 L17,32.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="36" y="36.006">TBase</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="79" y1="47.4" y2="47.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="79" y1="55.4" y2="55.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="6" y="14.5"/>
+      <ellipse cx="21" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,36.1406 Q23.3906,36.4375 22.75,36.5781 Q22.1094,36.7344 21.4063,36.7344 Q18.9063,36.7344 17.5781,35.0938 Q16.2656,33.4375 16.2656,30.3125 Q16.2656,27.1875 17.5781,25.5313 Q18.9063,23.875 21.4063,23.875 Q22.1094,23.875 22.75,24.0313 Q23.4063,24.1875 23.9688,24.4844 L23.9688,27.2031 Q23.3438,26.625 22.75,26.3594 Q22.1563,26.0781 21.5313,26.0781 Q20.1875,26.0781 19.5,27.1563 Q18.8125,28.2188 18.8125,30.3125 Q18.8125,32.4063 19.5,33.4844 Q20.1875,34.5469 21.5313,34.5469 Q22.1563,34.5469 22.75,34.2813 Q23.3438,34 23.9688,33.4219 L23.9688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="35" y="34.6543">TBase</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000687909853333071234">
-        <rect codeLine="10" fill="#F1F1F1" height="64.7999" id="C_0000687909853333071234" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="115.5" y="7"/>
-        <ellipse cx="175.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M170.75,24.1563 C170.75,26.6563 172.8906,28.4688 175.8125,28.4688 C177.0469,28.4688 178.2188,28.1719 178.9688,27.6563 C179.5781,27.2344 179.9063,26.8125 179.9063,26.4063 C179.9063,25.9375 179.4844,25.5313 178.9844,25.5313 C178.75,25.5313 178.5313,25.6094 178.3281,25.8125 C177.8906,26.25 177.8906,26.25 177.7188,26.3438 C177.2656,26.5781 176.625,26.7188 175.8594,26.7188 C173.8594,26.7188 172.5781,25.7031 172.5781,24.125 L172.5781,23.0781 C172.5781,21.375 173.7969,20.1719 175.5,20.1719 C176.0781,20.1719 176.6563,20.3125 177.125,20.5625 C177.5938,20.8281 177.7656,21.0156 177.8281,21.375 C177.9531,22.0469 178.2031,22.2969 178.7344,22.2969 C179.0156,22.2969 179.2969,22.1563 179.4844,21.9375 C179.6094,21.7656 179.6563,21.5938 179.6563,21.1563 L179.6563,19.7969 C179.6563,19.375 179.6406,19.2344 179.5156,19.0625 C179.3438,18.8125 179.0625,18.6563 178.7344,18.6563 C178.4219,18.6563 178.2188,18.7656 178,19.0313 C176.8281,18.5313 176.3906,18.4219 175.4375,18.4219 C172.7656,18.4219 170.75,20.4375 170.75,23.0625 L170.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="196.25" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="116.5" x2="252.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="121.5" y="47.9"/>
-          <ellipse cx="126.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="135.5" y="56.0059">operator()() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="116.5" x2="252.5" y1="63.7999" y2="63.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="111" y="8"/>
+      <ellipse cx="165.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M168.7188,29.6406 Q168.1406,29.9375 167.5,30.0781 Q166.8594,30.2344 166.1563,30.2344 Q163.6563,30.2344 162.3281,28.5938 Q161.0156,26.9375 161.0156,23.8125 Q161.0156,20.6875 162.3281,19.0313 Q163.6563,17.375 166.1563,17.375 Q166.8594,17.375 167.5,17.5313 Q168.1563,17.6875 168.7188,17.9844 L168.7188,20.7031 Q168.0938,20.125 167.5,19.8594 Q166.9063,19.5781 166.2813,19.5781 Q164.9375,19.5781 164.25,20.6563 Q163.5625,21.7188 163.5625,23.8125 Q163.5625,25.9063 164.25,26.9844 Q164.9375,28.0469 166.2813,28.0469 Q166.9063,28.0469 167.5,27.7813 Q168.0938,27.5 168.7188,26.9219 L168.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="186.25" y="28.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000737235057776029746">
-        <rect codeLine="15" fill="#F1F1F1" height="64.7999" id="C_0000737235057776029746" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="288.5" y="7"/>
-        <ellipse cx="348.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M343.75,24.1563 C343.75,26.6563 345.8906,28.4688 348.8125,28.4688 C350.0469,28.4688 351.2188,28.1719 351.9688,27.6563 C352.5781,27.2344 352.9063,26.8125 352.9063,26.4063 C352.9063,25.9375 352.4844,25.5313 351.9844,25.5313 C351.75,25.5313 351.5313,25.6094 351.3281,25.8125 C350.8906,26.25 350.8906,26.25 350.7188,26.3438 C350.2656,26.5781 349.625,26.7188 348.8594,26.7188 C346.8594,26.7188 345.5781,25.7031 345.5781,24.125 L345.5781,23.0781 C345.5781,21.375 346.7969,20.1719 348.5,20.1719 C349.0781,20.1719 349.6563,20.3125 350.125,20.5625 C350.5938,20.8281 350.7656,21.0156 350.8281,21.375 C350.9531,22.0469 351.2031,22.2969 351.7344,22.2969 C352.0156,22.2969 352.2969,22.1563 352.4844,21.9375 C352.6094,21.7656 352.6563,21.5938 352.6563,21.1563 L352.6563,19.7969 C352.6563,19.375 352.6406,19.2344 352.5156,19.0625 C352.3438,18.8125 352.0625,18.6563 351.7344,18.6563 C351.4219,18.6563 351.2188,18.7656 351,19.0313 C349.8281,18.5313 349.3906,18.4219 348.4375,18.4219 C345.7656,18.4219 343.75,20.4375 343.75,23.0625 L343.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="369.25" y="27.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="289.5" x2="425.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="294.5" y="47.9"/>
-          <ellipse cx="299.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="308.5" y="56.0059">operator()() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="289.5" x2="425.5" y1="63.7999" y2="63.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
+      <ellipse cx="122" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001497964256865073382">
-        <rect codeLine="20" fill="#F1F1F1" height="64.7999" id="C_0001497964256865073382" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="461.5" y="7"/>
-        <ellipse cx="521.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M516.25,24.1563 C516.25,26.6563 518.3906,28.4688 521.3125,28.4688 C522.5469,28.4688 523.7188,28.1719 524.4688,27.6563 C525.0781,27.2344 525.4063,26.8125 525.4063,26.4063 C525.4063,25.9375 524.9844,25.5313 524.4844,25.5313 C524.25,25.5313 524.0313,25.6094 523.8281,25.8125 C523.3906,26.25 523.3906,26.25 523.2188,26.3438 C522.7656,26.5781 522.125,26.7188 521.3594,26.7188 C519.3594,26.7188 518.0781,25.7031 518.0781,24.125 L518.0781,23.0781 C518.0781,21.375 519.2969,20.1719 521,20.1719 C521.5781,20.1719 522.1563,20.3125 522.625,20.5625 C523.0938,20.8281 523.2656,21.0156 523.3281,21.375 C523.4531,22.0469 523.7031,22.2969 524.2344,22.2969 C524.5156,22.2969 524.7969,22.1563 524.9844,21.9375 C525.1094,21.7656 525.1563,21.5938 525.1563,21.1563 L525.1563,19.7969 C525.1563,19.375 525.1406,19.2344 525.0156,19.0625 C524.8438,18.8125 524.5625,18.6563 524.2344,18.6563 C523.9219,18.6563 523.7188,18.7656 523.5,19.0313 C522.3281,18.5313 521.8906,18.4219 520.9375,18.4219 C518.2656,18.4219 516.25,20.4375 516.25,23.0625 L516.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="541.75" y="27.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="462.5" x2="598.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="467.5" y="47.9"/>
-          <ellipse cx="472.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="112" x="481.5" y="56.0059">operator()() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="462.5" x2="598.5" y1="63.7999" y2="63.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="131" y="54.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <g id="elem_C_0001463422997970691679">
-        <rect codeLine="25" fill="#F1F1F1" height="64.7999" id="C_0001463422997970691679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="136" x="152.5" y="257.8"/>
-        <ellipse cx="167.5" cy="273.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M162.5,274.9563 C162.5,277.4563 164.6406,279.2688 167.5625,279.2688 C168.7969,279.2688 169.9688,278.9719 170.7188,278.4563 C171.3281,278.0344 171.6563,277.6125 171.6563,277.2063 C171.6563,276.7375 171.2344,276.3313 170.7344,276.3313 C170.5,276.3313 170.2813,276.4094 170.0781,276.6125 C169.6406,277.05 169.6406,277.05 169.4688,277.1438 C169.0156,277.3781 168.375,277.5188 167.6094,277.5188 C165.6094,277.5188 164.3281,276.5031 164.3281,274.925 L164.3281,273.8781 C164.3281,272.175 165.5469,270.9719 167.25,270.9719 C167.8281,270.9719 168.4063,271.1125 168.875,271.3625 C169.3438,271.6281 169.5156,271.8156 169.5781,272.175 C169.7031,272.8469 169.9531,273.0969 170.4844,273.0969 C170.7656,273.0969 171.0469,272.9563 171.2344,272.7375 C171.3594,272.5656 171.4063,272.3938 171.4063,271.9563 L171.4063,270.5969 C171.4063,270.175 171.3906,270.0344 171.2656,269.8625 C171.0938,269.6125 170.8125,269.4563 170.4844,269.4563 C170.1719,269.4563 169.9688,269.5656 169.75,269.8313 C168.5781,269.3313 168.1406,269.2219 167.1875,269.2219 C164.5156,269.2219 162.5,271.2375 162.5,273.8625 L162.5,274.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="181.5" y="278.406">Overload</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="44" x="247.5" y="254.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="248.5" y="269.0001">T,L,Ts...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="153.5" x2="287.5" y1="289.8" y2="289.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="153.5" x2="287.5" y1="297.8" y2="297.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="158.5" y="306.7"/>
-          <ellipse cx="163.5" cy="311.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="172.5" y="314.8059">counter : L</text>
-        </a>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="272" y="8"/>
+      <ellipse cx="326.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M329.7188,29.6406 Q329.1406,29.9375 328.5,30.0781 Q327.8594,30.2344 327.1563,30.2344 Q324.6563,30.2344 323.3281,28.5938 Q322.0156,26.9375 322.0156,23.8125 Q322.0156,20.6875 323.3281,19.0313 Q324.6563,17.375 327.1563,17.375 Q327.8594,17.375 328.5,17.5313 Q329.1563,17.6875 329.7188,17.9844 L329.7188,20.7031 Q329.0938,20.125 328.5,19.8594 Q327.9063,19.5781 327.2813,19.5781 Q325.9375,19.5781 325.25,20.6563 Q324.5625,21.7188 324.5625,23.8125 Q324.5625,25.9063 325.25,26.9844 Q325.9375,28.0469 327.2813,28.0469 Q327.9063,28.0469 328.5,27.7813 Q329.0938,27.5 329.7188,26.9219 L329.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="347.25" y="28.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <g id="elem_C_0001706455047176879286">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001706455047176879286" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="179" x="268" y="148.8"/>
-        <ellipse cx="283" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M278,165.9563 C278,168.4563 280.1406,170.2688 283.0625,170.2688 C284.2969,170.2688 285.4688,169.9719 286.2188,169.4563 C286.8281,169.0344 287.1563,168.6125 287.1563,168.2063 C287.1563,167.7375 286.7344,167.3313 286.2344,167.3313 C286,167.3313 285.7813,167.4094 285.5781,167.6125 C285.1406,168.05 285.1406,168.05 284.9688,168.1438 C284.5156,168.3781 283.875,168.5188 283.1094,168.5188 C281.1094,168.5188 279.8281,167.5031 279.8281,165.925 L279.8281,164.8781 C279.8281,163.175 281.0469,161.9719 282.75,161.9719 C283.3281,161.9719 283.9063,162.1125 284.375,162.3625 C284.8438,162.6281 285.0156,162.8156 285.0781,163.175 C285.2031,163.8469 285.4531,164.0969 285.9844,164.0969 C286.2656,164.0969 286.5469,163.9563 286.7344,163.7375 C286.8594,163.5656 286.9063,163.3938 286.9063,162.9563 L286.9063,161.5969 C286.9063,161.175 286.8906,161.0344 286.7656,160.8625 C286.5938,160.6125 286.3125,160.4563 285.9844,160.4563 C285.6719,160.4563 285.4688,160.5656 285.25,160.8313 C284.0781,160.3313 283.6406,160.2219 282.6875,160.2219 C280.0156,160.2219 278,162.2375 278,164.8625 L278,165.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="297" y="169.406">Overload</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="87" x="363" y="145.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="85" x="364" y="160.0001">TBase,int,A,B,C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="269" x2="446" y1="180.8" y2="180.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="269" x2="446" y1="188.8" y2="188.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="278" y="46"/>
+      <ellipse cx="283" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000085539867332573320">
-        <rect codeLine="34" fill="#F1F1F1" height="64.7999" id="C_0000085539867332573320" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="267" x="635" y="7"/>
-        <ellipse cx="759.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M754.25,24.1563 C754.25,26.6563 756.3906,28.4688 759.3125,28.4688 C760.5469,28.4688 761.7188,28.1719 762.4688,27.6563 C763.0781,27.2344 763.4063,26.8125 763.4063,26.4063 C763.4063,25.9375 762.9844,25.5313 762.4844,25.5313 C762.25,25.5313 762.0313,25.6094 761.8281,25.8125 C761.3906,26.25 761.3906,26.25 761.2188,26.3438 C760.7656,26.5781 760.125,26.7188 759.3594,26.7188 C757.3594,26.7188 756.0781,25.7031 756.0781,24.125 L756.0781,23.0781 C756.0781,21.375 757.2969,20.1719 759,20.1719 C759.5781,20.1719 760.1563,20.3125 760.625,20.5625 C761.0938,20.8281 761.2656,21.0156 761.3281,21.375 C761.4531,22.0469 761.7031,22.2969 762.2344,22.2969 C762.5156,22.2969 762.7969,22.1563 762.9844,21.9375 C763.1094,21.7656 763.1563,21.5938 763.1563,21.1563 L763.1563,19.7969 C763.1563,19.375 763.1406,19.2344 763.0156,19.0625 C762.8438,18.8125 762.5625,18.6563 762.2344,18.6563 C761.9219,18.6563 761.7188,18.7656 761.5,19.0313 C760.3281,18.5313 759.8906,18.4219 758.9375,18.4219 C756.2656,18.4219 754.25,20.4375 754.25,23.0625 L754.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="779.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="636" x2="901" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="636" x2="901" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="641" y="55.9"/>
-          <ellipse cx="646" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="241" x="655" y="64.0059">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="292" y="54.2104">operator()() : void</text>
     </a>
-    <g id="link_C_0001619396229227632210_C_0001463422997970691679">
-      <path codeLine="38" d="M207.6199,214.8863 C210.6299,232.2763 211.71,238.47 215.02,257.57 " fill="none" id="C_0001619396229227632210-backto-C_0001463422997970691679" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="204.55,197.15,201.7078,215.9096,213.532,213.863,204.55,197.15" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001706455047176879286_C_0001463422997970691679">
-      <path codeLine="39" d="M329.78,197.15 C309.21,214.47 294.7075,226.6944 272.0775,245.7544 " fill="none" id="C_0001706455047176879286-to-C_0001463422997970691679" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="258.31,257.35,275.9426,250.3436,268.2123,241.1653,258.31,257.35" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000543776954602127752_C_0001706455047176879286">
-      <path codeLine="40" d="M95.9961,71.5592 C101.6861,74.7192 91.83,69.08 97.5,71.8 C160.19,101.85 234.46,129.68 287.53,148.31 " fill="none" id="C_0000543776954602127752-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="80.26,62.82,93.0831,76.8046,98.9092,66.3138,80.26,62.82" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000687909853333071234_C_0001706455047176879286">
-      <path codeLine="41" d="M240.714,83.0974 C271.614,106.5674 298.64,127.09 326.58,148.32 " fill="none" id="C_0000687909853333071234-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="226.38,72.21,237.0849,87.8754,244.3432,78.3194,226.38,72.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000737235057776029746_C_0001706455047176879286">
-      <path codeLine="42" d="M357.5,90.21 C357.5,113.75 357.5,127.3 357.5,148.52 " fill="none" id="C_0000737235057776029746-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="357.5,72.21,351.5,90.21,363.5,90.21,357.5,72.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001497964256865073382_C_0001706455047176879286">
-      <path codeLine="43" d="M474.286,83.0974 C443.386,106.5674 416.36,127.09 388.42,148.32 " fill="none" id="C_0001497964256865073382-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="488.62,72.21,470.6568,78.3194,477.9151,87.8754,488.62,72.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000085539867332573320_C_0001706455047176879286">
-      <path codeLine="44" d="M657.3198,75.9439 C583.8998,99.4139 497.16,127.15 430.86,148.35 " fill="none" id="C_0000085539867332573320-backto-C_0001706455047176879286" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="668.75,72.29,661.8169,70.3069,657.3198,75.9439,664.2529,77.927,668.75,72.29" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="581.5" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="49" x="588.5" y="114.877">overload</text>
-    </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="433" y="8"/>
+      <ellipse cx="487.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M490.7188,29.6406 Q490.1406,29.9375 489.5,30.0781 Q488.8594,30.2344 488.1563,30.2344 Q485.6563,30.2344 484.3281,28.5938 Q483.0156,26.9375 483.0156,23.8125 Q483.0156,20.6875 484.3281,19.0313 Q485.6563,17.375 488.1563,17.375 Q488.8594,17.375 489.5,17.5313 Q490.1563,17.6875 490.7188,17.9844 L490.7188,20.7031 Q490.0938,20.125 489.5,19.8594 Q488.9063,19.5781 488.2813,19.5781 Q486.9375,19.5781 486.25,20.6563 Q485.5625,21.7188 485.5625,23.8125 Q485.5625,25.9063 486.25,26.9844 Q486.9375,28.0469 488.2813,28.0469 Q488.9063,28.0469 489.5,27.7813 Q490.0938,27.5 490.7188,26.9219 L490.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508.25" y="28.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="439" y="46"/>
+      <ellipse cx="444" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="453" y="54.2104">operator()() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="127" y="255"/>
+      <ellipse cx="142" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M144.9688,276.6406 Q144.3906,276.9375 143.75,277.0781 Q143.1094,277.2344 142.4063,277.2344 Q139.9063,277.2344 138.5781,275.5938 Q137.2656,273.9375 137.2656,270.8125 Q137.2656,267.6875 138.5781,266.0313 Q139.9063,264.375 142.4063,264.375 Q143.1094,264.375 143.75,264.5313 Q144.4063,264.6875 144.9688,264.9844 L144.9688,267.7031 Q144.3438,267.125 143.75,266.8594 Q143.1563,266.5781 142.5313,266.5781 Q141.1875,266.5781 140.5,267.6563 Q139.8125,268.7188 139.8125,270.8125 Q139.8125,272.9063 140.5,273.9844 Q141.1875,275.0469 142.5313,275.0469 Q143.1563,275.0469 143.75,274.7813 Q144.3438,274.5 144.9688,273.9219 L144.9688,276.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="156" y="275.1543">Overload</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="49" x="219" y="252"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="220" y="264.1387">T,L,Ts...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="287" y2="287"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="295" y2="295"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133" y="301"/>
+      <ellipse cx="138" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="147" y="309.2104">counter : L</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="243" y="146"/>
+      <ellipse cx="258" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M260.9688,167.6406 Q260.3906,167.9375 259.75,168.0781 Q259.1094,168.2344 258.4063,168.2344 Q255.9063,168.2344 254.5781,166.5938 Q253.2656,164.9375 253.2656,161.8125 Q253.2656,158.6875 254.5781,157.0313 Q255.9063,155.375 258.4063,155.375 Q259.1094,155.375 259.75,155.5313 Q260.4063,155.6875 260.9688,155.9844 L260.9688,158.7031 Q260.3438,158.125 259.75,157.8594 Q259.1563,157.5781 258.5313,157.5781 Q257.1875,157.5781 256.5,158.6563 Q255.8125,159.7188 255.8125,161.8125 Q255.8125,163.9063 256.5,164.9844 Q257.1875,166.0469 258.5313,166.0469 Q259.1563,166.0469 259.75,165.7813 Q260.3438,165.5 260.9688,164.9219 L260.9688,167.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="272" y="166.1543">Overload</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="95" x="335" y="143"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="336" y="155.1387">TBase,int,A,B,C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="178" y2="178"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="186" y2="186"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="594.5" y="8"/>
+      <ellipse cx="708.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M711.7188,29.6406 Q711.1406,29.9375 710.5,30.0781 Q709.8594,30.2344 709.1563,30.2344 Q706.6563,30.2344 705.3281,28.5938 Q704.0156,26.9375 704.0156,23.8125 Q704.0156,20.6875 705.3281,19.0313 Q706.6563,17.375 709.1563,17.375 Q709.8594,17.375 710.5,17.5313 Q711.1563,17.6875 711.7188,17.9844 L711.7188,20.7031 Q711.0938,20.125 710.5,19.8594 Q709.9063,19.5781 709.2813,19.5781 Q707.9375,19.5781 707.25,20.6563 Q706.5625,21.7188 706.5625,23.8125 Q706.5625,25.9063 707.25,26.9844 Q707.9375,28.0469 709.2813,28.0469 Q709.9063,28.0469 710.5,27.7813 Q711.0938,27.5 711.7188,26.9219 L711.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="729.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="600.5" y="54"/>
+      <ellipse cx="605.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="614.5" y="62.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
+    </a>
+    <path d="M183.61,214.17 C186,227.73 188.58,242.4 190.77,254.81 " fill="none" id="C_0001619396229227632210&lt;-C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="176.67,215.15,180.1,194.24,190.46,212.72,176.67,215.15" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M306.54,194.24 C289.7,207.99 267.85,225.83 248.04,242.01 " fill="none" id="C_0001706455047176879286-&gt;C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="252.28,247.58,232.37,254.81,243.43,236.73,252.28,247.58" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M94.55,69.21 C164.27,102.83 227.9,128.45 273.41,145.99 " fill="none" id="C_0000543776954602127752&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="91.11,75.32,76.21,60.25,97.25,62.74,91.11,75.32" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M226.7,81.89 C253.17,103.18 284.21,128.15 306.26,145.88 " fill="none" id="C_0000687909853333071234&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="222.13,87.2,210.94,69.21,230.91,76.29,222.13,87.2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M335,89.25 C335,108.74 335,130.16 335,145.88 " fill="none" id="C_0000737235057776029746&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="328,89.21,335,69.21,342,89.21,328,89.21" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M443.3,81.89 C416.83,103.18 385.79,128.15 363.74,145.88 " fill="none" id="C_0001497964256865073382&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="439.09,76.29,459.06,69.21,447.87,87.2,439.09,76.29" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M617.49,73.23 C550.04,96.1 462.67,125.72 403.07,145.93 " fill="none" id="C_0000085539867332573320&lt;-C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="629.84,69.05,622.8738,67.1865,618.4744,72.9001,625.4406,74.7636,629.84,69.05" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="543" 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="550" y="112.0669">overload</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00032_class_mermaid.svg b/docs/test_cases/t00032_class_mermaid.svg
index b4c58c30..8a0f10f6 100644
--- a/docs/test_cases/t00032_class_mermaid.svg
+++ b/docs/test_cases/t00032_class_mermaid.svg
@@ -1,67 +1,62 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1046 349" style="max-width: 1046px; background-color: white;" width="1046" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1043.375 349" style="max-width: 1043.38px; background-color: white;" width="1043.375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M218.1171875,230L218.1171875,231.16666666666666C218.1171875,232.33333333333334,218.1171875,234.66666666666666,224.19458575581393,240C230.2719840116279,245.33333333333334,242.42678052325581,253.66666666666666,248.50417877906975,257.8333333333333L254.5815770348837,262"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M406.2734375,212L406.2734375,216.16666666666666C406.2734375,220.33333333333334,406.2734375,228.66666666666666,402.67035722264677,235.3036066076921C399.06727694529354,241.94054654871752,391.86111639058714,246.88109309743504,388.2580361132339,249.3513663717938L384.65495583588074,251.82163964615253"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M39.515625,94L39.515625,98.5C39.515625,103,39.515625,112,82.05338541666667,123.74895267511629C124.59114583333333,135.49790535023254,209.66666666666666,149.99581070046509,252.20442708333334,157.24476337558136L294.7421875,164.49371605069763"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M199.4453125,105L199.4453125,107.66666666666667C199.4453125,110.33333333333333,199.4453125,115.66666666666667,218.19772916666668,124C236.95014583333332,132.33333333333334,274.45497916666665,143.66666666666666,293.20739583333335,149.33333333333334L311.9598125,155"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M406.2734375,105L406.2734375,107.66666666666667C406.2734375,110.33333333333333,406.2734375,115.66666666666667,406.2734375,124C406.2734375,132.33333333333334,406.2734375,143.66666666666666,406.2734375,149.33333333333334L406.2734375,155"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M613.1015625,105L613.1015625,107.66666666666667C613.1015625,110.33333333333333,613.1015625,115.66666666666667,594.3491458333333,124C575.5967291666667,132.33333333333334,538.0918958333333,143.66666666666666,519.3394791666666,149.33333333333334L500.5870625,155"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M889.7578125,105L889.7578125,107.66666666666667C889.7578125,110.33333333333333,889.7578125,115.66666666666667,827.765625,126.34706018593327C765.7734375,137.02745370519986,641.7890625,153.05490741039975,579.796875,161.0686342629997L517.8046875,169.08236111559964"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M216.8046875,212L216.8046875,216.16666666666666C216.8046875,220.33333333333334,216.8046875,228.66666666666666,222.88208575581393,237C228.9594840116279,245.33333333333334,241.11428052325581,253.66666666666666,247.19167877906975,257.8333333333333L253.2690770348837,262"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M404.9609375,212L404.9609375,216.16666666666666C404.9609375,220.33333333333334,404.9609375,228.66666666666666,398.88353924418607,237C392.80614098837214,245.33333333333334,380.6513444767442,253.66666666666666,374.5739462209303,257.8333333333333L368.4965479651163,262"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M39.515625,76L39.515625,83.5C39.515625,91,39.515625,106,81.83463541666667,120.7375758029231C124.15364583333333,135.47515160584618,208.79166666666666,149.95030321169236,251.11067708333334,157.18787901461545L293.4296875,164.42545481753854"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M199.0078125,87L199.0078125,92.66666666666667C199.0078125,98.33333333333333,199.0078125,109.66666666666667,217.68089583333335,121C236.35397916666668,132.33333333333334,273.70014583333335,143.66666666666666,292.3732291666667,149.33333333333334L311.0463125,155"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M404.9609375,87L404.9609375,92.66666666666667C404.9609375,98.33333333333333,404.9609375,109.66666666666667,404.9609375,121C404.9609375,132.33333333333334,404.9609375,143.66666666666666,404.9609375,149.33333333333334L404.9609375,155"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M610.9140625,87L610.9140625,92.66666666666667C610.9140625,98.33333333333333,610.9140625,109.66666666666667,592.2409791666666,121C573.5678958333333,132.33333333333334,536.2217291666667,143.66666666666666,517.5486458333334,149.33333333333334L498.8755625,155"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M887.1328125,87L887.1328125,92.66666666666667C887.1328125,98.33333333333333,887.1328125,109.66666666666667,825.359375,123.3405192434406C763.5859375,137.0143718202145,640.0390625,153.02874364042904,578.265625,161.0359295505363L516.4921875,169.04311546064358"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -120,7 +115,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(889.7578125, 121)" class="edgeLabel">
+        <g transform="translate(887.1328125, 121)" class="edgeLabel">
           <g transform="translate(-35.359375, -9)" class="label">
             <foreignObject height="18" width="70.71875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -133,7 +128,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(218.1171875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L7">
+        <a transform="translate(216.8046875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L7">
           <g title="Base" id="classId-C_0001619396229227632210-0" class="node default clickable">
             <rect height="57" width="53.25" y="-28.5" x="-26.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="26.625" x1="-26.625" class="divider"/>
@@ -152,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L9">
+        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L9">
           <g title="TBase" id="classId-C_0000543776954602127752-1" class="node default clickable">
             <rect height="57" width="63.03125" y="-28.5" x="-31.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.515625" x1="-31.515625" class="divider"/>
@@ -171,11 +166,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(199.4453125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L11">
+        <a transform="translate(199.0078125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L11">
           <g title="A" id="classId-C_0000687909853333071234-2" class="node default clickable">
-            <rect height="79" width="156.828125" y="-39.5" x="-78.4140625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
+            <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -187,19 +182,19 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -70.9140625, 14)" height="18" width="141.828125">
+              <foreignObject transform="translate( -70.4765625, 14)" height="18" width="140.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator()() : : void</span>
+                  <span class="nodeLabel">+operator() : ) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(406.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L15">
+        <a transform="translate(404.9609375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L15">
           <g title="B" id="classId-C_0000737235057776029746-3" class="node default clickable">
-            <rect height="79" width="156.828125" y="-39.5" x="-78.4140625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
+            <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -211,19 +206,19 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -70.9140625, 14)" height="18" width="141.828125">
+              <foreignObject transform="translate( -70.4765625, 14)" height="18" width="140.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator()() : : void</span>
+                  <span class="nodeLabel">+operator() : ) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(613.1015625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L19">
+        <a transform="translate(610.9140625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L19">
           <g title="C" id="classId-C_0001497964256865073382-4" class="node default clickable">
-            <rect height="79" width="156.828125" y="-39.5" x="-78.4140625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="78.4140625" x1="-78.4140625" class="divider"/>
+            <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -235,15 +230,15 @@
                   <span class="nodeLabel">C</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -70.9140625, 14)" height="18" width="141.828125">
+              <foreignObject transform="translate( -70.4765625, 14)" height="18" width="140.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator()() : : void</span>
+                  <span class="nodeLabel">+operator() : ) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(312.1953125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24">
+        <a transform="translate(310.8828125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001463422997970691679-5" class="node default clickable">
             <rect height="79" width="160.53125" y="-39.5" x="-80.265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="80.265625" x1="-80.265625" class="divider"/>
@@ -267,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(406.2734375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L24">
+        <a transform="translate(404.9609375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001706455047176879286-6" class="node default clickable">
             <rect height="57" width="223.0625" y="-28.5" x="-111.53125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.53125" x1="-111.53125" class="divider"/>
@@ -286,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(889.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00032/t00032.cc#L31">
+        <a transform="translate(887.1328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L31">
           <g title="R" id="classId-C_0000085539867332573320-7" class="node default clickable">
             <rect height="79" width="296.484375" y="-39.5" x="-148.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="148.2421875" x1="-148.2421875" class="divider"/>
diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md
index 3ab036b7..921e661a 100644
--- a/docs/test_cases/t00033.md
+++ b/docs/test_cases/t00033.md
@@ -56,7 +56,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00033::A<T>",
+      "display_name": "A<T>",
       "id": "2036031998980633871",
       "is_abstract": false,
       "is_nested": false,
@@ -98,7 +98,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00033::B<T>",
+      "display_name": "B<T>",
       "id": "765515233845859023",
       "is_abstract": false,
       "is_nested": false,
@@ -140,7 +140,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00033::C<T>",
+      "display_name": "C<T>",
       "id": "1436835384265552869",
       "is_abstract": false,
       "is_nested": false,
@@ -182,7 +182,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00033::D",
+      "display_name": "D",
       "id": "2199581366769423637",
       "is_abstract": false,
       "is_nested": false,
@@ -217,7 +217,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00033::C<clanguml::t00033::D>",
+      "display_name": "C<D>",
       "id": "1609446044604054241",
       "is_abstract": false,
       "is_nested": false,
@@ -246,7 +246,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00033::B<std::unique_ptr<clanguml::t00033::C<clanguml::t00033::D>>>",
+      "display_name": "B<std::unique_ptr<C<D>>>",
       "id": "384927316081978893",
       "is_abstract": false,
       "is_nested": false,
@@ -289,7 +289,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00033::A<clanguml::t00033::B<std::unique_ptr<clanguml::t00033::C<clanguml::t00033::D>>>>",
+      "display_name": "A<B<std::unique_ptr<C<D>>>>",
       "id": "1747493965420341251",
       "is_abstract": false,
       "is_nested": false,
@@ -339,7 +339,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00033::R",
+      "display_name": "R",
       "id": "1866392706312766470",
       "is_abstract": false,
       "is_nested": false,
@@ -374,6 +374,7 @@ struct R {
     }
   ],
   "name": "t00033_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 66fb15cd..2d23dde8 100644
--- a/docs/test_cases/t00033_class.svg
+++ b/docs/test_cases/t00033_class.svg
@@ -1,164 +1,140 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="581px" preserveAspectRatio="none" style="width:435px;height:581px;background:#FFFFFF;" version="1.1" viewBox="0 0 435 581" width="435px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="f1k31tfnexxs8r" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002036031998980633871">
-        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0002036031998980633871" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="80.5" y="257.8"/>
-        <ellipse cx="104.05" cy="273.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M99.05,274.9563 C99.05,277.4563 101.1906,279.2688 104.1125,279.2688 C105.3469,279.2688 106.5188,278.9719 107.2688,278.4563 C107.8781,278.0344 108.2063,277.6125 108.2063,277.2063 C108.2063,276.7375 107.7844,276.3313 107.2844,276.3313 C107.05,276.3313 106.8313,276.4094 106.6281,276.6125 C106.1906,277.05 106.1906,277.05 106.0188,277.1438 C105.5656,277.3781 104.925,277.5188 104.1594,277.5188 C102.1594,277.5188 100.8781,276.5031 100.8781,274.925 L100.8781,273.8781 C100.8781,272.175 102.0969,270.9719 103.8,270.9719 C104.3781,270.9719 104.9563,271.1125 105.425,271.3625 C105.8938,271.6281 106.0656,271.8156 106.1281,272.175 C106.2531,272.8469 106.5031,273.0969 107.0344,273.0969 C107.3156,273.0969 107.5969,272.9563 107.7844,272.7375 C107.9094,272.5656 107.9563,272.3938 107.9563,271.9563 L107.9563,270.5969 C107.9563,270.175 107.9406,270.0344 107.8156,269.8625 C107.6438,269.6125 107.3625,269.4563 107.0344,269.4563 C106.7219,269.4563 106.5188,269.5656 106.3,269.8313 C105.1281,269.3313 104.6906,269.2219 103.7375,269.2219 C101.0656,269.2219 99.05,271.2375 99.05,273.8625 L99.05,274.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="119.95" y="278.406">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="145.5" y="254.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="146.5" y="269.0001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="81.5" x2="150.5" y1="289.8" y2="289.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="81.5" x2="150.5" y1="297.8" y2="297.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="86.5" y="306.7"/>
-          <ellipse cx="91.5" cy="311.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="100.5" y="314.8059">aaa : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
+      <ellipse cx="98.25" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M101.2188,276.6406 Q100.6406,276.9375 100,277.0781 Q99.3594,277.2344 98.6563,277.2344 Q96.1563,277.2344 94.8281,275.5938 Q93.5156,273.9375 93.5156,270.8125 Q93.5156,267.6875 94.8281,266.0313 Q96.1563,264.375 98.6563,264.375 Q99.3594,264.375 100,264.5313 Q100.6563,264.6875 101.2188,264.9844 L101.2188,267.7031 Q100.5938,267.125 100,266.8594 Q99.4063,266.5781 98.7813,266.5781 Q97.4375,266.5781 96.75,267.6563 Q96.0625,268.7188 96.0625,270.8125 Q96.0625,272.9063 96.75,273.9844 Q97.4375,275.0469 98.7813,275.0469 Q99.4063,275.0469 100,274.7813 Q100.5938,274.5 101.2188,273.9219 L101.2188,276.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.75" y="275.1543">A</text>
+      <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"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000765515233845859023">
-        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0000765515233845859023" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="203.5" y="383.6"/>
-        <ellipse cx="227.05" cy="399.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M222.05,400.7563 C222.05,403.2563 224.1906,405.0688 227.1125,405.0688 C228.3469,405.0688 229.5188,404.7719 230.2688,404.2563 C230.8781,403.8344 231.2063,403.4125 231.2063,403.0063 C231.2063,402.5375 230.7844,402.1313 230.2844,402.1313 C230.05,402.1313 229.8313,402.2094 229.6281,402.4125 C229.1906,402.85 229.1906,402.85 229.0188,402.9438 C228.5656,403.1781 227.925,403.3188 227.1594,403.3188 C225.1594,403.3188 223.8781,402.3031 223.8781,400.725 L223.8781,399.6781 C223.8781,397.975 225.0969,396.7719 226.8,396.7719 C227.3781,396.7719 227.9563,396.9125 228.425,397.1625 C228.8938,397.4281 229.0656,397.6156 229.1281,397.975 C229.2531,398.6469 229.5031,398.8969 230.0344,398.8969 C230.3156,398.8969 230.5969,398.7563 230.7844,398.5375 C230.9094,398.3656 230.9563,398.1938 230.9563,397.7563 L230.9563,396.3969 C230.9563,395.975 230.9406,395.8344 230.8156,395.6625 C230.6438,395.4125 230.3625,395.2563 230.0344,395.2563 C229.7219,395.2563 229.5188,395.3656 229.3,395.6313 C228.1281,395.1313 227.6906,395.0219 226.7375,395.0219 C224.0656,395.0219 222.05,397.0375 222.05,399.6625 L222.05,400.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="242.95" y="404.206">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="268.5" y="380.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="269.5" y="394.8001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="204.5" x2="273.5" y1="415.6" y2="415.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="204.5" x2="273.5" y1="423.6" y2="423.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="209.5" y="432.5"/>
-          <ellipse cx="214.5" cy="437.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="223.5" y="440.6059">bbb : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="82.5" y="301"/>
+      <ellipse cx="87.5" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001436835384265552869">
-        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0001436835384265552869" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="249" y="509.4"/>
-        <ellipse cx="270.75" cy="525.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M265.75,526.5563 C265.75,529.0563 267.8906,530.8688 270.8125,530.8688 C272.0469,530.8688 273.2188,530.5719 273.9688,530.0563 C274.5781,529.6344 274.9063,529.2125 274.9063,528.8063 C274.9063,528.3375 274.4844,527.9313 273.9844,527.9313 C273.75,527.9313 273.5313,528.0094 273.3281,528.2125 C272.8906,528.65 272.8906,528.65 272.7188,528.7438 C272.2656,528.9781 271.625,529.1188 270.8594,529.1188 C268.8594,529.1188 267.5781,528.1031 267.5781,526.525 L267.5781,525.4781 C267.5781,523.775 268.7969,522.5719 270.5,522.5719 C271.0781,522.5719 271.6563,522.7125 272.125,522.9625 C272.5938,523.2281 272.7656,523.4156 272.8281,523.775 C272.9531,524.4469 273.2031,524.6969 273.7344,524.6969 C274.0156,524.6969 274.2969,524.5563 274.4844,524.3375 C274.6094,524.1656 274.6563,523.9938 274.6563,523.5563 L274.6563,522.1969 C274.6563,521.775 274.6406,521.6344 274.5156,521.4625 C274.3438,521.2125 274.0625,521.0563 273.7344,521.0563 C273.4219,521.0563 273.2188,521.1656 273,521.4313 C271.8281,520.9313 271.3906,520.8219 270.4375,520.8219 C267.7656,520.8219 265.75,522.8375 265.75,525.4625 L265.75,526.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="286.25" y="530.006">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="311" y="506.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="312" y="520.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="250" x2="316" y1="541.4" y2="541.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="250" x2="316" y1="549.4" y2="549.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="255" y="558.3"/>
-          <ellipse cx="260" cy="563.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="269" y="566.4059">ccc : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="96.5" y="309.2104">aaa : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0002199581366769423637">
-        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0002199581366769423637" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="77" x="351.5" y="509.4"/>
-        <ellipse cx="382.25" cy="525.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M377.25,526.5563 C377.25,529.0563 379.3906,530.8688 382.3125,530.8688 C383.5469,530.8688 384.7188,530.5719 385.4688,530.0563 C386.0781,529.6344 386.4063,529.2125 386.4063,528.8063 C386.4063,528.3375 385.9844,527.9313 385.4844,527.9313 C385.25,527.9313 385.0313,528.0094 384.8281,528.2125 C384.3906,528.65 384.3906,528.65 384.2188,528.7438 C383.7656,528.9781 383.125,529.1188 382.3594,529.1188 C380.3594,529.1188 379.0781,528.1031 379.0781,526.525 L379.0781,525.4781 C379.0781,523.775 380.2969,522.5719 382,522.5719 C382.5781,522.5719 383.1563,522.7125 383.625,522.9625 C384.0938,523.2281 384.2656,523.4156 384.3281,523.775 C384.4531,524.4469 384.7031,524.6969 385.2344,524.6969 C385.5156,524.6969 385.7969,524.5563 385.9844,524.3375 C386.1094,524.1656 386.1563,523.9938 386.1563,523.5563 L386.1563,522.1969 C386.1563,521.775 386.1406,521.6344 386.0156,521.4625 C385.8438,521.2125 385.5625,521.0563 385.2344,521.0563 C384.9219,521.0563 384.7188,521.1656 384.5,521.4313 C383.3281,520.9313 382.8906,520.8219 381.9375,520.8219 C379.2656,520.8219 377.25,522.8375 377.25,525.4625 L377.25,526.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="399.75" y="530.006">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="352.5" x2="427.5" y1="541.4" y2="541.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="352.5" x2="427.5" y1="549.4" y2="549.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="357.5" y="558.3"/>
-          <ellipse cx="362.5" cy="563.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="371.5" y="566.4059">ddd : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
+      <ellipse cx="230.25" cy="393" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M233.2188,398.6406 Q232.6406,398.9375 232,399.0781 Q231.3594,399.2344 230.6563,399.2344 Q228.1563,399.2344 226.8281,397.5938 Q225.5156,395.9375 225.5156,392.8125 Q225.5156,389.6875 226.8281,388.0313 Q228.1563,386.375 230.6563,386.375 Q231.3594,386.375 232,386.5313 Q232.6563,386.6875 233.2188,386.9844 L233.2188,389.7031 Q232.5938,389.125 232,388.8594 Q231.4063,388.5781 230.7813,388.5781 Q229.4375,388.5781 228.75,389.6563 Q228.0625,390.7188 228.0625,392.8125 Q228.0625,394.9063 228.75,395.9844 Q229.4375,397.0469 230.7813,397.0469 Q231.4063,397.0469 232,396.7813 Q232.5938,396.5 233.2188,395.9219 L233.2188,398.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="245.75" y="397.1543">B</text>
+      <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"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="417" y2="417"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001609446044604054241">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001609446044604054241" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="309.5" y="392"/>
-        <ellipse cx="324.5" cy="408" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M319.5,409.1563 C319.5,411.6563 321.6406,413.4688 324.5625,413.4688 C325.7969,413.4688 326.9688,413.1719 327.7188,412.6563 C328.3281,412.2344 328.6563,411.8125 328.6563,411.4063 C328.6563,410.9375 328.2344,410.5313 327.7344,410.5313 C327.5,410.5313 327.2813,410.6094 327.0781,410.8125 C326.6406,411.25 326.6406,411.25 326.4688,411.3438 C326.0156,411.5781 325.375,411.7188 324.6094,411.7188 C322.6094,411.7188 321.3281,410.7031 321.3281,409.125 L321.3281,408.0781 C321.3281,406.375 322.5469,405.1719 324.25,405.1719 C324.8281,405.1719 325.4063,405.3125 325.875,405.5625 C326.3438,405.8281 326.5156,406.0156 326.5781,406.375 C326.7031,407.0469 326.9531,407.2969 327.4844,407.2969 C327.7656,407.2969 328.0469,407.1563 328.2344,406.9375 C328.3594,406.7656 328.4063,406.5938 328.4063,406.1563 L328.4063,404.7969 C328.4063,404.375 328.3906,404.2344 328.2656,404.0625 C328.0938,403.8125 327.8125,403.6563 327.4844,403.6563 C327.1719,403.6563 326.9688,403.7656 326.75,404.0313 C325.5781,403.5313 325.1406,403.4219 324.1875,403.4219 C321.5156,403.4219 319.5,405.4375 319.5,408.0625 L319.5,409.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="338.5" y="412.606">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="11" x="356.5" y="389"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="9" x="357.5" y="403.2001">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="310.5" x2="363.5" y1="424" y2="424"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="310.5" x2="363.5" y1="432" y2="432"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="214.5" y="423"/>
+      <ellipse cx="219.5" cy="428" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000384927316081978893">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000384927316081978893" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="172" x="187" y="266.2"/>
-        <ellipse cx="202" cy="282.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M197,283.3563 C197,285.8563 199.1406,287.6688 202.0625,287.6688 C203.2969,287.6688 204.4688,287.3719 205.2188,286.8563 C205.8281,286.4344 206.1563,286.0125 206.1563,285.6063 C206.1563,285.1375 205.7344,284.7313 205.2344,284.7313 C205,284.7313 204.7813,284.8094 204.5781,285.0125 C204.1406,285.45 204.1406,285.45 203.9688,285.5438 C203.5156,285.7781 202.875,285.9188 202.1094,285.9188 C200.1094,285.9188 198.8281,284.9031 198.8281,283.325 L198.8281,282.2781 C198.8281,280.575 200.0469,279.3719 201.75,279.3719 C202.3281,279.3719 202.9063,279.5125 203.375,279.7625 C203.8438,280.0281 204.0156,280.2156 204.0781,280.575 C204.2031,281.2469 204.4531,281.4969 204.9844,281.4969 C205.2656,281.4969 205.5469,281.3563 205.7344,281.1375 C205.8594,280.9656 205.9063,280.7938 205.9063,280.3563 L205.9063,278.9969 C205.9063,278.575 205.8906,278.4344 205.7656,278.2625 C205.5938,278.0125 205.3125,277.8563 204.9844,277.8563 C204.6719,277.8563 204.4688,277.9656 204.25,278.2313 C203.0781,277.7313 202.6406,277.6219 201.6875,277.6219 C199.0156,277.6219 197,279.6375 197,282.2625 L197,283.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="216" y="286.806">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="129" x="233" y="263.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="127" x="234" y="277.4001">std::unique_ptr&lt;C&lt;D&gt;&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="188" x2="358" y1="298.2" y2="298.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="188" x2="358" y1="306.2" y2="306.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="228.5" y="431.2104">bbb : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001747493965420341251">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001747493965420341251" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="194" x="39" y="148.8"/>
-        <ellipse cx="54" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M49,165.9563 C49,168.4563 51.1406,170.2688 54.0625,170.2688 C55.2969,170.2688 56.4688,169.9719 57.2188,169.4563 C57.8281,169.0344 58.1563,168.6125 58.1563,168.2063 C58.1563,167.7375 57.7344,167.3313 57.2344,167.3313 C57,167.3313 56.7813,167.4094 56.5781,167.6125 C56.1406,168.05 56.1406,168.05 55.9688,168.1438 C55.5156,168.3781 54.875,168.5188 54.1094,168.5188 C52.1094,168.5188 50.8281,167.5031 50.8281,165.925 L50.8281,164.8781 C50.8281,163.175 52.0469,161.9719 53.75,161.9719 C54.3281,161.9719 54.9063,162.1125 55.375,162.3625 C55.8438,162.6281 56.0156,162.8156 56.0781,163.175 C56.2031,163.8469 56.4531,164.0969 56.9844,164.0969 C57.2656,164.0969 57.5469,163.9563 57.7344,163.7375 C57.8594,163.5656 57.9063,163.3938 57.9063,162.9563 L57.9063,161.5969 C57.9063,161.175 57.8906,161.0344 57.7656,160.8625 C57.5938,160.6125 57.3125,160.4563 56.9844,160.4563 C56.6719,160.4563 56.4688,160.5656 56.25,160.8313 C55.0781,160.3313 54.6406,160.2219 53.6875,160.2219 C51.0156,160.2219 49,162.2375 49,164.8625 L49,165.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="68" y="169.406">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="151" x="85" y="145.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="149" x="86" y="160.0001">B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="232" y1="180.8" y2="180.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="232" y1="188.8" y2="188.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
+      <ellipse cx="273.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M276.3688,520.6406 Q275.7906,520.9375 275.15,521.0781 Q274.5094,521.2344 273.8063,521.2344 Q271.3063,521.2344 269.9781,519.5938 Q268.6656,517.9375 268.6656,514.8125 Q268.6656,511.6875 269.9781,510.0313 Q271.3063,508.375 273.8063,508.375 Q274.5094,508.375 275.15,508.5313 Q275.8063,508.6875 276.3688,508.9844 L276.3688,511.7031 Q275.7438,511.125 275.15,510.8594 Q274.5563,510.5781 273.9313,510.5781 Q272.5875,510.5781 271.9,511.6563 Q271.2125,512.7188 271.2125,514.8125 Q271.2125,516.9063 271.9,517.9844 Q272.5875,519.0469 273.9313,519.0469 Q274.5563,519.0469 275.15,518.7813 Q275.7438,518.5 276.3688,517.9219 L276.3688,520.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="288.6" y="519.1543">C</text>
+      <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"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="539" y2="539"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001866392706312766470">
-        <rect codeLine="34" fill="#F1F1F1" height="64.7999" id="C_0001866392706312766470" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="258" x="7" y="7"/>
-        <ellipse cx="126.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M121.75,24.1563 C121.75,26.6563 123.8906,28.4688 126.8125,28.4688 C128.0469,28.4688 129.2188,28.1719 129.9688,27.6563 C130.5781,27.2344 130.9063,26.8125 130.9063,26.4063 C130.9063,25.9375 130.4844,25.5313 129.9844,25.5313 C129.75,25.5313 129.5313,25.6094 129.3281,25.8125 C128.8906,26.25 128.8906,26.25 128.7188,26.3438 C128.2656,26.5781 127.625,26.7188 126.8594,26.7188 C124.8594,26.7188 123.5781,25.7031 123.5781,24.125 L123.5781,23.0781 C123.5781,21.375 124.7969,20.1719 126.5,20.1719 C127.0781,20.1719 127.6563,20.3125 128.125,20.5625 C128.5938,20.8281 128.7656,21.0156 128.8281,21.375 C128.9531,22.0469 129.2031,22.2969 129.7344,22.2969 C130.0156,22.2969 130.2969,22.1563 130.4844,21.9375 C130.6094,21.7656 130.6563,21.5938 130.6563,21.1563 L130.6563,19.7969 C130.6563,19.375 130.6406,19.2344 130.5156,19.0625 C130.3438,18.8125 130.0625,18.6563 129.7344,18.6563 C129.4219,18.6563 129.2188,18.7656 129,19.0313 C127.8281,18.5313 127.3906,18.4219 126.4375,18.4219 C123.7656,18.4219 121.75,20.4375 121.75,23.0625 L121.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="147.25" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="264" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="264" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="55.9"/>
-          <ellipse cx="18" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="27" y="64.0059">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="259" y="545"/>
+      <ellipse cx="264" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0001609446044604054241_C_0002199581366769423637">
-      <path codeLine="38" d="M346.97,440.29 C355.3,459.76 364.9087,482.2042 374.1087,503.6942 " fill="none" id="C_0001609446044604054241-to-C_0002199581366769423637" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="376.47,509.21,376.6052,499.3621,374.5022,504.6135,369.2508,502.5105,376.47,509.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001609446044604054241_C_0001436835384265552869">
-      <path codeLine="39" d="M326.84,440.29 C318.35,459.76 313.3442,471.2202 303.9742,492.7102 " fill="none" id="C_0001609446044604054241-to-C_0001436835384265552869" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="296.78,509.21,309.4741,495.1083,298.4743,490.3121,296.78,509.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000384927316081978893_C_0001609446044604054241">
-      <path codeLine="40" d="M285.04,314.49 C296.48,336.62 310.8337,364.3906 322.2637,386.4906 " fill="none" id="C_0000384927316081978893-to-C_0001609446044604054241" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="325.02,391.82,324.4384,381.9883,322.723,387.3788,317.3326,385.6634,325.02,391.82" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000384927316081978893_C_0000765515233845859023">
-      <path codeLine="41" d="M266.6,314.49 C261.26,333.96 258.3455,344.5623 252.4455,366.0523 " fill="none" id="C_0000384927316081978893-to-C_0000765515233845859023" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="247.68,383.41,258.2314,367.6408,246.6596,364.4638,247.68,383.41" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001747493965420341251_C_0000384927316081978893">
-      <path codeLine="42" d="M163.72,197.15 C187.49,217.17 216.9707,242.005 240.7307,262.015 " fill="none" id="C_0001747493965420341251-to-C_0000384927316081978893" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="245.32,265.88,241.0127,257.023,241.4956,262.6592,235.8594,263.1421,245.32,265.88" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001747493965420341251_C_0002036031998980633871">
-      <path codeLine="43" d="M131.95,197.15 C128.94,214.54 127.8636,220.7344 124.5536,239.8344 " fill="none" id="C_0001747493965420341251-to-C_0002036031998980633871" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="121.48,257.57,130.4654,240.8589,118.6417,238.8098,121.48,257.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001866392706312766470_C_0001747493965420341251">
-      <path codeLine="44" d="M136,84.21 C136,107.75 136,127.3 136,148.52 " fill="none" id="C_0001866392706312766470-backto-C_0001747493965420341251" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="136,72.21,132,78.21,136,84.21,140,78.21,136,72.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="142" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="149" y="114.877">abc</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="273" y="553.2104">ccc : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
+      <ellipse cx="380.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M383.3688,520.6406 Q382.7906,520.9375 382.15,521.0781 Q381.5094,521.2344 380.8063,521.2344 Q378.3063,521.2344 376.9781,519.5938 Q375.6656,517.9375 375.6656,514.8125 Q375.6656,511.6875 376.9781,510.0313 Q378.3063,508.375 380.8063,508.375 Q381.5094,508.375 382.15,508.5313 Q382.8063,508.6875 383.3688,508.9844 L383.3688,511.7031 Q382.7438,511.125 382.15,510.8594 Q381.5563,510.5781 380.9313,510.5781 Q379.5875,510.5781 378.9,511.6563 Q378.2125,512.7188 378.2125,514.8125 Q378.2125,516.9063 378.9,517.9844 Q379.5875,519.0469 380.9313,519.0469 Q381.5563,519.0469 382.15,518.7813 Q382.7438,518.5 383.3688,517.9219 L383.3688,520.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="397.6" y="519.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="531" y2="531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="539" y2="539"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="357" y="545"/>
+      <ellipse cx="362" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="371" y="553.2104">ddd : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
+      <ellipse cx="325" cy="399.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M327.9688,405.1406 Q327.3906,405.4375 326.75,405.5781 Q326.1094,405.7344 325.4063,405.7344 Q322.9063,405.7344 321.5781,404.0938 Q320.2656,402.4375 320.2656,399.3125 Q320.2656,396.1875 321.5781,394.5313 Q322.9063,392.875 325.4063,392.875 Q326.1094,392.875 326.75,393.0313 Q327.4063,393.1875 327.9688,393.4844 L327.9688,396.2031 Q327.3438,395.625 326.75,395.3594 Q326.1563,395.0781 325.5313,395.0781 Q324.1875,395.0781 323.5,396.1563 Q322.8125,397.2188 322.8125,399.3125 Q322.8125,401.4063 323.5,402.4844 Q324.1875,403.5469 325.5313,403.5469 Q326.1563,403.5469 326.75,403.2813 Q327.3438,403 327.9688,402.4219 L327.9688,405.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339" y="403.6543">C</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
+      <ellipse cx="193" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M195.9688,283.1406 Q195.3906,283.4375 194.75,283.5781 Q194.1094,283.7344 193.4063,283.7344 Q190.9063,283.7344 189.5781,282.0938 Q188.2656,280.4375 188.2656,277.3125 Q188.2656,274.1875 189.5781,272.5313 Q190.9063,270.875 193.4063,270.875 Q194.1094,270.875 194.75,271.0313 Q195.4063,271.1875 195.9688,271.4844 L195.9688,274.2031 Q195.3438,273.625 194.75,273.3594 Q194.1563,273.0781 193.5313,273.0781 Q192.1875,273.0781 191.5,274.1563 Q190.8125,275.2188 190.8125,277.3125 Q190.8125,279.4063 191.5,280.4844 Q192.1875,281.5469 193.5313,281.5469 Q194.1563,281.5469 194.75,281.2813 Q195.3438,281 195.9688,280.4219 L195.9688,283.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="281.6543">B</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
+      <ellipse cx="33" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M35.9688,167.6406 Q35.3906,167.9375 34.75,168.0781 Q34.1094,168.2344 33.4063,168.2344 Q30.9063,168.2344 29.5781,166.5938 Q28.2656,164.9375 28.2656,161.8125 Q28.2656,158.6875 29.5781,157.0313 Q30.9063,155.375 33.4063,155.375 Q34.1094,155.375 34.75,155.5313 Q35.4063,155.6875 35.9688,155.9844 L35.9688,158.7031 Q35.3438,158.125 34.75,157.8594 Q34.1563,157.5781 33.5313,157.5781 Q32.1875,157.5781 31.5,158.6563 Q30.8125,159.7188 30.8125,161.8125 Q30.8125,163.9063 31.5,164.9844 Q32.1875,166.0469 33.5313,166.0469 Q34.1563,166.0469 34.75,165.7813 Q35.3438,165.5 35.9688,164.9219 L35.9688,167.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="166.1543">A</text>
+      <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"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
+      <ellipse cx="121.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M124.2188,29.6406 Q123.6406,29.9375 123,30.0781 Q122.3594,30.2344 121.6563,30.2344 Q119.1563,30.2344 117.8281,28.5938 Q116.5156,26.9375 116.5156,23.8125 Q116.5156,20.6875 117.8281,19.0313 Q119.1563,17.375 121.6563,17.375 Q122.3594,17.375 123,17.5313 Q123.6563,17.6875 124.2188,17.9844 L124.2188,20.7031 Q123.5938,20.125 123,19.8594 Q122.4063,19.5781 121.7813,19.5781 Q120.4375,19.5781 119.75,20.6563 Q119.0625,21.7188 119.0625,23.8125 Q119.0625,25.9063 119.75,26.9844 Q120.4375,28.0469 121.7813,28.0469 Q122.4063,28.0469 123,27.7813 Q123.5938,27.5 124.2188,26.9219 L124.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="141.75" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
+      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="221" x="26" y="62.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
+    </a>
+    <path d="M346.33,431.64 C353.84,449.29 364.29,473.9 372.79,493.89 " fill="none" id="C_0001609446044604054241-&gt;C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <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;"/>
+    <path d="M326.47,431.64 C320.5,445.42 312.69,463.44 305.44,480.19 " fill="none" id="C_0001609446044604054241-&gt;C_0001436835384265552869" 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;"/>
+    <path d="M287.26,309.64 C297.3,329.39 311.77,357.85 322.43,378.81 " fill="none" id="C_0000384927316081978893-&gt;C_0001609446044604054241" 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;"/>
+    <path d="M268.94,309.64 C265.12,323.12 260.16,340.66 255.5,357.1 " fill="none" id="C_0000384927316081978893-&gt;C_0000765515233845859023" 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;"/>
+    <path d="M159.4,194.24 C183.29,212.82 216.79,238.86 241.66,258.2 " fill="none" id="C_0001747493965420341251-&gt;C_0000384927316081978893" 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;"/>
+    <path d="M125.4,194.24 C123.33,206.01 120.73,220.77 118.24,234.92 " fill="none" id="C_0001747493965420341251-&gt;C_0002036031998980633871" 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;"/>
+    <path d="M129.5,82.5 C129.5,103.65 129.5,128.32 129.5,145.88 " fill="none" id="C_0001866392706312766470&lt;-C_0001747493965420341251" 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>
   </g>
 </svg>
diff --git a/docs/test_cases/t00033_class_mermaid.svg b/docs/test_cases/t00033_class_mermaid.svg
index 36c07cd7..579c40ee 100644
--- a/docs/test_cases/t00033_class_mermaid.svg
+++ b/docs/test_cases/t00033_class_mermaid.svg
@@ -1,67 +1,62 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 415.41796875 607" style="max-width: 415.418px; background-color: white;" width="415.41796875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M280.83148619186045,459L274.9604832848837,465C269.08948037790697,471,257.3474745639535,483,251.47647165697674,492.1666666666667C245.60546875,501.3333333333333,245.60546875,507.6666666666667,245.60546875,510.8333333333333L245.60546875,514"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M336.60601380813955,459L342.47701671511624,465C348.34801962209303,471,360.0900254360465,483,365.9610283430232,490.1666666666667C371.83203125,497.3333333333333,371.83203125,499.6666666666667,371.83203125,500.8333333333333L371.83203125,502"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M276.53415697674416,330L281.8982558139535,336C287.26235465116275,342,297.9905523255814,354,303.35465116279073,365C308.71875,376,308.71875,386,308.71875,391L308.71875,396"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M225.57521802325581,330L220.21111918604652,336C214.84702034883722,342,204.11882267441862,354,198.7547238372093,361.1666666666667C193.390625,368.3333333333333,193.390625,370.6666666666667,193.390625,371.8333333333333L193.390625,373"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M204.68713492990653,212L212.41506035825546,216.16666666666666C220.14298578660433,220.33333333333334,235.59883664330218,228.66666666666666,243.32676207165107,237.83333333333334C251.0546875,247,251.0546875,257,251.0546875,262L251.0546875,267"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M98.96911507009347,212L91.24118964174455,216.16666666666666C83.51326421339564,220.33333333333334,68.05741335669782,228.66666666666666,60.32948792834892,234C52.6015625,239.33333333333334,52.6015625,241.66666666666666,52.6015625,242.83333333333334L52.6015625,244"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M151.828125,105L151.828125,107.66666666666667C151.828125,110.33333333333333,151.828125,115.66666666666667,151.828125,124C151.828125,132.33333333333334,151.828125,143.66666666666666,151.828125,149.33333333333334L151.828125,155"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M280.83148619186045,459L274.9604832848837,465C269.08948037790697,471,257.3474745639535,483,251.47647165697674,493.1666666666667C245.60546875,503.3333333333333,245.60546875,511.6666666666667,245.60546875,515.8333333333334L245.60546875,520"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M336.60601380813955,459L342.47701671511624,465C348.34801962209303,471,360.0900254360465,483,365.9610283430232,493.1666666666667C371.83203125,503.3333333333333,371.83203125,511.6666666666667,371.83203125,515.8333333333334L371.83203125,520"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M276.53415697674416,330L281.8982558139535,336C287.26235465116275,342,297.9905523255814,354,303.35465116279073,366C308.71875,378,308.71875,390,308.71875,396L308.71875,402"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M225.57521802325581,330L220.21111918604652,336C214.84702034883722,342,204.11882267441862,354,198.7547238372093,364.1666666666667C193.390625,374.3333333333333,193.390625,382.6666666666667,193.390625,386.8333333333333L193.390625,391"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M204.68713492990653,212L212.41506035825546,216.16666666666666C220.14298578660433,220.33333333333334,235.59883664330218,228.66666666666666,243.32676207165107,238.83333333333334C251.0546875,249,251.0546875,261,251.0546875,267L251.0546875,273"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M98.96911507009347,212L91.24118964174455,216.16666666666666C83.51326421339564,220.33333333333334,68.05741335669782,228.66666666666666,60.32948792834892,237C52.6015625,245.33333333333334,52.6015625,253.66666666666666,52.6015625,257.8333333333333L52.6015625,262"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M151.828125,87L151.828125,92.66666666666667C151.828125,98.33333333333333,151.828125,109.66666666666667,151.828125,121C151.828125,132.33333333333334,151.828125,143.66666666666666,151.828125,149.33333333333334L151.828125,155"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -143,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7">
+        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0002036031998980633871-0" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -167,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L11">
+        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L11">
           <g title="B" id="classId-C_0000765515233845859023-1" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -191,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L15">
+        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L15">
           <g title="C" id="classId-C_0001436835384265552869-2" class="node default clickable">
             <rect height="79" width="71.171875" y="-39.5" x="-35.5859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.5859375" x1="-35.5859375" class="divider"/>
@@ -215,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L19">
+        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L19">
           <g title="D" id="classId-C_0002199581366769423637-3" class="node default clickable">
             <rect height="79" width="81.28125" y="-39.5" x="-40.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.640625" x1="-40.640625" class="divider"/>
@@ -239,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7">
+        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7">
           <g title="C" id="classId-C_0001609446044604054241-4" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -258,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7">
+        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7">
           <g title="B" id="classId-C_0000384927316081978893-5" class="node default clickable">
             <rect height="57" width="223.046875" y="-28.5" x="-111.5234375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.5234375" x1="-111.5234375" class="divider"/>
@@ -277,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L7">
+        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0001747493965420341251-6" class="node default clickable">
             <rect height="57" width="253.296875" y="-28.5" x="-126.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="126.6484375" x1="-126.6484375" class="divider"/>
@@ -296,7 +291,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00033/t00033.cc#L23">
+        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L23">
           <g title="R" id="classId-C_0001866392706312766470-7" class="node default clickable">
             <rect height="79" width="287.65625" y="-39.5" x="-143.828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="143.828125" x1="-143.828125" class="divider"/>
diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md
index 61fb8c94..8671ef16 100644
--- a/docs/test_cases/t00034.md
+++ b/docs/test_cases/t00034.md
@@ -82,7 +82,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00034::Void",
+      "display_name": "Void",
       "id": "1704456490210873213",
       "is_abstract": false,
       "is_nested": false,
@@ -167,7 +167,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00034::lift_void<T>",
+      "display_name": "lift_void<T>",
       "id": "867472442996685316",
       "is_abstract": false,
       "is_nested": false,
@@ -196,7 +196,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00034::lift_void<void>",
+      "display_name": "lift_void<void>",
       "id": "126450862226197239",
       "is_abstract": false,
       "is_nested": false,
@@ -225,7 +225,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00034::drop_void<T>",
+      "display_name": "drop_void<T>",
       "id": "1578745816100337706",
       "is_abstract": false,
       "is_nested": false,
@@ -254,7 +254,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00034::drop_void<clanguml::t00034::Void>",
+      "display_name": "drop_void<Void>",
       "id": "1849836134504075115",
       "is_abstract": false,
       "is_nested": false,
@@ -283,7 +283,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00034::A",
+      "display_name": "A",
       "id": "1383912907884688827",
       "is_abstract": false,
       "is_nested": false,
@@ -305,7 +305,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00034::R",
+      "display_name": "R",
       "id": "1713991735741265309",
       "is_abstract": false,
       "is_nested": false,
@@ -352,6 +352,7 @@ struct R {
     }
   ],
   "name": "t00034_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index cc6a2cfe..48b023a4 100644
--- a/docs/test_cases/t00034_class.svg
+++ b/docs/test_cases/t00034_class.svg
@@ -1,137 +1,119 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="254px" preserveAspectRatio="none" style="width:818px;height:254px;background:#FFFFFF;" version="1.1" viewBox="0 0 818 254" width="818px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="243px" preserveAspectRatio="none" style="width:788px;height:243px;" version="1.1" viewBox="0 0 788 243" width="788px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f8r9vgp93mbit" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
-      <g id="elem_C_0001704456490210873213">
-        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0001704456490210873213" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="328" x="7" y="165.6"/>
-        <ellipse cx="152.75" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M147.75,182.7563 C147.75,185.2563 149.8906,187.0688 152.8125,187.0688 C154.0469,187.0688 155.2188,186.7719 155.9688,186.2563 C156.5781,185.8344 156.9063,185.4125 156.9063,185.0063 C156.9063,184.5375 156.4844,184.1313 155.9844,184.1313 C155.75,184.1313 155.5313,184.2094 155.3281,184.4125 C154.8906,184.85 154.8906,184.85 154.7188,184.9438 C154.2656,185.1781 153.625,185.3188 152.8594,185.3188 C150.8594,185.3188 149.5781,184.3031 149.5781,182.725 L149.5781,181.6781 C149.5781,179.975 150.7969,178.7719 152.5,178.7719 C153.0781,178.7719 153.6563,178.9125 154.125,179.1625 C154.5938,179.4281 154.7656,179.6156 154.8281,179.975 C154.9531,180.6469 155.2031,180.8969 155.7344,180.8969 C156.0156,180.8969 156.2969,180.7563 156.4844,180.5375 C156.6094,180.3656 156.6563,180.1938 156.6563,179.7563 L156.6563,178.3969 C156.6563,177.975 156.6406,177.8344 156.5156,177.6625 C156.3438,177.4125 156.0625,177.2563 155.7344,177.2563 C155.4219,177.2563 155.2188,177.3656 155,177.6313 C153.8281,177.1313 153.3906,177.0219 152.4375,177.0219 C149.7656,177.0219 147.75,179.0375 147.75,181.6625 L147.75,182.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="173.25" y="186.206">Void</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="334" y1="197.6" y2="197.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="206.5"/>
-          <ellipse cx="18" cy="211.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="298" x="27" y="214.6059">operator!=(const Void &amp;) constexpr const : bool</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.2999"/>
-          <ellipse cx="18" cy="228.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="302" x="27" y="231.4059">operator==(const Void &amp;) constexpr const : bool</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="334" y1="239.1999" y2="239.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="305" x="6" y="159"/>
+      <ellipse cx="140.75" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M143.7188,180.6406 Q143.1406,180.9375 142.5,181.0781 Q141.8594,181.2344 141.1563,181.2344 Q138.6563,181.2344 137.3281,179.5938 Q136.0156,177.9375 136.0156,174.8125 Q136.0156,171.6875 137.3281,170.0313 Q138.6563,168.375 141.1563,168.375 Q141.8594,168.375 142.5,168.5313 Q143.1563,168.6875 143.7188,168.9844 L143.7188,171.7031 Q143.0938,171.125 142.5,170.8594 Q141.9063,170.5781 141.2813,170.5781 Q139.9375,170.5781 139.25,171.6563 Q138.5625,172.7188 138.5625,174.8125 Q138.5625,176.9063 139.25,177.9844 Q139.9375,179.0469 141.2813,179.0469 Q141.9063,179.0469 142.5,178.7813 Q143.0938,178.5 143.7188,177.9219 L143.7188,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="161.25" y="179.1543">Void</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="191" y2="191"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <g id="elem_C_0000867472442996685316">
-        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0000867472442996685316" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="91" x="518.5" y="182.4"/>
-        <ellipse cx="533.5" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M528.5,199.5562 C528.5,202.0562 530.6406,203.8687 533.5625,203.8687 C534.7969,203.8687 535.9688,203.5719 536.7188,203.0562 C537.3281,202.6344 537.6563,202.2125 537.6563,201.8062 C537.6563,201.3375 537.2344,200.9312 536.7344,200.9312 C536.5,200.9312 536.2813,201.0094 536.0781,201.2125 C535.6406,201.65 535.6406,201.65 535.4688,201.7437 C535.0156,201.9781 534.375,202.1187 533.6094,202.1187 C531.6094,202.1187 530.3281,201.1031 530.3281,199.525 L530.3281,198.4781 C530.3281,196.775 531.5469,195.5719 533.25,195.5719 C533.8281,195.5719 534.4063,195.7125 534.875,195.9625 C535.3438,196.2281 535.5156,196.4156 535.5781,196.775 C535.7031,197.4469 535.9531,197.6969 536.4844,197.6969 C536.7656,197.6969 537.0469,197.5562 537.2344,197.3375 C537.3594,197.1656 537.4063,196.9937 537.4063,196.5562 L537.4063,195.1969 C537.4063,194.775 537.3906,194.6344 537.2656,194.4625 C537.0938,194.2125 536.8125,194.0562 536.4844,194.0562 C536.1719,194.0562 535.9688,194.1656 535.75,194.4312 C534.5781,193.9312 534.1406,193.8219 533.1875,193.8219 C530.5156,193.8219 528.5,195.8375 528.5,198.4625 L528.5,199.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="547.5" y="203.006">lift_void</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="603.5" y="179.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="604.5" y="193.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="519.5" x2="608.5" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="519.5" x2="608.5" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="197"/>
+      <ellipse cx="17" cy="202" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <g id="elem_C_0000126450862226197239">
-        <rect codeLine="12" fill="#F1F1F1" height="48" id="C_0000126450862226197239" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="510.5" y="23.8"/>
-        <ellipse cx="525.5" cy="39.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M520.5,40.9562 C520.5,43.4562 522.6406,45.2687 525.5625,45.2687 C526.7969,45.2687 527.9688,44.9719 528.7188,44.4562 C529.3281,44.0344 529.6563,43.6125 529.6563,43.2062 C529.6563,42.7375 529.2344,42.3312 528.7344,42.3312 C528.5,42.3312 528.2813,42.4094 528.0781,42.6125 C527.6406,43.05 527.6406,43.05 527.4688,43.1437 C527.0156,43.3781 526.375,43.5187 525.6094,43.5187 C523.6094,43.5187 522.3281,42.5031 522.3281,40.925 L522.3281,39.8781 C522.3281,38.175 523.5469,36.9719 525.25,36.9719 C525.8281,36.9719 526.4063,37.1125 526.875,37.3625 C527.3438,37.6281 527.5156,37.8156 527.5781,38.175 C527.7031,38.8469 527.9531,39.0969 528.4844,39.0969 C528.7656,39.0969 529.0469,38.9562 529.2344,38.7375 C529.3594,38.5656 529.4063,38.3937 529.4063,37.9562 L529.4063,36.5969 C529.4063,36.175 529.3906,36.0344 529.2656,35.8625 C529.0938,35.6125 528.8125,35.4562 528.4844,35.4562 C528.1719,35.4562 527.9688,35.5656 527.75,35.8312 C526.5781,35.3312 526.1406,35.2219 525.1875,35.2219 C522.5156,35.2219 520.5,37.2375 520.5,39.8625 L520.5,40.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="539.5" y="44.406">lift_void</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="25" x="595.5" y="20.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="23" x="596.5" y="35.0001">void</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="511.5" x2="616.5" y1="55.8" y2="55.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="511.5" x2="616.5" y1="63.8" y2="63.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="273" x="26" y="205.2104">operator!=(const Void &amp;) constexpr const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <g id="elem_C_0001578745816100337706">
-        <rect codeLine="16" fill="#F1F1F1" height="48" id="C_0001578745816100337706" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="106" x="370" y="182.4"/>
-        <ellipse cx="385" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M380,199.5562 C380,202.0562 382.1406,203.8687 385.0625,203.8687 C386.2969,203.8687 387.4688,203.5719 388.2188,203.0562 C388.8281,202.6344 389.1563,202.2125 389.1563,201.8062 C389.1563,201.3375 388.7344,200.9312 388.2344,200.9312 C388,200.9312 387.7813,201.0094 387.5781,201.2125 C387.1406,201.65 387.1406,201.65 386.9688,201.7437 C386.5156,201.9781 385.875,202.1187 385.1094,202.1187 C383.1094,202.1187 381.8281,201.1031 381.8281,199.525 L381.8281,198.4781 C381.8281,196.775 383.0469,195.5719 384.75,195.5719 C385.3281,195.5719 385.9063,195.7125 386.375,195.9625 C386.8438,196.2281 387.0156,196.4156 387.0781,196.775 C387.2031,197.4469 387.4531,197.6969 387.9844,197.6969 C388.2656,197.6969 388.5469,197.5562 388.7344,197.3375 C388.8594,197.1656 388.9063,196.9937 388.9063,196.5562 L388.9063,195.1969 C388.9063,194.775 388.8906,194.6344 388.7656,194.4625 C388.5938,194.2125 388.3125,194.0562 387.9844,194.0562 C387.6719,194.0562 387.4688,194.1656 387.25,194.4312 C386.0781,193.9312 385.6406,193.8219 384.6875,193.8219 C382.0156,193.8219 380,195.8375 380,198.4625 L380,199.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="399" y="203.006">drop_void</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="470" y="179.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="471" y="193.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="371" x2="475" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="371" x2="475" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="209.8047"/>
+      <ellipse cx="17" cy="214.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <g id="elem_C_0001849836134504075115">
-        <rect codeLine="20" fill="#F1F1F1" height="48" id="C_0001849836134504075115" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="231" y="23.8"/>
-        <ellipse cx="246" cy="39.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M241,40.9562 C241,43.4562 243.1406,45.2687 246.0625,45.2687 C247.2969,45.2687 248.4688,44.9719 249.2188,44.4562 C249.8281,44.0344 250.1563,43.6125 250.1563,43.2062 C250.1563,42.7375 249.7344,42.3312 249.2344,42.3312 C249,42.3312 248.7813,42.4094 248.5781,42.6125 C248.1406,43.05 248.1406,43.05 247.9688,43.1437 C247.5156,43.3781 246.875,43.5187 246.1094,43.5187 C244.1094,43.5187 242.8281,42.5031 242.8281,40.925 L242.8281,39.8781 C242.8281,38.175 244.0469,36.9719 245.75,36.9719 C246.3281,36.9719 246.9063,37.1125 247.375,37.3625 C247.8438,37.6281 248.0156,37.8156 248.0781,38.175 C248.2031,38.8469 248.4531,39.0969 248.9844,39.0969 C249.2656,39.0969 249.5469,38.9562 249.7344,38.7375 C249.8594,38.5656 249.9063,38.3937 249.9063,37.9562 L249.9063,36.5969 C249.9063,36.175 249.8906,36.0344 249.7656,35.8625 C249.5938,35.6125 249.3125,35.4562 248.9844,35.4562 C248.6719,35.4562 248.4688,35.5656 248.25,35.8312 C247.0781,35.3312 246.6406,35.2219 245.6875,35.2219 C243.0156,35.2219 241,37.2375 241,39.8625 L241,40.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="260" y="44.406">drop_void</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="27" x="331" y="20.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="25" x="332" y="35.0001">Void</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="232" x2="354" y1="55.8" y2="55.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="232" x2="354" y1="63.8" y2="63.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="279" x="26" y="218.0151">operator==(const Void &amp;) constexpr const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001383912907884688827">
-        <rect codeLine="24" fill="#F1F1F1" height="48" id="C_0001383912907884688827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="711.5" y="182.4"/>
-        <ellipse cx="726.5" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M721.5,199.5562 C721.5,202.0562 723.6406,203.8687 726.5625,203.8687 C727.7969,203.8687 728.9688,203.5719 729.7188,203.0562 C730.3281,202.6344 730.6563,202.2125 730.6563,201.8062 C730.6563,201.3375 730.2344,200.9312 729.7344,200.9312 C729.5,200.9312 729.2813,201.0094 729.0781,201.2125 C728.6406,201.65 728.6406,201.65 728.4688,201.7437 C728.0156,201.9781 727.375,202.1187 726.6094,202.1187 C724.6094,202.1187 723.3281,201.1031 723.3281,199.525 L723.3281,198.4781 C723.3281,196.775 724.5469,195.5719 726.25,195.5719 C726.8281,195.5719 727.4063,195.7125 727.875,195.9625 C728.3438,196.2281 728.5156,196.4156 728.5781,196.775 C728.7031,197.4469 728.9531,197.6969 729.4844,197.6969 C729.7656,197.6969 730.0469,197.5562 730.2344,197.3375 C730.3594,197.1656 730.4063,196.9937 730.4063,196.5562 L730.4063,195.1969 C730.4063,194.775 730.3906,194.6344 730.2656,194.4625 C730.0938,194.2125 729.8125,194.0562 729.4844,194.0562 C729.1719,194.0562 728.9688,194.1656 728.75,194.4312 C727.5781,193.9312 727.1406,193.8219 726.1875,193.8219 C723.5156,193.8219 721.5,195.8375 721.5,198.4625 L721.5,199.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="740.5" y="203.006">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="712.5" x2="751.5" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="712.5" x2="751.5" y1="222.4" y2="222.4"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="224.6094" y2="224.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="493" y="172"/>
+      <ellipse cx="508" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M510.9688,193.6406 Q510.3906,193.9375 509.75,194.0781 Q509.1094,194.2344 508.4063,194.2344 Q505.9063,194.2344 504.5781,192.5938 Q503.2656,190.9375 503.2656,187.8125 Q503.2656,184.6875 504.5781,183.0313 Q505.9063,181.375 508.4063,181.375 Q509.1094,181.375 509.75,181.5313 Q510.4063,181.6875 510.9688,181.9844 L510.9688,184.7031 Q510.3438,184.125 509.75,183.8594 Q509.1563,183.5781 508.5313,183.5781 Q507.1875,183.5781 506.5,184.6563 Q505.8125,185.7188 505.8125,187.8125 Q505.8125,189.9063 506.5,190.9844 Q507.1875,192.0469 508.5313,192.0469 Q509.1563,192.0469 509.75,191.7813 Q510.3438,191.5 510.9688,190.9219 L510.9688,193.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="522" y="192.1543">lift_void</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="576" y="169"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="577" y="181.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="204" y2="204"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001713991735741265309">
-        <rect codeLine="28" fill="#F1F1F1" height="81.5999" id="C_0001713991735741265309" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="159" x="652.5" y="7"/>
-        <ellipse cx="722.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M717.75,24.1563 C717.75,26.6563 719.8906,28.4688 722.8125,28.4688 C724.0469,28.4688 725.2188,28.1719 725.9688,27.6563 C726.5781,27.2344 726.9063,26.8125 726.9063,26.4063 C726.9063,25.9375 726.4844,25.5313 725.9844,25.5313 C725.75,25.5313 725.5313,25.6094 725.3281,25.8125 C724.8906,26.25 724.8906,26.25 724.7188,26.3438 C724.2656,26.5781 723.625,26.7188 722.8594,26.7188 C720.8594,26.7188 719.5781,25.7031 719.5781,24.125 L719.5781,23.0781 C719.5781,21.375 720.7969,20.1719 722.5,20.1719 C723.0781,20.1719 723.6563,20.3125 724.125,20.5625 C724.5938,20.8281 724.7656,21.0156 724.8281,21.375 C724.9531,22.0469 725.2031,22.2969 725.7344,22.2969 C726.0156,22.2969 726.2969,22.1563 726.4844,21.9375 C726.6094,21.7656 726.6563,21.5938 726.6563,21.1563 L726.6563,19.7969 C726.6563,19.375 726.6406,19.2344 726.5156,19.0625 C726.3438,18.8125 726.0625,18.6563 725.7344,18.6563 C725.4219,18.6563 725.2188,18.7656 725,19.0313 C723.8281,18.5313 723.3906,18.4219 722.4375,18.4219 C719.7656,18.4219 717.75,20.4375 717.75,23.0625 L717.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="743.25" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="653.5" x2="810.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="653.5" x2="810.5" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="658.5" y="55.9"/>
-          <ellipse cx="663.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="672.5" y="64.0059">la : lift_void_t&lt;A&gt; *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="658.5" y="72.6999"/>
-          <ellipse cx="663.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="672.5" y="80.8059">lv : lift_void_t&lt;void&gt; *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="484" y="21"/>
+      <ellipse cx="499" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M501.9688,42.6406 Q501.3906,42.9375 500.75,43.0781 Q500.1094,43.2344 499.4063,43.2344 Q496.9063,43.2344 495.5781,41.5938 Q494.2656,39.9375 494.2656,36.8125 Q494.2656,33.6875 495.5781,32.0313 Q496.9063,30.375 499.4063,30.375 Q500.1094,30.375 500.75,30.5313 Q501.4063,30.6875 501.9688,30.9844 L501.9688,33.7031 Q501.3438,33.125 500.75,32.8594 Q500.1563,32.5781 499.5313,32.5781 Q498.1875,32.5781 497.5,33.6563 Q496.8125,34.7188 496.8125,36.8125 Q496.8125,38.9063 497.5,39.9844 Q498.1875,41.0469 499.5313,41.0469 Q500.1563,41.0469 500.75,40.7813 Q501.3438,40.5 501.9688,39.9219 L501.9688,42.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="513" y="41.1543">lift_void</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="567" y="18"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="568" y="30.1387">void</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="53" y2="53"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="61" y2="61"/>
     </a>
-    <g id="link_C_0000126450862226197239_C_0000867472442996685316">
-      <path codeLine="33" d="M564,72.24 C564,101.85 564,134.49 564,164.05 " fill="none" id="C_0000126450862226197239-to-C_0000867472442996685316" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="564,182.05,570,164.05,558,164.05,564,182.05" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001849836134504075115_C_0001704456490210873213">
-      <path codeLine="34" d="M274.74,72.24 C255.59,96.82 228.8475,131.1469 205.8875,160.6169 " fill="none" id="C_0001849836134504075115-to-C_0001704456490210873213" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="202.2,165.35,210.8867,160.7087,205.2729,161.4058,204.5759,155.792,202.2,165.35" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001849836134504075115_C_0001578745816100337706">
-      <path codeLine="35" d="M312.46,72.24 C337.04,101.85 367.5825,138.6405 392.1225,168.2005 " fill="none" id="C_0001849836134504075115-to-C_0001578745816100337706" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="403.62,182.05,396.739,164.368,387.506,172.033,403.62,182.05" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001713991735741265309_C_0001383912907884688827">
-      <path codeLine="36" d="M707.94,88.93 C703.42,98.35 699.37,108.57 697,118.6 C691.72,140.89 699.6213,159.922 710.7013,177.052 " fill="none" id="C_0001713991735741265309-to-C_0001383912907884688827" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="713.96,182.09,712.4307,172.3606,711.2445,177.8917,705.7134,176.7055,713.96,182.09" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="703" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="10" x="710" y="131.677">la</text>
-    </g>
-    <g id="link_C_0001713991735741265309_C_0001383912907884688827">
-      <path codeLine="37" d="M732,88.72 C732,118.26 732,151.49 732,176.09 " fill="none" id="C_0001713991735741265309-to-C_0001383912907884688827-1" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="732,182.09,736,173.09,732,177.09,728,173.09,732,182.09" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="738" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="10" x="745" y="131.677">la</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="346" y="172"/>
+      <ellipse cx="361" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M363.9688,193.6406 Q363.3906,193.9375 362.75,194.0781 Q362.1094,194.2344 361.4063,194.2344 Q358.9063,194.2344 357.5781,192.5938 Q356.2656,190.9375 356.2656,187.8125 Q356.2656,184.6875 357.5781,183.0313 Q358.9063,181.375 361.4063,181.375 Q362.1094,181.375 362.75,181.5313 Q363.4063,181.6875 363.9688,181.9844 L363.9688,184.7031 Q363.3438,184.125 362.75,183.8594 Q362.1563,183.5781 361.5313,183.5781 Q360.1875,183.5781 359.5,184.6563 Q358.8125,185.7188 358.8125,187.8125 Q358.8125,189.9063 359.5,190.9844 Q360.1875,192.0469 361.5313,192.0469 Q362.1563,192.0469 362.75,191.7813 Q363.3438,191.5 363.9688,190.9219 L363.9688,193.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="375" y="192.1543">drop_void</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="443" y="169"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="444" y="181.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="204" y2="204"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="212" y2="212"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="212" y="21"/>
+      <ellipse cx="227" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M229.9688,42.6406 Q229.3906,42.9375 228.75,43.0781 Q228.1094,43.2344 227.4063,43.2344 Q224.9063,43.2344 223.5781,41.5938 Q222.2656,39.9375 222.2656,36.8125 Q222.2656,33.6875 223.5781,32.0313 Q224.9063,30.375 227.4063,30.375 Q228.1094,30.375 228.75,30.5313 Q229.4063,30.6875 229.9688,30.9844 L229.9688,33.7031 Q229.3438,33.125 228.75,32.8594 Q228.1563,32.5781 227.5313,32.5781 Q226.1875,32.5781 225.5,33.6563 Q224.8125,34.7188 224.8125,36.8125 Q224.8125,38.9063 225.5,39.9844 Q226.1875,41.0469 227.5313,41.0469 Q228.1563,41.0469 228.75,40.7813 Q229.3438,40.5 229.9688,39.9219 L229.9688,42.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="241" y="41.1543">drop_void</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="29" x="309" y="18"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="27" x="310" y="30.1387">Void</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="53" y2="53"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="61" y2="61"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="681.5" y="172"/>
+      <ellipse cx="696.5" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M699.4688,193.6406 Q698.8906,193.9375 698.25,194.0781 Q697.6094,194.2344 696.9063,194.2344 Q694.4063,194.2344 693.0781,192.5938 Q691.7656,190.9375 691.7656,187.8125 Q691.7656,184.6875 693.0781,183.0313 Q694.4063,181.375 696.9063,181.375 Q697.6094,181.375 698.25,181.5313 Q698.9063,181.6875 699.4688,181.9844 L699.4688,184.7031 Q698.8438,184.125 698.25,183.8594 Q697.6563,183.5781 697.0313,183.5781 Q695.6875,183.5781 695,184.6563 Q694.3125,185.7188 694.3125,187.8125 Q694.3125,189.9063 695,190.9844 Q695.6875,192.0469 697.0313,192.0469 Q697.6563,192.0469 698.25,191.7813 Q698.8438,191.5 699.4688,190.9219 L699.4688,193.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="710.5" y="192.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="204" y2="204"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="212" y2="212"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="626" y="8"/>
+      <ellipse cx="693.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M696.2188,29.6406 Q695.6406,29.9375 695,30.0781 Q694.3594,30.2344 693.6563,30.2344 Q691.1563,30.2344 689.8281,28.5938 Q688.5156,26.9375 688.5156,23.8125 Q688.5156,20.6875 689.8281,19.0313 Q691.1563,17.375 693.6563,17.375 Q694.3594,17.375 695,17.5313 Q695.6563,17.6875 696.2188,17.9844 L696.2188,20.7031 Q695.5938,20.125 695,19.8594 Q694.4063,19.5781 693.7813,19.5781 Q692.4375,19.5781 691.75,20.6563 Q691.0625,21.7188 691.0625,23.8125 Q691.0625,25.9063 691.75,26.9844 Q692.4375,28.0469 693.7813,28.0469 Q694.4063,28.0469 695,27.7813 Q695.5938,27.5 696.2188,26.9219 L696.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="713.75" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="632" y="54"/>
+      <ellipse cx="637" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="646" y="62.2104">la : lift_void_t&lt;A&gt; *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="632" y="66.8047"/>
+      <ellipse cx="637" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="125" x="646" y="75.0151">lv : lift_void_t&lt;void&gt; *</text>
+    </a>
+    <path d="M537.5,69.28 C537.5,91.26 537.5,124.76 537.5,151.66 " fill="none" id="C_0000126450862226197239-&gt;C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="544.5,151.88,537.5,171.88,530.5,151.88,544.5,151.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M255.53,69.28 C237.89,92.14 210.63,127.46 189.48,154.85 " fill="none" id="C_0001849836134504075115-&gt;C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="186.41,158.84,195.0777,154.1633,189.4668,154.8833,188.7469,149.2724,186.41,158.84" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M292.88,69.28 C312.26,92.57 342.41,128.81 365.38,156.4 " fill="none" id="C_0001849836134504075115-&gt;C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="370.85,152.03,378.26,171.88,360.09,160.99,370.85,152.03" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M677.51,82.35 C672.56,91.64 668.08,101.88 665.5,112 C660.6,131.2 669.27,151.63 679.33,167.42 " fill="none" id="C_0001713991735741265309-&gt;C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="682.19,171.74,680.5644,162.0262,679.433,167.5688,673.8904,166.4374,682.19,171.74" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="671.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="678.5" y="125.0669">la</text>
+    <path d="M701.5,82.07 C701.5,108.01 701.5,142.52 701.5,166.53 " fill="none" id="C_0001713991735741265309-&gt;C_0001383912907884688827-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="701.5,171.79,705.5,162.79,701.5,166.79,697.5,162.79,701.5,171.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="707.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="714.5" y="125.0669">la</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00034_class_mermaid.svg b/docs/test_cases/t00034_class_mermaid.svg
index 7f4426a8..01b5fbd4 100644
--- a/docs/test_cases/t00034_class_mermaid.svg
+++ b/docs/test_cases/t00034_class_mermaid.svg
@@ -1,64 +1,59 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 919.47265625 286" style="max-width: 919.473px; background-color: white;" width="919.47265625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 910.58203125 286" style="max-width: 910.582px; background-color: white;" width="910.58203125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M71.9609375,87L71.9609375,96.33333333333333C71.9609375,105.66666666666667,71.9609375,124.33333333333333,71.9609375,140C71.9609375,155.66666666666666,71.9609375,168.33333333333334,71.9609375,174.66666666666666L71.9609375,181"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M463.9620931952663,87L447.36945266272187,96.33333333333333C430.7768121301776,105.66666666666667,397.59153106508876,124.33333333333333,380.9988905325444,138.33333333333334C364.40625,152.33333333333334,364.40625,161.66666666666666,364.40625,166.33333333333334L364.40625,171"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M565.2957193047338,87L581.8883598372781,96.33333333333333C598.4810003698225,105.66666666666667,631.6662814349112,124.33333333333333,648.2589219674556,140C664.8515625,155.66666666666666,664.8515625,168.33333333333334,664.8515625,174.66666666666666L664.8515625,181"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M829.03515625,109L829.03515625,114.66666666666667C829.03515625,120.33333333333333,829.03515625,131.66666666666666,829.03515625,145.66666666666666C829.03515625,159.66666666666666,829.03515625,176.33333333333334,829.03515625,184.66666666666666L829.03515625,193"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M71.9609375,87L71.9609375,96.33333333333333C71.9609375,105.66666666666667,71.9609375,124.33333333333333,71.9609375,143C71.9609375,161.66666666666666,71.9609375,180.33333333333334,71.9609375,189.66666666666666L71.9609375,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M458.04377773668637,87L441.69663769723866,96.33333333333333C425.3494976577909,105.66666666666667,392.6552175788955,124.33333333333333,376.30807753944777,139.33333333333334C359.9609375,154.33333333333334,359.9609375,165.66666666666666,359.9609375,171.33333333333334L359.9609375,177"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M557.8780972633136,87L574.2252373027613,96.33333333333333C590.572377342209,105.66666666666667,623.2666574211045,124.33333333333333,639.6137974605523,143C655.9609375,161.66666666666666,655.9609375,180.33333333333334,655.9609375,189.66666666666666L655.9609375,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M820.14453125,109L820.14453125,114.66666666666667C820.14453125,120.33333333333333,820.14453125,131.66666666666666,820.14453125,146.66666666666666C820.14453125,161.66666666666666,820.14453125,180.33333333333334,820.14453125,189.66666666666666L820.14453125,199"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -94,7 +89,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(829.03515625, 143)" class="edgeLabel">
+        <g transform="translate(820.14453125, 143)" class="edgeLabel">
           <g transform="translate(-10.8984375, -9)" class="label">
             <foreignObject height="18" width="21.796875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -107,11 +102,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(364.40625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L9">
+        <a transform="translate(359.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L9">
           <g title="Void" id="classId-C_0001704456490210873213-0" class="node default clickable">
-            <rect height="101" width="380.09375" y="-50.5" x="-190.046875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="190.046875" x1="-190.046875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="190.046875" x1="-190.046875" class="divider"/>
+            <rect height="101" width="371.203125" y="-50.5" x="-185.6015625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="185.6015625" x1="-185.6015625" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="185.6015625" x1="-185.6015625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -123,20 +118,20 @@
                   <span class="nodeLabel">Void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -182.546875, 3)" height="18" width="360.203125">
+              <foreignObject transform="translate( -178.1015625, 3)" height="18" width="351.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator!=(const Void &amp;) : : [const,constexpr] bool</span>
+                  <span class="nodeLabel">+operator!=(const Void &amp;) : [const,constexpr] bool</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -182.546875, 25)" height="18" width="365.09375">
+              <foreignObject transform="translate( -178.1015625, 25)" height="18" width="356.203125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator==(const Void &amp;) : : [const,constexpr] bool</span>
+                  <span class="nodeLabel">+operator==(const Void &amp;) : [const,constexpr] bool</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L16">
+        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L16">
           <g title="lift_void" id="classId-C_0000867472442996685316-1" class="node default clickable">
             <rect height="57" width="104.796875" y="-28.5" x="-52.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.3984375" x1="-52.3984375" class="divider"/>
@@ -155,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L20">
+        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L20">
           <g title="lift_void" id="classId-C_0000126450862226197239-2" class="node default clickable">
             <rect height="57" width="127.921875" y="-28.5" x="-63.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.9609375" x1="-63.9609375" class="divider"/>
@@ -174,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(664.8515625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L33">
+        <a transform="translate(655.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L33">
           <g title="drop_void" id="classId-C_0001578745816100337706-3" class="node default clickable">
             <rect height="57" width="120.796875" y="-28.5" x="-60.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.3984375" x1="-60.3984375" class="divider"/>
@@ -193,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(514.62890625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L37">
+        <a transform="translate(507.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L37">
           <g title="drop_void" id="classId-C_0001849836134504075115-4" class="node default clickable">
             <rect height="57" width="144.5" y="-28.5" x="-72.25" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.25" x1="-72.25" class="divider"/>
@@ -212,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(829.03515625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L43">
+        <a transform="translate(820.14453125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L43">
           <g title="A" id="classId-C_0001383912907884688827-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -231,7 +226,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(829.03515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00034/t00034.cc#L45">
+        <a transform="translate(820.14453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L45">
           <g title="R" id="classId-C_0001713991735741265309-6" class="node default clickable">
             <rect height="101" width="164.875" y="-50.5" x="-82.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="82.4375" x1="-82.4375" class="divider"/>
@@ -249,12 +244,12 @@
               </foreignObject>
               <foreignObject transform="translate( -74.9375, -9)" height="18" width="132.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+la : lift_void_t&lt;A&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+la : lift_void_t&lt;A&gt; </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -74.9375, 13)" height="18" width="149.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+lv : lift_void_t&lt;void&gt;</span>
+                  <span style="font-style:italic;" class="nodeLabel">+lv : lift_void_t&lt;void&gt; </span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00035.md b/docs/test_cases/t00035.md
index ce6fb517..f06c66a0 100644
--- a/docs/test_cases/t00035.md
+++ b/docs/test_cases/t00035.md
@@ -49,7 +49,7 @@ struct Right { };
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00035::Top",
+      "display_name": "Top",
       "id": "2241062883697294772",
       "is_abstract": false,
       "is_nested": false,
@@ -71,7 +71,7 @@ struct Right { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00035::Left",
+      "display_name": "Left",
       "id": "242562856080127946",
       "is_abstract": false,
       "is_nested": false,
@@ -93,7 +93,7 @@ struct Right { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00035::Center",
+      "display_name": "Center",
       "id": "1933304541849408421",
       "is_abstract": false,
       "is_nested": false,
@@ -115,7 +115,7 @@ struct Right { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00035::Bottom",
+      "display_name": "Bottom",
       "id": "1646691079607377420",
       "is_abstract": false,
       "is_nested": false,
@@ -137,7 +137,7 @@ struct Right { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00035::Right",
+      "display_name": "Right",
       "id": "200121820090372322",
       "is_abstract": false,
       "is_nested": false,
@@ -159,6 +159,7 @@ struct Right { };
     }
   ],
   "name": "t00035_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00035"
 }
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index 2e7431bd..ca350e25 100644
--- a/docs/test_cases/t00035_class.svg
+++ b/docs/test_cases/t00035_class.svg
@@ -1,57 +1,53 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="278px" preserveAspectRatio="none" style="width:280px;height:278px;background:#FFFFFF;" version="1.1" viewBox="0 0 280 278" width="280px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="f9fe55hfb20gy" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
-      <g id="elem_C_0002241062883697294772">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0002241062883697294772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="57" x="107.5" y="7"/>
-        <ellipse cx="122.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M117.5,24.1563 C117.5,26.6563 119.6406,28.4688 122.5625,28.4688 C123.7969,28.4688 124.9688,28.1719 125.7188,27.6563 C126.3281,27.2344 126.6563,26.8125 126.6563,26.4063 C126.6563,25.9375 126.2344,25.5313 125.7344,25.5313 C125.5,25.5313 125.2813,25.6094 125.0781,25.8125 C124.6406,26.25 124.6406,26.25 124.4688,26.3438 C124.0156,26.5781 123.375,26.7188 122.6094,26.7188 C120.6094,26.7188 119.3281,25.7031 119.3281,24.125 L119.3281,23.0781 C119.3281,21.375 120.5469,20.1719 122.25,20.1719 C122.8281,20.1719 123.4063,20.3125 123.875,20.5625 C124.3438,20.8281 124.5156,21.0156 124.5781,21.375 C124.7031,22.0469 124.9531,22.2969 125.4844,22.2969 C125.7656,22.2969 126.0469,22.1563 126.2344,21.9375 C126.3594,21.7656 126.4063,21.5938 126.4063,21.1563 L126.4063,19.7969 C126.4063,19.375 126.3906,19.2344 126.2656,19.0625 C126.0938,18.8125 125.8125,18.6563 125.4844,18.6563 C125.1719,18.6563 124.9688,18.7656 124.75,19.0313 C123.5781,18.5313 123.1406,18.4219 122.1875,18.4219 C119.5156,18.4219 117.5,20.4375 117.5,23.0625 L117.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="136.5" y="27.606">Top</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="108.5" x2="163.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="108.5" x2="163.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
+      <ellipse cx="121" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M123.9688,29.6406 Q123.3906,29.9375 122.75,30.0781 Q122.1094,30.2344 121.4063,30.2344 Q118.9063,30.2344 117.5781,28.5938 Q116.2656,26.9375 116.2656,23.8125 Q116.2656,20.6875 117.5781,19.0313 Q118.9063,17.375 121.4063,17.375 Q122.1094,17.375 122.75,17.5313 Q123.4063,17.6875 123.9688,17.9844 L123.9688,20.7031 Q123.3438,20.125 122.75,19.8594 Q122.1563,19.5781 121.5313,19.5781 Q120.1875,19.5781 119.5,20.6563 Q118.8125,21.7188 118.8125,23.8125 Q118.8125,25.9063 119.5,26.9844 Q120.1875,28.0469 121.5313,28.0469 Q122.1563,28.0469 122.75,27.7813 Q123.3438,27.5 123.9688,26.9219 L123.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="135" y="28.1543">Top</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
-      <g id="elem_C_0000242562856080127946">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000242562856080127946" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="56" x="7" y="115"/>
-        <ellipse cx="22" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,132.1563 C17,134.6563 19.1406,136.4688 22.0625,136.4688 C23.2969,136.4688 24.4688,136.1719 25.2188,135.6563 C25.8281,135.2344 26.1563,134.8125 26.1563,134.4063 C26.1563,133.9375 25.7344,133.5313 25.2344,133.5313 C25,133.5313 24.7813,133.6094 24.5781,133.8125 C24.1406,134.25 24.1406,134.25 23.9688,134.3438 C23.5156,134.5781 22.875,134.7188 22.1094,134.7188 C20.1094,134.7188 18.8281,133.7031 18.8281,132.125 L18.8281,131.0781 C18.8281,129.375 20.0469,128.1719 21.75,128.1719 C22.3281,128.1719 22.9063,128.3125 23.375,128.5625 C23.8438,128.8281 24.0156,129.0156 24.0781,129.375 C24.2031,130.0469 24.4531,130.2969 24.9844,130.2969 C25.2656,130.2969 25.5469,130.1563 25.7344,129.9375 C25.8594,129.7656 25.9063,129.5938 25.9063,129.1563 L25.9063,127.7969 C25.9063,127.375 25.8906,127.2344 25.7656,127.0625 C25.5938,126.8125 25.3125,126.6563 24.9844,126.6563 C24.6719,126.6563 24.4688,126.7656 24.25,127.0313 C23.0781,126.5313 22.6406,126.4219 21.6875,126.4219 C19.0156,126.4219 17,128.4375 17,131.0625 L17,132.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="36" y="135.606">Left</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="62" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="62" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
+      <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="35" y="136.1543">Left</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
-      <g id="elem_C_0001933304541849408421">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001933304541849408421" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="75" x="98.5" y="115"/>
-        <ellipse cx="113.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M108.5,132.1563 C108.5,134.6563 110.6406,136.4688 113.5625,136.4688 C114.7969,136.4688 115.9688,136.1719 116.7188,135.6563 C117.3281,135.2344 117.6563,134.8125 117.6563,134.4063 C117.6563,133.9375 117.2344,133.5313 116.7344,133.5313 C116.5,133.5313 116.2813,133.6094 116.0781,133.8125 C115.6406,134.25 115.6406,134.25 115.4688,134.3438 C115.0156,134.5781 114.375,134.7188 113.6094,134.7188 C111.6094,134.7188 110.3281,133.7031 110.3281,132.125 L110.3281,131.0781 C110.3281,129.375 111.5469,128.1719 113.25,128.1719 C113.8281,128.1719 114.4063,128.3125 114.875,128.5625 C115.3438,128.8281 115.5156,129.0156 115.5781,129.375 C115.7031,130.0469 115.9531,130.2969 116.4844,130.2969 C116.7656,130.2969 117.0469,130.1563 117.2344,129.9375 C117.3594,129.7656 117.4063,129.5938 117.4063,129.1563 L117.4063,127.7969 C117.4063,127.375 117.3906,127.2344 117.2656,127.0625 C117.0938,126.8125 116.8125,126.6563 116.4844,126.6563 C116.1719,126.6563 115.9688,126.7656 115.75,127.0313 C114.5781,126.5313 114.1406,126.4219 113.1875,126.4219 C110.5156,126.4219 108.5,128.4375 108.5,131.0625 L108.5,132.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="127.5" y="135.606">Center</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="99.5" x2="172.5" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="99.5" x2="172.5" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
+      <ellipse cx="111.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M114.4688,137.6406 Q113.8906,137.9375 113.25,138.0781 Q112.6094,138.2344 111.9063,138.2344 Q109.4063,138.2344 108.0781,136.5938 Q106.7656,134.9375 106.7656,131.8125 Q106.7656,128.6875 108.0781,127.0313 Q109.4063,125.375 111.9063,125.375 Q112.6094,125.375 113.25,125.5313 Q113.9063,125.6875 114.4688,125.9844 L114.4688,128.7031 Q113.8438,128.125 113.25,127.8594 Q112.6563,127.5781 112.0313,127.5781 Q110.6875,127.5781 110,128.6563 Q109.3125,129.7188 109.3125,131.8125 Q109.3125,133.9063 110,134.9844 Q110.6875,136.0469 112.0313,136.0469 Q112.6563,136.0469 113.25,135.7813 Q113.8438,135.5 114.4688,134.9219 L114.4688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="125.5" y="136.1543">Center</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
-      <g id="elem_C_0001646691079607377420">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001646691079607377420" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="77" x="97.5" y="223"/>
-        <ellipse cx="112.5" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M107.5,240.1563 C107.5,242.6563 109.6406,244.4688 112.5625,244.4688 C113.7969,244.4688 114.9688,244.1719 115.7188,243.6563 C116.3281,243.2344 116.6563,242.8125 116.6563,242.4063 C116.6563,241.9375 116.2344,241.5313 115.7344,241.5313 C115.5,241.5313 115.2813,241.6094 115.0781,241.8125 C114.6406,242.25 114.6406,242.25 114.4688,242.3438 C114.0156,242.5781 113.375,242.7188 112.6094,242.7188 C110.6094,242.7188 109.3281,241.7031 109.3281,240.125 L109.3281,239.0781 C109.3281,237.375 110.5469,236.1719 112.25,236.1719 C112.8281,236.1719 113.4063,236.3125 113.875,236.5625 C114.3438,236.8281 114.5156,237.0156 114.5781,237.375 C114.7031,238.0469 114.9531,238.2969 115.4844,238.2969 C115.7656,238.2969 116.0469,238.1563 116.2344,237.9375 C116.3594,237.7656 116.4063,237.5938 116.4063,237.1563 L116.4063,235.7969 C116.4063,235.375 116.3906,235.2344 116.2656,235.0625 C116.0938,234.8125 115.8125,234.6563 115.4844,234.6563 C115.1719,234.6563 114.9688,234.7656 114.75,235.0313 C113.5781,234.5313 113.1406,234.4219 112.1875,234.4219 C109.5156,234.4219 107.5,236.4375 107.5,239.0625 L107.5,240.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="126.5" y="243.606">Bottom</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="98.5" x2="173.5" y1="255" y2="255"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="98.5" x2="173.5" y1="263" y2="263"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
+      <ellipse cx="110" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M112.9688,245.6406 Q112.3906,245.9375 111.75,246.0781 Q111.1094,246.2344 110.4063,246.2344 Q107.9063,246.2344 106.5781,244.5938 Q105.2656,242.9375 105.2656,239.8125 Q105.2656,236.6875 106.5781,235.0313 Q107.9063,233.375 110.4063,233.375 Q111.1094,233.375 111.75,233.5313 Q112.4063,233.6875 112.9688,233.9844 L112.9688,236.7031 Q112.3438,236.125 111.75,235.8594 Q111.1563,235.5781 110.5313,235.5781 Q109.1875,235.5781 108.5,236.6563 Q107.8125,237.7188 107.8125,239.8125 Q107.8125,241.9063 108.5,242.9844 Q109.1875,244.0469 110.5313,244.0469 Q111.1563,244.0469 111.75,243.7813 Q112.3438,243.5 112.9688,242.9219 L112.9688,245.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="124" y="244.1543">Bottom</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="256" y2="256"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
-      <g id="elem_C_0000200121820090372322">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000200121820090372322" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="65" x="208.5" y="115"/>
-        <ellipse cx="223.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M218.5,132.1563 C218.5,134.6563 220.6406,136.4688 223.5625,136.4688 C224.7969,136.4688 225.9688,136.1719 226.7188,135.6563 C227.3281,135.2344 227.6563,134.8125 227.6563,134.4063 C227.6563,133.9375 227.2344,133.5313 226.7344,133.5313 C226.5,133.5313 226.2813,133.6094 226.0781,133.8125 C225.6406,134.25 225.6406,134.25 225.4688,134.3438 C225.0156,134.5781 224.375,134.7188 223.6094,134.7188 C221.6094,134.7188 220.3281,133.7031 220.3281,132.125 L220.3281,131.0781 C220.3281,129.375 221.5469,128.1719 223.25,128.1719 C223.8281,128.1719 224.4063,128.3125 224.875,128.5625 C225.3438,128.8281 225.5156,129.0156 225.5781,129.375 C225.7031,130.0469 225.9531,130.2969 226.4844,130.2969 C226.7656,130.2969 227.0469,130.1563 227.2344,129.9375 C227.3594,129.7656 227.4063,129.5938 227.4063,129.1563 L227.4063,127.7969 C227.4063,127.375 227.3906,127.2344 227.2656,127.0625 C227.0938,126.8125 226.8125,126.6563 226.4844,126.6563 C226.1719,126.6563 225.9688,126.7656 225.75,127.0313 C224.5781,126.5313 224.1406,126.4219 223.1875,126.4219 C220.5156,126.4219 218.5,128.4375 218.5,131.0625 L218.5,132.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="237.5" y="135.606">Right</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="209.5" x2="272.5" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="209.5" x2="272.5" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
+      <ellipse cx="220.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M223.4688,137.6406 Q222.8906,137.9375 222.25,138.0781 Q221.6094,138.2344 220.9063,138.2344 Q218.4063,138.2344 217.0781,136.5938 Q215.7656,134.9375 215.7656,131.8125 Q215.7656,128.6875 217.0781,127.0313 Q218.4063,125.375 220.9063,125.375 Q221.6094,125.375 222.25,125.5313 Q222.9063,125.6875 223.4688,125.9844 L223.4688,128.7031 Q222.8438,128.125 222.25,127.8594 Q221.6563,127.5781 221.0313,127.5781 Q219.6875,127.5781 219,128.6563 Q218.3125,129.7188 218.3125,131.8125 Q218.3125,133.9063 219,134.9844 Q219.6875,136.0469 221.0313,136.0469 Q221.6563,136.0469 222.25,135.7813 Q222.8438,135.5 223.4688,134.9219 L223.4688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="234.5" y="136.1543">Right</text>
+      <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"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00035_class_mermaid.svg b/docs/test_cases/t00035_class_mermaid.svg
index c5c6d420..88b19390 100644
--- a/docs/test_cases/t00035_class_mermaid.svg
+++ b/docs/test_cases/t00035_class_mermaid.svg
@@ -1,55 +1,50 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 496.015625 73" style="max-width: 496.016px; background-color: white;" width="496.015625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L4">
+        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L4">
           <g title="Top" id="classId-C_0002241062883697294772-0" class="node default clickable">
             <rect height="57" width="43.140625" y="-28.5" x="-21.5703125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="21.5703125" x1="-21.5703125" class="divider"/>
@@ -76,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L6">
+        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L6">
           <g title="Left" id="classId-C_0000242562856080127946-1" class="node default clickable">
             <rect height="57" width="44.328125" y="-28.5" x="-22.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="22.1640625" x1="-22.1640625" class="divider"/>
@@ -95,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L8">
+        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L8">
           <g title="Center" id="classId-C_0001933304541849408421-2" class="node default clickable">
             <rect height="57" width="65.6875" y="-28.5" x="-32.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.84375" x1="-32.84375" class="divider"/>
@@ -114,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L10">
+        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L10">
           <g title="Bottom" id="classId-C_0001646691079607377420-3" class="node default clickable">
             <rect height="57" width="70.984375" y="-28.5" x="-35.4921875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.4921875" x1="-35.4921875" class="divider"/>
@@ -133,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00035/t00035.cc#L12">
+        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L12">
           <g title="Right" id="classId-C_0000200121820090372322-4" class="node default clickable">
             <rect height="57" width="55.875" y="-28.5" x="-27.9375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.9375" x1="-27.9375" class="divider"/>
diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md
index 222d1ff4..eabe606f 100644
--- a/docs/test_cases/t00036.md
+++ b/docs/test_cases/t00036.md
@@ -37,7 +37,7 @@ struct B {
     A<int> a_int;
 };
 
-}
+} // namespace ns111
 } // namespace ns11
 } // namespace ns1
 
@@ -49,8 +49,8 @@ struct C { };
 
 struct D { };
 
-}
-}
+} // namespace ns22
+} // namespace ns2
 
 namespace ns3 {
 namespace ns33 {
@@ -74,14 +74,14 @@ struct DImpl : public ns2::ns22::D { };
   "diagram_type": "class",
   "elements": [
     {
-      "display_name": "clanguml::t00036::ns1",
+      "display_name": "ns1",
       "elements": [
         {
           "constants": [
             "blue",
             "yellow"
           ],
-          "display_name": "clanguml::t00036::ns1::E",
+          "display_name": "ns1::E",
           "id": "2144761953049158478",
           "is_nested": false,
           "name": "E",
@@ -95,11 +95,11 @@ struct DImpl : public ns2::ns22::D { };
           "type": "enum"
         },
         {
-          "display_name": "clanguml::t00036::ns1::ns11",
+          "display_name": "ns11",
           "elements": [
             {
               "bases": [],
-              "display_name": "clanguml::t00036::ns1::ns11::A<T>",
+              "display_name": "ns1::ns11::A<T>",
               "id": "571573305652194946",
               "is_abstract": false,
               "is_nested": false,
@@ -140,11 +140,11 @@ struct DImpl : public ns2::ns22::D { };
               "type": "class"
             },
             {
-              "display_name": "clanguml::t00036::ns1::ns11::ns111",
+              "display_name": "ns111",
               "elements": [
                 {
                   "bases": [],
-                  "display_name": "clanguml::t00036::ns1::ns11::ns111::B",
+                  "display_name": "ns1::ns11::ns111::B",
                   "id": "1964031933563607376",
                   "is_abstract": false,
                   "is_nested": false,
@@ -183,7 +183,7 @@ struct DImpl : public ns2::ns22::D { };
             },
             {
               "bases": [],
-              "display_name": "clanguml::t00036::ns1::ns11::A<int>",
+              "display_name": "ns1::ns11::A<int>",
               "id": "1832710427462319797",
               "is_abstract": false,
               "is_nested": false,
@@ -219,14 +219,14 @@ struct DImpl : public ns2::ns22::D { };
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t00036::ns2",
+      "display_name": "ns2",
       "elements": [
         {
-          "display_name": "clanguml::t00036::ns2::ns22",
+          "display_name": "ns22",
           "elements": [
             {
               "bases": [],
-              "display_name": "clanguml::t00036::ns2::ns22::C",
+              "display_name": "ns2::ns22::C",
               "id": "2038956882066165590",
               "is_abstract": false,
               "is_nested": false,
@@ -255,13 +255,13 @@ struct DImpl : public ns2::ns22::D { };
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t00036::ns3",
+      "display_name": "ns3",
       "elements": [
         {
-          "display_name": "clanguml::t00036::ns3::ns33",
+          "display_name": "ns33",
           "elements": [
             {
-              "display_name": "clanguml::t00036::ns3::ns33::detail",
+              "display_name": "detail",
               "name": "detail",
               "type": "namespace"
             }
@@ -275,6 +275,7 @@ struct DImpl : public ns2::ns22::D { };
     }
   ],
   "name": "t00036_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index f5ed74e2..9987d7a0 100644
--- a/docs/test_cases/t00036_class.svg
+++ b/docs/test_cases/t00036_class.svg
@@ -1,112 +1,94 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="507px" preserveAspectRatio="none" style="width:455px;height:507px;background:#FFFFFF;" version="1.1" viewBox="0 0 455 507" width="455px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="525px" preserveAspectRatio="none" style="width:476px;height:525px;" version="1.1" viewBox="0 0 476 525" width="476px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fakdfoqya7gsu" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001715359870528941578">
-      <path d="M8.5,6.294 L34.5,6.294 A3.75,3.75 0 0 1 37,8.794 L44,29.0939 L299.5,29.0939 A2.5,2.5 0 0 1 302,31.5939 L302,497.994 A2.5,2.5 0 0 1 299.5,500.494 L8.5,500.494 A2.5,2.5 0 0 1 6,497.994 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="44" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="10" y="21.2999">ns1</text>
-    </g>
-    <g id="cluster_C_0000262695575877387930">
-      <path d="M90.5,49.294 L124.5,49.294 A3.75,3.75 0 0 1 127,51.794 L134,72.0939 L275.5,72.0939 A2.5,2.5 0 0 1 278,74.5939 L278,473.994 A2.5,2.5 0 0 1 275.5,476.494 L90.5,476.494 A2.5,2.5 0 0 1 88,473.994 L88,51.794 A2.5,2.5 0 0 1 90.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="88" x2="134" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="33" x="92" y="64.2999">ns11</text>
-    </g>
-    <g id="cluster_C_0000389054211045973300">
-      <path d="M114.5,92.294 L156.5,92.294 A3.75,3.75 0 0 1 159,94.794 L166,115.0939 L251.5,115.0939 A2.5,2.5 0 0 1 254,117.5939 L254,205.594 A2.5,2.5 0 0 1 251.5,208.094 L114.5,208.094 A2.5,2.5 0 0 1 112,205.594 L112,94.794 A2.5,2.5 0 0 1 114.5,92.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="112" x2="166" y1="115.0939" y2="115.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="41" x="116" y="107.2999">ns111</text>
-    </g>
-    <g id="cluster_C_0001286548696863286737">
-      <path d="M328.5,57.694 L354.5,57.694 A3.75,3.75 0 0 1 357,60.194 L364,80.4939 L445.5,80.4939 A2.5,2.5 0 0 1 448,82.9939 L448,221.194 A2.5,2.5 0 0 1 445.5,223.694 L328.5,223.694 A2.5,2.5 0 0 1 326,221.194 L326,60.194 A2.5,2.5 0 0 1 328.5,57.694 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="326" x2="364" y1="80.4939" y2="80.4939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="330" y="72.6999">ns2</text>
-    </g>
-    <g id="cluster_C_0000561406084501129272">
-      <path d="M352.5,100.694 L386.5,100.694 A3.75,3.75 0 0 1 389,103.194 L396,123.4939 L421.5,123.4939 A2.5,2.5 0 0 1 424,125.9939 L424,197.194 A2.5,2.5 0 0 1 421.5,199.694 L352.5,199.694 A2.5,2.5 0 0 1 350,197.194 L350,103.194 A2.5,2.5 0 0 1 352.5,100.694 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="350" x2="396" y1="123.4939" y2="123.4939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="33" x="354" y="115.6999">ns22</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0002144761953049158478">
-        <rect codeLine="3" fill="#F1F1F1" height="81.5999" id="C_0002144761953049158478" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="21.5" y="118.894"/>
-        <ellipse cx="41" cy="134.894" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M39.8594,135.9565 L41.1719,135.9565 L41.1719,136.0034 C41.1719,136.4096 41.1875,136.5659 41.2969,136.7221 C41.4688,136.9721 41.7656,137.144 42.0781,137.144 C42.3594,137.144 42.6563,137.0034 42.8281,136.7846 C42.9531,136.5971 43,136.4565 43,136.0034 L43,134.1596 C43,133.8315 42.9844,133.7221 42.9219,133.5502 C42.8125,133.2534 42.4531,133.0034 42.0781,133.0034 C41.7813,133.0034 41.5156,133.144 41.3438,133.3627 C41.2031,133.5502 41.1719,133.7221 41.1719,134.1596 L41.1719,134.2221 L39.8594,134.2221 L39.8594,132.0502 L43.7031,132.0502 L43.7031,132.8002 C43.7031,133.1909 43.7344,133.3784 43.8438,133.5346 C44.0156,133.7846 44.3125,133.9565 44.625,133.9565 C44.9219,133.9565 45.1875,133.8315 45.375,133.5971 C45.5156,133.4096 45.5469,133.269 45.5469,132.8002 L45.5469,130.3002 L37.8438,130.3002 C37.3906,130.3002 37.2656,130.3159 37.0938,130.4252 C36.8281,130.5971 36.6563,130.8627 36.6563,131.1752 C36.6563,131.4565 36.7813,131.7221 37.0313,131.894 C37.2188,132.019 37.4063,132.0502 37.8438,132.0502 L38.0313,132.0502 L38.0313,138.144 L37.8438,138.144 C37.4219,138.144 37.2656,138.1752 37.0938,138.269 C36.8281,138.4252 36.6563,138.7065 36.6563,139.0034 C36.6563,139.5815 37.0625,139.894 37.8438,139.894 L45.9219,139.894 L45.9219,137.3627 C45.9219,136.9565 45.8906,136.7846 45.7813,136.6284 C45.6094,136.3627 45.3281,136.2065 45,136.2065 C44.7188,136.2065 44.4375,136.3471 44.25,136.5659 C44.1094,136.7534 44.0781,136.9096 44.0781,137.3627 L44.0781,138.144 L39.8594,138.144 L39.8594,135.9565 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="56" y="139.5">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="71.5" y1="150.894" y2="150.894"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="27.5" y="167.8999">blue</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="27.5" y="184.6999">yellow</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="71.5" y1="192.4938" y2="192.4938"/>
-      </g>
+    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.7969" y2="46.7969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="39.4951">ns1</text>
+    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="102" x2="154" y1="89.7969" y2="89.7969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="106" y="82.4951">ns11</text>
+    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="126" x2="188" y1="132.7969" y2="132.7969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="130" y="125.4951">ns111</text>
+    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="334" x2="376" y1="96.2969" y2="96.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="338" y="88.9951">ns2</text>
+    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="358" x2="410" y1="139.2969" y2="139.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="362" y="131.9951">ns22</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
+      <ellipse cx="56.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M60.7594,161 L53.0406,161 L53.0406,148.6094 L60.7594,148.6094 L60.7594,150.7656 L55.4938,150.7656 L55.4938,153.4375 L60.2594,153.4375 L60.2594,155.5938 L55.4938,155.5938 L55.4938,158.8438 L60.7594,158.8438 L60.7594,161 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="71.35" y="159.1543">E</text>
+      <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000571573305652194946">
-        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0000571573305652194946" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="155.5" y="395.694"/>
-        <ellipse cx="171.85" cy="411.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M166.85,412.8502 C166.85,415.3502 168.9906,417.1627 171.9125,417.1627 C173.1469,417.1627 174.3188,416.8659 175.0688,416.3502 C175.6781,415.9284 176.0063,415.5065 176.0063,415.1002 C176.0063,414.6315 175.5844,414.2252 175.0844,414.2252 C174.85,414.2252 174.6313,414.3034 174.4281,414.5065 C173.9906,414.944 173.9906,414.944 173.8188,415.0377 C173.3656,415.2721 172.725,415.4127 171.9594,415.4127 C169.9594,415.4127 168.6781,414.3971 168.6781,412.819 L168.6781,411.7721 C168.6781,410.069 169.8969,408.8659 171.6,408.8659 C172.1781,408.8659 172.7563,409.0065 173.225,409.2565 C173.6938,409.5221 173.8656,409.7096 173.9281,410.069 C174.0531,410.7409 174.3031,410.9909 174.8344,410.9909 C175.1156,410.9909 175.3969,410.8502 175.5844,410.6315 C175.7094,410.4596 175.7563,410.2877 175.7563,409.8502 L175.7563,408.4909 C175.7563,408.069 175.7406,407.9284 175.6156,407.7565 C175.4438,407.5065 175.1625,407.3502 174.8344,407.3502 C174.5219,407.3502 174.3188,407.4596 174.1,407.7252 C172.9281,407.2252 172.4906,407.1159 171.5375,407.1159 C168.8656,407.1159 166.85,409.1315 166.85,411.7565 L166.85,412.8502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="186.15" y="416.3">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="204.5" y="392.694"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="205.5" y="406.8941">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="156.5" x2="209.5" y1="427.694" y2="427.694"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="156.5" x2="209.5" y1="435.694" y2="435.694"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="161.5" y="444.5939"/>
-          <ellipse cx="166.5" cy="449.5939" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="175.5" y="452.6999">a : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
+      <ellipse cx="183.45" cy="428" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M186.4188,433.6406 Q185.8406,433.9375 185.2,434.0781 Q184.5594,434.2344 183.8563,434.2344 Q181.3563,434.2344 180.0281,432.5938 Q178.7156,430.9375 178.7156,427.8125 Q178.7156,424.6875 180.0281,423.0313 Q181.3563,421.375 183.8563,421.375 Q184.5594,421.375 185.2,421.5313 Q185.8563,421.6875 186.4188,421.9844 L186.4188,424.7031 Q185.7938,424.125 185.2,423.8594 Q184.6063,423.5781 183.9813,423.5781 Q182.6375,423.5781 181.95,424.6563 Q181.2625,425.7188 181.2625,427.8125 Q181.2625,429.9063 181.95,430.9844 Q182.6375,432.0469 183.9813,432.0469 Q184.6063,432.0469 185.2,431.7813 Q185.7938,431.5 186.4188,430.9219 L186.4188,433.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="432.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="214" y="409"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="215" y="421.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="444" y2="444"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="452" y2="452"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001832710427462319797">
-        <rect codeLine="21" fill="#F1F1F1" height="48" id="C_0001832710427462319797" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="154" y="286.694"/>
-        <ellipse cx="169" cy="302.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M164,303.8502 C164,306.3502 166.1406,308.1627 169.0625,308.1627 C170.2969,308.1627 171.4688,307.8659 172.2188,307.3502 C172.8281,306.9284 173.1563,306.5065 173.1563,306.1002 C173.1563,305.6315 172.7344,305.2252 172.2344,305.2252 C172,305.2252 171.7813,305.3034 171.5781,305.5065 C171.1406,305.944 171.1406,305.944 170.9688,306.0377 C170.5156,306.2721 169.875,306.4127 169.1094,306.4127 C167.1094,306.4127 165.8281,305.3971 165.8281,303.819 L165.8281,302.7721 C165.8281,301.069 167.0469,299.8659 168.75,299.8659 C169.3281,299.8659 169.9063,300.0065 170.375,300.2565 C170.8438,300.5221 171.0156,300.7096 171.0781,301.069 C171.2031,301.7409 171.4531,301.9909 171.9844,301.9909 C172.2656,301.9909 172.5469,301.8502 172.7344,301.6315 C172.8594,301.4596 172.9063,301.2877 172.9063,300.8502 L172.9063,299.4909 C172.9063,299.069 172.8906,298.9284 172.7656,298.7565 C172.5938,298.5065 172.3125,298.3502 171.9844,298.3502 C171.6719,298.3502 171.4688,298.4596 171.25,298.7252 C170.0781,298.2252 169.6406,298.1159 168.6875,298.1159 C166.0156,298.1159 164,300.1315 164,302.7565 L164,303.8502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="183" y="307.3">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="200" y="283.694"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="201" y="297.8941">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="155" x2="211" y1="318.694" y2="318.694"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="155" x2="211" y1="326.694" y2="326.694"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="174" y="458"/>
+      <ellipse cx="179" cy="463" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001964031933563607376">
-        <rect codeLine="15" fill="#F1F1F1" height="64.7999" id="C_0001964031933563607376" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="128.5" y="127.294"/>
-        <ellipse cx="174.25" cy="143.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M169.25,144.4502 C169.25,146.9502 171.3906,148.7627 174.3125,148.7627 C175.5469,148.7627 176.7188,148.4659 177.4688,147.9502 C178.0781,147.5284 178.4063,147.1065 178.4063,146.7002 C178.4063,146.2315 177.9844,145.8252 177.4844,145.8252 C177.25,145.8252 177.0313,145.9034 176.8281,146.1065 C176.3906,146.544 176.3906,146.544 176.2188,146.6377 C175.7656,146.8721 175.125,147.0127 174.3594,147.0127 C172.3594,147.0127 171.0781,145.9971 171.0781,144.419 L171.0781,143.3721 C171.0781,141.669 172.2969,140.4659 174,140.4659 C174.5781,140.4659 175.1563,140.6065 175.625,140.8565 C176.0938,141.1221 176.2656,141.3096 176.3281,141.669 C176.4531,142.3409 176.7031,142.5909 177.2344,142.5909 C177.5156,142.5909 177.7969,142.4502 177.9844,142.2315 C178.1094,142.0596 178.1563,141.8877 178.1563,141.4502 L178.1563,140.0909 C178.1563,139.669 178.1406,139.5284 178.0156,139.3565 C177.8438,139.1065 177.5625,138.9502 177.2344,138.9502 C176.9219,138.9502 176.7188,139.0596 176.5,139.3252 C175.3281,138.8252 174.8906,138.7159 173.9375,138.7159 C171.2656,138.7159 169.25,140.7315 169.25,143.3565 L169.25,144.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="194.75" y="147.9">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="129.5" x2="236.5" y1="159.294" y2="159.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="129.5" x2="236.5" y1="167.294" y2="167.294"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="134.5" y="176.1939"/>
-          <ellipse cx="139.5" cy="181.1939" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="148.5" y="184.2999">a_int : A&lt;int&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="466.2104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0002038956882066165590">
-        <rect codeLine="29" fill="#F1F1F1" height="48" id="C_0002038956882066165590" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="366" y="135.694"/>
-        <ellipse cx="381" cy="151.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M376,152.8502 C376,155.3502 378.1406,157.1627 381.0625,157.1627 C382.2969,157.1627 383.4688,156.8659 384.2188,156.3502 C384.8281,155.9284 385.1563,155.5065 385.1563,155.1002 C385.1563,154.6315 384.7344,154.2252 384.2344,154.2252 C384,154.2252 383.7813,154.3034 383.5781,154.5065 C383.1406,154.944 383.1406,154.944 382.9688,155.0377 C382.5156,155.2721 381.875,155.4127 381.1094,155.4127 C379.1094,155.4127 377.8281,154.3971 377.8281,152.819 L377.8281,151.7721 C377.8281,150.069 379.0469,148.8659 380.75,148.8659 C381.3281,148.8659 381.9063,149.0065 382.375,149.2565 C382.8438,149.5221 383.0156,149.7096 383.0781,150.069 C383.2031,150.7409 383.4531,150.9909 383.9844,150.9909 C384.2656,150.9909 384.5469,150.8502 384.7344,150.6315 C384.8594,150.4596 384.9063,150.2877 384.9063,149.8502 L384.9063,148.4909 C384.9063,148.069 384.8906,147.9284 384.7656,147.7565 C384.5938,147.5065 384.3125,147.3502 383.9844,147.3502 C383.6719,147.3502 383.4688,147.4596 383.25,147.7252 C382.0781,147.2252 381.6406,147.1159 380.6875,147.1159 C378.0156,147.1159 376,149.1315 376,151.7565 L376,152.8502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="395" y="156.3">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="367" x2="407" y1="167.694" y2="167.694"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="367" x2="407" y1="175.694" y2="175.694"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
+      <ellipse cx="179" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M181.9688,324.6406 Q181.3906,324.9375 180.75,325.0781 Q180.1094,325.2344 179.4063,325.2344 Q176.9063,325.2344 175.5781,323.5938 Q174.2656,321.9375 174.2656,318.8125 Q174.2656,315.6875 175.5781,314.0313 Q176.9063,312.375 179.4063,312.375 Q180.1094,312.375 180.75,312.5313 Q181.4063,312.6875 181.9688,312.9844 L181.9688,315.7031 Q181.3438,315.125 180.75,314.8594 Q180.1563,314.5781 179.5313,314.5781 Q178.1875,314.5781 177.5,315.6563 Q176.8125,316.7188 176.8125,318.8125 Q176.8125,320.9063 177.5,321.9844 Q178.1875,323.0469 179.5313,323.0469 Q180.1563,323.0469 180.75,322.7813 Q181.3438,322.5 181.9688,321.9219 L181.9688,324.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="323.1543">A</text>
+      <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"/>
     </a>
-    <g id="link_C_0001964031933563607376_C_0001832710427462319797">
-      <path codeLine="34" d="M183,204.294 C183,232.484 183,261.104 183,286.424 " fill="none" id="C_0001964031933563607376-backto-C_0001832710427462319797" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="183,192.294,179,198.294,183,204.294,187,198.294,183,192.294" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="189" cy="248.994" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="196" y="252.771">a_int</text>
-    </g>
-    <g id="link_C_0001832710427462319797_C_0000571573305652194946">
-      <path codeLine="35" d="M183,335.044 C183,352.434 183,358.364 183,377.464 " fill="none" id="C_0001832710427462319797-to-C_0000571573305652194946" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="183,395.464,189,377.464,177,377.464,183,395.464" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
+      <ellipse cx="185.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M188.7688,167.1406 Q188.1906,167.4375 187.55,167.5781 Q186.9094,167.7344 186.2063,167.7344 Q183.7063,167.7344 182.3781,166.0938 Q181.0656,164.4375 181.0656,161.3125 Q181.0656,158.1875 182.3781,156.5313 Q183.7063,154.875 186.2063,154.875 Q186.9094,154.875 187.55,155.0313 Q188.2063,155.1875 188.7688,155.4844 L188.7688,158.2031 Q188.1438,157.625 187.55,157.3594 Q186.9563,157.0781 186.3313,157.0781 Q184.9875,157.0781 184.3,158.1563 Q183.6125,159.2188 183.6125,161.3125 Q183.6125,163.4063 184.3,164.4844 Q184.9875,165.5469 186.3313,165.5469 Q186.9563,165.5469 187.55,165.2813 Q188.1438,165 188.7688,164.4219 L188.7688,167.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="206.2" y="165.6543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="177.5" y2="177.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="185.5" y2="185.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="148" y="191.5"/>
+      <ellipse cx="153" cy="196.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="199.7104">a_int : A&lt;int&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
+      <ellipse cx="389" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M391.9688,173.6406 Q391.3906,173.9375 390.75,174.0781 Q390.1094,174.2344 389.4063,174.2344 Q386.9063,174.2344 385.5781,172.5938 Q384.2656,170.9375 384.2656,167.8125 Q384.2656,164.6875 385.5781,163.0313 Q386.9063,161.375 389.4063,161.375 Q390.1094,161.375 390.75,161.5313 Q391.4063,161.6875 391.9688,161.9844 L391.9688,164.7031 Q391.3438,164.125 390.75,163.8594 Q390.1563,163.5781 389.5313,163.5781 Q388.1875,163.5781 387.5,164.6563 Q386.8125,165.7188 386.8125,167.8125 Q386.8125,169.9063 387.5,170.9844 Q388.1875,172.0469 389.5313,172.0469 Q390.1563,172.0469 390.75,171.7813 Q391.3438,171.5 391.9688,170.9219 L391.9688,173.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="172.1543">C</text>
+      <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"/>
+    </a>
+    <path d="M194,220.15 C194,247.03 194,280.58 194,302.61 " fill="none" id="C_0001964031933563607376&lt;-C_0001832710427462319797" 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>
+    <path d="M194,351.24 C194,362.87 194,377.42 194,391.43 " fill="none" id="C_0001832710427462319797-&gt;C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="201,391.81,194,411.81,187,391.81,201,391.81" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00036_class_mermaid.svg b/docs/test_cases/t00036_class_mermaid.svg
index 74486438..6eb60a71 100644
--- a/docs/test_cases/t00036_class_mermaid.svg
+++ b/docs/test_cases/t00036_class_mermaid.svg
@@ -1,62 +1,57 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 514.9375 393" style="max-width: 514.938px; background-color: white;" width="514.9375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M262.390625,127L262.390625,133.33333333333334C262.390625,139.66666666666666,262.390625,152.33333333333334,262.390625,164.33333333333334C262.390625,176.33333333333334,262.390625,187.66666666666666,262.390625,193.33333333333334L262.390625,199"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M262.390625,256L262.390625,260.1666666666667C262.390625,264.3333333333333,262.390625,272.6666666666667,262.390625,278C262.390625,283.3333333333333,262.390625,285.6666666666667,262.390625,286.8333333333333L262.390625,288"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M262.390625,109L262.390625,118.33333333333333C262.390625,127.66666666666667,262.390625,146.33333333333334,262.390625,161.33333333333334C262.390625,176.33333333333334,262.390625,187.66666666666666,262.390625,193.33333333333334L262.390625,199"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M262.390625,256L262.390625,260.1666666666667C262.390625,264.3333333333333,262.390625,272.6666666666667,262.390625,281C262.390625,289.3333333333333,262.390625,297.6666666666667,262.390625,301.8333333333333L262.390625,306"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(262.390625, 165)" class="edgeLabel">
@@ -83,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L6">
+        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L6">
           <g title="E" id="classId-C_0002144761953049158478-0" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -112,7 +107,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0000571573305652194946-1" class="node default clickable">
             <rect height="79" width="139.484375" y="-39.5" x="-69.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.7421875" x1="-69.7421875" class="divider"/>
@@ -136,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L16">
+        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L16">
           <g title="B" id="classId-C_0001964031933563607376-2" class="node default clickable">
             <rect height="79" width="165.28125" y="-39.5" x="-82.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="82.640625" x1="-82.640625" class="divider"/>
@@ -160,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0001832710427462319797-3" class="node default clickable">
             <rect height="57" width="149.265625" y="-28.5" x="-74.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6328125" x1="-74.6328125" class="divider"/>
@@ -179,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00036/t00036.cc#L28">
+        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L28">
           <g title="C" id="classId-C_0002038956882066165590-4" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
diff --git a/docs/test_cases/t00037.md b/docs/test_cases/t00037.md
index 098da27f..f31e2e0d 100644
--- a/docs/test_cases/t00037.md
+++ b/docs/test_cases/t00037.md
@@ -61,7 +61,7 @@ struct A {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00037::ST",
+      "display_name": "ST",
       "id": "11203041379038775",
       "is_abstract": false,
       "is_nested": false,
@@ -108,7 +108,7 @@ struct A {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00037::ST::(dimensions)",
+      "display_name": "ST::(dimensions)",
       "id": "1980820317972901050",
       "is_abstract": false,
       "is_nested": true,
@@ -179,7 +179,7 @@ struct A {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00037::ST::(units)",
+      "display_name": "ST::(units)",
       "id": "1811145508890403377",
       "is_abstract": false,
       "is_nested": true,
@@ -226,7 +226,7 @@ struct A {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00037::A",
+      "display_name": "A",
       "id": "1322794181774144954",
       "is_abstract": false,
       "is_nested": false,
@@ -288,6 +288,7 @@ struct A {
     }
   ],
   "name": "t00037_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg
index 886be4f8..4f965b6f 100644
--- a/docs/test_cases/t00037_class.svg
+++ b/docs/test_cases/t00037_class.svg
@@ -1,135 +1,127 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="446px" preserveAspectRatio="none" style="width:287px;height:446px;background:#FFFFFF;" version="1.1" viewBox="0 0 287 446" width="287px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="420px" preserveAspectRatio="none" style="width:284px;height:420px;" version="1.1" viewBox="0 0 284 420" width="284px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1x952iyx8fda8" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
-      <g id="elem_C_0000011203041379038775">
-        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0000011203041379038775" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="252" x="28" y="165.6"/>
-        <ellipse cx="140.75" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M135.75,182.7562 C135.75,185.2562 137.8906,187.0687 140.8125,187.0687 C142.0469,187.0687 143.2188,186.7719 143.9688,186.2562 C144.5781,185.8344 144.9063,185.4125 144.9063,185.0062 C144.9063,184.5375 144.4844,184.1312 143.9844,184.1312 C143.75,184.1312 143.5313,184.2094 143.3281,184.4125 C142.8906,184.85 142.8906,184.85 142.7188,184.9437 C142.2656,185.1781 141.625,185.3187 140.8594,185.3187 C138.8594,185.3187 137.5781,184.3031 137.5781,182.725 L137.5781,181.6781 C137.5781,179.975 138.7969,178.7719 140.5,178.7719 C141.0781,178.7719 141.6563,178.9125 142.125,179.1625 C142.5938,179.4281 142.7656,179.6156 142.8281,179.975 C142.9531,180.6469 143.2031,180.8969 143.7344,180.8969 C144.0156,180.8969 144.2969,180.7562 144.4844,180.5375 C144.6094,180.3656 144.6563,180.1937 144.6563,179.7562 L144.6563,178.3969 C144.6563,177.975 144.6406,177.8344 144.5156,177.6625 C144.3438,177.4125 144.0625,177.2562 143.7344,177.2562 C143.4219,177.2562 143.2188,177.3656 143,177.6312 C141.8281,177.1312 141.3906,177.0219 140.4375,177.0219 C137.7656,177.0219 135.75,179.0375 135.75,181.6625 L135.75,182.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="161.25" y="186.206">ST</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="29" x2="279" y1="197.6" y2="197.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="29" x2="279" y1="205.6" y2="205.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="214.5"/>
-          <ellipse cx="39" cy="219.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="226" x="48" y="222.6059">dimensions : ST::(anonymous_662)</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="34" y="231.2999"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="36" y="233.2999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="184" x="48" y="239.4059">units : ST::(anonymous_792)</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x952iyx8fda8)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
+      <ellipse cx="137.25" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M140.2188,180.6406 Q139.6406,180.9375 139,181.0781 Q138.3594,181.2344 137.6563,181.2344 Q135.1563,181.2344 133.8281,179.5938 Q132.5156,177.9375 132.5156,174.8125 Q132.5156,171.6875 133.8281,170.0313 Q135.1563,168.375 137.6563,168.375 Q138.3594,168.375 139,168.5313 Q139.6563,168.6875 140.2188,168.9844 L140.2188,171.7031 Q139.5938,171.125 139,170.8594 Q138.4063,170.5781 137.7813,170.5781 Q136.4375,170.5781 135.75,171.6563 Q135.0625,172.7188 135.0625,174.8125 Q135.0625,176.9063 135.75,177.9844 Q136.4375,179.0469 137.7813,179.0469 Q138.4063,179.0469 139,178.7813 Q139.5938,178.5 140.2188,177.9219 L140.2188,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="15" x="157.75" y="179.1543">ST</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="191" y2="191"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
-      <g id="elem_C_0001980820317972901050">
-        <rect codeLine="8" fill="#F1F1F1" height="115.1997" id="C_0001980820317972901050" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="7" y="324.2"/>
-        <ellipse cx="22" cy="340.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,341.3563 C17,343.8563 19.1406,345.6688 22.0625,345.6688 C23.2969,345.6688 24.4688,345.3719 25.2188,344.8563 C25.8281,344.4344 26.1563,344.0125 26.1563,343.6063 C26.1563,343.1375 25.7344,342.7313 25.2344,342.7313 C25,342.7313 24.7813,342.8094 24.5781,343.0125 C24.1406,343.45 24.1406,343.45 23.9688,343.5438 C23.5156,343.7781 22.875,343.9188 22.1094,343.9188 C20.1094,343.9188 18.8281,342.9031 18.8281,341.325 L18.8281,340.2781 C18.8281,338.575 20.0469,337.3719 21.75,337.3719 C22.3281,337.3719 22.9063,337.5125 23.375,337.7625 C23.8438,338.0281 24.0156,338.2156 24.0781,338.575 C24.2031,339.2469 24.4531,339.4969 24.9844,339.4969 C25.2656,339.4969 25.5469,339.3563 25.7344,339.1375 C25.8594,338.9656 25.9063,338.7938 25.9063,338.3563 L25.9063,336.9969 C25.9063,336.575 25.8906,336.4344 25.7656,336.2625 C25.5938,336.0125 25.3125,335.8563 24.9844,335.8563 C24.6719,335.8563 24.4688,335.9656 24.25,336.2313 C23.0781,335.7313 22.6406,335.6219 21.6875,335.6219 C19.0156,335.6219 17,337.6375 17,340.2625 L17,341.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="36" y="344.806">ST::(dimensions)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="146" y1="356.2" y2="356.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="146" y1="364.2" y2="364.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="373.1"/>
-          <ellipse cx="18" cy="378.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59" x="27" y="381.2059">t : double</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="389.8999"/>
-          <ellipse cx="18" cy="394.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="27" y="398.0059">x : double</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="406.6998"/>
-          <ellipse cx="18" cy="411.6998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="27" y="414.8058">y : double</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="423.4997"/>
-          <ellipse cx="18" cy="428.4997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="27" y="431.6057">z : double</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="205"/>
+      <ellipse cx="46" cy="210" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
-      <g id="elem_C_0001811145508890403377">
-        <rect codeLine="16" fill="#F1F1F1" height="81.5999" id="C_0001811145508890403377" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="98" x="182" y="341"/>
-        <ellipse cx="197" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M192,358.1563 C192,360.6563 194.1406,362.4688 197.0625,362.4688 C198.2969,362.4688 199.4688,362.1719 200.2188,361.6563 C200.8281,361.2344 201.1563,360.8125 201.1563,360.4063 C201.1563,359.9375 200.7344,359.5313 200.2344,359.5313 C200,359.5313 199.7813,359.6094 199.5781,359.8125 C199.1406,360.25 199.1406,360.25 198.9688,360.3438 C198.5156,360.5781 197.875,360.7188 197.1094,360.7188 C195.1094,360.7188 193.8281,359.7031 193.8281,358.125 L193.8281,357.0781 C193.8281,355.375 195.0469,354.1719 196.75,354.1719 C197.3281,354.1719 197.9063,354.3125 198.375,354.5625 C198.8438,354.8281 199.0156,355.0156 199.0781,355.375 C199.2031,356.0469 199.4531,356.2969 199.9844,356.2969 C200.2656,356.2969 200.5469,356.1563 200.7344,355.9375 C200.8594,355.7656 200.9063,355.5938 200.9063,355.1563 L200.9063,353.7969 C200.9063,353.375 200.8906,353.2344 200.7656,353.0625 C200.5938,352.8125 200.3125,352.6563 199.9844,352.6563 C199.6719,352.6563 199.4688,352.7656 199.25,353.0313 C198.0781,352.5313 197.6406,352.4219 196.6875,352.4219 C194.0156,352.4219 192,354.4375 192,357.0625 L192,358.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="211" y="361.606">ST::(units)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="183" x2="279" y1="373" y2="373"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="183" x2="279" y1="381" y2="381"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="188" y="389.9"/>
-          <ellipse cx="193" cy="394.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="202" y="398.0059">c : double</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="188" y="406.6999"/>
-          <ellipse cx="193" cy="411.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="202" y="414.8059">h : double</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="202" x="55" y="213.2104">dimensions : ST::(anonymous_662)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001322794181774144954">
-        <rect codeLine="22" fill="#F1F1F1" height="81.5999" id="C_0001322794181774144954" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="112.5" y="7"/>
-        <ellipse cx="146.4" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M141.4,24.1563 C141.4,26.6563 143.5406,28.4688 146.4625,28.4688 C147.6969,28.4688 148.8688,28.1719 149.6188,27.6563 C150.2281,27.2344 150.5563,26.8125 150.5563,26.4063 C150.5563,25.9375 150.1344,25.5313 149.6344,25.5313 C149.4,25.5313 149.1813,25.6094 148.9781,25.8125 C148.5406,26.25 148.5406,26.25 148.3688,26.3438 C147.9156,26.5781 147.275,26.7188 146.5094,26.7188 C144.5094,26.7188 143.2281,25.7031 143.2281,24.125 L143.2281,23.0781 C143.2281,21.375 144.4469,20.1719 146.15,20.1719 C146.7281,20.1719 147.3063,20.3125 147.775,20.5625 C148.2438,20.8281 148.4156,21.0156 148.4781,21.375 C148.6031,22.0469 148.8531,22.2969 149.3844,22.2969 C149.6656,22.2969 149.9469,22.1563 150.1344,21.9375 C150.2594,21.7656 150.3063,21.5938 150.3063,21.1563 L150.3063,19.7969 C150.3063,19.375 150.2906,19.2344 150.1656,19.0625 C149.9938,18.8125 149.7125,18.6563 149.3844,18.6563 C149.0719,18.6563 148.8688,18.7656 148.65,19.0313 C147.4781,18.5313 147.0406,18.4219 146.0875,18.4219 C143.4156,18.4219 141.4,20.4375 141.4,23.0625 L141.4,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="164.6" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="113.5" x2="194.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="118.5" y="47.9"/>
-          <ellipse cx="123.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="132.5" y="56.0059">A() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="113.5" x2="194.5" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="118.5" y="72.6999"/>
-          <ellipse cx="123.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="132.5" y="80.8059">st : ST</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="217.8047"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="43" y="219.8047"/>
     </a>
-    <g id="link_C_0000011203041379038775_C_0001980820317972901050">
-      <path codeLine="27" d="M118.1777,257.6621 C112.1177,267.0821 112.67,267.21 108,277.2 C101.17,291.83 95.43,308.32 90.82,323.77 " fill="none" id="C_0000011203041379038775-backto-C_0001980820317972901050" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="124.67,247.57,118.0598,250.4519,118.1777,257.6621,124.7878,254.7801,124.67,247.57" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="114" cy="286.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="66" x="121" y="290.277">dimensions</text>
-    </g>
-    <g id="link_C_0000011203041379038775_C_0001811145508890403377">
-      <path codeLine="28" d="M182.7645,258.0828 C187.9345,267.6728 187.52,267.41 192,277.2 C201.44,297.82 210.46,321.44 217.45,340.92 " fill="none" id="C_0000011203041379038775-backto-C_0001811145508890403377" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="177.07,247.52,176.3963,254.6996,182.7645,258.0828,183.4382,250.9033,177.07,247.52" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="203" y="283.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="213" y="290.277">units</text>
-    </g>
-    <g id="link_C_0001322794181774144954_C_0000011203041379038775">
-      <path codeLine="29" d="M154,100.72 C154,124.19 154,141.77 154,165.28 " fill="none" id="C_0001322794181774144954-backto-C_0000011203041379038775" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="154,88.72,150,94.72,154,100.72,158,94.72,154,88.72" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="160" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="167" y="131.677">st</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="164" x="55" y="226.0151">units : ST::(anonymous_792)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x952iyx8fda8)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
+      <ellipse cx="21" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,331.6406 Q23.3906,331.9375 22.75,332.0781 Q22.1094,332.2344 21.4063,332.2344 Q18.9063,332.2344 17.5781,330.5938 Q16.2656,328.9375 16.2656,325.8125 Q16.2656,322.6875 17.5781,321.0313 Q18.9063,319.375 21.4063,319.375 Q22.1094,319.375 22.75,319.5313 Q23.4063,319.6875 23.9688,319.9844 L23.9688,322.7031 Q23.3438,322.125 22.75,321.8594 Q22.1563,321.5781 21.5313,321.5781 Q20.1875,321.5781 19.5,322.6563 Q18.8125,323.7188 18.8125,325.8125 Q18.8125,327.9063 19.5,328.9844 Q20.1875,330.0469 21.5313,330.0469 Q22.1563,330.0469 22.75,329.7813 Q23.3438,329.5 23.9688,328.9219 L23.9688,331.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="104" x="35" y="330.1543">ST::(dimensions)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="342" y2="342"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="350" y2="350"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="356"/>
+      <ellipse cx="17" cy="361" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="26" y="364.2104">t : double</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="368.8047"/>
+      <ellipse cx="17" cy="373.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="377.0151">x : double</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="381.6094"/>
+      <ellipse cx="17" cy="386.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="389.8198">y : double</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="394.4141"/>
+      <ellipse cx="17" cy="399.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="402.6245">z : double</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x952iyx8fda8)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
+      <ellipse cx="192" cy="338.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M194.9688,344.1406 Q194.3906,344.4375 193.75,344.5781 Q193.1094,344.7344 192.4063,344.7344 Q189.9063,344.7344 188.5781,343.0938 Q187.2656,341.4375 187.2656,338.3125 Q187.2656,335.1875 188.5781,333.5313 Q189.9063,331.875 192.4063,331.875 Q193.1094,331.875 193.75,332.0313 Q194.4063,332.1875 194.9688,332.4844 L194.9688,335.2031 Q194.3438,334.625 193.75,334.3594 Q193.1563,334.0781 192.5313,334.0781 Q191.1875,334.0781 190.5,335.1563 Q189.8125,336.2188 189.8125,338.3125 Q189.8125,340.4063 190.5,341.4844 Q191.1875,342.5469 192.5313,342.5469 Q193.1563,342.5469 193.75,342.2813 Q194.3438,342 194.9688,341.4219 L194.9688,344.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="206" y="342.6543">ST::(units)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="354.5" y2="354.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="362.5" y2="362.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="368.5"/>
+      <ellipse cx="188" cy="373.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="197" y="376.7104">c : double</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="381.3047"/>
+      <ellipse cx="188" cy="386.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="197" y="389.5151">h : double</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x952iyx8fda8)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
+      <ellipse cx="142.2" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M145.1688,29.6406 Q144.5906,29.9375 143.95,30.0781 Q143.3094,30.2344 142.6063,30.2344 Q140.1063,30.2344 138.7781,28.5938 Q137.4656,26.9375 137.4656,23.8125 Q137.4656,20.6875 138.7781,19.0313 Q140.1063,17.375 142.6063,17.375 Q143.3094,17.375 143.95,17.5313 Q144.6063,17.6875 145.1688,17.9844 L145.1688,20.7031 Q144.5438,20.125 143.95,19.8594 Q143.3563,19.5781 142.7313,19.5781 Q141.3875,19.5781 140.7,20.6563 Q140.0125,21.7188 140.0125,23.8125 Q140.0125,25.9063 140.7,26.9844 Q141.3875,28.0469 142.7313,28.0469 Q143.3563,28.0469 143.95,27.7813 Q144.5438,27.5 145.1688,26.9219 L145.1688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="159.8" y="28.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
+      <ellipse cx="122" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="131" y="54.2104">A() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="66.8047"/>
+      <ellipse cx="122" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="131" y="75.0151">st : ST</text>
+    </a>
+    <path d="M106.32,243.96 C102.05,250.09 98.15,256.5 95,263 C87.97,277.51 83.26,294.41 80.13,309.92 " fill="none" id="C_0000011203041379038775&lt;-C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="114.29,233.28,107.4974,235.7009,107.1196,242.9021,113.9121,240.4812,114.29,233.28" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="101" cy="272.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="73" x="108" y="276.0669">dimensions</text>
+    <path d="M176.66,244.73 C179.92,250.82 183.11,257.02 186,263 C195.26,282.2 204.34,304.18 211.4,322.22 " fill="none" id="C_0000011203041379038775&lt;-C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="170.37,233.23,169.7435,240.4138,176.1338,243.7552,176.7603,236.5713,170.37,233.23" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="196" y="269.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="206" y="276.0669">units</text>
+    <path d="M149,95.19 C149,115.93 149,139.64 149,158.75 " fill="none" id="C_0001322794181774144954&lt;-C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="149,82.07,145,88.07,149,94.07,153,88.07,149,82.07" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="155" 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="12" x="162" y="125.0669">st</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00037_class_mermaid.svg b/docs/test_cases/t00037_class_mermaid.svg
index e4134f43..c50a3d86 100644
--- a/docs/test_cases/t00037_class_mermaid.svg
+++ b/docs/test_cases/t00037_class_mermaid.svg
@@ -1,63 +1,58 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 310.14453125 499" style="max-width: 310.145px; background-color: white;" width="310.14453125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M101.25956080587927,290.71821743121257L97.70718608823273,294.2651811926771C94.15481137058619,297.81214495414173,87.0500619352931,304.90607247707084,83.49768721764654,314.1197029052021C79.9453125,323.3333333333333,79.9453125,334.6666666666667,79.9453125,340.3333333333333L79.9453125,346"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M227.88887669412074,290.71821743121257L231.4412514117673,294.2651811926771C234.99362612941385,297.81214495414173,242.0983755647069,304.90607247707084,245.65075028235344,317.78636957186876C249.203125,330.6666666666667,249.203125,349.3333333333333,249.203125,358.6666666666667L249.203125,368"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M164.57421875,127L164.57421875,129.66666666666666C164.57421875,132.33333333333334,164.57421875,137.66666666666666,164.57421875,146C164.57421875,154.33333333333334,164.57421875,165.66666666666666,164.57421875,171.33333333333334L164.57421875,177"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M113.9971801035503,278L108.32186883629193,283.6666666666667C102.64655756903353,289.3333333333333,91.29593503451677,300.6666666666667,85.6206237672584,312C79.9453125,323.3333333333333,79.9453125,334.6666666666667,79.9453125,340.3333333333333L79.9453125,346"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M215.1512573964497,278L220.82656866370806,283.6666666666667C226.50187993096645,289.3333333333333,237.8525024654832,300.6666666666667,243.5278137327416,315.6666666666667C249.203125,330.6666666666667,249.203125,349.3333333333333,249.203125,358.6666666666667L249.203125,368"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M164.57421875,109L164.57421875,114.66666666666667C164.57421875,120.33333333333333,164.57421875,131.66666666666666,164.57421875,143C164.57421875,154.33333333333334,164.57421875,165.66666666666666,164.57421875,171.33333333333334L164.57421875,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(79.9453125, 312)" class="edgeLabel">
@@ -95,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L4">
+        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L4">
           <g title="ST" id="classId-C_0000011203041379038775-0" class="node default clickable">
             <rect height="101" width="275.140625" y="-50.5" x="-137.5703125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="137.5703125" x1="-137.5703125" class="divider"/>
@@ -124,7 +119,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L6">
+        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L6">
           <g title="ST##(dimensions)" id="classId-C_0001980820317972901050-1" class="node default clickable">
             <rect height="145" width="143.890625" y="-72.5" x="-71.9453125" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="71.9453125" x1="-71.9453125" class="divider"/>
@@ -163,7 +158,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L14">
+        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L14">
           <g title="ST##(units)" id="classId-C_0001811145508890403377-2" class="node default clickable">
             <rect height="101" width="94.625" y="-50.5" x="-47.3125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="47.3125" x1="-47.3125" class="divider"/>
@@ -192,11 +187,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00037/t00037.cc#L20">
+        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L20">
           <g title="A" id="classId-C_0001322794181774144954-3" class="node default clickable">
-            <rect height="101" width="97.25" y="-50.5" x="-48.625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="48.625" x1="-48.625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="48.625" x1="-48.625" class="divider"/>
+            <rect height="101" width="88.359375" y="-50.5" x="-44.1796875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -208,14 +203,14 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -41.125, -9)" height="18" width="55.578125">
+              <foreignObject transform="translate( -36.6796875, -9)" height="18" width="55.578125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+st : ST</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -41.125, 25)" height="18" width="82.25">
+              <foreignObject transform="translate( -36.6796875, 25)" height="18" width="73.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A() : : void</span>
+                  <span class="nodeLabel">+A() : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00038.md b/docs/test_cases/t00038.md
index fd0e2441..29bbeb56 100644
--- a/docs/test_cases/t00038.md
+++ b/docs/test_cases/t00038.md
@@ -125,7 +125,7 @@ struct map<std::map<key_t,
         "property_b",
         "property_c"
       ],
-      "display_name": "clanguml::t00038::property_t",
+      "display_name": "property_t",
       "id": "7376951310260829",
       "is_nested": false,
       "name": "property_t",
@@ -140,7 +140,7 @@ struct map<std::map<key_t,
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00038::A",
+      "display_name": "A",
       "id": "790040432414172612",
       "is_abstract": false,
       "is_nested": false,
@@ -162,7 +162,7 @@ struct map<std::map<key_t,
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00038::B",
+      "display_name": "B",
       "id": "1295970068907562690",
       "is_abstract": false,
       "is_nested": false,
@@ -184,7 +184,7 @@ struct map<std::map<key_t,
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00038::C",
+      "display_name": "C",
       "id": "154510361779680983",
       "is_abstract": false,
       "is_nested": false,
@@ -206,7 +206,7 @@ struct map<std::map<key_t,
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00038::key_t",
+      "display_name": "key_t",
       "id": "137163683637529037",
       "is_abstract": false,
       "is_nested": false,
@@ -241,7 +241,7 @@ struct map<std::map<key_t,
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00038::map<T>",
+      "display_name": "map<T>",
       "id": "1917560728132448300",
       "is_abstract": false,
       "is_nested": false,
@@ -277,7 +277,7 @@ struct map<std::map<key_t,
           "name": "thirdparty::ns1::E"
         }
       ],
-      "display_name": "clanguml::t00038::map<std::integral_constant<thirdparty::ns1::color_t,thirdparty::ns1::color_t::red>>",
+      "display_name": "map<std::integral_constant<thirdparty::ns1::color_t,thirdparty::ns1::color_t::red>>",
       "id": "1664022047310891203",
       "is_abstract": false,
       "is_nested": false,
@@ -326,7 +326,7 @@ struct map<std::map<key_t,
           "name": "clanguml::t00038::A"
         }
       ],
-      "display_name": "clanguml::t00038::map<std::integral_constant<clanguml::t00038::property_t,clanguml::t00038::property_t::property_a>>",
+      "display_name": "map<std::integral_constant<property_t,property_t::property_a>>",
       "id": "307700801045535833",
       "is_abstract": false,
       "is_nested": false,
@@ -375,7 +375,7 @@ struct map<std::map<key_t,
           "name": "clanguml::t00038::B"
         }
       ],
-      "display_name": "clanguml::t00038::map<std::vector<std::integral_constant<clanguml::t00038::property_t,clanguml::t00038::property_t::property_b>>>",
+      "display_name": "map<std::vector<std::integral_constant<property_t,property_t::property_b>>>",
       "id": "548231528417484191",
       "is_abstract": false,
       "is_nested": false,
@@ -431,7 +431,7 @@ struct map<std::map<key_t,
           "name": "clanguml::t00038::C"
         }
       ],
-      "display_name": "clanguml::t00038::map<std::map<clanguml::t00038::key_t,std::vector<std::integral_constant<clanguml::t00038::property_t,clanguml::t00038::property_t::property_c>>>>",
+      "display_name": "map<std::map<key_t,std::vector<std::integral_constant<property_t,property_t::property_c>>>>",
       "id": "1510200402118706005",
       "is_abstract": false,
       "is_nested": false,
@@ -493,6 +493,7 @@ struct map<std::map<key_t,
     }
   ],
   "name": "t00038_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index e18885ad..7de04c78 100644
--- a/docs/test_cases/t00038_class.svg
+++ b/docs/test_cases/t00038_class.svg
@@ -1,202 +1,158 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="328px" preserveAspectRatio="none" style="width:1930px;height:328px;background:#FFFFFF;" version="1.1" viewBox="0 0 1930 328" width="1930px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="321px" preserveAspectRatio="none" style="width:2230px;height:321px;" version="1.1" viewBox="0 0 2230 321" width="2230px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fo49fvw7zjreu" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
-      <g id="elem_C_0000566782399856868761">
-        <rect codeLine="2" fill="#F1F1F1" height="98.3998" id="C_0000566782399856868761" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="174" x="150.5" y="223"/>
-        <ellipse cx="165.5" cy="239" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M164.3594,240.0625 L165.6719,240.0625 L165.6719,240.1094 C165.6719,240.5156 165.6875,240.6719 165.7969,240.8281 C165.9688,241.0781 166.2656,241.25 166.5781,241.25 C166.8594,241.25 167.1563,241.1094 167.3281,240.8906 C167.4531,240.7031 167.5,240.5625 167.5,240.1094 L167.5,238.2656 C167.5,237.9375 167.4844,237.8281 167.4219,237.6562 C167.3125,237.3594 166.9531,237.1094 166.5781,237.1094 C166.2813,237.1094 166.0156,237.25 165.8438,237.4687 C165.7031,237.6562 165.6719,237.8281 165.6719,238.2656 L165.6719,238.3281 L164.3594,238.3281 L164.3594,236.1562 L168.2031,236.1562 L168.2031,236.9062 C168.2031,237.2969 168.2344,237.4844 168.3438,237.6406 C168.5156,237.8906 168.8125,238.0625 169.125,238.0625 C169.4219,238.0625 169.6875,237.9375 169.875,237.7031 C170.0156,237.5156 170.0469,237.375 170.0469,236.9062 L170.0469,234.4062 L162.3438,234.4062 C161.8906,234.4062 161.7656,234.4219 161.5938,234.5312 C161.3281,234.7031 161.1563,234.9687 161.1563,235.2812 C161.1563,235.5625 161.2813,235.8281 161.5313,236 C161.7188,236.125 161.9063,236.1562 162.3438,236.1562 L162.5313,236.1562 L162.5313,242.25 L162.3438,242.25 C161.9219,242.25 161.7656,242.2812 161.5938,242.375 C161.3281,242.5312 161.1563,242.8125 161.1563,243.1094 C161.1563,243.6875 161.5625,244 162.3438,244 L170.4219,244 L170.4219,241.4687 C170.4219,241.0625 170.3906,240.8906 170.2813,240.7344 C170.1094,240.4687 169.8281,240.3125 169.5,240.3125 C169.2188,240.3125 168.9375,240.4531 168.75,240.6719 C168.6094,240.8594 168.5781,241.0156 168.5781,241.4687 L168.5781,242.25 L164.3594,242.25 L164.3594,240.0625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="142" x="179.5" y="243.606">thirdparty::ns1::color_t</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="323.5" y1="255" y2="255"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="21" x="156.5" y="272.0059">red</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="156.5" y="288.8059">green</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="156.5" y="305.6058">blue</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="323.5" y1="313.3998" y2="313.3998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
+      <ellipse cx="202" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M206.1094,246 L198.3906,246 L198.3906,233.6094 L206.1094,233.6094 L206.1094,235.7656 L200.8438,235.7656 L200.8438,238.4375 L205.6094,238.4375 L205.6094,240.5938 L200.8438,240.5938 L200.8438,243.8438 L206.1094,243.8438 L206.1094,246 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="142" x="216" y="244.1543">thirdparty::ns1::color_t</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="188" x2="360" y1="256" y2="256"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="19" x="193" y="270.2104">red</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="193" y="283.0151">green</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="193" y="295.8198">blue</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="188" x2="360" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001642222718760881014">
-        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0001642222718760881014" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="167.5" y="7"/>
-        <ellipse cx="182.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M177.5,24.1563 C177.5,26.6563 179.6406,28.4688 182.5625,28.4688 C183.7969,28.4688 184.9688,28.1719 185.7188,27.6563 C186.3281,27.2344 186.6563,26.8125 186.6563,26.4063 C186.6563,25.9375 186.2344,25.5313 185.7344,25.5313 C185.5,25.5313 185.2813,25.6094 185.0781,25.8125 C184.6406,26.25 184.6406,26.25 184.4688,26.3438 C184.0156,26.5781 183.375,26.7188 182.6094,26.7188 C180.6094,26.7188 179.3281,25.7031 179.3281,24.125 L179.3281,23.0781 C179.3281,21.375 180.5469,20.1719 182.25,20.1719 C182.8281,20.1719 183.4063,20.3125 183.875,20.5625 C184.3438,20.8281 184.5156,21.0156 184.5781,21.375 C184.7031,22.0469 184.9531,22.2969 185.4844,22.2969 C185.7656,22.2969 186.0469,22.1563 186.2344,21.9375 C186.3594,21.7656 186.4063,21.5938 186.4063,21.1563 L186.4063,19.7969 C186.4063,19.375 186.3906,19.2344 186.2656,19.0625 C186.0938,18.8125 185.8125,18.6563 185.4844,18.6563 C185.1719,18.6563 184.9688,18.7656 184.75,19.0313 C183.5781,18.5313 183.1406,18.4219 182.1875,18.4219 C179.5156,18.4219 177.5,20.4375 177.5,23.0625 L177.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="196.5" y="27.606">thirdparty::ns1::E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="168.5" x2="306.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="168.5" x2="306.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="204" y="8"/>
+      <ellipse cx="219" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M221.9688,29.6406 Q221.3906,29.9375 220.75,30.0781 Q220.1094,30.2344 219.4063,30.2344 Q216.9063,30.2344 215.5781,28.5938 Q214.2656,26.9375 214.2656,23.8125 Q214.2656,20.6875 215.5781,19.0313 Q216.9063,17.375 219.4063,17.375 Q220.1094,17.375 220.75,17.5313 Q221.4063,17.6875 221.9688,17.9844 L221.9688,20.7031 Q221.3438,20.125 220.75,19.8594 Q220.1563,19.5781 219.5313,19.5781 Q218.1875,19.5781 217.5,20.6563 Q216.8125,21.7188 216.8125,23.8125 Q216.8125,25.9063 217.5,26.9844 Q218.1875,28.0469 219.5313,28.0469 Q220.1563,28.0469 220.75,27.7813 Q221.3438,27.5 221.9688,26.9219 L221.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="108" x="233" y="28.1543">thirdparty::ns1::E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
-      <g id="elem_C_0000007376951310260829">
-        <rect codeLine="12" fill="#F1F1F1" height="98.3998" id="C_0000007376951310260829" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="1083" y="223"/>
-        <ellipse cx="1098" cy="239" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1096.8594,240.0625 L1098.1719,240.0625 L1098.1719,240.1094 C1098.1719,240.5156 1098.1875,240.6719 1098.2969,240.8281 C1098.4688,241.0781 1098.7656,241.25 1099.0781,241.25 C1099.3594,241.25 1099.6563,241.1094 1099.8281,240.8906 C1099.9531,240.7031 1100,240.5625 1100,240.1094 L1100,238.2656 C1100,237.9375 1099.9844,237.8281 1099.9219,237.6562 C1099.8125,237.3594 1099.4531,237.1094 1099.0781,237.1094 C1098.7813,237.1094 1098.5156,237.25 1098.3438,237.4687 C1098.2031,237.6562 1098.1719,237.8281 1098.1719,238.2656 L1098.1719,238.3281 L1096.8594,238.3281 L1096.8594,236.1562 L1100.7031,236.1562 L1100.7031,236.9062 C1100.7031,237.2969 1100.7344,237.4844 1100.8438,237.6406 C1101.0156,237.8906 1101.3125,238.0625 1101.625,238.0625 C1101.9219,238.0625 1102.1875,237.9375 1102.375,237.7031 C1102.5156,237.5156 1102.5469,237.375 1102.5469,236.9062 L1102.5469,234.4062 L1094.8438,234.4062 C1094.3906,234.4062 1094.2656,234.4219 1094.0938,234.5312 C1093.8281,234.7031 1093.6563,234.9687 1093.6563,235.2812 C1093.6563,235.5625 1093.7813,235.8281 1094.0313,236 C1094.2188,236.125 1094.4063,236.1562 1094.8438,236.1562 L1095.0313,236.1562 L1095.0313,242.25 L1094.8438,242.25 C1094.4219,242.25 1094.2656,242.2812 1094.0938,242.375 C1093.8281,242.5312 1093.6563,242.8125 1093.6563,243.1094 C1093.6563,243.6875 1094.0625,244 1094.8438,244 L1102.9219,244 L1102.9219,241.4687 C1102.9219,241.0625 1102.8906,240.8906 1102.7813,240.7344 C1102.6094,240.4687 1102.3281,240.3125 1102,240.3125 C1101.7188,240.3125 1101.4375,240.4531 1101.25,240.6719 C1101.1094,240.8594 1101.0781,241.0156 1101.0781,241.4687 L1101.0781,242.25 L1096.8594,242.25 L1096.8594,240.0625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="65" x="1112" y="243.606">property_t</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1084" x2="1179" y1="255" y2="255"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="1089" y="272.0059">property_a</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="1089" y="288.8059">property_b</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="1089" y="305.6058">property_c</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1084" x2="1179" y1="313.3998" y2="313.3998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
+      <ellipse cx="1266" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1270.1094,246 L1262.3906,246 L1262.3906,233.6094 L1270.1094,233.6094 L1270.1094,235.7656 L1264.8438,235.7656 L1264.8438,238.4375 L1269.6094,238.4375 L1269.6094,240.5938 L1264.8438,240.5938 L1264.8438,243.8438 L1270.1094,243.8438 L1270.1094,246 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="1280" y="244.1543">property_t</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1252" x2="1346" y1="256" y2="256"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="1257" y="270.2104">property_a</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="1257" y="283.0151">property_b</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="1257" y="295.8198">property_c</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1252" x2="1346" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000790040432414172612">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000790040432414172612" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="669" y="7"/>
-        <ellipse cx="684" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M679,24.1563 C679,26.6563 681.1406,28.4688 684.0625,28.4688 C685.2969,28.4688 686.4688,28.1719 687.2188,27.6563 C687.8281,27.2344 688.1563,26.8125 688.1563,26.4063 C688.1563,25.9375 687.7344,25.5313 687.2344,25.5313 C687,25.5313 686.7813,25.6094 686.5781,25.8125 C686.1406,26.25 686.1406,26.25 685.9688,26.3438 C685.5156,26.5781 684.875,26.7188 684.1094,26.7188 C682.1094,26.7188 680.8281,25.7031 680.8281,24.125 L680.8281,23.0781 C680.8281,21.375 682.0469,20.1719 683.75,20.1719 C684.3281,20.1719 684.9063,20.3125 685.375,20.5625 C685.8438,20.8281 686.0156,21.0156 686.0781,21.375 C686.2031,22.0469 686.4531,22.2969 686.9844,22.2969 C687.2656,22.2969 687.5469,22.1563 687.7344,21.9375 C687.8594,21.7656 687.9063,21.5938 687.9063,21.1563 L687.9063,19.7969 C687.9063,19.375 687.8906,19.2344 687.7656,19.0625 C687.5938,18.8125 687.3125,18.6563 686.9844,18.6563 C686.6719,18.6563 686.4688,18.7656 686.25,19.0313 C685.0781,18.5313 684.6406,18.4219 683.6875,18.4219 C681.0156,18.4219 679,20.4375 679,23.0625 L679,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="698" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="670" x2="709" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="670" x2="709" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
+      <ellipse cx="787" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M789.9688,29.6406 Q789.3906,29.9375 788.75,30.0781 Q788.1094,30.2344 787.4063,30.2344 Q784.9063,30.2344 783.5781,28.5938 Q782.2656,26.9375 782.2656,23.8125 Q782.2656,20.6875 783.5781,19.0313 Q784.9063,17.375 787.4063,17.375 Q788.1094,17.375 788.75,17.5313 Q789.4063,17.6875 789.9688,17.9844 L789.9688,20.7031 Q789.3438,20.125 788.75,19.8594 Q788.1563,19.5781 787.5313,19.5781 Q786.1875,19.5781 785.5,20.6563 Q784.8125,21.7188 784.8125,23.8125 Q784.8125,25.9063 785.5,26.9844 Q786.1875,28.0469 787.5313,28.0469 Q788.1563,28.0469 788.75,27.7813 Q789.3438,27.5 789.9688,26.9219 L789.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="801" y="28.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001295970068907562690">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001295970068907562690" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1111" y="7"/>
-        <ellipse cx="1126" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1121,24.1563 C1121,26.6563 1123.1406,28.4688 1126.0625,28.4688 C1127.2969,28.4688 1128.4688,28.1719 1129.2188,27.6563 C1129.8281,27.2344 1130.1563,26.8125 1130.1563,26.4063 C1130.1563,25.9375 1129.7344,25.5313 1129.2344,25.5313 C1129,25.5313 1128.7813,25.6094 1128.5781,25.8125 C1128.1406,26.25 1128.1406,26.25 1127.9688,26.3438 C1127.5156,26.5781 1126.875,26.7188 1126.1094,26.7188 C1124.1094,26.7188 1122.8281,25.7031 1122.8281,24.125 L1122.8281,23.0781 C1122.8281,21.375 1124.0469,20.1719 1125.75,20.1719 C1126.3281,20.1719 1126.9063,20.3125 1127.375,20.5625 C1127.8438,20.8281 1128.0156,21.0156 1128.0781,21.375 C1128.2031,22.0469 1128.4531,22.2969 1128.9844,22.2969 C1129.2656,22.2969 1129.5469,22.1563 1129.7344,21.9375 C1129.8594,21.7656 1129.9063,21.5938 1129.9063,21.1563 L1129.9063,19.7969 C1129.9063,19.375 1129.8906,19.2344 1129.7656,19.0625 C1129.5938,18.8125 1129.3125,18.6563 1128.9844,18.6563 C1128.6719,18.6563 1128.4688,18.7656 1128.25,19.0313 C1127.0781,18.5313 1126.6406,18.4219 1125.6875,18.4219 C1123.0156,18.4219 1121,20.4375 1121,23.0625 L1121,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1140" y="27.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1112" x2="1151" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1112" x2="1151" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
+      <ellipse cx="1294" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1296.9688,29.6406 Q1296.3906,29.9375 1295.75,30.0781 Q1295.1094,30.2344 1294.4063,30.2344 Q1291.9063,30.2344 1290.5781,28.5938 Q1289.2656,26.9375 1289.2656,23.8125 Q1289.2656,20.6875 1290.5781,19.0313 Q1291.9063,17.375 1294.4063,17.375 Q1295.1094,17.375 1295.75,17.5313 Q1296.4063,17.6875 1296.9688,17.9844 L1296.9688,20.7031 Q1296.3438,20.125 1295.75,19.8594 Q1295.1563,19.5781 1294.5313,19.5781 Q1293.1875,19.5781 1292.5,20.6563 Q1291.8125,21.7188 1291.8125,23.8125 Q1291.8125,25.9063 1292.5,26.9844 Q1293.1875,28.0469 1294.5313,28.0469 Q1295.1563,28.0469 1295.75,27.7813 Q1296.3438,27.5 1296.9688,26.9219 L1296.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1308" y="28.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000154510361779680983">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000154510361779680983" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="1632.5" y="7"/>
-        <ellipse cx="1647.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1642.5,24.1563 C1642.5,26.6563 1644.6406,28.4688 1647.5625,28.4688 C1648.7969,28.4688 1649.9688,28.1719 1650.7188,27.6563 C1651.3281,27.2344 1651.6563,26.8125 1651.6563,26.4063 C1651.6563,25.9375 1651.2344,25.5313 1650.7344,25.5313 C1650.5,25.5313 1650.2813,25.6094 1650.0781,25.8125 C1649.6406,26.25 1649.6406,26.25 1649.4688,26.3438 C1649.0156,26.5781 1648.375,26.7188 1647.6094,26.7188 C1645.6094,26.7188 1644.3281,25.7031 1644.3281,24.125 L1644.3281,23.0781 C1644.3281,21.375 1645.5469,20.1719 1647.25,20.1719 C1647.8281,20.1719 1648.4063,20.3125 1648.875,20.5625 C1649.3438,20.8281 1649.5156,21.0156 1649.5781,21.375 C1649.7031,22.0469 1649.9531,22.2969 1650.4844,22.2969 C1650.7656,22.2969 1651.0469,22.1563 1651.2344,21.9375 C1651.3594,21.7656 1651.4063,21.5938 1651.4063,21.1563 L1651.4063,19.7969 C1651.4063,19.375 1651.3906,19.2344 1651.2656,19.0625 C1651.0938,18.8125 1650.8125,18.6563 1650.4844,18.6563 C1650.1719,18.6563 1649.9688,18.7656 1649.75,19.0313 C1648.5781,18.5313 1648.1406,18.4219 1647.1875,18.4219 C1644.5156,18.4219 1642.5,20.4375 1642.5,23.0625 L1642.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1661.5" y="27.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1633.5" x2="1673.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1633.5" x2="1673.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
+      <ellipse cx="1899" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1901.9688,29.6406 Q1901.3906,29.9375 1900.75,30.0781 Q1900.1094,30.2344 1899.4063,30.2344 Q1896.9063,30.2344 1895.5781,28.5938 Q1894.2656,26.9375 1894.2656,23.8125 Q1894.2656,20.6875 1895.5781,19.0313 Q1896.9063,17.375 1899.4063,17.375 Q1900.1094,17.375 1900.75,17.5313 Q1901.4063,17.6875 1901.9688,17.9844 L1901.9688,20.7031 Q1901.3438,20.125 1900.75,19.8594 Q1900.1563,19.5781 1899.5313,19.5781 Q1898.1875,19.5781 1897.5,20.6563 Q1896.8125,21.7188 1896.8125,23.8125 Q1896.8125,25.9063 1897.5,26.9844 Q1898.1875,28.0469 1899.5313,28.0469 Q1900.1563,28.0469 1900.75,27.7813 Q1901.3438,27.5 1901.9688,26.9219 L1901.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1913" y="28.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
-      <g id="elem_C_0000137163683637529037">
-        <rect codeLine="30" fill="#F1F1F1" height="64.7999" id="C_0000137163683637529037" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="122" x="1592.5" y="239.8"/>
-        <ellipse cx="1632.7" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1627.7,256.9562 C1627.7,259.4562 1629.8406,261.2687 1632.7625,261.2687 C1633.9969,261.2687 1635.1688,260.9719 1635.9188,260.4562 C1636.5281,260.0344 1636.8563,259.6125 1636.8563,259.2062 C1636.8563,258.7375 1636.4344,258.3312 1635.9344,258.3312 C1635.7,258.3312 1635.4813,258.4094 1635.2781,258.6125 C1634.8406,259.05 1634.8406,259.05 1634.6688,259.1437 C1634.2156,259.3781 1633.575,259.5187 1632.8094,259.5187 C1630.8094,259.5187 1629.5281,258.5031 1629.5281,256.925 L1629.5281,255.8781 C1629.5281,254.175 1630.7469,252.9719 1632.45,252.9719 C1633.0281,252.9719 1633.6063,253.1125 1634.075,253.3625 C1634.5438,253.6281 1634.7156,253.8156 1634.7781,254.175 C1634.9031,254.8469 1635.1531,255.0969 1635.6844,255.0969 C1635.9656,255.0969 1636.2469,254.9562 1636.4344,254.7375 C1636.5594,254.5656 1636.6063,254.3937 1636.6063,253.9562 L1636.6063,252.5969 C1636.6063,252.175 1636.5906,252.0344 1636.4656,251.8625 C1636.2938,251.6125 1636.0125,251.4562 1635.6844,251.4562 C1635.3719,251.4562 1635.1688,251.5656 1634.95,251.8312 C1633.7781,251.3312 1633.3406,251.2219 1632.3875,251.2219 C1629.7156,251.2219 1627.7,253.2375 1627.7,255.8625 L1627.7,256.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="1652.3" y="260.406">key_t</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1593.5" x2="1713.5" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1593.5" x2="1713.5" y1="279.8" y2="279.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1598.5" y="288.7"/>
-          <ellipse cx="1603.5" cy="293.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="96" x="1612.5" y="296.8059">key : std::string</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
+      <ellipse cx="1884.4" cy="252.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1887.3688,258.1406 Q1886.7906,258.4375 1886.15,258.5781 Q1885.5094,258.7344 1884.8063,258.7344 Q1882.3063,258.7344 1880.9781,257.0938 Q1879.6656,255.4375 1879.6656,252.3125 Q1879.6656,249.1875 1880.9781,247.5313 Q1882.3063,245.875 1884.8063,245.875 Q1885.5094,245.875 1886.15,246.0313 Q1886.8063,246.1875 1887.3688,246.4844 L1887.3688,249.2031 Q1886.7438,248.625 1886.15,248.3594 Q1885.5563,248.0781 1884.9313,248.0781 Q1883.5875,248.0781 1882.9,249.1563 Q1882.2125,250.2188 1882.2125,252.3125 Q1882.2125,254.4063 1882.9,255.4844 Q1883.5875,256.5469 1884.9313,256.5469 Q1885.5563,256.5469 1886.15,256.2813 Q1886.7438,256 1887.3688,255.4219 L1887.3688,258.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1903.6" y="256.6543">key_t</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="268.5" y2="268.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="276.5" y2="276.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <g id="elem_C_0001917560728132448300">
-        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0001917560728132448300" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="815" y="248.2"/>
-        <ellipse cx="830" cy="264.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M825,265.3563 C825,267.8563 827.1406,269.6688 830.0625,269.6688 C831.2969,269.6688 832.4688,269.3719 833.2188,268.8563 C833.8281,268.4344 834.1563,268.0125 834.1563,267.6063 C834.1563,267.1375 833.7344,266.7313 833.2344,266.7313 C833,266.7313 832.7813,266.8094 832.5781,267.0125 C832.1406,267.45 832.1406,267.45 831.9688,267.5438 C831.5156,267.7781 830.875,267.9188 830.1094,267.9188 C828.1094,267.9188 826.8281,266.9031 826.8281,265.325 L826.8281,264.2781 C826.8281,262.575 828.0469,261.3719 829.75,261.3719 C830.3281,261.3719 830.9063,261.5125 831.375,261.7625 C831.8438,262.0281 832.0156,262.2156 832.0781,262.575 C832.2031,263.2469 832.4531,263.4969 832.9844,263.4969 C833.2656,263.4969 833.5469,263.3563 833.7344,263.1375 C833.8594,262.9656 833.9063,262.7938 833.9063,262.3563 L833.9063,260.9969 C833.9063,260.575 833.8906,260.4344 833.7656,260.2625 C833.5938,260.0125 833.3125,259.8563 832.9844,259.8563 C832.6719,259.8563 832.4688,259.9656 832.25,260.2313 C831.0781,259.7313 830.6406,259.6219 829.6875,259.6219 C827.0156,259.6219 825,261.6375 825,264.2625 L825,265.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="844" y="268.806">map</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="880" y="245.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="881" y="259.4001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="816" x2="885" y1="280.2" y2="280.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="816" x2="885" y1="288.2" y2="288.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1852" y="282.5"/>
+      <ellipse cx="1857" cy="287.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <g id="elem_C_0001664022047310891203">
-        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001664022047310891203" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="461" x="7" y="115"/>
-        <ellipse cx="22" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,132.1562 C17,134.6562 19.1406,136.4687 22.0625,136.4687 C23.2969,136.4687 24.4688,136.1719 25.2188,135.6562 C25.8281,135.2344 26.1563,134.8125 26.1563,134.4062 C26.1563,133.9375 25.7344,133.5312 25.2344,133.5312 C25,133.5312 24.7813,133.6094 24.5781,133.8125 C24.1406,134.25 24.1406,134.25 23.9688,134.3437 C23.5156,134.5781 22.875,134.7187 22.1094,134.7187 C20.1094,134.7187 18.8281,133.7031 18.8281,132.125 L18.8281,131.0781 C18.8281,129.375 20.0469,128.1719 21.75,128.1719 C22.3281,128.1719 22.9063,128.3125 23.375,128.5625 C23.8438,128.8281 24.0156,129.0156 24.0781,129.375 C24.2031,130.0469 24.4531,130.2969 24.9844,130.2969 C25.2656,130.2969 25.5469,130.1562 25.7344,129.9375 C25.8594,129.7656 25.9063,129.5937 25.9063,129.1562 L25.9063,127.7969 C25.9063,127.375 25.8906,127.2344 25.7656,127.0625 C25.5938,126.8125 25.3125,126.6562 24.9844,126.6562 C24.6719,126.6562 24.4688,126.7656 24.25,127.0312 C23.0781,126.5312 22.6406,126.4219 21.6875,126.4219 C19.0156,126.4219 17,128.4375 17,131.0625 L17,132.1562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="36" y="135.606">map</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="399" x="72" y="112"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="397" x="73" y="126.2001">std::integral_constant&lt;thirdparty::ns1::color_t,thirdparty::ns1::color_t::red&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="467" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="467" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="1866" y="290.7104">key : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <g id="elem_C_0000307700801045535833">
-        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0000307700801045535833" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="372" x="503.5" y="115"/>
-        <ellipse cx="518.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M513.5,132.1562 C513.5,134.6562 515.6406,136.4687 518.5625,136.4687 C519.7969,136.4687 520.9688,136.1719 521.7188,135.6562 C522.3281,135.2344 522.6563,134.8125 522.6563,134.4062 C522.6563,133.9375 522.2344,133.5312 521.7344,133.5312 C521.5,133.5312 521.2813,133.6094 521.0781,133.8125 C520.6406,134.25 520.6406,134.25 520.4688,134.3437 C520.0156,134.5781 519.375,134.7187 518.6094,134.7187 C516.6094,134.7187 515.3281,133.7031 515.3281,132.125 L515.3281,131.0781 C515.3281,129.375 516.5469,128.1719 518.25,128.1719 C518.8281,128.1719 519.4063,128.3125 519.875,128.5625 C520.3438,128.8281 520.5156,129.0156 520.5781,129.375 C520.7031,130.0469 520.9531,130.2969 521.4844,130.2969 C521.7656,130.2969 522.0469,130.1562 522.2344,129.9375 C522.3594,129.7656 522.4063,129.5937 522.4063,129.1562 L522.4063,127.7969 C522.4063,127.375 522.3906,127.2344 522.2656,127.0625 C522.0938,126.8125 521.8125,126.6562 521.4844,126.6562 C521.1719,126.6562 520.9688,126.7656 520.75,127.0312 C519.5781,126.5312 519.1406,126.4219 518.1875,126.4219 C515.5156,126.4219 513.5,128.4375 513.5,131.0625 L513.5,132.1562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="532.5" y="135.606">map</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="310" x="568.5" y="112"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="308" x="569.5" y="126.2001">std::integral_constant&lt;property_t,property_t::property_a&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="504.5" x2="874.5" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="504.5" x2="874.5" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
+      <ellipse cx="966" cy="259" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M968.9688,264.6406 Q968.3906,264.9375 967.75,265.0781 Q967.1094,265.2344 966.4063,265.2344 Q963.9063,265.2344 962.5781,263.5938 Q961.2656,261.9375 961.2656,258.8125 Q961.2656,255.6875 962.5781,254.0313 Q963.9063,252.375 966.4063,252.375 Q967.1094,252.375 967.75,252.5313 Q968.4063,252.6875 968.9688,252.9844 L968.9688,255.7031 Q968.3438,255.125 967.75,254.8594 Q967.1563,254.5781 966.5313,254.5781 Q965.1875,254.5781 964.5,255.6563 Q963.8125,256.7188 963.8125,258.8125 Q963.8125,260.9063 964.5,261.9844 Q965.1875,263.0469 966.5313,263.0469 Q967.1563,263.0469 967.75,262.7813 Q968.3438,262.5 968.9688,261.9219 L968.9688,264.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="980" y="263.1543">map</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1015" y="240"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1016" y="252.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="275" y2="275"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="283" y2="283"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <g id="elem_C_0000548231528417484191">
-        <rect codeLine="47" fill="#F1F1F1" height="48" id="C_0000548231528417484191" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="441" x="911" y="115"/>
-        <ellipse cx="926" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M921,132.1562 C921,134.6562 923.1406,136.4687 926.0625,136.4687 C927.2969,136.4687 928.4688,136.1719 929.2188,135.6562 C929.8281,135.2344 930.1563,134.8125 930.1563,134.4062 C930.1563,133.9375 929.7344,133.5312 929.2344,133.5312 C929,133.5312 928.7813,133.6094 928.5781,133.8125 C928.1406,134.25 928.1406,134.25 927.9688,134.3437 C927.5156,134.5781 926.875,134.7187 926.1094,134.7187 C924.1094,134.7187 922.8281,133.7031 922.8281,132.125 L922.8281,131.0781 C922.8281,129.375 924.0469,128.1719 925.75,128.1719 C926.3281,128.1719 926.9063,128.3125 927.375,128.5625 C927.8438,128.8281 928.0156,129.0156 928.0781,129.375 C928.2031,130.0469 928.4531,130.2969 928.9844,130.2969 C929.2656,130.2969 929.5469,130.1562 929.7344,129.9375 C929.8594,129.7656 929.9063,129.5937 929.9063,129.1562 L929.9063,127.7969 C929.9063,127.375 929.8906,127.2344 929.7656,127.0625 C929.5938,126.8125 929.3125,126.6562 928.9844,126.6562 C928.6719,126.6562 928.4688,126.7656 928.25,127.0312 C927.0781,126.5312 926.6406,126.4219 925.6875,126.4219 C923.0156,126.4219 921,128.4375 921,131.0625 L921,132.1562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="940" y="135.606">map</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="379" x="976" y="112"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="377" x="977" y="126.2001">std::vector&lt;std::integral_constant&lt;property_t,property_t::property_b&gt;&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="912" x2="1351" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="912" x2="1351" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
+      <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="35" y="136.1543">map</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="475" x="70" y="113"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="473" x="71" y="125.1387">std::integral_constant&lt;thirdparty::ns1::color_t,thirdparty::ns1::color_t::red&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <g id="elem_C_0001510200402118706005">
-        <rect codeLine="51" fill="#F1F1F1" height="48" id="C_0001510200402118706005" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="532" x="1387.5" y="115"/>
-        <ellipse cx="1402.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1397.5,132.1562 C1397.5,134.6562 1399.6406,136.4687 1402.5625,136.4687 C1403.7969,136.4687 1404.9688,136.1719 1405.7188,135.6562 C1406.3281,135.2344 1406.6563,134.8125 1406.6563,134.4062 C1406.6563,133.9375 1406.2344,133.5312 1405.7344,133.5312 C1405.5,133.5312 1405.2813,133.6094 1405.0781,133.8125 C1404.6406,134.25 1404.6406,134.25 1404.4688,134.3437 C1404.0156,134.5781 1403.375,134.7187 1402.6094,134.7187 C1400.6094,134.7187 1399.3281,133.7031 1399.3281,132.125 L1399.3281,131.0781 C1399.3281,129.375 1400.5469,128.1719 1402.25,128.1719 C1402.8281,128.1719 1403.4063,128.3125 1403.875,128.5625 C1404.3438,128.8281 1404.5156,129.0156 1404.5781,129.375 C1404.7031,130.0469 1404.9531,130.2969 1405.4844,130.2969 C1405.7656,130.2969 1406.0469,130.1562 1406.2344,129.9375 C1406.3594,129.7656 1406.4063,129.5937 1406.4063,129.1562 L1406.4063,127.7969 C1406.4063,127.375 1406.3906,127.2344 1406.2656,127.0625 C1406.0938,126.8125 1405.8125,126.6562 1405.4844,126.6562 C1405.1719,126.6562 1404.9688,126.7656 1404.75,127.0312 C1403.5781,126.5312 1403.1406,126.4219 1402.1875,126.4219 C1399.5156,126.4219 1397.5,128.4375 1397.5,131.0625 L1397.5,132.1562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="1416.5" y="135.606">map</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="470" x="1452.5" y="112"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="468" x="1453.5" y="126.2001">std::map&lt;key_t,std::vector&lt;std::integral_constant&lt;property_t,property_t::property_c&gt;&gt;&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1388.5" x2="1918.5" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1388.5" x2="1918.5" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
+      <ellipse cx="592.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M595.4688,137.6406 Q594.8906,137.9375 594.25,138.0781 Q593.6094,138.2344 592.9063,138.2344 Q590.4063,138.2344 589.0781,136.5938 Q587.7656,134.9375 587.7656,131.8125 Q587.7656,128.6875 589.0781,127.0313 Q590.4063,125.375 592.9063,125.375 Q593.6094,125.375 594.25,125.5313 Q594.9063,125.6875 595.4688,125.9844 L595.4688,128.7031 Q594.8438,128.125 594.25,127.8594 Q593.6563,127.5781 593.0313,127.5781 Q591.6875,127.5781 591,128.6563 Q590.3125,129.7188 590.3125,131.8125 Q590.3125,133.9063 591,134.9844 Q591.6875,136.0469 593.0313,136.0469 Q593.6563,136.0469 594.25,135.7813 Q594.8438,135.5 595.4688,134.9219 L595.4688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="606.5" y="136.1543">map</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="368" x="641.5" y="113"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="366" x="642.5" y="125.1387">std::integral_constant&lt;property_t,property_t::property_a&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="156" y2="156"/>
     </a>
-    <g id="link_C_0001664022047310891203_C_0000566782399856868761">
-      <path codeLine="54" d="M237.5,163.46 C237.5,179.89 237.5,196.45 237.5,216.68 " fill="none" id="C_0001664022047310891203-to-C_0000566782399856868761" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="237.5,222.68,241.5,213.68,237.5,217.68,233.5,213.68,237.5,222.68" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001664022047310891203_C_0001917560728132448300">
-      <path codeLine="55" d="M347.09,163.46 C487.94,193.6 707.3985,240.5736 797.0785,259.7636 " fill="none" id="C_0001664022047310891203-to-C_0001917560728132448300" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="814.68,263.53,798.3339,253.8964,795.823,265.6307,814.68,263.53" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001642222718760881014_C_0001664022047310891203">
-      <path codeLine="56" d="M237.5,73.26 C237.5,90.94 237.5,97.13 237.5,114.79 " fill="none" id="C_0001642222718760881014-backto-C_0001664022047310891203" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="237.5,55.26,231.5,73.26,243.5,73.26,237.5,55.26" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000307700801045535833_C_0000007376951310260829">
-      <path codeLine="57" d="M768.52,163.46 C859.65,190.51 1000.888,232.4327 1076.828,254.9727 " fill="none" id="C_0000307700801045535833-to-C_0000007376951310260829" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1082.58,256.68,1075.0902,250.2845,1077.7867,255.2573,1072.8139,257.9538,1082.58,256.68" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000307700801045535833_C_0001917560728132448300">
-      <path codeLine="58" d="M718.28,163.46 C747.5,187.26 778.5184,212.5367 807.7384,236.3567 " fill="none" id="C_0000307700801045535833-to-C_0001917560728132448300" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="821.69,247.73,811.5295,231.7062,803.9473,241.0072,821.69,247.73" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000790040432414172612_C_0000307700801045535833">
-      <path codeLine="59" d="M689.5,73.26 C689.5,90.94 689.5,97.13 689.5,114.79 " fill="none" id="C_0000790040432414172612-backto-C_0000307700801045535833" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="689.5,55.26,683.5,73.26,695.5,73.26,689.5,55.26" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000548231528417484191_C_0000007376951310260829">
-      <path codeLine="60" d="M1131.5,163.46 C1131.5,179.89 1131.5,196.45 1131.5,216.68 " fill="none" id="C_0000548231528417484191-to-C_0000007376951310260829" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1131.5,222.68,1135.5,213.68,1131.5,217.68,1127.5,213.68,1131.5,222.68" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000548231528417484191_C_0001917560728132448300">
-      <path codeLine="61" d="M1081.26,163.46 C1025.22,189.62 952.2701,223.6855 902.7901,246.7855 " fill="none" id="C_0000548231528417484191-to-C_0001917560728132448300" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="886.48,254.4,905.3283,252.2222,900.252,241.3488,886.48,254.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001295970068907562690_C_0000548231528417484191">
-      <path codeLine="62" d="M1131.5,73.26 C1131.5,90.94 1131.5,97.13 1131.5,114.79 " fill="none" id="C_0001295970068907562690-backto-C_0000548231528417484191" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="1131.5,55.26,1125.5,73.26,1137.5,73.26,1131.5,55.26" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001510200402118706005_C_0000137163683637529037">
-      <path codeLine="63" d="M1653.5,163.46 C1653.5,184.68 1653.5,210.12 1653.5,233.57 " fill="none" id="C_0001510200402118706005-to-C_0000137163683637529037" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1653.5,239.57,1657.5,230.57,1653.5,234.57,1649.5,230.57,1653.5,239.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001510200402118706005_C_0000007376951310260829">
-      <path codeLine="64" d="M1560.18,163.46 C1448.89,191.43 1272.879,235.6674 1186.229,257.4474 " fill="none" id="C_0001510200402118706005-to-C_0000007376951310260829" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1180.41,258.91,1190.1136,260.5954,1185.2592,257.6911,1188.1634,252.8367,1180.41,258.91" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001510200402118706005_C_0001917560728132448300">
-      <path codeLine="65" d="M1458.88,163.48 C1344.04,178.33 1196.08,199.19 1065.5,223 C1002.09,234.56 946.4934,247.5085 903.9434,257.9285 " fill="none" id="C_0001510200402118706005-to-C_0001917560728132448300" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="886.46,262.21,905.3705,263.7563,902.5162,252.1007,886.46,262.21" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000154510361779680983_C_0001510200402118706005">
-      <path codeLine="66" d="M1653.5,73.26 C1653.5,90.94 1653.5,97.13 1653.5,114.79 " fill="none" id="C_0000154510361779680983-backto-C_0001510200402118706005" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="1653.5,55.26,1647.5,73.26,1659.5,73.26,1653.5,55.26" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
+      <ellipse cx="1056.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1059.4688,137.6406 Q1058.8906,137.9375 1058.25,138.0781 Q1057.6094,138.2344 1056.9063,138.2344 Q1054.4063,138.2344 1053.0781,136.5938 Q1051.7656,134.9375 1051.7656,131.8125 Q1051.7656,128.6875 1053.0781,127.0313 Q1054.4063,125.375 1056.9063,125.375 Q1057.6094,125.375 1058.25,125.5313 Q1058.9063,125.6875 1059.4688,125.9844 L1059.4688,128.7031 Q1058.8438,128.125 1058.25,127.8594 Q1057.6563,127.5781 1057.0313,127.5781 Q1055.6875,127.5781 1055,128.6563 Q1054.3125,129.7188 1054.3125,131.8125 Q1054.3125,133.9063 1055,134.9844 Q1055.6875,136.0469 1057.0313,136.0469 Q1057.6563,136.0469 1058.25,135.7813 Q1058.8438,135.5 1059.4688,134.9219 L1059.4688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1070.5" y="136.1543">map</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="454" x="1105.5" y="113"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="452" x="1106.5" y="125.1387">std::vector&lt;std::integral_constant&lt;property_t,property_t::property_b&gt;&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="156" y2="156"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
+      <ellipse cx="1606.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1609.4688,137.6406 Q1608.8906,137.9375 1608.25,138.0781 Q1607.6094,138.2344 1606.9063,138.2344 Q1604.4063,138.2344 1603.0781,136.5938 Q1601.7656,134.9375 1601.7656,131.8125 Q1601.7656,128.6875 1603.0781,127.0313 Q1604.4063,125.375 1606.9063,125.375 Q1607.6094,125.375 1608.25,125.5313 Q1608.9063,125.6875 1609.4688,125.9844 L1609.4688,128.7031 Q1608.8438,128.125 1608.25,127.8594 Q1607.6563,127.5781 1607.0313,127.5781 Q1605.6875,127.5781 1605,128.6563 Q1604.3125,129.7188 1604.3125,131.8125 Q1604.3125,133.9063 1605,134.9844 Q1605.6875,136.0469 1607.0313,136.0469 Q1607.6563,136.0469 1608.25,135.7813 Q1608.8438,135.5 1609.4688,134.9219 L1609.4688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1620.5" y="136.1543">map</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="564" x="1655.5" y="113"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="562" x="1656.5" y="125.1387">std::map&lt;key_t,std::vector&lt;std::integral_constant&lt;property_t,property_t::property_c&gt;&gt;&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1592.5" x2="2215.5" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1592.5" x2="2215.5" y1="156" y2="156"/>
+    </a>
+    <path d="M274,164.22 C274,179.51 274,200.09 274,218.73 " fill="none" id="C_0001664022047310891203-&gt;C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="274,223.94,278,214.94,274,218.94,270,214.94,274,223.94" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M405.42,164.07 C562.83,191.71 819.25,236.73 931.02,256.35 " fill="none" id="C_0001664022047310891203-&gt;C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="932.27,249.46,950.76,259.81,929.85,263.25,932.27,249.46" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M274,76.02 C274,89.58 274,104.04 274,115.68 " fill="none" id="C_0001642222718760881014&lt;-C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="267,76,274,56,281,76,267,76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M885.58,164.07 C991.48,190.18 1160.32,231.81 1245.76,252.87 " fill="none" id="C_0000307700801045535833-&gt;C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1250.76,254.11,1242.9821,248.0681,1245.9059,252.9108,1241.0633,255.8346,1250.76,254.11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M828.04,164.22 C857.76,183.37 900.32,210.8 933.78,232.35 " fill="none" id="C_0000307700801045535833-&gt;C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="937.79,226.61,950.81,243.33,930.21,238.38,937.79,226.61" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M792,76.02 C792,89.58 792,104.04 792,115.68 " fill="none" id="C_0000790040432414172612&lt;-C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="785,76,792,56,799,76,785,76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1299,164.22 C1299,179.51 1299,200.09 1299,218.73 " fill="none" id="C_0000548231528417484191-&gt;C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1299,223.94,1303,214.94,1299,218.94,1295,214.94,1299,223.94" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1241.23,164.07 C1183.68,187.05 1096.03,222.06 1039.89,244.48 " fill="none" id="C_0000548231528417484191-&gt;C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1042.26,251.07,1021.09,251.99,1037.07,238.07,1042.26,251.07" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1299,76.02 C1299,89.58 1299,104.04 1299,115.68 " fill="none" id="C_0001295970068907562690&lt;-C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="1292,76,1299,56,1306,76,1292,76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1904,164.22 C1904,183.04 1904,209.86 1904,231.25 " fill="none" id="C_0001510200402118706005-&gt;C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1904,236.28,1908,227.28,1904,231.28,1900,227.28,1904,236.28" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1792.33,164.07 C1661.51,191.1 1450.22,234.76 1352.15,255.02 " fill="none" id="C_0001510200402118706005-&gt;C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1347,256.08,1356.6252,258.1671,1351.8956,255.0637,1354.999,250.3341,1347,256.08" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1698.79,164.02 C1566.02,179.51 1389.54,201.21 1234,224 C1167.46,233.75 1091.23,246.97 1041.05,255.95 " fill="none" id="C_0001510200402118706005-&gt;C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1042.17,262.87,1021.24,259.52,1039.68,249.09,1042.17,262.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1904,76.02 C1904,89.58 1904,104.04 1904,115.68 " fill="none" id="C_0000154510361779680983&lt;-C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="1897,76,1904,56,1911,76,1897,76" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00038_class_mermaid.svg b/docs/test_cases/t00038_class_mermaid.svg
index 295655d0..f3d43227 100644
--- a/docs/test_cases/t00038_class_mermaid.svg
+++ b/docs/test_cases/t00038_class_mermaid.svg
@@ -1,73 +1,68 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2676.328125 375" style="max-width: 2676.33px; background-color: white;" width="2676.328125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M326.21977219626166,172L325.4409559968847,176.16666666666666C324.6621397975078,180.33333333333334,323.10450739875387,188.66666666666666,322.32569119937693,196C321.546875,203.33333333333334,321.546875,209.66666666666666,321.546875,212.83333333333334L321.546875,216"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M540.6523072429907,172L571.2232768691589,176.16666666666666C601.7942464953271,180.33333333333334,662.9361857476636,188.66666666666666,701.2549107769914,202.03814912003727C739.5736358063192,215.40963157340795,755.0691466126385,233.81926314681587,762.816902015798,243.02407893351983L770.5646574189576,252.2288947202238"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M331.546875,83L331.546875,84.16666666666667C331.546875,85.33333333333333,331.546875,87.66666666666667,331.546875,93C331.546875,98.33333333333333,331.546875,106.66666666666667,331.546875,110.83333333333333L331.546875,115"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1214.4375,163.57497064714414L1285.109375,169.1458088726201C1355.78125,174.7166470980961,1497.125,185.85832354904804,1653.378407007849,205.80873955816824C1809.6318140156982,225.75915556728842,1980.7948780313966,254.51831113457683,2066.376410039246,268.89788891822104L2151.957942047095,283.27746670186525"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M844.8666764018692,172L828.0685845015577,176.16666666666666C811.2704926012461,180.33333333333334,777.674308800623,188.66666666666666,766.5858564095187,201.80259522204938C755.4974040184143,214.9385237774321,766.9166830368284,232.87704755486413,772.6263225460356,241.84630944358017L778.3359620552426,250.8155713322962"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M959.765625,83L959.765625,84.16666666666667C959.765625,85.33333333333333,959.765625,87.66666666666667,959.765625,93C959.765625,98.33333333333333,959.765625,106.66666666666667,959.765625,110.83333333333333L959.765625,115"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1805.6283221378505,172L1840.0437840732086,176.16666666666666C1874.459246008567,180.33333333333334,1943.2901698792837,188.66666666666666,2001.0935745713061,203.86917754389992C2058.8969792633284,219.0716884211332,2105.672864776657,241.14337684226632,2129.0608075333216,252.1792210528329L2152.4487502899856,263.2150652633995"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1331.1187207943926,172L1296.1614339953273,176.16666666666666C1261.2041471962618,180.33333333333334,1191.2895735981308,188.66666666666666,1113.0231973998364,206.22872697395792C1034.7568212015415,223.79078728124918,948.1386424030828,250.5815745624983,904.8295530038536,263.9769682031229L861.5204636046243,277.37236184374746"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1570.2265625,83L1570.2265625,84.16666666666667C1570.2265625,85.33333333333333,1570.2265625,87.66666666666667,1570.2265625,93C1570.2265625,98.33333333333333,1570.2265625,106.66666666666667,1570.2265625,110.83333333333333L1570.2265625,115"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M2402.0325642523367,172L2417.363074376947,176.16666666666666C2432.693584501558,180.33333333333334,2463.354604750779,188.66666666666666,2478.6851148753894,201.5C2494.015625,214.33333333333334,2494.015625,231.66666666666666,2494.015625,240.33333333333334L2494.015625,249"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M2297.171875,172L2297.171875,176.16666666666666C2297.171875,180.33333333333334,2297.171875,188.66666666666666,2294.447261575591,196.22077859500143C2291.722648151182,203.7748905233362,2286.273421302364,210.54978104667236,2283.548807877955,213.93722630834046L2280.824194453546,217.32467157000855"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1926.015625,165.79239006977122L1839.4173177083333,170.99365839147603C1752.8190104166667,176.19492671318082,1579.6223958333333,186.59746335659042,1402.3016886811304,206.53421439810745C1224.9809815289275,226.47096543962448,1043.5361818078552,255.94193087924893,952.813781947319,270.67741359906114L862.0913820867826,285.4128963188734"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M2297.171875,83L2297.171875,84.16666666666667C2297.171875,85.33333333333333,2297.171875,87.66666666666667,2297.171875,93C2297.171875,98.33333333333333,2297.171875,106.66666666666667,2297.171875,110.83333333333333L2297.171875,115"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M326.21977219626166,172L325.4409559968847,176.16666666666666C324.6621397975078,180.33333333333334,323.10450739875387,188.66666666666666,322.32569119937693,197C321.546875,205.33333333333334,321.546875,213.66666666666666,321.546875,217.83333333333334L321.546875,222"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M540.6523072429907,172L571.2232768691589,176.16666666666666C601.7942464953271,180.33333333333334,662.9361857476636,188.66666666666666,703.1867827776779,204.33333333333334C743.4373798076923,220,762.7966346153847,243,772.4762620192308,254.5L782.1558894230769,266"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M331.546875,65L331.546875,69.16666666666667C331.546875,73.33333333333333,331.546875,81.66666666666667,331.546875,90C331.546875,98.33333333333333,331.546875,106.66666666666667,331.546875,110.83333333333333L331.546875,115"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1214.4375,163.57497064714414L1285.109375,169.1458088726201C1355.78125,174.7166470980961,1497.125,185.85832354904804,1654.3645833333333,205.9744388492184C1811.6041666666667,226.0905541493888,1984.7395833333333,255.18110829877753,2071.3072916666665,269.72638537347194L2157.875,284.2716624481663"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M844.8666764018692,172L828.0685845015577,176.16666666666666C811.2704926012461,180.33333333333334,777.674308800623,188.66666666666666,768.1968699451833,204.33333333333334C758.7194310897436,220,773.3607371794873,243,780.6813902243589,254.5L788.0020432692307,266"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M959.765625,65L959.765625,69.16666666666667C959.765625,73.33333333333333,959.765625,81.66666666666667,959.765625,90C959.765625,98.33333333333333,959.765625,106.66666666666667,959.765625,110.83333333333333L959.765625,115"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M1805.6283221378505,172L1840.0437840732086,176.16666666666666C1874.459246008567,180.33333333333334,1943.2901698792837,188.66666666666666,2001.9979495229752,204.29591627754567C2060.7057291666665,219.9251658884247,2109.2903645833335,242.85033177684934,2133.5826822916665,254.3129147210617L2157.875,265.77549766527403"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1331.1187207943926,172L1296.1614339953273,176.16666666666666C1261.2041471962618,180.33333333333334,1191.2895735981308,188.66666666666666,1110.1571565907323,207.11518626831392C1029.0247395833333,225.56370586996118,936.6744791666666,254.12741173992242,890.4993489583334,268.409264674903L844.32421875,282.69111760988363"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1570.2265625,65L1570.2265625,69.16666666666667C1570.2265625,73.33333333333333,1570.2265625,81.66666666666667,1570.2265625,90C1570.2265625,98.33333333333333,1570.2265625,106.66666666666667,1570.2265625,110.83333333333333L1570.2265625,115"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M2402.0325642523367,172L2417.363074376947,176.16666666666666C2432.693584501558,180.33333333333334,2463.354604750779,188.66666666666666,2478.6851148753894,202.5C2494.015625,216.33333333333334,2494.015625,235.66666666666666,2494.015625,245.33333333333334L2494.015625,255"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M2297.171875,172L2297.171875,176.16666666666666C2297.171875,180.33333333333334,2297.171875,188.66666666666666,2293.820512820513,197C2290.469150641026,205.33333333333334,2283.7664262820513,213.66666666666666,2280.4150641025644,217.83333333333334L2277.063701923077,222"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1926.015625,165.79239006977122L1839.4173177083333,170.99365839147603C1752.8190104166667,176.19492671318082,1579.6223958333333,186.59746335659042,1399.3404947916667,207.0151829511361C1219.05859375,227.4329025456817,1031.69140625,257.8658050913634,938.0078125,273.0822563642043L844.32421875,288.29870763704514"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M2297.171875,65L2297.171875,69.16666666666667C2297.171875,73.33333333333333,2297.171875,81.66666666666667,2297.171875,90C2297.171875,98.33333333333333,2297.171875,106.66666666666667,2297.171875,110.83333333333333L2297.171875,115"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -207,7 +202,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L8">
+        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L8">
           <g title="color_t" id="classId-C_0000566782399856868761-0" class="node default clickable">
             <rect height="145" width="191.90625" y="-72.5" x="-95.953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="95.953125" x1="-95.953125" class="divider"/>
@@ -241,7 +236,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L10">
+        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L10">
           <g title="E" id="classId-C_0001642222718760881014-1" class="node default clickable">
             <rect height="57" width="149.234375" y="-28.5" x="-74.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6171875" x1="-74.6171875" class="divider"/>
@@ -260,7 +255,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L20">
+        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L20">
           <g title="property_t" id="classId-C_0000007376951310260829-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -294,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L22">
+        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L22">
           <g title="A" id="classId-C_0000790040432414172612-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -313,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L23">
+        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L23">
           <g title="B" id="classId-C_0001295970068907562690-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -332,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L24">
+        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L24">
           <g title="C" id="classId-C_0000154510361779680983-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -351,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L26">
+        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L26">
           <g title="key_t" id="classId-C_0000137163683637529037-6" class="node default clickable">
             <rect height="79" width="131.9375" y="-39.5" x="-65.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.96875" x1="-65.96875" class="divider"/>
@@ -375,7 +370,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L30">
+        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L30">
           <g title="map" id="classId-C_0001917560728132448300-7" class="node default clickable">
             <rect height="57" width="76.359375" y="-28.5" x="-38.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.1796875" x1="-38.1796875" class="divider"/>
@@ -394,7 +389,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L34">
+        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L34">
           <g title="map" id="classId-C_0001664022047310891203-8" class="node default clickable">
             <rect height="57" width="647.09375" y="-28.5" x="-323.546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="323.546875" x1="-323.546875" class="divider"/>
@@ -413,7 +408,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L37">
+        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L37">
           <g title="map" id="classId-C_0000307700801045535833-9" class="node default clickable">
             <rect height="57" width="509.34375" y="-28.5" x="-254.671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="254.671875" x1="-254.671875" class="divider"/>
@@ -432,7 +427,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L41">
+        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L41">
           <g title="map" id="classId-C_0000548231528417484191-10" class="node default clickable">
             <rect height="57" width="611.578125" y="-28.5" x="-305.7890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="305.7890625" x1="-305.7890625" class="divider"/>
@@ -451,7 +446,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00038/t00038.cc#L46">
+        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L46">
           <g title="map" id="classId-C_0001510200402118706005-11" class="node default clickable">
             <rect height="57" width="742.3125" y="-28.5" x="-371.15625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="371.15625" x1="-371.15625" class="divider"/>
diff --git a/docs/test_cases/t00039.md b/docs/test_cases/t00039.md
index 93ee3eb8..fe316946 100644
--- a/docs/test_cases/t00039.md
+++ b/docs/test_cases/t00039.md
@@ -95,7 +95,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00039::C",
+      "display_name": "C",
       "id": "241234977032861936",
       "is_abstract": false,
       "is_nested": false,
@@ -117,7 +117,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00039::D",
+      "display_name": "D",
       "id": "1975187139659616784",
       "is_abstract": false,
       "is_nested": false,
@@ -139,7 +139,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00039::E",
+      "display_name": "E",
       "id": "1959131184346890363",
       "is_abstract": false,
       "is_nested": false,
@@ -174,7 +174,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "clanguml::t00039::D"
         }
       ],
-      "display_name": "clanguml::t00039::CD",
+      "display_name": "CD",
       "id": "850483622527996929",
       "is_abstract": false,
       "is_nested": false,
@@ -209,7 +209,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "clanguml::t00039::E"
         }
       ],
-      "display_name": "clanguml::t00039::DE",
+      "display_name": "DE",
       "id": "1316022308303681160",
       "is_abstract": false,
       "is_nested": false,
@@ -250,7 +250,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "clanguml::t00039::E"
         }
       ],
-      "display_name": "clanguml::t00039::CDE",
+      "display_name": "CDE",
       "id": "1877487144594774465",
       "is_abstract": false,
       "is_nested": false,
@@ -272,7 +272,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00039::A",
+      "display_name": "A",
       "id": "1051171525946759825",
       "is_abstract": false,
       "is_nested": false,
@@ -301,7 +301,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "clanguml::t00039::A"
         }
       ],
-      "display_name": "clanguml::t00039::AA",
+      "display_name": "AA",
       "id": "1761969273600680013",
       "is_abstract": false,
       "is_nested": false,
@@ -330,7 +330,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "clanguml::t00039::AA"
         }
       ],
-      "display_name": "clanguml::t00039::AAA",
+      "display_name": "AAA",
       "id": "2158483243842147804",
       "is_abstract": false,
       "is_nested": false,
@@ -372,7 +372,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "clanguml::t00039::AAA"
         }
       ],
-      "display_name": "clanguml::t00039::ns2::AAAA",
+      "display_name": "ns2::AAAA",
       "id": "1857294881176816154",
       "is_abstract": false,
       "is_nested": false,
@@ -394,7 +394,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00039::ns3::F<T>",
+      "display_name": "ns3::F<T>",
       "id": "955785395599769805",
       "is_abstract": false,
       "is_nested": false,
@@ -443,7 +443,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "F<T>"
         }
       ],
-      "display_name": "clanguml::t00039::ns3::FF<T,M>",
+      "display_name": "ns3::FF<T,M>",
       "id": "1321996888067531304",
       "is_abstract": false,
       "is_nested": false,
@@ -498,7 +498,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "F<T>"
         }
       ],
-      "display_name": "clanguml::t00039::ns3::FE<T,M>",
+      "display_name": "ns3::FE<T,M>",
       "id": "2008055732881129924",
       "is_abstract": false,
       "is_nested": false,
@@ -553,7 +553,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
           "name": "FF<T,M>"
         }
       ],
-      "display_name": "clanguml::t00039::ns3::FFF<T,M,N>",
+      "display_name": "ns3::FFF<T,M,N>",
       "id": "1617455840736919039",
       "is_abstract": false,
       "is_nested": false,
@@ -607,6 +607,7 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
     }
   ],
   "name": "t00039_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg
index c7908bc0..8717a5f5 100644
--- a/docs/test_cases/t00039_class.svg
+++ b/docs/test_cases/t00039_class.svg
@@ -1,242 +1,194 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="439px" preserveAspectRatio="none" style="width:633px;height:439px;background:#FFFFFF;" version="1.1" viewBox="0 0 633 439" width="633px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="430px" preserveAspectRatio="none" style="width:622px;height:430px;" version="1.1" viewBox="0 0 622 430" width="622px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f15xq95jsh0npr" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000241234977032861936">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000241234977032861936" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="19" y="18.4"/>
-        <ellipse cx="34" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M29,35.5562 C29,38.0562 31.1406,39.8687 34.0625,39.8687 C35.2969,39.8687 36.4688,39.5719 37.2188,39.0562 C37.8281,38.6344 38.1563,38.2125 38.1563,37.8062 C38.1563,37.3375 37.7344,36.9312 37.2344,36.9312 C37,36.9312 36.7813,37.0094 36.5781,37.2125 C36.1406,37.65 36.1406,37.65 35.9688,37.7437 C35.5156,37.9781 34.875,38.1187 34.1094,38.1187 C32.1094,38.1187 30.8281,37.1031 30.8281,35.525 L30.8281,34.4781 C30.8281,32.775 32.0469,31.5719 33.75,31.5719 C34.3281,31.5719 34.9063,31.7125 35.375,31.9625 C35.8438,32.2281 36.0156,32.4156 36.0781,32.775 C36.2031,33.4469 36.4531,33.6969 36.9844,33.6969 C37.2656,33.6969 37.5469,33.5562 37.7344,33.3375 C37.8594,33.1656 37.9063,32.9937 37.9063,32.5562 L37.9063,31.1969 C37.9063,30.775 37.8906,30.6344 37.7656,30.4625 C37.5938,30.2125 37.3125,30.0562 36.9844,30.0562 C36.6719,30.0562 36.4688,30.1656 36.25,30.4312 C35.0781,29.9312 34.6406,29.8219 33.6875,29.8219 C31.0156,29.8219 29,31.8375 29,34.4625 L29,35.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="48" y="39.006">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="20" x2="60" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="20" x2="60" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
+      <ellipse cx="31.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M34.4688,36.1406 Q33.8906,36.4375 33.25,36.5781 Q32.6094,36.7344 31.9063,36.7344 Q29.4063,36.7344 28.0781,35.0938 Q26.7656,33.4375 26.7656,30.3125 Q26.7656,27.1875 28.0781,25.5313 Q29.4063,23.875 31.9063,23.875 Q32.6094,23.875 33.25,24.0313 Q33.9063,24.1875 34.4688,24.4844 L34.4688,27.2031 Q33.8438,26.625 33.25,26.3594 Q32.6563,26.0781 32.0313,26.0781 Q30.6875,26.0781 30,27.1563 Q29.3125,28.2188 29.3125,30.3125 Q29.3125,32.4063 30,33.4844 Q30.6875,34.5469 32.0313,34.5469 Q32.6563,34.5469 33.25,34.2813 Q33.8438,34 34.4688,33.4219 L34.4688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="45.5" y="34.6543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001975187139659616784">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0001975187139659616784" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="103" y="18.4"/>
-        <ellipse cx="118" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M113,35.5562 C113,38.0562 115.1406,39.8687 118.0625,39.8687 C119.2969,39.8687 120.4688,39.5719 121.2188,39.0562 C121.8281,38.6344 122.1563,38.2125 122.1563,37.8062 C122.1563,37.3375 121.7344,36.9312 121.2344,36.9312 C121,36.9312 120.7813,37.0094 120.5781,37.2125 C120.1406,37.65 120.1406,37.65 119.9688,37.7437 C119.5156,37.9781 118.875,38.1187 118.1094,38.1187 C116.1094,38.1187 114.8281,37.1031 114.8281,35.525 L114.8281,34.4781 C114.8281,32.775 116.0469,31.5719 117.75,31.5719 C118.3281,31.5719 118.9063,31.7125 119.375,31.9625 C119.8438,32.2281 120.0156,32.4156 120.0781,32.775 C120.2031,33.4469 120.4531,33.6969 120.9844,33.6969 C121.2656,33.6969 121.5469,33.5562 121.7344,33.3375 C121.8594,33.1656 121.9063,32.9937 121.9063,32.5562 L121.9063,31.1969 C121.9063,30.775 121.8906,30.6344 121.7656,30.4625 C121.5938,30.2125 121.3125,30.0562 120.9844,30.0562 C120.6719,30.0562 120.4688,30.1656 120.25,30.4312 C119.0781,29.9312 118.6406,29.8219 117.6875,29.8219 C115.0156,29.8219 113,31.8375 113,34.4625 L113,35.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="132" y="39.006">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="144" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="104" x2="144" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
+      <ellipse cx="113" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M115.9688,36.1406 Q115.3906,36.4375 114.75,36.5781 Q114.1094,36.7344 113.4063,36.7344 Q110.9063,36.7344 109.5781,35.0938 Q108.2656,33.4375 108.2656,30.3125 Q108.2656,27.1875 109.5781,25.5313 Q110.9063,23.875 113.4063,23.875 Q114.1094,23.875 114.75,24.0313 Q115.4063,24.1875 115.9688,24.4844 L115.9688,27.2031 Q115.3438,26.625 114.75,26.3594 Q114.1563,26.0781 113.5313,26.0781 Q112.1875,26.0781 111.5,27.1563 Q110.8125,28.2188 110.8125,30.3125 Q110.8125,32.4063 111.5,33.4844 Q112.1875,34.5469 113.5313,34.5469 Q114.1563,34.5469 114.75,34.2813 Q115.3438,34 115.9688,33.4219 L115.9688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="127" y="34.6543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001959131184346890363">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001959131184346890363" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="187.5" y="18.4"/>
-        <ellipse cx="202.5" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M197.5,35.5562 C197.5,38.0562 199.6406,39.8687 202.5625,39.8687 C203.7969,39.8687 204.9688,39.5719 205.7188,39.0562 C206.3281,38.6344 206.6563,38.2125 206.6563,37.8062 C206.6563,37.3375 206.2344,36.9312 205.7344,36.9312 C205.5,36.9312 205.2813,37.0094 205.0781,37.2125 C204.6406,37.65 204.6406,37.65 204.4688,37.7437 C204.0156,37.9781 203.375,38.1187 202.6094,38.1187 C200.6094,38.1187 199.3281,37.1031 199.3281,35.525 L199.3281,34.4781 C199.3281,32.775 200.5469,31.5719 202.25,31.5719 C202.8281,31.5719 203.4063,31.7125 203.875,31.9625 C204.3438,32.2281 204.5156,32.4156 204.5781,32.775 C204.7031,33.4469 204.9531,33.6969 205.4844,33.6969 C205.7656,33.6969 206.0469,33.5562 206.2344,33.3375 C206.3594,33.1656 206.4063,32.9937 206.4063,32.5562 L206.4063,31.1969 C206.4063,30.775 206.3906,30.6344 206.2656,30.4625 C206.0938,30.2125 205.8125,30.0562 205.4844,30.0562 C205.1719,30.0562 204.9688,30.1656 204.75,30.4312 C203.5781,29.9312 203.1406,29.8219 202.1875,29.8219 C199.5156,29.8219 197.5,31.8375 197.5,34.4625 L197.5,35.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="216.5" y="39.006">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="188.5" x2="227.5" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="188.5" x2="227.5" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
+      <ellipse cx="195.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M198.4688,36.1406 Q197.8906,36.4375 197.25,36.5781 Q196.6094,36.7344 195.9063,36.7344 Q193.4063,36.7344 192.0781,35.0938 Q190.7656,33.4375 190.7656,30.3125 Q190.7656,27.1875 192.0781,25.5313 Q193.4063,23.875 195.9063,23.875 Q196.6094,23.875 197.25,24.0313 Q197.9063,24.1875 198.4688,24.4844 L198.4688,27.2031 Q197.8438,26.625 197.25,26.3594 Q196.6563,26.0781 196.0313,26.0781 Q194.6875,26.0781 194,27.1563 Q193.3125,28.2188 193.3125,30.3125 Q193.3125,32.4063 194,33.4844 Q194.6875,34.5469 196.0313,34.5469 Q196.6563,34.5469 197.25,34.2813 Q197.8438,34 198.4688,33.4219 L198.4688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="209.5" y="34.6543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
-      <g id="elem_C_0000850483622527996929">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0000850483622527996929" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="52" x="7" y="143.2"/>
-        <ellipse cx="22" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,160.3563 C17,162.8563 19.1406,164.6688 22.0625,164.6688 C23.2969,164.6688 24.4688,164.3719 25.2188,163.8563 C25.8281,163.4344 26.1563,163.0125 26.1563,162.6063 C26.1563,162.1375 25.7344,161.7313 25.2344,161.7313 C25,161.7313 24.7813,161.8094 24.5781,162.0125 C24.1406,162.45 24.1406,162.45 23.9688,162.5438 C23.5156,162.7781 22.875,162.9188 22.1094,162.9188 C20.1094,162.9188 18.8281,161.9031 18.8281,160.325 L18.8281,159.2781 C18.8281,157.575 20.0469,156.3719 21.75,156.3719 C22.3281,156.3719 22.9063,156.5125 23.375,156.7625 C23.8438,157.0281 24.0156,157.2156 24.0781,157.575 C24.2031,158.2469 24.4531,158.4969 24.9844,158.4969 C25.2656,158.4969 25.5469,158.3563 25.7344,158.1375 C25.8594,157.9656 25.9063,157.7938 25.9063,157.3563 L25.9063,155.9969 C25.9063,155.575 25.8906,155.4344 25.7656,155.2625 C25.5938,155.0125 25.3125,154.8563 24.9844,154.8563 C24.6719,154.8563 24.4688,154.9656 24.25,155.2313 C23.0781,154.7313 22.6406,154.6219 21.6875,154.6219 C19.0156,154.6219 17,156.6375 17,159.2625 L17,160.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="36" y="163.806">CD</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="58" y1="175.2" y2="175.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="58" y1="183.2" y2="183.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
+      <ellipse cx="21" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,157.1406 Q23.3906,157.4375 22.75,157.5781 Q22.1094,157.7344 21.4063,157.7344 Q18.9063,157.7344 17.5781,156.0938 Q16.2656,154.4375 16.2656,151.3125 Q16.2656,148.1875 17.5781,146.5313 Q18.9063,144.875 21.4063,144.875 Q22.1094,144.875 22.75,145.0313 Q23.4063,145.1875 23.9688,145.4844 L23.9688,148.2031 Q23.3438,147.625 22.75,147.3594 Q22.1563,147.0781 21.5313,147.0781 Q20.1875,147.0781 19.5,148.1563 Q18.8125,149.2188 18.8125,151.3125 Q18.8125,153.4063 19.5,154.4844 Q20.1875,155.5469 21.5313,155.5469 Q22.1563,155.5469 22.75,155.2813 Q23.3438,155 23.9688,154.4219 L23.9688,157.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="155.6543">CD</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="167.5" y2="167.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
-      <g id="elem_C_0001316022308303681160">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001316022308303681160" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="51" x="189.5" y="143.2"/>
-        <ellipse cx="204.5" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M199.5,160.3563 C199.5,162.8563 201.6406,164.6688 204.5625,164.6688 C205.7969,164.6688 206.9688,164.3719 207.7188,163.8563 C208.3281,163.4344 208.6563,163.0125 208.6563,162.6063 C208.6563,162.1375 208.2344,161.7313 207.7344,161.7313 C207.5,161.7313 207.2813,161.8094 207.0781,162.0125 C206.6406,162.45 206.6406,162.45 206.4688,162.5438 C206.0156,162.7781 205.375,162.9188 204.6094,162.9188 C202.6094,162.9188 201.3281,161.9031 201.3281,160.325 L201.3281,159.2781 C201.3281,157.575 202.5469,156.3719 204.25,156.3719 C204.8281,156.3719 205.4063,156.5125 205.875,156.7625 C206.3438,157.0281 206.5156,157.2156 206.5781,157.575 C206.7031,158.2469 206.9531,158.4969 207.4844,158.4969 C207.7656,158.4969 208.0469,158.3563 208.2344,158.1375 C208.3594,157.9656 208.4063,157.7938 208.4063,157.3563 L208.4063,155.9969 C208.4063,155.575 208.3906,155.4344 208.2656,155.2625 C208.0938,155.0125 207.8125,154.8563 207.4844,154.8563 C207.1719,154.8563 206.9688,154.9656 206.75,155.2313 C205.5781,154.7313 205.1406,154.6219 204.1875,154.6219 C201.5156,154.6219 199.5,156.6375 199.5,159.2625 L199.5,160.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="218.5" y="163.806">DE</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="190.5" x2="239.5" y1="175.2" y2="175.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="190.5" x2="239.5" y1="183.2" y2="183.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
+      <ellipse cx="197" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M199.9688,157.1406 Q199.3906,157.4375 198.75,157.5781 Q198.1094,157.7344 197.4063,157.7344 Q194.9063,157.7344 193.5781,156.0938 Q192.2656,154.4375 192.2656,151.3125 Q192.2656,148.1875 193.5781,146.5313 Q194.9063,144.875 197.4063,144.875 Q198.1094,144.875 198.75,145.0313 Q199.4063,145.1875 199.9688,145.4844 L199.9688,148.2031 Q199.3438,147.625 198.75,147.3594 Q198.1563,147.0781 197.5313,147.0781 Q196.1875,147.0781 195.5,148.1563 Q194.8125,149.2188 194.8125,151.3125 Q194.8125,153.4063 195.5,154.4844 Q196.1875,155.5469 197.5313,155.5469 Q198.1563,155.5469 198.75,155.2813 Q199.3438,155 199.9688,154.4219 L199.9688,157.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="211" y="155.6543">DE</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="167.5" y2="167.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
-      <g id="elem_C_0001877487144594774465">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001877487144594774465" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="93.5" y="143.2"/>
-        <ellipse cx="108.5" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M103.5,160.3563 C103.5,162.8563 105.6406,164.6688 108.5625,164.6688 C109.7969,164.6688 110.9688,164.3719 111.7188,163.8563 C112.3281,163.4344 112.6563,163.0125 112.6563,162.6063 C112.6563,162.1375 112.2344,161.7313 111.7344,161.7313 C111.5,161.7313 111.2813,161.8094 111.0781,162.0125 C110.6406,162.45 110.6406,162.45 110.4688,162.5438 C110.0156,162.7781 109.375,162.9188 108.6094,162.9188 C106.6094,162.9188 105.3281,161.9031 105.3281,160.325 L105.3281,159.2781 C105.3281,157.575 106.5469,156.3719 108.25,156.3719 C108.8281,156.3719 109.4063,156.5125 109.875,156.7625 C110.3438,157.0281 110.5156,157.2156 110.5781,157.575 C110.7031,158.2469 110.9531,158.4969 111.4844,158.4969 C111.7656,158.4969 112.0469,158.3563 112.2344,158.1375 C112.3594,157.9656 112.4063,157.7938 112.4063,157.3563 L112.4063,155.9969 C112.4063,155.575 112.3906,155.4344 112.2656,155.2625 C112.0938,155.0125 111.8125,154.8563 111.4844,154.8563 C111.1719,154.8563 110.9688,154.9656 110.75,155.2313 C109.5781,154.7313 109.1406,154.6219 108.1875,154.6219 C105.5156,154.6219 103.5,156.6375 103.5,159.2625 L103.5,160.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="122.5" y="163.806">CDE</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="94.5" x2="153.5" y1="175.2" y2="175.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="94.5" x2="153.5" y1="183.2" y2="183.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
+      <ellipse cx="105" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M107.9688,157.1406 Q107.3906,157.4375 106.75,157.5781 Q106.1094,157.7344 105.4063,157.7344 Q102.9063,157.7344 101.5781,156.0938 Q100.2656,154.4375 100.2656,151.3125 Q100.2656,148.1875 101.5781,146.5313 Q102.9063,144.875 105.4063,144.875 Q106.1094,144.875 106.75,145.0313 Q107.4063,145.1875 107.9688,145.4844 L107.9688,148.2031 Q107.3438,147.625 106.75,147.3594 Q106.1563,147.0781 105.5313,147.0781 Q104.1875,147.0781 103.5,148.1563 Q102.8125,149.2188 102.8125,151.3125 Q102.8125,153.4063 103.5,154.4844 Q104.1875,155.5469 105.5313,155.5469 Q106.1563,155.5469 106.75,155.2813 Q107.3438,155 107.9688,154.4219 L107.9688,157.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="119" y="155.6543">CDE</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="167.5" y2="167.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001051171525946759825">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0001051171525946759825" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="279.5" y="18.4"/>
-        <ellipse cx="294.5" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M289.5,35.5562 C289.5,38.0562 291.6406,39.8687 294.5625,39.8687 C295.7969,39.8687 296.9688,39.5719 297.7188,39.0562 C298.3281,38.6344 298.6563,38.2125 298.6563,37.8062 C298.6563,37.3375 298.2344,36.9312 297.7344,36.9312 C297.5,36.9312 297.2813,37.0094 297.0781,37.2125 C296.6406,37.65 296.6406,37.65 296.4688,37.7437 C296.0156,37.9781 295.375,38.1187 294.6094,38.1187 C292.6094,38.1187 291.3281,37.1031 291.3281,35.525 L291.3281,34.4781 C291.3281,32.775 292.5469,31.5719 294.25,31.5719 C294.8281,31.5719 295.4063,31.7125 295.875,31.9625 C296.3438,32.2281 296.5156,32.4156 296.5781,32.775 C296.7031,33.4469 296.9531,33.6969 297.4844,33.6969 C297.7656,33.6969 298.0469,33.5562 298.2344,33.3375 C298.3594,33.1656 298.4063,32.9937 298.4063,32.5562 L298.4063,31.1969 C298.4063,30.775 298.3906,30.6344 298.2656,30.4625 C298.0938,30.2125 297.8125,30.0562 297.4844,30.0562 C297.1719,30.0562 296.9688,30.1656 296.75,30.4312 C295.5781,29.9312 295.1406,29.8219 294.1875,29.8219 C291.5156,29.8219 289.5,31.8375 289.5,34.4625 L289.5,35.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="308.5" y="39.006">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="280.5" x2="319.5" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="280.5" x2="319.5" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
+      <ellipse cx="285.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M288.4688,36.1406 Q287.8906,36.4375 287.25,36.5781 Q286.6094,36.7344 285.9063,36.7344 Q283.4063,36.7344 282.0781,35.0938 Q280.7656,33.4375 280.7656,30.3125 Q280.7656,27.1875 282.0781,25.5313 Q283.4063,23.875 285.9063,23.875 Q286.6094,23.875 287.25,24.0313 Q287.9063,24.1875 288.4688,24.4844 L288.4688,27.2031 Q287.8438,26.625 287.25,26.3594 Q286.6563,26.0781 286.0313,26.0781 Q284.6875,26.0781 284,27.1563 Q283.3125,28.2188 283.3125,30.3125 Q283.3125,32.4063 284,33.4844 Q284.6875,34.5469 286.0313,34.5469 Q286.6563,34.5469 287.25,34.2813 Q287.8438,34 288.4688,33.4219 L288.4688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.5" y="34.6543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <g id="elem_C_0001761969273600680013">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0001761969273600680013" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="275" y="143.2"/>
-        <ellipse cx="290" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M285,160.3563 C285,162.8563 287.1406,164.6688 290.0625,164.6688 C291.2969,164.6688 292.4688,164.3719 293.2188,163.8563 C293.8281,163.4344 294.1563,163.0125 294.1563,162.6063 C294.1563,162.1375 293.7344,161.7313 293.2344,161.7313 C293,161.7313 292.7813,161.8094 292.5781,162.0125 C292.1406,162.45 292.1406,162.45 291.9688,162.5438 C291.5156,162.7781 290.875,162.9188 290.1094,162.9188 C288.1094,162.9188 286.8281,161.9031 286.8281,160.325 L286.8281,159.2781 C286.8281,157.575 288.0469,156.3719 289.75,156.3719 C290.3281,156.3719 290.9063,156.5125 291.375,156.7625 C291.8438,157.0281 292.0156,157.2156 292.0781,157.575 C292.2031,158.2469 292.4531,158.4969 292.9844,158.4969 C293.2656,158.4969 293.5469,158.3563 293.7344,158.1375 C293.8594,157.9656 293.9063,157.7938 293.9063,157.3563 L293.9063,155.9969 C293.9063,155.575 293.8906,155.4344 293.7656,155.2625 C293.5938,155.0125 293.3125,154.8563 292.9844,154.8563 C292.6719,154.8563 292.4688,154.9656 292.25,155.2313 C291.0781,154.7313 290.6406,154.6219 289.6875,154.6219 C287.0156,154.6219 285,156.6375 285,159.2625 L285,160.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="304" y="163.806">AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="276" x2="324" y1="175.2" y2="175.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="276" x2="324" y1="183.2" y2="183.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
+      <ellipse cx="281.5" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M284.4688,157.1406 Q283.8906,157.4375 283.25,157.5781 Q282.6094,157.7344 281.9063,157.7344 Q279.4063,157.7344 278.0781,156.0938 Q276.7656,154.4375 276.7656,151.3125 Q276.7656,148.1875 278.0781,146.5313 Q279.4063,144.875 281.9063,144.875 Q282.6094,144.875 283.25,145.0313 Q283.9063,145.1875 284.4688,145.4844 L284.4688,148.2031 Q283.8438,147.625 283.25,147.3594 Q282.6563,147.0781 282.0313,147.0781 Q280.6875,147.0781 280,148.1563 Q279.3125,149.2188 279.3125,151.3125 Q279.3125,153.4063 280,154.4844 Q280.6875,155.5469 282.0313,155.5469 Q282.6563,155.5469 283.25,155.2813 Q283.8438,155 284.4688,154.4219 L284.4688,157.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="295.5" y="155.6543">AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="167.5" y2="167.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <g id="elem_C_0002158483243842147804">
-        <rect codeLine="34" fill="#F1F1F1" height="64.7999" id="C_0002158483243842147804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="64" x="268" y="259.6"/>
-        <ellipse cx="285.25" cy="275.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M280.25,276.7562 C280.25,279.2562 282.3906,281.0687 285.3125,281.0687 C286.5469,281.0687 287.7188,280.7719 288.4688,280.2562 C289.0781,279.8344 289.4063,279.4125 289.4063,279.0062 C289.4063,278.5375 288.9844,278.1312 288.4844,278.1312 C288.25,278.1312 288.0313,278.2094 287.8281,278.4125 C287.3906,278.85 287.3906,278.85 287.2188,278.9437 C286.7656,279.1781 286.125,279.3187 285.3594,279.3187 C283.3594,279.3187 282.0781,278.3031 282.0781,276.725 L282.0781,275.6781 C282.0781,273.975 283.2969,272.7719 285,272.7719 C285.5781,272.7719 286.1563,272.9125 286.625,273.1625 C287.0938,273.4281 287.2656,273.6156 287.3281,273.975 C287.4531,274.6469 287.7031,274.8969 288.2344,274.8969 C288.5156,274.8969 288.7969,274.7562 288.9844,274.5375 C289.1094,274.3656 289.1563,274.1937 289.1563,273.7562 L289.1563,272.3969 C289.1563,271.975 289.1406,271.8344 289.0156,271.6625 C288.8438,271.4125 288.5625,271.2562 288.2344,271.2562 C287.9219,271.2562 287.7188,271.3656 287.5,271.6312 C286.3281,271.1312 285.8906,271.0219 284.9375,271.0219 C282.2656,271.0219 280.25,273.0375 280.25,275.6625 L280.25,276.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="299.75" y="280.206">AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="269" x2="331" y1="291.6" y2="291.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="269" x2="331" y1="299.6" y2="299.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="274" y="308.5"/>
-          <ellipse cx="279" cy="313.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="288" y="316.6059">b : B *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
+      <ellipse cx="277.15" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M280.1188,271.6406 Q279.5406,271.9375 278.9,272.0781 Q278.2594,272.2344 277.5563,272.2344 Q275.0563,272.2344 273.7281,270.5938 Q272.4156,268.9375 272.4156,265.8125 Q272.4156,262.6875 273.7281,261.0313 Q275.0563,259.375 277.5563,259.375 Q278.2594,259.375 278.9,259.5313 Q279.5563,259.6875 280.1188,259.9844 L280.1188,262.7031 Q279.4938,262.125 278.9,261.8594 Q278.3063,261.5781 277.6813,261.5781 Q276.3375,261.5781 275.65,262.6563 Q274.9625,263.7188 274.9625,265.8125 Q274.9625,267.9063 275.65,268.9844 Q276.3375,270.0469 277.6813,270.0469 Q278.3063,270.0469 278.9,269.7813 Q279.4938,269.5 280.1188,268.9219 L280.1188,271.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="291.85" y="270.1543">AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="282" y2="282"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="290" y2="290"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <g id="elem_C_0001857294881176816154">
-        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001857294881176816154" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="99" x="250.5" y="384.4"/>
-        <ellipse cx="265.5" cy="400.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M260.5,401.5563 C260.5,404.0563 262.6406,405.8688 265.5625,405.8688 C266.7969,405.8688 267.9688,405.5719 268.7188,405.0563 C269.3281,404.6344 269.6563,404.2125 269.6563,403.8063 C269.6563,403.3375 269.2344,402.9313 268.7344,402.9313 C268.5,402.9313 268.2813,403.0094 268.0781,403.2125 C267.6406,403.65 267.6406,403.65 267.4688,403.7438 C267.0156,403.9781 266.375,404.1188 265.6094,404.1188 C263.6094,404.1188 262.3281,403.1031 262.3281,401.525 L262.3281,400.4781 C262.3281,398.775 263.5469,397.5719 265.25,397.5719 C265.8281,397.5719 266.4063,397.7125 266.875,397.9625 C267.3438,398.2281 267.5156,398.4156 267.5781,398.775 C267.7031,399.4469 267.9531,399.6969 268.4844,399.6969 C268.7656,399.6969 269.0469,399.5563 269.2344,399.3375 C269.3594,399.1656 269.4063,398.9938 269.4063,398.5563 L269.4063,397.1969 C269.4063,396.775 269.3906,396.6344 269.2656,396.4625 C269.0938,396.2125 268.8125,396.0563 268.4844,396.0563 C268.1719,396.0563 267.9688,396.1656 267.75,396.4313 C266.5781,395.9313 266.1406,395.8219 265.1875,395.8219 C262.5156,395.8219 260.5,397.8375 260.5,400.4625 L260.5,401.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="67" x="279.5" y="405.006">ns2::AAAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="251.5" x2="348.5" y1="416.4" y2="416.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="251.5" x2="348.5" y1="424.4" y2="424.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="265" y="296"/>
+      <ellipse cx="270" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000955785395599769805">
-        <rect codeLine="43" fill="#F1F1F1" height="64.7999" id="C_0000955785395599769805" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="458.5" y="10"/>
-        <ellipse cx="473.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M468.5,27.1563 C468.5,29.6563 470.6406,31.4688 473.5625,31.4688 C474.7969,31.4688 475.9688,31.1719 476.7188,30.6563 C477.3281,30.2344 477.6563,29.8125 477.6563,29.4063 C477.6563,28.9375 477.2344,28.5313 476.7344,28.5313 C476.5,28.5313 476.2813,28.6094 476.0781,28.8125 C475.6406,29.25 475.6406,29.25 475.4688,29.3438 C475.0156,29.5781 474.375,29.7188 473.6094,29.7188 C471.6094,29.7188 470.3281,28.7031 470.3281,27.125 L470.3281,26.0781 C470.3281,24.375 471.5469,23.1719 473.25,23.1719 C473.8281,23.1719 474.4063,23.3125 474.875,23.5625 C475.3438,23.8281 475.5156,24.0156 475.5781,24.375 C475.7031,25.0469 475.9531,25.2969 476.4844,25.2969 C476.7656,25.2969 477.0469,25.1563 477.2344,24.9375 C477.3594,24.7656 477.4063,24.5938 477.4063,24.1563 L477.4063,22.7969 C477.4063,22.375 477.3906,22.2344 477.2656,22.0625 C477.0938,21.8125 476.8125,21.6563 476.4844,21.6563 C476.1719,21.6563 475.9688,21.7656 475.75,22.0313 C474.5781,21.5313 474.1406,21.4219 473.1875,21.4219 C470.5156,21.4219 468.5,23.4375 468.5,26.0625 L468.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="487.5" y="30.606">ns3::F</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="535.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="536.5" y="21.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="459.5" x2="540.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="459.5" x2="540.5" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="464.5" y="58.9"/>
-          <ellipse cx="469.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="478.5" y="67.0059">t : T *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="279" y="304.2104">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
-      <g id="elem_C_0001321996888067531304">
-        <rect codeLine="48" fill="#F1F1F1" height="64.7999" id="C_0001321996888067531304" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="377.5" y="134.8"/>
-        <ellipse cx="392.5" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M387.5,151.9562 C387.5,154.4562 389.6406,156.2687 392.5625,156.2687 C393.7969,156.2687 394.9688,155.9719 395.7188,155.4562 C396.3281,155.0344 396.6563,154.6125 396.6563,154.2062 C396.6563,153.7375 396.2344,153.3312 395.7344,153.3312 C395.5,153.3312 395.2813,153.4094 395.0781,153.6125 C394.6406,154.05 394.6406,154.05 394.4688,154.1437 C394.0156,154.3781 393.375,154.5187 392.6094,154.5187 C390.6094,154.5187 389.3281,153.5031 389.3281,151.925 L389.3281,150.8781 C389.3281,149.175 390.5469,147.9719 392.25,147.9719 C392.8281,147.9719 393.4063,148.1125 393.875,148.3625 C394.3438,148.6281 394.5156,148.8156 394.5781,149.175 C394.7031,149.8469 394.9531,150.0969 395.4844,150.0969 C395.7656,150.0969 396.0469,149.9562 396.2344,149.7375 C396.3594,149.5656 396.4063,149.3937 396.4063,148.9562 L396.4063,147.5969 C396.4063,147.175 396.3906,147.0344 396.2656,146.8625 C396.0938,146.6125 395.8125,146.4562 395.4844,146.4562 C395.1719,146.4562 394.9688,146.5656 394.75,146.8312 C393.5781,146.3312 393.1406,146.2219 392.1875,146.2219 C389.5156,146.2219 387.5,148.2375 387.5,150.8625 L387.5,151.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="406.5" y="155.406">ns3::FF</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="22" x="463.5" y="131.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="20" x="464.5" y="146.0001">T,M</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="378.5" x2="481.5" y1="166.8" y2="166.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="378.5" x2="481.5" y1="174.8" y2="174.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="383.5" y="183.7"/>
-          <ellipse cx="388.5" cy="188.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="397.5" y="191.8059">m : M *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
+      <ellipse cx="258" cy="387" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M260.9688,392.6406 Q260.3906,392.9375 259.75,393.0781 Q259.1094,393.2344 258.4063,393.2344 Q255.9063,393.2344 254.5781,391.5938 Q253.2656,389.9375 253.2656,386.8125 Q253.2656,383.6875 254.5781,382.0313 Q255.9063,380.375 258.4063,380.375 Q259.1094,380.375 259.75,380.5313 Q260.4063,380.6875 260.9688,380.9844 L260.9688,383.7031 Q260.3438,383.125 259.75,382.8594 Q259.1563,382.5781 258.5313,382.5781 Q257.1875,382.5781 256.5,383.6563 Q255.8125,384.7188 255.8125,386.8125 Q255.8125,388.9063 256.5,389.9844 Q257.1875,391.0469 258.5313,391.0469 Q259.1563,391.0469 259.75,390.7813 Q260.3438,390.5 260.9688,389.9219 L260.9688,392.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="272" y="391.1543">ns2::AAAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="403" y2="403"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
-      <g id="elem_C_0002008055732881129924">
-        <rect codeLine="53" fill="#F1F1F1" height="64.7999" id="C_0002008055732881129924" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="517.5" y="134.8"/>
-        <ellipse cx="532.5" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M527.5,151.9562 C527.5,154.4562 529.6406,156.2687 532.5625,156.2687 C533.7969,156.2687 534.9688,155.9719 535.7188,155.4562 C536.3281,155.0344 536.6563,154.6125 536.6563,154.2062 C536.6563,153.7375 536.2344,153.3312 535.7344,153.3312 C535.5,153.3312 535.2813,153.4094 535.0781,153.6125 C534.6406,154.05 534.6406,154.05 534.4688,154.1437 C534.0156,154.3781 533.375,154.5187 532.6094,154.5187 C530.6094,154.5187 529.3281,153.5031 529.3281,151.925 L529.3281,150.8781 C529.3281,149.175 530.5469,147.9719 532.25,147.9719 C532.8281,147.9719 533.4063,148.1125 533.875,148.3625 C534.3438,148.6281 534.5156,148.8156 534.5781,149.175 C534.7031,149.8469 534.9531,150.0969 535.4844,150.0969 C535.7656,150.0969 536.0469,149.9562 536.2344,149.7375 C536.3594,149.5656 536.4063,149.3937 536.4063,148.9562 L536.4063,147.5969 C536.4063,147.175 536.3906,147.0344 536.2656,146.8625 C536.0938,146.6125 535.8125,146.4562 535.4844,146.4562 C535.1719,146.4562 534.9688,146.5656 534.75,146.8312 C533.5781,146.3312 533.1406,146.2219 532.1875,146.2219 C529.5156,146.2219 527.5,148.2375 527.5,150.8625 L527.5,151.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="546.5" y="155.406">ns3::FE</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="22" x="603.5" y="131.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="20" x="604.5" y="146.0001">T,M</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="518.5" x2="621.5" y1="166.8" y2="166.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="518.5" x2="621.5" y1="174.8" y2="174.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="523.5" y="183.7"/>
-          <ellipse cx="528.5" cy="188.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="537.5" y="191.8059">m : M *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
+      <ellipse cx="462" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M464.9688,29.6406 Q464.3906,29.9375 463.75,30.0781 Q463.1094,30.2344 462.4063,30.2344 Q459.9063,30.2344 458.5781,28.5938 Q457.2656,26.9375 457.2656,23.8125 Q457.2656,20.6875 458.5781,19.0313 Q459.9063,17.375 462.4063,17.375 Q463.1094,17.375 463.75,17.5313 Q464.4063,17.6875 464.9688,17.9844 L464.9688,20.7031 Q464.3438,20.125 463.75,19.8594 Q463.1563,19.5781 462.5313,19.5781 Q461.1875,19.5781 460.5,20.6563 Q459.8125,21.7188 459.8125,23.8125 Q459.8125,25.9063 460.5,26.9844 Q461.1875,28.0469 462.5313,28.0469 Q463.1563,28.0469 463.75,27.7813 Q464.3438,27.5 464.9688,26.9219 L464.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="476" y="28.1543">ns3::F</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="522" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="523" y="17.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
-      <g id="elem_C_0001617455840736919039">
-        <rect codeLine="58" fill="#F1F1F1" height="64.7999" id="C_0001617455840736919039" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="126" x="367" y="259.6"/>
-        <ellipse cx="382" cy="275.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M377,276.7562 C377,279.2562 379.1406,281.0687 382.0625,281.0687 C383.2969,281.0687 384.4688,280.7719 385.2188,280.2562 C385.8281,279.8344 386.1563,279.4125 386.1563,279.0062 C386.1563,278.5375 385.7344,278.1312 385.2344,278.1312 C385,278.1312 384.7813,278.2094 384.5781,278.4125 C384.1406,278.85 384.1406,278.85 383.9688,278.9437 C383.5156,279.1781 382.875,279.3187 382.1094,279.3187 C380.1094,279.3187 378.8281,278.3031 378.8281,276.725 L378.8281,275.6781 C378.8281,273.975 380.0469,272.7719 381.75,272.7719 C382.3281,272.7719 382.9063,272.9125 383.375,273.1625 C383.8438,273.4281 384.0156,273.6156 384.0781,273.975 C384.2031,274.6469 384.4531,274.8969 384.9844,274.8969 C385.2656,274.8969 385.5469,274.7562 385.7344,274.5375 C385.8594,274.3656 385.9063,274.1937 385.9063,273.7562 L385.9063,272.3969 C385.9063,271.975 385.8906,271.8344 385.7656,271.6625 C385.5938,271.4125 385.3125,271.2562 384.9844,271.2562 C384.6719,271.2562 384.4688,271.3656 384.25,271.6312 C383.0781,271.1312 382.6406,271.0219 381.6875,271.0219 C379.0156,271.0219 377,273.0375 377,275.6625 L377,276.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="396" y="280.206">ns3::FFF</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="34" x="462" y="256.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="32" x="463" y="270.8001">T,M,N</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="368" x2="492" y1="291.6" y2="291.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="368" x2="492" y1="299.6" y2="299.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="373" y="308.5"/>
-          <ellipse cx="378" cy="313.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="387" y="316.6059">n : N *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="453" y="54"/>
+      <ellipse cx="458" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0000241234977032861936_C_0000850483622527996929">
-      <path codeLine="62" d="M37.6419,84.7606 C36.3919,106.6106 35.57,121.08 34.33,142.9 " fill="none" id="C_0000241234977032861936-backto-C_0000850483622527996929" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="38.67,66.79,31.6517,84.4179,43.6321,85.1033,38.67,66.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001975187139659616784_C_0000850483622527996929">
-      <path codeLine="63" d="M95.9538,81.2525 C79.7638,103.1025 66.44,121.08 50.27,142.9 " fill="none" id="C_0001975187139659616784-backto-C_0000850483622527996929" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="106.67,66.79,91.133,77.6805,100.7747,84.8246,106.67,66.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001975187139659616784_C_0001316022308303681160">
-      <path codeLine="64" d="M152.0462,81.2525 C168.2362,103.1025 181.56,121.08 197.73,142.9 " fill="none" id="C_0001975187139659616784-backto-C_0001316022308303681160" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="141.33,66.79,147.2253,84.8246,156.867,77.6805,141.33,66.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001959131184346890363_C_0001316022308303681160">
-      <path codeLine="65" d="M210.3581,84.7606 C211.6081,106.6106 212.43,121.08 213.67,142.9 " fill="none" id="C_0001959131184346890363-backto-C_0001316022308303681160" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="209.33,66.79,204.3679,85.1033,216.3483,84.4179,209.33,66.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000241234977032861936_C_0001877487144594774465">
-      <path codeLine="66" d="M66.1597,81.6487 C81.0997,103.4987 93.13,121.08 108.06,142.9 " fill="none" id="C_0000241234977032861936-backto-C_0001877487144594774465" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="56,66.79,61.2068,85.0353,71.1126,78.2621,56,66.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001975187139659616784_C_0001877487144594774465">
-      <path codeLine="67" d="M124,84.79 C124,106.64 124,121.08 124,142.9 " fill="none" id="C_0001975187139659616784-backto-C_0001877487144594774465" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="124,66.79,118,84.79,130,84.79,124,66.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001959131184346890363_C_0001877487144594774465">
-      <path codeLine="68" d="M181.8403,81.6487 C166.9003,103.4987 154.87,121.08 139.94,142.9 " fill="none" id="C_0001959131184346890363-backto-C_0001877487144594774465" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="192,66.79,176.8874,78.2621,186.7932,85.0353,192,66.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001051171525946759825_C_0001761969273600680013">
-      <path codeLine="69" d="M300,84.79 C300,106.64 300,121.08 300,142.9 " fill="none" id="C_0001051171525946759825-backto-C_0001761969273600680013" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="300,66.79,294,84.79,306,84.79,300,66.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001761969273600680013_C_0002158483243842147804">
-      <path codeLine="70" d="M300,209.59 C300,228.79 300,238.18 300,259.35 " fill="none" id="C_0001761969273600680013-backto-C_0002158483243842147804" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="300,191.59,294,209.59,306,209.59,300,191.59" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002158483243842147804_C_0001857294881176816154">
-      <path codeLine="71" d="M300,342.87 C300,361.64 300,366.98 300,384.05 " fill="none" id="C_0002158483243842147804-backto-C_0001857294881176816154" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="300,324.87,294,342.87,306,342.87,300,324.87" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000955785395599769805_C_0001321996888067531304">
-      <path codeLine="72" d="M473.0588,90.6594 C462.6088,108.9994 458.41,116.37 447.97,134.68 " fill="none" id="C_0000955785395599769805-backto-C_0001321996888067531304" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="481.97,75.02,467.8457,87.689,478.2719,93.6298,481.97,75.02" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000955785395599769805_C_0002008055732881129924">
-      <path codeLine="73" d="M526.9412,90.6594 C537.3912,108.9994 541.59,116.37 552.03,134.68 " fill="none" id="C_0000955785395599769805-backto-C_0002008055732881129924" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="518.03,75.02,521.7281,93.6298,532.1543,87.689,518.03,75.02" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001321996888067531304_C_0001617455840736919039">
-      <path codeLine="74" d="M430,217.82 C430,236.16 430,241.17 430,259.48 " fill="none" id="C_0001321996888067531304-backto-C_0001617455840736919039" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="430,199.82,424,217.82,436,217.82,430,199.82" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="467" y="62.2104">t : T *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
+      <ellipse cx="382.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M385.4688,150.6406 Q384.8906,150.9375 384.25,151.0781 Q383.6094,151.2344 382.9063,151.2344 Q380.4063,151.2344 379.0781,149.5938 Q377.7656,147.9375 377.7656,144.8125 Q377.7656,141.6875 379.0781,140.0313 Q380.4063,138.375 382.9063,138.375 Q383.6094,138.375 384.25,138.5313 Q384.9063,138.6875 385.4688,138.9844 L385.4688,141.7031 Q384.8438,141.125 384.25,140.8594 Q383.6563,140.5781 383.0313,140.5781 Q381.6875,140.5781 381,141.6563 Q380.3125,142.7188 380.3125,144.8125 Q380.3125,146.9063 381,147.9844 Q381.6875,149.0469 383.0313,149.0469 Q383.6563,149.0469 384.25,148.7813 Q384.8438,148.5 385.4688,147.9219 L385.4688,150.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="396.5" y="149.1543">ns3::FF</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="23" x="449.5" y="126"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="450.5" y="138.1387">T,M</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="161" y2="161"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="169" y2="169"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="373.5" y="175"/>
+      <ellipse cx="378.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="387.5" y="183.2104">m : M *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
+      <ellipse cx="520" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M522.9688,150.6406 Q522.3906,150.9375 521.75,151.0781 Q521.1094,151.2344 520.4063,151.2344 Q517.9063,151.2344 516.5781,149.5938 Q515.2656,147.9375 515.2656,144.8125 Q515.2656,141.6875 516.5781,140.0313 Q517.9063,138.375 520.4063,138.375 Q521.1094,138.375 521.75,138.5313 Q522.4063,138.6875 522.9688,138.9844 L522.9688,141.7031 Q522.3438,141.125 521.75,140.8594 Q521.1563,140.5781 520.5313,140.5781 Q519.1875,140.5781 518.5,141.6563 Q517.8125,142.7188 517.8125,144.8125 Q517.8125,146.9063 518.5,147.9844 Q519.1875,149.0469 520.5313,149.0469 Q521.1563,149.0469 521.75,148.7813 Q522.3438,148.5 522.9688,147.9219 L522.9688,150.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="534" y="149.1543">ns3::FE</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="23" x="588" y="126"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="589" y="138.1387">T,M</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="161" y2="161"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="169" y2="169"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="511" y="175"/>
+      <ellipse cx="516" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="525" y="183.2104">m : M *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
+      <ellipse cx="372.5" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M375.4688,271.6406 Q374.8906,271.9375 374.25,272.0781 Q373.6094,272.2344 372.9063,272.2344 Q370.4063,272.2344 369.0781,270.5938 Q367.7656,268.9375 367.7656,265.8125 Q367.7656,262.6875 369.0781,261.0313 Q370.4063,259.375 372.9063,259.375 Q373.6094,259.375 374.25,259.5313 Q374.9063,259.6875 375.4688,259.9844 L375.4688,262.7031 Q374.8438,262.125 374.25,261.8594 Q373.6563,261.5781 373.0313,261.5781 Q371.6875,261.5781 371,262.6563 Q370.3125,263.7188 370.3125,265.8125 Q370.3125,267.9063 371,268.9844 Q371.6875,270.0469 373.0313,270.0469 Q373.6563,270.0469 374.25,269.7813 Q374.8438,269.5 375.4688,268.9219 L375.4688,271.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="386.5" y="270.1543">ns3::FFF</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="36" x="446.5" y="247"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="34" x="447.5" y="259.1387">T,M,N</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="282" y2="282"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="290" y2="290"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="296"/>
+      <ellipse cx="368.5" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="377.5" y="304.2104">n : N *</text>
+    </a>
+    <path d="M34.31,82.88 C33.42,100.62 32.42,120.44 31.67,135.33 " fill="none" id="C_0000241234977032861936&lt;-C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="27.33,82.35,35.33,62.73,41.31,83.05,27.33,82.35" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M89.42,78.82 C75.58,97.54 59.49,119.29 47.63,135.33 " fill="none" id="C_0001975187139659616784&lt;-C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="83.8,74.65,101.32,62.73,95.06,82.97,83.8,74.65" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M147.58,78.82 C161.42,97.54 177.51,119.29 189.37,135.33 " fill="none" id="C_0001975187139659616784&lt;-C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="141.94,82.97,135.68,62.73,153.2,74.65,141.94,82.97" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M202.69,82.88 C203.58,100.62 204.58,120.44 205.33,135.33 " fill="none" id="C_0001959131184346890363&lt;-C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="195.69,83.05,201.67,62.73,209.67,82.35,195.69,83.05" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M63.99,79.4 C76.8,97.99 91.6,119.46 102.54,135.33 " fill="none" id="C_0000241234977032861936&lt;-C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="58.09,83.17,52.51,62.73,69.62,75.22,58.09,83.17" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M118.5,82.88 C118.5,100.62 118.5,120.44 118.5,135.33 " fill="none" id="C_0001975187139659616784&lt;-C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="111.5,82.73,118.5,62.73,125.5,82.73,111.5,82.73" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M173.01,79.4 C160.2,97.99 145.4,119.46 134.46,135.33 " fill="none" id="C_0001959131184346890363&lt;-C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="167.38,75.22,184.49,62.73,178.91,83.17,167.38,75.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M290.5,82.88 C290.5,100.62 290.5,120.44 290.5,135.33 " fill="none" id="C_0001051171525946759825&lt;-C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="283.5,82.73,290.5,62.73,297.5,82.73,283.5,82.73" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M290.5,203.9 C290.5,219.22 290.5,236.09 290.5,249.99 " fill="none" id="C_0001761969273600680013&lt;-C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="283.5,203.73,290.5,183.73,297.5,203.73,283.5,203.73" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M290.5,331.11 C290.5,344.88 290.5,359.18 290.5,370.67 " fill="none" id="C_0002158483243842147804&lt;-C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="283.5,331.06,290.5,311.06,297.5,331.06,283.5,331.06" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M459.99,86.94 C451.81,101.05 443.08,116.1 435.75,128.74 " fill="none" id="C_0000955785395599769805&lt;-C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="454.18,83.01,470.27,69.22,466.29,90.03,454.18,83.01" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M515.01,86.94 C523.19,101.05 531.92,116.1 539.25,128.74 " fill="none" id="C_0000955785395599769805&lt;-C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="508.71,90.03,504.73,69.22,520.82,83.01,508.71,90.03" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M418.5,210.33 C418.5,223.73 418.5,237.81 418.5,249.74 " fill="none" id="C_0001321996888067531304&lt;-C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="411.5,210.22,418.5,190.22,425.5,210.22,411.5,210.22" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00039_class_mermaid.svg b/docs/test_cases/t00039_class_mermaid.svg
index 1b7fa36d..1ce167e2 100644
--- a/docs/test_cases/t00039_class_mermaid.svg
+++ b/docs/test_cases/t00039_class_mermaid.svg
@@ -1,73 +1,68 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 689.1796875 460" style="max-width: 689.18px; background-color: white;" width="689.1796875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M20.98615303708822,93.84766006086926L20.59002336424018,96.87305005072437C20.193893691392145,99.8984400405795,19.40163434569607,105.94922002028976,19.791115137964315,114.97461001014487C20.18059593023256,124,21.751816860465116,136,22.537427325581394,142L23.323037790697676,148"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M85.33053300050025,80.40990127869418L81.51632958375022,85.67491773224515C77.70212616700017,90.93993418579612,70.07371933350008,101.46996709289806,62.96736475395935,112.73498354644903C55.8610101744186,124,49.27670784883721,136,45.98455668604652,142L42.692405523255815,148"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M103.10334053708822,93.84766006086926L102.70721086424017,96.87305005072437C102.31108119139215,99.8984400405795,101.51882184569608,105.94922002028976,102.56963984726663,114.97461001014487C103.6204578488372,124,106.51435319767442,136,107.96130087209303,142L109.40824854651163,148"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M176.70268159604018,77.41050660209984L172.0497607050335,83.17542216841655C167.39683981402678,88.94033773473323,158.0909980320134,100.47016886736662,150.41445795496017,112.23508443368331C142.73791787790697,124,136.69067950581396,136,133.66706031976744,142L130.64344113372093,148"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M56.71917680603348,60.999987526423524L75.39684004669456,69.49998960535294C94.07450328735565,77.99999168428235,131.42982976867782,94.99999584214117,154.01992033492033,109.49999792107059C176.61001090116278,124,184.4348655523256,136,188.34729287790697,142L192.25972020348837,148"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M136.43913694045324,69.59101757326745L145.16347349204435,76.6591813110562C153.88781004363548,83.72734504884497,171.33648314681773,97.86367252442248,182.1127819077112,110.93183626221123C192.88908066860463,124,196.9930050872093,136,199.04496729651166,142L201.09692950581396,148"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M225.40625518329028,76.10399785503131L230.54362411107525,82.08666487919275C235.68099303886018,88.06933190335421,245.9557308944301,100.0346659516771,246.87107947337782,112.01733297583856C247.7864280523256,124,239.34238735465115,136,235.12036700581393,142L230.89834665697674,148"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M304.2890625,94L304.2890625,97C304.2890625,100,304.2890625,106,304.2890625,115C304.2890625,124,304.2890625,136,304.2890625,142L304.2890625,148"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M304.2890625,223L304.2890625,226C304.2890625,229,304.2890625,235,304.2890625,242.16666666666666C304.2890625,249.33333333333334,304.2890625,257.6666666666667,304.2890625,261.8333333333333L304.2890625,266"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M304.2890625,363L304.2890625,364.1666666666667C304.2890625,365.3333333333333,304.2890625,367.6666666666667,304.2890625,373C304.2890625,378.3333333333333,304.2890625,386.6666666666667,304.2890625,390.8333333333333L304.2890625,395"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M482.44203787588896,91.52973500545623L477.77201072990744,94.94144583788018C473.1019835839259,98.35315667030416,463.761929291963,105.17657833515209,459.0919021459815,112.75495583424271C454.421875,120.33333333333333,454.421875,128.66666666666666,454.421875,132.83333333333334L454.421875,137"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M602.4163315893176,96.0021877006205L605.698505491098,98.66848975051708C608.9806793928784,101.33479180041365,615.5450271964392,106.66739590020683,618.8272010982196,113.50036461677009C622.109375,120.33333333333333,622.109375,128.66666666666666,622.109375,132.83333333333334L622.109375,137"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M454.421875,234L454.421875,235.16666666666666C454.421875,236.33333333333334,454.421875,238.66666666666666,454.421875,244C454.421875,249.33333333333334,454.421875,257.6666666666667,454.421875,261.8333333333333L454.421875,266"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M23.323037790697676,76L22.537427325581394,82C21.751816860465116,88,20.18059593023256,100,20.180595930232556,112C20.18059593023256,124,21.751816860465116,136,22.537427325581394,142L23.323037790697676,148"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M95.890625,65.83305467313158L90.31640625,73.52754556094298C84.7421875,81.2220364487544,73.59375,96.61101822437719,64.72738008720931,110.30550911218859C55.8610101744186,124,49.27670784883721,136,45.98455668604652,142L42.692405523255815,148"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M105.44022529069767,76L104.65461482558139,82C103.86900436046511,88,102.29778343023254,100,102.95912063953487,112C103.6204578488372,124,106.51435319767442,136,107.96130087209303,142L109.40824854651163,148"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M188.0078125,63.403579200120056L181.470703125,71.50298266676671C174.93359375,79.60238613341336,161.859375,95.80119306670669,152.29864643895348,109.90059653335334C142.73791787790697,124,136.69067950581396,136,133.66706031976744,142L130.64344113372093,148"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M40.3359375,53.544152909075876L61.744140625,63.286794090896564C83.15234375,73.02943527271725,125.96875,92.51471763635863,151.28938045058138,108.2573588181793C176.61001090116278,124,184.4348655523256,136,188.34729287790697,142L192.25972020348837,148"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M122.453125,58.2600215887346L133.50846354166666,67.21668465727883C144.56380208333334,76.17334772582306,166.67447916666666,94.08667386291154,179.78177991763565,109.04333693145577C192.88908066860463,124,196.9930050872093,136,199.04496729651166,142L201.09692950581396,148"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M213.6796875,62.44795119542986L220.771484375,70.70662599619155C227.86328125,78.96530079695323,242.046875,95.48265039847662,244.91665152616278,109.7413251992383C247.7864280523256,124,239.34238735465115,136,235.12036700581393,142L230.89834665697674,148"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M304.2890625,76L304.2890625,82C304.2890625,88,304.2890625,100,304.2890625,112C304.2890625,124,304.2890625,136,304.2890625,142L304.2890625,148"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M304.2890625,205L304.2890625,211C304.2890625,217,304.2890625,229,304.2890625,239.16666666666666C304.2890625,249.33333333333334,304.2890625,257.6666666666667,304.2890625,261.8333333333333L304.2890625,266"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M304.2890625,345L304.2890625,349.1666666666667C304.2890625,353.3333333333333,304.2890625,361.6666666666667,304.2890625,370C304.2890625,378.3333333333333,304.2890625,386.6666666666667,304.2890625,390.8333333333333L304.2890625,395"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M496.9765625,80.91146801168038L489.8841145833333,86.09289000973365C482.7916666666667,91.27431200778692,468.6067708333333,101.63715600389345,461.5143229166667,110.9852446686134C454.421875,120.33333333333333,454.421875,128.66666666666666,454.421875,132.83333333333334L454.421875,137"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M588.4453125,84.65271081373609L594.0559895833334,89.21059234478008C599.6666666666666,93.76847387582406,610.8880208333334,102.88423693791204,616.4986979166666,111.60878513562268C622.109375,120.33333333333333,622.109375,128.66666666666666,622.109375,132.83333333333334L622.109375,137"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M454.421875,216L454.421875,220.16666666666666C454.421875,224.33333333333334,454.421875,232.66666666666666,454.421875,241C454.421875,249.33333333333334,454.421875,257.6666666666667,454.421875,261.8333333333333L454.421875,266"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -189,7 +184,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L6">
+        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L6">
           <g title="C" id="classId-C_0000241234977032861936-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -208,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L8">
+        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L8">
           <g title="D" id="classId-C_0001975187139659616784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -227,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L10">
+        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L10">
           <g title="E" id="classId-C_0001959131184346890363-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -246,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L16">
+        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L16">
           <g title="CD" id="classId-C_0000850483622527996929-3" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -265,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L18">
+        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L18">
           <g title="DE" id="classId-C_0001316022308303681160-4" class="node default clickable">
             <rect height="57" width="37.234375" y="-28.5" x="-18.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.6171875" x1="-18.6171875" class="divider"/>
@@ -284,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L20">
+        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L20">
           <g title="CDE" id="classId-C_0001877487144594774465-5" class="node default clickable">
             <rect height="57" width="48.78125" y="-28.5" x="-24.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.390625" x1="-24.390625" class="divider"/>
@@ -303,7 +298,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L22">
+        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L22">
           <g title="A" id="classId-C_0001051171525946759825-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -322,7 +317,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L24">
+        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L24">
           <g title="AA" id="classId-C_0001761969273600680013-7" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -341,7 +336,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L26">
+        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L26">
           <g title="AAA" id="classId-C_0002158483243842147804-8" class="node default clickable">
             <rect height="79" width="57.25" y="-39.5" x="-28.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.625" x1="-28.625" class="divider"/>
@@ -359,13 +354,13 @@
               </foreignObject>
               <foreignObject transform="translate( -21.125, 2)" height="18" width="42.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+b : B</span>
+                  <span style="font-style:italic;" class="nodeLabel">+b : B </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L31">
+        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L31">
           <g title="AAAA" id="classId-C_0001857294881176816154-9" class="node default clickable">
             <rect height="57" width="99.453125" y="-28.5" x="-49.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="49.7265625" x1="-49.7265625" class="divider"/>
@@ -384,7 +379,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L39">
+        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L39">
           <g title="F" id="classId-C_0000955785395599769805-10" class="node default clickable">
             <rect height="79" width="91.46875" y="-39.5" x="-45.734375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="45.734375" x1="-45.734375" class="divider"/>
@@ -402,13 +397,13 @@
               </foreignObject>
               <foreignObject transform="translate( -38.234375, 2)" height="18" width="36.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+t : T</span>
+                  <span style="font-style:italic;" class="nodeLabel">+t : T </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L43">
+        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L43">
           <g title="FF" id="classId-C_0001321996888067531304-11" class="node default clickable">
             <rect height="79" width="117.234375" y="-39.5" x="-58.6171875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -426,13 +421,13 @@
               </foreignObject>
               <foreignObject transform="translate( -51.1171875, 2)" height="18" width="49.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m : M</span>
+                  <span style="font-style:italic;" class="nodeLabel">+m : M </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L47">
+        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L47">
           <g title="FE" id="classId-C_0002008055732881129924-12" class="node default clickable">
             <rect height="79" width="118.140625" y="-39.5" x="-59.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="59.0703125" x1="-59.0703125" class="divider"/>
@@ -450,13 +445,13 @@
               </foreignObject>
               <foreignObject transform="translate( -51.5703125, 2)" height="18" width="49.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+m : M</span>
+                  <span style="font-style:italic;" class="nodeLabel">+m : M </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00039/t00039.cc#L51">
+        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L51">
           <g title="FFF" id="classId-C_0001617455840736919039-13" class="node default clickable">
             <rect height="79" width="143.015625" y="-39.5" x="-71.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.5078125" x1="-71.5078125" class="divider"/>
@@ -474,7 +469,7 @@
               </foreignObject>
               <foreignObject transform="translate( -64.0078125, 2)" height="18" width="43.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+n : N</span>
+                  <span style="font-style:italic;" class="nodeLabel">+n : N </span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00040.md b/docs/test_cases/t00040.md
index e056f27a..fe1d5978 100644
--- a/docs/test_cases/t00040.md
+++ b/docs/test_cases/t00040.md
@@ -71,7 +71,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00040::A",
+      "display_name": "A",
       "id": "307580006083737677",
       "is_abstract": false,
       "is_nested": false,
@@ -152,7 +152,7 @@ struct R {
           "name": "clanguml::t00040::A"
         }
       ],
-      "display_name": "clanguml::t00040::AA",
+      "display_name": "AA",
       "id": "534115812779766127",
       "is_abstract": false,
       "is_nested": false,
@@ -181,7 +181,7 @@ struct R {
           "name": "clanguml::t00040::AA"
         }
       ],
-      "display_name": "clanguml::t00040::AAA",
+      "display_name": "AAA",
       "id": "745371908432158369",
       "is_abstract": false,
       "is_nested": false,
@@ -255,7 +255,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00040::R",
+      "display_name": "R",
       "id": "1539035020975101539",
       "is_abstract": false,
       "is_nested": false,
@@ -309,6 +309,7 @@ struct R {
     }
   ],
   "name": "t00040_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg
index 10544533..485e74a9 100644
--- a/docs/test_cases/t00040_class.svg
+++ b/docs/test_cases/t00040_class.svg
@@ -1,90 +1,84 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="345px" preserveAspectRatio="none" style="width:279px;height:345px;background:#FFFFFF;" version="1.1" viewBox="0 0 279 345" width="279px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="334px" preserveAspectRatio="none" style="width:265px;height:334px;" version="1.1" viewBox="0 0 265 334" width="265px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fh31adiujgey3" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000307580006083737677">
-        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0000307580006083737677" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="99" x="15" y="7"/>
-        <ellipse cx="56.1" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M51.1,24.1563 C51.1,26.6563 53.2406,28.4688 56.1625,28.4688 C57.3969,28.4688 58.5688,28.1719 59.3188,27.6563 C59.9281,27.2344 60.2563,26.8125 60.2563,26.4063 C60.2563,25.9375 59.8344,25.5313 59.3344,25.5313 C59.1,25.5313 58.8813,25.6094 58.6781,25.8125 C58.2406,26.25 58.2406,26.25 58.0688,26.3438 C57.6156,26.5781 56.975,26.7188 56.2094,26.7188 C54.2094,26.7188 52.9281,25.7031 52.9281,24.125 L52.9281,23.0781 C52.9281,21.375 54.1469,20.1719 55.85,20.1719 C56.4281,20.1719 57.0063,20.3125 57.475,20.5625 C57.9438,20.8281 58.1156,21.0156 58.1781,21.375 C58.3031,22.0469 58.5531,22.2969 59.0844,22.2969 C59.3656,22.2969 59.6469,22.1563 59.8344,21.9375 C59.9594,21.7656 60.0063,21.5938 60.0063,21.1563 L60.0063,19.7969 C60.0063,19.375 59.9906,19.2344 59.8656,19.0625 C59.6938,18.8125 59.4125,18.6563 59.0844,18.6563 C58.7719,18.6563 58.5688,18.7656 58.35,19.0313 C57.1781,18.5313 56.7406,18.4219 55.7875,18.4219 C53.1156,18.4219 51.1,20.4375 51.1,23.0625 L51.1,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="75.9" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="16" x2="113" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21" y="47.9"/>
-          <ellipse cx="26" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="73" x="35" y="56.0059">get_a() : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="16" x2="113" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="21" y="72.6999"/>
-          <polygon fill="none" points="26,72.6999,30,76.6999,26,80.6999,22,76.6999" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="35" y="80.8059">ii_ : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh31adiujgey3)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
+      <ellipse cx="50.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M53.9188,29.6406 Q53.3406,29.9375 52.7,30.0781 Q52.0594,30.2344 51.3563,30.2344 Q48.8563,30.2344 47.5281,28.5938 Q46.2156,26.9375 46.2156,23.8125 Q46.2156,20.6875 47.5281,19.0313 Q48.8563,17.375 51.3563,17.375 Q52.0594,17.375 52.7,17.5313 Q53.3563,17.6875 53.9188,17.9844 L53.9188,20.7031 Q53.2938,20.125 52.7,19.8594 Q52.1063,19.5781 51.4813,19.5781 Q50.1375,19.5781 49.45,20.6563 Q48.7625,21.7188 48.7625,23.8125 Q48.7625,25.9063 49.45,26.9844 Q50.1375,28.0469 51.4813,28.0469 Q52.1063,28.0469 52.7,27.7813 Q53.2938,27.5 53.9188,26.9219 L53.9188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="70.05" y="28.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <g id="elem_C_0000534115812779766127">
-        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0000534115812779766127" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="39.5" y="148.6"/>
-        <ellipse cx="54.5" cy="164.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M49.5,165.7563 C49.5,168.2563 51.6406,170.0688 54.5625,170.0688 C55.7969,170.0688 56.9688,169.7719 57.7188,169.2563 C58.3281,168.8344 58.6563,168.4125 58.6563,168.0063 C58.6563,167.5375 58.2344,167.1313 57.7344,167.1313 C57.5,167.1313 57.2813,167.2094 57.0781,167.4125 C56.6406,167.85 56.6406,167.85 56.4688,167.9438 C56.0156,168.1781 55.375,168.3188 54.6094,168.3188 C52.6094,168.3188 51.3281,167.3031 51.3281,165.725 L51.3281,164.6781 C51.3281,162.975 52.5469,161.7719 54.25,161.7719 C54.8281,161.7719 55.4063,161.9125 55.875,162.1625 C56.3438,162.4281 56.5156,162.6156 56.5781,162.975 C56.7031,163.6469 56.9531,163.8969 57.4844,163.8969 C57.7656,163.8969 58.0469,163.7563 58.2344,163.5375 C58.3594,163.3656 58.4063,163.1938 58.4063,162.7563 L58.4063,161.3969 C58.4063,160.975 58.3906,160.8344 58.2656,160.6625 C58.0938,160.4125 57.8125,160.2563 57.4844,160.2563 C57.1719,160.2563 56.9688,160.3656 56.75,160.6313 C55.5781,160.1313 55.1406,160.0219 54.1875,160.0219 C51.5156,160.0219 49.5,162.0375 49.5,164.6625 L49.5,165.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="68.5" y="169.206">AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="40.5" x2="88.5" y1="180.6" y2="180.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="40.5" x2="88.5" y1="188.6" y2="188.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
+      <ellipse cx="24" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <g id="elem_C_0000745371908432158369">
-        <rect codeLine="12" fill="#F1F1F1" height="81.5999" id="C_0000745371908432158369" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="115" x="7" y="256.6"/>
-        <ellipse cx="47.2" cy="272.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M42.2,273.7562 C42.2,276.2562 44.3406,278.0687 47.2625,278.0687 C48.4969,278.0687 49.6688,277.7719 50.4188,277.2562 C51.0281,276.8344 51.3563,276.4125 51.3563,276.0062 C51.3563,275.5375 50.9344,275.1312 50.4344,275.1312 C50.2,275.1312 49.9813,275.2094 49.7781,275.4125 C49.3406,275.85 49.3406,275.85 49.1688,275.9437 C48.7156,276.1781 48.075,276.3187 47.3094,276.3187 C45.3094,276.3187 44.0281,275.3031 44.0281,273.725 L44.0281,272.6781 C44.0281,270.975 45.2469,269.7719 46.95,269.7719 C47.5281,269.7719 48.1063,269.9125 48.575,270.1625 C49.0438,270.4281 49.2156,270.6156 49.2781,270.975 C49.4031,271.6469 49.6531,271.8969 50.1844,271.8969 C50.4656,271.8969 50.7469,271.7562 50.9344,271.5375 C51.0594,271.3656 51.1063,271.1937 51.1063,270.7562 L51.1063,269.3969 C51.1063,268.975 51.0906,268.8344 50.9656,268.6625 C50.7938,268.4125 50.5125,268.2562 50.1844,268.2562 C49.8719,268.2562 49.6688,268.3656 49.45,268.6312 C48.2781,268.1312 47.8406,268.0219 46.8875,268.0219 C44.2156,268.0219 42.2,270.0375 42.2,272.6625 L42.2,273.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="66.8" y="277.206">AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="121" y1="288.6" y2="288.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="297.5"/>
-          <ellipse cx="18" cy="302.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="27" y="305.6059">get_aaa() : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="121" y1="313.3999" y2="313.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="322.2999"/>
-          <ellipse cx="18" cy="327.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="27" y="330.4059">b : B *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="54.2104">get_a() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001539035020975101539">
-        <rect codeLine="18" fill="#F1F1F1" height="64.7999" id="C_0001539035020975101539" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="148.5" y="15.4"/>
-        <ellipse cx="201.25" cy="31.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M196.25,32.5562 C196.25,35.0562 198.3906,36.8687 201.3125,36.8687 C202.5469,36.8687 203.7188,36.5719 204.4688,36.0562 C205.0781,35.6344 205.4063,35.2125 205.4063,34.8062 C205.4063,34.3375 204.9844,33.9312 204.4844,33.9312 C204.25,33.9312 204.0313,34.0094 203.8281,34.2125 C203.3906,34.65 203.3906,34.65 203.2188,34.7437 C202.7656,34.9781 202.125,35.1187 201.3594,35.1187 C199.3594,35.1187 198.0781,34.1031 198.0781,32.525 L198.0781,31.4781 C198.0781,29.775 199.2969,28.5719 201,28.5719 C201.5781,28.5719 202.1563,28.7125 202.625,28.9625 C203.0938,29.2281 203.2656,29.4156 203.3281,29.775 C203.4531,30.4469 203.7031,30.6969 204.2344,30.6969 C204.5156,30.6969 204.7969,30.5562 204.9844,30.3375 C205.1094,30.1656 205.1563,29.9937 205.1563,29.5562 L205.1563,28.1969 C205.1563,27.775 205.1406,27.6344 205.0156,27.4625 C204.8438,27.2125 204.5625,27.0562 204.2344,27.0562 C203.9219,27.0562 203.7188,27.1656 203.5,27.4312 C202.3281,26.9312 201.8906,26.8219 200.9375,26.8219 C198.2656,26.8219 196.25,28.8375 196.25,31.4625 L196.25,32.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="221.75" y="36.006">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="149.5" x2="271.5" y1="47.4" y2="47.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="154.5" y="56.3"/>
-          <ellipse cx="159.5" cy="61.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="168.5" y="64.4059">foo(A * a) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="149.5" x2="271.5" y1="72.1999" y2="72.1999"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="66.8047"/>
+      <polygon fill="none" points="24,66.8047,28,70.8047,24,74.8047,20,70.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0000307580006083737677_C_0000534115812779766127">
-      <path codeLine="22" d="M64.5,107.01 C64.5,126.6 64.5,131.46 64.5,148.16 " fill="none" id="C_0000307580006083737677-backto-C_0000534115812779766127" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="64.5,89.01,58.5,107.01,70.5,107.01,64.5,89.01" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000534115812779766127_C_0000745371908432158369">
-      <path codeLine="23" d="M64.5,214.99 C64.5,231.69 64.5,236.58 64.5,256.18 " fill="none" id="C_0000534115812779766127-backto-C_0000745371908432158369" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="64.5,196.99,58.5,214.99,70.5,214.99,64.5,196.99" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="33" y="75.0151">ii_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh31adiujgey3)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
+      <ellipse cx="49.5" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M52.4688,163.6406 Q51.8906,163.9375 51.25,164.0781 Q50.6094,164.2344 49.9063,164.2344 Q47.4063,164.2344 46.0781,162.5938 Q44.7656,160.9375 44.7656,157.8125 Q44.7656,154.6875 46.0781,153.0313 Q47.4063,151.375 49.9063,151.375 Q50.6094,151.375 51.25,151.5313 Q51.9063,151.6875 52.4688,151.9844 L52.4688,154.7031 Q51.8438,154.125 51.25,153.8594 Q50.6563,153.5781 50.0313,153.5781 Q48.6875,153.5781 48,154.6563 Q47.3125,155.7188 47.3125,157.8125 Q47.3125,159.9063 48,160.9844 Q48.6875,162.0469 50.0313,162.0469 Q50.6563,162.0469 51.25,161.7813 Q51.8438,161.5 52.4688,160.9219 L52.4688,163.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="63.5" y="162.1543">AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="174" y2="174"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="182" y2="182"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh31adiujgey3)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
+      <ellipse cx="43.05" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M46.0188,271.6406 Q45.4406,271.9375 44.8,272.0781 Q44.1594,272.2344 43.4563,272.2344 Q40.9563,272.2344 39.6281,270.5938 Q38.3156,268.9375 38.3156,265.8125 Q38.3156,262.6875 39.6281,261.0313 Q40.9563,259.375 43.4563,259.375 Q44.1594,259.375 44.8,259.5313 Q45.4563,259.6875 46.0188,259.9844 L46.0188,262.7031 Q45.3938,262.125 44.8,261.8594 Q44.2063,261.5781 43.5813,261.5781 Q42.2375,261.5781 41.55,262.6563 Q40.8625,263.7188 40.8625,265.8125 Q40.8625,267.9063 41.55,268.9844 Q42.2375,270.0469 43.5813,270.0469 Q44.2063,270.0469 44.8,269.7813 Q45.3938,269.5 46.0188,268.9219 L46.0188,271.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="61.95" y="270.1543">AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="282" y2="282"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="288"/>
+      <ellipse cx="17" cy="293" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="26" y="296.2104">get_aaa() : int</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="302.8047" y2="302.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="308.8047"/>
+      <ellipse cx="17" cy="313.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="26" y="317.0151">b : B *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh31adiujgey3)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
+      <ellipse cx="188.25" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M191.2188,36.1406 Q190.6406,36.4375 190,36.5781 Q189.3594,36.7344 188.6563,36.7344 Q186.1563,36.7344 184.8281,35.0938 Q183.5156,33.4375 183.5156,30.3125 Q183.5156,27.1875 184.8281,25.5313 Q186.1563,23.875 188.6563,23.875 Q189.3594,23.875 190,24.0313 Q190.6563,24.1875 191.2188,24.4844 L191.2188,27.2031 Q190.5938,26.625 190,26.3594 Q189.4063,26.0781 188.7813,26.0781 Q187.4375,26.0781 186.75,27.1563 Q186.0625,28.2188 186.0625,30.3125 Q186.0625,32.4063 186.75,33.4844 Q187.4375,34.5469 188.7813,34.5469 Q189.4063,34.5469 190,34.2813 Q190.5938,34 191.2188,33.4219 L191.2188,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="208.75" y="34.6543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="46.5" y2="46.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="145" y="52.5"/>
+      <ellipse cx="150" cy="57.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="159" y="60.7104">foo(A * a) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="67.3047" y2="67.3047"/>
+    <path d="M58.5,102.07 C58.5,116.12 58.5,130.43 58.5,141.85 " fill="none" id="C_0000307580006083737677&lt;-C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="51.5,102.03,58.5,82.03,65.5,102.03,51.5,102.03" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M58.5,210.43 C58.5,223.33 58.5,237.32 58.5,249.71 " fill="none" id="C_0000534115812779766127&lt;-C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="51.5,210.23,58.5,190.23,65.5,210.23,51.5,210.23" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00040_class_mermaid.svg b/docs/test_cases/t00040_class_mermaid.svg
index 80686e75..f73719bd 100644
--- a/docs/test_cases/t00040_class_mermaid.svg
+++ b/docs/test_cases/t00040_class_mermaid.svg
@@ -1,62 +1,57 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 331.6953125 375" style="max-width: 331.695px; background-color: white;" width="331.6953125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 313.9140625 375" style="max-width: 313.914px; background-color: white;" width="313.9140625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M73.984375,127L73.984375,128.16666666666666C73.984375,129.33333333333334,73.984375,131.66666666666666,73.984375,137C73.984375,142.33333333333334,73.984375,150.66666666666666,73.984375,154.83333333333334L73.984375,159"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M73.984375,234L73.984375,235.16666666666666C73.984375,236.33333333333334,73.984375,238.66666666666666,73.984375,244C73.984375,249.33333333333334,73.984375,257.6666666666667,73.984375,261.8333333333333L73.984375,266"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M69.5390625,109L69.5390625,113.16666666666667C69.5390625,117.33333333333333,69.5390625,125.66666666666667,69.5390625,134C69.5390625,142.33333333333334,69.5390625,150.66666666666666,69.5390625,154.83333333333334L69.5390625,159"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M69.5390625,216L69.5390625,220.16666666666666C69.5390625,224.33333333333334,69.5390625,232.66666666666666,69.5390625,241C69.5390625,249.33333333333334,69.5390625,257.6666666666667,69.5390625,261.8333333333333L69.5390625,266"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -79,11 +74,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(73.984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L5">
+        <a transform="translate(69.5390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L5">
           <g title="A" id="classId-C_0000307580006083737677-0" class="node default clickable">
-            <rect height="101" width="114.171875" y="-50.5" x="-57.0859375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="57.0859375" x1="-57.0859375" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="57.0859375" x1="-57.0859375" class="divider"/>
+            <rect height="101" width="105.28125" y="-50.5" x="-52.640625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="52.640625" x1="-52.640625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="52.640625" x1="-52.640625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -95,20 +90,20 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -49.5859375, -9)" height="18" width="55.140625">
+              <foreignObject transform="translate( -45.140625, -9)" height="18" width="55.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#ii_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -49.5859375, 25)" height="18" width="99.171875">
+              <foreignObject transform="translate( -45.140625, 25)" height="18" width="90.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_a() : : int</span>
+                  <span class="nodeLabel">+get_a() : int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(73.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L18">
+        <a transform="translate(69.5390625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L18">
           <g title="AA" id="classId-C_0000534115812779766127-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -127,11 +122,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(73.984375, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L22">
+        <a transform="translate(69.5390625, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L22">
           <g title="AAA" id="classId-C_0000745371908432158369-2" class="node default clickable">
-            <rect height="101" width="131.96875" y="-50.5" x="-65.984375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="65.984375" x1="-65.984375" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="65.984375" x1="-65.984375" class="divider"/>
+            <rect height="101" width="123.078125" y="-50.5" x="-61.5390625" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="61.5390625" x1="-61.5390625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="61.5390625" x1="-61.5390625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -143,24 +138,24 @@
                   <span class="nodeLabel">AAA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -58.484375, -9)" height="18" width="42.25">
+              <foreignObject transform="translate( -54.0390625, -9)" height="18" width="42.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+b : B</span>
+                  <span style="font-style:italic;" class="nodeLabel">+b : B </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -58.484375, 25)" height="18" width="116.96875">
+              <foreignObject transform="translate( -54.0390625, 25)" height="18" width="108.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_aaa() : : int</span>
+                  <span class="nodeLabel">+get_aaa() : int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(252.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00040/t00040.cc#L31">
+        <a transform="translate(239.046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L31">
           <g title="R" id="classId-C_0001539035020975101539-3" class="node default clickable">
-            <rect height="79" width="142.625" y="-39.5" x="-71.3125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="71.3125" x1="-71.3125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="71.3125" x1="-71.3125" class="divider"/>
+            <rect height="79" width="133.734375" y="-39.5" x="-66.8671875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="66.8671875" x1="-66.8671875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="66.8671875" x1="-66.8671875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -172,9 +167,9 @@
                   <span class="nodeLabel">R</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -63.8125, 14)" height="18" width="127.625">
+              <foreignObject transform="translate( -59.3671875, 14)" height="18" width="118.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo(A * a) : : void</span>
+                  <span class="nodeLabel">+foo(A * a) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00041.md b/docs/test_cases/t00041.md
index b722a0d3..d881e31d 100644
--- a/docs/test_cases/t00041.md
+++ b/docs/test_cases/t00041.md
@@ -82,7 +82,7 @@ struct NM : public N { };
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00041::R",
+      "display_name": "R",
       "id": "775317088453163919",
       "is_abstract": false,
       "is_nested": false,
@@ -104,7 +104,7 @@ struct NM : public N { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00041::D",
+      "display_name": "D",
       "id": "1798851434286108347",
       "is_abstract": false,
       "is_nested": false,
@@ -139,7 +139,7 @@ struct NM : public N { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00041::E",
+      "display_name": "E",
       "id": "2158730167547707264",
       "is_abstract": false,
       "is_nested": false,
@@ -161,7 +161,7 @@ struct NM : public N { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00041::F",
+      "display_name": "F",
       "id": "430600213408545846",
       "is_abstract": false,
       "is_nested": false,
@@ -190,7 +190,7 @@ struct NM : public N { };
           "name": "clanguml::t00041::R"
         }
       ],
-      "display_name": "clanguml::t00041::RR",
+      "display_name": "RR",
       "id": "175608867682236642",
       "is_abstract": false,
       "is_nested": false,
@@ -288,7 +288,7 @@ struct NM : public N { };
           "name": "clanguml::t00041::RR"
         }
       ],
-      "display_name": "clanguml::t00041::RRR",
+      "display_name": "RRR",
       "id": "819254010294444715",
       "is_abstract": false,
       "is_nested": false,
@@ -310,7 +310,7 @@ struct NM : public N { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00041::ns1::N",
+      "display_name": "ns1::N",
       "id": "220253364661036147",
       "is_abstract": false,
       "is_nested": false,
@@ -339,7 +339,7 @@ struct NM : public N { };
           "name": "clanguml::t00041::ns1::N"
         }
       ],
-      "display_name": "clanguml::t00041::ns1::NN",
+      "display_name": "ns1::NN",
       "id": "618038667214398895",
       "is_abstract": false,
       "is_nested": false,
@@ -368,7 +368,7 @@ struct NM : public N { };
           "name": "clanguml::t00041::ns1::N"
         }
       ],
-      "display_name": "clanguml::t00041::ns1::NM",
+      "display_name": "ns1::NM",
       "id": "1206750351408617127",
       "is_abstract": false,
       "is_nested": false,
@@ -390,6 +390,7 @@ struct NM : public N { };
     }
   ],
   "name": "t00041_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg
index d180aeb3..4bb4b9dc 100644
--- a/docs/test_cases/t00041_class.svg
+++ b/docs/test_cases/t00041_class.svg
@@ -1,164 +1,138 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="396px" preserveAspectRatio="none" style="width:411px;height:396px;background:#FFFFFF;" version="1.1" viewBox="0 0 411 396" width="411px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="381px" preserveAspectRatio="none" style="width:427px;height:381px;" version="1.1" viewBox="0 0 427 381" width="427px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f186i87xpii2j2" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000775317088453163919">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000775317088453163919" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="35.5" y="15.4"/>
-        <ellipse cx="50.5" cy="31.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M45.5,32.5562 C45.5,35.0562 47.6406,36.8687 50.5625,36.8687 C51.7969,36.8687 52.9688,36.5719 53.7188,36.0562 C54.3281,35.6344 54.6563,35.2125 54.6563,34.8062 C54.6563,34.3375 54.2344,33.9312 53.7344,33.9312 C53.5,33.9312 53.2813,34.0094 53.0781,34.2125 C52.6406,34.65 52.6406,34.65 52.4688,34.7437 C52.0156,34.9781 51.375,35.1187 50.6094,35.1187 C48.6094,35.1187 47.3281,34.1031 47.3281,32.525 L47.3281,31.4781 C47.3281,29.775 48.5469,28.5719 50.25,28.5719 C50.8281,28.5719 51.4063,28.7125 51.875,28.9625 C52.3438,29.2281 52.5156,29.4156 52.5781,29.775 C52.7031,30.4469 52.9531,30.6969 53.4844,30.6969 C53.7656,30.6969 54.0469,30.5562 54.2344,30.3375 C54.3594,30.1656 54.4063,29.9937 54.4063,29.5562 L54.4063,28.1969 C54.4063,27.775 54.3906,27.6344 54.2656,27.4625 C54.0938,27.2125 53.8125,27.0562 53.4844,27.0562 C53.1719,27.0562 52.9688,27.1656 52.75,27.4312 C51.5781,26.9312 51.1406,26.8219 50.1875,26.8219 C47.5156,26.8219 45.5,28.8375 45.5,31.4625 L45.5,32.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="64.5" y="36.006">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="36.5" x2="76.5" y1="47.4" y2="47.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="36.5" x2="76.5" y1="55.4" y2="55.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="57" y="14.5"/>
+      <ellipse cx="72" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M74.9688,36.1406 Q74.3906,36.4375 73.75,36.5781 Q73.1094,36.7344 72.4063,36.7344 Q69.9063,36.7344 68.5781,35.0938 Q67.2656,33.4375 67.2656,30.3125 Q67.2656,27.1875 68.5781,25.5313 Q69.9063,23.875 72.4063,23.875 Q73.1094,23.875 73.75,24.0313 Q74.4063,24.1875 74.9688,24.4844 L74.9688,27.2031 Q74.3438,26.625 73.75,26.3594 Q73.1563,26.0781 72.5313,26.0781 Q71.1875,26.0781 70.5,27.1563 Q69.8125,28.2188 69.8125,30.3125 Q69.8125,32.4063 70.5,33.4844 Q71.1875,34.5469 72.5313,34.5469 Q73.1563,34.5469 73.75,34.2813 Q74.3438,34 74.9688,33.4219 L74.9688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="86" y="34.6543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001798851434286108347">
-        <rect codeLine="6" fill="#F1F1F1" height="64.7999" id="C_0001798851434286108347" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="77" x="112" y="7"/>
-        <ellipse cx="142.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M137.75,24.1563 C137.75,26.6563 139.8906,28.4688 142.8125,28.4688 C144.0469,28.4688 145.2188,28.1719 145.9688,27.6563 C146.5781,27.2344 146.9063,26.8125 146.9063,26.4063 C146.9063,25.9375 146.4844,25.5313 145.9844,25.5313 C145.75,25.5313 145.5313,25.6094 145.3281,25.8125 C144.8906,26.25 144.8906,26.25 144.7188,26.3438 C144.2656,26.5781 143.625,26.7188 142.8594,26.7188 C140.8594,26.7188 139.5781,25.7031 139.5781,24.125 L139.5781,23.0781 C139.5781,21.375 140.7969,20.1719 142.5,20.1719 C143.0781,20.1719 143.6563,20.3125 144.125,20.5625 C144.5938,20.8281 144.7656,21.0156 144.8281,21.375 C144.9531,22.0469 145.2031,22.2969 145.7344,22.2969 C146.0156,22.2969 146.2969,22.1563 146.4844,21.9375 C146.6094,21.7656 146.6563,21.5938 146.6563,21.1563 L146.6563,19.7969 C146.6563,19.375 146.6406,19.2344 146.5156,19.0625 C146.3438,18.8125 146.0625,18.6563 145.7344,18.6563 C145.4219,18.6563 145.2188,18.7656 145,19.0313 C143.8281,18.5313 143.3906,18.4219 142.4375,18.4219 C139.7656,18.4219 137.75,20.4375 137.75,23.0625 L137.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="160.25" y="27.606">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="113" x2="188" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="113" x2="188" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="118" y="55.9"/>
-          <ellipse cx="123" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="132" y="64.0059">rr : RR *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="132" y="8"/>
+      <ellipse cx="160.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M163.9188,29.6406 Q163.3406,29.9375 162.7,30.0781 Q162.0594,30.2344 161.3563,30.2344 Q158.8563,30.2344 157.5281,28.5938 Q156.2156,26.9375 156.2156,23.8125 Q156.2156,20.6875 157.5281,19.0313 Q158.8563,17.375 161.3563,17.375 Q162.0594,17.375 162.7,17.5313 Q163.3563,17.6875 163.9188,17.9844 L163.9188,20.7031 Q163.2938,20.125 162.7,19.8594 Q162.1063,19.5781 161.4813,19.5781 Q160.1375,19.5781 159.45,20.6563 Q158.7625,21.7188 158.7625,23.8125 Q158.7625,25.9063 159.45,26.9844 Q160.1375,28.0469 161.4813,28.0469 Q162.1063,28.0469 162.7,27.7813 Q163.2938,27.5 163.9188,26.9219 L163.9188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="178.05" y="28.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0002158730167547707264">
-        <rect codeLine="11" fill="#F1F1F1" height="48" id="C_0002158730167547707264" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="341"/>
-        <ellipse cx="22" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,358.1563 C17,360.6563 19.1406,362.4688 22.0625,362.4688 C23.2969,362.4688 24.4688,362.1719 25.2188,361.6563 C25.8281,361.2344 26.1563,360.8125 26.1563,360.4063 C26.1563,359.9375 25.7344,359.5313 25.2344,359.5313 C25,359.5313 24.7813,359.6094 24.5781,359.8125 C24.1406,360.25 24.1406,360.25 23.9688,360.3438 C23.5156,360.5781 22.875,360.7188 22.1094,360.7188 C20.1094,360.7188 18.8281,359.7031 18.8281,358.125 L18.8281,357.0781 C18.8281,355.375 20.0469,354.1719 21.75,354.1719 C22.3281,354.1719 22.9063,354.3125 23.375,354.5625 C23.8438,354.8281 24.0156,355.0156 24.0781,355.375 C24.2031,356.0469 24.4531,356.2969 24.9844,356.2969 C25.2656,356.2969 25.5469,356.1563 25.7344,355.9375 C25.8594,355.7656 25.9063,355.5938 25.9063,355.1563 L25.9063,353.7969 C25.9063,353.375 25.8906,353.2344 25.7656,353.0625 C25.5938,352.8125 25.3125,352.6563 24.9844,352.6563 C24.6719,352.6563 24.4688,352.7656 24.25,353.0313 C23.0781,352.5313 22.6406,352.4219 21.6875,352.4219 C19.0156,352.4219 17,354.4375 17,357.0625 L17,358.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="361.606">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="373" y2="373"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="381" y2="381"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="54"/>
+      <ellipse cx="143" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000430600213408545846">
-        <rect codeLine="15" fill="#F1F1F1" height="48" id="C_0000430600213408545846" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="341"/>
-        <ellipse cx="98" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93,358.1563 C93,360.6563 95.1406,362.4688 98.0625,362.4688 C99.2969,362.4688 100.4688,362.1719 101.2188,361.6563 C101.8281,361.2344 102.1563,360.8125 102.1563,360.4063 C102.1563,359.9375 101.7344,359.5313 101.2344,359.5313 C101,359.5313 100.7813,359.6094 100.5781,359.8125 C100.1406,360.25 100.1406,360.25 99.9688,360.3438 C99.5156,360.5781 98.875,360.7188 98.1094,360.7188 C96.1094,360.7188 94.8281,359.7031 94.8281,358.125 L94.8281,357.0781 C94.8281,355.375 96.0469,354.1719 97.75,354.1719 C98.3281,354.1719 98.9063,354.3125 99.375,354.5625 C99.8438,354.8281 100.0156,355.0156 100.0781,355.375 C100.2031,356.0469 100.4531,356.2969 100.9844,356.2969 C101.2656,356.2969 101.5469,356.1563 101.7344,355.9375 C101.8594,355.7656 101.9063,355.5938 101.9063,355.1563 L101.9063,353.7969 C101.9063,353.375 101.8906,353.2344 101.7656,353.0625 C101.5938,352.8125 101.3125,352.6563 100.9844,352.6563 C100.6719,352.6563 100.4688,352.7656 100.25,353.0313 C99.0781,352.5313 98.6406,352.4219 97.6875,352.4219 C95.0156,352.4219 93,354.4375 93,357.0625 L93,358.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="361.606">F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="373" y2="373"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="381" y2="381"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="152" y="62.2104">rr : RR *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <g id="elem_C_0000175608867682236642">
-        <rect codeLine="19" fill="#F1F1F1" height="115.1997" id="C_0000175608867682236642" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="125" x="41" y="148.8"/>
-        <ellipse cx="89.25" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M84.25,165.9563 C84.25,168.4563 86.3906,170.2688 89.3125,170.2688 C90.5469,170.2688 91.7188,169.9719 92.4688,169.4563 C93.0781,169.0344 93.4063,168.6125 93.4063,168.2063 C93.4063,167.7375 92.9844,167.3313 92.4844,167.3313 C92.25,167.3313 92.0313,167.4094 91.8281,167.6125 C91.3906,168.05 91.3906,168.05 91.2188,168.1438 C90.7656,168.3781 90.125,168.5188 89.3594,168.5188 C87.3594,168.5188 86.0781,167.5031 86.0781,165.925 L86.0781,164.8781 C86.0781,163.175 87.2969,161.9719 89,161.9719 C89.5781,161.9719 90.1563,162.1125 90.625,162.3625 C91.0938,162.6281 91.2656,162.8156 91.3281,163.175 C91.4531,163.8469 91.7031,164.0969 92.2344,164.0969 C92.5156,164.0969 92.7969,163.9563 92.9844,163.7375 C93.1094,163.5656 93.1563,163.3938 93.1563,162.9563 L93.1563,161.5969 C93.1563,161.175 93.1406,161.0344 93.0156,160.8625 C92.8438,160.6125 92.5625,160.4563 92.2344,160.4563 C91.9219,160.4563 91.7188,160.5656 91.5,160.8313 C90.3281,160.3313 89.8906,160.2219 88.9375,160.2219 C86.2656,160.2219 84.25,162.2375 84.25,164.8625 L84.25,165.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="109.75" y="169.406">RR</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="42" x2="165" y1="180.8" y2="180.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="47" y="189.7"/>
-          <ellipse cx="52" cy="194.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="61" y="197.8059">foo(H * h) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="42" x2="165" y1="205.5999" y2="205.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="47" y="214.4999"/>
-          <ellipse cx="52" cy="219.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="61" y="222.6059">e : E *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="47" y="231.2998"/>
-          <ellipse cx="52" cy="236.2998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="61" y="239.4058">f : F *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="47" y="248.0997"/>
-          <ellipse cx="52" cy="253.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="61" y="256.2057">g : detail::G *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="322"/>
+      <ellipse cx="21" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,343.6406 Q23.3906,343.9375 22.75,344.0781 Q22.1094,344.2344 21.4063,344.2344 Q18.9063,344.2344 17.5781,342.5938 Q16.2656,340.9375 16.2656,337.8125 Q16.2656,334.6875 17.5781,333.0313 Q18.9063,331.375 21.4063,331.375 Q22.1094,331.375 22.75,331.5313 Q23.4063,331.6875 23.9688,331.9844 L23.9688,334.7031 Q23.3438,334.125 22.75,333.8594 Q22.1563,333.5781 21.5313,333.5781 Q20.1875,333.5781 19.5,334.6563 Q18.8125,335.7188 18.8125,337.8125 Q18.8125,339.9063 19.5,340.9844 Q20.1875,342.0469 21.5313,342.0469 Q22.1563,342.0469 22.75,341.7813 Q23.3438,341.5 23.9688,340.9219 L23.9688,343.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="342.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="354" y2="354"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
-      <g id="elem_C_0000819254010294444715">
-        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0000819254010294444715" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="158.5" y="341"/>
-        <ellipse cx="173.5" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M168.5,358.1563 C168.5,360.6563 170.6406,362.4688 173.5625,362.4688 C174.7969,362.4688 175.9688,362.1719 176.7188,361.6563 C177.3281,361.2344 177.6563,360.8125 177.6563,360.4063 C177.6563,359.9375 177.2344,359.5313 176.7344,359.5313 C176.5,359.5313 176.2813,359.6094 176.0781,359.8125 C175.6406,360.25 175.6406,360.25 175.4688,360.3438 C175.0156,360.5781 174.375,360.7188 173.6094,360.7188 C171.6094,360.7188 170.3281,359.7031 170.3281,358.125 L170.3281,357.0781 C170.3281,355.375 171.5469,354.1719 173.25,354.1719 C173.8281,354.1719 174.4063,354.3125 174.875,354.5625 C175.3438,354.8281 175.5156,355.0156 175.5781,355.375 C175.7031,356.0469 175.9531,356.2969 176.4844,356.2969 C176.7656,356.2969 177.0469,356.1563 177.2344,355.9375 C177.3594,355.7656 177.4063,355.5938 177.4063,355.1563 L177.4063,353.7969 C177.4063,353.375 177.3906,353.2344 177.2656,353.0625 C177.0938,352.8125 176.8125,352.6563 176.4844,352.6563 C176.1719,352.6563 175.9688,352.7656 175.75,353.0313 C174.5781,352.5313 174.1406,352.4219 173.1875,352.4219 C170.5156,352.4219 168.5,354.4375 168.5,357.0625 L168.5,358.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="187.5" y="361.606">RRR</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="219.5" y1="373" y2="373"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="219.5" y1="381" y2="381"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="322"/>
+      <ellipse cx="96.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M99.4688,343.6406 Q98.8906,343.9375 98.25,344.0781 Q97.6094,344.2344 96.9063,344.2344 Q94.4063,344.2344 93.0781,342.5938 Q91.7656,340.9375 91.7656,337.8125 Q91.7656,334.6875 93.0781,333.0313 Q94.4063,331.375 96.9063,331.375 Q97.6094,331.375 98.25,331.5313 Q98.9063,331.6875 99.4688,331.9844 L99.4688,334.7031 Q98.8438,334.125 98.25,333.8594 Q97.6563,333.5781 97.0313,333.5781 Q95.6875,333.5781 95,334.6563 Q94.3125,335.7188 94.3125,337.8125 Q94.3125,339.9063 95,340.9844 Q95.6875,342.0469 97.0313,342.0469 Q97.6563,342.0469 98.25,341.7813 Q98.8438,341.5 99.4688,340.9219 L99.4688,343.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="110.5" y="342.1543">F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="354" y2="354"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <g id="elem_C_0000220253364661036147">
-        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0000220253364661036147" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="73" x="275" y="15.4"/>
-        <ellipse cx="290" cy="31.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M285,32.5562 C285,35.0562 287.1406,36.8687 290.0625,36.8687 C291.2969,36.8687 292.4688,36.5719 293.2188,36.0562 C293.8281,35.6344 294.1563,35.2125 294.1563,34.8062 C294.1563,34.3375 293.7344,33.9312 293.2344,33.9312 C293,33.9312 292.7813,34.0094 292.5781,34.2125 C292.1406,34.65 292.1406,34.65 291.9688,34.7437 C291.5156,34.9781 290.875,35.1187 290.1094,35.1187 C288.1094,35.1187 286.8281,34.1031 286.8281,32.525 L286.8281,31.4781 C286.8281,29.775 288.0469,28.5719 289.75,28.5719 C290.3281,28.5719 290.9063,28.7125 291.375,28.9625 C291.8438,29.2281 292.0156,29.4156 292.0781,29.775 C292.2031,30.4469 292.4531,30.6969 292.9844,30.6969 C293.2656,30.6969 293.5469,30.5562 293.7344,30.3375 C293.8594,30.1656 293.9063,29.9937 293.9063,29.5562 L293.9063,28.1969 C293.9063,27.775 293.8906,27.6344 293.7656,27.4625 C293.5938,27.2125 293.3125,27.0562 292.9844,27.0562 C292.6719,27.0562 292.4688,27.1656 292.25,27.4312 C291.0781,26.9312 290.6406,26.8219 289.6875,26.8219 C287.0156,26.8219 285,28.8375 285,31.4625 L285,32.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="304" y="36.006">ns1::N</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="276" x2="347" y1="47.4" y2="47.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="276" x2="347" y1="55.4" y2="55.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="99.2188" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="43" y="146"/>
+      <ellipse cx="88.75" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M91.7188,167.6406 Q91.1406,167.9375 90.5,168.0781 Q89.8594,168.2344 89.1563,168.2344 Q86.6563,168.2344 85.3281,166.5938 Q84.0156,164.9375 84.0156,161.8125 Q84.0156,158.6875 85.3281,157.0313 Q86.6563,155.375 89.1563,155.375 Q89.8594,155.375 90.5,155.5313 Q91.1563,155.6875 91.7188,155.9844 L91.7188,158.7031 Q91.0938,158.125 90.5,157.8594 Q89.9063,157.5781 89.2813,157.5781 Q87.9375,157.5781 87.25,158.6563 Q86.5625,159.7188 86.5625,161.8125 Q86.5625,163.9063 87.25,164.9844 Q87.9375,166.0469 89.2813,166.0469 Q89.9063,166.0469 90.5,165.7813 Q91.0938,165.5 91.7188,164.9219 L91.7188,167.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="109.25" y="166.1543">RR</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <g id="elem_C_0000618038667214398895">
-        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0000618038667214398895" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="201" y="182.4"/>
-        <ellipse cx="216" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M211,199.5563 C211,202.0563 213.1406,203.8688 216.0625,203.8688 C217.2969,203.8688 218.4688,203.5719 219.2188,203.0563 C219.8281,202.6344 220.1563,202.2125 220.1563,201.8063 C220.1563,201.3375 219.7344,200.9313 219.2344,200.9313 C219,200.9313 218.7813,201.0094 218.5781,201.2125 C218.1406,201.65 218.1406,201.65 217.9688,201.7438 C217.5156,201.9781 216.875,202.1188 216.1094,202.1188 C214.1094,202.1188 212.8281,201.1031 212.8281,199.525 L212.8281,198.4781 C212.8281,196.775 214.0469,195.5719 215.75,195.5719 C216.3281,195.5719 216.9063,195.7125 217.375,195.9625 C217.8438,196.2281 218.0156,196.4156 218.0781,196.775 C218.2031,197.4469 218.4531,197.6969 218.9844,197.6969 C219.2656,197.6969 219.5469,197.5563 219.7344,197.3375 C219.8594,197.1656 219.9063,196.9938 219.9063,196.5563 L219.9063,195.1969 C219.9063,194.775 219.8906,194.6344 219.7656,194.4625 C219.5938,194.2125 219.3125,194.0563 218.9844,194.0563 C218.6719,194.0563 218.4688,194.1656 218.25,194.4313 C217.0781,193.9313 216.6406,193.8219 215.6875,193.8219 C213.0156,193.8219 211,195.8375 211,198.4625 L211,199.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="230" y="203.006">ns1::NN</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="202" x2="283" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="202" x2="283" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="184"/>
+      <ellipse cx="54" cy="189" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
-      <g id="elem_C_0001206750351408617127">
-        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001206750351408617127" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="85" x="319" y="182.4"/>
-        <ellipse cx="334" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M329,199.5563 C329,202.0563 331.1406,203.8688 334.0625,203.8688 C335.2969,203.8688 336.4688,203.5719 337.2188,203.0563 C337.8281,202.6344 338.1563,202.2125 338.1563,201.8063 C338.1563,201.3375 337.7344,200.9313 337.2344,200.9313 C337,200.9313 336.7813,201.0094 336.5781,201.2125 C336.1406,201.65 336.1406,201.65 335.9688,201.7438 C335.5156,201.9781 334.875,202.1188 334.1094,202.1188 C332.1094,202.1188 330.8281,201.1031 330.8281,199.525 L330.8281,198.4781 C330.8281,196.775 332.0469,195.5719 333.75,195.5719 C334.3281,195.5719 334.9063,195.7125 335.375,195.9625 C335.8438,196.2281 336.0156,196.4156 336.0781,196.775 C336.2031,197.4469 336.4531,197.6969 336.9844,197.6969 C337.2656,197.6969 337.5469,197.5563 337.7344,197.3375 C337.8594,197.1656 337.9063,196.9938 337.9063,196.5563 L337.9063,195.1969 C337.9063,194.775 337.8906,194.6344 337.7656,194.4625 C337.5938,194.2125 337.3125,194.0563 336.9844,194.0563 C336.6719,194.0563 336.4688,194.1656 336.25,194.4313 C335.0781,193.9313 334.6406,193.8219 333.6875,193.8219 C331.0156,193.8219 329,195.8375 329,198.4625 L329,199.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53" x="348" y="203.006">ns1::NM</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="320" x2="403" y1="214.4" y2="214.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="320" x2="403" y1="222.4" y2="222.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="63" y="192.2104">foo(H * h) : void</text>
     </a>
-    <g id="link_C_0001798851434286108347_C_0000175608867682236642">
-      <path codeLine="42" d="M141.44,72.21 C135.28,93.85 128.5936,117.2995 121.3136,142.8595 " fill="none" id="C_0001798851434286108347-to-C_0000175608867682236642" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="119.67,148.63,125.9823,141.0699,121.0396,143.8212,118.2883,138.8785,119.67,148.63" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="139.5" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="146.5" y="114.877">rr</text>
-    </g>
-    <g id="link_C_0000175608867682236642_C_0002158730167547707264">
-      <path codeLine="43" d="M75.85,264.38 C63.03,290.79 51.1286,315.3016 41.3786,335.4016 " fill="none" id="C_0000175608867682236642-to-C_0002158730167547707264" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="38.76,340.8,46.2869,334.4481,40.9422,336.3013,39.089,330.9566,38.76,340.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="62.5" y="307.077">+e</text>
-    </g>
-    <g id="link_C_0000175608867682236642_C_0000430600213408545846">
-      <path codeLine="44" d="M103.5,264.38 C103.5,290.79 103.5,314.7 103.5,334.8 " fill="none" id="C_0000175608867682236642-to-C_0000430600213408545846" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="103.5,340.8,107.5,331.8,103.5,335.8,99.5,331.8,103.5,340.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="104.5" y="307.077">+f</text>
-    </g>
-    <g id="link_C_0000775317088453163919_C_0000175608867682236642">
-      <path codeLine="45" d="M68.0614,81.0013 C74.3114,102.9413 79,119.38 87.28,148.44 " fill="none" id="C_0000775317088453163919-backto-C_0000175608867682236642" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="63.13,63.69,62.291,82.6451,73.8319,79.3575,63.13,63.69" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000175608867682236642_C_0000819254010294444715">
-      <path codeLine="46" d="M143.4574,280.1558 C157.9674,306.5658 165.72,320.7 176.76,340.8 " fill="none" id="C_0000175608867682236642-backto-C_0000819254010294444715" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="134.79,264.38,138.1988,283.0449,148.716,277.2667,134.79,264.38" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000220253364661036147_C_0000618038667214398895">
-      <path codeLine="47" d="M294.8174,80.2972 C281.7074,111.6572 265.45,150.53 252.3,181.96 " fill="none" id="C_0000220253364661036147-backto-C_0000618038667214398895" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="301.76,63.69,289.2816,77.983,300.3531,82.6114,301.76,63.69" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000220253364661036147_C_0001206750351408617127">
-      <path codeLine="48" d="M323.7786,80.9169 C333.2786,112.2769 344.87,150.53 354.4,181.96 " fill="none" id="C_0000220253364661036147-backto-C_0001206750351408617127" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="318.56,63.69,318.0363,82.6564,329.5209,79.1774,318.56,63.69" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="198.8047" y2="198.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="204.8047"/>
+      <ellipse cx="54" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="63" y="213.0151">e : E *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="217.6094"/>
+      <ellipse cx="54" cy="222.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="63" y="225.8198">f : F *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="230.4141"/>
+      <ellipse cx="54" cy="235.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="77" x="63" y="238.6245">g : detail::G *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="322"/>
+      <ellipse cx="171" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.9688,343.6406 Q173.3906,343.9375 172.75,344.0781 Q172.1094,344.2344 171.4063,344.2344 Q168.9063,344.2344 167.5781,342.5938 Q166.2656,340.9375 166.2656,337.8125 Q166.2656,334.6875 167.5781,333.0313 Q168.9063,331.375 171.4063,331.375 Q172.1094,331.375 172.75,331.5313 Q173.4063,331.6875 173.9688,331.9844 L173.9688,334.7031 Q173.3438,334.125 172.75,333.8594 Q172.1563,333.5781 171.5313,333.5781 Q170.1875,333.5781 169.5,334.6563 Q168.8125,335.7188 168.8125,337.8125 Q168.8125,339.9063 169.5,340.9844 Q170.1875,342.0469 171.5313,342.0469 Q172.1563,342.0469 172.75,341.7813 Q173.3438,341.5 173.9688,340.9219 L173.9688,343.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="185" y="342.1543">RRR</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="354" y2="354"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="362" y2="362"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="289" y="14.5"/>
+      <ellipse cx="304" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M306.9688,36.1406 Q306.3906,36.4375 305.75,36.5781 Q305.1094,36.7344 304.4063,36.7344 Q301.9063,36.7344 300.5781,35.0938 Q299.2656,33.4375 299.2656,30.3125 Q299.2656,27.1875 300.5781,25.5313 Q301.9063,23.875 304.4063,23.875 Q305.1094,23.875 305.75,24.0313 Q306.4063,24.1875 306.9688,24.4844 L306.9688,27.2031 Q306.3438,26.625 305.75,26.3594 Q305.1563,26.0781 304.5313,26.0781 Q303.1875,26.0781 302.5,27.1563 Q301.8125,28.2188 301.8125,30.3125 Q301.8125,32.4063 302.5,33.4844 Q303.1875,34.5469 304.5313,34.5469 Q305.1563,34.5469 305.75,34.2813 Q306.3438,34 306.9688,33.4219 L306.9688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="40" x="318" y="34.6543">ns1::N</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="54.5" y2="54.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="217.5" y="171.5"/>
+      <ellipse cx="232.5" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M235.4688,193.1406 Q234.8906,193.4375 234.25,193.5781 Q233.6094,193.7344 232.9063,193.7344 Q230.4063,193.7344 229.0781,192.0938 Q227.7656,190.4375 227.7656,187.3125 Q227.7656,184.1875 229.0781,182.5313 Q230.4063,180.875 232.9063,180.875 Q233.6094,180.875 234.25,181.0313 Q234.9063,181.1875 235.4688,181.4844 L235.4688,184.2031 Q234.8438,183.625 234.25,183.3594 Q233.6563,183.0781 233.0313,183.0781 Q231.6875,183.0781 231,184.1563 Q230.3125,185.2188 230.3125,187.3125 Q230.3125,189.4063 231,190.4844 Q231.6875,191.5469 233.0313,191.5469 Q233.6563,191.5469 234.25,191.2813 Q234.8438,191 235.4688,190.4219 L235.4688,193.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="246.5" y="191.6543">ns1::NN</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="203.5" y2="203.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="211.5" y2="211.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="334" y="171.5"/>
+      <ellipse cx="349" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M351.9688,193.1406 Q351.3906,193.4375 350.75,193.5781 Q350.1094,193.7344 349.4063,193.7344 Q346.9063,193.7344 345.5781,192.0938 Q344.2656,190.4375 344.2656,187.3125 Q344.2656,184.1875 345.5781,182.5313 Q346.9063,180.875 349.4063,180.875 Q350.1094,180.875 350.75,181.0313 Q351.4063,181.1875 351.9688,181.4844 L351.9688,184.2031 Q351.3438,183.625 350.75,183.3594 Q350.1563,183.0781 349.5313,183.0781 Q348.1875,183.0781 347.5,184.1563 Q346.8125,185.2188 346.8125,187.3125 Q346.8125,189.4063 347.5,190.4844 Q348.1875,191.5469 349.5313,191.5469 Q350.1563,191.5469 350.75,191.2813 Q351.3438,191 351.9688,190.4219 L351.9688,193.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="50" x="363" y="191.6543">ns1::NM</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="335" x2="415" y1="203.5" y2="203.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="335" x2="415" y1="211.5" y2="211.5"/>
+    </a>
+    <path d="M155.24,69.02 C146.45,89.36 134.51,116.97 124.08,141.11 " fill="none" id="C_0001798851434286108347-&gt;C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="122.01,145.89,129.2569,139.2205,123.9968,141.3017,121.9157,136.0416,122.01,145.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="147" 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="10" x="154" y="112.0669">rr</text>
+    <path d="M76.44,245.12 C64.42,268.93 50.37,296.74 40.16,316.96 " fill="none" id="C_0000175608867682236642-&gt;C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="37.78,321.67,45.4065,315.4381,40.0332,317.2065,38.2649,311.8331,37.78,321.67" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="63" y="288.0669">+e</text>
+    <path d="M101,245.12 C101,268.73 101,296.27 101,316.45 " fill="none" id="C_0000175608867682236642-&gt;C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="101,321.67,105,312.67,101,316.67,97,312.67,101,321.67" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="102" y="288.0669">+f</text>
+    <path d="M83.67,82.58 C86.71,102.2 90.32,125.52 93.46,145.78 " fill="none" id="C_0000775317088453163919&lt;-C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="76.74,83.54,80.59,62.71,90.57,81.4,76.74,83.54" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M138.08,262.83 C149.84,283.88 162.08,305.78 170.96,321.67 " fill="none" id="C_0000175608867682236642&lt;-C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="131.82,266,128.18,245.12,144.05,259.17,131.82,266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M307.01,81.11 C294.49,110.07 278.27,147.62 267.99,171.39 " fill="none" id="C_0000220253364661036147&lt;-C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="300.61,78.29,314.97,62.71,313.46,83.84,300.61,78.29" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M338.69,81.95 C348,110.79 359.95,147.84 367.55,171.39 " fill="none" id="C_0000220253364661036147&lt;-C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="331.96,83.89,332.49,62.71,345.29,79.59,331.96,83.89" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00041_class_mermaid.svg b/docs/test_cases/t00041_class_mermaid.svg
index 8fcc6158..a73afadb 100644
--- a/docs/test_cases/t00041_class_mermaid.svg
+++ b/docs/test_cases/t00041_class_mermaid.svg
@@ -1,67 +1,62 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 445.03515625 433" style="max-width: 445.035px; background-color: white;" width="445.03515625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 442.8125 433" style="max-width: 442.812px; background-color: white;" width="442.8125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M43.7265625,87L43.7265625,92.66666666666667C43.7265625,98.33333333333333,43.7265625,109.66666666666667,46.74286752036577,120.15235121058224C49.75917254073155,130.6380357544978,55.79178258146308,140.27607150899559,58.80808760182885,145.0950893862445L61.82439262219462,149.91410726349338"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M73.10229606807512,300L70.18811130672927,305.6666666666667C67.27392654538342,311.3333333333333,61.44555702269171,322.6666666666667,58.53137226134586,333C55.6171875,343.3333333333333,55.6171875,352.6666666666667,55.6171875,357.3333333333333L55.6171875,362"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M124.31286678403755,300L125.40134732003129,305.6666666666667C126.48982785602504,311.3333333333333,128.66678892801252,322.6666666666667,129.75526946400626,333C130.84375,343.3333333333333,130.84375,352.6666666666667,130.84375,357.3333333333333L130.84375,362"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M142.734375,94L142.734375,98.5C142.734375,103,142.734375,112,141.0132164514867,122.16666666666667C139.2920579029734,132.33333333333334,135.8497408059468,143.66666666666666,134.1285822574335,149.33333333333334L132.4074237089202,155"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M195.38009330391532,311.5591781419069L199.16179650326276,315.2993151182557C202.9434997026102,319.0394520946046,210.50690610130513,326.5197260473023,214.28860930065255,335.9265296903178C218.0703125,345.3333333333333,218.0703125,356.6666666666667,218.0703125,362.3333333333333L218.0703125,368"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M325.0244318776587,81.59449678899335L315.97934427304887,88.16208065749447C306.9342566684391,94.72966452599557,288.8440814592196,107.86483226299778,279.79899385460976,127.4324161314989C270.75390625,147,270.75390625,173,270.75390625,186L270.75390625,199"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M388.0649387201049,92.96955933856586L389.7175270584207,97.64129944880489C391.3701153967366,102.3130395590439,394.6752920733683,111.65651977952196,396.32788041168413,129.32825988976097C397.98046875,147,397.98046875,173,397.98046875,186L397.98046875,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M43.7265625,87L43.7265625,92.66666666666667C43.7265625,98.33333333333333,43.7265625,109.66666666666667,47.39168867370892,121C51.05681484741783,132.33333333333334,58.38706719483568,143.66666666666666,62.0521933685446,149.33333333333334L65.71731954225352,155"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M73.81187646713616,300L70.7794283059468,305.6666666666667C67.74698014475744,311.3333333333333,61.68208382237872,322.6666666666667,58.64963566118936,334C55.6171875,345.3333333333333,55.6171875,356.6666666666667,55.6171875,362.3333333333333L55.6171875,368"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M125.02244718309859,300L125.99266431924883,305.6666666666667C126.96288145539906,311.3333333333333,128.90331572769955,322.6666666666667,129.87353286384976,334C130.84375,345.3333333333333,130.84375,356.6666666666667,130.84375,362.3333333333333L130.84375,368"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M142.734375,76L142.734375,83.5C142.734375,91,142.734375,106,141.1314798513302,119.16666666666667C139.5285847026604,132.33333333333334,136.32279440532082,143.66666666666666,134.71989925665102,149.33333333333334L133.11700410798122,155"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M180.359375,295.91751240832656L186.64453125,302.2645936736055C192.9296875,308.6116749388844,205.5,321.30583746944217,211.78515625,333.31958540138777C218.0703125,345.3333333333333,218.0703125,356.6666666666667,218.0703125,362.3333333333333L218.0703125,368"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M337.3671875,71.01863857374391L325.89453125,79.34886547811993C314.421875,87.67909238249594,291.4765625,104.33954619124798,280.00390625,125.669773095624C268.53125,147,268.53125,173,268.53125,186L268.53125,199"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M379.8394451530612,76L382.492506377551,83.5C385.1455676020408,91,390.4516900510204,106,393.1047512755102,126.5C395.7578125,147,395.7578125,173,395.7578125,186L395.7578125,199"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(43.7265625, 121)" class="edgeLabel">
@@ -135,7 +130,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L9">
+        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L9">
           <g title="R" id="classId-C_0000775317088453163919-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -154,7 +149,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L13">
+        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L13">
           <g title="D" id="classId-C_0001798851434286108347-1" class="node default clickable">
             <rect height="79" width="71.453125" y="-39.5" x="-35.7265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.7265625" x1="-35.7265625" class="divider"/>
@@ -172,13 +167,13 @@
               </foreignObject>
               <foreignObject transform="translate( -28.2265625, 2)" height="18" width="56.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+rr : RR</span>
+                  <span style="font-style:italic;" class="nodeLabel">+rr : RR </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L17">
+        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L17">
           <g title="E" id="classId-C_0002158730167547707264-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -197,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L19">
+        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L19">
           <g title="F" id="classId-C_0000430600213408545846-3" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -216,11 +211,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(110.38671875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L27">
+        <a transform="translate(112.609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L27">
           <g title="RR" id="classId-C_0000175608867682236642-4" class="node default clickable">
-            <rect height="145" width="144.390625" y="-72.5" x="-72.1953125" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="72.1953125" x1="-72.1953125" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="72.1953125" x1="-72.1953125" class="divider"/>
+            <rect height="145" width="135.5" y="-72.5" x="-67.75" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="67.75" x1="-67.75" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="67.75" x1="-67.75" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -232,30 +227,30 @@
                   <span class="nodeLabel">RR</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -64.6953125, -31)" height="18" width="42.25">
+              <foreignObject transform="translate( -60.25, -31)" height="18" width="42.25">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+e : E</span>
+                  <span style="font-style:italic;" class="nodeLabel">+e : E </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -64.6953125, -9)" height="18" width="36.90625">
+              <foreignObject transform="translate( -60.25, -9)" height="18" width="36.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+f : F</span>
+                  <span style="font-style:italic;" class="nodeLabel">+f : F </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -64.6953125, 13)" height="18" width="91.171875">
+              <foreignObject transform="translate( -60.25, 13)" height="18" width="91.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+g : detail::G</span>
+                  <span style="font-style:italic;" class="nodeLabel">+g : detail::G </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -64.6953125, 47)" height="18" width="129.390625">
+              <foreignObject transform="translate( -60.25, 47)" height="18" width="120.5">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo(H * h) : : void</span>
+                  <span class="nodeLabel">+foo(H * h) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L35">
+        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L35">
           <g title="RRR" id="classId-C_0000819254010294444715-5" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -274,7 +269,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(371.98046875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L38">
+        <a transform="translate(369.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L38">
           <g title="N" id="classId-C_0000220253364661036147-6" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -293,7 +288,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(270.75390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L40">
+        <a transform="translate(268.53125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L40">
           <g title="NN" id="classId-C_0000618038667214398895-7" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -312,7 +307,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(397.98046875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00041/t00041.cc#L42">
+        <a transform="translate(395.7578125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L42">
           <g title="NM" id="classId-C_0001206750351408617127-8" class="node default clickable">
             <rect height="57" width="78.109375" y="-28.5" x="-39.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.0546875" x1="-39.0546875" class="divider"/>
diff --git a/docs/test_cases/t00042.md b/docs/test_cases/t00042.md
index 33b62d25..f9e2e655 100644
--- a/docs/test_cases/t00042.md
+++ b/docs/test_cases/t00042.md
@@ -67,7 +67,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00042::A<T>",
+      "display_name": "A<T>",
       "id": "462160951579835462",
       "is_abstract": false,
       "is_nested": false,
@@ -109,7 +109,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00042::A<void>",
+      "display_name": "A<void>",
       "id": "1422802342059669545",
       "is_abstract": false,
       "is_nested": false,
@@ -151,7 +151,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00042::B<T,K>",
+      "display_name": "B<T,K>",
       "id": "1414456934388678010",
       "is_abstract": false,
       "is_nested": false,
@@ -211,7 +211,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00042::A<double>",
+      "display_name": "A<double>",
       "id": "364538479078826988",
       "is_abstract": false,
       "is_nested": false,
@@ -240,7 +240,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00042::A<std::string>",
+      "display_name": "A<std::string>",
       "id": "496773262538580186",
       "is_abstract": false,
       "is_nested": false,
@@ -269,7 +269,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00042::B<int,float>",
+      "display_name": "B<int,float>",
       "id": "1833471931530161359",
       "is_abstract": false,
       "is_nested": false,
@@ -304,6 +304,7 @@ struct R {
     }
   ],
   "name": "t00042_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg
index 717a876a..1569025d 100644
--- a/docs/test_cases/t00042_class.svg
+++ b/docs/test_cases/t00042_class.svg
@@ -1,123 +1,109 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="223px" preserveAspectRatio="none" style="width:468px;height:223px;background:#FFFFFF;" version="1.1" viewBox="0 0 468 223" width="468px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:489px;height:213px;" version="1.1" viewBox="0 0 489 213" width="489px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fkjygwz40ktem" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000462160951579835462">
-        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000462160951579835462" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="137" y="143.2"/>
-        <ellipse cx="153.35" cy="159.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M148.35,160.3563 C148.35,162.8563 150.4906,164.6688 153.4125,164.6688 C154.6469,164.6688 155.8188,164.3719 156.5688,163.8563 C157.1781,163.4344 157.5063,163.0125 157.5063,162.6063 C157.5063,162.1375 157.0844,161.7313 156.5844,161.7313 C156.35,161.7313 156.1313,161.8094 155.9281,162.0125 C155.4906,162.45 155.4906,162.45 155.3188,162.5438 C154.8656,162.7781 154.225,162.9188 153.4594,162.9188 C151.4594,162.9188 150.1781,161.9031 150.1781,160.325 L150.1781,159.2781 C150.1781,157.575 151.3969,156.3719 153.1,156.3719 C153.6781,156.3719 154.2563,156.5125 154.725,156.7625 C155.1938,157.0281 155.3656,157.2156 155.4281,157.575 C155.5531,158.2469 155.8031,158.4969 156.3344,158.4969 C156.6156,158.4969 156.8969,158.3563 157.0844,158.1375 C157.2094,157.9656 157.2563,157.7938 157.2563,157.3563 L157.2563,155.9969 C157.2563,155.575 157.2406,155.4344 157.1156,155.2625 C156.9438,155.0125 156.6625,154.8563 156.3344,154.8563 C156.0219,154.8563 155.8188,154.9656 155.6,155.2313 C154.4281,154.7313 153.9906,154.6219 153.0375,154.6219 C150.3656,154.6219 148.35,156.6375 148.35,159.2625 L148.35,160.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="167.65" y="163.806">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="186" y="140.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="187" y="154.4001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="138" x2="191" y1="175.2" y2="175.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="138" x2="191" y1="183.2" y2="183.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="143" y="192.1"/>
-          <ellipse cx="148" cy="197.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="157" y="200.2059">a : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
+      <ellipse cx="152.45" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M155.4188,157.1406 Q154.8406,157.4375 154.2,157.5781 Q153.5594,157.7344 152.8563,157.7344 Q150.3563,157.7344 149.0281,156.0938 Q147.7156,154.4375 147.7156,151.3125 Q147.7156,148.1875 149.0281,146.5313 Q150.3563,144.875 152.8563,144.875 Q153.5594,144.875 154.2,145.0313 Q154.8563,145.1875 155.4188,145.4844 L155.4188,148.2031 Q154.7938,147.625 154.2,147.3594 Q153.6063,147.0781 152.9813,147.0781 Q151.6375,147.0781 150.95,148.1563 Q150.2625,149.2188 150.2625,151.3125 Q150.2625,153.4063 150.95,154.4844 Q151.6375,155.5469 152.9813,155.5469 Q153.6063,155.5469 154.2,155.2813 Q154.7938,155 155.4188,154.4219 L155.4188,157.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.55" y="155.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="183" y="132.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="184" y="144.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="167.5" y2="167.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001422802342059669545">
-        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001422802342059669545" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="7" y="10"/>
-        <ellipse cx="27.85" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M22.85,27.1563 C22.85,29.6563 24.9906,31.4688 27.9125,31.4688 C29.1469,31.4688 30.3188,31.1719 31.0688,30.6563 C31.6781,30.2344 32.0063,29.8125 32.0063,29.4063 C32.0063,28.9375 31.5844,28.5313 31.0844,28.5313 C30.85,28.5313 30.6313,28.6094 30.4281,28.8125 C29.9906,29.25 29.9906,29.25 29.8188,29.3438 C29.3656,29.5781 28.725,29.7188 27.9594,29.7188 C25.9594,29.7188 24.6781,28.7031 24.6781,27.125 L24.6781,26.0781 C24.6781,24.375 25.8969,23.1719 27.6,23.1719 C28.1781,23.1719 28.7563,23.3125 29.225,23.5625 C29.6938,23.8281 29.8656,24.0156 29.9281,24.375 C30.0531,25.0469 30.3031,25.2969 30.8344,25.2969 C31.1156,25.2969 31.3969,25.1563 31.5844,24.9375 C31.7094,24.7656 31.7563,24.5938 31.7563,24.1563 L31.7563,22.7969 C31.7563,22.375 31.7406,22.2344 31.6156,22.0625 C31.4438,21.8125 31.1625,21.6563 30.8344,21.6563 C30.5219,21.6563 30.3188,21.7656 30.1,22.0313 C28.9281,21.5313 28.4906,21.4219 27.5375,21.4219 C24.8656,21.4219 22.85,23.4375 22.85,26.0625 L22.85,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="43.15" y="30.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="25" x="66" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="23" x="67" y="21.2001">void</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="87" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="87" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="58.9"/>
-          <ellipse cx="18" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="27" y="67.0059">a : void *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="181.5"/>
+      <ellipse cx="148" cy="186.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001414456934388678010">
-        <rect codeLine="12" fill="#F1F1F1" height="81.5999" id="C_0001414456934388678010" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="384" y="134.8"/>
-        <ellipse cx="399" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M394,151.9563 C394,154.4563 396.1406,156.2688 399.0625,156.2688 C400.2969,156.2688 401.4688,155.9719 402.2188,155.4563 C402.8281,155.0344 403.1563,154.6125 403.1563,154.2063 C403.1563,153.7375 402.7344,153.3313 402.2344,153.3313 C402,153.3313 401.7813,153.4094 401.5781,153.6125 C401.1406,154.05 401.1406,154.05 400.9688,154.1438 C400.5156,154.3781 399.875,154.5188 399.1094,154.5188 C397.1094,154.5188 395.8281,153.5031 395.8281,151.925 L395.8281,150.8781 C395.8281,149.175 397.0469,147.9719 398.75,147.9719 C399.3281,147.9719 399.9063,148.1125 400.375,148.3625 C400.8438,148.6281 401.0156,148.8156 401.0781,149.175 C401.2031,149.8469 401.4531,150.0969 401.9844,150.0969 C402.2656,150.0969 402.5469,149.9563 402.7344,149.7375 C402.8594,149.5656 402.9063,149.3938 402.9063,148.9563 L402.9063,147.5969 C402.9063,147.175 402.8906,147.0344 402.7656,146.8625 C402.5938,146.6125 402.3125,146.4563 401.9844,146.4563 C401.6719,146.4563 401.4688,146.5656 401.25,146.8313 C400.0781,146.3313 399.6406,146.2219 398.6875,146.2219 C396.0156,146.2219 394,148.2375 394,150.8625 L394,151.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="413" y="155.406">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="430" y="131.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="431" y="146.0001">T,K</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="385" x2="446" y1="166.8" y2="166.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="385" x2="446" y1="174.8" y2="174.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="390" y="183.7"/>
-          <ellipse cx="395" cy="188.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="404" y="191.8059">b : T</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="390" y="200.4999"/>
-          <ellipse cx="395" cy="205.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="404" y="208.6059">bb : K</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="157" y="189.7104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000364538479078826988">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000364538479078826988" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="123" y="18.4"/>
-        <ellipse cx="138" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M133,35.5563 C133,38.0563 135.1406,39.8688 138.0625,39.8688 C139.2969,39.8688 140.4688,39.5719 141.2188,39.0563 C141.8281,38.6344 142.1563,38.2125 142.1563,37.8063 C142.1563,37.3375 141.7344,36.9313 141.2344,36.9313 C141,36.9313 140.7813,37.0094 140.5781,37.2125 C140.1406,37.65 140.1406,37.65 139.9688,37.7438 C139.5156,37.9781 138.875,38.1188 138.1094,38.1188 C136.1094,38.1188 134.8281,37.1031 134.8281,35.525 L134.8281,34.4781 C134.8281,32.775 136.0469,31.5719 137.75,31.5719 C138.3281,31.5719 138.9063,31.7125 139.375,31.9625 C139.8438,32.2281 140.0156,32.4156 140.0781,32.775 C140.2031,33.4469 140.4531,33.6969 140.9844,33.6969 C141.2656,33.6969 141.5469,33.5563 141.7344,33.3375 C141.8594,33.1656 141.9063,32.9938 141.9063,32.5563 L141.9063,31.1969 C141.9063,30.775 141.8906,30.6344 141.7656,30.4625 C141.5938,30.2125 141.3125,30.0563 140.9844,30.0563 C140.6719,30.0563 140.4688,30.1656 140.25,30.4313 C139.0781,29.9313 138.6406,29.8219 137.6875,29.8219 C135.0156,29.8219 133,31.8375 133,34.4625 L133,35.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="152" y="39.006">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="40" x="169" y="15.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="38" x="170" y="29.6001">double</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124" x2="205" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124" x2="205" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
+      <ellipse cx="25.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M28.0188,29.6406 Q27.4406,29.9375 26.8,30.0781 Q26.1594,30.2344 25.4563,30.2344 Q22.9563,30.2344 21.6281,28.5938 Q20.3156,26.9375 20.3156,23.8125 Q20.3156,20.6875 21.6281,19.0313 Q22.9563,17.375 25.4563,17.375 Q26.1594,17.375 26.8,17.5313 Q27.4563,17.6875 28.0188,17.9844 L28.0188,20.7031 Q27.3938,20.125 26.8,19.8594 Q26.2063,19.5781 25.5813,19.5781 Q24.2375,19.5781 23.55,20.6563 Q22.8625,21.7188 22.8625,23.8125 Q22.8625,25.9063 23.55,26.9844 Q24.2375,28.0469 25.5813,28.0469 Q26.2063,28.0469 26.8,27.7813 Q27.3938,27.5 28.0188,26.9219 L28.0188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.95" y="28.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="60" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="61" y="17.1387">void</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000496773262538580186">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000496773262538580186" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="241" y="18.4"/>
-        <ellipse cx="256" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M251,35.5563 C251,38.0563 253.1406,39.8688 256.0625,39.8688 C257.2969,39.8688 258.4688,39.5719 259.2188,39.0563 C259.8281,38.6344 260.1563,38.2125 260.1563,37.8063 C260.1563,37.3375 259.7344,36.9313 259.2344,36.9313 C259,36.9313 258.7813,37.0094 258.5781,37.2125 C258.1406,37.65 258.1406,37.65 257.9688,37.7438 C257.5156,37.9781 256.875,38.1188 256.1094,38.1188 C254.1094,38.1188 252.8281,37.1031 252.8281,35.525 L252.8281,34.4781 C252.8281,32.775 254.0469,31.5719 255.75,31.5719 C256.3281,31.5719 256.9063,31.7125 257.375,31.9625 C257.8438,32.2281 258.0156,32.4156 258.0781,32.775 C258.2031,33.4469 258.4531,33.6969 258.9844,33.6969 C259.2656,33.6969 259.5469,33.5563 259.7344,33.3375 C259.8594,33.1656 259.9063,32.9938 259.9063,32.5563 L259.9063,31.1969 C259.9063,30.775 259.8906,30.6344 259.7656,30.4625 C259.5938,30.2125 259.3125,30.0563 258.9844,30.0563 C258.6719,30.0563 258.4688,30.1656 258.25,30.4313 C257.0781,29.9313 256.6406,29.8219 255.6875,29.8219 C253.0156,29.8219 251,31.8375 251,34.4625 L251,35.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="270" y="39.006">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="287" y="15.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="288" y="29.6001">std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="242" x2="337" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="242" x2="337" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
+      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001833471931530161359">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0001833471931530161359" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="84" x="373.5" y="18.4"/>
-        <ellipse cx="388.5" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M383.5,35.5563 C383.5,38.0563 385.6406,39.8688 388.5625,39.8688 C389.7969,39.8688 390.9688,39.5719 391.7188,39.0563 C392.3281,38.6344 392.6563,38.2125 392.6563,37.8063 C392.6563,37.3375 392.2344,36.9313 391.7344,36.9313 C391.5,36.9313 391.2813,37.0094 391.0781,37.2125 C390.6406,37.65 390.6406,37.65 390.4688,37.7438 C390.0156,37.9781 389.375,38.1188 388.6094,38.1188 C386.6094,38.1188 385.3281,37.1031 385.3281,35.525 L385.3281,34.4781 C385.3281,32.775 386.5469,31.5719 388.25,31.5719 C388.8281,31.5719 389.4063,31.7125 389.875,31.9625 C390.3438,32.2281 390.5156,32.4156 390.5781,32.775 C390.7031,33.4469 390.9531,33.6969 391.4844,33.6969 C391.7656,33.6969 392.0469,33.5563 392.2344,33.3375 C392.3594,33.1656 392.4063,32.9938 392.4063,32.5563 L392.4063,31.1969 C392.4063,30.775 392.3906,30.6344 392.2656,30.4625 C392.0938,30.2125 391.8125,30.0563 391.4844,30.0563 C391.1719,30.0563 390.9688,30.1656 390.75,30.4313 C389.5781,29.9313 389.1406,29.8219 388.1875,29.8219 C385.5156,29.8219 383.5,31.8375 383.5,34.4625 L383.5,35.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="402.5" y="39.006">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="41" x="419.5" y="15.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="39" x="420.5" y="29.6001">int,float</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="374.5" x2="456.5" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="374.5" x2="456.5" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="62.2104">a : void *</text>
     </a>
-    <g id="link_C_0001422802342059669545_C_0000462160951579835462">
-      <path codeLine="29" d="M75.82,75.16 C94.35,95.94 106.4725,109.5235 124.8625,130.1535 " fill="none" id="C_0001422802342059669545-to-C_0000462160951579835462" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="136.84,143.59,129.3413,126.161,120.3836,134.146,136.84,143.59" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000364538479078826988_C_0000462160951579835462">
-      <path codeLine="30" d="M164.5,66.86 C164.5,88.08 164.5,101.52 164.5,124.97 " fill="none" id="C_0000364538479078826988-to-C_0000462160951579835462" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="164.5,142.97,170.5,124.97,158.5,124.97,164.5,142.97" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000496773262538580186_C_0000462160951579835462">
-      <path codeLine="31" d="M267.15,66.86 C246.23,88.82 227.2957,108.6874 204.7557,132.3474 " fill="none" id="C_0000496773262538580186-to-C_0000462160951579835462" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="192.34,145.38,209.0999,136.4859,200.4115,128.2088,192.34,145.38" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001833471931530161359_C_0001414456934388678010">
-      <path codeLine="32" d="M415.5,66.86 C415.5,85.58 415.5,94.24 415.5,116.36 " fill="none" id="C_0001833471931530161359-to-C_0001414456934388678010" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="415.5,134.36,421.5,116.36,409.5,116.36,415.5,134.36" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
+      <ellipse cx="412.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M415.4688,150.6406 Q414.8906,150.9375 414.25,151.0781 Q413.6094,151.2344 412.9063,151.2344 Q410.4063,151.2344 409.0781,149.5938 Q407.7656,147.9375 407.7656,144.8125 Q407.7656,141.6875 409.0781,140.0313 Q410.4063,138.375 412.9063,138.375 Q413.6094,138.375 414.25,138.5313 Q414.9063,138.6875 415.4688,138.9844 L415.4688,141.7031 Q414.8438,141.125 414.25,140.8594 Q413.6563,140.5781 413.0313,140.5781 Q411.6875,140.5781 411,141.6563 Q410.3125,142.7188 410.3125,144.8125 Q410.3125,146.9063 411,147.9844 Q411.6875,149.0469 413.0313,149.0469 Q413.6563,149.0469 414.25,148.7813 Q414.8438,148.5 415.4688,147.9219 L415.4688,150.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="426.5" y="149.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="21" x="442.5" y="126"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="19" x="443.5" y="138.1387">T,K</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="161" y2="161"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="169" y2="169"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="175"/>
+      <ellipse cx="408.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="417.5" y="183.2104">b : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="187.8047"/>
+      <ellipse cx="408.5" cy="192.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="417.5" y="196.0151">bb : K</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
+      <ellipse cx="134.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M137.4688,36.1406 Q136.8906,36.4375 136.25,36.5781 Q135.6094,36.7344 134.9063,36.7344 Q132.4063,36.7344 131.0781,35.0938 Q129.7656,33.4375 129.7656,30.3125 Q129.7656,27.1875 131.0781,25.5313 Q132.4063,23.875 134.9063,23.875 Q135.6094,23.875 136.25,24.0313 Q136.9063,24.1875 137.4688,24.4844 L137.4688,27.2031 Q136.8438,26.625 136.25,26.3594 Q135.6563,26.0781 135.0313,26.0781 Q133.6875,26.0781 133,27.1563 Q132.3125,28.2188 132.3125,30.3125 Q132.3125,32.4063 133,33.4844 Q133.6875,34.5469 135.0313,34.5469 Q135.6563,34.5469 136.25,34.2813 Q136.8438,34 137.4688,33.4219 L137.4688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="148.5" y="34.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="45" x="164.5" y="11.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="165.5" y="23.6387">double</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="54.5" y2="54.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
+      <ellipse cx="257" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M259.9688,36.1406 Q259.3906,36.4375 258.75,36.5781 Q258.1094,36.7344 257.4063,36.7344 Q254.9063,36.7344 253.5781,35.0938 Q252.2656,33.4375 252.2656,30.3125 Q252.2656,27.1875 253.5781,25.5313 Q254.9063,23.875 257.4063,23.875 Q258.1094,23.875 258.75,24.0313 Q259.4063,24.1875 259.9688,24.4844 L259.9688,27.2031 Q259.3438,26.625 258.75,26.3594 Q258.1563,26.0781 257.5313,26.0781 Q256.1875,26.0781 255.5,27.1563 Q254.8125,28.2188 254.8125,30.3125 Q254.8125,32.4063 255.5,33.4844 Q256.1875,34.5469 257.5313,34.5469 Q258.1563,34.5469 258.75,34.2813 Q259.3438,34 259.9688,33.4219 L259.9688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="34.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="64" x="287" y="11.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="288" y="23.6387">std::string</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="54.5" y2="54.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
+      <ellipse cx="398" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M400.9688,36.1406 Q400.3906,36.4375 399.75,36.5781 Q399.1094,36.7344 398.4063,36.7344 Q395.9063,36.7344 394.5781,35.0938 Q393.2656,33.4375 393.2656,30.3125 Q393.2656,27.1875 394.5781,25.5313 Q395.9063,23.875 398.4063,23.875 Q399.1094,23.875 399.75,24.0313 Q400.4063,24.1875 400.9688,24.4844 L400.9688,27.2031 Q400.3438,26.625 399.75,26.3594 Q399.1563,26.0781 398.5313,26.0781 Q397.1875,26.0781 396.5,27.1563 Q395.8125,28.2188 395.8125,30.3125 Q395.8125,32.4063 396.5,33.4844 Q397.1875,34.5469 398.5313,34.5469 Q399.1563,34.5469 399.75,34.2813 Q400.3438,34 400.9688,33.4219 L400.9688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="412" y="34.6543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="50" x="428" y="11.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="48" x="429" y="23.6387">int,float</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384" x2="474" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="384" x2="474" y1="54.5" y2="54.5"/>
+    </a>
+    <path d="M72.96,69.24 C87.93,85.16 106.63,105.05 123.1,122.57 " fill="none" id="C_0001422802342059669545-&gt;C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="128.25,117.83,136.85,137.19,118.05,127.42,128.25,117.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M163,62.52 C163,77.27 163,96.99 163,115.2 " fill="none" id="C_0000364538479078826988-&gt;C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="170,115.48,163,135.48,156,115.48,170,115.48" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M270.79,62.52 C252.13,80.26 225.91,105.19 204,126.02 " fill="none" id="C_0000496773262538580186-&gt;C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="208.64,131.27,189.32,139.98,198.99,121.12,208.64,131.27" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M429,62.52 C429,75.55 429,92.48 429,108.8 " fill="none" id="C_0001833471931530161359-&gt;C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="436,108.82,429,128.82,422,108.82,436,108.82" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00042_class_mermaid.svg b/docs/test_cases/t00042_class_mermaid.svg
index 7066f0dd..c9b59370 100644
--- a/docs/test_cases/t00042_class_mermaid.svg
+++ b/docs/test_cases/t00042_class_mermaid.svg
@@ -1,64 +1,59 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 569.1875 246" style="max-width: 569.188px; background-color: white;" width="569.1875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M47.0703125,87L47.0703125,91.16666666666667C47.0703125,95.33333333333333,47.0703125,103.66666666666667,62.75262992984673,116.41849821420563C78.43494735969345,129.17032976174463,109.79958221938692,146.34065952348922,125.48189964923364,154.92582440436152L141.16421707908037,163.51098928523385"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.984375,76L184.984375,82C184.984375,88,184.984375,100,184.984375,109C184.984375,118,184.984375,124,184.984375,127L184.984375,130"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M346,76L346,82C346,88,346,100,326.55215917689395,115.11906519720993C307.10431835378785,130.23813039441987,268.20863670757575,148.47626078883977,248.76079588446967,157.59532598604972L229.31295506136362,166.71439118325966"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M509.6796875,76L509.6796875,82C509.6796875,88,509.6796875,100,509.6796875,107.16666666666667C509.6796875,114.33333333333333,509.6796875,116.66666666666667,509.6796875,117.83333333333333L509.6796875,119"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M47.0703125,87L47.0703125,91.16666666666667C47.0703125,95.33333333333333,47.0703125,103.66666666666667,65.38411458333333,117.85908438603447C83.69791666666667,132.0515021054023,120.32552083333333,152.10300421080458,138.63932291666666,162.12875526350572L156.953125,172.1545063162069"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.984375,76L184.984375,82C184.984375,88,184.984375,100,184.984375,112C184.984375,124,184.984375,136,184.984375,142L184.984375,148"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M346,76L346,82C346,88,346,100,323.8359375,116.39269771955361C301.671875,132.78539543910722,257.34375,153.57079087821447,235.1796875,163.96348859776808L213.015625,174.3561863173217"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M509.6796875,76L509.6796875,82C509.6796875,88,509.6796875,100,509.6796875,110.16666666666667C509.6796875,120.33333333333333,509.6796875,128.66666666666666,509.6796875,132.83333333333334L509.6796875,137"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -107,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000462160951579835462-0" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -131,7 +126,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L9">
+        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L9">
           <g title="A" id="classId-C_0001422802342059669545-1" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -149,13 +144,13 @@
               </foreignObject>
               <foreignObject transform="translate( -31.5703125, 2)" height="18" width="60.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+a : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+a : void </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001414456934388678010-2" class="node default clickable">
             <rect height="101" width="69.25" y="-50.5" x="-34.625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.625" x1="-34.625" class="divider"/>
@@ -184,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000364538479078826988-3" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -203,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L5">
+        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000496773262538580186-4" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -222,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001833471931530161359-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
diff --git a/docs/test_cases/t00043.md b/docs/test_cases/t00043.md
index 3c402377..be2f8518 100644
--- a/docs/test_cases/t00043.md
+++ b/docs/test_cases/t00043.md
@@ -85,11 +85,11 @@ struct J {
   "diagram_type": "class",
   "elements": [
     {
-      "display_name": "clanguml::t00043::dependants",
+      "display_name": "dependants",
       "elements": [
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependants::A",
+          "display_name": "dependants::A",
           "id": "1454679300998460550",
           "is_abstract": false,
           "is_nested": false,
@@ -111,7 +111,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependants::B",
+          "display_name": "dependants::B",
           "id": "1972977265990430931",
           "is_abstract": false,
           "is_nested": false,
@@ -165,7 +165,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependants::BB",
+          "display_name": "dependants::BB",
           "id": "1906291555025945295",
           "is_abstract": false,
           "is_nested": false,
@@ -219,7 +219,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependants::C",
+          "display_name": "dependants::C",
           "id": "823759225351121534",
           "is_abstract": false,
           "is_nested": false,
@@ -273,7 +273,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependants::D",
+          "display_name": "dependants::D",
           "id": "2277976215348279426",
           "is_abstract": false,
           "is_nested": false,
@@ -358,7 +358,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependants::E",
+          "display_name": "dependants::E",
           "id": "1694685540293810116",
           "is_abstract": false,
           "is_nested": false,
@@ -415,11 +415,11 @@ struct J {
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t00043::dependencies",
+      "display_name": "dependencies",
       "elements": [
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependencies::G",
+          "display_name": "dependencies::G",
           "id": "736400571183204899",
           "is_abstract": false,
           "is_nested": false,
@@ -441,7 +441,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependencies::GG",
+          "display_name": "dependencies::GG",
           "id": "1522297681294871411",
           "is_abstract": false,
           "is_nested": false,
@@ -463,7 +463,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependencies::H",
+          "display_name": "dependencies::H",
           "id": "1534191494825314170",
           "is_abstract": false,
           "is_nested": false,
@@ -548,7 +548,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependencies::I",
+          "display_name": "dependencies::I",
           "id": "97422543769740359",
           "is_abstract": false,
           "is_nested": false,
@@ -602,7 +602,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00043::dependencies::J",
+          "display_name": "dependencies::J",
           "id": "1498530043106438011",
           "is_abstract": false,
           "is_nested": false,
@@ -660,6 +660,7 @@ struct J {
     }
   ],
   "name": "t00043_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg
index 259b5c5e..3c82ea0e 100644
--- a/docs/test_cases/t00043_class.svg
+++ b/docs/test_cases/t00043_class.svg
@@ -1,237 +1,197 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="645px" preserveAspectRatio="none" style="width:508px;height:645px;background:#FFFFFF;" version="1.1" viewBox="0 0 508 645" width="508px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="645px" preserveAspectRatio="none" style="width:512px;height:645px;" version="1.1" viewBox="0 0 512 645" width="512px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f197p1jzp6tkel" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0000304447182504144601">
-      <path d="M8.5,6.294 L91.5,6.294 A3.75,3.75 0 0 1 94,8.794 L101,29.0939 L302.5,29.0939 A2.5,2.5 0 0 1 305,31.5939 L305,635.594 A2.5,2.5 0 0 1 302.5,638.094 L8.5,638.094 A2.5,2.5 0 0 1 6,635.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="101" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="10" y="21.2999">dependants</text>
-    </g>
-    <g id="cluster_C_0001483444584386955509">
-      <path d="M331.5,6.294 L429.5,6.294 A3.75,3.75 0 0 1 432,8.794 L439,29.0939 L498.5,29.0939 A2.5,2.5 0 0 1 501,31.5939 L501,519.194 A2.5,2.5 0 0 1 498.5,521.694 L331.5,521.694 A2.5,2.5 0 0 1 329,519.194 L329,8.794 A2.5,2.5 0 0 1 331.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="329" x2="439" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="97" x="333" y="21.2999">dependencies</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001454679300998460550">
-        <rect codeLine="3" fill="#F1F1F1" height="48" id="C_0001454679300998460550" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="136.5" y="574.094"/>
-        <ellipse cx="151.5" cy="590.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M146.5,591.2502 C146.5,593.7502 148.6406,595.5627 151.5625,595.5627 C152.7969,595.5627 153.9688,595.2659 154.7188,594.7502 C155.3281,594.3284 155.6563,593.9065 155.6563,593.5002 C155.6563,593.0315 155.2344,592.6252 154.7344,592.6252 C154.5,592.6252 154.2813,592.7034 154.0781,592.9065 C153.6406,593.344 153.6406,593.344 153.4688,593.4377 C153.0156,593.6721 152.375,593.8127 151.6094,593.8127 C149.6094,593.8127 148.3281,592.7971 148.3281,591.219 L148.3281,590.1721 C148.3281,588.469 149.5469,587.2659 151.25,587.2659 C151.8281,587.2659 152.4063,587.4065 152.875,587.6565 C153.3438,587.9221 153.5156,588.1096 153.5781,588.469 C153.7031,589.1409 153.9531,589.3909 154.4844,589.3909 C154.7656,589.3909 155.0469,589.2502 155.2344,589.0315 C155.3594,588.8596 155.4063,588.6877 155.4063,588.2502 L155.4063,586.8909 C155.4063,586.469 155.3906,586.3284 155.2656,586.1565 C155.0938,585.9065 154.8125,585.7502 154.4844,585.7502 C154.1719,585.7502 153.9688,585.8596 153.75,586.1252 C152.5781,585.6252 152.1406,585.5159 151.1875,585.5159 C148.5156,585.5159 146.5,587.5315 146.5,590.1565 L146.5,591.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="165.5" y="594.7">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="137.5" x2="176.5" y1="606.094" y2="606.094"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="137.5" x2="176.5" y1="614.094" y2="614.094"/>
-      </g>
+    <polygon fill="#FFFFFF" filter="url(#f197p1jzp6tkel)" points="22,24,122,24,129,46.2969,304,46.2969,304,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
+    <polygon fill="#FFFFFF" filter="url(#f197p1jzp6tkel)" points="328,24,446,24,453,46.2969,490,46.2969,490,518.5,328,518.5,328,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="328" x2="453" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="332" y="38.9951">dependencies</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="144" y="569"/>
+      <ellipse cx="159" cy="585" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M161.9688,590.6406 Q161.3906,590.9375 160.75,591.0781 Q160.1094,591.2344 159.4063,591.2344 Q156.9063,591.2344 155.5781,589.5938 Q154.2656,587.9375 154.2656,584.8125 Q154.2656,581.6875 155.5781,580.0313 Q156.9063,578.375 159.4063,578.375 Q160.1094,578.375 160.75,578.5313 Q161.4063,578.6875 161.9688,578.9844 L161.9688,581.7031 Q161.3438,581.125 160.75,580.8594 Q160.1563,580.5781 159.5313,580.5781 Q158.1875,580.5781 157.5,581.6563 Q156.8125,582.7188 156.8125,584.8125 Q156.8125,586.9063 157.5,587.9844 Q158.1875,589.0469 159.5313,589.0469 Q160.1563,589.0469 160.75,588.7813 Q161.3438,588.5 161.9688,587.9219 L161.9688,590.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="173" y="589.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="601" y2="601"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="609" y2="609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001972977265990430931">
-        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001972977265990430931" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="177" y="449.294"/>
-        <ellipse cx="224.25" cy="465.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M219.25,466.4502 C219.25,468.9502 221.3906,470.7627 224.3125,470.7627 C225.5469,470.7627 226.7188,470.4659 227.4688,469.9502 C228.0781,469.5284 228.4063,469.1065 228.4063,468.7002 C228.4063,468.2315 227.9844,467.8252 227.4844,467.8252 C227.25,467.8252 227.0313,467.9034 226.8281,468.1065 C226.3906,468.544 226.3906,468.544 226.2188,468.6377 C225.7656,468.8721 225.125,469.0127 224.3594,469.0127 C222.3594,469.0127 221.0781,467.9971 221.0781,466.419 L221.0781,465.3721 C221.0781,463.669 222.2969,462.4659 224,462.4659 C224.5781,462.4659 225.1563,462.6065 225.625,462.8565 C226.0938,463.1221 226.2656,463.3096 226.3281,463.669 C226.4531,464.3409 226.7031,464.5909 227.2344,464.5909 C227.5156,464.5909 227.7969,464.4502 227.9844,464.2315 C228.1094,464.0596 228.1563,463.8877 228.1563,463.4502 L228.1563,462.0909 C228.1563,461.669 228.1406,461.5284 228.0156,461.3565 C227.8438,461.1065 227.5625,460.9502 227.2344,460.9502 C226.9219,460.9502 226.7188,461.0596 226.5,461.3252 C225.3281,460.8252 224.8906,460.7159 223.9375,460.7159 C221.2656,460.7159 219.25,462.7315 219.25,465.3565 L219.25,466.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="244.75" y="469.9">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="178" x2="288" y1="481.294" y2="481.294"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="183" y="490.1939"/>
-          <ellipse cx="188" cy="495.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="86" x="197" y="498.2999">b(A * a) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="178" x2="288" y1="506.0939" y2="506.0939"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="184" y="448"/>
+      <ellipse cx="227.8" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M230.7688,469.6406 Q230.1906,469.9375 229.55,470.0781 Q228.9094,470.2344 228.2063,470.2344 Q225.7063,470.2344 224.3781,468.5938 Q223.0656,466.9375 223.0656,463.8125 Q223.0656,460.6875 224.3781,459.0313 Q225.7063,457.375 228.2063,457.375 Q228.9094,457.375 229.55,457.5313 Q230.2063,457.6875 230.7688,457.9844 L230.7688,460.7031 Q230.1438,460.125 229.55,459.8594 Q228.9563,459.5781 228.3313,459.5781 Q226.9875,459.5781 226.3,460.6563 Q225.6125,461.7188 225.6125,463.8125 Q225.6125,465.9063 226.3,466.9844 Q226.9875,468.0469 228.3313,468.0469 Q228.9563,468.0469 229.55,467.7813 Q230.1438,467.5 230.7688,466.9219 L230.7688,469.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="248.2" y="468.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="480" y2="480"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <g id="elem_C_0001906291555025945295">
-        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0001906291555025945295" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="22" y="449.294"/>
-        <ellipse cx="68.75" cy="465.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M63.75,466.4502 C63.75,468.9502 65.8906,470.7627 68.8125,470.7627 C70.0469,470.7627 71.2188,470.4659 71.9688,469.9502 C72.5781,469.5284 72.9063,469.1065 72.9063,468.7002 C72.9063,468.2315 72.4844,467.8252 71.9844,467.8252 C71.75,467.8252 71.5313,467.9034 71.3281,468.1065 C70.8906,468.544 70.8906,468.544 70.7188,468.6377 C70.2656,468.8721 69.625,469.0127 68.8594,469.0127 C66.8594,469.0127 65.5781,467.9971 65.5781,466.419 L65.5781,465.3721 C65.5781,463.669 66.7969,462.4659 68.5,462.4659 C69.0781,462.4659 69.6563,462.6065 70.125,462.8565 C70.5938,463.1221 70.7656,463.3096 70.8281,463.669 C70.9531,464.3409 71.2031,464.5909 71.7344,464.5909 C72.0156,464.5909 72.2969,464.4502 72.4844,464.2315 C72.6094,464.0596 72.6563,463.8877 72.6563,463.4502 L72.6563,462.0909 C72.6563,461.669 72.6406,461.5284 72.5156,461.3565 C72.3438,461.1065 72.0625,460.9502 71.7344,460.9502 C71.4219,460.9502 71.2188,461.0596 71,461.3252 C69.8281,460.8252 69.3906,460.7159 68.4375,460.7159 C65.7656,460.7159 63.75,462.7315 63.75,465.3565 L63.75,466.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="89.25" y="469.9">BB</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="23" x2="141" y1="481.294" y2="481.294"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="28" y="490.1939"/>
-          <ellipse cx="33" cy="495.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="94" x="42" y="498.2999">bb(A * a) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="23" x2="141" y1="506.0939" y2="506.0939"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="190" y="486"/>
+      <ellipse cx="195" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000823759225351121534">
-        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0000823759225351121534" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="111" x="162.5" y="316.094"/>
-        <ellipse cx="208.75" cy="332.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M203.75,333.2502 C203.75,335.7502 205.8906,337.5627 208.8125,337.5627 C210.0469,337.5627 211.2188,337.2659 211.9688,336.7502 C212.5781,336.3284 212.9063,335.9065 212.9063,335.5002 C212.9063,335.0315 212.4844,334.6252 211.9844,334.6252 C211.75,334.6252 211.5313,334.7034 211.3281,334.9065 C210.8906,335.344 210.8906,335.344 210.7188,335.4377 C210.2656,335.6721 209.625,335.8127 208.8594,335.8127 C206.8594,335.8127 205.5781,334.7971 205.5781,333.219 L205.5781,332.1721 C205.5781,330.469 206.7969,329.2659 208.5,329.2659 C209.0781,329.2659 209.6563,329.4065 210.125,329.6565 C210.5938,329.9221 210.7656,330.1096 210.8281,330.469 C210.9531,331.1409 211.2031,331.3909 211.7344,331.3909 C212.0156,331.3909 212.2969,331.2502 212.4844,331.0315 C212.6094,330.8596 212.6563,330.6877 212.6563,330.2502 L212.6563,328.8909 C212.6563,328.469 212.6406,328.3284 212.5156,328.1565 C212.3438,327.9065 212.0625,327.7502 211.7344,327.7502 C211.4219,327.7502 211.2188,327.8596 211,328.1252 C209.8281,327.6252 209.3906,327.5159 208.4375,327.5159 C205.7656,327.5159 203.75,329.5315 203.75,332.1565 L203.75,333.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="229.25" y="336.7">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="163.5" x2="272.5" y1="348.094" y2="348.094"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="168.5" y="356.9939"/>
-          <ellipse cx="173.5" cy="361.9939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="182.5" y="365.0999">c(B * b) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="163.5" x2="272.5" y1="372.8939" y2="372.8939"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="204" y="494.2104">b(A * a) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0002277976215348279426">
-        <rect codeLine="22" fill="#F1F1F1" height="81.5999" id="C_0002277976215348279426" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="63.5" y="166.094"/>
-        <ellipse cx="122.75" cy="182.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M117.75,183.2502 C117.75,185.7502 119.8906,187.5627 122.8125,187.5627 C124.0469,187.5627 125.2188,187.2659 125.9688,186.7502 C126.5781,186.3284 126.9063,185.9065 126.9063,185.5002 C126.9063,185.0315 126.4844,184.6252 125.9844,184.6252 C125.75,184.6252 125.5313,184.7034 125.3281,184.9065 C124.8906,185.344 124.8906,185.344 124.7188,185.4377 C124.2656,185.6721 123.625,185.8127 122.8594,185.8127 C120.8594,185.8127 119.5781,184.7971 119.5781,183.219 L119.5781,182.1721 C119.5781,180.469 120.7969,179.2659 122.5,179.2659 C123.0781,179.2659 123.6563,179.4065 124.125,179.6565 C124.5938,179.9221 124.7656,180.1096 124.8281,180.469 C124.9531,181.1409 125.2031,181.3909 125.7344,181.3909 C126.0156,181.3909 126.2969,181.2502 126.4844,181.0315 C126.6094,180.8596 126.6563,180.6877 126.6563,180.2502 L126.6563,178.8909 C126.6563,178.469 126.6406,178.3284 126.5156,178.1565 C126.3438,177.9065 126.0625,177.7502 125.7344,177.7502 C125.4219,177.7502 125.2188,177.8596 125,178.1252 C123.8281,177.6252 123.3906,177.5159 122.4375,177.5159 C119.7656,177.5159 117.75,179.5315 117.75,182.1565 L117.75,183.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="143.25" y="186.7">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="64.5" x2="199.5" y1="198.094" y2="198.094"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="206.9939"/>
-          <ellipse cx="74.5" cy="211.9939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="86" x="83.5" y="215.0999">d(C * c) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="69.5" y="223.7939"/>
-          <ellipse cx="74.5" cy="228.7939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="83.5" y="231.8999">dd(BB * bb) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="64.5" x2="199.5" y1="239.6938" y2="239.6938"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="500.8047" y2="500.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="111" x="37.5" y="448"/>
+      <ellipse cx="80.85" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M83.8188,469.6406 Q83.2406,469.9375 82.6,470.0781 Q81.9594,470.2344 81.2563,470.2344 Q78.7563,470.2344 77.4281,468.5938 Q76.1156,466.9375 76.1156,463.8125 Q76.1156,460.6875 77.4281,459.0313 Q78.7563,457.375 81.2563,457.375 Q81.9594,457.375 82.6,457.5313 Q83.2563,457.6875 83.8188,457.9844 L83.8188,460.7031 Q83.1938,460.125 82.6,459.8594 Q82.0063,459.5781 81.3813,459.5781 Q80.0375,459.5781 79.35,460.6563 Q78.6625,461.7188 78.6625,463.8125 Q78.6625,465.9063 79.35,466.9844 Q80.0375,468.0469 81.3813,468.0469 Q82.0063,468.0469 82.6,467.7813 Q83.1938,467.5 83.8188,466.9219 L83.8188,469.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="101.15" y="468.1543">BB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="480" y2="480"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001694685540293810116">
-        <rect codeLine="28" fill="#F1F1F1" height="64.7999" id="C_0001694685540293810116" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="75.5" y="41.294"/>
-        <ellipse cx="123.25" cy="57.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M118.25,58.4502 C118.25,60.9502 120.3906,62.7627 123.3125,62.7627 C124.5469,62.7627 125.7188,62.4659 126.4688,61.9502 C127.0781,61.5284 127.4063,61.1065 127.4063,60.7002 C127.4063,60.2315 126.9844,59.8252 126.4844,59.8252 C126.25,59.8252 126.0313,59.9034 125.8281,60.1065 C125.3906,60.544 125.3906,60.544 125.2188,60.6377 C124.7656,60.8721 124.125,61.0127 123.3594,61.0127 C121.3594,61.0127 120.0781,59.9971 120.0781,58.419 L120.0781,57.3721 C120.0781,55.669 121.2969,54.4659 123,54.4659 C123.5781,54.4659 124.1563,54.6065 124.625,54.8565 C125.0938,55.1221 125.2656,55.3096 125.3281,55.669 C125.4531,56.3409 125.7031,56.5909 126.2344,56.5909 C126.5156,56.5909 126.7969,56.4502 126.9844,56.2315 C127.1094,56.0596 127.1563,55.8877 127.1563,55.4502 L127.1563,54.0909 C127.1563,53.669 127.1406,53.5284 127.0156,53.3565 C126.8438,53.1065 126.5625,52.9502 126.2344,52.9502 C125.9219,52.9502 125.7188,53.0596 125.5,53.3252 C124.3281,52.8252 123.8906,52.7159 122.9375,52.7159 C120.2656,52.7159 118.25,54.7315 118.25,57.3565 L118.25,58.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="143.75" y="61.9">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="76.5" x2="187.5" y1="73.294" y2="73.294"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="81.5" y="82.1939"/>
-          <ellipse cx="86.5" cy="87.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="95.5" y="90.2999">e(D * d) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="76.5" x2="187.5" y1="98.0939" y2="98.0939"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="43.5" y="486"/>
+      <ellipse cx="48.5" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0000736400571183204899">
-        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0000736400571183204899" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="348.5" y="457.694"/>
-        <ellipse cx="363.5" cy="473.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M358.5,474.8502 C358.5,477.3502 360.6406,479.1627 363.5625,479.1627 C364.7969,479.1627 365.9688,478.8659 366.7188,478.3502 C367.3281,477.9284 367.6563,477.5065 367.6563,477.1002 C367.6563,476.6315 367.2344,476.2252 366.7344,476.2252 C366.5,476.2252 366.2813,476.3034 366.0781,476.5065 C365.6406,476.944 365.6406,476.944 365.4688,477.0377 C365.0156,477.2721 364.375,477.4127 363.6094,477.4127 C361.6094,477.4127 360.3281,476.3971 360.3281,474.819 L360.3281,473.7721 C360.3281,472.069 361.5469,470.8659 363.25,470.8659 C363.8281,470.8659 364.4063,471.0065 364.875,471.2565 C365.3438,471.5221 365.5156,471.7096 365.5781,472.069 C365.7031,472.7409 365.9531,472.9909 366.4844,472.9909 C366.7656,472.9909 367.0469,472.8502 367.2344,472.6315 C367.3594,472.4596 367.4063,472.2877 367.4063,471.8502 L367.4063,470.4909 C367.4063,470.069 367.3906,469.9284 367.2656,469.7565 C367.0938,469.5065 366.8125,469.3502 366.4844,469.3502 C366.1719,469.3502 365.9688,469.4596 365.75,469.7252 C364.5781,469.2252 364.1406,469.1159 363.1875,469.1159 C360.5156,469.1159 358.5,471.1315 358.5,473.7565 L358.5,474.8502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="377.5" y="478.3">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="349.5" x2="390.5" y1="489.694" y2="489.694"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="349.5" x2="390.5" y1="497.694" y2="497.694"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="57.5" y="494.2104">bb(A * a) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
-      <g id="elem_C_0001522297681294871411">
-        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001522297681294871411" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="426" y="457.694"/>
-        <ellipse cx="441" cy="473.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M436,474.8502 C436,477.3502 438.1406,479.1627 441.0625,479.1627 C442.2969,479.1627 443.4688,478.8659 444.2188,478.3502 C444.8281,477.9284 445.1563,477.5065 445.1563,477.1002 C445.1563,476.6315 444.7344,476.2252 444.2344,476.2252 C444,476.2252 443.7813,476.3034 443.5781,476.5065 C443.1406,476.944 443.1406,476.944 442.9688,477.0377 C442.5156,477.2721 441.875,477.4127 441.1094,477.4127 C439.1094,477.4127 437.8281,476.3971 437.8281,474.819 L437.8281,473.7721 C437.8281,472.069 439.0469,470.8659 440.75,470.8659 C441.3281,470.8659 441.9063,471.0065 442.375,471.2565 C442.8438,471.5221 443.0156,471.7096 443.0781,472.069 C443.2031,472.7409 443.4531,472.9909 443.9844,472.9909 C444.2656,472.9909 444.5469,472.8502 444.7344,472.6315 C444.8594,472.4596 444.9063,472.2877 444.9063,471.8502 L444.9063,470.4909 C444.9063,470.069 444.8906,469.9284 444.7656,469.7565 C444.5938,469.5065 444.3125,469.3502 443.9844,469.3502 C443.6719,469.3502 443.4688,469.4596 443.25,469.7252 C442.0781,469.2252 441.6406,469.1159 440.6875,469.1159 C438.0156,469.1159 436,471.1315 436,473.7565 L436,474.8502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="22" x="455" y="478.3">GG</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="427" x2="479" y1="489.694" y2="489.694"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="427" x2="479" y1="497.694" y2="497.694"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="500.8047" y2="500.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="170" y="320.5"/>
+      <ellipse cx="213.8" cy="336.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M216.7688,342.1406 Q216.1906,342.4375 215.55,342.5781 Q214.9094,342.7344 214.2063,342.7344 Q211.7063,342.7344 210.3781,341.0938 Q209.0656,339.4375 209.0656,336.3125 Q209.0656,333.1875 210.3781,331.5313 Q211.7063,329.875 214.2063,329.875 Q214.9094,329.875 215.55,330.0313 Q216.2063,330.1875 216.7688,330.4844 L216.7688,333.2031 Q216.1438,332.625 215.55,332.3594 Q214.9563,332.0781 214.3313,332.0781 Q212.9875,332.0781 212.3,333.1563 Q211.6125,334.2188 211.6125,336.3125 Q211.6125,338.4063 212.3,339.4844 Q212.9875,340.5469 214.3313,340.5469 Q214.9563,340.5469 215.55,340.2813 Q216.1438,340 216.7688,339.4219 L216.7688,342.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="234.2" y="340.6543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <g id="elem_C_0001534191494825314170">
-        <rect codeLine="43" fill="#F1F1F1" height="81.5999" id="C_0001534191494825314170" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="141" x="344.5" y="307.694"/>
-        <ellipse cx="405.75" cy="323.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M400.75,324.8502 C400.75,327.3502 402.8906,329.1627 405.8125,329.1627 C407.0469,329.1627 408.2188,328.8659 408.9688,328.3502 C409.5781,327.9284 409.9063,327.5065 409.9063,327.1002 C409.9063,326.6315 409.4844,326.2252 408.9844,326.2252 C408.75,326.2252 408.5313,326.3034 408.3281,326.5065 C407.8906,326.944 407.8906,326.944 407.7188,327.0377 C407.2656,327.2721 406.625,327.4127 405.8594,327.4127 C403.8594,327.4127 402.5781,326.3971 402.5781,324.819 L402.5781,323.7721 C402.5781,322.069 403.7969,320.8659 405.5,320.8659 C406.0781,320.8659 406.6563,321.0065 407.125,321.2565 C407.5938,321.5221 407.7656,321.7096 407.8281,322.069 C407.9531,322.7409 408.2031,322.9909 408.7344,322.9909 C409.0156,322.9909 409.2969,322.8502 409.4844,322.6315 C409.6094,322.4596 409.6563,322.2877 409.6563,321.8502 L409.6563,320.4909 C409.6563,320.069 409.6406,319.9284 409.5156,319.7565 C409.3438,319.5065 409.0625,319.3502 408.7344,319.3502 C408.4219,319.3502 408.2188,319.4596 408,319.7252 C406.8281,319.2252 406.3906,319.1159 405.4375,319.1159 C402.7656,319.1159 400.75,321.1315 400.75,323.7565 L400.75,324.8502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="426.25" y="328.3">H</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="345.5" x2="484.5" y1="339.694" y2="339.694"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="350.5" y="348.5939"/>
-          <ellipse cx="355.5" cy="353.5939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="364.5" y="356.6999">h(G * g) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="350.5" y="365.3939"/>
-          <ellipse cx="355.5" cy="370.3939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="364.5" y="373.4999">hh(GG * gg) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="345.5" x2="484.5" y1="381.2938" y2="381.2938"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="176" y="358.5"/>
+      <ellipse cx="181" cy="363.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <g id="elem_C_0000097422543769740359">
-        <rect codeLine="49" fill="#F1F1F1" height="64.7999" id="C_0000097422543769740359" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="361" y="174.494"/>
-        <ellipse cx="408.75" cy="190.494" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M403.75,191.6502 C403.75,194.1502 405.8906,195.9627 408.8125,195.9627 C410.0469,195.9627 411.2188,195.6659 411.9688,195.1502 C412.5781,194.7284 412.9063,194.3065 412.9063,193.9002 C412.9063,193.4315 412.4844,193.0252 411.9844,193.0252 C411.75,193.0252 411.5313,193.1034 411.3281,193.3065 C410.8906,193.744 410.8906,193.744 410.7188,193.8377 C410.2656,194.0721 409.625,194.2127 408.8594,194.2127 C406.8594,194.2127 405.5781,193.1971 405.5781,191.619 L405.5781,190.5721 C405.5781,188.869 406.7969,187.6659 408.5,187.6659 C409.0781,187.6659 409.6563,187.8065 410.125,188.0565 C410.5938,188.3221 410.7656,188.5096 410.8281,188.869 C410.9531,189.5409 411.2031,189.7909 411.7344,189.7909 C412.0156,189.7909 412.2969,189.6502 412.4844,189.4315 C412.6094,189.2596 412.6563,189.0877 412.6563,188.6502 L412.6563,187.2909 C412.6563,186.869 412.6406,186.7284 412.5156,186.5565 C412.3438,186.3065 412.0625,186.1502 411.7344,186.1502 C411.4219,186.1502 411.2188,186.2596 411,186.5252 C409.8281,186.0252 409.3906,185.9159 408.4375,185.9159 C405.7656,185.9159 403.75,187.9315 403.75,190.5565 L403.75,191.6502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="429.25" y="195.1">I</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="468" y1="206.494" y2="206.494"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="215.3939"/>
-          <ellipse cx="372" cy="220.3939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="381" y="223.4999">i(H * h) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="468" y1="231.2939" y2="231.2939"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="190" y="366.7104">c(B * b) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <g id="elem_C_0001498530043106438011">
-        <rect codeLine="54" fill="#F1F1F1" height="64.7999" id="C_0001498530043106438011" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="366.5" y="41.294"/>
-        <ellipse cx="407.6" cy="57.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M402.6,58.4502 C402.6,60.9502 404.7406,62.7627 407.6625,62.7627 C408.8969,62.7627 410.0688,62.4659 410.8188,61.9502 C411.4281,61.5284 411.7563,61.1065 411.7563,60.7002 C411.7563,60.2315 411.3344,59.8252 410.8344,59.8252 C410.6,59.8252 410.3813,59.9034 410.1781,60.1065 C409.7406,60.544 409.7406,60.544 409.5688,60.6377 C409.1156,60.8721 408.475,61.0127 407.7094,61.0127 C405.7094,61.0127 404.4281,59.9971 404.4281,58.419 L404.4281,57.3721 C404.4281,55.669 405.6469,54.4659 407.35,54.4659 C407.9281,54.4659 408.5063,54.6065 408.975,54.8565 C409.4438,55.1221 409.6156,55.3096 409.6781,55.669 C409.8031,56.3409 410.0531,56.5909 410.5844,56.5909 C410.8656,56.5909 411.1469,56.4502 411.3344,56.2315 C411.4594,56.0596 411.5063,55.8877 411.5063,55.4502 L411.5063,54.0909 C411.5063,53.669 411.4906,53.5284 411.3656,53.3565 C411.1938,53.1065 410.9125,52.9502 410.5844,52.9502 C410.2719,52.9502 410.0688,53.0596 409.85,53.3252 C408.6781,52.8252 408.2406,52.7159 407.2875,52.7159 C404.6156,52.7159 402.6,54.7315 402.6,57.3565 L402.6,58.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="427.4" y="61.9">J</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="367.5" x2="462.5" y1="73.294" y2="73.294"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="372.5" y="82.1939"/>
-          <ellipse cx="377.5" cy="87.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="386.5" y="90.2999">i(I * i) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="367.5" x2="462.5" y1="98.0939" y2="98.0939"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="373.3047" y2="373.3047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="77.5" y="180"/>
+      <ellipse cx="132.25" cy="196" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M135.2188,201.6406 Q134.6406,201.9375 134,202.0781 Q133.3594,202.2344 132.6563,202.2344 Q130.1563,202.2344 128.8281,200.5938 Q127.5156,198.9375 127.5156,195.8125 Q127.5156,192.6875 128.8281,191.0313 Q130.1563,189.375 132.6563,189.375 Q133.3594,189.375 134,189.5313 Q134.6563,189.6875 135.2188,189.9844 L135.2188,192.7031 Q134.5938,192.125 134,191.8594 Q133.4063,191.5781 132.7813,191.5781 Q131.4375,191.5781 130.75,192.6563 Q130.0625,193.7188 130.0625,195.8125 Q130.0625,197.9063 130.75,198.9844 Q131.4375,200.0469 132.7813,200.0469 Q133.4063,200.0469 134,199.7813 Q134.5938,199.5 135.2188,198.9219 L135.2188,201.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="152.75" y="200.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="212" y2="212"/>
     </a>
-    <g id="link_C_0001972977265990430931_C_0001454679300998460550">
-      <path codeLine="59" d="M211.83,514.564 C199.36,533.334 187.1701,551.6763 175.8301,568.7463 " fill="none" id="C_0001972977265990430931-to-C_0001454679300998460550" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="172.51,573.744,180.8219,568.4608,175.2767,569.5792,174.1583,564.034,172.51,573.744" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001906291555025945295_C_0001454679300998460550">
-      <path codeLine="60" d="M102.89,514.564 C115.2,533.334 127.2106,551.6561 138.4006,568.7261 " fill="none" id="C_0001906291555025945295-to-C_0001454679300998460550" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="141.69,573.744,140.1011,564.0241,138.9488,569.5624,133.4106,568.41,141.69,573.744" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000823759225351121534_C_0001972977265990430931">
-      <path codeLine="61" d="M221.63,381.254 C223.99,401.884 226.369,422.6928 228.719,443.2628 " fill="none" id="C_0000823759225351121534-to-C_0001972977265990430931" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="229.4,449.224,232.3526,439.8281,228.8325,444.2563,224.4043,440.7362,229.4,449.224" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002277976215348279426_C_0000823759225351121534">
-      <path codeLine="62" d="M156.64,247.894 C169.95,269.494 182.9824,290.6559 195.3924,310.7959 " fill="none" id="C_0002277976215348279426-to-C_0000823759225351121534" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="198.54,315.904,197.2241,306.1434,195.917,311.6472,190.4133,310.3402,198.54,315.904" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002277976215348279426_C_0001906291555025945295">
-      <path codeLine="63" d="M124.62,248.144 C114.63,302.684 98.0611,393.0622 88.9311,442.9022 " fill="none" id="C_0002277976215348279426-to-C_0001906291555025945295" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="87.85,448.804,93.4062,440.672,88.7509,443.8858,85.5372,439.2305,87.85,448.804" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001694685540293810116_C_0002277976215348279426">
-      <path codeLine="64" d="M132,106.454 C132,124.354 132,140.874 132,159.964 " fill="none" id="C_0001694685540293810116-to-C_0002277976215348279426" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="132,165.964,136,156.964,132,160.964,128,156.964,132,165.964" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001534191494825314170_C_0000736400571183204899">
-      <path codeLine="65" d="M401.25,389.574 C393.65,411.724 386.4272,432.8087 379.9872,451.5787 " fill="none" id="C_0001534191494825314170-to-C_0000736400571183204899" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="378.04,457.254,384.7443,450.0392,379.6627,452.5246,377.1773,447.443,378.04,457.254" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001534191494825314170_C_0001522297681294871411">
-      <path codeLine="66" d="M426.61,389.574 C433.02,411.724 439.0998,432.7211 444.5398,451.4911 " fill="none" id="C_0001534191494825314170-to-C_0001522297681294871411" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="446.21,457.254,447.5466,447.4962,444.8182,452.4516,439.8628,449.7232,446.21,457.254" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000097422543769740359_C_0001534191494825314170">
-      <path codeLine="67" d="M415,239.574 C415,259.684 415,279.884 415,301.434 " fill="none" id="C_0000097422543769740359-to-C_0001534191494825314170" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="415,307.434,419,298.434,415,302.434,411,298.434,415,307.434" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001498530043106438011_C_0000097422543769740359">
-      <path codeLine="68" d="M415,106.454 C415,127.084 415,147.854 415,168.424 " fill="none" id="C_0001498530043106438011-to-C_0000097422543769740359" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="415,174.424,419,165.424,415,169.424,411,165.424,415,174.424" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="218"/>
+      <ellipse cx="88.5" cy="223" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="97.5" y="226.2104">d(C * c) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="230.8047"/>
+      <ellipse cx="88.5" cy="235.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="97.5" y="239.0151">dd(BB * bb) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="245.6094" y2="245.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="88.5" y="59"/>
+      <ellipse cx="132.75" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M135.7188,80.6406 Q135.1406,80.9375 134.5,81.0781 Q133.8594,81.2344 133.1563,81.2344 Q130.6563,81.2344 129.3281,79.5938 Q128.0156,77.9375 128.0156,74.8125 Q128.0156,71.6875 129.3281,70.0313 Q130.6563,68.375 133.1563,68.375 Q133.8594,68.375 134.5,68.5313 Q135.1563,68.6875 135.7188,68.9844 L135.7188,71.7031 Q135.0938,71.125 134.5,70.8594 Q133.9063,70.5781 133.2813,70.5781 Q131.9375,70.5781 131.25,71.6563 Q130.5625,72.7188 130.5625,74.8125 Q130.5625,76.9063 131.25,77.9844 Q131.9375,79.0469 133.2813,79.0469 Q133.9063,79.0469 134.5,78.7813 Q135.0938,78.5 135.7188,77.9219 L135.7188,80.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="153.25" y="79.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="91" y2="91"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="94.5" y="97"/>
+      <ellipse cx="99.5" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="108.5" y="105.2104">e(D * d) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="111.8047" y2="111.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="345.5" y="454.5"/>
+      <ellipse cx="360.5" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M363.4688,476.1406 Q362.8906,476.4375 362.25,476.5781 Q361.6094,476.7344 360.9063,476.7344 Q358.4063,476.7344 357.0781,475.0938 Q355.7656,473.4375 355.7656,470.3125 Q355.7656,467.1875 357.0781,465.5313 Q358.4063,463.875 360.9063,463.875 Q361.6094,463.875 362.25,464.0313 Q362.9063,464.1875 363.4688,464.4844 L363.4688,467.2031 Q362.8438,466.625 362.25,466.3594 Q361.6563,466.0781 361.0313,466.0781 Q359.6875,466.0781 359,467.1563 Q358.3125,468.2188 358.3125,470.3125 Q358.3125,472.4063 359,473.4844 Q359.6875,474.5469 361.0313,474.5469 Q361.6563,474.5469 362.25,474.2813 Q362.8438,474 363.4688,473.4219 L363.4688,476.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="374.5" y="474.6543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="486.5" y2="486.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="494.5" y2="494.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="422" y="454.5"/>
+      <ellipse cx="437" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M439.9688,476.1406 Q439.3906,476.4375 438.75,476.5781 Q438.1094,476.7344 437.4063,476.7344 Q434.9063,476.7344 433.5781,475.0938 Q432.2656,473.4375 432.2656,470.3125 Q432.2656,467.1875 433.5781,465.5313 Q434.9063,463.875 437.4063,463.875 Q438.1094,463.875 438.75,464.0313 Q439.4063,464.1875 439.9688,464.4844 L439.9688,467.2031 Q439.3438,466.625 438.75,466.3594 Q438.1563,466.0781 437.5313,466.0781 Q436.1875,466.0781 435.5,467.1563 Q434.8125,468.2188 434.8125,470.3125 Q434.8125,472.4063 435.5,473.4844 Q436.1875,474.5469 437.5313,474.5469 Q438.1563,474.5469 438.75,474.2813 Q439.3438,474 439.9688,473.4219 L439.9688,476.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="451" y="474.6543">GG</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="486.5" y2="486.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="494.5" y2="494.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="344.5" y="314"/>
+      <ellipse cx="400.25" cy="330" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M403.2188,335.6406 Q402.6406,335.9375 402,336.0781 Q401.3594,336.2344 400.6563,336.2344 Q398.1563,336.2344 396.8281,334.5938 Q395.5156,332.9375 395.5156,329.8125 Q395.5156,326.6875 396.8281,325.0313 Q398.1563,323.375 400.6563,323.375 Q401.3594,323.375 402,323.5313 Q402.6563,323.6875 403.2188,323.9844 L403.2188,326.7031 Q402.5938,326.125 402,325.8594 Q401.4063,325.5781 400.7813,325.5781 Q399.4375,325.5781 398.75,326.6563 Q398.0625,327.7188 398.0625,329.8125 Q398.0625,331.9063 398.75,332.9844 Q399.4375,334.0469 400.7813,334.0469 Q401.4063,334.0469 402,333.7813 Q402.5938,333.5 403.2188,332.9219 L403.2188,335.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="420.75" y="334.1543">H</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="346" y2="346"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="352"/>
+      <ellipse cx="355.5" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="80" x="364.5" y="360.2104">h(G * g) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="364.8047"/>
+      <ellipse cx="355.5" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="364.5" y="373.0151">hh(GG * gg) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="379.6094" y2="379.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="358.5" y="186.5"/>
+      <ellipse cx="403.25" cy="202.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M406.2188,208.1406 Q405.6406,208.4375 405,208.5781 Q404.3594,208.7344 403.6563,208.7344 Q401.1563,208.7344 399.8281,207.0938 Q398.5156,205.4375 398.5156,202.3125 Q398.5156,199.1875 399.8281,197.5313 Q401.1563,195.875 403.6563,195.875 Q404.3594,195.875 405,196.0313 Q405.6563,196.1875 406.2188,196.4844 L406.2188,199.2031 Q405.5938,198.625 405,198.3594 Q404.4063,198.0781 403.7813,198.0781 Q402.4375,198.0781 401.75,199.1563 Q401.0625,200.2188 401.0625,202.3125 Q401.0625,204.4063 401.75,205.4844 Q402.4375,206.5469 403.7813,206.5469 Q404.4063,206.5469 405,206.2813 Q405.5938,206 406.2188,205.4219 L406.2188,208.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.75" y="206.6543">I</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="218.5" y2="218.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="364.5" y="224.5"/>
+      <ellipse cx="369.5" cy="229.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="378.5" y="232.7104">i(H * h) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="239.3047" y2="239.3047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="363" y="59"/>
+      <ellipse cx="403.65" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M406.6188,80.6406 Q406.0406,80.9375 405.4,81.0781 Q404.7594,81.2344 404.0563,81.2344 Q401.5563,81.2344 400.2281,79.5938 Q398.9156,77.9375 398.9156,74.8125 Q398.9156,71.6875 400.2281,70.0313 Q401.5563,68.375 404.0563,68.375 Q404.7594,68.375 405.4,68.5313 Q406.0563,68.6875 406.6188,68.9844 L406.6188,71.7031 Q405.9938,71.125 405.4,70.8594 Q404.8063,70.5781 404.1813,70.5781 Q402.8375,70.5781 402.15,71.6563 Q401.4625,72.7188 401.4625,74.8125 Q401.4625,76.9063 402.15,77.9844 Q402.8375,79.0469 404.1813,79.0469 Q404.8063,79.0469 405.4,78.7813 Q405.9938,78.5 406.6188,77.9219 L406.6188,80.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.35" y="79.1543">J</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="91" y2="91"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="369" y="97"/>
+      <ellipse cx="374" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="383" y="105.2104">i(I * i) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="111.8047" y2="111.8047"/>
+    <path d="M217.08,509.06 C206.19,526.08 192.58,547.34 181.87,564.08 " fill="none" id="C_0001972977265990430931-&gt;C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="178.93,568.67,187.1532,563.2497,181.6273,564.4599,180.4171,558.9341,178.93,568.67" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M111.65,509.06 C122.4,526.08 135.81,547.34 146.38,564.08 " fill="none" id="C_0001906291555025945295-&gt;C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="149.28,568.67,147.8784,558.9214,146.6197,564.4364,141.1047,563.1778,149.28,568.67" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225.32,381.74 C227.36,400.03 229.98,423.54 232.12,442.69 " fill="none" id="C_0000823759225351121534-&gt;C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="232.71,447.97,235.6828,438.5805,232.1531,443.0011,227.7325,439.4715,232.71,447.97" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M163.13,254.07 C174.88,273.21 189.24,296.61 200.84,315.51 " fill="none" id="C_0002277976215348279426-&gt;C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="203.72,320.21,202.4335,310.4455,201.1099,315.9454,195.61,314.6217,203.72,320.21" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M134.33,254.08 C125.09,304.03 108.51,393.65 99.41,442.83 " fill="none" id="C_0002277976215348279426-&gt;C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="98.5,447.76,104.0787,439.6435,99.4145,442.8443,96.2137,438.1802,98.5,447.76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M141,120.24 C141,136.4 141,156.64 141,174.35 " fill="none" id="C_0001694685540293810116-&gt;C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="141,179.76,145,170.76,141,174.76,137,170.76,141,179.76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M396.56,388.3 C389.9,407.75 381.81,431.36 375.63,449.4 " fill="none" id="C_0001534191494825314170-&gt;C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="373.94,454.33,380.6332,447.105,375.5554,449.5981,373.0622,444.5203,373.94,454.33" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M419.99,388.3 C425.88,407.75 433.03,431.36 438.49,449.4 " fill="none" id="C_0001534191494825314170-&gt;C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="439.99,454.33,441.2218,444.5585,438.5467,449.5428,433.5623,446.8677,439.99,454.33" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M409,247.62 C409,265.63 409,288.88 409,308.67 " fill="none" id="C_0000097422543769740359-&gt;C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="409,313.89,413,304.89,409,308.89,405,304.89,409,313.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M409,120.24 C409,138.53 409,162.04 409,181.19 " fill="none" id="C_0001498530043106438011-&gt;C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="409,186.47,413,177.47,409,181.47,405,177.47,409,186.47" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00043_class_mermaid.svg b/docs/test_cases/t00043_class_mermaid.svg
index 7c66978f..3e6c6a45 100644
--- a/docs/test_cases/t00043_class_mermaid.svg
+++ b/docs/test_cases/t00043_class_mermaid.svg
@@ -1,70 +1,65 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 735.90625 633" style="max-width: 735.906px; background-color: white;" width="735.90625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 733.625 633" style="max-width: 733.625px; background-color: white;" width="733.625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M72.640625,518L72.640625,522.1666666666666C72.640625,526.3333333333334,72.640625,534.6666666666666,78.93832487529801,542.4971383410676C85.23602475059602,550.3276100154686,97.83142450119203,557.6552200309374,104.12912437649004,561.3190250386716L110.42682425178806,564.982830046406"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M256.5625,518L256.5625,522.1666666666666C256.5625,526.3333333333334,256.5625,534.6666666666666,250.264800124702,542.4971383410676C243.96710024940398,550.3276100154686,231.37170049880797,557.6552200309374,225.07400062350996,561.3190250386716L218.77630074821195,564.982830046406"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M72.640625,378L72.640625,384C72.640625,390,72.640625,402,72.640625,411.1666666666667C72.640625,420.3333333333333,72.640625,426.6666666666667,72.640625,429.8333333333333L72.640625,433"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M103.09126655629139,238L98.01615963024283,242.16666666666666C92.94105270419425,246.33333333333334,82.79083885209712,254.66666666666666,77.71573192604856,263.8333333333333C72.640625,273,72.640625,283,72.640625,288L72.640625,293"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M226.11185844370863,238L231.1869653697572,242.16666666666666C236.26207229580575,246.33333333333334,246.41228614790285,254.66666666666666,251.48739307395144,271.4166666666667C256.5625,288.1666666666667,256.5625,313.3333333333333,256.5625,338.5C256.5625,363.6666666666667,256.5625,388.8333333333333,256.5625,404.5833333333333C256.5625,420.3333333333333,256.5625,426.6666666666667,256.5625,429.8333333333333L256.5625,433"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M164.6015625,87L164.6015625,91.16666666666667C164.6015625,95.33333333333333,164.6015625,103.66666666666667,164.6015625,111C164.6015625,118.33333333333333,164.6015625,124.66666666666667,164.6015625,127.83333333333333L164.6015625,131"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M481.53331953642385,389L475.9860996136865,393.1666666666667C470.43887969094925,397.3333333333333,459.3444398454746,405.6666666666667,453.79721992273727,414.8333333333333C448.25,424,448.25,434,448.25,439L448.25,444"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M615.9979304635762,389L621.5451503863135,393.1666666666667C627.0923703090508,397.3333333333333,638.1868101545255,405.6666666666667,643.7340300772627,414.8333333333333C649.28125,424,649.28125,434,649.28125,439L649.28125,444"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M548.765625,227L548.765625,233C548.765625,239,548.765625,251,548.765625,260.1666666666667C548.765625,269.3333333333333,548.765625,275.6666666666667,548.765625,278.8333333333333L548.765625,282"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M548.765625,87L548.765625,91.16666666666667C548.765625,95.33333333333333,548.765625,103.66666666666667,548.765625,112.83333333333333C548.765625,122,548.765625,132,548.765625,137L548.765625,142"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M71.5,518L71.5,522.1666666666666C71.5,526.3333333333334,71.5,534.6666666666666,78.61764992211839,543C85.73529984423676,551.3333333333334,99.97059968847351,559.6666666666666,107.0882496105919,563.8333333333334L114.20589953271028,568"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M254.28125,518L254.28125,522.1666666666666C254.28125,526.3333333333334,254.28125,534.6666666666666,247.16360007788163,543C240.04595015576322,551.3333333333334,225.81065031152647,559.6666666666666,218.6930003894081,563.8333333333334L211.57535046728972,568"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M71.5,378L71.5,384C71.5,390,71.5,402,71.5,412.1666666666667C71.5,422.3333333333333,71.5,430.6666666666667,71.5,434.8333333333333L71.5,439"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M101.76179635761589,238L96.71816363134657,242.16666666666666C91.67453090507725,246.33333333333334,81.58726545253863,254.66666666666666,76.54363272626931,264.8333333333333C71.5,275,71.5,287,71.5,293L71.5,299"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M224.01945364238412,238L229.06308636865344,242.16666666666666C234.10671909492274,246.33333333333334,244.19398454746138,254.66666666666666,249.2376172737307,271.4166666666667C254.28125,288.1666666666667,254.28125,313.3333333333333,254.28125,338.5C254.28125,363.6666666666667,254.28125,388.8333333333333,254.28125,405.5833333333333C254.28125,422.3333333333333,254.28125,430.6666666666667,254.28125,434.8333333333333L254.28125,439"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M162.890625,87L162.890625,91.16666666666667C162.890625,95.33333333333333,162.890625,103.66666666666667,162.890625,112C162.890625,120.33333333333333,162.890625,128.66666666666666,162.890625,132.83333333333334L162.890625,137"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M479.25206953642385,389L473.7048496136865,393.1666666666667C468.15762969094925,397.3333333333333,457.0631898454746,405.6666666666667,451.51596992273727,415.8333333333333C445.96875,426,445.96875,438,445.96875,444L445.96875,450"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M613.7166804635762,389L619.2639003863135,393.1666666666667C624.8111203090508,397.3333333333333,635.9055601545255,405.6666666666667,641.4527800772627,415.8333333333333C647,426,647,438,647,444L647,450"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M546.484375,227L546.484375,233C546.484375,239,546.484375,251,546.484375,261.1666666666667C546.484375,271.3333333333333,546.484375,279.6666666666667,546.484375,283.8333333333333L546.484375,288"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M546.484375,87L546.484375,91.16666666666667C546.484375,95.33333333333333,546.484375,103.66666666666667,546.484375,113.83333333333333C546.484375,124,546.484375,136,546.484375,142L546.484375,148"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -179,7 +174,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(164.6015625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L4">
+        <a transform="translate(162.890625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L4">
           <g title="A" id="classId-C_0001454679300998460550-0" class="node default clickable">
             <rect height="57" width="127" y="-28.5" x="-63.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -198,11 +193,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(72.640625, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L6">
+        <a transform="translate(71.5, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L6">
           <g title="B" id="classId-C_0001972977265990430931-1" class="node default clickable">
-            <rect height="79" width="129.28125" y="-39.5" x="-64.640625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="64.640625" x1="-64.640625" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="64.640625" x1="-64.640625" class="divider"/>
+            <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.5" x1="-63.5" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -214,15 +209,15 @@
                   <span class="nodeLabel">dependants::B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -57.140625, 14)" height="18" width="114.28125">
+              <foreignObject transform="translate( -56, 14)" height="18" width="105.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+b(A * a) : : void</span>
+                  <span class="nodeLabel">+b(A * a) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(256.5625, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L10">
+        <a transform="translate(254.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L10">
           <g title="BB" id="classId-C_0001906291555025945295-2" class="node default clickable">
             <rect height="79" width="138.5625" y="-39.5" x="-69.28125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.28125" x1="-69.28125" class="divider"/>
@@ -238,19 +233,19 @@
                   <span class="nodeLabel">dependants::BB</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -61.78125, 14)" height="18" width="123.1875">
+              <foreignObject transform="translate( -61.78125, 14)" height="18" width="114.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+bb(A * a) : : void</span>
+                  <span class="nodeLabel">+bb(A * a) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(72.640625, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L14">
+        <a transform="translate(71.5, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L14">
           <g title="C" id="classId-C_0000823759225351121534-3" class="node default clickable">
-            <rect height="79" width="129.265625" y="-39.5" x="-64.6328125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="64.6328125" x1="-64.6328125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="64.6328125" x1="-64.6328125" class="divider"/>
+            <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.5" x1="-63.5" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -262,19 +257,19 @@
                   <span class="nodeLabel">dependants::C</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -57.1328125, 14)" height="18" width="114.265625">
+              <foreignObject transform="translate( -56, 14)" height="18" width="105.375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+c(B * b) : : void</span>
+                  <span class="nodeLabel">+c(B * b) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(164.6015625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L18">
+        <a transform="translate(162.890625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L18">
           <g title="D" id="classId-C_0002277976215348279426-4" class="node default clickable">
-            <rect height="101" width="158.640625" y="-50.5" x="-79.3203125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="79.3203125" x1="-79.3203125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="79.3203125" x1="-79.3203125" class="divider"/>
+            <rect height="101" width="149.75" y="-50.5" x="-74.875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="74.875" x1="-74.875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="74.875" x1="-74.875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -286,24 +281,24 @@
                   <span class="nodeLabel">dependants::D</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -71.8203125, 3)" height="18" width="115.15625">
+              <foreignObject transform="translate( -67.375, 3)" height="18" width="106.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+d(C * c) : : void</span>
+                  <span class="nodeLabel">+d(C * c) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -71.8203125, 25)" height="18" width="143.640625">
+              <foreignObject transform="translate( -67.375, 25)" height="18" width="134.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+dd(BB * bb) : : void</span>
+                  <span class="nodeLabel">+dd(BB * bb) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(164.6015625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L23">
+        <a transform="translate(162.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L23">
           <g title="E" id="classId-C_0001694685540293810116-5" class="node default clickable">
-            <rect height="79" width="131.046875" y="-39.5" x="-65.5234375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="65.5234375" x1="-65.5234375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="65.5234375" x1="-65.5234375" class="divider"/>
+            <rect height="79" width="126.125" y="-39.5" x="-63.0625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="63.0625" x1="-63.0625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="63.0625" x1="-63.0625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -315,15 +310,15 @@
                   <span class="nodeLabel">dependants::E</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -58.0234375, 14)" height="18" width="116.046875">
+              <foreignObject transform="translate( -55.5625, 14)" height="18" width="107.15625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+e(D * d) : : void</span>
+                  <span class="nodeLabel">+e(D * d) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(448.25, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L32">
+        <a transform="translate(445.96875, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L32">
           <g title="G" id="classId-C_0000736400571183204899-6" class="node default clickable">
             <rect height="57" width="144.8125" y="-28.5" x="-72.40625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.40625" x1="-72.40625" class="divider"/>
@@ -342,7 +337,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(649.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L34">
+        <a transform="translate(647, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L34">
           <g title="GG" id="classId-C_0001522297681294871411-7" class="node default clickable">
             <rect height="57" width="157.25" y="-28.5" x="-78.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="78.625" x1="-78.625" class="divider"/>
@@ -361,11 +356,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(548.765625, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L36">
+        <a transform="translate(546.484375, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L36">
           <g title="H" id="classId-C_0001534191494825314170-8" class="node default clickable">
-            <rect height="101" width="162.1875" y="-50.5" x="-81.09375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="81.09375" x1="-81.09375" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="81.09375" x1="-81.09375" class="divider"/>
+            <rect height="101" width="153.296875" y="-50.5" x="-76.6484375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="76.6484375" x1="-76.6484375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="76.6484375" x1="-76.6484375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -377,20 +372,20 @@
                   <span class="nodeLabel">dependencies::H</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -73.59375, 3)" height="18" width="116.9375">
+              <foreignObject transform="translate( -69.1484375, 3)" height="18" width="108.046875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+h(G * g) : : void</span>
+                  <span class="nodeLabel">+h(G * g) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -73.59375, 25)" height="18" width="147.1875">
+              <foreignObject transform="translate( -69.1484375, 25)" height="18" width="138.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+hh(GG * gg) : : void</span>
+                  <span class="nodeLabel">+hh(GG * gg) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(548.765625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L45">
+        <a transform="translate(546.484375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L45">
           <g title="I" id="classId-C_0000097422543769740359-9" class="node default clickable">
             <rect height="79" width="136.8125" y="-39.5" x="-68.40625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.40625" x1="-68.40625" class="divider"/>
@@ -406,15 +401,15 @@
                   <span class="nodeLabel">dependencies::I</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -60.90625, 14)" height="18" width="110.703125">
+              <foreignObject transform="translate( -60.90625, 14)" height="18" width="101.8125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+i(H * h) : : void</span>
+                  <span class="nodeLabel">+i(H * h) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(548.765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00043/t00043.cc#L49">
+        <a transform="translate(546.484375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L49">
           <g title="J" id="classId-C_0001498530043106438011-10" class="node default clickable">
             <rect height="79" width="141.265625" y="-39.5" x="-70.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="70.6328125" x1="-70.6328125" class="divider"/>
@@ -430,9 +425,9 @@
                   <span class="nodeLabel">dependencies::J</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -63.1328125, 14)" height="18" width="98.25">
+              <foreignObject transform="translate( -63.1328125, 14)" height="18" width="89.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+i(I * i) : : void</span>
+                  <span class="nodeLabel">+i(I * i) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00044.md b/docs/test_cases/t00044.md
index 4cf62d1c..e11b072d 100644
--- a/docs/test_cases/t00044.md
+++ b/docs/test_cases/t00044.md
@@ -65,7 +65,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00044::signal_handler<Ret(Args...),A>",
+      "display_name": "signal_handler<Ret(Args...),A>",
       "id": "1591729735727316875",
       "is_abstract": false,
       "is_nested": false,
@@ -112,7 +112,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00044::sink<clanguml::t00044::signal_handler<Ret(Args...),A>>",
+      "display_name": "sink<signal_handler<Ret(Args...),A>>",
       "id": "559574389062594251",
       "is_abstract": false,
       "is_nested": false,
@@ -231,7 +231,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00044::signal_handler<void(int),bool>",
+      "display_name": "signal_handler<void(int),bool>",
       "id": "103559998624864011",
       "is_abstract": false,
       "is_nested": false,
@@ -278,7 +278,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00044::sink<clanguml::t00044::signal_handler<void(int),bool>>",
+      "display_name": "sink<signal_handler<void(int),bool>>",
       "id": "1718007222067272862",
       "is_abstract": false,
       "is_nested": false,
@@ -332,7 +332,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00044::R",
+      "display_name": "R",
       "id": "1644484569399365272",
       "is_abstract": false,
       "is_nested": false,
@@ -367,7 +367,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00044::signal_handler<T,A>",
+      "display_name": "signal_handler<T,A>",
       "id": "276594465967577895",
       "is_abstract": false,
       "is_nested": false,
@@ -402,7 +402,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00044::sink<T>",
+      "display_name": "sink<T>",
       "id": "1759724482769288325",
       "is_abstract": false,
       "is_nested": false,
@@ -431,6 +431,7 @@ struct R {
     }
   ],
   "name": "t00044_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg
index 169ae58c..c4273877 100644
--- a/docs/test_cases/t00044_class.svg
+++ b/docs/test_cases/t00044_class.svg
@@ -1,145 +1,123 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="605px" preserveAspectRatio="none" style="width:483px;height:605px;background:#FFFFFF;" version="1.1" viewBox="0 0 483 605" width="483px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="594px" preserveAspectRatio="none" style="width:517px;height:594px;" version="1.1" viewBox="0 0 517 594" width="517px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fr13fm281tlrt" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <g id="elem_C_0001591729735727316875">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001591729735727316875" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="201" x="230.5" y="441.2"/>
-        <ellipse cx="245.5" cy="457.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M240.5,458.3563 C240.5,460.8563 242.6406,462.6688 245.5625,462.6688 C246.7969,462.6688 247.9688,462.3719 248.7188,461.8563 C249.3281,461.4344 249.6563,461.0125 249.6563,460.6063 C249.6563,460.1375 249.2344,459.7313 248.7344,459.7313 C248.5,459.7313 248.2813,459.8094 248.0781,460.0125 C247.6406,460.45 247.6406,460.45 247.4688,460.5438 C247.0156,460.7781 246.375,460.9188 245.6094,460.9188 C243.6094,460.9188 242.3281,459.9031 242.3281,458.325 L242.3281,457.2781 C242.3281,455.575 243.5469,454.3719 245.25,454.3719 C245.8281,454.3719 246.4063,454.5125 246.875,454.7625 C247.3438,455.0281 247.5156,455.2156 247.5781,455.575 C247.7031,456.2469 247.9531,456.4969 248.4844,456.4969 C248.7656,456.4969 249.0469,456.3563 249.2344,456.1375 C249.3594,455.9656 249.4063,455.7938 249.4063,455.3563 L249.4063,453.9969 C249.4063,453.575 249.3906,453.4344 249.2656,453.2625 C249.0938,453.0125 248.8125,452.8563 248.4844,452.8563 C248.1719,452.8563 247.9688,452.9656 247.75,453.2313 C246.5781,452.7313 246.1406,452.6219 245.1875,452.6219 C242.5156,452.6219 240.5,454.6375 240.5,457.2625 L240.5,458.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="259.5" y="461.806">signal_handler</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="74" x="360.5" y="438.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="72" x="361.5" y="452.4001">Ret(Args...),A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="231.5" x2="430.5" y1="473.2" y2="473.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="231.5" x2="430.5" y1="481.2" y2="481.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="248" y="426"/>
+      <ellipse cx="263" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M265.9688,447.6406 Q265.3906,447.9375 264.75,448.0781 Q264.1094,448.2344 263.4063,448.2344 Q260.9063,448.2344 259.5781,446.5938 Q258.2656,444.9375 258.2656,441.8125 Q258.2656,438.6875 259.5781,437.0313 Q260.9063,435.375 263.4063,435.375 Q264.1094,435.375 264.75,435.5313 Q265.4063,435.6875 265.9688,435.9844 L265.9688,438.7031 Q265.3438,438.125 264.75,437.8594 Q264.1563,437.5781 263.5313,437.5781 Q262.1875,437.5781 261.5,438.6563 Q260.8125,439.7188 260.8125,441.8125 Q260.8125,443.9063 261.5,444.9844 Q262.1875,446.0469 263.5313,446.0469 Q264.1563,446.0469 264.75,445.7813 Q265.3438,445.5 265.9688,444.9219 L265.9688,447.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="277" y="446.1543">signal_handler</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="84" x="376" y="423"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="377" y="435.1387">Ret(Args...),A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="458" y2="458"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="466" y2="466"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <g id="elem_C_0000559574389062594251">
-        <rect codeLine="6" fill="#F1F1F1" height="106.3998" id="C_0000559574389062594251" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="7" y="257.8"/>
-        <ellipse cx="22.45" cy="273.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17.45,274.9563 C17.45,277.4563 19.5906,279.2688 22.5125,279.2688 C23.7469,279.2688 24.9188,278.9719 25.6688,278.4563 C26.2781,278.0344 26.6063,277.6125 26.6063,277.2063 C26.6063,276.7375 26.1844,276.3313 25.6844,276.3313 C25.45,276.3313 25.2313,276.4094 25.0281,276.6125 C24.5906,277.05 24.5906,277.05 24.4188,277.1438 C23.9656,277.3781 23.325,277.5188 22.5594,277.5188 C20.5594,277.5188 19.2781,276.5031 19.2781,274.925 L19.2781,273.8781 C19.2781,272.175 20.4969,270.9719 22.2,270.9719 C22.7781,270.9719 23.3563,271.1125 23.825,271.3625 C24.2938,271.6281 24.4656,271.8156 24.5281,272.175 C24.6531,272.8469 24.9031,273.0969 25.4344,273.0969 C25.7156,273.0969 25.9969,272.9563 26.1844,272.7375 C26.3094,272.5656 26.3563,272.3938 26.3563,271.9563 L26.3563,270.5969 C26.3563,270.175 26.3406,270.0344 26.2156,269.8625 C26.0438,269.6125 25.7625,269.4563 25.4344,269.4563 C25.1219,269.4563 24.9188,269.5656 24.7,269.8313 C23.5281,269.3313 23.0906,269.2219 22.1375,269.2219 C19.4656,269.2219 17.45,271.2375 17.45,273.8625 L17.45,274.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="36.55" y="278.406">sink</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="170" x="70" y="254.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="168" x="71" y="269.0001">signal_handler&lt;Ret(Args...),A&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="236" y1="289.8" y2="289.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="298.7"/>
-          <ellipse cx="18" cy="303.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="154" x="27" y="306.8059">sink(signal_t &amp; sh) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="8" x2="236" y1="314.5999" y2="314.5999"/>
-        <ellipse cx="18" cy="328.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="27" y="331.6059">get_signal&lt;CastTo&gt;() : CastTo *</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="236" y1="339.3999" y2="339.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="348.2998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="350.2998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="27" y="356.4058">signal : signal_t *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="94.4141" id="C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="6" y="255"/>
+      <ellipse cx="21" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,276.6406 Q23.3906,276.9375 22.75,277.0781 Q22.1094,277.2344 21.4063,277.2344 Q18.9063,277.2344 17.5781,275.5938 Q16.2656,273.9375 16.2656,270.8125 Q16.2656,267.6875 17.5781,266.0313 Q18.9063,264.375 21.4063,264.375 Q22.1094,264.375 22.75,264.5313 Q23.4063,264.6875 23.9688,264.9844 L23.9688,267.7031 Q23.3438,267.125 22.75,266.8594 Q22.1563,266.5781 21.5313,266.5781 Q20.1875,266.5781 19.5,267.6563 Q18.8125,268.7188 18.8125,270.8125 Q18.8125,272.9063 19.5,273.9844 Q20.1875,275.0469 21.5313,275.0469 Q22.1563,275.0469 22.75,274.7813 Q23.3438,274.5 23.9688,273.9219 L23.9688,276.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="275.1543">sink</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="194" x="68" y="252"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="192" x="69" y="264.1387">signal_handler&lt;Ret(Args...),A&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <g id="elem_C_0000103559998624864011">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0000103559998624864011" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="200" x="272" y="287"/>
-        <ellipse cx="287" cy="303" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M282,304.1563 C282,306.6563 284.1406,308.4688 287.0625,308.4688 C288.2969,308.4688 289.4688,308.1719 290.2188,307.6563 C290.8281,307.2344 291.1563,306.8125 291.1563,306.4063 C291.1563,305.9375 290.7344,305.5313 290.2344,305.5313 C290,305.5313 289.7813,305.6094 289.5781,305.8125 C289.1406,306.25 289.1406,306.25 288.9688,306.3438 C288.5156,306.5781 287.875,306.7188 287.1094,306.7188 C285.1094,306.7188 283.8281,305.7031 283.8281,304.125 L283.8281,303.0781 C283.8281,301.375 285.0469,300.1719 286.75,300.1719 C287.3281,300.1719 287.9063,300.3125 288.375,300.5625 C288.8438,300.8281 289.0156,301.0156 289.0781,301.375 C289.2031,302.0469 289.4531,302.2969 289.9844,302.2969 C290.2656,302.2969 290.5469,302.1563 290.7344,301.9375 C290.8594,301.7656 290.9063,301.5938 290.9063,301.1563 L290.9063,299.7969 C290.9063,299.375 290.8906,299.2344 290.7656,299.0625 C290.5938,298.8125 290.3125,298.6563 289.9844,298.6563 C289.6719,298.6563 289.4688,298.7656 289.25,299.0313 C288.0781,298.5313 287.6406,298.4219 286.6875,298.4219 C284.0156,298.4219 282,300.4375 282,303.0625 L282,304.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="301" y="307.606">signal_handler</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="73" x="402" y="284"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="71" x="403" y="298.2001">void(int),bool</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="273" x2="471" y1="319" y2="319"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="273" x2="471" y1="327" y2="327"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
+      <ellipse cx="17" cy="298" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <g id="elem_C_0001718007222067272862">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001718007222067272862" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="228" x="132" y="148.8"/>
-        <ellipse cx="147" cy="164.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M142,165.9563 C142,168.4563 144.1406,170.2688 147.0625,170.2688 C148.2969,170.2688 149.4688,169.9719 150.2188,169.4563 C150.8281,169.0344 151.1563,168.6125 151.1563,168.2063 C151.1563,167.7375 150.7344,167.3313 150.2344,167.3313 C150,167.3313 149.7813,167.4094 149.5781,167.6125 C149.1406,168.05 149.1406,168.05 148.9688,168.1438 C148.5156,168.3781 147.875,168.5188 147.1094,168.5188 C145.1094,168.5188 143.8281,167.5031 143.8281,165.925 L143.8281,164.8781 C143.8281,163.175 145.0469,161.9719 146.75,161.9719 C147.3281,161.9719 147.9063,162.1125 148.375,162.3625 C148.8438,162.6281 149.0156,162.8156 149.0781,163.175 C149.2031,163.8469 149.4531,164.0969 149.9844,164.0969 C150.2656,164.0969 150.5469,163.9563 150.7344,163.7375 C150.8594,163.5656 150.9063,163.3938 150.9063,162.9563 L150.9063,161.5969 C150.9063,161.175 150.8906,161.0344 150.7656,160.8625 C150.5938,160.6125 150.3125,160.4563 149.9844,160.4563 C149.6719,160.4563 149.4688,160.5656 149.25,160.8313 C148.0781,160.3313 147.6406,160.2219 146.6875,160.2219 C144.0156,160.2219 142,162.2375 142,164.8625 L142,165.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="161" y="169.406">sink</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="169" x="194" y="145.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="167" x="195" y="160.0001">signal_handler&lt;void(int),bool&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="133" x2="359" y1="180.8" y2="180.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="133" x2="359" y1="188.8" y2="188.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="26" y="301.2104">sink(signal_t &amp; sh) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001644484569399365272">
-        <rect codeLine="22" fill="#F1F1F1" height="64.7999" id="C_0001644484569399365272" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="307" x="92.5" y="7"/>
-        <ellipse cx="236.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M231.75,24.1563 C231.75,26.6563 233.8906,28.4688 236.8125,28.4688 C238.0469,28.4688 239.2188,28.1719 239.9688,27.6563 C240.5781,27.2344 240.9063,26.8125 240.9063,26.4063 C240.9063,25.9375 240.4844,25.5313 239.9844,25.5313 C239.75,25.5313 239.5313,25.6094 239.3281,25.8125 C238.8906,26.25 238.8906,26.25 238.7188,26.3438 C238.2656,26.5781 237.625,26.7188 236.8594,26.7188 C234.8594,26.7188 233.5781,25.7031 233.5781,24.125 L233.5781,23.0781 C233.5781,21.375 234.7969,20.1719 236.5,20.1719 C237.0781,20.1719 237.6563,20.3125 238.125,20.5625 C238.5938,20.8281 238.7656,21.0156 238.8281,21.375 C238.9531,22.0469 239.2031,22.2969 239.7344,22.2969 C240.0156,22.2969 240.2969,22.1563 240.4844,21.9375 C240.6094,21.7656 240.6563,21.5938 240.6563,21.1563 L240.6563,19.7969 C240.6563,19.375 240.6406,19.2344 240.5156,19.0625 C240.3438,18.8125 240.0625,18.6563 239.7344,18.6563 C239.4219,18.6563 239.2188,18.7656 239,19.0313 C237.8281,18.5313 237.3906,18.4219 236.4375,18.4219 C233.7656,18.4219 231.75,20.4375 231.75,23.0625 L231.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="257.25" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="93.5" x2="398.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="93.5" x2="398.5" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="98.5" y="55.9"/>
-          <ellipse cx="103.5" cy="60.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="281" x="112.5" y="64.0059">sink1 : sink&lt;signal_handler&lt;void (int),bool&gt;&gt;</text>
-        </a>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="258" y1="307.8047" y2="307.8047"/>
+    <ellipse cx="17" cy="318.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="26" y="322.0151">get_signal&lt;CastTo&gt;() : CastTo *</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="328.6094" y2="328.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="334.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="336.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <g id="elem_C_0000276594465967577895">
-        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0000276594465967577895" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="147" x="257.5" y="550.2"/>
-        <ellipse cx="272.5" cy="566.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M267.5,567.3563 C267.5,569.8563 269.6406,571.6688 272.5625,571.6688 C273.7969,571.6688 274.9688,571.3719 275.7188,570.8563 C276.3281,570.4344 276.6563,570.0125 276.6563,569.6063 C276.6563,569.1375 276.2344,568.7313 275.7344,568.7313 C275.5,568.7313 275.2813,568.8094 275.0781,569.0125 C274.6406,569.45 274.6406,569.45 274.4688,569.5438 C274.0156,569.7781 273.375,569.9188 272.6094,569.9188 C270.6094,569.9188 269.3281,568.9031 269.3281,567.325 L269.3281,566.2781 C269.3281,564.575 270.5469,563.3719 272.25,563.3719 C272.8281,563.3719 273.4063,563.5125 273.875,563.7625 C274.3438,564.0281 274.5156,564.2156 274.5781,564.575 C274.7031,565.2469 274.9531,565.4969 275.4844,565.4969 C275.7656,565.4969 276.0469,565.3563 276.2344,565.1375 C276.3594,564.9656 276.4063,564.7938 276.4063,564.3563 L276.4063,562.9969 C276.4063,562.575 276.3906,562.4344 276.2656,562.2625 C276.0938,562.0125 275.8125,561.8563 275.4844,561.8563 C275.1719,561.8563 274.9688,561.9656 274.75,562.2313 C273.5781,561.7313 273.1406,561.6219 272.1875,561.6219 C269.5156,561.6219 267.5,563.6375 267.5,566.2625 L267.5,567.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="286.5" y="570.806">signal_handler</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="387.5" y="547.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="388.5" y="561.4001">T,A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="258.5" x2="403.5" y1="582.2" y2="582.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="258.5" x2="403.5" y1="590.2" y2="590.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="26" y="342.8198">signal : signal_t *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <g id="elem_C_0001759724482769288325">
-        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0001759724482769288325" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="88" y="441.2"/>
-        <ellipse cx="103" cy="457.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M98,458.3563 C98,460.8563 100.1406,462.6688 103.0625,462.6688 C104.2969,462.6688 105.4688,462.3719 106.2188,461.8563 C106.8281,461.4344 107.1563,461.0125 107.1563,460.6063 C107.1563,460.1375 106.7344,459.7313 106.2344,459.7313 C106,459.7313 105.7813,459.8094 105.5781,460.0125 C105.1406,460.45 105.1406,460.45 104.9688,460.5438 C104.5156,460.7781 103.875,460.9188 103.1094,460.9188 C101.1094,460.9188 99.8281,459.9031 99.8281,458.325 L99.8281,457.2781 C99.8281,455.575 101.0469,454.3719 102.75,454.3719 C103.3281,454.3719 103.9063,454.5125 104.375,454.7625 C104.8438,455.0281 105.0156,455.2156 105.0781,455.575 C105.2031,456.2469 105.4531,456.4969 105.9844,456.4969 C106.2656,456.4969 106.5469,456.3563 106.7344,456.1375 C106.8594,455.9656 106.9063,455.7938 106.9063,455.3563 L106.9063,453.9969 C106.9063,453.575 106.8906,453.4344 106.7656,453.2625 C106.5938,453.0125 106.3125,452.8563 105.9844,452.8563 C105.6719,452.8563 105.4688,452.9656 105.25,453.2313 C104.0781,452.7313 103.6406,452.6219 102.6875,452.6219 C100.0156,452.6219 98,454.6375 98,457.2625 L98,458.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="117" y="461.806">sink</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="150" y="438.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="151" y="452.4001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="89" x2="155" y1="473.2" y2="473.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="89" x2="155" y1="481.2" y2="481.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="294" y="278"/>
+      <ellipse cx="309" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M311.9688,299.6406 Q311.3906,299.9375 310.75,300.0781 Q310.1094,300.2344 309.4063,300.2344 Q306.9063,300.2344 305.5781,298.5938 Q304.2656,296.9375 304.2656,293.8125 Q304.2656,290.6875 305.5781,289.0313 Q306.9063,287.375 309.4063,287.375 Q310.1094,287.375 310.75,287.5313 Q311.4063,287.6875 311.9688,287.9844 L311.9688,290.7031 Q311.3438,290.125 310.75,289.8594 Q310.1563,289.5781 309.5313,289.5781 Q308.1875,289.5781 307.5,290.6563 Q306.8125,291.7188 306.8125,293.8125 Q306.8125,295.9063 307.5,296.9844 Q308.1875,298.0469 309.5313,298.0469 Q310.1563,298.0469 310.75,297.7813 Q311.3438,297.5 311.9688,296.9219 L311.9688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="323" y="298.1543">signal_handler</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="84" x="422" y="275"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="423" y="287.1387">void(int),bool</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="318" y2="318"/>
     </a>
-    <g id="link_C_0001591729735727316875_C_0000276594465967577895">
-      <path codeLine="34" d="M331,489.68 C331,507.52 331,513.95 331,531.77 " fill="none" id="C_0001591729735727316875-to-C_0000276594465967577895" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="331,549.77,337,531.77,325,531.77,331,549.77" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000559574389062594251_C_0001591729735727316875">
-      <path codeLine="35" d="M194.22,364.59 C229.85,390.54 266.19,416.9976 293.98,437.2376 " fill="none" id="C_0000559574389062594251-to-C_0001591729735727316875" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="298.83,440.77,293.9099,432.2381,294.7883,437.8264,289.2001,438.7048,298.83,440.77" style="stroke:#181818;stroke-width:1.0;"/>
-      <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="261" y="400.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="271" y="407.277">signal</text>
-    </g>
-    <g id="link_C_0000559574389062594251_C_0001759724482769288325">
-      <path codeLine="36" d="M122,364.38 C122,390.35 122,402.41 122,422.7 " fill="none" id="C_0000559574389062594251-to-C_0001759724482769288325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="122,440.7,128,422.7,116,422.7,122,440.7" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000103559998624864011_C_0001591729735727316875">
-      <path codeLine="37" d="M365.68,335.45 C357.98,364.05 349.7121,394.7296 342.0021,423.3496 " fill="none" id="C_0000103559998624864011-to-C_0001591729735727316875" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="337.32,440.73,347.7956,424.9103,336.2087,421.7889,337.32,440.73" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001718007222067272862_C_0000103559998624864011">
-      <path codeLine="38" d="M267.66,197.21 C290.88,222.31 323.4354,257.5057 346.5454,282.4857 " fill="none" id="C_0001718007222067272862-to-C_0000103559998624864011" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="350.62,286.89,347.4443,277.5672,347.2245,283.2198,341.5719,283,350.62,286.89" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001718007222067272862_C_0000559574389062594251">
-      <path codeLine="39" d="M224.68,197.21 C209.59,213.79 200.8467,223.3889 181.8767,244.2289 " fill="none" id="C_0001718007222067272862-to-C_0000559574389062594251" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="169.76,257.54,186.3137,248.2678,177.4397,240.19,169.76,257.54" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001644484569399365272_C_0001718007222067272862">
-      <path codeLine="40" d="M246,84.21 C246,107.75 246,127.3 246,148.52 " fill="none" id="C_0001644484569399365272-backto-C_0001718007222067272862" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="246,72.21,242,78.21,246,84.21,250,78.21,246,72.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="252" cy="111.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="259" y="114.877">sink1</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="138" y="146"/>
+      <ellipse cx="153" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M155.9688,167.6406 Q155.3906,167.9375 154.75,168.0781 Q154.1094,168.2344 153.4063,168.2344 Q150.9063,168.2344 149.5781,166.5938 Q148.2656,164.9375 148.2656,161.8125 Q148.2656,158.6875 149.5781,157.0313 Q150.9063,155.375 153.4063,155.375 Q154.1094,155.375 154.75,155.5313 Q155.4063,155.6875 155.9688,155.9844 L155.9688,158.7031 Q155.3438,158.125 154.75,157.8594 Q154.1563,157.5781 153.5313,157.5781 Q152.1875,157.5781 151.5,158.6563 Q150.8125,159.7188 150.8125,161.8125 Q150.8125,163.9063 151.5,164.9844 Q152.1875,166.0469 153.5313,166.0469 Q154.1563,166.0469 154.75,165.7813 Q155.3438,165.5 155.9688,164.9219 L155.9688,167.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="167" y="166.1543">sink</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="194" x="200" y="143"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="192" x="201" y="155.1387">signal_handler&lt;void(int),bool&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="178" y2="178"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="186" y2="186"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="60.8047" id="C_0001644484569399365272" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="121" y="8"/>
+      <ellipse cx="256.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M259.2188,29.6406 Q258.6406,29.9375 258,30.0781 Q257.3594,30.2344 256.6563,30.2344 Q254.1563,30.2344 252.8281,28.5938 Q251.5156,26.9375 251.5156,23.8125 Q251.5156,20.6875 252.8281,19.0313 Q254.1563,17.375 256.6563,17.375 Q257.3594,17.375 258,17.5313 Q258.6563,17.6875 259.2188,17.9844 L259.2188,20.7031 Q258.5938,20.125 258,19.8594 Q257.4063,19.5781 256.7813,19.5781 Q255.4375,19.5781 254.75,20.6563 Q254.0625,21.7188 254.0625,23.8125 Q254.0625,25.9063 254.75,26.9844 Q255.4375,28.0469 256.7813,28.0469 Q257.4063,28.0469 258,27.7813 Q258.5938,27.5 259.2188,26.9219 L259.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="276.75" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="127" y="54"/>
+      <ellipse cx="132" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="261" x="141" y="62.2104">sink1 : sink&lt;signal_handler&lt;void (int),bool&gt;&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="279.5" y="535"/>
+      <ellipse cx="294.5" cy="551" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M297.4688,556.6406 Q296.8906,556.9375 296.25,557.0781 Q295.6094,557.2344 294.9063,557.2344 Q292.4063,557.2344 291.0781,555.5938 Q289.7656,553.9375 289.7656,550.8125 Q289.7656,547.6875 291.0781,546.0313 Q292.4063,544.375 294.9063,544.375 Q295.6094,544.375 296.25,544.5313 Q296.9063,544.6875 297.4688,544.9844 L297.4688,547.7031 Q296.8438,547.125 296.25,546.8594 Q295.6563,546.5781 295.0313,546.5781 Q293.6875,546.5781 293,547.6563 Q292.3125,548.7188 292.3125,550.8125 Q292.3125,552.9063 293,553.9844 Q293.6875,555.0469 295.0313,555.0469 Q295.6563,555.0469 296.25,554.7813 Q296.8438,554.5 297.4688,553.9219 L297.4688,556.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="308.5" y="555.1543">signal_handler</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="21" x="407.5" y="532"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="19" x="408.5" y="544.1387">T,A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="567" y2="567"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="575" y2="575"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="98.5" y="426"/>
+      <ellipse cx="113.5" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M116.4688,447.6406 Q115.8906,447.9375 115.25,448.0781 Q114.6094,448.2344 113.9063,448.2344 Q111.4063,448.2344 110.0781,446.5938 Q108.7656,444.9375 108.7656,441.8125 Q108.7656,438.6875 110.0781,437.0313 Q111.4063,435.375 113.9063,435.375 Q114.6094,435.375 115.25,435.5313 Q115.9063,435.6875 116.4688,435.9844 L116.4688,438.7031 Q115.8438,438.125 115.25,437.8594 Q114.6563,437.5781 114.0313,437.5781 Q112.6875,437.5781 112,438.6563 Q111.3125,439.7188 111.3125,441.8125 Q111.3125,443.9063 112,444.9844 Q112.6875,446.0469 114.0313,446.0469 Q114.6563,446.0469 115.25,445.7813 Q115.8438,445.5 116.4688,444.9219 L116.4688,447.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="127.5" y="446.1543">sink</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="160.5" y="423"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="161.5" y="435.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99.5" x2="165.5" y1="458" y2="458"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="99.5" x2="165.5" y1="466" y2="466"/>
+    </a>
+    <path d="M352.5,474.22 C352.5,486 352.5,500.69 352.5,514.48 " fill="none" id="C_0001591729735727316875-&gt;C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="359.5,514.83,352.5,534.83,345.5,514.83,359.5,514.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M202.11,349.2 C238.82,373.56 282.51,402.55 313.31,422.99 " fill="none" id="C_0000559574389062594251-&gt;C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="317.76,425.95,312.4574,417.6504,313.5888,423.193,308.0462,424.3244,317.76,425.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="272.5" y="385.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="282.5" y="392.0669">signal</text>
+    <path d="M132.5,349.2 C132.5,367.27 132.5,387.89 132.5,405.68 " fill="none" id="C_0000559574389062594251-&gt;C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="139.5,405.95,132.5,425.95,125.5,405.95,139.5,405.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M391.21,326.13 C384.41,347.71 374.11,380.41 365.84,406.65 " fill="none" id="C_0000103559998624864011-&gt;C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="372.44,409,359.75,425.97,359.09,404.79,372.44,409" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M288.46,194.24 C311.61,216.7 346.65,250.7 370.95,274.27 " fill="none" id="C_0001718007222067272862-&gt;C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="374.75,277.96,371.0848,268.8185,371.1648,274.4748,365.5085,274.5548,374.75,277.96" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M240.9,194.24 C227.71,207.23 210.6,224.08 193.88,240.55 " fill="none" id="C_0001718007222067272862-&gt;C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="198.57,245.76,179.41,254.8,188.74,235.78,198.57,245.76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M264.5,82.5 C264.5,103.65 264.5,128.32 264.5,145.88 " fill="none" id="C_0001644484569399365272&lt;-C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="264.5,69.21,260.5,75.21,264.5,81.21,268.5,75.21,264.5,69.21" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="270.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="33" x="277.5" y="112.0669">sink1</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00044_class_mermaid.svg b/docs/test_cases/t00044_class_mermaid.svg
index 44861534..0edaa5eb 100644
--- a/docs/test_cases/t00044_class_mermaid.svg
+++ b/docs/test_cases/t00044_class_mermaid.svg
@@ -1,67 +1,62 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 613.46875 625" style="max-width: 613.469px; background-color: white;" width="613.46875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M153.74609375,510L153.74609375,514.1666666666666C153.74609375,518.3333333333334,153.74609375,526.6666666666666,153.74609375,532C153.74609375,537.3333333333334,153.74609375,539.6666666666666,153.74609375,540.8333333333334L153.74609375,542"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M365.4854180301047,385L357.17339523342054,390.6666666666667C348.8613724367365,396.3333333333333,332.23732684336824,407.6666666666667,310.1822205412821,418.63979928454796C288.1271142391959,429.61293190242924,260.6409472283919,440.2258638048586,246.89786372298985,445.53232975607324L233.1547802175878,450.8387957072879"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M469.72449689136124,385L471.017158867801,390.6666666666667C472.30982084424085,396.3333333333333,474.8951447971204,407.6666666666667,476.18780677356017,416C477.48046875,424.3333333333333,477.48046875,429.6666666666667,477.48046875,432.3333333333333L477.48046875,435"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M131.9609375,352L131.9609375,363.1666666666667C131.9609375,374.3333333333333,131.9609375,396.6666666666667,132.9487023441578,410.66715752313513C133.93646718831562,424.6676483796037,135.91199687663124,430.33529675920744,136.89976172078903,433.16912094900925L137.88752656494685,436.0029451388111"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M207.5998101635514,212L194.99333138629285,216.16666666666666C182.38685260903426,220.33333333333334,157.17389505451715,228.66666666666666,144.56741627725856,241.5C131.9609375,254.33333333333334,131.9609375,271.6666666666667,131.9609375,280.3333333333333L131.9609375,289"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M380.0564398364486,212L392.6629186137072,216.16666666666666C405.2693973909657,220.33333333333334,430.4823549454829,228.66666666666666,443.0888337227414,234C455.6953125,239.33333333333334,455.6953125,241.66666666666666,455.6953125,242.83333333333334L455.6953125,244"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M293.828125,105L293.828125,107.66666666666667C293.828125,110.33333333333333,293.828125,115.66666666666667,293.828125,124C293.828125,132.33333333333334,293.828125,143.66666666666666,293.828125,149.33333333333334L293.828125,155"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M153.74609375,510L153.74609375,514.1666666666666C153.74609375,518.3333333333334,153.74609375,526.6666666666666,153.74609375,535C153.74609375,543.3333333333334,153.74609375,551.6666666666666,153.74609375,555.8333333333334L153.74609375,560"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M365.4854180301047,385L357.17339523342054,390.6666666666667C348.8613724367365,396.3333333333333,332.23732684336824,407.6666666666667,309.2493457133508,419C286.2613645833333,430.3333333333333,256.9094479166667,441.6666666666667,242.23348958333335,447.3333333333333L227.55753125,453"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M469.72449689136124,385L471.017158867801,390.6666666666667C472.30982084424085,396.3333333333333,474.8951447971204,407.6666666666667,476.18780677356017,419C477.48046875,430.3333333333333,477.48046875,441.6666666666667,477.48046875,447.3333333333333L477.48046875,453"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M131.9609375,352L131.9609375,363.1666666666667C131.9609375,374.3333333333333,131.9609375,396.6666666666667,133.936125,413.5C135.9113125,430.3333333333333,139.8616875,441.6666666666667,141.836875,447.3333333333333L143.8120625,453"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M207.5998101635514,212L194.99333138629285,216.16666666666666C182.38685260903426,220.33333333333334,157.17389505451715,228.66666666666666,144.56741627725856,242.5C131.9609375,256.3333333333333,131.9609375,275.6666666666667,131.9609375,285.3333333333333L131.9609375,295"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M380.0564398364486,212L392.6629186137072,216.16666666666666C405.2693973909657,220.33333333333334,430.4823549454829,228.66666666666666,443.0888337227414,237C455.6953125,245.33333333333334,455.6953125,253.66666666666666,455.6953125,257.8333333333333L455.6953125,262"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M293.828125,87L293.828125,92.66666666666667C293.828125,98.33333333333333,293.828125,109.66666666666667,293.828125,121C293.828125,132.33333333333334,293.828125,143.66666666666666,293.828125,149.33333333333334L293.828125,155"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -143,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9">
+        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9">
           <g title="signal_handler" id="classId-C_0001591729735727316875-0" class="node default clickable">
             <rect height="57" width="248.84375" y="-28.5" x="-124.421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="124.421875" x1="-124.421875" class="divider"/>
@@ -162,7 +157,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L9">
+        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9">
           <g title="sink" id="classId-C_0000559574389062594251-1" class="node default clickable">
             <rect height="123" width="299.546875" y="-61.5" x="-149.7734375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="149.7734375" x1="-149.7734375" class="divider"/>
@@ -180,23 +175,23 @@
               </foreignObject>
               <foreignObject transform="translate( -142.2734375, -20)" height="18" width="115.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-signal : signal_t</span>
+                  <span style="font-style:italic;" class="nodeLabel">-signal : signal_t </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -142.2734375, 14)" height="18" width="191.640625">
+              <foreignObject transform="translate( -142.2734375, 14)" height="18" width="182.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sink(signal_t &amp; sh) : : void</span>
+                  <span class="nodeLabel">+sink(signal_t &amp; sh) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -142.2734375, 36)" height="18" width="165.28125">
+              <foreignObject transform="translate( -142.2734375, 36)" height="18" width="156.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+get_signal() : : CastTo</span>
+                  <span style="font-style:italic;" class="nodeLabel">+get_signal() : CastTo</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4">
+        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4">
           <g title="signal_handler" id="classId-C_0000103559998624864011-2" class="node default clickable">
             <rect height="57" width="247.921875" y="-28.5" x="-123.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="123.9609375" x1="-123.9609375" class="divider"/>
@@ -215,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4">
+        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001718007222067272862-3" class="node default clickable">
             <rect height="57" width="298.625" y="-28.5" x="-149.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.3125" x1="-149.3125" class="divider"/>
@@ -234,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L33">
+        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L33">
           <g title="R" id="classId-C_0001644484569399365272-4" class="node default clickable">
             <rect height="79" width="340.984375" y="-39.5" x="-170.4921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="170.4921875" x1="-170.4921875" class="divider"/>
@@ -258,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L6">
+        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L6">
           <g title="signal_handler" id="classId-C_0000276594465967577895-5" class="node default clickable">
             <rect height="57" width="170.609375" y="-28.5" x="-85.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.3046875" x1="-85.3046875" class="divider"/>
@@ -277,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00044/t00044.cc#L4">
+        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001759724482769288325-6" class="node default clickable">
             <rect height="57" width="75.484375" y="-28.5" x="-37.7421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="37.7421875" x1="-37.7421875" class="divider"/>
diff --git a/docs/test_cases/t00045.md b/docs/test_cases/t00045.md
index 0f47adf1..4659275c 100644
--- a/docs/test_cases/t00045.md
+++ b/docs/test_cases/t00045.md
@@ -462,6 +462,7 @@ public:
     }
   ],
   "name": "t00045_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg
index 75abbfb1..5be5be00 100644
--- a/docs/test_cases/t00045_class.svg
+++ b/docs/test_cases/t00045_class.svg
@@ -1,220 +1,182 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:667px;height:380px;background:#FFFFFF;" version="1.1" viewBox="0 0 667 380" width="667px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="365px" preserveAspectRatio="none" style="width:670px;height:365px;" version="1.1" viewBox="0 0 670 365" width="670px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1dv2vlcayt093" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000864916647665253425">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000864916647665253425" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="38" y="216"/>
-        <ellipse cx="53" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M48,233.1563 C48,235.6563 50.1406,237.4688 53.0625,237.4688 C54.2969,237.4688 55.4688,237.1719 56.2188,236.6563 C56.8281,236.2344 57.1563,235.8125 57.1563,235.4063 C57.1563,234.9375 56.7344,234.5313 56.2344,234.5313 C56,234.5313 55.7813,234.6094 55.5781,234.8125 C55.1406,235.25 55.1406,235.25 54.9688,235.3438 C54.5156,235.5781 53.875,235.7188 53.1094,235.7188 C51.1094,235.7188 49.8281,234.7031 49.8281,233.125 L49.8281,232.0781 C49.8281,230.375 51.0469,229.1719 52.75,229.1719 C53.3281,229.1719 53.9063,229.3125 54.375,229.5625 C54.8438,229.8281 55.0156,230.0156 55.0781,230.375 C55.2031,231.0469 55.4531,231.2969 55.9844,231.2969 C56.2656,231.2969 56.5469,231.1563 56.7344,230.9375 C56.8594,230.7656 56.9063,230.5938 56.9063,230.1563 L56.9063,228.7969 C56.9063,228.375 56.8906,228.2344 56.7656,228.0625 C56.5938,227.8125 56.3125,227.6563 55.9844,227.6563 C55.6719,227.6563 55.4688,227.7656 55.25,228.0313 C54.0781,227.5313 53.6406,227.4219 52.6875,227.4219 C50.0156,227.4219 48,229.4375 48,232.0625 L48,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="67" y="236.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="39" x2="78" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="39" x2="78" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
+      <ellipse cx="52" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M54.9688,218.6406 Q54.3906,218.9375 53.75,219.0781 Q53.1094,219.2344 52.4063,219.2344 Q49.9063,219.2344 48.5781,217.5938 Q47.2656,215.9375 47.2656,212.8125 Q47.2656,209.6875 48.5781,208.0313 Q49.9063,206.375 52.4063,206.375 Q53.1094,206.375 53.75,206.5313 Q54.4063,206.6875 54.9688,206.9844 L54.9688,209.7031 Q54.3438,209.125 53.75,208.8594 Q53.1563,208.5781 52.5313,208.5781 Q51.1875,208.5781 50.5,209.6563 Q49.8125,210.7188 49.8125,212.8125 Q49.8125,214.9063 50.5,215.9844 Q51.1875,217.0469 52.5313,217.0469 Q53.1563,217.0469 53.75,216.7813 Q54.3438,216.5 54.9688,215.9219 L54.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="66" y="217.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <g id="elem_C_0000386872828559902182">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000386872828559902182" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="113.5" y="216"/>
-        <ellipse cx="128.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M123.5,233.1563 C123.5,235.6563 125.6406,237.4688 128.5625,237.4688 C129.7969,237.4688 130.9688,237.1719 131.7188,236.6563 C132.3281,236.2344 132.6563,235.8125 132.6563,235.4063 C132.6563,234.9375 132.2344,234.5313 131.7344,234.5313 C131.5,234.5313 131.2813,234.6094 131.0781,234.8125 C130.6406,235.25 130.6406,235.25 130.4688,235.3438 C130.0156,235.5781 129.375,235.7188 128.6094,235.7188 C126.6094,235.7188 125.3281,234.7031 125.3281,233.125 L125.3281,232.0781 C125.3281,230.375 126.5469,229.1719 128.25,229.1719 C128.8281,229.1719 129.4063,229.3125 129.875,229.5625 C130.3438,229.8281 130.5156,230.0156 130.5781,230.375 C130.7031,231.0469 130.9531,231.2969 131.4844,231.2969 C131.7656,231.2969 132.0469,231.1563 132.2344,230.9375 C132.3594,230.7656 132.4063,230.5938 132.4063,230.1563 L132.4063,228.7969 C132.4063,228.375 132.3906,228.2344 132.2656,228.0625 C132.0938,227.8125 131.8125,227.6563 131.4844,227.6563 C131.1719,227.6563 130.9688,227.7656 130.75,228.0313 C129.5781,227.5313 129.1406,227.4219 128.1875,227.4219 C125.5156,227.4219 123.5,229.4375 123.5,232.0625 L123.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="142.5" y="236.606">AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="114.5" x2="162.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="114.5" x2="162.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
+      <ellipse cx="127" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M129.9688,218.6406 Q129.3906,218.9375 128.75,219.0781 Q128.1094,219.2344 127.4063,219.2344 Q124.9063,219.2344 123.5781,217.5938 Q122.2656,215.9375 122.2656,212.8125 Q122.2656,209.6875 123.5781,208.0313 Q124.9063,206.375 127.4063,206.375 Q128.1094,206.375 128.75,206.5313 Q129.4063,206.6875 129.9688,206.9844 L129.9688,209.7031 Q129.3438,209.125 128.75,208.8594 Q128.1563,208.5781 127.5313,208.5781 Q126.1875,208.5781 125.5,209.6563 Q124.8125,210.7188 124.8125,212.8125 Q124.8125,214.9063 125.5,215.9844 Q126.1875,217.0469 127.5313,217.0469 Q128.1563,217.0469 128.75,216.7813 Q129.3438,216.5 129.9688,215.9219 L129.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="141" y="217.1543">AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <g id="elem_C_0000054164402597771463">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000054164402597771463" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="198" y="216"/>
-        <ellipse cx="213" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M208,233.1563 C208,235.6563 210.1406,237.4688 213.0625,237.4688 C214.2969,237.4688 215.4688,237.1719 216.2188,236.6563 C216.8281,236.2344 217.1563,235.8125 217.1563,235.4063 C217.1563,234.9375 216.7344,234.5313 216.2344,234.5313 C216,234.5313 215.7813,234.6094 215.5781,234.8125 C215.1406,235.25 215.1406,235.25 214.9688,235.3438 C214.5156,235.5781 213.875,235.7188 213.1094,235.7188 C211.1094,235.7188 209.8281,234.7031 209.8281,233.125 L209.8281,232.0781 C209.8281,230.375 211.0469,229.1719 212.75,229.1719 C213.3281,229.1719 213.9063,229.3125 214.375,229.5625 C214.8438,229.8281 215.0156,230.0156 215.0781,230.375 C215.2031,231.0469 215.4531,231.2969 215.9844,231.2969 C216.2656,231.2969 216.5469,231.1563 216.7344,230.9375 C216.8594,230.7656 216.9063,230.5938 216.9063,230.1563 L216.9063,228.7969 C216.9063,228.375 216.8906,228.2344 216.7656,228.0625 C216.5938,227.8125 216.3125,227.6563 215.9844,227.6563 C215.6719,227.6563 215.4688,227.7656 215.25,228.0313 C214.0781,227.5313 213.6406,227.4219 212.6875,227.4219 C210.0156,227.4219 208,229.4375 208,232.0625 L208,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="227" y="236.606">AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="199" x2="256" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="199" x2="256" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
+      <ellipse cx="210" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M212.9688,218.6406 Q212.3906,218.9375 211.75,219.0781 Q211.1094,219.2344 210.4063,219.2344 Q207.9063,219.2344 206.5781,217.5938 Q205.2656,215.9375 205.2656,212.8125 Q205.2656,209.6875 206.5781,208.0313 Q207.9063,206.375 210.4063,206.375 Q211.1094,206.375 211.75,206.5313 Q212.4063,206.6875 212.9688,206.9844 L212.9688,209.7031 Q212.3438,209.125 211.75,208.8594 Q211.1563,208.5781 210.5313,208.5781 Q209.1875,208.5781 208.5,209.6563 Q207.8125,210.7188 207.8125,212.8125 Q207.8125,214.9063 208.5,215.9844 Q209.1875,217.0469 210.5313,217.0469 Q211.1563,217.0469 211.75,216.7813 Q212.3438,216.5 212.9688,215.9219 L212.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="224" y="217.1543">AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <g id="elem_C_0000375905626569465019">
-        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0000375905626569465019" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="79" x="406" y="40.6"/>
-        <ellipse cx="421" cy="56.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M416,57.7563 C416,60.2563 418.1406,62.0688 421.0625,62.0688 C422.2969,62.0688 423.4688,61.7719 424.2188,61.2563 C424.8281,60.8344 425.1563,60.4125 425.1563,60.0063 C425.1563,59.5375 424.7344,59.1313 424.2344,59.1313 C424,59.1313 423.7813,59.2094 423.5781,59.4125 C423.1406,59.85 423.1406,59.85 422.9688,59.9438 C422.5156,60.1781 421.875,60.3188 421.1094,60.3188 C419.1094,60.3188 417.8281,59.3031 417.8281,57.725 L417.8281,56.6781 C417.8281,54.975 419.0469,53.7719 420.75,53.7719 C421.3281,53.7719 421.9063,53.9125 422.375,54.1625 C422.8438,54.4281 423.0156,54.6156 423.0781,54.975 C423.2031,55.6469 423.4531,55.8969 423.9844,55.8969 C424.2656,55.8969 424.5469,55.7563 424.7344,55.5375 C424.8594,55.3656 424.9063,55.1938 424.9063,54.7563 L424.9063,53.3969 C424.9063,52.975 424.8906,52.8344 424.7656,52.6625 C424.5938,52.4125 424.3125,52.2563 423.9844,52.2563 C423.6719,52.2563 423.4688,52.3656 423.25,52.6313 C422.0781,52.1313 421.6406,52.0219 420.6875,52.0219 C418.0156,52.0219 416,54.0375 416,56.6625 L416,57.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="435" y="61.206">AAAA</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="479" y="37.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="480" y="51.8001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="407" x2="484" y1="72.6" y2="72.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="407" x2="484" y1="80.6" y2="80.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="412" y="89.5"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="414" y="91.5"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="426" y="97.6059">t : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
+      <ellipse cx="409.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M412.4688,55.1406 Q411.8906,55.4375 411.25,55.5781 Q410.6094,55.7344 409.9063,55.7344 Q407.4063,55.7344 406.0781,54.0938 Q404.7656,52.4375 404.7656,49.3125 Q404.7656,46.1875 406.0781,44.5313 Q407.4063,42.875 409.9063,42.875 Q410.6094,42.875 411.25,43.0313 Q411.9063,43.1875 412.4688,43.4844 L412.4688,46.2031 Q411.8438,45.625 411.25,45.3594 Q410.6563,45.0781 410.0313,45.0781 Q408.6875,45.0781 408,46.1563 Q407.3125,47.2188 407.3125,49.3125 Q407.3125,51.4063 408,52.4844 Q408.6875,53.5469 410.0313,53.5469 Q410.6563,53.5469 411.25,53.2813 Q411.8438,53 412.4688,52.4219 L412.4688,55.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="423.5" y="53.6543">AAAA</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="463.5" y="30.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="464.5" y="42.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="65.5" y2="65.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000619642232943663499">
-        <rect codeLine="19" fill="#F1F1F1" height="48" id="C_0000619642232943663499" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="72" x="291.5" y="216"/>
-        <ellipse cx="306.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M301.5,233.1563 C301.5,235.6563 303.6406,237.4688 306.5625,237.4688 C307.7969,237.4688 308.9688,237.1719 309.7188,236.6563 C310.3281,236.2344 310.6563,235.8125 310.6563,235.4063 C310.6563,234.9375 310.2344,234.5313 309.7344,234.5313 C309.5,234.5313 309.2813,234.6094 309.0781,234.8125 C308.6406,235.25 308.6406,235.25 308.4688,235.3438 C308.0156,235.5781 307.375,235.7188 306.6094,235.7188 C304.6094,235.7188 303.3281,234.7031 303.3281,233.125 L303.3281,232.0781 C303.3281,230.375 304.5469,229.1719 306.25,229.1719 C306.8281,229.1719 307.4063,229.3125 307.875,229.5625 C308.3438,229.8281 308.5156,230.0156 308.5781,230.375 C308.7031,231.0469 308.9531,231.2969 309.4844,231.2969 C309.7656,231.2969 310.0469,231.1563 310.2344,230.9375 C310.3594,230.7656 310.4063,230.5938 310.4063,230.1563 L310.4063,228.7969 C310.4063,228.375 310.3906,228.2344 310.2656,228.0625 C310.0938,227.8125 309.8125,227.6563 309.4844,227.6563 C309.1719,227.6563 308.9688,227.7656 308.75,228.0313 C307.5781,227.5313 307.1406,227.4219 306.1875,227.4219 C303.5156,227.4219 301.5,229.4375 301.5,232.0625 L301.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="320.5" y="236.606">ns1::A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="292.5" x2="362.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="292.5" x2="362.5" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="79.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="402.5" y="81.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002207007194029669343">
-        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0002207007194029669343" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="420" y="216"/>
-        <ellipse cx="435" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M430,233.1563 C430,235.6563 432.1406,237.4688 435.0625,237.4688 C436.2969,237.4688 437.4688,237.1719 438.2188,236.6563 C438.8281,236.2344 439.1563,235.8125 439.1563,235.4063 C439.1563,234.9375 438.7344,234.5313 438.2344,234.5313 C438,234.5313 437.7813,234.6094 437.5781,234.8125 C437.1406,235.25 437.1406,235.25 436.9688,235.3438 C436.5156,235.5781 435.875,235.7188 435.1094,235.7188 C433.1094,235.7188 431.8281,234.7031 431.8281,233.125 L431.8281,232.0781 C431.8281,230.375 433.0469,229.1719 434.75,229.1719 C435.3281,229.1719 435.9063,229.3125 436.375,229.5625 C436.8438,229.8281 437.0156,230.0156 437.0781,230.375 C437.2031,231.0469 437.4531,231.2969 437.9844,231.2969 C438.2656,231.2969 438.5469,231.1563 438.7344,230.9375 C438.8594,230.7656 438.9063,230.5938 438.9063,230.1563 L438.9063,228.7969 C438.9063,228.375 438.8906,228.2344 438.7656,228.0625 C438.5938,227.8125 438.3125,227.6563 437.9844,227.6563 C437.6719,227.6563 437.4688,227.7656 437.25,228.0313 C436.0781,227.5313 435.6406,227.4219 434.6875,227.4219 C432.0156,227.4219 430,229.4375 430,232.0625 L430,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="449" y="236.606">ns1::ns2::A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="421" x2="522" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="421" x2="522" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="414.5" y="87.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000204051985124373077">
-        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0000204051985124373077" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="418" y="325"/>
-        <ellipse cx="433" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M428,342.1563 C428,344.6563 430.1406,346.4688 433.0625,346.4688 C434.2969,346.4688 435.4688,346.1719 436.2188,345.6563 C436.8281,345.2344 437.1563,344.8125 437.1563,344.4063 C437.1563,343.9375 436.7344,343.5313 436.2344,343.5313 C436,343.5313 435.7813,343.6094 435.5781,343.8125 C435.1406,344.25 435.1406,344.25 434.9688,344.3438 C434.5156,344.5781 433.875,344.7188 433.1094,344.7188 C431.1094,344.7188 429.8281,343.7031 429.8281,342.125 L429.8281,341.0781 C429.8281,339.375 431.0469,338.1719 432.75,338.1719 C433.3281,338.1719 433.9063,338.3125 434.375,338.5625 C434.8438,338.8281 435.0156,339.0156 435.0781,339.375 C435.2031,340.0469 435.4531,340.2969 435.9844,340.2969 C436.2656,340.2969 436.5469,340.1563 436.7344,339.9375 C436.8594,339.7656 436.9063,339.5938 436.9063,339.1563 L436.9063,337.7969 C436.9063,337.375 436.8906,337.2344 436.7656,337.0625 C436.5938,336.8125 436.3125,336.6563 435.9844,336.6563 C435.6719,336.6563 435.4688,336.7656 435.25,337.0313 C434.0781,336.5313 433.6406,336.4219 432.6875,336.4219 C430.0156,336.4219 428,338.4375 428,341.0625 L428,342.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="447" y="345.606">ns1::ns2::B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="419" x2="520" y1="357" y2="357"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="419" x2="520" y1="365" y2="365"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
+      <ellipse cx="304.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M307.4688,218.6406 Q306.8906,218.9375 306.25,219.0781 Q305.6094,219.2344 304.9063,219.2344 Q302.4063,219.2344 301.0781,217.5938 Q299.7656,215.9375 299.7656,212.8125 Q299.7656,209.6875 301.0781,208.0313 Q302.4063,206.375 304.9063,206.375 Q305.6094,206.375 306.25,206.5313 Q306.9063,206.6875 307.4688,206.9844 L307.4688,209.7031 Q306.8438,209.125 306.25,208.8594 Q305.6563,208.5781 305.0313,208.5781 Q303.6875,208.5781 303,209.6563 Q302.3125,210.7188 302.3125,212.8125 Q302.3125,214.9063 303,215.9844 Q303.6875,217.0469 305.0313,217.0469 Q305.6563,217.0469 306.25,216.7813 Q306.8438,216.5 307.4688,215.9219 L307.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="318.5" y="217.1543">ns1::A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001837009554564742531">
-        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0001837009554564742531" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="275.5" y="325"/>
-        <ellipse cx="290.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M285.5,342.1563 C285.5,344.6563 287.6406,346.4688 290.5625,346.4688 C291.7969,346.4688 292.9688,346.1719 293.7188,345.6563 C294.3281,345.2344 294.6563,344.8125 294.6563,344.4063 C294.6563,343.9375 294.2344,343.5313 293.7344,343.5313 C293.5,343.5313 293.2813,343.6094 293.0781,343.8125 C292.6406,344.25 292.6406,344.25 292.4688,344.3438 C292.0156,344.5781 291.375,344.7188 290.6094,344.7188 C288.6094,344.7188 287.3281,343.7031 287.3281,342.125 L287.3281,341.0781 C287.3281,339.375 288.5469,338.1719 290.25,338.1719 C290.8281,338.1719 291.4063,338.3125 291.875,338.5625 C292.3438,338.8281 292.5156,339.0156 292.5781,339.375 C292.7031,340.0469 292.9531,340.2969 293.4844,340.2969 C293.7656,340.2969 294.0469,340.1563 294.2344,339.9375 C294.3594,339.7656 294.4063,339.5938 294.4063,339.1563 L294.4063,337.7969 C294.4063,337.375 294.3906,337.2344 294.2656,337.0625 C294.0938,336.8125 293.8125,336.6563 293.4844,336.6563 C293.1719,336.6563 292.9688,336.7656 292.75,337.0313 C291.5781,336.5313 291.1406,336.4219 290.1875,336.4219 C287.5156,336.4219 285.5,338.4375 285.5,341.0625 L285.5,342.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="304.5" y="345.606">ns1::ns2::C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="276.5" x2="378.5" y1="357" y2="357"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="276.5" x2="378.5" y1="365" y2="365"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
+      <ellipse cx="438" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M440.9688,218.6406 Q440.3906,218.9375 439.75,219.0781 Q439.1094,219.2344 438.4063,219.2344 Q435.9063,219.2344 434.5781,217.5938 Q433.2656,215.9375 433.2656,212.8125 Q433.2656,209.6875 434.5781,208.0313 Q435.9063,206.375 438.4063,206.375 Q439.1094,206.375 439.75,206.5313 Q440.4063,206.6875 440.9688,206.9844 L440.9688,209.7031 Q440.3438,209.125 439.75,208.8594 Q439.1563,208.5781 438.5313,208.5781 Q437.1875,208.5781 436.5,209.6563 Q435.8125,210.7188 435.8125,212.8125 Q435.8125,214.9063 436.5,215.9844 Q437.1875,217.0469 438.5313,217.0469 Q439.1563,217.0469 439.75,216.7813 Q440.3438,216.5 440.9688,215.9219 L440.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="452" y="217.1543">ns1::ns2::A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0002029929560931799980">
-        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0002029929560931799980" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="556.5" y="325"/>
-        <ellipse cx="571.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M566.5,342.1563 C566.5,344.6563 568.6406,346.4688 571.5625,346.4688 C572.7969,346.4688 573.9688,346.1719 574.7188,345.6563 C575.3281,345.2344 575.6563,344.8125 575.6563,344.4063 C575.6563,343.9375 575.2344,343.5313 574.7344,343.5313 C574.5,343.5313 574.2813,343.6094 574.0781,343.8125 C573.6406,344.25 573.6406,344.25 573.4688,344.3438 C573.0156,344.5781 572.375,344.7188 571.6094,344.7188 C569.6094,344.7188 568.3281,343.7031 568.3281,342.125 L568.3281,341.0781 C568.3281,339.375 569.5469,338.1719 571.25,338.1719 C571.8281,338.1719 572.4063,338.3125 572.875,338.5625 C573.3438,338.8281 573.5156,339.0156 573.5781,339.375 C573.7031,340.0469 573.9531,340.2969 574.4844,340.2969 C574.7656,340.2969 575.0469,340.1563 575.2344,339.9375 C575.3594,339.7656 575.4063,339.5938 575.4063,339.1563 L575.4063,337.7969 C575.4063,337.375 575.3906,337.2344 575.2656,337.0625 C575.0938,336.8125 574.8125,336.6563 574.4844,336.6563 C574.1719,336.6563 573.9688,336.7656 573.75,337.0313 C572.5781,336.5313 572.1406,336.4219 571.1875,336.4219 C568.5156,336.4219 566.5,338.4375 566.5,341.0625 L566.5,342.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="585.5" y="345.606">ns1::ns2::D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="557.5" x2="659.5" y1="357" y2="357"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="557.5" x2="659.5" y1="365" y2="365"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
+      <ellipse cx="434" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M436.9688,327.6406 Q436.3906,327.9375 435.75,328.0781 Q435.1094,328.2344 434.4063,328.2344 Q431.9063,328.2344 430.5781,326.5938 Q429.2656,324.9375 429.2656,321.8125 Q429.2656,318.6875 430.5781,317.0313 Q431.9063,315.375 434.4063,315.375 Q435.1094,315.375 435.75,315.5313 Q436.4063,315.6875 436.9688,315.9844 L436.9688,318.7031 Q436.3438,318.125 435.75,317.8594 Q435.1563,317.5781 434.5313,317.5781 Q433.1875,317.5781 432.5,318.6563 Q431.8125,319.7188 431.8125,321.8125 Q431.8125,323.9063 432.5,324.9844 Q433.1875,326.0469 434.5313,326.0469 Q435.1563,326.0469 435.75,325.7813 Q436.3438,325.5 436.9688,324.9219 L436.9688,327.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="448" y="326.1543">ns1::ns2::B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="338" y2="338"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0002305358535757579772">
-        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0002305358535757579772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="7" y="325"/>
-        <ellipse cx="22" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,342.1563 C17,344.6563 19.1406,346.4688 22.0625,346.4688 C23.2969,346.4688 24.4688,346.1719 25.2188,345.6563 C25.8281,345.2344 26.1563,344.8125 26.1563,344.4063 C26.1563,343.9375 25.7344,343.5313 25.2344,343.5313 C25,343.5313 24.7813,343.6094 24.5781,343.8125 C24.1406,344.25 24.1406,344.25 23.9688,344.3438 C23.5156,344.5781 22.875,344.7188 22.1094,344.7188 C20.1094,344.7188 18.8281,343.7031 18.8281,342.125 L18.8281,341.0781 C18.8281,339.375 20.0469,338.1719 21.75,338.1719 C22.3281,338.1719 22.9063,338.3125 23.375,338.5625 C23.8438,338.8281 24.0156,339.0156 24.0781,339.375 C24.2031,340.0469 24.4531,340.2969 24.9844,340.2969 C25.2656,340.2969 25.5469,340.1563 25.7344,339.9375 C25.8594,339.7656 25.9063,339.5938 25.9063,339.1563 L25.9063,337.7969 C25.9063,337.375 25.8906,337.2344 25.7656,337.0625 C25.5938,336.8125 25.3125,336.6563 24.9844,336.6563 C24.6719,336.6563 24.4688,336.7656 24.25,337.0313 C23.0781,336.5313 22.6406,336.4219 21.6875,336.4219 C19.0156,336.4219 17,338.4375 17,341.0625 L17,342.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71" x="36" y="345.606">ns1::ns2::E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="109" y1="357" y2="357"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="109" y1="365" y2="365"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
+      <ellipse cx="289" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M291.9688,327.6406 Q291.3906,327.9375 290.75,328.0781 Q290.1094,328.2344 289.4063,328.2344 Q286.9063,328.2344 285.5781,326.5938 Q284.2656,324.9375 284.2656,321.8125 Q284.2656,318.6875 285.5781,317.0313 Q286.9063,315.375 289.4063,315.375 Q290.1094,315.375 290.75,315.5313 Q291.4063,315.6875 291.9688,315.9844 L291.9688,318.7031 Q291.3438,318.125 290.75,317.8594 Q290.1563,317.5781 289.5313,317.5781 Q288.1875,317.5781 287.5,318.6563 Q286.8125,319.7188 286.8125,321.8125 Q286.8125,323.9063 287.5,324.9844 Q288.1875,326.0469 289.5313,326.0469 Q290.1563,326.0469 290.75,325.7813 Q291.3438,325.5 291.9688,324.9219 L291.9688,327.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="303" y="326.1543">ns1::ns2::C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="338" y2="338"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <g id="elem_C_0001731264248793686366">
-        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0001731264248793686366" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="121" x="520" y="49"/>
-        <ellipse cx="535" cy="65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M530,66.1563 C530,68.6563 532.1406,70.4688 535.0625,70.4688 C536.2969,70.4688 537.4688,70.1719 538.2188,69.6563 C538.8281,69.2344 539.1563,68.8125 539.1563,68.4063 C539.1563,67.9375 538.7344,67.5313 538.2344,67.5313 C538,67.5313 537.7813,67.6094 537.5781,67.8125 C537.1406,68.25 537.1406,68.25 536.9688,68.3438 C536.5156,68.5781 535.875,68.7188 535.1094,68.7188 C533.1094,68.7188 531.8281,67.7031 531.8281,66.125 L531.8281,65.0781 C531.8281,63.375 533.0469,62.1719 534.75,62.1719 C535.3281,62.1719 535.9063,62.3125 536.375,62.5625 C536.8438,62.8281 537.0156,63.0156 537.0781,63.375 C537.2031,64.0469 537.4531,64.2969 537.9844,64.2969 C538.2656,64.2969 538.5469,64.1563 538.7344,63.9375 C538.8594,63.7656 538.9063,63.5938 538.9063,63.1563 L538.9063,61.7969 C538.9063,61.375 538.8906,61.2344 538.7656,61.0625 C538.5938,60.8125 538.3125,60.6563 537.9844,60.6563 C537.6719,60.6563 537.4688,60.7656 537.25,61.0313 C536.0781,60.5313 535.6406,60.4219 534.6875,60.4219 C532.0156,60.4219 530,62.4375 530,65.0625 L530,66.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="549" y="69.606">ns1::ns2::AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="521" x2="640" y1="81" y2="81"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="521" x2="640" y1="89" y2="89"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
+      <ellipse cx="571.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M574.4688,327.6406 Q573.8906,327.9375 573.25,328.0781 Q572.6094,328.2344 571.9063,328.2344 Q569.4063,328.2344 568.0781,326.5938 Q566.7656,324.9375 566.7656,321.8125 Q566.7656,318.6875 568.0781,317.0313 Q569.4063,315.375 571.9063,315.375 Q572.6094,315.375 573.25,315.5313 Q573.9063,315.6875 574.4688,315.9844 L574.4688,318.7031 Q573.8438,318.125 573.25,317.8594 Q572.6563,317.5781 572.0313,317.5781 Q570.6875,317.5781 570,318.6563 Q569.3125,319.7188 569.3125,321.8125 Q569.3125,323.9063 570,324.9844 Q570.6875,326.0469 572.0313,326.0469 Q572.6563,326.0469 573.25,325.7813 Q573.8438,325.5 574.4688,324.9219 L574.4688,327.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="585.5" y="326.1543">ns1::ns2::D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="338" y2="338"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000974430595320588991">
-        <rect codeLine="47" fill="#F1F1F1" height="131.9996" id="C_0000974430595320588991" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="188" x="183.5" y="7"/>
-        <ellipse cx="237.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M232.25,24.1563 C232.25,26.6563 234.3906,28.4688 237.3125,28.4688 C238.5469,28.4688 239.7188,28.1719 240.4688,27.6563 C241.0781,27.2344 241.4063,26.8125 241.4063,26.4063 C241.4063,25.9375 240.9844,25.5313 240.4844,25.5313 C240.25,25.5313 240.0313,25.6094 239.8281,25.8125 C239.3906,26.25 239.3906,26.25 239.2188,26.3438 C238.7656,26.5781 238.125,26.7188 237.3594,26.7188 C235.3594,26.7188 234.0781,25.7031 234.0781,24.125 L234.0781,23.0781 C234.0781,21.375 235.2969,20.1719 237,20.1719 C237.5781,20.1719 238.1563,20.3125 238.625,20.5625 C239.0938,20.8281 239.2656,21.0156 239.3281,21.375 C239.4531,22.0469 239.7031,22.2969 240.2344,22.2969 C240.5156,22.2969 240.7969,22.1563 240.9844,21.9375 C241.1094,21.7656 241.1563,21.5938 241.1563,21.1563 L241.1563,19.7969 C241.1563,19.375 241.1406,19.2344 241.0156,19.0625 C240.8438,18.8125 240.5625,18.6563 240.2344,18.6563 C239.9219,18.6563 239.7188,18.7656 239.5,19.0313 C238.3281,18.5313 237.8906,18.4219 236.9375,18.4219 C234.2656,18.4219 232.25,20.4375 232.25,23.0625 L232.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="257.75" y="27.606">ns1::ns2::R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="184.5" x2="370.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="47.9"/>
-          <ellipse cx="194.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="203.5" y="56.0059">foo(AA &amp; aa) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="184.5" x2="370.5" y1="63.7999" y2="63.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="72.6999"/>
-          <ellipse cx="194.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="203.5" y="80.8059">a : A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="89.4998"/>
-          <ellipse cx="194.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="203.5" y="97.6058">ns1_a : ns1::A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="106.2997"/>
-          <ellipse cx="194.5" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="203.5" y="114.4057">ns1_ns2_a : ns1::ns2::A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="189.5" y="123.0997"/>
-          <ellipse cx="194.5" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="203.5" y="131.2057">root_a : ::A *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
+      <ellipse cx="21" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,327.6406 Q23.3906,327.9375 22.75,328.0781 Q22.1094,328.2344 21.4063,328.2344 Q18.9063,328.2344 17.5781,326.5938 Q16.2656,324.9375 16.2656,321.8125 Q16.2656,318.6875 17.5781,317.0313 Q18.9063,315.375 21.4063,315.375 Q22.1094,315.375 22.75,315.5313 Q23.4063,315.6875 23.9688,315.9844 L23.9688,318.7031 Q23.3438,318.125 22.75,317.8594 Q22.1563,317.5781 21.5313,317.5781 Q20.1875,317.5781 19.5,318.6563 Q18.8125,319.7188 18.8125,321.8125 Q18.8125,323.9063 19.5,324.9844 Q20.1875,326.0469 21.5313,326.0469 Q22.1563,326.0469 22.75,325.7813 Q23.3438,325.5 23.9688,324.9219 L23.9688,327.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="35" y="326.1543">ns1::ns2::E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="338" y2="338"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="346" y2="346"/>
     </a>
-    <g id="link_C_0002207007194029669343_C_0000204051985124373077">
-      <path codeLine="55" d="M470.7271,282.4769 C470.3971,300.3169 470.27,306.75 469.94,324.57 " fill="none" id="C_0002207007194029669343-backto-C_0000204051985124373077" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="471.06,264.48,464.7281,282.366,476.7261,282.5879,471.06,264.48" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000619642232943663499_C_0001837009554564742531">
-      <path codeLine="56" d="M327.5,282.48 C327.5,300.32 327.5,306.75 327.5,324.57 " fill="none" id="C_0000619642232943663499-backto-C_0001837009554564742531" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="327.5,264.48,321.5,282.48,333.5,282.48,327.5,264.48" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002207007194029669343_C_0002029929560931799980">
-      <path codeLine="57" d="M515.7556,275.5601 C538.5956,293.4001 555.68,306.75 578.5,324.57 " fill="none" id="C_0002207007194029669343-backto-C_0002029929560931799980" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="501.57,264.48,512.0622,280.2887,519.449,270.8316,501.57,264.48" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000864916647665253425_C_0002305358535757579772">
-      <path codeLine="58" d="M58.5,282.48 C58.5,300.32 58.5,306.75 58.5,324.57 " fill="none" id="C_0000864916647665253425-backto-C_0002305358535757579772" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="58.5,264.48,52.5,282.48,64.5,282.48,58.5,264.48" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0000386872828559902182">
-      <path codeLine="59" d="M222.56,139.21 C199.8,166.24 178.7162,191.2617 161.9562,211.1517 " fill="none" id="C_0000974430595320588991-to-C_0000386872828559902182" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="158.09,215.74,166.9482,211.4351,161.3119,211.9164,160.8305,206.2801,158.09,215.74" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0002207007194029669343">
-      <path codeLine="60" d="M354.45,139.45 C386.19,166.44 416.3491,192.0932 439.6691,211.9232 " fill="none" id="C_0000974430595320588991-to-C_0002207007194029669343" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="444.24,215.81,439.9749,206.9326,440.4309,212.571,434.7925,213.027,444.24,215.81" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="409.5" y="182.077">+a</text>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0002207007194029669343">
-      <path codeLine="62" d="M371.99,130.23 C403.1,148.99 430.59,165.94 433.5,169 C446.27,182.42 453.6709,195.4793 460.1209,210.1193 " fill="none" id="C_0000974430595320588991-to-C_0002207007194029669343-1" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="462.54,215.61,462.5719,205.7612,460.5241,211.0344,455.2509,208.9866,462.54,215.61" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="451.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="458.5" y="182.077">ns1_ns2_a</text>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0000619642232943663499">
-      <path codeLine="61" d="M297.26,139.21 C305.45,166.24 312.6792,190.1081 318.7092,209.9981 " fill="none" id="C_0000974430595320588991-to-C_0000619642232943663499" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="320.45,215.74,321.6668,205.9666,318.9994,210.9551,314.0109,208.2876,320.45,215.74" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="316.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="323.5" y="182.077">ns1_a</text>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0000864916647665253425">
-      <path codeLine="63" d="M183.35,127.74 C163.6,140.4 143.36,154.47 125.5,169 C108.27,183.01 94.9809,196.7009 82.2909,211.0109 " fill="none" id="C_0000974430595320588991-to-C_0000864916647665253425" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="78.31,215.5,87.2741,211.4203,81.6274,211.7591,81.2886,206.1124,78.31,215.5" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="131.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="138.5" y="182.077">root_a</text>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0000054164402597771463">
-      <path codeLine="64" d="M246.1882,145.1061 C242.5182,154.8661 241.21,159.3 238.5,169 C234.23,184.28 231.47,201.94 229.78,215.69 " fill="none" id="C_0000974430595320588991-backto-C_0000054164402597771463" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="248.3,139.49,241.3883,146.5063,246.5402,144.1701,248.8764,149.322,248.3,139.49" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="244.5" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="251.5" y="182.077">«friend»</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
+      <ellipse cx="520" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M522.9688,61.6406 Q522.3906,61.9375 521.75,62.0781 Q521.1094,62.2344 520.4063,62.2344 Q517.9063,62.2344 516.5781,60.5938 Q515.2656,58.9375 515.2656,55.8125 Q515.2656,52.6875 516.5781,51.0313 Q517.9063,49.375 520.4063,49.375 Q521.1094,49.375 521.75,49.5313 Q522.4063,49.6875 522.9688,49.9844 L522.9688,52.7031 Q522.3438,52.125 521.75,51.8594 Q521.1563,51.5781 520.5313,51.5781 Q519.1875,51.5781 518.5,52.6563 Q517.8125,53.7188 517.8125,55.8125 Q517.8125,57.9063 518.5,58.9844 Q519.1875,60.0469 520.5313,60.0469 Q521.1563,60.0469 521.75,59.7813 Q522.3438,59.5 522.9688,58.9219 L522.9688,61.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="534" y="60.1543">ns1::ns2::AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="72" y2="72"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="80" y2="80"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
+      <ellipse cx="232.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M235.7188,29.6406 Q235.1406,29.9375 234.5,30.0781 Q233.8594,30.2344 233.1563,30.2344 Q230.6563,30.2344 229.3281,28.5938 Q228.0156,26.9375 228.0156,23.8125 Q228.0156,20.6875 229.3281,19.0313 Q230.6563,17.375 233.1563,17.375 Q233.8594,17.375 234.5,17.5313 Q235.1563,17.6875 235.7188,17.9844 L235.7188,20.7031 Q235.0938,20.125 234.5,19.8594 Q233.9063,19.5781 233.2813,19.5781 Q231.9375,19.5781 231.25,20.6563 Q230.5625,21.7188 230.5625,23.8125 Q230.5625,25.9063 231.25,26.9844 Q231.9375,28.0469 233.2813,28.0469 Q233.9063,28.0469 234.5,27.7813 Q235.0938,27.5 235.7188,26.9219 L235.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="253.25" y="28.1543">ns1::ns2::R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="46"/>
+      <ellipse cx="196" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="205" y="54.2104">foo(AA &amp; aa) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="66.8047"/>
+      <ellipse cx="196" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="205" y="75.0151">a : A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="79.6094"/>
+      <ellipse cx="196" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="205" y="87.8198">ns1_a : ns1::A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="92.4141"/>
+      <ellipse cx="196" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="205" y="100.6245">ns1_ns2_a : ns1::ns2::A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="105.2188"/>
+      <ellipse cx="196" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="205" y="113.4292">root_a : ::A *</text>
+    </a>
+    <path d="M472.37,265.58 C471.86,279.36 471.31,294.06 470.87,305.83 " fill="none" id="C_0002207007194029669343&lt;-C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="465.39,264.94,473.13,245.22,479.38,265.46,465.39,264.94" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M325,265.58 C325,279.36 325,294.06 325,305.83 " fill="none" id="C_0000619642232943663499&lt;-C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="318,265.22,325,245.22,332,265.22,318,265.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M518.87,257.83 C538.69,273.66 561.43,291.82 578.98,305.83 " fill="none" id="C_0002207007194029669343&lt;-C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="514.34,263.17,503.08,245.22,523.07,252.23,514.34,263.17" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M57,265.58 C57,279.36 57,294.06 57,305.83 " fill="none" id="C_0000864916647665253425&lt;-C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="50,265.22,57,245.22,64,265.22,50,265.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M223.67,120.08 C202.05,144.72 177.54,172.66 159.94,192.72 " fill="none" id="C_0000974430595320588991-&gt;C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="156.51,196.62,165.4546,192.4976,159.8096,192.8633,159.4439,187.2183,156.51,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M343.79,120.08 C376.4,145.11 413.46,173.55 439.68,193.67 " fill="none" id="C_0000974430595320588991-&gt;C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="443.8,196.83,439.0887,188.1811,439.831,193.789,434.2231,194.5314,443.8,196.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="403" y="163.0669">+a</text>
+    <path d="M359.33,111.09 C395.41,130.23 429.32,148.42 431,150 C443.59,161.86 453.91,178.2 461.27,192.1 " fill="none" id="C_0000974430595320588991-&gt;C_0002207007194029669343-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="463.66,196.72,463.0746,186.8886,461.3613,192.2797,455.9702,190.5664,463.66,196.72" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="451" cy="159.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="68" x="458" y="163.0669">ns1_ns2_a</text>
+    <path d="M290.84,120.08 C299.12,144.31 308.5,171.73 315.33,191.71 " fill="none" id="C_0000974430595320588991-&gt;C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="317.01,196.62,317.8968,186.8111,315.399,191.8867,310.3234,189.3888,317.01,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="312" cy="159.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="319" y="163.0669">ns1_a</text>
+    <path d="M184.71,107.93 C163.02,120.24 140.43,134.56 121,150 C105.34,162.44 90.14,178.83 78.48,192.62 " fill="none" id="C_0000974430595320588991-&gt;C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="74.98,196.81,83.8225,192.4729,78.1879,192.9747,77.6861,187.3402,74.98,196.81" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="127" cy="159.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="41" x="134" y="163.0669">root_a</text>
+    <path d="M226.66,124.8 C222.31,132.93 218.57,141.43 216,150 C211.44,165.21 213.32,183.02 216.27,196.87 " fill="none" id="C_0000974430595320588991&lt;-C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="229.14,120.32,221.2874,126.2645,226.7227,124.6968,228.2904,130.1321,229.14,120.32" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="222" cy="159.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="52" x="229" y="163.0669">«friend»</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00045_class_mermaid.svg b/docs/test_cases/t00045_class_mermaid.svg
index af6e347f..32b5fb6f 100644
--- a/docs/test_cases/t00045_class_mermaid.svg
+++ b/docs/test_cases/t00045_class_mermaid.svg
@@ -1,70 +1,65 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 787.625 415" style="max-width: 787.625px; background-color: white;" width="787.625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M190.70324205961373,310.3151433039687L187.20322254967812,312.7626194199739C183.70320303974248,315.2100955359791,176.70316401987125,320.10504776798956,173.20314450993564,326.71919055066144C169.703125,333.3333333333333,169.703125,341.6666666666667,169.703125,345.8333333333333L169.703125,350"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M575.9921875,318L575.9921875,319.1666666666667C575.9921875,320.3333333333333,575.9921875,322.6666666666667,575.9921875,328C575.9921875,333.3333333333333,575.9921875,341.6666666666667,575.9921875,345.8333333333333L575.9921875,350"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M311.0299728861911,309.01686213283494L315.63239928015923,311.6807184440291C320.2348256741274,314.3445747552233,329.4396784620637,319.67228737761167,334.0421048560318,326.5028103554725C338.64453125,333.3333333333333,338.64453125,341.6666666666667,338.64453125,345.8333333333333L338.64453125,350"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.5625,318L728.5625,319.1666666666667C728.5625,320.3333333333333,728.5625,322.6666666666667,728.5625,328C728.5625,333.3333333333333,728.5625,341.6666666666667,728.5625,345.8333333333333L728.5625,350"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M388.45917553191487,175L386.1951462765957,180.66666666666666C383.9311170212766,186.33333333333334,379.40305851063823,197.66666666666666,377.13902925531914,208C374.875,218.33333333333334,374.875,227.66666666666666,374.875,232.33333333333334L374.875,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M323.8125,145.79935719153482L304.8001302083333,156.33279765961234C285.7877604166667,166.86623812768988,247.76302083333334,187.93311906384494,231.55348651213956,203.26953345583445C215.34395219094577,218.60594784782396,220.94962313189157,228.21189569564794,223.75245860236444,233.0148696195599L226.5552940728373,237.81784354347187"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M519.828125,166.19532279314888L529.1888020833334,173.32943566095742C538.5494791666666,180.46354852876593,557.2708333333334,194.73177426438295,566.6315104166666,206.53255379885817C575.9921875,218.33333333333334,575.9921875,227.66666666666666,575.9921875,232.33333333333334L575.9921875,237"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M323.8125,174.26692214829166L316.9576822916667,180.0557684569097C310.1028645833333,185.84461476552778,296.3932291666667,197.42230738276388,286.73557598786044,208.01412761529392C277.0779228090542,218.60594784782396,271.47225186810846,228.21189569564794,268.6694163976356,233.0148696195599L265.8665809271627,237.81784354347187"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M519.828125,129.04266102946795L554.6171875,142.3688841912233C589.40625,155.69510735297862,658.984375,182.3475536764893,693.7734375,200.34044350491135C728.5625,218.33333333333334,728.5625,227.66666666666666,728.5625,232.33333333333334L728.5625,237"/>
-        <path marker-start="url(#my-svg_classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M457.4075577980547,180.57175391624935L459.3005689983789,185.30979493020777C461.19358019870316,190.04783594416622,464.9796025993516,199.52391797208313,466.8726137996758,209.9286256527082C468.765625,220.33333333333334,468.765625,231.66666666666666,468.765625,237.33333333333334L468.765625,243"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M205.45443925233644,300L199.49588687694703,304.1666666666667C193.53733450155764,308.3333333333333,181.6202297507788,316.6666666666667,175.66167737538942,325C169.703125,333.3333333333333,169.703125,341.6666666666667,169.703125,345.8333333333333L169.703125,350"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M575.9921875,300L575.9921875,304.1666666666667C575.9921875,308.3333333333333,575.9921875,316.6666666666667,575.9921875,325C575.9921875,333.3333333333333,575.9921875,341.6666666666667,575.9921875,345.8333333333333L575.9921875,350"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M295.4512631425234,300L302.65014116043614,304.1666666666667C309.8490191783489,308.3333333333333,324.2467752141745,316.6666666666667,331.44565323208724,325C338.64453125,333.3333333333333,338.64453125,341.6666666666667,338.64453125,345.8333333333333L338.64453125,350"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M728.5625,300L728.5625,304.1666666666667C728.5625,308.3333333333333,728.5625,316.6666666666667,728.5625,325C728.5625,333.3333333333333,728.5625,341.6666666666667,728.5625,345.8333333333333L728.5625,350"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M388.45917553191487,175L386.1951462765957,180.66666666666666C383.9311170212766,186.33333333333334,379.40305851063823,197.66666666666666,377.13902925531914,209C374.875,220.33333333333334,374.875,231.66666666666666,374.875,237.33333333333334L374.875,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M323.8125,145.79935719153482L304.8001302083333,156.33279765961234C285.7877604166667,166.86623812768988,247.76302083333334,187.93311906384494,232.0575052083333,204.13322619858914C216.35198958333334,220.33333333333334,222.9656979166667,231.66666666666666,226.27255208333335,237.33333333333334L229.57940625,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M519.828125,166.19532279314888L529.1888020833334,173.32943566095742C538.5494791666666,180.46354852876593,557.2708333333334,194.73177426438295,566.6315104166666,207.53255379885817C575.9921875,220.33333333333334,575.9921875,231.66666666666666,575.9921875,237.33333333333334L575.9921875,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M323.8125,174.26692214829166L316.9576822916667,180.0557684569097C310.1028645833333,185.84461476552778,296.3932291666667,197.42230738276388,286.23155729166666,208.87782035804858C276.0698854166667,220.33333333333334,269.45617708333333,231.66666666666666,266.1493229166667,237.33333333333334L262.84246875,243"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M519.828125,129.04266102946795L554.6171875,142.3688841912233C589.40625,155.69510735297862,658.984375,182.3475536764893,693.7734375,201.34044350491135C728.5625,220.33333333333334,728.5625,231.66666666666666,728.5625,237.33333333333334L728.5625,243"/>
+        <path marker-start="url(#classDiagram-dependencyStart)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M455.18144946808513,175L457.4454787234043,180.66666666666666C459.7095079787234,186.33333333333334,464.23756648936177,197.66666666666666,466.50159574468086,209C468.765625,220.33333333333334,468.765625,231.66666666666666,468.765625,237.33333333333334L468.765625,243"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -171,7 +166,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L1">
+        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L1">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -190,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L3">
+        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L3">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -209,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L5">
+        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L5">
           <g title="AAA" id="classId-C_0000054164402597771463-2" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -228,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L7">
+        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L7">
           <g title="AAAA" id="classId-C_0000375905626569465019-3" class="node default clickable">
             <rect height="79" width="89.6875" y="-39.5" x="-44.84375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.84375" x1="-44.84375" class="divider"/>
@@ -252,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L13">
+        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L13">
           <g title="A" id="classId-C_0000619642232943663499-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -271,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L17">
+        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L17">
           <g title="A" id="classId-C_0002207007194029669343-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -290,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L19">
+        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L19">
           <g title="B" id="classId-C_0000204051985124373077-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -309,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L21">
+        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L21">
           <g title="C" id="classId-C_0001837009554564742531-7" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -328,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L23">
+        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L23">
           <g title="D" id="classId-C_0002029929560931799980-8" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -347,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L25">
+        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L25">
           <g title="E" id="classId-C_0002305358535757579772-9" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -366,7 +361,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L27">
+        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L27">
           <g title="AAA" id="classId-C_0001731264248793686366-10" class="node default clickable">
             <rect height="57" width="126.125" y="-28.5" x="-63.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.0625" x1="-63.0625" class="divider"/>
@@ -385,7 +380,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00045/t00045.cc#L29">
+        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L29">
           <g title="R" id="classId-C_0000974430595320588991-11" class="node default clickable">
             <rect height="167" width="196.015625" y="-83.5" x="-98.0078125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="98.0078125" x1="-98.0078125" class="divider"/>
@@ -403,27 +398,27 @@
               </foreignObject>
               <foreignObject transform="translate( -90.5078125, -42)" height="18" width="41.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+a : A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+a : A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -90.5078125, -20)" height="18" width="111.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ns1_a : ns1::A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+ns1_a : ns1::A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -90.5078125, 2)" height="18" width="181.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ns1_ns2_a : ns1::ns2::A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+ns1_ns2_a : ns1::ns2::A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -90.5078125, 24)" height="18" width="87.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+root_a : ::A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+root_a : ::A </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -90.5078125, 58)" height="18" width="151.640625">
+              <foreignObject transform="translate( -90.5078125, 58)" height="18" width="142.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo(AA &amp; aa) : : void</span>
+                  <span class="nodeLabel">+foo(AA &amp; aa) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00046.md b/docs/test_cases/t00046.md
index 75993b5f..46bccef1 100644
--- a/docs/test_cases/t00046.md
+++ b/docs/test_cases/t00046.md
@@ -130,7 +130,7 @@ public:
           "type": "class"
         },
         {
-          "display_name": "ns1::ns2",
+          "display_name": "ns2",
           "elements": [
             {
               "bases": [],
@@ -395,6 +395,7 @@ public:
     }
   ],
   "name": "t00046_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg
index a3161785..22273711 100644
--- a/docs/test_cases/t00046_class.svg
+++ b/docs/test_cases/t00046_class.svg
@@ -1,192 +1,158 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="617px" preserveAspectRatio="none" style="width:580px;height:617px;background:#FFFFFF;" version="1.1" viewBox="0 0 580 617" width="580px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="616px" preserveAspectRatio="none" style="width:586px;height:616px;" version="1.1" viewBox="0 0 586 616" width="586px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f2b8isq445f1y" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0000685556094251433947">
-      <path d="M8.5,6.294 L34.5,6.294 A3.75,3.75 0 0 1 37,8.794 L44,29.0939 L429.5,29.0939 A2.5,2.5 0 0 1 432,31.5939 L432,607.594 A2.5,2.5 0 0 1 429.5,610.094 L8.5,610.094 A2.5,2.5 0 0 1 6,607.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="44" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="10" y="21.2999">ns1</text>
-    </g>
-    <g id="cluster_C_0001530587720836442927">
-      <path d="M32.5,152.294 L58.5,152.294 A3.75,3.75 0 0 1 61,154.794 L68,175.0939 L405.5,175.0939 A2.5,2.5 0 0 1 408,177.5939 L408,583.594 A2.5,2.5 0 0 1 405.5,586.094 L32.5,586.094 A2.5,2.5 0 0 1 30,583.594 L30,154.794 A2.5,2.5 0 0 1 32.5,152.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="68" y1="175.0939" y2="175.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="34" y="167.2999">ns2</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000619642232943663499">
-        <rect codeLine="11" fill="#F1F1F1" height="48" id="C_0000619642232943663499" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="94.5" y="41.294"/>
-        <ellipse cx="109.5" cy="57.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M104.5,58.4502 C104.5,60.9502 106.6406,62.7627 109.5625,62.7627 C110.7969,62.7627 111.9688,62.4659 112.7188,61.9502 C113.3281,61.5284 113.6563,61.1065 113.6563,60.7002 C113.6563,60.2315 113.2344,59.8252 112.7344,59.8252 C112.5,59.8252 112.2813,59.9034 112.0781,60.1065 C111.6406,60.544 111.6406,60.544 111.4688,60.6377 C111.0156,60.8721 110.375,61.0127 109.6094,61.0127 C107.6094,61.0127 106.3281,59.9971 106.3281,58.419 L106.3281,57.3721 C106.3281,55.669 107.5469,54.4659 109.25,54.4659 C109.8281,54.4659 110.4063,54.6065 110.875,54.8565 C111.3438,55.1221 111.5156,55.3096 111.5781,55.669 C111.7031,56.3409 111.9531,56.5909 112.4844,56.5909 C112.7656,56.5909 113.0469,56.4502 113.2344,56.2315 C113.3594,56.0596 113.4063,55.8877 113.4063,55.4502 L113.4063,54.0909 C113.4063,53.669 113.3906,53.5284 113.2656,53.3565 C113.0938,53.1065 112.8125,52.9502 112.4844,52.9502 C112.1719,52.9502 111.9688,53.0596 111.75,53.3252 C110.5781,52.8252 110.1406,52.7159 109.1875,52.7159 C106.5156,52.7159 104.5,54.7315 104.5,57.3565 L104.5,58.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="123.5" y="61.9">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="95.5" x2="134.5" y1="73.294" y2="73.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="95.5" x2="134.5" y1="81.294" y2="81.294"/>
-      </g>
+    <polygon fill="#FFFFFF" filter="url(#f2b8isq445f1y)" points="22,24,57,24,64,46.2969,436,46.2969,436,604,22,604,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">ns1</text>
+    <polygon fill="#FFFFFF" filter="url(#f2b8isq445f1y)" points="46,170,81,170,88,192.2969,412,192.2969,412,580,46,580,46,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="88" y1="192.2969" y2="192.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="50" y="184.9951">ns2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="108" y="59"/>
+      <ellipse cx="123" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M125.9688,80.6406 Q125.3906,80.9375 124.75,81.0781 Q124.1094,81.2344 123.4063,81.2344 Q120.9063,81.2344 119.5781,79.5938 Q118.2656,77.9375 118.2656,74.8125 Q118.2656,71.6875 119.5781,70.0313 Q120.9063,68.375 123.4063,68.375 Q124.1094,68.375 124.75,68.5313 Q125.4063,68.6875 125.9688,68.9844 L125.9688,71.7031 Q125.3438,71.125 124.75,70.8594 Q124.1563,70.5781 123.5313,70.5781 Q122.1875,70.5781 121.5,71.6563 Q120.8125,72.7188 120.8125,74.8125 Q120.8125,76.9063 121.5,77.9844 Q122.1875,79.0469 123.5313,79.0469 Q124.1563,79.0469 124.75,78.7813 Q125.3438,78.5 125.9688,77.9219 L125.9688,80.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="137" y="79.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="91" y2="91"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="99" y2="99"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002207007194029669343">
-        <rect codeLine="16" fill="#F1F1F1" height="48" id="C_0002207007194029669343" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="198.5" y="413.094"/>
-        <ellipse cx="213.5" cy="429.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M208.5,430.2502 C208.5,432.7502 210.6406,434.5627 213.5625,434.5627 C214.7969,434.5627 215.9688,434.2659 216.7188,433.7502 C217.3281,433.3284 217.6563,432.9065 217.6563,432.5002 C217.6563,432.0315 217.2344,431.6252 216.7344,431.6252 C216.5,431.6252 216.2813,431.7034 216.0781,431.9065 C215.6406,432.344 215.6406,432.344 215.4688,432.4377 C215.0156,432.6721 214.375,432.8127 213.6094,432.8127 C211.6094,432.8127 210.3281,431.7971 210.3281,430.219 L210.3281,429.1721 C210.3281,427.469 211.5469,426.2659 213.25,426.2659 C213.8281,426.2659 214.4063,426.4065 214.875,426.6565 C215.3438,426.9221 215.5156,427.1096 215.5781,427.469 C215.7031,428.1409 215.9531,428.3909 216.4844,428.3909 C216.7656,428.3909 217.0469,428.2502 217.2344,428.0315 C217.3594,427.8596 217.4063,427.6877 217.4063,427.2502 L217.4063,425.8909 C217.4063,425.469 217.3906,425.3284 217.2656,425.1565 C217.0938,424.9065 216.8125,424.7502 216.4844,424.7502 C216.1719,424.7502 215.9688,424.8596 215.75,425.1252 C214.5781,424.6252 214.1406,424.5159 213.1875,424.5159 C210.5156,424.5159 208.5,426.5315 208.5,429.1565 L208.5,430.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="227.5" y="433.7">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="199.5" x2="238.5" y1="445.094" y2="445.094"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="199.5" x2="238.5" y1="453.094" y2="453.094"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="208" y="407"/>
+      <ellipse cx="223" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M225.9688,428.6406 Q225.3906,428.9375 224.75,429.0781 Q224.1094,429.2344 223.4063,429.2344 Q220.9063,429.2344 219.5781,427.5938 Q218.2656,425.9375 218.2656,422.8125 Q218.2656,419.6875 219.5781,418.0313 Q220.9063,416.375 223.4063,416.375 Q224.1094,416.375 224.75,416.5313 Q225.4063,416.6875 225.9688,416.9844 L225.9688,419.7031 Q225.3438,419.125 224.75,418.8594 Q224.1563,418.5781 223.5313,418.5781 Q222.1875,418.5781 221.5,419.6563 Q220.8125,420.7188 220.8125,422.8125 Q220.8125,424.9063 221.5,425.9844 Q222.1875,427.0469 223.5313,427.0469 Q224.1563,427.0469 224.75,426.7813 Q225.3438,426.5 225.9688,425.9219 L225.9688,428.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="237" y="427.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="439" y2="439"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="447" y2="447"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000204051985124373077">
-        <rect codeLine="20" fill="#F1F1F1" height="48" id="C_0000204051985124373077" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="153.5" y="522.094"/>
-        <ellipse cx="168.5" cy="538.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M163.5,539.2502 C163.5,541.7502 165.6406,543.5627 168.5625,543.5627 C169.7969,543.5627 170.9688,543.2659 171.7188,542.7502 C172.3281,542.3284 172.6563,541.9065 172.6563,541.5002 C172.6563,541.0315 172.2344,540.6252 171.7344,540.6252 C171.5,540.6252 171.2813,540.7034 171.0781,540.9065 C170.6406,541.344 170.6406,541.344 170.4688,541.4377 C170.0156,541.6721 169.375,541.8127 168.6094,541.8127 C166.6094,541.8127 165.3281,540.7971 165.3281,539.219 L165.3281,538.1721 C165.3281,536.469 166.5469,535.2659 168.25,535.2659 C168.8281,535.2659 169.4063,535.4065 169.875,535.6565 C170.3438,535.9221 170.5156,536.1096 170.5781,536.469 C170.7031,537.1409 170.9531,537.3909 171.4844,537.3909 C171.7656,537.3909 172.0469,537.2502 172.2344,537.0315 C172.3594,536.8596 172.4063,536.6877 172.4063,536.2502 L172.4063,534.8909 C172.4063,534.469 172.3906,534.3284 172.2656,534.1565 C172.0938,533.9065 171.8125,533.7502 171.4844,533.7502 C171.1719,533.7502 170.9688,533.8596 170.75,534.1252 C169.5781,533.6252 169.1406,533.5159 168.1875,533.5159 C165.5156,533.5159 163.5,535.5315 163.5,538.1565 L163.5,539.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="182.5" y="542.7">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="154.5" x2="193.5" y1="554.094" y2="554.094"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="154.5" x2="193.5" y1="562.094" y2="562.094"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="178" y="516"/>
+      <ellipse cx="193" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M195.9688,537.6406 Q195.3906,537.9375 194.75,538.0781 Q194.1094,538.2344 193.4063,538.2344 Q190.9063,538.2344 189.5781,536.5938 Q188.2656,534.9375 188.2656,531.8125 Q188.2656,528.6875 189.5781,527.0313 Q190.9063,525.375 193.4063,525.375 Q194.1094,525.375 194.75,525.5313 Q195.4063,525.6875 195.9688,525.9844 L195.9688,528.7031 Q195.3438,528.125 194.75,527.8594 Q194.1563,527.5781 193.5313,527.5781 Q192.1875,527.5781 191.5,528.6563 Q190.8125,529.7188 190.8125,531.8125 Q190.8125,533.9063 191.5,534.9844 Q192.1875,536.0469 193.5313,536.0469 Q194.1563,536.0469 194.75,535.7813 Q195.3438,535.5 195.9688,534.9219 L195.9688,537.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="536.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="548" y2="548"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="556" y2="556"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001837009554564742531">
-        <rect codeLine="24" fill="#F1F1F1" height="48" id="C_0001837009554564742531" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="46" y="237.694"/>
-        <ellipse cx="61" cy="253.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M56,254.8502 C56,257.3502 58.1406,259.1627 61.0625,259.1627 C62.2969,259.1627 63.4688,258.8659 64.2188,258.3502 C64.8281,257.9284 65.1563,257.5065 65.1563,257.1002 C65.1563,256.6315 64.7344,256.2252 64.2344,256.2252 C64,256.2252 63.7813,256.3034 63.5781,256.5065 C63.1406,256.944 63.1406,256.944 62.9688,257.0377 C62.5156,257.2721 61.875,257.4127 61.1094,257.4127 C59.1094,257.4127 57.8281,256.3971 57.8281,254.819 L57.8281,253.7721 C57.8281,252.069 59.0469,250.8659 60.75,250.8659 C61.3281,250.8659 61.9063,251.0065 62.375,251.2565 C62.8438,251.5221 63.0156,251.7096 63.0781,252.069 C63.2031,252.7409 63.4531,252.9909 63.9844,252.9909 C64.2656,252.9909 64.5469,252.8502 64.7344,252.6315 C64.8594,252.4596 64.9063,252.2877 64.9063,251.8502 L64.9063,250.4909 C64.9063,250.069 64.8906,249.9284 64.7656,249.7565 C64.5938,249.5065 64.3125,249.3502 63.9844,249.3502 C63.6719,249.3502 63.4688,249.4596 63.25,249.7252 C62.0781,249.2252 61.6406,249.1159 60.6875,249.1159 C58.0156,249.1159 56,251.1315 56,253.7565 L56,254.8502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="75" y="258.3">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="47" x2="87" y1="269.694" y2="269.694"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="47" x2="87" y1="277.694" y2="277.694"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="62" y="243.5"/>
+      <ellipse cx="77" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M79.9688,265.1406 Q79.3906,265.4375 78.75,265.5781 Q78.1094,265.7344 77.4063,265.7344 Q74.9063,265.7344 73.5781,264.0938 Q72.2656,262.4375 72.2656,259.3125 Q72.2656,256.1875 73.5781,254.5313 Q74.9063,252.875 77.4063,252.875 Q78.1094,252.875 78.75,253.0313 Q79.4063,253.1875 79.9688,253.4844 L79.9688,256.2031 Q79.3438,255.625 78.75,255.3594 Q78.1563,255.0781 77.5313,255.0781 Q76.1875,255.0781 75.5,256.1563 Q74.8125,257.2188 74.8125,259.3125 Q74.8125,261.4063 75.5,262.4844 Q76.1875,263.5469 77.5313,263.5469 Q78.1563,263.5469 78.75,263.2813 Q79.3438,263 79.9688,262.4219 L79.9688,265.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91" y="263.6543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="275.5" y2="275.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="283.5" y2="283.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0002029929560931799980">
-        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0002029929560931799980" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="229" y="522.094"/>
-        <ellipse cx="244" cy="538.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M239,539.2502 C239,541.7502 241.1406,543.5627 244.0625,543.5627 C245.2969,543.5627 246.4688,543.2659 247.2188,542.7502 C247.8281,542.3284 248.1563,541.9065 248.1563,541.5002 C248.1563,541.0315 247.7344,540.6252 247.2344,540.6252 C247,540.6252 246.7813,540.7034 246.5781,540.9065 C246.1406,541.344 246.1406,541.344 245.9688,541.4377 C245.5156,541.6721 244.875,541.8127 244.1094,541.8127 C242.1094,541.8127 240.8281,540.7971 240.8281,539.219 L240.8281,538.1721 C240.8281,536.469 242.0469,535.2659 243.75,535.2659 C244.3281,535.2659 244.9063,535.4065 245.375,535.6565 C245.8438,535.9221 246.0156,536.1096 246.0781,536.469 C246.2031,537.1409 246.4531,537.3909 246.9844,537.3909 C247.2656,537.3909 247.5469,537.2502 247.7344,537.0315 C247.8594,536.8596 247.9063,536.6877 247.9063,536.2502 L247.9063,534.8909 C247.9063,534.469 247.8906,534.3284 247.7656,534.1565 C247.5938,533.9065 247.3125,533.7502 246.9844,533.7502 C246.6719,533.7502 246.4688,533.8596 246.25,534.1252 C245.0781,533.6252 244.6406,533.5159 243.6875,533.5159 C241.0156,533.5159 239,535.5315 239,538.1565 L239,539.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="258" y="542.7">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="230" x2="270" y1="554.094" y2="554.094"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="230" x2="270" y1="562.094" y2="562.094"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="253.5" y="516"/>
+      <ellipse cx="268.5" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M271.4688,537.6406 Q270.8906,537.9375 270.25,538.0781 Q269.6094,538.2344 268.9063,538.2344 Q266.4063,538.2344 265.0781,536.5938 Q263.7656,534.9375 263.7656,531.8125 Q263.7656,528.6875 265.0781,527.0313 Q266.4063,525.375 268.9063,525.375 Q269.6094,525.375 270.25,525.5313 Q270.9063,525.6875 271.4688,525.9844 L271.4688,528.7031 Q270.8438,528.125 270.25,527.8594 Q269.6563,527.5781 269.0313,527.5781 Q267.6875,527.5781 267,528.6563 Q266.3125,529.7188 266.3125,531.8125 Q266.3125,533.9063 267,534.9844 Q267.6875,536.0469 269.0313,536.0469 Q269.6563,536.0469 270.25,535.7813 Q270.8438,535.5 271.4688,534.9219 L271.4688,537.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="282.5" y="536.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="548" y2="548"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="556" y2="556"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0002305358535757579772">
-        <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0002305358535757579772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="351.5" y="237.694"/>
-        <ellipse cx="366.5" cy="253.694" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M361.5,254.8502 C361.5,257.3502 363.6406,259.1627 366.5625,259.1627 C367.7969,259.1627 368.9688,258.8659 369.7188,258.3502 C370.3281,257.9284 370.6563,257.5065 370.6563,257.1002 C370.6563,256.6315 370.2344,256.2252 369.7344,256.2252 C369.5,256.2252 369.2813,256.3034 369.0781,256.5065 C368.6406,256.944 368.6406,256.944 368.4688,257.0377 C368.0156,257.2721 367.375,257.4127 366.6094,257.4127 C364.6094,257.4127 363.3281,256.3971 363.3281,254.819 L363.3281,253.7721 C363.3281,252.069 364.5469,250.8659 366.25,250.8659 C366.8281,250.8659 367.4063,251.0065 367.875,251.2565 C368.3438,251.5221 368.5156,251.7096 368.5781,252.069 C368.7031,252.7409 368.9531,252.9909 369.4844,252.9909 C369.7656,252.9909 370.0469,252.8502 370.2344,252.6315 C370.3594,252.4596 370.4063,252.2877 370.4063,251.8502 L370.4063,250.4909 C370.4063,250.069 370.3906,249.9284 370.2656,249.7565 C370.0938,249.5065 369.8125,249.3502 369.4844,249.3502 C369.1719,249.3502 368.9688,249.4596 368.75,249.7252 C367.5781,249.2252 367.1406,249.1159 366.1875,249.1159 C363.5156,249.1159 361.5,251.1315 361.5,253.7565 L361.5,254.8502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="380.5" y="258.3">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="352.5" x2="391.5" y1="269.694" y2="269.694"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="352.5" x2="391.5" y1="277.694" y2="277.694"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="356" y="243.5"/>
+      <ellipse cx="371" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M373.9688,265.1406 Q373.3906,265.4375 372.75,265.5781 Q372.1094,265.7344 371.4063,265.7344 Q368.9063,265.7344 367.5781,264.0938 Q366.2656,262.4375 366.2656,259.3125 Q366.2656,256.1875 367.5781,254.5313 Q368.9063,252.875 371.4063,252.875 Q372.1094,252.875 372.75,253.0313 Q373.4063,253.1875 373.9688,253.4844 L373.9688,256.2031 Q373.3438,255.625 372.75,255.3594 Q372.1563,255.0781 371.5313,255.0781 Q370.1875,255.0781 369.5,256.1563 Q368.8125,257.2188 368.8125,259.3125 Q368.8125,261.4063 369.5,262.4844 Q370.1875,263.5469 371.5313,263.5469 Q372.1563,263.5469 372.75,263.2813 Q373.3438,263 373.9688,262.4219 L373.9688,265.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="385" y="263.6543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="275.5" y2="275.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="283.5" y2="283.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000974430595320588991">
-        <rect codeLine="36" fill="#F1F1F1" height="148.7996" id="C_0000974430595320588991" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="193" x="123.5" y="187.294"/>
-        <ellipse cx="210.75" cy="203.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M205.75,204.4502 C205.75,206.9502 207.8906,208.7627 210.8125,208.7627 C212.0469,208.7627 213.2188,208.4659 213.9688,207.9502 C214.5781,207.5284 214.9063,207.1065 214.9063,206.7002 C214.9063,206.2315 214.4844,205.8252 213.9844,205.8252 C213.75,205.8252 213.5313,205.9034 213.3281,206.1065 C212.8906,206.544 212.8906,206.544 212.7188,206.6377 C212.2656,206.8721 211.625,207.0127 210.8594,207.0127 C208.8594,207.0127 207.5781,205.9971 207.5781,204.419 L207.5781,203.3721 C207.5781,201.669 208.7969,200.4659 210.5,200.4659 C211.0781,200.4659 211.6563,200.6065 212.125,200.8565 C212.5938,201.1221 212.7656,201.3096 212.8281,201.669 C212.9531,202.3409 213.2031,202.5909 213.7344,202.5909 C214.0156,202.5909 214.2969,202.4502 214.4844,202.2315 C214.6094,202.0596 214.6563,201.8877 214.6563,201.4502 L214.6563,200.0909 C214.6563,199.669 214.6406,199.5284 214.5156,199.3565 C214.3438,199.1065 214.0625,198.9502 213.7344,198.9502 C213.4219,198.9502 213.2188,199.0596 213,199.3252 C211.8281,198.8252 211.3906,198.7159 210.4375,198.7159 C207.7656,198.7159 205.75,200.7315 205.75,203.3565 L205.75,204.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="231.25" y="207.9">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="315.5" y1="219.294" y2="219.294"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="228.1939"/>
-          <ellipse cx="134.5" cy="233.1939" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="143.5" y="236.2999">foo(AA &amp; aa) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="124.5" x2="315.5" y1="244.0939" y2="244.0939"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="252.9939"/>
-          <ellipse cx="134.5" cy="257.9939" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="143.5" y="261.0999">a : A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="269.7938"/>
-          <ellipse cx="134.5" cy="274.7938" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="143.5" y="277.8998">i : std::vector&lt;std::uint8_t&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="286.5937"/>
-          <ellipse cx="134.5" cy="291.5937" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="143.5" y="294.6997">ns1_a : ns1::A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="303.3937"/>
-          <ellipse cx="134.5" cy="308.3937" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="143.5" y="311.4996">ns1_ns2_a : ns1::ns2::A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="129.5" y="320.1936"/>
-          <ellipse cx="134.5" cy="325.1936" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="143.5" y="328.2996">root_a : ::A *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="137" y="205"/>
+      <ellipse cx="220.75" cy="221" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M223.7188,226.6406 Q223.1406,226.9375 222.5,227.0781 Q221.8594,227.2344 221.1563,227.2344 Q218.6563,227.2344 217.3281,225.5938 Q216.0156,223.9375 216.0156,220.8125 Q216.0156,217.6875 217.3281,216.0313 Q218.6563,214.375 221.1563,214.375 Q221.8594,214.375 222.5,214.5313 Q223.1563,214.6875 223.7188,214.9844 L223.7188,217.7031 Q223.0938,217.125 222.5,216.8594 Q221.9063,216.5781 221.2813,216.5781 Q219.9375,216.5781 219.25,217.6563 Q218.5625,218.7188 218.5625,220.8125 Q218.5625,222.9063 219.25,223.9844 Q219.9375,225.0469 221.2813,225.0469 Q221.9063,225.0469 222.5,224.7813 Q223.0938,224.5 223.7188,223.9219 L223.7188,226.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="241.25" y="225.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000864916647665253425">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000864916647665253425" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="532.5" y="413.094"/>
-        <ellipse cx="547.5" cy="429.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M542.5,430.2502 C542.5,432.7502 544.6406,434.5627 547.5625,434.5627 C548.7969,434.5627 549.9688,434.2659 550.7188,433.7502 C551.3281,433.3284 551.6563,432.9065 551.6563,432.5002 C551.6563,432.0315 551.2344,431.6252 550.7344,431.6252 C550.5,431.6252 550.2813,431.7034 550.0781,431.9065 C549.6406,432.344 549.6406,432.344 549.4688,432.4377 C549.0156,432.6721 548.375,432.8127 547.6094,432.8127 C545.6094,432.8127 544.3281,431.7971 544.3281,430.219 L544.3281,429.1721 C544.3281,427.469 545.5469,426.2659 547.25,426.2659 C547.8281,426.2659 548.4063,426.4065 548.875,426.6565 C549.3438,426.9221 549.5156,427.1096 549.5781,427.469 C549.7031,428.1409 549.9531,428.3909 550.4844,428.3909 C550.7656,428.3909 551.0469,428.2502 551.2344,428.0315 C551.3594,427.8596 551.4063,427.6877 551.4063,427.2502 L551.4063,425.8909 C551.4063,425.469 551.3906,425.3284 551.2656,425.1565 C551.0938,424.9065 550.8125,424.7502 550.4844,424.7502 C550.1719,424.7502 549.9688,424.8596 549.75,425.1252 C548.5781,424.6252 548.1406,424.5159 547.1875,424.5159 C544.5156,424.5159 542.5,426.5315 542.5,429.1565 L542.5,430.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="561.5" y="433.7">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="533.5" x2="572.5" y1="445.094" y2="445.094"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="533.5" x2="572.5" y1="453.094" y2="453.094"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="243"/>
+      <ellipse cx="148" cy="248" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <g id="elem_C_0000386872828559902182">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000386872828559902182" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="448" y="413.094"/>
-        <ellipse cx="463" cy="429.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M458,430.2502 C458,432.7502 460.1406,434.5627 463.0625,434.5627 C464.2969,434.5627 465.4688,434.2659 466.2188,433.7502 C466.8281,433.3284 467.1563,432.9065 467.1563,432.5002 C467.1563,432.0315 466.7344,431.6252 466.2344,431.6252 C466,431.6252 465.7813,431.7034 465.5781,431.9065 C465.1406,432.344 465.1406,432.344 464.9688,432.4377 C464.5156,432.6721 463.875,432.8127 463.1094,432.8127 C461.1094,432.8127 459.8281,431.7971 459.8281,430.219 L459.8281,429.1721 C459.8281,427.469 461.0469,426.2659 462.75,426.2659 C463.3281,426.2659 463.9063,426.4065 464.375,426.6565 C464.8438,426.9221 465.0156,427.1096 465.0781,427.469 C465.2031,428.1409 465.4531,428.3909 465.9844,428.3909 C466.2656,428.3909 466.5469,428.2502 466.7344,428.0315 C466.8594,427.8596 466.9063,427.6877 466.9063,427.2502 L466.9063,425.8909 C466.9063,425.469 466.8906,425.3284 466.7656,425.1565 C466.5938,424.9065 466.3125,424.7502 465.9844,424.7502 C465.6719,424.7502 465.4688,424.8596 465.25,425.1252 C464.0781,424.6252 463.6406,424.5159 462.6875,424.5159 C460.0156,424.5159 458,426.5315 458,429.1565 L458,430.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="477" y="433.7">AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="449" x2="497" y1="445.094" y2="445.094"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="449" x2="497" y1="453.094" y2="453.094"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="157" y="251.2104">foo(AA &amp; aa) : void</text>
     </a>
-    <g id="link_C_0002207007194029669343_C_0000204051985124373077">
-      <path codeLine="47" d="M202.1441,478.1673 C194.6441,496.0073 191.35,503.844 183.85,521.664 " fill="none" id="C_0002207007194029669343-backto-C_0000204051985124373077" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="209.12,461.574,196.613,475.842,207.6752,480.4926,209.12,461.574" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000619642232943663499_C_0001837009554564742531">
-      <path codeLine="48" d="M104.896,107.2194 C95.646,144.6894 81.95,200.134 72.74,237.464 " fill="none" id="C_0000619642232943663499-backto-C_0001837009554564742531" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="109.21,89.744,99.0708,105.7814,110.7211,108.6574,109.21,89.744" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002207007194029669343_C_0002029929560931799980">
-      <path codeLine="49" d="M230.8102,478.8626 C235.9802,496.7026 238.05,503.844 243.21,521.664 " fill="none" id="C_0002207007194029669343-backto-C_0002029929560931799980" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="225.8,461.574,225.0473,480.5327,236.5731,477.1926,225.8,461.574" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000864916647665253425_C_0002305358535757579772">
-      <path codeLine="50" d="M546.252,395.1691 C543.312,380.5891 541.32,379.694 531,366.094 C493.97,317.314 426.81,284.834 392.86,270.714 " fill="none" id="C_0000864916647665253425-backto-C_0002305358535757579772" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="549.81,412.814,552.1336,393.9831,540.3704,396.3551,549.81,412.814" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0000386872828559902182">
-      <path codeLine="51" d="M316.73,328.994 C364.02,361.404 412.2513,394.4513 442.7813,415.3813 " fill="none" id="C_0000974430595320588991-to-C_0000386872828559902182" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="447.73,418.774,442.5686,410.3859,443.606,415.9468,438.0451,416.9842,447.73,418.774" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0002207007194029669343">
-      <path codeLine="52" d="M187.86,336.584 C184.68,351.964 183.93,368.064 188,383.094 C190.82,393.484 193.0579,398.8373 198.5879,407.6773 " fill="none" id="C_0000974430595320588991-to-C_0002207007194029669343" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="201.77,412.764,200.388,403.0126,199.1183,408.5251,193.6058,407.2553,201.77,412.764" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="189" y="379.171">+a</text>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0002207007194029669343">
-      <path codeLine="54" d="M219.57,336.484 C219.42,363.954 219.2867,387.1941 219.1667,406.8341 " fill="none" id="C_0000974430595320588991-to-C_0002207007194029669343-1" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="219.13,412.834,223.1849,403.8586,219.1605,407.8341,215.1851,403.8097,219.13,412.834" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="226" cy="375.394" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="233" y="379.171">ns1_ns2_a</text>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0000619642232943663499">
-      <path codeLine="53" d="M180.13,186.864 C161.51,152.404 143.5015,119.0531 130.5215,95.0231 " fill="none" id="C_0000974430595320588991-to-C_0000619642232943663499" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="127.67,89.744,128.4279,99.5636,130.0463,94.1432,135.4667,95.7616,127.67,89.744" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="158" cy="128.594" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="165" y="132.371">ns1_a</text>
-    </g>
-    <g id="link_C_0000974430595320588991_C_0000864916647665253425">
-      <path codeLine="55" d="M316.9,326.824 C322.63,330.064 328.35,333.184 334,336.094 C365.91,352.554 375.92,352.144 409,366.094 C456.49,386.114 469.31,389.264 515,413.094 C520.74,416.094 521.6748,416.4907 527.2348,419.8507 " fill="none" id="C_0000974430595320588991-to-C_0000864916647665253425" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="532.37,422.954,526.7361,414.8757,528.0907,420.3679,522.5984,421.7225,532.37,422.954" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="455" cy="375.394" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="462" y="379.171">root_a</text>
-    </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="257.8047" y2="257.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="263.8047"/>
+      <ellipse cx="148" cy="268.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="157" y="272.0151">a : A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="276.6094"/>
+      <ellipse cx="148" cy="281.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="157" y="284.8198">i : std::vector&lt;std::uint8_t&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="289.4141"/>
+      <ellipse cx="148" cy="294.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="157" y="297.6245">ns1_a : ns1::A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="302.2188"/>
+      <ellipse cx="148" cy="307.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="157" y="310.4292">ns1_ns2_a : ns1::ns2::A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="315.0234"/>
+      <ellipse cx="148" cy="320.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="157" y="323.2339">root_a : ::A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="535" y="407"/>
+      <ellipse cx="550" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M552.9688,428.6406 Q552.3906,428.9375 551.75,429.0781 Q551.1094,429.2344 550.4063,429.2344 Q547.9063,429.2344 546.5781,427.5938 Q545.2656,425.9375 545.2656,422.8125 Q545.2656,419.6875 546.5781,418.0313 Q547.9063,416.375 550.4063,416.375 Q551.1094,416.375 551.75,416.5313 Q552.4063,416.6875 552.9688,416.9844 L552.9688,419.7031 Q552.3438,419.125 551.75,418.8594 Q551.1563,418.5781 550.5313,418.5781 Q549.1875,418.5781 548.5,419.6563 Q547.8125,420.7188 547.8125,422.8125 Q547.8125,424.9063 548.5,425.9844 Q549.1875,427.0469 550.5313,427.0469 Q551.1563,427.0469 551.75,426.7813 Q552.3438,426.5 552.9688,425.9219 L552.9688,428.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="564" y="427.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="439" y2="439"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="447" y2="447"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="452" y="407"/>
+      <ellipse cx="467" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M469.9688,428.6406 Q469.3906,428.9375 468.75,429.0781 Q468.1094,429.2344 467.4063,429.2344 Q464.9063,429.2344 463.5781,427.5938 Q462.2656,425.9375 462.2656,422.8125 Q462.2656,419.6875 463.5781,418.0313 Q464.9063,416.375 467.4063,416.375 Q468.1094,416.375 468.75,416.5313 Q469.4063,416.6875 469.9688,416.9844 L469.9688,419.7031 Q469.3438,419.125 468.75,418.8594 Q468.1563,418.5781 467.5313,418.5781 Q466.1875,418.5781 465.5,419.6563 Q464.8125,420.7188 464.8125,422.8125 Q464.8125,424.9063 465.5,425.9844 Q466.1875,427.0469 467.5313,427.0469 Q468.1563,427.0469 468.75,426.7813 Q469.3438,426.5 469.9688,425.9219 L469.9688,428.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="481" y="427.1543">AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="453" x2="499" y1="439" y2="439"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="453" x2="499" y1="447" y2="447"/>
+    </a>
+    <path d="M216.06,474.59 C212.11,488.66 207.88,503.78 204.5,515.83 " fill="none" id="C_0002207007194029669343&lt;-C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="209.35,472.59,221.49,455.22,222.83,476.36,209.35,472.59" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M117.27,126.58 C108.09,162.98 95.24,213.97 87.85,243.29 " fill="none" id="C_0000619642232943663499&lt;-C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="110.5,124.8,122.17,107.11,124.07,128.22,110.5,124.8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M245.89,473.62 C252.06,487.96 258.74,503.5 264.04,515.83 " fill="none" id="C_0002207007194029669343&lt;-C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="239.45,476.36,237.98,455.22,252.31,470.83,239.45,476.36" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M547.01,387.2 C543.79,377.57 539.29,367.87 533,360 C496.19,313.9 429.38,286.33 396.05,274.81 " fill="none" id="C_0000864916647665253425&lt;-C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="553.87,385.76,552.09,406.88,540.31,389.26,553.87,385.76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M321.32,328.87 C366.12,358.16 416.77,391.27 447.54,411.39 " fill="none" id="C_0000974430595320588991-&gt;C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="451.93,414.26,446.5749,405.9943,447.7414,411.5295,442.2061,412.6961,451.93,414.26" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M196.81,330.02 C192.37,345.32 190.63,361.72 195,377 C197.54,385.88 202.04,394.72 206.93,402.57 " fill="none" id="C_0000974430595320588991-&gt;C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="209.67,406.82,208.1679,397.0864,206.9662,402.6141,201.4385,401.4124,209.67,406.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="196" y="373.0669">+a</text>
+    <path d="M228.62,330.02 C228.47,354.73 228.3,381.99 228.17,401.8 " fill="none" id="C_0000974430595320588991-&gt;C_0002207007194029669343-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="228.14,406.92,232.1914,397.943,228.1686,401.9201,224.1915,397.8973,228.14,406.92" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="235" cy="369.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="68" x="242" y="373.0669">ns1_ns2_a</text>
+    <path d="M194.87,204.83 C177.35,173.17 156.89,136.2 143.26,111.57 " fill="none" id="C_0000974430595320588991-&gt;C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="140.79,107.11,141.6642,116.92,143.2182,111.4808,148.6574,113.0348,140.79,107.11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="173" 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="38" x="180" y="150.0669">ns1_a</text>
+    <path d="M321.06,320.88 C327.09,324.03 333.11,327.1 339,330 C416.68,368.29 441.23,366.92 518,407 C522.14,409.16 526.43,411.61 530.56,414.1 " fill="none" id="C_0000974430595320588991-&gt;C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="534.96,416.79,529.3839,408.6717,530.6993,414.1735,525.1975,415.4889,534.96,416.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="456" cy="369.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="41" x="463" y="373.0669">root_a</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00046_class_mermaid.svg b/docs/test_cases/t00046_class_mermaid.svg
index c3343e19..448fcbdf 100644
--- a/docs/test_cases/t00046_class_mermaid.svg
+++ b/docs/test_cases/t00046_class_mermaid.svg
@@ -1,69 +1,64 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 611.66796875 437" style="max-width: 611.668px; background-color: white;" width="611.66796875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M80.50792955961373,332.3151433039687L77.0079100496781,334.7626194199739C73.50789053974249,337.2100955359791,66.50785151987124,342.10504776798956,63.00783200993562,348.7191905506614C59.5078125,355.3333333333333,59.5078125,363.6666666666667,59.5078125,367.8333333333333L59.5078125,372"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M400.03515625,340L400.03515625,341.1666666666667C400.03515625,342.3333333333333,400.03515625,344.6666666666667,400.03515625,350C400.03515625,355.3333333333333,400.03515625,363.6666666666667,400.03515625,367.8333333333333L400.03515625,372"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M191.52332044038627,332.3151433039687L195.02333995032188,334.7626194199739C198.52335946025752,337.2100955359791,205.52339848012875,342.10504776798956,209.02341799006436,348.7191905506614C212.5234375,355.3333333333333,212.5234375,363.6666666666667,212.5234375,367.8333333333333L212.5234375,372"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M552.60546875,340L552.60546875,341.1666666666667C552.60546875,342.3333333333333,552.60546875,344.6666666666667,552.60546875,350C552.60546875,355.3333333333333,552.60546875,363.6666666666667,552.60546875,367.8333333333333L552.60546875,372"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M298.58984375,197L298.58984375,202.66666666666666C298.58984375,208.33333333333334,298.58984375,219.66666666666666,298.58984375,230C298.58984375,240.33333333333334,298.58984375,249.66666666666666,298.58984375,254.33333333333334L298.58984375,259"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M192.58984375,170.93111704215403L177.08203125,180.94259753512836C161.57421875,190.95407802810269,130.55859375,210.97703901405134,117.85361672047289,225.79149343093763C105.14863969094576,240.60594784782393,110.75431063189153,250.21189569564788,113.55714610236441,255.01486961955985L116.3599815728373,259.81784354347184"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M373.1935949659533,197L377.66718851329443,202.66666666666666C382.1407820606355,208.33333333333334,391.08796915531775,219.66666666666666,395.5615627026589,230C400.03515625,240.33333333333334,400.03515625,249.66666666666666,400.03515625,254.33333333333334L400.03515625,259"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M230.7914944066148,197L226.72598492217898,202.66666666666666C222.6604754377432,208.33333333333334,214.5294564688716,219.66666666666666,204.83031091786833,230.3360071631191C195.13116536686508,241.0053476595715,183.86389323373012,251.01069531914297,178.23025716716268,256.0133691489287L172.5966211005952,261.01604297871444"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M404.58984375,156.1226856123516L429.2591145833333,168.602238010293C453.9283854166667,181.08179040823438,503.2669270833333,206.0408952041172,527.9361979166666,223.18711426872528C552.60546875,240.33333333333334,552.60546875,249.66666666666666,552.60546875,254.33333333333334L552.60546875,259"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M95.25912675233644,322L89.30057437694704,326.1666666666667C83.34202200155762,330.3333333333333,71.42491725077882,338.6666666666667,65.4663648753894,347C59.5078125,355.3333333333333,59.5078125,363.6666666666667,59.5078125,367.8333333333333L59.5078125,372"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M400.03515625,322L400.03515625,326.1666666666667C400.03515625,330.3333333333333,400.03515625,338.6666666666667,400.03515625,347C400.03515625,355.3333333333333,400.03515625,363.6666666666667,400.03515625,367.8333333333333L400.03515625,372"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M176.77212324766356,322L182.73067562305297,326.1666666666667C188.68922799844236,330.3333333333333,200.6063327492212,338.6666666666667,206.56488512461058,347C212.5234375,355.3333333333333,212.5234375,363.6666666666667,212.5234375,367.8333333333333L212.5234375,372"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M552.60546875,322L552.60546875,326.1666666666667C552.60546875,330.3333333333333,552.60546875,338.6666666666667,552.60546875,347C552.60546875,355.3333333333333,552.60546875,363.6666666666667,552.60546875,367.8333333333333L552.60546875,372"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M298.58984375,197L298.58984375,202.66666666666666C298.58984375,208.33333333333334,298.58984375,219.66666666666666,298.58984375,231C298.58984375,242.33333333333334,298.58984375,253.66666666666666,298.58984375,259.3333333333333L298.58984375,265"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M192.58984375,170.93111704215403L177.08203125,180.94259753512836C161.57421875,190.95407802810269,130.55859375,210.97703901405134,118.35763541666667,226.65518617369233C106.15667708333335,242.33333333333334,112.77038541666667,253.66666666666666,116.07723958333334,259.3333333333333L119.38409375,265"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M373.1935949659533,197L377.66718851329443,202.66666666666666C382.1407820606355,208.33333333333334,391.08796915531775,219.66666666666666,395.5615627026589,231C400.03515625,242.33333333333334,400.03515625,253.66666666666666,400.03515625,259.3333333333333L400.03515625,265"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M230.7914944066148,197L226.72598492217898,202.66666666666666C222.6604754377432,208.33333333333334,214.5294564688716,219.66666666666666,204.08257198443576,231C193.6356875,242.33333333333334,180.8729375,253.66666666666666,174.4915625,259.3333333333333L168.1101875,265"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M404.58984375,156.1226856123516L429.2591145833333,168.602238010293C453.9283854166667,181.08179040823438,503.2669270833333,206.0408952041172,527.9361979166666,224.18711426872528C552.60546875,242.33333333333334,552.60546875,253.66666666666666,552.60546875,259.3333333333333L552.60546875,265"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -159,7 +154,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L4">
+        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L4">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -178,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L6">
+        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L6">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -197,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L10">
+        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L10">
           <g title="A" id="classId-C_0000619642232943663499-2" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -216,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L14">
+        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L14">
           <g title="A" id="classId-C_0002207007194029669343-3" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -235,7 +230,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L16">
+        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L16">
           <g title="B" id="classId-C_0000204051985124373077-4" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -254,7 +249,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L18">
+        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L18">
           <g title="C" id="classId-C_0001837009554564742531-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -273,7 +268,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L20">
+        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L20">
           <g title="D" id="classId-C_0002029929560931799980-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -292,7 +287,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L22">
+        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L22">
           <g title="E" id="classId-C_0002305358535757579772-7" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -311,7 +306,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00046/t00046.cc#L24">
+        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L24">
           <g title="R" id="classId-C_0000974430595320588991-8" class="node default clickable">
             <rect height="189" width="212" y="-94.5" x="-106" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="106" x1="-106" class="divider"/>
@@ -329,7 +324,7 @@
               </foreignObject>
               <foreignObject transform="translate( -98.5, -53)" height="18" width="41.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+a : A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+a : A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -98.5, -31)" height="18" width="197">
@@ -339,22 +334,22 @@
               </foreignObject>
               <foreignObject transform="translate( -98.5, -9)" height="18" width="111.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ns1_a : ns1::A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+ns1_a : ns1::A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -98.5, 13)" height="18" width="181.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+ns1_ns2_a : ns1::ns2::A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+ns1_ns2_a : ns1::ns2::A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -98.5, 35)" height="18" width="87.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+root_a : ::A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+root_a : ::A </span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -98.5, 69)" height="18" width="151.640625">
+              <foreignObject transform="translate( -98.5, 69)" height="18" width="142.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo(AA &amp; aa) : : void</span>
+                  <span class="nodeLabel">+foo(AA &amp; aa) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00047.md b/docs/test_cases/t00047.md
index ebd9bebd..66b74dc5 100644
--- a/docs/test_cases/t00047.md
+++ b/docs/test_cases/t00047.md
@@ -52,7 +52,7 @@ using conditional = typename conditional_t<Ts...>::type;
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00047::conditional_t<Else>",
+      "display_name": "conditional_t<Else>",
       "id": "47394280824625133",
       "is_abstract": false,
       "is_nested": false,
@@ -81,7 +81,7 @@ using conditional = typename conditional_t<Ts...>::type;
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00047::conditional_t<std::true_type,Result,Tail...>",
+      "display_name": "conditional_t<std::true_type,Result,Tail...>",
       "id": "599782159389775809",
       "is_abstract": false,
       "is_nested": false,
@@ -122,7 +122,7 @@ using conditional = typename conditional_t<Ts...>::type;
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00047::conditional_t<std::false_type,Result,Tail...>",
+      "display_name": "conditional_t<std::false_type,Result,Tail...>",
       "id": "824938194184364511",
       "is_abstract": false,
       "is_nested": false,
@@ -163,7 +163,7 @@ using conditional = typename conditional_t<Ts...>::type;
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00047::conditional_t<Ts...>",
+      "display_name": "conditional_t<Ts...>",
       "id": "1673692992642087414",
       "is_abstract": false,
       "is_nested": false,
@@ -192,6 +192,7 @@ using conditional = typename conditional_t<Ts...>::type;
     }
   ],
   "name": "t00047_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg
index 395a2e62..87c2d77e 100644
--- a/docs/test_cases/t00047_class.svg
+++ b/docs/test_cases/t00047_class.svg
@@ -1,67 +1,59 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="173px" preserveAspectRatio="none" style="width:751px;height:173px;background:#FFFFFF;" version="1.1" viewBox="0 0 751 173" width="751px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:799px;height:175px;" version="1.1" viewBox="0 0 799 175" width="799px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f151qeb8r3cme8" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <g id="elem_C_0000047394280824625133">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000047394280824625133" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="140" x="7" y="10"/>
-        <ellipse cx="22" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,27.1563 C17,29.6563 19.1406,31.4688 22.0625,31.4688 C23.2969,31.4688 24.4688,31.1719 25.2188,30.6563 C25.8281,30.2344 26.1563,29.8125 26.1563,29.4063 C26.1563,28.9375 25.7344,28.5313 25.2344,28.5313 C25,28.5313 24.7813,28.6094 24.5781,28.8125 C24.1406,29.25 24.1406,29.25 23.9688,29.3438 C23.5156,29.5781 22.875,29.7188 22.1094,29.7188 C20.1094,29.7188 18.8281,28.7031 18.8281,27.125 L18.8281,26.0781 C18.8281,24.375 20.0469,23.1719 21.75,23.1719 C22.3281,23.1719 22.9063,23.3125 23.375,23.5625 C23.8438,23.8281 24.0156,24.0156 24.0781,24.375 C24.2031,25.0469 24.4531,25.2969 24.9844,25.2969 C25.2656,25.2969 25.5469,25.1563 25.7344,24.9375 C25.8594,24.7656 25.9063,24.5938 25.9063,24.1563 L25.9063,22.7969 C25.9063,22.375 25.8906,22.2344 25.7656,22.0625 C25.5938,21.8125 25.3125,21.6563 24.9844,21.6563 C24.6719,21.6563 24.4688,21.7656 24.25,22.0313 C23.0781,21.5313 22.6406,21.4219 21.6875,21.4219 C19.0156,21.4219 17,23.4375 17,26.0625 L17,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="36" y="30.606">conditional_t</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="26" x="124" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="24" x="125" y="21.2001">Else</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="146" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="146" y1="50" y2="50"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f151qeb8r3cme8)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="8"/>
+      <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="35" y="28.1543">conditional_t</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="123" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="124" y="17.1387">Else</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <g id="elem_C_0000599782159389775809">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000599782159389775809" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="259" x="181.5" y="10"/>
-        <ellipse cx="196.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M191.5,27.1563 C191.5,29.6563 193.6406,31.4688 196.5625,31.4688 C197.7969,31.4688 198.9688,31.1719 199.7188,30.6563 C200.3281,30.2344 200.6563,29.8125 200.6563,29.4063 C200.6563,28.9375 200.2344,28.5313 199.7344,28.5313 C199.5,28.5313 199.2813,28.6094 199.0781,28.8125 C198.6406,29.25 198.6406,29.25 198.4688,29.3438 C198.0156,29.5781 197.375,29.7188 196.6094,29.7188 C194.6094,29.7188 193.3281,28.7031 193.3281,27.125 L193.3281,26.0781 C193.3281,24.375 194.5469,23.1719 196.25,23.1719 C196.8281,23.1719 197.4063,23.3125 197.875,23.5625 C198.3438,23.8281 198.5156,24.0156 198.5781,24.375 C198.7031,25.0469 198.9531,25.2969 199.4844,25.2969 C199.7656,25.2969 200.0469,25.1563 200.2344,24.9375 C200.3594,24.7656 200.4063,24.5938 200.4063,24.1563 L200.4063,22.7969 C200.4063,22.375 200.3906,22.2344 200.2656,22.0625 C200.0938,21.8125 199.8125,21.6563 199.4844,21.6563 C199.1719,21.6563 198.9688,21.7656 198.75,22.0313 C197.5781,21.5313 197.1406,21.4219 196.1875,21.4219 C193.5156,21.4219 191.5,23.4375 191.5,26.0625 L191.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="210.5" y="30.606">conditional_t</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="145" x="298.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="143" x="299.5" y="21.2001">std::true_type,Result,Tail...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="182.5" x2="439.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="182.5" x2="439.5" y1="50" y2="50"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f151qeb8r3cme8)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="8"/>
+      <ellipse cx="197.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M200.4688,29.6406 Q199.8906,29.9375 199.25,30.0781 Q198.6094,30.2344 197.9063,30.2344 Q195.4063,30.2344 194.0781,28.5938 Q192.7656,26.9375 192.7656,23.8125 Q192.7656,20.6875 194.0781,19.0313 Q195.4063,17.375 197.9063,17.375 Q198.6094,17.375 199.25,17.5313 Q199.9063,17.6875 200.4688,17.9844 L200.4688,20.7031 Q199.8438,20.125 199.25,19.8594 Q198.6563,19.5781 198.0313,19.5781 Q196.6875,19.5781 196,20.6563 Q195.3125,21.7188 195.3125,23.8125 Q195.3125,25.9063 196,26.9844 Q196.6875,28.0469 198.0313,28.0469 Q198.6563,28.0469 199.25,27.7813 Q199.8438,27.5 200.4688,26.9219 L200.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="211.5" y="28.1543">conditional_t</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="168" x="299.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="166" x="300.5" y="17.1387">std::true_type,Result,Tail...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <g id="elem_C_0000824938194184364511">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000824938194184364511" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="264" x="476" y="10"/>
-        <ellipse cx="491" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M486,27.1563 C486,29.6563 488.1406,31.4688 491.0625,31.4688 C492.2969,31.4688 493.4688,31.1719 494.2188,30.6563 C494.8281,30.2344 495.1563,29.8125 495.1563,29.4063 C495.1563,28.9375 494.7344,28.5313 494.2344,28.5313 C494,28.5313 493.7813,28.6094 493.5781,28.8125 C493.1406,29.25 493.1406,29.25 492.9688,29.3438 C492.5156,29.5781 491.875,29.7188 491.1094,29.7188 C489.1094,29.7188 487.8281,28.7031 487.8281,27.125 L487.8281,26.0781 C487.8281,24.375 489.0469,23.1719 490.75,23.1719 C491.3281,23.1719 491.9063,23.3125 492.375,23.5625 C492.8438,23.8281 493.0156,24.0156 493.0781,24.375 C493.2031,25.0469 493.4531,25.2969 493.9844,25.2969 C494.2656,25.2969 494.5469,25.1563 494.7344,24.9375 C494.8594,24.7656 494.9063,24.5938 494.9063,24.1563 L494.9063,22.7969 C494.9063,22.375 494.8906,22.2344 494.7656,22.0625 C494.5938,21.8125 494.3125,21.6563 493.9844,21.6563 C493.6719,21.6563 493.4688,21.7656 493.25,22.0313 C492.0781,21.5313 491.6406,21.4219 490.6875,21.4219 C488.0156,21.4219 486,23.4375 486,26.0625 L486,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="505" y="30.606">conditional_t</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="150" x="593" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="148" x="594" y="21.2001">std::false_type,Result,Tail...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="477" x2="739" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="477" x2="739" y1="50" y2="50"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f151qeb8r3cme8)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="8"/>
+      <ellipse cx="515" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M517.9688,29.6406 Q517.3906,29.9375 516.75,30.0781 Q516.1094,30.2344 515.4063,30.2344 Q512.9063,30.2344 511.5781,28.5938 Q510.2656,26.9375 510.2656,23.8125 Q510.2656,20.6875 511.5781,19.0313 Q512.9063,17.375 515.4063,17.375 Q516.1094,17.375 516.75,17.5313 Q517.4063,17.6875 517.9688,17.9844 L517.9688,20.7031 Q517.3438,20.125 516.75,19.8594 Q516.1563,19.5781 515.5313,19.5781 Q514.1875,19.5781 513.5,20.6563 Q512.8125,21.7188 512.8125,23.8125 Q512.8125,25.9063 513.5,26.9844 Q514.1875,28.0469 515.5313,28.0469 Q516.1563,28.0469 516.75,27.7813 Q517.3438,27.5 517.9688,26.9219 L517.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="529" y="28.1543">conditional_t</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="171" x="617" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="618" y="17.1387">std::false_type,Result,Tail...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <g id="elem_C_0001673692992642087414">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001673692992642087414" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="242" y="118"/>
-        <ellipse cx="257" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M252,135.1563 C252,137.6563 254.1406,139.4688 257.0625,139.4688 C258.2969,139.4688 259.4688,139.1719 260.2188,138.6563 C260.8281,138.2344 261.1563,137.8125 261.1563,137.4063 C261.1563,136.9375 260.7344,136.5313 260.2344,136.5313 C260,136.5313 259.7813,136.6094 259.5781,136.8125 C259.1406,137.25 259.1406,137.25 258.9688,137.3438 C258.5156,137.5781 257.875,137.7188 257.1094,137.7188 C255.1094,137.7188 253.8281,136.7031 253.8281,135.125 L253.8281,134.0781 C253.8281,132.375 255.0469,131.1719 256.75,131.1719 C257.3281,131.1719 257.9063,131.3125 258.375,131.5625 C258.8438,131.8281 259.0156,132.0156 259.0781,132.375 C259.2031,133.0469 259.4531,133.2969 259.9844,133.2969 C260.2656,133.2969 260.5469,133.1563 260.7344,132.9375 C260.8594,132.7656 260.9063,132.5938 260.9063,132.1563 L260.9063,130.7969 C260.9063,130.375 260.8906,130.2344 260.7656,130.0625 C260.5938,129.8125 260.3125,129.6563 259.9844,129.6563 C259.6719,129.6563 259.4688,129.7656 259.25,130.0313 C258.0781,129.5313 257.6406,129.4219 256.6875,129.4219 C254.0156,129.4219 252,131.4375 252,134.0625 L252,135.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="271" y="138.606">conditional_t</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="24" x="359" y="115"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="22" x="360" y="129.2001">Ts...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="243" x2="379" y1="150" y2="150"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="243" x2="379" y1="158" y2="158"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f151qeb8r3cme8)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="116"/>
+      <ellipse cx="268" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M270.9688,137.6406 Q270.3906,137.9375 269.75,138.0781 Q269.1094,138.2344 268.4063,138.2344 Q265.9063,138.2344 264.5781,136.5938 Q263.2656,134.9375 263.2656,131.8125 Q263.2656,128.6875 264.5781,127.0313 Q265.9063,125.375 268.4063,125.375 Q269.1094,125.375 269.75,125.5313 Q270.4063,125.6875 270.9688,125.9844 L270.9688,128.7031 Q270.3438,128.125 269.75,127.8594 Q269.1563,127.5781 268.5313,127.5781 Q267.1875,127.5781 266.5,128.6563 Q265.8125,129.7188 265.8125,131.8125 Q265.8125,133.9063 266.5,134.9844 Q267.1875,136.0469 268.5313,136.0469 Q269.1563,136.0469 269.75,135.7813 Q270.3438,135.5 270.9688,134.9219 L270.9688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="282" y="136.1543">conditional_t</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="370" y="113"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="371" y="125.1387">Ts...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="393" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="393" y1="156" y2="156"/>
     </a>
-    <g id="link_C_0000047394280824625133_C_0001673692992642087414">
-      <path codeLine="17" d="M128.64,58.39 C167.54,76.01 204.2349,92.6303 243.0949,110.2403 " fill="none" id="C_0000047394280824625133-to-C_0001673692992642087414" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="259.49,117.67,245.5715,104.7753,240.6183,115.7053,259.49,117.67" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000599782159389775809_C_0001673692992642087414">
-      <path codeLine="18" d="M311,58.26 C311,75.94 311,82.13 311,99.79 " fill="none" id="C_0000599782159389775809-to-C_0001673692992642087414" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="311,117.79,317,99.79,305,99.79,311,117.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000824938194184364511_C_0001673692992642087414">
-      <path codeLine="19" d="M542.45,58.39 C493.17,75.98 442.8936,93.9323 393.5836,111.5223 " fill="none" id="C_0000824938194184364511-to-C_0001673692992642087414" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="376.63,117.57,395.5995,117.1735,391.5677,105.8711,376.63,117.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <path d="M130.1,56 C165.5,71.19 212.32,91.29 251.04,107.9 " fill="none" id="C_0000047394280824625133-&gt;C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="253.96,101.54,269.58,115.86,248.44,114.41,253.96,101.54" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M323.5,56 C323.5,67.59 323.5,82.03 323.5,95.6 " fill="none" id="C_0000599782159389775809-&gt;C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="330.5,95.68,323.5,115.68,316.5,95.68,330.5,95.68" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M573.28,56 C526.02,71.7 462.99,92.65 412.08,109.57 " fill="none" id="C_0000824938194184364511-&gt;C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="414.05,116.29,392.86,115.95,409.63,103,414.05,116.29" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00047_class_mermaid.svg b/docs/test_cases/t00047_class_mermaid.svg
index 7e1b9ee2..1207c7c4 100644
--- a/docs/test_cases/t00047_class_mermaid.svg
+++ b/docs/test_cases/t00047_class_mermaid.svg
@@ -1,63 +1,58 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 963.25 180" style="max-width: 963.25px; background-color: white;" width="963.25" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M91.078125,65L91.078125,69.16666666666667C91.078125,73.33333333333333,91.078125,81.66666666666667,124.75048454704893,91.80263924801379C158.42284409409783,101.93861182936088,225.76756318819568,113.87722365872177,259.4399227352446,119.84652957340222L293.1122822822935,125.81583548808267"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M392.8671875,65L392.8671875,69.16666666666667C392.8671875,73.33333333333333,392.8671875,81.66666666666667,392.8671875,87C392.8671875,92.33333333333333,392.8671875,94.66666666666667,392.8671875,95.83333333333333L392.8671875,97"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M783.4140625,65L783.4140625,69.16666666666667C783.4140625,73.33333333333333,783.4140625,81.66666666666667,734.9670334148813,92.4699657633172C686.5200043297623,103.27326485996775,589.6259461595246,116.54652971993549,541.1789170744057,123.18316214991937L492.7318879892869,129.81979457990323"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M91.078125,65L91.078125,69.16666666666667C91.078125,73.33333333333333,91.078125,81.66666666666667,127.70442708333333,92.32630277770586C164.33072916666666,102.98593888874507,237.58333333333334,115.97187777749014,274.2096354166667,122.46484722186267L310.8359375,128.9578166662352"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M392.8671875,65L392.8671875,69.16666666666667C392.8671875,73.33333333333333,392.8671875,81.66666666666667,392.8671875,90C392.8671875,98.33333333333333,392.8671875,106.66666666666667,392.8671875,110.83333333333333L392.8671875,115"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M783.4140625,65L783.4140625,69.16666666666667C783.4140625,73.33333333333333,783.4140625,81.66666666666667,731.9947916666666,92.87712542508501C680.5755208333334,104.08758418350335,577.7369791666666,118.17516836700673,526.3177083333334,125.21896045875842L474.8984375,132.2627525505101"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -95,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L8">
+        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L8">
           <g title="conditional_t" id="classId-C_0000047394280824625133-0" class="node default clickable">
             <rect height="57" width="166.15625" y="-28.5" x="-83.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.078125" x1="-83.078125" class="divider"/>
@@ -114,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L13">
+        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L13">
           <g title="conditional_t" id="classId-C_0000599782159389775809-1" class="node default clickable">
             <rect height="57" width="337.421875" y="-28.5" x="-168.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="168.7109375" x1="-168.7109375" class="divider"/>
@@ -133,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L18">
+        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L18">
           <g title="conditional_t" id="classId-C_0000824938194184364511-2" class="node default clickable">
             <rect height="57" width="343.671875" y="-28.5" x="-171.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="171.8359375" x1="-171.8359375" class="divider"/>
@@ -152,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00047/t00047.cc#L6">
+        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L6">
           <g title="conditional_t" id="classId-C_0001673692992642087414-3" class="node default clickable">
             <rect height="57" width="164.0625" y="-28.5" x="-82.03125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.03125" x1="-82.03125" class="divider"/>
diff --git a/docs/test_cases/t00048.md b/docs/test_cases/t00048.md
index 272187f4..c42e151d 100644
--- a/docs/test_cases/t00048.md
+++ b/docs/test_cases/t00048.md
@@ -14,28 +14,6 @@ diagrams:
         - clanguml::t00048
 ```
 ## Source code
-File `tests/t00048/t00048.h`
-```cpp
-#pragma once
-
-namespace clanguml {
-namespace t00048 {
-
-struct Base {
-    int base;
-
-    virtual void foo() = 0;
-};
-
-template <typename T> struct BaseTemplate {
-    T base;
-
-    virtual void foo() = 0;
-};
-
-}
-}
-```
 File `tests/t00048/b_t00048.h`
 ```cpp
 #include "t00048.h"
@@ -60,14 +38,14 @@ template <typename T> struct BTemplate : public BaseTemplate<T> {
 }
 }
 ```
-File `tests/t00048/a_t00048.cc`
+File `tests/t00048/b_t00048.cc`
 ```cpp
-#include "a_t00048.h"
+#include "b_t00048.h"
 
 namespace clanguml {
 namespace t00048 {
 
-void A::foo() { }
+void B::foo() { }
 
 }
 }
@@ -105,14 +83,36 @@ template <typename T> struct ATemplate : public BaseTemplate<T> {
 }
 }
 ```
-File `tests/t00048/b_t00048.cc`
+File `tests/t00048/a_t00048.cc`
 ```cpp
-#include "b_t00048.h"
+#include "a_t00048.h"
 
 namespace clanguml {
 namespace t00048 {
 
-void B::foo() { }
+void A::foo() { }
+
+}
+}
+```
+File `tests/t00048/t00048.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t00048 {
+
+struct Base {
+    int base;
+
+    virtual void foo() = 0;
+};
+
+template <typename T> struct BaseTemplate {
+    T base;
+
+    virtual void foo() = 0;
+};
 
 }
 }
@@ -128,7 +128,7 @@ void B::foo() { }
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00048::Base",
+      "display_name": "Base",
       "id": "10200626899013233",
       "is_abstract": true,
       "is_nested": false,
@@ -190,7 +190,7 @@ void B::foo() { }
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00048::BaseTemplate<T>",
+      "display_name": "BaseTemplate<T>",
       "id": "630197772543569536",
       "is_abstract": true,
       "is_nested": false,
@@ -266,7 +266,7 @@ void B::foo() { }
           "name": "clanguml::t00048::Base"
         }
       ],
-      "display_name": "clanguml::t00048::B",
+      "display_name": "B",
       "id": "59336049758992190",
       "is_abstract": false,
       "is_nested": false,
@@ -335,7 +335,7 @@ void B::foo() { }
           "name": "BaseTemplate<T>"
         }
       ],
-      "display_name": "clanguml::t00048::BTemplate<T>",
+      "display_name": "BTemplate<T>",
       "id": "1635850649347735305",
       "is_abstract": false,
       "is_nested": false,
@@ -411,7 +411,7 @@ void B::foo() { }
           "name": "clanguml::t00048::Base"
         }
       ],
-      "display_name": "clanguml::t00048::A",
+      "display_name": "A",
       "id": "199333691834211223",
       "is_abstract": false,
       "is_nested": false,
@@ -480,7 +480,7 @@ void B::foo() { }
           "name": "BaseTemplate<T>"
         }
       ],
-      "display_name": "clanguml::t00048::ATemplate<T>",
+      "display_name": "ATemplate<T>",
       "id": "1025697108404463905",
       "is_abstract": false,
       "is_nested": false,
@@ -549,6 +549,7 @@ void B::foo() { }
     }
   ],
   "name": "t00048_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg
index 92d66697..cde89a08 100644
--- a/docs/test_cases/t00048_class.svg
+++ b/docs/test_cases/t00048_class.svg
@@ -1,173 +1,159 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="242px" preserveAspectRatio="none" style="width:547px;height:242px;background:#FFFFFF;" version="1.1" viewBox="0 0 547 242" width="547px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:529px;height:226px;" version="1.1" viewBox="0 0 529 226" width="529px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1091katpioaj" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <g id="elem_C_0000010200626899013233">
-        <rect codeLine="2" fill="#F1F1F1" height="83.6998" id="C_0000010200626899013233" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="89" y="10"/>
-        <ellipse cx="128.3" cy="26" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M129.8313,27.9375 L130.1594,28.7344 L129.8781,28.7344 C129.425,28.7344 129.3,28.7656 129.1281,28.875 C128.8469,29.0156 128.675,29.3125 128.675,29.6094 C128.675,29.9063 128.8156,30.1563 129.05,30.3281 C129.2219,30.4531 129.4563,30.5 129.8781,30.5 L132.2375,30.5 C132.5969,30.5 132.8469,30.4688 132.9875,30.375 C133.2531,30.2344 133.425,29.9219 133.425,29.6094 C133.425,29.3438 133.2844,29.0781 133.05,28.9063 C132.8625,28.7813 132.7063,28.75 132.2531,28.7344 L128.8625,20.9063 L125.1438,20.9063 C124.6906,20.9063 124.55,20.9219 124.3781,21.0313 C124.1125,21.2031 123.9406,21.4844 123.9406,21.7813 C123.9406,22.0625 124.0813,22.3281 124.3313,22.5 C124.5031,22.625 124.6906,22.6563 125.1438,22.6563 L126.1125,22.6563 L123.5344,28.7344 C122.7844,28.7344 122.3781,29.0313 122.3781,29.6094 C122.3781,30.2188 122.7688,30.5 123.5656,30.5 L125.8313,30.5 C126.1906,30.5 126.4406,30.4688 126.5813,30.375 C126.8469,30.2188 127.0188,29.9219 127.0188,29.6094 C127.0188,29.3438 126.8781,29.0781 126.6438,28.9063 C126.4563,28.7656 126.3,28.7344 125.8313,28.7344 L125.5344,28.7344 L125.8781,27.9375 L129.8313,27.9375 Z M129.0656,26.1875 L126.6125,26.1875 L127.8469,23.3125 L129.0656,26.1875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="32" x="147.7" y="31.95">Base</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="90" x2="206" y1="42" y2="42"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="95" y="51.95"/>
-          <ellipse cx="100" cy="56.95" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="109" y="61.3999">foo() = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="90" x2="206" y1="68.8999" y2="68.8999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="95" y="77.7999"/>
-          <ellipse cx="100" cy="82.7999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="109" y="85.9059">base : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
+      <ellipse cx="119" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M119.1094,19.3438 L117.9531,24.4219 L120.2813,24.4219 L119.1094,19.3438 Z M117.625,17.1094 L120.6094,17.1094 L123.9688,29.5 L121.5156,29.5 L120.75,26.4375 L117.4688,26.4375 L116.7188,29.5 L114.2813,29.5 L117.625,17.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="138" y="28.1543">Base</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
-      <g id="elem_C_0000630197772543569536">
-        <rect codeLine="8" fill="#F1F1F1" height="83.6998" id="C_0000630197772543569536" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="300.5" y="10"/>
-        <ellipse cx="315.5" cy="26" fill="#A9DCDF" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M317.0313,27.9375 L317.3594,28.7344 L317.0781,28.7344 C316.625,28.7344 316.5,28.7656 316.3281,28.875 C316.0469,29.0156 315.875,29.3125 315.875,29.6094 C315.875,29.9063 316.0156,30.1563 316.25,30.3281 C316.4219,30.4531 316.6563,30.5 317.0781,30.5 L319.4375,30.5 C319.7969,30.5 320.0469,30.4688 320.1875,30.375 C320.4531,30.2344 320.625,29.9219 320.625,29.6094 C320.625,29.3438 320.4844,29.0781 320.25,28.9063 C320.0625,28.7813 319.9063,28.75 319.4531,28.7344 L316.0625,20.9063 L312.3438,20.9063 C311.8906,20.9063 311.75,20.9219 311.5781,21.0313 C311.3125,21.2031 311.1406,21.4844 311.1406,21.7813 C311.1406,22.0625 311.2813,22.3281 311.5313,22.5 C311.7031,22.625 311.8906,22.6563 312.3438,22.6563 L313.3125,22.6563 L310.7344,28.7344 C309.9844,28.7344 309.5781,29.0313 309.5781,29.6094 C309.5781,30.2188 309.9688,30.5 310.7656,30.5 L313.0313,30.5 C313.3906,30.5 313.6406,30.4688 313.7813,30.375 C314.0469,30.2188 314.2188,29.9219 314.2188,29.6094 C314.2188,29.3438 314.0781,29.0781 313.8438,28.9063 C313.6563,28.7656 313.5,28.7344 313.0313,28.7344 L312.7344,28.7344 L313.0781,27.9375 L317.0313,27.9375 Z M316.2656,26.1875 L313.8125,26.1875 L315.0469,23.3125 L316.2656,26.1875 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="329.5" y="31.95">BaseTemplate</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="429.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="430.5" y="21.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="301.5" x2="434.5" y1="42" y2="42"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="306.5" y="51.95"/>
-          <ellipse cx="311.5" cy="56.95" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="92" x="320.5" y="61.3999">foo() = 0 : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="301.5" x2="434.5" y1="68.8999" y2="68.8999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="306.5" y="77.7999"/>
-          <ellipse cx="311.5" cy="82.7999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="320.5" y="85.9059">base : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="46"/>
+      <ellipse cx="92.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000059336049758992190">
-        <rect codeLine="14" fill="#F1F1F1" height="81.5999" id="C_0000059336049758992190" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="7" y="153.7"/>
-        <ellipse cx="45.85" cy="169.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M40.85,170.8563 C40.85,173.3563 42.9906,175.1688 45.9125,175.1688 C47.1469,175.1688 48.3188,174.8719 49.0688,174.3563 C49.6781,173.9344 50.0063,173.5125 50.0063,173.1063 C50.0063,172.6375 49.5844,172.2313 49.0844,172.2313 C48.85,172.2313 48.6313,172.3094 48.4281,172.5125 C47.9906,172.95 47.9906,172.95 47.8188,173.0438 C47.3656,173.2781 46.725,173.4188 45.9594,173.4188 C43.9594,173.4188 42.6781,172.4031 42.6781,170.825 L42.6781,169.7781 C42.6781,168.075 43.8969,166.8719 45.6,166.8719 C46.1781,166.8719 46.7563,167.0125 47.225,167.2625 C47.6938,167.5281 47.8656,167.7156 47.9281,168.075 C48.0531,168.7469 48.3031,168.9969 48.8344,168.9969 C49.1156,168.9969 49.3969,168.8563 49.5844,168.6375 C49.7094,168.4656 49.7563,168.2938 49.7563,167.8563 L49.7563,166.4969 C49.7563,166.075 49.7406,165.9344 49.6156,165.7625 C49.4438,165.5125 49.1625,165.3563 48.8344,165.3563 C48.5219,165.3563 48.3188,165.4656 48.1,165.7313 C46.9281,165.2313 46.4906,165.1219 45.5375,165.1219 C42.8656,165.1219 40.85,167.1375 40.85,169.7625 L40.85,170.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="65.15" y="174.306">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="185.7" y2="185.7"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="194.6"/>
-          <ellipse cx="18" cy="199.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="27" y="202.7059">foo() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="100" y1="210.4999" y2="210.4999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="219.3999"/>
-          <ellipse cx="18" cy="224.3999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="27" y="227.5059">b : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="101.5" y="54.2104">foo() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
-      <g id="elem_C_0001635850649347735305">
-        <rect codeLine="20" fill="#F1F1F1" height="81.5999" id="C_0001635850649347735305" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="277" y="153.7"/>
-        <ellipse cx="292" cy="169.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M287,170.8563 C287,173.3563 289.1406,175.1688 292.0625,175.1688 C293.2969,175.1688 294.4688,174.8719 295.2188,174.3563 C295.8281,173.9344 296.1563,173.5125 296.1563,173.1063 C296.1563,172.6375 295.7344,172.2313 295.2344,172.2313 C295,172.2313 294.7813,172.3094 294.5781,172.5125 C294.1406,172.95 294.1406,172.95 293.9688,173.0438 C293.5156,173.2781 292.875,173.4188 292.1094,173.4188 C290.1094,173.4188 288.8281,172.4031 288.8281,170.825 L288.8281,169.7781 C288.8281,168.075 290.0469,166.8719 291.75,166.8719 C292.3281,166.8719 292.9063,167.0125 293.375,167.2625 C293.8438,167.5281 294.0156,167.7156 294.0781,168.075 C294.2031,168.7469 294.4531,168.9969 294.9844,168.9969 C295.2656,168.9969 295.5469,168.8563 295.7344,168.6375 C295.8594,168.4656 295.9063,168.2938 295.9063,167.8563 L295.9063,166.4969 C295.9063,166.075 295.8906,165.9344 295.7656,165.7625 C295.5938,165.5125 295.3125,165.3563 294.9844,165.3563 C294.6719,165.3563 294.4688,165.4656 294.25,165.7313 C293.0781,165.2313 292.6406,165.1219 291.6875,165.1219 C289.0156,165.1219 287,167.1375 287,169.7625 L287,170.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="306" y="174.306">BTemplate</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="383" y="150.7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="384" y="164.9001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="278" x2="388" y1="185.7" y2="185.7"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="283" y="194.6"/>
-          <ellipse cx="288" cy="199.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="297" y="202.7059">foo() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="278" x2="388" y1="210.4999" y2="210.4999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="283" y="219.3999"/>
-          <ellipse cx="288" cy="224.3999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="297" y="227.5059">b : T</text>
-        </a>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="66.8047"/>
+      <ellipse cx="92.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000199333691834211223">
-        <rect codeLine="26" fill="#F1F1F1" height="81.5999" id="C_0000199333691834211223" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="136" y="153.7"/>
-        <ellipse cx="174.85" cy="169.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M169.85,170.8563 C169.85,173.3563 171.9906,175.1688 174.9125,175.1688 C176.1469,175.1688 177.3188,174.8719 178.0688,174.3563 C178.6781,173.9344 179.0063,173.5125 179.0063,173.1063 C179.0063,172.6375 178.5844,172.2313 178.0844,172.2313 C177.85,172.2313 177.6313,172.3094 177.4281,172.5125 C176.9906,172.95 176.9906,172.95 176.8188,173.0438 C176.3656,173.2781 175.725,173.4188 174.9594,173.4188 C172.9594,173.4188 171.6781,172.4031 171.6781,170.825 L171.6781,169.7781 C171.6781,168.075 172.8969,166.8719 174.6,166.8719 C175.1781,166.8719 175.7563,167.0125 176.225,167.2625 C176.6938,167.5281 176.8656,167.7156 176.9281,168.075 C177.0531,168.7469 177.3031,168.9969 177.8344,168.9969 C178.1156,168.9969 178.3969,168.8563 178.5844,168.6375 C178.7094,168.4656 178.7563,168.2938 178.7563,167.8563 L178.7563,166.4969 C178.7563,166.075 178.7406,165.9344 178.6156,165.7625 C178.4438,165.5125 178.1625,165.3563 177.8344,165.3563 C177.5219,165.3563 177.3188,165.4656 177.1,165.7313 C175.9281,165.2313 175.4906,165.1219 174.5375,165.1219 C171.8656,165.1219 169.85,167.1375 169.85,169.7625 L169.85,170.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="194.15" y="174.306">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="229" y1="185.7" y2="185.7"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="194.6"/>
-          <ellipse cx="147" cy="199.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="156" y="202.7059">foo() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="137" x2="229" y1="210.4999" y2="210.4999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="142" y="219.3999"/>
-          <ellipse cx="147" cy="224.3999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="156" y="227.5059">a : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="101.5" y="75.0151">base : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
-      <g id="elem_C_0001025697108404463905">
-        <rect codeLine="32" fill="#F1F1F1" height="81.5999" id="C_0001025697108404463905" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="424" y="153.7"/>
-        <ellipse cx="439" cy="169.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M434,170.8563 C434,173.3563 436.1406,175.1688 439.0625,175.1688 C440.2969,175.1688 441.4688,174.8719 442.2188,174.3563 C442.8281,173.9344 443.1563,173.5125 443.1563,173.1063 C443.1563,172.6375 442.7344,172.2313 442.2344,172.2313 C442,172.2313 441.7813,172.3094 441.5781,172.5125 C441.1406,172.95 441.1406,172.95 440.9688,173.0438 C440.5156,173.2781 439.875,173.4188 439.1094,173.4188 C437.1094,173.4188 435.8281,172.4031 435.8281,170.825 L435.8281,169.7781 C435.8281,168.075 437.0469,166.8719 438.75,166.8719 C439.3281,166.8719 439.9063,167.0125 440.375,167.2625 C440.8438,167.5281 441.0156,167.7156 441.0781,168.075 C441.2031,168.7469 441.4531,168.9969 441.9844,168.9969 C442.2656,168.9969 442.5469,168.8563 442.7344,168.6375 C442.8594,168.4656 442.9063,168.2938 442.9063,167.8563 L442.9063,166.4969 C442.9063,166.075 442.8906,165.9344 442.7656,165.7625 C442.5938,165.5125 442.3125,165.3563 441.9844,165.3563 C441.6719,165.3563 441.4688,165.4656 441.25,165.7313 C440.0781,165.2313 439.6406,165.1219 438.6875,165.1219 C436.0156,165.1219 434,167.1375 434,169.7625 L434,170.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="453" y="174.306">ATemplate</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="530" y="150.7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="531" y="164.9001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="425" x2="535" y1="185.7" y2="185.7"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="430" y="194.6"/>
-          <ellipse cx="435" cy="199.6" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="444" y="202.7059">foo() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="425" x2="535" y1="210.4999" y2="210.4999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="430" y="219.3999"/>
-          <ellipse cx="435" cy="224.3999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="444" y="227.5059">a : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
+      <ellipse cx="299" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M299.1094,19.3438 L297.9531,24.4219 L300.2813,24.4219 L299.1094,19.3438 Z M297.625,17.1094 L300.6094,17.1094 L303.9688,29.5 L301.5156,29.5 L300.75,26.4375 L297.4688,26.4375 L296.7188,29.5 L294.2813,29.5 L297.625,17.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="88" x="313" y="28.1543">BaseTemplate</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="409" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="410" y="17.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="40" y2="40"/>
     </a>
-    <g id="link_C_0000010200626899013233_C_0000059336049758992190">
-      <path codeLine="37" d="M110.5589,108.8759 C97.9889,127.6859 93.14,134.93 80.67,153.6 " fill="none" id="C_0000010200626899013233-backto-C_0000059336049758992190" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="120.56,93.91,105.5703,105.5422,115.5475,112.2096,120.56,93.91" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000630197772543569536_C_0001635850649347735305">
-      <path codeLine="38" d="M353.434,111.3775 C348.754,130.1875 347.57,134.93 342.93,153.6 " fill="none" id="C_0000630197772543569536-backto-C_0001635850649347735305" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="357.78,93.91,347.6115,109.9288,359.2565,112.8261,357.78,93.91" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000010200626899013233_C_0000199333691834211223">
-      <path codeLine="39" d="M162.566,111.3775 C167.246,130.1875 168.43,134.93 173.07,153.6 " fill="none" id="C_0000010200626899013233-backto-C_0000199333691834211223" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="158.22,93.91,156.7435,112.8261,168.3885,109.9288,158.22,93.91" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000630197772543569536_C_0001025697108404463905">
-      <path codeLine="40" d="M411.9134,107.9904 C426.8934,126.8004 433.36,134.93 448.23,153.6 " fill="none" id="C_0000630197772543569536-backto-C_0001025697108404463905" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="400.7,93.91,407.22,111.7282,416.6069,104.2526,400.7,93.91" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="46"/>
+      <ellipse cx="295" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="304" y="54.2104">foo() = 0 : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="60.8047" y2="60.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="66.8047"/>
+      <ellipse cx="295" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304" y="75.0151">base : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
+      <ellipse cx="42.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M45.1188,163.6406 Q44.5406,163.9375 43.9,164.0781 Q43.2594,164.2344 42.5563,164.2344 Q40.0563,164.2344 38.7281,162.5938 Q37.4156,160.9375 37.4156,157.8125 Q37.4156,154.6875 38.7281,153.0313 Q40.0563,151.375 42.5563,151.375 Q43.2594,151.375 43.9,151.5313 Q44.5563,151.6875 45.1188,151.9844 L45.1188,154.7031 Q44.4938,154.125 43.9,153.8594 Q43.3063,153.5781 42.6813,153.5781 Q41.3375,153.5781 40.65,154.6563 Q39.9625,155.7188 39.9625,157.8125 Q39.9625,159.9063 40.65,160.9844 Q41.3375,162.0469 42.6813,162.0469 Q43.3063,162.0469 43.9,161.7813 Q44.4938,161.5 45.1188,160.9219 L45.1188,163.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="60.85" y="162.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="174" y2="174"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="180"/>
+      <ellipse cx="17" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="188.2104">foo() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="194.8047" y2="194.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="200.8047"/>
+      <ellipse cx="17" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="209.0151">b : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
+      <ellipse cx="277" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M279.9688,163.6406 Q279.3906,163.9375 278.75,164.0781 Q278.1094,164.2344 277.4063,164.2344 Q274.9063,164.2344 273.5781,162.5938 Q272.2656,160.9375 272.2656,157.8125 Q272.2656,154.6875 273.5781,153.0313 Q274.9063,151.375 277.4063,151.375 Q278.1094,151.375 278.75,151.5313 Q279.4063,151.6875 279.9688,151.9844 L279.9688,154.7031 Q279.3438,154.125 278.75,153.8594 Q278.1563,153.5781 277.5313,153.5781 Q276.1875,153.5781 275.5,154.6563 Q274.8125,155.7188 274.8125,157.8125 Q274.8125,159.9063 275.5,160.9844 Q276.1875,162.0469 277.5313,162.0469 Q278.1563,162.0469 278.75,161.7813 Q279.3438,161.5 279.9688,160.9219 L279.9688,163.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="291" y="162.1543">BTemplate</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="365" y="139"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="366" y="151.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="174" y2="174"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="180"/>
+      <ellipse cx="273" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="282" y="188.2104">foo() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="194.8047" y2="194.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="200.8047"/>
+      <ellipse cx="273" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="282" y="209.0151">b : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
+      <ellipse cx="164.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M167.1188,163.6406 Q166.5406,163.9375 165.9,164.0781 Q165.2594,164.2344 164.5563,164.2344 Q162.0563,164.2344 160.7281,162.5938 Q159.4156,160.9375 159.4156,157.8125 Q159.4156,154.6875 160.7281,153.0313 Q162.0563,151.375 164.5563,151.375 Q165.2594,151.375 165.9,151.5313 Q166.5563,151.6875 167.1188,151.9844 L167.1188,154.7031 Q166.4938,154.125 165.9,153.8594 Q165.3063,153.5781 164.6813,153.5781 Q163.3375,153.5781 162.65,154.6563 Q161.9625,155.7188 161.9625,157.8125 Q161.9625,159.9063 162.65,160.9844 Q163.3375,162.0469 164.6813,162.0469 Q165.3063,162.0469 165.9,161.7813 Q166.4938,161.5 167.1188,160.9219 L167.1188,163.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="182.85" y="162.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="174" y2="174"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="180"/>
+      <ellipse cx="139" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="188.2104">foo() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="194.8047" y2="194.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="200.8047"/>
+      <ellipse cx="139" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="148" y="209.0151">a : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
+      <ellipse cx="421" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M423.9688,163.6406 Q423.3906,163.9375 422.75,164.0781 Q422.1094,164.2344 421.4063,164.2344 Q418.9063,164.2344 417.5781,162.5938 Q416.2656,160.9375 416.2656,157.8125 Q416.2656,154.6875 417.5781,153.0313 Q418.9063,151.375 421.4063,151.375 Q422.1094,151.375 422.75,151.5313 Q423.4063,151.6875 423.9688,151.9844 L423.9688,154.7031 Q423.3438,154.125 422.75,153.8594 Q422.1563,153.5781 421.5313,153.5781 Q420.1875,153.5781 419.5,154.6563 Q418.8125,155.7188 418.8125,157.8125 Q418.8125,159.9063 419.5,160.9844 Q420.1875,162.0469 421.5313,162.0469 Q422.1563,162.0469 422.75,161.7813 Q423.3438,161.5 423.9688,160.9219 L423.9688,163.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="435" y="162.1543">ATemplate</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="509" y="139"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="510" y="151.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="174" y2="174"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="180"/>
+      <ellipse cx="417" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="426" y="188.2104">foo() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="194.8047" y2="194.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="200.8047"/>
+      <ellipse cx="417" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="426" y="209.0151">a : T</text>
+    </a>
+    <path d="M102.14,99.04 C92.53,113.46 82.34,128.74 73.52,141.97 " fill="none" id="C_0000010200626899013233&lt;-C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="96.54,94.83,113.45,82.07,108.18,102.59,96.54,94.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M335.52,101.9 C332.13,115.46 328.6,129.61 325.51,141.97 " fill="none" id="C_0000630197772543569536&lt;-C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="328.84,99.77,340.48,82.07,342.42,103.17,328.84,99.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M151.9,101.9 C155.39,115.46 159.04,129.61 162.22,141.97 " fill="none" id="C_0000010200626899013233&lt;-C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="145,103.18,146.79,82.07,158.56,99.69,145,103.18" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M392.9,97.61 C405.38,112.45 418.71,128.3 430.21,141.97 " fill="none" id="C_0000630197772543569536&lt;-C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="387.35,101.88,379.83,82.07,398.06,92.87,387.35,101.88" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00048_class_mermaid.svg b/docs/test_cases/t00048_class_mermaid.svg
index d2a635cd..3a968ce3 100644
--- a/docs/test_cases/t00048_class_mermaid.svg
+++ b/docs/test_cases/t00048_class_mermaid.svg
@@ -1,64 +1,59 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 630.625 290" style="max-width: 630.625px; background-color: white;" width="630.625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 612.84375 290" style="max-width: 612.844px; background-color: white;" width="612.84375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M75.24082766883893,142.02873153473837L73.10303347403244,144.35727627894866C70.96523927922595,146.68582102315892,66.68965088961298,151.34291051157945,64.55185669480649,157.8381219224564C62.4140625,164.33333333333334,62.4140625,172.66666666666666,62.4140625,176.83333333333334L62.4140625,181"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M400.0196060185661,143.71011637957636L397.96555709880505,145.75843031631362C395.911508179044,147.8067442530509,391.80341033952203,151.90337212652545,389.74936141976104,158.1183527299294C387.6953125,164.33333333333334,387.6953125,172.66666666666666,387.6953125,176.83333333333334L387.6953125,181"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M208.41542233116107,142.02873153473837L210.55321652596754,144.35727627894866C212.69101072077402,146.68582102315892,216.96659911038702,151.34291051157945,219.10439330519353,157.8381219224564C221.2421875,164.33333333333334,221.2421875,172.66666666666666,221.2421875,176.83333333333334L221.2421875,181"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M548.8553939814338,143.71011637957636L550.9094429011949,145.75843031631362C552.9634918209559,147.8067442530509,557.0715896604779,151.90337212652545,559.125638580239,158.1183527299294C561.1796875,164.33333333333334,561.1796875,172.66666666666666,561.1796875,176.83333333333334L561.1796875,181"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M82.96875,127.15464776990413L78.80208333333333,131.96220647492012C74.63541666666667,136.7697651799361,66.30208333333333,146.38488258996804,62.135416666666664,155.3591079616507C57.96875,164.33333333333334,57.96875,172.66666666666666,57.96875,176.83333333333334L57.96875,181"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M394.98405888728325,131L390.80572615606934,135.16666666666666C386.6273934248555,139.33333333333334,378.27072796242777,147.66666666666666,374.09239523121386,156C369.9140625,164.33333333333334,369.9140625,172.66666666666666,369.9140625,176.83333333333334L369.9140625,181"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M182.90625,127.15464776990413L187.07291666666666,131.96220647492012C191.23958333333334,136.7697651799361,199.57291666666666,146.38488258996804,203.73958333333334,155.3591079616507C207.90625,164.33333333333334,207.90625,172.66666666666666,207.90625,176.83333333333334L207.90625,181"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M518.3284411127167,131L522.5067738439307,135.16666666666666C526.6851065751445,139.33333333333334,535.0417720375723,147.66666666666666,539.2201047687862,156C543.3984375,164.33333333333334,543.3984375,172.66666666666666,543.3984375,176.83333333333334L543.3984375,181"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -99,11 +94,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(141.828125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L6">
+        <a transform="translate(132.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L6">
           <g title="Base" id="classId-C_0000010200626899013233-0" class="node default clickable">
-            <rect height="123" width="108.828125" y="-61.5" x="-54.4140625" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
-            <line y2="28.5" y1="28.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <rect height="123" width="99.9375" y="-61.5" x="-49.96875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="49.96875" x1="-49.96875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -37.359375, -54)" height="18" width="74.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -115,20 +110,20 @@
                   <span class="nodeLabel">Base</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, 2)" height="18" width="74.28125">
+              <foreignObject transform="translate( -42.46875, 2)" height="18" width="74.28125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+base : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, 36)" height="18" width="93.828125">
+              <foreignObject transform="translate( -42.46875, 36)" height="18" width="84.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+foo() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+foo() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(474.4375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/t00048.h#L12">
+        <a transform="translate(456.65625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L12">
           <g title="BaseTemplate" id="classId-C_0000630197772543569536-1" class="node default clickable">
             <rect height="123" width="150.765625" y="-61.5" x="-75.3828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.3828125" x1="-75.3828125" class="divider"/>
@@ -149,19 +144,19 @@
                   <span class="nodeLabel">+base : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -67.8828125, 36)" height="18" width="93.828125">
+              <foreignObject transform="translate( -67.8828125, 36)" height="18" width="84.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+foo() : : void</span>
+                  <span style="font-style:italic;" class="nodeLabel">+foo() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(62.4140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L8">
+        <a transform="translate(57.96875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L8">
           <g title="B" id="classId-C_0000059336049758992190-2" class="node default clickable">
-            <rect height="101" width="108.828125" y="-50.5" x="-54.4140625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="49.96875" x1="-49.96875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -173,20 +168,20 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, -9)" height="18" width="48.484375">
+              <foreignObject transform="translate( -42.46875, -9)" height="18" width="48.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+b : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, 25)" height="18" width="93.828125">
+              <foreignObject transform="translate( -42.46875, 25)" height="18" width="84.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : : void</span>
+                  <span class="nodeLabel">+foo() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(387.6953125, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/b_t00048.h#L14">
+        <a transform="translate(369.9140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L14">
           <g title="BTemplate" id="classId-C_0001635850649347735305-3" class="node default clickable">
             <rect height="101" width="124.078125" y="-50.5" x="-62.0390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="62.0390625" x1="-62.0390625" class="divider"/>
@@ -207,19 +202,19 @@
                   <span class="nodeLabel">+b : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -54.5390625, 25)" height="18" width="93.828125">
+              <foreignObject transform="translate( -54.5390625, 25)" height="18" width="84.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : : void</span>
+                  <span class="nodeLabel">+foo() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(221.2421875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L8">
+        <a transform="translate(207.90625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L8">
           <g title="A" id="classId-C_0000199333691834211223-4" class="node default clickable">
-            <rect height="101" width="108.828125" y="-50.5" x="-54.4140625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="54.4140625" x1="-54.4140625" class="divider"/>
+            <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="49.96875" x1="-49.96875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -231,20 +226,20 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, -9)" height="18" width="48.484375">
+              <foreignObject transform="translate( -42.46875, -9)" height="18" width="48.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -46.9140625, 25)" height="18" width="93.828125">
+              <foreignObject transform="translate( -42.46875, 25)" height="18" width="84.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : : void</span>
+                  <span class="nodeLabel">+foo() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(561.1796875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00048/a_t00048.h#L14">
+        <a transform="translate(543.3984375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L14">
           <g title="ATemplate" id="classId-C_0001025697108404463905-5" class="node default clickable">
             <rect height="101" width="122.890625" y="-50.5" x="-61.4453125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="61.4453125" x1="-61.4453125" class="divider"/>
@@ -265,9 +260,9 @@
                   <span class="nodeLabel">+a : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -53.9453125, 25)" height="18" width="93.828125">
+              <foreignObject transform="translate( -53.9453125, 25)" height="18" width="84.9375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+foo() : : void</span>
+                  <span class="nodeLabel">+foo() : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00049.md b/docs/test_cases/t00049.md
index 93725f55..e076aaab 100644
--- a/docs/test_cases/t00049.md
+++ b/docs/test_cases/t00049.md
@@ -55,7 +55,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00049::A<T>",
+      "display_name": "A<T>",
       "id": "372971769516871577",
       "is_abstract": false,
       "is_nested": false,
@@ -124,7 +124,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00049::A<intmap>",
+      "display_name": "A<intmap>",
       "id": "654829353386288443",
       "is_abstract": false,
       "is_nested": false,
@@ -153,7 +153,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00049::A<thestring>",
+      "display_name": "A<thestring>",
       "id": "973058255816844469",
       "is_abstract": false,
       "is_nested": false,
@@ -182,7 +182,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00049::A<string_vector>",
+      "display_name": "A<string_vector>",
       "id": "562074851310302010",
       "is_abstract": false,
       "is_nested": false,
@@ -211,7 +211,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00049::R",
+      "display_name": "R",
       "id": "2288024073053091226",
       "is_abstract": false,
       "is_nested": false,
@@ -328,6 +328,7 @@ struct R {
     }
   ],
   "name": "t00049_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg
index 087c5e76..bce17cf5 100644
--- a/docs/test_cases/t00049_class.svg
+++ b/docs/test_cases/t00049_class.svg
@@ -1,144 +1,128 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="413px" preserveAspectRatio="none" style="width:377px;height:413px;background:#FFFFFF;" version="1.1" viewBox="0 0 377 413" width="377px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:401px;height:390px;" version="1.1" viewBox="0 0 401 390" width="401px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1pr5pkt5qb1a6" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000372971769516871577">
-        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0000372971769516871577" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="106" x="117" y="325"/>
-        <ellipse cx="156.3" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M151.3,342.1563 C151.3,344.6563 153.4406,346.4688 156.3625,346.4688 C157.5969,346.4688 158.7688,346.1719 159.5188,345.6563 C160.1281,345.2344 160.4563,344.8125 160.4563,344.4063 C160.4563,343.9375 160.0344,343.5313 159.5344,343.5313 C159.3,343.5313 159.0813,343.6094 158.8781,343.8125 C158.4406,344.25 158.4406,344.25 158.2688,344.3438 C157.8156,344.5781 157.175,344.7188 156.4094,344.7188 C154.4094,344.7188 153.1281,343.7031 153.1281,342.125 L153.1281,341.0781 C153.1281,339.375 154.3469,338.1719 156.05,338.1719 C156.6281,338.1719 157.2063,338.3125 157.675,338.5625 C158.1438,338.8281 158.3156,339.0156 158.3781,339.375 C158.5031,340.0469 158.7531,340.2969 159.2844,340.2969 C159.5656,340.2969 159.8469,340.1563 160.0344,339.9375 C160.1594,339.7656 160.2063,339.5938 160.2063,339.1563 L160.2063,337.7969 C160.2063,337.375 160.1906,337.2344 160.0656,337.0625 C159.8938,336.8125 159.6125,336.6563 159.2844,336.6563 C158.9719,336.6563 158.7688,336.7656 158.55,337.0313 C157.3781,336.5313 156.9406,336.4219 155.9875,336.4219 C153.3156,336.4219 151.3,338.4375 151.3,341.0625 L151.3,342.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="175.7" y="345.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="217" y="322"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="218" y="336.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="118" x2="222" y1="357" y2="357"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="123" y="365.9"/>
-          <ellipse cx="128" cy="370.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="137" y="374.0059">get_a() : T &amp;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="118" x2="222" y1="381.7999" y2="381.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="123" y="390.6999"/>
-          <ellipse cx="128" cy="395.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="137" y="398.8059">a : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="129.5" y="306"/>
+      <ellipse cx="165.65" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M168.6188,327.6406 Q168.0406,327.9375 167.4,328.0781 Q166.7594,328.2344 166.0563,328.2344 Q163.5563,328.2344 162.2281,326.5938 Q160.9156,324.9375 160.9156,321.8125 Q160.9156,318.6875 162.2281,317.0313 Q163.5563,315.375 166.0563,315.375 Q166.7594,315.375 167.4,315.5313 Q168.0563,315.6875 168.6188,315.9844 L168.6188,318.7031 Q167.9938,318.125 167.4,317.8594 Q166.8063,317.5781 166.1813,317.5781 Q164.8375,317.5781 164.15,318.6563 Q163.4625,319.7188 163.4625,321.8125 Q163.4625,323.9063 164.15,324.9844 Q164.8375,326.0469 166.1813,326.0469 Q166.8063,326.0469 167.4,325.7813 Q167.9938,325.5 168.6188,324.9219 L168.6188,327.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="184.35" y="326.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="221.5" y="303"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="222.5" y="315.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000654829353386288443">
-        <rect codeLine="8" fill="#F1F1F1" height="48" id="C_0000654829353386288443" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="7" y="216"/>
-        <ellipse cx="22" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,233.1563 C17,235.6563 19.1406,237.4688 22.0625,237.4688 C23.2969,237.4688 24.4688,237.1719 25.2188,236.6563 C25.8281,236.2344 26.1563,235.8125 26.1563,235.4063 C26.1563,234.9375 25.7344,234.5313 25.2344,234.5313 C25,234.5313 24.7813,234.6094 24.5781,234.8125 C24.1406,235.25 24.1406,235.25 23.9688,235.3438 C23.5156,235.5781 22.875,235.7188 22.1094,235.7188 C20.1094,235.7188 18.8281,234.7031 18.8281,233.125 L18.8281,232.0781 C18.8281,230.375 20.0469,229.1719 21.75,229.1719 C22.3281,229.1719 22.9063,229.3125 23.375,229.5625 C23.8438,229.8281 24.0156,230.0156 24.0781,230.375 C24.2031,231.0469 24.4531,231.2969 24.9844,231.2969 C25.2656,231.2969 25.5469,231.1563 25.7344,230.9375 C25.8594,230.7656 25.9063,230.5938 25.9063,230.1563 L25.9063,228.7969 C25.9063,228.375 25.8906,228.2344 25.7656,228.0625 C25.5938,227.8125 25.3125,227.6563 24.9844,227.6563 C24.6719,227.6563 24.4688,227.7656 24.25,228.0313 C23.0781,227.5313 22.6406,227.4219 21.6875,227.4219 C19.0156,227.4219 17,229.4375 17,232.0625 L17,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="236.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="39" x="53" y="213"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="37" x="54" y="227.2001">intmap</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="88" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="88" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="344"/>
+      <ellipse cx="140.5" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000973058255816844469">
-        <rect codeLine="12" fill="#F1F1F1" height="48" id="C_0000973058255816844469" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="92" x="124" y="216"/>
-        <ellipse cx="139" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M134,233.1563 C134,235.6563 136.1406,237.4688 139.0625,237.4688 C140.2969,237.4688 141.4688,237.1719 142.2188,236.6563 C142.8281,236.2344 143.1563,235.8125 143.1563,235.4063 C143.1563,234.9375 142.7344,234.5313 142.2344,234.5313 C142,234.5313 141.7813,234.6094 141.5781,234.8125 C141.1406,235.25 141.1406,235.25 140.9688,235.3438 C140.5156,235.5781 139.875,235.7188 139.1094,235.7188 C137.1094,235.7188 135.8281,234.7031 135.8281,233.125 L135.8281,232.0781 C135.8281,230.375 137.0469,229.1719 138.75,229.1719 C139.3281,229.1719 139.9063,229.3125 140.375,229.5625 C140.8438,229.8281 141.0156,230.0156 141.0781,230.375 C141.2031,231.0469 141.4531,231.2969 141.9844,231.2969 C142.2656,231.2969 142.5469,231.1563 142.7344,230.9375 C142.8594,230.7656 142.9063,230.5938 142.9063,230.1563 L142.9063,228.7969 C142.9063,228.375 142.8906,228.2344 142.7656,228.0625 C142.5938,227.8125 142.3125,227.6563 141.9844,227.6563 C141.6719,227.6563 141.4688,227.7656 141.25,228.0313 C140.0781,227.5313 139.6406,227.4219 138.6875,227.4219 C136.0156,227.4219 134,229.4375 134,232.0625 L134,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="153" y="236.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="49" x="170" y="213"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="47" x="171" y="227.2001">thestring</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="125" x2="215" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="125" x2="215" y1="256" y2="256"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="149.5" y="352.2104">get_a() : T &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000562074851310302010">
-        <rect codeLine="16" fill="#F1F1F1" height="48" id="C_0000562074851310302010" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="115" x="251.5" y="216"/>
-        <ellipse cx="266.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M261.5,233.1563 C261.5,235.6563 263.6406,237.4688 266.5625,237.4688 C267.7969,237.4688 268.9688,237.1719 269.7188,236.6563 C270.3281,236.2344 270.6563,235.8125 270.6563,235.4063 C270.6563,234.9375 270.2344,234.5313 269.7344,234.5313 C269.5,234.5313 269.2813,234.6094 269.0781,234.8125 C268.6406,235.25 268.6406,235.25 268.4688,235.3438 C268.0156,235.5781 267.375,235.7188 266.6094,235.7188 C264.6094,235.7188 263.3281,234.7031 263.3281,233.125 L263.3281,232.0781 C263.3281,230.375 264.5469,229.1719 266.25,229.1719 C266.8281,229.1719 267.4063,229.3125 267.875,229.5625 C268.3438,229.8281 268.5156,230.0156 268.5781,230.375 C268.7031,231.0469 268.9531,231.2969 269.4844,231.2969 C269.7656,231.2969 270.0469,231.1563 270.2344,230.9375 C270.3594,230.7656 270.4063,230.5938 270.4063,230.1563 L270.4063,228.7969 C270.4063,228.375 270.3906,228.2344 270.2656,228.0625 C270.0938,227.8125 269.8125,227.6563 269.4844,227.6563 C269.1719,227.6563 268.9688,227.7656 268.75,228.0313 C267.5781,227.5313 267.1406,227.4219 266.1875,227.4219 C263.5156,227.4219 261.5,229.4375 261.5,232.0625 L261.5,233.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="280.5" y="236.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="72" x="297.5" y="213"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="70" x="298.5" y="227.2001">string_vector</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="252.5" x2="365.5" y1="248" y2="248"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="252.5" x2="365.5" y1="256" y2="256"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="358.8047" y2="358.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="364.8047"/>
+      <ellipse cx="140.5" cy="369.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0002288024073053091226">
-        <rect codeLine="20" fill="#F1F1F1" height="131.9996" id="C_0002288024073053091226" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="297" x="21.5" y="7"/>
-        <ellipse cx="160.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M155.75,24.1563 C155.75,26.6563 157.8906,28.4688 160.8125,28.4688 C162.0469,28.4688 163.2188,28.1719 163.9688,27.6563 C164.5781,27.2344 164.9063,26.8125 164.9063,26.4063 C164.9063,25.9375 164.4844,25.5313 163.9844,25.5313 C163.75,25.5313 163.5313,25.6094 163.3281,25.8125 C162.8906,26.25 162.8906,26.25 162.7188,26.3438 C162.2656,26.5781 161.625,26.7188 160.8594,26.7188 C158.8594,26.7188 157.5781,25.7031 157.5781,24.125 L157.5781,23.0781 C157.5781,21.375 158.7969,20.1719 160.5,20.1719 C161.0781,20.1719 161.6563,20.3125 162.125,20.5625 C162.5938,20.8281 162.7656,21.0156 162.8281,21.375 C162.9531,22.0469 163.2031,22.2969 163.7344,22.2969 C164.0156,22.2969 164.2969,22.1563 164.4844,21.9375 C164.6094,21.7656 164.6563,21.5938 164.6563,21.1563 L164.6563,19.7969 C164.6563,19.375 164.6406,19.2344 164.5156,19.0625 C164.3438,18.8125 164.0625,18.6563 163.7344,18.6563 C163.4219,18.6563 163.2188,18.7656 163,19.0313 C161.8281,18.5313 161.3906,18.4219 160.4375,18.4219 C157.7656,18.4219 155.75,20.4375 155.75,23.0625 L155.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="181.25" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="317.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="47.9"/>
-          <ellipse cx="32.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="169" x="41.5" y="56.0059">get_int_map() : A&lt;intmap&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="64.6999"/>
-          <ellipse cx="32.5" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="271" x="41.5" y="72.8059">set_int_map(A&lt;intmap&gt; &amp;&amp; int_map) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="317.5" y1="80.5999" y2="80.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="89.4998"/>
-          <ellipse cx="32.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="41.5" y="97.6058">a_int_map : A&lt;intmap&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="106.2997"/>
-          <ellipse cx="32.5" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="41.5" y="114.4057">a_string : A&lt;thestring&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="27.5" y="123.0997"/>
-          <ellipse cx="32.5" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="217" x="41.5" y="131.2057">a_vector_string : A&lt;string_vector&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="149.5" y="373.0151">a : T</text>
     </a>
-    <g id="link_C_0000654829353386288443_C_0000372971769516871577">
-      <path codeLine="28" d="M70.95,264.29 C87.65,281.24 98.0556,291.7992 117.7156,311.7492 " fill="none" id="C_0000654829353386288443-to-C_0000372971769516871577" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="130.35,324.57,121.9892,307.5378,113.442,315.9607,130.35,324.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000973058255816844469_C_0000372971769516871577">
-      <path codeLine="29" d="M170,264.29 C170,281.24 170,286.62 170,306.57 " fill="none" id="C_0000973058255816844469-to-C_0000372971769516871577" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="170,324.57,176,306.57,164,306.57,170,324.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000562074851310302010_C_0000372971769516871577">
-      <path codeLine="30" d="M282.86,264.29 C263.82,281.24 251.0118,292.6484 228.6118,312.5984 " fill="none" id="C_0000562074851310302010-to-C_0000372971769516871577" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="215.17,324.57,232.6023,317.079,224.6212,308.1178,215.17,324.57" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002288024073053091226_C_0000973058255816844469">
-      <path codeLine="31" d="M170,151.21 C170,178.24 170,195.85 170,215.74 " fill="none" id="C_0002288024073053091226-backto-C_0000973058255816844469" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="170,139.21,166,145.21,170,151.21,174,145.21,170,139.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="176" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="183" y="182.077">a_string</text>
-    </g>
-    <g id="link_C_0002288024073053091226_C_0000562074851310302010">
-      <path codeLine="32" d="M232.6692,148.3893 C255.4292,175.4193 272.65,195.85 289.41,215.74 " fill="none" id="C_0002288024073053091226-backto-C_0000562074851310302010" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="224.94,139.21,225.7448,146.376,232.6692,148.3893,231.8644,141.2232,224.94,139.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="270" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="89" x="277" y="182.077">a_vector_string</text>
-    </g>
-    <g id="link_C_0002288024073053091226_C_0000654829353386288443">
-      <path codeLine="33" d="M103.1333,148.6511 C95.1833,158.3511 94.98,159.13 88,169 C77.49,183.86 67.34,201.67 59.89,215.62 " fill="none" id="C_0002288024073053091226-backto-C_0000654829353386288443" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="110.74,139.37,103.843,141.475,103.1333,148.6511,110.0304,146.5461,110.74,139.37" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="94" cy="178.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="60" x="101" y="182.077">a_int_map</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="197"/>
+      <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="45" x="51" y="194"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="52" y="206.1387">intmap</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="237" y2="237"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="128.5" y="197"/>
+      <ellipse cx="143.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M146.4688,218.6406 Q145.8906,218.9375 145.25,219.0781 Q144.6094,219.2344 143.9063,219.2344 Q141.4063,219.2344 140.0781,217.5938 Q138.7656,215.9375 138.7656,212.8125 Q138.7656,209.6875 140.0781,208.0313 Q141.4063,206.375 143.9063,206.375 Q144.6094,206.375 145.25,206.5313 Q145.9063,206.6875 146.4688,206.9844 L146.4688,209.7031 Q145.8438,209.125 145.25,208.8594 Q144.6563,208.5781 144.0313,208.5781 Q142.6875,208.5781 142,209.6563 Q141.3125,210.7188 141.3125,212.8125 Q141.3125,214.9063 142,215.9844 Q142.6875,217.0469 144.0313,217.0469 Q144.6563,217.0469 145.25,216.7813 Q145.8438,216.5 146.4688,215.9219 L146.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.5" y="217.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="58" x="173.5" y="194"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="174.5" y="206.1387">thestring</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="237" y2="237"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="263.5" y="197"/>
+      <ellipse cx="278.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M281.4688,218.6406 Q280.8906,218.9375 280.25,219.0781 Q279.6094,219.2344 278.9063,219.2344 Q276.4063,219.2344 275.0781,217.5938 Q273.7656,215.9375 273.7656,212.8125 Q273.7656,209.6875 275.0781,208.0313 Q276.4063,206.375 278.9063,206.375 Q279.6094,206.375 280.25,206.5313 Q280.9063,206.6875 281.4688,206.9844 L281.4688,209.7031 Q280.8438,209.125 280.25,208.8594 Q279.6563,208.5781 279.0313,208.5781 Q277.6875,208.5781 277,209.6563 Q276.3125,210.7188 276.3125,212.8125 Q276.3125,214.9063 277,215.9844 Q277.6875,217.0469 279.0313,217.0469 Q279.6563,217.0469 280.25,216.7813 Q280.8438,216.5 281.4688,215.9219 L281.4688,218.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="292.5" y="217.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="82" x="308.5" y="194"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="309.5" y="206.1387">string_vector</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="229" y2="229"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="237" y2="237"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="41" y="8"/>
+      <ellipse cx="170.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.2188,29.6406 Q172.6406,29.9375 172,30.0781 Q171.3594,30.2344 170.6563,30.2344 Q168.1563,30.2344 166.8281,28.5938 Q165.5156,26.9375 165.5156,23.8125 Q165.5156,20.6875 166.8281,19.0313 Q168.1563,17.375 170.6563,17.375 Q171.3594,17.375 172,17.5313 Q172.6563,17.6875 173.2188,17.9844 L173.2188,20.7031 Q172.5938,20.125 172,19.8594 Q171.4063,19.5781 170.7813,19.5781 Q169.4375,19.5781 168.75,20.6563 Q168.0625,21.7188 168.0625,23.8125 Q168.0625,25.9063 168.75,26.9844 Q169.4375,28.0469 170.7813,28.0469 Q171.4063,28.0469 172,27.7813 Q172.5938,27.5 173.2188,26.9219 L173.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190.75" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="46"/>
+      <ellipse cx="52" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="61" y="54.2104">get_int_map() : A&lt;intmap&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="58.8047"/>
+      <ellipse cx="52" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="61" y="67.0151">set_int_map(A&lt;intmap&gt; &amp;&amp; int_map) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="73.6094" y2="73.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="79.6094"/>
+      <ellipse cx="52" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="61" y="87.8198">a_int_map : A&lt;intmap&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="92.4141"/>
+      <ellipse cx="52" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="61" y="100.6245">a_string : A&lt;thestring&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="105.2188"/>
+      <ellipse cx="52" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="198" x="61" y="113.4292">a_vector_string : A&lt;string_vector&gt;</text>
+    </a>
+    <path d="M74.37,245.14 C88.77,258.53 107.47,275.93 125.05,292.27 " fill="none" id="C_0000654829353386288443-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="129.87,287.2,139.74,305.95,120.33,297.45,129.87,287.2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M178.5,245.14 C178.5,256.67 178.5,271.17 178.5,285.41 " fill="none" id="C_0000973058255816844469-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="185.5,285.71,178.5,305.71,171.5,285.71,185.5,285.71" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M297.16,245.14 C280.42,258.8 258.58,276.63 238.21,293.26 " fill="none" id="C_0000562074851310302010-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="242.59,298.72,222.67,305.95,233.73,287.88,242.59,298.72" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M178.5,133.26 C178.5,155.95 178.5,179.72 178.5,196.62 " fill="none" id="C_0002288024073053091226&lt;-C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="178.5,120.08,174.5,126.08,178.5,132.08,182.5,126.08,178.5,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="184.5" cy="159.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="51" x="191.5" y="163.0669">a_string</text>
+    <path d="M239.93,129.77 C262.43,153.49 286.48,178.85 303.33,196.62 " fill="none" id="C_0002288024073053091226&lt;-C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="230.74,120.08,231.9615,127.1869,238.9915,128.7928,237.77,121.6859,230.74,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="279.5" cy="159.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="98" x="286.5" y="163.0669">a_vector_string</text>
+    <path d="M106.73,129.89 C100.65,136.46 94.81,143.22 89.5,150 C78.12,164.55 67.84,182.71 60.55,196.88 " fill="none" id="C_0002288024073053091226&lt;-C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="115.76,120.42,108.7238,121.9987,107.4749,129.1009,114.5111,127.5221,115.76,120.42" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="95.5" cy="159.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="67" x="102.5" y="163.0669">a_int_map</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00049_class_mermaid.svg b/docs/test_cases/t00049_class_mermaid.svg
index e06fb016..4c8b4646 100644
--- a/docs/test_cases/t00049_class_mermaid.svg
+++ b/docs/test_cases/t00049_class_mermaid.svg
@@ -1,66 +1,61 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 473.984375 459" style="max-width: 473.984px; background-color: white;" width="473.984375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M56.84375,300L56.84375,304.1666666666667C56.84375,308.3333333333333,56.84375,316.6666666666667,69.96081706356145,327.1943999783684C83.0778841271229,337.7221332900701,109.3120182542458,350.4442665801401,122.42908531780726,356.80533322517505L135.5461523813687,363.1663998702101"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M212.53125,300L212.53125,304.1666666666667C212.53125,308.3333333333333,212.53125,316.6666666666667,212.53125,322C212.53125,327.3333333333333,212.53125,329.6666666666667,212.53125,330.8333333333333L212.53125,332"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M392.6796875,300L392.6796875,304.1666666666667C392.6796875,308.3333333333333,392.6796875,316.6666666666667,375.5532940281003,328.0109848582233C358.4269005562007,339.35530304978,324.17411361240136,353.71060609956,307.04772014050167,360.88825762445L289.92132666860203,368.06590914934"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M212.53125,193L212.53125,195.66666666666666C212.53125,198.33333333333334,212.53125,203.66666666666666,212.53125,212C212.53125,220.33333333333334,212.53125,231.66666666666666,212.53125,237.33333333333334L212.53125,243"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M355.62816446725355,184.8335180878396L361.80341830604465,188.86126507319966C367.9786721448357,192.88901205855973,380.32917982241787,200.94450602927986,386.5044336612089,210.6389196813066C392.6796875,220.33333333333334,392.6796875,231.66666666666666,392.6796875,237.33333333333334L392.6796875,243"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M87.52634529400184,185.8433243064137L82.4125794116682,189.70277025534475C77.29881352933457,193.5622162042758,67.07128176466728,201.2811081021379,61.95751588233364,210.80722071773562C56.84375,220.33333333333334,56.84375,231.66666666666666,56.84375,237.33333333333334L56.84375,243"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M56.84375,300L56.84375,304.1666666666667C56.84375,308.3333333333333,56.84375,316.6666666666667,73.40104166666667,328.8627224675499C89.95833333333333,341.05877826843306,123.07291666666667,357.11755653686606,139.63020833333334,365.1469456710825L156.1875,373.17633480529906"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M212.53125,300L212.53125,304.1666666666667C212.53125,308.3333333333333,212.53125,316.6666666666667,212.53125,325C212.53125,333.3333333333333,212.53125,341.6666666666667,212.53125,345.8333333333333L212.53125,350"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M392.6796875,300L392.6796875,304.1666666666667C392.6796875,308.3333333333333,392.6796875,316.6666666666667,372.0455729166667,329.48106668401346C351.4114583333333,342.2954667013603,310.1432291666667,359.59093340272057,289.5091145833333,368.23866675340076L268.875,376.88640010408085"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M212.53125,175L212.53125,180.66666666666666C212.53125,186.33333333333334,212.53125,197.66666666666666,212.53125,209C212.53125,220.33333333333334,212.53125,231.66666666666666,212.53125,237.33333333333334L212.53125,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M340.5516289893617,175L349.23963874113474,180.66666666666666C357.9276484929078,186.33333333333334,375.3036679964539,197.66666666666666,383.99167774822695,209C392.6796875,220.33333333333334,392.6796875,231.66666666666666,392.6796875,237.33333333333334L392.6796875,243"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M101.89375,175L94.38541666666667,180.66666666666666C86.87708333333335,186.33333333333334,71.86041666666667,197.66666666666666,64.35208333333334,209C56.84375,220.33333333333334,56.84375,231.66666666666666,56.84375,237.33333333333334L56.84375,243"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -131,11 +126,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000372971769516871577-0" class="node default clickable">
-            <rect height="101" width="121.578125" y="-50.5" x="-60.7890625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="60.7890625" x1="-60.7890625" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="60.7890625" x1="-60.7890625" class="divider"/>
+            <rect height="101" width="112.6875" y="-50.5" x="-56.34375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="56.34375" x1="-56.34375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="56.34375" x1="-56.34375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -147,20 +142,20 @@
                   <span class="nodeLabel">A&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -53.2890625, -9)" height="18" width="41.0625">
+              <foreignObject transform="translate( -48.84375, -9)" height="18" width="41.0625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -53.2890625, 25)" height="18" width="106.578125">
+              <foreignObject transform="translate( -48.84375, 25)" height="18" width="97.6875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_a() : : T &amp;</span>
+                  <span class="nodeLabel">+get_a() : T &amp;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7">
+        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000654829353386288443-1" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -179,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000973058255816844469-2" class="node default clickable">
             <rect height="57" width="113.6875" y="-28.5" x="-56.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.84375" x1="-56.84375" class="divider"/>
@@ -198,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L7">
+        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000562074851310302010-3" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -217,11 +212,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00049/t00049.cc#L13">
+        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L13">
           <g title="R" id="classId-C_0002288024073053091226-4" class="node default clickable">
-            <rect height="167" width="270.6875" y="-83.5" x="-135.34375" class="outer title-state"/>
-            <line y2="-53.5" y1="-53.5" x2="135.34375" x1="-135.34375" class="divider"/>
-            <line y2="28.5" y1="28.5" x2="135.34375" x1="-135.34375" class="divider"/>
+            <rect height="167" width="267.140625" y="-83.5" x="-133.5703125" class="outer title-state"/>
+            <line y2="-53.5" y1="-53.5" x2="133.5703125" x1="-133.5703125" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="133.5703125" x1="-133.5703125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -233,29 +228,29 @@
                   <span class="nodeLabel">R</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.84375, -42)" height="18" width="173.90625">
+              <foreignObject transform="translate( -126.0703125, -42)" height="18" width="173.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a_int_map : A&lt;intmap&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.84375, -20)" height="18" width="169.453125">
+              <foreignObject transform="translate( -126.0703125, -20)" height="18" width="169.453125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a_string : A&lt;thestring&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.84375, 2)" height="18" width="252.140625">
+              <foreignObject transform="translate( -126.0703125, 2)" height="18" width="252.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+a_vector_string : A&lt;string_vector&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.84375, 36)" height="18" width="206.796875">
+              <foreignObject transform="translate( -126.0703125, 36)" height="18" width="197.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_int_map() : : A&lt;intmap&gt;</span>
+                  <span class="nodeLabel">+get_int_map() : A&lt;intmap&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -127.84375, 58)" height="18" width="255.6875">
+              <foreignObject transform="translate( -126.0703125, 58)" height="18" width="246.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+set_int_map(A &amp;&amp; int_map) : : void</span>
+                  <span class="nodeLabel">+set_int_map(A &amp;&amp; int_map) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00050.md b/docs/test_cases/t00050.md
index c39aab55..2e847070 100644
--- a/docs/test_cases/t00050.md
+++ b/docs/test_cases/t00050.md
@@ -223,7 +223,7 @@ class NoComment { };
         "raw": "/// Lorem ipsum dolor sit",
         "text": "\n Lorem ipsum dolor sit\n"
       },
-      "display_name": "clanguml::t00050::A",
+      "display_name": "A",
       "id": "1885563213397742674",
       "is_abstract": false,
       "is_nested": false,
@@ -263,7 +263,7 @@ class NoComment { };
           " 3. Implement\n"
         ]
       },
-      "display_name": "clanguml::t00050::B",
+      "display_name": "B",
       "id": "500262098409836244",
       "is_abstract": false,
       "is_nested": false,
@@ -299,7 +299,7 @@ class NoComment { };
         "raw": "/// \\brief Long comment example\n///\n/// Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n/// vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n/// Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n/// integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n/// tellus ligula porttitor metus.\n///\n/// Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n/// euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n/// erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n/// ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\n/// ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\n/// volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\n/// conubia mauris tempor, etiam ultricies proin quisque lectus sociis id\n/// tristique, integer phasellus taciti pretium adipiscing tortor sagittis\n/// ligula.\n///\n/// Mollis pretium lorem primis senectus habitasse lectus scelerisque\n/// donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\n/// pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\n/// lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\n/// taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\n/// est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\n/// imperdiet praesent magnis ridiculus congue gravida curabitur dictum\n/// sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\n/// aenean vel nostra tellus commodo pretium sapien sociosqu.",
         "text": "\n \n\n Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\n ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\n volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\n conubia mauris tempor, etiam ultricies proin quisque lectus sociis id\n tristique, integer phasellus taciti pretium adipiscing tortor sagittis\n ligula.\n\n Mollis pretium lorem primis senectus habitasse lectus scelerisque\n donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\n pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\n lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\n taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\n est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\n imperdiet praesent magnis ridiculus congue gravida curabitur dictum\n sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\n aenean vel nostra tellus commodo pretium sapien sociosqu.\n"
       },
-      "display_name": "clanguml::t00050::C",
+      "display_name": "C",
       "id": "1663081653671078922",
       "is_abstract": false,
       "is_nested": false,
@@ -333,7 +333,7 @@ class NoComment { };
           " Implement...\n"
         ]
       },
-      "display_name": "clanguml::t00050::utils::D",
+      "display_name": "utils::D",
       "id": "1492514566602019299",
       "is_abstract": false,
       "is_nested": false,
@@ -367,7 +367,7 @@ class NoComment { };
         "E2",
         "E3"
       ],
-      "display_name": "clanguml::t00050::E",
+      "display_name": "E",
       "id": "2027344031570117998",
       "is_nested": false,
       "name": "E",
@@ -409,7 +409,7 @@ class NoComment { };
           }
         ]
       },
-      "display_name": "clanguml::t00050::F<T,V,int N>",
+      "display_name": "F<T,V,int N>",
       "id": "793698410848959592",
       "is_abstract": false,
       "is_nested": false,
@@ -486,7 +486,7 @@ class NoComment { };
         "raw": "/// This is a short description of class G.\n///\n/// This is an intermediate description of class G.\n///\n/// This is a long description of class G.",
         "text": "\n This is a short description of class G.\n\n This is an intermediate description of class G.\n\n This is a long description of class G.\n"
       },
-      "display_name": "clanguml::t00050::G",
+      "display_name": "G",
       "id": "449485154531299941",
       "is_abstract": false,
       "is_nested": false,
@@ -508,7 +508,7 @@ class NoComment { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00050::NoComment",
+      "display_name": "NoComment",
       "id": "1832693799357996932",
       "is_abstract": false,
       "is_nested": false,
@@ -530,6 +530,7 @@ class NoComment { };
     }
   ],
   "name": "t00050_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00050"
 }
diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg
index 376bec07..8d2df7c4 100644
--- a/docs/test_cases/t00050_class.svg
+++ b/docs/test_cases/t00050_class.svg
@@ -1,226 +1,186 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="699px" preserveAspectRatio="none" style="width:2338px;height:699px;background:#FFFFFF;" version="1.1" viewBox="0 0 2338 699" width="2338px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="684px" preserveAspectRatio="none" style="width:2480px;height:684px;" version="1.1" viewBox="0 0 2480 684" width="2480px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f4x1nh73sxgnc" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001885563213397742674">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001885563213397742674" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="186.5" y="52.32"/>
-        <ellipse cx="201.5" cy="68.32" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M196.5,69.4763 C196.5,71.9763 198.6406,73.7888 201.5625,73.7888 C202.7969,73.7888 203.9688,73.4919 204.7188,72.9763 C205.3281,72.5544 205.6563,72.1325 205.6563,71.7263 C205.6563,71.2575 205.2344,70.8513 204.7344,70.8513 C204.5,70.8513 204.2813,70.9294 204.0781,71.1325 C203.6406,71.57 203.6406,71.57 203.4688,71.6638 C203.0156,71.8981 202.375,72.0388 201.6094,72.0388 C199.6094,72.0388 198.3281,71.0231 198.3281,69.445 L198.3281,68.3981 C198.3281,66.695 199.5469,65.4919 201.25,65.4919 C201.8281,65.4919 202.4063,65.6325 202.875,65.8825 C203.3438,66.1481 203.5156,66.3356 203.5781,66.695 C203.7031,67.3669 203.9531,67.6169 204.4844,67.6169 C204.7656,67.6169 205.0469,67.4763 205.2344,67.2575 C205.3594,67.0856 205.4063,66.9138 205.4063,66.4763 L205.4063,65.1169 C205.4063,64.695 205.3906,64.5544 205.2656,64.3825 C205.0938,64.1325 204.8125,63.9763 204.4844,63.9763 C204.1719,63.9763 203.9688,64.0856 203.75,64.3513 C202.5781,63.8513 202.1406,63.7419 201.1875,63.7419 C198.5156,63.7419 196.5,65.7575 196.5,68.3825 L196.5,69.4763 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="215.5" y="72.926">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="187.5" x2="226.5" y1="84.32" y2="84.32"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="187.5" x2="226.5" y1="92.32" y2="92.32"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
+      <ellipse cx="216" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M218.9688,71.1406 Q218.3906,71.4375 217.75,71.5781 Q217.1094,71.7344 216.4063,71.7344 Q213.9063,71.7344 212.5781,70.0938 Q211.2656,68.4375 211.2656,65.3125 Q211.2656,62.1875 212.5781,60.5313 Q213.9063,58.875 216.4063,58.875 Q217.1094,58.875 217.75,59.0313 Q218.4063,59.1875 218.9688,59.4844 L218.9688,62.2031 Q218.3438,61.625 217.75,61.3594 Q217.1563,61.0781 216.5313,61.0781 Q215.1875,61.0781 214.5,62.1563 Q213.8125,63.2188 213.8125,65.3125 Q213.8125,67.4063 214.5,68.4844 Q215.1875,69.5469 216.5313,69.5469 Q217.1563,69.5469 217.75,69.2813 Q218.3438,69 218.9688,68.4219 L218.9688,71.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="230" y="69.6543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="81.5" y2="81.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="89.5" y2="89.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
-      <g id="elem_C_0000500262098409836244">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000500262098409836244" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1259.5" y="382.65"/>
-        <ellipse cx="1274.5" cy="398.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1269.5,399.8063 C1269.5,402.3063 1271.6406,404.1188 1274.5625,404.1188 C1275.7969,404.1188 1276.9688,403.8219 1277.7188,403.3063 C1278.3281,402.8844 1278.6563,402.4625 1278.6563,402.0563 C1278.6563,401.5875 1278.2344,401.1813 1277.7344,401.1813 C1277.5,401.1813 1277.2813,401.2594 1277.0781,401.4625 C1276.6406,401.9 1276.6406,401.9 1276.4688,401.9938 C1276.0156,402.2281 1275.375,402.3688 1274.6094,402.3688 C1272.6094,402.3688 1271.3281,401.3531 1271.3281,399.775 L1271.3281,398.7281 C1271.3281,397.025 1272.5469,395.8219 1274.25,395.8219 C1274.8281,395.8219 1275.4063,395.9625 1275.875,396.2125 C1276.3438,396.4781 1276.5156,396.6656 1276.5781,397.025 C1276.7031,397.6969 1276.9531,397.9469 1277.4844,397.9469 C1277.7656,397.9469 1278.0469,397.8063 1278.2344,397.5875 C1278.3594,397.4156 1278.4063,397.2438 1278.4063,396.8063 L1278.4063,395.4469 C1278.4063,395.025 1278.3906,394.8844 1278.2656,394.7125 C1278.0938,394.4625 1277.8125,394.3063 1277.4844,394.3063 C1277.1719,394.3063 1276.9688,394.4156 1276.75,394.6813 C1275.5781,394.1813 1275.1406,394.0719 1274.1875,394.0719 C1271.5156,394.0719 1269.5,396.0875 1269.5,398.7125 L1269.5,399.8063 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1288.5" y="403.256">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1260.5" x2="1299.5" y1="414.65" y2="414.65"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1260.5" x2="1299.5" y1="422.65" y2="422.65"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
+      <ellipse cx="1359" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1361.9688,390.6406 Q1361.3906,390.9375 1360.75,391.0781 Q1360.1094,391.2344 1359.4063,391.2344 Q1356.9063,391.2344 1355.5781,389.5938 Q1354.2656,387.9375 1354.2656,384.8125 Q1354.2656,381.6875 1355.5781,380.0313 Q1356.9063,378.375 1359.4063,378.375 Q1360.1094,378.375 1360.75,378.5313 Q1361.4063,378.6875 1361.9688,378.9844 L1361.9688,381.7031 Q1361.3438,381.125 1360.75,380.8594 Q1360.1563,380.5781 1359.5313,380.5781 Q1358.1875,380.5781 1357.5,381.6563 Q1356.8125,382.7188 1356.8125,384.8125 Q1356.8125,386.9063 1357.5,387.9844 Q1358.1875,389.0469 1359.5313,389.0469 Q1360.1563,389.0469 1360.75,388.7813 Q1361.3438,388.5 1361.9688,387.9219 L1361.9688,390.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1373" y="389.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="401" y2="401"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
-      <g id="elem_C_0001663081653671078922">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001663081653671078922" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="542" y="382.65"/>
-        <ellipse cx="557" cy="398.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M552,399.8063 C552,402.3063 554.1406,404.1188 557.0625,404.1188 C558.2969,404.1188 559.4688,403.8219 560.2188,403.3063 C560.8281,402.8844 561.1563,402.4625 561.1563,402.0563 C561.1563,401.5875 560.7344,401.1813 560.2344,401.1813 C560,401.1813 559.7813,401.2594 559.5781,401.4625 C559.1406,401.9 559.1406,401.9 558.9688,401.9938 C558.5156,402.2281 557.875,402.3688 557.1094,402.3688 C555.1094,402.3688 553.8281,401.3531 553.8281,399.775 L553.8281,398.7281 C553.8281,397.025 555.0469,395.8219 556.75,395.8219 C557.3281,395.8219 557.9063,395.9625 558.375,396.2125 C558.8438,396.4781 559.0156,396.6656 559.0781,397.025 C559.2031,397.6969 559.4531,397.9469 559.9844,397.9469 C560.2656,397.9469 560.5469,397.8063 560.7344,397.5875 C560.8594,397.4156 560.9063,397.2438 560.9063,396.8063 L560.9063,395.4469 C560.9063,395.025 560.8906,394.8844 560.7656,394.7125 C560.5938,394.4625 560.3125,394.3063 559.9844,394.3063 C559.6719,394.3063 559.4688,394.4156 559.25,394.6813 C558.0781,394.1813 557.6406,394.0719 556.6875,394.0719 C554.0156,394.0719 552,396.0875 552,398.7125 L552,399.8063 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="571" y="403.256">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="543" x2="583" y1="414.65" y2="414.65"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="543" x2="583" y1="422.65" y2="422.65"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
+      <ellipse cx="595" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M597.9688,390.6406 Q597.3906,390.9375 596.75,391.0781 Q596.1094,391.2344 595.4063,391.2344 Q592.9063,391.2344 591.5781,389.5938 Q590.2656,387.9375 590.2656,384.8125 Q590.2656,381.6875 591.5781,380.0313 Q592.9063,378.375 595.4063,378.375 Q596.1094,378.375 596.75,378.5313 Q597.4063,378.6875 597.9688,378.9844 L597.9688,381.7031 Q597.3438,381.125 596.75,380.8594 Q596.1563,380.5781 595.5313,380.5781 Q594.1875,380.5781 593.5,381.6563 Q592.8125,382.7188 592.8125,384.8125 Q592.8125,386.9063 593.5,387.9844 Q594.1875,389.0469 595.5313,389.0469 Q596.1563,389.0469 596.75,388.7813 Q597.3438,388.5 597.9688,387.9219 L597.9688,390.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="609" y="389.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="401" y2="401"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001492514566602019299">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001492514566602019299" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="75" x="1597.5" y="382.65"/>
-        <ellipse cx="1612.5" cy="398.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1607.5,399.8063 C1607.5,402.3063 1609.6406,404.1188 1612.5625,404.1188 C1613.7969,404.1188 1614.9688,403.8219 1615.7188,403.3063 C1616.3281,402.8844 1616.6563,402.4625 1616.6563,402.0563 C1616.6563,401.5875 1616.2344,401.1813 1615.7344,401.1813 C1615.5,401.1813 1615.2813,401.2594 1615.0781,401.4625 C1614.6406,401.9 1614.6406,401.9 1614.4688,401.9938 C1614.0156,402.2281 1613.375,402.3688 1612.6094,402.3688 C1610.6094,402.3688 1609.3281,401.3531 1609.3281,399.775 L1609.3281,398.7281 C1609.3281,397.025 1610.5469,395.8219 1612.25,395.8219 C1612.8281,395.8219 1613.4063,395.9625 1613.875,396.2125 C1614.3438,396.4781 1614.5156,396.6656 1614.5781,397.025 C1614.7031,397.6969 1614.9531,397.9469 1615.4844,397.9469 C1615.7656,397.9469 1616.0469,397.8063 1616.2344,397.5875 C1616.3594,397.4156 1616.4063,397.2438 1616.4063,396.8063 L1616.4063,395.4469 C1616.4063,395.025 1616.3906,394.8844 1616.2656,394.7125 C1616.0938,394.4625 1615.8125,394.3063 1615.4844,394.3063 C1615.1719,394.3063 1614.9688,394.4156 1614.75,394.6813 C1613.5781,394.1813 1613.1406,394.0719 1612.1875,394.0719 C1609.5156,394.0719 1607.5,396.0875 1607.5,398.7125 L1607.5,399.8063 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="1626.5" y="403.256">utils::D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1598.5" x2="1671.5" y1="414.65" y2="414.65"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1598.5" x2="1671.5" y1="422.65" y2="422.65"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
+      <ellipse cx="1721.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1724.4688,390.6406 Q1723.8906,390.9375 1723.25,391.0781 Q1722.6094,391.2344 1721.9063,391.2344 Q1719.4063,391.2344 1718.0781,389.5938 Q1716.7656,387.9375 1716.7656,384.8125 Q1716.7656,381.6875 1718.0781,380.0313 Q1719.4063,378.375 1721.9063,378.375 Q1722.6094,378.375 1723.25,378.5313 Q1723.9063,378.6875 1724.4688,378.9844 L1724.4688,381.7031 Q1723.8438,381.125 1723.25,380.8594 Q1722.6563,380.5781 1722.0313,380.5781 Q1720.6875,380.5781 1720,381.6563 Q1719.3125,382.7188 1719.3125,384.8125 Q1719.3125,386.9063 1720,387.9844 Q1720.6875,389.0469 1722.0313,389.0469 Q1722.6563,389.0469 1723.25,388.7813 Q1723.8438,388.5 1724.4688,387.9219 L1724.4688,390.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1735.5" y="389.1543">utils::D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="401" y2="401"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0002027344031570117998">
-        <rect codeLine="18" fill="#F1F1F1" height="98.3998" id="C_0002027344031570117998" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1718.5" y="27.12"/>
-        <ellipse cx="1733.5" cy="43.12" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1732.3594,44.1825 L1733.6719,44.1825 L1733.6719,44.2294 C1733.6719,44.6356 1733.6875,44.7919 1733.7969,44.9481 C1733.9688,45.1981 1734.2656,45.37 1734.5781,45.37 C1734.8594,45.37 1735.1563,45.2294 1735.3281,45.0106 C1735.4531,44.8231 1735.5,44.6825 1735.5,44.2294 L1735.5,42.3856 C1735.5,42.0575 1735.4844,41.9481 1735.4219,41.7763 C1735.3125,41.4794 1734.9531,41.2294 1734.5781,41.2294 C1734.2813,41.2294 1734.0156,41.37 1733.8438,41.5888 C1733.7031,41.7763 1733.6719,41.9481 1733.6719,42.3856 L1733.6719,42.4481 L1732.3594,42.4481 L1732.3594,40.2763 L1736.2031,40.2763 L1736.2031,41.0263 C1736.2031,41.4169 1736.2344,41.6044 1736.3438,41.7606 C1736.5156,42.0106 1736.8125,42.1825 1737.125,42.1825 C1737.4219,42.1825 1737.6875,42.0575 1737.875,41.8231 C1738.0156,41.6356 1738.0469,41.495 1738.0469,41.0263 L1738.0469,38.5263 L1730.3438,38.5263 C1729.8906,38.5263 1729.7656,38.5419 1729.5938,38.6513 C1729.3281,38.8231 1729.1563,39.0888 1729.1563,39.4013 C1729.1563,39.6825 1729.2813,39.9481 1729.5313,40.12 C1729.7188,40.245 1729.9063,40.2763 1730.3438,40.2763 L1730.5313,40.2763 L1730.5313,46.37 L1730.3438,46.37 C1729.9219,46.37 1729.7656,46.4013 1729.5938,46.495 C1729.3281,46.6513 1729.1563,46.9325 1729.1563,47.2294 C1729.1563,47.8075 1729.5625,48.12 1730.3438,48.12 L1738.4219,48.12 L1738.4219,45.5888 C1738.4219,45.1825 1738.3906,45.0106 1738.2813,44.8544 C1738.1094,44.5888 1737.8281,44.4325 1737.5,44.4325 C1737.2188,44.4325 1736.9375,44.5731 1736.75,44.7919 C1736.6094,44.9794 1736.5781,45.1356 1736.5781,45.5888 L1736.5781,46.37 L1732.3594,46.37 L1732.3594,44.1825 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1747.5" y="47.726">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1719.5" x2="1758.5" y1="59.12" y2="59.12"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="1724.5" y="76.1259">E1</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="1724.5" y="92.9259">E2</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="1724.5" y="109.7258">E3</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1719.5" x2="1758.5" y1="117.5198" y2="117.5198"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
+      <ellipse cx="1847" cy="46.5" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1851.1094,52.5 L1843.3906,52.5 L1843.3906,40.1094 L1851.1094,40.1094 L1851.1094,42.2656 L1845.8438,42.2656 L1845.8438,44.9375 L1850.6094,44.9375 L1850.6094,47.0938 L1845.8438,47.0938 L1845.8438,50.3438 L1851.1094,50.3438 L1851.1094,52.5 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1861" y="50.6543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="62.5" y2="62.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="76.7104">E1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="89.5151">E2</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="102.3198">E3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="108.9141" y2="108.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
-      <g id="elem_C_0000793698410848959592">
-        <rect codeLine="24" fill="#F1F1F1" height="81.5999" id="C_0000793698410848959592" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="91" x="1928.5" y="365.85"/>
-        <ellipse cx="1943.5" cy="381.85" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1938.5,383.0063 C1938.5,385.5063 1940.6406,387.3188 1943.5625,387.3188 C1944.7969,387.3188 1945.9688,387.0219 1946.7188,386.5063 C1947.3281,386.0844 1947.6563,385.6625 1947.6563,385.2563 C1947.6563,384.7875 1947.2344,384.3813 1946.7344,384.3813 C1946.5,384.3813 1946.2813,384.4594 1946.0781,384.6625 C1945.6406,385.1 1945.6406,385.1 1945.4688,385.1938 C1945.0156,385.4281 1944.375,385.5688 1943.6094,385.5688 C1941.6094,385.5688 1940.3281,384.5531 1940.3281,382.975 L1940.3281,381.9281 C1940.3281,380.225 1941.5469,379.0219 1943.25,379.0219 C1943.8281,379.0219 1944.4063,379.1625 1944.875,379.4125 C1945.3438,379.6781 1945.5156,379.8656 1945.5781,380.225 C1945.7031,380.8969 1945.9531,381.1469 1946.4844,381.1469 C1946.7656,381.1469 1947.0469,381.0063 1947.2344,380.7875 C1947.3594,380.6156 1947.4063,380.4438 1947.4063,380.0063 L1947.4063,378.6469 C1947.4063,378.225 1947.3906,378.0844 1947.2656,377.9125 C1947.0938,377.6625 1946.8125,377.5063 1946.4844,377.5063 C1946.1719,377.5063 1945.9688,377.6156 1945.75,377.8813 C1944.5781,377.3813 1944.1406,377.2719 1943.1875,377.2719 C1940.5156,377.2719 1938.5,379.2875 1938.5,381.9125 L1938.5,383.0063 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1957.5" y="386.456">F</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="48" x="1974.5" y="362.85"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="46" x="1975.5" y="377.0501">T,V,int N</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1929.5" x2="2018.5" y1="397.85" y2="397.85"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1929.5" x2="2018.5" y1="405.85" y2="405.85"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1934.5" y="414.75"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="1936.5" y="416.75"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="1948.5" y="422.8559">t : T[N]</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1934.5" y="431.5499"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="1936.5" y="433.5499"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="1948.5" y="439.6559">v : V</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
+      <ellipse cx="2068.5" cy="372" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M2071.4688,377.6406 Q2070.8906,377.9375 2070.25,378.0781 Q2069.6094,378.2344 2068.9063,378.2344 Q2066.4063,378.2344 2065.0781,376.5938 Q2063.7656,374.9375 2063.7656,371.8125 Q2063.7656,368.6875 2065.0781,367.0313 Q2066.4063,365.375 2068.9063,365.375 Q2069.6094,365.375 2070.25,365.5313 Q2070.9063,365.6875 2071.4688,365.9844 L2071.4688,368.7031 Q2070.8438,368.125 2070.25,367.8594 Q2069.6563,367.5781 2069.0313,367.5781 Q2067.6875,367.5781 2067,368.6563 Q2066.3125,369.7188 2066.3125,371.8125 Q2066.3125,373.9063 2067,374.9844 Q2067.6875,376.0469 2069.0313,376.0469 Q2069.6563,376.0469 2070.25,375.7813 Q2070.8438,375.5 2071.4688,374.9219 L2071.4688,377.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="2082.5" y="376.1543">F</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="54" x="2097.5" y="353"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="52" x="2098.5" y="365.1387">T,V,int N</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="388" y2="388"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="396" y2="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0000449485154531299941">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000449485154531299941" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="775.5" y="382.65"/>
-        <ellipse cx="790.5" cy="398.65" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M785.5,399.8063 C785.5,402.3063 787.6406,404.1188 790.5625,404.1188 C791.7969,404.1188 792.9688,403.8219 793.7188,403.3063 C794.3281,402.8844 794.6563,402.4625 794.6563,402.0563 C794.6563,401.5875 794.2344,401.1813 793.7344,401.1813 C793.5,401.1813 793.2813,401.2594 793.0781,401.4625 C792.6406,401.9 792.6406,401.9 792.4688,401.9938 C792.0156,402.2281 791.375,402.3688 790.6094,402.3688 C788.6094,402.3688 787.3281,401.3531 787.3281,399.775 L787.3281,398.7281 C787.3281,397.025 788.5469,395.8219 790.25,395.8219 C790.8281,395.8219 791.4063,395.9625 791.875,396.2125 C792.3438,396.4781 792.5156,396.6656 792.5781,397.025 C792.7031,397.6969 792.9531,397.9469 793.4844,397.9469 C793.7656,397.9469 794.0469,397.8063 794.2344,397.5875 C794.3594,397.4156 794.4063,397.2438 794.4063,396.8063 L794.4063,395.4469 C794.4063,395.025 794.3906,394.8844 794.2656,394.7125 C794.0938,394.4625 793.8125,394.3063 793.4844,394.3063 C793.1719,394.3063 792.9688,394.4156 792.75,394.6813 C791.5781,394.1813 791.1406,394.0719 790.1875,394.0719 C787.5156,394.0719 785.5,396.0875 785.5,398.7125 L785.5,399.8063 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="804.5" y="403.256">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="776.5" x2="817.5" y1="414.65" y2="414.65"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="776.5" x2="817.5" y1="422.65" y2="422.65"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="402"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="404"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
-      <g id="elem_C_0001832693799357996932">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0001832693799357996932" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="2219" y="52.32"/>
-        <ellipse cx="2234" cy="68.32" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M2229,69.4763 C2229,71.9763 2231.1406,73.7888 2234.0625,73.7888 C2235.2969,73.7888 2236.4688,73.4919 2237.2188,72.9763 C2237.8281,72.5544 2238.1563,72.1325 2238.1563,71.7263 C2238.1563,71.2575 2237.7344,70.8513 2237.2344,70.8513 C2237,70.8513 2236.7813,70.9294 2236.5781,71.1325 C2236.1406,71.57 2236.1406,71.57 2235.9688,71.6638 C2235.5156,71.8981 2234.875,72.0388 2234.1094,72.0388 C2232.1094,72.0388 2230.8281,71.0231 2230.8281,69.445 L2230.8281,68.3981 C2230.8281,66.695 2232.0469,65.4919 2233.75,65.4919 C2234.3281,65.4919 2234.9063,65.6325 2235.375,65.8825 C2235.8438,66.1481 2236.0156,66.3356 2236.0781,66.695 C2236.2031,67.3669 2236.4531,67.6169 2236.9844,67.6169 C2237.2656,67.6169 2237.5469,67.4763 2237.7344,67.2575 C2237.8594,67.0856 2237.9063,66.9138 2237.9063,66.4763 L2237.9063,65.1169 C2237.9063,64.695 2237.8906,64.5544 2237.7656,64.3825 C2237.5938,64.1325 2237.3125,63.9763 2236.9844,63.9763 C2236.6719,63.9763 2236.4688,64.0856 2236.25,64.3513 C2235.0781,63.8513 2234.6406,63.7419 2233.6875,63.7419 C2231.0156,63.7419 2229,65.7575 2229,68.3825 L2229,69.4763 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="2248" y="72.926">NoComment</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="2220" x2="2330" y1="84.32" y2="84.32"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="2220" x2="2330" y1="92.32" y2="92.32"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="2073.5" y="410.2104">t : T[N]</text>
     </a>
-    <g id="elem_GMN10">
-      <path d="M6,63.52 L6,89.12 A0,0 0 0 0 6,89.12 L152,89.12 A0,0 0 0 0 152,89.12 L152,81.52 L186.14,76.32 L152,73.52 L152,73.52 L142,63.52 L6,63.52 A0,0 0 0 0 6,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M142,63.52 L142,73.52 L152,73.52 L142,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="12" y="80.597">Lorem ipsum dolor sit</text>
-    </g>
-    <g id="elem_GMN13">
-      <path d="M262,63.52 L262,72.32 L227.81,76.32 L262,80.32 L262,89.12 A0,0 0 0 0 262,89.12 L448,89.12 A0,0 0 0 0 448,89.12 L448,73.52 L438,63.52 L262,63.52 A0,0 0 0 0 262,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M438,63.52 L438,73.52 L448,73.52 L438,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="125" x="268" y="80.597">Lorem ipsum dolor sit</text>
-    </g>
-    <g id="elem_GMN16">
-      <path d="M28.5,206.65 L28.5,606.6503 A0,0 0 0 0 28.5,606.6503 L507.5,606.6503 A0,0 0 0 0 507.5,606.6503 L507.5,410.65 L541.51,406.65 L507.5,402.65 L507.5,216.65 L497.5,206.65 L28.5,206.65 A0,0 0 0 0 28.5,206.65 " fill="#AABBCC" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M497.5,206.65 L497.5,216.65 L507.5,216.65 L497.5,206.65 " fill="#AABBCC" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="438" x="42.5" y="223.727">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="398" x="34.5" y="239.327">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="424" x="34.5" y="254.927">Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="402" x="34.5" y="270.5271">integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="157" x="34.5" y="286.1271">tellus ligula porttitor metus.</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="34.5" y="301.7271"> </text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="431" x="34.5" y="317.3271">Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="430" x="34.5" y="332.9271">euismod libero facilisi aptent elementum felis blandit cursus gravida sociis</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="425" x="34.5" y="348.5271">erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="393" x="34.5" y="364.1271">ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="414" x="34.5" y="379.7271">ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="424" x="34.5" y="395.3272">volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="393" x="34.5" y="410.9272">conubia mauris tempor, etiam ultricies proin quisque lectus sociis id</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="373" x="34.5" y="426.5272">tristique, integer phasellus taciti pretium adipiscing tortor sagittis</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="34.5" y="442.1272">ligula.</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="34.5" y="457.7272"> </text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="382" x="34.5" y="473.3272">Mollis pretium lorem primis senectus habitasse lectus scelerisque</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="383" x="34.5" y="488.9272">donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="449" x="34.5" y="504.5273">pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="454" x="34.5" y="520.1273">lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="458" x="34.5" y="535.7273">taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="444" x="34.5" y="551.3273">est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="394" x="34.5" y="566.9273">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="407" x="34.5" y="582.5273">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="348" x="34.5" y="598.1273">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
-    </g>
-    <g id="elem_GMN19">
-      <path d="M677.5,63.52 L677.5,89.12 A0,0 0 0 0 677.5,89.12 L793,89.12 L797,382.47 L801,89.12 L916.5,89.12 A0,0 0 0 0 916.5,89.12 L916.5,73.52 L906.5,63.52 L677.5,63.52 A0,0 0 0 0 677.5,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M906.5,63.52 L906.5,73.52 L916.5,73.52 L906.5,63.52 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="218" x="683.5" y="80.597">This is a short description of class G.</text>
-    </g>
-    <g id="elem_GMN22">
-      <path d="M853,393.85 L853,402.65 L818.88,406.65 L853,410.65 L853,419.45 A0,0 0 0 0 853,419.45 L1141,419.45 A0,0 0 0 0 1141,419.45 L1141,403.85 L1131,393.85 L853,393.85 A0,0 0 0 0 853,393.85 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M1131,393.85 L1131,403.85 L1141,403.85 L1131,393.85 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="267" x="859" y="410.927">This is an intermediate description of class G.</text>
-    </g>
-    <g id="elem_GMN25">
-      <path d="M680,666.65 L680,692.25 A0,0 0 0 0 680,692.25 L914,692.25 A0,0 0 0 0 914,692.25 L914,676.65 L904,666.65 L801,666.65 L797,430.74 L793,666.65 L680,666.65 A0,0 0 0 0 680,666.65 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M904,666.65 L904,676.65 L914,676.65 L904,666.65 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="213" x="686" y="683.727">This is a long description of class G.</text>
-    </g>
-    <g id="elem_GMN28">
-      <path d="M951,55.72 L951,96.92 L1047,96.92 L1047,65.72 L1037,55.72 L951,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M1037,55.72 L1037,65.72 L1047,65.72 L1037,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="75" x="957" y="72.797">Lorem ipsum</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="957" y="88.397"> </text>
-    </g>
-    <g id="elem_GMN31">
-      <path d="M1081.5,40.12 L1081.5,112.5201 A0,0 0 0 0 1081.5,112.5201 L1185.9,112.5201 L1272.81,382.26 L1193.9,112.5201 L1276.5,112.5201 A0,0 0 0 0 1276.5,112.5201 L1276.5,50.12 L1266.5,40.12 L1081.5,40.12 A0,0 0 0 0 1081.5,40.12 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M1266.5,40.12 L1266.5,50.12 L1276.5,50.12 L1266.5,40.12 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="37" x="1087.5" y="57.197">TODO</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="170" x="1091.5" y="72.797">1. Write meaningful comment</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1087.5" y="88.397"> </text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1087.5" y="103.9971"> </text>
-    </g>
-    <g id="elem_GMN34">
-      <path d="M1311.5,40.12 L1311.5,112.5201 A0,0 0 0 0 1311.5,112.5201 L1350.04,112.5201 L1285.91,382.26 L1358.04,112.5201 L1414.5,112.5201 A0,0 0 0 0 1414.5,112.5201 L1414.5,50.12 L1404.5,40.12 L1311.5,40.12 A0,0 0 0 0 1311.5,40.12 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M1404.5,40.12 L1404.5,50.12 L1414.5,50.12 L1404.5,40.12 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="37" x="1317.5" y="57.197">TODO</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="78" x="1321.5" y="72.797">2. Write tests</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1317.5" y="88.397"> </text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1317.5" y="103.9971"> </text>
-    </g>
-    <g id="elem_GMN37">
-      <path d="M1449.5,47.92 L1449.5,104.72 A0,0 0 0 0 1449.5,104.72 L1477.43,104.72 L1295.74,382.16 L1485.43,104.72 L1550.5,104.72 A0,0 0 0 0 1550.5,104.72 L1550.5,57.92 L1540.5,47.92 L1449.5,47.92 A0,0 0 0 0 1449.5,47.92 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M1540.5,47.92 L1540.5,57.92 L1550.5,57.92 L1540.5,47.92 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="37" x="1455.5" y="64.997">TODO</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="76" x="1459.5" y="80.597">3. Implement</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1455.5" y="96.197"> </text>
-    </g>
-    <g id="elem_GMN40">
-      <path d="M483,55.72 L483,96.92 A0,0 0 0 0 483,96.92 L559,96.92 L563,382.43 L567,96.92 L643,96.92 A0,0 0 0 0 643,96.92 L643,65.72 L633,55.72 L483,55.72 A0,0 0 0 0 483,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M633,55.72 L633,65.72 L643,65.72 L633,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="139" x="489" y="72.797">Long comment example</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="489" y="88.397"> </text>
-    </g>
-    <g id="elem_GMN43">
-      <path d="M1586,47.92 L1586,104.72 A0,0 0 0 0 1586,104.72 L1631,104.72 L1635,382.16 L1639,104.72 L1684,104.72 A0,0 0 0 0 1684,104.72 L1684,57.92 L1674,47.92 L1586,47.92 A0,0 0 0 0 1586,47.92 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M1674,47.92 L1674,57.92 L1684,57.92 L1674,47.92 " fill="#882222" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="37" x="1592" y="64.997">TODO</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="1596" y="80.597">Implement...</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1592" y="96.197"> </text>
-    </g>
-    <g id="elem_GMN46">
-      <path d="M1794.5,55.72 L1794.5,96.92 A0,0 0 0 0 1794.5,96.92 L1870.47,96.92 L1961.06,365.57 L1878.47,96.92 L1941.5,96.92 A0,0 0 0 0 1941.5,96.92 L1941.5,65.72 L1931.5,55.72 L1794.5,55.72 A0,0 0 0 0 1794.5,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M1931.5,55.72 L1931.5,65.72 L1941.5,65.72 L1931.5,55.72 " fill="#22AA22" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="126" x="1800.5" y="72.797">Simple array wrapper.</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1800.5" y="88.397"> </text>
-    </g>
-    <g id="elem_GMN49">
-      <path d="M1976.5,6 L1976.5,146.6501 A0,0 0 0 0 1976.5,146.6501 L2053.52,146.6501 L1986.95,365.52 L2061.52,146.6501 L2183.5,146.6501 A0,0 0 0 0 2183.5,146.6501 L2183.5,16 L2173.5,6 L1976.5,6 A0,0 0 0 0 1976.5,6 " fill="#AAAAFF" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M2173.5,6 L2173.5,16 L2183.5,16 L2173.5,6 " fill="#AAAAFF" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="130" x="1982.5" y="23.077">Template parameters</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1982.5" y="38.677"> </text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="8" x="1982.5" y="56.5">T</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="138" x="1994.5" y="56.227">Type of array elements.</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1982.5" y="71.8271"> </text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="9" x="1982.5" y="89.6501">V</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="141" x="1995.5" y="89.3771">Type of regular element.</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1982.5" y="104.9771"> </text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="9" x="1982.5" y="122.8001">N</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="90" x="1995.5" y="122.5271">Size of T array.</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="4" x="1982.5" y="138.1271"> </text>
-    </g>
-    <g id="link_GMN28_C_0000500262098409836244">
-      <path d="M1015.47,97.42 C1027.95,111.99 1045.97,131.69 1064,146.65 C1102.14,178.31 1123.27,171.29 1158,206.65 C1211.24,260.86 1251.94,342.41 1269.91,382.18 " fill="none" id="GMN28-C_0000500262098409836244" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="414.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="416.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="2073.5" y="423.0151">v : V</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
+      <ellipse cx="844.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M847.4688,390.6406 Q846.8906,390.9375 846.25,391.0781 Q845.6094,391.2344 844.9063,391.2344 Q842.4063,391.2344 841.0781,389.5938 Q839.7656,387.9375 839.7656,384.8125 Q839.7656,381.6875 841.0781,380.0313 Q842.4063,378.375 844.9063,378.375 Q845.6094,378.375 846.25,378.5313 Q846.9063,378.6875 847.4688,378.9844 L847.4688,381.7031 Q846.8438,381.125 846.25,380.8594 Q845.6563,380.5781 845.0313,380.5781 Q843.6875,380.5781 843,381.6563 Q842.3125,382.7188 842.3125,384.8125 Q842.3125,386.9063 843,387.9844 Q843.6875,389.0469 845.0313,389.0469 Q845.6563,389.0469 846.25,388.7813 Q846.8438,388.5 847.4688,387.9219 L847.4688,390.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="858.5" y="389.1543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="401" y2="401"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="409" y2="409"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
+      <ellipse cx="2376" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M2378.9688,71.1406 Q2378.3906,71.4375 2377.75,71.5781 Q2377.1094,71.7344 2376.4063,71.7344 Q2373.9063,71.7344 2372.5781,70.0938 Q2371.2656,68.4375 2371.2656,65.3125 Q2371.2656,62.1875 2372.5781,60.5313 Q2373.9063,58.875 2376.4063,58.875 Q2377.1094,58.875 2377.75,59.0313 Q2378.4063,59.1875 2378.9688,59.4844 L2378.9688,62.2031 Q2378.3438,61.625 2377.75,61.3594 Q2377.1563,61.0781 2376.5313,61.0781 Q2375.1875,61.0781 2374.5,62.1563 Q2373.8125,63.2188 2373.8125,65.3125 Q2373.8125,67.4063 2374.5,68.4844 Q2375.1875,69.5469 2376.5313,69.5469 Q2377.1563,69.5469 2377.75,69.2813 Q2378.3438,69 2378.9688,68.4219 L2378.9688,71.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="2390" y="69.6543">NoComment</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="81.5" y2="81.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="89.5" y2="89.5"/>
+    </a>
+    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M156,61 L156,71 L166,71 L156,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="12" y="78.0669">Lorem ipsum dolor sit</text>
+    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M466,61 L466,71 L476,71 L466,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="282" y="78.0669">Lorem ipsum dolor sit</text>
+    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M534.5,199 L534.5,209 L544.5,209 L534.5,199 " fill="#AABBCC" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="484" x="33.5" y="216.0669">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="434" x="25.5" y="231.1997">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="470" x="25.5" y="246.3325">Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="444" x="25.5" y="261.4653">integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="176" x="25.5" y="276.5981">tellus ligula porttitor metus.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="29.5" y="291.731"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="476" x="25.5" y="306.8638">Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="472" x="25.5" y="321.9966">euismod libero facilisi aptent elementum felis blandit cursus gravida sociis</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="473" x="25.5" y="337.1294">erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="433" x="25.5" y="352.2622">ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="462" x="25.5" y="367.395">ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="468" x="25.5" y="382.5278">volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="433" x="25.5" y="397.6606">conubia mauris tempor, etiam ultricies proin quisque lectus sociis id</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="415" x="25.5" y="412.7935">tristique, integer phasellus taciti pretium adipiscing tortor sagittis</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="25.5" y="427.9263">ligula.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="29.5" y="443.0591"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="419" x="25.5" y="458.1919">Mollis pretium lorem primis senectus habitasse lectus scelerisque</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="421" x="25.5" y="473.3247">donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="496" x="25.5" y="488.4575">pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="498" x="25.5" y="503.5903">lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="504" x="25.5" y="518.7231">taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="493" x="25.5" y="533.856">est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="440" x="25.5" y="548.9888">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="453" x="25.5" y="564.1216">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="386" x="25.5" y="579.2544">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
+    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M966.5,61 L966.5,71 L976.5,71 L966.5,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="232" x="729.5" y="78.0669">This is a short description of class G.</text>
+    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1206,380.5 L1206,390.5 L1216,390.5 L1206,380.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="289" x="912" y="397.5669">This is an intermediate description of class G.</text>
+    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M963.5,647 L963.5,657 L973.5,657 L963.5,647 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="226" x="732.5" y="664.0669">This is a long description of class G.</text>
+    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1106.5,53.5 L1106.5,63.5 L1116.5,63.5 L1106.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1017.5" y="70.5669">Lorem ipsum</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1021.5" y="85.6997"/>
+    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1356,38 L1356,48 L1366,48 L1356,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1158" y="55.0669">TODO</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="1162" y="70.1997">1. Write meaningful comment</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="85.3325"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="100.4653"/>
+    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1500.5,38 L1500.5,48 L1510.5,48 L1500.5,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1407.5" y="55.0669">TODO</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1411.5" y="70.1997">2. Write tests</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="85.3325"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="100.4653"/>
+    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1646,46 L1646,56 L1656,56 L1646,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1552" y="63.0669">TODO</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1556" y="78.1997">3. Implement</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1556" y="93.3325"/>
+    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M678.5,53.5 L678.5,63.5 L688.5,63.5 L678.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="517.5" y="70.5669">Long comment example</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="521.5" y="85.6997"/>
+    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1787,46 L1787,56 L1797,56 L1787,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1697" y="63.0669">TODO</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="1701" y="78.1997">Implement...</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1701" y="93.3325"/>
+    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M2058.5,53.5 L2058.5,63.5 L2068.5,63.5 L2058.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="1913.5" y="70.5669">Simple array wrapper.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1917.5" y="85.6997"/>
+    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M2316,8 L2316,18 L2326,18 L2316,8 " fill="#AAAAFF" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="160" x="2110" y="25.0669">Template parameters</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="40.1997"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="2110" y="55.3325">T</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="151" x="2122" y="55.3325">Type of array elements.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="70.4653"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="9" x="2110" y="85.5981">V</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="2123" y="85.5981">Type of regular element.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="100.731"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="10" x="2110" y="115.8638">N</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="2124" y="115.8638">Size of T array.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="130.9966"/>
+    <path d="M1082.7,93.66 C1096.31,107.11 1115.51,125.1 1134,139 C1175.12,169.92 1195.7,163.57 1233,199 C1287.91,251.15 1332.5,330.1 1352.55,368.86 " fill="none" id="GMN808-C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00050_class_mermaid.svg b/docs/test_cases/t00050_class_mermaid.svg
index 012e975f..f203bd3a 100644
--- a/docs/test_cases/t00050_class_mermaid.svg
+++ b/docs/test_cases/t00050_class_mermaid.svg
@@ -1,55 +1,50 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 4049.046875 632" style="max-width: 4049.05px; background-color: white;" width="4049.046875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -189,7 +184,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L9">
+        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L9">
           <g title="A" id="classId-C_0001885563213397742674-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -208,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L24">
+        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L24">
           <g title="Lorem ipsum" id="classId-C_0000500262098409836244-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -227,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L53">
+        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L53">
           <g title="Long comment example" id="classId-C_0001663081653671078922-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -246,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L65">
+        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L65">
           <g title="D" id="classId-C_0001492514566602019299-3" class="node default clickable">
             <rect height="57" width="70.109375" y="-28.5" x="-35.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.0546875" x1="-35.0546875" class="divider"/>
@@ -265,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L70">
+        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L70">
           <g title="E" id="classId-C_0002027344031570117998-4" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -299,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L81">
+        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L81">
           <g title="Simple array wrapper." id="classId-C_0000793698410848959592-5" class="node default clickable">
             <rect height="101" width="105.109375" y="-50.5" x="-52.5546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="52.5546875" x1="-52.5546875" class="divider"/>
@@ -328,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L91">
+        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L91">
           <g title="G" id="classId-C_0000449485154531299941-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -347,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00050/t00050.cc#L93">
+        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L93">
           <g title="NoComment" id="classId-C_0001832693799357996932-7" class="node default clickable">
             <rect height="57" width="110.109375" y="-28.5" x="-55.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md
index d7e54070..1f8cfe80 100644
--- a/docs/test_cases/t00051.md
+++ b/docs/test_cases/t00051.md
@@ -97,7 +97,7 @@ A::custom_thread2 A::start_thread2()
           "name": "std::thread"
         }
       ],
-      "display_name": "clanguml::t00051::B<F,FF=F>",
+      "display_name": "B<F,FF=F>",
       "id": "486675674447050206",
       "is_abstract": false,
       "is_nested": false,
@@ -253,7 +253,7 @@ A::custom_thread2 A::start_thread2()
           "name": "std::thread"
         }
       ],
-      "display_name": "clanguml::t00051::B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>",
+      "display_name": "B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>",
       "id": "1969502737237579476",
       "is_abstract": false,
       "is_nested": false,
@@ -401,7 +401,7 @@ A::custom_thread2 A::start_thread2()
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00051::A",
+      "display_name": "A",
       "id": "1064663612772326174",
       "is_abstract": false,
       "is_nested": false,
@@ -535,7 +535,7 @@ A::custom_thread2 A::start_thread2()
           "name": "std::thread"
         }
       ],
-      "display_name": "clanguml::t00051::A::custom_thread1",
+      "display_name": "A::custom_thread1",
       "id": "267762118222214764",
       "is_abstract": false,
       "is_nested": true,
@@ -594,7 +594,7 @@ A::custom_thread2 A::start_thread2()
           "name": "std::thread"
         }
       ],
-      "display_name": "clanguml::t00051::A::custom_thread2",
+      "display_name": "A::custom_thread2",
       "id": "728501319748477470",
       "is_abstract": false,
       "is_nested": true,
@@ -648,6 +648,7 @@ A::custom_thread2 A::start_thread2()
     }
   ],
   "name": "t00051_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "private",
diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg
index 4b717169..f61cde19 100644
--- a/docs/test_cases/t00051_class.svg
+++ b/docs/test_cases/t00051_class.svg
@@ -1,190 +1,178 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="653px" preserveAspectRatio="none" style="width:846px;height:653px;background:#FFFFFF;" version="1.1" viewBox="0 0 846 653" width="846px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="599px" preserveAspectRatio="none" style="width:789px;height:599px;" version="1.1" viewBox="0 0 789 599" width="789px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1giv8r3ootj0a" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000486675674447050206">
-        <rect codeLine="2" fill="#F1F1F1" height="139.9996" id="C_0000486675674447050206" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="182" x="373.5" y="507"/>
-        <ellipse cx="434.75" cy="523" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M429.75,524.1563 C429.75,526.6563 431.8906,528.4688 434.8125,528.4688 C436.0469,528.4688 437.2188,528.1719 437.9688,527.6563 C438.5781,527.2344 438.9063,526.8125 438.9063,526.4063 C438.9063,525.9375 438.4844,525.5313 437.9844,525.5313 C437.75,525.5313 437.5313,525.6094 437.3281,525.8125 C436.8906,526.25 436.8906,526.25 436.7188,526.3438 C436.2656,526.5781 435.625,526.7188 434.8594,526.7188 C432.8594,526.7188 431.5781,525.7031 431.5781,524.125 L431.5781,523.0781 C431.5781,521.375 432.7969,520.1719 434.5,520.1719 C435.0781,520.1719 435.6563,520.3125 436.125,520.5625 C436.5938,520.8281 436.7656,521.0156 436.8281,521.375 C436.9531,522.0469 437.2031,522.2969 437.7344,522.2969 C438.0156,522.2969 438.2969,522.1563 438.4844,521.9375 C438.6094,521.7656 438.6563,521.5938 438.6563,521.1563 L438.6563,519.7969 C438.6563,519.375 438.6406,519.2344 438.5156,519.0625 C438.3438,518.8125 438.0625,518.6563 437.7344,518.6563 C437.4219,518.6563 437.2188,518.7656 437,519.0313 C435.8281,518.5313 435.3906,518.4219 434.4375,518.4219 C431.7656,518.4219 429.75,520.4375 429.75,523.0625 L429.75,524.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="455.25" y="527.606">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="40" x="518.5" y="504"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="38" x="519.5" y="518.2001">F,FF=F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="374.5" x2="554.5" y1="539" y2="539"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="547.9"/>
-          <ellipse cx="384.5" cy="552.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="156" x="393.5" y="556.0059">B(F &amp;&amp; f, FF &amp;&amp; ff) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="374.5" x2="554.5" y1="563.7999" y2="563.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="572.6999"/>
-          <ellipse cx="384.5" cy="577.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="393.5" y="580.8059">f() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="589.4998"/>
-          <ellipse cx="384.5" cy="594.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="393.5" y="597.6058">ff() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="374.5" x2="554.5" y1="605.3998" y2="605.3998"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="614.2997"/>
-          <ellipse cx="384.5" cy="619.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="393.5" y="622.4057">f_ : F</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="379.5" y="631.0997"/>
-          <ellipse cx="384.5" cy="636.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="46" x="393.5" y="639.2057">ff_ : FF</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="120.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="346" y="468"/>
+      <ellipse cx="400.25" cy="484" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M403.2188,489.6406 Q402.6406,489.9375 402,490.0781 Q401.3594,490.2344 400.6563,490.2344 Q398.1563,490.2344 396.8281,488.5938 Q395.5156,486.9375 395.5156,483.8125 Q395.5156,480.6875 396.8281,479.0313 Q398.1563,477.375 400.6563,477.375 Q401.3594,477.375 402,477.5313 Q402.6563,477.6875 403.2188,477.9844 L403.2188,480.7031 Q402.5938,480.125 402,479.8594 Q401.4063,479.5781 400.7813,479.5781 Q399.4375,479.5781 398.75,480.6563 Q398.0625,481.7188 398.0625,483.8125 Q398.0625,485.9063 398.75,486.9844 Q399.4375,488.0469 400.7813,488.0469 Q401.4063,488.0469 402,487.7813 Q402.5938,487.5 403.2188,486.9219 L403.2188,489.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="420.75" y="488.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="44" x="476" y="465"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="477" y="477.1387">F,FF=F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="516" y1="500" y2="500"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001969502737237579476">
-        <rect codeLine="12" fill="#F1F1F1" height="139.9996" id="C_0001969502737237579476" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="513" x="208" y="307"/>
-        <ellipse cx="300.25" cy="323" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M295.25,324.1563 C295.25,326.6563 297.3906,328.4688 300.3125,328.4688 C301.5469,328.4688 302.7188,328.1719 303.4688,327.6563 C304.0781,327.2344 304.4063,326.8125 304.4063,326.4063 C304.4063,325.9375 303.9844,325.5313 303.4844,325.5313 C303.25,325.5313 303.0313,325.6094 302.8281,325.8125 C302.3906,326.25 302.3906,326.25 302.2188,326.3438 C301.7656,326.5781 301.125,326.7188 300.3594,326.7188 C298.3594,326.7188 297.0781,325.7031 297.0781,324.125 L297.0781,323.0781 C297.0781,321.375 298.2969,320.1719 300,320.1719 C300.5781,320.1719 301.1563,320.3125 301.625,320.5625 C302.0938,320.8281 302.2656,321.0156 302.3281,321.375 C302.4531,322.0469 302.7031,322.2969 303.2344,322.2969 C303.5156,322.2969 303.7969,322.1563 303.9844,321.9375 C304.1094,321.7656 304.1563,321.5938 304.1563,321.1563 L304.1563,319.7969 C304.1563,319.375 304.1406,319.2344 304.0156,319.0625 C303.8438,318.8125 303.5625,318.6563 303.2344,318.6563 C302.9219,318.6563 302.7188,318.7656 302.5,319.0313 C301.3281,318.5313 300.8906,318.4219 299.9375,318.4219 C297.2656,318.4219 295.25,320.4375 295.25,323.0625 L295.25,324.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="320.75" y="327.606">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="309" x="415" y="304"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="307" x="416" y="318.2001">(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="209" x2="720" y1="339" y2="339"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="347.9"/>
-          <ellipse cx="219" cy="352.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="487" x="228" y="356.0059">B((lambda at t00051.cc:43:18) &amp;&amp; f, (lambda at t00051.cc:43:27) &amp;&amp; ff) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="209" x2="720" y1="363.7999" y2="363.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="372.6999"/>
-          <ellipse cx="219" cy="377.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="228" y="380.8059">f() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="389.4998"/>
-          <ellipse cx="219" cy="394.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="228" y="397.6058">ff() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="209" x2="720" y1="405.3998" y2="405.3998"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="414.2997"/>
-          <ellipse cx="219" cy="419.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="228" y="422.4057">f_ : (lambda at t00051.cc:43:18)</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="214" y="431.0997"/>
-          <ellipse cx="219" cy="436.0997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="207" x="228" y="439.2057">ff_ : (lambda at t00051.cc:43:27)</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="506"/>
+      <ellipse cx="357" cy="511" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001064663612772326174">
-        <rect codeLine="22" fill="#F1F1F1" height="115.1997" id="C_0001064663612772326174" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="520" x="204.5" y="131.8"/>
-        <ellipse cx="455.75" cy="147.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M450.75,148.9562 C450.75,151.4562 452.8906,153.2687 455.8125,153.2687 C457.0469,153.2687 458.2188,152.9719 458.9688,152.4562 C459.5781,152.0344 459.9063,151.6125 459.9063,151.2062 C459.9063,150.7375 459.4844,150.3312 458.9844,150.3312 C458.75,150.3312 458.5313,150.4094 458.3281,150.6125 C457.8906,151.05 457.8906,151.05 457.7188,151.1437 C457.2656,151.3781 456.625,151.5187 455.8594,151.5187 C453.8594,151.5187 452.5781,150.5031 452.5781,148.925 L452.5781,147.8781 C452.5781,146.175 453.7969,144.9719 455.5,144.9719 C456.0781,144.9719 456.6563,145.1125 457.125,145.3625 C457.5938,145.6281 457.7656,145.8156 457.8281,146.175 C457.9531,146.8469 458.2031,147.0969 458.7344,147.0969 C459.0156,147.0969 459.2969,146.9562 459.4844,146.7375 C459.6094,146.5656 459.6563,146.3937 459.6563,145.9562 L459.6563,144.5969 C459.6563,144.175 459.6406,144.0344 459.5156,143.8625 C459.3438,143.6125 459.0625,143.4562 458.7344,143.4562 C458.4219,143.4562 458.2188,143.5656 458,143.8312 C456.8281,143.3312 456.3906,143.2219 455.4375,143.2219 C452.7656,143.2219 450.75,145.2375 450.75,147.8625 L450.75,148.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="476.25" y="152.406">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="205.5" x2="723.5" y1="163.8" y2="163.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="210.5" y="172.7"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="212.5" y="174.7"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="279" x="224.5" y="180.8059">get_function() : (lambda at t00051.cc:48:16)</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="210.5" y="189.4999"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="212.5" y="191.4999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="210" x="224.5" y="197.6059">start_thread1() : custom_thread1</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="210.5" y="206.2998"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="212.5" y="208.2998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="210" x="224.5" y="214.4058">start_thread2() : custom_thread2</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="210.5" y="223.0997"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="212.5" y="225.0997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="494" x="224.5" y="231.2057">start_thread3() : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="205.5" x2="723.5" y1="238.9997" y2="238.9997"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="366" y="514.2104">B(F &amp;&amp; f, FF &amp;&amp; ff) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
-      <g id="elem_C_0000267762118222214764">
-        <rect codeLine="30" fill="#F1F1F1" height="64.7999" id="C_0000267762118222214764" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="481" x="7" y="7"/>
-        <ellipse cx="183.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M178.25,24.1563 C178.25,26.6563 180.3906,28.4688 183.3125,28.4688 C184.5469,28.4688 185.7188,28.1719 186.4688,27.6563 C187.0781,27.2344 187.4063,26.8125 187.4063,26.4063 C187.4063,25.9375 186.9844,25.5313 186.4844,25.5313 C186.25,25.5313 186.0313,25.6094 185.8281,25.8125 C185.3906,26.25 185.3906,26.25 185.2188,26.3438 C184.7656,26.5781 184.125,26.7188 183.3594,26.7188 C181.3594,26.7188 180.0781,25.7031 180.0781,24.125 L180.0781,23.0781 C180.0781,21.375 181.2969,20.1719 183,20.1719 C183.5781,20.1719 184.1563,20.3125 184.625,20.5625 C185.0938,20.8281 185.2656,21.0156 185.3281,21.375 C185.4531,22.0469 185.7031,22.2969 186.2344,22.2969 C186.5156,22.2969 186.7969,22.1563 186.9844,21.9375 C187.1094,21.7656 187.1563,21.5938 187.1563,21.1563 L187.1563,19.7969 C187.1563,19.375 187.1406,19.2344 187.0156,19.0625 C186.8438,18.8125 186.5625,18.6563 186.2344,18.6563 C185.9219,18.6563 185.7188,18.7656 185.5,19.0313 C184.3281,18.5313 183.8906,18.4219 182.9375,18.4219 C180.2656,18.4219 178.25,20.4375 178.25,23.0625 L178.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="203.75" y="27.606">A::custom_thread1</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="487" y1="39" y2="39"/>
-        <ellipse cx="18" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="455" x="27" y="56.0059">custom_thread1&lt;Function,Args...&gt;(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="487" y1="63.7999" y2="63.7999"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="347" x2="516" y1="520.8047" y2="520.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="526.8047"/>
+      <ellipse cx="357" cy="531.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
-      <g id="elem_C_0000728501319748477470">
-        <rect codeLine="35" fill="#F1F1F1" height="64.7999" id="C_0000728501319748477470" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="316" x="523.5" y="7"/>
-        <ellipse cx="617.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M612.25,24.1563 C612.25,26.6563 614.3906,28.4688 617.3125,28.4688 C618.5469,28.4688 619.7188,28.1719 620.4688,27.6563 C621.0781,27.2344 621.4063,26.8125 621.4063,26.4063 C621.4063,25.9375 620.9844,25.5313 620.4844,25.5313 C620.25,25.5313 620.0313,25.6094 619.8281,25.8125 C619.3906,26.25 619.3906,26.25 619.2188,26.3438 C618.7656,26.5781 618.125,26.7188 617.3594,26.7188 C615.3594,26.7188 614.0781,25.7031 614.0781,24.125 L614.0781,23.0781 C614.0781,21.375 615.2969,20.1719 617,20.1719 C617.5781,20.1719 618.1563,20.3125 618.625,20.5625 C619.0938,20.8281 619.2656,21.0156 619.3281,21.375 C619.4531,22.0469 619.7031,22.2969 620.2344,22.2969 C620.5156,22.2969 620.7969,22.1563 620.9844,21.9375 C621.1094,21.7656 621.1563,21.5938 621.1563,21.1563 L621.1563,19.7969 C621.1563,19.375 621.1406,19.2344 621.0156,19.0625 C620.8438,18.8125 620.5625,18.6563 620.2344,18.6563 C619.9219,18.6563 619.7188,18.7656 619.5,19.0313 C618.3281,18.5313 617.8906,18.4219 616.9375,18.4219 C614.2656,18.4219 612.25,20.4375 612.25,23.0625 L612.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="637.75" y="27.606">A::custom_thread2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="524.5" x2="838.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="529.5" y="47.9"/>
-          <ellipse cx="534.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="290" x="543.5" y="56.0059">thread((lambda at t00051.cc:59:27) &amp;&amp;) : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="524.5" x2="838.5" y1="63.7999" y2="63.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="366" y="535.0151">f() : void</text>
     </a>
-    <g id="link_C_0001969502737237579476_C_0000486675674447050206">
-      <path codeLine="39" d="M464.5,447.25 C464.5,466.54 464.5,469.5 464.5,488.79 " fill="none" id="C_0001969502737237579476-to-C_0000486675674447050206" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="464.5,506.79,470.5,488.79,458.5,488.79,464.5,506.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001064663612772326174_C_0001969502737237579476">
-      <path codeLine="40" d="M464.5,247.35 C464.5,266.1 464.5,281.17 464.5,300.73 " fill="none" id="C_0001064663612772326174-to-C_0001969502737237579476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="464.5,306.73,468.5,297.73,464.5,301.73,460.5,297.73,464.5,306.73" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000267762118222214764_C_0001064663612772326174">
-      <path codeLine="41" d="M294.05,72.15 C319.33,89.39 338.1405,102.2265 367.5905,122.3065 " fill="none" id="C_0000267762118222214764-to-C_0001064663612772326174" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="374.2002" cy="126.8132" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="367.5905" x2="380.81" y1="122.3065" y2="131.32"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="378.707" x2="369.6935" y1="120.2035" y2="133.423"/>
-    </g>
-    <g id="link_C_0000728501319748477470_C_0001064663612772326174">
-      <path codeLine="42" d="M634.95,72.15 C609.67,89.39 590.8595,102.2265 561.4095,122.3065 " fill="none" id="C_0000728501319748477470-to-C_0001064663612772326174" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="554.7998" cy="126.8132" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="561.4095" x2="548.19" y1="122.3065" y2="131.32"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="559.3065" x2="550.293" y1="133.423" y2="120.2035"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="539.6094"/>
+      <ellipse cx="357" cy="544.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="366" y="547.8198">ff() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="516" y1="554.4141" y2="554.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="560.4141"/>
+      <ellipse cx="357" cy="565.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="366" y="568.6245">f_ : F</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="573.2188"/>
+      <ellipse cx="357" cy="578.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="366" y="581.4292">ff_ : FF</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="120.0234" id="C_0001969502737237579476" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="288"/>
+      <ellipse cx="239.25" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M242.2188,309.6406 Q241.6406,309.9375 241,310.0781 Q240.3594,310.2344 239.6563,310.2344 Q237.1563,310.2344 235.8281,308.5938 Q234.5156,306.9375 234.5156,303.8125 Q234.5156,300.6875 235.8281,299.0313 Q237.1563,297.375 239.6563,297.375 Q240.3594,297.375 241,297.5313 Q241.6563,297.6875 242.2188,297.9844 L242.2188,300.7031 Q241.5938,300.125 241,299.8594 Q240.4063,299.5781 239.7813,299.5781 Q238.4375,299.5781 237.75,300.6563 Q237.0625,301.7188 237.0625,303.8125 Q237.0625,305.9063 237.75,306.9844 Q238.4375,308.0469 239.7813,308.0469 Q240.4063,308.0469 241,307.7813 Q241.5938,307.5 242.2188,306.9219 L242.2188,309.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="259.75" y="308.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="366" x="305" y="285"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="364" x="306" y="297.1387">(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="320" y2="320"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="326"/>
+      <ellipse cx="206" cy="331" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="447" x="215" y="334.2104">B((lambda at t00051.cc:43:18) &amp;&amp; f, (lambda at t00051.cc:43:27) &amp;&amp; ff) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="196" x2="667" y1="340.8047" y2="340.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="346.8047"/>
+      <ellipse cx="206" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="215" y="355.0151">f() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="359.6094"/>
+      <ellipse cx="206" cy="364.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="215" y="367.8198">ff() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="374.4141" y2="374.4141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="380.4141"/>
+      <ellipse cx="206" cy="385.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="182" x="215" y="388.6245">f_ : (lambda at t00051.cc:43:18)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="393.2188"/>
+      <ellipse cx="206" cy="398.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="215" y="401.4292">ff_ : (lambda at t00051.cc:43:27)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="129"/>
+      <ellipse cx="423.25" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M426.2188,150.6406 Q425.6406,150.9375 425,151.0781 Q424.3594,151.2344 423.6563,151.2344 Q421.1563,151.2344 419.8281,149.5938 Q418.5156,147.9375 418.5156,144.8125 Q418.5156,141.6875 419.8281,140.0313 Q421.1563,138.375 423.6563,138.375 Q424.3594,138.375 425,138.5313 Q425.6563,138.6875 426.2188,138.9844 L426.2188,141.7031 Q425.5938,141.125 425,140.8594 Q424.4063,140.5781 423.7813,140.5781 Q422.4375,140.5781 421.75,141.6563 Q421.0625,142.7188 421.0625,144.8125 Q421.0625,146.9063 421.75,147.9844 Q422.4375,149.0469 423.7813,149.0469 Q424.4063,149.0469 425,148.7813 Q425.5938,148.5 426.2188,147.9219 L426.2188,150.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="443.75" y="149.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="161" y2="161"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="167"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="169"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="215" y="175.2104">get_function() : (lambda at t00051.cc:48:16)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="179.8047"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="181.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="215" y="188.0151">start_thread1() : custom_thread1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="192.6094"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="194.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="215" y="200.8198">start_thread2() : custom_thread2</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="205.4141"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="207.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="447" x="215" y="213.6245">start_thread3() : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="220.2188" y2="220.2188"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="447" x="6" y="8"/>
+      <ellipse cx="166.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M169.2188,29.6406 Q168.6406,29.9375 168,30.0781 Q167.3594,30.2344 166.6563,30.2344 Q164.1563,30.2344 162.8281,28.5938 Q161.5156,26.9375 161.5156,23.8125 Q161.5156,20.6875 162.8281,19.0313 Q164.1563,17.375 166.6563,17.375 Q167.3594,17.375 168,17.5313 Q168.6563,17.6875 169.2188,17.9844 L169.2188,20.7031 Q168.5938,20.125 168,19.8594 Q167.4063,19.5781 166.7813,19.5781 Q165.4375,19.5781 164.75,20.6563 Q164.0625,21.7188 164.0625,23.8125 Q164.0625,25.9063 164.75,26.9844 Q165.4375,28.0469 166.7813,28.0469 Q167.4063,28.0469 168,27.7813 Q168.5938,27.5 169.2188,26.9219 L169.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="186.75" y="28.1543">A::custom_thread1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="452" y1="40" y2="40"/>
+      <ellipse cx="17" cy="51" 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="421" x="26" y="54.2104">custom_thread1&lt;Function,Args...&gt;(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="452" y1="60.8047" y2="60.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="290" x="488.5" y="8"/>
+      <ellipse cx="570.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M573.2188,29.6406 Q572.6406,29.9375 572,30.0781 Q571.3594,30.2344 570.6563,30.2344 Q568.1563,30.2344 566.8281,28.5938 Q565.5156,26.9375 565.5156,23.8125 Q565.5156,20.6875 566.8281,19.0313 Q568.1563,17.375 570.6563,17.375 Q571.3594,17.375 572,17.5313 Q572.6563,17.6875 573.2188,17.9844 L573.2188,20.7031 Q572.5938,20.125 572,19.8594 Q571.4063,19.5781 570.7813,19.5781 Q569.4375,19.5781 568.75,20.6563 Q568.0625,21.7188 568.0625,23.8125 Q568.0625,25.9063 568.75,26.9844 Q569.4375,28.0469 570.7813,28.0469 Q571.4063,28.0469 572,27.7813 Q572.5938,27.5 573.2188,26.9219 L573.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="590.75" y="28.1543">A::custom_thread2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="777.5" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="494.5" y="46"/>
+      <ellipse cx="499.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="264" x="508.5" y="54.2104">thread((lambda at t00051.cc:59:27) &amp;&amp;) : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="777.5" y1="60.8047" y2="60.8047"/>
+    <path d="M431.5,408.27 C431.5,420.88 431.5,434.39 431.5,447.61 " fill="none" id="C_0001969502737237579476-&gt;C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="438.5,447.99,431.5,467.99,424.5,447.99,438.5,447.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M431.5,228.4 C431.5,245.43 431.5,264.81 431.5,282.89 " fill="none" id="C_0001064663612772326174-&gt;C_0001969502737237579476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="431.5,287.95,435.5,278.95,431.5,282.95,427.5,278.95,431.5,287.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M272.83,69.1 C294.75,84.08 322.12,102.77 347.92,120.4 " fill="none" id="C_0000267762118222214764-&gt;C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="353.8232" cy="124.4388" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="347.2165" x2="360.43" y1="119.9276" y2="128.95"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="358.3344" x2="349.3121" y1="117.8321" y2="131.0456"/>
+    <path d="M590.17,69.1 C568.25,84.08 540.88,102.77 515.08,120.4 " fill="none" id="C_0000728501319748477470-&gt;C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="509.1768" cy="124.4388" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="515.7835" x2="502.57" y1="119.9276" y2="128.95"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="513.6879" x2="504.6656" y1="131.0456" y2="117.8321"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00051_class_mermaid.svg b/docs/test_cases/t00051_class_mermaid.svg
index eb39389b..2c398be7 100644
--- a/docs/test_cases/t00051_class_mermaid.svg
+++ b/docs/test_cases/t00051_class_mermaid.svg
@@ -1,64 +1,59 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1459.625 595" style="max-width: 1459.62px; background-color: white;" width="1459.625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1446.28125 595" style="max-width: 1446.28px; background-color: white;" width="1446.28125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M294.84375,370L294.84375,374.1666666666667C294.84375,378.3333333333333,294.84375,386.6666666666667,294.84375,392C294.84375,397.3333333333333,294.84375,399.6666666666667,294.84375,400.8333333333333L294.84375,402"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M548.2890625,132.51934690708308L506.0481770833333,140.09945575590257C463.8072916666667,147.67956460472206,379.3255208333333,162.83978230236104,337.0846354166667,173.5865578178472C294.84375,184.33333333333334,294.84375,190.66666666666666,294.84375,193.83333333333334L294.84375,197"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M838.171875,166.5L838.171875,168.41666666666666C838.171875,170.33333333333334,838.171875,174.16666666666666,838.171875,187.58333333333334C838.171875,201,838.171875,224,838.171875,235.5L838.171875,247"/>
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M1141.2278015168138,148.43120847276805L1163.2132720973448,153.35934039397338C1185.1987426778758,158.2874723151787,1229.169683838938,168.14373615758936,1251.155154419469,184.57186807879467C1273.140625,201,1273.140625,224,1273.140625,235.5L1273.140625,247"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M292.6171875,370L292.6171875,374.1666666666667C292.6171875,378.3333333333333,292.6171875,386.6666666666667,292.6171875,395C292.6171875,403.3333333333333,292.6171875,411.6666666666667,292.6171875,415.8333333333333L292.6171875,420"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M543.8359375,132.3584405753217L501.9661458333333,139.96536714610144C460.0963541666667,147.57229371688115,376.3567708333333,162.78614685844056,334.4869791666667,174.55974009588695C292.6171875,186.33333333333334,292.6171875,194.66666666666666,292.6171875,198.83333333333334L292.6171875,203"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M829.2734375,153L829.2734375,157.16666666666666C829.2734375,161.33333333333334,829.2734375,169.66666666666666,829.2734375,185.33333333333334C829.2734375,201,829.2734375,224,829.2734375,235.5L829.2734375,247"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M1114.7109375,145.1426043878273L1138.8919270833333,150.61883698985608C1163.0729166666667,156.09506959188488,1211.4348958333333,167.04753479594243,1235.6158854166667,184.02376739797123C1259.796875,201,1259.796875,224,1259.796875,235.5L1259.796875,247"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -107,11 +102,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(294.84375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6">
+        <a transform="translate(292.6171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0000486675674447050206-0" class="node default clickable">
-            <rect height="167" width="208.984375" y="-83.5" x="-104.4921875" class="outer title-state"/>
-            <line y2="-53.5" y1="-53.5" x2="104.4921875" x1="-104.4921875" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="104.4921875" x1="-104.4921875" class="divider"/>
+            <rect height="167" width="200.09375" y="-83.5" x="-100.046875" class="outer title-state"/>
+            <line y2="-53.5" y1="-53.5" x2="100.046875" x1="-100.046875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="100.046875" x1="-100.046875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -123,39 +118,39 @@
                   <span class="nodeLabel">B&lt;F,FF=F&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -96.9921875, -42)" height="18" width="45.796875">
+              <foreignObject transform="translate( -92.546875, -42)" height="18" width="45.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+f_ : F</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -96.9921875, -20)" height="18" width="59.734375">
+              <foreignObject transform="translate( -92.546875, -20)" height="18" width="59.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+ff_ : FF</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -96.9921875, 14)" height="18" width="193.984375">
+              <foreignObject transform="translate( -92.546875, 14)" height="18" width="185.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+B(F &amp;&amp; f, FF &amp;&amp; ff) : : void</span>
+                  <span class="nodeLabel">+B(F &amp;&amp; f, FF &amp;&amp; ff) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -96.9921875, 36)" height="18" width="76.03125">
+              <foreignObject transform="translate( -92.546875, 36)" height="18" width="67.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+f() : : void</span>
+                  <span class="nodeLabel">+f() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -96.9921875, 58)" height="18" width="80.1875">
+              <foreignObject transform="translate( -92.546875, 58)" height="18" width="71.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+ff() : : void</span>
+                  <span class="nodeLabel">+ff() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(294.84375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L6">
+        <a transform="translate(292.6171875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0001969502737237579476-1" class="node default clickable">
-            <rect height="167" width="573.6875" y="-83.5" x="-286.84375" class="outer title-state"/>
-            <line y2="-53.5" y1="-53.5" x2="286.84375" x1="-286.84375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="286.84375" x1="-286.84375" class="divider"/>
+            <rect height="167" width="569.234375" y="-83.5" x="-284.6171875" class="outer title-state"/>
+            <line y2="-53.5" y1="-53.5" x2="284.6171875" x1="-284.6171875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="284.6171875" x1="-284.6171875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -167,39 +162,39 @@
                   <span class="nodeLabel">B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -279.34375, -42)" height="18" width="235.265625">
+              <foreignObject transform="translate( -277.1171875, -42)" height="18" width="235.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+f_ : (lambda at t00051.cc:43:18)</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -279.34375, -20)" height="18" width="239.421875">
+              <foreignObject transform="translate( -277.1171875, -20)" height="18" width="239.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+ff_ : (lambda at t00051.cc:43:27)</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -279.34375, 14)" height="18" width="558.6875">
+              <foreignObject transform="translate( -277.1171875, 14)" height="18" width="554.234375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+B((lambda at t00051.cc:43:18) &amp;&amp; f,(lambda at t00051.cc:43:27) &amp;&amp; ff) : : void</span>
+                  <span class="nodeLabel">+B((lambda at t00051.cc:43:18) &amp;&amp; f, (lambda at t00051.cc:43:27) &amp;&amp; ff) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -279.34375, 36)" height="18" width="76.03125">
+              <foreignObject transform="translate( -277.1171875, 36)" height="18" width="67.140625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+f() : : void</span>
+                  <span class="nodeLabel">+f() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -279.34375, 58)" height="18" width="80.1875">
+              <foreignObject transform="translate( -277.1171875, 58)" height="18" width="71.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+ff() : : void</span>
+                  <span class="nodeLabel">+ff() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(838.171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L20">
+        <a transform="translate(829.2734375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L20">
           <g title="A" id="classId-C_0001064663612772326174-2" class="node default clickable">
-            <rect height="145" width="579.765625" y="-72.5" x="-289.8828125" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="289.8828125" x1="-289.8828125" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="289.8828125" x1="-289.8828125" class="divider"/>
+            <rect height="145" width="570.875" y="-72.5" x="-285.4375" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="285.4375" x1="-285.4375" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="285.4375" x1="-285.4375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -211,34 +206,34 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -282.3828125, -19)" height="18" width="324.625">
+              <foreignObject transform="translate( -277.9375, -19)" height="18" width="315.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-get_function() : : (lambda at t00051.cc:48:16)</span>
+                  <span class="nodeLabel">-get_function() : (lambda at t00051.cc:48:16)</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -282.3828125, 3)" height="18" width="247.234375">
+              <foreignObject transform="translate( -277.9375, 3)" height="18" width="238.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">-start_thread1() : : custom_thread1</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">-start_thread1() : custom_thread1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -282.3828125, 25)" height="18" width="247.234375">
+              <foreignObject transform="translate( -277.9375, 25)" height="18" width="238.34375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">-start_thread2() : : custom_thread2</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">-start_thread2() : custom_thread2</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -282.3828125, 47)" height="18" width="564.765625">
+              <foreignObject transform="translate( -277.9375, 47)" height="18" width="555.875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-start_thread3() : : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</span>
+                  <span class="nodeLabel">-start_thread3() : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(838.171875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L23">
+        <a transform="translate(829.2734375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L23">
           <g title="A##custom_thread1" id="classId-C_0000267762118222214764-3" class="node default clickable">
-            <rect height="79" width="412.96875" y="-39.5" x="-206.484375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="206.484375" x1="-206.484375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="206.484375" x1="-206.484375" class="divider"/>
+            <rect height="79" width="404.078125" y="-39.5" x="-202.0390625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="202.0390625" x1="-202.0390625" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="202.0390625" x1="-202.0390625" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -250,15 +245,15 @@
                   <span class="nodeLabel">A::custom_thread1</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -198.984375, 14)" height="18" width="397.96875">
+              <foreignObject transform="translate( -194.5390625, 14)" height="18" width="389.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+custom_thread1(Function &amp;&amp; f, Args &amp;&amp;... args) : : void</span>
+                  <span class="nodeLabel">+custom_thread1(Function &amp;&amp; f, Args &amp;&amp;... args) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1273.140625, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00051/t00051.cc#L35">
+        <a transform="translate(1259.796875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L35">
           <g title="A##custom_thread2" id="classId-C_0000728501319748477470-4" class="node default clickable">
             <rect height="79" width="356.96875" y="-39.5" x="-178.484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="178.484375" x1="-178.484375" class="divider"/>
@@ -276,7 +271,7 @@
               </foreignObject>
               <foreignObject transform="translate( -170.984375, 14)" height="18" width="341.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+thread((lambda at t00051.cc:59:27) &amp;&amp;) : : void</span>
+                  <span class="nodeLabel">+thread((lambda at t00051.cc:59:27) : &amp;&amp;) : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00052.md b/docs/test_cases/t00052.md
index a2c98c8c..8e841b26 100644
--- a/docs/test_cases/t00052.md
+++ b/docs/test_cases/t00052.md
@@ -61,7 +61,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00052::A",
+      "display_name": "A",
       "id": "2200853067459698271",
       "is_abstract": false,
       "is_nested": false,
@@ -138,7 +138,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00052::B<T>",
+      "display_name": "B<T>",
       "id": "1737293776724790064",
       "is_abstract": false,
       "is_nested": false,
@@ -228,7 +228,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00052::C<T>",
+      "display_name": "C<T>",
       "id": "687756639884832524",
       "is_abstract": false,
       "is_nested": false,
@@ -283,7 +283,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00052::B<int>",
+      "display_name": "B<int>",
       "id": "1043027222809675776",
       "is_abstract": false,
       "is_nested": false,
@@ -312,7 +312,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00052::C<int>",
+      "display_name": "C<int>",
       "id": "492968837554438176",
       "is_abstract": false,
       "is_nested": false,
@@ -341,7 +341,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00052::R",
+      "display_name": "R",
       "id": "1157978668683299226",
       "is_abstract": false,
       "is_nested": false,
@@ -400,6 +400,7 @@ struct R {
     }
   ],
   "name": "t00052_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg
index 19d7e332..bd321064 100644
--- a/docs/test_cases/t00052_class.svg
+++ b/docs/test_cases/t00052_class.svg
@@ -1,134 +1,118 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="413px" preserveAspectRatio="none" style="width:494px;height:413px;background:#FFFFFF;" version="1.1" viewBox="0 0 494 413" width="494px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:459px;height:390px;" version="1.1" viewBox="0 0 459 390" width="459px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1k1wijysn6zp" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002200853067459698271">
-        <rect codeLine="2" fill="#F1F1F1" height="81.5999" id="C_0002200853067459698271" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="200" x="7" y="182.4"/>
-        <ellipse cx="98.25" cy="198.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93.25,199.5563 C93.25,202.0563 95.3906,203.8688 98.3125,203.8688 C99.5469,203.8688 100.7188,203.5719 101.4688,203.0563 C102.0781,202.6344 102.4063,202.2125 102.4063,201.8063 C102.4063,201.3375 101.9844,200.9313 101.4844,200.9313 C101.25,200.9313 101.0313,201.0094 100.8281,201.2125 C100.3906,201.65 100.3906,201.65 100.2188,201.7438 C99.7656,201.9781 99.125,202.1188 98.3594,202.1188 C96.3594,202.1188 95.0781,201.1031 95.0781,199.525 L95.0781,198.4781 C95.0781,196.775 96.2969,195.5719 98,195.5719 C98.5781,195.5719 99.1563,195.7125 99.625,195.9625 C100.0938,196.2281 100.2656,196.4156 100.3281,196.775 C100.4531,197.4469 100.7031,197.6969 101.2344,197.6969 C101.5156,197.6969 101.7969,197.5563 101.9844,197.3375 C102.1094,197.1656 102.1563,196.9938 102.1563,196.5563 L102.1563,195.1969 C102.1563,194.775 102.1406,194.6344 102.0156,194.4625 C101.8438,194.2125 101.5625,194.0563 101.2344,194.0563 C100.9219,194.0563 100.7188,194.1656 100.5,194.4313 C99.3281,193.9313 98.8906,193.8219 97.9375,193.8219 C95.2656,193.8219 93.25,195.8375 93.25,198.4625 L93.25,199.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="118.75" y="203.006">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="206" y1="214.4" y2="214.4"/>
-        <ellipse cx="18" cy="228.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="27" y="231.4059">a&lt;T&gt;(T p) : T</text>
-        <ellipse cx="18" cy="245.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="27" y="248.2059">aa&lt;F,Q&gt;(F &amp;&amp; f, Q q) : void</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="206" y1="255.9999" y2="255.9999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="73.6094" id="C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="6" y="171"/>
+      <ellipse cx="90.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M93.7188,192.6406 Q93.1406,192.9375 92.5,193.0781 Q91.8594,193.2344 91.1563,193.2344 Q88.6563,193.2344 87.3281,191.5938 Q86.0156,189.9375 86.0156,186.8125 Q86.0156,183.6875 87.3281,182.0313 Q88.6563,180.375 91.1563,180.375 Q91.8594,180.375 92.5,180.5313 Q93.1563,180.6875 93.7188,180.9844 L93.7188,183.7031 Q93.0938,183.125 92.5,182.8594 Q91.9063,182.5781 91.2813,182.5781 Q89.9375,182.5781 89.25,183.6563 Q88.5625,184.7188 88.5625,186.8125 Q88.5625,188.9063 89.25,189.9844 Q89.9375,191.0469 91.2813,191.0469 Q91.9063,191.0469 92.5,190.7813 Q93.0938,190.5 93.7188,189.9219 L93.7188,192.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="111.25" y="191.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="191" y1="203" y2="203"/>
+      <ellipse cx="17" cy="214" 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="77" x="26" y="217.2104">a&lt;T&gt;(T p) : T</text>
+      <ellipse cx="17" cy="226.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="160" x="26" y="230.0151">aa&lt;F,Q&gt;(F &amp;&amp; f, Q q) : void</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="191" y1="236.6094" y2="236.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001737293776724790064">
-        <rect codeLine="8" fill="#F1F1F1" height="81.5999" id="C_0001737293776724790064" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="176" y="325"/>
-        <ellipse cx="242.75" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M237.75,342.1563 C237.75,344.6563 239.8906,346.4688 242.8125,346.4688 C244.0469,346.4688 245.2188,346.1719 245.9688,345.6563 C246.5781,345.2344 246.9063,344.8125 246.9063,344.4063 C246.9063,343.9375 246.4844,343.5313 245.9844,343.5313 C245.75,343.5313 245.5313,343.6094 245.3281,343.8125 C244.8906,344.25 244.8906,344.25 244.7188,344.3438 C244.2656,344.5781 243.625,344.7188 242.8594,344.7188 C240.8594,344.7188 239.5781,343.7031 239.5781,342.125 L239.5781,341.0781 C239.5781,339.375 240.7969,338.1719 242.5,338.1719 C243.0781,338.1719 243.6563,338.3125 244.125,338.5625 C244.5938,338.8281 244.7656,339.0156 244.8281,339.375 C244.9531,340.0469 245.2031,340.2969 245.7344,340.2969 C246.0156,340.2969 246.2969,340.1563 246.4844,339.9375 C246.6094,339.7656 246.6563,339.5938 246.6563,339.1563 L246.6563,337.7969 C246.6563,337.375 246.6406,337.2344 246.5156,337.0625 C246.3438,336.8125 246.0625,336.6563 245.7344,336.6563 C245.4219,336.6563 245.2188,336.7656 245,337.0313 C243.8281,336.5313 243.3906,336.4219 242.4375,336.4219 C239.7656,336.4219 237.75,338.4375 237.75,341.0625 L237.75,342.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="263.25" y="345.606">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="332" y="322"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="333" y="336.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="177" x2="337" y1="357" y2="357"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="182" y="365.9"/>
-          <ellipse cx="187" cy="370.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="196" y="374.0059">b(T t) : T</text>
-        </a>
-        <ellipse cx="187" cy="387.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136" x="196" y="390.8059">bb&lt;F&gt;(F &amp;&amp; f, T t) : T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="177" x2="337" y1="398.5999" y2="398.5999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="73.6094" id="C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="156" y="306"/>
+      <ellipse cx="218.25" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M221.2188,327.6406 Q220.6406,327.9375 220,328.0781 Q219.3594,328.2344 218.6563,328.2344 Q216.1563,328.2344 214.8281,326.5938 Q213.5156,324.9375 213.5156,321.8125 Q213.5156,318.6875 214.8281,317.0313 Q216.1563,315.375 218.6563,315.375 Q219.3594,315.375 220,315.5313 Q220.6563,315.6875 221.2188,315.9844 L221.2188,318.7031 Q220.5938,318.125 220,317.8594 Q219.4063,317.5781 218.7813,317.5781 Q217.4375,317.5781 216.75,318.6563 Q216.0625,319.7188 216.0625,321.8125 Q216.0625,323.9063 216.75,324.9844 Q217.4375,326.0469 218.7813,326.0469 Q219.4063,326.0469 220,325.7813 Q220.5938,325.5 221.2188,324.9219 L221.2188,327.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="238.75" y="326.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="302" y="303"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="303" y="315.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000687756639884832524">
-        <rect codeLine="14" fill="#F1F1F1" height="64.7999" id="C_0000687756639884832524" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="373" y="333.4"/>
-        <ellipse cx="413.65" cy="349.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M408.65,350.5563 C408.65,353.0563 410.7906,354.8688 413.7125,354.8688 C414.9469,354.8688 416.1188,354.5719 416.8688,354.0563 C417.4781,353.6344 417.8063,353.2125 417.8063,352.8063 C417.8063,352.3375 417.3844,351.9313 416.8844,351.9313 C416.65,351.9313 416.4313,352.0094 416.2281,352.2125 C415.7906,352.65 415.7906,352.65 415.6188,352.7438 C415.1656,352.9781 414.525,353.1188 413.7594,353.1188 C411.7594,353.1188 410.4781,352.1031 410.4781,350.525 L410.4781,349.4781 C410.4781,347.775 411.6969,346.5719 413.4,346.5719 C413.9781,346.5719 414.5563,346.7125 415.025,346.9625 C415.4938,347.2281 415.6656,347.4156 415.7281,347.775 C415.8531,348.4469 416.1031,348.6969 416.6344,348.6969 C416.9156,348.6969 417.1969,348.5563 417.3844,348.3375 C417.5094,348.1656 417.5563,347.9938 417.5563,347.5563 L417.5563,346.1969 C417.5563,345.775 417.5406,345.6344 417.4156,345.4625 C417.2438,345.2125 416.9625,345.0563 416.6344,345.0563 C416.3219,345.0563 416.1188,345.1656 415.9,345.4313 C414.7281,344.9313 414.2906,344.8219 413.3375,344.8219 C410.6656,344.8219 408.65,346.8375 408.65,349.4625 L408.65,350.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="433.35" y="354.006">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="477" y="330.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="478" y="344.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="374" x2="482" y1="365.4" y2="365.4"/>
-        <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="381" y="376.3"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="84" x="393" y="382.4059">c&lt;P&gt;(P p) : T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="374" x2="482" y1="390.1999" y2="390.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="162" y="344"/>
+      <ellipse cx="167" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001043027222809675776">
-        <rect codeLine="19" fill="#F1F1F1" height="48" id="C_0001043027222809675776" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="58" x="242" y="199.2"/>
-        <ellipse cx="257" cy="215.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M252,216.3563 C252,218.8563 254.1406,220.6688 257.0625,220.6688 C258.2969,220.6688 259.4688,220.3719 260.2188,219.8563 C260.8281,219.4344 261.1563,219.0125 261.1563,218.6063 C261.1563,218.1375 260.7344,217.7313 260.2344,217.7313 C260,217.7313 259.7813,217.8094 259.5781,218.0125 C259.1406,218.45 259.1406,218.45 258.9688,218.5438 C258.5156,218.7781 257.875,218.9188 257.1094,218.9188 C255.1094,218.9188 253.8281,217.9031 253.8281,216.325 L253.8281,215.2781 C253.8281,213.575 255.0469,212.3719 256.75,212.3719 C257.3281,212.3719 257.9063,212.5125 258.375,212.7625 C258.8438,213.0281 259.0156,213.2156 259.0781,213.575 C259.2031,214.2469 259.4531,214.4969 259.9844,214.4969 C260.2656,214.4969 260.5469,214.3563 260.7344,214.1375 C260.8594,213.9656 260.9063,213.7938 260.9063,213.3563 L260.9063,211.9969 C260.9063,211.575 260.8906,211.4344 260.7656,211.2625 C260.5938,211.0125 260.3125,210.8563 259.9844,210.8563 C259.6719,210.8563 259.4688,210.9656 259.25,211.2313 C258.0781,210.7313 257.6406,210.6219 256.6875,210.6219 C254.0156,210.6219 252,212.6375 252,215.2625 L252,216.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="271" y="219.806">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="288" y="196.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="289" y="210.4001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="243" x2="299" y1="231.2" y2="231.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="243" x2="299" y1="239.2" y2="239.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="176" y="352.2104">b(T t) : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000492968837554438176">
-        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0000492968837554438176" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="370.5" y="199.2"/>
-        <ellipse cx="385.5" cy="215.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M380.5,216.3563 C380.5,218.8563 382.6406,220.6688 385.5625,220.6688 C386.7969,220.6688 387.9688,220.3719 388.7188,219.8563 C389.3281,219.4344 389.6563,219.0125 389.6563,218.6063 C389.6563,218.1375 389.2344,217.7313 388.7344,217.7313 C388.5,217.7313 388.2813,217.8094 388.0781,218.0125 C387.6406,218.45 387.6406,218.45 387.4688,218.5438 C387.0156,218.7781 386.375,218.9188 385.6094,218.9188 C383.6094,218.9188 382.3281,217.9031 382.3281,216.325 L382.3281,215.2781 C382.3281,213.575 383.5469,212.3719 385.25,212.3719 C385.8281,212.3719 386.4063,212.5125 386.875,212.7625 C387.3438,213.0281 387.5156,213.2156 387.5781,213.575 C387.7031,214.2469 387.9531,214.4969 388.4844,214.4969 C388.7656,214.4969 389.0469,214.3563 389.2344,214.1375 C389.3594,213.9656 389.4063,213.7938 389.4063,213.3563 L389.4063,211.9969 C389.4063,211.575 389.3906,211.4344 389.2656,211.2625 C389.0938,211.0125 388.8125,210.8563 388.4844,210.8563 C388.1719,210.8563 387.9688,210.9656 387.75,211.2313 C386.5781,210.7313 386.1406,210.6219 385.1875,210.6219 C382.5156,210.6219 380.5,212.6375 380.5,215.2625 L380.5,216.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="399.5" y="219.806">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="417.5" y="196.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="418.5" y="210.4001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="371.5" x2="428.5" y1="231.2" y2="231.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="371.5" x2="428.5" y1="239.2" y2="239.2"/>
-      </g>
+    <ellipse cx="167" cy="361.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="176" y="365.0151">bb&lt;F&gt;(F &amp;&amp; f, T t) : T</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="371.6094" y2="371.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="60.8047" id="C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="343" y="312.5"/>
+      <ellipse cx="380.95" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M383.9188,334.1406 Q383.3406,334.4375 382.7,334.5781 Q382.0594,334.7344 381.3563,334.7344 Q378.8563,334.7344 377.5281,333.0938 Q376.2156,331.4375 376.2156,328.3125 Q376.2156,325.1875 377.5281,323.5313 Q378.8563,321.875 381.3563,321.875 Q382.0594,321.875 382.7,322.0313 Q383.3563,322.1875 383.9188,322.4844 L383.9188,325.2031 Q383.2938,324.625 382.7,324.3594 Q382.1063,324.0781 381.4813,324.0781 Q380.1375,324.0781 379.45,325.1563 Q378.7625,326.2188 378.7625,328.3125 Q378.7625,330.4063 379.45,331.4844 Q380.1375,332.5469 381.4813,332.5469 Q382.1063,332.5469 382.7,332.2813 Q383.2938,332 383.9188,331.4219 L383.9188,334.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="400.05" y="332.6543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="439" y="309.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="440" y="321.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="344" x2="444" y1="344.5" y2="344.5"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="351" y="352.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="363" y="358.7104">c&lt;P&gt;(P p) : T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="344" x2="444" y1="365.3047" y2="365.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001157978668683299226">
-        <rect codeLine="27" fill="#F1F1F1" height="98.3998" id="C_0001157978668683299226" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="86" x="228" y="7"/>
-        <ellipse cx="262.8" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M257.8,24.1563 C257.8,26.6563 259.9406,28.4688 262.8625,28.4688 C264.0969,28.4688 265.2688,28.1719 266.0188,27.6563 C266.6281,27.2344 266.9563,26.8125 266.9563,26.4063 C266.9563,25.9375 266.5344,25.5313 266.0344,25.5313 C265.8,25.5313 265.5813,25.6094 265.3781,25.8125 C264.9406,26.25 264.9406,26.25 264.7688,26.3438 C264.3156,26.5781 263.675,26.7188 262.9094,26.7188 C260.9094,26.7188 259.6281,25.7031 259.6281,24.125 L259.6281,23.0781 C259.6281,21.375 260.8469,20.1719 262.55,20.1719 C263.1281,20.1719 263.7063,20.3125 264.175,20.5625 C264.6438,20.8281 264.8156,21.0156 264.8781,21.375 C265.0031,22.0469 265.2531,22.2969 265.7844,22.2969 C266.0656,22.2969 266.3469,22.1563 266.5344,21.9375 C266.6594,21.7656 266.7063,21.5938 266.7063,21.1563 L266.7063,19.7969 C266.7063,19.375 266.6906,19.2344 266.5656,19.0625 C266.3938,18.8125 266.1125,18.6563 265.7844,18.6563 C265.4719,18.6563 265.2688,18.7656 265.05,19.0313 C263.8781,18.5313 263.4406,18.4219 262.4875,18.4219 C259.8156,18.4219 257.8,20.4375 257.8,23.0625 L257.8,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="281.2" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="229" x2="313" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="229" x2="313" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="234" y="55.9"/>
-          <ellipse cx="239" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="248" y="64.0059">a : A</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="234" y="72.6999"/>
-          <ellipse cx="239" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="248" y="80.8059">b : B&lt;int&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="234" y="89.4998"/>
-          <ellipse cx="239" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="248" y="97.6058">c : C&lt;int&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
+      <ellipse cx="242" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M244.9688,205.6406 Q244.3906,205.9375 243.75,206.0781 Q243.1094,206.2344 242.4063,206.2344 Q239.9063,206.2344 238.5781,204.5938 Q237.2656,202.9375 237.2656,199.8125 Q237.2656,196.6875 238.5781,195.0313 Q239.9063,193.375 242.4063,193.375 Q243.1094,193.375 243.75,193.5313 Q244.4063,193.6875 244.9688,193.9844 L244.9688,196.7031 Q244.3438,196.125 243.75,195.8594 Q243.1563,195.5781 242.5313,195.5781 Q241.1875,195.5781 240.5,196.6563 Q239.8125,197.7188 239.8125,199.8125 Q239.8125,201.9063 240.5,202.9844 Q241.1875,204.0469 242.5313,204.0469 Q243.1563,204.0469 243.75,203.7813 Q244.3438,203.5 244.9688,202.9219 L244.9688,205.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="256" y="204.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="272" y="181"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="273" y="193.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="216" y2="216"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="224" y2="224"/>
     </a>
-    <g id="link_C_0001043027222809675776_C_0001737293776724790064">
-      <path codeLine="33" d="M268.69,247.42 C266.6,268.4 265.2626,281.8185 262.7726,306.8385 " fill="none" id="C_0001043027222809675776-to-C_0001737293776724790064" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="260.99,324.75,268.7431,307.4327,256.8021,306.2443,260.99,324.75" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000492968837554438176_C_0000687756639884832524">
-      <path codeLine="34" d="M404.62,247.42 C409.28,270.82 412.9982,289.4359 418.1782,315.4759 " fill="none" id="C_0000492968837554438176-to-C_0000687756639884832524" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="421.69,333.13,424.0629,314.3053,412.2935,316.6465,421.69,333.13" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001157978668683299226_C_0002200853067459698271">
-      <path codeLine="35" d="M219.4518,109.0623 C194.4018,134.2723 171.49,157.31 146.99,181.97 " fill="none" id="C_0001157978668683299226-backto-C_0002200853067459698271" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="227.91,100.55,220.8435,101.9867,219.4518,109.0623,226.5183,107.6255,227.91,100.55" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="190" y="148.477">+a</text>
-    </g>
-    <g id="link_C_0001157978668683299226_C_0001043027222809675776">
-      <path codeLine="36" d="M271,117.81 C271,148.61 271,175.04 271,199.11 " fill="none" id="C_0001157978668683299226-backto-C_0001043027222809675776" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="271,105.81,267,111.81,271,117.81,275,111.81,271,105.81" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="272" y="148.477">+b</text>
-    </g>
-    <g id="link_C_0001157978668683299226_C_0000492968837554438176">
-      <path codeLine="37" d="M316.4011,115.2637 C340.4811,146.0637 363.13,175.04 381.94,199.11 " fill="none" id="C_0001157978668683299226-backto-C_0000492968837554438176" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="309.01,105.81,309.5543,113.0005,316.4011,115.2637,315.8568,108.0732,309.01,105.81" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="345" y="148.477">+c</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
+      <ellipse cx="366" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M368.9688,205.6406 Q368.3906,205.9375 367.75,206.0781 Q367.1094,206.2344 366.4063,206.2344 Q363.9063,206.2344 362.5781,204.5938 Q361.2656,202.9375 361.2656,199.8125 Q361.2656,196.6875 362.5781,195.0313 Q363.9063,193.375 366.4063,193.375 Q367.1094,193.375 367.75,193.5313 Q368.4063,193.6875 368.9688,193.9844 L368.9688,196.7031 Q368.3438,196.125 367.75,195.8594 Q367.1563,195.5781 366.5313,195.5781 Q365.1875,195.5781 364.5,196.6563 Q363.8125,197.7188 363.8125,199.8125 Q363.8125,201.9063 364.5,202.9844 Q365.1875,204.0469 366.5313,204.0469 Q367.1563,204.0469 367.75,203.7813 Q368.3438,203.5 368.9688,202.9219 L368.9688,205.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="380" y="204.1543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="396" y="181"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="397" y="193.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="216" y2="216"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="224" y2="224"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="86.4141" id="C_0001157978668683299226" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="214.5" y="8"/>
+      <ellipse cx="249.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M252.7188,29.6406 Q252.1406,29.9375 251.5,30.0781 Q250.8594,30.2344 250.1563,30.2344 Q247.6563,30.2344 246.3281,28.5938 Q245.0156,26.9375 245.0156,23.8125 Q245.0156,20.6875 246.3281,19.0313 Q247.6563,17.375 250.1563,17.375 Q250.8594,17.375 251.5,17.5313 Q252.1563,17.6875 252.7188,17.9844 L252.7188,20.7031 Q252.0938,20.125 251.5,19.8594 Q250.9063,19.5781 250.2813,19.5781 Q248.9375,19.5781 248.25,20.6563 Q247.5625,21.7188 247.5625,23.8125 Q247.5625,25.9063 248.25,26.9844 Q248.9375,28.0469 250.2813,28.0469 Q250.9063,28.0469 251.5,27.7813 Q252.0938,27.5 252.7188,26.9219 L252.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="268.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="54"/>
+      <ellipse cx="225.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="234.5" y="62.2104">a : A</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="66.8047"/>
+      <ellipse cx="225.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="59" x="234.5" y="75.0151">b : B&lt;int&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="79.6094"/>
+      <ellipse cx="225.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="234.5" y="87.8198">c : C&lt;int&gt;</text>
+    </a>
+    <path d="M252.65,232.17 C249.84,247.09 246.07,267.16 242.51,286.07 " fill="none" id="C_0001043027222809675776-&gt;C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="249.37,287.46,238.8,305.83,235.61,284.88,249.37,287.46" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M383.26,232.17 C384.87,248.63 387.1,271.36 389.1,291.88 " fill="none" id="C_0000492968837554438176-&gt;C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="396.1,291.51,391.08,312.1,382.16,292.88,396.1,291.51" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M204.81,103.2 C182.25,125.33 156.39,150.7 135.89,170.82 " fill="none" id="C_0001157978668683299226&lt;-C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="214.24,93.95,207.155,95.2927,205.6694,102.3491,212.7544,101.0064,214.24,93.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="184" y="137.0669">+a</text>
+    <path d="M257,107.68 C257,133.94 257,163.83 257,183.9 " fill="none" id="C_0001157978668683299226&lt;-C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="257,94.35,253,100.35,257,106.35,261,100.35,257,94.35" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="258" y="137.0669">+b</text>
+    <path d="M299.24,104.81 C320.78,131.73 345.87,163.09 362.52,183.9 " fill="none" id="C_0001157978668683299226&lt;-C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="290.88,94.35,291.5059,101.5339,298.3779,103.7191,297.752,96.5353,290.88,94.35" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="328" y="137.0669">+c</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00052_class_mermaid.svg b/docs/test_cases/t00052_class_mermaid.svg
index decea17d..aba3084e 100644
--- a/docs/test_cases/t00052_class_mermaid.svg
+++ b/docs/test_cases/t00052_class_mermaid.svg
@@ -1,65 +1,60 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 563.9296875 459" style="max-width: 563.93px; background-color: white;" width="563.9296875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 541.703125 459" style="max-width: 541.703px; background-color: white;" width="541.703125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M273.9140625,278L273.9140625,285.8333333333333C273.9140625,293.6666666666667,273.9140625,309.3333333333333,273.9140625,318.3333333333333C273.9140625,327.3333333333333,273.9140625,329.6666666666667,273.9140625,330.8333333333333L273.9140625,332"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M478.90625,278L478.90625,285.8333333333333C478.90625,293.6666666666667,478.90625,309.3333333333333,478.90625,320.1666666666667C478.90625,331,478.90625,337,478.90625,340L478.90625,343"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M211.70937157084782,103.61044957464364L193.0507783923732,113.84204131220304C174.39218521389853,124.07363304976242,137.07499885694926,144.53681652488123,118.41640567847463,160.4350749291073C99.7578125,176.33333333333334,99.7578125,187.66666666666666,99.7578125,193.33333333333334L99.7578125,199"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M273.9140625,149L273.9140625,151.66666666666666C273.9140625,154.33333333333334,273.9140625,159.66666666666666,273.9140625,171.66666666666666C273.9140625,183.66666666666666,273.9140625,202.33333333333334,273.9140625,211.66666666666666L273.9140625,221"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M336.65220293104875,98.72790611795953L360.361210775874,109.77325509829961C384.0702186206992,120.8186040786397,431.4882343103496,142.90930203931984,455.19724215517476,163.28798435299325C478.90625,183.66666666666666,478.90625,202.33333333333334,478.90625,211.66666666666666L478.90625,221"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M265.0234375,278L265.0234375,285.8333333333333C265.0234375,293.6666666666667,265.0234375,309.3333333333333,265.0234375,321.3333333333333C265.0234375,333.3333333333333,265.0234375,341.6666666666667,265.0234375,345.8333333333333L265.0234375,350"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M461.125,278L461.125,285.8333333333333C461.125,293.6666666666667,461.125,309.3333333333333,461.125,323.1666666666667C461.125,337,461.125,349,461.125,355L461.125,361"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M218.6015625,95.62258896100907L198.05338541666666,107.1854908008409C177.50520833333334,118.7483926406727,136.40885416666666,141.87419632033635,115.86067708333333,159.10376482683486C95.3125,176.33333333333334,95.3125,187.66666666666666,95.3125,193.33333333333334L95.3125,199"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M265.0234375,131L265.0234375,136.66666666666666C265.0234375,142.33333333333334,265.0234375,153.66666666666666,265.0234375,168.66666666666666C265.0234375,183.66666666666666,265.0234375,202.33333333333334,265.0234375,211.66666666666666L265.0234375,221"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M311.4453125,92.1071072865623L336.3919270833333,104.25592273880191C361.3385416666667,116.40473819104153,411.2317708333333,140.70236909552077,436.1783854166667,162.1845178810937C461.125,183.66666666666666,461.125,202.33333333333334,461.125,211.66666666666666L461.125,221"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -84,7 +79,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(99.7578125, 165)" class="edgeLabel">
+        <g transform="translate(95.3125, 165)" class="edgeLabel">
           <g transform="translate(-9.125, -9)" class="label">
             <foreignObject height="18" width="18.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -95,7 +90,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(273.9140625, 165)" class="edgeLabel">
+        <g transform="translate(265.0234375, 165)" class="edgeLabel">
           <g transform="translate(-9.125, -9)" class="label">
             <foreignObject height="18" width="18.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -106,7 +101,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(478.90625, 165)" class="edgeLabel">
+        <g transform="translate(461.125, 165)" class="edgeLabel">
           <g transform="translate(-8.671875, -9)" class="label">
             <foreignObject height="18" width="17.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -119,11 +114,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(99.7578125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L6">
+        <a transform="translate(95.3125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L6">
           <g title="A" id="classId-C_0002200853067459698271-0" class="node default clickable">
-            <rect height="101" width="183.515625" y="-50.5" x="-91.7578125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="91.7578125" x1="-91.7578125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="91.7578125" x1="-91.7578125" class="divider"/>
+            <rect height="101" width="174.625" y="-50.5" x="-87.3125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="87.3125" x1="-87.3125" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="87.3125" x1="-87.3125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -135,24 +130,24 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -84.2578125, 3)" height="18" width="83.4375">
+              <foreignObject transform="translate( -79.8125, 3)" height="18" width="74.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+a(T p) : : T</span>
+                  <span class="nodeLabel">+a(T p) : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -84.2578125, 25)" height="18" width="168.515625">
+              <foreignObject transform="translate( -79.8125, 25)" height="18" width="159.625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+aa(F &amp;&amp; f, Q q) : : void</span>
+                  <span class="nodeLabel">+aa(F &amp;&amp; f, Q q) : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(273.9140625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13">
+        <a transform="translate(265.0234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001737293776724790064-1" class="node default clickable">
-            <rect height="101" width="155.9375" y="-50.5" x="-77.96875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="77.96875" x1="-77.96875" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="77.96875" x1="-77.96875" class="divider"/>
+            <rect height="101" width="147.046875" y="-50.5" x="-73.5234375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="73.5234375" x1="-73.5234375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="73.5234375" x1="-73.5234375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -164,24 +159,24 @@
                   <span class="nodeLabel">B&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -70.46875, 3)" height="18" width="78.984375">
+              <foreignObject transform="translate( -66.0234375, 3)" height="18" width="70.09375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+b(T t) : : T</span>
+                  <span class="nodeLabel">+b(T t) : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -70.46875, 25)" height="18" width="140.9375">
+              <foreignObject transform="translate( -66.0234375, 25)" height="18" width="132.046875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+bb(F &amp;&amp; f, T t) : : T</span>
+                  <span class="nodeLabel">+bb(F &amp;&amp; f, T t) : T</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(478.90625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20">
+        <a transform="translate(461.125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000687756639884832524-2" class="node default clickable">
-            <rect height="79" width="154.046875" y="-39.5" x="-77.0234375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="77.0234375" x1="-77.0234375" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="77.0234375" x1="-77.0234375" class="divider"/>
+            <rect height="79" width="145.15625" y="-39.5" x="-72.578125" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="72.578125" x1="-72.578125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="72.578125" x1="-72.578125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -193,15 +188,15 @@
                   <span class="nodeLabel">C&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -69.5234375, 14)" height="18" width="139.046875">
+              <foreignObject transform="translate( -65.078125, 14)" height="18" width="130.15625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-c&lt;p&gt;(P p) : : T&lt;/p&gt;</span>
+                  <span class="nodeLabel">-c&lt;p&gt;(P p) : T&lt;/p&gt;</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(273.9140625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L13">
+        <a transform="translate(265.0234375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001043027222809675776-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -220,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.90625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L20">
+        <a transform="translate(461.125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000492968837554438176-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -239,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(273.9140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00052/t00052.cc#L29">
+        <a transform="translate(265.0234375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L29">
           <g title="R" id="classId-C_0001157978668683299226-5" class="node default clickable">
             <rect height="123" width="92.84375" y="-61.5" x="-46.421875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="46.421875" x1="-46.421875" class="divider"/>
diff --git a/docs/test_cases/t00053.md b/docs/test_cases/t00053.md
index c4234092..60c9735b 100644
--- a/docs/test_cases/t00053.md
+++ b/docs/test_cases/t00053.md
@@ -58,7 +58,7 @@ enum class j { jjj };
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00053::a",
+      "display_name": "a",
       "id": "347629837292519144",
       "is_abstract": false,
       "is_nested": false,
@@ -80,7 +80,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::b",
+      "display_name": "b",
       "id": "1376344645244260547",
       "is_abstract": false,
       "is_nested": false,
@@ -102,7 +102,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::c",
+      "display_name": "c",
       "id": "504463801094568803",
       "is_abstract": false,
       "is_nested": false,
@@ -124,7 +124,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::d",
+      "display_name": "d",
       "id": "1264455164862224089",
       "is_abstract": false,
       "is_nested": false,
@@ -146,7 +146,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::e",
+      "display_name": "e",
       "id": "907921963776939609",
       "is_abstract": false,
       "is_nested": false,
@@ -168,7 +168,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::f",
+      "display_name": "f",
       "id": "1421289128664274084",
       "is_abstract": false,
       "is_nested": false,
@@ -190,7 +190,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::g",
+      "display_name": "g",
       "id": "200227126708762001",
       "is_abstract": false,
       "is_nested": false,
@@ -212,7 +212,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::A",
+      "display_name": "A",
       "id": "322642841130459425",
       "is_abstract": false,
       "is_nested": false,
@@ -234,7 +234,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::B",
+      "display_name": "B",
       "id": "876623970071162908",
       "is_abstract": false,
       "is_nested": false,
@@ -256,7 +256,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::C",
+      "display_name": "C",
       "id": "1248473990784124468",
       "is_abstract": false,
       "is_nested": false,
@@ -278,7 +278,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::D",
+      "display_name": "D",
       "id": "470228045297785394",
       "is_abstract": false,
       "is_nested": false,
@@ -300,7 +300,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::E",
+      "display_name": "E",
       "id": "1038384764221361257",
       "is_abstract": false,
       "is_nested": false,
@@ -322,7 +322,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::F",
+      "display_name": "F",
       "id": "530253748811039667",
       "is_abstract": false,
       "is_nested": false,
@@ -344,7 +344,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00053::G",
+      "display_name": "G",
       "id": "1031614323468823578",
       "is_abstract": false,
       "is_nested": false,
@@ -368,7 +368,7 @@ enum class j { jjj };
       "constants": [
         "hhh"
       ],
-      "display_name": "clanguml::t00053::h",
+      "display_name": "h",
       "id": "190978367074032185",
       "is_nested": false,
       "name": "h",
@@ -385,7 +385,7 @@ enum class j { jjj };
       "constants": [
         "iii"
       ],
-      "display_name": "clanguml::t00053::i",
+      "display_name": "i",
       "id": "1473214620883985930",
       "is_nested": false,
       "name": "i",
@@ -402,7 +402,7 @@ enum class j { jjj };
       "constants": [
         "jjj"
       ],
-      "display_name": "clanguml::t00053::j",
+      "display_name": "j",
       "id": "965083605473661435",
       "is_nested": false,
       "name": "j",
@@ -417,6 +417,7 @@ enum class j { jjj };
     }
   ],
   "name": "t00053_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00053"
 }
diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg
index 67b8c90f..273c8eb8 100644
--- a/docs/test_cases/t00053_class.svg
+++ b/docs/test_cases/t00053_class.svg
@@ -1,180 +1,152 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="419px" preserveAspectRatio="none" style="width:579px;height:419px;background:#FFFFFF;" version="1.1" viewBox="0 0 579 419" width="579px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="340px" preserveAspectRatio="none" style="width:698px;height:340px;" version="1.1" viewBox="0 0 698 340" width="698px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1irkunw8yx982" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <g id="elem_C_0001376344645244260547">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001376344645244260547" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="8.5" y="7"/>
-        <ellipse cx="23.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M18.5,24.1563 C18.5,26.6563 20.6406,28.4688 23.5625,28.4688 C24.7969,28.4688 25.9688,28.1719 26.7188,27.6563 C27.3281,27.2344 27.6563,26.8125 27.6563,26.4063 C27.6563,25.9375 27.2344,25.5313 26.7344,25.5313 C26.5,25.5313 26.2813,25.6094 26.0781,25.8125 C25.6406,26.25 25.6406,26.25 25.4688,26.3438 C25.0156,26.5781 24.375,26.7188 23.6094,26.7188 C21.6094,26.7188 20.3281,25.7031 20.3281,24.125 L20.3281,23.0781 C20.3281,21.375 21.5469,20.1719 23.25,20.1719 C23.8281,20.1719 24.4063,20.3125 24.875,20.5625 C25.3438,20.8281 25.5156,21.0156 25.5781,21.375 C25.7031,22.0469 25.9531,22.2969 26.4844,22.2969 C26.7656,22.2969 27.0469,22.1563 27.2344,21.9375 C27.3594,21.7656 27.4063,21.5938 27.4063,21.1563 L27.4063,19.7969 C27.4063,19.375 27.3906,19.2344 27.2656,19.0625 C27.0938,18.8125 26.8125,18.6563 26.4844,18.6563 C26.1719,18.6563 25.9688,18.7656 25.75,19.0313 C24.5781,18.5313 24.1406,18.4219 23.1875,18.4219 C20.5156,18.4219 18.5,20.4375 18.5,23.0625 L18.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="37.5" y="27.606">b</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="9.5" x2="47.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="9.5" x2="47.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000322642841130459425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="46.5"/>
+      <ellipse cx="249" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M251.9688,68.1406 Q251.3906,68.4375 250.75,68.5781 Q250.1094,68.7344 249.4063,68.7344 Q246.9063,68.7344 245.5781,67.0938 Q244.2656,65.4375 244.2656,62.3125 Q244.2656,59.1875 245.5781,57.5313 Q246.9063,55.875 249.4063,55.875 Q250.1094,55.875 250.75,56.0313 Q251.4063,56.1875 251.9688,56.4844 L251.9688,59.2031 Q251.3438,58.625 250.75,58.3594 Q250.1563,58.0781 249.5313,58.0781 Q248.1875,58.0781 247.5,59.1563 Q246.8125,60.2188 246.8125,62.3125 Q246.8125,64.4063 247.5,65.4844 Q248.1875,66.5469 249.5313,66.5469 Q250.1563,66.5469 250.75,66.2813 Q251.3438,66 251.9688,65.4219 L251.9688,68.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="66.6543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="78.5" y2="78.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <g id="elem_C_0001264455164862224089">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0001264455164862224089" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="83.5" y="7"/>
-        <ellipse cx="98.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93.5,24.1563 C93.5,26.6563 95.6406,28.4688 98.5625,28.4688 C99.7969,28.4688 100.9688,28.1719 101.7188,27.6563 C102.3281,27.2344 102.6563,26.8125 102.6563,26.4063 C102.6563,25.9375 102.2344,25.5313 101.7344,25.5313 C101.5,25.5313 101.2813,25.6094 101.0781,25.8125 C100.6406,26.25 100.6406,26.25 100.4688,26.3438 C100.0156,26.5781 99.375,26.7188 98.6094,26.7188 C96.6094,26.7188 95.3281,25.7031 95.3281,24.125 L95.3281,23.0781 C95.3281,21.375 96.5469,20.1719 98.25,20.1719 C98.8281,20.1719 99.4063,20.3125 99.875,20.5625 C100.3438,20.8281 100.5156,21.0156 100.5781,21.375 C100.7031,22.0469 100.9531,22.2969 101.4844,22.2969 C101.7656,22.2969 102.0469,22.1563 102.2344,21.9375 C102.3594,21.7656 102.4063,21.5938 102.4063,21.1563 L102.4063,19.7969 C102.4063,19.375 102.3906,19.2344 102.2656,19.0625 C102.0938,18.8125 101.8125,18.6563 101.4844,18.6563 C101.1719,18.6563 100.9688,18.7656 100.75,19.0313 C99.5781,18.5313 99.1406,18.4219 98.1875,18.4219 C95.5156,18.4219 93.5,20.4375 93.5,23.0625 L93.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="112.5" y="27.606">d</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84.5" x2="122.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84.5" x2="122.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001248473990784124468" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309" y="46.5"/>
+      <ellipse cx="324" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M326.9688,68.1406 Q326.3906,68.4375 325.75,68.5781 Q325.1094,68.7344 324.4063,68.7344 Q321.9063,68.7344 320.5781,67.0938 Q319.2656,65.4375 319.2656,62.3125 Q319.2656,59.1875 320.5781,57.5313 Q321.9063,55.875 324.4063,55.875 Q325.1094,55.875 325.75,56.0313 Q326.4063,56.1875 326.9688,56.4844 L326.9688,59.2031 Q326.3438,58.625 325.75,58.3594 Q325.1563,58.0781 324.5313,58.0781 Q323.1875,58.0781 322.5,59.1563 Q321.8125,60.2188 321.8125,62.3125 Q321.8125,64.4063 322.5,65.4844 Q323.1875,66.5469 324.5313,66.5469 Q325.1563,66.5469 325.75,66.2813 Q326.3438,66 326.9688,65.4219 L326.9688,68.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338" y="66.6543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="78.5" y2="78.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <g id="elem_C_0000200227126708762001">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000200227126708762001" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="158.5" y="7"/>
-        <ellipse cx="173.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M168.5,24.1563 C168.5,26.6563 170.6406,28.4688 173.5625,28.4688 C174.7969,28.4688 175.9688,28.1719 176.7188,27.6563 C177.3281,27.2344 177.6563,26.8125 177.6563,26.4063 C177.6563,25.9375 177.2344,25.5313 176.7344,25.5313 C176.5,25.5313 176.2813,25.6094 176.0781,25.8125 C175.6406,26.25 175.6406,26.25 175.4688,26.3438 C175.0156,26.5781 174.375,26.7188 173.6094,26.7188 C171.6094,26.7188 170.3281,25.7031 170.3281,24.125 L170.3281,23.0781 C170.3281,21.375 171.5469,20.1719 173.25,20.1719 C173.8281,20.1719 174.4063,20.3125 174.875,20.5625 C175.3438,20.8281 175.5156,21.0156 175.5781,21.375 C175.7031,22.0469 175.9531,22.2969 176.4844,22.2969 C176.7656,22.2969 177.0469,22.1563 177.2344,21.9375 C177.3594,21.7656 177.4063,21.5938 177.4063,21.1563 L177.4063,19.7969 C177.4063,19.375 177.3906,19.2344 177.2656,19.0625 C177.0938,18.8125 176.8125,18.6563 176.4844,18.6563 C176.1719,18.6563 175.9688,18.7656 175.75,19.0313 C174.5781,18.5313 174.1406,18.4219 173.1875,18.4219 C170.5156,18.4219 168.5,20.4375 168.5,23.0625 L168.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="187.5" y="27.606">g</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="197.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="197.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001038384764221361257" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="161"/>
+      <ellipse cx="249" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M251.9688,182.6406 Q251.3906,182.9375 250.75,183.0781 Q250.1094,183.2344 249.4063,183.2344 Q246.9063,183.2344 245.5781,181.5938 Q244.2656,179.9375 244.2656,176.8125 Q244.2656,173.6875 245.5781,172.0313 Q246.9063,170.375 249.4063,170.375 Q250.1094,170.375 250.75,170.5313 Q251.4063,170.6875 251.9688,170.9844 L251.9688,173.7031 Q251.3438,173.125 250.75,172.8594 Q250.1563,172.5781 249.5313,172.5781 Q248.1875,172.5781 247.5,173.6563 Q246.8125,174.7188 246.8125,176.8125 Q246.8125,178.9063 247.5,179.9844 Q248.1875,181.0469 249.5313,181.0469 Q250.1563,181.0469 250.75,180.7813 Q251.3438,180.5 251.9688,179.9219 L251.9688,182.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="181.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="193" y2="193"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000876623970071162908">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0000876623970071162908" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="234" y="7"/>
-        <ellipse cx="249" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M244,24.1563 C244,26.6563 246.1406,28.4688 249.0625,28.4688 C250.2969,28.4688 251.4688,28.1719 252.2188,27.6563 C252.8281,27.2344 253.1563,26.8125 253.1563,26.4063 C253.1563,25.9375 252.7344,25.5313 252.2344,25.5313 C252,25.5313 251.7813,25.6094 251.5781,25.8125 C251.1406,26.25 251.1406,26.25 250.9688,26.3438 C250.5156,26.5781 249.875,26.7188 249.1094,26.7188 C247.1094,26.7188 245.8281,25.7031 245.8281,24.125 L245.8281,23.0781 C245.8281,21.375 247.0469,20.1719 248.75,20.1719 C249.3281,20.1719 249.9063,20.3125 250.375,20.5625 C250.8438,20.8281 251.0156,21.0156 251.0781,21.375 C251.2031,22.0469 251.4531,22.2969 251.9844,22.2969 C252.2656,22.2969 252.5469,22.1563 252.7344,21.9375 C252.8594,21.7656 252.9063,21.5938 252.9063,21.1563 L252.9063,19.7969 C252.9063,19.375 252.8906,19.2344 252.7656,19.0625 C252.5938,18.8125 252.3125,18.6563 251.9844,18.6563 C251.6719,18.6563 251.4688,18.7656 251.25,19.0313 C250.0781,18.5313 249.6406,18.4219 248.6875,18.4219 C246.0156,18.4219 244,20.4375 244,23.0625 L244,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="263" y="27.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="235" x2="274" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="235" x2="274" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000530253748811039667" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="309.5" y="161"/>
+      <ellipse cx="324.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M327.4688,182.6406 Q326.8906,182.9375 326.25,183.0781 Q325.6094,183.2344 324.9063,183.2344 Q322.4063,183.2344 321.0781,181.5938 Q319.7656,179.9375 319.7656,176.8125 Q319.7656,173.6875 321.0781,172.0313 Q322.4063,170.375 324.9063,170.375 Q325.6094,170.375 326.25,170.5313 Q326.9063,170.6875 327.4688,170.9844 L327.4688,173.7031 Q326.8438,173.125 326.25,172.8594 Q325.6563,172.5781 325.0313,172.5781 Q323.6875,172.5781 323,173.6563 Q322.3125,174.7188 322.3125,176.8125 Q322.3125,178.9063 323,179.9844 Q323.6875,181.0469 325.0313,181.0469 Q325.6563,181.0469 326.25,180.7813 Q326.8438,180.5 327.4688,179.9219 L327.4688,182.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="338.5" y="181.1543">F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="193" y2="193"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0000470228045297785394">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000470228045297785394" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="309.5" y="7"/>
-        <ellipse cx="324.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M319.5,24.1563 C319.5,26.6563 321.6406,28.4688 324.5625,28.4688 C325.7969,28.4688 326.9688,28.1719 327.7188,27.6563 C328.3281,27.2344 328.6563,26.8125 328.6563,26.4063 C328.6563,25.9375 328.2344,25.5313 327.7344,25.5313 C327.5,25.5313 327.2813,25.6094 327.0781,25.8125 C326.6406,26.25 326.6406,26.25 326.4688,26.3438 C326.0156,26.5781 325.375,26.7188 324.6094,26.7188 C322.6094,26.7188 321.3281,25.7031 321.3281,24.125 L321.3281,23.0781 C321.3281,21.375 322.5469,20.1719 324.25,20.1719 C324.8281,20.1719 325.4063,20.3125 325.875,20.5625 C326.3438,20.8281 326.5156,21.0156 326.5781,21.375 C326.7031,22.0469 326.9531,22.2969 327.4844,22.2969 C327.7656,22.2969 328.0469,22.1563 328.2344,21.9375 C328.3594,21.7656 328.4063,21.5938 328.4063,21.1563 L328.4063,19.7969 C328.4063,19.375 328.3906,19.2344 328.2656,19.0625 C328.0938,18.8125 327.8125,18.6563 327.4844,18.6563 C327.1719,18.6563 326.9688,18.7656 326.75,19.0313 C325.5781,18.5313 325.1406,18.4219 324.1875,18.4219 C321.5156,18.4219 319.5,20.4375 319.5,23.0625 L319.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="338.5" y="27.606">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="310.5" x2="350.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="310.5" x2="350.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000347629837292519144" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="46.5"/>
+      <ellipse cx="420" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M422.9688,68.1406 Q422.3906,68.4375 421.75,68.5781 Q421.1094,68.7344 420.4063,68.7344 Q417.9063,68.7344 416.5781,67.0938 Q415.2656,65.4375 415.2656,62.3125 Q415.2656,59.1875 416.5781,57.5313 Q417.9063,55.875 420.4063,55.875 Q421.1094,55.875 421.75,56.0313 Q422.4063,56.1875 422.9688,56.4844 L422.9688,59.2031 Q422.3438,58.625 421.75,58.3594 Q421.1563,58.0781 420.5313,58.0781 Q419.1875,58.0781 418.5,59.1563 Q417.8125,60.2188 417.8125,62.3125 Q417.8125,64.4063 418.5,65.4844 Q419.1875,66.5469 420.5313,66.5469 Q421.1563,66.5469 421.75,66.2813 Q422.3438,66 422.9688,65.4219 L422.9688,68.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="66.6543">a</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="78.5" y2="78.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0001031614323468823578">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001031614323468823578" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="7" y="123.4"/>
-        <ellipse cx="22" cy="139.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,140.5563 C17,143.0563 19.1406,144.8688 22.0625,144.8688 C23.2969,144.8688 24.4688,144.5719 25.2188,144.0563 C25.8281,143.6344 26.1563,143.2125 26.1563,142.8063 C26.1563,142.3375 25.7344,141.9313 25.2344,141.9313 C25,141.9313 24.7813,142.0094 24.5781,142.2125 C24.1406,142.65 24.1406,142.65 23.9688,142.7438 C23.5156,142.9781 22.875,143.1188 22.1094,143.1188 C20.1094,143.1188 18.8281,142.1031 18.8281,140.525 L18.8281,139.4781 C18.8281,137.775 20.0469,136.5719 21.75,136.5719 C22.3281,136.5719 22.9063,136.7125 23.375,136.9625 C23.8438,137.2281 24.0156,137.4156 24.0781,137.775 C24.2031,138.4469 24.4531,138.6969 24.9844,138.6969 C25.2656,138.6969 25.5469,138.5563 25.7344,138.3375 C25.8594,138.1656 25.9063,137.9938 25.9063,137.5563 L25.9063,136.1969 C25.9063,135.775 25.8906,135.6344 25.7656,135.4625 C25.5938,135.2125 25.3125,135.0563 24.9844,135.0563 C24.6719,135.0563 24.4688,135.1656 24.25,135.4313 C23.0781,134.9313 22.6406,134.8219 21.6875,134.8219 C19.0156,134.8219 17,136.8375 17,139.4625 L17,140.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="36" y="144.006">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="49" y1="155.4" y2="155.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="49" y1="163.4" y2="163.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000504463801094568803" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="480.5" y="46.5"/>
+      <ellipse cx="495.5" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M498.4688,68.1406 Q497.8906,68.4375 497.25,68.5781 Q496.6094,68.7344 495.9063,68.7344 Q493.4063,68.7344 492.0781,67.0938 Q490.7656,65.4375 490.7656,62.3125 Q490.7656,59.1875 492.0781,57.5313 Q493.4063,55.875 495.9063,55.875 Q496.6094,55.875 497.25,56.0313 Q497.9063,56.1875 498.4688,56.4844 L498.4688,59.2031 Q497.8438,58.625 497.25,58.3594 Q496.6563,58.0781 496.0313,58.0781 Q494.6875,58.0781 494,59.1563 Q493.3125,60.2188 493.3125,62.3125 Q493.3125,64.4063 494,65.4844 Q494.6875,66.5469 496.0313,66.5469 Q496.6563,66.5469 497.25,66.2813 Q497.8438,66 498.4688,65.4219 L498.4688,68.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="509.5" y="66.6543">c</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="78.5" y2="78.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <g id="elem_C_0001473214620883985930">
-        <rect codeLine="26" fill="#F1F1F1" height="64.7999" id="C_0001473214620883985930" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="85" y="115"/>
-        <ellipse cx="100" cy="131" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M98.8594,132.0625 L100.1719,132.0625 L100.1719,132.1094 C100.1719,132.5156 100.1875,132.6719 100.2969,132.8281 C100.4688,133.0781 100.7656,133.25 101.0781,133.25 C101.3594,133.25 101.6563,133.1094 101.8281,132.8906 C101.9531,132.7031 102,132.5625 102,132.1094 L102,130.2656 C102,129.9375 101.9844,129.8281 101.9219,129.6563 C101.8125,129.3594 101.4531,129.1094 101.0781,129.1094 C100.7813,129.1094 100.5156,129.25 100.3438,129.4688 C100.2031,129.6563 100.1719,129.8281 100.1719,130.2656 L100.1719,130.3281 L98.8594,130.3281 L98.8594,128.1563 L102.7031,128.1563 L102.7031,128.9063 C102.7031,129.2969 102.7344,129.4844 102.8438,129.6406 C103.0156,129.8906 103.3125,130.0625 103.625,130.0625 C103.9219,130.0625 104.1875,129.9375 104.375,129.7031 C104.5156,129.5156 104.5469,129.375 104.5469,128.9063 L104.5469,126.4063 L96.8438,126.4063 C96.3906,126.4063 96.2656,126.4219 96.0938,126.5313 C95.8281,126.7031 95.6563,126.9688 95.6563,127.2813 C95.6563,127.5625 95.7813,127.8281 96.0313,128 C96.2188,128.125 96.4063,128.1563 96.8438,128.1563 L97.0313,128.1563 L97.0313,134.25 L96.8438,134.25 C96.4219,134.25 96.2656,134.2813 96.0938,134.375 C95.8281,134.5313 95.6563,134.8125 95.6563,135.1094 C95.6563,135.6875 96.0625,136 96.8438,136 L104.9219,136 L104.9219,133.4688 C104.9219,133.0625 104.8906,132.8906 104.7813,132.7344 C104.6094,132.4688 104.3281,132.3125 104,132.3125 C103.7188,132.3125 103.4375,132.4531 103.25,132.6719 C103.1094,132.8594 103.0781,133.0156 103.0781,133.4688 L103.0781,134.25 L98.8594,134.25 L98.8594,132.0625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="114" y="135.606">i</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="86" x2="119" y1="147" y2="147"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="91" y="164.0059">iii</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="86" x2="119" y1="171.7999" y2="171.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000907921963776939609" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="161"/>
+      <ellipse cx="420" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M422.9688,182.6406 Q422.3906,182.9375 421.75,183.0781 Q421.1094,183.2344 420.4063,183.2344 Q417.9063,183.2344 416.5781,181.5938 Q415.2656,179.9375 415.2656,176.8125 Q415.2656,173.6875 416.5781,172.0313 Q417.9063,170.375 420.4063,170.375 Q421.1094,170.375 421.75,170.5313 Q422.4063,170.6875 422.9688,170.9844 L422.9688,173.7031 Q422.3438,173.125 421.75,172.8594 Q421.1563,172.5781 420.5313,172.5781 Q419.1875,172.5781 418.5,173.6563 Q417.8125,174.7188 417.8125,176.8125 Q417.8125,178.9063 418.5,179.9844 Q419.1875,181.0469 420.5313,181.0469 Q421.1563,181.0469 421.75,180.7813 Q422.3438,180.5 422.9688,179.9219 L422.9688,182.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="181.1543">e</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="193" y2="193"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000322642841130459425">
-        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0000322642841130459425" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="83" y="239.8"/>
-        <ellipse cx="98" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M93,256.9563 C93,259.4563 95.1406,261.2688 98.0625,261.2688 C99.2969,261.2688 100.4688,260.9719 101.2188,260.4563 C101.8281,260.0344 102.1563,259.6125 102.1563,259.2063 C102.1563,258.7375 101.7344,258.3313 101.2344,258.3313 C101,258.3313 100.7813,258.4094 100.5781,258.6125 C100.1406,259.05 100.1406,259.05 99.9688,259.1438 C99.5156,259.3781 98.875,259.5188 98.1094,259.5188 C96.1094,259.5188 94.8281,258.5031 94.8281,256.925 L94.8281,255.8781 C94.8281,254.175 96.0469,252.9719 97.75,252.9719 C98.3281,252.9719 98.9063,253.1125 99.375,253.3625 C99.8438,253.6281 100.0156,253.8156 100.0781,254.175 C100.2031,254.8469 100.4531,255.0969 100.9844,255.0969 C101.2656,255.0969 101.5469,254.9563 101.7344,254.7375 C101.8594,254.5656 101.9063,254.3938 101.9063,253.9563 L101.9063,252.5969 C101.9063,252.175 101.8906,252.0344 101.7656,251.8625 C101.5938,251.6125 101.3125,251.4563 100.9844,251.4563 C100.6719,251.4563 100.4688,251.5656 100.25,251.8313 C99.0781,251.3313 98.6406,251.2219 97.6875,251.2219 C95.0156,251.2219 93,253.2375 93,255.8625 L93,256.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="112" y="260.406">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="123" y1="279.8" y2="279.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001421289128664274084" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="480" y="161"/>
+      <ellipse cx="495" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M497.9688,182.6406 Q497.3906,182.9375 496.75,183.0781 Q496.1094,183.2344 495.4063,183.2344 Q492.9063,183.2344 491.5781,181.5938 Q490.2656,179.9375 490.2656,176.8125 Q490.2656,173.6875 491.5781,172.0313 Q492.9063,170.375 495.4063,170.375 Q496.1094,170.375 496.75,170.5313 Q497.4063,170.6875 497.9688,170.9844 L497.9688,173.7031 Q497.3438,173.125 496.75,172.8594 Q496.1563,172.5781 495.5313,172.5781 Q494.1875,172.5781 493.5,173.6563 Q492.8125,174.7188 492.8125,176.8125 Q492.8125,178.9063 493.5,179.9844 Q494.1875,181.0469 495.5313,181.0469 Q496.1563,181.0469 496.75,180.7813 Q497.3438,180.5 497.9688,179.9219 L497.9688,182.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="509" y="181.1543">f</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="193" y2="193"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001248473990784124468">
-        <rect codeLine="35" fill="#F1F1F1" height="48" id="C_0001248473990784124468" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="158.5" y="239.8"/>
-        <ellipse cx="173.5" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M168.5,256.9563 C168.5,259.4563 170.6406,261.2688 173.5625,261.2688 C174.7969,261.2688 175.9688,260.9719 176.7188,260.4563 C177.3281,260.0344 177.6563,259.6125 177.6563,259.2063 C177.6563,258.7375 177.2344,258.3313 176.7344,258.3313 C176.5,258.3313 176.2813,258.4094 176.0781,258.6125 C175.6406,259.05 175.6406,259.05 175.4688,259.1438 C175.0156,259.3781 174.375,259.5188 173.6094,259.5188 C171.6094,259.5188 170.3281,258.5031 170.3281,256.925 L170.3281,255.8781 C170.3281,254.175 171.5469,252.9719 173.25,252.9719 C173.8281,252.9719 174.4063,253.1125 174.875,253.3625 C175.3438,253.6281 175.5156,253.8156 175.5781,254.175 C175.7031,254.8469 175.9531,255.0969 176.4844,255.0969 C176.7656,255.0969 177.0469,254.9563 177.2344,254.7375 C177.3594,254.5656 177.4063,254.3938 177.4063,253.9563 L177.4063,252.5969 C177.4063,252.175 177.3906,252.0344 177.2656,251.8625 C177.0938,251.6125 176.8125,251.4563 176.4844,251.4563 C176.1719,251.4563 175.9688,251.5656 175.75,251.8313 C174.5781,251.3313 174.1406,251.2219 173.1875,251.2219 C170.5156,251.2219 168.5,253.2375 168.5,255.8625 L168.5,256.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="187.5" y="260.406">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="159.5" x2="199.5" y1="279.8" y2="279.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="60.8047" id="C_0000190978367074032185" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="647" y="40"/>
+      <ellipse cx="662" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M666.1094,62 L658.3906,62 L658.3906,49.6094 L666.1094,49.6094 L666.1094,51.7656 L660.8438,51.7656 L660.8438,54.4375 L665.6094,54.4375 L665.6094,56.5938 L660.8438,56.5938 L660.8438,59.8438 L666.1094,59.8438 L666.1094,62 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="676" y="60.1543">h</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="648" x2="686" y1="72" y2="72"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="653" y="86.2104">hhh</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="648" x2="686" y1="92.8047" y2="92.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001038384764221361257">
-        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001038384764221361257" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="235" y="239.8"/>
-        <ellipse cx="250" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M245,256.9563 C245,259.4563 247.1406,261.2688 250.0625,261.2688 C251.2969,261.2688 252.4688,260.9719 253.2188,260.4563 C253.8281,260.0344 254.1563,259.6125 254.1563,259.2063 C254.1563,258.7375 253.7344,258.3313 253.2344,258.3313 C253,258.3313 252.7813,258.4094 252.5781,258.6125 C252.1406,259.05 252.1406,259.05 251.9688,259.1438 C251.5156,259.3781 250.875,259.5188 250.1094,259.5188 C248.1094,259.5188 246.8281,258.5031 246.8281,256.925 L246.8281,255.8781 C246.8281,254.175 248.0469,252.9719 249.75,252.9719 C250.3281,252.9719 250.9063,253.1125 251.375,253.3625 C251.8438,253.6281 252.0156,253.8156 252.0781,254.175 C252.2031,254.8469 252.4531,255.0969 252.9844,255.0969 C253.2656,255.0969 253.5469,254.9563 253.7344,254.7375 C253.8594,254.5656 253.9063,254.3938 253.9063,253.9563 L253.9063,252.5969 C253.9063,252.175 253.8906,252.0344 253.7656,251.8625 C253.5938,251.6125 253.3125,251.4563 252.9844,251.4563 C252.6719,251.4563 252.4688,251.5656 252.25,251.8313 C251.0781,251.3313 250.6406,251.2219 249.6875,251.2219 C247.0156,251.2219 245,253.2375 245,255.8625 L245,256.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="264" y="260.406">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236" x2="275" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236" x2="275" y1="279.8" y2="279.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="60.8047" id="C_0000965083605473661435" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="576.5" y="40"/>
+      <ellipse cx="591.5" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M595.6094,62 L587.8906,62 L587.8906,49.6094 L595.6094,49.6094 L595.6094,51.7656 L590.3438,51.7656 L590.3438,54.4375 L595.1094,54.4375 L595.1094,56.5938 L590.3438,56.5938 L590.3438,59.8438 L595.6094,59.8438 L595.6094,62 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="605.5" y="60.1543">j</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="577.5" x2="610.5" y1="72" y2="72"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="582.5" y="86.2104">jjj</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="577.5" x2="610.5" y1="92.8047" y2="92.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000530253748811039667">
-        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0000530253748811039667" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="239.8"/>
-        <ellipse cx="22" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,256.9563 C17,259.4563 19.1406,261.2688 22.0625,261.2688 C23.2969,261.2688 24.4688,260.9719 25.2188,260.4563 C25.8281,260.0344 26.1563,259.6125 26.1563,259.2063 C26.1563,258.7375 25.7344,258.3313 25.2344,258.3313 C25,258.3313 24.7813,258.4094 24.5781,258.6125 C24.1406,259.05 24.1406,259.05 23.9688,259.1438 C23.5156,259.3781 22.875,259.5188 22.1094,259.5188 C20.1094,259.5188 18.8281,258.5031 18.8281,256.925 L18.8281,255.8781 C18.8281,254.175 20.0469,252.9719 21.75,252.9719 C22.3281,252.9719 22.9063,253.1125 23.375,253.3625 C23.8438,253.6281 24.0156,253.8156 24.0781,254.175 C24.2031,254.8469 24.4531,255.0969 24.9844,255.0969 C25.2656,255.0969 25.5469,254.9563 25.7344,254.7375 C25.8594,254.5656 25.9063,254.3938 25.9063,253.9563 L25.9063,252.5969 C25.9063,252.175 25.8906,252.0344 25.7656,251.8625 C25.5938,251.6125 25.3125,251.4563 24.9844,251.4563 C24.6719,251.4563 24.4688,251.5656 24.25,251.8313 C23.0781,251.3313 22.6406,251.2219 21.6875,251.2219 C19.0156,251.2219 17,253.2375 17,255.8625 L17,256.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="260.406">F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="279.8" y2="279.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001376344645244260547" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="46.5"/>
+      <ellipse cx="21" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,68.1406 Q23.3906,68.4375 22.75,68.5781 Q22.1094,68.7344 21.4063,68.7344 Q18.9063,68.7344 17.5781,67.0938 Q16.2656,65.4375 16.2656,62.3125 Q16.2656,59.1875 17.5781,57.5313 Q18.9063,55.875 21.4063,55.875 Q22.1094,55.875 22.75,56.0313 Q23.4063,56.1875 23.9688,56.4844 L23.9688,59.2031 Q23.3438,58.625 22.75,58.3594 Q22.1563,58.0781 21.5313,58.0781 Q20.1875,58.0781 19.5,59.1563 Q18.8125,60.2188 18.8125,62.3125 Q18.8125,64.4063 19.5,65.4844 Q20.1875,66.5469 21.5313,66.5469 Q22.1563,66.5469 22.75,66.2813 Q23.3438,66 23.9688,65.4219 L23.9688,68.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="66.6543">b</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="78.5" y2="78.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <g id="elem_C_0000347629837292519144">
-        <rect codeLine="49" fill="#F1F1F1" height="48" id="C_0000347629837292519144" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="311.5" y="239.8"/>
-        <ellipse cx="326.5" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M321.5,256.9563 C321.5,259.4563 323.6406,261.2688 326.5625,261.2688 C327.7969,261.2688 328.9688,260.9719 329.7188,260.4563 C330.3281,260.0344 330.6563,259.6125 330.6563,259.2063 C330.6563,258.7375 330.2344,258.3313 329.7344,258.3313 C329.5,258.3313 329.2813,258.4094 329.0781,258.6125 C328.6406,259.05 328.6406,259.05 328.4688,259.1438 C328.0156,259.3781 327.375,259.5188 326.6094,259.5188 C324.6094,259.5188 323.3281,258.5031 323.3281,256.925 L323.3281,255.8781 C323.3281,254.175 324.5469,252.9719 326.25,252.9719 C326.8281,252.9719 327.4063,253.1125 327.875,253.3625 C328.3438,253.6281 328.5156,253.8156 328.5781,254.175 C328.7031,254.8469 328.9531,255.0969 329.4844,255.0969 C329.7656,255.0969 330.0469,254.9563 330.2344,254.7375 C330.3594,254.5656 330.4063,254.3938 330.4063,253.9563 L330.4063,252.5969 C330.4063,252.175 330.3906,252.0344 330.2656,251.8625 C330.0938,251.6125 329.8125,251.4563 329.4844,251.4563 C329.1719,251.4563 328.9688,251.5656 328.75,251.8313 C327.5781,251.3313 327.1406,251.2219 326.1875,251.2219 C323.5156,251.2219 321.5,253.2375 321.5,255.8625 L321.5,256.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="340.5" y="260.406">a</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="312.5" x2="350.5" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="312.5" x2="350.5" y1="279.8" y2="279.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001264455164862224089" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="46.5"/>
+      <ellipse cx="96" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M98.9688,68.1406 Q98.3906,68.4375 97.75,68.5781 Q97.1094,68.7344 96.4063,68.7344 Q93.9063,68.7344 92.5781,67.0938 Q91.2656,65.4375 91.2656,62.3125 Q91.2656,59.1875 92.5781,57.5313 Q93.9063,55.875 96.4063,55.875 Q97.1094,55.875 97.75,56.0313 Q98.4063,56.1875 98.9688,56.4844 L98.9688,59.2031 Q98.3438,58.625 97.75,58.3594 Q97.1563,58.0781 96.5313,58.0781 Q95.1875,58.0781 94.5,59.1563 Q93.8125,60.2188 93.8125,62.3125 Q93.8125,64.4063 94.5,65.4844 Q95.1875,66.5469 96.5313,66.5469 Q97.1563,66.5469 97.75,66.2813 Q98.3438,66 98.9688,65.4219 L98.9688,68.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="66.6543">d</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="78.5" y2="78.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <g id="elem_C_0000504463801094568803">
-        <rect codeLine="53" fill="#F1F1F1" height="48" id="C_0000504463801094568803" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="387" y="239.8"/>
-        <ellipse cx="402" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M397,256.9563 C397,259.4563 399.1406,261.2688 402.0625,261.2688 C403.2969,261.2688 404.4688,260.9719 405.2188,260.4563 C405.8281,260.0344 406.1563,259.6125 406.1563,259.2063 C406.1563,258.7375 405.7344,258.3313 405.2344,258.3313 C405,258.3313 404.7813,258.4094 404.5781,258.6125 C404.1406,259.05 404.1406,259.05 403.9688,259.1438 C403.5156,259.3781 402.875,259.5188 402.1094,259.5188 C400.1094,259.5188 398.8281,258.5031 398.8281,256.925 L398.8281,255.8781 C398.8281,254.175 400.0469,252.9719 401.75,252.9719 C402.3281,252.9719 402.9063,253.1125 403.375,253.3625 C403.8438,253.6281 404.0156,253.8156 404.0781,254.175 C404.2031,254.8469 404.4531,255.0969 404.9844,255.0969 C405.2656,255.0969 405.5469,254.9563 405.7344,254.7375 C405.8594,254.5656 405.9063,254.3938 405.9063,253.9563 L405.9063,252.5969 C405.9063,252.175 405.8906,252.0344 405.7656,251.8625 C405.5938,251.6125 405.3125,251.4563 404.9844,251.4563 C404.6719,251.4563 404.4688,251.5656 404.25,251.8313 C403.0781,251.3313 402.6406,251.2219 401.6875,251.2219 C399.0156,251.2219 397,253.2375 397,255.8625 L397,256.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="416" y="260.406">c</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="388" x2="425" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="388" x2="425" y1="279.8" y2="279.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000200227126708762001" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="46.5"/>
+      <ellipse cx="171" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.9688,68.1406 Q173.3906,68.4375 172.75,68.5781 Q172.1094,68.7344 171.4063,68.7344 Q168.9063,68.7344 167.5781,67.0938 Q166.2656,65.4375 166.2656,62.3125 Q166.2656,59.1875 167.5781,57.5313 Q168.9063,55.875 171.4063,55.875 Q172.1094,55.875 172.75,56.0313 Q173.4063,56.1875 173.9688,56.4844 L173.9688,59.2031 Q173.3438,58.625 172.75,58.3594 Q172.1563,58.0781 171.5313,58.0781 Q170.1875,58.0781 169.5,59.1563 Q168.8125,60.2188 168.8125,62.3125 Q168.8125,64.4063 169.5,65.4844 Q170.1875,66.5469 171.5313,66.5469 Q172.1563,66.5469 172.75,66.2813 Q173.3438,66 173.9688,65.4219 L173.9688,68.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="66.6543">g</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="78.5" y2="78.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <g id="elem_C_0000907921963776939609">
-        <rect codeLine="57" fill="#F1F1F1" height="48" id="C_0000907921963776939609" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="461.5" y="239.8"/>
-        <ellipse cx="476.5" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M471.5,256.9563 C471.5,259.4563 473.6406,261.2688 476.5625,261.2688 C477.7969,261.2688 478.9688,260.9719 479.7188,260.4563 C480.3281,260.0344 480.6563,259.6125 480.6563,259.2063 C480.6563,258.7375 480.2344,258.3313 479.7344,258.3313 C479.5,258.3313 479.2813,258.4094 479.0781,258.6125 C478.6406,259.05 478.6406,259.05 478.4688,259.1438 C478.0156,259.3781 477.375,259.5188 476.6094,259.5188 C474.6094,259.5188 473.3281,258.5031 473.3281,256.925 L473.3281,255.8781 C473.3281,254.175 474.5469,252.9719 476.25,252.9719 C476.8281,252.9719 477.4063,253.1125 477.875,253.3625 C478.3438,253.6281 478.5156,253.8156 478.5781,254.175 C478.7031,254.8469 478.9531,255.0969 479.4844,255.0969 C479.7656,255.0969 480.0469,254.9563 480.2344,254.7375 C480.3594,254.5656 480.4063,254.3938 480.4063,253.9563 L480.4063,252.5969 C480.4063,252.175 480.3906,252.0344 480.2656,251.8625 C480.0938,251.6125 479.8125,251.4563 479.4844,251.4563 C479.1719,251.4563 478.9688,251.5656 478.75,251.8313 C477.5781,251.3313 477.1406,251.2219 476.1875,251.2219 C473.5156,251.2219 471.5,253.2375 471.5,255.8625 L471.5,256.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="490.5" y="260.406">e</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="462.5" x2="500.5" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="462.5" x2="500.5" y1="279.8" y2="279.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000876623970071162908" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="161"/>
+      <ellipse cx="21" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,182.6406 Q23.3906,182.9375 22.75,183.0781 Q22.1094,183.2344 21.4063,183.2344 Q18.9063,183.2344 17.5781,181.5938 Q16.2656,179.9375 16.2656,176.8125 Q16.2656,173.6875 17.5781,172.0313 Q18.9063,170.375 21.4063,170.375 Q22.1094,170.375 22.75,170.5313 Q23.4063,170.6875 23.9688,170.9844 L23.9688,173.7031 Q23.3438,173.125 22.75,172.8594 Q22.1563,172.5781 21.5313,172.5781 Q20.1875,172.5781 19.5,173.6563 Q18.8125,174.7188 18.8125,176.8125 Q18.8125,178.9063 19.5,179.9844 Q20.1875,181.0469 21.5313,181.0469 Q22.1563,181.0469 22.75,180.7813 Q23.3438,180.5 23.9688,179.9219 L23.9688,182.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="181.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="193" y2="193"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <g id="elem_C_0001421289128664274084">
-        <rect codeLine="61" fill="#F1F1F1" height="48" id="C_0001421289128664274084" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="536.5" y="239.8"/>
-        <ellipse cx="551.5" cy="255.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M546.5,256.9563 C546.5,259.4563 548.6406,261.2688 551.5625,261.2688 C552.7969,261.2688 553.9688,260.9719 554.7188,260.4563 C555.3281,260.0344 555.6563,259.6125 555.6563,259.2063 C555.6563,258.7375 555.2344,258.3313 554.7344,258.3313 C554.5,258.3313 554.2813,258.4094 554.0781,258.6125 C553.6406,259.05 553.6406,259.05 553.4688,259.1438 C553.0156,259.3781 552.375,259.5188 551.6094,259.5188 C549.6094,259.5188 548.3281,258.5031 548.3281,256.925 L548.3281,255.8781 C548.3281,254.175 549.5469,252.9719 551.25,252.9719 C551.8281,252.9719 552.4063,253.1125 552.875,253.3625 C553.3438,253.6281 553.5156,253.8156 553.5781,254.175 C553.7031,254.8469 553.9531,255.0969 554.4844,255.0969 C554.7656,255.0969 555.0469,254.9563 555.2344,254.7375 C555.3594,254.5656 555.4063,254.3938 555.4063,253.9563 L555.4063,252.5969 C555.4063,252.175 555.3906,252.0344 555.2656,251.8625 C555.0938,251.6125 554.8125,251.4563 554.4844,251.4563 C554.1719,251.4563 553.9688,251.5656 553.75,251.8313 C552.5781,251.3313 552.1406,251.2219 551.1875,251.2219 C548.5156,251.2219 546.5,253.2375 546.5,255.8625 L546.5,256.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="565.5" y="260.406">f</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="537.5" x2="571.5" y1="271.8" y2="271.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="537.5" x2="571.5" y1="279.8" y2="279.8"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000470228045297785394" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="81.5" y="161"/>
+      <ellipse cx="96.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M99.4688,182.6406 Q98.8906,182.9375 98.25,183.0781 Q97.6094,183.2344 96.9063,183.2344 Q94.4063,183.2344 93.0781,181.5938 Q91.7656,179.9375 91.7656,176.8125 Q91.7656,173.6875 93.0781,172.0313 Q94.4063,170.375 96.9063,170.375 Q97.6094,170.375 98.25,170.5313 Q98.9063,170.6875 99.4688,170.9844 L99.4688,173.7031 Q98.8438,173.125 98.25,172.8594 Q97.6563,172.5781 97.0313,172.5781 Q95.6875,172.5781 95,173.6563 Q94.3125,174.7188 94.3125,176.8125 Q94.3125,178.9063 95,179.9844 Q95.6875,181.0469 97.0313,181.0469 Q97.6563,181.0469 98.25,180.7813 Q98.8438,180.5 99.4688,179.9219 L99.4688,182.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="110.5" y="181.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="193" y2="193"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <g id="elem_C_0000190978367074032185">
-        <rect codeLine="67" fill="#F1F1F1" height="64.7999" id="C_0000190978367074032185" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="7.5" y="347.8"/>
-        <ellipse cx="22.5" cy="363.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M21.3594,364.8625 L22.6719,364.8625 L22.6719,364.9094 C22.6719,365.3156 22.6875,365.4719 22.7969,365.6281 C22.9688,365.8781 23.2656,366.05 23.5781,366.05 C23.8594,366.05 24.1563,365.9094 24.3281,365.6906 C24.4531,365.5031 24.5,365.3625 24.5,364.9094 L24.5,363.0656 C24.5,362.7375 24.4844,362.6281 24.4219,362.4563 C24.3125,362.1594 23.9531,361.9094 23.5781,361.9094 C23.2813,361.9094 23.0156,362.05 22.8438,362.2688 C22.7031,362.4563 22.6719,362.6281 22.6719,363.0656 L22.6719,363.1281 L21.3594,363.1281 L21.3594,360.9563 L25.2031,360.9563 L25.2031,361.7063 C25.2031,362.0969 25.2344,362.2844 25.3438,362.4406 C25.5156,362.6906 25.8125,362.8625 26.125,362.8625 C26.4219,362.8625 26.6875,362.7375 26.875,362.5031 C27.0156,362.3156 27.0469,362.175 27.0469,361.7063 L27.0469,359.2063 L19.3438,359.2063 C18.8906,359.2063 18.7656,359.2219 18.5938,359.3313 C18.3281,359.5031 18.1563,359.7688 18.1563,360.0813 C18.1563,360.3625 18.2813,360.6281 18.5313,360.8 C18.7188,360.925 18.9063,360.9563 19.3438,360.9563 L19.5313,360.9563 L19.5313,367.05 L19.3438,367.05 C18.9219,367.05 18.7656,367.0813 18.5938,367.175 C18.3281,367.3313 18.1563,367.6125 18.1563,367.9094 C18.1563,368.4875 18.5625,368.8 19.3438,368.8 L27.4219,368.8 L27.4219,366.2688 C27.4219,365.8625 27.3906,365.6906 27.2813,365.5344 C27.1094,365.2688 26.8281,365.1125 26.5,365.1125 C26.2188,365.1125 25.9375,365.2531 25.75,365.4719 C25.6094,365.6594 25.5781,365.8156 25.5781,366.2688 L25.5781,367.05 L21.3594,367.05 L21.3594,364.8625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="36.5" y="368.406">h</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8.5" x2="46.5" y1="379.8" y2="379.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="13.5" y="396.8059">hhh</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8.5" x2="46.5" y1="404.5999" y2="404.5999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001031614323468823578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="157.5" y="161"/>
+      <ellipse cx="172.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M175.4688,182.6406 Q174.8906,182.9375 174.25,183.0781 Q173.6094,183.2344 172.9063,183.2344 Q170.4063,183.2344 169.0781,181.5938 Q167.7656,179.9375 167.7656,176.8125 Q167.7656,173.6875 169.0781,172.0313 Q170.4063,170.375 172.9063,170.375 Q173.6094,170.375 174.25,170.5313 Q174.9063,170.6875 175.4688,170.9844 L175.4688,173.7031 Q174.8438,173.125 174.25,172.8594 Q173.6563,172.5781 173.0313,172.5781 Q171.6875,172.5781 171,173.6563 Q170.3125,174.7188 170.3125,176.8125 Q170.3125,178.9063 171,179.9844 Q171.6875,181.0469 173.0313,181.0469 Q173.6563,181.0469 174.25,180.7813 Q174.8438,180.5 175.4688,179.9219 L175.4688,182.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="181.1543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="193" y2="193"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <g id="elem_C_0000965083605473661435">
-        <rect codeLine="71" fill="#F1F1F1" height="64.7999" id="C_0000965083605473661435" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="83" y="347.8"/>
-        <ellipse cx="98" cy="363.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M96.8594,364.8625 L98.1719,364.8625 L98.1719,364.9094 C98.1719,365.3156 98.1875,365.4719 98.2969,365.6281 C98.4688,365.8781 98.7656,366.05 99.0781,366.05 C99.3594,366.05 99.6563,365.9094 99.8281,365.6906 C99.9531,365.5031 100,365.3625 100,364.9094 L100,363.0656 C100,362.7375 99.9844,362.6281 99.9219,362.4563 C99.8125,362.1594 99.4531,361.9094 99.0781,361.9094 C98.7813,361.9094 98.5156,362.05 98.3438,362.2688 C98.2031,362.4563 98.1719,362.6281 98.1719,363.0656 L98.1719,363.1281 L96.8594,363.1281 L96.8594,360.9563 L100.7031,360.9563 L100.7031,361.7063 C100.7031,362.0969 100.7344,362.2844 100.8438,362.4406 C101.0156,362.6906 101.3125,362.8625 101.625,362.8625 C101.9219,362.8625 102.1875,362.7375 102.375,362.5031 C102.5156,362.3156 102.5469,362.175 102.5469,361.7063 L102.5469,359.2063 L94.8438,359.2063 C94.3906,359.2063 94.2656,359.2219 94.0938,359.3313 C93.8281,359.5031 93.6563,359.7688 93.6563,360.0813 C93.6563,360.3625 93.7813,360.6281 94.0313,360.8 C94.2188,360.925 94.4063,360.9563 94.8438,360.9563 L95.0313,360.9563 L95.0313,367.05 L94.8438,367.05 C94.4219,367.05 94.2656,367.0813 94.0938,367.175 C93.8281,367.3313 93.6563,367.6125 93.6563,367.9094 C93.6563,368.4875 94.0625,368.8 94.8438,368.8 L102.9219,368.8 L102.9219,366.2688 C102.9219,365.8625 102.8906,365.6906 102.7813,365.5344 C102.6094,365.2688 102.3281,365.1125 102,365.1125 C101.7188,365.1125 101.4375,365.2531 101.25,365.4719 C101.1094,365.6594 101.0781,365.8156 101.0781,366.2688 L101.0781,367.05 L96.8594,367.05 L96.8594,364.8625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="112" y="368.406">j</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="117" y1="379.8" y2="379.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="89" y="396.8059">jjj</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="84" x2="117" y1="404.5999" y2="404.5999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="60.8047" id="C_0001473214620883985930" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="8.5" y="269"/>
+      <ellipse cx="23.5" cy="285" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M27.6094,291 L19.8906,291 L19.8906,278.6094 L27.6094,278.6094 L27.6094,280.7656 L22.3438,280.7656 L22.3438,283.4375 L27.1094,283.4375 L27.1094,285.5938 L22.3438,285.5938 L22.3438,288.8438 L27.6094,288.8438 L27.6094,291 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="37.5" y="289.1543">i</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="9.5" x2="42.5" y1="301" y2="301"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="14.5" y="315.2104">iii</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="9.5" x2="42.5" y1="321.8047" y2="321.8047"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00053_class_mermaid.svg b/docs/test_cases/t00053_class_mermaid.svg
index 30027b4b..8f8a528e 100644
--- a/docs/test_cases/t00053_class_mermaid.svg
+++ b/docs/test_cases/t00053_class_mermaid.svg
@@ -1,55 +1,50 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1531.796875 117" style="max-width: 1531.8px; background-color: white;" width="1531.796875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L4">
           <g title="b" id="classId-C_0001376344645244260547-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -76,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L6">
+        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L6">
           <g title="d" id="classId-C_0001264455164862224089-1" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -95,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L9">
+        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L9">
           <g title="g" id="classId-C_0000200227126708762001-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -114,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L12">
+        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L12">
           <g title="B" id="classId-C_0000876623970071162908-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -133,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L14">
+        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L14">
           <g title="D" id="classId-C_0000470228045297785394-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -152,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L17">
+        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L17">
           <g title="G" id="classId-C_0001031614323468823578-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -171,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L20">
+        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L20">
           <g title="i" id="classId-C_0001473214620883985930-6" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -195,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L11">
+        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L11">
           <g title="A" id="classId-C_0000322642841130459425-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -214,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L13">
+        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L13">
           <g title="C" id="classId-C_0001248473990784124468-8" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -233,7 +228,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L15">
+        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L15">
           <g title="E" id="classId-C_0001038384764221361257-9" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -252,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L16">
+        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L16">
           <g title="F" id="classId-C_0000530253748811039667-10" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -271,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L3">
+        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L3">
           <g title="a" id="classId-C_0000347629837292519144-11" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -290,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L5">
+        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L5">
           <g title="c" id="classId-C_0000504463801094568803-12" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -309,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L7">
+        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L7">
           <g title="e" id="classId-C_0000907921963776939609-13" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -328,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L8">
+        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L8">
           <g title="f" id="classId-C_0001421289128664274084-14" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -347,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L19">
+        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L19">
           <g title="h" id="classId-C_0000190978367074032185-15" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -371,7 +366,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00053/t00053.cc#L21">
+        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L21">
           <g title="j" id="classId-C_0000965083605473661435-16" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
diff --git a/docs/test_cases/t00054.md b/docs/test_cases/t00054.md
index b19c652b..735a6e90 100644
--- a/docs/test_cases/t00054.md
+++ b/docs/test_cases/t00054.md
@@ -72,7 +72,7 @@ enum class j { jjj };
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00054::a",
+      "display_name": "a",
       "id": "1158868779503074564",
       "is_abstract": false,
       "is_nested": false,
@@ -94,7 +94,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00054::b",
+      "display_name": "b",
       "id": "252416999805673718",
       "is_abstract": false,
       "is_nested": false,
@@ -115,11 +115,11 @@ enum class j { jjj };
       "type": "class"
     },
     {
-      "display_name": "clanguml::t00054::detail",
+      "display_name": "detail",
       "elements": [
         {
           "bases": [],
-          "display_name": "clanguml::t00054::detail::c",
+          "display_name": "detail::c",
           "id": "1168031834662719964",
           "is_abstract": false,
           "is_nested": false,
@@ -141,7 +141,7 @@ enum class j { jjj };
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00054::detail::d",
+          "display_name": "detail::d",
           "id": "1569559620782547158",
           "is_abstract": false,
           "is_nested": false,
@@ -163,7 +163,7 @@ enum class j { jjj };
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00054::detail::e",
+          "display_name": "detail::e",
           "id": "2037550833462858827",
           "is_abstract": false,
           "is_nested": false,
@@ -189,7 +189,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00054::f",
+      "display_name": "f",
       "id": "2123626454198320938",
       "is_abstract": false,
       "is_nested": false,
@@ -211,7 +211,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00054::g",
+      "display_name": "g",
       "id": "595494794840378320",
       "is_abstract": false,
       "is_nested": false,
@@ -233,7 +233,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00054::A",
+      "display_name": "A",
       "id": "917656824503504804",
       "is_abstract": false,
       "is_nested": false,
@@ -255,7 +255,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00054::B",
+      "display_name": "B",
       "id": "1235773045370563004",
       "is_abstract": false,
       "is_nested": false,
@@ -276,11 +276,11 @@ enum class j { jjj };
       "type": "class"
     },
     {
-      "display_name": "clanguml::t00054::detail2",
+      "display_name": "detail2",
       "elements": [
         {
           "bases": [],
-          "display_name": "clanguml::t00054::detail2::C",
+          "display_name": "detail2::C",
           "id": "540054955081677892",
           "is_abstract": false,
           "is_nested": false,
@@ -301,11 +301,11 @@ enum class j { jjj };
           "type": "class"
         },
         {
-          "display_name": "clanguml::t00054::detail2::detail3",
+          "display_name": "detail3",
           "elements": [
             {
               "bases": [],
-              "display_name": "clanguml::t00054::detail2::detail3::D",
+              "display_name": "detail2::detail3::D",
               "id": "1266390196945323478",
               "is_abstract": false,
               "is_nested": false,
@@ -327,7 +327,7 @@ enum class j { jjj };
             },
             {
               "bases": [],
-              "display_name": "clanguml::t00054::detail2::detail3::E",
+              "display_name": "detail2::detail3::E",
               "id": "134928214982255105",
               "is_abstract": false,
               "is_nested": false,
@@ -353,7 +353,7 @@ enum class j { jjj };
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00054::detail2::F",
+          "display_name": "detail2::F",
           "id": "446694692150903211",
           "is_abstract": false,
           "is_nested": false,
@@ -379,7 +379,7 @@ enum class j { jjj };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00054::G",
+      "display_name": "G",
       "id": "1365815261671395853",
       "is_abstract": false,
       "is_nested": false,
@@ -400,13 +400,13 @@ enum class j { jjj };
       "type": "class"
     },
     {
-      "display_name": "clanguml::t00054::detail4",
+      "display_name": "detail4",
       "elements": [
         {
           "constants": [
             "hhh"
           ],
-          "display_name": "clanguml::t00054::detail4::h",
+          "display_name": "detail4::h",
           "id": "1592677999268391183",
           "is_nested": false,
           "name": "h",
@@ -423,7 +423,7 @@ enum class j { jjj };
           "constants": [
             "iii"
           ],
-          "display_name": "clanguml::t00054::detail4::i",
+          "display_name": "detail4::i",
           "id": "441521323390223397",
           "is_nested": false,
           "name": "i",
@@ -440,7 +440,7 @@ enum class j { jjj };
           "constants": [
             "jjj"
           ],
-          "display_name": "clanguml::t00054::detail4::j",
+          "display_name": "detail4::j",
           "id": "499334434426587347",
           "is_nested": false,
           "name": "j",
@@ -459,6 +459,7 @@ enum class j { jjj };
     }
   ],
   "name": "t00054_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00054"
 }
diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg
index 532dd26a..e78cf148 100644
--- a/docs/test_cases/t00054_class.svg
+++ b/docs/test_cases/t00054_class.svg
@@ -1,393 +1,183 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="659px" preserveAspectRatio="none" style="width:1187px;height:659px;background:#FFFFFF;" version="1.1" viewBox="0 0 1187 659" width="1187px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:1774px;height:380px;" version="1.1" viewBox="0 0 1774 380" width="1774px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fytq19m9zy2wv" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001528412426718409492">
-      <path d="M618,49.294 L657,49.294 A3.75,3.75 0 0 1 659.5,51.794 L666.5,72.0939 L776,72.0939 A2.5,2.5 0 0 1 778.5,74.5939 L778.5,269.794 A2.5,2.5 0 0 1 776,272.294 L618,272.294 A2.5,2.5 0 0 1 615.5,269.794 L615.5,51.794 A2.5,2.5 0 0 1 618,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="615.5" x2="666.5" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="619.5" y="64.2999">detail</text>
-    </g>
-    <g id="cluster_C_0001254251774710725340">
-      <path d="M845,6.294 L892,6.294 A3.75,3.75 0 0 1 894.5,8.794 L901.5,29.0939 L1178,29.0939 A2.5,2.5 0 0 1 1180.5,31.5939 L1180.5,408.794 A2.5,2.5 0 0 1 1178,411.294 L845,411.294 A2.5,2.5 0 0 1 842.5,408.794 L842.5,8.794 A2.5,2.5 0 0 1 845,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="842.5" x2="901.5" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="846.5" y="21.2999">detail2</text>
-    </g>
-    <g id="cluster_C_0002287989977787433815">
-      <path d="M994,49.294 L1041,49.294 A3.75,3.75 0 0 1 1043.5,51.794 L1050.5,72.0939 L1154,72.0939 A2.5,2.5 0 0 1 1156.5,74.5939 L1156.5,161.794 A2.5,2.5 0 0 1 1154,164.294 L994,164.294 A2.5,2.5 0 0 1 991.5,161.794 L991.5,51.794 A2.5,2.5 0 0 1 994,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="991.5" x2="1050.5" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="995.5" y="64.2999">detail3</text>
-    </g>
-    <g id="cluster_C_0001966327474066391027">
-      <path d="M447,296.294 L494,296.294 A3.75,3.75 0 0 1 496.5,298.794 L503.5,319.0939 L816,319.0939 A2.5,2.5 0 0 1 818.5,321.5939 L818.5,649.994 A2.5,2.5 0 0 1 816,652.494 L447,652.494 A2.5,2.5 0 0 1 444.5,649.994 L444.5,298.794 A2.5,2.5 0 0 1 447,296.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="444.5" x2="503.5" y1="319.0939" y2="319.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="448.5" y="311.2999">detail4</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <g id="elem_C_0001569559620782547158">
-        <rect codeLine="7" fill="#F1F1F1" height="48" id="C_0001569559620782547158" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="639.5" y="92.294"/>
-        <ellipse cx="654.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M649.5,109.4502 C649.5,111.9502 651.6406,113.7627 654.5625,113.7627 C655.7969,113.7627 656.9688,113.4659 657.7188,112.9502 C658.3281,112.5284 658.6563,112.1065 658.6563,111.7002 C658.6563,111.2315 658.2344,110.8252 657.7344,110.8252 C657.5,110.8252 657.2813,110.9034 657.0781,111.1065 C656.6406,111.544 656.6406,111.544 656.4688,111.6377 C656.0156,111.8721 655.375,112.0127 654.6094,112.0127 C652.6094,112.0127 651.3281,110.9971 651.3281,109.419 L651.3281,108.3721 C651.3281,106.669 652.5469,105.4659 654.25,105.4659 C654.8281,105.4659 655.4063,105.6065 655.875,105.8565 C656.3438,106.1221 656.5156,106.3096 656.5781,106.669 C656.7031,107.3409 656.9531,107.5909 657.4844,107.5909 C657.7656,107.5909 658.0469,107.4502 658.2344,107.2315 C658.3594,107.0596 658.4063,106.8877 658.4063,106.4502 L658.4063,105.0909 C658.4063,104.669 658.3906,104.5284 658.2656,104.3565 C658.0938,104.1065 657.8125,103.9502 657.4844,103.9502 C657.1719,103.9502 656.9688,104.0596 656.75,104.3252 C655.5781,103.8252 655.1406,103.7159 654.1875,103.7159 C651.5156,103.7159 649.5,105.7315 649.5,108.3565 L649.5,109.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="668.5" y="112.9">d</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="640.5" x2="678.5" y1="124.294" y2="124.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="640.5" x2="678.5" y1="132.294" y2="132.294"/>
-      </g>
+    <polygon fill="#FFFFFF" filter="url(#fytq19m9zy2wv)" points="707,55,756,55,763,77.2969,1049,77.2969,1049,226,707,226,707,55" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="707" x2="763" y1="77.2969" y2="77.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="43" x="711" y="69.9951">detail</text>
+    <polygon fill="#FFFFFF" filter="url(#fytq19m9zy2wv)" points="1073,24,1132,24,1139,46.2969,1752,46.2969,1752,238,1073,238,1073,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="1073" x2="1139" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1077" y="38.9951">detail2</text>
+    <polygon fill="#FFFFFF" filter="url(#fytq19m9zy2wv)" points="1531,67,1590,67,1597,89.2969,1728,89.2969,1728,214,1531,214,1531,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="1531" x2="1597" y1="89.2969" y2="89.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1535" y="81.9951">detail3</text>
+    <polygon fill="#FFFFFF" filter="url(#fytq19m9zy2wv)" points="22,54,81,54,88,76.2969,377,76.2969,377,368,22,368,22,54" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="88" y1="76.2969" y2="76.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="26" y="68.9951">detail4</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0001569559620782547158" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="723" y="126"/>
+      <ellipse cx="738" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M740.9688,147.6406 Q740.3906,147.9375 739.75,148.0781 Q739.1094,148.2344 738.4063,148.2344 Q735.9063,148.2344 734.5781,146.5938 Q733.2656,144.9375 733.2656,141.8125 Q733.2656,138.6875 734.5781,137.0313 Q735.9063,135.375 738.4063,135.375 Q739.1094,135.375 739.75,135.5313 Q740.4063,135.6875 740.9688,135.9844 L740.9688,138.7031 Q740.3438,138.125 739.75,137.8594 Q739.1563,137.5781 738.5313,137.5781 Q737.1875,137.5781 736.5,138.6563 Q735.8125,139.7188 735.8125,141.8125 Q735.8125,143.9063 736.5,144.9844 Q737.1875,146.0469 738.5313,146.0469 Q739.1563,146.0469 739.75,145.7813 Q740.3438,145.5 740.9688,144.9219 L740.9688,147.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="752" y="146.1543">d</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <g id="elem_C_0001158868779503074564">
-        <rect codeLine="12" fill="#F1F1F1" height="48" id="C_0001158868779503074564" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="714.5" y="92.294"/>
-        <ellipse cx="729.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M724.5,109.4502 C724.5,111.9502 726.6406,113.7627 729.5625,113.7627 C730.7969,113.7627 731.9688,113.4659 732.7188,112.9502 C733.3281,112.5284 733.6563,112.1065 733.6563,111.7002 C733.6563,111.2315 733.2344,110.8252 732.7344,110.8252 C732.5,110.8252 732.2813,110.9034 732.0781,111.1065 C731.6406,111.544 731.6406,111.544 731.4688,111.6377 C731.0156,111.8721 730.375,112.0127 729.6094,112.0127 C727.6094,112.0127 726.3281,110.9971 726.3281,109.419 L726.3281,108.3721 C726.3281,106.669 727.5469,105.4659 729.25,105.4659 C729.8281,105.4659 730.4063,105.6065 730.875,105.8565 C731.3438,106.1221 731.5156,106.3096 731.5781,106.669 C731.7031,107.3409 731.9531,107.5909 732.4844,107.5909 C732.7656,107.5909 733.0469,107.4502 733.2344,107.2315 C733.3594,107.0596 733.4063,106.8877 733.4063,106.4502 L733.4063,105.0909 C733.4063,104.669 733.3906,104.5284 733.2656,104.3565 C733.0938,104.1065 732.8125,103.9502 732.4844,103.9502 C732.1719,103.9502 731.9688,104.0596 731.75,104.3252 C730.5781,103.8252 730.1406,103.7159 729.1875,103.7159 C726.5156,103.7159 724.5,105.7315 724.5,108.3565 L724.5,109.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="743.5" y="112.9">a</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="715.5" x2="753.5" y1="124.294" y2="124.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="715.5" x2="753.5" y1="132.294" y2="132.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="72" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="114"/>
+      <ellipse cx="984" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M986.9688,135.6406 Q986.3906,135.9375 985.75,136.0781 Q985.1094,136.2344 984.4063,136.2344 Q981.9063,136.2344 980.5781,134.5938 Q979.2656,132.9375 979.2656,129.8125 Q979.2656,126.6875 980.5781,125.0313 Q981.9063,123.375 984.4063,123.375 Q985.1094,123.375 985.75,123.5313 Q986.4063,123.6875 986.9688,123.9844 L986.9688,126.7031 Q986.3438,126.125 985.75,125.8594 Q985.1563,125.5781 984.5313,125.5781 Q983.1875,125.5781 982.5,126.6563 Q981.8125,127.7188 981.8125,129.8125 Q981.8125,131.9063 982.5,132.9844 Q983.1875,134.0469 984.5313,134.0469 Q985.1563,134.0469 985.75,133.7813 Q986.3438,133.5 986.9688,132.9219 L986.9688,135.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="998" y="134.1543">a</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="146" y2="146"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="154" y2="154"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="162" y2="162"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="170" y2="170"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <g id="elem_C_0001168031834662719964">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001168031834662719964" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="640" y="200.294"/>
-        <ellipse cx="655" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M650,217.4502 C650,219.9502 652.1406,221.7627 655.0625,221.7627 C656.2969,221.7627 657.4688,221.4659 658.2188,220.9502 C658.8281,220.5284 659.1563,220.1065 659.1563,219.7002 C659.1563,219.2315 658.7344,218.8252 658.2344,218.8252 C658,218.8252 657.7813,218.9034 657.5781,219.1065 C657.1406,219.544 657.1406,219.544 656.9688,219.6377 C656.5156,219.8721 655.875,220.0127 655.1094,220.0127 C653.1094,220.0127 651.8281,218.9971 651.8281,217.419 L651.8281,216.3721 C651.8281,214.669 653.0469,213.4659 654.75,213.4659 C655.3281,213.4659 655.9063,213.6065 656.375,213.8565 C656.8438,214.1221 657.0156,214.3096 657.0781,214.669 C657.2031,215.3409 657.4531,215.5909 657.9844,215.5909 C658.2656,215.5909 658.5469,215.4502 658.7344,215.2315 C658.8594,215.0596 658.9063,214.8877 658.9063,214.4502 L658.9063,213.0909 C658.9063,212.669 658.8906,212.5284 658.7656,212.3565 C658.5938,212.1065 658.3125,211.9502 657.9844,211.9502 C657.6719,211.9502 657.4688,212.0596 657.25,212.3252 C656.0781,211.8252 655.6406,211.7159 654.6875,211.7159 C652.0156,211.7159 650,213.7315 650,216.3565 L650,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="669" y="220.9">c</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="641" x2="678" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="641" x2="678" y1="240.294" y2="240.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="72" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="114"/>
+      <ellipse cx="888.5" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M891.4688,135.6406 Q890.8906,135.9375 890.25,136.0781 Q889.6094,136.2344 888.9063,136.2344 Q886.4063,136.2344 885.0781,134.5938 Q883.7656,132.9375 883.7656,129.8125 Q883.7656,126.6875 885.0781,125.0313 Q886.4063,123.375 888.9063,123.375 Q889.6094,123.375 890.25,123.5313 Q890.9063,123.6875 891.4688,123.9844 L891.4688,126.7031 Q890.8438,126.125 890.25,125.8594 Q889.6563,125.5781 889.0313,125.5781 Q887.6875,125.5781 887,126.6563 Q886.3125,127.7188 886.3125,129.8125 Q886.3125,131.9063 887,132.9844 Q887.6875,134.0469 889.0313,134.0469 Q889.6563,134.0469 890.25,133.7813 Q890.8438,133.5 891.4688,132.9219 L891.4688,135.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="902.5" y="134.1543">c</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="146" y2="146"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="154" y2="154"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="162" y2="162"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="170" y2="170"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <g id="elem_C_0002037550833462858827">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0002037550833462858827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="714.5" y="200.294"/>
-        <ellipse cx="729.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M724.5,217.4502 C724.5,219.9502 726.6406,221.7627 729.5625,221.7627 C730.7969,221.7627 731.9688,221.4659 732.7188,220.9502 C733.3281,220.5284 733.6563,220.1065 733.6563,219.7002 C733.6563,219.2315 733.2344,218.8252 732.7344,218.8252 C732.5,218.8252 732.2813,218.9034 732.0781,219.1065 C731.6406,219.544 731.6406,219.544 731.4688,219.6377 C731.0156,219.8721 730.375,220.0127 729.6094,220.0127 C727.6094,220.0127 726.3281,218.9971 726.3281,217.419 L726.3281,216.3721 C726.3281,214.669 727.5469,213.4659 729.25,213.4659 C729.8281,213.4659 730.4063,213.6065 730.875,213.8565 C731.3438,214.1221 731.5156,214.3096 731.5781,214.669 C731.7031,215.3409 731.9531,215.5909 732.4844,215.5909 C732.7656,215.5909 733.0469,215.4502 733.2344,215.2315 C733.3594,215.0596 733.4063,214.8877 733.4063,214.4502 L733.4063,213.0909 C733.4063,212.669 733.3906,212.5284 733.2656,212.3565 C733.0938,212.1065 732.8125,211.9502 732.4844,211.9502 C732.1719,211.9502 731.9688,212.0596 731.75,212.3252 C730.5781,211.8252 730.1406,211.7159 729.1875,211.7159 C726.5156,211.7159 724.5,213.7315 724.5,216.3565 L724.5,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="743.5" y="220.9">e</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="715.5" x2="753.5" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="715.5" x2="753.5" y1="240.294" y2="240.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="72" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="114"/>
+      <ellipse cx="813" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M815.9688,135.6406 Q815.3906,135.9375 814.75,136.0781 Q814.1094,136.2344 813.4063,136.2344 Q810.9063,136.2344 809.5781,134.5938 Q808.2656,132.9375 808.2656,129.8125 Q808.2656,126.6875 809.5781,125.0313 Q810.9063,123.375 813.4063,123.375 Q814.1094,123.375 814.75,123.5313 Q815.4063,123.6875 815.9688,123.9844 L815.9688,126.7031 Q815.3438,126.125 814.75,125.8594 Q814.1563,125.5781 813.5313,125.5781 Q812.1875,125.5781 811.5,126.6563 Q810.8125,127.7188 810.8125,129.8125 Q810.8125,131.9063 811.5,132.9844 Q812.1875,134.0469 813.5313,134.0469 Q814.1563,134.0469 814.75,133.7813 Q815.3438,133.5 815.9688,132.9219 L815.9688,135.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827" y="134.1543">e</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="146" y2="146"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="154" y2="154"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="162" y2="162"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="170" y2="170"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000540054955081677892">
-        <rect codeLine="33" fill="#F1F1F1" height="48" id="C_0000540054955081677892" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="858.5" y="92.294"/>
-        <ellipse cx="873.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M868.5,109.4502 C868.5,111.9502 870.6406,113.7627 873.5625,113.7627 C874.7969,113.7627 875.9688,113.4659 876.7188,112.9502 C877.3281,112.5284 877.6563,112.1065 877.6563,111.7002 C877.6563,111.2315 877.2344,110.8252 876.7344,110.8252 C876.5,110.8252 876.2813,110.9034 876.0781,111.1065 C875.6406,111.544 875.6406,111.544 875.4688,111.6377 C875.0156,111.8721 874.375,112.0127 873.6094,112.0127 C871.6094,112.0127 870.3281,110.9971 870.3281,109.419 L870.3281,108.3721 C870.3281,106.669 871.5469,105.4659 873.25,105.4659 C873.8281,105.4659 874.4063,105.6065 874.875,105.8565 C875.3438,106.1221 875.5156,106.3096 875.5781,106.669 C875.7031,107.3409 875.9531,107.5909 876.4844,107.5909 C876.7656,107.5909 877.0469,107.4502 877.2344,107.2315 C877.3594,107.0596 877.4063,106.8877 877.4063,106.4502 L877.4063,105.0909 C877.4063,104.669 877.3906,104.5284 877.2656,104.3565 C877.0938,104.1065 876.8125,103.9502 876.4844,103.9502 C876.1719,103.9502 875.9688,104.0596 875.75,104.3252 C874.5781,103.8252 874.1406,103.7159 873.1875,103.7159 C870.5156,103.7159 868.5,105.7315 868.5,108.3565 L868.5,109.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="887.5" y="112.9">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="859.5" x2="899.5" y1="124.294" y2="124.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="859.5" x2="899.5" y1="132.294" y2="132.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000540054955081677892" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1209" y="126"/>
+      <ellipse cx="1224" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1226.9688,147.6406 Q1226.3906,147.9375 1225.75,148.0781 Q1225.1094,148.2344 1224.4063,148.2344 Q1221.9063,148.2344 1220.5781,146.5938 Q1219.2656,144.9375 1219.2656,141.8125 Q1219.2656,138.6875 1220.5781,137.0313 Q1221.9063,135.375 1224.4063,135.375 Q1225.1094,135.375 1225.75,135.5313 Q1226.4063,135.6875 1226.9688,135.9844 L1226.9688,138.7031 Q1226.3438,138.125 1225.75,137.8594 Q1225.1563,137.5781 1224.5313,137.5781 Q1223.1875,137.5781 1222.5,138.6563 Q1221.8125,139.7188 1221.8125,141.8125 Q1221.8125,143.9063 1222.5,144.9844 Q1223.1875,146.0469 1224.5313,146.0469 Q1225.1563,146.0469 1225.75,145.7813 Q1226.3438,145.5 1226.9688,144.9219 L1226.9688,147.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1238" y="146.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000446694692150903211">
-        <rect codeLine="49" fill="#F1F1F1" height="48" id="C_0000446694692150903211" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="935" y="92.294"/>
-        <ellipse cx="950" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M945,109.4502 C945,111.9502 947.1406,113.7627 950.0625,113.7627 C951.2969,113.7627 952.4688,113.4659 953.2188,112.9502 C953.8281,112.5284 954.1563,112.1065 954.1563,111.7002 C954.1563,111.2315 953.7344,110.8252 953.2344,110.8252 C953,110.8252 952.7813,110.9034 952.5781,111.1065 C952.1406,111.544 952.1406,111.544 951.9688,111.6377 C951.5156,111.8721 950.875,112.0127 950.1094,112.0127 C948.1094,112.0127 946.8281,110.9971 946.8281,109.419 L946.8281,108.3721 C946.8281,106.669 948.0469,105.4659 949.75,105.4659 C950.3281,105.4659 950.9063,105.6065 951.375,105.8565 C951.8438,106.1221 952.0156,106.3096 952.0781,106.669 C952.2031,107.3409 952.4531,107.5909 952.9844,107.5909 C953.2656,107.5909 953.5469,107.4502 953.7344,107.2315 C953.8594,107.0596 953.9063,106.8877 953.9063,106.4502 L953.9063,105.0909 C953.9063,104.669 953.8906,104.5284 953.7656,104.3565 C953.5938,104.1065 953.3125,103.9502 952.9844,103.9502 C952.6719,103.9502 952.4688,104.0596 952.25,104.3252 C951.0781,103.8252 950.6406,103.7159 949.6875,103.7159 C947.0156,103.7159 945,105.7315 945,108.3565 L945,109.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="964" y="112.9">F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="936" x2="975" y1="124.294" y2="124.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="936" x2="975" y1="132.294" y2="132.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000446694692150903211" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="1134.5" y="126"/>
+      <ellipse cx="1149.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1152.4688,147.6406 Q1151.8906,147.9375 1151.25,148.0781 Q1150.6094,148.2344 1149.9063,148.2344 Q1147.4063,148.2344 1146.0781,146.5938 Q1144.7656,144.9375 1144.7656,141.8125 Q1144.7656,138.6875 1146.0781,137.0313 Q1147.4063,135.375 1149.9063,135.375 Q1150.6094,135.375 1151.25,135.5313 Q1151.9063,135.6875 1152.4688,135.9844 L1152.4688,138.7031 Q1151.8438,138.125 1151.25,137.8594 Q1150.6563,137.5781 1150.0313,137.5781 Q1148.6875,137.5781 1148,138.6563 Q1147.3125,139.7188 1147.3125,141.8125 Q1147.3125,143.9063 1148,144.9844 Q1148.6875,146.0469 1150.0313,146.0469 Q1150.6563,146.0469 1151.25,145.7813 Q1151.8438,145.5 1152.4688,144.9219 L1152.4688,147.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1163.5" y="146.1543">F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000917656824503504804">
-        <rect codeLine="54" fill="#F1F1F1" height="48" id="C_0000917656824503504804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="942" y="200.294"/>
-        <ellipse cx="957" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M952,217.4502 C952,219.9502 954.1406,221.7627 957.0625,221.7627 C958.2969,221.7627 959.4688,221.4659 960.2188,220.9502 C960.8281,220.5284 961.1563,220.1065 961.1563,219.7002 C961.1563,219.2315 960.7344,218.8252 960.2344,218.8252 C960,218.8252 959.7813,218.9034 959.5781,219.1065 C959.1406,219.544 959.1406,219.544 958.9688,219.6377 C958.5156,219.8721 957.875,220.0127 957.1094,220.0127 C955.1094,220.0127 953.8281,218.9971 953.8281,217.419 L953.8281,216.3721 C953.8281,214.669 955.0469,213.4659 956.75,213.4659 C957.3281,213.4659 957.9063,213.6065 958.375,213.8565 C958.8438,214.1221 959.0156,214.3096 959.0781,214.669 C959.2031,215.3409 959.4531,215.5909 959.9844,215.5909 C960.2656,215.5909 960.5469,215.4502 960.7344,215.2315 C960.8594,215.0596 960.9063,214.8877 960.9063,214.4502 L960.9063,213.0909 C960.9063,212.669 960.8906,212.5284 960.7656,212.3565 C960.5938,212.1065 960.3125,211.9502 959.9844,211.9502 C959.6719,211.9502 959.4688,212.0596 959.25,212.3252 C958.0781,211.8252 957.6406,211.7159 956.6875,211.7159 C954.0156,211.7159 952,213.7315 952,216.3565 L952,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="971" y="220.9">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="943" x2="982" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="943" x2="982" y1="240.294" y2="240.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0001266390196945323478" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1646.5" y="126"/>
+      <ellipse cx="1661.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1664.4688,147.6406 Q1663.8906,147.9375 1663.25,148.0781 Q1662.6094,148.2344 1661.9063,148.2344 Q1659.4063,148.2344 1658.0781,146.5938 Q1656.7656,144.9375 1656.7656,141.8125 Q1656.7656,138.6875 1658.0781,137.0313 Q1659.4063,135.375 1661.9063,135.375 Q1662.6094,135.375 1663.25,135.5313 Q1663.9063,135.6875 1664.4688,135.9844 L1664.4688,138.7031 Q1663.8438,138.125 1663.25,137.8594 Q1662.6563,137.5781 1662.0313,137.5781 Q1660.6875,137.5781 1660,138.6563 Q1659.3125,139.7188 1659.3125,141.8125 Q1659.3125,143.9063 1660,144.9844 Q1660.6875,146.0469 1662.0313,146.0469 Q1662.6563,146.0469 1663.25,145.7813 Q1663.8438,145.5 1664.4688,144.9219 L1664.4688,147.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1675.5" y="146.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001235773045370563004">
-        <rect codeLine="58" fill="#F1F1F1" height="48" id="C_0001235773045370563004" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="866" y="200.294"/>
-        <ellipse cx="881" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M876,217.4502 C876,219.9502 878.1406,221.7627 881.0625,221.7627 C882.2969,221.7627 883.4688,221.4659 884.2188,220.9502 C884.8281,220.5284 885.1563,220.1065 885.1563,219.7002 C885.1563,219.2315 884.7344,218.8252 884.2344,218.8252 C884,218.8252 883.7813,218.9034 883.5781,219.1065 C883.1406,219.544 883.1406,219.544 882.9688,219.6377 C882.5156,219.8721 881.875,220.0127 881.1094,220.0127 C879.1094,220.0127 877.8281,218.9971 877.8281,217.419 L877.8281,216.3721 C877.8281,214.669 879.0469,213.4659 880.75,213.4659 C881.3281,213.4659 881.9063,213.6065 882.375,213.8565 C882.8438,214.1221 883.0156,214.3096 883.0781,214.669 C883.2031,215.3409 883.4531,215.5909 883.9844,215.5909 C884.2656,215.5909 884.5469,215.4502 884.7344,215.2315 C884.8594,215.0596 884.9063,214.8877 884.9063,214.4502 L884.9063,213.0909 C884.9063,212.669 884.8906,212.5284 884.7656,212.3565 C884.5938,212.1065 884.3125,211.9502 883.9844,211.9502 C883.6719,211.9502 883.4688,212.0596 883.25,212.3252 C882.0781,211.8252 881.6406,211.7159 880.6875,211.7159 C878.0156,211.7159 876,213.7315 876,216.3565 L876,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="895" y="220.9">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="867" x2="906" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="867" x2="906" y1="240.294" y2="240.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000134928214982255105" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1571" y="126"/>
+      <ellipse cx="1586" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1588.9688,147.6406 Q1588.3906,147.9375 1587.75,148.0781 Q1587.1094,148.2344 1586.4063,148.2344 Q1583.9063,148.2344 1582.5781,146.5938 Q1581.2656,144.9375 1581.2656,141.8125 Q1581.2656,138.6875 1582.5781,137.0313 Q1583.9063,135.375 1586.4063,135.375 Q1587.1094,135.375 1587.75,135.5313 Q1588.4063,135.6875 1588.9688,135.9844 L1588.9688,138.7031 Q1588.3438,138.125 1587.75,137.8594 Q1587.1563,137.5781 1586.5313,137.5781 Q1585.1875,137.5781 1584.5,138.6563 Q1583.8125,139.7188 1583.8125,141.8125 Q1583.8125,143.9063 1584.5,144.9844 Q1585.1875,146.0469 1586.5313,146.0469 Q1587.1563,146.0469 1587.75,145.7813 Q1588.3438,145.5 1588.9688,144.9219 L1588.9688,147.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1600" y="146.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <g id="elem_C_0001158868779503074564">
-        <rect codeLine="64" fill="#F1F1F1" height="48" id="C_0001158868779503074564" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="1018.5" y="200.294"/>
-        <ellipse cx="1033.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1028.5,217.4502 C1028.5,219.9502 1030.6406,221.7627 1033.5625,221.7627 C1034.7969,221.7627 1035.9688,221.4659 1036.7188,220.9502 C1037.3281,220.5284 1037.6563,220.1065 1037.6563,219.7002 C1037.6563,219.2315 1037.2344,218.8252 1036.7344,218.8252 C1036.5,218.8252 1036.2813,218.9034 1036.0781,219.1065 C1035.6406,219.544 1035.6406,219.544 1035.4688,219.6377 C1035.0156,219.8721 1034.375,220.0127 1033.6094,220.0127 C1031.6094,220.0127 1030.3281,218.9971 1030.3281,217.419 L1030.3281,216.3721 C1030.3281,214.669 1031.5469,213.4659 1033.25,213.4659 C1033.8281,213.4659 1034.4063,213.6065 1034.875,213.8565 C1035.3438,214.1221 1035.5156,214.3096 1035.5781,214.669 C1035.7031,215.3409 1035.9531,215.5909 1036.4844,215.5909 C1036.7656,215.5909 1037.0469,215.4502 1037.2344,215.2315 C1037.3594,215.0596 1037.4063,214.8877 1037.4063,214.4502 L1037.4063,213.0909 C1037.4063,212.669 1037.3906,212.5284 1037.2656,212.3565 C1037.0938,212.1065 1036.8125,211.9502 1036.4844,211.9502 C1036.1719,211.9502 1035.9688,212.0596 1035.75,212.3252 C1034.5781,211.8252 1034.1406,211.7159 1033.1875,211.7159 C1030.5156,211.7159 1028.5,213.7315 1028.5,216.3565 L1028.5,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="1047.5" y="220.9">a</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1019.5" x2="1057.5" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1019.5" x2="1057.5" y1="240.294" y2="240.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="64" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="118"/>
+      <ellipse cx="1466" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1468.9688,139.6406 Q1468.3906,139.9375 1467.75,140.0781 Q1467.1094,140.2344 1466.4063,140.2344 Q1463.9063,140.2344 1462.5781,138.5938 Q1461.2656,136.9375 1461.2656,133.8125 Q1461.2656,130.6875 1462.5781,129.0313 Q1463.9063,127.375 1466.4063,127.375 Q1467.1094,127.375 1467.75,127.5313 Q1468.4063,127.6875 1468.9688,127.9844 L1468.9688,130.7031 Q1468.3438,130.125 1467.75,129.8594 Q1467.1563,129.5781 1466.5313,129.5781 Q1465.1875,129.5781 1464.5,130.6563 Q1463.8125,131.7188 1463.8125,133.8125 Q1463.8125,135.9063 1464.5,136.9844 Q1465.1875,138.0469 1466.5313,138.0469 Q1467.1563,138.0469 1467.75,137.7813 Q1468.3438,137.5 1468.9688,136.9219 L1468.9688,139.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1480" y="138.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="150" y2="150"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="166" y2="166"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <g id="elem_C_0002123626454198320938">
-        <rect codeLine="68" fill="#F1F1F1" height="48" id="C_0002123626454198320938" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="1093.5" y="200.294"/>
-        <ellipse cx="1108.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1103.5,217.4502 C1103.5,219.9502 1105.6406,221.7627 1108.5625,221.7627 C1109.7969,221.7627 1110.9688,221.4659 1111.7188,220.9502 C1112.3281,220.5284 1112.6563,220.1065 1112.6563,219.7002 C1112.6563,219.2315 1112.2344,218.8252 1111.7344,218.8252 C1111.5,218.8252 1111.2813,218.9034 1111.0781,219.1065 C1110.6406,219.544 1110.6406,219.544 1110.4688,219.6377 C1110.0156,219.8721 1109.375,220.0127 1108.6094,220.0127 C1106.6094,220.0127 1105.3281,218.9971 1105.3281,217.419 L1105.3281,216.3721 C1105.3281,214.669 1106.5469,213.4659 1108.25,213.4659 C1108.8281,213.4659 1109.4063,213.6065 1109.875,213.8565 C1110.3438,214.1221 1110.5156,214.3096 1110.5781,214.669 C1110.7031,215.3409 1110.9531,215.5909 1111.4844,215.5909 C1111.7656,215.5909 1112.0469,215.4502 1112.2344,215.2315 C1112.3594,215.0596 1112.4063,214.8877 1112.4063,214.4502 L1112.4063,213.0909 C1112.4063,212.669 1112.3906,212.5284 1112.2656,212.3565 C1112.0938,212.1065 1111.8125,211.9502 1111.4844,211.9502 C1111.1719,211.9502 1110.9688,212.0596 1110.75,212.3252 C1109.5781,211.8252 1109.1406,211.7159 1108.1875,211.7159 C1105.5156,211.7159 1103.5,213.7315 1103.5,216.3565 L1103.5,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="1122.5" y="220.9">f</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1094.5" x2="1128.5" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1094.5" x2="1128.5" y1="240.294" y2="240.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="64" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="118"/>
+      <ellipse cx="1391" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1393.9688,139.6406 Q1393.3906,139.9375 1392.75,140.0781 Q1392.1094,140.2344 1391.4063,140.2344 Q1388.9063,140.2344 1387.5781,138.5938 Q1386.2656,136.9375 1386.2656,133.8125 Q1386.2656,130.6875 1387.5781,129.0313 Q1388.9063,127.375 1391.4063,127.375 Q1392.1094,127.375 1392.75,127.5313 Q1393.4063,127.6875 1393.9688,127.9844 L1393.9688,130.7031 Q1393.3438,130.125 1392.75,129.8594 Q1392.1563,129.5781 1391.5313,129.5781 Q1390.1875,129.5781 1389.5,130.6563 Q1388.8125,131.7188 1388.8125,133.8125 Q1388.8125,135.9063 1389.5,136.9844 Q1390.1875,138.0469 1391.5313,138.0469 Q1392.1563,138.0469 1392.75,137.7813 Q1393.3438,137.5 1393.9688,136.9219 L1393.9688,139.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1405" y="138.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="150" y2="150"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="166" y2="166"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <g id="elem_C_0001168031834662719964">
-        <rect codeLine="74" fill="#F1F1F1" height="48" id="C_0001168031834662719964" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="867" y="339.294"/>
-        <ellipse cx="882" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M877,356.4502 C877,358.9502 879.1406,360.7627 882.0625,360.7627 C883.2969,360.7627 884.4688,360.4659 885.2188,359.9502 C885.8281,359.5284 886.1563,359.1065 886.1563,358.7002 C886.1563,358.2315 885.7344,357.8252 885.2344,357.8252 C885,357.8252 884.7813,357.9034 884.5781,358.1065 C884.1406,358.544 884.1406,358.544 883.9688,358.6377 C883.5156,358.8721 882.875,359.0127 882.1094,359.0127 C880.1094,359.0127 878.8281,357.9971 878.8281,356.419 L878.8281,355.3721 C878.8281,353.669 880.0469,352.4659 881.75,352.4659 C882.3281,352.4659 882.9063,352.6065 883.375,352.8565 C883.8438,353.1221 884.0156,353.3096 884.0781,353.669 C884.2031,354.3409 884.4531,354.5909 884.9844,354.5909 C885.2656,354.5909 885.5469,354.4502 885.7344,354.2315 C885.8594,354.0596 885.9063,353.8877 885.9063,353.4502 L885.9063,352.0909 C885.9063,351.669 885.8906,351.5284 885.7656,351.3565 C885.5938,351.1065 885.3125,350.9502 884.9844,350.9502 C884.6719,350.9502 884.4688,351.0596 884.25,351.3252 C883.0781,350.8252 882.6406,350.7159 881.6875,350.7159 C879.0156,350.7159 877,352.7315 877,355.3565 L877,356.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="896" y="359.9">c</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="868" x2="905" y1="371.294" y2="371.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="868" x2="905" y1="379.294" y2="379.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="64" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="118"/>
+      <ellipse cx="1299" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1301.9688,139.6406 Q1301.3906,139.9375 1300.75,140.0781 Q1300.1094,140.2344 1299.4063,140.2344 Q1296.9063,140.2344 1295.5781,138.5938 Q1294.2656,136.9375 1294.2656,133.8125 Q1294.2656,130.6875 1295.5781,129.0313 Q1296.9063,127.375 1299.4063,127.375 Q1300.1094,127.375 1300.75,127.5313 Q1301.4063,127.6875 1301.9688,127.9844 L1301.9688,130.7031 Q1301.3438,130.125 1300.75,129.8594 Q1300.1563,129.5781 1299.5313,129.5781 Q1298.1875,129.5781 1297.5,130.6563 Q1296.8125,131.7188 1296.8125,133.8125 Q1296.8125,135.9063 1297.5,136.9844 Q1298.1875,138.0469 1299.5313,138.0469 Q1300.1563,138.0469 1300.75,137.7813 Q1301.3438,137.5 1301.9688,136.9219 L1301.9688,139.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="1313" y="138.1543">f</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="150" y2="150"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="166" y2="166"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <g id="elem_C_0002037550833462858827">
-        <rect codeLine="78" fill="#F1F1F1" height="48" id="C_0002037550833462858827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="941.5" y="339.294"/>
-        <ellipse cx="956.5" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M951.5,356.4502 C951.5,358.9502 953.6406,360.7627 956.5625,360.7627 C957.7969,360.7627 958.9688,360.4659 959.7188,359.9502 C960.3281,359.5284 960.6563,359.1065 960.6563,358.7002 C960.6563,358.2315 960.2344,357.8252 959.7344,357.8252 C959.5,357.8252 959.2813,357.9034 959.0781,358.1065 C958.6406,358.544 958.6406,358.544 958.4688,358.6377 C958.0156,358.8721 957.375,359.0127 956.6094,359.0127 C954.6094,359.0127 953.3281,357.9971 953.3281,356.419 L953.3281,355.3721 C953.3281,353.669 954.5469,352.4659 956.25,352.4659 C956.8281,352.4659 957.4063,352.6065 957.875,352.8565 C958.3438,353.1221 958.5156,353.3096 958.5781,353.669 C958.7031,354.3409 958.9531,354.5909 959.4844,354.5909 C959.7656,354.5909 960.0469,354.4502 960.2344,354.2315 C960.3594,354.0596 960.4063,353.8877 960.4063,353.4502 L960.4063,352.0909 C960.4063,351.669 960.3906,351.5284 960.2656,351.3565 C960.0938,351.1065 959.8125,350.9502 959.4844,350.9502 C959.1719,350.9502 958.9688,351.0596 958.75,351.3252 C957.5781,350.8252 957.1406,350.7159 956.1875,350.7159 C953.5156,350.7159 951.5,352.7315 951.5,355.3565 L951.5,356.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="970.5" y="359.9">e</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="942.5" x2="980.5" y1="371.294" y2="371.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="942.5" x2="980.5" y1="379.294" y2="379.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="56" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="122"/>
+      <ellipse cx="310.5" cy="138" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M313.4688,143.6406 Q312.8906,143.9375 312.25,144.0781 Q311.6094,144.2344 310.9063,144.2344 Q308.4063,144.2344 307.0781,142.5938 Q305.7656,140.9375 305.7656,137.8125 Q305.7656,134.6875 307.0781,133.0313 Q308.4063,131.375 310.9063,131.375 Q311.6094,131.375 312.25,131.5313 Q312.9063,131.6875 313.4688,131.9844 L313.4688,134.7031 Q312.8438,134.125 312.25,133.8594 Q311.6563,133.5781 311.0313,133.5781 Q309.6875,133.5781 309,134.6563 Q308.3125,135.7188 308.3125,137.8125 Q308.3125,139.9063 309,140.9844 Q309.6875,142.0469 311.0313,142.0469 Q311.6563,142.0469 312.25,141.7813 Q312.8438,141.5 313.4688,140.9219 L313.4688,143.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="324.5" y="142.1543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="154" y2="154"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="162" y2="162"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="170" y2="170"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001266390196945323478">
-        <rect codeLine="39" fill="#F1F1F1" height="48" id="C_0001266390196945323478" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="1090.5" y="92.294"/>
-        <ellipse cx="1105.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1100.5,109.4502 C1100.5,111.9502 1102.6406,113.7627 1105.5625,113.7627 C1106.7969,113.7627 1107.9688,113.4659 1108.7188,112.9502 C1109.3281,112.5284 1109.6563,112.1065 1109.6563,111.7002 C1109.6563,111.2315 1109.2344,110.8252 1108.7344,110.8252 C1108.5,110.8252 1108.2813,110.9034 1108.0781,111.1065 C1107.6406,111.544 1107.6406,111.544 1107.4688,111.6377 C1107.0156,111.8721 1106.375,112.0127 1105.6094,112.0127 C1103.6094,112.0127 1102.3281,110.9971 1102.3281,109.419 L1102.3281,108.3721 C1102.3281,106.669 1103.5469,105.4659 1105.25,105.4659 C1105.8281,105.4659 1106.4063,105.6065 1106.875,105.8565 C1107.3438,106.1221 1107.5156,106.3096 1107.5781,106.669 C1107.7031,107.3409 1107.9531,107.5909 1108.4844,107.5909 C1108.7656,107.5909 1109.0469,107.4502 1109.2344,107.2315 C1109.3594,107.0596 1109.4063,106.8877 1109.4063,106.4502 L1109.4063,105.0909 C1109.4063,104.669 1109.3906,104.5284 1109.2656,104.3565 C1109.0938,104.1065 1108.8125,103.9502 1108.4844,103.9502 C1108.1719,103.9502 1107.9688,104.0596 1107.75,104.3252 C1106.5781,103.8252 1106.1406,103.7159 1105.1875,103.7159 C1102.5156,103.7159 1100.5,105.7315 1100.5,108.3565 L1100.5,109.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1119.5" y="112.9">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1091.5" x2="1131.5" y1="124.294" y2="124.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1091.5" x2="1131.5" y1="132.294" y2="132.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="73.6094" id="C_0001592677999268391183" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="128" y="113"/>
+      <ellipse cx="143" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M147.1094,135 L139.3906,135 L139.3906,122.6094 L147.1094,122.6094 L147.1094,124.7656 L141.8438,124.7656 L141.8438,127.4375 L146.6094,127.4375 L146.6094,129.5938 L141.8438,129.5938 L141.8438,132.8438 L147.1094,132.8438 L147.1094,135 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157" y="133.1543">h</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="167" y1="145" y2="145"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="134" y="159.2104">hhh</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="134" y="172.0151">hhh</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="167" y1="178.6094" y2="178.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0000134928214982255105">
-        <rect codeLine="43" fill="#F1F1F1" height="48" id="C_0000134928214982255105" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1015" y="92.294"/>
-        <ellipse cx="1030" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1025,109.4502 C1025,111.9502 1027.1406,113.7627 1030.0625,113.7627 C1031.2969,113.7627 1032.4688,113.4659 1033.2188,112.9502 C1033.8281,112.5284 1034.1563,112.1065 1034.1563,111.7002 C1034.1563,111.2315 1033.7344,110.8252 1033.2344,110.8252 C1033,110.8252 1032.7813,110.9034 1032.5781,111.1065 C1032.1406,111.544 1032.1406,111.544 1031.9688,111.6377 C1031.5156,111.8721 1030.875,112.0127 1030.1094,112.0127 C1028.1094,112.0127 1026.8281,110.9971 1026.8281,109.419 L1026.8281,108.3721 C1026.8281,106.669 1028.0469,105.4659 1029.75,105.4659 C1030.3281,105.4659 1030.9063,105.6065 1031.375,105.8565 C1031.8438,106.1221 1032.0156,106.3096 1032.0781,106.669 C1032.2031,107.3409 1032.4531,107.5909 1032.9844,107.5909 C1033.2656,107.5909 1033.5469,107.4502 1033.7344,107.2315 C1033.8594,107.0596 1033.9063,106.8877 1033.9063,106.4502 L1033.9063,105.0909 C1033.9063,104.669 1033.8906,104.5284 1033.7656,104.3565 C1033.5938,104.1065 1033.3125,103.9502 1032.9844,103.9502 C1032.6719,103.9502 1032.4688,104.0596 1032.25,104.3252 C1031.0781,103.8252 1030.6406,103.7159 1029.6875,103.7159 C1027.0156,103.7159 1025,105.7315 1025,108.3565 L1025,109.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1044" y="112.9">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1016" x2="1055" y1="124.294" y2="124.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1016" x2="1055" y1="132.294" y2="132.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="73.6094" id="C_0000441521323390223397" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="203.5" y="113"/>
+      <ellipse cx="218.5" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M222.6094,135 L214.8906,135 L214.8906,122.6094 L222.6094,122.6094 L222.6094,124.7656 L217.3438,124.7656 L217.3438,127.4375 L222.1094,127.4375 L222.1094,129.5938 L217.3438,129.5938 L217.3438,132.8438 L222.6094,132.8438 L222.6094,135 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="232.5" y="133.1543">i</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="237.5" y1="145" y2="145"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="159.2104">iii</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="172.0151">iii</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="237.5" y1="178.6094" y2="178.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000917656824503504804">
-        <rect codeLine="86" fill="#F1F1F1" height="48" id="C_0000917656824503504804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="600" y="339.294"/>
-        <ellipse cx="615" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M610,356.4502 C610,358.9502 612.1406,360.7627 615.0625,360.7627 C616.2969,360.7627 617.4688,360.4659 618.2188,359.9502 C618.8281,359.5284 619.1563,359.1065 619.1563,358.7002 C619.1563,358.2315 618.7344,357.8252 618.2344,357.8252 C618,357.8252 617.7813,357.9034 617.5781,358.1065 C617.1406,358.544 617.1406,358.544 616.9688,358.6377 C616.5156,358.8721 615.875,359.0127 615.1094,359.0127 C613.1094,359.0127 611.8281,357.9971 611.8281,356.419 L611.8281,355.3721 C611.8281,353.669 613.0469,352.4659 614.75,352.4659 C615.3281,352.4659 615.9063,352.6065 616.375,352.8565 C616.8438,353.1221 617.0156,353.3096 617.0781,353.669 C617.2031,354.3409 617.4531,354.5909 617.9844,354.5909 C618.2656,354.5909 618.5469,354.4502 618.7344,354.2315 C618.8594,354.0596 618.9063,353.8877 618.9063,353.4502 L618.9063,352.0909 C618.9063,351.669 618.8906,351.5284 618.7656,351.3565 C618.5938,351.1065 618.3125,350.9502 617.9844,350.9502 C617.6719,350.9502 617.4688,351.0596 617.25,351.3252 C616.0781,350.8252 615.6406,350.7159 614.6875,350.7159 C612.0156,350.7159 610,352.7315 610,355.3565 L610,356.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="629" y="359.9">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="601" x2="640" y1="371.294" y2="371.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="601" x2="640" y1="379.294" y2="379.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="73.6094" id="C_0000499334434426587347" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="130.5" y="254"/>
+      <ellipse cx="145.5" cy="270" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M149.6094,276 L141.8906,276 L141.8906,263.6094 L149.6094,263.6094 L149.6094,265.7656 L144.3438,265.7656 L144.3438,268.4375 L149.1094,268.4375 L149.1094,270.5938 L144.3438,270.5938 L144.3438,273.8438 L149.6094,273.8438 L149.6094,276 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="159.5" y="274.1543">j</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="164.5" y1="286" y2="286"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="136.5" y="300.2104">jjj</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="136.5" y="313.0151">jjj</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="164.5" y1="319.6094" y2="319.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001235773045370563004">
-        <rect codeLine="90" fill="#F1F1F1" height="48" id="C_0001235773045370563004" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="676" y="339.294"/>
-        <ellipse cx="691" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M686,356.4502 C686,358.9502 688.1406,360.7627 691.0625,360.7627 C692.2969,360.7627 693.4688,360.4659 694.2188,359.9502 C694.8281,359.5284 695.1563,359.1065 695.1563,358.7002 C695.1563,358.2315 694.7344,357.8252 694.2344,357.8252 C694,357.8252 693.7813,357.9034 693.5781,358.1065 C693.1406,358.544 693.1406,358.544 692.9688,358.6377 C692.5156,358.8721 691.875,359.0127 691.1094,359.0127 C689.1094,359.0127 687.8281,357.9971 687.8281,356.419 L687.8281,355.3721 C687.8281,353.669 689.0469,352.4659 690.75,352.4659 C691.3281,352.4659 691.9063,352.6065 692.375,352.8565 C692.8438,353.1221 693.0156,353.3096 693.0781,353.669 C693.2031,354.3409 693.4531,354.5909 693.9844,354.5909 C694.2656,354.5909 694.5469,354.4502 694.7344,354.2315 C694.8594,354.0596 694.9063,353.8877 694.9063,353.4502 L694.9063,352.0909 C694.9063,351.669 694.8906,351.5284 694.7656,351.3565 C694.5938,351.1065 694.3125,350.9502 693.9844,350.9502 C693.6719,350.9502 693.4688,351.0596 693.25,351.3252 C692.0781,350.8252 691.6406,350.7159 690.6875,350.7159 C688.0156,350.7159 686,352.7315 686,355.3565 L686,356.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="705" y="359.9">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="677" x2="716" y1="371.294" y2="371.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="677" x2="716" y1="379.294" y2="379.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000252416999805673718" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="573" y="126"/>
+      <ellipse cx="588" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M590.9688,147.6406 Q590.3906,147.9375 589.75,148.0781 Q589.1094,148.2344 588.4063,148.2344 Q585.9063,148.2344 584.5781,146.5938 Q583.2656,144.9375 583.2656,141.8125 Q583.2656,138.6875 584.5781,137.0313 Q585.9063,135.375 588.4063,135.375 Q589.1094,135.375 589.75,135.5313 Q590.4063,135.6875 590.9688,135.9844 L590.9688,138.7031 Q590.3438,138.125 589.75,137.8594 Q589.1563,137.5781 588.5313,137.5781 Q587.1875,137.5781 586.5,138.6563 Q585.8125,139.7188 585.8125,141.8125 Q585.8125,143.9063 586.5,144.9844 Q587.1875,146.0469 588.5313,146.0469 Q589.1563,146.0469 589.75,145.7813 Q590.3438,145.5 590.9688,144.9219 L590.9688,147.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="602" y="146.1543">b</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0001365815261671395853">
-        <rect codeLine="94" fill="#F1F1F1" height="48" id="C_0001365815261671395853" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="752" y="339.294"/>
-        <ellipse cx="767" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M762,356.4502 C762,358.9502 764.1406,360.7627 767.0625,360.7627 C768.2969,360.7627 769.4688,360.4659 770.2188,359.9502 C770.8281,359.5284 771.1563,359.1065 771.1563,358.7002 C771.1563,358.2315 770.7344,357.8252 770.2344,357.8252 C770,357.8252 769.7813,357.9034 769.5781,358.1065 C769.1406,358.544 769.1406,358.544 768.9688,358.6377 C768.5156,358.8721 767.875,359.0127 767.1094,359.0127 C765.1094,359.0127 763.8281,357.9971 763.8281,356.419 L763.8281,355.3721 C763.8281,353.669 765.0469,352.4659 766.75,352.4659 C767.3281,352.4659 767.9063,352.6065 768.375,352.8565 C768.8438,353.1221 769.0156,353.3096 769.0781,353.669 C769.2031,354.3409 769.4531,354.5909 769.9844,354.5909 C770.2656,354.5909 770.5469,354.4502 770.7344,354.2315 C770.8594,354.0596 770.9063,353.8877 770.9063,353.4502 L770.9063,352.0909 C770.9063,351.669 770.8906,351.5284 770.7656,351.3565 C770.5938,351.1065 770.3125,350.9502 769.9844,350.9502 C769.6719,350.9502 769.4688,351.0596 769.25,351.3252 C768.0781,350.8252 767.6406,350.7159 766.6875,350.7159 C764.0156,350.7159 762,352.7315 762,355.3565 L762,356.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="781" y="359.9">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="753" x2="794" y1="371.294" y2="371.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="753" x2="794" y1="379.294" y2="379.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <g id="elem_C_0001158868779503074564">
-        <rect codeLine="100" fill="#F1F1F1" height="48" id="C_0001158868779503074564" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="754.5" y="464.094"/>
-        <ellipse cx="769.5" cy="480.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M764.5,481.2502 C764.5,483.7502 766.6406,485.5627 769.5625,485.5627 C770.7969,485.5627 771.9688,485.2659 772.7188,484.7502 C773.3281,484.3284 773.6563,483.9065 773.6563,483.5002 C773.6563,483.0315 773.2344,482.6252 772.7344,482.6252 C772.5,482.6252 772.2813,482.7034 772.0781,482.9065 C771.6406,483.344 771.6406,483.344 771.4688,483.4377 C771.0156,483.6721 770.375,483.8127 769.6094,483.8127 C767.6094,483.8127 766.3281,482.7971 766.3281,481.219 L766.3281,480.1721 C766.3281,478.469 767.5469,477.2659 769.25,477.2659 C769.8281,477.2659 770.4063,477.4065 770.875,477.6565 C771.3438,477.9221 771.5156,478.1096 771.5781,478.469 C771.7031,479.1409 771.9531,479.3909 772.4844,479.3909 C772.7656,479.3909 773.0469,479.2502 773.2344,479.0315 C773.3594,478.8596 773.4063,478.6877 773.4063,478.2502 L773.4063,476.8909 C773.4063,476.469 773.3906,476.3284 773.2656,476.1565 C773.0938,475.9065 772.8125,475.7502 772.4844,475.7502 C772.1719,475.7502 771.9688,475.8596 771.75,476.1252 C770.5781,475.6252 770.1406,475.5159 769.1875,475.5159 C766.5156,475.5159 764.5,477.5315 764.5,480.1565 L764.5,481.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="783.5" y="484.7">a</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="755.5" x2="793.5" y1="496.094" y2="496.094"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="755.5" x2="793.5" y1="504.094" y2="504.094"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <g id="elem_C_0002123626454198320938">
-        <rect codeLine="104" fill="#F1F1F1" height="48" id="C_0002123626454198320938" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="683.5" y="464.094"/>
-        <ellipse cx="698.5" cy="480.094" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M693.5,481.2502 C693.5,483.7502 695.6406,485.5627 698.5625,485.5627 C699.7969,485.5627 700.9688,485.2659 701.7188,484.7502 C702.3281,484.3284 702.6563,483.9065 702.6563,483.5002 C702.6563,483.0315 702.2344,482.6252 701.7344,482.6252 C701.5,482.6252 701.2813,482.7034 701.0781,482.9065 C700.6406,483.344 700.6406,483.344 700.4688,483.4377 C700.0156,483.6721 699.375,483.8127 698.6094,483.8127 C696.6094,483.8127 695.3281,482.7971 695.3281,481.219 L695.3281,480.1721 C695.3281,478.469 696.5469,477.2659 698.25,477.2659 C698.8281,477.2659 699.4063,477.4065 699.875,477.6565 C700.3438,477.9221 700.5156,478.1096 700.5781,478.469 C700.7031,479.1409 700.9531,479.3909 701.4844,479.3909 C701.7656,479.3909 702.0469,479.2502 702.2344,479.0315 C702.3594,478.8596 702.4063,478.6877 702.4063,478.2502 L702.4063,476.8909 C702.4063,476.469 702.3906,476.3284 702.2656,476.1565 C702.0938,475.9065 701.8125,475.7502 701.4844,475.7502 C701.1719,475.7502 700.9688,475.8596 700.75,476.1252 C699.5781,475.6252 699.1406,475.5159 698.1875,475.5159 C695.5156,475.5159 693.5,477.5315 693.5,480.1565 L693.5,481.2502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="712.5" y="484.7">f</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="684.5" x2="718.5" y1="496.094" y2="496.094"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="684.5" x2="718.5" y1="504.094" y2="504.094"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <g id="elem_C_0001592677999268391183">
-        <rect codeLine="110" fill="#F1F1F1" height="64.7999" id="C_0001592677999268391183" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="468.5" y="455.694"/>
-        <ellipse cx="483.5" cy="471.694" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M482.3594,472.7565 L483.6719,472.7565 L483.6719,472.8034 C483.6719,473.2096 483.6875,473.3659 483.7969,473.5221 C483.9688,473.7721 484.2656,473.944 484.5781,473.944 C484.8594,473.944 485.1563,473.8034 485.3281,473.5846 C485.4531,473.3971 485.5,473.2565 485.5,472.8034 L485.5,470.9596 C485.5,470.6315 485.4844,470.5221 485.4219,470.3502 C485.3125,470.0534 484.9531,469.8034 484.5781,469.8034 C484.2813,469.8034 484.0156,469.944 483.8438,470.1627 C483.7031,470.3502 483.6719,470.5221 483.6719,470.9596 L483.6719,471.0221 L482.3594,471.0221 L482.3594,468.8502 L486.2031,468.8502 L486.2031,469.6002 C486.2031,469.9909 486.2344,470.1784 486.3438,470.3346 C486.5156,470.5846 486.8125,470.7565 487.125,470.7565 C487.4219,470.7565 487.6875,470.6315 487.875,470.3971 C488.0156,470.2096 488.0469,470.069 488.0469,469.6002 L488.0469,467.1002 L480.3438,467.1002 C479.8906,467.1002 479.7656,467.1159 479.5938,467.2252 C479.3281,467.3971 479.1563,467.6627 479.1563,467.9752 C479.1563,468.2565 479.2813,468.5221 479.5313,468.694 C479.7188,468.819 479.9063,468.8502 480.3438,468.8502 L480.5313,468.8502 L480.5313,474.944 L480.3438,474.944 C479.9219,474.944 479.7656,474.9752 479.5938,475.069 C479.3281,475.2252 479.1563,475.5065 479.1563,475.8034 C479.1563,476.3815 479.5625,476.694 480.3438,476.694 L488.4219,476.694 L488.4219,474.1627 C488.4219,473.7565 488.3906,473.5846 488.2813,473.4284 C488.1094,473.1627 487.8281,473.0065 487.5,473.0065 C487.2188,473.0065 486.9375,473.1471 486.75,473.3659 C486.6094,473.5534 486.5781,473.7096 486.5781,474.1627 L486.5781,474.944 L482.3594,474.944 L482.3594,472.7565 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="497.5" y="476.3">h</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="469.5" x2="507.5" y1="487.694" y2="487.694"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="474.5" y="504.6999">hhh</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="469.5" x2="507.5" y1="512.4939" y2="512.4939"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <g id="elem_C_0000441521323390223397">
-        <rect codeLine="114" fill="#F1F1F1" height="64.7999" id="C_0000441521323390223397" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="544" y="455.694"/>
-        <ellipse cx="559" cy="471.694" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M557.8594,472.7565 L559.1719,472.7565 L559.1719,472.8034 C559.1719,473.2096 559.1875,473.3659 559.2969,473.5221 C559.4688,473.7721 559.7656,473.944 560.0781,473.944 C560.3594,473.944 560.6563,473.8034 560.8281,473.5846 C560.9531,473.3971 561,473.2565 561,472.8034 L561,470.9596 C561,470.6315 560.9844,470.5221 560.9219,470.3502 C560.8125,470.0534 560.4531,469.8034 560.0781,469.8034 C559.7813,469.8034 559.5156,469.944 559.3438,470.1627 C559.2031,470.3502 559.1719,470.5221 559.1719,470.9596 L559.1719,471.0221 L557.8594,471.0221 L557.8594,468.8502 L561.7031,468.8502 L561.7031,469.6002 C561.7031,469.9909 561.7344,470.1784 561.8438,470.3346 C562.0156,470.5846 562.3125,470.7565 562.625,470.7565 C562.9219,470.7565 563.1875,470.6315 563.375,470.3971 C563.5156,470.2096 563.5469,470.069 563.5469,469.6002 L563.5469,467.1002 L555.8438,467.1002 C555.3906,467.1002 555.2656,467.1159 555.0938,467.2252 C554.8281,467.3971 554.6563,467.6627 554.6563,467.9752 C554.6563,468.2565 554.7813,468.5221 555.0313,468.694 C555.2188,468.819 555.4063,468.8502 555.8438,468.8502 L556.0313,468.8502 L556.0313,474.944 L555.8438,474.944 C555.4219,474.944 555.2656,474.9752 555.0938,475.069 C554.8281,475.2252 554.6563,475.5065 554.6563,475.8034 C554.6563,476.3815 555.0625,476.694 555.8438,476.694 L563.9219,476.694 L563.9219,474.1627 C563.9219,473.7565 563.8906,473.5846 563.7813,473.4284 C563.6094,473.1627 563.3281,473.0065 563,473.0065 C562.7188,473.0065 562.4375,473.1471 562.25,473.3659 C562.1094,473.5534 562.0781,473.7096 562.0781,474.1627 L562.0781,474.944 L557.8594,474.944 L557.8594,472.7565 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="573" y="476.3">i</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="545" x2="578" y1="487.694" y2="487.694"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="550" y="504.6999">iii</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="545" x2="578" y1="512.4939" y2="512.4939"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <g id="elem_C_0000499334434426587347">
-        <rect codeLine="118" fill="#F1F1F1" height="64.7999" id="C_0000499334434426587347" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="614" y="455.694"/>
-        <ellipse cx="629" cy="471.694" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M627.8594,472.7565 L629.1719,472.7565 L629.1719,472.8034 C629.1719,473.2096 629.1875,473.3659 629.2969,473.5221 C629.4688,473.7721 629.7656,473.944 630.0781,473.944 C630.3594,473.944 630.6563,473.8034 630.8281,473.5846 C630.9531,473.3971 631,473.2565 631,472.8034 L631,470.9596 C631,470.6315 630.9844,470.5221 630.9219,470.3502 C630.8125,470.0534 630.4531,469.8034 630.0781,469.8034 C629.7813,469.8034 629.5156,469.944 629.3438,470.1627 C629.2031,470.3502 629.1719,470.5221 629.1719,470.9596 L629.1719,471.0221 L627.8594,471.0221 L627.8594,468.8502 L631.7031,468.8502 L631.7031,469.6002 C631.7031,469.9909 631.7344,470.1784 631.8438,470.3346 C632.0156,470.5846 632.3125,470.7565 632.625,470.7565 C632.9219,470.7565 633.1875,470.6315 633.375,470.3971 C633.5156,470.2096 633.5469,470.069 633.5469,469.6002 L633.5469,467.1002 L625.8438,467.1002 C625.3906,467.1002 625.2656,467.1159 625.0938,467.2252 C624.8281,467.3971 624.6563,467.6627 624.6563,467.9752 C624.6563,468.2565 624.7813,468.5221 625.0313,468.694 C625.2188,468.819 625.4063,468.8502 625.8438,468.8502 L626.0313,468.8502 L626.0313,474.944 L625.8438,474.944 C625.4219,474.944 625.2656,474.9752 625.0938,475.069 C624.8281,475.2252 624.6563,475.5065 624.6563,475.8034 C624.6563,476.3815 625.0625,476.694 625.8438,476.694 L633.9219,476.694 L633.9219,474.1627 C633.9219,473.7565 633.8906,473.5846 633.7813,473.4284 C633.6094,473.1627 633.3281,473.0065 633,473.0065 C632.7188,473.0065 632.4375,473.1471 632.25,473.3659 C632.1094,473.5534 632.0781,473.7096 632.0781,474.1627 L632.0781,474.944 L627.8594,474.944 L627.8594,472.7565 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="643" y="476.3">j</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="648" y1="487.694" y2="487.694"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="620" y="504.6999">jjj</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="648" y1="512.4939" y2="512.4939"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <g id="elem_C_0001168031834662719964">
-        <rect codeLine="124" fill="#F1F1F1" height="48" id="C_0001168031834662719964" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="680" y="580.494"/>
-        <ellipse cx="695" cy="596.494" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M690,597.6502 C690,600.1502 692.1406,601.9627 695.0625,601.9627 C696.2969,601.9627 697.4688,601.6659 698.2188,601.1502 C698.8281,600.7284 699.1563,600.3065 699.1563,599.9002 C699.1563,599.4315 698.7344,599.0252 698.2344,599.0252 C698,599.0252 697.7813,599.1034 697.5781,599.3065 C697.1406,599.744 697.1406,599.744 696.9688,599.8377 C696.5156,600.0721 695.875,600.2127 695.1094,600.2127 C693.1094,600.2127 691.8281,599.1971 691.8281,597.619 L691.8281,596.5721 C691.8281,594.869 693.0469,593.6659 694.75,593.6659 C695.3281,593.6659 695.9063,593.8065 696.375,594.0565 C696.8438,594.3221 697.0156,594.5096 697.0781,594.869 C697.2031,595.5409 697.4531,595.7909 697.9844,595.7909 C698.2656,595.7909 698.5469,595.6502 698.7344,595.4315 C698.8594,595.2596 698.9063,595.0877 698.9063,594.6502 L698.9063,593.2909 C698.9063,592.869 698.8906,592.7284 698.7656,592.5565 C698.5938,592.3065 698.3125,592.1502 697.9844,592.1502 C697.6719,592.1502 697.4688,592.2596 697.25,592.5252 C696.0781,592.0252 695.6406,591.9159 694.6875,591.9159 C692.0156,591.9159 690,593.9315 690,596.5565 L690,597.6502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="709" y="601.1">c</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="681" x2="718" y1="612.494" y2="612.494"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="681" x2="718" y1="620.494" y2="620.494"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <g id="elem_C_0002037550833462858827">
-        <rect codeLine="128" fill="#F1F1F1" height="48" id="C_0002037550833462858827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="754.5" y="580.494"/>
-        <ellipse cx="769.5" cy="596.494" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M764.5,597.6502 C764.5,600.1502 766.6406,601.9627 769.5625,601.9627 C770.7969,601.9627 771.9688,601.6659 772.7188,601.1502 C773.3281,600.7284 773.6563,600.3065 773.6563,599.9002 C773.6563,599.4315 773.2344,599.0252 772.7344,599.0252 C772.5,599.0252 772.2813,599.1034 772.0781,599.3065 C771.6406,599.744 771.6406,599.744 771.4688,599.8377 C771.0156,600.0721 770.375,600.2127 769.6094,600.2127 C767.6094,600.2127 766.3281,599.1971 766.3281,597.619 L766.3281,596.5721 C766.3281,594.869 767.5469,593.6659 769.25,593.6659 C769.8281,593.6659 770.4063,593.8065 770.875,594.0565 C771.3438,594.3221 771.5156,594.5096 771.5781,594.869 C771.7031,595.5409 771.9531,595.7909 772.4844,595.7909 C772.7656,595.7909 773.0469,595.6502 773.2344,595.4315 C773.3594,595.2596 773.4063,595.0877 773.4063,594.6502 L773.4063,593.2909 C773.4063,592.869 773.3906,592.7284 773.2656,592.5565 C773.0938,592.3065 772.8125,592.1502 772.4844,592.1502 C772.1719,592.1502 771.9688,592.2596 771.75,592.5252 C770.5781,592.0252 770.1406,591.9159 769.1875,591.9159 C766.5156,591.9159 764.5,593.9315 764.5,596.5565 L764.5,597.6502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="783.5" y="601.1">e</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="755.5" x2="793.5" y1="612.494" y2="612.494"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="755.5" x2="793.5" y1="620.494" y2="620.494"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <g id="elem_C_0000252416999805673718">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000252416999805673718" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="9.5" y="92.294"/>
-        <ellipse cx="24.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M19.5,109.4502 C19.5,111.9502 21.6406,113.7627 24.5625,113.7627 C25.7969,113.7627 26.9688,113.4659 27.7188,112.9502 C28.3281,112.5284 28.6563,112.1065 28.6563,111.7002 C28.6563,111.2315 28.2344,110.8252 27.7344,110.8252 C27.5,110.8252 27.2813,110.9034 27.0781,111.1065 C26.6406,111.544 26.6406,111.544 26.4688,111.6377 C26.0156,111.8721 25.375,112.0127 24.6094,112.0127 C22.6094,112.0127 21.3281,110.9971 21.3281,109.419 L21.3281,108.3721 C21.3281,106.669 22.5469,105.4659 24.25,105.4659 C24.8281,105.4659 25.4063,105.6065 25.875,105.8565 C26.3438,106.1221 26.5156,106.3096 26.5781,106.669 C26.7031,107.3409 26.9531,107.5909 27.4844,107.5909 C27.7656,107.5909 28.0469,107.4502 28.2344,107.2315 C28.3594,107.0596 28.4063,106.8877 28.4063,106.4502 L28.4063,105.0909 C28.4063,104.669 28.3906,104.5284 28.2656,104.3565 C28.0938,104.1065 27.8125,103.9502 27.4844,103.9502 C27.1719,103.9502 26.9688,104.0596 26.75,104.3252 C25.5781,103.8252 25.1406,103.7159 24.1875,103.7159 C21.5156,103.7159 19.5,105.7315 19.5,108.3565 L19.5,109.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="38.5" y="112.9">b</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="10.5" x2="48.5" y1="124.294" y2="124.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="10.5" x2="48.5" y1="132.294" y2="132.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <g id="elem_C_0000595494794840378320">
-        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0000595494794840378320" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="84.5" y="92.294"/>
-        <ellipse cx="99.5" cy="108.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M94.5,109.4502 C94.5,111.9502 96.6406,113.7627 99.5625,113.7627 C100.7969,113.7627 101.9688,113.4659 102.7188,112.9502 C103.3281,112.5284 103.6563,112.1065 103.6563,111.7002 C103.6563,111.2315 103.2344,110.8252 102.7344,110.8252 C102.5,110.8252 102.2813,110.9034 102.0781,111.1065 C101.6406,111.544 101.6406,111.544 101.4688,111.6377 C101.0156,111.8721 100.375,112.0127 99.6094,112.0127 C97.6094,112.0127 96.3281,110.9971 96.3281,109.419 L96.3281,108.3721 C96.3281,106.669 97.5469,105.4659 99.25,105.4659 C99.8281,105.4659 100.4063,105.6065 100.875,105.8565 C101.3438,106.1221 101.5156,106.3096 101.5781,106.669 C101.7031,107.3409 101.9531,107.5909 102.4844,107.5909 C102.7656,107.5909 103.0469,107.4502 103.2344,107.2315 C103.3594,107.0596 103.4063,106.8877 103.4063,106.4502 L103.4063,105.0909 C103.4063,104.669 103.3906,104.5284 103.2656,104.3565 C103.0938,104.1065 102.8125,103.9502 102.4844,103.9502 C102.1719,103.9502 101.9688,104.0596 101.75,104.3252 C100.5781,103.8252 100.1406,103.7159 99.1875,103.7159 C96.5156,103.7159 94.5,105.7315 94.5,108.3565 L94.5,109.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="113.5" y="112.9">g</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="123.5" y1="124.294" y2="124.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="85.5" x2="123.5" y1="132.294" y2="132.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000917656824503504804">
-        <rect codeLine="135" fill="#F1F1F1" height="48" id="C_0000917656824503504804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="85" y="200.294"/>
-        <ellipse cx="100" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M95,217.4502 C95,219.9502 97.1406,221.7627 100.0625,221.7627 C101.2969,221.7627 102.4688,221.4659 103.2188,220.9502 C103.8281,220.5284 104.1563,220.1065 104.1563,219.7002 C104.1563,219.2315 103.7344,218.8252 103.2344,218.8252 C103,218.8252 102.7813,218.9034 102.5781,219.1065 C102.1406,219.544 102.1406,219.544 101.9688,219.6377 C101.5156,219.8721 100.875,220.0127 100.1094,220.0127 C98.1094,220.0127 96.8281,218.9971 96.8281,217.419 L96.8281,216.3721 C96.8281,214.669 98.0469,213.4659 99.75,213.4659 C100.3281,213.4659 100.9063,213.6065 101.375,213.8565 C101.8438,214.1221 102.0156,214.3096 102.0781,214.669 C102.2031,215.3409 102.4531,215.5909 102.9844,215.5909 C103.2656,215.5909 103.5469,215.4502 103.7344,215.2315 C103.8594,215.0596 103.9063,214.8877 103.9063,214.4502 L103.9063,213.0909 C103.9063,212.669 103.8906,212.5284 103.7656,212.3565 C103.5938,212.1065 103.3125,211.9502 102.9844,211.9502 C102.6719,211.9502 102.4688,212.0596 102.25,212.3252 C101.0781,211.8252 100.6406,211.7159 99.6875,211.7159 C97.0156,211.7159 95,213.7315 95,216.3565 L95,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="114" y="220.9">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="86" x2="125" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="86" x2="125" y1="240.294" y2="240.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001235773045370563004">
-        <rect codeLine="139" fill="#F1F1F1" height="48" id="C_0001235773045370563004" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="161" y="200.294"/>
-        <ellipse cx="176" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M171,217.4502 C171,219.9502 173.1406,221.7627 176.0625,221.7627 C177.2969,221.7627 178.4688,221.4659 179.2188,220.9502 C179.8281,220.5284 180.1563,220.1065 180.1563,219.7002 C180.1563,219.2315 179.7344,218.8252 179.2344,218.8252 C179,218.8252 178.7813,218.9034 178.5781,219.1065 C178.1406,219.544 178.1406,219.544 177.9688,219.6377 C177.5156,219.8721 176.875,220.0127 176.1094,220.0127 C174.1094,220.0127 172.8281,218.9971 172.8281,217.419 L172.8281,216.3721 C172.8281,214.669 174.0469,213.4659 175.75,213.4659 C176.3281,213.4659 176.9063,213.6065 177.375,213.8565 C177.8438,214.1221 178.0156,214.3096 178.0781,214.669 C178.2031,215.3409 178.4531,215.5909 178.9844,215.5909 C179.2656,215.5909 179.5469,215.4502 179.7344,215.2315 C179.8594,215.0596 179.9063,214.8877 179.9063,214.4502 L179.9063,213.0909 C179.9063,212.669 179.8906,212.5284 179.7656,212.3565 C179.5938,212.1065 179.3125,211.9502 178.9844,211.9502 C178.6719,211.9502 178.4688,212.0596 178.25,212.3252 C177.0781,211.8252 176.6406,211.7159 175.6875,211.7159 C173.0156,211.7159 171,213.7315 171,216.3565 L171,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="190" y="220.9">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="162" x2="201" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="162" x2="201" y1="240.294" y2="240.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0001365815261671395853">
-        <rect codeLine="143" fill="#F1F1F1" height="48" id="C_0001365815261671395853" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="7" y="200.294"/>
-        <ellipse cx="22" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,217.4502 C17,219.9502 19.1406,221.7627 22.0625,221.7627 C23.2969,221.7627 24.4688,221.4659 25.2188,220.9502 C25.8281,220.5284 26.1563,220.1065 26.1563,219.7002 C26.1563,219.2315 25.7344,218.8252 25.2344,218.8252 C25,218.8252 24.7813,218.9034 24.5781,219.1065 C24.1406,219.544 24.1406,219.544 23.9688,219.6377 C23.5156,219.8721 22.875,220.0127 22.1094,220.0127 C20.1094,220.0127 18.8281,218.9971 18.8281,217.419 L18.8281,216.3721 C18.8281,214.669 20.0469,213.4659 21.75,213.4659 C22.3281,213.4659 22.9063,213.6065 23.375,213.8565 C23.8438,214.1221 24.0156,214.3096 24.0781,214.669 C24.2031,215.3409 24.4531,215.5909 24.9844,215.5909 C25.2656,215.5909 25.5469,215.4502 25.7344,215.2315 C25.8594,215.0596 25.9063,214.8877 25.9063,214.4502 L25.9063,213.0909 C25.9063,212.669 25.8906,212.5284 25.7656,212.3565 C25.5938,212.1065 25.3125,211.9502 24.9844,211.9502 C24.6719,211.9502 24.4688,212.0596 24.25,212.3252 C23.0781,211.8252 22.6406,211.7159 21.6875,211.7159 C19.0156,211.7159 17,213.7315 17,216.3565 L17,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="36" y="220.9">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="49" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="49" y1="240.294" y2="240.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <g id="elem_C_0001158868779503074564">
-        <rect codeLine="149" fill="#F1F1F1" height="48" id="C_0001158868779503074564" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="237.5" y="200.294"/>
-        <ellipse cx="252.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M247.5,217.4502 C247.5,219.9502 249.6406,221.7627 252.5625,221.7627 C253.7969,221.7627 254.9688,221.4659 255.7188,220.9502 C256.3281,220.5284 256.6563,220.1065 256.6563,219.7002 C256.6563,219.2315 256.2344,218.8252 255.7344,218.8252 C255.5,218.8252 255.2813,218.9034 255.0781,219.1065 C254.6406,219.544 254.6406,219.544 254.4688,219.6377 C254.0156,219.8721 253.375,220.0127 252.6094,220.0127 C250.6094,220.0127 249.3281,218.9971 249.3281,217.419 L249.3281,216.3721 C249.3281,214.669 250.5469,213.4659 252.25,213.4659 C252.8281,213.4659 253.4063,213.6065 253.875,213.8565 C254.3438,214.1221 254.5156,214.3096 254.5781,214.669 C254.7031,215.3409 254.9531,215.5909 255.4844,215.5909 C255.7656,215.5909 256.0469,215.4502 256.2344,215.2315 C256.3594,215.0596 256.4063,214.8877 256.4063,214.4502 L256.4063,213.0909 C256.4063,212.669 256.3906,212.5284 256.2656,212.3565 C256.0938,212.1065 255.8125,211.9502 255.4844,211.9502 C255.1719,211.9502 254.9688,212.0596 254.75,212.3252 C253.5781,211.8252 253.1406,211.7159 252.1875,211.7159 C249.5156,211.7159 247.5,213.7315 247.5,216.3565 L247.5,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="266.5" y="220.9">a</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="238.5" x2="276.5" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="238.5" x2="276.5" y1="240.294" y2="240.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <g id="elem_C_0002123626454198320938">
-        <rect codeLine="153" fill="#F1F1F1" height="48" id="C_0002123626454198320938" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="312.5" y="200.294"/>
-        <ellipse cx="327.5" cy="216.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M322.5,217.4502 C322.5,219.9502 324.6406,221.7627 327.5625,221.7627 C328.7969,221.7627 329.9688,221.4659 330.7188,220.9502 C331.3281,220.5284 331.6563,220.1065 331.6563,219.7002 C331.6563,219.2315 331.2344,218.8252 330.7344,218.8252 C330.5,218.8252 330.2813,218.9034 330.0781,219.1065 C329.6406,219.544 329.6406,219.544 329.4688,219.6377 C329.0156,219.8721 328.375,220.0127 327.6094,220.0127 C325.6094,220.0127 324.3281,218.9971 324.3281,217.419 L324.3281,216.3721 C324.3281,214.669 325.5469,213.4659 327.25,213.4659 C327.8281,213.4659 328.4063,213.6065 328.875,213.8565 C329.3438,214.1221 329.5156,214.3096 329.5781,214.669 C329.7031,215.3409 329.9531,215.5909 330.4844,215.5909 C330.7656,215.5909 331.0469,215.4502 331.2344,215.2315 C331.3594,215.0596 331.4063,214.8877 331.4063,214.4502 L331.4063,213.0909 C331.4063,212.669 331.3906,212.5284 331.2656,212.3565 C331.0938,212.1065 330.8125,211.9502 330.4844,211.9502 C330.1719,211.9502 329.9688,212.0596 329.75,212.3252 C328.5781,211.8252 328.1406,211.7159 327.1875,211.7159 C324.5156,211.7159 322.5,213.7315 322.5,216.3565 L322.5,217.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="341.5" y="220.9">f</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313.5" x2="347.5" y1="232.294" y2="232.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313.5" x2="347.5" y1="240.294" y2="240.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <g id="elem_C_0001592677999268391183">
-        <rect codeLine="159" fill="#F1F1F1" height="64.7999" id="C_0001592677999268391183" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="230.5" y="330.894"/>
-        <ellipse cx="245.5" cy="346.894" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M244.3594,347.9565 L245.6719,347.9565 L245.6719,348.0034 C245.6719,348.4096 245.6875,348.5659 245.7969,348.7221 C245.9688,348.9721 246.2656,349.144 246.5781,349.144 C246.8594,349.144 247.1563,349.0034 247.3281,348.7846 C247.4531,348.5971 247.5,348.4565 247.5,348.0034 L247.5,346.1596 C247.5,345.8315 247.4844,345.7221 247.4219,345.5502 C247.3125,345.2534 246.9531,345.0034 246.5781,345.0034 C246.2813,345.0034 246.0156,345.144 245.8438,345.3627 C245.7031,345.5502 245.6719,345.7221 245.6719,346.1596 L245.6719,346.2221 L244.3594,346.2221 L244.3594,344.0502 L248.2031,344.0502 L248.2031,344.8002 C248.2031,345.1909 248.2344,345.3784 248.3438,345.5346 C248.5156,345.7846 248.8125,345.9565 249.125,345.9565 C249.4219,345.9565 249.6875,345.8315 249.875,345.5971 C250.0156,345.4096 250.0469,345.269 250.0469,344.8002 L250.0469,342.3002 L242.3438,342.3002 C241.8906,342.3002 241.7656,342.3159 241.5938,342.4252 C241.3281,342.5971 241.1563,342.8627 241.1563,343.1752 C241.1563,343.4565 241.2813,343.7221 241.5313,343.894 C241.7188,344.019 241.9063,344.0502 242.3438,344.0502 L242.5313,344.0502 L242.5313,350.144 L242.3438,350.144 C241.9219,350.144 241.7656,350.1752 241.5938,350.269 C241.3281,350.4252 241.1563,350.7065 241.1563,351.0034 C241.1563,351.5815 241.5625,351.894 242.3438,351.894 L250.4219,351.894 L250.4219,349.3627 C250.4219,348.9565 250.3906,348.7846 250.2813,348.6284 C250.1094,348.3627 249.8281,348.2065 249.5,348.2065 C249.2188,348.2065 248.9375,348.3471 248.75,348.5659 C248.6094,348.7534 248.5781,348.9096 248.5781,349.3627 L248.5781,350.144 L244.3594,350.144 L244.3594,347.9565 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="259.5" y="351.5">h</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="231.5" x2="269.5" y1="362.894" y2="362.894"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="236.5" y="379.8999">hhh</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="231.5" x2="269.5" y1="387.6939" y2="387.6939"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <g id="elem_C_0000441521323390223397">
-        <rect codeLine="163" fill="#F1F1F1" height="64.7999" id="C_0000441521323390223397" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="90" y="330.894"/>
-        <ellipse cx="105" cy="346.894" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M103.8594,347.9565 L105.1719,347.9565 L105.1719,348.0034 C105.1719,348.4096 105.1875,348.5659 105.2969,348.7221 C105.4688,348.9721 105.7656,349.144 106.0781,349.144 C106.3594,349.144 106.6563,349.0034 106.8281,348.7846 C106.9531,348.5971 107,348.4565 107,348.0034 L107,346.1596 C107,345.8315 106.9844,345.7221 106.9219,345.5502 C106.8125,345.2534 106.4531,345.0034 106.0781,345.0034 C105.7813,345.0034 105.5156,345.144 105.3438,345.3627 C105.2031,345.5502 105.1719,345.7221 105.1719,346.1596 L105.1719,346.2221 L103.8594,346.2221 L103.8594,344.0502 L107.7031,344.0502 L107.7031,344.8002 C107.7031,345.1909 107.7344,345.3784 107.8438,345.5346 C108.0156,345.7846 108.3125,345.9565 108.625,345.9565 C108.9219,345.9565 109.1875,345.8315 109.375,345.5971 C109.5156,345.4096 109.5469,345.269 109.5469,344.8002 L109.5469,342.3002 L101.8438,342.3002 C101.3906,342.3002 101.2656,342.3159 101.0938,342.4252 C100.8281,342.5971 100.6563,342.8627 100.6563,343.1752 C100.6563,343.4565 100.7813,343.7221 101.0313,343.894 C101.2188,344.019 101.4063,344.0502 101.8438,344.0502 L102.0313,344.0502 L102.0313,350.144 L101.8438,350.144 C101.4219,350.144 101.2656,350.1752 101.0938,350.269 C100.8281,350.4252 100.6563,350.7065 100.6563,351.0034 C100.6563,351.5815 101.0625,351.894 101.8438,351.894 L109.9219,351.894 L109.9219,349.3627 C109.9219,348.9565 109.8906,348.7846 109.7813,348.6284 C109.6094,348.3627 109.3281,348.2065 109,348.2065 C108.7188,348.2065 108.4375,348.3471 108.25,348.5659 C108.1094,348.7534 108.0781,348.9096 108.0781,349.3627 L108.0781,350.144 L103.8594,350.144 L103.8594,347.9565 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="119" y="351.5">i</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="124" y1="362.894" y2="362.894"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="96" y="379.8999">iii</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="124" y1="387.6939" y2="387.6939"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <g id="elem_C_0000499334434426587347">
-        <rect codeLine="167" fill="#F1F1F1" height="64.7999" id="C_0000499334434426587347" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="35" x="160" y="330.894"/>
-        <ellipse cx="175" cy="346.894" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M173.8594,347.9565 L175.1719,347.9565 L175.1719,348.0034 C175.1719,348.4096 175.1875,348.5659 175.2969,348.7221 C175.4688,348.9721 175.7656,349.144 176.0781,349.144 C176.3594,349.144 176.6563,349.0034 176.8281,348.7846 C176.9531,348.5971 177,348.4565 177,348.0034 L177,346.1596 C177,345.8315 176.9844,345.7221 176.9219,345.5502 C176.8125,345.2534 176.4531,345.0034 176.0781,345.0034 C175.7813,345.0034 175.5156,345.144 175.3438,345.3627 C175.2031,345.5502 175.1719,345.7221 175.1719,346.1596 L175.1719,346.2221 L173.8594,346.2221 L173.8594,344.0502 L177.7031,344.0502 L177.7031,344.8002 C177.7031,345.1909 177.7344,345.3784 177.8438,345.5346 C178.0156,345.7846 178.3125,345.9565 178.625,345.9565 C178.9219,345.9565 179.1875,345.8315 179.375,345.5971 C179.5156,345.4096 179.5469,345.269 179.5469,344.8002 L179.5469,342.3002 L171.8438,342.3002 C171.3906,342.3002 171.2656,342.3159 171.0938,342.4252 C170.8281,342.5971 170.6563,342.8627 170.6563,343.1752 C170.6563,343.4565 170.7813,343.7221 171.0313,343.894 C171.2188,344.019 171.4063,344.0502 171.8438,344.0502 L172.0313,344.0502 L172.0313,350.144 L171.8438,350.144 C171.4219,350.144 171.2656,350.1752 171.0938,350.269 C170.8281,350.4252 170.6563,350.7065 170.6563,351.0034 C170.6563,351.5815 171.0625,351.894 171.8438,351.894 L179.9219,351.894 L179.9219,349.3627 C179.9219,348.9565 179.8906,348.7846 179.7813,348.6284 C179.6094,348.3627 179.3281,348.2065 179,348.2065 C178.7188,348.2065 178.4375,348.3471 178.25,348.5659 C178.1094,348.7534 178.0781,348.9096 178.0781,349.3627 L178.0781,350.144 L173.8594,350.144 L173.8594,347.9565 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="3" x="189" y="351.5">j</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="161" x2="194" y1="362.894" y2="362.894"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="166" y="379.8999">jjj</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="161" x2="194" y1="387.6939" y2="387.6939"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <g id="elem_C_0001168031834662719964">
-        <rect codeLine="173" fill="#F1F1F1" height="48" id="C_0001168031834662719964" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="306" y="339.294"/>
-        <ellipse cx="321" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M316,356.4502 C316,358.9502 318.1406,360.7627 321.0625,360.7627 C322.2969,360.7627 323.4688,360.4659 324.2188,359.9502 C324.8281,359.5284 325.1563,359.1065 325.1563,358.7002 C325.1563,358.2315 324.7344,357.8252 324.2344,357.8252 C324,357.8252 323.7813,357.9034 323.5781,358.1065 C323.1406,358.544 323.1406,358.544 322.9688,358.6377 C322.5156,358.8721 321.875,359.0127 321.1094,359.0127 C319.1094,359.0127 317.8281,357.9971 317.8281,356.419 L317.8281,355.3721 C317.8281,353.669 319.0469,352.4659 320.75,352.4659 C321.3281,352.4659 321.9063,352.6065 322.375,352.8565 C322.8438,353.1221 323.0156,353.3096 323.0781,353.669 C323.2031,354.3409 323.4531,354.5909 323.9844,354.5909 C324.2656,354.5909 324.5469,354.4502 324.7344,354.2315 C324.8594,354.0596 324.9063,353.8877 324.9063,353.4502 L324.9063,352.0909 C324.9063,351.669 324.8906,351.5284 324.7656,351.3565 C324.5938,351.1065 324.3125,350.9502 323.9844,350.9502 C323.6719,350.9502 323.4688,351.0596 323.25,351.3252 C322.0781,350.8252 321.6406,350.7159 320.6875,350.7159 C318.0156,350.7159 316,352.7315 316,355.3565 L316,356.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="335" y="359.9">c</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="307" x2="344" y1="371.294" y2="371.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="307" x2="344" y1="379.294" y2="379.294"/>
-      </g>
-    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <g id="elem_C_0002037550833462858827">
-        <rect codeLine="177" fill="#F1F1F1" height="48" id="C_0002037550833462858827" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="40" x="380.5" y="339.294"/>
-        <ellipse cx="395.5" cy="355.294" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M390.5,356.4502 C390.5,358.9502 392.6406,360.7627 395.5625,360.7627 C396.7969,360.7627 397.9688,360.4659 398.7188,359.9502 C399.3281,359.5284 399.6563,359.1065 399.6563,358.7002 C399.6563,358.2315 399.2344,357.8252 398.7344,357.8252 C398.5,357.8252 398.2813,357.9034 398.0781,358.1065 C397.6406,358.544 397.6406,358.544 397.4688,358.6377 C397.0156,358.8721 396.375,359.0127 395.6094,359.0127 C393.6094,359.0127 392.3281,357.9971 392.3281,356.419 L392.3281,355.3721 C392.3281,353.669 393.5469,352.4659 395.25,352.4659 C395.8281,352.4659 396.4063,352.6065 396.875,352.8565 C397.3438,353.1221 397.5156,353.3096 397.5781,353.669 C397.7031,354.3409 397.9531,354.5909 398.4844,354.5909 C398.7656,354.5909 399.0469,354.4502 399.2344,354.2315 C399.3594,354.0596 399.4063,353.8877 399.4063,353.4502 L399.4063,352.0909 C399.4063,351.669 399.3906,351.5284 399.2656,351.3565 C399.0938,351.1065 398.8125,350.9502 398.4844,350.9502 C398.1719,350.9502 397.9688,351.0596 397.75,351.3252 C396.5781,350.8252 396.1406,350.7159 395.1875,350.7159 C392.5156,350.7159 390.5,352.7315 390.5,355.3565 L390.5,356.4502 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="409.5" y="359.9">e</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="381.5" x2="419.5" y1="371.294" y2="371.294"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="381.5" x2="419.5" y1="379.294" y2="379.294"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000595494794840378320" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="648" y="126"/>
+      <ellipse cx="663" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M665.9688,147.6406 Q665.3906,147.9375 664.75,148.0781 Q664.1094,148.2344 663.4063,148.2344 Q660.9063,148.2344 659.5781,146.5938 Q658.2656,144.9375 658.2656,141.8125 Q658.2656,138.6875 659.5781,137.0313 Q660.9063,135.375 663.4063,135.375 Q664.1094,135.375 664.75,135.5313 Q665.4063,135.6875 665.9688,135.9844 L665.9688,138.7031 Q665.3438,138.125 664.75,137.8594 Q664.1563,137.5781 663.5313,137.5781 Q662.1875,137.5781 661.5,138.6563 Q660.8125,139.7188 660.8125,141.8125 Q660.8125,143.9063 661.5,144.9844 Q662.1875,146.0469 663.5313,146.0469 Q664.1563,146.0469 664.75,145.7813 Q665.3438,145.5 665.9688,144.9219 L665.9688,147.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="677" y="146.1543">g</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="649" x2="687" y1="158" y2="158"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="649" x2="687" y1="166" y2="166"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00054_class_mermaid.svg b/docs/test_cases/t00054_class_mermaid.svg
index 3b24e55e..39b3433e 100644
--- a/docs/test_cases/t00054_class_mermaid.svg
+++ b/docs/test_cases/t00054_class_mermaid.svg
@@ -1,55 +1,50 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2057.171875 117" style="max-width: 2057.17px; background-color: white;" width="2057.171875" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L4">
           <g title="b" id="classId-C_0000252416999805673718-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -76,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L8">
+        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L8">
           <g title="d" id="classId-C_0001569559620782547158-1" class="node default clickable">
             <rect height="57" width="77.21875" y="-28.5" x="-38.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.609375" x1="-38.609375" class="divider"/>
@@ -95,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L12">
+        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L12">
           <g title="g" id="classId-C_0000595494794840378320-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -114,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L18">
+        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L18">
           <g title="C" id="classId-C_0000540054955081677892-3" class="node default clickable">
             <rect height="57" width="87.90625" y="-28.5" x="-43.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.953125" x1="-43.953125" class="divider"/>
@@ -133,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L23">
+        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L23">
           <g title="F" id="classId-C_0000446694692150903211-4" class="node default clickable">
             <rect height="57" width="86.125" y="-28.5" x="-43.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.0625" x1="-43.0625" class="divider"/>
@@ -152,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L14">
+        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L14">
           <g title="A" id="classId-C_0000917656824503504804-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -171,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L15">
+        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L15">
           <g title="B" id="classId-C_0001235773045370563004-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -190,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L25">
+        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L25">
           <g title="G" id="classId-C_0001365815261671395853-7" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -209,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L3">
+        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L3">
           <g title="a" id="classId-C_0001158868779503074564-8" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -228,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L11">
+        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L11">
           <g title="f" id="classId-C_0002123626454198320938-9" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -247,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L20">
+        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L20">
           <g title="D" id="classId-C_0001266390196945323478-10" class="node default clickable">
             <rect height="57" width="149.25" y="-28.5" x="-74.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.625" x1="-74.625" class="divider"/>
@@ -266,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L21">
+        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L21">
           <g title="E" id="classId-C_0000134928214982255105-11" class="node default clickable">
             <rect height="57" width="148.359375" y="-28.5" x="-74.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.1796875" x1="-74.1796875" class="divider"/>
@@ -285,7 +280,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L28">
+        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L28">
           <g title="h" id="classId-C_0001592677999268391183-12" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -309,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L29">
+        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L29">
           <g title="i" id="classId-C_0000441521323390223397-13" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -333,7 +328,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L30">
+        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L30">
           <g title="j" id="classId-C_0000499334434426587347-14" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -357,7 +352,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L7">
+        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L7">
           <g title="c" id="classId-C_0001168031834662719964-15" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -376,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00054/t00054.cc#L9">
+        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L9">
           <g title="e" id="classId-C_0002037550833462858827-16" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
diff --git a/docs/test_cases/t00055.md b/docs/test_cases/t00055.md
index ddbafcb6..057a08ff 100644
--- a/docs/test_cases/t00055.md
+++ b/docs/test_cases/t00055.md
@@ -45,7 +45,7 @@ struct J { };
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00055::A",
+      "display_name": "A",
       "id": "1697191682863715554",
       "is_abstract": false,
       "is_nested": false,
@@ -67,7 +67,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::B",
+      "display_name": "B",
       "id": "188599859894721517",
       "is_abstract": false,
       "is_nested": false,
@@ -89,7 +89,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::C",
+      "display_name": "C",
       "id": "625177137967392996",
       "is_abstract": false,
       "is_nested": false,
@@ -111,7 +111,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::D",
+      "display_name": "D",
       "id": "1046415640323289221",
       "is_abstract": false,
       "is_nested": false,
@@ -133,7 +133,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::E",
+      "display_name": "E",
       "id": "702117239243796422",
       "is_abstract": false,
       "is_nested": false,
@@ -155,7 +155,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::F",
+      "display_name": "F",
       "id": "1511375015718046137",
       "is_abstract": false,
       "is_nested": false,
@@ -177,7 +177,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::G",
+      "display_name": "G",
       "id": "651600874645139639",
       "is_abstract": false,
       "is_nested": false,
@@ -199,7 +199,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::H",
+      "display_name": "H",
       "id": "374142601071476038",
       "is_abstract": false,
       "is_nested": false,
@@ -221,7 +221,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::I",
+      "display_name": "I",
       "id": "295372236079742697",
       "is_abstract": false,
       "is_nested": false,
@@ -243,7 +243,7 @@ struct J { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00055::J",
+      "display_name": "J",
       "id": "769231292718551090",
       "is_abstract": false,
       "is_nested": false,
@@ -265,6 +265,7 @@ struct J { };
     }
   ],
   "name": "t00055_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00055"
 }
diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg
index b60989f3..9047fa90 100644
--- a/docs/test_cases/t00055_class.svg
+++ b/docs/test_cases/t00055_class.svg
@@ -1,107 +1,93 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="494px" preserveAspectRatio="none" style="width:431px;height:494px;background:#FFFFFF;" version="1.1" viewBox="0 0 431 494" width="431px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="499px" preserveAspectRatio="none" style="width:429px;height:499px;" version="1.1" viewBox="0 0 429 499" width="429px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f18d3h6krg0exx" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001697191682863715554">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001697191682863715554" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="7"/>
-        <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,24.1563 C17,26.6563 19.1406,28.4688 22.0625,28.4688 C23.2969,28.4688 24.4688,28.1719 25.2188,27.6563 C25.8281,27.2344 26.1563,26.8125 26.1563,26.4063 C26.1563,25.9375 25.7344,25.5313 25.2344,25.5313 C25,25.5313 24.7813,25.6094 24.5781,25.8125 C24.1406,26.25 24.1406,26.25 23.9688,26.3438 C23.5156,26.5781 22.875,26.7188 22.1094,26.7188 C20.1094,26.7188 18.8281,25.7031 18.8281,24.125 L18.8281,23.0781 C18.8281,21.375 20.0469,20.1719 21.75,20.1719 C22.3281,20.1719 22.9063,20.3125 23.375,20.5625 C23.8438,20.8281 24.0156,21.0156 24.0781,21.375 C24.2031,22.0469 24.4531,22.2969 24.9844,22.2969 C25.2656,22.2969 25.5469,22.1563 25.7344,21.9375 C25.8594,21.7656 25.9063,21.5938 25.9063,21.1563 L25.9063,19.7969 C25.9063,19.375 25.8906,19.2344 25.7656,19.0625 C25.5938,18.8125 25.3125,18.6563 24.9844,18.6563 C24.6719,18.6563 24.4688,18.7656 24.25,19.0313 C23.0781,18.5313 22.6406,18.4219 21.6875,18.4219 C19.0156,18.4219 17,20.4375 17,23.0625 L17,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0001697191682863715554" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="8"/>
+      <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000188599859894721517">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000188599859894721517" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="383" y="7"/>
-        <ellipse cx="398" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M393,24.1563 C393,26.6563 395.1406,28.4688 398.0625,28.4688 C399.2969,28.4688 400.4688,28.1719 401.2188,27.6563 C401.8281,27.2344 402.1563,26.8125 402.1563,26.4063 C402.1563,25.9375 401.7344,25.5313 401.2344,25.5313 C401,25.5313 400.7813,25.6094 400.5781,25.8125 C400.1406,26.25 400.1406,26.25 399.9688,26.3438 C399.5156,26.5781 398.875,26.7188 398.1094,26.7188 C396.1094,26.7188 394.8281,25.7031 394.8281,24.125 L394.8281,23.0781 C394.8281,21.375 396.0469,20.1719 397.75,20.1719 C398.3281,20.1719 398.9063,20.3125 399.375,20.5625 C399.8438,20.8281 400.0156,21.0156 400.0781,21.375 C400.2031,22.0469 400.4531,22.2969 400.9844,22.2969 C401.2656,22.2969 401.5469,22.1563 401.7344,21.9375 C401.8594,21.7656 401.9063,21.5938 401.9063,21.1563 L401.9063,19.7969 C401.9063,19.375 401.8906,19.2344 401.7656,19.0625 C401.5938,18.8125 401.3125,18.6563 400.9844,18.6563 C400.6719,18.6563 400.4688,18.7656 400.25,19.0313 C399.0781,18.5313 398.6406,18.4219 397.6875,18.4219 C395.0156,18.4219 393,20.4375 393,23.0625 L393,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="412" y="27.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="384" x2="423" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="384" x2="423" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000188599859894721517" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="378" y="8"/>
+      <ellipse cx="393" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M395.9688,29.6406 Q395.3906,29.9375 394.75,30.0781 Q394.1094,30.2344 393.4063,30.2344 Q390.9063,30.2344 389.5781,28.5938 Q388.2656,26.9375 388.2656,23.8125 Q388.2656,20.6875 389.5781,19.0313 Q390.9063,17.375 393.4063,17.375 Q394.1094,17.375 394.75,17.5313 Q395.4063,17.6875 395.9688,17.9844 L395.9688,20.7031 Q395.3438,20.125 394.75,19.8594 Q394.1563,19.5781 393.5313,19.5781 Q392.1875,19.5781 391.5,20.6563 Q390.8125,21.7188 390.8125,23.8125 Q390.8125,25.9063 391.5,26.9844 Q392.1875,28.0469 393.5313,28.0469 Q394.1563,28.0469 394.75,27.7813 Q395.3438,27.5 395.9688,26.9219 L395.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="407" y="28.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000625177137967392996">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0000625177137967392996" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="82.5" y="7"/>
-        <ellipse cx="97.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M92.5,24.1563 C92.5,26.6563 94.6406,28.4688 97.5625,28.4688 C98.7969,28.4688 99.9688,28.1719 100.7188,27.6563 C101.3281,27.2344 101.6563,26.8125 101.6563,26.4063 C101.6563,25.9375 101.2344,25.5313 100.7344,25.5313 C100.5,25.5313 100.2813,25.6094 100.0781,25.8125 C99.6406,26.25 99.6406,26.25 99.4688,26.3438 C99.0156,26.5781 98.375,26.7188 97.6094,26.7188 C95.6094,26.7188 94.3281,25.7031 94.3281,24.125 L94.3281,23.0781 C94.3281,21.375 95.5469,20.1719 97.25,20.1719 C97.8281,20.1719 98.4063,20.3125 98.875,20.5625 C99.3438,20.8281 99.5156,21.0156 99.5781,21.375 C99.7031,22.0469 99.9531,22.2969 100.4844,22.2969 C100.7656,22.2969 101.0469,22.1563 101.2344,21.9375 C101.3594,21.7656 101.4063,21.5938 101.4063,21.1563 L101.4063,19.7969 C101.4063,19.375 101.3906,19.2344 101.2656,19.0625 C101.0938,18.8125 100.8125,18.6563 100.4844,18.6563 C100.1719,18.6563 99.9688,18.7656 99.75,19.0313 C98.5781,18.5313 98.1406,18.4219 97.1875,18.4219 C94.5156,18.4219 92.5,20.4375 92.5,23.0625 L92.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="111.5" y="27.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="83.5" x2="123.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="83.5" x2="123.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000625177137967392996" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="8"/>
+      <ellipse cx="96" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M98.9688,29.6406 Q98.3906,29.9375 97.75,30.0781 Q97.1094,30.2344 96.4063,30.2344 Q93.9063,30.2344 92.5781,28.5938 Q91.2656,26.9375 91.2656,23.8125 Q91.2656,20.6875 92.5781,19.0313 Q93.9063,17.375 96.4063,17.375 Q97.1094,17.375 97.75,17.5313 Q98.4063,17.6875 98.9688,17.9844 L98.9688,20.7031 Q98.3438,20.125 97.75,19.8594 Q97.1563,19.5781 96.5313,19.5781 Q95.1875,19.5781 94.5,20.6563 Q93.8125,21.7188 93.8125,23.8125 Q93.8125,25.9063 94.5,26.9844 Q95.1875,28.0469 96.5313,28.0469 Q97.1563,28.0469 97.75,27.7813 Q98.3438,27.5 98.9688,26.9219 L98.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="28.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001046415640323289221">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001046415640323289221" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="382.5" y="115"/>
-        <ellipse cx="397.5" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M392.5,132.1563 C392.5,134.6563 394.6406,136.4688 397.5625,136.4688 C398.7969,136.4688 399.9688,136.1719 400.7188,135.6563 C401.3281,135.2344 401.6563,134.8125 401.6563,134.4063 C401.6563,133.9375 401.2344,133.5313 400.7344,133.5313 C400.5,133.5313 400.2813,133.6094 400.0781,133.8125 C399.6406,134.25 399.6406,134.25 399.4688,134.3438 C399.0156,134.5781 398.375,134.7188 397.6094,134.7188 C395.6094,134.7188 394.3281,133.7031 394.3281,132.125 L394.3281,131.0781 C394.3281,129.375 395.5469,128.1719 397.25,128.1719 C397.8281,128.1719 398.4063,128.3125 398.875,128.5625 C399.3438,128.8281 399.5156,129.0156 399.5781,129.375 C399.7031,130.0469 399.9531,130.2969 400.4844,130.2969 C400.7656,130.2969 401.0469,130.1563 401.2344,129.9375 C401.3594,129.7656 401.4063,129.5938 401.4063,129.1563 L401.4063,127.7969 C401.4063,127.375 401.3906,127.2344 401.2656,127.0625 C401.0938,126.8125 400.8125,126.6563 400.4844,126.6563 C400.1719,126.6563 399.9688,126.7656 399.75,127.0313 C398.5781,126.5313 398.1406,126.4219 397.1875,126.4219 C394.5156,126.4219 392.5,128.4375 392.5,131.0625 L392.5,132.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="411.5" y="135.606">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="383.5" x2="423.5" y1="147" y2="147"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="383.5" x2="423.5" y1="155" y2="155"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0001046415640323289221" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="116"/>
+      <ellipse cx="392.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M395.4688,137.6406 Q394.8906,137.9375 394.25,138.0781 Q393.6094,138.2344 392.9063,138.2344 Q390.4063,138.2344 389.0781,136.5938 Q387.7656,134.9375 387.7656,131.8125 Q387.7656,128.6875 389.0781,127.0313 Q390.4063,125.375 392.9063,125.375 Q393.6094,125.375 394.25,125.5313 Q394.9063,125.6875 395.4688,125.9844 L395.4688,128.7031 Q394.8438,128.125 394.25,127.8594 Q393.6563,127.5781 393.0313,127.5781 Q391.6875,127.5781 391,128.6563 Q390.3125,129.7188 390.3125,131.8125 Q390.3125,133.9063 391,134.9844 Q391.6875,136.0469 393.0313,136.0469 Q393.6563,136.0469 394.25,135.7813 Q394.8438,135.5 395.4688,134.9219 L395.4688,137.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="136.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="148" y2="148"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0000702117239243796422">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0000702117239243796422" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="159" y="7"/>
-        <ellipse cx="174" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M169,24.1563 C169,26.6563 171.1406,28.4688 174.0625,28.4688 C175.2969,28.4688 176.4688,28.1719 177.2188,27.6563 C177.8281,27.2344 178.1563,26.8125 178.1563,26.4063 C178.1563,25.9375 177.7344,25.5313 177.2344,25.5313 C177,25.5313 176.7813,25.6094 176.5781,25.8125 C176.1406,26.25 176.1406,26.25 175.9688,26.3438 C175.5156,26.5781 174.875,26.7188 174.1094,26.7188 C172.1094,26.7188 170.8281,25.7031 170.8281,24.125 L170.8281,23.0781 C170.8281,21.375 172.0469,20.1719 173.75,20.1719 C174.3281,20.1719 174.9063,20.3125 175.375,20.5625 C175.8438,20.8281 176.0156,21.0156 176.0781,21.375 C176.2031,22.0469 176.4531,22.2969 176.9844,22.2969 C177.2656,22.2969 177.5469,22.1563 177.7344,21.9375 C177.8594,21.7656 177.9063,21.5938 177.9063,21.1563 L177.9063,19.7969 C177.9063,19.375 177.8906,19.2344 177.7656,19.0625 C177.5938,18.8125 177.3125,18.6563 176.9844,18.6563 C176.6719,18.6563 176.4688,18.7656 176.25,19.0313 C175.0781,18.5313 174.6406,18.4219 173.6875,18.4219 C171.0156,18.4219 169,20.4375 169,23.0625 L169,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="188" y="27.606">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="160" x2="199" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="160" x2="199" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000702117239243796422" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="8"/>
+      <ellipse cx="171" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.9688,29.6406 Q173.3906,29.9375 172.75,30.0781 Q172.1094,30.2344 171.4063,30.2344 Q168.9063,30.2344 167.5781,28.5938 Q166.2656,26.9375 166.2656,23.8125 Q166.2656,20.6875 167.5781,19.0313 Q168.9063,17.375 171.4063,17.375 Q172.1094,17.375 172.75,17.5313 Q173.4063,17.6875 173.9688,17.9844 L173.9688,20.7031 Q173.3438,20.125 172.75,19.8594 Q172.1563,19.5781 171.5313,19.5781 Q170.1875,19.5781 169.5,20.6563 Q168.8125,21.7188 168.8125,23.8125 Q168.8125,25.9063 169.5,26.9844 Q170.1875,28.0469 171.5313,28.0469 Q172.1563,28.0469 172.75,27.7813 Q173.3438,27.5 173.9688,26.9219 L173.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="28.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0001511375015718046137">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001511375015718046137" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="383" y="223"/>
-        <ellipse cx="398" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M393,240.1563 C393,242.6563 395.1406,244.4688 398.0625,244.4688 C399.2969,244.4688 400.4688,244.1719 401.2188,243.6563 C401.8281,243.2344 402.1563,242.8125 402.1563,242.4063 C402.1563,241.9375 401.7344,241.5313 401.2344,241.5313 C401,241.5313 400.7813,241.6094 400.5781,241.8125 C400.1406,242.25 400.1406,242.25 399.9688,242.3438 C399.5156,242.5781 398.875,242.7188 398.1094,242.7188 C396.1094,242.7188 394.8281,241.7031 394.8281,240.125 L394.8281,239.0781 C394.8281,237.375 396.0469,236.1719 397.75,236.1719 C398.3281,236.1719 398.9063,236.3125 399.375,236.5625 C399.8438,236.8281 400.0156,237.0156 400.0781,237.375 C400.2031,238.0469 400.4531,238.2969 400.9844,238.2969 C401.2656,238.2969 401.5469,238.1563 401.7344,237.9375 C401.8594,237.7656 401.9063,237.5938 401.9063,237.1563 L401.9063,235.7969 C401.9063,235.375 401.8906,235.2344 401.7656,235.0625 C401.5938,234.8125 401.3125,234.6563 400.9844,234.6563 C400.6719,234.6563 400.4688,234.7656 400.25,235.0313 C399.0781,234.5313 398.6406,234.4219 397.6875,234.4219 C395.0156,234.4219 393,236.4375 393,239.0625 L393,240.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="412" y="243.606">F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="384" x2="423" y1="255" y2="255"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="384" x2="423" y1="263" y2="263"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0001511375015718046137" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="378.5" y="224"/>
+      <ellipse cx="393.5" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M396.4688,245.6406 Q395.8906,245.9375 395.25,246.0781 Q394.6094,246.2344 393.9063,246.2344 Q391.4063,246.2344 390.0781,244.5938 Q388.7656,242.9375 388.7656,239.8125 Q388.7656,236.6875 390.0781,235.0313 Q391.4063,233.375 393.9063,233.375 Q394.6094,233.375 395.25,233.5313 Q395.9063,233.6875 396.4688,233.9844 L396.4688,236.7031 Q395.8438,236.125 395.25,235.8594 Q394.6563,235.5781 394.0313,235.5781 Q392.6875,235.5781 392,236.6563 Q391.3125,237.7188 391.3125,239.8125 Q391.3125,241.9063 392,242.9844 Q392.6875,244.0469 394.0313,244.0469 Q394.6563,244.0469 395.25,243.7813 Q395.8438,243.5 396.4688,242.9219 L396.4688,245.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="407.5" y="244.1543">F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="256" y2="256"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0000651600874645139639">
-        <rect codeLine="26" fill="#F1F1F1" height="48" id="C_0000651600874645139639" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="43" x="235" y="7"/>
-        <ellipse cx="250" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M245,24.1563 C245,26.6563 247.1406,28.4688 250.0625,28.4688 C251.2969,28.4688 252.4688,28.1719 253.2188,27.6563 C253.8281,27.2344 254.1563,26.8125 254.1563,26.4063 C254.1563,25.9375 253.7344,25.5313 253.2344,25.5313 C253,25.5313 252.7813,25.6094 252.5781,25.8125 C252.1406,26.25 252.1406,26.25 251.9688,26.3438 C251.5156,26.5781 250.875,26.7188 250.1094,26.7188 C248.1094,26.7188 246.8281,25.7031 246.8281,24.125 L246.8281,23.0781 C246.8281,21.375 248.0469,20.1719 249.75,20.1719 C250.3281,20.1719 250.9063,20.3125 251.375,20.5625 C251.8438,20.8281 252.0156,21.0156 252.0781,21.375 C252.2031,22.0469 252.4531,22.2969 252.9844,22.2969 C253.2656,22.2969 253.5469,22.1563 253.7344,21.9375 C253.8594,21.7656 253.9063,21.5938 253.9063,21.1563 L253.9063,19.7969 C253.9063,19.375 253.8906,19.2344 253.7656,19.0625 C253.5938,18.8125 253.3125,18.6563 252.9844,18.6563 C252.6719,18.6563 252.4688,18.7656 252.25,19.0313 C251.0781,18.5313 250.6406,18.4219 249.6875,18.4219 C247.0156,18.4219 245,20.4375 245,23.0625 L245,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="264" y="27.606">G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236" x2="277" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="236" x2="277" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000651600874645139639" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="8"/>
+      <ellipse cx="246.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M249.4688,29.6406 Q248.8906,29.9375 248.25,30.0781 Q247.6094,30.2344 246.9063,30.2344 Q244.4063,30.2344 243.0781,28.5938 Q241.7656,26.9375 241.7656,23.8125 Q241.7656,20.6875 243.0781,19.0313 Q244.4063,17.375 246.9063,17.375 Q247.6094,17.375 248.25,17.5313 Q248.9063,17.6875 249.4688,17.9844 L249.4688,20.7031 Q248.8438,20.125 248.25,19.8594 Q247.6563,19.5781 247.0313,19.5781 Q245.6875,19.5781 245,20.6563 Q244.3125,21.7188 244.3125,23.8125 Q244.3125,25.9063 245,26.9844 Q245.6875,28.0469 247.0313,28.0469 Q247.6563,28.0469 248.25,27.7813 Q248.8438,27.5 249.4688,26.9219 L249.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="28.1543">G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <g id="elem_C_0000374142601071476038">
-        <rect codeLine="30" fill="#F1F1F1" height="48" id="C_0000374142601071476038" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="382.5" y="331"/>
-        <ellipse cx="397.5" cy="347" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M392.5,348.1563 C392.5,350.6563 394.6406,352.4688 397.5625,352.4688 C398.7969,352.4688 399.9688,352.1719 400.7188,351.6563 C401.3281,351.2344 401.6563,350.8125 401.6563,350.4063 C401.6563,349.9375 401.2344,349.5313 400.7344,349.5313 C400.5,349.5313 400.2813,349.6094 400.0781,349.8125 C399.6406,350.25 399.6406,350.25 399.4688,350.3438 C399.0156,350.5781 398.375,350.7188 397.6094,350.7188 C395.6094,350.7188 394.3281,349.7031 394.3281,348.125 L394.3281,347.0781 C394.3281,345.375 395.5469,344.1719 397.25,344.1719 C397.8281,344.1719 398.4063,344.3125 398.875,344.5625 C399.3438,344.8281 399.5156,345.0156 399.5781,345.375 C399.7031,346.0469 399.9531,346.2969 400.4844,346.2969 C400.7656,346.2969 401.0469,346.1563 401.2344,345.9375 C401.3594,345.7656 401.4063,345.5938 401.4063,345.1563 L401.4063,343.7969 C401.4063,343.375 401.3906,343.2344 401.2656,343.0625 C401.0938,342.8125 400.8125,342.6563 400.4844,342.6563 C400.1719,342.6563 399.9688,342.7656 399.75,343.0313 C398.5781,342.5313 398.1406,342.4219 397.1875,342.4219 C394.5156,342.4219 392.5,344.4375 392.5,347.0625 L392.5,348.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="411.5" y="351.606">H</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="383.5" x2="423.5" y1="363" y2="363"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="383.5" x2="423.5" y1="371" y2="371"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000374142601071476038" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="332"/>
+      <ellipse cx="392.5" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M395.4688,353.6406 Q394.8906,353.9375 394.25,354.0781 Q393.6094,354.2344 392.9063,354.2344 Q390.4063,354.2344 389.0781,352.5938 Q387.7656,350.9375 387.7656,347.8125 Q387.7656,344.6875 389.0781,343.0313 Q390.4063,341.375 392.9063,341.375 Q393.6094,341.375 394.25,341.5313 Q394.9063,341.6875 395.4688,341.9844 L395.4688,344.7031 Q394.8438,344.125 394.25,343.8594 Q393.6563,343.5781 393.0313,343.5781 Q391.6875,343.5781 391,344.6563 Q390.3125,345.7188 390.3125,347.8125 Q390.3125,349.9063 391,350.9844 Q391.6875,352.0469 393.0313,352.0469 Q393.6563,352.0469 394.25,351.7813 Q394.8438,351.5 395.4688,350.9219 L395.4688,353.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="352.1543">H</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="364" y2="364"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="372" y2="372"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <g id="elem_C_0000295372236079742697">
-        <rect codeLine="34" fill="#F1F1F1" height="48" id="C_0000295372236079742697" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="36" x="312.5" y="7"/>
-        <ellipse cx="327.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M322.5,24.1563 C322.5,26.6563 324.6406,28.4688 327.5625,28.4688 C328.7969,28.4688 329.9688,28.1719 330.7188,27.6563 C331.3281,27.2344 331.6563,26.8125 331.6563,26.4063 C331.6563,25.9375 331.2344,25.5313 330.7344,25.5313 C330.5,25.5313 330.2813,25.6094 330.0781,25.8125 C329.6406,26.25 329.6406,26.25 329.4688,26.3438 C329.0156,26.5781 328.375,26.7188 327.6094,26.7188 C325.6094,26.7188 324.3281,25.7031 324.3281,24.125 L324.3281,23.0781 C324.3281,21.375 325.5469,20.1719 327.25,20.1719 C327.8281,20.1719 328.4063,20.3125 328.875,20.5625 C329.3438,20.8281 329.5156,21.0156 329.5781,21.375 C329.7031,22.0469 329.9531,22.2969 330.4844,22.2969 C330.7656,22.2969 331.0469,22.1563 331.2344,21.9375 C331.3594,21.7656 331.4063,21.5938 331.4063,21.1563 L331.4063,19.7969 C331.4063,19.375 331.3906,19.2344 331.2656,19.0625 C331.0938,18.8125 330.8125,18.6563 330.4844,18.6563 C330.1719,18.6563 329.9688,18.7656 329.75,19.0313 C328.5781,18.5313 328.1406,18.4219 327.1875,18.4219 C324.5156,18.4219 322.5,20.4375 322.5,23.0625 L322.5,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="4" x="341.5" y="27.606">I</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313.5" x2="347.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="313.5" x2="347.5" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000295372236079742697" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="307.5" y="8"/>
+      <ellipse cx="322.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M325.4688,29.6406 Q324.8906,29.9375 324.25,30.0781 Q323.6094,30.2344 322.9063,30.2344 Q320.4063,30.2344 319.0781,28.5938 Q317.7656,26.9375 317.7656,23.8125 Q317.7656,20.6875 319.0781,19.0313 Q320.4063,17.375 322.9063,17.375 Q323.6094,17.375 324.25,17.5313 Q324.9063,17.6875 325.4688,17.9844 L325.4688,20.7031 Q324.8438,20.125 324.25,19.8594 Q323.6563,19.5781 323.0313,19.5781 Q321.6875,19.5781 321,20.6563 Q320.3125,21.7188 320.3125,23.8125 Q320.3125,25.9063 321,26.9844 Q321.6875,28.0469 323.0313,28.0469 Q323.6563,28.0469 324.25,27.7813 Q324.8438,27.5 325.4688,26.9219 L325.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="336.5" y="28.1543">I</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <g id="elem_C_0000769231292718551090">
-        <rect codeLine="38" fill="#F1F1F1" height="48" id="C_0000769231292718551090" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="39" x="384" y="439"/>
-        <ellipse cx="399" cy="455" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M394,456.1563 C394,458.6563 396.1406,460.4688 399.0625,460.4688 C400.2969,460.4688 401.4688,460.1719 402.2188,459.6563 C402.8281,459.2344 403.1563,458.8125 403.1563,458.4063 C403.1563,457.9375 402.7344,457.5313 402.2344,457.5313 C402,457.5313 401.7813,457.6094 401.5781,457.8125 C401.1406,458.25 401.1406,458.25 400.9688,458.3438 C400.5156,458.5781 399.875,458.7188 399.1094,458.7188 C397.1094,458.7188 395.8281,457.7031 395.8281,456.125 L395.8281,455.0781 C395.8281,453.375 397.0469,452.1719 398.75,452.1719 C399.3281,452.1719 399.9063,452.3125 400.375,452.5625 C400.8438,452.8281 401.0156,453.0156 401.0781,453.375 C401.2031,454.0469 401.4531,454.2969 401.9844,454.2969 C402.2656,454.2969 402.5469,454.1563 402.7344,453.9375 C402.8594,453.7656 402.9063,453.5938 402.9063,453.1563 L402.9063,451.7969 C402.9063,451.375 402.8906,451.2344 402.7656,451.0625 C402.5938,450.8125 402.3125,450.6563 401.9844,450.6563 C401.6719,450.6563 401.4688,450.7656 401.25,451.0313 C400.0781,450.5313 399.6406,450.4219 398.6875,450.4219 C396.0156,450.4219 394,452.4375 394,455.0625 L394,456.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="413" y="459.606">J</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="385" x2="422" y1="471" y2="471"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="385" x2="422" y1="479" y2="479"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000769231292718551090" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="380.5" y="440"/>
+      <ellipse cx="395.5" cy="456" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M398.4688,461.6406 Q397.8906,461.9375 397.25,462.0781 Q396.6094,462.2344 395.9063,462.2344 Q393.4063,462.2344 392.0781,460.5938 Q390.7656,458.9375 390.7656,455.8125 Q390.7656,452.6875 392.0781,451.0313 Q393.4063,449.375 395.9063,449.375 Q396.6094,449.375 397.25,449.5313 Q397.9063,449.6875 398.4688,449.9844 L398.4688,452.7031 Q397.8438,452.125 397.25,451.8594 Q396.6563,451.5781 396.0313,451.5781 Q394.6875,451.5781 394,452.6563 Q393.3125,453.7188 393.3125,455.8125 Q393.3125,457.9063 394,458.9844 Q394.6875,460.0469 396.0313,460.0469 Q396.6563,460.0469 397.25,459.7813 Q397.8438,459.5 398.4688,458.9219 L398.4688,461.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="409.5" y="460.1543">J</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="381.5" x2="414.5" y1="472" y2="472"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="381.5" x2="414.5" y1="480" y2="480"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00055_class_mermaid.svg b/docs/test_cases/t00055_class_mermaid.svg
index f1c70c9e..2549cb38 100644
--- a/docs/test_cases/t00055_class_mermaid.svg
+++ b/docs/test_cases/t00055_class_mermaid.svg
@@ -1,55 +1,50 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 720.078125 73" style="max-width: 720.078px; background-color: white;" width="720.078125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L3">
           <g title="A" id="classId-C_0001697191682863715554-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -76,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L4">
+        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L4">
           <g title="B" id="classId-C_0000188599859894721517-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -95,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L5">
+        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L5">
           <g title="C" id="classId-C_0000625177137967392996-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -114,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L6">
+        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L6">
           <g title="D" id="classId-C_0001046415640323289221-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -133,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L7">
+        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L7">
           <g title="E" id="classId-C_0000702117239243796422-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -152,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L8">
+        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L8">
           <g title="F" id="classId-C_0001511375015718046137-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -171,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L9">
+        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L9">
           <g title="G" id="classId-C_0000651600874645139639-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -190,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L10">
+        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L10">
           <g title="H" id="classId-C_0000374142601071476038-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -209,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L11">
+        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L11">
           <g title="I" id="classId-C_0000295372236079742697-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -228,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00055/t00055.cc#L12">
+        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L12">
           <g title="J" id="classId-C_0000769231292718551090-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
diff --git a/docs/test_cases/t00056.md b/docs/test_cases/t00056.md
index 277cdf12..8a1addbf 100644
--- a/docs/test_cases/t00056.md
+++ b/docs/test_cases/t00056.md
@@ -119,7 +119,7 @@ struct F {
   "diagram_type": "class",
   "elements": [
     {
-      "display_name": "clanguml::t00056::greater_than_simple<T,L>",
+      "display_name": "greater_than_simple<T,L>",
       "id": "902541696362244204",
       "name": "greater_than_simple",
       "namespace": "clanguml::t00056",
@@ -134,7 +134,7 @@ struct F {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00056::greater_than_with_requires<T,P>",
+      "display_name": "greater_than_with_requires<T,P>",
       "id": "1830716585637735576",
       "name": "greater_than_with_requires",
       "namespace": "clanguml::t00056",
@@ -160,7 +160,7 @@ struct F {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00056::max_four_bytes<T>",
+      "display_name": "max_four_bytes<T>",
       "id": "385255522691733325",
       "name": "max_four_bytes",
       "namespace": "clanguml::t00056",
@@ -175,7 +175,7 @@ struct F {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00056::iterable<T>",
+      "display_name": "iterable<T>",
       "id": "392540961352249242",
       "name": "iterable",
       "namespace": "clanguml::t00056",
@@ -198,7 +198,7 @@ struct F {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00056::has_value_type<T>",
+      "display_name": "has_value_type<T>",
       "id": "1850394311226276678",
       "name": "has_value_type",
       "namespace": "clanguml::t00056",
@@ -215,7 +215,7 @@ struct F {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00056::convertible_to_string<T>",
+      "display_name": "convertible_to_string<T>",
       "id": "137304962071054497",
       "name": "convertible_to_string",
       "namespace": "clanguml::t00056",
@@ -239,7 +239,7 @@ struct F {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00056::iterable_with_value_type<T>",
+      "display_name": "iterable_with_value_type<T>",
       "id": "1043398062146751019",
       "name": "iterable_with_value_type",
       "namespace": "clanguml::t00056",
@@ -254,7 +254,7 @@ struct F {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00056::iterable_or_small_value_type<T>",
+      "display_name": "iterable_or_small_value_type<T>",
       "id": "866345615551223718",
       "name": "iterable_or_small_value_type",
       "namespace": "clanguml::t00056",
@@ -270,7 +270,7 @@ struct F {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00056::A<clanguml::t00056::max_four_bytes T>",
+      "display_name": "A<max_four_bytes T>",
       "id": "1418333499545421661",
       "is_abstract": false,
       "is_nested": false,
@@ -312,7 +312,7 @@ struct F {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00056::B<T>",
+      "display_name": "B<T>",
       "id": "1814355496814977880",
       "is_abstract": false,
       "is_nested": false,
@@ -354,7 +354,7 @@ struct F {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00056::C<clanguml::t00056::convertible_to_string T>",
+      "display_name": "C<convertible_to_string T>",
       "id": "1512618198241549089",
       "is_abstract": false,
       "is_nested": false,
@@ -396,7 +396,7 @@ struct F {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00056::D<clanguml::t00056::iterable T1,T2,clanguml::t00056::iterable T3,T4,T5>",
+      "display_name": "D<iterable T1,T2,iterable T3,T4,T5>",
       "id": "1635109601630198093",
       "is_abstract": false,
       "is_nested": false,
@@ -449,7 +449,7 @@ struct F {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00056::E<T1,T2,T3>",
+      "display_name": "E<T1,T2,T3>",
       "id": "1429225801945621089",
       "is_abstract": false,
       "is_nested": false,
@@ -527,7 +527,7 @@ struct F {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00056::F<T1,T2,T3>",
+      "display_name": "F<T1,T2,T3>",
       "id": "856301122972546034",
       "is_abstract": false,
       "is_nested": false,
@@ -605,6 +605,7 @@ struct F {
     }
   ],
   "name": "t00056_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "385255522691733325",
diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg
index 27452232..ef095842 100644
--- a/docs/test_cases/t00056_class.svg
+++ b/docs/test_cases/t00056_class.svg
@@ -1,327 +1,277 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="674px" preserveAspectRatio="none" style="width:1482px;height:674px;background:#FFFFFF;" version="1.1" viewBox="0 0 1482 674" width="1482px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="613px" preserveAspectRatio="none" style="width:1507px;height:613px;" version="1.1" viewBox="0 0 1507 613" width="1507px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1etijee47fp2t" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
-      <g id="elem_C_0000902541696362244204">
-        <rect codeLine="2" fill="#F1F1F1" height="59" id="C_0000902541696362244204" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="7" y="202.2"/>
-        <ellipse cx="22" cy="223.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,224.8563 C17,227.3563 19.1406,229.1688 22.0625,229.1688 C23.2969,229.1688 24.4688,228.8719 25.2188,228.3563 C25.8281,227.9344 26.1563,227.5125 26.1563,227.1063 C26.1563,226.6375 25.7344,226.2313 25.2344,226.2313 C25,226.2313 24.7813,226.3094 24.5781,226.5125 C24.1406,226.95 24.1406,226.95 23.9688,227.0438 C23.5156,227.2781 22.875,227.4188 22.1094,227.4188 C20.1094,227.4188 18.8281,226.4031 18.8281,224.825 L18.8281,223.7781 C18.8281,222.075 20.0469,220.8719 21.75,220.8719 C22.3281,220.8719 22.9063,221.0125 23.375,221.2625 C23.8438,221.5281 24.0156,221.7156 24.0781,222.075 C24.2031,222.7469 24.4531,222.9969 24.9844,222.9969 C25.2656,222.9969 25.5469,222.8563 25.7344,222.6375 C25.8594,222.4656 25.9063,222.2938 25.9063,221.8563 L25.9063,220.4969 C25.9063,220.075 25.8906,219.9344 25.7656,219.7625 C25.5938,219.5125 25.3125,219.3563 24.9844,219.3563 C24.6719,219.3563 24.4688,219.4656 24.25,219.7313 C23.0781,219.2313 22.6406,219.1219 21.6875,219.1219 C19.0156,219.1219 17,221.1375 17,223.7625 L17,224.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="73" y="220.4001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="36" y="236.4061">greater_than_simple</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="19" x="175" y="199.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="17" x="176" y="213.4001">T,L</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="190" y1="245.2" y2="245.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="190" y1="253.2" y2="253.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="53.9375" id="C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="6" y="184"/>
+      <ellipse cx="21" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,208.6094 Q23.3906,208.9063 22.75,209.0469 Q22.1094,209.2031 21.4063,209.2031 Q18.9063,209.2031 17.5781,207.5625 Q16.2656,205.9063 16.2656,202.7813 Q16.2656,199.6563 17.5781,198 Q18.9063,196.3438 21.4063,196.3438 Q22.1094,196.3438 22.75,196.5 Q23.4063,196.6563 23.9688,196.9531 L23.9688,199.6719 Q23.3438,199.0938 22.75,198.8281 Q22.1563,198.5469 21.5313,198.5469 Q20.1875,198.5469 19.5,199.625 Q18.8125,200.6875 18.8125,202.7813 Q18.8125,204.875 19.5,205.9531 Q20.1875,207.0156 21.5313,207.0156 Q22.1563,207.0156 22.75,206.75 Q23.3438,206.4688 23.9688,205.8906 L23.9688,208.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="66.5" y="200.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="128" x="35" y="214.1074">greater_than_simple</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="171" y="181"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="172" y="193.1387">T,L</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="221.9375" y2="221.9375"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="229.9375" y2="229.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
-      <g id="elem_C_0001830716585637735576">
-        <rect codeLine="5" fill="#F1F1F1" height="92.5999" id="C_0001830716585637735576" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="226.5" y="185.4"/>
-        <ellipse cx="241.5" cy="206.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M236.5,208.0563 C236.5,210.5563 238.6406,212.3688 241.5625,212.3688 C242.7969,212.3688 243.9688,212.0719 244.7188,211.5563 C245.3281,211.1344 245.6563,210.7125 245.6563,210.3063 C245.6563,209.8375 245.2344,209.4313 244.7344,209.4313 C244.5,209.4313 244.2813,209.5094 244.0781,209.7125 C243.6406,210.15 243.6406,210.15 243.4688,210.2438 C243.0156,210.4781 242.375,210.6188 241.6094,210.6188 C239.6094,210.6188 238.3281,209.6031 238.3281,208.025 L238.3281,206.9781 C238.3281,205.275 239.5469,204.0719 241.25,204.0719 C241.8281,204.0719 242.4063,204.2125 242.875,204.4625 C243.3438,204.7281 243.5156,204.9156 243.5781,205.275 C243.7031,205.9469 243.9531,206.1969 244.4844,206.1969 C244.7656,206.1969 245.0469,206.0563 245.2344,205.8375 C245.3594,205.6656 245.4063,205.4938 245.4063,205.0563 L245.4063,203.6969 C245.4063,203.275 245.3906,203.1344 245.2656,202.9625 C245.0938,202.7125 244.8125,202.5563 244.4844,202.5563 C244.1719,202.5563 243.9688,202.6656 243.75,202.9313 C242.5781,202.4313 242.1406,202.3219 241.1875,202.3219 C238.5156,202.3219 236.5,204.3375 236.5,206.9625 L236.5,208.0563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="314.5" y="203.6001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="175" x="255.5" y="219.6061">greater_than_with_requires</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="438.5" y="182.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="439.5" y="196.6001">T,P</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="227.5" x2="454.5" y1="228.4" y2="228.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="232.5" y="245.406">(T l,P r)</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="227.5" x2="454.5" y1="253.2" y2="253.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="232.5" y="270.2059">sizeof (l) &gt; sizeof (r)</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="79.5469" id="C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.5;" width="225" x="223.5" y="171"/>
+      <ellipse cx="238.5" cy="189.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M241.4688,195.6094 Q240.8906,195.9063 240.25,196.0469 Q239.6094,196.2031 238.9063,196.2031 Q236.4063,196.2031 235.0781,194.5625 Q233.7656,192.9063 233.7656,189.7813 Q233.7656,186.6563 235.0781,185 Q236.4063,183.3438 238.9063,183.3438 Q239.6094,183.3438 240.25,183.5 Q240.9063,183.6563 241.4688,183.9531 L241.4688,186.6719 Q240.8438,186.0938 240.25,185.8281 Q239.6563,185.5469 239.0313,185.5469 Q237.6875,185.5469 237,186.625 Q236.3125,187.6875 236.3125,189.7813 Q236.3125,191.875 237,192.9531 Q237.6875,194.0156 239.0313,194.0156 Q239.6563,194.0156 240.25,193.75 Q240.8438,193.4688 241.4688,192.8906 L241.4688,195.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="305.5" y="187.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="171" x="252.5" y="201.1074">greater_than_with_requires</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="431.5" y="168"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="432.5" y="180.1387">T,P</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="224.5" x2="447.5" y1="208.9375" y2="208.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="229.5" y="223.1479">(T l,P r)</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="224.5" x2="447.5" y1="229.7422" y2="229.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="229.5" y="243.9526">sizeof (l) &gt; sizeof (r)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
-      <g id="elem_C_0000385255522691733325">
-        <rect codeLine="11" fill="#F1F1F1" height="59" id="C_0000385255522691733325" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="145" x="841.5" y="583.4"/>
-        <ellipse cx="856.5" cy="604.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M851.5,606.0563 C851.5,608.5563 853.6406,610.3688 856.5625,610.3688 C857.7969,610.3688 858.9688,610.0719 859.7188,609.5563 C860.3281,609.1344 860.6563,608.7125 860.6563,608.3063 C860.6563,607.8375 860.2344,607.4313 859.7344,607.4313 C859.5,607.4313 859.2813,607.5094 859.0781,607.7125 C858.6406,608.15 858.6406,608.15 858.4688,608.2438 C858.0156,608.4781 857.375,608.6188 856.6094,608.6188 C854.6094,608.6188 853.3281,607.6031 853.3281,606.025 L853.3281,604.9781 C853.3281,603.275 854.5469,602.0719 856.25,602.0719 C856.8281,602.0719 857.4063,602.2125 857.875,602.4625 C858.3438,602.7281 858.5156,602.9156 858.5781,603.275 C858.7031,603.9469 858.9531,604.1969 859.4844,604.1969 C859.7656,604.1969 860.0469,604.0563 860.2344,603.8375 C860.3594,603.6656 860.4063,603.4938 860.4063,603.0563 L860.4063,601.6969 C860.4063,601.275 860.3906,601.1344 860.2656,600.9625 C860.0938,600.7125 859.8125,600.5563 859.4844,600.5563 C859.1719,600.5563 858.9688,600.6656 858.75,600.9313 C857.5781,600.4313 857.1406,600.3219 856.1875,600.3219 C853.5156,600.3219 851.5,602.3375 851.5,604.9625 L851.5,606.0563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="893" y="601.6001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102" x="870.5" y="617.6061">max_four_bytes</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="980.5" y="580.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="981.5" y="594.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="842.5" x2="985.5" y1="626.4" y2="626.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="842.5" x2="985.5" y1="634.4" y2="634.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="53.9375" id="C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="843.5" y="529"/>
+      <ellipse cx="858.5" cy="547.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M861.4688,553.6094 Q860.8906,553.9063 860.25,554.0469 Q859.6094,554.2031 858.9063,554.2031 Q856.4063,554.2031 855.0781,552.5625 Q853.7656,550.9063 853.7656,547.7813 Q853.7656,544.6563 855.0781,543 Q856.4063,541.3438 858.9063,541.3438 Q859.6094,541.3438 860.25,541.5 Q860.9063,541.6563 861.4688,541.9531 L861.4688,544.6719 Q860.8438,544.0938 860.25,543.8281 Q859.6563,543.5469 859.0313,543.5469 Q857.6875,543.5469 857,544.625 Q856.3125,545.6875 856.3125,547.7813 Q856.3125,549.875 857,550.9531 Q857.6875,552.0156 859.0313,552.0156 Q859.6563,552.0156 860.25,551.75 Q860.8438,551.4688 861.4688,550.8906 L861.4688,553.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="888" y="545.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="96" x="872.5" y="559.1074">max_four_bytes</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="976.5" y="526"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="977.5" y="538.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="566.9375" y2="566.9375"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="574.9375" y2="574.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
-      <g id="elem_C_0000392540961352249242">
-        <rect codeLine="14" fill="#F1F1F1" height="109.3998" id="C_0000392540961352249242" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="1125" y="558.2"/>
-        <ellipse cx="1150.8" cy="579.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1145.8,580.8563 C1145.8,583.3563 1147.9406,585.1688 1150.8625,585.1688 C1152.0969,585.1688 1153.2688,584.8719 1154.0188,584.3563 C1154.6281,583.9344 1154.9563,583.5125 1154.9563,583.1063 C1154.9563,582.6375 1154.5344,582.2313 1154.0344,582.2313 C1153.8,582.2313 1153.5813,582.3094 1153.3781,582.5125 C1152.9406,582.95 1152.9406,582.95 1152.7688,583.0438 C1152.3156,583.2781 1151.675,583.4188 1150.9094,583.4188 C1148.9094,583.4188 1147.6281,582.4031 1147.6281,580.825 L1147.6281,579.7781 C1147.6281,578.075 1148.8469,576.8719 1150.55,576.8719 C1151.1281,576.8719 1151.7063,577.0125 1152.175,577.2625 C1152.6438,577.5281 1152.8156,577.7156 1152.8781,578.075 C1153.0031,578.7469 1153.2531,578.9969 1153.7844,578.9969 C1154.0656,578.9969 1154.3469,578.8563 1154.5344,578.6375 C1154.6594,578.4656 1154.7063,578.2938 1154.7063,577.8563 L1154.7063,576.4969 C1154.7063,576.075 1154.6906,575.9344 1154.5656,575.7625 C1154.3938,575.5125 1154.1125,575.3563 1153.7844,575.3563 C1153.4719,575.3563 1153.2688,575.4656 1153.05,575.7313 C1151.8781,575.2313 1151.4406,575.1219 1150.4875,575.1219 C1147.8156,575.1219 1145.8,577.1375 1145.8,579.7625 L1145.8,580.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="1165.2" y="576.4001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="1170.2" y="592.4061">iterable</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1239" y="555.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1240" y="569.4001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1126" x2="1244" y1="601.2" y2="601.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="1131" y="618.206">(T container)</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="1126" x2="1244" y1="626" y2="626"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="1131" y="643.0059">container.begin()</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="1131" y="659.8058">container.end()</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="92.3516" id="C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="1147" y="510"/>
+      <ellipse cx="1163.8" cy="528.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1166.7688,534.6094 Q1166.1906,534.9063 1165.55,535.0469 Q1164.9094,535.2031 1164.2063,535.2031 Q1161.7063,535.2031 1160.3781,533.5625 Q1159.0656,531.9063 1159.0656,528.7813 Q1159.0656,525.6563 1160.3781,524 Q1161.7063,522.3438 1164.2063,522.3438 Q1164.9094,522.3438 1165.55,522.5 Q1166.2063,522.6563 1166.7688,522.9531 L1166.7688,525.6719 Q1166.1438,525.0938 1165.55,524.8281 Q1164.9563,524.5469 1164.3313,524.5469 Q1162.9875,524.5469 1162.3,525.625 Q1161.6125,526.6875 1161.6125,528.7813 Q1161.6125,530.875 1162.3,531.9531 Q1162.9875,533.0156 1164.3313,533.0156 Q1164.9563,533.0156 1165.55,532.75 Q1166.1438,532.4688 1166.7688,531.8906 L1166.7688,534.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1176.2" y="526.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="1184.7" y="540.1074">iterable</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1249" y="507"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1250" y="519.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1148" x2="1254" y1="547.9375" y2="547.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="1153" y="562.1479">(T container)</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="1148" x2="1254" y1="568.7422" y2="568.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="1153" y="582.9526">container.begin()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="86" x="1153" y="595.7573">container.end()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
-      <g id="elem_C_0001850394311226276678">
-        <rect codeLine="21" fill="#F1F1F1" height="92.5999" id="C_0001850394311226276678" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="165" x="1288.5" y="566.6"/>
-        <ellipse cx="1313.4" cy="588.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1308.4,589.2563 C1308.4,591.7563 1310.5406,593.5688 1313.4625,593.5688 C1314.6969,593.5688 1315.8688,593.2719 1316.6188,592.7563 C1317.2281,592.3344 1317.5563,591.9125 1317.5563,591.5063 C1317.5563,591.0375 1317.1344,590.6313 1316.6344,590.6313 C1316.4,590.6313 1316.1813,590.7094 1315.9781,590.9125 C1315.5406,591.35 1315.5406,591.35 1315.3688,591.4438 C1314.9156,591.6781 1314.275,591.8188 1313.5094,591.8188 C1311.5094,591.8188 1310.2281,590.8031 1310.2281,589.225 L1310.2281,588.1781 C1310.2281,586.475 1311.4469,585.2719 1313.15,585.2719 C1313.7281,585.2719 1314.3063,585.4125 1314.775,585.6625 C1315.2438,585.9281 1315.4156,586.1156 1315.4781,586.475 C1315.6031,587.1469 1315.8531,587.3969 1316.3844,587.3969 C1316.6656,587.3969 1316.9469,587.2563 1317.1344,587.0375 C1317.2594,586.8656 1317.3063,586.6938 1317.3063,586.2563 L1317.3063,584.8969 C1317.3063,584.475 1317.2906,584.3344 1317.1656,584.1625 C1316.9938,583.9125 1316.7125,583.7563 1316.3844,583.7563 C1316.0719,583.7563 1315.8688,583.8656 1315.65,584.1313 C1314.4781,583.6313 1314.0406,583.5219 1313.0875,583.5219 C1310.4156,583.5219 1308.4,585.5375 1308.4,588.1625 L1308.4,589.2563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="1351.1" y="584.8001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="1329.6" y="600.8061">has_value_type</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1447.5" y="563.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1448.5" y="577.8001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1289.5" x2="1452.5" y1="609.6" y2="609.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1294.5" y="626.606">()</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="1289.5" x2="1452.5" y1="634.4" y2="634.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="1294.5" y="651.4059">typename T::value_type</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="79.5469" id="C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="1322.5" y="516"/>
+      <ellipse cx="1341.55" cy="534.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1344.5188,540.6094 Q1343.9406,540.9063 1343.3,541.0469 Q1342.6594,541.2031 1341.9563,541.2031 Q1339.4563,541.2031 1338.1281,539.5625 Q1336.8156,537.9063 1336.8156,534.7813 Q1336.8156,531.6563 1338.1281,530 Q1339.4563,528.3438 1341.9563,528.3438 Q1342.6594,528.3438 1343.3,528.5 Q1343.9563,528.6563 1344.5188,528.9531 L1344.5188,531.6719 Q1343.8938,531.0938 1343.3,530.8281 Q1342.7063,530.5469 1342.0813,530.5469 Q1340.7375,530.5469 1340.05,531.625 Q1339.3625,532.6875 1339.3625,534.7813 Q1339.3625,536.875 1340.05,537.9531 Q1340.7375,539.0156 1342.0813,539.0156 Q1342.7063,539.0156 1343.3,538.75 Q1343.8938,538.4688 1344.5188,537.8906 L1344.5188,540.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371.45" y="532.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="1356.45" y="546.1074">has_value_type</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1463.5" y="513"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1464.5" y="525.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1323.5" x2="1468.5" y1="553.9375" y2="553.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="8" x="1328.5" y="568.1479">()</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="1323.5" x2="1468.5" y1="574.7422" y2="574.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="1328.5" y="588.9526">typename T::value_type</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
-      <g id="elem_C_0000137304962071054497">
-        <rect codeLine="27" fill="#F1F1F1" height="126.1997" id="C_0000137304962071054497" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="305" x="423.5" y="355"/>
-        <ellipse cx="500.25" cy="376.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M495.25,377.6563 C495.25,380.1563 497.3906,381.9688 500.3125,381.9688 C501.5469,381.9688 502.7188,381.6719 503.4688,381.1563 C504.0781,380.7344 504.4063,380.3125 504.4063,379.9063 C504.4063,379.4375 503.9844,379.0313 503.4844,379.0313 C503.25,379.0313 503.0313,379.1094 502.8281,379.3125 C502.3906,379.75 502.3906,379.75 502.2188,379.8438 C501.7656,380.0781 501.125,380.2188 500.3594,380.2188 C498.3594,380.2188 497.0781,379.2031 497.0781,377.625 L497.0781,376.5781 C497.0781,374.875 498.2969,373.6719 500,373.6719 C500.5781,373.6719 501.1563,373.8125 501.625,374.0625 C502.0938,374.3281 502.2656,374.5156 502.3281,374.875 C502.4531,375.5469 502.7031,375.7969 503.2344,375.7969 C503.5156,375.7969 503.7969,375.6563 503.9844,375.4375 C504.1094,375.2656 504.1563,375.0938 504.1563,374.6563 L504.1563,373.2969 C504.1563,372.875 504.1406,372.7344 504.0156,372.5625 C503.8438,372.3125 503.5625,372.1563 503.2344,372.1563 C502.9219,372.1563 502.7188,372.2656 502.5,372.5313 C501.3281,372.0313 500.8906,371.9219 499.9375,371.9219 C497.2656,371.9219 495.25,373.9375 495.25,376.5625 L495.25,377.6563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="558.25" y="373.2001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="520.75" y="389.2061">convertible_to_string</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="722.5" y="352"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="723.5" y="366.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="424.5" x2="727.5" y1="398" y2="398"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="429.5" y="415.006">(T s)</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="424.5" x2="727.5" y1="422.8" y2="422.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="429.5" y="439.8059">std::string{s}</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="171" x="429.5" y="456.6058">{std::to_string(s)} noexcept</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="293" x="429.5" y="473.4058">{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="105.1563" id="C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="429.5" y="328"/>
+      <ellipse cx="501.25" cy="346.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M504.2188,352.6094 Q503.6406,352.9063 503,353.0469 Q502.3594,353.2031 501.6563,353.2031 Q499.1563,353.2031 497.8281,351.5625 Q496.5156,349.9063 496.5156,346.7813 Q496.5156,343.6563 497.8281,342 Q499.1563,340.3438 501.6563,340.3438 Q502.3594,340.3438 503,340.5 Q503.6563,340.6563 504.2188,340.9531 L504.2188,343.6719 Q503.5938,343.0938 503,342.8281 Q502.4063,342.5469 501.7813,342.5469 Q500.4375,342.5469 499.75,343.625 Q499.0625,344.6875 499.0625,346.7813 Q499.0625,348.875 499.75,349.9531 Q500.4375,351.0156 501.7813,351.0156 Q502.4063,351.0156 503,350.75 Q503.5938,350.4688 504.2188,349.8906 L504.2188,352.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="554.25" y="344.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="130" x="521.75" y="358.1074">convertible_to_string</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="716.5" y="325"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="717.5" y="337.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="430.5" x2="721.5" y1="365.9375" y2="365.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="435.5" y="380.1479">(T s)</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="430.5" x2="721.5" y1="386.7422" y2="386.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="80" x="435.5" y="400.9526">std::string{s}</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="435.5" y="413.7573">{std::to_string(s)} noexcept</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="281" x="435.5" y="426.562">{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
-      <g id="elem_C_0001043398062146751019">
-        <rect codeLine="35" fill="#F1F1F1" height="59" id="C_0001043398062146751019" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="200" x="1271" y="388.6"/>
-        <ellipse cx="1286" cy="410.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1281,411.2563 C1281,413.7563 1283.1406,415.5688 1286.0625,415.5688 C1287.2969,415.5688 1288.4688,415.2719 1289.2188,414.7563 C1289.8281,414.3344 1290.1563,413.9125 1290.1563,413.5063 C1290.1563,413.0375 1289.7344,412.6313 1289.2344,412.6313 C1289,412.6313 1288.7813,412.7094 1288.5781,412.9125 C1288.1406,413.35 1288.1406,413.35 1287.9688,413.4438 C1287.5156,413.6781 1286.875,413.8188 1286.1094,413.8188 C1284.1094,413.8188 1282.8281,412.8031 1282.8281,411.225 L1282.8281,410.1781 C1282.8281,408.475 1284.0469,407.2719 1285.75,407.2719 C1286.3281,407.2719 1286.9063,407.4125 1287.375,407.6625 C1287.8438,407.9281 1288.0156,408.1156 1288.0781,408.475 C1288.2031,409.1469 1288.4531,409.3969 1288.9844,409.3969 C1289.2656,409.3969 1289.5469,409.2563 1289.7344,409.0375 C1289.8594,408.8656 1289.9063,408.6938 1289.9063,408.2563 L1289.9063,406.8969 C1289.9063,406.475 1289.8906,406.3344 1289.7656,406.1625 C1289.5938,405.9125 1289.3125,405.7563 1288.9844,405.7563 C1288.6719,405.7563 1288.4688,405.8656 1288.25,406.1313 C1287.0781,405.6313 1286.6406,405.5219 1285.6875,405.5219 C1283.0156,405.5219 1281,407.5375 1281,410.1625 L1281,411.2563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="1350" y="406.8001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="1300" y="422.8061">iterable_with_value_type</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1465" y="385.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1466" y="399.8001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1272" x2="1470" y1="431.6" y2="431.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1272" x2="1470" y1="439.6" y2="439.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="53.9375" id="C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="1299" y="353.5"/>
+      <ellipse cx="1314" cy="372.4688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1316.9688,378.1094 Q1316.3906,378.4063 1315.75,378.5469 Q1315.1094,378.7031 1314.4063,378.7031 Q1311.9063,378.7031 1310.5781,377.0625 Q1309.2656,375.4063 1309.2656,372.2813 Q1309.2656,369.1563 1310.5781,367.5 Q1311.9063,365.8438 1314.4063,365.8438 Q1315.1094,365.8438 1315.75,366 Q1316.4063,366.1563 1316.9688,366.4531 L1316.9688,369.1719 Q1316.3438,368.5938 1315.75,368.3281 Q1315.1563,368.0469 1314.5313,368.0469 Q1313.1875,368.0469 1312.5,369.125 Q1311.8125,370.1875 1311.8125,372.2813 Q1311.8125,374.375 1312.5,375.4531 Q1313.1875,376.5156 1314.5313,376.5156 Q1315.1563,376.5156 1315.75,376.25 Q1316.3438,375.9688 1316.9688,375.3906 L1316.9688,378.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371" y="369.6387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="151" x="1328" y="383.6074">iterable_with_value_type</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1487" y="350.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1488" y="362.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="391.4375" y2="391.4375"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="399.4375" y2="399.4375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
-      <g id="elem_C_0000866345615551223718">
-        <rect codeLine="38" fill="#F1F1F1" height="59" id="C_0000866345615551223718" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="847.5" y="202.2"/>
-        <ellipse cx="862.5" cy="223.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M857.5,224.8563 C857.5,227.3563 859.6406,229.1688 862.5625,229.1688 C863.7969,229.1688 864.9688,228.8719 865.7188,228.3563 C866.3281,227.9344 866.6563,227.5125 866.6563,227.1063 C866.6563,226.6375 866.2344,226.2313 865.7344,226.2313 C865.5,226.2313 865.2813,226.3094 865.0781,226.5125 C864.6406,226.95 864.6406,226.95 864.4688,227.0438 C864.0156,227.2781 863.375,227.4188 862.6094,227.4188 C860.6094,227.4188 859.3281,226.4031 859.3281,224.825 L859.3281,223.7781 C859.3281,222.075 860.5469,220.8719 862.25,220.8719 C862.8281,220.8719 863.4063,221.0125 863.875,221.2625 C864.3438,221.5281 864.5156,221.7156 864.5781,222.075 C864.7031,222.7469 864.9531,222.9969 865.4844,222.9969 C865.7656,222.9969 866.0469,222.8563 866.2344,222.6375 C866.3594,222.4656 866.4063,222.2938 866.4063,221.8563 L866.4063,220.4969 C866.4063,220.075 866.3906,219.9344 866.2656,219.7625 C866.0938,219.5125 865.8125,219.3563 865.4844,219.3563 C865.1719,219.3563 864.9688,219.4656 864.75,219.7313 C863.5781,219.2313 863.1406,219.1219 862.1875,219.1219 C859.5156,219.1219 857.5,221.1375 857.5,223.7625 L857.5,224.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="941" y="220.4001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="876.5" y="236.4061">iterable_or_small_value_type</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="1070.5" y="199.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="1071.5" y="213.4001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="848.5" x2="1075.5" y1="245.2" y2="245.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="848.5" x2="1075.5" y1="253.2" y2="253.2"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="53.9375" id="C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.5;" width="220" x="858" y="184"/>
+      <ellipse cx="873" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M875.9688,208.6094 Q875.3906,208.9063 874.75,209.0469 Q874.1094,209.2031 873.4063,209.2031 Q870.9063,209.2031 869.5781,207.5625 Q868.2656,205.9063 868.2656,202.7813 Q868.2656,199.6563 869.5781,198 Q870.9063,196.3438 873.4063,196.3438 Q874.1094,196.3438 874.75,196.5 Q875.4063,196.6563 875.9688,196.9531 L875.9688,199.6719 Q875.3438,199.0938 874.75,198.8281 Q874.1563,198.5469 873.5313,198.5469 Q872.1875,198.5469 871.5,199.625 Q870.8125,200.6875 870.8125,202.7813 Q870.8125,204.875 871.5,205.9531 Q872.1875,207.0156 873.5313,207.0156 Q874.1563,207.0156 874.75,206.75 Q875.3438,206.4688 875.9688,205.8906 L875.9688,208.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="943" y="200.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="177" x="887" y="214.1074">iterable_or_small_value_type</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1072" y="181"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1073" y="193.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="221.9375" y2="221.9375"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="229.9375" y2="229.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001418333499545421661">
-        <rect codeLine="41" fill="#F1F1F1" height="64.7999" id="C_0001418333499545421661" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="142" x="843" y="385.7"/>
-        <ellipse cx="858" cy="401.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M853,402.8563 C853,405.3563 855.1406,407.1688 858.0625,407.1688 C859.2969,407.1688 860.4688,406.8719 861.2188,406.3563 C861.8281,405.9344 862.1563,405.5125 862.1563,405.1063 C862.1563,404.6375 861.7344,404.2313 861.2344,404.2313 C861,404.2313 860.7813,404.3094 860.5781,404.5125 C860.1406,404.95 860.1406,404.95 859.9688,405.0438 C859.5156,405.2781 858.875,405.4188 858.1094,405.4188 C856.1094,405.4188 854.8281,404.4031 854.8281,402.825 L854.8281,401.7781 C854.8281,400.075 856.0469,398.8719 857.75,398.8719 C858.3281,398.8719 858.9063,399.0125 859.375,399.2625 C859.8438,399.5281 860.0156,399.7156 860.0781,400.075 C860.2031,400.7469 860.4531,400.9969 860.9844,400.9969 C861.2656,400.9969 861.5469,400.8563 861.7344,400.6375 C861.8594,400.4656 861.9063,400.2938 861.9063,399.8563 L861.9063,398.4969 C861.9063,398.075 861.8906,397.9344 861.7656,397.7625 C861.5938,397.5125 861.3125,397.3563 860.9844,397.3563 C860.6719,397.3563 860.4688,397.4656 860.25,397.7313 C859.0781,397.2313 858.6406,397.1219 857.6875,397.1219 C855.0156,397.1219 853,399.1375 853,401.7625 L853,402.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="872" y="406.306">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="99" x="889" y="382.7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="97" x="890" y="396.9001">max_four_bytes T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="844" x2="984" y1="417.7" y2="417.7"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="844" x2="984" y1="425.7" y2="425.7"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="849" y="434.6"/>
-          <ellipse cx="854" cy="439.6" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="863" y="442.7059">a : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="60.8047" id="C_0001418333499545421661" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="837" y="350"/>
+      <ellipse cx="852" cy="366" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M854.9688,371.6406 Q854.3906,371.9375 853.75,372.0781 Q853.1094,372.2344 852.4063,372.2344 Q849.9063,372.2344 848.5781,370.5938 Q847.2656,368.9375 847.2656,365.8125 Q847.2656,362.6875 848.5781,361.0313 Q849.9063,359.375 852.4063,359.375 Q853.1094,359.375 853.75,359.5313 Q854.4063,359.6875 854.9688,359.9844 L854.9688,362.7031 Q854.3438,362.125 853.75,361.8594 Q853.1563,361.5781 852.5313,361.5781 Q851.1875,361.5781 850.5,362.6563 Q849.8125,363.7188 849.8125,365.8125 Q849.8125,367.9063 850.5,368.9844 Q851.1875,370.0469 852.5313,370.0469 Q853.1563,370.0469 853.75,369.7813 Q854.3438,369.5 854.9688,368.9219 L854.9688,371.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="866" y="370.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="110" x="882" y="347"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="883" y="359.1387">max_four_bytes T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="382" y2="382"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="390" y2="390"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001814355496814977880">
-        <rect codeLine="46" fill="#F1F1F1" height="64.7999" id="C_0001814355496814977880" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="934.5" y="26.8"/>
-        <ellipse cx="950.85" cy="42.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M945.85,43.9563 C945.85,46.4563 947.9906,48.2688 950.9125,48.2688 C952.1469,48.2688 953.3188,47.9719 954.0688,47.4563 C954.6781,47.0344 955.0063,46.6125 955.0063,46.2063 C955.0063,45.7375 954.5844,45.3313 954.0844,45.3313 C953.85,45.3313 953.6313,45.4094 953.4281,45.6125 C952.9906,46.05 952.9906,46.05 952.8188,46.1438 C952.3656,46.3781 951.725,46.5188 950.9594,46.5188 C948.9594,46.5188 947.6781,45.5031 947.6781,43.925 L947.6781,42.8781 C947.6781,41.175 948.8969,39.9719 950.6,39.9719 C951.1781,39.9719 951.7563,40.1125 952.225,40.3625 C952.6938,40.6281 952.8656,40.8156 952.9281,41.175 C953.0531,41.8469 953.3031,42.0969 953.8344,42.0969 C954.1156,42.0969 954.3969,41.9563 954.5844,41.7375 C954.7094,41.5656 954.7563,41.3938 954.7563,40.9563 L954.7563,39.5969 C954.7563,39.175 954.7406,39.0344 954.6156,38.8625 C954.4438,38.6125 954.1625,38.4563 953.8344,38.4563 C953.5219,38.4563 953.3188,38.5656 953.1,38.8313 C951.9281,38.3313 951.4906,38.2219 950.5375,38.2219 C947.8656,38.2219 945.85,40.2375 945.85,42.8625 L945.85,43.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="965.15" y="47.406">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="983.5" y="23.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="984.5" y="38.0001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="935.5" x2="988.5" y1="58.8" y2="58.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="935.5" x2="988.5" y1="66.8" y2="66.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="940.5" y="75.7"/>
-          <ellipse cx="945.5" cy="80.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="954.5" y="83.8059">b : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="843" y="396"/>
+      <ellipse cx="848" cy="401" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001512618198241549089">
-        <rect codeLine="51" fill="#F1F1F1" height="64.7999" id="C_0001512618198241549089" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="170" x="491" y="199.3"/>
-        <ellipse cx="506" cy="215.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M501,216.4563 C501,218.9563 503.1406,220.7688 506.0625,220.7688 C507.2969,220.7688 508.4688,220.4719 509.2188,219.9563 C509.8281,219.5344 510.1563,219.1125 510.1563,218.7063 C510.1563,218.2375 509.7344,217.8313 509.2344,217.8313 C509,217.8313 508.7813,217.9094 508.5781,218.1125 C508.1406,218.55 508.1406,218.55 507.9688,218.6438 C507.5156,218.8781 506.875,219.0188 506.1094,219.0188 C504.1094,219.0188 502.8281,218.0031 502.8281,216.425 L502.8281,215.3781 C502.8281,213.675 504.0469,212.4719 505.75,212.4719 C506.3281,212.4719 506.9063,212.6125 507.375,212.8625 C507.8438,213.1281 508.0156,213.3156 508.0781,213.675 C508.2031,214.3469 508.4531,214.5969 508.9844,214.5969 C509.2656,214.5969 509.5469,214.4563 509.7344,214.2375 C509.8594,214.0656 509.9063,213.8938 509.9063,213.4563 L509.9063,212.0969 C509.9063,211.675 509.8906,211.5344 509.7656,211.3625 C509.5938,211.1125 509.3125,210.9563 508.9844,210.9563 C508.6719,210.9563 508.4688,211.0656 508.25,211.3313 C507.0781,210.8313 506.6406,210.7219 505.6875,210.7219 C503.0156,210.7219 501,212.7375 501,215.3625 L501,216.4563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="520" y="219.906">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="126" x="538" y="196.3"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="124" x="539" y="210.5001">convertible_to_string T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="492" x2="660" y1="231.3" y2="231.3"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="492" x2="660" y1="239.3" y2="239.3"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="497" y="248.2"/>
-          <ellipse cx="502" cy="253.2" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="511" y="256.3059">c : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="857" y="404.2104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001635109601630198093">
-        <rect codeLine="56" fill="#F1F1F1" height="48" id="C_0001635109601630198093" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="216" x="1020" y="394.1"/>
-        <ellipse cx="1035" cy="410.1" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1030,411.2563 C1030,413.7563 1032.1406,415.5688 1035.0625,415.5688 C1036.2969,415.5688 1037.4688,415.2719 1038.2188,414.7563 C1038.8281,414.3344 1039.1563,413.9125 1039.1563,413.5063 C1039.1563,413.0375 1038.7344,412.6313 1038.2344,412.6313 C1038,412.6313 1037.7813,412.7094 1037.5781,412.9125 C1037.1406,413.35 1037.1406,413.35 1036.9688,413.4438 C1036.5156,413.6781 1035.875,413.8188 1035.1094,413.8188 C1033.1094,413.8188 1031.8281,412.8031 1031.8281,411.225 L1031.8281,410.1781 C1031.8281,408.475 1033.0469,407.2719 1034.75,407.2719 C1035.3281,407.2719 1035.9063,407.4125 1036.375,407.6625 C1036.8438,407.9281 1037.0156,408.1156 1037.0781,408.475 C1037.2031,409.1469 1037.4531,409.3969 1037.9844,409.3969 C1038.2656,409.3969 1038.5469,409.2563 1038.7344,409.0375 C1038.8594,408.8656 1038.9063,408.6938 1038.9063,408.2563 L1038.9063,406.8969 C1038.9063,406.475 1038.8906,406.3344 1038.7656,406.1625 C1038.5938,405.9125 1038.3125,405.7563 1037.9844,405.7563 C1037.6719,405.7563 1037.4688,405.8656 1037.25,406.1313 C1036.0781,405.6313 1035.6406,405.5219 1034.6875,405.5219 C1032.0156,405.5219 1030,407.5375 1030,410.1625 L1030,411.2563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1049" y="414.706">D</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="172" x="1067" y="391.1"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="170" x="1068" y="405.3001">iterable T1,T2,iterable T3,T4,T5</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1021" x2="1235" y1="426.1" y2="426.1"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1021" x2="1235" y1="434.1" y2="434.1"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="60.8047" id="C_0001814355496814977880" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="942" y="20.5"/>
+      <ellipse cx="957.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M960.4188,42.1406 Q959.8406,42.4375 959.2,42.5781 Q958.5594,42.7344 957.8563,42.7344 Q955.3563,42.7344 954.0281,41.0938 Q952.7156,39.4375 952.7156,36.3125 Q952.7156,33.1875 954.0281,31.5313 Q955.3563,29.875 957.8563,29.875 Q958.5594,29.875 959.2,30.0313 Q959.8563,30.1875 960.4188,30.4844 L960.4188,33.2031 Q959.7938,32.625 959.2,32.3594 Q958.6063,32.0781 957.9813,32.0781 Q956.6375,32.0781 955.95,33.1563 Q955.2625,34.2188 955.2625,36.3125 Q955.2625,38.4063 955.95,39.4844 Q956.6375,40.5469 957.9813,40.5469 Q958.6063,40.5469 959.2,40.2813 Q959.7938,40 960.4188,39.4219 L960.4188,42.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="971.55" y="40.6543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="988" y="17.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="989" y="29.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="52.5" y2="52.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001429225801945621089">
-        <rect codeLine="60" fill="#F1F1F1" height="98.3998" id="C_0001429225801945621089" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="294.5" y="10"/>
-        <ellipse cx="309.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M304.5,27.1563 C304.5,29.6563 306.6406,31.4688 309.5625,31.4688 C310.7969,31.4688 311.9688,31.1719 312.7188,30.6563 C313.3281,30.2344 313.6563,29.8125 313.6563,29.4063 C313.6563,28.9375 313.2344,28.5313 312.7344,28.5313 C312.5,28.5313 312.2813,28.6094 312.0781,28.8125 C311.6406,29.25 311.6406,29.25 311.4688,29.3438 C311.0156,29.5781 310.375,29.7188 309.6094,29.7188 C307.6094,29.7188 306.3281,28.7031 306.3281,27.125 L306.3281,26.0781 C306.3281,24.375 307.5469,23.1719 309.25,23.1719 C309.8281,23.1719 310.4063,23.3125 310.875,23.5625 C311.3438,23.8281 311.5156,24.0156 311.5781,24.375 C311.7031,25.0469 311.9531,25.2969 312.4844,25.2969 C312.7656,25.2969 313.0469,25.1563 313.2344,24.9375 C313.3594,24.7656 313.4063,24.5938 313.4063,24.1563 L313.4063,22.7969 C313.4063,22.375 313.3906,22.2344 313.2656,22.0625 C313.0938,21.8125 312.8125,21.6563 312.4844,21.6563 C312.1719,21.6563 311.9688,21.7656 311.75,22.0313 C310.5781,21.5313 310.1406,21.4219 309.1875,21.4219 C306.5156,21.4219 304.5,23.4375 304.5,26.0625 L304.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="323.5" y="30.606">E</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="50" x="340.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="341.5" y="21.2001">T1,T2,T3</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="295.5" x2="386.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="295.5" x2="386.5" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300.5" y="58.9"/>
-          <ellipse cx="305.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="314.5" y="67.0059">e1 : T1</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300.5" y="75.6999"/>
-          <ellipse cx="305.5" cy="80.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="314.5" y="83.8059">e2 : T2</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="300.5" y="92.4998"/>
-          <ellipse cx="305.5" cy="97.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="314.5" y="100.6058">e3 : T3</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="948" y="66.5"/>
+      <ellipse cx="953" cy="71.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <g id="elem_C_0000856301122972546034">
-        <rect codeLine="67" fill="#F1F1F1" height="98.3998" id="C_0000856301122972546034" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="52.5" y="10"/>
-        <ellipse cx="67.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M62.5,27.1563 C62.5,29.6563 64.6406,31.4688 67.5625,31.4688 C68.7969,31.4688 69.9688,31.1719 70.7188,30.6563 C71.3281,30.2344 71.6563,29.8125 71.6563,29.4063 C71.6563,28.9375 71.2344,28.5313 70.7344,28.5313 C70.5,28.5313 70.2813,28.6094 70.0781,28.8125 C69.6406,29.25 69.6406,29.25 69.4688,29.3438 C69.0156,29.5781 68.375,29.7188 67.6094,29.7188 C65.6094,29.7188 64.3281,28.7031 64.3281,27.125 L64.3281,26.0781 C64.3281,24.375 65.5469,23.1719 67.25,23.1719 C67.8281,23.1719 68.4063,23.3125 68.875,23.5625 C69.3438,23.8281 69.5156,24.0156 69.5781,24.375 C69.7031,25.0469 69.9531,25.2969 70.4844,25.2969 C70.7656,25.2969 71.0469,25.1563 71.2344,24.9375 C71.3594,24.7656 71.4063,24.5938 71.4063,24.1563 L71.4063,22.7969 C71.4063,22.375 71.3906,22.2344 71.2656,22.0625 C71.0938,21.8125 70.8125,21.6563 70.4844,21.6563 C70.1719,21.6563 69.9688,21.7656 69.75,22.0313 C68.5781,21.5313 68.1406,21.4219 67.1875,21.4219 C64.5156,21.4219 62.5,23.4375 62.5,26.0625 L62.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81.5" y="30.606">F</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="50" x="98.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="99.5" y="21.2001">T1,T2,T3</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="53.5" x2="144.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="53.5" x2="144.5" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="58.5" y="58.9"/>
-          <ellipse cx="63.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="72.5" y="67.0059">f1 : T1</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="58.5" y="75.6999"/>
-          <ellipse cx="63.5" cy="80.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="72.5" y="83.8059">f2 : T2</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="58.5" y="92.4998"/>
-          <ellipse cx="63.5" cy="97.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="72.5" y="100.6058">f3 : T3</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="962" y="74.7104">b : T</text>
     </a>
-    <g id="link_C_0000137304962071054497_C_0000385255522691733325">
-      <path codeLine="73" d="M681.45,481.62 C707.69,496.99 735.8,513.31 762,528.2 C794.61,546.74 826.1842,564.164 855.4242,580.134 " fill="none" id="C_0000137304962071054497-to-C_0000385255522691733325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="860.69,583.01,854.7087,575.1855,856.3018,580.6133,850.874,582.2065,860.69,583.01" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="763" y="524.277">T</text>
-    </g>
-    <g id="link_C_0001043398062146751019_C_0000392540961352249242">
-      <path codeLine="74" d="M1343.15,447.96 C1315.18,476.96 1275.5757,518.0118 1241.1657,553.6818 " fill="none" id="C_0001043398062146751019-to-C_0000392540961352249242" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1237,558,1246.1273,554.2998,1240.4714,554.4015,1240.3697,548.7455,1237,558" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="1279" y="524.277">T</text>
-    </g>
-    <g id="link_C_0001043398062146751019_C_0001850394311226276678">
-      <path codeLine="75" d="M1371,447.96 C1371,479.27 1371,523.67 1371,560.33 " fill="none" id="C_0001043398062146751019-to-C_0001850394311226276678" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1371,566.33,1375,557.33,1371,561.33,1367,557.33,1371,566.33" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="1372" y="524.277">T</text>
-    </g>
-    <g id="link_C_0000866345615551223718_C_0001043398062146751019">
-      <path codeLine="76" d="M1036.32,261.65 C1095.83,285.35 1181.11,320.48 1254,355 C1275.61,365.24 1293.6978,374.5641 1313.8178,385.4041 " fill="none" id="C_0000866345615551223718-to-C_0001043398062146751019" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1319.1,388.25,1313.074,380.4598,1314.6982,385.8785,1309.2795,387.5027,1319.1,388.25" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="1183" y="321.077">T</text>
-    </g>
-    <g id="link_C_0000866345615551223718_C_0000385255522691733325">
-      <path codeLine="77" d="M908.01,261.5 C874.74,282.52 834.95,314.4 816,355 C792.27,405.82 798.27,427.99 816,481.2 C829.27,521.02 855.7957,554.1509 879.3257,578.6709 " fill="none" id="C_0000866345615551223718-to-C_0000385255522691733325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="883.48,583,880.1346,573.7367,880.018,579.3924,874.3624,579.2759,883.48,583" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="817" y="422.677">T</text>
-    </g>
-    <g id="link_C_0001418333499545421661_C_0000385255522691733325">
-      <path codeLine="78" d="M914,450.94 C914,487.73 914,541.74 914,577.17 " fill="none" id="C_0001418333499545421661-to-C_0000385255522691733325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="914,583.17,918,574.17,914,578.17,910,574.17,914,583.17" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="915" y="524.277">T</text>
-    </g>
-    <g id="link_C_0001814355496814977880_C_0000866345615551223718">
-      <path codeLine="79" d="M962,91.87 C962,123.36 962,165.26 962,195.76 " fill="none" id="C_0001814355496814977880-to-C_0000866345615551223718" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="962,201.76,966,192.76,962,196.76,958,192.76,962,201.76" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="963" y="151.477">T</text>
-    </g>
-    <g id="link_C_0001512618198241549089_C_0000137304962071054497">
-      <path codeLine="80" d="M576,264.4 C576,289.11 576,318.21 576,348.53 " fill="none" id="C_0001512618198241549089-to-C_0000137304962071054497" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="576,354.53,580,345.53,576,349.53,572,345.53,576,354.53" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="577" y="321.077">T</text>
-    </g>
-    <g id="link_C_0001635109601630198093_C_0000392540961352249242">
-      <path codeLine="81" d="M1122.99,442.29 C1119.13,464.82 1115.84,499.7 1125,528.2 C1128.28,538.41 1130.1596,543.3398 1135.9596,552.6998 " fill="none" id="C_0001635109601630198093-to-C_0000392540961352249242" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1139.12,557.8,1137.7796,548.0428,1136.4864,553.5498,1130.9793,552.2566,1139.12,557.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1126" y="524.277">T1</text>
-    </g>
-    <g id="link_C_0001635109601630198093_C_0000392540961352249242">
-      <path codeLine="82" d="M1134.88,442.36 C1143.28,470.8 1156.0888,514.0962 1167.3388,552.1462 " fill="none" id="C_0001635109601630198093-to-C_0000392540961352249242-1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1169.04,557.9,1170.3241,548.1352,1167.6223,553.1052,1162.6524,550.4035,1169.04,557.9" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1160" y="524.277">T3</text>
-    </g>
-    <g id="link_C_0001635109601630198093_C_0000385255522691733325">
-      <path codeLine="83" d="M1090.28,442.42 C1063.5,459.81 1027.42,484.99 999,511.2 C974.95,533.38 954.8974,557.4436 938.6574,578.5636 " fill="none" id="C_0001635109601630198093-to-C_0000385255522691733325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="935,583.32,943.657,578.6236,938.0478,579.3563,937.3151,573.7471,935,583.32" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1000" y="524.277">T2</text>
-    </g>
-    <g id="link_C_0001635109601630198093_C_0000385255522691733325">
-      <path codeLine="84" d="M1106.44,442.49 C1085.18,465.16 1051.4,500.14 1020,528.2 C998.58,547.34 978.1559,563.685 957.7059,579.325 " fill="none" id="C_0001635109601630198093-to-C_0000385255522691733325-1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="952.94,582.97,962.5189,580.6799,956.9116,579.9325,957.6589,574.3253,952.94,582.97" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="1036" y="524.277">T5</text>
-    </g>
-    <g id="link_C_0001429225801945621089_C_0001830716585637735576">
-      <path codeLine="85" d="M341,108.6 C341,132.63 341,155.48 341,179.11 " fill="none" id="C_0001429225801945621089-to-C_0001830716585637735576" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="341,185.11,345,176.11,341,180.11,337,176.11,341,185.11" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="342" y="151.477">T1,T3</text>
-    </g>
-    <g id="link_C_0000856301122972546034_C_0000902541696362244204">
-      <path codeLine="86" d="M99,108.6 C99,138.73 99,170.46 99,195.94 " fill="none" id="C_0000856301122972546034-to-C_0000902541696362244204" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="99,201.94,103,192.94,99,196.94,95,192.94,99,201.94" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="100" y="151.477">T1,T3</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="60.8047" id="C_0001512618198241549089" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="484" y="180.5"/>
+      <ellipse cx="499" cy="196.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M501.9688,202.1406 Q501.3906,202.4375 500.75,202.5781 Q500.1094,202.7344 499.4063,202.7344 Q496.9063,202.7344 495.5781,201.0938 Q494.2656,199.4375 494.2656,196.3125 Q494.2656,193.1875 495.5781,191.5313 Q496.9063,189.875 499.4063,189.875 Q500.1094,189.875 500.75,190.0313 Q501.4063,190.1875 501.9688,190.4844 L501.9688,193.2031 Q501.3438,192.625 500.75,192.3594 Q500.1563,192.0781 499.5313,192.0781 Q498.1875,192.0781 497.5,193.1563 Q496.8125,194.2188 496.8125,196.3125 Q496.8125,198.4063 497.5,199.4844 Q498.1875,200.5469 499.5313,200.5469 Q500.1563,200.5469 500.75,200.2813 Q501.3438,200 501.9688,199.4219 L501.9688,202.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="513" y="200.6543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="142" x="529" y="177.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="140" x="530" y="189.6387">convertible_to_string T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="212.5" y2="212.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="220.5" y2="220.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="490" y="226.5"/>
+      <ellipse cx="495" cy="231.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="504" y="234.7104">c : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="48" id="C_0001635109601630198093" style="stroke: #A80036; stroke-width: 1.5;" width="240" x="1024" y="356.5"/>
+      <ellipse cx="1039" cy="372.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1041.9688,378.1406 Q1041.3906,378.4375 1040.75,378.5781 Q1040.1094,378.7344 1039.4063,378.7344 Q1036.9063,378.7344 1035.5781,377.0938 Q1034.2656,375.4375 1034.2656,372.3125 Q1034.2656,369.1875 1035.5781,367.5313 Q1036.9063,365.875 1039.4063,365.875 Q1040.1094,365.875 1040.75,366.0313 Q1041.4063,366.1875 1041.9688,366.4844 L1041.9688,369.2031 Q1041.3438,368.625 1040.75,368.3594 Q1040.1563,368.0781 1039.5313,368.0781 Q1038.1875,368.0781 1037.5,369.1563 Q1036.8125,370.2188 1036.8125,372.3125 Q1036.8125,374.4063 1037.5,375.4844 Q1038.1875,376.5469 1039.5313,376.5469 Q1040.1563,376.5469 1040.75,376.2813 Q1041.3438,376 1041.9688,375.4219 L1041.9688,378.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1053" y="376.6543">D</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="197" x="1070" y="353.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="195" x="1071" y="365.6387">iterable T1,T2,iterable T3,T4,T5</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="388.5" y2="388.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="396.5" y2="396.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="86.4141" id="C_0001429225801945621089" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="287.5" y="8"/>
+      <ellipse cx="302.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M305.4688,29.6406 Q304.8906,29.9375 304.25,30.0781 Q303.6094,30.2344 302.9063,30.2344 Q300.4063,30.2344 299.0781,28.5938 Q297.7656,26.9375 297.7656,23.8125 Q297.7656,20.6875 299.0781,19.0313 Q300.4063,17.375 302.9063,17.375 Q303.6094,17.375 304.25,17.5313 Q304.9063,17.6875 305.4688,17.9844 L305.4688,20.7031 Q304.8438,20.125 304.25,19.8594 Q303.6563,19.5781 303.0313,19.5781 Q301.6875,19.5781 301,20.6563 Q300.3125,21.7188 300.3125,23.8125 Q300.3125,25.9063 301,26.9844 Q301.6875,28.0469 303.0313,28.0469 Q303.6563,28.0469 304.25,27.7813 Q304.8438,27.5 305.4688,26.9219 L305.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="316.5" y="28.1543">E</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="55" x="332.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="53" x="333.5" y="17.1387">T1,T2,T3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="54"/>
+      <ellipse cx="298.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="62.2104">e1 : T1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="66.8047"/>
+      <ellipse cx="298.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="75.0151">e2 : T2</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="79.6094"/>
+      <ellipse cx="298.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="87.8198">e3 : T3</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="86.4141" id="C_0000856301122972546034" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="49" y="8"/>
+      <ellipse cx="64" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M66.9688,29.6406 Q66.3906,29.9375 65.75,30.0781 Q65.1094,30.2344 64.4063,30.2344 Q61.9063,30.2344 60.5781,28.5938 Q59.2656,26.9375 59.2656,23.8125 Q59.2656,20.6875 60.5781,19.0313 Q61.9063,17.375 64.4063,17.375 Q65.1094,17.375 65.75,17.5313 Q66.4063,17.6875 66.9688,17.9844 L66.9688,20.7031 Q66.3438,20.125 65.75,19.8594 Q65.1563,19.5781 64.5313,19.5781 Q63.1875,19.5781 62.5,20.6563 Q61.8125,21.7188 61.8125,23.8125 Q61.8125,25.9063 62.5,26.9844 Q63.1875,28.0469 64.5313,28.0469 Q65.1563,28.0469 65.75,27.7813 Q66.3438,27.5 66.9688,26.9219 L66.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="78" y="28.1543">F</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="55" x="93" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="53" x="94" y="17.1387">T1,T2,T3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="54"/>
+      <ellipse cx="60" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="62.2104">f1 : T1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="66.8047"/>
+      <ellipse cx="60" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="75.0151">f2 : T2</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="79.6094"/>
+      <ellipse cx="60" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="87.8198">f3 : T3</text>
+    </a>
+    <path d="M669.56,433.19 C697.84,448.52 729.06,465.18 758,480 C789.06,495.91 824.03,512.91 852.89,526.69 " fill="none" id="C_0000137304962071054497-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="857.46,528.88,851.0448,521.407,852.9431,526.7359,847.6142,528.6341,857.46,528.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="759" y="476.0669">T</text>
+    <path d="M1366.38,407.85 C1337.09,433.92 1291.55,474.43 1255.68,506.35 " fill="none" id="C_0001043398062146751019-&gt;C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1251.79,509.81,1261.1798,506.8382,1255.5333,506.4953,1255.8762,500.8488,1251.79,509.81" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="1305" y="476.0669">T</text>
+    <path d="M1396,407.85 C1396,435.12 1396,478.18 1396,510.69 " fill="none" id="C_0001043398062146751019-&gt;C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1396,515.82,1400,506.82,1396,510.82,1392,506.82,1396,515.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="1397" y="476.0669">T</text>
+    <path d="M1043.12,238.07 C1107.09,260.68 1201.21,294.88 1282,328 C1299.54,335.19 1318.37,343.47 1335.58,351.25 " fill="none" id="C_0000866345615551223718-&gt;C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1340.39,353.43,1333.8519,346.0643,1335.8382,351.361,1330.5415,353.3472,1340.39,353.43" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="1206" y="294.0669">T</text>
+    <path d="M908.59,238.21 C872.92,257.44 830.6,287.32 810,328 C788.92,369.63 793.97,389.17 810,433 C823.37,469.57 853.09,502.75 877.18,525.24 " fill="none" id="C_0000866345615551223718-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="881,528.75,877.0955,519.7082,877.3243,525.3604,871.6721,525.5892,881,528.75" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="811" y="385.0669">T</text>
+    <path d="M913,411.33 C913,442.65 913,491.7 913,523.6 " fill="none" id="C_0001418333499545421661-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="913,528.96,917,519.96,913,523.96,909,519.96,913,528.96" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="914" y="476.0669">T</text>
+    <path d="M968,81.72 C968,109.41 968,150.54 968,178.72 " fill="none" id="C_0001814355496814977880-&gt;C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="968,183.82,972,174.82,968,178.82,964,174.82,968,183.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="969" y="137.0669">T</text>
+    <path d="M576,241.56 C576,264.02 576,295.58 576,322.86 " fill="none" id="C_0001512618198241549089-&gt;C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="576,327.89,580,318.89,576,322.89,572,318.89,576,327.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="577" y="294.0669">T</text>
+    <path d="M1138.73,404.51 C1135.1,424.94 1132.34,455.3 1141,480 C1144.12,488.9 1148.79,497.52 1154.17,505.56 " fill="none" id="C_0001635109601630198093-&gt;C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1157.23,509.96,1155.3889,500.2848,1154.381,505.8511,1148.8146,504.8432,1157.23,509.96" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="1142" y="476.0669">T1</text>
+    <path d="M1151.57,404.54 C1159.94,430.02 1173.68,471.84 1184.55,504.93 " fill="none" id="C_0001635109601630198093-&gt;C_0000392540961352249242-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1186.13,509.75,1187.123,499.9513,1184.5703,504.9995,1179.5222,502.4468,1186.13,509.75" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="1176" y="476.0669">T3</text>
+    <path d="M1100.85,404.63 C1073.82,419.87 1038.77,441.01 1010,463 C985.28,481.9 959.85,506.23 941.23,525.13 " fill="none" id="C_0001635109601630198093-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="937.6,528.83,946.7562,525.2018,941.0996,525.2589,941.0425,519.6024,937.6,528.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="1011" y="476.0669">T2</text>
+    <path d="M1119.77,404.53 C1097.48,425.24 1063.11,456.02 1031,480 C1009.03,496.41 983.47,512.94 961.77,526.29 " fill="none" id="C_0001635109601630198093-&gt;C_0000385255522691733325-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="957.48,528.92,967.2425,527.6189,961.7407,526.3035,963.0561,520.8017,957.48,528.92" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="1051" y="476.0669">T5</text>
+    <path d="M336,94.34 C336,116.34 336,143.22 336,165.53 " fill="none" id="C_0001429225801945621089-&gt;C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="336,170.8,340,161.8,336,165.8,332,161.8,336,170.8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="337" y="137.0669">T1,T3</text>
+    <path d="M97,94.34 C97,120.97 97,154.73 97,178.89 " fill="none" id="C_0000856301122972546034-&gt;C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="97,183.9,101,174.9,97,178.9,93,174.9,97,183.9" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="98" y="137.0669">T1,T3</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00056_class_mermaid.svg b/docs/test_cases/t00056_class_mermaid.svg
index 95752e94..8715edce 100644
--- a/docs/test_cases/t00056_class_mermaid.svg
+++ b/docs/test_cases/t00056_class_mermaid.svg
@@ -1,74 +1,69 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1519.96484375 778" style="max-width: 1519.96px; background-color: white;" width="1519.96484375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1334.92578125,557L1334.92578125,562.6666666666666C1334.92578125,568.3333333333334,1334.92578125,579.6666666666666,1311.3222640567699,596.2551828056136C1287.7187468635395,612.8436989445606,1240.511712477079,634.6873978891213,1216.908195283849,645.6092473614016L1193.3046780906186,656.5310968336819"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M442.21662234042554,513L468.7430186170213,526C495.26941489361707,539,548.3222074468085,565,569.9091123271791,582.9582229456458C591.4960172075495,600.9164458912916,581.6170344150988,610.8328917825833,576.6775430188736,615.7911147282291L571.7380516226483,620.749337673875"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M324.58725066489365,513L312.4001828457447,526C300.21311502659574,539,275.8389793882979,565,263.6519115691489,584.5C251.46484375,604,251.46484375,617,251.46484375,623.5L251.46484375,630"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M587.078125,295.9922813969692L549.5013020833334,305.99356783080765C511.9244791666667,315.9948542646461,436.7708333333333,335.9974271323231,399.1940104166667,357.99871356616154C361.6171875,380,361.6171875,404,361.6171875,416L361.6171875,428"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M853.78125,295.9922813969692L891.3580729166666,305.99356783080765C928.9348958333334,315.9948542646461,1004.0885416666666,335.9974271323231,1041.6653645833333,365.58204689949486C1079.2421875,395.1666666666667,1079.2421875,434.3333333333333,1079.2421875,473.5C1079.2421875,512.6666666666666,1079.2421875,551.8333333333334,1081.6852966064162,581.6108703209874C1084.1284057128323,611.3884073086415,1089.0146239256649,631.776814617283,1091.457733032081,641.9710182716037L1093.9008421384972,652.1652219259245"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M948.2578125,513L948.2578125,526C948.2578125,539,948.2578125,565,963.8411218229412,588.6040868911464C979.4244311458824,612.2081737822928,1010.5910497917649,633.4163475645854,1026.1743591147062,644.0204344557318L1041.7576684376475,654.6245213468782"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M720.4296875,109L720.4296875,118.33333333333333C720.4296875,127.66666666666667,720.4296875,146.33333333333334,720.4296875,164C720.4296875,181.66666666666666,720.4296875,198.33333333333334,720.4296875,206.66666666666666L720.4296875,215"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1334.92578125,300L1334.92578125,309.3333333333333C1334.92578125,318.6666666666667,1334.92578125,337.3333333333333,1334.92578125,351.3333333333333C1334.92578125,365.3333333333333,1334.92578125,374.6666666666667,1334.92578125,379.3333333333333L1334.92578125,384"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M626.3488031914893,502L604.8740026595744,516.8333333333334C583.3992021276596,531.6666666666666,540.4496010638298,561.3333333333334,518.8774026002487,580.8335510409128C497.3052041366677,600.3337687484922,497.1104082733354,609.6675374969844,497.01301034166926,614.3344218712305L496.91561241000306,619.0013062454766"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M603.2427692819149,502L569.7420212765957,516.8333333333334C536.2412732712766,531.6666666666666,469.2397772606383,561.3333333333334,440.03155459564005,581.0802366926349C410.82333193064187,600.8271400519365,419.4083826112838,610.6542801038728,423.70090795160473,615.5678501298411L427.9934332919257,620.4814201558092"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M702.1845744680851,502L720.1798537234041,516.8333333333334C738.1751329787234,531.6666666666666,774.1656914893616,561.3333333333334,826.4731365841516,588.5703644848493C878.7805816789414,615.8073956363652,947.4049133578828,640.6147912727304,981.7170791973535,653.018489090913L1016.0292450368244,665.4221869090956"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M692.8045877659574,502L705.9178856382978,516.8333333333334C719.0311835106382,531.6666666666666,745.2577792553192,561.3333333333334,799.1164452812924,589.1868461948037C852.9751113072657,617.0403590562739,934.4658476145314,643.0807181125479,975.2112157681644,656.1008976406848L1015.9565839217972,669.1210771688218"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M403.75,131L403.75,136.66666666666666C403.75,142.33333333333334,403.75,153.66666666666666,403.75,164C403.75,174.33333333333334,403.75,183.66666666666666,403.75,188.33333333333334L403.75,193"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M114.2109375,131L114.2109375,136.66666666666666C114.2109375,142.33333333333334,114.2109375,153.66666666666666,114.2109375,167.66666666666666C114.2109375,181.66666666666666,114.2109375,198.33333333333334,114.2109375,206.66666666666666L114.2109375,215"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1334.92578125,557L1334.92578125,562.6666666666666C1334.92578125,568.3333333333334,1334.92578125,579.6666666666666,1310.4147135416667,596.6751257333266C1285.9036458333333,613.6835847999864,1236.8815104166667,636.3671695999728,1212.3704427083333,647.708961999966L1187.859375,659.0507543999593"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M442.21662234042554,513L468.7430186170213,526C495.26941489361707,539,548.3222074468085,565,569.2033450183964,583.6666666666666C590.0844825899843,602.3333333333334,578.7939651799687,613.6666666666666,573.1487064749608,619.3333333333334L567.503447769953,625"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M324.58725066489365,513L312.4001828457447,526C300.21311502659574,539,275.8389793882979,565,263.6519115691489,585.5C251.46484375,606,251.46484375,621,251.46484375,628.5L251.46484375,636"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M587.078125,295.9922813969692L549.5013020833334,305.99356783080765C511.9244791666667,315.9948542646461,436.7708333333333,335.9974271323231,399.1940104166667,358.99871356616154C361.6171875,382,361.6171875,408,361.6171875,421L361.6171875,434"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M853.78125,295.9922813969692L891.3580729166666,305.99356783080765C928.9348958333334,315.9948542646461,1004.0885416666666,335.9974271323231,1041.6653645833333,365.58204689949486C1079.2421875,395.1666666666667,1079.2421875,434.3333333333333,1079.2421875,473.5C1079.2421875,512.6666666666666,1079.2421875,551.8333333333334,1081.9183538732393,582.5833333333334C1084.5945202464789,613.3333333333334,1089.9468529929577,635.6666666666666,1092.623019366197,646.8333333333334L1095.2991857394366,658"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M948.2578125,513L948.2578125,526C948.2578125,539,948.2578125,565,964.6678648278561,589.1666666666666C981.077917155712,613.3333333333334,1013.8980218114242,635.6666666666666,1030.3080741392803,646.8333333333334L1046.7181264671362,658"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M720.4296875,109L720.4296875,118.33333333333333C720.4296875,127.66666666666667,720.4296875,146.33333333333334,720.4296875,165C720.4296875,183.66666666666666,720.4296875,202.33333333333334,720.4296875,211.66666666666666L720.4296875,221"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1334.92578125,300L1334.92578125,309.3333333333333C1334.92578125,318.6666666666667,1334.92578125,337.3333333333333,1334.92578125,352.3333333333333C1334.92578125,367.3333333333333,1334.92578125,378.6666666666667,1334.92578125,384.3333333333333L1334.92578125,390"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M626.3488031914893,502L604.8740026595744,516.8333333333334C583.3992021276596,531.6666666666666,540.4496010638298,561.3333333333334,518.8565371320714,581.8333333333334C497.263473200313,602.3333333333334,497.026946400626,613.6666666666666,496.9086830007825,619.3333333333334L496.79041960093895,625"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M603.2427692819149,502L569.7420212765957,516.8333333333334C536.2412732712766,531.6666666666666,469.2397772606383,561.3333333333334,440.6894645057103,581.8333333333334C412.13915175078245,602.3333333333334,422.04002225156495,613.6666666666666,426.99045750195614,619.3333333333334L431.9408927523474,625"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M702.1845744680851,502L720.1798537234041,516.8333333333334C738.1751329787234,531.6666666666666,774.1656914893616,561.3333333333334,827.4135749113475,588.9103288252453C880.6614583333334,616.4873243171572,951.1666666666666,641.9746486343146,986.4192708333334,654.7183107928931L1021.671875,667.4619729514718"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M692.8045877659574,502L705.9178856382978,516.8333333333334C719.0311835106382,531.6666666666666,745.2577792553192,561.3333333333334,800.0689937943262,589.491233005157C854.8802083333334,617.6491326769807,938.2760416666666,644.2982653539615,979.9739583333334,657.6228316924519L1021.671875,670.9473980309423"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M403.75,131L403.75,136.66666666666666C403.75,142.33333333333334,403.75,153.66666666666666,403.75,165C403.75,176.33333333333334,403.75,187.66666666666666,403.75,193.33333333333334L403.75,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M114.2109375,131L114.2109375,136.66666666666666C114.2109375,142.33333333333334,114.2109375,153.66666666666666,114.2109375,168.66666666666666C114.2109375,183.66666666666666,114.2109375,202.33333333333334,114.2109375,211.66666666666666L114.2109375,221"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(1334.92578125, 591)" class="edgeLabel">
@@ -227,7 +222,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L8">
+        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L8">
           <g title="greater_than_simple" id="classId-C_0000902541696362244204-0" class="node default clickable">
             <rect height="79" width="212.421875" y="-39.5" x="-106.2109375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="106.2109375" x1="-106.2109375" class="divider"/>
@@ -246,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L11">
+        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L11">
           <g title="greater_than_with_requires" id="classId-C_0001830716585637735576-1" class="node default clickable">
             <rect height="123" width="266.65625" y="-61.5" x="-133.328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="133.328125" x1="-133.328125" class="divider"/>
@@ -267,15 +262,15 @@
                   <span class="nodeLabel">"sizeof (l) &gt; sizeof (r)"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -125.828125, 36)" height="18" width="77.4375">
+              <foreignObject transform="translate( -125.828125, 36)" height="18" width="64.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T l,P r) : "</span>
+                  <span class="nodeLabel">"(T l,P r)"</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L16">
+        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L16">
           <g title="max_four_bytes" id="classId-C_0000385255522691733325-2" class="node default clickable">
             <rect height="79" width="166.1875" y="-39.5" x="-83.09375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="83.09375" x1="-83.09375" class="divider"/>
@@ -294,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L20">
+        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L20">
           <g title="iterable" id="classId-C_0000392540961352249242-3" class="node default clickable">
             <rect height="145" width="145.546875" y="-72.5" x="-72.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="72.7734375" x1="-72.7734375" class="divider"/>
@@ -320,15 +315,15 @@
                   <span class="nodeLabel">"container.end()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.2734375, 47)" height="18" width="115.109375">
+              <foreignObject transform="translate( -65.2734375, 47)" height="18" width="101.765625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T container) : "</span>
+                  <span class="nodeLabel">"(T container)"</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L27">
+        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L27">
           <g title="has_value_type" id="classId-C_0001850394311226276678-4" class="node default clickable">
             <rect height="123" width="195.0625" y="-61.5" x="-97.53125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.53125" x1="-97.53125" class="divider"/>
@@ -349,15 +344,15 @@
                   <span class="nodeLabel">"typename T::value_type"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -90.03125, 36)" height="18" width="35.359375">
+              <foreignObject transform="translate( -90.03125, 36)" height="18" width="22.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"() : "</span>
+                  <span class="nodeLabel">"()"</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L30">
+        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L30">
           <g title="convertible_to_string" id="classId-C_0000137304962071054497-5" class="node default clickable">
             <rect height="167" width="354.078125" y="-83.5" x="-177.0390625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="177.0390625" x1="-177.0390625" class="divider"/>
@@ -388,15 +383,15 @@
                   <span class="nodeLabel">"{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -169.5390625, 58)" height="18" width="57.28125">
+              <foreignObject transform="translate( -169.5390625, 58)" height="18" width="43.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T s) : "</span>
+                  <span class="nodeLabel">"(T s)"</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L46">
+        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L46">
           <g title="iterable_with_value_type" id="classId-C_0001043398062146751019-6" class="node default clickable">
             <rect height="79" width="232.875" y="-39.5" x="-116.4375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="116.4375" x1="-116.4375" class="divider"/>
@@ -415,7 +410,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L49">
+        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L49">
           <g title="iterable_or_small_value_type" id="classId-C_0000866345615551223718-7" class="node default clickable">
             <rect height="79" width="266.703125" y="-39.5" x="-133.3515625" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="133.3515625" x1="-133.3515625" class="divider"/>
@@ -434,7 +429,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L53">
+        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L53">
           <g title="A" id="classId-C_0001418333499545421661-8" class="node default clickable">
             <rect height="79" width="182.1875" y="-39.5" x="-91.09375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="91.09375" x1="-91.09375" class="divider"/>
@@ -458,7 +453,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L60">
+        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L60">
           <g title="B" id="classId-C_0001814355496814977880-9" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -482,7 +477,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L70">
+        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L70">
           <g title="C" id="classId-C_0001512618198241549089-10" class="node default clickable">
             <rect height="79" width="222.171875" y="-39.5" x="-111.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="111.0859375" x1="-111.0859375" class="divider"/>
@@ -506,7 +501,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L76">
+        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L76">
           <g title="D" id="classId-C_0001635109601630198093-11" class="node default clickable">
             <rect height="57" width="279.109375" y="-28.5" x="-139.5546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="139.5546875" x1="-139.5546875" class="divider"/>
@@ -525,7 +520,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L80">
+        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L80">
           <g title="E" id="classId-C_0001429225801945621089-12" class="node default clickable">
             <rect height="123" width="109.265625" y="-61.5" x="-54.6328125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.6328125" x1="-54.6328125" class="divider"/>
@@ -559,7 +554,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00056/t00056.cc#L88">
+        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L88">
           <g title="F" id="classId-C_0000856301122972546034-13" class="node default clickable">
             <rect height="123" width="108.375" y="-61.5" x="-54.1875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.1875" x1="-54.1875" class="divider"/>
diff --git a/docs/test_cases/t00057.md b/docs/test_cases/t00057.md
index e64ddb6d..61cdd8c9 100644
--- a/docs/test_cases/t00057.md
+++ b/docs/test_cases/t00057.md
@@ -564,6 +564,7 @@ struct t00057_F;
     }
   ],
   "name": "t00057_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg
index 3df55a2f..449df1f4 100644
--- a/docs/test_cases/t00057_class.svg
+++ b/docs/test_cases/t00057_class.svg
@@ -1,303 +1,271 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="524px" preserveAspectRatio="none" style="width:1084px;height:524px;background:#FFFFFF;" version="1.1" viewBox="0 0 1084 524" width="1084px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="476px" preserveAspectRatio="none" style="width:1040px;height:476px;" version="1.1" viewBox="0 0 1040 476" width="1040px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1djt6fqlvsz3a" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
-      <g id="elem_C_0000940295970488928395">
-        <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_0000940295970488928395" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="7" y="266.4"/>
-        <ellipse cx="22" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,283.5563 C17,286.0563 19.1406,287.8688 22.0625,287.8688 C23.2969,287.8688 24.4688,287.5719 25.2188,287.0563 C25.8281,286.6344 26.1563,286.2125 26.1563,285.8063 C26.1563,285.3375 25.7344,284.9313 25.2344,284.9313 C25,284.9313 24.7813,285.0094 24.5781,285.2125 C24.1406,285.65 24.1406,285.65 23.9688,285.7438 C23.5156,285.9781 22.875,286.1188 22.1094,286.1188 C20.1094,286.1188 18.8281,285.1031 18.8281,283.525 L18.8281,282.4781 C18.8281,280.775 20.0469,279.5719 21.75,279.5719 C22.3281,279.5719 22.9063,279.7125 23.375,279.9625 C23.8438,280.2281 24.0156,280.4156 24.0781,280.775 C24.2031,281.4469 24.4531,281.6969 24.9844,281.6969 C25.2656,281.6969 25.5469,281.5563 25.7344,281.3375 C25.8594,281.1656 25.9063,280.9938 25.9063,280.5563 L25.9063,279.1969 C25.9063,278.775 25.8906,278.6344 25.7656,278.4625 C25.5938,278.2125 25.3125,278.0563 24.9844,278.0563 C24.6719,278.0563 24.4688,278.1656 24.25,278.4313 C23.0781,277.9313 22.6406,277.8219 21.6875,277.8219 C19.0156,277.8219 17,279.8375 17,282.4625 L17,283.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="36" y="287.006">t00057_A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="99" y1="298.4" y2="298.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="99" y1="306.4" y2="306.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="315.3"/>
-          <ellipse cx="18" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="323.4059">a1 : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="235.5"/>
+      <ellipse cx="21" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,257.1406 Q23.3906,257.4375 22.75,257.5781 Q22.1094,257.7344 21.4063,257.7344 Q18.9063,257.7344 17.5781,256.0938 Q16.2656,254.4375 16.2656,251.3125 Q16.2656,248.1875 17.5781,246.5313 Q18.9063,244.875 21.4063,244.875 Q22.1094,244.875 22.75,245.0313 Q23.4063,245.1875 23.9688,245.4844 L23.9688,248.2031 Q23.3438,247.625 22.75,247.3594 Q22.1563,247.0781 21.5313,247.0781 Q20.1875,247.0781 19.5,248.1563 Q18.8125,249.2188 18.8125,251.3125 Q18.8125,253.4063 19.5,254.4844 Q20.1875,255.5469 21.5313,255.5469 Q22.1563,255.5469 22.75,255.2813 Q23.3438,255 23.9688,254.4219 L23.9688,257.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="35" y="255.6543">t00057_A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="267.5" y2="267.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
-      <g id="elem_C_0001030391494410415852">
-        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001030391494410415852" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="135" y="266.4"/>
-        <ellipse cx="150" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M145,283.5563 C145,286.0563 147.1406,287.8688 150.0625,287.8688 C151.2969,287.8688 152.4688,287.5719 153.2188,287.0563 C153.8281,286.6344 154.1563,286.2125 154.1563,285.8063 C154.1563,285.3375 153.7344,284.9313 153.2344,284.9313 C153,284.9313 152.7813,285.0094 152.5781,285.2125 C152.1406,285.65 152.1406,285.65 151.9688,285.7438 C151.5156,285.9781 150.875,286.1188 150.1094,286.1188 C148.1094,286.1188 146.8281,285.1031 146.8281,283.525 L146.8281,282.4781 C146.8281,280.775 148.0469,279.5719 149.75,279.5719 C150.3281,279.5719 150.9063,279.7125 151.375,279.9625 C151.8438,280.2281 152.0156,280.4156 152.0781,280.775 C152.2031,281.4469 152.4531,281.6969 152.9844,281.6969 C153.2656,281.6969 153.5469,281.5563 153.7344,281.3375 C153.8594,281.1656 153.9063,280.9938 153.9063,280.5563 L153.9063,279.1969 C153.9063,278.775 153.8906,278.6344 153.7656,278.4625 C153.5938,278.2125 153.3125,278.0563 152.9844,278.0563 C152.6719,278.0563 152.4688,278.1656 152.25,278.4313 C151.0781,277.9313 150.6406,277.8219 149.6875,277.8219 C147.0156,277.8219 145,279.8375 145,282.4625 L145,283.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="164" y="287.006">t00057_B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="136" x2="227" y1="298.4" y2="298.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="136" x2="227" y1="306.4" y2="306.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="141" y="315.3"/>
-          <ellipse cx="146" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="155" y="323.4059">b1 : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="281.5"/>
+      <ellipse cx="17" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
-      <g id="elem_C_0000388213894542327772">
-        <rect codeLine="12" fill="#F1F1F1" height="64.7999" id="C_0000388213894542327772" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="263.5" y="266.4"/>
-        <ellipse cx="278.5" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M273.5,283.5563 C273.5,286.0563 275.6406,287.8688 278.5625,287.8688 C279.7969,287.8688 280.9688,287.5719 281.7188,287.0563 C282.3281,286.6344 282.6563,286.2125 282.6563,285.8063 C282.6563,285.3375 282.2344,284.9313 281.7344,284.9313 C281.5,284.9313 281.2813,285.0094 281.0781,285.2125 C280.6406,285.65 280.6406,285.65 280.4688,285.7438 C280.0156,285.9781 279.375,286.1188 278.6094,286.1188 C276.6094,286.1188 275.3281,285.1031 275.3281,283.525 L275.3281,282.4781 C275.3281,280.775 276.5469,279.5719 278.25,279.5719 C278.8281,279.5719 279.4063,279.7125 279.875,279.9625 C280.3438,280.2281 280.5156,280.4156 280.5781,280.775 C280.7031,281.4469 280.9531,281.6969 281.4844,281.6969 C281.7656,281.6969 282.0469,281.5563 282.2344,281.3375 C282.3594,281.1656 282.4063,280.9938 282.4063,280.5563 L282.4063,279.1969 C282.4063,278.775 282.3906,278.6344 282.2656,278.4625 C282.0938,278.2125 281.8125,278.0563 281.4844,278.0563 C281.1719,278.0563 280.9688,278.1656 280.75,278.4313 C279.5781,277.9313 279.1406,277.8219 278.1875,277.8219 C275.5156,277.8219 273.5,279.8375 273.5,282.4625 L273.5,283.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="292.5" y="287.006">t00057_C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="264.5" x2="356.5" y1="298.4" y2="298.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="264.5" x2="356.5" y1="306.4" y2="306.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="269.5" y="315.3"/>
-          <ellipse cx="274.5" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="283.5" y="323.4059">c1 : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="26" y="289.7104">a1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
-      <g id="elem_C_0000784667124248020371">
-        <rect codeLine="17" fill="#F1F1F1" height="92.5999" id="C_0000784667124248020371" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="392.5" y="252.5"/>
-        <ellipse cx="407.5" cy="274" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M402.5,275.1563 C402.5,277.6563 404.6406,279.4688 407.5625,279.4688 C408.7969,279.4688 409.9688,279.1719 410.7188,278.6563 C411.3281,278.2344 411.6563,277.8125 411.6563,277.4063 C411.6563,276.9375 411.2344,276.5313 410.7344,276.5313 C410.5,276.5313 410.2813,276.6094 410.0781,276.8125 C409.6406,277.25 409.6406,277.25 409.4688,277.3438 C409.0156,277.5781 408.375,277.7188 407.6094,277.7188 C405.6094,277.7188 404.3281,276.7031 404.3281,275.125 L404.3281,274.0781 C404.3281,272.375 405.5469,271.1719 407.25,271.1719 C407.8281,271.1719 408.4063,271.3125 408.875,271.5625 C409.3438,271.8281 409.5156,272.0156 409.5781,272.375 C409.7031,273.0469 409.9531,273.2969 410.4844,273.2969 C410.7656,273.2969 411.0469,273.1563 411.2344,272.9375 C411.3594,272.7656 411.4063,272.5938 411.4063,272.1563 L411.4063,270.7969 C411.4063,270.375 411.3906,270.2344 411.2656,270.0625 C411.0938,269.8125 410.8125,269.6563 410.4844,269.6563 C410.1719,269.6563 409.9688,269.7656 409.75,270.0313 C408.5781,269.5313 408.1406,269.4219 407.1875,269.4219 C404.5156,269.4219 402.5,271.4375 402.5,274.0625 L402.5,275.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="45" x="430" y="270.7001">«union»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="421.5" y="286.7061">t00057_D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="393.5" x2="485.5" y1="295.5" y2="295.5"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="393.5" x2="485.5" y1="303.5" y2="303.5"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="398.5" y="312.4"/>
-          <ellipse cx="403.5" cy="317.4" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="412.5" y="320.506">d1 : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="398.5" y="329.1999"/>
-          <ellipse cx="403.5" cy="334.1999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="412.5" y="337.3059">d2 : float</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="235.5"/>
+      <ellipse cx="147" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M149.9688,257.1406 Q149.3906,257.4375 148.75,257.5781 Q148.1094,257.7344 147.4063,257.7344 Q144.9063,257.7344 143.5781,256.0938 Q142.2656,254.4375 142.2656,251.3125 Q142.2656,248.1875 143.5781,246.5313 Q144.9063,244.875 147.4063,244.875 Q148.1094,244.875 148.75,245.0313 Q149.4063,245.1875 149.9688,245.4844 L149.9688,248.2031 Q149.3438,247.625 148.75,247.3594 Q148.1563,247.0781 147.5313,247.0781 Q146.1875,247.0781 145.5,248.1563 Q144.8125,249.2188 144.8125,251.3125 Q144.8125,253.4063 145.5,254.4844 Q146.1875,255.5469 147.5313,255.5469 Q148.1563,255.5469 148.75,255.2813 Q149.3438,255 149.9688,254.4219 L149.9688,257.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="161" y="255.6543">t00057_B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="267.5" y2="267.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
-      <g id="elem_C_0000682873132844345324">
-        <rect codeLine="23" fill="#F1F1F1" height="98.3998" id="C_0000682873132844345324" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="297" x="522" y="249.6"/>
-        <ellipse cx="635.75" cy="265.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M630.75,266.7563 C630.75,269.2563 632.8906,271.0688 635.8125,271.0688 C637.0469,271.0688 638.2188,270.7719 638.9688,270.2563 C639.5781,269.8344 639.9063,269.4125 639.9063,269.0063 C639.9063,268.5375 639.4844,268.1313 638.9844,268.1313 C638.75,268.1313 638.5313,268.2094 638.3281,268.4125 C637.8906,268.85 637.8906,268.85 637.7188,268.9438 C637.2656,269.1781 636.625,269.3188 635.8594,269.3188 C633.8594,269.3188 632.5781,268.3031 632.5781,266.725 L632.5781,265.6781 C632.5781,263.975 633.7969,262.7719 635.5,262.7719 C636.0781,262.7719 636.6563,262.9125 637.125,263.1625 C637.5938,263.4281 637.7656,263.6156 637.8281,263.975 C637.9531,264.6469 638.2031,264.8969 638.7344,264.8969 C639.0156,264.8969 639.2969,264.7563 639.4844,264.5375 C639.6094,264.3656 639.6563,264.1938 639.6563,263.7563 L639.6563,262.3969 C639.6563,261.975 639.6406,261.8344 639.5156,261.6625 C639.3438,261.4125 639.0625,261.2563 638.7344,261.2563 C638.4219,261.2563 638.2188,261.3656 638,261.6313 C636.8281,261.1313 636.3906,261.0219 635.4375,261.0219 C632.7656,261.0219 630.75,263.0375 630.75,265.6625 L630.75,266.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="656.25" y="270.206">t00057_E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="523" x2="818" y1="281.6" y2="281.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="523" x2="818" y1="289.6" y2="289.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="528" y="298.5"/>
-          <ellipse cx="533" cy="303.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="271" x="542" y="306.6059">coordinates : t00057_E::(anonymous_739)</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="528" y="315.2999"/>
-          <ellipse cx="533" cy="320.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="542" y="323.4059">e : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="528" y="332.0998"/>
-          <ellipse cx="533" cy="337.0998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="236" x="542" y="340.2058">height : t00057_E::(anonymous_807)</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="281.5"/>
+      <ellipse cx="143" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
-      <g id="elem_C_0000161676142413826748">
-        <rect codeLine="30" fill="#F1F1F1" height="81.5999" id="C_0000161676142413826748" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="185" x="477" y="430.5"/>
-        <ellipse cx="492" cy="446.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M487,447.6563 C487,450.1563 489.1406,451.9688 492.0625,451.9688 C493.2969,451.9688 494.4688,451.6719 495.2188,451.1563 C495.8281,450.7344 496.1563,450.3125 496.1563,449.9063 C496.1563,449.4375 495.7344,449.0313 495.2344,449.0313 C495,449.0313 494.7813,449.1094 494.5781,449.3125 C494.1406,449.75 494.1406,449.75 493.9688,449.8438 C493.5156,450.0781 492.875,450.2188 492.1094,450.2188 C490.1094,450.2188 488.8281,449.2031 488.8281,447.625 L488.8281,446.5781 C488.8281,444.875 490.0469,443.6719 491.75,443.6719 C492.3281,443.6719 492.9063,443.8125 493.375,444.0625 C493.8438,444.3281 494.0156,444.5156 494.0781,444.875 C494.2031,445.5469 494.4531,445.7969 494.9844,445.7969 C495.2656,445.7969 495.5469,445.6563 495.7344,445.4375 C495.8594,445.2656 495.9063,445.0938 495.9063,444.6563 L495.9063,443.2969 C495.9063,442.875 495.8906,442.7344 495.7656,442.5625 C495.5938,442.3125 495.3125,442.1563 494.9844,442.1563 C494.6719,442.1563 494.4688,442.2656 494.25,442.5313 C493.0781,442.0313 492.6406,441.9219 491.6875,441.9219 C489.0156,441.9219 487,443.9375 487,446.5625 L487,447.6563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="153" x="506" y="451.106">t00057_E::(coordinates)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="478" x2="661" y1="462.5" y2="462.5"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="478" x2="661" y1="470.5" y2="470.5"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483" y="479.4"/>
-          <ellipse cx="488" cy="484.4" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="497" y="487.5059">x : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="483" y="496.1999"/>
-          <ellipse cx="488" cy="501.1999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="497" y="504.3059">y : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="152" y="289.7104">b1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
-      <g id="elem_C_0002265335931722752750">
-        <rect codeLine="36" fill="#F1F1F1" height="92.5999" id="C_0002265335931722752750" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="150" x="696.5" y="425"/>
-        <ellipse cx="711.5" cy="446.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M706.5,447.6563 C706.5,450.1563 708.6406,451.9688 711.5625,451.9688 C712.7969,451.9688 713.9688,451.6719 714.7188,451.1563 C715.3281,450.7344 715.6563,450.3125 715.6563,449.9063 C715.6563,449.4375 715.2344,449.0313 714.7344,449.0313 C714.5,449.0313 714.2813,449.1094 714.0781,449.3125 C713.6406,449.75 713.6406,449.75 713.4688,449.8438 C713.0156,450.0781 712.375,450.2188 711.6094,450.2188 C709.6094,450.2188 708.3281,449.2031 708.3281,447.625 L708.3281,446.5781 C708.3281,444.875 709.5469,443.6719 711.25,443.6719 C711.8281,443.6719 712.4063,443.8125 712.875,444.0625 C713.3438,444.3281 713.5156,444.5156 713.5781,444.875 C713.7031,445.5469 713.9531,445.7969 714.4844,445.7969 C714.7656,445.7969 715.0469,445.6563 715.2344,445.4375 C715.3594,445.2656 715.4063,445.0938 715.4063,444.6563 L715.4063,443.2969 C715.4063,442.875 715.3906,442.7344 715.2656,442.5625 C715.0938,442.3125 714.8125,442.1563 714.4844,442.1563 C714.1719,442.1563 713.9688,442.2656 713.75,442.5313 C712.5781,442.0313 712.1406,441.9219 711.1875,441.9219 C708.5156,441.9219 706.5,443.9375 706.5,446.5625 L706.5,447.6563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="45" x="762" y="443.2001">«union»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="725.5" y="459.2061">t00057_E::(height)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="697.5" x2="845.5" y1="468" y2="468"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="697.5" x2="845.5" y1="476" y2="476"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="702.5" y="484.9"/>
-          <ellipse cx="707.5" cy="489.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59" x="716.5" y="493.006">t : double</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="702.5" y="501.6999"/>
-          <ellipse cx="707.5" cy="506.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="716.5" y="509.8059">z : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="235.5"/>
+      <ellipse cx="273" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M275.9688,257.1406 Q275.3906,257.4375 274.75,257.5781 Q274.1094,257.7344 273.4063,257.7344 Q270.9063,257.7344 269.5781,256.0938 Q268.2656,254.4375 268.2656,251.3125 Q268.2656,248.1875 269.5781,246.5313 Q270.9063,244.875 273.4063,244.875 Q274.1094,244.875 274.75,245.0313 Q275.4063,245.1875 275.9688,245.4844 L275.9688,248.2031 Q275.3438,247.625 274.75,247.3594 Q274.1563,247.0781 273.5313,247.0781 Q272.1875,247.0781 271.5,248.1563 Q270.8125,249.2188 270.8125,251.3125 Q270.8125,253.4063 271.5,254.4844 Q272.1875,255.5469 273.5313,255.5469 Q274.1563,255.5469 274.75,255.2813 Q275.3438,255 275.9688,254.4219 L275.9688,257.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="287" y="255.6543">t00057_C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="267.5" y2="267.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
-      <g id="elem_C_0001592909736406415155">
-        <rect codeLine="42" fill="#F1F1F1" height="64.7999" id="C_0001592909736406415155" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="95" x="854" y="266.4"/>
-        <ellipse cx="869" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M864,283.5563 C864,286.0563 866.1406,287.8688 869.0625,287.8688 C870.2969,287.8688 871.4688,287.5719 872.2188,287.0563 C872.8281,286.6344 873.1563,286.2125 873.1563,285.8063 C873.1563,285.3375 872.7344,284.9313 872.2344,284.9313 C872,284.9313 871.7813,285.0094 871.5781,285.2125 C871.1406,285.65 871.1406,285.65 870.9688,285.7438 C870.5156,285.9781 869.875,286.1188 869.1094,286.1188 C867.1094,286.1188 865.8281,285.1031 865.8281,283.525 L865.8281,282.4781 C865.8281,280.775 867.0469,279.5719 868.75,279.5719 C869.3281,279.5719 869.9063,279.7125 870.375,279.9625 C870.8438,280.2281 871.0156,280.4156 871.0781,280.775 C871.2031,281.4469 871.4531,281.6969 871.9844,281.6969 C872.2656,281.6969 872.5469,281.5563 872.7344,281.3375 C872.8594,281.1656 872.9063,280.9938 872.9063,280.5563 L872.9063,279.1969 C872.9063,278.775 872.8906,278.6344 872.7656,278.4625 C872.5938,278.2125 872.3125,278.0563 871.9844,278.0563 C871.6719,278.0563 871.4688,278.1656 871.25,278.4313 C870.0781,277.9313 869.6406,277.8219 868.6875,277.8219 C866.0156,277.8219 864,279.8375 864,282.4625 L864,283.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="883" y="287.006">t00057_G</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="855" x2="948" y1="298.4" y2="298.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="855" x2="948" y1="306.4" y2="306.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="860" y="315.3"/>
-          <ellipse cx="865" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="874" y="323.4059">g1 : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="264" y="281.5"/>
+      <ellipse cx="269" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
-      <g id="elem_C_0000370583978606928327">
-        <rect codeLine="47" fill="#F1F1F1" height="165.5995" id="C_0000370583978606928327" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="361" y="7"/>
-        <ellipse cx="404.35" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M399.35,24.1563 C399.35,26.6563 401.4906,28.4688 404.4125,28.4688 C405.6469,28.4688 406.8188,28.1719 407.5688,27.6563 C408.1781,27.2344 408.5063,26.8125 408.5063,26.4063 C408.5063,25.9375 408.0844,25.5313 407.5844,25.5313 C407.35,25.5313 407.1313,25.6094 406.9281,25.8125 C406.4906,26.25 406.4906,26.25 406.3188,26.3438 C405.8656,26.5781 405.225,26.7188 404.4594,26.7188 C402.4594,26.7188 401.1781,25.7031 401.1781,24.125 L401.1781,23.0781 C401.1781,21.375 402.3969,20.1719 404.1,20.1719 C404.6781,20.1719 405.2563,20.3125 405.725,20.5625 C406.1938,20.8281 406.3656,21.0156 406.4281,21.375 C406.5531,22.0469 406.8031,22.2969 407.3344,22.2969 C407.6156,22.2969 407.8969,22.1563 408.0844,21.9375 C408.2094,21.7656 408.2563,21.5938 408.2563,21.1563 L408.2563,19.7969 C408.2563,19.375 408.2406,19.2344 408.1156,19.0625 C407.9438,18.8125 407.6625,18.6563 407.3344,18.6563 C407.0219,18.6563 406.8188,18.7656 406.6,19.0313 C405.4281,18.5313 404.9906,18.4219 404.0375,18.4219 C401.3656,18.4219 399.35,20.4375 399.35,23.0625 L399.35,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="424.65" y="27.606">t00057_R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="517" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="517" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="55.9"/>
-          <ellipse cx="372" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="381" y="64.0059">a : struct t00057_A</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="72.6999"/>
-          <ellipse cx="372" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="381" y="80.8059">b : t00057_B</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="89.4998"/>
-          <ellipse cx="372" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="381" y="97.6058">c : struct t00057_C *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="106.2997"/>
-          <ellipse cx="372" cy="111.2997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="381" y="114.4057">d : union t00057_D</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="123.0997"/>
-          <ellipse cx="372" cy="128.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="381" y="131.2057">e : struct t00057_E *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="139.8996"/>
-          <ellipse cx="372" cy="144.8996" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="381" y="148.0056">f : struct t00057_F *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="156.6995"/>
-          <ellipse cx="372" cy="161.6995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="381" y="164.8055">g : struct t00057_G *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="278" y="289.7104">c1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
-      <g id="elem_C_0000085797106299568719">
-        <rect codeLine="58" fill="#F1F1F1" height="64.7999" id="C_0000085797106299568719" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="984" y="266.4"/>
-        <ellipse cx="999" cy="282.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M994,283.5563 C994,286.0563 996.1406,287.8688 999.0625,287.8688 C1000.2969,287.8688 1001.4688,287.5719 1002.2188,287.0563 C1002.8281,286.6344 1003.1563,286.2125 1003.1563,285.8063 C1003.1563,285.3375 1002.7344,284.9313 1002.2344,284.9313 C1002,284.9313 1001.7813,285.0094 1001.5781,285.2125 C1001.1406,285.65 1001.1406,285.65 1000.9688,285.7438 C1000.5156,285.9781 999.875,286.1188 999.1094,286.1188 C997.1094,286.1188 995.8281,285.1031 995.8281,283.525 L995.8281,282.4781 C995.8281,280.775 997.0469,279.5719 998.75,279.5719 C999.3281,279.5719 999.9063,279.7125 1000.375,279.9625 C1000.8438,280.2281 1001.0156,280.4156 1001.0781,280.775 C1001.2031,281.4469 1001.4531,281.6969 1001.9844,281.6969 C1002.2656,281.6969 1002.5469,281.5563 1002.7344,281.3375 C1002.8594,281.1656 1002.9063,280.9938 1002.9063,280.5563 L1002.9063,279.1969 C1002.9063,278.775 1002.8906,278.6344 1002.7656,278.4625 C1002.5938,278.2125 1002.3125,278.0563 1001.9844,278.0563 C1001.6719,278.0563 1001.4688,278.1656 1001.25,278.4313 C1000.0781,277.9313 999.6406,277.8219 998.6875,277.8219 C996.0156,277.8219 994,279.8375 994,282.4625 L994,283.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="61" x="1013" y="287.006">t00057_F</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="985" x2="1076" y1="298.4" y2="298.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="985" x2="1076" y1="306.4" y2="306.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="990" y="315.3"/>
-          <ellipse cx="995" cy="320.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="1004" y="323.4059">f1 : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="226"/>
+      <ellipse cx="399.5" cy="244.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M402.4688,250.6094 Q401.8906,250.9063 401.25,251.0469 Q400.6094,251.2031 399.9063,251.2031 Q397.4063,251.2031 396.0781,249.5625 Q394.7656,247.9063 394.7656,244.7813 Q394.7656,241.6563 396.0781,240 Q397.4063,238.3438 399.9063,238.3438 Q400.6094,238.3438 401.25,238.5 Q401.9063,238.6563 402.4688,238.9531 L402.4688,241.6719 Q401.8438,241.0938 401.25,240.8281 Q400.6563,240.5469 400.0313,240.5469 Q398.6875,240.5469 398,241.625 Q397.3125,242.6875 397.3125,244.7813 Q397.3125,246.875 398,247.9531 Q398.6875,249.0156 400.0313,249.0156 Q400.6563,249.0156 401.25,248.75 Q401.8438,248.4688 402.4688,247.8906 L402.4688,250.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="419" y="242.1387">«union»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="413.5" y="256.1074">t00057_D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="263.9375" y2="263.9375"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="271.9375" y2="271.9375"/>
     </a>
-    <g id="link_C_0000682873132844345324_C_0000161676142413826748">
-      <path codeLine="62" d="M635.7148,358.5249 C620.3748,384.4249 607.82,405.6 593.3,430.13 " fill="none" id="C_0000682873132844345324-backto-C_0000161676142413826748" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="641.83,348.2,635.3307,351.3241,635.7148,358.5249,642.214,355.4009,641.83,348.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="629.5" cy="387.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="67" x="636.5" y="391.077">coordinates</text>
-    </g>
-    <g id="link_C_0000682873132844345324_C_0002265335931722752750">
-      <path codeLine="63" d="M705.2863,358.5243 C719.5163,382.5443 730.5,401.08 744.49,424.71 " fill="none" id="C_0000682873132844345324-backto-C_0002265335931722752750" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="699.17,348.2,698.7867,355.4009,705.2863,358.5243,705.6696,351.3234,699.17,348.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="730.5" cy="387.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="35" x="737.5" y="391.077">height</text>
-    </g>
-    <g id="link_C_0000370583978606928327_C_0000940295970488928395">
-      <path codeLine="64" d="M349.5955,129.6188 C283.0255,159.3888 197.12,200.58 117.5,249.6 C109.45,254.56 101.15,260.28 93.32,266.02 " fill="none" id="C_0000370583978606928327-backto-C_0000940295970488928395" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="360.55,124.72,353.4398,123.5179,349.5955,129.6188,356.7057,130.8209,360.55,124.72" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="195.5" y="215.677">+a</text>
-    </g>
-    <g id="link_C_0000370583978606928327_C_0001030391494410415852">
-      <path codeLine="65" d="M351.3302,161.5397 C305.0902,198.6397 258.03,236.4 221,266.11 " fill="none" id="C_0000370583978606928327-backto-C_0001030391494410415852" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="360.69,154.03,353.5069,154.6649,351.3302,161.5397,358.5133,160.9047,360.69,154.03" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="296.5" y="215.677">+b</text>
-    </g>
-    <g id="link_C_0000370583978606928327_C_0000388213894542327772">
-      <path codeLine="66" d="M388.33,172.91 C368,205.53 348.9932,236.0277 333.5332,260.8377 " fill="none" id="C_0000370583978606928327-to-C_0000388213894542327772" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="330.36,265.93,338.5146,260.4071,333.0043,261.6865,331.7249,256.1762,330.36,265.93" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="368.5" y="215.677">+c</text>
-    </g>
-    <g id="link_C_0000370583978606928327_C_0000784667124248020371">
-      <path codeLine="67" d="M439.5,184.91 C439.5,211.89 439.5,228.89 439.5,252.15 " fill="none" id="C_0000370583978606928327-backto-C_0000784667124248020371" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="439.5,172.91,435.5,178.91,439.5,184.91,443.5,178.91,439.5,172.91" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="440.5" y="215.677">+d</text>
-    </g>
-    <g id="link_C_0000370583978606928327_C_0000682873132844345324">
-      <path codeLine="68" d="M518.35,161.46 C550.63,190.39 582.7117,219.1357 611.8917,245.2857 " fill="none" id="C_0000370583978606928327-to-C_0000682873132844345324" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="616.36,249.29,612.3271,240.3047,612.6364,245.9531,606.988,246.2624,616.36,249.29" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="583.5" y="215.677">+e</text>
-    </g>
-    <g id="link_C_0000370583978606928327_C_0000085797106299568719">
-      <path codeLine="69" d="M518.23,105.45 C624.2,127.16 816.7,173.68 966.5,249.6 C975.43,254.13 979.5387,256.4032 987.8187,262.3932 " fill="none" id="C_0000370583978606928327-to-C_0000085797106299568719" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="992.68,265.91,987.7326,257.3939,988.6289,262.9793,983.0435,263.8757,992.68,265.91" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="900.5" y="215.677">+f</text>
-    </g>
-    <g id="link_C_0000370583978606928327_C_0001592909736406415155">
-      <path codeLine="70" d="M518.3,115.59 C600.41,142.95 731.5,190.97 836.5,249.6 C845.09,254.39 848.9624,256.6758 857.1424,262.5358 " fill="none" id="C_0000370583978606928327-to-C_0001592909736406415155" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="862.02,266.03,857.0331,257.537,857.9554,263.1182,852.3742,264.0404,862.02,266.03" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="775.5" y="215.677">+g</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="277.9375"/>
+      <ellipse cx="395.5" cy="282.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="404.5" y="286.1479">d1 : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="290.7422"/>
+      <ellipse cx="395.5" cy="295.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="404.5" y="298.9526">d2 : float</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="223"/>
+      <ellipse cx="610.75" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M613.7188,244.6406 Q613.1406,244.9375 612.5,245.0781 Q611.8594,245.2344 611.1563,245.2344 Q608.6563,245.2344 607.3281,243.5938 Q606.0156,241.9375 606.0156,238.8125 Q606.0156,235.6875 607.3281,234.0313 Q608.6563,232.375 611.1563,232.375 Q611.8594,232.375 612.5,232.5313 Q613.1563,232.6875 613.7188,232.9844 L613.7188,235.7031 Q613.0938,235.125 612.5,234.8594 Q611.9063,234.5781 611.2813,234.5781 Q609.9375,234.5781 609.25,235.6563 Q608.5625,236.7188 608.5625,238.8125 Q608.5625,240.9063 609.25,241.9844 Q609.9375,243.0469 611.2813,243.0469 Q611.9063,243.0469 612.5,242.7813 Q613.0938,242.5 613.7188,241.9219 L613.7188,244.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="631.25" y="243.1543">t00057_E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="255" y2="255"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="263" y2="263"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="269"/>
+      <ellipse cx="522.5" cy="274" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="240" x="531.5" y="277.2104">coordinates : t00057_E::(anonymous_739)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="281.8047"/>
+      <ellipse cx="522.5" cy="286.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="531.5" y="290.0151">e : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="294.6094"/>
+      <ellipse cx="522.5" cy="299.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="531.5" y="302.8198">height : t00057_E::(anonymous_807)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="389"/>
+      <ellipse cx="466.5" cy="405" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M469.4688,410.6406 Q468.8906,410.9375 468.25,411.0781 Q467.6094,411.2344 466.9063,411.2344 Q464.4063,411.2344 463.0781,409.5938 Q461.7656,407.9375 461.7656,404.8125 Q461.7656,401.6875 463.0781,400.0313 Q464.4063,398.375 466.9063,398.375 Q467.6094,398.375 468.25,398.5313 Q468.9063,398.6875 469.4688,398.9844 L469.4688,401.7031 Q468.8438,401.125 468.25,400.8594 Q467.6563,400.5781 467.0313,400.5781 Q465.6875,400.5781 465,401.6563 Q464.3125,402.7188 464.3125,404.8125 Q464.3125,406.9063 465,407.9844 Q465.6875,409.0469 467.0313,409.0469 Q467.6563,409.0469 468.25,408.7813 Q468.8438,408.5 469.4688,407.9219 L469.4688,410.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="152" x="480.5" y="409.1543">t00057_E::(coordinates)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="421" y2="421"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="429" y2="429"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="435"/>
+      <ellipse cx="462.5" cy="440" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="443.2104">x : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="447.8047"/>
+      <ellipse cx="462.5" cy="452.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="456.0151">y : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="386"/>
+      <ellipse cx="686" cy="404.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M688.9688,410.6094 Q688.3906,410.9063 687.75,411.0469 Q687.1094,411.2031 686.4063,411.2031 Q683.9063,411.2031 682.5781,409.5625 Q681.2656,407.9063 681.2656,404.7813 Q681.2656,401.6563 682.5781,400 Q683.9063,398.3438 686.4063,398.3438 Q687.1094,398.3438 687.75,398.5 Q688.4063,398.6563 688.9688,398.9531 L688.9688,401.6719 Q688.3438,401.0938 687.75,400.8281 Q687.1563,400.5469 686.5313,400.5469 Q685.1875,400.5469 684.5,401.625 Q683.8125,402.6875 683.8125,404.7813 Q683.8125,406.875 684.5,407.9531 Q685.1875,409.0156 686.5313,409.0156 Q687.1563,409.0156 687.75,408.75 Q688.3438,408.4688 688.9688,407.8906 L688.9688,410.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="734" y="402.1387">«union»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="117" x="700" y="416.1074">t00057_E::(height)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="423.9375" y2="423.9375"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="431.9375" y2="431.9375"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="437.9375"/>
+      <ellipse cx="682" cy="442.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="691" y="446.1479">t : double</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="450.7422"/>
+      <ellipse cx="682" cy="455.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="691" y="458.9526">z : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="812.5" y="235.5"/>
+      <ellipse cx="827.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M830.4688,257.1406 Q829.8906,257.4375 829.25,257.5781 Q828.6094,257.7344 827.9063,257.7344 Q825.4063,257.7344 824.0781,256.0938 Q822.7656,254.4375 822.7656,251.3125 Q822.7656,248.1875 824.0781,246.5313 Q825.4063,244.875 827.9063,244.875 Q828.6094,244.875 829.25,245.0313 Q829.9063,245.1875 830.4688,245.4844 L830.4688,248.2031 Q829.8438,247.625 829.25,247.3594 Q828.6563,247.0781 828.0313,247.0781 Q826.6875,247.0781 826,248.1563 Q825.3125,249.2188 825.3125,251.3125 Q825.3125,253.4063 826,254.4844 Q826.6875,255.5469 828.0313,255.5469 Q828.6563,255.5469 829.25,255.2813 Q829.8438,255 830.4688,254.4219 L830.4688,257.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="841.5" y="255.6543">t00057_G</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="267.5" y2="267.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="275.5" y2="275.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="818.5" y="281.5"/>
+      <ellipse cx="823.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="832.5" y="289.7104">g1 : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="137.6328" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="357.5" y="8"/>
+      <ellipse cx="397.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M400.2188,29.6406 Q399.6406,29.9375 399,30.0781 Q398.3594,30.2344 397.6563,30.2344 Q395.1563,30.2344 393.8281,28.5938 Q392.5156,26.9375 392.5156,23.8125 Q392.5156,20.6875 393.8281,19.0313 Q395.1563,17.375 397.6563,17.375 Q398.3594,17.375 399,17.5313 Q399.6563,17.6875 400.2188,17.9844 L400.2188,20.7031 Q399.5938,20.125 399,19.8594 Q398.4063,19.5781 397.7813,19.5781 Q396.4375,19.5781 395.75,20.6563 Q395.0625,21.7188 395.0625,23.8125 Q395.0625,25.9063 395.75,26.9844 Q396.4375,28.0469 397.7813,28.0469 Q398.4063,28.0469 399,27.7813 Q399.5938,27.5 400.2188,26.9219 L400.2188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="416.75" y="28.1543">t00057_R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="54"/>
+      <ellipse cx="368.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="377.5" y="62.2104">a : struct t00057_A</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="66.8047"/>
+      <ellipse cx="368.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="377.5" y="75.0151">b : t00057_B</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="79.6094"/>
+      <ellipse cx="368.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="87.8198">c : struct t00057_C *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="92.4141"/>
+      <ellipse cx="368.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="377.5" y="100.6245">d : union t00057_D</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="105.2188"/>
+      <ellipse cx="368.5" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="113.4292">e : struct t00057_E *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="118.0234"/>
+      <ellipse cx="368.5" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="377.5" y="126.2339">f : struct t00057_F *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="130.8281"/>
+      <ellipse cx="368.5" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="377.5" y="139.0386">g : struct t00057_G *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="939.5" y="235.5"/>
+      <ellipse cx="954.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M957.4688,257.1406 Q956.8906,257.4375 956.25,257.5781 Q955.6094,257.7344 954.9063,257.7344 Q952.4063,257.7344 951.0781,256.0938 Q949.7656,254.4375 949.7656,251.3125 Q949.7656,248.1875 951.0781,246.5313 Q952.4063,244.875 954.9063,244.875 Q955.6094,244.875 956.25,245.0313 Q956.9063,245.1875 957.4688,245.4844 L957.4688,248.2031 Q956.8438,247.625 956.25,247.3594 Q955.6563,247.0781 955.0313,247.0781 Q953.6875,247.0781 953,248.1563 Q952.3125,249.2188 952.3125,251.3125 Q952.3125,253.4063 953,254.4844 Q953.6875,255.5469 955.0313,255.5469 Q955.6563,255.5469 956.25,255.2813 Q956.8438,255 957.4688,254.4219 L957.4688,257.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="968.5" y="255.6543">t00057_F</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="267.5" y2="267.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="275.5" y2="275.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="945.5" y="281.5"/>
+      <ellipse cx="950.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="959.5" y="289.7104">f1 : int</text>
+    </a>
+    <path d="M610.32,320.47 C595.89,343.04 579.48,368.72 566.53,388.97 " fill="none" id="C_0000682873132844345324&lt;-C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="617.43,309.34,610.8263,312.2367,610.9602,319.4465,617.564,316.5499,617.43,309.34" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="603.5" cy="348.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="75" x="610.5" y="352.0669">coordinates</text>
+    <path d="M682.2,320.38 C686.41,326.62 690.59,332.92 694.5,339 C704.17,354.04 714.31,370.9 722.98,385.68 " fill="none" id="C_0000682873132844345324&lt;-C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="674.62,309.3,674.7034,316.5106,681.3915,319.2069,681.308,311.9963,674.62,309.3" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="711.5" cy="348.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="40" x="718.5" y="352.0669">height</text>
+    <path d="M345.2,112.8 C280.56,140.2 190.26,180.71 114.5,223 C107.73,226.78 100.73,231.05 93.97,235.38 " fill="none" id="C_0000370583978606928327&lt;-C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="357.36,107.67,350.2777,106.3129,346.3011,112.3285,353.3834,113.6855,357.36,107.67" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="200.5" y="189.0669">+a</text>
+    <path d="M346.73,139.91 C303.25,172.06 252.12,209.84 217.54,235.41 " fill="none" id="C_0000370583978606928327&lt;-C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="357.32,132.09,350.1176,132.4441,347.6743,139.2286,354.8767,138.8746,357.32,132.09" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="297.5" y="189.0669">+b</text>
+    <path d="M384.29,146.04 C364.66,174.94 342.65,207.36 326.56,231.05 " fill="none" id="C_0000370583978606928327-&gt;C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="323.63,235.36,332.0044,230.1764,326.4462,231.2286,325.3941,225.6704,323.63,235.36" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="364.5" y="189.0669">+c</text>
+    <path d="M430.5,159.13 C430.5,182.27 430.5,206.45 430.5,225.84 " fill="none" id="C_0000370583978606928327&lt;-C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="430.5,146.04,426.5,152.04,430.5,158.04,434.5,152.04,430.5,146.04" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="431.5" y="189.0669">+d</text>
+    <path d="M503.55,141.83 C532.75,167.35 565.71,196.15 592.41,219.48 " fill="none" id="C_0000370583978606928327-&gt;C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="596.3,222.88,592.1584,213.9443,592.5362,219.5885,586.892,219.9663,596.3,222.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="558.5" y="189.0669">+e</text>
+    <path d="M503.7,92.39 C601.88,113.28 780.21,156.9 921.5,223 C927.48,225.8 933.53,229.11 939.41,232.63 " fill="none" id="C_0000370583978606928327-&gt;C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="943.86,235.36,938.2839,227.2417,939.5993,232.7435,934.0975,234.0589,943.86,235.36" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="846.5" y="189.0669">+f</text>
+    <path d="M503.54,102.19 C578.43,128.12 697.35,172.43 794.5,223 C800.14,225.93 805.9,229.24 811.55,232.67 " fill="none" id="C_0000370583978606928327-&gt;C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="815.84,235.31,810.2836,227.1782,811.5856,232.6831,806.0807,233.9852,815.84,235.31" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="728.5" y="189.0669">+g</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00057_class_mermaid.svg b/docs/test_cases/t00057_class_mermaid.svg
index d8f08528..842a088d 100644
--- a/docs/test_cases/t00057_class_mermaid.svg
+++ b/docs/test_cases/t00057_class_mermaid.svg
@@ -1,69 +1,64 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1154 609" style="max-width: 1154px; background-color: white;" width="1154" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M626.758949311702,421.6474070411549L622.3694369264184,425.37283920096246C617.9799245411347,429.09827136076996,609.2008997705674,436.549135680385,604.8113873852836,447.7745678401925C600.421875,459,600.421875,474,600.421875,481.5L600.421875,489"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M799.131675688298,421.6474070411549L803.5211880735816,425.37283920096246C807.9107004588653,429.09827136076996,816.6897252294326,436.549135680385,821.0792376147164,445.9412345068592C825.46875,455.3333333333333,825.46875,466.6666666666667,825.46875,472.3333333333333L825.46875,478"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M359.46874659788875,146.90420695605854L307.9973929982406,164.5868391300488C256.5260393985925,182.26947130403903,153.58333219929625,217.6347356520195,102.11197859964813,244.65070115934307C50.640625,271.6666666666667,50.640625,290.3333333333333,50.640625,299.6666666666667L50.640625,309"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M360.4908049601395,163.06627774471292L331.39598330011626,178.0552314539274C302.30116164009297,193.04418516314195,244.11151832004649,223.02209258157097,215.01669666002326,247.3443796241188C185.921875,271.6666666666667,185.921875,290.3333333333333,185.921875,299.6666666666667L185.921875,309"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M376.4921875,196.07878805350555L367.27734375,205.56565671125463C358.0625,215.0525253690037,339.6328125,234.02626268450186,330.41796875,251.84646467558426C321.203125,269.6666666666667,321.203125,286.3333333333333,321.203125,294.6666666666667L321.203125,303"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M456.703125,237L456.703125,239.66666666666666C456.703125,242.33333333333334,456.703125,247.66666666666666,456.703125,256C456.703125,264.3333333333333,456.703125,275.6666666666667,456.703125,281.3333333333333L456.703125,287"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M536.9140625,157.16738315192538L566.2526041666666,173.13948595993782C595.5911458333334,189.11158876795025,654.2682291666666,221.05579438397513,683.6067708333334,241.69456385865422C712.9453125,262.3333333333333,712.9453125,271.6666666666667,712.9453125,276.3333333333333L712.9453125,281"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M536.9140625,130.7797155128731L631.4700520833334,151.14976292739425C726.0260416666666,171.51981034191542,915.1380208333334,212.2599051709577,1009.6940104166666,240.96328591881218C1104.25,269.6666666666667,1104.25,286.3333333333333,1104.25,294.6666666666667L1104.25,303"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M536.9140625,135.32404345772318L608.9973958333334,154.936702881436C681.0807291666666,174.54936230514878,825.2473958333334,213.7746811525744,897.3307291666666,241.72067390962056C969.4140625,269.6666666666667,969.4140625,286.3333333333333,969.4140625,294.6666666666667L969.4140625,303"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M640.4825752617801,410L633.8057918848167,415.6666666666667C627.1290085078534,421.3333333333333,613.7754417539267,432.6666666666667,607.0986583769633,445.8333333333333C600.421875,459,600.421875,474,600.421875,481.5L600.421875,489"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M785.4080497382199,410L792.0848331151833,415.6666666666667C798.7616164921466,421.3333333333333,812.1151832460733,432.6666666666667,818.7919666230367,444C825.46875,455.3333333333333,825.46875,466.6666666666667,825.46875,472.3333333333333L825.46875,478"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M376.4921875,141.05592004001846L322.18359375,159.7132667000154C267.875,178.3706133600123,159.2578125,215.68530668000616,104.94921875,243.6759866733364C50.640625,271.6666666666667,50.640625,290.3333333333333,50.640625,299.6666666666667L50.640625,309"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M376.4921875,154.82274956722446L344.73046875,171.18562463935373C312.96875,187.548499711483,249.4453125,220.2742498557415,217.68359375,245.97045826120407C185.921875,271.6666666666667,185.921875,290.3333333333333,185.921875,299.6666666666667L185.921875,309"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M376.4921875,196.07878805350555L367.27734375,205.56565671125463C358.0625,215.0525253690037,339.6328125,234.02626268450186,330.41796875,252.84646467558426C321.203125,271.6666666666667,321.203125,290.3333333333333,321.203125,299.6666666666667L321.203125,309"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M456.703125,219L456.703125,224.66666666666666C456.703125,230.33333333333334,456.703125,241.66666666666666,456.703125,253C456.703125,264.3333333333333,456.703125,275.6666666666667,456.703125,281.3333333333333L456.703125,287"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M536.9140625,157.16738315192538L566.2526041666666,173.13948595993782C595.5911458333334,189.11158876795025,654.2682291666666,221.05579438397513,683.6067708333334,242.69456385865422C712.9453125,264.3333333333333,712.9453125,275.6666666666667,712.9453125,281.3333333333333L712.9453125,287"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M536.9140625,130.7797155128731L631.4700520833334,151.14976292739425C726.0260416666666,171.51981034191542,915.1380208333334,212.2599051709577,1009.6940104166666,241.96328591881218C1104.25,271.6666666666667,1104.25,290.3333333333333,1104.25,299.6666666666667L1104.25,309"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M536.9140625,135.32404345772318L608.9973958333334,154.936702881436C681.0807291666666,174.54936230514878,825.2473958333334,213.7746811525744,897.3307291666666,242.72067390962056C969.4140625,271.6666666666667,969.4140625,290.3333333333333,969.4140625,299.6666666666667L969.4140625,309"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(600.421875, 444)" class="edgeLabel">
@@ -167,7 +162,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L3">
+        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L3">
           <g title="t00057_A" id="classId-C_0000940295970488928395-0" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -191,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L7">
+        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L7">
           <g title="t00057_B" id="classId-C_0001030391494410415852-1" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -215,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L11">
+        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L11">
           <g title="t00057_C" id="classId-C_0000388213894542327772-2" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -239,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L15">
+        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L15">
           <g title="t00057_D" id="classId-C_0000784667124248020371-3" class="node default clickable">
             <rect height="123" width="85.71875" y="-61.5" x="-42.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.859375" x1="-42.859375" class="divider"/>
@@ -268,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L20">
+        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L20">
           <g title="t00057_E" id="classId-C_0000682873132844345324-4" class="node default clickable">
             <rect height="123" width="326.765625" y="-61.5" x="-163.3828125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="163.3828125" x1="-163.3828125" class="divider"/>
@@ -302,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L22">
+        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L22">
           <g title="t00057_E##(coordinates)" id="classId-C_0000161676142413826748-5" class="node default clickable">
             <rect height="101" width="196.390625" y="-50.5" x="-98.1953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="98.1953125" x1="-98.1953125" class="divider"/>
@@ -331,7 +326,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L26">
+        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L26">
           <g title="t00057_E##(height)" id="classId-C_0002265335931722752750-6" class="node default clickable">
             <rect height="123" width="153.703125" y="-61.5" x="-76.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.8515625" x1="-76.8515625" class="divider"/>
@@ -360,7 +355,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L32">
+        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L32">
           <g title="t00057_G" id="classId-C_0001592909736406415155-7" class="node default clickable">
             <rect height="79" width="86.171875" y="-39.5" x="-43.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="43.0859375" x1="-43.0859375" class="divider"/>
@@ -384,7 +379,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/t00057.c#L36">
+        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L36">
           <g title="t00057_R" id="classId-C_0000370583978606928327-8" class="node default clickable">
             <rect height="211" width="160.421875" y="-105.5" x="-80.2109375" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="80.2109375" x1="-80.2109375" class="divider"/>
@@ -412,7 +407,7 @@
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, -20)" height="18" width="143.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+c : struct t00057_C</span>
+                  <span style="font-style:italic;" class="nodeLabel">+c : struct t00057_C </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, 2)" height="18" width="144.5625">
@@ -422,23 +417,23 @@
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, 24)" height="18" width="143.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+e : struct t00057_E</span>
+                  <span style="font-style:italic;" class="nodeLabel">+e : struct t00057_E </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, 46)" height="18" width="138.296875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+f : struct t00057_F</span>
+                  <span style="font-style:italic;" class="nodeLabel">+f : struct t00057_F </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -72.7109375, 68)" height="18" width="145.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+g : struct t00057_G</span>
+                  <span style="font-style:italic;" class="nodeLabel">+g : struct t00057_G </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00057/include/t00057.h#L3">
+        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/include/t00057.h#L3">
           <g title="t00057_F" id="classId-C_0000085797106299568719-9" class="node default clickable">
             <rect height="79" width="83.5" y="-39.5" x="-41.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="41.75" x1="-41.75" class="divider"/>
diff --git a/docs/test_cases/t00058.md b/docs/test_cases/t00058.md
index 0bc20930..9b12c112 100644
--- a/docs/test_cases/t00058.md
+++ b/docs/test_cases/t00058.md
@@ -73,7 +73,7 @@ struct R {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00058::first_type<T,Args...>",
+      "display_name": "first_type<T,Args...>",
       "id": "39461943261269692",
       "is_abstract": false,
       "is_nested": false,
@@ -107,7 +107,7 @@ struct R {
       "type": "class"
     },
     {
-      "display_name": "clanguml::t00058::same_as_first_type<T,Args...>",
+      "display_name": "same_as_first_type<T,Args...>",
       "id": "1725820236573641307",
       "name": "same_as_first_type",
       "namespace": "clanguml::t00058",
@@ -123,7 +123,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00058::A<T,Args...>",
+      "display_name": "A<T,Args...>",
       "id": "798619347004821702",
       "is_abstract": false,
       "is_nested": false,
@@ -171,7 +171,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00058::B<T,P,Args...>",
+      "display_name": "B<T,P,Args...>",
       "id": "420594889696591405",
       "is_abstract": false,
       "is_nested": false,
@@ -237,7 +237,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00058::A<int,int,double,std::string>",
+      "display_name": "A<int,int,double,std::string>",
       "id": "1724002183455178980",
       "is_abstract": false,
       "is_nested": false,
@@ -284,7 +284,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00058::A<int,int>",
+      "display_name": "A<int,int>",
       "id": "1372381231906520278",
       "is_abstract": false,
       "is_nested": false,
@@ -319,7 +319,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00058::B<int,std::string,int,double,clanguml::t00058::A<int,int>>",
+      "display_name": "B<int,std::string,int,double,A<int,int>>",
       "id": "290383080560130133",
       "is_abstract": false,
       "is_nested": false,
@@ -385,7 +385,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00058::R",
+      "display_name": "R",
       "id": "1015108159699260009",
       "is_abstract": false,
       "is_nested": false,
@@ -432,6 +432,7 @@ struct R {
     }
   ],
   "name": "t00058_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "1725820236573641307",
diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg
index 41fc7335..c8ce71f4 100644
--- a/docs/test_cases/t00058_class.svg
+++ b/docs/test_cases/t00058_class.svg
@@ -1,179 +1,151 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="828px" preserveAspectRatio="none" style="width:405px;height:828px;background:#FFFFFF;" version="1.1" viewBox="0 0 405 828" width="405px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="809px" preserveAspectRatio="none" style="width:437px;height:809px;" version="1.1" viewBox="0 0 437 809" width="437px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="flwrcg7gmf5w5" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
-      <g id="elem_C_0000039461943261269692">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0000039461943261269692" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="159.5" y="773"/>
-        <ellipse cx="174.5" cy="789" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M169.5,790.1563 C169.5,792.6563 171.6406,794.4688 174.5625,794.4688 C175.7969,794.4688 176.9688,794.1719 177.7188,793.6563 C178.3281,793.2344 178.6563,792.8125 178.6563,792.4063 C178.6563,791.9375 178.2344,791.5313 177.7344,791.5313 C177.5,791.5313 177.2813,791.6094 177.0781,791.8125 C176.6406,792.25 176.6406,792.25 176.4688,792.3438 C176.0156,792.5781 175.375,792.7188 174.6094,792.7188 C172.6094,792.7188 171.3281,791.7031 171.3281,790.125 L171.3281,789.0781 C171.3281,787.375 172.5469,786.1719 174.25,786.1719 C174.8281,786.1719 175.4063,786.3125 175.875,786.5625 C176.3438,786.8281 176.5156,787.0156 176.5781,787.375 C176.7031,788.0469 176.9531,788.2969 177.4844,788.2969 C177.7656,788.2969 178.0469,788.1563 178.2344,787.9375 C178.3594,787.7656 178.4063,787.5938 178.4063,787.1563 L178.4063,785.7969 C178.4063,785.375 178.3906,785.2344 178.2656,785.0625 C178.0938,784.8125 177.8125,784.6563 177.4844,784.6563 C177.1719,784.6563 176.9688,784.7656 176.75,785.0313 C175.5781,784.5313 175.1406,784.4219 174.1875,784.4219 C171.5156,784.4219 169.5,786.4375 169.5,789.0625 L169.5,790.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="188.5" y="793.606">first_type</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="254.5" y="770"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="255.5" y="784.2001">T,Args...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="160.5" x2="296.5" y1="805" y2="805"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="160.5" x2="296.5" y1="813" y2="813"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="48" id="C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="155.5" y="750"/>
+      <ellipse cx="170.5" cy="766" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M173.4688,771.6406 Q172.8906,771.9375 172.25,772.0781 Q171.6094,772.2344 170.9063,772.2344 Q168.4063,772.2344 167.0781,770.5938 Q165.7656,768.9375 165.7656,765.8125 Q165.7656,762.6875 167.0781,761.0313 Q168.4063,759.375 170.9063,759.375 Q171.6094,759.375 172.25,759.5313 Q172.9063,759.6875 173.4688,759.9844 L173.4688,762.7031 Q172.8438,762.125 172.25,761.8594 Q171.6563,761.5781 171.0313,761.5781 Q169.6875,761.5781 169,762.6563 Q168.3125,763.7188 168.3125,765.8125 Q168.3125,767.9063 169,768.9844 Q169.6875,770.0469 171.0313,770.0469 Q171.6563,770.0469 172.25,769.7813 Q172.8438,769.5 173.4688,768.9219 L173.4688,771.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="184.5" y="770.1543">first_type</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="52" x="249.5" y="747"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="250.5" y="759.1387">T,Args...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="782" y2="782"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="790" y2="790"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
-      <g id="elem_C_0001725820236573641307">
-        <rect codeLine="6" fill="#F1F1F1" height="59" id="C_0001725820236573641307" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="204" x="126.5" y="653"/>
-        <ellipse cx="141.5" cy="674.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M136.5,675.6563 C136.5,678.1563 138.6406,679.9688 141.5625,679.9688 C142.7969,679.9688 143.9688,679.6719 144.7188,679.1563 C145.3281,678.7344 145.6563,678.3125 145.6563,677.9063 C145.6563,677.4375 145.2344,677.0313 144.7344,677.0313 C144.5,677.0313 144.2813,677.1094 144.0781,677.3125 C143.6406,677.75 143.6406,677.75 143.4688,677.8438 C143.0156,678.0781 142.375,678.2188 141.6094,678.2188 C139.6094,678.2188 138.3281,677.2031 138.3281,675.625 L138.3281,674.5781 C138.3281,672.875 139.5469,671.6719 141.25,671.6719 C141.8281,671.6719 142.4063,671.8125 142.875,672.0625 C143.3438,672.3281 143.5156,672.5156 143.5781,672.875 C143.7031,673.5469 143.9531,673.7969 144.4844,673.7969 C144.7656,673.7969 145.0469,673.6563 145.2344,673.4375 C145.3594,673.2656 145.4063,673.0938 145.4063,672.6563 L145.4063,671.2969 C145.4063,670.875 145.3906,670.7344 145.2656,670.5625 C145.0938,670.3125 144.8125,670.1563 144.4844,670.1563 C144.1719,670.1563 143.9688,670.2656 143.75,670.5313 C142.5781,670.0313 142.1406,669.9219 141.1875,669.9219 C138.5156,669.9219 136.5,671.9375 136.5,674.5625 L136.5,675.6563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="189" y="671.2001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124" x="155.5" y="687.2061">same_as_first_type</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="287.5" y="650"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="288.5" y="664.2001">T,Args...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="127.5" x2="329.5" y1="696" y2="696"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="127.5" x2="329.5" y1="704" y2="704"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="53.9375" id="C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="125" y="635"/>
+      <ellipse cx="140" cy="653.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M142.9688,659.6094 Q142.3906,659.9063 141.75,660.0469 Q141.1094,660.2031 140.4063,660.2031 Q137.9063,660.2031 136.5781,658.5625 Q135.2656,656.9063 135.2656,653.7813 Q135.2656,650.6563 136.5781,649 Q137.9063,647.3438 140.4063,647.3438 Q141.1094,647.3438 141.75,647.5 Q142.4063,647.6563 142.9688,647.9531 L142.9688,650.6719 Q142.3438,650.0938 141.75,649.8281 Q141.1563,649.5469 140.5313,649.5469 Q139.1875,649.5469 138.5,650.625 Q137.8125,651.6875 137.8125,653.7813 Q137.8125,655.875 138.5,656.9531 Q139.1875,658.0156 140.5313,658.0156 Q141.1563,658.0156 141.75,657.75 Q142.3438,657.4688 142.9688,656.8906 L142.9688,659.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="180.5" y="651.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="154" y="665.1074">same_as_first_type</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="52" x="280" y="632"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="281" y="644.1387">T,Args...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="672.9375" y2="672.9375"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="680.9375" y2="680.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000798619347004821702">
-        <rect codeLine="9" fill="#F1F1F1" height="64.7999" id="C_0000798619347004821702" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="90" y="511.2"/>
-        <ellipse cx="126.6" cy="527.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M121.6,528.3563 C121.6,530.8563 123.7406,532.6688 126.6625,532.6688 C127.8969,532.6688 129.0688,532.3719 129.8188,531.8563 C130.4281,531.4344 130.7563,531.0125 130.7563,530.6063 C130.7563,530.1375 130.3344,529.7313 129.8344,529.7313 C129.6,529.7313 129.3813,529.8094 129.1781,530.0125 C128.7406,530.45 128.7406,530.45 128.5688,530.5438 C128.1156,530.7781 127.475,530.9188 126.7094,530.9188 C124.7094,530.9188 123.4281,529.9031 123.4281,528.325 L123.4281,527.2781 C123.4281,525.575 124.6469,524.3719 126.35,524.3719 C126.9281,524.3719 127.5063,524.5125 127.975,524.7625 C128.4438,525.0281 128.6156,525.2156 128.6781,525.575 C128.8031,526.2469 129.0531,526.4969 129.5844,526.4969 C129.8656,526.4969 130.1469,526.3563 130.3344,526.1375 C130.4594,525.9656 130.5063,525.7938 130.5063,525.3563 L130.5063,523.9969 C130.5063,523.575 130.4906,523.4344 130.3656,523.2625 C130.1938,523.0125 129.9125,522.8563 129.5844,522.8563 C129.2719,522.8563 129.0688,522.9656 128.85,523.2313 C127.6781,522.7313 127.2406,522.6219 126.2875,522.6219 C123.6156,522.6219 121.6,524.6375 121.6,527.2625 L121.6,528.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="145.4" y="531.806">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="46" x="184" y="508.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="44" x="185" y="522.4001">T,Args...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="226" y1="543.2" y2="543.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="226" y1="551.2" y2="551.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="560.1"/>
-          <ellipse cx="101" cy="565.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="110" y="568.2059">a : std::vector&lt;T&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="60.8047" id="C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="93.5" y="497"/>
+      <ellipse cx="125.15" cy="513" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M128.1188,518.6406 Q127.5406,518.9375 126.9,519.0781 Q126.2594,519.2344 125.5563,519.2344 Q123.0563,519.2344 121.7281,517.5938 Q120.4156,515.9375 120.4156,512.8125 Q120.4156,509.6875 121.7281,508.0313 Q123.0563,506.375 125.5563,506.375 Q126.2594,506.375 126.9,506.5313 Q127.5563,506.6875 128.1188,506.9844 L128.1188,509.7031 Q127.4938,509.125 126.9,508.8594 Q126.3063,508.5781 125.6813,508.5781 Q124.3375,508.5781 123.65,509.6563 Q122.9625,510.7188 122.9625,512.8125 Q122.9625,514.9063 123.65,515.9844 Q124.3375,517.0469 125.6813,517.0469 Q126.3063,517.0469 126.9,516.7813 Q127.4938,516.5 128.1188,515.9219 L128.1188,518.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="142.85" y="517.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="52" x="175.5" y="494"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="176.5" y="506.1387">T,Args...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="529" y2="529"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="537" y2="537"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000420594889696591405">
-        <rect codeLine="14" fill="#F1F1F1" height="81.5999" id="C_0000420594889696591405" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="229" y="399.6"/>
-        <ellipse cx="260.65" cy="415.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M255.65,416.7563 C255.65,419.2563 257.7906,421.0688 260.7125,421.0688 C261.9469,421.0688 263.1188,420.7719 263.8688,420.2563 C264.4781,419.8344 264.8063,419.4125 264.8063,419.0063 C264.8063,418.5375 264.3844,418.1313 263.8844,418.1313 C263.65,418.1313 263.4313,418.2094 263.2281,418.4125 C262.7906,418.85 262.7906,418.85 262.6188,418.9438 C262.1656,419.1781 261.525,419.3188 260.7594,419.3188 C258.7594,419.3188 257.4781,418.3031 257.4781,416.725 L257.4781,415.6781 C257.4781,413.975 258.6969,412.7719 260.4,412.7719 C260.9781,412.7719 261.5563,412.9125 262.025,413.1625 C262.4938,413.4281 262.6656,413.6156 262.7281,413.975 C262.8531,414.6469 263.1031,414.8969 263.6344,414.8969 C263.9156,414.8969 264.1969,414.7563 264.3844,414.5375 C264.5094,414.3656 264.5563,414.1938 264.5563,413.7563 L264.5563,412.3969 C264.5563,411.975 264.5406,411.8344 264.4156,411.6625 C264.2438,411.4125 263.9625,411.2563 263.6344,411.2563 C263.3219,411.2563 263.1188,411.3656 262.9,411.6313 C261.7281,411.1313 261.2906,411.0219 260.3375,411.0219 C257.6656,411.0219 255.65,413.0375 255.65,415.6625 L255.65,416.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="278.35" y="420.206">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="57" x="312" y="396.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="55" x="313" y="410.8001">T,P,Args...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="230" x2="365" y1="431.6" y2="431.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="230" x2="365" y1="439.6" y2="439.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="235" y="448.5"/>
-          <ellipse cx="240" cy="453.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="249" y="456.6059">b : std::vector&lt;T&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="235" y="465.2999"/>
-          <ellipse cx="240" cy="470.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="249" y="473.4059">bb : P</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="99.5" y="543"/>
+      <ellipse cx="104.5" cy="548" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001724002183455178980">
-        <rect codeLine="20" fill="#F1F1F1" height="48" id="C_0001724002183455178980" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="170" x="32.5" y="243.6"/>
-        <ellipse cx="47.5" cy="259.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M42.5,260.7563 C42.5,263.2563 44.6406,265.0688 47.5625,265.0688 C48.7969,265.0688 49.9688,264.7719 50.7188,264.2563 C51.3281,263.8344 51.6563,263.4125 51.6563,263.0063 C51.6563,262.5375 51.2344,262.1313 50.7344,262.1313 C50.5,262.1313 50.2813,262.2094 50.0781,262.4125 C49.6406,262.85 49.6406,262.85 49.4688,262.9438 C49.0156,263.1781 48.375,263.3188 47.6094,263.3188 C45.6094,263.3188 44.3281,262.3031 44.3281,260.725 L44.3281,259.6781 C44.3281,257.975 45.5469,256.7719 47.25,256.7719 C47.8281,256.7719 48.4063,256.9125 48.875,257.1625 C49.3438,257.4281 49.5156,257.6156 49.5781,257.975 C49.7031,258.6469 49.9531,258.8969 50.4844,258.8969 C50.7656,258.8969 51.0469,258.7563 51.2344,258.5375 C51.3594,258.3656 51.4063,258.1938 51.4063,257.7563 L51.4063,256.3969 C51.4063,255.975 51.3906,255.8344 51.2656,255.6625 C51.0938,255.4125 50.8125,255.2563 50.4844,255.2563 C50.1719,255.2563 49.9688,255.3656 49.75,255.6313 C48.5781,255.1313 48.1406,255.0219 47.1875,255.0219 C44.5156,255.0219 42.5,257.0375 42.5,259.6625 L42.5,260.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="61.5" y="264.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="127" x="78.5" y="240.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="125" x="79.5" y="254.8001">int,int,double,std::string</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="33.5" x2="201.5" y1="275.6" y2="275.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="33.5" x2="201.5" y1="283.6" y2="283.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="113.5" y="551.2104">a : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001372381231906520278">
-        <rect codeLine="24" fill="#F1F1F1" height="48" id="C_0001372381231906520278" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="170.5" y="321.6"/>
-        <ellipse cx="185.5" cy="337.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M180.5,338.7563 C180.5,341.2563 182.6406,343.0688 185.5625,343.0688 C186.7969,343.0688 187.9688,342.7719 188.7188,342.2563 C189.3281,341.8344 189.6563,341.4125 189.6563,341.0063 C189.6563,340.5375 189.2344,340.1313 188.7344,340.1313 C188.5,340.1313 188.2813,340.2094 188.0781,340.4125 C187.6406,340.85 187.6406,340.85 187.4688,340.9438 C187.0156,341.1781 186.375,341.3188 185.6094,341.3188 C183.6094,341.3188 182.3281,340.3031 182.3281,338.725 L182.3281,337.6781 C182.3281,335.975 183.5469,334.7719 185.25,334.7719 C185.8281,334.7719 186.4063,334.9125 186.875,335.1625 C187.3438,335.4281 187.5156,335.6156 187.5781,335.975 C187.7031,336.6469 187.9531,336.8969 188.4844,336.8969 C188.7656,336.8969 189.0469,336.7563 189.2344,336.5375 C189.3594,336.3656 189.4063,336.1938 189.4063,335.7563 L189.4063,334.3969 C189.4063,333.975 189.3906,333.8344 189.2656,333.6625 C189.0938,333.4125 188.8125,333.2563 188.4844,333.2563 C188.1719,333.2563 187.9688,333.3656 187.75,333.6313 C186.5781,333.1313 186.1406,333.0219 185.1875,333.0219 C182.5156,333.0219 180.5,335.0375 180.5,337.6625 L180.5,338.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="199.5" y="342.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="31" x="216.5" y="318.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="29" x="217.5" y="332.8001">int,int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="243.5" y1="353.6" y2="353.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="243.5" y1="361.6" y2="361.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="73.6094" id="C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="229.5" y="393"/>
+      <ellipse cx="256.2" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M259.1688,414.6406 Q258.5906,414.9375 257.95,415.0781 Q257.3094,415.2344 256.6063,415.2344 Q254.1063,415.2344 252.7781,413.5938 Q251.4656,411.9375 251.4656,408.8125 Q251.4656,405.6875 252.7781,404.0313 Q254.1063,402.375 256.6063,402.375 Q257.3094,402.375 257.95,402.5313 Q258.6063,402.6875 259.1688,402.9844 L259.1688,405.7031 Q258.5438,405.125 257.95,404.8594 Q257.3563,404.5781 256.7313,404.5781 Q255.3875,404.5781 254.7,405.6563 Q254.0125,406.7188 254.0125,408.8125 Q254.0125,410.9063 254.7,411.9844 Q255.3875,413.0469 256.7313,413.0469 Q257.3563,413.0469 257.95,412.7813 Q258.5438,412.5 259.1688,411.9219 L259.1688,414.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="272.8" y="413.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="63" x="300.5" y="390"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="301.5" y="402.1387">T,P,Args...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="425" y2="425"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="433" y2="433"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000290383080560130133">
-        <rect codeLine="28" fill="#F1F1F1" height="48" id="C_0000290383080560130133" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="224" x="170.5" y="165.6"/>
-        <ellipse cx="185.5" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M180.5,182.7563 C180.5,185.2563 182.6406,187.0688 185.5625,187.0688 C186.7969,187.0688 187.9688,186.7719 188.7188,186.2563 C189.3281,185.8344 189.6563,185.4125 189.6563,185.0063 C189.6563,184.5375 189.2344,184.1313 188.7344,184.1313 C188.5,184.1313 188.2813,184.2094 188.0781,184.4125 C187.6406,184.85 187.6406,184.85 187.4688,184.9438 C187.0156,185.1781 186.375,185.3188 185.6094,185.3188 C183.6094,185.3188 182.3281,184.3031 182.3281,182.725 L182.3281,181.6781 C182.3281,179.975 183.5469,178.7719 185.25,178.7719 C185.8281,178.7719 186.4063,178.9125 186.875,179.1625 C187.3438,179.4281 187.5156,179.6156 187.5781,179.975 C187.7031,180.6469 187.9531,180.8969 188.4844,180.8969 C188.7656,180.8969 189.0469,180.7563 189.2344,180.5375 C189.3594,180.3656 189.4063,180.1938 189.4063,179.7563 L189.4063,178.3969 C189.4063,177.975 189.3906,177.8344 189.2656,177.6625 C189.0938,177.4125 188.8125,177.2563 188.4844,177.2563 C188.1719,177.2563 187.9688,177.3656 187.75,177.6313 C186.5781,177.1313 186.1406,177.0219 185.1875,177.0219 C182.5156,177.0219 180.5,179.0375 180.5,181.6625 L180.5,182.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="199.5" y="186.206">B</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="181" x="216.5" y="162.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="179" x="217.5" y="176.8001">int,std::string,int,double,A&lt;int,int&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="393.5" y1="197.6" y2="197.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="171.5" x2="393.5" y1="205.6" y2="205.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="439"/>
+      <ellipse cx="240.5" cy="444" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001015108159699260009">
-        <rect codeLine="32" fill="#F1F1F1" height="81.5999" id="C_0001015108159699260009" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="289" x="7" y="7"/>
-        <ellipse cx="142.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M137.25,24.1563 C137.25,26.6563 139.3906,28.4688 142.3125,28.4688 C143.5469,28.4688 144.7188,28.1719 145.4688,27.6563 C146.0781,27.2344 146.4063,26.8125 146.4063,26.4063 C146.4063,25.9375 145.9844,25.5313 145.4844,25.5313 C145.25,25.5313 145.0313,25.6094 144.8281,25.8125 C144.3906,26.25 144.3906,26.25 144.2188,26.3438 C143.7656,26.5781 143.125,26.7188 142.3594,26.7188 C140.3594,26.7188 139.0781,25.7031 139.0781,24.125 L139.0781,23.0781 C139.0781,21.375 140.2969,20.1719 142,20.1719 C142.5781,20.1719 143.1563,20.3125 143.625,20.5625 C144.0938,20.8281 144.2656,21.0156 144.3281,21.375 C144.4531,22.0469 144.7031,22.2969 145.2344,22.2969 C145.5156,22.2969 145.7969,22.1563 145.9844,21.9375 C146.1094,21.7656 146.1563,21.5938 146.1563,21.1563 L146.1563,19.7969 C146.1563,19.375 146.1406,19.2344 146.0156,19.0625 C145.8438,18.8125 145.5625,18.6563 145.2344,18.6563 C144.9219,18.6563 144.7188,18.7656 144.5,19.0313 C143.3281,18.5313 142.8906,18.4219 141.9375,18.4219 C139.2656,18.4219 137.25,20.4375 137.25,23.0625 L137.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="162.75" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="295" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="295" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="55.9"/>
-          <ellipse cx="18" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="27" y="64.0059">aa : A&lt;int,int,double,std::string&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="72.6999"/>
-          <ellipse cx="18" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="263" x="27" y="80.8059">bb : B&lt;int,std::string,int,double,A&lt;int,int&gt;&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="249.5" y="447.2104">b : std::vector&lt;T&gt;</text>
     </a>
-    <g id="link_C_0000798619347004821702_C_0001725820236573641307">
-      <path codeLine="37" d="M174.74,576.35 C186.53,599.42 199.63,625.0271 211.05,647.3771 " fill="none" id="C_0000798619347004821702-to-C_0001725820236573641307" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="213.78,652.72,213.2469,642.8856,211.505,648.2676,206.123,646.5256,213.78,652.72" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="51" x="199.5" y="619.077">T,Args...</text>
-    </g>
-    <g id="link_C_0000420594889696591405_C_0001725820236573641307">
-      <path codeLine="38" d="M292.4,481.61 C286.89,519.01 276.52,575.89 259.5,623 C255.87,633.05 253.6307,638.2405 248.6307,647.5005 " fill="none" id="C_0000420594889696591405-to-C_0001725820236573641307" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="245.78,652.78,253.5758,646.7612,248.1556,648.3804,246.5364,642.9602,245.78,652.78" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="51" x="287.5" y="548.177">T,Args...</text>
-    </g>
-    <g id="link_C_0001724002183455178980_C_0000798619347004821702">
-      <path codeLine="39" d="M121,291.96 C128.35,341.14 142.788,437.5779 151.108,493.2179 " fill="none" id="C_0001724002183455178980-to-C_0000798619347004821702" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="153.77,511.02,157.042,492.3306,145.174,494.1053,153.77,511.02" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001372381231906520278_C_0000798619347004821702">
-      <path codeLine="40" d="M201.69,369.85 C192.92,404.94 180.6467,454.0277 170.7767,493.4977 " fill="none" id="C_0001372381231906520278-to-C_0000798619347004821702" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="166.41,510.96,176.5975,494.9533,164.9559,492.0421,166.41,510.96" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000290383080560130133_C_0001372381231906520278">
-      <path codeLine="41" d="M271.11,213.99 C256.97,243.02 235.6389,286.8366 221.4989,315.8466 " fill="none" id="C_0000290383080560130133-to-C_0001372381231906520278" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="218.87,321.24,226.4089,314.9024,221.0607,316.7455,219.2177,311.3973,218.87,321.24" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000290383080560130133_C_0000420594889696591405">
-      <path codeLine="42" d="M283.91,214.01 C286.47,256.47 290.8287,328.6725 293.9887,381.1825 " fill="none" id="C_0000290383080560130133-to-C_0000420594889696591405" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="295.07,399.15,299.9779,380.8221,287.9996,381.5429,295.07,399.15" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001015108159699260009_C_0001724002183455178980">
-      <path codeLine="43" d="M143.3694,100.8564 C136.2894,146.2164 126.87,206.58 121.12,243.39 " fill="none" id="C_0001015108159699260009-backto-C_0001724002183455178980" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="145.22,89,140.3425,94.3114,143.3694,100.8564,148.2468,95.5451,145.22,89" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="146.5" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="153.5" y="131.677">aa</text>
-    </g>
-    <g id="link_C_0001015108159699260009_C_0000290383080560130133">
-      <path codeLine="44" d="M197.2441,97.6174 C220.3741,122.3074 241.04,144.35 260.52,165.15 " fill="none" id="C_0001015108159699260009-backto-C_0000290383080560130133" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="189.04,88.86,190.2229,95.9734,197.2441,97.6174,196.0612,90.504,189.04,88.86" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="238.5" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="245.5" y="131.677">bb</text>
-    </g>
-    <g id="link_C_0001725820236573641307_C_0000039461943261269692">
-      <path codeLine="45" d="M228.5,712.47 C228.5,731.22 228.5,749.31 228.5,766.79 " fill="none" id="C_0001725820236573641307-to-C_0000039461943261269692" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="228.5,772.79,232.5,763.79,228.5,767.79,224.5,763.79,228.5,772.79" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="451.8047"/>
+      <ellipse cx="240.5" cy="456.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="249.5" y="460.0151">bb : P</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
+      <ellipse cx="27.5" cy="253" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M30.4688,258.6406 Q29.8906,258.9375 29.25,259.0781 Q28.6094,259.2344 27.9063,259.2344 Q25.4063,259.2344 24.0781,257.5938 Q22.7656,255.9375 22.7656,252.8125 Q22.7656,249.6875 24.0781,248.0313 Q25.4063,246.375 27.9063,246.375 Q28.6094,246.375 29.25,246.5313 Q29.9063,246.6875 30.4688,246.9844 L30.4688,249.7031 Q29.8438,249.125 29.25,248.8594 Q28.6563,248.5781 28.0313,248.5781 Q26.6875,248.5781 26,249.6563 Q25.3125,250.7188 25.3125,252.8125 Q25.3125,254.9063 26,255.9844 Q26.6875,257.0469 28.0313,257.0469 Q28.6563,257.0469 29.25,256.7813 Q29.8438,256.5 30.4688,255.9219 L30.4688,258.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="41.5" y="257.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="151" x="57.5" y="234"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="149" x="58.5" y="246.1387">int,int,double,std::string</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="269" y2="269"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="277" y2="277"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
+      <ellipse cx="177" cy="331" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M179.9688,336.6406 Q179.3906,336.9375 178.75,337.0781 Q178.1094,337.2344 177.4063,337.2344 Q174.9063,337.2344 173.5781,335.5938 Q172.2656,333.9375 172.2656,330.8125 Q172.2656,327.6875 173.5781,326.0313 Q174.9063,324.375 177.4063,324.375 Q178.1094,324.375 178.75,324.5313 Q179.4063,324.6875 179.9688,324.9844 L179.9688,327.7031 Q179.3438,327.125 178.75,326.8594 Q178.1563,326.5781 177.5313,326.5781 Q176.1875,326.5781 175.5,327.6563 Q174.8125,328.7188 174.8125,330.8125 Q174.8125,332.9063 175.5,333.9844 Q176.1875,335.0469 177.5313,335.0469 Q178.1563,335.0469 178.75,334.7813 Q179.3438,334.5 179.9688,333.9219 L179.9688,336.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191" y="335.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="38" x="207" y="312"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="208" y="324.1387">int,int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="347" y2="347"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="355" y2="355"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
+      <ellipse cx="177.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M180.4688,180.6406 Q179.8906,180.9375 179.25,181.0781 Q178.6094,181.2344 177.9063,181.2344 Q175.4063,181.2344 174.0781,179.5938 Q172.7656,177.9375 172.7656,174.8125 Q172.7656,171.6875 174.0781,170.0313 Q175.4063,168.375 177.9063,168.375 Q178.6094,168.375 179.25,168.5313 Q179.9063,168.6875 180.4688,168.9844 L180.4688,171.7031 Q179.8438,171.125 179.25,170.8594 Q178.6563,170.5781 178.0313,170.5781 Q176.6875,170.5781 176,171.6563 Q175.3125,172.7188 175.3125,174.8125 Q175.3125,176.9063 176,177.9844 Q176.6875,179.0469 178.0313,179.0469 Q178.6563,179.0469 179.25,178.7813 Q179.8438,178.5 180.4688,177.9219 L180.4688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191.5" y="179.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="219" x="207.5" y="156"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="217" x="208.5" y="168.1387">int,std::string,int,double,A&lt;int,int&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="191" y2="191"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="199" y2="199"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="73.6094" id="C_0001015108159699260009" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="6" y="8"/>
+      <ellipse cx="135.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M138.7188,29.6406 Q138.1406,29.9375 137.5,30.0781 Q136.8594,30.2344 136.1563,30.2344 Q133.6563,30.2344 132.3281,28.5938 Q131.0156,26.9375 131.0156,23.8125 Q131.0156,20.6875 132.3281,19.0313 Q133.6563,17.375 136.1563,17.375 Q136.8594,17.375 137.5,17.5313 Q138.1563,17.6875 138.7188,17.9844 L138.7188,20.7031 Q138.0938,20.125 137.5,19.8594 Q136.9063,19.5781 136.2813,19.5781 Q134.9375,19.5781 134.25,20.6563 Q133.5625,21.7188 133.5625,23.8125 Q133.5625,25.9063 134.25,26.9844 Q134.9375,28.0469 136.2813,28.0469 Q136.9063,28.0469 137.5,27.7813 Q138.0938,27.5 138.7188,26.9219 L138.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
+      <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="26" y="62.2104">aa : A&lt;int,int,double,std::string&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
+      <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="250" x="26" y="75.0151">bb : B&lt;int,std::string,int,double,A&lt;int,int&gt;&gt;</text>
+    </a>
+    <path d="M174.26,558.24 C185.3,579.75 200.17,608.73 211.31,630.43 " fill="none" id="C_0000798619347004821702-&gt;C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="213.63,634.95,213.0696,625.1171,211.3426,630.5039,205.9558,628.7769,213.63,634.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="199" y="601.0669">T,Args...</text>
+    <path d="M291.28,467.3 C286.77,503.2 277.51,559.24 260,605 C256.7,613.63 252.14,622.46 247.45,630.49 " fill="none" id="C_0000420594889696591405-&gt;C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="244.85,634.86,252.8965,629.1808,247.4119,630.5662,246.0265,625.0817,244.85,634.86" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="287" y="532.0669">T,Args...</text>
+    <path d="M113.35,285.01 C121.42,327.68 138.85,419.93 149.69,477.25 " fill="none" id="C_0001724002183455178980-&gt;C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="156.58,476.03,153.42,496.99,142.83,478.63,156.58,476.03" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M196.64,363.24 C190.1,391.62 178.86,440.37 170.36,477.23 " fill="none" id="C_0001372381231906520278-&gt;C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="177.16,478.88,165.85,496.8,163.52,475.74,177.16,478.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M279.38,207.06 C263.09,234.61 235.86,280.7 218.43,310.2 " fill="none" id="C_0000290383080560130133-&gt;C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="215.72,314.79,223.7359,309.0676,218.2588,310.4825,216.8439,305.0055,215.72,314.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M293.19,207.05 C293.49,244.63 294.11,320.19 294.54,372.64 " fill="none" id="C_0000290383080560130133-&gt;C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="301.54,372.79,294.7,392.84,287.54,372.9,301.54,372.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M135.96,95.14 C128.7,139.55 118.32,202.99 112.8,236.76 " fill="none" id="C_0001015108159699260009&lt;-C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="138.06,82.3,133.1433,87.575,136.1214,94.1424,141.0382,88.8674,138.06,82.3" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="140" 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="16" x="147" y="125.0669">aa</text>
+    <path d="M193.16,90.87 C217.96,113.51 247.01,140.02 267.36,158.6 " fill="none" id="C_0001015108159699260009&lt;-C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="183.54,82.09,185.2714,89.0902,192.399,90.1844,190.6676,83.1842,183.54,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="237" 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="16" x="244" y="125.0669">bb</text>
+    <path d="M227,689.07 C227,705.77 227,727.44 227,744.57 " fill="none" id="C_0001725820236573641307-&gt;C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="227,749.74,231,740.74,227,744.74,223,740.74,227,749.74" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00058_class_mermaid.svg b/docs/test_cases/t00058_class_mermaid.svg
index 345cd26e..16288621 100644
--- a/docs/test_cases/t00058_class_mermaid.svg
+++ b/docs/test_cases/t00058_class_mermaid.svg
@@ -1,68 +1,63 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 652.8828125 647" style="max-width: 652.883px; background-color: white;" width="652.8828125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M287.2421875,481L287.2421875,488.5C287.2421875,496,287.2421875,511,294.1032450870902,523.572200988476C300.9643026741805,536.1444019769519,314.686417848361,546.2888039539038,321.5474754354512,551.3610049423797L328.40853302254146,556.4332059308557"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M530.859375,492L530.859375,497.6666666666667C530.859375,503.3333333333333,530.859375,514.6666666666666,520.6332105631419,525.545868145164C510.4070461262839,536.4250696236614,489.9547172525679,546.850139247323,479.72855281570986,552.0626740591538L469.50238837885183,557.2752088709846"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M182.7421875,341L182.7421875,345.1666666666667C182.7421875,349.3333333333333,182.7421875,357.6666666666667,188.61509242076352,366.07643688852613C194.48799734152703,374.4862071103856,206.23380718305407,382.9724142207711,212.10671210381759,387.2155177759639L217.97961702458113,391.4586213311567"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M391.7421875,341L391.7421875,345.1666666666667C391.7421875,349.3333333333333,391.7421875,357.6666666666667,385.86928257923654,366.07643688852613C379.99637765847297,374.4862071103856,368.25056781694593,382.9724142207711,362.37766289618247,387.2155177759639L356.5047579754189,391.4586213311567"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M438.2010075934579,234L430.4578709112149,238.16666666666666C422.71473422897196,242.33333333333334,407.22846086448595,250.66666666666666,399.48532418224295,258C391.7421875,265.3333333333333,391.7421875,271.6666666666667,391.7421875,274.8333333333333L391.7421875,278"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M512.3101635514018,234L515.4016987928348,238.16666666666666C518.4932340342679,242.33333333333334,524.6763045171339,250.66666666666666,527.767839758567,263.75C530.859375,276.8333333333333,530.859375,294.6666666666667,530.859375,312.5C530.859375,330.3333333333333,530.859375,348.1666666666667,530.859375,358.25C530.859375,368.3333333333333,530.859375,370.6666666666667,530.859375,371.8333333333333L530.859375,373"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M248.16470686068473,115.89058426920673L237.26095363390394,120.40882022433895C226.35720040712317,124.92705617947115,204.5496939535616,133.96352808973558,193.64594072678082,148.89843071153447C182.7421875,163.83333333333334,182.7421875,184.66666666666666,182.7421875,204C182.7421875,223.33333333333334,182.7421875,241.16666666666666,182.7421875,254.25C182.7421875,267.3333333333333,182.7421875,275.6666666666667,182.7421875,279.8333333333333L182.7421875,284"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M463.11336903528013,120.31786030843224L467.7884846127334,124.09821692369354C472.46360019018675,127.87857353895483,481.8138313450934,135.43928676947743,486.48894692254663,144.8863100514054C491.1640625,154.33333333333334,491.1640625,165.66666666666666,491.1640625,171.33333333333334L491.1640625,177"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M287.2421875,481L287.2421875,488.5C287.2421875,496,287.2421875,511,294.9073660714286,524.1666666666666C302.57254464285717,537.3333333333334,317.9029017857143,548.6666666666666,325.5680803571429,554.3333333333334L333.23325892857144,560"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M530.859375,492L530.859375,497.6666666666667C530.859375,503.3333333333333,530.859375,514.6666666666666,519.7422760770975,526C508.625177154195,537.3333333333334,486.39097930839006,548.6666666666666,475.27388038548753,554.3333333333334L464.15678146258506,560"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M182.7421875,341L182.7421875,345.1666666666667C182.7421875,349.3333333333333,182.7421875,357.6666666666667,191.04682326158942,367.8333333333333C199.35145902317882,378,215.9607305463576,390,224.26536630794703,396L232.57000206953643,402"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M391.7421875,341L391.7421875,345.1666666666667C391.7421875,349.3333333333333,391.7421875,357.6666666666667,383.4375517384106,367.8333333333333C375.13291597682115,378,358.52364445364236,390,350.21900869205297,396L341.91437293046357,402"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M438.2010075934579,234L430.4578709112149,238.16666666666666C422.71473422897196,242.33333333333334,407.22846086448595,250.66666666666666,399.48532418224295,259C391.7421875,267.3333333333333,391.7421875,275.6666666666667,391.7421875,279.8333333333333L391.7421875,284"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M512.3101635514018,234L515.4016987928348,238.16666666666666C518.4932340342679,242.33333333333334,524.6763045171339,250.66666666666666,527.767839758567,263.75C530.859375,276.8333333333333,530.859375,294.6666666666667,530.859375,312.5C530.859375,330.3333333333333,530.859375,348.1666666666667,530.859375,361.25C530.859375,374.3333333333333,530.859375,382.6666666666667,530.859375,386.8333333333333L530.859375,391"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M264.7935928254438,109L251.1183586045365,114.66666666666667C237.4431243836292,120.33333333333333,210.09265594181457,131.66666666666666,196.4174217209073,147.75C182.7421875,163.83333333333334,182.7421875,184.66666666666666,182.7421875,204C182.7421875,223.33333333333334,182.7421875,241.16666666666666,182.7421875,254.25C182.7421875,267.3333333333333,182.7421875,275.6666666666667,182.7421875,279.8333333333333L182.7421875,284"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M449.1167252218935,109L456.12461476824456,114.66666666666667C463.1325043145957,120.33333333333333,477.1482834072978,131.66666666666666,484.1561729536489,143C491.1640625,154.33333333333334,491.1640625,165.66666666666666,491.1640625,171.33333333333334L491.1640625,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(287.2421875, 526)" class="edgeLabel">
@@ -155,7 +150,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L11">
+        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L11">
           <g title="first_type" id="classId-C_0000039461943261269692-0" class="node default clickable">
             <rect height="57" width="167.953125" y="-28.5" x="-83.9765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.9765625" x1="-83.9765625" class="divider"/>
@@ -174,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L22">
+        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L22">
           <g title="same_as_first_type" id="classId-C_0001725820236573641307-1" class="node default clickable">
             <rect height="79" width="244.46875" y="-39.5" x="-122.234375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="122.234375" x1="-122.234375" class="divider"/>
@@ -193,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27">
+        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0000798619347004821702-2" class="node default clickable">
             <rect height="79" width="148.84375" y="-39.5" x="-74.421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -217,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33">
+        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000420594889696591405-3" class="node default clickable">
             <rect height="101" width="148.84375" y="-50.5" x="-74.421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -246,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L27">
+        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0001724002183455178980-4" class="node default clickable">
             <rect height="57" width="229.21875" y="-28.5" x="-114.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="114.609375" x1="-114.609375" class="divider"/>
@@ -265,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33">
+        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33">
           <g title="A" id="classId-C_0001372381231906520278-5" class="node default clickable">
             <rect height="57" width="88.78125" y="-28.5" x="-44.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="44.390625" x1="-44.390625" class="divider"/>
@@ -284,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L33">
+        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000290383080560130133-6" class="node default clickable">
             <rect height="57" width="307.4375" y="-28.5" x="-153.71875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="153.71875" x1="-153.71875" class="divider"/>
@@ -303,7 +298,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00058/t00058.cc#L38">
+        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L38">
           <g title="R" id="classId-C_0001015108159699260009-7" class="node default clickable">
             <rect height="101" width="321.421875" y="-50.5" x="-160.7109375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="160.7109375" x1="-160.7109375" class="divider"/>
diff --git a/docs/test_cases/t00059.md b/docs/test_cases/t00059.md
index ca9aa916..4170426e 100644
--- a/docs/test_cases/t00059.md
+++ b/docs/test_cases/t00059.md
@@ -81,7 +81,7 @@ struct R {
   "diagram_type": "class",
   "elements": [
     {
-      "display_name": "clanguml::t00059::fruit_c<T>",
+      "display_name": "fruit_c<T>",
       "id": "1926201868069460340",
       "name": "fruit_c",
       "namespace": "clanguml::t00059",
@@ -104,7 +104,7 @@ struct R {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00059::apple_c<T>",
+      "display_name": "apple_c<T>",
       "id": "1932582371736186409",
       "name": "apple_c",
       "namespace": "clanguml::t00059",
@@ -126,7 +126,7 @@ struct R {
       "type": "concept"
     },
     {
-      "display_name": "clanguml::t00059::orange_c<T>",
+      "display_name": "orange_c<T>",
       "id": "1483904441065806133",
       "name": "orange_c",
       "namespace": "clanguml::t00059",
@@ -149,7 +149,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00059::gala_apple",
+      "display_name": "gala_apple",
       "id": "399997161214328320",
       "is_abstract": false,
       "is_nested": false,
@@ -224,7 +224,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00059::empire_apple",
+      "display_name": "empire_apple",
       "id": "660406972347773654",
       "is_abstract": false,
       "is_nested": false,
@@ -299,7 +299,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00059::lima_orange",
+      "display_name": "lima_orange",
       "id": "1649295452510454080",
       "is_abstract": false,
       "is_nested": false,
@@ -374,7 +374,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00059::valencia_orange",
+      "display_name": "valencia_orange",
       "id": "802727760415733923",
       "is_abstract": false,
       "is_nested": false,
@@ -449,7 +449,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00059::fruit_factory<clanguml::t00059::apple_c TA,clanguml::t00059::orange_c TO>",
+      "display_name": "fruit_factory<apple_c TA,orange_c TO>",
       "id": "2301786483822933456",
       "is_abstract": false,
       "is_nested": false,
@@ -537,7 +537,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00059::fruit_factory<clanguml::t00059::gala_apple,clanguml::t00059::valencia_orange>",
+      "display_name": "fruit_factory<gala_apple,valencia_orange>",
       "id": "551278102444647278",
       "is_abstract": false,
       "is_nested": false,
@@ -572,7 +572,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00059::fruit_factory<clanguml::t00059::empire_apple,clanguml::t00059::lima_orange>",
+      "display_name": "fruit_factory<empire_apple,lima_orange>",
       "id": "536390279563541226",
       "is_abstract": false,
       "is_nested": false,
@@ -607,7 +607,7 @@ struct R {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00059::R",
+      "display_name": "R",
       "id": "1128300671453354325",
       "is_abstract": false,
       "is_nested": false,
@@ -654,6 +654,7 @@ struct R {
     }
   ],
   "name": "t00059_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "1926201868069460340",
diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg
index 1b58e64d..adf14620 100644
--- a/docs/test_cases/t00059_class.svg
+++ b/docs/test_cases/t00059_class.svg
@@ -1,279 +1,239 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="719px" preserveAspectRatio="none" style="width:1250px;height:719px;background:#FFFFFF;" version="1.1" viewBox="0 0 1250 719" width="1250px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="679px" preserveAspectRatio="none" style="width:1199px;height:679px;" version="1.1" viewBox="0 0 1199 679" width="1199px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1q1yptj5zybs5" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
-      <g id="elem_C_0001926201868069460340">
-        <rect codeLine="2" fill="#F1F1F1" height="109.3998" id="C_0001926201868069460340" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="96" x="565" y="602.8"/>
-        <ellipse cx="580" cy="624.3" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M575,625.4563 C575,627.9563 577.1406,629.7688 580.0625,629.7688 C581.2969,629.7688 582.4688,629.4719 583.2188,628.9563 C583.8281,628.5344 584.1563,628.1125 584.1563,627.7063 C584.1563,627.2375 583.7344,626.8313 583.2344,626.8313 C583,626.8313 582.7813,626.9094 582.5781,627.1125 C582.1406,627.55 582.1406,627.55 581.9688,627.6438 C581.5156,627.8781 580.875,628.0188 580.1094,628.0188 C578.1094,628.0188 576.8281,627.0031 576.8281,625.425 L576.8281,624.3781 C576.8281,622.675 578.0469,621.4719 579.75,621.4719 C580.3281,621.4719 580.9063,621.6125 581.375,621.8625 C581.8438,622.1281 582.0156,622.3156 582.0781,622.675 C582.2031,623.3469 582.4531,623.5969 582.9844,623.5969 C583.2656,623.5969 583.5469,623.4563 583.7344,623.2375 C583.8594,623.0656 583.9063,622.8938 583.9063,622.4563 L583.9063,621.0969 C583.9063,620.675 583.8906,620.5344 583.7656,620.3625 C583.5938,620.1125 583.3125,619.9563 582.9844,619.9563 C582.6719,619.9563 582.4688,620.0656 582.25,620.3313 C581.0781,619.8313 580.6406,619.7219 579.6875,619.7219 C577.0156,619.7219 575,621.7375 575,624.3625 L575,625.4563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="592" y="621.0001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="601" y="637.0061">fruit_c</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="655" y="599.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="656" y="614.0001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="566" x2="660" y1="645.8" y2="645.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="571" y="662.806">(T t)</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="566" x2="660" y1="670.6" y2="670.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="571" y="687.6059">T{}</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="571" y="704.4058">t.get_name()</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="534" y="576"/>
+      <ellipse cx="549" cy="594.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M551.9688,600.6094 Q551.3906,600.9063 550.75,601.0469 Q550.1094,601.2031 549.4063,601.2031 Q546.9063,601.2031 545.5781,599.5625 Q544.2656,597.9063 544.2656,594.7813 Q544.2656,591.6563 545.5781,590 Q546.9063,588.3438 549.4063,588.3438 Q550.1094,588.3438 550.75,588.5 Q551.4063,588.6563 551.9688,588.9531 L551.9688,591.6719 Q551.3438,591.0938 550.75,590.8281 Q550.1563,590.5469 549.5313,590.5469 Q548.1875,590.5469 547.5,591.625 Q546.8125,592.6875 546.8125,594.7813 Q546.8125,596.875 547.5,597.9531 Q548.1875,599.0156 549.5313,599.0156 Q550.1563,599.0156 550.75,598.75 Q551.3438,598.4688 551.9688,597.8906 L551.9688,600.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="561" y="592.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="574.5" y="606.1074">fruit_c</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="632" y="573"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="633" y="585.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="535" x2="637" y1="613.9375" y2="613.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="540" y="628.1479">(T t)</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="535" x2="637" y1="634.7422" y2="634.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="540" y="648.9526">T{}</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="540" y="661.7573">t.get_name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
-      <g id="elem_C_0001932582371736186409">
-        <rect codeLine="9" fill="#F1F1F1" height="92.5999" id="C_0001932582371736186409" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="125" x="471.5" y="433.2"/>
-        <ellipse cx="499.55" cy="454.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M494.55,455.8563 C494.55,458.3563 496.6906,460.1688 499.6125,460.1688 C500.8469,460.1688 502.0188,459.8719 502.7688,459.3563 C503.3781,458.9344 503.7063,458.5125 503.7063,458.1063 C503.7063,457.6375 503.2844,457.2313 502.7844,457.2313 C502.55,457.2313 502.3313,457.3094 502.1281,457.5125 C501.6906,457.95 501.6906,457.95 501.5188,458.0438 C501.0656,458.2781 500.425,458.4188 499.6594,458.4188 C497.6594,458.4188 496.3781,457.4031 496.3781,455.825 L496.3781,454.7781 C496.3781,453.075 497.5969,451.8719 499.3,451.8719 C499.8781,451.8719 500.4563,452.0125 500.925,452.2625 C501.3938,452.5281 501.5656,452.7156 501.6281,453.075 C501.7531,453.7469 502.0031,453.9969 502.5344,453.9969 C502.8156,453.9969 503.0969,453.8563 503.2844,453.6375 C503.4094,453.4656 503.4563,453.2938 503.4563,452.8563 L503.4563,451.4969 C503.4563,451.075 503.4406,450.9344 503.3156,450.7625 C503.1438,450.5125 502.8625,450.3563 502.5344,450.3563 C502.2219,450.3563 502.0188,450.4656 501.8,450.7313 C500.6281,450.2313 500.1906,450.1219 499.2375,450.1219 C496.5656,450.1219 494.55,452.1375 494.55,454.7625 L494.55,455.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="514.45" y="451.4001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="517.95" y="467.4061">apple_c</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="590.5" y="430.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="591.5" y="444.4001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="472.5" x2="595.5" y1="476.2" y2="476.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="477.5" y="493.206">(T t)</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="472.5" x2="595.5" y1="501" y2="501"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="477.5" y="518.0059">t.get_sweetness()</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="456" y="419"/>
+      <ellipse cx="475.5" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M478.4688,443.6094 Q477.8906,443.9063 477.25,444.0469 Q476.6094,444.2031 475.9063,444.2031 Q473.4063,444.2031 472.0781,442.5625 Q470.7656,440.9063 470.7656,437.7813 Q470.7656,434.6563 472.0781,433 Q473.4063,431.3438 475.9063,431.3438 Q476.6094,431.3438 477.25,431.5 Q477.9063,431.6563 478.4688,431.9531 L478.4688,434.6719 Q477.8438,434.0938 477.25,433.8281 Q476.6563,433.5469 476.0313,433.5469 Q474.6875,433.5469 474,434.625 Q473.3125,435.6875 473.3125,437.7813 Q473.3125,439.875 474,440.9531 Q474.6875,442.0156 476.0313,442.0156 Q476.6563,442.0156 477.25,441.75 Q477.8438,441.4688 478.4688,440.8906 L478.4688,443.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="488.5" y="435.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="497" y="449.1074">apple_c</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="564" y="416"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="565" y="428.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="457" x2="569" y1="456.9375" y2="456.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="462" y="471.1479">(T t)</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="457" x2="569" y1="477.7422" y2="477.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="462" y="491.9526">t.get_sweetness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
-      <g id="elem_C_0001483904441065806133">
-        <rect codeLine="15" fill="#F1F1F1" height="92.5999" id="C_0001483904441065806133" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="632" y="433.2"/>
-        <ellipse cx="654.65" cy="454.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M649.65,455.8563 C649.65,458.3563 651.7906,460.1688 654.7125,460.1688 C655.9469,460.1688 657.1188,459.8719 657.8688,459.3563 C658.4781,458.9344 658.8063,458.5125 658.8063,458.1063 C658.8063,457.6375 658.3844,457.2313 657.8844,457.2313 C657.65,457.2313 657.4313,457.3094 657.2281,457.5125 C656.7906,457.95 656.7906,457.95 656.6188,458.0438 C656.1656,458.2781 655.525,458.4188 654.7594,458.4188 C652.7594,458.4188 651.4781,457.4031 651.4781,455.825 L651.4781,454.7781 C651.4781,453.075 652.6969,451.8719 654.4,451.8719 C654.9781,451.8719 655.5563,452.0125 656.025,452.2625 C656.4938,452.5281 656.6656,452.7156 656.7281,453.075 C656.8531,453.7469 657.1031,453.9969 657.6344,453.9969 C657.9156,453.9969 658.1969,453.8563 658.3844,453.6375 C658.5094,453.4656 658.5563,453.2938 658.5563,452.8563 L658.5563,451.4969 C658.5563,451.075 658.5406,450.9344 658.4156,450.7625 C658.2438,450.5125 657.9625,450.3563 657.6344,450.3563 C657.3219,450.3563 657.1188,450.4656 656.9,450.7313 C655.7281,450.2313 655.2906,450.1219 654.3375,450.1219 C651.6656,450.1219 649.65,452.1375 649.65,454.7625 L649.65,455.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="671.85" y="451.4001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="670.35" y="467.4061">orange_c</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="746" y="430.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="747" y="444.4001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="633" x2="751" y1="476.2" y2="476.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="638" y="493.206">(T t)</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="633" x2="751" y1="501" y2="501"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="108" x="638" y="518.0059">t.get_bitterness()</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="605" y="419"/>
+      <ellipse cx="622.7" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M625.6688,443.6094 Q625.0906,443.9063 624.45,444.0469 Q623.8094,444.2031 623.1063,444.2031 Q620.6063,444.2031 619.2781,442.5625 Q617.9656,440.9063 617.9656,437.7813 Q617.9656,434.6563 619.2781,433 Q620.6063,431.3438 623.1063,431.3438 Q623.8094,431.3438 624.45,431.5 Q625.1063,431.6563 625.6688,431.9531 L625.6688,434.6719 Q625.0438,434.0938 624.45,433.8281 Q623.8563,433.5469 623.2313,433.5469 Q621.8875,433.5469 621.2,434.625 Q620.5125,435.6875 620.5125,437.7813 Q620.5125,439.875 621.2,440.9531 Q621.8875,442.0156 623.2313,442.0156 Q623.8563,442.0156 624.45,441.75 Q625.0438,441.4688 625.6688,440.8906 L625.6688,443.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="635.3" y="435.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="638.8" y="449.1074">orange_c</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="709" y="416"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="710" y="428.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="606" x2="714" y1="456.9375" y2="456.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="611" y="471.1479">(T t)</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="606" x2="714" y1="477.7422" y2="477.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="611" y="491.9526">t.get_bitterness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
-      <g id="elem_C_0000399997161214328320">
-        <rect codeLine="21" fill="#F1F1F1" height="81.5999" id="C_0000399997161214328320" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="7" y="274.6"/>
-        <ellipse cx="73.75" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M68.75,291.7563 C68.75,294.2563 70.8906,296.0688 73.8125,296.0688 C75.0469,296.0688 76.2188,295.7719 76.9688,295.2563 C77.5781,294.8344 77.9063,294.4125 77.9063,294.0063 C77.9063,293.5375 77.4844,293.1313 76.9844,293.1313 C76.75,293.1313 76.5313,293.2094 76.3281,293.4125 C75.8906,293.85 75.8906,293.85 75.7188,293.9438 C75.2656,294.1781 74.625,294.3188 73.8594,294.3188 C71.8594,294.3188 70.5781,293.3031 70.5781,291.725 L70.5781,290.6781 C70.5781,288.975 71.7969,287.7719 73.5,287.7719 C74.0781,287.7719 74.6563,287.9125 75.125,288.1625 C75.5938,288.4281 75.7656,288.6156 75.8281,288.975 C75.9531,289.6469 76.2031,289.8969 76.7344,289.8969 C77.0156,289.8969 77.2969,289.7563 77.4844,289.5375 C77.6094,289.3656 77.6563,289.1938 77.6563,288.7563 L77.6563,287.3969 C77.6563,286.975 77.6406,286.8344 77.5156,286.6625 C77.3438,286.4125 77.0625,286.2563 76.7344,286.2563 C76.4219,286.2563 76.2188,286.3656 76,286.6313 C74.8281,286.1313 74.3906,286.0219 73.4375,286.0219 C70.7656,286.0219 68.75,288.0375 68.75,290.6625 L68.75,291.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="70" x="94.25" y="295.206">gala_apple</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="218" y1="306.6" y2="306.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="315.5"/>
-          <ellipse cx="18" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="27" y="323.6059">get_name() const : std::string</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="332.2999"/>
-          <ellipse cx="18" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="27" y="340.4059">get_sweetness() const : float</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="218" y1="348.1999" y2="348.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="268"/>
+      <ellipse cx="65.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M68.7188,289.6406 Q68.1406,289.9375 67.5,290.0781 Q66.8594,290.2344 66.1563,290.2344 Q63.6563,290.2344 62.3281,288.5938 Q61.0156,286.9375 61.0156,283.8125 Q61.0156,280.6875 62.3281,279.0313 Q63.6563,277.375 66.1563,277.375 Q66.8594,277.375 67.5,277.5313 Q68.1563,277.6875 68.7188,277.9844 L68.7188,280.7031 Q68.0938,280.125 67.5,279.8594 Q66.9063,279.5781 66.2813,279.5781 Q64.9375,279.5781 64.25,280.6563 Q63.5625,281.7188 63.5625,283.8125 Q63.5625,285.9063 64.25,286.9844 Q64.9375,288.0469 66.2813,288.0469 Q66.9063,288.0469 67.5,287.7813 Q68.0938,287.5 68.7188,286.9219 L68.7188,289.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="68" x="86.25" y="288.1543">gala_apple</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
-      <g id="elem_C_0000660406972347773654">
-        <rect codeLine="27" fill="#F1F1F1" height="81.5999" id="C_0000660406972347773654" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="784" y="274.6"/>
-        <ellipse cx="842.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M837.25,291.7563 C837.25,294.2563 839.3906,296.0688 842.3125,296.0688 C843.5469,296.0688 844.7188,295.7719 845.4688,295.2563 C846.0781,294.8344 846.4063,294.4125 846.4063,294.0063 C846.4063,293.5375 845.9844,293.1313 845.4844,293.1313 C845.25,293.1313 845.0313,293.2094 844.8281,293.4125 C844.3906,293.85 844.3906,293.85 844.2188,293.9438 C843.7656,294.1781 843.125,294.3188 842.3594,294.3188 C840.3594,294.3188 839.0781,293.3031 839.0781,291.725 L839.0781,290.6781 C839.0781,288.975 840.2969,287.7719 842,287.7719 C842.5781,287.7719 843.1563,287.9125 843.625,288.1625 C844.0938,288.4281 844.2656,288.6156 844.3281,288.975 C844.4531,289.6469 844.7031,289.8969 845.2344,289.8969 C845.5156,289.8969 845.7969,289.7563 845.9844,289.5375 C846.1094,289.3656 846.1563,289.1938 846.1563,288.7563 L846.1563,287.3969 C846.1563,286.975 846.1406,286.8344 846.0156,286.6625 C845.8438,286.4125 845.5625,286.2563 845.2344,286.2563 C844.9219,286.2563 844.7188,286.3656 844.5,286.6313 C843.3281,286.1313 842.8906,286.0219 841.9375,286.0219 C839.2656,286.0219 837.25,288.0375 837.25,290.6625 L837.25,291.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="862.75" y="295.206">empire_apple</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="785" x2="995" y1="306.6" y2="306.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="790" y="315.5"/>
-          <ellipse cx="795" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="804" y="323.6059">get_name() const : std::string</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="790" y="332.2999"/>
-          <ellipse cx="795" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="804" y="340.4059">get_sweetness() const : float</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="785" x2="995" y1="348.1999" y2="348.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="306"/>
+      <ellipse cx="17" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
-      <g id="elem_C_0001649295452510454080">
-        <rect codeLine="33" fill="#F1F1F1" height="81.5999" id="C_0001649295452510454080" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="1031" y="274.6"/>
-        <ellipse cx="1093.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1088.25,291.7563 C1088.25,294.2563 1090.3906,296.0688 1093.3125,296.0688 C1094.5469,296.0688 1095.7188,295.7719 1096.4688,295.2563 C1097.0781,294.8344 1097.4063,294.4125 1097.4063,294.0063 C1097.4063,293.5375 1096.9844,293.1313 1096.4844,293.1313 C1096.25,293.1313 1096.0313,293.2094 1095.8281,293.4125 C1095.3906,293.85 1095.3906,293.85 1095.2188,293.9438 C1094.7656,294.1781 1094.125,294.3188 1093.3594,294.3188 C1091.3594,294.3188 1090.0781,293.3031 1090.0781,291.725 L1090.0781,290.6781 C1090.0781,288.975 1091.2969,287.7719 1093,287.7719 C1093.5781,287.7719 1094.1563,287.9125 1094.625,288.1625 C1095.0938,288.4281 1095.2656,288.6156 1095.3281,288.975 C1095.4531,289.6469 1095.7031,289.8969 1096.2344,289.8969 C1096.5156,289.8969 1096.7969,289.7563 1096.9844,289.5375 C1097.1094,289.3656 1097.1563,289.1938 1097.1563,288.7563 L1097.1563,287.3969 C1097.1563,286.975 1097.1406,286.8344 1097.0156,286.6625 C1096.8438,286.4125 1096.5625,286.2563 1096.2344,286.2563 C1095.9219,286.2563 1095.7188,286.3656 1095.5,286.6313 C1094.3281,286.1313 1093.8906,286.0219 1092.9375,286.0219 C1090.2656,286.0219 1088.25,288.0375 1088.25,290.6625 L1088.25,291.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="1113.75" y="295.206">lima_orange</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1032" x2="1242" y1="306.6" y2="306.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1037" y="315.5"/>
-          <ellipse cx="1042" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177" x="1051" y="323.6059">get_bitterness() const : float</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="1037" y="332.2999"/>
-          <ellipse cx="1042" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="1051" y="340.4059">get_name() const : std::string</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1032" x2="1242" y1="348.1999" y2="348.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="314.2104">get_name() const : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
-      <g id="elem_C_0000802727760415733923">
-        <rect codeLine="39" fill="#F1F1F1" height="81.5999" id="C_0000802727760415733923" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="212" x="254" y="274.6"/>
-        <ellipse cx="303.25" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M298.25,291.7563 C298.25,294.2563 300.3906,296.0688 303.3125,296.0688 C304.5469,296.0688 305.7188,295.7719 306.4688,295.2563 C307.0781,294.8344 307.4063,294.4125 307.4063,294.0063 C307.4063,293.5375 306.9844,293.1313 306.4844,293.1313 C306.25,293.1313 306.0313,293.2094 305.8281,293.4125 C305.3906,293.85 305.3906,293.85 305.2188,293.9438 C304.7656,294.1781 304.125,294.3188 303.3594,294.3188 C301.3594,294.3188 300.0781,293.3031 300.0781,291.725 L300.0781,290.6781 C300.0781,288.975 301.2969,287.7719 303,287.7719 C303.5781,287.7719 304.1563,287.9125 304.625,288.1625 C305.0938,288.4281 305.2656,288.6156 305.3281,288.975 C305.4531,289.6469 305.7031,289.8969 306.2344,289.8969 C306.5156,289.8969 306.7969,289.7563 306.9844,289.5375 C307.1094,289.3656 307.1563,289.1938 307.1563,288.7563 L307.1563,287.3969 C307.1563,286.975 307.1406,286.8344 307.0156,286.6625 C306.8438,286.4125 306.5625,286.2563 306.2344,286.2563 C305.9219,286.2563 305.7188,286.3656 305.5,286.6313 C304.3281,286.1313 303.8906,286.0219 302.9375,286.0219 C300.2656,286.0219 298.25,288.0375 298.25,290.6625 L298.25,291.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="105" x="323.75" y="295.206">valencia_orange</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="255" x2="465" y1="306.6" y2="306.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="260" y="315.5"/>
-          <ellipse cx="265" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="177" x="274" y="323.6059">get_bitterness() const : float</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="260" y="332.2999"/>
-          <ellipse cx="265" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="186" x="274" y="340.4059">get_name() const : std::string</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="255" x2="465" y1="348.1999" y2="348.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="318.8047"/>
+      <ellipse cx="17" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <g id="elem_C_0002301786483822933456">
-        <rect codeLine="45" fill="#F1F1F1" height="81.5999" id="C_0002301786483822933456" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="247" x="501.5" y="274.6"/>
-        <ellipse cx="516.5" cy="290.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M511.5,291.7563 C511.5,294.2563 513.6406,296.0688 516.5625,296.0688 C517.7969,296.0688 518.9688,295.7719 519.7188,295.2563 C520.3281,294.8344 520.6563,294.4125 520.6563,294.0063 C520.6563,293.5375 520.2344,293.1313 519.7344,293.1313 C519.5,293.1313 519.2813,293.2094 519.0781,293.4125 C518.6406,293.85 518.6406,293.85 518.4688,293.9438 C518.0156,294.1781 517.375,294.3188 516.6094,294.3188 C514.6094,294.3188 513.3281,293.3031 513.3281,291.725 L513.3281,290.6781 C513.3281,288.975 514.5469,287.7719 516.25,287.7719 C516.8281,287.7719 517.4063,287.9125 517.875,288.1625 C518.3438,288.4281 518.5156,288.6156 518.5781,288.975 C518.7031,289.6469 518.9531,289.8969 519.4844,289.8969 C519.7656,289.8969 520.0469,289.7563 520.2344,289.5375 C520.3594,289.3656 520.4063,289.1938 520.4063,288.7563 L520.4063,287.3969 C520.4063,286.975 520.3906,286.8344 520.2656,286.6625 C520.0938,286.4125 519.8125,286.2563 519.4844,286.2563 C519.1719,286.2563 518.9688,286.3656 518.75,286.6313 C517.5781,286.1313 517.1406,286.0219 516.1875,286.0219 C513.5156,286.0219 511.5,288.0375 511.5,290.6625 L511.5,291.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="530.5" y="295.206">fruit_factory</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="138" x="613.5" y="271.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="136" x="614.5" y="285.8001">apple_c TA,orange_c TO</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="502.5" x2="747.5" y1="306.6" y2="306.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="507.5" y="315.5"/>
-          <ellipse cx="512.5" cy="320.5" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="161" x="521.5" y="323.6059">create_apple() const : TA</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="507.5" y="332.2999"/>
-          <ellipse cx="512.5" cy="337.2999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="521.5" y="340.4059">create_orange() const : TO</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="502.5" x2="747.5" y1="348.1999" y2="348.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="26" y="327.0151">get_sweetness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <g id="elem_C_0000551278102444647278">
-        <rect codeLine="51" fill="#F1F1F1" height="48" id="C_0000551278102444647278" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="268" x="357" y="165.6"/>
-        <ellipse cx="372" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M367,182.7563 C367,185.2563 369.1406,187.0688 372.0625,187.0688 C373.2969,187.0688 374.4688,186.7719 375.2188,186.2563 C375.8281,185.8344 376.1563,185.4125 376.1563,185.0063 C376.1563,184.5375 375.7344,184.1313 375.2344,184.1313 C375,184.1313 374.7813,184.2094 374.5781,184.4125 C374.1406,184.85 374.1406,184.85 373.9688,184.9438 C373.5156,185.1781 372.875,185.3188 372.1094,185.3188 C370.1094,185.3188 368.8281,184.3031 368.8281,182.725 L368.8281,181.6781 C368.8281,179.975 370.0469,178.7719 371.75,178.7719 C372.3281,178.7719 372.9063,178.9125 373.375,179.1625 C373.8438,179.4281 374.0156,179.6156 374.0781,179.975 C374.2031,180.6469 374.4531,180.8969 374.9844,180.8969 C375.2656,180.8969 375.5469,180.7563 375.7344,180.5375 C375.8594,180.3656 375.9063,180.1938 375.9063,179.7563 L375.9063,178.3969 C375.9063,177.975 375.8906,177.8344 375.7656,177.6625 C375.5938,177.4125 375.3125,177.2563 374.9844,177.2563 C374.6719,177.2563 374.4688,177.3656 374.25,177.6313 C373.0781,177.1313 372.6406,177.0219 371.6875,177.0219 C369.0156,177.0219 367,179.0375 367,181.6625 L367,182.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="386" y="186.206">fruit_factory</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="159" x="469" y="162.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="157" x="470" y="176.8001">gala_apple,valencia_orange</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="358" x2="624" y1="197.6" y2="197.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="358" x2="624" y1="205.6" y2="205.6"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="333.6094" y2="333.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="268"/>
+      <ellipse cx="812.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M815.7188,289.6406 Q815.1406,289.9375 814.5,290.0781 Q813.8594,290.2344 813.1563,290.2344 Q810.6563,290.2344 809.3281,288.5938 Q808.0156,286.9375 808.0156,283.8125 Q808.0156,280.6875 809.3281,279.0313 Q810.6563,277.375 813.1563,277.375 Q813.8594,277.375 814.5,277.5313 Q815.1563,277.6875 815.7188,277.9844 L815.7188,280.7031 Q815.0938,280.125 814.5,279.8594 Q813.9063,279.5781 813.2813,279.5781 Q811.9375,279.5781 811.25,280.6563 Q810.5625,281.7188 810.5625,283.8125 Q810.5625,285.9063 811.25,286.9844 Q811.9375,288.0469 813.2813,288.0469 Q813.9063,288.0469 814.5,287.7813 Q815.0938,287.5 815.7188,286.9219 L815.7188,289.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="833.25" y="288.1543">empire_apple</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <g id="elem_C_0000536390279563541226">
-        <rect codeLine="55" fill="#F1F1F1" height="48" id="C_0000536390279563541226" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="259" x="728.5" y="165.6"/>
-        <ellipse cx="743.5" cy="181.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M738.5,182.7563 C738.5,185.2563 740.6406,187.0688 743.5625,187.0688 C744.7969,187.0688 745.9688,186.7719 746.7188,186.2563 C747.3281,185.8344 747.6563,185.4125 747.6563,185.0063 C747.6563,184.5375 747.2344,184.1313 746.7344,184.1313 C746.5,184.1313 746.2813,184.2094 746.0781,184.4125 C745.6406,184.85 745.6406,184.85 745.4688,184.9438 C745.0156,185.1781 744.375,185.3188 743.6094,185.3188 C741.6094,185.3188 740.3281,184.3031 740.3281,182.725 L740.3281,181.6781 C740.3281,179.975 741.5469,178.7719 743.25,178.7719 C743.8281,178.7719 744.4063,178.9125 744.875,179.1625 C745.3438,179.4281 745.5156,179.6156 745.5781,179.975 C745.7031,180.6469 745.9531,180.8969 746.4844,180.8969 C746.7656,180.8969 747.0469,180.7563 747.2344,180.5375 C747.3594,180.3656 747.4063,180.1938 747.4063,179.7563 L747.4063,178.3969 C747.4063,177.975 747.3906,177.8344 747.2656,177.6625 C747.0938,177.4125 746.8125,177.2563 746.4844,177.2563 C746.1719,177.2563 745.9688,177.3656 745.75,177.6313 C744.5781,177.1313 744.1406,177.0219 743.1875,177.0219 C740.5156,177.0219 738.5,179.0375 738.5,181.6625 L738.5,182.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="757.5" y="186.206">fruit_factory</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="150" x="840.5" y="162.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="148" x="841.5" y="176.8001">empire_apple,lima_orange</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="729.5" x2="986.5" y1="197.6" y2="197.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="729.5" x2="986.5" y1="205.6" y2="205.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="306"/>
+      <ellipse cx="772" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001128300671453354325">
-        <rect codeLine="59" fill="#F1F1F1" height="81.5999" id="C_0001128300671453354325" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="188" x="550" y="7"/>
-        <ellipse cx="634.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M629.75,24.1563 C629.75,26.6563 631.8906,28.4688 634.8125,28.4688 C636.0469,28.4688 637.2188,28.1719 637.9688,27.6563 C638.5781,27.2344 638.9063,26.8125 638.9063,26.4063 C638.9063,25.9375 638.4844,25.5313 637.9844,25.5313 C637.75,25.5313 637.5313,25.6094 637.3281,25.8125 C636.8906,26.25 636.8906,26.25 636.7188,26.3438 C636.2656,26.5781 635.625,26.7188 634.8594,26.7188 C632.8594,26.7188 631.5781,25.7031 631.5781,24.125 L631.5781,23.0781 C631.5781,21.375 632.7969,20.1719 634.5,20.1719 C635.0781,20.1719 635.6563,20.3125 636.125,20.5625 C636.5938,20.8281 636.7656,21.0156 636.8281,21.375 C636.9531,22.0469 637.2031,22.2969 637.7344,22.2969 C638.0156,22.2969 638.2969,22.1563 638.4844,21.9375 C638.6094,21.7656 638.6563,21.5938 638.6563,21.1563 L638.6563,19.7969 C638.6563,19.375 638.6406,19.2344 638.5156,19.0625 C638.3438,18.8125 638.0625,18.6563 637.7344,18.6563 C637.4219,18.6563 637.2188,18.7656 637,19.0313 C635.8281,18.5313 635.3906,18.4219 634.4375,18.4219 C631.7656,18.4219 629.75,20.4375 629.75,23.0625 L629.75,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="655.25" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="551" x2="737" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="551" x2="737" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="556" y="55.9"/>
-          <ellipse cx="561" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="570" y="64.0059">factory_1 : fruit_factory_1</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="556" y="72.6999"/>
-          <ellipse cx="561" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="570" y="80.8059">factory_2 : fruit_factory_2</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="781" y="314.2104">get_name() const : std::string</text>
     </a>
-    <g id="link_C_0001932582371736186409_C_0001926201868069460340">
-      <path codeLine="64" d="M554.55,526.28 C565.02,549.61 575.3644,572.6455 586.3044,597.0355 " fill="none" id="C_0001932582371736186409-to-C_0001926201868069460340" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="588.76,602.51,588.7263,592.6612,586.7137,597.9479,581.427,595.9353,588.76,602.51" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="575" y="568.877">T</text>
-    </g>
-    <g id="link_C_0001483904441065806133_C_0001926201868069460340">
-      <path codeLine="65" d="M671.45,526.28 C660.98,549.61 650.6356,572.6455 639.6956,597.0355 " fill="none" id="C_0001483904441065806133-to-C_0001926201868069460340" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="637.24,602.51,644.573,595.9353,639.2863,597.9479,637.2737,592.6612,637.24,602.51" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="659" y="568.877">T</text>
-    </g>
-    <g id="link_C_0002301786483822933456_C_0001932582371736186409">
-      <path codeLine="66" d="M602.51,356.47 C589.51,379.63 576.0478,403.6085 562.5478,427.6485 " fill="none" id="C_0002301786483822933456-to-C_0001932582371736186409" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="559.61,432.88,567.5045,426.9912,562.0582,428.5204,560.5291,423.0741,559.61,432.88" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="586" y="399.277">TA</text>
-    </g>
-    <g id="link_C_0002301786483822933456_C_0001483904441065806133">
-      <path codeLine="67" d="M641.56,356.47 C651.13,379.63 660.9194,403.2945 670.8494,427.3345 " fill="none" id="C_0002301786483822933456-to-C_0001483904441065806133" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="673.14,432.88,673.4011,423.0346,671.2311,428.2587,666.007,426.0888,673.14,432.88" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="18" x="662" y="399.277">TO</text>
-    </g>
-    <g id="link_C_0000551278102444647278_C_0000399997161214328320">
-      <path codeLine="68" d="M419.46,214.03 C362.95,232.54 288.9419,256.7723 224.9819,277.7223 " fill="none" id="C_0000551278102444647278-to-C_0000399997161214328320" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="219.28,279.59,229.078,280.5898,224.0316,278.0336,226.5878,272.9872,219.28,279.59" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000551278102444647278_C_0000802727760415733923">
-      <path codeLine="69" d="M466.36,213.89 C448.42,230.84 428.0408,250.0989 406.9308,270.0489 " fill="none" id="C_0000551278102444647278-to-C_0000802727760415733923" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="402.57,274.17,411.8586,270.8955,406.204,270.7357,406.3637,265.0811,402.57,274.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000551278102444647278_C_0002301786483822933456">
-      <path codeLine="70" d="M516.2,213.89 C534.55,230.84 546.6399,242.0041 568.2299,261.9541 " fill="none" id="C_0000551278102444647278-to-C_0002301786483822933456" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="581.45,274.17,572.3018,257.5474,564.1579,266.3608,581.45,274.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000536390279563541226_C_0000660406972347773654">
-      <path codeLine="71" d="M864.02,213.89 C868.4,230.84 872.9376,248.4112 878.0976,268.3612 " fill="none" id="C_0000536390279563541226-to-C_0000660406972347773654" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="879.6,274.17,881.2189,264.4551,878.348,269.3293,873.4738,266.4584,879.6,274.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000536390279563541226_C_0001649295452510454080">
-      <path codeLine="72" d="M910.81,214.03 C948.96,230.96 995.9555,251.8168 1040.7655,271.6968 " fill="none" id="C_0000536390279563541226-to-C_0001649295452510454080" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1046.25,274.13,1039.6454,266.8239,1041.6796,272.1023,1036.4011,274.1365,1046.25,274.13" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000536390279563541226_C_0002301786483822933456">
-      <path codeLine="73" d="M813.9,214.03 C781.97,231 753.9263,245.9056 716.4463,265.8156 " fill="none" id="C_0000536390279563541226-to-C_0002301786483822933456" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="700.55,274.26,719.2611,271.1144,713.6315,260.5169,700.55,274.26" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001128300671453354325_C_0000551278102444647278">
-      <path codeLine="74" d="M591.3014,96.9547 C564.2814,121.6447 539.42,144.35 516.67,165.15 " fill="none" id="C_0001128300671453354325-backto-C_0000551278102444647278" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="600.16,88.86,593.0324,89.9545,591.3014,96.9547,598.4289,95.8602,600.16,88.86" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="574" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="581" y="131.677">factory_1</text>
-    </g>
-    <g id="link_C_0001128300671453354325_C_0000536390279563541226">
-      <path codeLine="75" d="M715.6564,95.6128 C753.4364,120.2928 790.45,144.47 822.19,165.21 " fill="none" id="C_0001128300671453354325-backto-C_0000536390279563541226" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="705.61,89.05,708.4456,95.6802,715.6564,95.6128,712.8208,88.9826,705.61,89.05" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="782" cy="127.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="789" y="131.677">factory_2</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="318.8047"/>
+      <ellipse cx="772" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="781" y="327.0151">get_sweetness() const : float</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="333.6094" y2="333.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="268"/>
+      <ellipse cx="1047.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1050.7188,289.6406 Q1050.1406,289.9375 1049.5,290.0781 Q1048.8594,290.2344 1048.1563,290.2344 Q1045.6563,290.2344 1044.3281,288.5938 Q1043.0156,286.9375 1043.0156,283.8125 Q1043.0156,280.6875 1044.3281,279.0313 Q1045.6563,277.375 1048.1563,277.375 Q1048.8594,277.375 1049.5,277.5313 Q1050.1563,277.6875 1050.7188,277.9844 L1050.7188,280.7031 Q1050.0938,280.125 1049.5,279.8594 Q1048.9063,279.5781 1048.2813,279.5781 Q1046.9375,279.5781 1046.25,280.6563 Q1045.5625,281.7188 1045.5625,283.8125 Q1045.5625,285.9063 1046.25,286.9844 Q1046.9375,288.0469 1048.2813,288.0469 Q1048.9063,288.0469 1049.5,287.7813 Q1050.0938,287.5 1050.7188,286.9219 L1050.7188,289.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="1068.25" y="288.1543">lima_orange</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="300" y2="300"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="306"/>
+      <ellipse cx="1003" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="1012" y="314.2104">get_bitterness() const : float</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="318.8047"/>
+      <ellipse cx="1003" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="1012" y="327.0151">get_name() const : std::string</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="333.6094" y2="333.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="268"/>
+      <ellipse cx="279.9" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M282.8688,289.6406 Q282.2906,289.9375 281.65,290.0781 Q281.0094,290.2344 280.3063,290.2344 Q277.8063,290.2344 276.4781,288.5938 Q275.1656,286.9375 275.1656,283.8125 Q275.1656,280.6875 276.4781,279.0313 Q277.8063,277.375 280.3063,277.375 Q281.0094,277.375 281.65,277.5313 Q282.3063,277.6875 282.8688,277.9844 L282.8688,280.7031 Q282.2438,280.125 281.65,279.8594 Q281.0563,279.5781 280.4313,279.5781 Q279.0875,279.5781 278.4,280.6563 Q277.7125,281.7188 277.7125,283.8125 Q277.7125,285.9063 278.4,286.9844 Q279.0875,288.0469 280.4313,288.0469 Q281.0563,288.0469 281.65,287.7813 Q282.2438,287.5 282.8688,286.9219 L282.8688,289.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="102" x="300.1" y="288.1543">valencia_orange</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="300" y2="300"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="306"/>
+      <ellipse cx="248" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="257" y="314.2104">get_bitterness() const : float</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="318.8047"/>
+      <ellipse cx="248" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="257" y="327.0151">get_name() const : std::string</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="333.6094" y2="333.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="268"/>
+      <ellipse cx="483" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M485.9688,289.6406 Q485.3906,289.9375 484.75,290.0781 Q484.1094,290.2344 483.4063,290.2344 Q480.9063,290.2344 479.5781,288.5938 Q478.2656,286.9375 478.2656,283.8125 Q478.2656,280.6875 479.5781,279.0313 Q480.9063,277.375 483.4063,277.375 Q484.1094,277.375 484.75,277.5313 Q485.4063,277.6875 485.9688,277.9844 L485.9688,280.7031 Q485.3438,280.125 484.75,279.8594 Q484.1563,279.5781 483.5313,279.5781 Q482.1875,279.5781 481.5,280.6563 Q480.8125,281.7188 480.8125,283.8125 Q480.8125,285.9063 481.5,286.9844 Q482.1875,288.0469 483.5313,288.0469 Q484.1563,288.0469 484.75,287.7813 Q485.3438,287.5 485.9688,286.9219 L485.9688,289.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="497" y="288.1543">fruit_factory</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="150" x="579" y="265"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="580" y="277.1387">apple_c TA,orange_c TO</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="300" y2="300"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="306"/>
+      <ellipse cx="479" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="488" y="314.2104">create_apple() const : TA</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="318.8047"/>
+      <ellipse cx="479" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="488" y="327.0151">create_orange() const : TO</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="333.6094" y2="333.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="257" y="159"/>
+      <ellipse cx="272" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M274.9688,180.6406 Q274.3906,180.9375 273.75,181.0781 Q273.1094,181.2344 272.4063,181.2344 Q269.9063,181.2344 268.5781,179.5938 Q267.2656,177.9375 267.2656,174.8125 Q267.2656,171.6875 268.5781,170.0313 Q269.9063,168.375 272.4063,168.375 Q273.1094,168.375 273.75,168.5313 Q274.4063,168.6875 274.9688,168.9844 L274.9688,171.7031 Q274.3438,171.125 273.75,170.8594 Q273.1563,170.5781 272.5313,170.5781 Q271.1875,170.5781 270.5,171.6563 Q269.8125,172.7188 269.8125,174.8125 Q269.8125,176.9063 270.5,177.9844 Q271.1875,179.0469 272.5313,179.0469 Q273.1563,179.0469 273.75,178.7813 Q274.3438,178.5 274.9688,177.9219 L274.9688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="286" y="179.1543">fruit_factory</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="176" x="368" y="156"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="174" x="369" y="168.1387">gala_apple,valencia_orange</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="191" y2="191"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="199" y2="199"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="673" y="159"/>
+      <ellipse cx="688" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M690.9688,180.6406 Q690.3906,180.9375 689.75,181.0781 Q689.1094,181.2344 688.4063,181.2344 Q685.9063,181.2344 684.5781,179.5938 Q683.2656,177.9375 683.2656,174.8125 Q683.2656,171.6875 684.5781,170.0313 Q685.9063,168.375 688.4063,168.375 Q689.1094,168.375 689.75,168.5313 Q690.4063,168.6875 690.9688,168.9844 L690.9688,171.7031 Q690.3438,171.125 689.75,170.8594 Q689.1563,170.5781 688.5313,170.5781 Q687.1875,170.5781 686.5,171.6563 Q685.8125,172.7188 685.8125,174.8125 Q685.8125,176.9063 686.5,177.9844 Q687.1875,179.0469 688.5313,179.0469 Q689.1563,179.0469 689.75,178.7813 Q690.3438,178.5 690.9688,177.9219 L690.9688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="702" y="179.1543">fruit_factory</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="166" x="784" y="156"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="164" x="785" y="168.1387">empire_apple,lima_orange</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="191" y2="191"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="199" y2="199"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="469.5" y="8"/>
+      <ellipse cx="546.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M549.7188,29.6406 Q549.1406,29.9375 548.5,30.0781 Q547.8594,30.2344 547.1563,30.2344 Q544.6563,30.2344 543.3281,28.5938 Q542.0156,26.9375 542.0156,23.8125 Q542.0156,20.6875 543.3281,19.0313 Q544.6563,17.375 547.1563,17.375 Q547.8594,17.375 548.5,17.5313 Q549.1563,17.6875 549.7188,17.9844 L549.7188,20.7031 Q549.0938,20.125 548.5,19.8594 Q547.9063,19.5781 547.2813,19.5781 Q545.9375,19.5781 545.25,20.6563 Q544.5625,21.7188 544.5625,23.8125 Q544.5625,25.9063 545.25,26.9844 Q545.9375,28.0469 547.2813,28.0469 Q547.9063,28.0469 548.5,27.7813 Q549.0938,27.5 549.7188,26.9219 L549.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="567.25" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="54"/>
+      <ellipse cx="480.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="62.2104">factory_1 : fruit_factory_1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="66.8047"/>
+      <ellipse cx="480.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="75.0151">factory_2 : fruit_factory_2</text>
+    </a>
+    <path d="M530.86,499.39 C540.67,521.03 552.94,548.09 563.42,571.19 " fill="none" id="C_0001932582371736186409-&gt;C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="565.49,575.76,565.4072,565.9115,563.421,571.2082,558.1243,569.2219,565.49,575.76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="553" y="542.0669">T</text>
+    <path d="M641.9,499.39 C631.95,521.03 619.51,548.09 608.89,571.19 " fill="none" id="C_0001483904441065806133-&gt;C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="606.79,575.76,614.1972,569.269,608.888,571.2215,606.9356,565.9122,606.79,575.76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="629" y="542.0669">T</text>
+    <path d="M577.09,342.02 C565.13,363.67 549.83,391.36 537.17,414.26 " fill="none" id="C_0002301786483822933456-&gt;C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="534.68,418.77,542.5326,412.8255,537.0973,414.3932,535.5296,408.9579,534.68,418.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="562" y="385.0669">TA</text>
+    <path d="M611.93,342.02 C620.86,363.58 632.28,391.13 641.75,413.97 " fill="none" id="C_0002301786483822933456-&gt;C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="643.74,418.77,643.9859,408.9242,641.824,414.1517,636.5966,411.9898,643.74,418.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="632" y="385.0669">TO</text>
+    <path d="M342.12,207.14 C301.17,223.8 245,246.64 197.5,265.97 " fill="none" id="C_0000551278102444647278-&gt;C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="192.63,267.95,202.474,268.2587,197.2605,266.0635,199.4556,260.85,192.63,267.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M386.66,207.14 C378.22,222.96 366.81,244.36 356.85,263.03 " fill="none" id="C_0000551278102444647278-&gt;C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="354.35,267.71,362.1025,261.6355,356.694,263.2935,355.0361,257.8851,354.35,267.71" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M437.18,207.14 C460.72,221.41 491.76,240.22 520.22,257.46 " fill="none" id="C_0000551278102444647278-&gt;C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="524.03,251.59,537.51,267.95,516.78,263.57,524.03,251.59" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M819.45,207.14 C825.91,222.96 834.65,244.36 842.27,263.03 " fill="none" id="C_0000536390279563541226-&gt;C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="844.18,267.71,844.4887,257.866,842.2935,263.0795,837.08,260.8844,844.18,267.71" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M863.99,207.14 C902.86,223.8 956.17,246.64 1001.26,265.97 " fill="none" id="C_0000536390279563541226-&gt;C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1005.87,267.95,999.1815,260.7206,1001.2765,265.9752,996.0219,268.0702,1005.87,267.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M768.93,207.14 C743.36,221.54 709.58,240.57 678.74,257.95 " fill="none" id="C_0000536390279563541226-&gt;C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="681.86,264.23,661,267.95,674.99,252.03,681.86,264.23" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M503.53,90.87 C477.57,113.51 447.15,140.02 425.84,158.6 " fill="none" id="C_0001128300671453354325&lt;-C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="513.6,82.09,506.4488,83.0174,504.5544,89.9752,511.7056,89.0478,513.6,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="483" 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="59" x="490" y="125.0669">factory_1</text>
+    <path d="M634.41,88.35 C678,111.6 730.37,139.53 766.51,158.8 " fill="none" id="C_0001128300671453354325&lt;-C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="622.67,82.09,626.0834,88.4421,633.2597,87.7343,629.8463,81.3823,622.67,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="712" 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="59" x="719" y="125.0669">factory_2</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00059_class_mermaid.svg b/docs/test_cases/t00059_class_mermaid.svg
index 2579a153..2efef3a2 100644
--- a/docs/test_cases/t00059_class_mermaid.svg
+++ b/docs/test_cases/t00059_class_mermaid.svg
@@ -1,75 +1,70 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1526.484375 797" style="max-width: 1526.48px; background-color: white;" width="1526.484375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1490.921875 797" style="max-width: 1490.92px; background-color: white;" width="1490.921875" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M962.8046875,576L962.8046875,581.6666666666666C962.8046875,587.3333333333334,962.8046875,598.6666666666666,968.9921251056027,610.9384350905436C975.1795627112054,623.2102035144206,987.5544379224107,636.4204070288412,993.7418755280133,643.0255087860515L999.929313133616,649.6306105432618"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1162.3359375,576L1162.3359375,581.6666666666666C1162.3359375,587.3333333333334,1162.3359375,598.6666666666666,1156.1484998943972,610.9384350905436C1149.9610622887947,623.2102035144206,1137.5861870775893,636.4204070288412,1131.3987494719865,643.0255087860515L1125.211311866384,649.6306105432618"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M1002.9470691568048,385L996.256672214004,390.6666666666667C989.5662752712033,396.3333333333333,976.1854813856016,407.6666666666667,969.4950844428008,418C962.8046875,428.3333333333333,962.8046875,437.6666666666667,962.8046875,442.3333333333333L962.8046875,447"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1122.1935558431953,385L1128.8839527859961,390.6666666666667C1135.574349728797,396.3333333333333,1148.9551436143984,407.6666666666667,1155.6455405571992,418C1162.3359375,428.3333333333333,1162.3359375,437.6666666666667,1162.3359375,442.3333333333333L1162.3359375,447"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M272.5370181074766,234L249.22485883956384,238.16666666666666C225.91269957165107,242.33333333333334,179.28838103582552,250.66666666666666,155.97622176791276,258C132.6640625,265.3333333333333,132.6640625,271.6666666666667,132.6640625,274.8333333333333L132.6640625,278"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M431.9921875,234L431.9921875,238.16666666666666C431.9921875,242.33333333333334,431.9921875,250.66666666666666,431.9921875,258C431.9921875,265.3333333333333,431.9921875,271.6666666666667,431.9921875,274.8333333333333L431.9921875,278"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M601.7890625,226.7021625761278L644.8984375,232.0851354801065C688.0078125,237.46810838408518,774.2265625,248.23405419204258,825.6803965562013,256.73394315659374C877.1342306124026,265.2338321211448,893.8231487248053,271.4676642422897,902.1676077810066,274.5845803028621L910.512066837208,277.7014963634345"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M985.3920122663551,234L967.9008956386292,238.16666666666666C950.4097790109034,242.33333333333334,915.4275457554517,250.66666666666666,890.5987450333131,258.5483049955507C865.7699443111745,266.42994332443476,851.0945761223489,273.85988664886946,843.7568920279363,277.5748583110868L836.4192079335234,281.28982997330417"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1151.1980870327102,234L1157.9476246105917,238.16666666666666C1164.6971621884734,242.33333333333334,1178.1962373442368,250.66666666666666,1196.9191504160176,259.3057630168925C1215.6420634877986,267.94485936711834,1239.5888144755975,276.88971873423674,1251.5621899694968,281.3621484177959L1263.535565463396,285.8345781013551"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1170.642012266355,234L1180.2342289719625,238.16666666666666C1189.82644567757,242.33333333333334,1209.010879088785,250.66666666666666,1212.192400558493,257.7556427087924C1215.3739220282012,264.8446187509181,1202.5525315564025,270.6892375018362,1196.141836320503,273.6115468772952L1189.7311410846037,276.5338562527543"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M505.20291061118263,110.80061885285656L493.0011234259855,116.16718237738047C480.7993362407885,121.53374590190437,456.3957618703942,132.2668729509522,444.19397468519713,143.30010314214277C431.9921875,154.33333333333334,431.9921875,165.66666666666666,431.9921875,171.33333333333334L431.9921875,177"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M744.28310326173,79.61400076155226L804.4077943847751,90.17833396796021C864.5324855078201,100.74266717436818,984.78186775391,121.87133358718408,1044.9065588769552,138.1023334602587C1105.03125,154.33333333333334,1105.03125,165.66666666666666,1105.03125,171.33333333333334L1105.03125,177"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M936.1328125,576L936.1328125,581.6666666666666C936.1328125,587.3333333333334,936.1328125,598.6666666666666,943.00390625,611.6682393630905C949.875,624.6698120595145,963.6171875,639.3396241190289,970.48828125,646.6745301487862L977.359375,654.0094361785434"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1135.6640625,576L1135.6640625,581.6666666666666C1135.6640625,587.3333333333334,1135.6640625,598.6666666666666,1128.79296875,611.6682393630905C1121.921875,624.6698120595145,1108.1796875,639.3396241190289,1101.30859375,646.6745301487862L1094.4375,654.0094361785434"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M976.2751941568048,385L969.584797214004,390.6666666666667C962.8944002712033,396.3333333333333,949.5136063856016,407.6666666666667,942.8232094428008,419C936.1328125,430.3333333333333,936.1328125,441.6666666666667,936.1328125,447.3333333333333L936.1328125,453"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1095.5216808431953,385L1102.2120777859961,390.6666666666667C1108.902474728797,396.3333333333333,1122.2832686143984,407.6666666666667,1128.9736655571992,419C1135.6640625,430.3333333333333,1135.6640625,441.6666666666667,1135.6640625,447.3333333333333L1135.6640625,453"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M263.9372079439253,234L241.31746495327107,238.16666666666666C218.69772196261684,242.33333333333334,173.45823598130843,250.66666666666666,150.8384929906542,259C128.21875,267.3333333333333,128.21875,275.6666666666667,128.21875,279.8333333333333L128.21875,284"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M418.65625,234L418.65625,238.16666666666666C418.65625,242.33333333333334,418.65625,250.66666666666666,418.65625,259C418.65625,267.3333333333333,418.65625,275.6666666666667,418.65625,279.8333333333333L418.65625,284"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M588.453125,227.38329726169192L629.33984375,232.6527477180766C670.2265625,237.9221981744613,752,248.46109908723065,804.0415200745033,257.897216210282C856.0830401490066,267.3333333333333,878.3926427980132,275.6666666666667,889.5474441225165,279.8333333333333L900.7022454470199,284"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M960.7973860981308,234L942.9600613317757,238.16666666666666C925.1227365654205,242.33333333333334,889.4480870327103,250.66666666666666,863.6262320511233,259C837.8043770695364,267.3333333333333,821.8353166390729,275.6666666666667,813.850786423841,279.8333333333333L805.8662562086092,284"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1124.2353971962616,234L1130.2925184968847,238.16666666666666C1136.3496397975077,242.33333333333334,1148.4638823987539,250.66666666666666,1168.1720453660437,259.9324237270666C1187.8802083333333,269.1981807874665,1215.1822916666667,279.396361574933,1228.8333333333333,284.49545196866626L1242.484375,289.5945423623995"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1144.8633542640187,234L1153.9362587616822,238.16666666666666C1163.0091632593458,242.33333333333334,1181.1549722546729,250.66666666666666,1181.2100873621598,259C1181.265202469647,267.3333333333333,1163.2296236892937,275.6666666666667,1154.211834299117,279.8333333333333L1145.1940449089404,284"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M508.34375,103.55383864671438L493.3958333333333,110.12819887226199C478.4479166666667,116.70255909780958,448.5520833333333,129.85127954890478,433.6041666666667,142.09230644111906C418.65625,154.33333333333334,418.65625,165.66666666666666,418.65625,171.33333333333334L418.65625,177"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M713.21875,76.83800625631011L774.81640625,87.86500521359176C836.4140625,98.8920041708734,959.609375,120.9460020854367,1021.20703125,137.639667709385C1082.8046875,154.33333333333334,1082.8046875,165.66666666666666,1082.8046875,171.33333333333334L1082.8046875,177"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(962.8046875, 610)" class="edgeLabel">
+        <g transform="translate(936.1328125, 610)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -80,7 +75,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1162.3359375, 610)" class="edgeLabel">
+        <g transform="translate(1135.6640625, 610)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -91,7 +86,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(962.8046875, 419)" class="edgeLabel">
+        <g transform="translate(936.1328125, 419)" class="edgeLabel">
           <g transform="translate(-9.6328125, -9)" class="label">
             <foreignObject height="18" width="19.265625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -102,7 +97,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1162.3359375, 419)" class="edgeLabel">
+        <g transform="translate(1135.6640625, 419)" class="edgeLabel">
           <g transform="translate(-10.96875, -9)" class="label">
             <foreignObject height="18" width="21.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -179,7 +174,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(431.9921875, 143)" class="edgeLabel">
+        <g transform="translate(418.65625, 143)" class="edgeLabel">
           <g transform="translate(-37.578125, -9)" class="label">
             <foreignObject height="18" width="75.15625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -190,7 +185,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1105.03125, 143)" class="edgeLabel">
+        <g transform="translate(1082.8046875, 143)" class="edgeLabel">
           <g transform="translate(-37.578125, -9)" class="label">
             <foreignObject height="18" width="75.15625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -203,7 +198,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1062.5703125, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L7">
+        <a transform="translate(1035.8984375, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L7">
           <g title="fruit_c" id="classId-C_0001926201868069460340-0" class="node default clickable">
             <rect height="145" width="117.078125" y="-72.5" x="-58.5390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.5390625" x1="-58.5390625" class="divider"/>
@@ -229,15 +224,15 @@
                   <span class="nodeLabel">"t.get_name()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -51.0390625, 47)" height="18" width="53.734375">
+              <foreignObject transform="translate( -51.0390625, 47)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T t) : "</span>
+                  <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(962.8046875, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L13">
+        <a transform="translate(936.1328125, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L13">
           <g title="apple_c" id="classId-C_0001932582371736186409-1" class="node default clickable">
             <rect height="123" width="152.640625" y="-61.5" x="-76.3203125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.3203125" x1="-76.3203125" class="divider"/>
@@ -258,15 +253,15 @@
                   <span class="nodeLabel">"t.get_sweetness()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -68.8203125, 36)" height="18" width="53.734375">
+              <foreignObject transform="translate( -68.8203125, 36)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T t) : "</span>
+                  <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1162.3359375, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L16">
+        <a transform="translate(1135.6640625, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L16">
           <g title="orange_c" id="classId-C_0001483904441065806133-2" class="node default clickable">
             <rect height="123" width="146.421875" y="-61.5" x="-73.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="73.2109375" x1="-73.2109375" class="divider"/>
@@ -287,19 +282,19 @@
                   <span class="nodeLabel">"t.get_bitterness()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.7109375, 36)" height="18" width="53.734375">
+              <foreignObject transform="translate( -65.7109375, 36)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T t) : "</span>
+                  <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(132.6640625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L18">
+        <a transform="translate(128.21875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L18">
           <g title="gala_apple" id="classId-C_0000399997161214328320-3" class="node default clickable">
-            <rect height="101" width="249.328125" y="-50.5" x="-124.6640625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
+            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -311,24 +306,24 @@
                   <span class="nodeLabel">gala_apple</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -117.1640625, 3)" height="18" width="234.328125">
+              <foreignObject transform="translate( -112.71875, 3)" height="18" width="225.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : : [const] std::string</span>
+                  <span class="nodeLabel">+get_name() : [const] std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -117.1640625, 25)" height="18" width="230.78125">
+              <foreignObject transform="translate( -112.71875, 25)" height="18" width="221.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_sweetness() : : [const] float</span>
+                  <span class="nodeLabel">+get_sweetness() : [const] float</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(731.3203125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L24">
+        <a transform="translate(709.09375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L24">
           <g title="empire_apple" id="classId-C_0000660406972347773654-4" class="node default clickable">
-            <rect height="101" width="249.328125" y="-50.5" x="-124.6640625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
+            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -340,24 +335,24 @@
                   <span class="nodeLabel">empire_apple</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -117.1640625, 3)" height="18" width="234.328125">
+              <foreignObject transform="translate( -112.71875, 3)" height="18" width="225.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : : [const] std::string</span>
+                  <span class="nodeLabel">+get_name() : [const] std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -117.1640625, 25)" height="18" width="230.78125">
+              <foreignObject transform="translate( -112.71875, 25)" height="18" width="221.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_sweetness() : : [const] float</span>
+                  <span class="nodeLabel">+get_sweetness() : [const] float</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1393.8203125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L30">
+        <a transform="translate(1362.703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L30">
           <g title="lima_orange" id="classId-C_0001649295452510454080-5" class="node default clickable">
-            <rect height="101" width="249.328125" y="-50.5" x="-124.6640625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
+            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -369,24 +364,24 @@
                   <span class="nodeLabel">lima_orange</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -117.1640625, 3)" height="18" width="224.5625">
+              <foreignObject transform="translate( -112.71875, 3)" height="18" width="215.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_bitterness() : : [const] float</span>
+                  <span class="nodeLabel">+get_bitterness() : [const] float</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -117.1640625, 25)" height="18" width="234.328125">
+              <foreignObject transform="translate( -112.71875, 25)" height="18" width="225.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : : [const] std::string</span>
+                  <span class="nodeLabel">+get_name() : [const] std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(431.9921875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L36">
+        <a transform="translate(418.65625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L36">
           <g title="valencia_orange" id="classId-C_0000802727760415733923-6" class="node default clickable">
-            <rect height="101" width="249.328125" y="-50.5" x="-124.6640625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="124.6640625" x1="-124.6640625" class="divider"/>
+            <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="120.21875" x1="-120.21875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -398,20 +393,20 @@
                   <span class="nodeLabel">valencia_orange</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -117.1640625, 3)" height="18" width="224.5625">
+              <foreignObject transform="translate( -112.71875, 3)" height="18" width="215.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_bitterness() : : [const] float</span>
+                  <span class="nodeLabel">+get_bitterness() : [const] float</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -117.1640625, 25)" height="18" width="234.328125">
+              <foreignObject transform="translate( -112.71875, 25)" height="18" width="225.4375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_name() : : [const] std::string</span>
+                  <span class="nodeLabel">+get_name() : [const] std::string</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1062.5703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1035.8984375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0002301786483822933456-7" class="node default clickable">
             <rect height="101" width="313.171875" y="-50.5" x="-156.5859375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="156.5859375" x1="-156.5859375" class="divider"/>
@@ -427,20 +422,20 @@
                   <span class="nodeLabel">fruit_factory&lt;apple_c TA,orange_c TO&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -149.0859375, 3)" height="18" width="205.296875">
+              <foreignObject transform="translate( -149.0859375, 3)" height="18" width="196.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+create_apple() : : [const] TA</span>
+                  <span class="nodeLabel">+create_apple() : [const] TA</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -149.0859375, 25)" height="18" width="218.640625">
+              <foreignObject transform="translate( -149.0859375, 25)" height="18" width="209.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+create_orange() : : [const] TO</span>
+                  <span class="nodeLabel">+create_orange() : [const] TO</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(431.9921875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42">
+        <a transform="translate(418.65625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000551278102444647278-8" class="node default clickable">
             <rect height="57" width="339.59375" y="-28.5" x="-169.796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="169.796875" x1="-169.796875" class="divider"/>
@@ -459,7 +454,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1105.03125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1082.8046875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000536390279563541226-9" class="node default clickable">
             <rect height="57" width="328.90625" y="-28.5" x="-164.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="164.453125" x1="-164.453125" class="divider"/>
@@ -478,7 +473,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(624.1171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00059/t00059.cc#L51">
+        <a transform="translate(610.78125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L51">
           <g title="R" id="classId-C_0001128300671453354325-10" class="node default clickable">
             <rect height="101" width="204.875" y="-50.5" x="-102.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="102.4375" x1="-102.4375" class="divider"/>
diff --git a/docs/test_cases/t00060.md b/docs/test_cases/t00060.md
index a0fede27..bf33de7d 100644
--- a/docs/test_cases/t00060.md
+++ b/docs/test_cases/t00060.md
@@ -49,7 +49,7 @@ template <typename T, typename P> struct H : public G<T> {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00060::A",
+      "display_name": "A",
       "id": "1373615549846303472",
       "is_abstract": false,
       "is_nested": false,
@@ -78,7 +78,7 @@ template <typename T, typename P> struct H : public G<T> {
           "name": "clanguml::t00060::A"
         }
       ],
-      "display_name": "clanguml::t00060::B",
+      "display_name": "B",
       "id": "479650368930934571",
       "is_abstract": false,
       "is_nested": false,
@@ -107,7 +107,7 @@ template <typename T, typename P> struct H : public G<T> {
           "name": "clanguml::t00060::A"
         }
       ],
-      "display_name": "clanguml::t00060::C",
+      "display_name": "C",
       "id": "1827660844127264787",
       "is_abstract": false,
       "is_nested": false,
@@ -142,7 +142,7 @@ template <typename T, typename P> struct H : public G<T> {
           "name": "clanguml::t00060::C"
         }
       ],
-      "display_name": "clanguml::t00060::D",
+      "display_name": "D",
       "id": "1629687372290281981",
       "is_abstract": false,
       "is_nested": false,
@@ -164,7 +164,7 @@ template <typename T, typename P> struct H : public G<T> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00060::G<T>",
+      "display_name": "G<T>",
       "id": "1877304825033069517",
       "is_abstract": false,
       "is_nested": false,
@@ -213,7 +213,7 @@ template <typename T, typename P> struct H : public G<T> {
           "name": "G<T>"
         }
       ],
-      "display_name": "clanguml::t00060::H<T,P>",
+      "display_name": "H<T,P>",
       "id": "1881610349123495638",
       "is_abstract": false,
       "is_nested": false,
@@ -273,6 +273,7 @@ template <typename T, typename P> struct H : public G<T> {
     }
   ],
   "name": "t00060_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg
index a0faba10..15110b0d 100644
--- a/docs/test_cases/t00060_class.svg
+++ b/docs/test_cases/t00060_class.svg
@@ -1,117 +1,99 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="349px" preserveAspectRatio="none" style="width:257px;height:349px;background:#FFFFFF;" version="1.1" viewBox="0 0 257 349" width="257px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="340px" preserveAspectRatio="none" style="width:254px;height:340px;" version="1.1" viewBox="0 0 254 340" width="254px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1xr7hibwi5565" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001373615549846303472">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001373615549846303472" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="43" y="18.4"/>
-        <ellipse cx="58" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M53,35.5562 C53,38.0562 55.1406,39.8687 58.0625,39.8687 C59.2969,39.8687 60.4688,39.5719 61.2188,39.0562 C61.8281,38.6344 62.1563,38.2125 62.1563,37.8062 C62.1563,37.3375 61.7344,36.9312 61.2344,36.9312 C61,36.9312 60.7813,37.0094 60.5781,37.2125 C60.1406,37.65 60.1406,37.65 59.9688,37.7437 C59.5156,37.9781 58.875,38.1187 58.1094,38.1187 C56.1094,38.1187 54.8281,37.1031 54.8281,35.525 L54.8281,34.4781 C54.8281,32.775 56.0469,31.5719 57.75,31.5719 C58.3281,31.5719 58.9063,31.7125 59.375,31.9625 C59.8438,32.2281 60.0156,32.4156 60.0781,32.775 C60.2031,33.4469 60.4531,33.6969 60.9844,33.6969 C61.2656,33.6969 61.5469,33.5562 61.7344,33.3375 C61.8594,33.1656 61.9063,32.9937 61.9063,32.5562 L61.9063,31.1969 C61.9063,30.775 61.8906,30.6344 61.7656,30.4625 C61.5938,30.2125 61.3125,30.0562 60.9844,30.0562 C60.6719,30.0562 60.4688,30.1656 60.25,30.4312 C59.0781,29.9312 58.6406,29.8219 57.6875,29.8219 C55.0156,29.8219 53,31.8375 53,34.4625 L53,35.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="72" y="39.006">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="44" x2="83" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="44" x2="83" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="48" id="C_0001373615549846303472" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="61" y="14.5"/>
+      <ellipse cx="76" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M78.9688,36.1406 Q78.3906,36.4375 77.75,36.5781 Q77.1094,36.7344 76.4063,36.7344 Q73.9063,36.7344 72.5781,35.0938 Q71.2656,33.4375 71.2656,30.3125 Q71.2656,27.1875 72.5781,25.5313 Q73.9063,23.875 76.4063,23.875 Q77.1094,23.875 77.75,24.0313 Q78.4063,24.1875 78.9688,24.4844 L78.9688,27.2031 Q78.3438,26.625 77.75,26.3594 Q77.1563,26.0781 76.5313,26.0781 Q75.1875,26.0781 74.5,27.1563 Q73.8125,28.2188 73.8125,30.3125 Q73.8125,32.4063 74.5,33.4844 Q75.1875,34.5469 76.5313,34.5469 Q77.1563,34.5469 77.75,34.2813 Q78.3438,34 78.9688,33.4219 L78.9688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="90" y="34.6543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000479650368930934571">
-        <rect codeLine="6" fill="#F1F1F1" height="48" id="C_0000479650368930934571" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="168.6"/>
-        <ellipse cx="22" cy="184.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,185.7562 C17,188.2562 19.1406,190.0687 22.0625,190.0687 C23.2969,190.0687 24.4688,189.7719 25.2188,189.2562 C25.8281,188.8344 26.1563,188.4125 26.1563,188.0062 C26.1563,187.5375 25.7344,187.1312 25.2344,187.1312 C25,187.1312 24.7813,187.2094 24.5781,187.4125 C24.1406,187.85 24.1406,187.85 23.9688,187.9437 C23.5156,188.1781 22.875,188.3187 22.1094,188.3187 C20.1094,188.3187 18.8281,187.3031 18.8281,185.725 L18.8281,184.6781 C18.8281,182.975 20.0469,181.7719 21.75,181.7719 C22.3281,181.7719 22.9063,181.9125 23.375,182.1625 C23.8438,182.4281 24.0156,182.6156 24.0781,182.975 C24.2031,183.6469 24.4531,183.8969 24.9844,183.8969 C25.2656,183.8969 25.5469,183.7562 25.7344,183.5375 C25.8594,183.3656 25.9063,183.1937 25.9063,182.7562 L25.9063,181.3969 C25.9063,180.975 25.8906,180.8344 25.7656,180.6625 C25.5938,180.4125 25.3125,180.2562 24.9844,180.2562 C24.6719,180.2562 24.4688,180.3656 24.25,180.6312 C23.0781,180.1312 22.6406,180.0219 21.6875,180.0219 C19.0156,180.0219 17,182.0375 17,184.6625 L17,185.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="189.206">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="200.6" y2="200.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="208.6" y2="208.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="48" id="C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="159"/>
+      <ellipse cx="21" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,180.6406 Q23.3906,180.9375 22.75,181.0781 Q22.1094,181.2344 21.4063,181.2344 Q18.9063,181.2344 17.5781,179.5938 Q16.2656,177.9375 16.2656,174.8125 Q16.2656,171.6875 17.5781,170.0313 Q18.9063,168.375 21.4063,168.375 Q22.1094,168.375 22.75,168.5313 Q23.4063,168.6875 23.9688,168.9844 L23.9688,171.7031 Q23.3438,171.125 22.75,170.8594 Q22.1563,170.5781 21.5313,170.5781 Q20.1875,170.5781 19.5,171.6563 Q18.8125,172.7188 18.8125,174.8125 Q18.8125,176.9063 19.5,177.9844 Q20.1875,179.0469 21.5313,179.0469 Q22.1563,179.0469 22.75,178.7813 Q23.3438,178.5 23.9688,177.9219 L23.9688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="179.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="191" y2="191"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001827660844127264787">
-        <rect codeLine="10" fill="#F1F1F1" height="48" id="C_0001827660844127264787" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="82.5" y="168.6"/>
-        <ellipse cx="97.5" cy="184.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M92.5,185.7562 C92.5,188.2562 94.6406,190.0687 97.5625,190.0687 C98.7969,190.0687 99.9688,189.7719 100.7188,189.2562 C101.3281,188.8344 101.6563,188.4125 101.6563,188.0062 C101.6563,187.5375 101.2344,187.1312 100.7344,187.1312 C100.5,187.1312 100.2813,187.2094 100.0781,187.4125 C99.6406,187.85 99.6406,187.85 99.4688,187.9437 C99.0156,188.1781 98.375,188.3187 97.6094,188.3187 C95.6094,188.3187 94.3281,187.3031 94.3281,185.725 L94.3281,184.6781 C94.3281,182.975 95.5469,181.7719 97.25,181.7719 C97.8281,181.7719 98.4063,181.9125 98.875,182.1625 C99.3438,182.4281 99.5156,182.6156 99.5781,182.975 C99.7031,183.6469 99.9531,183.8969 100.4844,183.8969 C100.7656,183.8969 101.0469,183.7562 101.2344,183.5375 C101.3594,183.3656 101.4063,183.1937 101.4063,182.7562 L101.4063,181.3969 C101.4063,180.975 101.3906,180.8344 101.2656,180.6625 C101.0938,180.4125 100.8125,180.2562 100.4844,180.2562 C100.1719,180.2562 99.9688,180.3656 99.75,180.6312 C98.5781,180.1312 98.1406,180.0219 97.1875,180.0219 C94.5156,180.0219 92.5,182.0375 92.5,184.6625 L92.5,185.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="111.5" y="189.206">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="83.5" x2="123.5" y1="200.6" y2="200.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="83.5" x2="123.5" y1="208.6" y2="208.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="48" id="C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="159"/>
+      <ellipse cx="96" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M98.9688,180.6406 Q98.3906,180.9375 97.75,181.0781 Q97.1094,181.2344 96.4063,181.2344 Q93.9063,181.2344 92.5781,179.5938 Q91.2656,177.9375 91.2656,174.8125 Q91.2656,171.6875 92.5781,170.0313 Q93.9063,168.375 96.4063,168.375 Q97.1094,168.375 97.75,168.5313 Q98.4063,168.6875 98.9688,168.9844 L98.9688,171.7031 Q98.3438,171.125 97.75,170.8594 Q97.1563,170.5781 96.5313,170.5781 Q95.1875,170.5781 94.5,171.6563 Q93.8125,172.7188 93.8125,174.8125 Q93.8125,176.9063 94.5,177.9844 Q95.1875,179.0469 96.5313,179.0469 Q97.1563,179.0469 97.75,178.7813 Q98.3438,178.5 98.9688,177.9219 L98.9688,180.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="179.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="191" y2="191"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001629687372290281981">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0001629687372290281981" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="43.5" y="294.4"/>
-        <ellipse cx="58.5" cy="310.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M53.5,311.5563 C53.5,314.0563 55.6406,315.8688 58.5625,315.8688 C59.7969,315.8688 60.9688,315.5719 61.7188,315.0563 C62.3281,314.6344 62.6563,314.2125 62.6563,313.8063 C62.6563,313.3375 62.2344,312.9313 61.7344,312.9313 C61.5,312.9313 61.2813,313.0094 61.0781,313.2125 C60.6406,313.65 60.6406,313.65 60.4688,313.7438 C60.0156,313.9781 59.375,314.1188 58.6094,314.1188 C56.6094,314.1188 55.3281,313.1031 55.3281,311.525 L55.3281,310.4781 C55.3281,308.775 56.5469,307.5719 58.25,307.5719 C58.8281,307.5719 59.4063,307.7125 59.875,307.9625 C60.3438,308.2281 60.5156,308.4156 60.5781,308.775 C60.7031,309.4469 60.9531,309.6969 61.4844,309.6969 C61.7656,309.6969 62.0469,309.5563 62.2344,309.3375 C62.3594,309.1656 62.4063,308.9938 62.4063,308.5563 L62.4063,307.1969 C62.4063,306.775 62.3906,306.6344 62.2656,306.4625 C62.0938,306.2125 61.8125,306.0563 61.4844,306.0563 C61.1719,306.0563 60.9688,306.1656 60.75,306.4313 C59.5781,305.9313 59.1406,305.8219 58.1875,305.8219 C55.5156,305.8219 53.5,307.8375 53.5,310.4625 L53.5,311.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="72.5" y="315.006">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="44.5" x2="84.5" y1="326.4" y2="326.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="44.5" x2="84.5" y1="334.4" y2="334.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="48" id="C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="42.5" y="281"/>
+      <ellipse cx="57.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M60.4688,302.6406 Q59.8906,302.9375 59.25,303.0781 Q58.6094,303.2344 57.9063,303.2344 Q55.4063,303.2344 54.0781,301.5938 Q52.7656,299.9375 52.7656,296.8125 Q52.7656,293.6875 54.0781,292.0313 Q55.4063,290.375 57.9063,290.375 Q58.6094,290.375 59.25,290.5313 Q59.9063,290.6875 60.4688,290.9844 L60.4688,293.7031 Q59.8438,293.125 59.25,292.8594 Q58.6563,292.5781 58.0313,292.5781 Q56.6875,292.5781 56,293.6563 Q55.3125,294.7188 55.3125,296.8125 Q55.3125,298.9063 56,299.9844 Q56.6875,301.0469 58.0313,301.0469 Q58.6563,301.0469 59.25,300.7813 Q59.8438,300.5 60.4688,299.9219 L60.4688,302.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="71.5" y="301.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="313" y2="313"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="321" y2="321"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <g id="elem_C_0001877304825033069517">
-        <rect codeLine="18" fill="#F1F1F1" height="64.7999" id="C_0001877304825033069517" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="137" y="10"/>
-        <ellipse cx="152.45" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M147.45,27.1563 C147.45,29.6563 149.5906,31.4688 152.5125,31.4688 C153.7469,31.4688 154.9188,31.1719 155.6688,30.6563 C156.2781,30.2344 156.6063,29.8125 156.6063,29.4063 C156.6063,28.9375 156.1844,28.5313 155.6844,28.5313 C155.45,28.5313 155.2313,28.6094 155.0281,28.8125 C154.5906,29.25 154.5906,29.25 154.4188,29.3438 C153.9656,29.5781 153.325,29.7188 152.5594,29.7188 C150.5594,29.7188 149.2781,28.7031 149.2781,27.125 L149.2781,26.0781 C149.2781,24.375 150.4969,23.1719 152.2,23.1719 C152.7781,23.1719 153.3563,23.3125 153.825,23.5625 C154.2938,23.8281 154.4656,24.0156 154.5281,24.375 C154.6531,25.0469 154.9031,25.2969 155.4344,25.2969 C155.7156,25.2969 155.9969,25.1563 156.1844,24.9375 C156.3094,24.7656 156.3563,24.5938 156.3563,24.1563 L156.3563,22.7969 C156.3563,22.375 156.3406,22.2344 156.2156,22.0625 C156.0438,21.8125 155.7625,21.6563 155.4344,21.6563 C155.1219,21.6563 154.9188,21.7656 154.7,22.0313 C153.5281,21.5313 153.0906,21.4219 152.1375,21.4219 C149.4656,21.4219 147.45,23.4375 147.45,26.0625 L147.45,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="11" x="166.55" y="30.606">G</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="186" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="187" y="21.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="138" x2="191" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="138" x2="191" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="143" y="58.9"/>
-          <ellipse cx="148" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="157" y="67.0059">g : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="60.8047" id="C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="136" y="8"/>
+      <ellipse cx="151" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M153.9688,29.6406 Q153.3906,29.9375 152.75,30.0781 Q152.1094,30.2344 151.4063,30.2344 Q148.9063,30.2344 147.5781,28.5938 Q146.2656,26.9375 146.2656,23.8125 Q146.2656,20.6875 147.5781,19.0313 Q148.9063,17.375 151.4063,17.375 Q152.1094,17.375 152.75,17.5313 Q153.4063,17.6875 153.9688,17.9844 L153.9688,20.7031 Q153.3438,20.125 152.75,19.8594 Q152.1563,19.5781 151.5313,19.5781 Q150.1875,19.5781 149.5,20.6563 Q148.8125,21.7188 148.8125,23.8125 Q148.8125,25.9063 149.5,26.9844 Q150.1875,28.0469 151.5313,28.0469 Q152.1563,28.0469 152.75,27.7813 Q153.3438,27.5 153.9688,26.9219 L153.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="165" y="28.1543">G</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="182" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="183" y="17.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <g id="elem_C_0001881610349123495638">
-        <rect codeLine="23" fill="#F1F1F1" height="81.5999" id="C_0001881610349123495638" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="164.5" y="151.8"/>
-        <ellipse cx="187.6" cy="167.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M182.6,168.9562 C182.6,171.4562 184.7406,173.2687 187.6625,173.2687 C188.8969,173.2687 190.0688,172.9719 190.8188,172.4562 C191.4281,172.0344 191.7563,171.6125 191.7563,171.2062 C191.7563,170.7375 191.3344,170.3312 190.8344,170.3312 C190.6,170.3312 190.3813,170.4094 190.1781,170.6125 C189.7406,171.05 189.7406,171.05 189.5688,171.1437 C189.1156,171.3781 188.475,171.5187 187.7094,171.5187 C185.7094,171.5187 184.4281,170.5031 184.4281,168.925 L184.4281,167.8781 C184.4281,166.175 185.6469,164.9719 187.35,164.9719 C187.9281,164.9719 188.5063,165.1125 188.975,165.3625 C189.4438,165.6281 189.6156,165.8156 189.6781,166.175 C189.8031,166.8469 190.0531,167.0969 190.5844,167.0969 C190.8656,167.0969 191.1469,166.9562 191.3344,166.7375 C191.4594,166.5656 191.5063,166.3937 191.5063,165.9562 L191.5063,164.5969 C191.5063,164.175 191.4906,164.0344 191.3656,163.8625 C191.1938,163.6125 190.9125,163.4562 190.5844,163.4562 C190.2719,163.4562 190.0688,163.5656 189.85,163.8312 C188.6781,163.3312 188.2406,163.2219 187.2875,163.2219 C184.6156,163.2219 182.6,165.2375 182.6,167.8625 L182.6,168.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="203.4" y="172.406">H</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="20" x="229.5" y="148.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="18" x="230.5" y="163.0001">T,P</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="165.5" x2="245.5" y1="183.8" y2="183.8"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="165.5" x2="245.5" y1="191.8" y2="191.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="170.5" y="200.7"/>
-          <ellipse cx="175.5" cy="205.7" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="184.5" y="208.8059">h : G&lt;T&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="170.5" y="217.4999"/>
-          <ellipse cx="175.5" cy="222.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="184.5" y="225.6059">hh : P</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142" y="54"/>
+      <ellipse cx="147" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0001373615549846303472_C_0000479650368930934571">
-      <path codeLine="28" d="M53.5457,84.37 C46.7957,112.12 39.91,140.53 33.18,168.23 " fill="none" id="C_0001373615549846303472-backto-C_0000479650368930934571" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="57.8,66.88,47.7157,82.9519,59.3757,85.7881,57.8,66.88" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001373615549846303472_C_0001827660844127264787">
-      <path codeLine="29" d="M74.5305,84.2581 C82.0205,112.0081 89.71,140.53 97.19,168.23 " fill="none" id="C_0001373615549846303472-backto-C_0001827660844127264787" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="69.84,66.88,68.7378,85.8216,80.3232,82.6946,69.84,66.88" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000479650368930934571_C_0001629687372290281981">
-      <path codeLine="30" d="M39.6115,234.1371 C46.2215,256.2671 50.97,272.12 57.57,294.22 " fill="none" id="C_0000479650368930934571-backto-C_0001629687372290281981" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="34.46,216.89,33.8625,235.8543,45.3606,232.4199,34.46,216.89" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001827660844127264787_C_0001629687372290281981">
-      <path codeLine="31" d="M90.7526,234.0586 C83.7826,256.1886 78.76,272.12 71.8,294.22 " fill="none" id="C_0001827660844127264787-backto-C_0001629687372290281981" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="96.16,216.89,85.0298,232.2561,96.4755,235.861,96.16,216.89" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001881610349123495638_C_0001877304825033069517">
-      <path codeLine="32" d="M191.1717,139.8141 C184.5517,115.8741 179.46,97.48 173.3,75.19 " fill="none" id="C_0001881610349123495638-backto-C_0001877304825033069517" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="194.37,151.38,196.6262,144.5309,191.1717,139.8141,188.9156,146.6631,194.37,151.38" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="185.5" y="117.877">+h</text>
-    </g>
-    <g id="link_C_0001877304825033069517_C_0001881610349123495638">
-      <path codeLine="33" d="M168.1916,93.0136 C169.6116,107.4536 170.29,106.73 174.5,121.8 C177.25,131.63 181.15,141.87 185.26,151.37 " fill="none" id="C_0001877304825033069517-backto-C_0001881610349123495638" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="166.43,75.1,162.2204,93.6008,174.1628,92.4264,166.43,75.1" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="156" y="62.2104">g : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="73.6094" id="C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="161.5" y="146"/>
+      <ellipse cx="183.7" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M186.6688,167.6406 Q186.0906,167.9375 185.45,168.0781 Q184.8094,168.2344 184.1063,168.2344 Q181.6063,168.2344 180.2781,166.5938 Q178.9656,164.9375 178.9656,161.8125 Q178.9656,158.6875 180.2781,157.0313 Q181.6063,155.375 184.1063,155.375 Q184.8094,155.375 185.45,155.5313 Q186.1063,155.6875 186.6688,155.9844 L186.6688,158.7031 Q186.0438,158.125 185.45,157.8594 Q184.8563,157.5781 184.2313,157.5781 Q182.8875,157.5781 182.2,158.6563 Q181.5125,159.7188 181.5125,161.8125 Q181.5125,163.9063 182.2,164.9844 Q182.8875,166.0469 184.2313,166.0469 Q184.8563,166.0469 185.45,165.7813 Q186.0438,165.5 186.6688,164.9219 L186.6688,167.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="199.3" y="166.1543">H</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="20" x="223.5" y="143"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="224.5" y="155.1387">T,P</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="178" y2="178"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="186" y2="186"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="192"/>
+      <ellipse cx="172.5" cy="197" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="181.5" y="200.2104">h : G&lt;T&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="204.8047"/>
+      <ellipse cx="172.5" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="181.5" y="213.0151">hh : P</text>
+    </a>
+    <path d="M64.83,81.38 C55.08,106.65 43.02,137.89 34.96,158.8 " fill="none" id="C_0001373615549846303472&lt;-C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="58.31,78.85,72.04,62.71,71.37,83.89,58.31,78.85" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M87.09,82.89 C90.6,107.89 94.87,138.31 97.74,158.8 " fill="none" id="C_0001373615549846303472&lt;-C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="80.11,83.49,84.26,62.71,93.97,81.55,80.11,83.49" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M39.08,226.42 C44.73,244.76 51.13,265.51 55.89,280.93 " fill="none" id="C_0000479650368930934571&lt;-C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="32.34,228.31,33.13,207.14,45.72,224.19,32.34,228.31" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M87.57,226.42 C81.76,244.76 75.19,265.51 70.3,280.93 " fill="none" id="C_0001827660844127264787&lt;-C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="80.96,224.09,93.67,207.14,94.31,228.32,80.96,224.09" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M187.63,133.13 C181.79,111.81 175.14,87.52 170.08,69.03 " fill="none" id="C_0001881610349123495638&lt;-C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="191.13,145.94,193.4064,139.0976,187.9659,134.3647,185.6895,141.207,191.13,145.94" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="183" y="112.0669">+h</text>
+    <path d="M165.61,89.39 C166.89,98.35 168.64,107.52 171,116 C173.77,125.94 177.85,136.29 182.1,145.76 " fill="none" id="C_0001877304825033069517&lt;-C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="158.63,89.99,163.36,69.34,172.54,88.44,158.63,89.99" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00060_class_mermaid.svg b/docs/test_cases/t00060_class_mermaid.svg
index 35f96a14..5fab1a5e 100644
--- a/docs/test_cases/t00060_class_mermaid.svg
+++ b/docs/test_cases/t00060_class_mermaid.svg
@@ -1,66 +1,61 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 256.609375 371" style="max-width: 256.609px; background-color: white;" width="256.609375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M37.96643046093457,88.96445351500563L35.18556705077881,94.30371126250469C32.40470364062305,99.64296901000375,26.84297682031152,110.32148450500188,24.06211341015576,124.99407558583427C21.28125,139.66666666666666,21.28125,158.33333333333334,21.28125,167.66666666666666L21.28125,177"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M81.15856953906544,88.96445351500563L83.9394329492212,94.30371126250469C86.72029635937696,99.64296901000375,92.28202317968847,110.32148450500188,95.06288658984424,124.99407558583427C97.84375,139.66666666666666,97.84375,158.33333333333334,97.84375,167.66666666666666L97.84375,177"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M21.28125,252L21.28125,256.8333333333333C21.28125,261.6666666666667,21.28125,271.3333333333333,25.447916666666668,281.98979591836735C29.614583333333332,292.6462585034014,37.947916666666664,304.2925170068027,42.114583333333336,310.11564625850343L46.28125,315.9387755102041"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M97.84375,252L97.84375,256.8333333333333C97.84375,261.6666666666667,97.84375,271.3333333333333,93.67708333333333,281.98979591836735C89.51041666666667,292.6462585034014,81.17708333333333,304.2925170068027,77.01041666666667,310.11564625850343L72.84375,315.9387755102041"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M216.62722645301693,137.261490710391L217.09430329418078,134.55124225865916C217.56138013534462,131.84099380692734,218.49553381767228,126.42049690346367,217.8398782325323,118.04358178506516C217.1842226473923,109.66666666666667,214.93875779478458,98.33333333333333,213.81602536848072,92.66666666666667L212.69329294217687,87"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M172.31373365875712,102.48929773559797L170.48735617396426,105.57441477966499C168.6609786891714,108.65953182373198,165.0082237195857,114.82976591186599,166.09979187088751,123.58154962259967C167.19136002218934,132.33333333333334,173.02725129437871,143.66666666666666,175.94519693047337,149.33333333333334L178.86314256656806,155"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M46.28125,73L42.114583333333336,81C37.947916666666664,89,29.614583333333332,105,25.447916666666668,122.33333333333333C21.28125,139.66666666666666,21.28125,158.33333333333334,21.28125,167.66666666666666L21.28125,177"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M72.84375,73L77.01041666666667,81C81.17708333333333,89,89.51041666666667,105,93.67708333333333,122.33333333333333C97.84375,139.66666666666666,97.84375,158.33333333333334,97.84375,167.66666666666666L97.84375,177"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M21.28125,234L21.28125,241.83333333333334C21.28125,249.66666666666666,21.28125,265.3333333333333,25.447916666666668,278.98979591836735C29.614583333333332,292.6462585034014,37.947916666666664,304.2925170068027,42.114583333333336,310.11564625850343L46.28125,315.9387755102041"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M97.84375,234L97.84375,241.83333333333334C97.84375,249.66666666666666,97.84375,265.3333333333333,93.67708333333333,278.98979591836735C89.51041666666667,292.6462585034014,81.17708333333333,304.2925170068027,77.01041666666667,310.11564625850343L72.84375,315.9387755102041"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M213.5702200443787,155L214.5467979536489,149.33333333333334C215.52337586291912,143.66666666666666,217.47653168145953,132.33333333333334,217.33037716442593,121C217.1842226473923,109.66666666666667,214.93875779478458,98.33333333333333,213.81602536848072,92.66666666666667L212.69329294217687,87"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M181.4833386479592,87L178.128693664966,92.66666666666667C174.77404868197277,98.33333333333333,168.0647587159864,109.66666666666667,167.62805936908788,121C167.19136002218934,132.33333333333334,173.02725129437871,143.66666666666666,175.94519693047337,149.33333333333334L178.86314256656806,155"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -121,7 +116,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L3">
+        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L3">
           <g title="A" id="classId-C_0001373615549846303472-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -140,7 +135,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L4">
+        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L4">
           <g title="B" id="classId-C_0000479650368930934571-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -159,7 +154,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L5">
+        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L5">
           <g title="C" id="classId-C_0001827660844127264787-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -178,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L6">
+        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L6">
           <g title="D" id="classId-C_0001629687372290281981-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -197,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L10">
+        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L10">
           <g title="G" id="classId-C_0001877304825033069517-4" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -221,7 +216,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00060/t00060.cc#L14">
+        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L14">
           <g title="H" id="classId-C_0001881610349123495638-5" class="node default clickable">
             <rect height="101" width="87.484375" y="-50.5" x="-43.7421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="43.7421875" x1="-43.7421875" class="divider"/>
diff --git a/docs/test_cases/t00061.md b/docs/test_cases/t00061.md
index 4387656a..98a321e0 100644
--- a/docs/test_cases/t00061.md
+++ b/docs/test_cases/t00061.md
@@ -55,7 +55,7 @@ struct B { };
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00061::A",
+      "display_name": "A",
       "id": "1010204727957329423",
       "is_abstract": false,
       "is_nested": false,
@@ -77,6 +77,7 @@ struct B { };
     }
   ],
   "name": "t00061_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00061"
 }
diff --git a/docs/test_cases/t00061_class.svg b/docs/test_cases/t00061_class.svg
index 24140ee8..5ff2041e 100644
--- a/docs/test_cases/t00061_class.svg
+++ b/docs/test_cases/t00061_class.svg
@@ -1,17 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="69px" preserveAspectRatio="none" style="width:62px;height:69px;background:#FFFFFF;" version="1.1" viewBox="0 0 62 69" width="62px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fcw9fu40qz1dn" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001010204727957329423">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001010204727957329423" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="7"/>
-        <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,24.1563 C17,26.6563 19.1406,28.4688 22.0625,28.4688 C23.2969,28.4688 24.4688,28.1719 25.2188,27.6563 C25.8281,27.2344 26.1563,26.8125 26.1563,26.4063 C26.1563,25.9375 25.7344,25.5313 25.2344,25.5313 C25,25.5313 24.7813,25.6094 24.5781,25.8125 C24.1406,26.25 24.1406,26.25 23.9688,26.3438 C23.5156,26.5781 22.875,26.7188 22.1094,26.7188 C20.1094,26.7188 18.8281,25.7031 18.8281,24.125 L18.8281,23.0781 C18.8281,21.375 20.0469,20.1719 21.75,20.1719 C22.3281,20.1719 22.9063,20.3125 23.375,20.5625 C23.8438,20.8281 24.0156,21.0156 24.0781,21.375 C24.2031,22.0469 24.4531,22.2969 24.9844,22.2969 C25.2656,22.2969 25.5469,22.1563 25.7344,21.9375 C25.8594,21.7656 25.9063,21.5938 25.9063,21.1563 L25.9063,19.7969 C25.9063,19.375 25.8906,19.2344 25.7656,19.0625 C25.5938,18.8125 25.3125,18.6563 24.9844,18.6563 C24.6719,18.6563 24.4688,18.7656 24.25,19.0313 C23.0781,18.5313 22.6406,18.4219 21.6875,18.4219 C19.0156,18.4219 17,20.4375 17,23.0625 L17,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcw9fu40qz1dn)" height="48" id="C_0001010204727957329423" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
+      <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="39" y2="39"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="47" y2="47"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00061_class_mermaid.svg b/docs/test_cases/t00061_class_mermaid.svg
index 8f75c358..5a7ce2b6 100644
--- a/docs/test_cases/t00061_class_mermaid.svg
+++ b/docs/test_cases/t00061_class_mermaid.svg
@@ -1,55 +1,50 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 42.5625 73" style="max-width: 42.5625px; background-color: white;" width="42.5625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00061/include/t00061_a.h#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00061/include/t00061_a.h#L3">
           <g title="A" id="classId-C_0001010204727957329423-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00062.md b/docs/test_cases/t00062.md
index fbc7d99b..b2d50631 100644
--- a/docs/test_cases/t00062.md
+++ b/docs/test_cases/t00062.md
@@ -130,7 +130,7 @@ struct A<C<T, Args...>> {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<U &>",
+      "display_name": "A<U &>",
       "id": "1046827200300090710",
       "is_abstract": false,
       "is_nested": false,
@@ -172,7 +172,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<std::map<std::string,U> &>",
+      "display_name": "A<std::map<std::string,U> &>",
       "id": "1099548178945911245",
       "is_abstract": false,
       "is_nested": false,
@@ -227,7 +227,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<std::map<std::string,std::map<std::string,std::string>> &>",
+      "display_name": "A<std::map<std::string,std::map<std::string,std::string>> &>",
       "id": "1239388209995793547",
       "is_abstract": false,
       "is_nested": false,
@@ -282,7 +282,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<U * *>",
+      "display_name": "A<U * *>",
       "id": "45701897814162098",
       "is_abstract": false,
       "is_nested": false,
@@ -324,7 +324,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<U * * const*>",
+      "display_name": "A<U * * const*>",
       "id": "1379193770802992785",
       "is_abstract": false,
       "is_nested": false,
@@ -366,7 +366,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<U const volatile* const volatile>",
+      "display_name": "A<U const volatile* const volatile>",
       "id": "1407865337446777280",
       "is_abstract": false,
       "is_nested": false,
@@ -408,7 +408,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<U &&>",
+      "display_name": "A<U &&>",
       "id": "1034483227649400416",
       "is_abstract": false,
       "is_nested": false,
@@ -450,7 +450,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<U const&>",
+      "display_name": "A<U const&>",
       "id": "352457857519671117",
       "is_abstract": false,
       "is_nested": false,
@@ -492,7 +492,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<M C::*>",
+      "display_name": "A<M C::*>",
       "id": "314708288320430272",
       "is_abstract": false,
       "is_nested": false,
@@ -558,7 +558,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<M C::* &&>",
+      "display_name": "A<M C::* &&>",
       "id": "827753335392390402",
       "is_abstract": false,
       "is_nested": false,
@@ -624,7 +624,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<M (C::*)(Arg)>",
+      "display_name": "A<M (C::*)(Arg)>",
       "id": "395583480407686249",
       "is_abstract": false,
       "is_nested": false,
@@ -696,7 +696,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<int (C::*)(bool)>",
+      "display_name": "A<int (C::*)(bool)>",
       "id": "476497055497873078",
       "is_abstract": false,
       "is_nested": false,
@@ -756,7 +756,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<M (C::*)(Arg) &&>",
+      "display_name": "A<M (C::*)(Arg) &&>",
       "id": "1619634759668095904",
       "is_abstract": false,
       "is_nested": false,
@@ -828,7 +828,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<float (C::*)(int) &&>",
+      "display_name": "A<float (C::*)(int) &&>",
       "id": "1357746808315142717",
       "is_abstract": false,
       "is_nested": false,
@@ -900,7 +900,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<M (C::*)(Arg1,Arg2,Arg3)>",
+      "display_name": "A<M (C::*)(Arg1,Arg2,Arg3)>",
       "id": "544335779197078982",
       "is_abstract": false,
       "is_nested": false,
@@ -984,7 +984,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<char[N]>",
+      "display_name": "A<char[N]>",
       "id": "602066980416477930",
       "is_abstract": false,
       "is_nested": false,
@@ -1038,7 +1038,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<char[1000]>",
+      "display_name": "A<char[1000]>",
       "id": "1318419672443856415",
       "is_abstract": false,
       "is_nested": false,
@@ -1092,7 +1092,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<char[M][L][K]>",
+      "display_name": "A<char[M][L][K]>",
       "id": "599593856979463652",
       "is_abstract": false,
       "is_nested": false,
@@ -1170,7 +1170,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<U(...)>",
+      "display_name": "A<U(...)>",
       "id": "15395295268000991",
       "is_abstract": false,
       "is_nested": false,
@@ -1224,7 +1224,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<C<T>>",
+      "display_name": "A<C<T>>",
       "id": "1603321863498552207",
       "is_abstract": false,
       "is_nested": false,
@@ -1273,7 +1273,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<C<T,Args...>>",
+      "display_name": "A<C<T,Args...>>",
       "id": "232518961342221670",
       "is_abstract": false,
       "is_nested": false,
@@ -1340,7 +1340,7 @@ struct A<C<T, Args...>> {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00062::A<T>",
+      "display_name": "A<T>",
       "id": "121103565834936476",
       "is_abstract": false,
       "is_nested": false,
@@ -1369,6 +1369,7 @@ struct A<C<T, Args...>> {
     }
   ],
   "name": "t00062_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00062_class.svg b/docs/test_cases/t00062_class.svg
index aeb547a8..f14cca97 100644
--- a/docs/test_cases/t00062_class.svg
+++ b/docs/test_cases/t00062_class.svg
@@ -1,544 +1,464 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1347px" preserveAspectRatio="none" style="width:975px;height:1347px;background:#FFFFFF;" version="1.1" viewBox="0 0 975 1347" width="975px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1285px" preserveAspectRatio="none" style="width:1087px;height:1285px;" version="1.1" viewBox="0 0 1087 1285" width="1087px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f187l88acoacxy" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001046827200300090710">
-        <rect codeLine="3" fill="#F1F1F1" height="64.7999" id="C_0001046827200300090710" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="69" x="714" y="1276"/>
-        <ellipse cx="730.8" cy="1292" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M725.8,1293.1563 C725.8,1295.6563 727.9406,1297.4688 730.8625,1297.4688 C732.0969,1297.4688 733.2688,1297.1719 734.0188,1296.6563 C734.6281,1296.2344 734.9563,1295.8125 734.9563,1295.4063 C734.9563,1294.9375 734.5344,1294.5313 734.0344,1294.5313 C733.8,1294.5313 733.5813,1294.6094 733.3781,1294.8125 C732.9406,1295.25 732.9406,1295.25 732.7688,1295.3438 C732.3156,1295.5781 731.675,1295.7188 730.9094,1295.7188 C728.9094,1295.7188 727.6281,1294.7031 727.6281,1293.125 L727.6281,1292.0781 C727.6281,1290.375 728.8469,1289.1719 730.55,1289.1719 C731.1281,1289.1719 731.7063,1289.3125 732.175,1289.5625 C732.6438,1289.8281 732.8156,1290.0156 732.8781,1290.375 C733.0031,1291.0469 733.2531,1291.2969 733.7844,1291.2969 C734.0656,1291.2969 734.3469,1291.1563 734.5344,1290.9375 C734.6594,1290.7656 734.7063,1290.5938 734.7063,1290.1563 L734.7063,1288.7969 C734.7063,1288.375 734.6906,1288.2344 734.5656,1288.0625 C734.3938,1287.8125 734.1125,1287.6563 733.7844,1287.6563 C733.4719,1287.6563 733.2688,1287.7656 733.05,1288.0313 C731.8781,1287.5313 731.4406,1287.4219 730.4875,1287.4219 C727.8156,1287.4219 725.8,1289.4375 725.8,1292.0625 L725.8,1293.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="745.2" y="1296.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="22" x="764" y="1273"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="20" x="765" y="1287.2001">U &amp;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="715" x2="782" y1="1308" y2="1308"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="715" x2="782" y1="1316" y2="1316"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="720" y="1324.9"/>
-          <ellipse cx="725" cy="1329.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="734" y="1333.0059">u : U &amp;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.5;" width="67" x="813" y="1214"/>
+      <ellipse cx="828.45" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M831.4188,1235.6406 Q830.8406,1235.9375 830.2,1236.0781 Q829.5594,1236.2344 828.8563,1236.2344 Q826.3563,1236.2344 825.0281,1234.5938 Q823.7156,1232.9375 823.7156,1229.8125 Q823.7156,1226.6875 825.0281,1225.0313 Q826.3563,1223.375 828.8563,1223.375 Q829.5594,1223.375 830.2,1223.5313 Q830.8563,1223.6875 831.4188,1223.9844 L831.4188,1226.7031 Q830.7938,1226.125 830.2,1225.8594 Q829.6063,1225.5781 828.9813,1225.5781 Q827.6375,1225.5781 826.95,1226.6563 Q826.2625,1227.7188 826.2625,1229.8125 Q826.2625,1231.9063 826.95,1232.9844 Q827.6375,1234.0469 828.9813,1234.0469 Q829.6063,1234.0469 830.2,1233.7813 Q830.7938,1233.5 831.4188,1232.9219 L831.4188,1235.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="842.55" y="1234.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="24" x="859" y="1211"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="22" x="860" y="1223.1387">U &amp;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1246" y2="1246"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1254" y2="1254"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001099548178945911245">
-        <rect codeLine="8" fill="#F1F1F1" height="64.7999" id="C_0001099548178945911245" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="180" x="405" y="1276"/>
-        <ellipse cx="420" cy="1292" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M415,1293.1563 C415,1295.6563 417.1406,1297.4688 420.0625,1297.4688 C421.2969,1297.4688 422.4688,1297.1719 423.2188,1296.6563 C423.8281,1296.2344 424.1563,1295.8125 424.1563,1295.4063 C424.1563,1294.9375 423.7344,1294.5313 423.2344,1294.5313 C423,1294.5313 422.7813,1294.6094 422.5781,1294.8125 C422.1406,1295.25 422.1406,1295.25 421.9688,1295.3438 C421.5156,1295.5781 420.875,1295.7188 420.1094,1295.7188 C418.1094,1295.7188 416.8281,1294.7031 416.8281,1293.125 L416.8281,1292.0781 C416.8281,1290.375 418.0469,1289.1719 419.75,1289.1719 C420.3281,1289.1719 420.9063,1289.3125 421.375,1289.5625 C421.8438,1289.8281 422.0156,1290.0156 422.0781,1290.375 C422.2031,1291.0469 422.4531,1291.2969 422.9844,1291.2969 C423.2656,1291.2969 423.5469,1291.1563 423.7344,1290.9375 C423.8594,1290.7656 423.9063,1290.5938 423.9063,1290.1563 L423.9063,1288.7969 C423.9063,1288.375 423.8906,1288.2344 423.7656,1288.0625 C423.5938,1287.8125 423.3125,1287.6563 422.9844,1287.6563 C422.6719,1287.6563 422.4688,1287.7656 422.25,1288.0313 C421.0781,1287.5313 420.6406,1287.4219 419.6875,1287.4219 C417.0156,1287.4219 415,1289.4375 415,1292.0625 L415,1293.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="434" y="1296.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="137" x="451" y="1273"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="135" x="452" y="1287.2001">std::map&lt;std::string,U&gt; &amp;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="406" x2="584" y1="1308" y2="1308"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="406" x2="584" y1="1316" y2="1316"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="411" y="1324.9"/>
-          <ellipse cx="416" cy="1329.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="425" y="1333.0059">u : U &amp;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="819" y="1260"/>
+      <ellipse cx="824" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001239388209995793547">
-        <rect codeLine="13" fill="#F1F1F1" height="48" id="C_0001239388209995793547" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="338" x="7" y="1284.4"/>
-        <ellipse cx="22" cy="1300.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,1301.5562 C17,1304.0562 19.1406,1305.8687 22.0625,1305.8687 C23.2969,1305.8687 24.4688,1305.5719 25.2188,1305.0562 C25.8281,1304.6344 26.1563,1304.2125 26.1563,1303.8062 C26.1563,1303.3375 25.7344,1302.9312 25.2344,1302.9312 C25,1302.9312 24.7813,1303.0094 24.5781,1303.2125 C24.1406,1303.65 24.1406,1303.65 23.9688,1303.7437 C23.5156,1303.9781 22.875,1304.1187 22.1094,1304.1187 C20.1094,1304.1187 18.8281,1303.1031 18.8281,1301.525 L18.8281,1300.4781 C18.8281,1298.775 20.0469,1297.5719 21.75,1297.5719 C22.3281,1297.5719 22.9063,1297.7125 23.375,1297.9625 C23.8438,1298.2281 24.0156,1298.4156 24.0781,1298.775 C24.2031,1299.4469 24.4531,1299.6969 24.9844,1299.6969 C25.2656,1299.6969 25.5469,1299.5562 25.7344,1299.3375 C25.8594,1299.1656 25.9063,1298.9937 25.9063,1298.5562 L25.9063,1297.1969 C25.9063,1296.775 25.8906,1296.6344 25.7656,1296.4625 C25.5938,1296.2125 25.3125,1296.0562 24.9844,1296.0562 C24.6719,1296.0562 24.4688,1296.1656 24.25,1296.4312 C23.0781,1295.9312 22.6406,1295.8219 21.6875,1295.8219 C19.0156,1295.8219 17,1297.8375 17,1300.4625 L17,1301.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="1305.006">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="295" x="53" y="1281.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="293" x="54" y="1295.6001">std::map&lt;std::string,std::map&lt;std::string,std::string&gt;&gt; &amp;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="344" y1="1316.4" y2="1316.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="344" y1="1324.4" y2="1324.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="833" y="1268.2104">u : U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000045701897814162098">
-        <rect codeLine="17" fill="#F1F1F1" height="64.7999" id="C_0000045701897814162098" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="70" x="713.5" y="10"/>
-        <ellipse cx="728.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M723.5,27.1563 C723.5,29.6563 725.6406,31.4688 728.5625,31.4688 C729.7969,31.4688 730.9688,31.1719 731.7188,30.6563 C732.3281,30.2344 732.6563,29.8125 732.6563,29.4063 C732.6563,28.9375 732.2344,28.5313 731.7344,28.5313 C731.5,28.5313 731.2813,28.6094 731.0781,28.8125 C730.6406,29.25 730.6406,29.25 730.4688,29.3438 C730.0156,29.5781 729.375,29.7188 728.6094,29.7188 C726.6094,29.7188 725.3281,28.7031 725.3281,27.125 L725.3281,26.0781 C725.3281,24.375 726.5469,23.1719 728.25,23.1719 C728.8281,23.1719 729.4063,23.3125 729.875,23.5625 C730.3438,23.8281 730.5156,24.0156 730.5781,24.375 C730.7031,25.0469 730.9531,25.2969 731.4844,25.2969 C731.7656,25.2969 732.0469,25.1563 732.2344,24.9375 C732.3594,24.7656 732.4063,24.5938 732.4063,24.1563 L732.4063,22.7969 C732.4063,22.375 732.3906,22.2344 732.2656,22.0625 C732.0938,21.8125 731.8125,21.6563 731.4844,21.6563 C731.1719,21.6563 730.9688,21.7656 730.75,22.0313 C729.5781,21.5313 729.1406,21.4219 728.1875,21.4219 C725.5156,21.4219 723.5,23.4375 723.5,26.0625 L723.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="742.5" y="30.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="27" x="759.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="25" x="760.5" y="21.2001">U * *</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="714.5" x2="782.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="714.5" x2="782.5" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="719.5" y="58.9"/>
-          <ellipse cx="724.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="44" x="733.5" y="67.0059">u : U **</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="465" y="1214"/>
+      <ellipse cx="480" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M482.9688,1235.6406 Q482.3906,1235.9375 481.75,1236.0781 Q481.1094,1236.2344 480.4063,1236.2344 Q477.9063,1236.2344 476.5781,1234.5938 Q475.2656,1232.9375 475.2656,1229.8125 Q475.2656,1226.6875 476.5781,1225.0313 Q477.9063,1223.375 480.4063,1223.375 Q481.1094,1223.375 481.75,1223.5313 Q482.4063,1223.6875 482.9688,1223.9844 L482.9688,1226.7031 Q482.3438,1226.125 481.75,1225.8594 Q481.1563,1225.5781 480.5313,1225.5781 Q479.1875,1225.5781 478.5,1226.6563 Q477.8125,1227.7188 477.8125,1229.8125 Q477.8125,1231.9063 478.5,1232.9844 Q479.1875,1234.0469 480.5313,1234.0469 Q481.1563,1234.0469 481.75,1233.7813 Q482.3438,1233.5 482.9688,1232.9219 L482.9688,1235.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="494" y="1234.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="164" x="510" y="1211"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="162" x="511" y="1223.1387">std::map&lt;std::string,U&gt; &amp;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1246" y2="1246"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1254" y2="1254"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001379193770802992785">
-        <rect codeLine="22" fill="#F1F1F1" height="64.7999" id="C_0001379193770802992785" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="441.5" y="10"/>
-        <ellipse cx="456.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M451.5,27.1563 C451.5,29.6563 453.6406,31.4688 456.5625,31.4688 C457.7969,31.4688 458.9688,31.1719 459.7188,30.6563 C460.3281,30.2344 460.6563,29.8125 460.6563,29.4063 C460.6563,28.9375 460.2344,28.5313 459.7344,28.5313 C459.5,28.5313 459.2813,28.6094 459.0781,28.8125 C458.6406,29.25 458.6406,29.25 458.4688,29.3438 C458.0156,29.5781 457.375,29.7188 456.6094,29.7188 C454.6094,29.7188 453.3281,28.7031 453.3281,27.125 L453.3281,26.0781 C453.3281,24.375 454.5469,23.1719 456.25,23.1719 C456.8281,23.1719 457.4063,23.3125 457.875,23.5625 C458.3438,23.8281 458.5156,24.0156 458.5781,24.375 C458.7031,25.0469 458.9531,25.2969 459.4844,25.2969 C459.7656,25.2969 460.0469,25.1563 460.2344,24.9375 C460.3594,24.7656 460.4063,24.5938 460.4063,24.1563 L460.4063,22.7969 C460.4063,22.375 460.3906,22.2344 460.2656,22.0625 C460.0938,21.8125 459.8125,21.6563 459.4844,21.6563 C459.1719,21.6563 458.9688,21.7656 458.75,22.0313 C457.5781,21.5313 457.1406,21.4219 456.1875,21.4219 C453.5156,21.4219 451.5,23.4375 451.5,26.0625 L451.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="470.5" y="30.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="64" x="487.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="62" x="488.5" y="21.2001">U * * const*</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="442.5" x2="547.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="442.5" x2="547.5" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="447.5" y="58.9"/>
-          <ellipse cx="452.5" cy="63.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="461.5" y="67.0059">u : U ***</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="471" y="1260"/>
+      <ellipse cx="476" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001407865337446777280">
-        <rect codeLine="27" fill="#F1F1F1" height="64.7999" id="C_0001407865337446777280" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="207" x="645" y="110"/>
-        <ellipse cx="660" cy="126" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M655,127.1563 C655,129.6563 657.1406,131.4688 660.0625,131.4688 C661.2969,131.4688 662.4688,131.1719 663.2188,130.6563 C663.8281,130.2344 664.1563,129.8125 664.1563,129.4063 C664.1563,128.9375 663.7344,128.5313 663.2344,128.5313 C663,128.5313 662.7813,128.6094 662.5781,128.8125 C662.1406,129.25 662.1406,129.25 661.9688,129.3438 C661.5156,129.5781 660.875,129.7188 660.1094,129.7188 C658.1094,129.7188 656.8281,128.7031 656.8281,127.125 L656.8281,126.0781 C656.8281,124.375 658.0469,123.1719 659.75,123.1719 C660.3281,123.1719 660.9063,123.3125 661.375,123.5625 C661.8438,123.8281 662.0156,124.0156 662.0781,124.375 C662.2031,125.0469 662.4531,125.2969 662.9844,125.2969 C663.2656,125.2969 663.5469,125.1563 663.7344,124.9375 C663.8594,124.7656 663.9063,124.5938 663.9063,124.1563 L663.9063,122.7969 C663.9063,122.375 663.8906,122.2344 663.7656,122.0625 C663.5938,121.8125 663.3125,121.6563 662.9844,121.6563 C662.6719,121.6563 662.4688,121.7656 662.25,122.0313 C661.0781,121.5313 660.6406,121.4219 659.6875,121.4219 C657.0156,121.4219 655,123.4375 655,126.0625 L655,127.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="674" y="130.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="164" x="691" y="107"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="162" x="692" y="121.2001">U const volatile* const volatile</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="646" x2="851" y1="142" y2="142"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="646" x2="851" y1="150" y2="150"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="651" y="158.9"/>
-          <ellipse cx="656" cy="163.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="665" y="167.0059">u : U ***</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="485" y="1268.2104">u : U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001034483227649400416">
-        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0001034483227649400416" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="709.5" y="210"/>
-        <ellipse cx="726.75" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M721.75,227.1563 C721.75,229.6563 723.8906,231.4688 726.8125,231.4688 C728.0469,231.4688 729.2188,231.1719 729.9688,230.6563 C730.5781,230.2344 730.9063,229.8125 730.9063,229.4063 C730.9063,228.9375 730.4844,228.5313 729.9844,228.5313 C729.75,228.5313 729.5313,228.6094 729.3281,228.8125 C728.8906,229.25 728.8906,229.25 728.7188,229.3438 C728.2656,229.5781 727.625,229.7188 726.8594,229.7188 C724.8594,229.7188 723.5781,228.7031 723.5781,227.125 L723.5781,226.0781 C723.5781,224.375 724.7969,223.1719 726.5,223.1719 C727.0781,223.1719 727.6563,223.3125 728.125,223.5625 C728.5938,223.8281 728.7656,224.0156 728.8281,224.375 C728.9531,225.0469 729.2031,225.2969 729.7344,225.2969 C730.0156,225.2969 730.2969,225.1563 730.4844,224.9375 C730.6094,224.7656 730.6563,224.5938 730.6563,224.1563 L730.6563,222.7969 C730.6563,222.375 730.6406,222.2344 730.5156,222.0625 C730.3438,221.8125 730.0625,221.6563 729.7344,221.6563 C729.4219,221.6563 729.2188,221.7656 729,222.0313 C727.8281,221.5313 727.3906,221.4219 726.4375,221.4219 C723.7656,221.4219 721.75,223.4375 721.75,226.0625 L721.75,227.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="741.25" y="230.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="30" x="760.5" y="207"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="28" x="761.5" y="221.2001">U &amp;&amp;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="710.5" x2="786.5" y1="242" y2="242"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="710.5" x2="786.5" y1="250" y2="250"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="715.5" y="258.9"/>
-          <ellipse cx="720.5" cy="263.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="729.5" y="267.0059">u : U &amp;&amp;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="48" id="C_0001239388209995793547" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="1220.5"/>
+      <ellipse cx="21" cy="1236.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M23.9688,1242.1406 Q23.3906,1242.4375 22.75,1242.5781 Q22.1094,1242.7344 21.4063,1242.7344 Q18.9063,1242.7344 17.5781,1241.0938 Q16.2656,1239.4375 16.2656,1236.3125 Q16.2656,1233.1875 17.5781,1231.5313 Q18.9063,1229.875 21.4063,1229.875 Q22.1094,1229.875 22.75,1230.0313 Q23.4063,1230.1875 23.9688,1230.4844 L23.9688,1233.2031 Q23.3438,1232.625 22.75,1232.3594 Q22.1563,1232.0781 21.5313,1232.0781 Q20.1875,1232.0781 19.5,1233.1563 Q18.8125,1234.2188 18.8125,1236.3125 Q18.8125,1238.4063 19.5,1239.4844 Q20.1875,1240.5469 21.5313,1240.5469 Q22.1563,1240.5469 22.75,1240.2813 Q23.3438,1240 23.9688,1239.4219 L23.9688,1242.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="1240.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="357" x="51" y="1217.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="355" x="52" y="1229.6387">std::map&lt;std::string,std::map&lt;std::string,std::string&gt;&gt; &amp;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1252.5" y2="1252.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1260.5" y2="1260.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000352457857519671117">
-        <rect codeLine="37" fill="#F1F1F1" height="64.7999" id="C_0000352457857519671117" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="695" y="310"/>
-        <ellipse cx="715.85" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M710.85,327.1563 C710.85,329.6563 712.9906,331.4688 715.9125,331.4688 C717.1469,331.4688 718.3188,331.1719 719.0688,330.6563 C719.6781,330.2344 720.0063,329.8125 720.0063,329.4063 C720.0063,328.9375 719.5844,328.5313 719.0844,328.5313 C718.85,328.5313 718.6313,328.6094 718.4281,328.8125 C717.9906,329.25 717.9906,329.25 717.8188,329.3438 C717.3656,329.5781 716.725,329.7188 715.9594,329.7188 C713.9594,329.7188 712.6781,328.7031 712.6781,327.125 L712.6781,326.0781 C712.6781,324.375 713.8969,323.1719 715.6,323.1719 C716.1781,323.1719 716.7563,323.3125 717.225,323.5625 C717.6938,323.8281 717.8656,324.0156 717.9281,324.375 C718.0531,325.0469 718.3031,325.2969 718.8344,325.2969 C719.1156,325.2969 719.3969,325.1563 719.5844,324.9375 C719.7094,324.7656 719.7563,324.5938 719.7563,324.1563 L719.7563,322.7969 C719.7563,322.375 719.7406,322.2344 719.6156,322.0625 C719.4438,321.8125 719.1625,321.6563 718.8344,321.6563 C718.5219,321.6563 718.3188,321.7656 718.1,322.0313 C716.9281,321.5313 716.4906,321.4219 715.5375,321.4219 C712.8656,321.4219 710.85,323.4375 710.85,326.0625 L710.85,327.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="731.15" y="330.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="51" x="754" y="307"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="49" x="755" y="321.2001">U const&amp;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="696" x2="801" y1="342" y2="342"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="696" x2="801" y1="350" y2="350"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="701" y="358.9"/>
-          <ellipse cx="706" cy="363.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="715" y="367.0059">u : const U &amp;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="810" y="8"/>
+      <ellipse cx="825" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M827.9688,29.6406 Q827.3906,29.9375 826.75,30.0781 Q826.1094,30.2344 825.4063,30.2344 Q822.9063,30.2344 821.5781,28.5938 Q820.2656,26.9375 820.2656,23.8125 Q820.2656,20.6875 821.5781,19.0313 Q822.9063,17.375 825.4063,17.375 Q826.1094,17.375 826.75,17.5313 Q827.4063,17.6875 827.9688,17.9844 L827.9688,20.7031 Q827.3438,20.125 826.75,19.8594 Q826.1563,19.5781 825.5313,19.5781 Q824.1875,19.5781 823.5,20.6563 Q822.8125,21.7188 822.8125,23.8125 Q822.8125,25.9063 823.5,26.9844 Q824.1875,28.0469 825.5313,28.0469 Q826.1563,28.0469 826.75,27.7813 Q827.3438,27.5 827.9688,26.9219 L827.9688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="839" y="28.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="31" x="855" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="29" x="856" y="17.1387">U * *</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000314708288320430272">
-        <rect codeLine="42" fill="#F1F1F1" height="81.5999" id="C_0000314708288320430272" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="89" x="704" y="409.6"/>
-        <ellipse cx="723.95" cy="425.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M718.95,426.7562 C718.95,429.2562 721.0906,431.0687 724.0125,431.0687 C725.2469,431.0687 726.4188,430.7719 727.1688,430.2562 C727.7781,429.8344 728.1063,429.4125 728.1063,429.0062 C728.1063,428.5375 727.6844,428.1312 727.1844,428.1312 C726.95,428.1312 726.7313,428.2094 726.5281,428.4125 C726.0906,428.85 726.0906,428.85 725.9188,428.9437 C725.4656,429.1781 724.825,429.3187 724.0594,429.3187 C722.0594,429.3187 720.7781,428.3031 720.7781,426.725 L720.7781,425.6781 C720.7781,423.975 721.9969,422.7719 723.7,422.7719 C724.2781,422.7719 724.8563,422.9125 725.325,423.1625 C725.7938,423.4281 725.9656,423.6156 726.0281,423.975 C726.1531,424.6469 726.4031,424.8969 726.9344,424.8969 C727.2156,424.8969 727.4969,424.7562 727.6844,424.5375 C727.8094,424.3656 727.8563,424.1937 727.8563,423.7562 L727.8563,422.3969 C727.8563,421.975 727.8406,421.8344 727.7156,421.6625 C727.5438,421.4125 727.2625,421.2562 726.9344,421.2562 C726.6219,421.2562 726.4188,421.3656 726.2,421.6312 C725.0281,421.1312 724.5906,421.0219 723.6375,421.0219 C720.9656,421.0219 718.95,423.0375 718.95,425.6625 L718.95,426.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="739.05" y="430.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="35" x="761" y="406.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="33" x="762" y="420.8001">M C::*</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="705" x2="792" y1="441.6" y2="441.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="705" x2="792" y1="449.6" y2="449.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="710" y="458.5"/>
-          <ellipse cx="715" cy="463.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="724" y="466.6059">c : C &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="710" y="475.2999"/>
-          <ellipse cx="715" cy="480.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="724" y="483.4059">m : M C::*</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="816" y="54"/>
+      <ellipse cx="821" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000827753335392390402">
-        <rect codeLine="48" fill="#F1F1F1" height="81.5999" id="C_0000827753335392390402" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="97" x="446.5" y="155.6"/>
-        <ellipse cx="461.5" cy="171.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M456.5,172.7562 C456.5,175.2562 458.6406,177.0687 461.5625,177.0687 C462.7969,177.0687 463.9688,176.7719 464.7188,176.2562 C465.3281,175.8344 465.6563,175.4125 465.6563,175.0062 C465.6563,174.5375 465.2344,174.1312 464.7344,174.1312 C464.5,174.1312 464.2813,174.2094 464.0781,174.4125 C463.6406,174.85 463.6406,174.85 463.4688,174.9437 C463.0156,175.1781 462.375,175.3187 461.6094,175.3187 C459.6094,175.3187 458.3281,174.3031 458.3281,172.725 L458.3281,171.6781 C458.3281,169.975 459.5469,168.7719 461.25,168.7719 C461.8281,168.7719 462.4063,168.9125 462.875,169.1625 C463.3438,169.4281 463.5156,169.6156 463.5781,169.975 C463.7031,170.6469 463.9531,170.8969 464.4844,170.8969 C464.7656,170.8969 465.0469,170.7562 465.2344,170.5375 C465.3594,170.3656 465.4063,170.1937 465.4063,169.7562 L465.4063,168.3969 C465.4063,167.975 465.3906,167.8344 465.2656,167.6625 C465.0938,167.4125 464.8125,167.2562 464.4844,167.2562 C464.1719,167.2562 463.9688,167.3656 463.75,167.6312 C462.5781,167.1312 462.1406,167.0219 461.1875,167.0219 C458.5156,167.0219 456.5,169.0375 456.5,171.6625 L456.5,172.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="475.5" y="176.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="54" x="492.5" y="152.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="493.5" y="166.8001">M C::* &amp;&amp;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="447.5" x2="542.5" y1="187.6" y2="187.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="447.5" x2="542.5" y1="195.6" y2="195.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="452.5" y="204.5"/>
-          <ellipse cx="457.5" cy="209.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="466.5" y="212.6059">c : C &amp;&amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="452.5" y="221.2999"/>
-          <ellipse cx="457.5" cy="226.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="466.5" y="229.4059">m : M C::*</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="830" y="62.2104">u : U **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000395583480407686249">
-        <rect codeLine="54" fill="#F1F1F1" height="81.5999" id="C_0000395583480407686249" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="692" y="526.6"/>
-        <ellipse cx="707" cy="542.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M702,543.7562 C702,546.2562 704.1406,548.0687 707.0625,548.0687 C708.2969,548.0687 709.4688,547.7719 710.2188,547.2562 C710.8281,546.8344 711.1563,546.4125 711.1563,546.0062 C711.1563,545.5375 710.7344,545.1312 710.2344,545.1312 C710,545.1312 709.7813,545.2094 709.5781,545.4125 C709.1406,545.85 709.1406,545.85 708.9688,545.9437 C708.5156,546.1781 707.875,546.3187 707.1094,546.3187 C705.1094,546.3187 703.8281,545.3031 703.8281,543.725 L703.8281,542.6781 C703.8281,540.975 705.0469,539.7719 706.75,539.7719 C707.3281,539.7719 707.9063,539.9125 708.375,540.1625 C708.8438,540.4281 709.0156,540.6156 709.0781,540.975 C709.2031,541.6469 709.4531,541.8969 709.9844,541.8969 C710.2656,541.8969 710.5469,541.7562 710.7344,541.5375 C710.8594,541.3656 710.9063,541.1937 710.9063,540.7562 L710.9063,539.3969 C710.9063,538.975 710.8906,538.8344 710.7656,538.6625 C710.5938,538.4125 710.3125,538.2562 709.9844,538.2562 C709.6719,538.2562 709.4688,538.3656 709.25,538.6312 C708.0781,538.1312 707.6406,538.0219 706.6875,538.0219 C704.0156,538.0219 702,540.0375 702,542.6625 L702,543.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="721" y="547.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="70" x="738" y="523.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="68" x="739" y="537.8001">M (C::*)(Arg)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="693" x2="804" y1="558.6" y2="558.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="693" x2="804" y1="566.6" y2="566.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="698" y="575.5"/>
-          <ellipse cx="703" cy="580.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="712" y="583.6059">c : C &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="698" y="592.2999"/>
-          <ellipse cx="703" cy="597.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="712" y="600.4059">m : M C::*</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001379193770802992785" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="509.5" y="8"/>
+      <ellipse cx="524.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M527.4688,29.6406 Q526.8906,29.9375 526.25,30.0781 Q525.6094,30.2344 524.9063,30.2344 Q522.4063,30.2344 521.0781,28.5938 Q519.7656,26.9375 519.7656,23.8125 Q519.7656,20.6875 521.0781,19.0313 Q522.4063,17.375 524.9063,17.375 Q525.6094,17.375 526.25,17.5313 Q526.9063,17.6875 527.4688,17.9844 L527.4688,20.7031 Q526.8438,20.125 526.25,19.8594 Q525.6563,19.5781 525.0313,19.5781 Q523.6875,19.5781 523,20.6563 Q522.3125,21.7188 522.3125,23.8125 Q522.3125,25.9063 523,26.9844 Q523.6875,28.0469 525.0313,28.0469 Q525.6563,28.0469 526.25,27.7813 Q526.8438,27.5 527.4688,26.9219 L527.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="538.5" y="28.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="75" x="554.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="555.5" y="17.1387">U * * const*</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000476497055497873078">
-        <rect codeLine="60" fill="#F1F1F1" height="64.7999" id="C_0000476497055497873078" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="121" x="434.5" y="535"/>
-        <ellipse cx="449.5" cy="551" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M444.5,552.1563 C444.5,554.6563 446.6406,556.4688 449.5625,556.4688 C450.7969,556.4688 451.9688,556.1719 452.7188,555.6563 C453.3281,555.2344 453.6563,554.8125 453.6563,554.4063 C453.6563,553.9375 453.2344,553.5313 452.7344,553.5313 C452.5,553.5313 452.2813,553.6094 452.0781,553.8125 C451.6406,554.25 451.6406,554.25 451.4688,554.3438 C451.0156,554.5781 450.375,554.7188 449.6094,554.7188 C447.6094,554.7188 446.3281,553.7031 446.3281,552.125 L446.3281,551.0781 C446.3281,549.375 447.5469,548.1719 449.25,548.1719 C449.8281,548.1719 450.4063,548.3125 450.875,548.5625 C451.3438,548.8281 451.5156,549.0156 451.5781,549.375 C451.7031,550.0469 451.9531,550.2969 452.4844,550.2969 C452.7656,550.2969 453.0469,550.1563 453.2344,549.9375 C453.3594,549.7656 453.4063,549.5938 453.4063,549.1563 L453.4063,547.7969 C453.4063,547.375 453.3906,547.2344 453.2656,547.0625 C453.0938,546.8125 452.8125,546.6563 452.4844,546.6563 C452.1719,546.6563 451.9688,546.7656 451.75,547.0313 C450.5781,546.5313 450.1406,546.4219 449.1875,546.4219 C446.5156,546.4219 444.5,548.4375 444.5,551.0625 L444.5,552.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="463.5" y="555.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="78" x="480.5" y="532"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="76" x="481.5" y="546.2001">int (C::*)(bool)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="435.5" x2="554.5" y1="567" y2="567"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="435.5" x2="554.5" y1="575" y2="575"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="440.5" y="583.9"/>
-          <ellipse cx="445.5" cy="588.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="454.5" y="592.0059">c : C &amp;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="515.5" y="54"/>
+      <ellipse cx="520.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001619634759668095904">
-        <rect codeLine="65" fill="#F1F1F1" height="81.5999" id="C_0001619634759668095904" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="132" x="429" y="272.6"/>
-        <ellipse cx="444" cy="288.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M439,289.7562 C439,292.2562 441.1406,294.0687 444.0625,294.0687 C445.2969,294.0687 446.4688,293.7719 447.2188,293.2562 C447.8281,292.8344 448.1563,292.4125 448.1563,292.0062 C448.1563,291.5375 447.7344,291.1312 447.2344,291.1312 C447,291.1312 446.7813,291.2094 446.5781,291.4125 C446.1406,291.85 446.1406,291.85 445.9688,291.9437 C445.5156,292.1781 444.875,292.3187 444.1094,292.3187 C442.1094,292.3187 440.8281,291.3031 440.8281,289.725 L440.8281,288.6781 C440.8281,286.975 442.0469,285.7719 443.75,285.7719 C444.3281,285.7719 444.9063,285.9125 445.375,286.1625 C445.8438,286.4281 446.0156,286.6156 446.0781,286.975 C446.2031,287.6469 446.4531,287.8969 446.9844,287.8969 C447.2656,287.8969 447.5469,287.7562 447.7344,287.5375 C447.8594,287.3656 447.9063,287.1937 447.9063,286.7562 L447.9063,285.3969 C447.9063,284.975 447.8906,284.8344 447.7656,284.6625 C447.5938,284.4125 447.3125,284.2562 446.9844,284.2562 C446.6719,284.2562 446.4688,284.3656 446.25,284.6312 C445.0781,284.1312 444.6406,284.0219 443.6875,284.0219 C441.0156,284.0219 439,286.0375 439,288.6625 L439,289.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="458" y="293.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="89" x="475" y="269.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="87" x="476" y="283.8001">M (C::*)(Arg) &amp;&amp;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="430" x2="560" y1="304.6" y2="304.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="430" x2="560" y1="312.6" y2="312.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="435" y="321.5"/>
-          <ellipse cx="440" cy="326.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="449" y="329.6059">c : C &amp;&amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="435" y="338.2999"/>
-          <ellipse cx="440" cy="343.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="449" y="346.4059">m : M C::*</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="529.5" y="62.2104">u : U ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001357746808315142717">
-        <rect codeLine="71" fill="#F1F1F1" height="81.5999" id="C_0001357746808315142717" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="106.5" y="272.6"/>
-        <ellipse cx="121.5" cy="288.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M116.5,289.7562 C116.5,292.2562 118.6406,294.0687 121.5625,294.0687 C122.7969,294.0687 123.9688,293.7719 124.7188,293.2562 C125.3281,292.8344 125.6563,292.4125 125.6563,292.0062 C125.6563,291.5375 125.2344,291.1312 124.7344,291.1312 C124.5,291.1312 124.2813,291.2094 124.0781,291.4125 C123.6406,291.85 123.6406,291.85 123.4688,291.9437 C123.0156,292.1781 122.375,292.3187 121.6094,292.3187 C119.6094,292.3187 118.3281,291.3031 118.3281,289.725 L118.3281,288.6781 C118.3281,286.975 119.5469,285.7719 121.25,285.7719 C121.8281,285.7719 122.4063,285.9125 122.875,286.1625 C123.3438,286.4281 123.5156,286.6156 123.5781,286.975 C123.7031,287.6469 123.9531,287.8969 124.4844,287.8969 C124.7656,287.8969 125.0469,287.7562 125.2344,287.5375 C125.3594,287.3656 125.4063,287.1937 125.4063,286.7562 L125.4063,285.3969 C125.4063,284.975 125.3906,284.8344 125.2656,284.6625 C125.0938,284.4125 124.8125,284.2562 124.4844,284.2562 C124.1719,284.2562 123.9688,284.3656 123.75,284.6312 C122.5781,284.1312 122.1406,284.0219 121.1875,284.0219 C118.5156,284.0219 116.5,286.0375 116.5,288.6625 L116.5,289.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="135.5" y="293.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="96" x="152.5" y="269.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="94" x="153.5" y="283.8001">float (C::*)(int) &amp;&amp;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="107.5" x2="244.5" y1="304.6" y2="304.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="107.5" x2="244.5" y1="312.6" y2="312.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="112.5" y="321.5"/>
-          <ellipse cx="117.5" cy="326.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="51" x="126.5" y="329.6059">c : C &amp;&amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="112.5" y="338.2999"/>
-          <ellipse cx="117.5" cy="343.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="126.5" y="346.4059">mf : float C::*</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001407865337446777280" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="731" y="104"/>
+      <ellipse cx="746" cy="120" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M748.9688,125.6406 Q748.3906,125.9375 747.75,126.0781 Q747.1094,126.2344 746.4063,126.2344 Q743.9063,126.2344 742.5781,124.5938 Q741.2656,122.9375 741.2656,119.8125 Q741.2656,116.6875 742.5781,115.0313 Q743.9063,113.375 746.4063,113.375 Q747.1094,113.375 747.75,113.5313 Q748.4063,113.6875 748.9688,113.9844 L748.9688,116.7031 Q748.3438,116.125 747.75,115.8594 Q747.1563,115.5781 746.5313,115.5781 Q745.1875,115.5781 744.5,116.6563 Q743.8125,117.7188 743.8125,119.8125 Q743.8125,121.9063 744.5,122.9844 Q745.1875,124.0469 746.5313,124.0469 Q747.1563,124.0469 747.75,123.7813 Q748.3438,123.5 748.9688,122.9219 L748.9688,125.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="760" y="124.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="189" x="776" y="101"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="187" x="777" y="113.1387">U const volatile* const volatile</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="136" y2="136"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="144" y2="144"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000544335779197078982">
-        <rect codeLine="77" fill="#F1F1F1" height="81.5999" id="C_0000544335779197078982" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="178" x="659.5" y="643.6"/>
-        <ellipse cx="674.5" cy="659.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M669.5,660.7562 C669.5,663.2562 671.6406,665.0687 674.5625,665.0687 C675.7969,665.0687 676.9688,664.7719 677.7188,664.2562 C678.3281,663.8344 678.6563,663.4125 678.6563,663.0062 C678.6563,662.5375 678.2344,662.1312 677.7344,662.1312 C677.5,662.1312 677.2813,662.2094 677.0781,662.4125 C676.6406,662.85 676.6406,662.85 676.4688,662.9437 C676.0156,663.1781 675.375,663.3187 674.6094,663.3187 C672.6094,663.3187 671.3281,662.3031 671.3281,660.725 L671.3281,659.6781 C671.3281,657.975 672.5469,656.7719 674.25,656.7719 C674.8281,656.7719 675.4063,656.9125 675.875,657.1625 C676.3438,657.4281 676.5156,657.6156 676.5781,657.975 C676.7031,658.6469 676.9531,658.8969 677.4844,658.8969 C677.7656,658.8969 678.0469,658.7562 678.2344,658.5375 C678.3594,658.3656 678.4063,658.1937 678.4063,657.7562 L678.4063,656.3969 C678.4063,655.975 678.3906,655.8344 678.2656,655.6625 C678.0938,655.4125 677.8125,655.2562 677.4844,655.2562 C677.1719,655.2562 676.9688,655.3656 676.75,655.6312 C675.5781,655.1312 675.1406,655.0219 674.1875,655.0219 C671.5156,655.0219 669.5,657.0375 669.5,659.6625 L669.5,660.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="688.5" y="664.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="135" x="705.5" y="640.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="133" x="706.5" y="654.8001">M (C::*)(Arg1,Arg2,Arg3)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="660.5" x2="836.5" y1="675.6" y2="675.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="660.5" x2="836.5" y1="683.6" y2="683.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="665.5" y="692.5"/>
-          <ellipse cx="670.5" cy="697.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="679.5" y="700.6059">c : C &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="665.5" y="709.2999"/>
-          <ellipse cx="670.5" cy="714.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="679.5" y="717.4059">m : M C::*</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="737" y="150"/>
+      <ellipse cx="742" cy="155" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000602066980416477930">
-        <rect codeLine="83" fill="#F1F1F1" height="64.7999" id="C_0000602066980416477930" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="92" x="702.5" y="760"/>
-        <ellipse cx="721.1" cy="776" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M716.1,777.1563 C716.1,779.6563 718.2406,781.4688 721.1625,781.4688 C722.3969,781.4688 723.5688,781.1719 724.3188,780.6563 C724.9281,780.2344 725.2563,779.8125 725.2563,779.4063 C725.2563,778.9375 724.8344,778.5313 724.3344,778.5313 C724.1,778.5313 723.8813,778.6094 723.6781,778.8125 C723.2406,779.25 723.2406,779.25 723.0688,779.3438 C722.6156,779.5781 721.975,779.7188 721.2094,779.7188 C719.2094,779.7188 717.9281,778.7031 717.9281,777.125 L717.9281,776.0781 C717.9281,774.375 719.1469,773.1719 720.85,773.1719 C721.4281,773.1719 722.0063,773.3125 722.475,773.5625 C722.9438,773.8281 723.1156,774.0156 723.1781,774.375 C723.3031,775.0469 723.5531,775.2969 724.0844,775.2969 C724.3656,775.2969 724.6469,775.1563 724.8344,774.9375 C724.9594,774.7656 725.0063,774.5938 725.0063,774.1563 L725.0063,772.7969 C725.0063,772.375 724.9906,772.2344 724.8656,772.0625 C724.6938,771.8125 724.4125,771.6563 724.0844,771.6563 C723.7719,771.6563 723.5688,771.7656 723.35,772.0313 C722.1781,771.5313 721.7406,771.4219 720.7875,771.4219 C718.1156,771.4219 716.1,773.4375 716.1,776.0625 L716.1,777.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="735.9" y="780.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="41" x="756.5" y="757"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="39" x="757.5" y="771.2001">char[N]</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="703.5" x2="793.5" y1="792" y2="792"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="703.5" x2="793.5" y1="800" y2="800"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="708.5" y="808.9"/>
-          <ellipse cx="713.5" cy="813.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="722.5" y="817.0059">n : char[N]</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="751" y="158.2104">u : U ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001318419672443856415">
-        <rect codeLine="88" fill="#F1F1F1" height="64.7999" id="C_0001318419672443856415" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="156" x="417" y="760"/>
-        <ellipse cx="455.85" cy="776" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M450.85,777.1563 C450.85,779.6563 452.9906,781.4688 455.9125,781.4688 C457.1469,781.4688 458.3188,781.1719 459.0688,780.6563 C459.6781,780.2344 460.0063,779.8125 460.0063,779.4063 C460.0063,778.9375 459.5844,778.5313 459.0844,778.5313 C458.85,778.5313 458.6313,778.6094 458.4281,778.8125 C457.9906,779.25 457.9906,779.25 457.8188,779.3438 C457.3656,779.5781 456.725,779.7188 455.9594,779.7188 C453.9594,779.7188 452.6781,778.7031 452.6781,777.125 L452.6781,776.0781 C452.6781,774.375 453.8969,773.1719 455.6,773.1719 C456.1781,773.1719 456.7563,773.3125 457.225,773.5625 C457.6938,773.8281 457.8656,774.0156 457.9281,774.375 C458.0531,775.0469 458.3031,775.2969 458.8344,775.2969 C459.1156,775.2969 459.3969,775.1563 459.5844,774.9375 C459.7094,774.7656 459.7563,774.5938 459.7563,774.1563 L459.7563,772.7969 C459.7563,772.375 459.7406,772.2344 459.6156,772.0625 C459.4438,771.8125 459.1625,771.6563 458.8344,771.6563 C458.5219,771.6563 458.3188,771.7656 458.1,772.0313 C456.9281,771.5313 456.4906,771.4219 455.5375,771.4219 C452.8656,771.4219 450.85,773.4375 450.85,776.0625 L450.85,777.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="475.15" y="780.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="60" x="516" y="757"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="58" x="517" y="771.2001">char[1000]</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="418" x2="572" y1="792" y2="792"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="418" x2="572" y1="800" y2="800"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="423" y="808.9"/>
-          <ellipse cx="428" cy="813.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="130" x="437" y="817.0059">n : std::vector&lt;char&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="808" y="200"/>
+      <ellipse cx="823.9" cy="216" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M826.8688,221.6406 Q826.2906,221.9375 825.65,222.0781 Q825.0094,222.2344 824.3063,222.2344 Q821.8063,222.2344 820.4781,220.5938 Q819.1656,218.9375 819.1656,215.8125 Q819.1656,212.6875 820.4781,211.0313 Q821.8063,209.375 824.3063,209.375 Q825.0094,209.375 825.65,209.5313 Q826.3063,209.6875 826.8688,209.9844 L826.8688,212.7031 Q826.2438,212.125 825.65,211.8594 Q825.0563,211.5781 824.4313,211.5781 Q823.0875,211.5781 822.4,212.6563 Q821.7125,213.7188 821.7125,215.8125 Q821.7125,217.9063 822.4,218.9844 Q823.0875,220.0469 824.4313,220.0469 Q825.0563,220.0469 825.65,219.7813 Q826.2438,219.5 826.8688,218.9219 L826.8688,221.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838.1" y="220.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="33" x="855" y="197"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="31" x="856" y="209.1387">U &amp;&amp;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="232" y2="232"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="240" y2="240"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000599593856979463652">
-        <rect codeLine="93" fill="#F1F1F1" height="64.7999" id="C_0000599593856979463652" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="141" x="678" y="860"/>
-        <ellipse cx="706.05" cy="876" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M701.05,877.1563 C701.05,879.6563 703.1906,881.4688 706.1125,881.4688 C707.3469,881.4688 708.5188,881.1719 709.2688,880.6563 C709.8781,880.2344 710.2063,879.8125 710.2063,879.4063 C710.2063,878.9375 709.7844,878.5313 709.2844,878.5313 C709.05,878.5313 708.8313,878.6094 708.6281,878.8125 C708.1906,879.25 708.1906,879.25 708.0188,879.3438 C707.5656,879.5781 706.925,879.7188 706.1594,879.7188 C704.1594,879.7188 702.8781,878.7031 702.8781,877.125 L702.8781,876.0781 C702.8781,874.375 704.0969,873.1719 705.8,873.1719 C706.3781,873.1719 706.9563,873.3125 707.425,873.5625 C707.8938,873.8281 708.0656,874.0156 708.1281,874.375 C708.2531,875.0469 708.5031,875.2969 709.0344,875.2969 C709.3156,875.2969 709.5969,875.1563 709.7844,874.9375 C709.9094,874.7656 709.9563,874.5938 709.9563,874.1563 L709.9563,872.7969 C709.9563,872.375 709.9406,872.2344 709.8156,872.0625 C709.6438,871.8125 709.3625,871.6563 709.0344,871.6563 C708.7219,871.6563 708.5188,871.7656 708.3,872.0313 C707.1281,871.5313 706.6906,871.4219 705.7375,871.4219 C703.0656,871.4219 701.05,873.4375 701.05,876.0625 L701.05,877.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="722.95" y="880.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="69" x="753" y="857"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="67" x="754" y="871.2001">char[M][L][K]</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="679" x2="818" y1="892" y2="892"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="679" x2="818" y1="900" y2="900"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="684" y="908.9"/>
-          <ellipse cx="689" cy="913.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="698" y="917.0059">klm : char[K][L][M]</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="814" y="246"/>
+      <ellipse cx="819" cy="251" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000015395295268000991">
-        <rect codeLine="98" fill="#F1F1F1" height="64.7999" id="C_0000015395295268000991" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="73" x="712" y="960"/>
-        <ellipse cx="727.9" cy="976" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M722.9,977.1563 C722.9,979.6563 725.0406,981.4688 727.9625,981.4688 C729.1969,981.4688 730.3688,981.1719 731.1188,980.6563 C731.7281,980.2344 732.0563,979.8125 732.0563,979.4063 C732.0563,978.9375 731.6344,978.5313 731.1344,978.5313 C730.9,978.5313 730.6813,978.6094 730.4781,978.8125 C730.0406,979.25 730.0406,979.25 729.8688,979.3438 C729.4156,979.5781 728.775,979.7188 728.0094,979.7188 C726.0094,979.7188 724.7281,978.7031 724.7281,977.125 L724.7281,976.0781 C724.7281,974.375 725.9469,973.1719 727.65,973.1719 C728.2281,973.1719 728.8063,973.3125 729.275,973.5625 C729.7438,973.8281 729.9156,974.0156 729.9781,974.375 C730.1031,975.0469 730.3531,975.2969 730.8844,975.2969 C731.1656,975.2969 731.4469,975.1563 731.6344,974.9375 C731.7594,974.7656 731.8063,974.5938 731.8063,974.1563 L731.8063,972.7969 C731.8063,972.375 731.7906,972.2344 731.6656,972.0625 C731.4938,971.8125 731.2125,971.6563 730.8844,971.6563 C730.5719,971.6563 730.3688,971.7656 730.15,972.0313 C728.9781,971.5313 728.5406,971.4219 727.5875,971.4219 C724.9156,971.4219 722.9,973.4375 722.9,976.0625 L722.9,977.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="742.1" y="980.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="28" x="760" y="957"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="26" x="761" y="971.2001">U(...)</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="713" x2="784" y1="992" y2="992"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="713" x2="784" y1="1000" y2="1000"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="718" y="1008.9"/>
-          <ellipse cx="723" cy="1013.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="732" y="1017.0059">u : bool</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="828" y="254.2104">u : U &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001603321863498552207">
-        <rect codeLine="103" fill="#F1F1F1" height="64.7999" id="C_0001603321863498552207" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="708.5" y="1060"/>
-        <ellipse cx="725.75" cy="1076" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M720.75,1077.1563 C720.75,1079.6563 722.8906,1081.4688 725.8125,1081.4688 C727.0469,1081.4688 728.2188,1081.1719 728.9688,1080.6563 C729.5781,1080.2344 729.9063,1079.8125 729.9063,1079.4063 C729.9063,1078.9375 729.4844,1078.5313 728.9844,1078.5313 C728.75,1078.5313 728.5313,1078.6094 728.3281,1078.8125 C727.8906,1079.25 727.8906,1079.25 727.7188,1079.3438 C727.2656,1079.5781 726.625,1079.7188 725.8594,1079.7188 C723.8594,1079.7188 722.5781,1078.7031 722.5781,1077.125 L722.5781,1076.0781 C722.5781,1074.375 723.7969,1073.1719 725.5,1073.1719 C726.0781,1073.1719 726.6563,1073.3125 727.125,1073.5625 C727.5938,1073.8281 727.7656,1074.0156 727.8281,1074.375 C727.9531,1075.0469 728.2031,1075.2969 728.7344,1075.2969 C729.0156,1075.2969 729.2969,1075.1563 729.4844,1074.9375 C729.6094,1074.7656 729.6563,1074.5938 729.6563,1074.1563 L729.6563,1072.7969 C729.6563,1072.375 729.6406,1072.2344 729.5156,1072.0625 C729.3438,1071.8125 729.0625,1071.6563 728.7344,1071.6563 C728.4219,1071.6563 728.2188,1071.7656 728,1072.0313 C726.8281,1071.5313 726.3906,1071.4219 725.4375,1071.4219 C722.7656,1071.4219 720.75,1073.4375 720.75,1076.0625 L720.75,1077.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="740.25" y="1080.606">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="32" x="759.5" y="1057"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="30" x="760.5" y="1071.2001">C&lt;T&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="709.5" x2="787.5" y1="1092" y2="1092"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="709.5" x2="787.5" y1="1100" y2="1100"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="714.5" y="1108.9"/>
-          <ellipse cx="719.5" cy="1113.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="728.5" y="1117.0059">c : C&lt;T&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000352457857519671117" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="795.5" y="296"/>
+      <ellipse cx="811.4" cy="312" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M814.3688,317.6406 Q813.7906,317.9375 813.15,318.0781 Q812.5094,318.2344 811.8063,318.2344 Q809.3063,318.2344 807.9781,316.5938 Q806.6656,314.9375 806.6656,311.8125 Q806.6656,308.6875 807.9781,307.0313 Q809.3063,305.375 811.8063,305.375 Q812.5094,305.375 813.15,305.5313 Q813.8063,305.6875 814.3688,305.9844 L814.3688,308.7031 Q813.7438,308.125 813.15,307.8594 Q812.5563,307.5781 811.9313,307.5781 Q810.5875,307.5781 809.9,308.6563 Q809.2125,309.7188 809.2125,311.8125 Q809.2125,313.9063 809.9,314.9844 Q810.5875,316.0469 811.9313,316.0469 Q812.5563,316.0469 813.15,315.7813 Q813.7438,315.5 814.3688,314.9219 L814.3688,317.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.6" y="316.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="58" x="842.5" y="293"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="843.5" y="305.1387">U const&amp;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="328" y2="328"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000232518961342221670">
-        <rect codeLine="108" fill="#F1F1F1" height="81.5999" id="C_0000232518961342221670" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="181" x="658" y="1159.6"/>
-        <ellipse cx="704.25" cy="1175.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M699.25,1176.7563 C699.25,1179.2563 701.3906,1181.0688 704.3125,1181.0688 C705.5469,1181.0688 706.7188,1180.7719 707.4688,1180.2563 C708.0781,1179.8344 708.4063,1179.4125 708.4063,1179.0063 C708.4063,1178.5375 707.9844,1178.1313 707.4844,1178.1313 C707.25,1178.1313 707.0313,1178.2094 706.8281,1178.4125 C706.3906,1178.85 706.3906,1178.85 706.2188,1178.9438 C705.7656,1179.1781 705.125,1179.3188 704.3594,1179.3188 C702.3594,1179.3188 701.0781,1178.3031 701.0781,1176.725 L701.0781,1175.6781 C701.0781,1173.975 702.2969,1172.7719 704,1172.7719 C704.5781,1172.7719 705.1563,1172.9125 705.625,1173.1625 C706.0938,1173.4281 706.2656,1173.6156 706.3281,1173.975 C706.4531,1174.6469 706.7031,1174.8969 707.2344,1174.8969 C707.5156,1174.8969 707.7969,1174.7563 707.9844,1174.5375 C708.1094,1174.3656 708.1563,1174.1938 708.1563,1173.7563 L708.1563,1172.3969 C708.1563,1171.975 708.1406,1171.8344 708.0156,1171.6625 C707.8438,1171.4125 707.5625,1171.2563 707.2344,1171.2563 C706.9219,1171.2563 706.7188,1171.3656 706.5,1171.6313 C705.3281,1171.1313 704.8906,1171.0219 703.9375,1171.0219 C701.2656,1171.0219 699.25,1173.0375 699.25,1175.6625 L699.25,1176.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="724.75" y="1180.206">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="69" x="773" y="1156.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="67" x="774" y="1170.8001">C&lt;T,Args...&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="659" x2="838" y1="1191.6" y2="1191.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="659" x2="838" y1="1199.6" y2="1199.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="664" y="1208.5"/>
-          <ellipse cx="669" cy="1213.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="678" y="1216.6059">args : std::tuple&lt;Args...&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="664" y="1225.2999"/>
-          <ellipse cx="669" cy="1230.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="678" y="1233.4059">c : C&lt;T&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="342"/>
+      <ellipse cx="806.5" cy="347" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000121103565834936476">
-        <rect codeLine="114" fill="#F1F1F1" height="48" id="C_0000121103565834936476" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="52" x="912" y="660.4"/>
-        <ellipse cx="927" cy="676.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M922,677.5563 C922,680.0563 924.1406,681.8688 927.0625,681.8688 C928.2969,681.8688 929.4688,681.5719 930.2188,681.0563 C930.8281,680.6344 931.1563,680.2125 931.1563,679.8063 C931.1563,679.3375 930.7344,678.9313 930.2344,678.9313 C930,678.9313 929.7813,679.0094 929.5781,679.2125 C929.1406,679.65 929.1406,679.65 928.9688,679.7438 C928.5156,679.9781 927.875,680.1188 927.1094,680.1188 C925.1094,680.1188 923.8281,679.1031 923.8281,677.525 L923.8281,676.4781 C923.8281,674.775 925.0469,673.5719 926.75,673.5719 C927.3281,673.5719 927.9063,673.7125 928.375,673.9625 C928.8438,674.2281 929.0156,674.4156 929.0781,674.775 C929.2031,675.4469 929.4531,675.6969 929.9844,675.6969 C930.2656,675.6969 930.5469,675.5563 930.7344,675.3375 C930.8594,675.1656 930.9063,674.9938 930.9063,674.5563 L930.9063,673.1969 C930.9063,672.775 930.8906,672.6344 930.7656,672.4625 C930.5938,672.2125 930.3125,672.0563 929.9844,672.0563 C929.6719,672.0563 929.4688,672.1656 929.25,672.4313 C928.0781,671.9313 927.6406,671.8219 926.6875,671.8219 C924.0156,671.8219 922,673.8375 922,676.4625 L922,677.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="941" y="681.006">A</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="958" y="657.4"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="959" y="671.6001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="913" x2="963" y1="692.4" y2="692.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="913" x2="963" y1="700.4" y2="700.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="815.5" y="350.2104">u : const U &amp;</text>
     </a>
-    <g id="link_C_0001046827200300090710_C_0000121103565834936476">
-      <path codeLine="117" d="M783.48,1300.68 C806.51,1293.62 835.62,1280.77 852,1258.4 C917.76,1168.58 932.7705,824.0513 935.8005,726.6113 " fill="none" id="C_0001046827200300090710-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="936.36,708.62,929.8034,726.4248,941.7976,726.7978,936.36,708.62" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001099548178945911245_C_0001046827200300090710">
-      <path codeLine="118" d="M585.38,1308.4 C629.85,1308.4 662.97,1308.4 695.72,1308.4 " fill="none" id="C_0001099548178945911245-to-C_0001046827200300090710" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="713.72,1308.4,695.72,1302.4,695.72,1314.4,713.72,1308.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001239388209995793547_C_0001099548178945911245">
-      <path codeLine="119" d="M345.25,1308.4 C365.7,1308.4 367.93,1308.4 386.58,1308.4 " fill="none" id="C_0001239388209995793547-to-C_0001099548178945911245" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="404.58,1308.4,386.58,1302.4,386.58,1314.4,404.58,1308.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045701897814162098_C_0000121103565834936476">
-      <path codeLine="120" d="M783.51,50.1 C806.55,57.15 835.67,70 852,92.4 C919.73,185.33 933.4233,542.6461 936.0033,642.1161 " fill="none" id="C_0000045701897814162098-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="936.47,660.11,942.0013,641.9605,930.0053,642.2716,936.47,660.11" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001379193770802992785_C_0000045701897814162098">
-      <path codeLine="121" d="M548.72,42.4 C598.27,42.4 652.97,42.4 695.34,42.4 " fill="none" id="C_0001379193770802992785-to-C_0000045701897814162098" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="713.34,42.4,695.34,36.4,695.34,48.4,713.34,42.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001407865337446777280_C_0000121103565834936476">
-      <path codeLine="122" d="M834.64,175.23 C841.18,180.21 847.13,185.91 852,192.4 C908.73,267.96 929.4219,553.6411 934.6319,642.1211 " fill="none" id="C_0001407865337446777280-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="935.69,660.09,940.6216,641.7684,928.6423,642.4738,935.69,660.09" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001034483227649400416_C_0000121103565834936476">
-      <path codeLine="123" d="M787.75,252.01 C809.73,259.48 836.05,272.07 852,292.4 C897.83,350.82 924.36,566.0238 932.58,642.2438 " fill="none" id="C_0001034483227649400416-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="934.51,660.14,938.5454,641.6004,926.6146,642.8871,934.51,660.14" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000352457857519671117_C_0000121103565834936476">
-      <path codeLine="124" d="M802.29,358.26 C820.26,365.99 839.05,377.03 852,392.4 C920.04,473.16 932.7584,587.9721 935.4484,642.2121 " fill="none" id="C_0000352457857519671117-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="936.34,660.19,941.441,641.9149,929.4558,642.5093,936.34,660.19" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000314708288320430272_C_0000121103565834936476">
-      <path codeLine="125" d="M793.36,468.41 C813.19,478.23 835.76,491.98 852,509.4 C893.8,554.24 913.8013,606.2453 924.9513,642.7453 " fill="none" id="C_0000314708288320430272-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="930.21,659.96,930.6895,640.9924,919.213,644.4982,930.21,659.96" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000827753335392390402_C_0001034483227649400416">
-      <path codeLine="126" d="M543.9,205.16 C591.93,213.95 647.2335,224.0625 691.5335,232.1625 " fill="none" id="C_0000827753335392390402-to-C_0001034483227649400416" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="709.24,235.4,692.6127,226.2603,690.4544,238.0646,709.24,235.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000395583480407686249_C_0000121103565834936476">
-      <path codeLine="127" d="M805.28,598.48 C820.57,607.27 837.04,617.01 852,626.4 C872.43,639.22 880.2105,644.3182 896.9305,656.0382 " fill="none" id="C_0000395583480407686249-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="911.67,666.37,900.3744,651.125,893.4865,660.9514,911.67,666.37" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000476497055497873078_C_0000395583480407686249">
-      <path codeLine="128" d="M555.92,567.4 C597.18,567.4 633.61,567.4 673.91,567.4 " fill="none" id="C_0000476497055497873078-to-C_0000395583480407686249" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="691.91,567.4,673.91,561.4,673.91,573.4,691.91,567.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001619634759668095904_C_0001034483227649400416">
-      <path codeLine="129" d="M561.42,294.93 C608.29,281.7 652.476,269.2166 691.686,258.1566 " fill="none" id="C_0001619634759668095904-to-C_0001034483227649400416" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="709.01,253.27,690.0571,252.3819,693.3149,263.9313,709.01,253.27" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001357746808315142717_C_0001619634759668095904">
-      <path codeLine="130" d="M245.78,313.4 C300.05,313.4 357.23,313.4 410.6,313.4 " fill="none" id="C_0001357746808315142717-to-C_0001619634759668095904" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="428.6,313.4,410.6,307.4,410.6,319.4,428.6,313.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000544335779197078982_C_0000121103565834936476">
-      <path codeLine="131" d="M837.76,684.4 C864.74,684.4 874.32,684.4 893.54,684.4 " fill="none" id="C_0000544335779197078982-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="911.54,684.4,893.54,678.4,893.54,690.4,911.54,684.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000602066980416477930_C_0000121103565834936476">
-      <path codeLine="132" d="M794.89,772 C812.97,763.43 833.77,752.99 852,742.4 C872.7,730.37 880.3913,725.5382 896.9613,713.6582 " fill="none" id="C_0000602066980416477930-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="911.59,703.17,893.4653,708.7819,900.4574,718.5344,911.59,703.17" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001318419672443856415_C_0000602066980416477930">
-      <path codeLine="133" d="M573.17,792.4 C615.47,792.4 648.45,792.4 684.32,792.4 " fill="none" id="C_0001318419672443856415-to-C_0000602066980416477930" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="702.32,792.4,684.32,786.4,684.32,798.4,702.32,792.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000599593856979463652_C_0000121103565834936476">
-      <path codeLine="134" d="M819.24,865.77 C831.03,859.28 842.51,851.52 852,842.4 C891.98,803.98 911.5129,759.5927 923.3329,725.7627 " fill="none" id="C_0000599593856979463652-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="929.27,708.77,917.6686,723.7836,928.9971,727.7417,929.27,708.77" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000015395295268000991_C_0000121103565834936476">
-      <path codeLine="135" d="M785.26,982.78 C807.29,975.15 834.55,962.39 852,942.4 C912.78,872.76 928.5618,776.4339 933.4418,726.7139 " fill="none" id="C_0000015395295268000991-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="935.2,708.8,927.4704,726.1278,939.4131,727.3,935.2,708.8" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001603321863498552207_C_0000121103565834936476">
-      <path codeLine="136" d="M788.87,1082.24 C810.54,1074.69 836.16,1062.19 852,1042.4 C894.12,989.79 922.216,798.548 931.616,726.668 " fill="none" id="C_0001603321863498552207-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="933.95,708.82,925.6666,725.89,937.5653,727.446,933.95,708.82" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000232518961342221670_C_0000121103565834936476">
-      <path codeLine="137" d="M836.55,1159.21 C842.34,1154.15 847.61,1148.56 852,1142.4 C902.84,1071.13 927.0519,810.7833 933.7519,726.6033 " fill="none" id="C_0000232518961342221670-to-C_0000121103565834936476" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="935.18,708.66,927.7708,726.1272,939.733,727.0793,935.18,708.66" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000314708288320430272" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="804.5" y="392.5"/>
+      <ellipse cx="821.3" cy="408.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M824.2688,414.1406 Q823.6906,414.4375 823.05,414.5781 Q822.4094,414.7344 821.7063,414.7344 Q819.2063,414.7344 817.8781,413.0938 Q816.5656,411.4375 816.5656,408.3125 Q816.5656,405.1875 817.8781,403.5313 Q819.2063,401.875 821.7063,401.875 Q822.4094,401.875 823.05,402.0313 Q823.7063,402.1875 824.2688,402.4844 L824.2688,405.2031 Q823.6438,404.625 823.05,404.3594 Q822.4563,404.0781 821.8313,404.0781 Q820.4875,404.0781 819.8,405.1563 Q819.1125,406.2188 819.1125,408.3125 Q819.1125,410.4063 819.8,411.4844 Q820.4875,412.5469 821.8313,412.5469 Q822.4563,412.5469 823.05,412.2813 Q823.6438,412 824.2688,411.4219 L824.2688,414.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="835.7" y="412.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="38" x="853.5" y="389.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="854.5" y="401.6387">M C::*</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="424.5" y2="424.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="432.5" y2="432.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="438.5"/>
+      <ellipse cx="815.5" cy="443.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="824.5" y="446.7104">c : C &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="451.3047"/>
+      <ellipse cx="815.5" cy="456.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="824.5" y="459.5151">m : M C::*</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000827753335392390402" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="517" y="149.5"/>
+      <ellipse cx="532" cy="165.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M534.9688,171.1406 Q534.3906,171.4375 533.75,171.5781 Q533.1094,171.7344 532.4063,171.7344 Q529.9063,171.7344 528.5781,170.0938 Q527.2656,168.4375 527.2656,165.3125 Q527.2656,162.1875 528.5781,160.5313 Q529.9063,158.875 532.4063,158.875 Q533.1094,158.875 533.75,159.0313 Q534.4063,159.1875 534.9688,159.4844 L534.9688,162.2031 Q534.3438,161.625 533.75,161.3594 Q533.1563,161.0781 532.5313,161.0781 Q531.1875,161.0781 530.5,162.1563 Q529.8125,163.2188 529.8125,165.3125 Q529.8125,167.4063 530.5,168.4844 Q531.1875,169.5469 532.5313,169.5469 Q533.1563,169.5469 533.75,169.2813 Q534.3438,169 534.9688,168.4219 L534.9688,171.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="546" y="169.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="60" x="562" y="146.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="58" x="563" y="158.6387">M C::* &amp;&amp;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="181.5" y2="181.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="189.5" y2="189.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="195.5"/>
+      <ellipse cx="528" cy="200.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="537" y="203.7104">c : C &amp;&amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="208.3047"/>
+      <ellipse cx="528" cy="213.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="537" y="216.5151">m : M C::*</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="786" y="501.5"/>
+      <ellipse cx="801" cy="517.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M803.9688,523.1406 Q803.3906,523.4375 802.75,523.5781 Q802.1094,523.7344 801.4063,523.7344 Q798.9063,523.7344 797.5781,522.0938 Q796.2656,520.4375 796.2656,517.3125 Q796.2656,514.1875 797.5781,512.5313 Q798.9063,510.875 801.4063,510.875 Q802.1094,510.875 802.75,511.0313 Q803.4063,511.1875 803.9688,511.4844 L803.9688,514.2031 Q803.3438,513.625 802.75,513.3594 Q802.1563,513.0781 801.5313,513.0781 Q800.1875,513.0781 799.5,514.1563 Q798.8125,515.2188 798.8125,517.3125 Q798.8125,519.4063 799.5,520.4844 Q800.1875,521.5469 801.5313,521.5469 Q802.1563,521.5469 802.75,521.2813 Q803.3438,521 803.9688,520.4219 L803.9688,523.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="815" y="521.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="79" x="831" y="498.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="77" x="832" y="510.6387">M (C::*)(Arg)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="533.5" y2="533.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="541.5" y2="541.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="547.5"/>
+      <ellipse cx="797" cy="552.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="806" y="555.7104">c : C &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="560.3047"/>
+      <ellipse cx="797" cy="565.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="806" y="568.5151">m : M C::*</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000476497055497873078" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="501.5" y="508"/>
+      <ellipse cx="516.5" cy="524" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M519.4688,529.6406 Q518.8906,529.9375 518.25,530.0781 Q517.6094,530.2344 516.9063,530.2344 Q514.4063,530.2344 513.0781,528.5938 Q511.7656,526.9375 511.7656,523.8125 Q511.7656,520.6875 513.0781,519.0313 Q514.4063,517.375 516.9063,517.375 Q517.6094,517.375 518.25,517.5313 Q518.9063,517.6875 519.4688,517.9844 L519.4688,520.7031 Q518.8438,520.125 518.25,519.8594 Q517.6563,519.5781 517.0313,519.5781 Q515.6875,519.5781 515,520.6563 Q514.3125,521.7188 514.3125,523.8125 Q514.3125,525.9063 515,526.9844 Q515.6875,528.0469 517.0313,528.0469 Q517.6563,528.0469 518.25,527.7813 Q518.8438,527.5 519.4688,526.9219 L519.4688,529.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="530.5" y="528.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="91" x="546.5" y="505"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="89" x="547.5" y="517.1387">int (C::*)(bool)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="540" y2="540"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="548" y2="548"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="507.5" y="554"/>
+      <ellipse cx="512.5" cy="559" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="521.5" y="562.2104">c : C &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="496.5" y="258.5"/>
+      <ellipse cx="511.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M514.4688,280.1406 Q513.8906,280.4375 513.25,280.5781 Q512.6094,280.7344 511.9063,280.7344 Q509.4063,280.7344 508.0781,279.0938 Q506.7656,277.4375 506.7656,274.3125 Q506.7656,271.1875 508.0781,269.5313 Q509.4063,267.875 511.9063,267.875 Q512.6094,267.875 513.25,268.0313 Q513.9063,268.1875 514.4688,268.4844 L514.4688,271.2031 Q513.8438,270.625 513.25,270.3594 Q512.6563,270.0781 512.0313,270.0781 Q510.6875,270.0781 510,271.1563 Q509.3125,272.2188 509.3125,274.3125 Q509.3125,276.4063 510,277.4844 Q510.6875,278.5469 512.0313,278.5469 Q512.6563,278.5469 513.25,278.2813 Q513.8438,278 514.4688,277.4219 L514.4688,280.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="525.5" y="278.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="101" x="541.5" y="255.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="542.5" y="267.6387">M (C::*)(Arg) &amp;&amp;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="290.5" y2="290.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="298.5" y2="298.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="304.5"/>
+      <ellipse cx="507.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="516.5" y="312.7104">c : C &amp;&amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="317.3047"/>
+      <ellipse cx="507.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="516.5" y="325.5151">m : M C::*</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0001357746808315142717" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="127.5" y="258.5"/>
+      <ellipse cx="142.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M145.4688,280.1406 Q144.8906,280.4375 144.25,280.5781 Q143.6094,280.7344 142.9063,280.7344 Q140.4063,280.7344 139.0781,279.0938 Q137.7656,277.4375 137.7656,274.3125 Q137.7656,271.1875 139.0781,269.5313 Q140.4063,267.875 142.9063,267.875 Q143.6094,267.875 144.25,268.0313 Q144.9063,268.1875 145.4688,268.4844 L145.4688,271.2031 Q144.8438,270.625 144.25,270.3594 Q143.6563,270.0781 143.0313,270.0781 Q141.6875,270.0781 141,271.1563 Q140.3125,272.2188 140.3125,274.3125 Q140.3125,276.4063 141,277.4844 Q141.6875,278.5469 143.0313,278.5469 Q143.6563,278.5469 144.25,278.2813 Q144.8438,278 145.4688,277.4219 L145.4688,280.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.5" y="278.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="114" x="172.5" y="255.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="112" x="173.5" y="267.6387">float (C::*)(int) &amp;&amp;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="290.5" y2="290.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="298.5" y2="298.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="304.5"/>
+      <ellipse cx="138.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="147.5" y="312.7104">c : C &amp;&amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="317.3047"/>
+      <ellipse cx="138.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="147.5" y="325.5151">mf : float C::*</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000544335779197078982" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="749" y="610.5"/>
+      <ellipse cx="764" cy="626.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M766.9688,632.1406 Q766.3906,632.4375 765.75,632.5781 Q765.1094,632.7344 764.4063,632.7344 Q761.9063,632.7344 760.5781,631.0938 Q759.2656,629.4375 759.2656,626.3125 Q759.2656,623.1875 760.5781,621.5313 Q761.9063,619.875 764.4063,619.875 Q765.1094,619.875 765.75,620.0313 Q766.4063,620.1875 766.9688,620.4844 L766.9688,623.2031 Q766.3438,622.625 765.75,622.3594 Q765.1563,622.0781 764.5313,622.0781 Q763.1875,622.0781 762.5,623.1563 Q761.8125,624.2188 761.8125,626.3125 Q761.8125,628.4063 762.5,629.4844 Q763.1875,630.5469 764.5313,630.5469 Q765.1563,630.5469 765.75,630.2813 Q766.3438,630 766.9688,629.4219 L766.9688,632.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="778" y="630.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="153" x="794" y="607.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="151" x="795" y="619.6387">M (C::*)(Arg1,Arg2,Arg3)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="642.5" y2="642.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="650.5" y2="650.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="656.5"/>
+      <ellipse cx="760" cy="661.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="769" y="664.7104">c : C &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="669.3047"/>
+      <ellipse cx="760" cy="674.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="769" y="677.5151">m : M C::*</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="801" y="720"/>
+      <ellipse cx="816" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M818.9688,741.6406 Q818.3906,741.9375 817.75,742.0781 Q817.1094,742.2344 816.4063,742.2344 Q813.9063,742.2344 812.5781,740.5938 Q811.2656,738.9375 811.2656,735.8125 Q811.2656,732.6875 812.5781,731.0313 Q813.9063,729.375 816.4063,729.375 Q817.1094,729.375 817.75,729.5313 Q818.4063,729.6875 818.9688,729.9844 L818.9688,732.7031 Q818.3438,732.125 817.75,731.8594 Q817.1563,731.5781 816.5313,731.5781 Q815.1875,731.5781 814.5,732.6563 Q813.8125,733.7188 813.8125,735.8125 Q813.8125,737.9063 814.5,738.9844 Q815.1875,740.0469 816.5313,740.0469 Q817.1563,740.0469 817.75,739.7813 Q818.3438,739.5 818.9688,738.9219 L818.9688,741.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="830" y="740.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="49" x="846" y="717"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="847" y="729.1387">char[N]</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="752" y2="752"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="760" y2="760"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="807" y="766"/>
+      <ellipse cx="812" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="821" y="774.2104">n : char[N]</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001318419672443856415" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="493.5" y="720"/>
+      <ellipse cx="524.25" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M527.2188,741.6406 Q526.6406,741.9375 526,742.0781 Q525.3594,742.2344 524.6563,742.2344 Q522.1563,742.2344 520.8281,740.5938 Q519.5156,738.9375 519.5156,735.8125 Q519.5156,732.6875 520.8281,731.0313 Q522.1563,729.375 524.6563,729.375 Q525.3594,729.375 526,729.5313 Q526.6563,729.6875 527.2188,729.9844 L527.2188,732.7031 Q526.5938,732.125 526,731.8594 Q525.4063,731.5781 524.7813,731.5781 Q523.4375,731.5781 522.75,732.6563 Q522.0625,733.7188 522.0625,735.8125 Q522.0625,737.9063 522.75,738.9844 Q523.4375,740.0469 524.7813,740.0469 Q525.4063,740.0469 526,739.7813 Q526.5938,739.5 527.2188,738.9219 L527.2188,741.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="541.75" y="740.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="72" x="573.5" y="717"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="70" x="574.5" y="729.1387">char[1000]</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="752" y2="752"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="760" y2="760"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="499.5" y="766"/>
+      <ellipse cx="504.5" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="513.5" y="774.2104">n : std::vector&lt;char&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000599593856979463652" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="782" y="816"/>
+      <ellipse cx="797.9" cy="832" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M800.8688,837.6406 Q800.2906,837.9375 799.65,838.0781 Q799.0094,838.2344 798.3063,838.2344 Q795.8063,838.2344 794.4781,836.5938 Q793.1656,834.9375 793.1656,831.8125 Q793.1656,828.6875 794.4781,827.0313 Q795.8063,825.375 798.3063,825.375 Q799.0094,825.375 799.65,825.5313 Q800.3063,825.6875 800.8688,825.9844 L800.8688,828.7031 Q800.2438,828.125 799.65,827.8594 Q799.0563,827.5781 798.4313,827.5781 Q797.0875,827.5781 796.4,828.6563 Q795.7125,829.7188 795.7125,831.8125 Q795.7125,833.9063 796.4,834.9844 Q797.0875,836.0469 798.4313,836.0469 Q799.0563,836.0469 799.65,835.7813 Q800.2438,835.5 800.8688,834.9219 L800.8688,837.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.1" y="836.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="85" x="829" y="813"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="83" x="830" y="825.1387">char[M][L][K]</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="848" y2="848"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="856" y2="856"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="788" y="862"/>
+      <ellipse cx="793" cy="867" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="802" y="870.2104">klm : char[K][L][M]</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000015395295268000991" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="809" y="912"/>
+      <ellipse cx="824" cy="928" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M826.9688,933.6406 Q826.3906,933.9375 825.75,934.0781 Q825.1094,934.2344 824.4063,934.2344 Q821.9063,934.2344 820.5781,932.5938 Q819.2656,930.9375 819.2656,927.8125 Q819.2656,924.6875 820.5781,923.0313 Q821.9063,921.375 824.4063,921.375 Q825.1094,921.375 825.75,921.5313 Q826.4063,921.6875 826.9688,921.9844 L826.9688,924.7031 Q826.3438,924.125 825.75,923.8594 Q825.1563,923.5781 824.5313,923.5781 Q823.1875,923.5781 822.5,924.6563 Q821.8125,925.7188 821.8125,927.8125 Q821.8125,929.9063 822.5,930.9844 Q823.1875,932.0469 824.5313,932.0469 Q825.1563,932.0469 825.75,931.7813 Q826.3438,931.5 826.9688,930.9219 L826.9688,933.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838" y="932.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="33" x="854" y="909"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="31" x="855" y="921.1387">U(...)</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="944" y2="944"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="952" y2="952"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="815" y="958"/>
+      <ellipse cx="820" cy="963" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="829" y="966.2104">u : bool</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001603321863498552207" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="807" y="1008"/>
+      <ellipse cx="822" cy="1024" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M824.9688,1029.6406 Q824.3906,1029.9375 823.75,1030.0781 Q823.1094,1030.2344 822.4063,1030.2344 Q819.9063,1030.2344 818.5781,1028.5938 Q817.2656,1026.9375 817.2656,1023.8125 Q817.2656,1020.6875 818.5781,1019.0313 Q819.9063,1017.375 822.4063,1017.375 Q823.1094,1017.375 823.75,1017.5313 Q824.4063,1017.6875 824.9688,1017.9844 L824.9688,1020.7031 Q824.3438,1020.125 823.75,1019.8594 Q823.1563,1019.5781 822.5313,1019.5781 Q821.1875,1019.5781 820.5,1020.6563 Q819.8125,1021.7188 819.8125,1023.8125 Q819.8125,1025.9063 820.5,1026.9844 Q821.1875,1028.0469 822.5313,1028.0469 Q823.1563,1028.0469 823.75,1027.7813 Q824.3438,1027.5 824.9688,1026.9219 L824.9688,1029.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="836" y="1028.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="37" x="852" y="1005"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="35" x="853" y="1017.1387">C&lt;T&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1040" y2="1040"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1048" y2="1048"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="813" y="1054"/>
+      <ellipse cx="818" cy="1059" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="827" y="1062.2104">c : C&lt;T&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000232518961342221670" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="759.5" y="1104.5"/>
+      <ellipse cx="797.9" cy="1120.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M800.8688,1126.1406 Q800.2906,1126.4375 799.65,1126.5781 Q799.0094,1126.7344 798.3063,1126.7344 Q795.8063,1126.7344 794.4781,1125.0938 Q793.1656,1123.4375 793.1656,1120.3125 Q793.1656,1117.1875 794.4781,1115.5313 Q795.8063,1113.875 798.3063,1113.875 Q799.0094,1113.875 799.65,1114.0313 Q800.3063,1114.1875 800.8688,1114.4844 L800.8688,1117.2031 Q800.2438,1116.625 799.65,1116.3594 Q799.0563,1116.0781 798.4313,1116.0781 Q797.0875,1116.0781 796.4,1117.1563 Q795.7125,1118.2188 795.7125,1120.3125 Q795.7125,1122.4063 796.4,1123.4844 Q797.0875,1124.5469 798.4313,1124.5469 Q799.0563,1124.5469 799.65,1124.2813 Q800.2438,1124 800.8688,1123.4219 L800.8688,1126.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="817.1" y="1124.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="80" x="856.5" y="1101.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="857.5" y="1113.6387">C&lt;T,Args...&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1136.5" y2="1136.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1144.5" y2="1144.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1150.5"/>
+      <ellipse cx="770.5" cy="1155.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="779.5" y="1158.7104">args : std::tuple&lt;Args...&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1163.3047"/>
+      <ellipse cx="770.5" cy="1168.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="779.5" y="1171.5151">c : C&lt;T&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="48" id="C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.5;" width="51" x="1022" y="623.5"/>
+      <ellipse cx="1037" cy="639.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1039.9688,645.1406 Q1039.3906,645.4375 1038.75,645.5781 Q1038.1094,645.7344 1037.4063,645.7344 Q1034.9063,645.7344 1033.5781,644.0938 Q1032.2656,642.4375 1032.2656,639.3125 Q1032.2656,636.1875 1033.5781,634.5313 Q1034.9063,632.875 1037.4063,632.875 Q1038.1094,632.875 1038.75,633.0313 Q1039.4063,633.1875 1039.9688,633.4844 L1039.9688,636.2031 Q1039.3438,635.625 1038.75,635.3594 Q1038.1563,635.0781 1037.5313,635.0781 Q1036.1875,635.0781 1035.5,636.1563 Q1034.8125,637.2188 1034.8125,639.3125 Q1034.8125,641.4063 1035.5,642.4844 Q1036.1875,643.5469 1037.5313,643.5469 Q1038.1563,643.5469 1038.75,643.2813 Q1039.3438,643 1039.9688,642.4219 L1039.9688,645.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1051" y="643.6543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="1067" y="620.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1068" y="632.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1072" y1="655.5" y2="655.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1072" y1="663.5" y2="663.5"/>
+    </a>
+    <path d="M880.16,1239.67 C906.44,1234 942.16,1221.89 962,1196.5 C1023.36,1117.97 1040.72,808.34 1045.13,692 " fill="none" id="C_0001046827200300090710-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1038.15,691.48,1045.84,671.73,1052.14,691.97,1038.15,691.48" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M671.17,1244.5 C712.38,1244.5 758.19,1244.5 792.5,1244.5 " fill="none" id="C_0001099548178945911245-&gt;C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="792.73,1237.5,812.73,1244.5,792.73,1251.5,792.73,1237.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M405.2,1244.5 C418.54,1244.5 431.74,1244.5 444.51,1244.5 " fill="none" id="C_0001239388209995793547-&gt;C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="444.85,1237.5,464.85,1244.5,444.85,1251.5,444.85,1237.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M883.12,43.96 C909.08,49.89 942.93,62.01 962,86.5 C1024.75,167.08 1041.29,485.26 1045.3,603.21 " fill="none" id="C_0000045701897814162098-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1052.31,603.19,1045.93,623.4,1038.31,603.63,1052.31,603.19" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M626.63,38.5 C674.53,38.5 742.28,38.5 789.67,38.5 " fill="none" id="C_0001379193770802992785-&gt;C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="789.87,31.5,809.87,38.5,789.87,45.5,789.87,31.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M943.22,165.18 C950.25,170.13 956.67,175.86 962,182.5 C1013.95,247.16 1036.54,499.69 1043.75,603.04 " fill="none" id="C_0001407865337446777280-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1050.75,602.82,1045.1,623.24,1036.78,603.75,1050.75,602.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M885.03,236.98 C910.38,243.31 942.64,255.49 962,278.5 C1003.3,327.59 1030.75,516.41 1041.46,603.29 " fill="none" id="C_0001034483227649400416-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1048.42,602.58,1043.84,623.27,1034.52,604.24,1048.42,602.58" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M897.7,337.25 C920.11,344.39 945.2,355.99 962,374.5 C1020.69,439.17 1038.62,543.96 1044.1,603.14 " fill="none" id="C_0000352457857519671117-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1051.1,602.93,1045.64,623.41,1037.14,604,1051.1,602.93" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M888.74,441.54 C912.46,450.14 941.52,463.73 962,483.5 C996.75,517.05 1019.89,567.99 1033.03,604.19 " fill="none" id="C_0000314708288320430272-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1039.72,602.12,1039.55,623.31,1026.47,606.64,1039.72,602.12" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M619.07,194.47 C666.6,202.03 737.98,213.39 787.85,221.33 " fill="none" id="C_0000827753335392390402-&gt;C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="789.13,214.44,807.78,224.5,786.93,228.27,789.13,214.44" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M907.11,564.74 C925.02,573.12 944.53,582.76 962,592.5 C976.29,600.47 991.42,609.96 1004.86,618.79 " fill="none" id="C_0000395583480407686249-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1009.2,613.27,1021.91,630.22,1001.4,624.9,1009.2,613.27" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M634.53,538.5 C673.74,538.5 723.85,538.5 765.4,538.5 " fill="none" id="C_0000476497055497873078-&gt;C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="765.63,531.5,785.63,538.5,765.63,545.5,765.63,531.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M639.85,278.85 C685.91,268.02 745.19,254.08 788.26,243.95 " fill="none" id="C_0001619634759668095904-&gt;C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="786.91,237.08,807.98,239.32,790.11,250.71,786.91,237.08" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M283.84,295.5 C340.19,295.5 416.73,295.5 476.02,295.5 " fill="none" id="C_0001357746808315142717-&gt;C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="476.21,288.5,496.21,295.5,476.21,302.5,476.21,288.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M944.09,647.5 C964.17,647.5 984.4,647.5 1001.53,647.5 " fill="none" id="C_0000544335779197078982-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1001.63,640.5,1021.63,647.5,1001.63,654.5,1001.63,640.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M892.06,733.42 C913.58,724.68 939.54,713.38 962,701.5 C976.28,693.95 991.32,684.77 1004.68,676.14 " fill="none" id="C_0000602066980416477930-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1001.09,670.12,1021.64,664.92,1008.82,681.8,1001.09,670.12" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M642.73,750.5 C685.75,750.5 739.5,750.5 780.85,750.5 " fill="none" id="C_0001318419672443856415-&gt;C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="780.93,743.5,800.93,750.5,780.93,757.5,780.93,743.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M911.24,828.42 C929.08,821.19 947.53,811.42 962,798.5 C994.85,769.18 1017.78,723.93 1031.39,690.61 " fill="none" id="C_0000599593856979463652-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1024.96,687.82,1038.66,671.65,1038.03,692.83,1024.96,687.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M884.03,935.44 C909.08,928.83 941.39,916.54 962,894.5 C1015.18,837.61 1035.04,745.82 1042.35,691.6 " fill="none" id="C_0000015395295268000991-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1035.42,690.57,1044.71,671.52,1049.33,692.2,1035.42,690.57" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M886,1031.64 C911.13,1025.2 942.73,1013.02 962,990.5 C1000.48,945.52 1028.97,773.37 1040.66,691.39 " fill="none" id="C_0001603321863498552207-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1033.74,690.36,1043.42,671.51,1047.61,692.28,1033.74,690.36" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M933.59,1111.52 C944.39,1104.71 954.33,1096.46 962,1086.5 C1009.46,1024.91 1034.39,790.8 1042.99,691.96 " fill="none" id="C_0000232518961342221670-&gt;C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1036.04,691.07,1044.68,671.73,1049.99,692.24,1036.04,691.07" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00062_class_mermaid.svg b/docs/test_cases/t00062_class_mermaid.svg
index d1152ef4..21833aad 100644
--- a/docs/test_cases/t00062_class_mermaid.svg
+++ b/docs/test_cases/t00062_class_mermaid.svg
@@ -1,81 +1,76 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 2641.2578125 526" style="max-width: 2641.26px; background-color: white;" width="2641.2578125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M247.9609375,400L247.9609375,406C247.9609375,412,247.9609375,424,434.4536821916786,438.56833870504744C620.946426883357,453.1366774100948,993.9319162667142,470.2733548201897,1180.4246609583927,478.84169352523713L1366.9174056500713,487.41003223028457"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M247.9609375,249L247.9609375,255C247.9609375,261,247.9609375,273,247.9609375,282C247.9609375,291,247.9609375,297,247.9609375,300L247.9609375,303"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M247.9609375,87L247.9609375,94.83333333333333C247.9609375,102.66666666666667,247.9609375,118.33333333333333,247.9609375,129.16666666666666C247.9609375,140,247.9609375,146,247.9609375,149L247.9609375,152"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M485,400L485,406C485,412,485,424,631.9880523104937,438.47941320064575C778.9761046209874,452.95882640129156,1072.9522092419747,469.9176528025832,1219.9402615524684,478.39706600322893L1366.928313862962,486.87647920387474"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M485,249L485,255C485,261,485,273,485,282C485,291,485,297,485,300L485,303"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M712.28125,400L712.28125,406C712.28125,412,712.28125,424,821.3928352715657,438.33775370402253C930.5044205431315,452.675507408045,1148.727591086263,469.35101481609007,1257.8391763578286,477.68876852011255L1366.9507616293945,486.02652222413514"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M942.671875,400L942.671875,406C942.671875,412,942.671875,424,1013.3955726214053,438.05501582196365C1084.1192702428107,452.1100316439272,1225.5666654856213,468.2200632878544,1296.2903631070267,476.275079109818L1367.014060728432,484.3300949317816"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1092.8203125,400L1092.8203125,406C1092.8203125,412,1092.8203125,424,1138.5411728234485,437.65386001161113C1184.2620331468968,451.3077200232222,1275.7037537937938,466.61544004644435,1321.4246141172423,474.2693000580555L1367.1454744406906,481.92316006966655"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1246.515625,411L1246.515625,415.1666666666667C1246.515625,419.3333333333333,1246.515625,427.6666666666667,1266.7242353364484,438.3506434766882C1286.9328456728965,449.03462028670987,1327.3500663457933,462.0692405734197,1347.5586766822416,468.5865507167746L1367.76728701869,475.1038608601295"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M801.4609375,260L801.4609375,264.1666666666667C801.4609375,268.3333333333333,801.4609375,276.6666666666667,815.3205470364511,288.2435278871515C829.1801565729023,299.8203891076364,856.8993756458045,314.64077821527286,870.7589851822557,322.05097276909106L884.618594718707,329.46116732290926"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M1412.40625,411L1412.40625,415.1666666666667C1412.40625,419.3333333333333,1412.40625,427.6666666666667,1412.40625,433C1412.40625,438.3333333333333,1412.40625,440.6666666666667,1412.40625,441.8333333333333L1412.40625,443"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1412.40625,249L1412.40625,255C1412.40625,261,1412.40625,273,1412.40625,280.1666666666667C1412.40625,287.3333333333333,1412.40625,289.6666666666667,1412.40625,290.8333333333333L1412.40625,292"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M1072.3828125,260L1072.3828125,264.1666666666667C1072.3828125,268.3333333333333,1072.3828125,276.6666666666667,1060.3870393460504,287.8156348306391C1048.391266192101,298.9646029946116,1024.3997198842019,312.9292059892232,1012.4039467302524,319.911507486529L1000.4081735763028,326.8938089838348"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M1072.3828125,109L1072.3828125,113.16666666666667C1072.3828125,117.33333333333333,1072.3828125,125.66666666666667,1072.3828125,131C1072.3828125,136.33333333333334,1072.3828125,138.66666666666666,1072.3828125,139.83333333333334L1072.3828125,141"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1648.078125,411L1648.078125,415.1666666666667C1648.078125,419.3333333333333,1648.078125,427.6666666666667,1616.309678824992,439.04510550751803C1584.5412326499838,450.4235443483694,1521.004340299968,464.8470886967387,1489.2358941249595,472.0588608709234L1457.4674479499515,479.2706330451081"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M1864.2109375,400L1864.2109375,406C1864.2109375,412,1864.2109375,424,1796.4739774901282,438.02100434278503C1728.7370174802566,452.04200868557,1593.2630974605133,468.08401737114013,1525.5261374506415,476.10502171392517L1457.78917744077,484.1260260567102"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id17" d="M1864.2109375,249L1864.2109375,255C1864.2109375,261,1864.2109375,273,1864.2109375,282C1864.2109375,291,1864.2109375,297,1864.2109375,300L1864.2109375,303"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id18" d="M2041.46875,400L2041.46875,406C2041.46875,412,2041.46875,424,1944.1988443827556,438.2725324598471C1846.928938765511,452.5450649196943,1652.3891275310218,469.0901298393885,1555.1192219137774,477.36266229923564L1457.8493162965328,485.63519475908276"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id19" d="M2208.5,400L2208.5,406C2208.5,412,2208.5,424,2083.395592217076,438.4074090725953C1958.2911844341513,452.8148181451907,1708.0823688683024,469.6296362903815,1582.9779610853777,478.0370453629768L1457.8735533024535,486.44445443557214"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id20" d="M2341.75,400L2341.75,406C2341.75,412,2341.75,424,2194.4390517119277,438.48032359760515C2047.1281034238552,452.96064719521036,1752.5062068477102,469.92129439042066,1605.195258559638,478.40161798802586L1457.8843102715655,486.881941585631"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M2533.9296875,411L2533.9296875,415.1666666666667C2533.9296875,419.3333333333333,2533.9296875,427.6666666666667,2354.590342454327,440.3883529068262C2175.2509974086547,453.1100391469857,1816.5723073173092,470.2200782939714,1637.2329622716363,478.77509786746424L1457.893617225964,487.3301174409571"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M247.9609375,400L247.9609375,406C247.9609375,412,247.9609375,424,437.4505208333333,438.70602732434753C626.9401041666666,453.41205464869495,1005.9192708333334,470.8241092973899,1195.4088541666667,479.5301366217374L1384.8984375,488.23616394608484"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M247.9609375,249L247.9609375,255C247.9609375,261,247.9609375,273,247.9609375,285C247.9609375,297,247.9609375,309,247.9609375,315L247.9609375,321"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M247.9609375,87L247.9609375,94.83333333333333C247.9609375,102.66666666666667,247.9609375,118.33333333333333,247.9609375,132.16666666666666C247.9609375,146,247.9609375,158,247.9609375,164L247.9609375,170"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M485,400L485,406C485,412,485,424,634.9830729166666,438.6521892655367C784.9661458333334,453.3043785310735,1084.9322916666667,470.6087570621469,1234.9153645833333,479.2609463276836L1384.8984375,487.9131355932203"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M485,249L485,255C485,261,485,273,485,285C485,297,485,309,485,315L485,321"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M712.28125,400L712.28125,406C712.28125,412,712.28125,424,824.3841145833334,438.5663320909957C936.4869791666666,453.1326641819913,1160.6927083333333,470.26532836398263,1272.7955729166667,478.83166045497825L1384.8984375,487.3979925459739"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M942.671875,400L942.671875,406C942.671875,412,942.671875,424,1016.3763020833334,438.3945034871215C1090.0807291666667,452.78900697424297,1237.4895833333333,469.57801394848593,1311.1940104166667,477.9725174356074L1384.8984375,486.36702092272895"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1092.8203125,400L1092.8203125,406C1092.8203125,412,1092.8203125,424,1141.5,438.14917984696996C1190.1796875,452.29835969394,1287.5390625,468.59671938787983,1336.21875,476.7458992348498L1384.8984375,484.89507908181974"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1246.515625,411L1246.515625,415.1666666666667C1246.515625,419.3333333333333,1246.515625,427.6666666666667,1269.5794270833333,439.2714475212709C1292.6432291666667,450.87622837587514,1338.7708333333333,465.7524567517503,1361.8346354166667,473.19057093968786L1384.8984375,480.6286851276255"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M801.4609375,260L801.4609375,264.1666666666667C801.4609375,268.3333333333333,801.4609375,276.6666666666667,817.9661458333334,289.6580267404334C834.4713541666666,302.6493868142001,867.4817708333334,320.29877362840017,883.9869791666666,329.12346703550025L900.4921875,337.9481604426003"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M1412.40625,411L1412.40625,415.1666666666667C1412.40625,419.3333333333333,1412.40625,427.6666666666667,1412.40625,436C1412.40625,444.3333333333333,1412.40625,452.6666666666667,1412.40625,456.8333333333333L1412.40625,461"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M1412.40625,249L1412.40625,255C1412.40625,261,1412.40625,273,1412.40625,283.1666666666667C1412.40625,293.3333333333333,1412.40625,301.6666666666667,1412.40625,305.8333333333333L1412.40625,310"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M1072.3828125,260L1072.3828125,264.1666666666667C1072.3828125,268.3333333333333,1072.3828125,276.6666666666667,1057.7942708333333,289.32479070047583C1043.2057291666667,301.982914734285,1014.0286458333334,318.96582946856995,999.4401041666666,327.4572868357124L984.8515625,335.9487442028549"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M1072.3828125,109L1072.3828125,113.16666666666667C1072.3828125,117.33333333333333,1072.3828125,125.66666666666667,1072.3828125,134C1072.3828125,142.33333333333334,1072.3828125,150.66666666666666,1072.3828125,154.83333333333334L1072.3828125,159"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M1648.078125,411L1648.078125,415.1666666666667C1648.078125,419.3333333333333,1648.078125,427.6666666666667,1613.3841145833333,439.7092394307056C1578.6901041666667,451.7518121947446,1509.3020833333333,467.50362438948923,1474.6080729166667,475.37953048686154L1439.9140625,483.2554365842339"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M1864.2109375,400L1864.2109375,406C1864.2109375,412,1864.2109375,424,1793.4947916666667,438.3737816511329C1722.7786458333333,452.74756330226575,1581.3463541666667,469.4951266045316,1510.6302083333333,477.8689082556645L1439.9140625,486.2426899067974"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id17" d="M1864.2109375,249L1864.2109375,255C1864.2109375,261,1864.2109375,273,1864.2109375,285C1864.2109375,297,1864.2109375,309,1864.2109375,315L1864.2109375,321"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id18" d="M2041.46875,400L2041.46875,406C2041.46875,412,2041.46875,424,1941.2096354166667,438.52675629243254C1840.9505208333333,453.0535125848651,1640.4322916666667,470.1070251697301,1540.1731770833333,478.63378146216263L1439.9140625,487.1605377545951"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id19" d="M2208.5,400L2208.5,406C2208.5,412,2208.5,424,2080.40234375,438.60856476938176C1952.3046875,453.21712953876346,1696.109375,470.434259077527,1568.01171875,479.04282384690873L1439.9140625,487.6513886162905"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id20" d="M2341.75,400L2341.75,406C2341.75,412,2341.75,424,2191.4440104166665,438.6527406492036C2041.1380208333333,453.3054812984073,1740.5260416666667,470.61096259681455,1590.2200520833333,479.26370324601817L1439.9140625,487.9164438952218"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M2533.9296875,411L2533.9296875,415.1666666666667C2533.9296875,419.3333333333333,2533.9296875,427.6666666666667,2351.59375,440.531299269734C2169.2578125,453.3959318728014,1804.5859375,470.79186374560277,1622.25,479.4898296820034L1439.9140625,488.1877956184041"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -311,7 +306,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L9">
+        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L9">
           <g title="A" id="classId-C_0001046827200300090710-0" class="node default clickable">
             <rect height="79" width="73.25" y="-39.5" x="-36.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.625" x1="-36.625" class="divider"/>
@@ -335,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L13">
+        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L13">
           <g title="A" id="classId-C_0001099548178945911245-1" class="node default clickable">
             <rect height="79" width="242.59375" y="-39.5" x="-121.296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.296875" x1="-121.296875" class="divider"/>
@@ -359,7 +354,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L18">
+        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L18">
           <g title="A" id="classId-C_0001239388209995793547-2" class="node default clickable">
             <rect height="57" width="479.921875" y="-28.5" x="-239.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="239.9609375" x1="-239.9609375" class="divider"/>
@@ -378,7 +373,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L20">
+        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L20">
           <g title="A" id="classId-C_0000045701897814162098-3" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -402,7 +397,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L24">
+        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L24">
           <g title="A" id="classId-C_0001379193770802992785-4" class="node default clickable">
             <rect height="79" width="131.484375" y="-39.5" x="-65.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.7421875" x1="-65.7421875" class="divider"/>
@@ -426,7 +421,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L28">
+        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L28">
           <g title="A" id="classId-C_0001407865337446777280-5" class="node default clickable">
             <rect height="79" width="276.421875" y="-39.5" x="-138.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="138.2109375" x1="-138.2109375" class="divider"/>
@@ -450,7 +445,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L32">
+        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L32">
           <g title="A" id="classId-C_0001034483227649400416-6" class="node default clickable">
             <rect height="79" width="84.359375" y="-39.5" x="-42.1796875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.1796875" x1="-42.1796875" class="divider"/>
@@ -474,7 +469,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L36">
+        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L36">
           <g title="A" id="classId-C_0000352457857519671117-7" class="node default clickable">
             <rect height="79" width="115.9375" y="-39.5" x="-57.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="57.96875" x1="-57.96875" class="divider"/>
@@ -498,7 +493,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L40">
+        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L40">
           <g title="A" id="classId-C_0000314708288320430272-8" class="node default clickable">
             <rect height="101" width="91.453125" y="-50.5" x="-45.7265625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="45.7265625" x1="-45.7265625" class="divider"/>
@@ -527,7 +522,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L45">
+        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L45">
           <g title="A" id="classId-C_0000827753335392390402-9" class="node default clickable">
             <rect height="101" width="119.015625" y="-50.5" x="-59.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.5078125" x1="-59.5078125" class="divider"/>
@@ -556,7 +551,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L50">
+        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L50">
           <g title="A" id="classId-C_0000395583480407686249-10" class="node default clickable">
             <rect height="101" width="140.328125" y="-50.5" x="-70.1640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="70.1640625" x1="-70.1640625" class="divider"/>
@@ -585,7 +580,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L55">
+        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L55">
           <g title="A" id="classId-C_0000476497055497873078-11" class="node default clickable">
             <rect height="79" width="152.75" y="-39.5" x="-76.375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.375" x1="-76.375" class="divider"/>
@@ -609,7 +604,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L59">
+        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L59">
           <g title="A" id="classId-C_0001619634759668095904-12" class="node default clickable">
             <rect height="101" width="167.875" y="-50.5" x="-83.9375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="83.9375" x1="-83.9375" class="divider"/>
@@ -638,7 +633,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L64">
+        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L64">
           <g title="A" id="classId-C_0001357746808315142717-13" class="node default clickable">
             <rect height="101" width="180.3125" y="-50.5" x="-90.15625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="90.15625" x1="-90.15625" class="divider"/>
@@ -667,7 +662,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L70">
+        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L70">
           <g title="A" id="classId-C_0000544335779197078982-14" class="node default clickable">
             <rect height="101" width="231.015625" y="-50.5" x="-115.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="115.5078125" x1="-115.5078125" class="divider"/>
@@ -696,7 +691,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L75">
+        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L75">
           <g title="A" id="classId-C_0000602066980416477930-15" class="node default clickable">
             <rect height="79" width="101.25" y="-39.5" x="-50.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="50.625" x1="-50.625" class="divider"/>
@@ -720,7 +715,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L79">
+        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L79">
           <g title="A" id="classId-C_0001318419672443856415-16" class="node default clickable">
             <rect height="79" width="170.203125" y="-39.5" x="-85.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="85.1015625" x1="-85.1015625" class="divider"/>
@@ -744,7 +739,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L83">
+        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83">
           <g title="A" id="classId-C_0000599593856979463652-17" class="node default clickable">
             <rect height="79" width="153.265625" y="-39.5" x="-76.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.6328125" x1="-76.6328125" class="divider"/>
@@ -768,7 +763,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L85">
+        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L85">
           <g title="A" id="classId-C_0000015395295268000991-18" class="node default clickable">
             <rect height="79" width="80.796875" y="-39.5" x="-40.3984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.3984375" x1="-40.3984375" class="divider"/>
@@ -792,7 +787,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L89">
+        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L89">
           <g title="A" id="classId-C_0001603321863498552207-19" class="node default clickable">
             <rect height="79" width="85.703125" y="-39.5" x="-42.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.8515625" x1="-42.8515625" class="divider"/>
@@ -816,7 +811,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L95">
+        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L95">
           <g title="A" id="classId-C_0000232518961342221670-20" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -845,7 +840,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00062/t00062.cc#L7">
+        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L7">
           <g title="A" id="classId-C_0000121103565834936476-21" class="node default clickable">
             <rect height="57" width="55.015625" y="-28.5" x="-27.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
diff --git a/docs/test_cases/t00063.md b/docs/test_cases/t00063.md
index 78b52ef0..df61e8f6 100644
--- a/docs/test_cases/t00063.md
+++ b/docs/test_cases/t00063.md
@@ -38,7 +38,7 @@ enum class C { c1, c2, c3 };
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00063::A",
+      "display_name": "A",
       "id": "1518171774798799557",
       "is_abstract": false,
       "is_nested": false,
@@ -60,6 +60,7 @@ enum class C { c1, c2, c3 };
     }
   ],
   "name": "t00063_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00063"
 }
diff --git a/docs/test_cases/t00063_class.svg b/docs/test_cases/t00063_class.svg
index c1590e8f..2ecd60b4 100644
--- a/docs/test_cases/t00063_class.svg
+++ b/docs/test_cases/t00063_class.svg
@@ -1,17 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="69px" preserveAspectRatio="none" style="width:62px;height:69px;background:#FFFFFF;" version="1.1" viewBox="0 0 62 69" width="62px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1uljthhlqc0pe" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001518171774798799557">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001518171774798799557" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="7" y="7"/>
-        <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M17,24.1563 C17,26.6563 19.1406,28.4688 22.0625,28.4688 C23.2969,28.4688 24.4688,28.1719 25.2188,27.6563 C25.8281,27.2344 26.1563,26.8125 26.1563,26.4063 C26.1563,25.9375 25.7344,25.5313 25.2344,25.5313 C25,25.5313 24.7813,25.6094 24.5781,25.8125 C24.1406,26.25 24.1406,26.25 23.9688,26.3438 C23.5156,26.5781 22.875,26.7188 22.1094,26.7188 C20.1094,26.7188 18.8281,25.7031 18.8281,24.125 L18.8281,23.0781 C18.8281,21.375 20.0469,20.1719 21.75,20.1719 C22.3281,20.1719 22.9063,20.3125 23.375,20.5625 C23.8438,20.8281 24.0156,21.0156 24.0781,21.375 C24.2031,22.0469 24.4531,22.2969 24.9844,22.2969 C25.2656,22.2969 25.5469,22.1563 25.7344,21.9375 C25.8594,21.7656 25.9063,21.5938 25.9063,21.1563 L25.9063,19.7969 C25.9063,19.375 25.8906,19.2344 25.7656,19.0625 C25.5938,18.8125 25.3125,18.6563 24.9844,18.6563 C24.6719,18.6563 24.4688,18.7656 24.25,19.0313 C23.0781,18.5313 22.6406,18.4219 21.6875,18.4219 C19.0156,18.4219 17,20.4375 17,23.0625 L17,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="36" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="47" y1="47" y2="47"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uljthhlqc0pe)" height="48" id="C_0001518171774798799557" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
+      <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="39" y2="39"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="47" y2="47"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00063_class_mermaid.svg b/docs/test_cases/t00063_class_mermaid.svg
index 5dc436a4..a01d07bf 100644
--- a/docs/test_cases/t00063_class_mermaid.svg
+++ b/docs/test_cases/t00063_class_mermaid.svg
@@ -1,55 +1,50 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 42.5625 73" style="max-width: 42.5625px; background-color: white;" width="42.5625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00063/t00063.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00063/t00063.cc#L3">
           <g title="A" id="classId-C_0001518171774798799557-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00064.md b/docs/test_cases/t00064.md
index a3f2b94d..a40bde1c 100644
--- a/docs/test_cases/t00064.md
+++ b/docs/test_cases/t00064.md
@@ -90,7 +90,7 @@ public:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<Ts...>",
+      "display_name": "type_list<Ts...>",
       "id": "2055044356505752139",
       "is_abstract": false,
       "is_nested": false,
@@ -119,7 +119,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<Ret(Arg &&),Ts...>",
+      "display_name": "type_list<Ret(Arg &&),Ts...>",
       "id": "1536403088019105838",
       "is_abstract": false,
       "is_nested": false,
@@ -166,7 +166,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<T const,Ts...>",
+      "display_name": "type_list<T const,Ts...>",
       "id": "1613293628874851145",
       "is_abstract": false,
       "is_nested": false,
@@ -201,7 +201,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<Head,Tail...>",
+      "display_name": "type_list<Head,Tail...>",
       "id": "96201031647373215",
       "is_abstract": false,
       "is_nested": false,
@@ -236,7 +236,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::head<clanguml::t00064::type_list<Head,Tail...>>",
+      "display_name": "head<type_list<Head,Tail...>>",
       "id": "1342666740698875376",
       "is_abstract": false,
       "is_nested": false,
@@ -278,7 +278,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<Type...>",
+      "display_name": "type_list<Type...>",
       "id": "74655005329778311",
       "is_abstract": false,
       "is_nested": false,
@@ -307,7 +307,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<First...>",
+      "display_name": "type_list<First...>",
       "id": "1877705309010128195",
       "is_abstract": false,
       "is_nested": false,
@@ -336,7 +336,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<Second...>",
+      "display_name": "type_list<Second...>",
       "id": "1737554639587928188",
       "is_abstract": false,
       "is_nested": false,
@@ -365,7 +365,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_group_pair<clanguml::t00064::type_list<First...>,clanguml::t00064::type_list<Second...>>",
+      "display_name": "type_group_pair<type_list<First...>,type_list<Second...>>",
       "id": "1313421318785708660",
       "is_abstract": false,
       "is_nested": false,
@@ -427,7 +427,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::optional_ref<T>",
+      "display_name": "optional_ref<T>",
       "id": "2110316024454672764",
       "is_abstract": false,
       "is_nested": false,
@@ -456,7 +456,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::optional_ref<clanguml::t00064::type_group_pair_it<It,clanguml::t00064::type_list<First...>,clanguml::t00064::type_list<Second...>>::value_type>",
+      "display_name": "optional_ref<type_group_pair_it<It,type_list<First...>,type_list<Second...>>::value_type>",
       "id": "476531044436856932",
       "is_abstract": false,
       "is_nested": false,
@@ -485,7 +485,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_group_pair_it<It,clanguml::t00064::type_list<First...>,clanguml::t00064::type_list<Second...>>",
+      "display_name": "type_group_pair_it<It,type_list<First...>,type_list<Second...>>",
       "id": "1024383802991748694",
       "is_abstract": false,
       "is_nested": false,
@@ -634,7 +634,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::A",
+      "display_name": "A",
       "id": "586286676481245707",
       "is_abstract": false,
       "is_nested": false,
@@ -656,7 +656,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::B",
+      "display_name": "B",
       "id": "1353306307770366167",
       "is_abstract": false,
       "is_nested": false,
@@ -678,7 +678,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::C",
+      "display_name": "C",
       "id": "598044391549147725",
       "is_abstract": false,
       "is_nested": false,
@@ -700,7 +700,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<clanguml::t00064::A,bool,int>",
+      "display_name": "type_list<A,bool,int>",
       "id": "425551452299939770",
       "is_abstract": false,
       "is_nested": false,
@@ -741,7 +741,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<float,double>",
+      "display_name": "type_list<float,double>",
       "id": "179850898515269194",
       "is_abstract": false,
       "is_nested": false,
@@ -776,7 +776,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_list<clanguml::t00064::A,clanguml::t00064::B,clanguml::t00064::C>",
+      "display_name": "type_list<A,B,C>",
       "id": "1070380438303872295",
       "is_abstract": false,
       "is_nested": false,
@@ -817,7 +817,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_group_pair<clanguml::t00064::type_list<float,double>,clanguml::t00064::type_list<clanguml::t00064::A,clanguml::t00064::B,clanguml::t00064::C>>",
+      "display_name": "type_group_pair<type_list<float,double>,type_list<A,B,C>>",
       "id": "1854055939974723413",
       "is_abstract": false,
       "is_nested": false,
@@ -884,7 +884,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::R",
+      "display_name": "R",
       "id": "2161425587790795236",
       "is_abstract": false,
       "is_nested": false,
@@ -931,7 +931,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_group_pair<typename,typename>",
+      "display_name": "type_group_pair<typename,typename>",
       "id": "271990753639572557",
       "is_abstract": false,
       "is_nested": false,
@@ -966,7 +966,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::type_group_pair_it<typename,typename,typename>",
+      "display_name": "type_group_pair_it<typename,typename,typename>",
       "id": "1057906395469156958",
       "is_abstract": false,
       "is_nested": false,
@@ -1007,7 +1007,7 @@ public:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00064::head<typename>",
+      "display_name": "head<typename>",
       "id": "1317314479884183399",
       "is_abstract": false,
       "is_nested": false,
@@ -1036,6 +1036,7 @@ public:
     }
   ],
   "name": "t00064_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00064_class.svg b/docs/test_cases/t00064_class.svg
index 437cbcc5..43088e2e 100644
--- a/docs/test_cases/t00064_class.svg
+++ b/docs/test_cases/t00064_class.svg
@@ -1,433 +1,337 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1350px" preserveAspectRatio="none" style="width:2227px;height:1350px;background:#FFFFFF;" version="1.1" viewBox="0 0 2227 1350" width="2227px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1373px" preserveAspectRatio="none" style="width:2348px;height:1373px;" version="1.1" viewBox="0 0 2348 1373" width="2348px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1o82gcf7sez8z" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0002055044356505752139">
-        <rect codeLine="3" fill="#F1F1F1" height="48" id="C_0002055044356505752139" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="2102" y="573"/>
-        <ellipse cx="2117" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M2112,590.1563 C2112,592.6563 2114.1406,594.4688 2117.0625,594.4688 C2118.2969,594.4688 2119.4688,594.1719 2120.2188,593.6563 C2120.8281,593.2344 2121.1563,592.8125 2121.1563,592.4063 C2121.1563,591.9375 2120.7344,591.5313 2120.2344,591.5313 C2120,591.5313 2119.7813,591.6094 2119.5781,591.8125 C2119.1406,592.25 2119.1406,592.25 2118.9688,592.3438 C2118.5156,592.5781 2117.875,592.7188 2117.1094,592.7188 C2115.1094,592.7188 2113.8281,591.7031 2113.8281,590.125 L2113.8281,589.0781 C2113.8281,587.375 2115.0469,586.1719 2116.75,586.1719 C2117.3281,586.1719 2117.9063,586.3125 2118.375,586.5625 C2118.8438,586.8281 2119.0156,587.0156 2119.0781,587.375 C2119.2031,588.0469 2119.4531,588.2969 2119.9844,588.2969 C2120.2656,588.2969 2120.5469,588.1563 2120.7344,587.9375 C2120.8594,587.7656 2120.9063,587.5938 2120.9063,587.1563 L2120.9063,585.7969 C2120.9063,585.375 2120.8906,585.2344 2120.7656,585.0625 C2120.5938,584.8125 2120.3125,584.6563 2119.9844,584.6563 C2119.6719,584.6563 2119.4688,584.7656 2119.25,585.0313 C2118.0781,584.5313 2117.6406,584.4219 2116.6875,584.4219 C2114.0156,584.4219 2112,586.4375 2112,589.0625 L2112,590.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="2131" y="593.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="24" x="2191" y="570"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="22" x="2192" y="584.2001">Ts...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="2103" x2="2211" y1="605" y2="605"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="2103" x2="2211" y1="613" y2="613"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="2219.5" y="571.2"/>
+      <ellipse cx="2234.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M2237.4688,592.8406 Q2236.8906,593.1375 2236.25,593.2781 Q2235.6094,593.4344 2234.9063,593.4344 Q2232.4063,593.4344 2231.0781,591.7938 Q2229.7656,590.1375 2229.7656,587.0125 Q2229.7656,583.8875 2231.0781,582.2313 Q2232.4063,580.575 2234.9063,580.575 Q2235.6094,580.575 2236.25,580.7313 Q2236.9063,580.8875 2237.4688,581.1844 L2237.4688,583.9031 Q2236.8438,583.325 2236.25,583.0594 Q2235.6563,582.7781 2235.0313,582.7781 Q2233.6875,582.7781 2233,583.8563 Q2232.3125,584.9188 2232.3125,587.0125 Q2232.3125,589.1063 2233,590.1844 Q2233.6875,591.2469 2235.0313,591.2469 Q2235.6563,591.2469 2236.25,590.9813 Q2236.8438,590.7 2237.4688,590.1219 L2237.4688,592.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="2248.5" y="591.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="2307.5" y="568.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="2308.5" y="580.3387">Ts...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="603.2" y2="603.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="611.2" y2="611.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0001536403088019105838">
-        <rect codeLine="7" fill="#F1F1F1" height="48" id="C_0001536403088019105838" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="178" x="1694.5" y="247"/>
-        <ellipse cx="1709.5" cy="263" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1704.5,264.1563 C1704.5,266.6563 1706.6406,268.4688 1709.5625,268.4688 C1710.7969,268.4688 1711.9688,268.1719 1712.7188,267.6563 C1713.3281,267.2344 1713.6563,266.8125 1713.6563,266.4063 C1713.6563,265.9375 1713.2344,265.5313 1712.7344,265.5313 C1712.5,265.5313 1712.2813,265.6094 1712.0781,265.8125 C1711.6406,266.25 1711.6406,266.25 1711.4688,266.3438 C1711.0156,266.5781 1710.375,266.7188 1709.6094,266.7188 C1707.6094,266.7188 1706.3281,265.7031 1706.3281,264.125 L1706.3281,263.0781 C1706.3281,261.375 1707.5469,260.1719 1709.25,260.1719 C1709.8281,260.1719 1710.4063,260.3125 1710.875,260.5625 C1711.3438,260.8281 1711.5156,261.0156 1711.5781,261.375 C1711.7031,262.0469 1711.9531,262.2969 1712.4844,262.2969 C1712.7656,262.2969 1713.0469,262.1563 1713.2344,261.9375 C1713.3594,261.7656 1713.4063,261.5938 1713.4063,261.1563 L1713.4063,259.7969 C1713.4063,259.375 1713.3906,259.2344 1713.2656,259.0625 C1713.0938,258.8125 1712.8125,258.6563 1712.4844,258.6563 C1712.1719,258.6563 1711.9688,258.7656 1711.75,259.0313 C1710.5781,258.5313 1710.1406,258.4219 1709.1875,258.4219 C1706.5156,258.4219 1704.5,260.4375 1704.5,263.0625 L1704.5,264.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1723.5" y="267.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="92" x="1783.5" y="244"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="90" x="1784.5" y="258.2001">Ret(Arg &amp;&amp;),Ts...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1695.5" x2="1871.5" y1="279" y2="279"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1695.5" x2="1871.5" y1="287" y2="287"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001536403088019105838" style="stroke: #A80036; stroke-width: 1.5;" width="190" x="1773" y="245.2"/>
+      <ellipse cx="1788" cy="261.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1790.9688,266.8406 Q1790.3906,267.1375 1789.75,267.2781 Q1789.1094,267.4344 1788.4063,267.4344 Q1785.9063,267.4344 1784.5781,265.7938 Q1783.2656,264.1375 1783.2656,261.0125 Q1783.2656,257.8875 1784.5781,256.2313 Q1785.9063,254.575 1788.4063,254.575 Q1789.1094,254.575 1789.75,254.7313 Q1790.4063,254.8875 1790.9688,255.1844 L1790.9688,257.9031 Q1790.3438,257.325 1789.75,257.0594 Q1789.1563,256.7781 1788.5313,256.7781 Q1787.1875,256.7781 1786.5,257.8563 Q1785.8125,258.9188 1785.8125,261.0125 Q1785.8125,263.1063 1786.5,264.1844 Q1787.1875,265.2469 1788.5313,265.2469 Q1789.1563,265.2469 1789.75,264.9813 Q1790.3438,264.7 1790.9688,264.1219 L1790.9688,266.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1802" y="265.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="105" x="1861" y="242.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1862" y="254.3387">Ret(Arg &amp;&amp;),Ts...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="277.2" y2="277.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="285.2" y2="285.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0001613293628874851145">
-        <rect codeLine="11" fill="#F1F1F1" height="48" id="C_0001613293628874851145" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="152" x="1707.5" y="496"/>
-        <ellipse cx="1722.5" cy="512" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1717.5,513.1563 C1717.5,515.6563 1719.6406,517.4688 1722.5625,517.4688 C1723.7969,517.4688 1724.9688,517.1719 1725.7188,516.6563 C1726.3281,516.2344 1726.6563,515.8125 1726.6563,515.4063 C1726.6563,514.9375 1726.2344,514.5313 1725.7344,514.5313 C1725.5,514.5313 1725.2813,514.6094 1725.0781,514.8125 C1724.6406,515.25 1724.6406,515.25 1724.4688,515.3438 C1724.0156,515.5781 1723.375,515.7188 1722.6094,515.7188 C1720.6094,515.7188 1719.3281,514.7031 1719.3281,513.125 L1719.3281,512.0781 C1719.3281,510.375 1720.5469,509.1719 1722.25,509.1719 C1722.8281,509.1719 1723.4063,509.3125 1723.875,509.5625 C1724.3438,509.8281 1724.5156,510.0156 1724.5781,510.375 C1724.7031,511.0469 1724.9531,511.2969 1725.4844,511.2969 C1725.7656,511.2969 1726.0469,511.1563 1726.2344,510.9375 C1726.3594,510.7656 1726.4063,510.5938 1726.4063,510.1563 L1726.4063,508.7969 C1726.4063,508.375 1726.3906,508.2344 1726.2656,508.0625 C1726.0938,507.8125 1725.8125,507.6563 1725.4844,507.6563 C1725.1719,507.6563 1724.9688,507.7656 1724.75,508.0313 C1723.5781,507.5313 1723.1406,507.4219 1722.1875,507.4219 C1719.5156,507.4219 1717.5,509.4375 1717.5,512.0625 L1717.5,513.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1736.5" y="516.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="66" x="1796.5" y="493"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="64" x="1797.5" y="507.2001">T const,Ts...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1708.5" x2="1858.5" y1="528" y2="528"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1708.5" x2="1858.5" y1="536" y2="536"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001613293628874851145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="1787.5" y="494.2"/>
+      <ellipse cx="1802.5" cy="510.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1805.4688,515.8406 Q1804.8906,516.1375 1804.25,516.2781 Q1803.6094,516.4344 1802.9063,516.4344 Q1800.4063,516.4344 1799.0781,514.7938 Q1797.7656,513.1375 1797.7656,510.0125 Q1797.7656,506.8875 1799.0781,505.2313 Q1800.4063,503.575 1802.9063,503.575 Q1803.6094,503.575 1804.25,503.7313 Q1804.9063,503.8875 1805.4688,504.1844 L1805.4688,506.9031 Q1804.8438,506.325 1804.25,506.0594 Q1803.6563,505.7781 1803.0313,505.7781 Q1801.6875,505.7781 1801,506.8563 Q1800.3125,507.9188 1800.3125,510.0125 Q1800.3125,512.1063 1801,513.1844 Q1801.6875,514.2469 1803.0313,514.2469 Q1803.6563,514.2469 1804.25,513.9813 Q1804.8438,513.7 1805.4688,513.1219 L1805.4688,515.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1816.5" y="514.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="76" x="1875.5" y="491.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="74" x="1876.5" y="503.3387">T const,Ts...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="526.2" y2="526.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="534.2" y2="534.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0000096201031647373215">
-        <rect codeLine="15" fill="#F1F1F1" height="48" id="C_0000096201031647373215" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="150" x="1708.5" y="93"/>
-        <ellipse cx="1723.5" cy="109" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1718.5,110.1563 C1718.5,112.6563 1720.6406,114.4688 1723.5625,114.4688 C1724.7969,114.4688 1725.9688,114.1719 1726.7188,113.6563 C1727.3281,113.2344 1727.6563,112.8125 1727.6563,112.4063 C1727.6563,111.9375 1727.2344,111.5313 1726.7344,111.5313 C1726.5,111.5313 1726.2813,111.6094 1726.0781,111.8125 C1725.6406,112.25 1725.6406,112.25 1725.4688,112.3438 C1725.0156,112.5781 1724.375,112.7188 1723.6094,112.7188 C1721.6094,112.7188 1720.3281,111.7031 1720.3281,110.125 L1720.3281,109.0781 C1720.3281,107.375 1721.5469,106.1719 1723.25,106.1719 C1723.8281,106.1719 1724.4063,106.3125 1724.875,106.5625 C1725.3438,106.8281 1725.5156,107.0156 1725.5781,107.375 C1725.7031,108.0469 1725.9531,108.2969 1726.4844,108.2969 C1726.7656,108.2969 1727.0469,108.1563 1727.2344,107.9375 C1727.3594,107.7656 1727.4063,107.5938 1727.4063,107.1563 L1727.4063,105.7969 C1727.4063,105.375 1727.3906,105.2344 1727.2656,105.0625 C1727.0938,104.8125 1726.8125,104.6563 1726.4844,104.6563 C1726.1719,104.6563 1725.9688,104.7656 1725.75,105.0313 C1724.5781,104.5313 1724.1406,104.4219 1723.1875,104.4219 C1720.5156,104.4219 1718.5,106.4375 1718.5,109.0625 L1718.5,110.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1737.5" y="113.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="64" x="1797.5" y="90"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="62" x="1798.5" y="104.2001">Head,Tail...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1709.5" x2="1857.5" y1="125" y2="125"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1709.5" x2="1857.5" y1="133" y2="133"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="1789.5" y="91.2"/>
+      <ellipse cx="1804.5" cy="107.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1807.4688,112.8406 Q1806.8906,113.1375 1806.25,113.2781 Q1805.6094,113.4344 1804.9063,113.4344 Q1802.4063,113.4344 1801.0781,111.7938 Q1799.7656,110.1375 1799.7656,107.0125 Q1799.7656,103.8875 1801.0781,102.2313 Q1802.4063,100.575 1804.9063,100.575 Q1805.6094,100.575 1806.25,100.7313 Q1806.9063,100.8875 1807.4688,101.1844 L1807.4688,103.9031 Q1806.8438,103.325 1806.25,103.0594 Q1805.6563,102.7781 1805.0313,102.7781 Q1803.6875,102.7781 1803,103.8563 Q1802.3125,104.9188 1802.3125,107.0125 Q1802.3125,109.1063 1803,110.1844 Q1803.6875,111.2469 1805.0313,111.2469 Q1805.6563,111.2469 1806.25,110.9813 Q1806.8438,110.7 1807.4688,110.1219 L1807.4688,112.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1818.5" y="111.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="72" x="1877.5" y="88.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="70" x="1878.5" y="100.3387">Head,Tail...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="123.2" y2="123.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="131.2" y2="131.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <g id="elem_C_0001342666740698875376">
-        <rect codeLine="19" fill="#F1F1F1" height="48" id="C_0001342666740698875376" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="189" x="1039.5" y="41"/>
-        <ellipse cx="1054.5" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1049.5,58.1563 C1049.5,60.6563 1051.6406,62.4688 1054.5625,62.4688 C1055.7969,62.4688 1056.9688,62.1719 1057.7188,61.6563 C1058.3281,61.2344 1058.6563,60.8125 1058.6563,60.4063 C1058.6563,59.9375 1058.2344,59.5313 1057.7344,59.5313 C1057.5,59.5313 1057.2813,59.6094 1057.0781,59.8125 C1056.6406,60.25 1056.6406,60.25 1056.4688,60.3438 C1056.0156,60.5781 1055.375,60.7188 1054.6094,60.7188 C1052.6094,60.7188 1051.3281,59.7031 1051.3281,58.125 L1051.3281,57.0781 C1051.3281,55.375 1052.5469,54.1719 1054.25,54.1719 C1054.8281,54.1719 1055.4063,54.3125 1055.875,54.5625 C1056.3438,54.8281 1056.5156,55.0156 1056.5781,55.375 C1056.7031,56.0469 1056.9531,56.2969 1057.4844,56.2969 C1057.7656,56.2969 1058.0469,56.1563 1058.2344,55.9375 C1058.3594,55.7656 1058.4063,55.5938 1058.4063,55.1563 L1058.4063,53.7969 C1058.4063,53.375 1058.3906,53.2344 1058.2656,53.0625 C1058.0938,52.8125 1057.8125,52.6563 1057.4844,52.6563 C1057.1719,52.6563 1056.9688,52.7656 1056.75,53.0313 C1055.5781,52.5313 1055.1406,52.4219 1054.1875,52.4219 C1051.5156,52.4219 1049.5,54.4375 1049.5,57.0625 L1049.5,58.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="1068.5" y="61.606">head</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="123" x="1108.5" y="38"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="121" x="1109.5" y="52.2001">type_list&lt;Head,Tail...&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1040.5" x2="1227.5" y1="73" y2="73"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1040.5" x2="1227.5" y1="81" y2="81"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001342666740698875376" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1050.5" y="39.2"/>
+      <ellipse cx="1065.5" cy="55.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1068.4688,60.8406 Q1067.8906,61.1375 1067.25,61.2781 Q1066.6094,61.4344 1065.9063,61.4344 Q1063.4063,61.4344 1062.0781,59.7938 Q1060.7656,58.1375 1060.7656,55.0125 Q1060.7656,51.8875 1062.0781,50.2313 Q1063.4063,48.575 1065.9063,48.575 Q1066.6094,48.575 1067.25,48.7313 Q1067.9063,48.8875 1068.4688,49.1844 L1068.4688,51.9031 Q1067.8438,51.325 1067.25,51.0594 Q1066.6563,50.7781 1066.0313,50.7781 Q1064.6875,50.7781 1064,51.8563 Q1063.3125,52.9188 1063.3125,55.0125 Q1063.3125,57.1063 1064,58.1844 Q1064.6875,59.2469 1066.0313,59.2469 Q1066.6563,59.2469 1067.25,58.9813 Q1067.8438,58.7 1068.4688,58.1219 L1068.4688,60.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1079.5" y="59.3543">head</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="143" x="1119.5" y="36.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="141" x="1120.5" y="48.3387">type_list&lt;Head,Tail...&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="71.2" y2="71.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="79.2" y2="79.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L21" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L21" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0000074655005329778311">
-        <rect codeLine="23" fill="#F1F1F1" height="48" id="C_0000074655005329778311" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="1721.5" y="899"/>
-        <ellipse cx="1736.5" cy="915" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1731.5,916.1563 C1731.5,918.6563 1733.6406,920.4688 1736.5625,920.4688 C1737.7969,920.4688 1738.9688,920.1719 1739.7188,919.6563 C1740.3281,919.2344 1740.6563,918.8125 1740.6563,918.4063 C1740.6563,917.9375 1740.2344,917.5313 1739.7344,917.5313 C1739.5,917.5313 1739.2813,917.6094 1739.0781,917.8125 C1738.6406,918.25 1738.6406,918.25 1738.4688,918.3438 C1738.0156,918.5781 1737.375,918.7188 1736.6094,918.7188 C1734.6094,918.7188 1733.3281,917.7031 1733.3281,916.125 L1733.3281,915.0781 C1733.3281,913.375 1734.5469,912.1719 1736.25,912.1719 C1736.8281,912.1719 1737.4063,912.3125 1737.875,912.5625 C1738.3438,912.8281 1738.5156,913.0156 1738.5781,913.375 C1738.7031,914.0469 1738.9531,914.2969 1739.4844,914.2969 C1739.7656,914.2969 1740.0469,914.1563 1740.2344,913.9375 C1740.3594,913.7656 1740.4063,913.5938 1740.4063,913.1563 L1740.4063,911.7969 C1740.4063,911.375 1740.3906,911.2344 1740.2656,911.0625 C1740.0938,910.8125 1739.8125,910.6563 1739.4844,910.6563 C1739.1719,910.6563 1738.9688,910.7656 1738.75,911.0313 C1737.5781,910.5313 1737.1406,910.4219 1736.1875,910.4219 C1733.5156,910.4219 1731.5,912.4375 1731.5,915.0625 L1731.5,916.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1750.5" y="919.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="38" x="1810.5" y="896"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="36" x="1811.5" y="910.2001">Type...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1722.5" x2="1844.5" y1="931" y2="931"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1722.5" x2="1844.5" y1="939" y2="939"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L21" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L21" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000074655005329778311" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="1803.5" y="897.2"/>
+      <ellipse cx="1818.5" cy="913.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1821.4688,918.8406 Q1820.8906,919.1375 1820.25,919.2781 Q1819.6094,919.4344 1818.9063,919.4344 Q1816.4063,919.4344 1815.0781,917.7938 Q1813.7656,916.1375 1813.7656,913.0125 Q1813.7656,909.8875 1815.0781,908.2313 Q1816.4063,906.575 1818.9063,906.575 Q1819.6094,906.575 1820.25,906.7313 Q1820.9063,906.8875 1821.4688,907.1844 L1821.4688,909.9031 Q1820.8438,909.325 1820.25,909.0594 Q1819.6563,908.7781 1819.0313,908.7781 Q1817.6875,908.7781 1817,909.8563 Q1816.3125,910.9188 1816.3125,913.0125 Q1816.3125,915.1063 1817,916.1844 Q1817.6875,917.2469 1819.0313,917.2469 Q1819.6563,917.2469 1820.25,916.9813 Q1820.8438,916.7 1821.4688,916.1219 L1821.4688,918.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1832.5" y="917.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="44" x="1891.5" y="894.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="1892.5" y="906.3387">Type...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="929.2" y2="929.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="937.2" y2="937.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0001877705309010128195">
-        <rect codeLine="27" fill="#F1F1F1" height="48" id="C_0001877705309010128195" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="1723.5" y="982"/>
-        <ellipse cx="1738.5" cy="998" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1733.5,999.1563 C1733.5,1001.6563 1735.6406,1003.4688 1738.5625,1003.4688 C1739.7969,1003.4688 1740.9688,1003.1719 1741.7188,1002.6563 C1742.3281,1002.2344 1742.6563,1001.8125 1742.6563,1001.4063 C1742.6563,1000.9375 1742.2344,1000.5313 1741.7344,1000.5313 C1741.5,1000.5313 1741.2813,1000.6094 1741.0781,1000.8125 C1740.6406,1001.25 1740.6406,1001.25 1740.4688,1001.3438 C1740.0156,1001.5781 1739.375,1001.7188 1738.6094,1001.7188 C1736.6094,1001.7188 1735.3281,1000.7031 1735.3281,999.125 L1735.3281,998.0781 C1735.3281,996.375 1736.5469,995.1719 1738.25,995.1719 C1738.8281,995.1719 1739.4063,995.3125 1739.875,995.5625 C1740.3438,995.8281 1740.5156,996.0156 1740.5781,996.375 C1740.7031,997.0469 1740.9531,997.2969 1741.4844,997.2969 C1741.7656,997.2969 1742.0469,997.1563 1742.2344,996.9375 C1742.3594,996.7656 1742.4063,996.5938 1742.4063,996.1563 L1742.4063,994.7969 C1742.4063,994.375 1742.3906,994.2344 1742.2656,994.0625 C1742.0938,993.8125 1741.8125,993.6563 1741.4844,993.6563 C1741.1719,993.6563 1740.9688,993.7656 1740.75,994.0313 C1739.5781,993.5313 1739.1406,993.4219 1738.1875,993.4219 C1735.5156,993.4219 1733.5,995.4375 1733.5,998.0625 L1733.5,999.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1752.5" y="1002.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="34" x="1812.5" y="979"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="32" x="1813.5" y="993.2001">First...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1724.5" x2="1842.5" y1="1014" y2="1014"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1724.5" x2="1842.5" y1="1022" y2="1022"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="1805.5" y="980.2"/>
+      <ellipse cx="1820.5" cy="996.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1823.4688,1001.8406 Q1822.8906,1002.1375 1822.25,1002.2781 Q1821.6094,1002.4344 1820.9063,1002.4344 Q1818.4063,1002.4344 1817.0781,1000.7938 Q1815.7656,999.1375 1815.7656,996.0125 Q1815.7656,992.8875 1817.0781,991.2313 Q1818.4063,989.575 1820.9063,989.575 Q1821.6094,989.575 1822.25,989.7313 Q1822.9063,989.8875 1823.4688,990.1844 L1823.4688,992.9031 Q1822.8438,992.325 1822.25,992.0594 Q1821.6563,991.7781 1821.0313,991.7781 Q1819.6875,991.7781 1819,992.8563 Q1818.3125,993.9188 1818.3125,996.0125 Q1818.3125,998.1063 1819,999.1844 Q1819.6875,1000.2469 1821.0313,1000.2469 Q1821.6563,1000.2469 1822.25,999.9813 Q1822.8438,999.7 1823.4688,999.1219 L1823.4688,1001.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1834.5" y="1000.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="40" x="1893.5" y="977.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="1894.5" y="989.3387">First...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1012.2" y2="1012.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1020.2" y2="1020.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0001737554639587928188">
-        <rect codeLine="31" fill="#F1F1F1" height="48" id="C_0001737554639587928188" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="1714" y="816"/>
-        <ellipse cx="1729" cy="832" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1724,833.1563 C1724,835.6563 1726.1406,837.4688 1729.0625,837.4688 C1730.2969,837.4688 1731.4688,837.1719 1732.2188,836.6563 C1732.8281,836.2344 1733.1563,835.8125 1733.1563,835.4063 C1733.1563,834.9375 1732.7344,834.5313 1732.2344,834.5313 C1732,834.5313 1731.7813,834.6094 1731.5781,834.8125 C1731.1406,835.25 1731.1406,835.25 1730.9688,835.3438 C1730.5156,835.5781 1729.875,835.7188 1729.1094,835.7188 C1727.1094,835.7188 1725.8281,834.7031 1725.8281,833.125 L1725.8281,832.0781 C1725.8281,830.375 1727.0469,829.1719 1728.75,829.1719 C1729.3281,829.1719 1729.9063,829.3125 1730.375,829.5625 C1730.8438,829.8281 1731.0156,830.0156 1731.0781,830.375 C1731.2031,831.0469 1731.4531,831.2969 1731.9844,831.2969 C1732.2656,831.2969 1732.5469,831.1563 1732.7344,830.9375 C1732.8594,830.7656 1732.9063,830.5938 1732.9063,830.1563 L1732.9063,828.7969 C1732.9063,828.375 1732.8906,828.2344 1732.7656,828.0625 C1732.5938,827.8125 1732.3125,827.6563 1731.9844,827.6563 C1731.6719,827.6563 1731.4688,827.7656 1731.25,828.0313 C1730.0781,827.5313 1729.6406,827.4219 1728.6875,827.4219 C1726.0156,827.4219 1724,829.4375 1724,832.0625 L1724,833.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1743" y="836.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="53" x="1803" y="813"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="51" x="1804" y="827.2001">Second...</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1715" x2="1852" y1="848" y2="848"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1715" x2="1852" y1="856" y2="856"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1795" y="814.2"/>
+      <ellipse cx="1810" cy="830.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1812.9688,835.8406 Q1812.3906,836.1375 1811.75,836.2781 Q1811.1094,836.4344 1810.4063,836.4344 Q1807.9063,836.4344 1806.5781,834.7938 Q1805.2656,833.1375 1805.2656,830.0125 Q1805.2656,826.8875 1806.5781,825.2313 Q1807.9063,823.575 1810.4063,823.575 Q1811.1094,823.575 1811.75,823.7313 Q1812.4063,823.8875 1812.9688,824.1844 L1812.9688,826.9031 Q1812.3438,826.325 1811.75,826.0594 Q1811.1563,825.7781 1810.5313,825.7781 Q1809.1875,825.7781 1808.5,826.8563 Q1807.8125,827.9188 1807.8125,830.0125 Q1807.8125,832.1063 1808.5,833.1844 Q1809.1875,834.2469 1810.5313,834.2469 Q1811.1563,834.2469 1811.75,833.9813 Q1812.3438,833.7 1812.9688,833.1219 L1812.9688,835.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1824" y="834.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="61" x="1883" y="811.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="1884" y="823.3387">Second...</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="846.2" y2="846.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="854.2" y2="854.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <g id="elem_C_0001313421318785708660">
-        <rect codeLine="35" fill="#F1F1F1" height="64.7999" id="C_0001313421318785708660" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="344" x="962" y="969.6"/>
-        <ellipse cx="977" cy="985.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M972,986.7563 C972,989.2563 974.1406,991.0688 977.0625,991.0688 C978.2969,991.0688 979.4688,990.7719 980.2188,990.2563 C980.8281,989.8344 981.1563,989.4125 981.1563,989.0063 C981.1563,988.5375 980.7344,988.1313 980.2344,988.1313 C980,988.1313 979.7813,988.2094 979.5781,988.4125 C979.1406,988.85 979.1406,988.85 978.9688,988.9438 C978.5156,989.1781 977.875,989.3188 977.1094,989.3188 C975.1094,989.3188 973.8281,988.3031 973.8281,986.725 L973.8281,985.6781 C973.8281,983.975 975.0469,982.7719 976.75,982.7719 C977.3281,982.7719 977.9063,982.9125 978.375,983.1625 C978.8438,983.4281 979.0156,983.6156 979.0781,983.975 C979.2031,984.6469 979.4531,984.8969 979.9844,984.8969 C980.2656,984.8969 980.5469,984.7563 980.7344,984.5375 C980.8594,984.3656 980.9063,984.1938 980.9063,983.7563 L980.9063,982.3969 C980.9063,981.975 980.8906,981.8344 980.7656,981.6625 C980.5938,981.4125 980.3125,981.2563 979.9844,981.2563 C979.6719,981.2563 979.4688,981.3656 979.25,981.6313 C978.0781,981.1313 977.6406,981.0219 976.6875,981.0219 C974.0156,981.0219 972,983.0375 972,985.6625 L972,986.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="991" y="990.206">type_group_pair</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="206" x="1103" y="966.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="204" x="1104" y="980.8001">type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="963" x2="1305" y1="1001.6" y2="1001.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="963" x2="1305" y1="1009.6" y2="1009.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="968" y="1018.5"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="970" y="1020.5"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="112" x="982" y="1026.6059">size : const size_t</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="60.8047" id="C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="965.5" y="965.7"/>
+      <ellipse cx="980.5" cy="981.7" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M983.4688,987.3406 Q982.8906,987.6375 982.25,987.7781 Q981.6094,987.9344 980.9063,987.9344 Q978.4063,987.9344 977.0781,986.2938 Q975.7656,984.6375 975.7656,981.5125 Q975.7656,978.3875 977.0781,976.7313 Q978.4063,975.075 980.9063,975.075 Q981.6094,975.075 982.25,975.2313 Q982.9063,975.3875 983.4688,975.6844 L983.4688,978.4031 Q982.8438,977.825 982.25,977.5594 Q981.6563,977.2781 981.0313,977.2781 Q979.6875,977.2781 979,978.3563 Q978.3125,979.4188 978.3125,981.5125 Q978.3125,983.6063 979,984.6844 Q979.6875,985.7469 981.0313,985.7469 Q981.6563,985.7469 982.25,985.4813 Q982.8438,985.2 983.4688,984.6219 L983.4688,987.3406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="994.5" y="985.8543">type_group_pair</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="245" x="1102.5" y="962.7"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="243" x="1103.5" y="974.8387">type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="997.7" y2="997.7"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="1005.7" y2="1005.7"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <g id="elem_C_0002110316024454672764">
-        <rect codeLine="40" fill="#F1F1F1" height="48" id="C_0002110316024454672764" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="2098" y="1065"/>
-        <ellipse cx="2113" cy="1081" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M2108,1082.1563 C2108,1084.6563 2110.1406,1086.4688 2113.0625,1086.4688 C2114.2969,1086.4688 2115.4688,1086.1719 2116.2188,1085.6563 C2116.8281,1085.2344 2117.1563,1084.8125 2117.1563,1084.4063 C2117.1563,1083.9375 2116.7344,1083.5313 2116.2344,1083.5313 C2116,1083.5313 2115.7813,1083.6094 2115.5781,1083.8125 C2115.1406,1084.25 2115.1406,1084.25 2114.9688,1084.3438 C2114.5156,1084.5781 2113.875,1084.7188 2113.1094,1084.7188 C2111.1094,1084.7188 2109.8281,1083.7031 2109.8281,1082.125 L2109.8281,1081.0781 C2109.8281,1079.375 2111.0469,1078.1719 2112.75,1078.1719 C2113.3281,1078.1719 2113.9063,1078.3125 2114.375,1078.5625 C2114.8438,1078.8281 2115.0156,1079.0156 2115.0781,1079.375 C2115.2031,1080.0469 2115.4531,1080.2969 2115.9844,1080.2969 C2116.2656,1080.2969 2116.5469,1080.1563 2116.7344,1079.9375 C2116.8594,1079.7656 2116.9063,1079.5938 2116.9063,1079.1563 L2116.9063,1077.7969 C2116.9063,1077.375 2116.8906,1077.2344 2116.7656,1077.0625 C2116.5938,1076.8125 2116.3125,1076.6563 2115.9844,1076.6563 C2115.6719,1076.6563 2115.4688,1076.7656 2115.25,1077.0313 C2114.0781,1076.5313 2113.6406,1076.4219 2112.6875,1076.4219 C2110.0156,1076.4219 2108,1078.4375 2108,1081.0625 L2108,1082.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="2127" y="1085.606">optional_ref</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="2210" y="1062"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="2211" y="1076.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="2099" x2="2215" y1="1097" y2="1097"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="2099" x2="2215" y1="1105" y2="1105"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="971.5" y="1011.7"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="973.5" y="1013.7"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <g id="elem_C_0000476531044436856932">
-        <rect codeLine="44" fill="#F1F1F1" height="48" id="C_0000476531044436856932" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="507" x="1530" y="1065"/>
-        <ellipse cx="1545" cy="1081" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1540,1082.1563 C1540,1084.6563 1542.1406,1086.4688 1545.0625,1086.4688 C1546.2969,1086.4688 1547.4688,1086.1719 1548.2188,1085.6563 C1548.8281,1085.2344 1549.1563,1084.8125 1549.1563,1084.4063 C1549.1563,1083.9375 1548.7344,1083.5313 1548.2344,1083.5313 C1548,1083.5313 1547.7813,1083.6094 1547.5781,1083.8125 C1547.1406,1084.25 1547.1406,1084.25 1546.9688,1084.3438 C1546.5156,1084.5781 1545.875,1084.7188 1545.1094,1084.7188 C1543.1094,1084.7188 1541.8281,1083.7031 1541.8281,1082.125 L1541.8281,1081.0781 C1541.8281,1079.375 1543.0469,1078.1719 1544.75,1078.1719 C1545.3281,1078.1719 1545.9063,1078.3125 1546.375,1078.5625 C1546.8438,1078.8281 1547.0156,1079.0156 1547.0781,1079.375 C1547.2031,1080.0469 1547.4531,1080.2969 1547.9844,1080.2969 C1548.2656,1080.2969 1548.5469,1080.1563 1548.7344,1079.9375 C1548.8594,1079.7656 1548.9063,1079.5938 1548.9063,1079.1563 L1548.9063,1077.7969 C1548.9063,1077.375 1548.8906,1077.2344 1548.7656,1077.0625 C1548.5938,1076.8125 1548.3125,1076.6563 1547.9844,1076.6563 C1547.6719,1076.6563 1547.4688,1076.7656 1547.25,1077.0313 C1546.0781,1076.5313 1545.6406,1076.4219 1544.6875,1076.4219 C1542.0156,1076.4219 1540,1078.4375 1540,1081.0625 L1540,1082.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="1559" y="1085.606">optional_ref</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="398" x="1642" y="1062"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="396" x="1643" y="1076.2001">type_group_pair_it&lt;It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;&gt;::value_type</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1531" x2="2036" y1="1097" y2="1097"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1531" x2="2036" y1="1105" y2="1105"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="101" x="985.5" y="1019.9104">size : const size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <g id="elem_C_0001024383802991748694">
-        <rect codeLine="48" fill="#F1F1F1" height="98.3998" id="C_0001024383802991748694" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="368" x="950" y="811.8"/>
-        <ellipse cx="965" cy="827.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M960,828.9563 C960,831.4563 962.1406,833.2688 965.0625,833.2688 C966.2969,833.2688 967.4688,832.9719 968.2188,832.4563 C968.8281,832.0344 969.1563,831.6125 969.1563,831.2063 C969.1563,830.7375 968.7344,830.3313 968.2344,830.3313 C968,830.3313 967.7813,830.4094 967.5781,830.6125 C967.1406,831.05 967.1406,831.05 966.9688,831.1438 C966.5156,831.3781 965.875,831.5188 965.1094,831.5188 C963.1094,831.5188 961.8281,830.5031 961.8281,828.925 L961.8281,827.8781 C961.8281,826.175 963.0469,824.9719 964.75,824.9719 C965.3281,824.9719 965.9063,825.1125 966.375,825.3625 C966.8438,825.6281 967.0156,825.8156 967.0781,826.175 C967.2031,826.8469 967.4531,827.0969 967.9844,827.0969 C968.2656,827.0969 968.5469,826.9563 968.7344,826.7375 C968.8594,826.5656 968.9063,826.3938 968.9063,825.9563 L968.9063,824.5969 C968.9063,824.175 968.8906,824.0344 968.7656,823.8625 C968.5938,823.6125 968.3125,823.4563 967.9844,823.4563 C967.6719,823.4563 967.4688,823.5656 967.25,823.8313 C966.0781,823.3313 965.6406,823.2219 964.6875,823.2219 C962.0156,823.2219 960,825.2375 960,827.8625 L960,828.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="979" y="832.406">type_group_pair_it</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="215" x="1106" y="808.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="213" x="1107" y="823.0001">It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="951" x2="1317" y1="843.8" y2="843.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="956" y="852.7"/>
-          <ellipse cx="961" cy="857.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="319" x="970" y="860.8059">find(const value_type &amp; v) constexpr : unsigned int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="956" y="869.4999"/>
-          <ellipse cx="961" cy="874.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="155" x="970" y="877.6059">get(unsigned int i) : ref_t</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="956" y="886.2998"/>
-          <ellipse cx="961" cy="891.2998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="250" x="970" y="894.4058">getp(unsigned int i) : const value_type *</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="951" x2="1317" y1="902.1998" y2="902.1998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="2217" y="1063.2"/>
+      <ellipse cx="2232" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M2234.9688,1084.8406 Q2234.3906,1085.1375 2233.75,1085.2781 Q2233.1094,1085.4344 2232.4063,1085.4344 Q2229.9063,1085.4344 2228.5781,1083.7938 Q2227.2656,1082.1375 2227.2656,1079.0125 Q2227.2656,1075.8875 2228.5781,1074.2313 Q2229.9063,1072.575 2232.4063,1072.575 Q2233.1094,1072.575 2233.75,1072.7313 Q2234.4063,1072.8875 2234.9688,1073.1844 L2234.9688,1075.9031 Q2234.3438,1075.325 2233.75,1075.0594 Q2233.1563,1074.7781 2232.5313,1074.7781 Q2231.1875,1074.7781 2230.5,1075.8563 Q2229.8125,1076.9188 2229.8125,1079.0125 Q2229.8125,1081.1063 2230.5,1082.1844 Q2231.1875,1083.2469 2232.5313,1083.2469 Q2233.1563,1083.2469 2233.75,1082.9813 Q2234.3438,1082.7 2234.9688,1082.1219 L2234.9688,1084.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="2246" y="1083.3543">optional_ref</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="2328" y="1060.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="2329" y="1072.3387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1095.2" y2="1095.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1103.2" y2="1103.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000586286676481245707">
-        <rect codeLine="55" fill="#F1F1F1" height="48" id="C_0000586286676481245707" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1763" y="330"/>
-        <ellipse cx="1778" cy="346" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1773,347.1563 C1773,349.6563 1775.1406,351.4688 1778.0625,351.4688 C1779.2969,351.4688 1780.4688,351.1719 1781.2188,350.6563 C1781.8281,350.2344 1782.1563,349.8125 1782.1563,349.4063 C1782.1563,348.9375 1781.7344,348.5313 1781.2344,348.5313 C1781,348.5313 1780.7813,348.6094 1780.5781,348.8125 C1780.1406,349.25 1780.1406,349.25 1779.9688,349.3438 C1779.5156,349.5781 1778.875,349.7188 1778.1094,349.7188 C1776.1094,349.7188 1774.8281,348.7031 1774.8281,347.125 L1774.8281,346.0781 C1774.8281,344.375 1776.0469,343.1719 1777.75,343.1719 C1778.3281,343.1719 1778.9063,343.3125 1779.375,343.5625 C1779.8438,343.8281 1780.0156,344.0156 1780.0781,344.375 C1780.2031,345.0469 1780.4531,345.2969 1780.9844,345.2969 C1781.2656,345.2969 1781.5469,345.1563 1781.7344,344.9375 C1781.8594,344.7656 1781.9063,344.5938 1781.9063,344.1563 L1781.9063,342.7969 C1781.9063,342.375 1781.8906,342.2344 1781.7656,342.0625 C1781.5938,341.8125 1781.3125,341.6563 1780.9844,341.6563 C1780.6719,341.6563 1780.4688,341.7656 1780.25,342.0313 C1779.0781,341.5313 1778.6406,341.4219 1777.6875,341.4219 C1775.0156,341.4219 1773,343.4375 1773,346.0625 L1773,347.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1792" y="350.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1764" x2="1803" y1="362" y2="362"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1764" x2="1803" y1="370" y2="370"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.5;" width="576" x="1580" y="1063.2"/>
+      <ellipse cx="1595" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1597.9688,1084.8406 Q1597.3906,1085.1375 1596.75,1085.2781 Q1596.1094,1085.4344 1595.4063,1085.4344 Q1592.9063,1085.4344 1591.5781,1083.7938 Q1590.2656,1082.1375 1590.2656,1079.0125 Q1590.2656,1075.8875 1591.5781,1074.2313 Q1592.9063,1072.575 1595.4063,1072.575 Q1596.1094,1072.575 1596.75,1072.7313 Q1597.4063,1072.8875 1597.9688,1073.1844 L1597.9688,1075.9031 Q1597.3438,1075.325 1596.75,1075.0594 Q1596.1563,1074.7781 1595.5313,1074.7781 Q1594.1875,1074.7781 1593.5,1075.8563 Q1592.8125,1076.9188 1592.8125,1079.0125 Q1592.8125,1081.1063 1593.5,1082.1844 Q1594.1875,1083.2469 1595.5313,1083.2469 Q1596.1563,1083.2469 1596.75,1082.9813 Q1597.3438,1082.7 1597.9688,1082.1219 L1597.9688,1084.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="1609" y="1083.3543">optional_ref</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="468" x="1691" y="1060.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="466" x="1692" y="1072.3387">type_group_pair_it&lt;It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;&gt;::value_type</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1095.2" y2="1095.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1103.2" y2="1103.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001353306307770366167">
-        <rect codeLine="59" fill="#F1F1F1" height="48" id="C_0001353306307770366167" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="1763" y="650"/>
-        <ellipse cx="1778" cy="666" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1773,667.1563 C1773,669.6563 1775.1406,671.4688 1778.0625,671.4688 C1779.2969,671.4688 1780.4688,671.1719 1781.2188,670.6563 C1781.8281,670.2344 1782.1563,669.8125 1782.1563,669.4063 C1782.1563,668.9375 1781.7344,668.5313 1781.2344,668.5313 C1781,668.5313 1780.7813,668.6094 1780.5781,668.8125 C1780.1406,669.25 1780.1406,669.25 1779.9688,669.3438 C1779.5156,669.5781 1778.875,669.7188 1778.1094,669.7188 C1776.1094,669.7188 1774.8281,668.7031 1774.8281,667.125 L1774.8281,666.0781 C1774.8281,664.375 1776.0469,663.1719 1777.75,663.1719 C1778.3281,663.1719 1778.9063,663.3125 1779.375,663.5625 C1779.8438,663.8281 1780.0156,664.0156 1780.0781,664.375 C1780.2031,665.0469 1780.4531,665.2969 1780.9844,665.2969 C1781.2656,665.2969 1781.5469,665.1563 1781.7344,664.9375 C1781.8594,664.7656 1781.9063,664.5938 1781.9063,664.1563 L1781.9063,662.7969 C1781.9063,662.375 1781.8906,662.2344 1781.7656,662.0625 C1781.5938,661.8125 1781.3125,661.6563 1780.9844,661.6563 C1780.6719,661.6563 1780.4688,661.7656 1780.25,662.0313 C1779.0781,661.5313 1778.6406,661.4219 1777.6875,661.4219 C1775.0156,661.4219 1773,663.4375 1773,666.0625 L1773,667.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="1792" y="670.606">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1764" x2="1803" y1="682" y2="682"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1764" x2="1803" y1="690" y2="690"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="86.4141" id="C_0001024383802991748694" style="stroke: #A80036; stroke-width: 1.5;" width="406" x="952" y="816.2"/>
+      <ellipse cx="967" cy="832.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M969.9688,837.8406 Q969.3906,838.1375 968.75,838.2781 Q968.1094,838.4344 967.4063,838.4344 Q964.9063,838.4344 963.5781,836.7938 Q962.2656,835.1375 962.2656,832.0125 Q962.2656,828.8875 963.5781,827.2313 Q964.9063,825.575 967.4063,825.575 Q968.1094,825.575 968.75,825.7313 Q969.4063,825.8875 969.9688,826.1844 L969.9688,828.9031 Q969.3438,828.325 968.75,828.0594 Q968.1563,827.7781 967.5313,827.7781 Q966.1875,827.7781 965.5,828.8563 Q964.8125,829.9188 964.8125,832.0125 Q964.8125,834.1063 965.5,835.1844 Q966.1875,836.2469 967.5313,836.2469 Q968.1563,836.2469 968.75,835.9813 Q969.3438,835.7 969.9688,835.1219 L969.9688,837.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="981" y="836.3543">type_group_pair_it</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="258" x="1103" y="813.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="256" x="1104" y="825.3387">It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="848.2" y2="848.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000598044391549147725">
-        <rect codeLine="63" fill="#F1F1F1" height="48" id="C_0000598044391549147725" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="1762.5" y="413"/>
-        <ellipse cx="1777.5" cy="429" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1772.5,430.1563 C1772.5,432.6563 1774.6406,434.4688 1777.5625,434.4688 C1778.7969,434.4688 1779.9688,434.1719 1780.7188,433.6563 C1781.3281,433.2344 1781.6563,432.8125 1781.6563,432.4063 C1781.6563,431.9375 1781.2344,431.5313 1780.7344,431.5313 C1780.5,431.5313 1780.2813,431.6094 1780.0781,431.8125 C1779.6406,432.25 1779.6406,432.25 1779.4688,432.3438 C1779.0156,432.5781 1778.375,432.7188 1777.6094,432.7188 C1775.6094,432.7188 1774.3281,431.7031 1774.3281,430.125 L1774.3281,429.0781 C1774.3281,427.375 1775.5469,426.1719 1777.25,426.1719 C1777.8281,426.1719 1778.4063,426.3125 1778.875,426.5625 C1779.3438,426.8281 1779.5156,427.0156 1779.5781,427.375 C1779.7031,428.0469 1779.9531,428.2969 1780.4844,428.2969 C1780.7656,428.2969 1781.0469,428.1563 1781.2344,427.9375 C1781.3594,427.7656 1781.4063,427.5938 1781.4063,427.1563 L1781.4063,425.7969 C1781.4063,425.375 1781.3906,425.2344 1781.2656,425.0625 C1781.0938,424.8125 1780.8125,424.6563 1780.4844,424.6563 C1780.1719,424.6563 1779.9688,424.7656 1779.75,425.0313 C1778.5781,424.5313 1778.1406,424.4219 1777.1875,424.4219 C1774.5156,424.4219 1772.5,426.4375 1772.5,429.0625 L1772.5,430.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="1791.5" y="433.606">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1763.5" x2="1803.5" y1="445" y2="445"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1763.5" x2="1803.5" y1="453" y2="453"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="854.2"/>
+      <ellipse cx="963" cy="859.2" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0000425551452299939770">
-        <rect codeLine="67" fill="#F1F1F1" height="48" id="C_0000425551452299939770" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="1064.5" y="330"/>
-        <ellipse cx="1079.5" cy="346" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1074.5,347.1563 C1074.5,349.6563 1076.6406,351.4688 1079.5625,351.4688 C1080.7969,351.4688 1081.9688,351.1719 1082.7188,350.6563 C1083.3281,350.2344 1083.6563,349.8125 1083.6563,349.4063 C1083.6563,348.9375 1083.2344,348.5313 1082.7344,348.5313 C1082.5,348.5313 1082.2813,348.6094 1082.0781,348.8125 C1081.6406,349.25 1081.6406,349.25 1081.4688,349.3438 C1081.0156,349.5781 1080.375,349.7188 1079.6094,349.7188 C1077.6094,349.7188 1076.3281,348.7031 1076.3281,347.125 L1076.3281,346.0781 C1076.3281,344.375 1077.5469,343.1719 1079.25,343.1719 C1079.8281,343.1719 1080.4063,343.3125 1080.875,343.5625 C1081.3438,343.8281 1081.5156,344.0156 1081.5781,344.375 C1081.7031,345.0469 1081.9531,345.2969 1082.4844,345.2969 C1082.7656,345.2969 1083.0469,345.1563 1083.2344,344.9375 C1083.3594,344.7656 1083.4063,344.5938 1083.4063,344.1563 L1083.4063,342.7969 C1083.4063,342.375 1083.3906,342.2344 1083.2656,342.0625 C1083.0938,341.8125 1082.8125,341.6563 1082.4844,341.6563 C1082.1719,341.6563 1081.9688,341.7656 1081.75,342.0313 C1080.5781,341.5313 1080.1406,341.4219 1079.1875,341.4219 C1076.5156,341.4219 1074.5,343.4375 1074.5,346.0625 L1074.5,347.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1093.5" y="350.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="53" x="1153.5" y="327"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="51" x="1154.5" y="341.2001">A,bool,int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1065.5" x2="1202.5" y1="362" y2="362"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1065.5" x2="1202.5" y1="370" y2="370"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="290" x="972" y="862.4104">find(const value_type &amp; v) constexpr : unsigned int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0000179850898515269194">
-        <rect codeLine="71" fill="#F1F1F1" height="48" id="C_0000179850898515269194" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="152" x="1348" y="1210"/>
-        <ellipse cx="1363" cy="1226" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1358,1227.1563 C1358,1229.6563 1360.1406,1231.4688 1363.0625,1231.4688 C1364.2969,1231.4688 1365.4688,1231.1719 1366.2188,1230.6563 C1366.8281,1230.2344 1367.1563,1229.8125 1367.1563,1229.4063 C1367.1563,1228.9375 1366.7344,1228.5313 1366.2344,1228.5313 C1366,1228.5313 1365.7813,1228.6094 1365.5781,1228.8125 C1365.1406,1229.25 1365.1406,1229.25 1364.9688,1229.3438 C1364.5156,1229.5781 1363.875,1229.7188 1363.1094,1229.7188 C1361.1094,1229.7188 1359.8281,1228.7031 1359.8281,1227.125 L1359.8281,1226.0781 C1359.8281,1224.375 1361.0469,1223.1719 1362.75,1223.1719 C1363.3281,1223.1719 1363.9063,1223.3125 1364.375,1223.5625 C1364.8438,1223.8281 1365.0156,1224.0156 1365.0781,1224.375 C1365.2031,1225.0469 1365.4531,1225.2969 1365.9844,1225.2969 C1366.2656,1225.2969 1366.5469,1225.1563 1366.7344,1224.9375 C1366.8594,1224.7656 1366.9063,1224.5938 1366.9063,1224.1563 L1366.9063,1222.7969 C1366.9063,1222.375 1366.8906,1222.2344 1366.7656,1222.0625 C1366.5938,1221.8125 1366.3125,1221.6563 1365.9844,1221.6563 C1365.6719,1221.6563 1365.4688,1221.7656 1365.25,1222.0313 C1364.0781,1221.5313 1363.6406,1221.4219 1362.6875,1221.4219 C1360.0156,1221.4219 1358,1223.4375 1358,1226.0625 L1358,1227.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1377" y="1230.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="66" x="1437" y="1207"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="64" x="1438" y="1221.2001">float,double</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1349" x2="1499" y1="1242" y2="1242"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1349" x2="1499" y1="1250" y2="1250"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="867.0047"/>
+      <ellipse cx="963" cy="872.0047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <g id="elem_C_0001070380438303872295">
-        <rect codeLine="75" fill="#F1F1F1" height="48" id="C_0001070380438303872295" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="119" x="1074.5" y="573"/>
-        <ellipse cx="1089.5" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1084.5,590.1563 C1084.5,592.6563 1086.6406,594.4688 1089.5625,594.4688 C1090.7969,594.4688 1091.9688,594.1719 1092.7188,593.6563 C1093.3281,593.2344 1093.6563,592.8125 1093.6563,592.4063 C1093.6563,591.9375 1093.2344,591.5313 1092.7344,591.5313 C1092.5,591.5313 1092.2813,591.6094 1092.0781,591.8125 C1091.6406,592.25 1091.6406,592.25 1091.4688,592.3438 C1091.0156,592.5781 1090.375,592.7188 1089.6094,592.7188 C1087.6094,592.7188 1086.3281,591.7031 1086.3281,590.125 L1086.3281,589.0781 C1086.3281,587.375 1087.5469,586.1719 1089.25,586.1719 C1089.8281,586.1719 1090.4063,586.3125 1090.875,586.5625 C1091.3438,586.8281 1091.5156,587.0156 1091.5781,587.375 C1091.7031,588.0469 1091.9531,588.2969 1092.4844,588.2969 C1092.7656,588.2969 1093.0469,588.1563 1093.2344,587.9375 C1093.3594,587.7656 1093.4063,587.5938 1093.4063,587.1563 L1093.4063,585.7969 C1093.4063,585.375 1093.3906,585.2344 1093.2656,585.0625 C1093.0938,584.8125 1092.8125,584.6563 1092.4844,584.6563 C1092.1719,584.6563 1091.9688,584.7656 1091.75,585.0313 C1090.5781,584.5313 1090.1406,584.4219 1089.1875,584.4219 C1086.5156,584.4219 1084.5,586.4375 1084.5,589.0625 L1084.5,590.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="1103.5" y="593.606">type_list</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="33" x="1163.5" y="570"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="31" x="1164.5" y="584.2001">A,B,C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1075.5" x2="1192.5" y1="605" y2="605"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1075.5" x2="1192.5" y1="613" y2="613"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="972" y="875.2151">get(unsigned int i) : ref_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <g id="elem_C_0001854055939974723413">
-        <rect codeLine="79" fill="#F1F1F1" height="48" id="C_0001854055939974723413" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="356" x="533" y="752"/>
-        <ellipse cx="548" cy="768" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M543,769.1563 C543,771.6563 545.1406,773.4688 548.0625,773.4688 C549.2969,773.4688 550.4688,773.1719 551.2188,772.6563 C551.8281,772.2344 552.1563,771.8125 552.1563,771.4063 C552.1563,770.9375 551.7344,770.5313 551.2344,770.5313 C551,770.5313 550.7813,770.6094 550.5781,770.8125 C550.1406,771.25 550.1406,771.25 549.9688,771.3438 C549.5156,771.5781 548.875,771.7188 548.1094,771.7188 C546.1094,771.7188 544.8281,770.7031 544.8281,769.125 L544.8281,768.0781 C544.8281,766.375 546.0469,765.1719 547.75,765.1719 C548.3281,765.1719 548.9063,765.3125 549.375,765.5625 C549.8438,765.8281 550.0156,766.0156 550.0781,766.375 C550.2031,767.0469 550.4531,767.2969 550.9844,767.2969 C551.2656,767.2969 551.5469,767.1563 551.7344,766.9375 C551.8594,766.7656 551.9063,766.5938 551.9063,766.1563 L551.9063,764.7969 C551.9063,764.375 551.8906,764.2344 551.7656,764.0625 C551.5938,763.8125 551.3125,763.6563 550.9844,763.6563 C550.6719,763.6563 550.4688,763.7656 550.25,764.0313 C549.0781,763.5313 548.6406,763.4219 547.6875,763.4219 C545.0156,763.4219 543,765.4375 543,768.0625 L543,769.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="562" y="772.606">type_group_pair</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="218" x="674" y="749"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="216" x="675" y="763.2001">type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="534" x2="888" y1="784" y2="784"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="534" x2="888" y1="792" y2="792"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="879.8094"/>
+      <ellipse cx="963" cy="884.8094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0002161425587790795236">
-        <rect codeLine="83" fill="#F1F1F1" height="81.5999" id="C_0002161425587790795236" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="431" x="7" y="586.2"/>
-        <ellipse cx="213.25" cy="602.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M208.25,603.3563 C208.25,605.8563 210.3906,607.6688 213.3125,607.6688 C214.5469,607.6688 215.7188,607.3719 216.4688,606.8563 C217.0781,606.4344 217.4063,606.0125 217.4063,605.6063 C217.4063,605.1375 216.9844,604.7313 216.4844,604.7313 C216.25,604.7313 216.0313,604.8094 215.8281,605.0125 C215.3906,605.45 215.3906,605.45 215.2188,605.5438 C214.7656,605.7781 214.125,605.9188 213.3594,605.9188 C211.3594,605.9188 210.0781,604.9031 210.0781,603.325 L210.0781,602.2781 C210.0781,600.575 211.2969,599.3719 213,599.3719 C213.5781,599.3719 214.1563,599.5125 214.625,599.7625 C215.0938,600.0281 215.2656,600.2156 215.3281,600.575 C215.4531,601.2469 215.7031,601.4969 216.2344,601.4969 C216.5156,601.4969 216.7969,601.3563 216.9844,601.1375 C217.1094,600.9656 217.1563,600.7938 217.1563,600.3563 L217.1563,598.9969 C217.1563,598.575 217.1406,598.4344 217.0156,598.2625 C216.8438,598.0125 216.5625,597.8563 216.2344,597.8563 C215.9219,597.8563 215.7188,597.9656 215.5,598.2313 C214.3281,597.7313 213.8906,597.6219 212.9375,597.6219 C210.2656,597.6219 208.25,599.6375 208.25,602.2625 L208.25,603.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="233.75" y="606.806">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="437" y1="618.2" y2="618.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="437" y1="626.2" y2="626.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="635.1"/>
-          <ellipse cx="18" cy="640.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="405" x="27" y="643.2059">abc : type_group_pair&lt;type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="651.8999"/>
-          <ellipse cx="18" cy="656.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="189" x="27" y="660.0059">aboolint : type_list&lt;A,bool,int&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="227" x="972" y="888.0198">getp(unsigned int i) : const value_type *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <g id="elem_C_0000271990753639572557">
-        <rect codeLine="89" fill="#F1F1F1" height="48" id="C_0000271990753639572557" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="251" x="1658" y="1148"/>
-        <ellipse cx="1673" cy="1164" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1668,1165.1563 C1668,1167.6563 1670.1406,1169.4688 1673.0625,1169.4688 C1674.2969,1169.4688 1675.4688,1169.1719 1676.2188,1168.6563 C1676.8281,1168.2344 1677.1563,1167.8125 1677.1563,1167.4063 C1677.1563,1166.9375 1676.7344,1166.5313 1676.2344,1166.5313 C1676,1166.5313 1675.7813,1166.6094 1675.5781,1166.8125 C1675.1406,1167.25 1675.1406,1167.25 1674.9688,1167.3438 C1674.5156,1167.5781 1673.875,1167.7188 1673.1094,1167.7188 C1671.1094,1167.7188 1669.8281,1166.7031 1669.8281,1165.125 L1669.8281,1164.0781 C1669.8281,1162.375 1671.0469,1161.1719 1672.75,1161.1719 C1673.3281,1161.1719 1673.9063,1161.3125 1674.375,1161.5625 C1674.8438,1161.8281 1675.0156,1162.0156 1675.0781,1162.375 C1675.2031,1163.0469 1675.4531,1163.2969 1675.9844,1163.2969 C1676.2656,1163.2969 1676.5469,1163.1563 1676.7344,1162.9375 C1676.8594,1162.7656 1676.9063,1162.5938 1676.9063,1162.1563 L1676.9063,1160.7969 C1676.9063,1160.375 1676.8906,1160.2344 1676.7656,1160.0625 C1676.5938,1159.8125 1676.3125,1159.6563 1675.9844,1159.6563 C1675.6719,1159.6563 1675.4688,1159.7656 1675.25,1160.0313 C1674.0781,1159.5313 1673.6406,1159.4219 1672.6875,1159.4219 C1670.0156,1159.4219 1668,1161.4375 1668,1164.0625 L1668,1165.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="1687" y="1168.606">type_group_pair</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="113" x="1799" y="1145"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="111" x="1800" y="1159.2001">typename,typename</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1659" x2="1908" y1="1180" y2="1180"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1659" x2="1908" y1="1188" y2="1188"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="894.6141" y2="894.6141"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="328.2"/>
+      <ellipse cx="1863" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1865.9688,349.8406 Q1865.3906,350.1375 1864.75,350.2781 Q1864.1094,350.4344 1863.4063,350.4344 Q1860.9063,350.4344 1859.5781,348.7938 Q1858.2656,347.1375 1858.2656,344.0125 Q1858.2656,340.8875 1859.5781,339.2313 Q1860.9063,337.575 1863.4063,337.575 Q1864.1094,337.575 1864.75,337.7313 Q1865.4063,337.8875 1865.9688,338.1844 L1865.9688,340.9031 Q1865.3438,340.325 1864.75,340.0594 Q1864.1563,339.7781 1863.5313,339.7781 Q1862.1875,339.7781 1861.5,340.8563 Q1860.8125,341.9188 1860.8125,344.0125 Q1860.8125,346.1063 1861.5,347.1844 Q1862.1875,348.2469 1863.5313,348.2469 Q1864.1563,348.2469 1864.75,347.9813 Q1865.3438,347.7 1865.9688,347.1219 L1865.9688,349.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="348.3543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="360.2" y2="360.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="368.2" y2="368.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <g id="elem_C_0001057906395469156958">
-        <rect codeLine="93" fill="#F1F1F1" height="48" id="C_0001057906395469156958" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="323" x="1622" y="733"/>
-        <ellipse cx="1637" cy="749" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1632,750.1563 C1632,752.6563 1634.1406,754.4688 1637.0625,754.4688 C1638.2969,754.4688 1639.4688,754.1719 1640.2188,753.6563 C1640.8281,753.2344 1641.1563,752.8125 1641.1563,752.4063 C1641.1563,751.9375 1640.7344,751.5313 1640.2344,751.5313 C1640,751.5313 1639.7813,751.6094 1639.5781,751.8125 C1639.1406,752.25 1639.1406,752.25 1638.9688,752.3438 C1638.5156,752.5781 1637.875,752.7188 1637.1094,752.7188 C1635.1094,752.7188 1633.8281,751.7031 1633.8281,750.125 L1633.8281,749.0781 C1633.8281,747.375 1635.0469,746.1719 1636.75,746.1719 C1637.3281,746.1719 1637.9063,746.3125 1638.375,746.5625 C1638.8438,746.8281 1639.0156,747.0156 1639.0781,747.375 C1639.2031,748.0469 1639.4531,748.2969 1639.9844,748.2969 C1640.2656,748.2969 1640.5469,748.1563 1640.7344,747.9375 C1640.8594,747.7656 1640.9063,747.5938 1640.9063,747.1563 L1640.9063,745.7969 C1640.9063,745.375 1640.8906,745.2344 1640.7656,745.0625 C1640.5938,744.8125 1640.3125,744.6563 1639.9844,744.6563 C1639.6719,744.6563 1639.4688,744.7656 1639.25,745.0313 C1638.0781,744.5313 1637.6406,744.4219 1636.6875,744.4219 C1634.0156,744.4219 1632,746.4375 1632,749.0625 L1632,750.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="119" x="1651" y="753.606">type_group_pair_it</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="170" x="1778" y="730"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="168" x="1779" y="744.2001">typename,typename,typename</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1623" x2="1944" y1="765" y2="765"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1623" x2="1944" y1="773" y2="773"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="648.2"/>
+      <ellipse cx="1863" cy="664.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1865.9688,669.8406 Q1865.3906,670.1375 1864.75,670.2781 Q1864.1094,670.4344 1863.4063,670.4344 Q1860.9063,670.4344 1859.5781,668.7938 Q1858.2656,667.1375 1858.2656,664.0125 Q1858.2656,660.8875 1859.5781,659.2313 Q1860.9063,657.575 1863.4063,657.575 Q1864.1094,657.575 1864.75,657.7313 Q1865.4063,657.8875 1865.9688,658.1844 L1865.9688,660.9031 Q1865.3438,660.325 1864.75,660.0594 Q1864.1563,659.7781 1863.5313,659.7781 Q1862.1875,659.7781 1861.5,660.8563 Q1860.8125,661.9188 1860.8125,664.0125 Q1860.8125,666.1063 1861.5,667.1844 Q1862.1875,668.2469 1863.5313,668.2469 Q1864.1563,668.2469 1864.75,667.9813 Q1865.3438,667.7 1865.9688,667.1219 L1865.9688,669.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="668.3543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="680.2" y2="680.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="688.2" y2="688.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <g id="elem_C_0001317314479884183399">
-        <rect codeLine="97" fill="#F1F1F1" height="48" id="C_0001317314479884183399" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="122" x="1722.5" y="10"/>
-        <ellipse cx="1737.5" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M1732.5,27.1563 C1732.5,29.6563 1734.6406,31.4688 1737.5625,31.4688 C1738.7969,31.4688 1739.9688,31.1719 1740.7188,30.6563 C1741.3281,30.2344 1741.6563,29.8125 1741.6563,29.4063 C1741.6563,28.9375 1741.2344,28.5313 1740.7344,28.5313 C1740.5,28.5313 1740.2813,28.6094 1740.0781,28.8125 C1739.6406,29.25 1739.6406,29.25 1739.4688,29.3438 C1739.0156,29.5781 1738.375,29.7188 1737.6094,29.7188 C1735.6094,29.7188 1734.3281,28.7031 1734.3281,27.125 L1734.3281,26.0781 C1734.3281,24.375 1735.5469,23.1719 1737.25,23.1719 C1737.8281,23.1719 1738.4063,23.3125 1738.875,23.5625 C1739.3438,23.8281 1739.5156,24.0156 1739.5781,24.375 C1739.7031,25.0469 1739.9531,25.2969 1740.4844,25.2969 C1740.7656,25.2969 1741.0469,25.1563 1741.2344,24.9375 C1741.3594,24.7656 1741.4063,24.5938 1741.4063,24.1563 L1741.4063,22.7969 C1741.4063,22.375 1741.3906,22.2344 1741.2656,22.0625 C1741.0938,21.8125 1740.8125,21.6563 1740.4844,21.6563 C1740.1719,21.6563 1739.9688,21.7656 1739.75,22.0313 C1738.5781,21.5313 1738.1406,21.4219 1737.1875,21.4219 C1734.5156,21.4219 1732.5,23.4375 1732.5,26.0625 L1732.5,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="1751.5" y="30.606">head</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="56" x="1791.5" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="54" x="1792.5" y="21.2001">typename</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1723.5" x2="1843.5" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="1723.5" x2="1843.5" y1="50" y2="50"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="411.2"/>
+      <ellipse cx="1863" cy="427.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1865.9688,432.8406 Q1865.3906,433.1375 1864.75,433.2781 Q1864.1094,433.4344 1863.4063,433.4344 Q1860.9063,433.4344 1859.5781,431.7938 Q1858.2656,430.1375 1858.2656,427.0125 Q1858.2656,423.8875 1859.5781,422.2313 Q1860.9063,420.575 1863.4063,420.575 Q1864.1094,420.575 1864.75,420.7313 Q1865.4063,420.8875 1865.9688,421.1844 L1865.9688,423.9031 Q1865.3438,423.325 1864.75,423.0594 Q1864.1563,422.7781 1863.5313,422.7781 Q1862.1875,422.7781 1861.5,423.8563 Q1860.8125,424.9188 1860.8125,427.0125 Q1860.8125,429.1063 1861.5,430.1844 Q1862.1875,431.2469 1863.5313,431.2469 Q1864.1563,431.2469 1864.75,430.9813 Q1865.3438,430.7 1865.9688,430.1219 L1865.9688,432.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="431.3543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="443.2" y2="443.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="451.2" y2="451.2"/>
     </a>
-    <g id="link_C_0001536403088019105838_C_0002055044356505752139">
-      <path codeLine="100" d="M1872.74,264.99 C1925.54,265.96 1991.07,275.76 2037,312 C2121.81,378.94 2144.6586,499.2027 2151.4686,554.9827 " fill="none" id="C_0001536403088019105838-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2153.65,572.85,2157.4244,554.2555,2145.5129,555.7098,2153.65,572.85" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001613293628874851145_C_0002055044356505752139">
-      <path codeLine="101" d="M1859.87,531.26 C1917.27,540.39 1998.05,554.43 2068,571 C2079.01,573.61 2073.3861,571.7778 2084.5061,574.9878 " fill="none" id="C_0001613293628874851145-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2101.8,579.98,2086.1702,569.2232,2082.8421,580.7524,2101.8,579.98" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000096201031647373215_C_0002055044356505752139">
-      <path codeLine="102" d="M1858.97,109.16 C1922.97,106.81 2013.33,114.65 2068,168 C2126.7,225.29 2147.7452,472.761 2153.2952,554.811 " fill="none" id="C_0000096201031647373215-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2154.51,572.77,2159.2815,554.4061,2147.3089,555.216,2154.51,572.77" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001342666740698875376_C_0000096201031647373215">
-      <path codeLine="103" d="M1228.81,72.54 C1358.49,82.95 1583.9092,101.0601 1702.2992,110.5601 " fill="none" id="C_0001342666740698875376-to-C_0000096201031647373215" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1708.28,111.04,1699.6288,106.3329,1703.296,110.6401,1698.9889,114.3073,1708.28,111.04" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001342666740698875376_C_0001317314479884183399">
-      <path codeLine="104" d="M1228.81,60.51 C1363.74,54.05 1590.8406,43.1802 1704.1306,37.7602 " fill="none" id="C_0001342666740698875376-to-C_0001317314479884183399" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="1722.11,36.9,1703.8438,31.767,1704.4173,43.7533,1722.11,36.9" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000074655005329778311_C_0002055044356505752139">
-      <path codeLine="105" d="M1845.89,928.8 C1901.54,930.7 1982.88,924.72 2037,882 C2121.81,815.07 2144.659,694.8074 2151.469,639.0174 " fill="none" id="C_0000074655005329778311-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2153.65,621.15,2145.5132,638.2904,2157.4248,639.7444,2153.65,621.15" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001877705309010128195_C_0002055044356505752139">
-      <path codeLine="106" d="M1843.77,1012.68 C1900.06,1015.62 1983.76,1010.72 2037,965 C2142.96,874.02 2155.0467,705.9484 2155.9467,639.3684 " fill="none" id="C_0001877705309010128195-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2156.19,621.37,2149.9473,639.2873,2161.9462,639.4495,2156.19,621.37" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001737554639587928188_C_0002055044356505752139">
-      <path codeLine="107" d="M1853.26,844.07 C1907.6,843.93 1983.02,835.91 2037,799 C2101.01,755.24 2130.2937,681.9346 2143.8337,638.4946 " fill="none" id="C_0001737554639587928188-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2149.19,621.31,2138.1055,636.7091,2149.5619,640.28,2149.19,621.31" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001313421318785708660_C_0001877705309010128195">
-      <path codeLine="108" d="M1306.39,1003.06 C1444.08,1003.91 1623.4001,1005.0228 1717.0401,1005.6028 " fill="none" id="C_0001313421318785708660-to-C_0001877705309010128195" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1723.04,1005.64,1714.0649,1001.5843,1718.0401,1005.609,1714.0154,1009.5842,1723.04,1005.64" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001313421318785708660_C_0001737554639587928188">
-      <path codeLine="109" d="M1229.39,969.11 C1308.8,942.41 1425.75,905.32 1530,881 C1591.52,866.66 1656.6955,856.404 1707.7455,849.414 " fill="none" id="C_0001313421318785708660-to-C_0001737554639587928188" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1713.69,848.6,1704.2306,845.8579,1708.7362,849.2783,1705.3158,853.784,1713.69,848.6" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001313421318785708660_C_0000271990753639572557">
-      <path codeLine="110" d="M1222.12,1034.77 C1301.42,1063.56 1422.22,1104.82 1530,1131 C1571.21,1141.02 1599.0362,1146.4783 1640.0162,1152.8883 " fill="none" id="C_0001313421318785708660-to-C_0000271990753639572557" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="1657.8,1155.67,1640.9435,1146.9604,1639.089,1158.8162,1657.8,1155.67" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000476531044436856932_C_0002110316024454672764">
-      <path codeLine="111" d="M2037.43,1089 C2059.4,1089 2061.92,1089 2079.51,1089 " fill="none" id="C_0000476531044436856932-to-C_0002110316024454672764" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2097.51,1089,2079.51,1083,2079.51,1095,2097.51,1089" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001024383802991748694_C_0001877705309010128195">
-      <path codeLine="112" d="M1318.46,879.19 C1378.69,890.3 1444.4,908.19 1500,937 C1516.19,945.4 1513.62,956.97 1530,965 C1591.31,995.07 1664.0551,1003.5628 1717.1751,1005.7528 " fill="none" id="C_0001024383802991748694-to-C_0001877705309010128195" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1723.17,1006,1714.3424,1001.6327,1718.1742,1005.794,1714.0129,1009.6259,1723.17,1006" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001024383802991748694_C_0001737554639587928188">
-      <path codeLine="113" d="M1318.38,855.06 C1450.19,850.78 1614.5032,845.4547 1707.8132,842.4247 " fill="none" id="C_0001024383802991748694-to-C_0001737554639587928188" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1713.81,842.23,1704.6849,838.5242,1708.8126,842.3923,1704.9446,846.52,1713.81,842.23" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001024383802991748694_C_0000476531044436856932">
-      <path codeLine="114" d="M1235.99,910.62 C1342.77,962.8 1499.93,1038.65 1530,1048 C1550.67,1054.43 1566.7592,1058.6618 1588.7592,1063.3018 " fill="none" id="C_0001024383802991748694-to-C_0000476531044436856932" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1594.63,1064.54,1586.6492,1058.7688,1589.7376,1063.5082,1584.9983,1066.5966,1594.63,1064.54" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001024383802991748694_C_0001057906395469156958">
-      <path codeLine="115" d="M1318.26,829.88 C1328.32,828.22 1338.28,826.59 1348,825 C1439,810.19 1523.0324,796.9872 1605.2224,784.2472 " fill="none" id="C_0001024383802991748694-to-C_0001057906395469156958" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="1623.01,781.49,1604.3034,778.318,1606.1415,790.1764,1623.01,781.49" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000425551452299939770_C_0000586286676481245707">
-      <path codeLine="116" d="M1203.99,354 C1348.83,354 1672.21,354 1756.54,354 " fill="none" id="C_0000425551452299939770-to-C_0000586286676481245707" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1762.54,354,1753.54,350,1757.54,354,1753.54,358,1762.54,354" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000425551452299939770_C_0002055044356505752139">
-      <path codeLine="117" d="M1192.55,329.63 C1268.28,298.99 1406.31,248.11 1530,229 C1752.69,194.61 1853.09,98.8 2037,229 C2095.3,270.28 2135.8207,479.3736 2148.8807,554.8436 " fill="none" id="C_0000425551452299939770-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2151.95,572.58,2154.7929,553.8205,2142.9686,555.8667,2151.95,572.58" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000179850898515269194_C_0002055044356505752139">
-      <path codeLine="118" d="M1500.44,1258.27 C1627.56,1293.98 1885.38,1343.4 2037,1214 C2083.52,1174.3 2137.6845,748.5793 2150.9445,639.1593 " fill="none" id="C_0000179850898515269194-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2153.11,621.29,2144.9881,638.4374,2156.9009,639.8811,2153.11,621.29" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001070380438303872295_C_0000586286676481245707">
-      <path codeLine="119" d="M1171.8,572.59 C1239.52,528.97 1389.78,438.22 1530,395 C1614.25,369.04 1713.6779,359.1536 1756.7779,355.8136 " fill="none" id="C_0001070380438303872295-to-C_0000586286676481245707" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1762.76,355.35,1753.4779,352.0573,1757.7749,355.7363,1754.096,360.0334,1762.76,355.35" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001070380438303872295_C_0001353306307770366167">
-      <path codeLine="120" d="M1193.76,604.25 C1236.53,609.51 1295.84,616.76 1348,623 C1507.88,642.14 1694.9699,663.8696 1756.6099,671.0096 " fill="none" id="C_0001070380438303872295-to-C_0001353306307770366167" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1762.57,671.7,1754.09,666.691,1757.6032,671.1247,1753.1695,674.6379,1762.57,671.7" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001070380438303872295_C_0000598044391549147725">
-      <path codeLine="121" d="M1193.9,576.6 C1270.53,550.67 1408.92,505.94 1530,478 C1615.25,458.33 1712.864,445.385 1756.074,440.125 " fill="none" id="C_0001070380438303872295-to-C_0000598044391549147725" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1762.03,439.4,1752.6126,436.5169,1757.0666,440.0042,1753.5793,444.4582,1762.03,439.4" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001070380438303872295_C_0002055044356505752139">
-      <path codeLine="122" d="M1193.93,597 C1375.8,597 1908.5,597 2083.79,597 " fill="none" id="C_0001070380438303872295-to-C_0002055044356505752139" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="2101.79,597,2083.79,591,2083.79,603,2101.79,597" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001854055939974723413_C_0000179850898515269194">
-      <path codeLine="123" d="M726.83,800.18 C760.33,852.96 847.03,979.54 950,1052 C1075.56,1140.37 1243.8979,1191.3798 1342.0579,1215.8298 " fill="none" id="C_0001854055939974723413-to-C_0000179850898515269194" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1347.88,1217.28,1340.1136,1211.2233,1343.0282,1216.0715,1338.18,1218.9861,1347.88,1217.28" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001854055939974723413_C_0001070380438303872295">
-      <path codeLine="124" d="M769.22,751.68 C849.59,717.5 989.5583,657.9875 1070.0483,623.7675 " fill="none" id="C_0001854055939974723413-to-C_0001070380438303872295" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1075.57,621.42,1065.7224,621.2602,1070.9686,623.3763,1068.8525,628.6224,1075.57,621.42" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001854055939974723413_C_0001313421318785708660">
-      <path codeLine="125" d="M745.89,800.48 C791.01,832.4 873.97,888.78 950,928 C979.39,943.17 995.8925,950.7875 1025.8925,962.6575 " fill="none" id="C_0001854055939974723413-to-C_0001313421318785708660" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="1042.63,969.28,1028.1,957.0784,1023.685,968.2367,1042.63,969.28" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002161425587790795236_C_0000425551452299939770">
-      <path codeLine="126" d="M372.1433,582.3899 C569.5233,523.1399 914.85,419.48 1064.27,374.63 " fill="none" id="C_0002161425587790795236-backto-C_0000425551452299939770" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="360.65,585.84,367.5467,587.9461,372.1433,582.3899,365.2466,580.2838,360.65,585.84" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="687.5" cy="420.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="45" x="694.5" y="424.077">aboolint</text>
-    </g>
-    <g id="link_C_0002161425587790795236_C_0001854055939974723413">
-      <path codeLine="127" d="M369.5238,671.7246 C456.9838,698.5146 556.58,729.01 630.3,751.59 " fill="none" id="C_0002161425587790795236-backto-C_0001854055939974723413" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="358.05,668.21,362.6154,673.7919,369.5238,671.7246,364.9584,666.1427,358.05,668.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="474" cy="697.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="481" y="701.077">abc</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1082" y="328.2"/>
+      <ellipse cx="1097" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1099.9688,349.8406 Q1099.3906,350.1375 1098.75,350.2781 Q1098.1094,350.4344 1097.4063,350.4344 Q1094.9063,350.4344 1093.5781,348.7938 Q1092.2656,347.1375 1092.2656,344.0125 Q1092.2656,340.8875 1093.5781,339.2313 Q1094.9063,337.575 1097.4063,337.575 Q1098.1094,337.575 1098.75,337.7313 Q1099.4063,337.8875 1099.9688,338.1844 L1099.9688,340.9031 Q1099.3438,340.325 1098.75,340.0594 Q1098.1563,339.7781 1097.5313,339.7781 Q1096.1875,339.7781 1095.5,340.8563 Q1094.8125,341.9188 1094.8125,344.0125 Q1094.8125,346.1063 1095.5,347.1844 Q1096.1875,348.2469 1097.5313,348.2469 Q1098.1563,348.2469 1098.75,347.9813 Q1099.3438,347.7 1099.9688,347.1219 L1099.9688,349.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1111" y="348.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="61" x="1170" y="325.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="1171" y="337.3387">A,bool,int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="360.2" y2="360.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="368.2" y2="368.2"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="1388" y="1208.2"/>
+      <ellipse cx="1403" cy="1224.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1405.9688,1229.8406 Q1405.3906,1230.1375 1404.75,1230.2781 Q1404.1094,1230.4344 1403.4063,1230.4344 Q1400.9063,1230.4344 1399.5781,1228.7938 Q1398.2656,1227.1375 1398.2656,1224.0125 Q1398.2656,1220.8875 1399.5781,1219.2313 Q1400.9063,1217.575 1403.4063,1217.575 Q1404.1094,1217.575 1404.75,1217.7313 Q1405.4063,1217.8875 1405.9688,1218.1844 L1405.9688,1220.9031 Q1405.3438,1220.325 1404.75,1220.0594 Q1404.1563,1219.7781 1403.5313,1219.7781 Q1402.1875,1219.7781 1401.5,1220.8563 Q1400.8125,1221.9188 1400.8125,1224.0125 Q1400.8125,1226.1063 1401.5,1227.1844 Q1402.1875,1228.2469 1403.5313,1228.2469 Q1404.1563,1228.2469 1404.75,1227.9813 Q1405.3438,1227.7 1405.9688,1227.1219 L1405.9688,1229.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1417" y="1228.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="77" x="1476" y="1205.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="75" x="1477" y="1217.3387">float,double</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1240.2" y2="1240.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1248.2" y2="1248.2"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="1095.5" y="571.2"/>
+      <ellipse cx="1110.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1113.4688,592.8406 Q1112.8906,593.1375 1112.25,593.2781 Q1111.6094,593.4344 1110.9063,593.4344 Q1108.4063,593.4344 1107.0781,591.7938 Q1105.7656,590.1375 1105.7656,587.0125 Q1105.7656,583.8875 1107.0781,582.2313 Q1108.4063,580.575 1110.9063,580.575 Q1111.6094,580.575 1112.25,580.7313 Q1112.9063,580.8875 1113.4688,581.1844 L1113.4688,583.9031 Q1112.8438,583.325 1112.25,583.0594 Q1111.6563,582.7781 1111.0313,582.7781 Q1109.6875,582.7781 1109,583.8563 Q1108.3125,584.9188 1108.3125,587.0125 Q1108.3125,589.1063 1109,590.1844 Q1109.6875,591.2469 1111.0313,591.2469 Q1111.6563,591.2469 1112.25,590.9813 Q1112.8438,590.7 1113.4688,590.1219 L1113.4688,592.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1124.5" y="591.3543">type_list</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="34" x="1183.5" y="568.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="1184.5" y="580.3387">A,B,C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="603.2" y2="603.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="611.2" y2="611.2"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.5;" width="389" x="502" y="748.2"/>
+      <ellipse cx="517" cy="764.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M519.9688,769.8406 Q519.3906,770.1375 518.75,770.2781 Q518.1094,770.4344 517.4063,770.4344 Q514.9063,770.4344 513.5781,768.7938 Q512.2656,767.1375 512.2656,764.0125 Q512.2656,760.8875 513.5781,759.2313 Q514.9063,757.575 517.4063,757.575 Q518.1094,757.575 518.75,757.7313 Q519.4063,757.8875 519.9688,758.1844 L519.9688,760.9031 Q519.3438,760.325 518.75,760.0594 Q518.1563,759.7781 517.5313,759.7781 Q516.1875,759.7781 515.5,760.8563 Q514.8125,761.9188 514.8125,764.0125 Q514.8125,766.1063 515.5,767.1844 Q516.1875,768.2469 517.5313,768.2469 Q518.1563,768.2469 518.75,767.9813 Q519.3438,767.7 519.9688,767.1219 L519.9688,769.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="531" y="768.3543">type_group_pair</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="255" x="639" y="745.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="253" x="640" y="757.3387">type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="780.2" y2="780.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="788.2" y2="788.2"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="73.6094" id="C_0002161425587790795236" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="586.2"/>
+      <ellipse cx="197.25" cy="602.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M200.2188,607.8406 Q199.6406,608.1375 199,608.2781 Q198.3594,608.4344 197.6563,608.4344 Q195.1563,608.4344 193.8281,606.7938 Q192.5156,605.1375 192.5156,602.0125 Q192.5156,598.8875 193.8281,597.2313 Q195.1563,595.575 197.6563,595.575 Q198.3594,595.575 199,595.7313 Q199.6563,595.8875 200.2188,596.1844 L200.2188,598.9031 Q199.5938,598.325 199,598.0594 Q198.4063,597.7781 197.7813,597.7781 Q196.4375,597.7781 195.75,598.8563 Q195.0625,599.9188 195.0625,602.0125 Q195.0625,604.1063 195.75,605.1844 Q196.4375,606.2469 197.7813,606.2469 Q198.4063,606.2469 199,605.9813 Q199.5938,605.7 200.2188,605.1219 L200.2188,607.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="217.75" y="606.3543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="618.2" y2="618.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="626.2" y2="626.2"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="632.2"/>
+      <ellipse cx="17" cy="637.2" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="373" x="26" y="640.4104">abc : type_group_pair&lt;type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="645.0047"/>
+      <ellipse cx="17" cy="650.0047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="175" x="26" y="653.2151">aboolint : type_list&lt;A,bool,int&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="1735" y="1146.2"/>
+      <ellipse cx="1750" cy="1162.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1752.9688,1167.8406 Q1752.3906,1168.1375 1751.75,1168.2781 Q1751.1094,1168.4344 1750.4063,1168.4344 Q1747.9063,1168.4344 1746.5781,1166.7938 Q1745.2656,1165.1375 1745.2656,1162.0125 Q1745.2656,1158.8875 1746.5781,1157.2313 Q1747.9063,1155.575 1750.4063,1155.575 Q1751.1094,1155.575 1751.75,1155.7313 Q1752.4063,1155.8875 1752.9688,1156.1844 L1752.9688,1158.9031 Q1752.3438,1158.325 1751.75,1158.0594 Q1751.1563,1157.7781 1750.5313,1157.7781 Q1749.1875,1157.7781 1748.5,1158.8563 Q1747.8125,1159.9188 1747.8125,1162.0125 Q1747.8125,1164.1063 1748.5,1165.1844 Q1749.1875,1166.2469 1750.5313,1166.2469 Q1751.1563,1166.2469 1751.75,1165.9813 Q1752.3438,1165.7 1752.9688,1165.1219 L1752.9688,1167.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="1764" y="1166.3543">type_group_pair</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="132" x="1872" y="1143.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="130" x="1873" y="1155.3387">typename,typename</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1178.2" y2="1178.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1186.2" y2="1186.2"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.5;" width="347" x="1694.5" y="731.2"/>
+      <ellipse cx="1709.5" cy="747.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1712.4688,752.8406 Q1711.8906,753.1375 1711.25,753.2781 Q1710.6094,753.4344 1709.9063,753.4344 Q1707.4063,753.4344 1706.0781,751.7938 Q1704.7656,750.1375 1704.7656,747.0125 Q1704.7656,743.8875 1706.0781,742.2313 Q1707.4063,740.575 1709.9063,740.575 Q1710.6094,740.575 1711.25,740.7313 Q1711.9063,740.8875 1712.4688,741.1844 L1712.4688,743.9031 Q1711.8438,743.325 1711.25,743.0594 Q1710.6563,742.7781 1710.0313,742.7781 Q1708.6875,742.7781 1708,743.8563 Q1707.3125,744.9188 1707.3125,747.0125 Q1707.3125,749.1063 1708,750.1844 Q1708.6875,751.2469 1710.0313,751.2469 Q1710.6563,751.2469 1711.25,750.9813 Q1711.8438,750.7 1712.4688,750.1219 L1712.4688,752.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="1723.5" y="751.3543">type_group_pair_it</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="199" x="1845.5" y="728.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="197" x="1846.5" y="740.3387">typename,typename,typename</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="763.2" y2="763.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="771.2" y2="771.2"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="1802.5" y="8.2"/>
+      <ellipse cx="1817.5" cy="24.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1820.4688,29.8406 Q1819.8906,30.1375 1819.25,30.2781 Q1818.6094,30.4344 1817.9063,30.4344 Q1815.4063,30.4344 1814.0781,28.7938 Q1812.7656,27.1375 1812.7656,24.0125 Q1812.7656,20.8875 1814.0781,19.2313 Q1815.4063,17.575 1817.9063,17.575 Q1818.6094,17.575 1819.25,17.7313 Q1819.9063,17.8875 1820.4688,18.1844 L1820.4688,20.9031 Q1819.8438,20.325 1819.25,20.0594 Q1818.6563,19.7781 1818.0313,19.7781 Q1816.6875,19.7781 1816,20.8563 Q1815.3125,21.9188 1815.3125,24.0125 Q1815.3125,26.1063 1816,27.1844 Q1816.6875,28.2469 1818.0313,28.2469 Q1818.6563,28.2469 1819.25,27.9813 Q1819.8438,27.7 1820.4688,27.1219 L1820.4688,29.8406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1831.5" y="28.3543">head</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="65" x="1871.5" y="5.2"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="63" x="1872.5" y="17.3387">typename</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1803.5" x2="1932.5" y1="40.2" y2="40.2"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1803.5" x2="1932.5" y1="48.2" y2="48.2"/>
+    </a>
+    <path d="M1963.06,260.15 C2023.99,259.29 2101.8,268.19 2156,310.2 C2232.51,369.5 2260.05,487.02 2269.63,551.07 " fill="none" id="C_0001536403088019105838-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2276.58,550.2,2272.28,570.95,2262.7,552.05,2276.58,550.2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1948.61,528.05 C2013.27,536.75 2106.59,550.89 2187,569.2 C2191.19,570.16 2195.47,571.2 2199.77,572.3 " fill="none" id="C_0001613293628874851145-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2201.78,565.59,2219.24,577.6,2198.1,579.1,2201.78,565.59" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1946.8,104.91 C2018.72,100.05 2123.73,105.55 2187,166.2 C2241.97,218.9 2264.49,451.92 2271.69,550.7 " fill="none" id="C_0000096201031647373215-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2278.69,550.5,2273.08,570.93,2264.72,551.46,2278.69,550.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1259.77,70.79 C1401.76,81.18 1653.79,99.61 1784,109.13 " fill="none" id="C_0001342666740698875376-&gt;C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1789.34,109.52,1780.6488,104.8872,1784.3528,109.1627,1780.0772,112.8667,1789.34,109.52" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1259.77,58.68 C1401.03,52.52 1651.19,41.61 1781.97,35.91 " fill="none" id="C_0001342666740698875376-&gt;C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1782,28.9,1802.28,35.02,1782.61,42.89,1782,28.9" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1932.66,929.02 C1995.85,933.23 2092.25,929.61 2156,880.2 C2232.51,820.91 2260.05,703.39 2269.63,639.34 " fill="none" id="C_0000074655005329778311-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2262.7,638.36,2272.28,619.46,2276.58,640.21,2262.7,638.36" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1930.57,1012.87 C1994.38,1018.24 2093.38,1016.01 2156,963.2 C2253.45,881.02 2271.53,718.24 2274.37,639.67 " fill="none" id="C_0001877705309010128195-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2267.37,639.51,2274.82,619.67,2281.37,639.82,2267.37,639.51" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1941.16,844.51 C2003.21,846.3 2092.47,839.84 2156,797.2 C2212.04,759.59 2245.23,685.82 2261.64,638.6 " fill="none" id="C_0001737554639587928188-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2255.08,636.14,2267.93,619.29,2268.39,640.47,2255.08,636.14" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1344.67,998.33 C1494.97,1000.02 1696.72,1002.29 1799.97,1003.45 " fill="none" id="C_0001313421318785708660-&gt;C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1805.11,1003.51,1796.1446,999.433,1800.1102,1003.4671,1796.076,1007.4327,1805.11,1003.51" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1254.12,965.7 C1339.53,940.03 1467.02,903.83 1580,880.2 C1650.45,865.47 1731.7,854.09 1789.73,846.92 " fill="none" id="C_0001313421318785708660-&gt;C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1794.92,846.28,1785.4964,843.4172,1789.958,846.8949,1786.4802,851.3564,1794.92,846.28" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1239.37,1026.77 C1324.09,1056.78 1459.62,1101.91 1580,1129.2 C1623.42,1139.05 1671.1,1146.98 1714.91,1153.15 " fill="none" id="C_0001313421318785708660-&gt;C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1715.87,1146.22,1734.73,1155.86,1713.97,1160.09,1715.87,1146.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M2156.12,1087.2 C2170.45,1087.2 2184.09,1087.2 2196.68,1087.2 " fill="none" id="C_0000476531044436856932-&gt;C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2196.81,1080.2,2216.81,1087.2,2196.81,1094.2,2196.81,1080.2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1358.01,876.04 C1421.92,887.08 1491.17,905.27 1550,935.2 C1566.25,943.47 1563.55,955.33 1580,963.2 C1650.1,996.76 1740.05,1004.75 1800.4,1005.81 " fill="none" id="C_0001024383802991748694-&gt;C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1805.42,1005.88,1796.4781,1001.7518,1800.4205,1005.8086,1796.3638,1009.751,1805.42,1005.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1358.32,853.23 C1502.03,848.98 1687.04,843.52 1789.68,840.49 " fill="none" id="C_0001024383802991748694-&gt;C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1794.81,840.33,1785.6994,836.5887,1789.812,840.4728,1785.9279,844.5854,1794.81,840.33" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1253.87,902.31 C1286.94,916.88 1324.08,933.24 1358,948.2 C1456.68,991.72 1476.31,1016.52 1580,1046.2 C1601.68,1052.41 1624.57,1057.7 1647.58,1062.2 " fill="none" id="C_0001024383802991748694-&gt;C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1652.49,1063.15,1644.4238,1057.4988,1647.5827,1062.1914,1642.8901,1065.3504,1652.49,1063.15" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1358.11,827.68 C1368.22,826.16 1378.22,824.66 1388,823.2 C1482.23,809.2 1586.99,794.26 1674.44,781.96 " fill="none" id="C_0001024383802991748694-&gt;C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1673.49,775.03,1694.27,779.17,1675.43,788.89,1673.49,775.03" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1228.09,352.2 C1383.83,352.2 1745.53,352.2 1842.64,352.2 " fill="none" id="C_0000425551452299939770-&gt;C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1847.86,352.2,1838.86,348.2,1842.86,352.2,1838.86,356.2,1847.86,352.2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1217.26,328.08 C1298.6,297.46 1447.46,246.33 1580,227.2 C1706.69,208.92 2051.4,153.43 2156,227.2 C2209.91,265.22 2250.9,461.82 2267.02,551.06 " fill="none" id="C_0000425551452299939770-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2273.96,550.12,2270.54,571.03,2260.18,552.55,2273.96,550.12" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1542.37,1256.24 C1679.9,1296.92 1980.88,1361.24 2156,1212.2 C2200.11,1174.66 2252.61,774.59 2269.2,639.48 " fill="none" id="C_0000179850898515269194-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2262.27,638.5,2271.63,619.49,2276.17,640.19,2262.27,638.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1195.17,571.05 C1267.96,527.45 1430.3,436.14 1580,393.2 C1674.76,366.02 1792.52,356.43 1842.62,353.43 " fill="none" id="C_0001070380438303872295-&gt;C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1847.82,353.12,1838.6059,349.6415,1842.8282,353.4061,1839.0636,357.6284,1847.82,353.12" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1214.63,601.86 C1261.53,607.17 1328.97,614.75 1388,621.2 C1562.2,640.24 1772.15,662.28 1842.61,669.65 " fill="none" id="C_0001070380438303872295-&gt;C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1847.83,670.2,1839.2894,665.2951,1842.8565,669.6855,1838.4662,673.2527,1847.83,670.2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1214.73,576.06 C1296.01,550.19 1447.77,504.08 1580,476.2 C1676.22,455.92 1792.74,442.71 1842.53,437.6 " fill="none" id="C_0001070380438303872295-&gt;C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1847.7,437.07,1838.3362,434.0173,1842.7265,437.5845,1839.1594,441.9749,1847.7,437.07" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1214.56,595.2 C1402.29,595.2 1989.05,595.2 2198.92,595.2 " fill="none" id="C_0001070380438303872295-&gt;C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="2199.18,588.2,2219.18,595.2,2199.18,602.2,2199.18,588.2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M714.04,796.49 C750.88,848.87 844.91,973.42 952,1044.2 C1089.22,1134.89 1275.82,1188.73 1382.94,1214.2 " fill="none" id="C_0001854055939974723413-&gt;C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1387.98,1215.39,1380.1315,1209.4401,1383.1122,1214.248,1378.3043,1217.2286,1387.98,1215.39" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M759.54,748.15 C846.27,714.52 1002.93,653.78 1090.46,619.84 " fill="none" id="C_0001854055939974723413-&gt;C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1095.35,617.94,1085.5119,617.4798,1090.6911,619.755,1088.4159,624.9341,1095.35,617.94" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M734.38,796.29 C782.96,827.39 871.66,882.06 952,920.2 C981.29,934.11 1013.87,947.3 1044.15,958.67 " fill="none" id="C_0001854055939974723413-&gt;C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="1046.82,952.19,1063.17,965.68,1041.98,965.33,1046.82,952.19" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M348.93,582.46 C554.27,523.74 925.89,417.45 1081.94,372.81 " fill="none" id="C_0002161425587790795236&lt;-C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="336.26,586.09,343.128,588.2878,347.7983,582.7933,340.9303,580.5956,336.26,586.09" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="670" cy="420.2664" 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="51" x="677" y="424.2669">aboolint</text>
+    <path d="M340.61,664.07 C429.2,691.06 542.27,725.51 616.68,748.18 " fill="none" id="C_0002161425587790795236&lt;-C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="328,660.23,332.57,665.8081,339.4767,663.7349,334.9067,658.1569,328,660.23" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="441" cy="685.2664" 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="448" y="689.2669">abc</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00064_class_mermaid.svg b/docs/test_cases/t00064_class_mermaid.svg
index 1a2e75a2..9b87d280 100644
--- a/docs/test_cases/t00064_class_mermaid.svg
+++ b/docs/test_cases/t00064_class_mermaid.svg
@@ -1,88 +1,83 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 3853.625 647" style="max-width: 3853.62px; background-color: white;" width="3853.625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M120.7109375,532L120.7109375,536.1666666666666C120.7109375,540.3333333333334,120.7109375,548.6666666666666,521.8522549765834,561.4537748093743C922.9935724531666,574.240882952082,1725.2762074063332,591.4817659041638,2126.4175248829165,600.1022073802047L2527.5588423595,608.7226488562458"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M378.8046875,532L378.8046875,536.1666666666666C378.8046875,540.3333333333334,378.8046875,548.6666666666666,736.9305493527372,561.4195170693511C1095.0564112054742,574.1723674720355,1811.3081349109486,591.3447349440711,2169.4339967636856,599.9309186800888L2527.559858616423,608.5171024161066"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M1008.9609375,532L1008.9609375,536.1666666666666C1008.9609375,540.3333333333334,1008.9609375,548.6666666666666,1262.06156880072,561.2894902910257C1515.1622001014396,573.9123139153847,2021.363462702879,590.8246278307694,2274.464094003599,599.2807847884618L2527.5647253043185,607.7369417461541"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M913.7968298410404,392L929.657514450867,401.6666666666667C945.5181990606937,411.3333333333333,977.2395682803468,430.6666666666667,993.1002528901735,443.5C1008.9609375,456.3333333333333,1008.9609375,462.6666666666667,1008.9609375,465.8333333333333L1008.9609375,469"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M778.0820538294797,392L747.9108261078997,401.6666666666667C717.7395983863198,411.3333333333333,657.3971429431599,430.6666666666667,627.22591522158,441.5C597.0546875,452.3333333333333,597.0546875,454.6666666666667,597.0546875,455.8333333333333L597.0546875,457"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M793.96875,532L793.96875,536.1666666666666C793.96875,540.3333333333334,793.96875,548.6666666666666,1082.9010401800676,561.3439891283193C1371.8333303601355,574.0213115899719,1949.6979107202708,591.0426231799438,2238.630200900339,599.5532789749298L2527.5624910804063,608.0639347699157"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M3052.19140625,532L3052.19140625,536.1666666666666C3052.19140625,540.3333333333334,3052.19140625,548.6666666666666,2992.3005206844955,560.083786947267C2932.409635118991,571.5009072278672,2812.627863987982,586.0018144557343,2752.736978422478,593.2522680696679L2692.8460928569734,600.5027216836015"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M2107.67578125,532L2107.67578125,536.1666666666666C2107.67578125,540.3333333333334,2107.67578125,548.6666666666666,2177.672452826551,560.2843830827752C2247.669124403102,571.9020994988838,2387.662467556204,586.8041989977675,2457.6591391327547,594.2552487472094L2527.6558107093056,601.7062984966512"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1819.514157333815,403L1835.1634904865125,410.8333333333333C1850.8128236392101,418.6666666666667,1882.111489944605,434.3333333333333,2074.34135191976,450.46242872983856C2266.571213894915,466.5915241263438,2619.732271539831,483.1830482526877,2796.3128003622883,491.47881031585956L2972.893329184746,499.77457237903144"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1810.3812093569363,403L1824.219367172447,410.8333333333333C1838.0575249879575,418.6666666666667,1865.7338406189785,434.3333333333333,1900.1681914742765,447.30933165377604C1934.6025423295741,460.2853299742187,1975.794928409148,470.5706599484374,1996.391121448935,475.7133249355468L2016.987314488722,480.85598992265614"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M1542.302429552023,403L1502.9772850433526,410.8333333333333C1463.652140534682,418.6666666666667,1385.0018515173408,434.3333333333333,1345.6767070086705,443.3333333333333C1306.3515625,452.3333333333333,1306.3515625,454.6666666666667,1306.3515625,455.8333333333333L1306.3515625,457"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M2585.71484375,532L2585.71484375,536.1666666666666C2585.71484375,540.3333333333334,2585.71484375,548.6666666666666,2536.69783080183,559.7445721953337C2487.6808178536608,570.8224777240008,2389.646791957321,584.6449554480015,2340.629779009151,591.556194310002L2291.6127660609814,598.4674331720023"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M2771.984375,403.52862471071967L2818.685546875,411.2738539255997C2865.38671875,419.0190831404798,2958.7890625,434.5095415702399,3005.490234375,445.42143745178663C3052.19140625,456.3333333333333,3052.19140625,462.6666666666667,3052.19140625,465.8333333333333L3052.19140625,469"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M2389.789333453757,425L2380.2476216281307,429.1666666666667C2370.7059098025047,433.3333333333333,2351.6224861512524,441.6666666666667,2319.7209361335204,451.1532385514186C2287.8193861157883,460.63981043617065,2243.0997097315762,471.27962087234135,2220.7398715394706,476.59952609042665L2198.3800333473646,481.919431308512"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M2375.5696802745665,425L2365.0645773121387,429.1666666666667C2354.559474349711,433.3333333333333,2333.549268424855,441.6666666666667,2343.33818077936,449.80780652597065C2353.1270931338645,457.94894638527467,2393.7151237677294,465.8978927705493,2414.0091390846615,469.8723659631866L2434.303154401594,473.8468391558239"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M2289.265625,398.4582502109401L2229.9563802083335,407.04854184245005C2170.6471354166665,415.6388334739601,2052.0286458333335,432.81941673698003,1982.649995869022,444.65588512313985C1913.2713459047106,456.4923535092996,1893.1325355594208,462.98470701859924,1883.063130386776,466.2308837732491L1872.9937252141312,469.4770605278989"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id17" d="M3738.25,532L3738.25,536.1666666666666C3738.25,540.3333333333334,3738.25,548.6666666666666,3735.0930797484693,557.585193951529C3731.936159496939,566.5037212363915,3725.622318993878,576.0074424727828,3722.4653987423476,580.7593030909785L3719.3084784908165,585.5111637091743"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id18" d="M3667.012485397196,532L3656.597644080997,536.1666666666666C3646.182802764797,540.3333333333334,3625.3531201323985,548.6666666666666,3463.009465948439,561.0084679777243C3300.6658117644783,573.350269288782,2996.8081860289567,589.7005385775641,2844.8793731611963,597.8756732219551L2692.9505602934355,606.0508078663462"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id19" d="M3479.1171875,532L3479.1171875,536.1666666666666C3479.1171875,540.3333333333334,3479.1171875,548.6666666666666,3348.0880788020636,560.9015208326676C3217.0589701041263,573.1363749986687,2955.0007527082525,589.2727499973374,2823.971644010316,597.3409374966717L2692.9425353123793,605.4091249960061"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id20" d="M3315.5348641939254,532L3323.156006619938,536.1666666666666C3330.7771490459504,540.3333333333334,3346.019433897975,548.6666666666666,3407.3466406288608,561.2483688752569C3468.6738473597457,573.8300710838471,3576.085975969491,590.6601421676942,3629.792040274364,599.0751777096177L3683.4981045792365,607.4902132515413"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M3286.175452686916,532L3289.504283489097,536.1666666666666C3292.833114291277,540.3333333333334,3299.4907758956383,548.6666666666666,3330.410566637484,560.8300699185338C3361.330357379329,572.9934731704009,3416.5122772586583,588.9869463408018,3444.1032371983233,596.9836829260022L3471.694197137988,604.9804195112026"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id22" d="M3224.6619816004672,532L3218.99761487539,536.1666666666666C3213.3332481503116,540.3333333333334,3202.004514700156,548.6666666666666,3226.8610429335135,560.9085613319952C3251.7175711668715,573.1504559973238,3312.759361083743,589.3009119946477,3343.2802560421787,597.3761399933096L3373.801151000614,605.4513679919716"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id23" d="M3207.9918954439254,532L3199.890381619938,536.1666666666666C3191.7888677959504,540.3333333333334,3175.585840147975,548.6666666666666,3089.73581325045,560.40830192678C3003.8857863529242,572.1499371868933,2848.388760205849,587.2998743737867,2770.640247132311,594.8748429672333L2692.891734058773,602.44981156068"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id24" d="M3406.7609375,234L3418.8203125,239.66666666666666C3430.8796875000003,245.33333333333334,3454.9984375,256.6666666666667,3467.0578124999997,278.25C3479.1171875,299.8333333333333,3479.1171875,331.6666666666667,3479.1171875,362C3479.1171875,392.3333333333333,3479.1171875,421.1666666666667,3479.1171875,438.75C3479.1171875,456.3333333333333,3479.1171875,462.6666666666667,3479.1171875,465.8333333333333L3479.1171875,469"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id25" d="M3308.39675,234L3300.898333333333,239.66666666666666C3293.3999166666667,245.33333333333334,3278.403083333333,256.6666666666667,3270.904666666667,278.25C3263.40625,299.8333333333333,3263.40625,331.6666666666667,3263.40625,362C3263.40625,392.3333333333333,3263.40625,421.1666666666667,3263.40625,438.75C3263.40625,456.3333333333333,3263.40625,462.6666666666667,3263.40625,465.8333333333333L3263.40625,469"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id26" d="M3113.65625,214.54904990146224L2884.8138020833335,223.45754158455188C2655.9713541666665,232.36603326764148,2198.2864583333335,250.18301663382076,1969.4440104166667,265.4248416502437C1740.6015625,280.6666666666667,1740.6015625,293.3333333333333,1740.6015625,299.6666666666667L1740.6015625,306"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id27" d="M3699.780894369829,118.6321026942356L3706.192411974858,122.69341891186299C3712.603929579886,126.75473512949038,3725.426964789943,134.87736756474519,3731.8384823949714,149.35535044903926C3738.25,163.83333333333334,3738.25,184.66666666666666,3738.25,205.5C3738.25,226.33333333333334,3738.25,247.16666666666666,3738.25,273.5C3738.25,299.8333333333333,3738.25,331.6666666666667,3738.25,362C3738.25,392.3333333333333,3738.25,421.1666666666667,3738.25,439.75C3738.25,458.3333333333333,3738.25,466.6666666666667,3738.25,470.8333333333333L3738.25,475"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M3433.1080082346575,114.58799429131153L3418.6082360288815,119.32332857609295C3404.1084638231055,124.05866286087435,3375.1089194115525,133.52933143043717,3360.609147205776,143.93133238188526C3346.109375,154.33333333333334,3346.109375,165.66666666666666,3346.109375,171.33333333333334L3346.109375,177"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M120.7109375,532L120.7109375,536.1666666666666C120.7109375,540.3333333333334,120.7109375,548.6666666666666,524.8515625,561.5182292892491C928.9921875,574.3697919118316,1737.2734375,591.7395838236632,2141.4140625,600.424479779579L2545.5546875,609.1093757354948"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M378.8046875,532L378.8046875,536.1666666666666C378.8046875,540.3333333333334,378.8046875,548.6666666666666,739.9296875,561.491422379537C1101.0546875,574.3161780924073,1823.3046875,591.6323561848145,2184.4296875,600.2904452310181L2545.5546875,608.9485342772217"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M1008.9609375,532L1008.9609375,536.1666666666666C1008.9609375,540.3333333333334,1008.9609375,548.6666666666666,1265.0598958333333,561.389665165612C1521.1588541666667,574.1126636645573,2033.3567708333333,591.2253273291147,2289.4557291666665,599.7816591613935L2545.5546875,608.3379909936722"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M913.7968298410404,392L929.657514450867,401.6666666666667C945.5181990606937,411.3333333333333,977.2395682803468,430.6666666666667,993.1002528901735,444.5C1008.9609375,458.3333333333333,1008.9609375,466.6666666666667,1008.9609375,470.8333333333333L1008.9609375,475"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M778.0820538294797,392L747.9108261078997,401.6666666666667C717.7395983863198,411.3333333333333,657.3971429431599,430.6666666666667,627.22591522158,444.5C597.0546875,458.3333333333333,597.0546875,466.6666666666667,597.0546875,470.8333333333333L597.0546875,475"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M793.96875,532L793.96875,536.1666666666666C793.96875,540.3333333333334,793.96875,548.6666666666666,1085.8997395833333,561.4323174298668C1377.8307291666667,574.1979681930669,1961.6927083333333,591.3959363861337,2253.6236979166665,599.9949204826671L2545.5546875,608.5939045792005"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M3052.19140625,532L3052.19140625,536.1666666666666C3052.19140625,540.3333333333334,3052.19140625,548.6666666666666,2989.322265625,560.4443376380012C2926.453125,572.2220086093358,2800.71484375,587.4440172186718,2737.845703125,595.0550215233397L2674.9765625,602.6660258280077"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M2107.67578125,532L2107.67578125,536.1666666666666C2107.67578125,540.3333333333334,2107.67578125,548.6666666666666,2180.6555989583335,560.6019348996992C2253.6354166666665,572.5372031327317,2399.5950520833335,588.0744062654635,2472.5748697916665,595.8430078318294L2545.5546875,603.6116093981952"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M1819.514157333815,403L1835.1634904865125,410.8333333333333C1850.8128236392101,418.6666666666667,1882.111489944605,434.3333333333333,2075.340250180636,450.5093570200232C2268.5690104166665,466.68538070671315,2623.7278645833335,483.37076141342624,2801.3072916666665,491.7134517667828L2978.88671875,500.0561421201394"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M1810.3812093569363,403L1824.219367172447,410.8333333333333C1838.0575249879575,418.6666666666667,1865.7338406189785,434.3333333333333,1901.1384046844894,447.551584263108C1936.54296875,460.7698351928827,1979.67578125,471.5396703857653,2001.2421875,476.9245879822067L2022.80859375,482.309505578648"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M1542.302429552023,403L1502.9772850433526,410.8333333333333C1463.652140534682,418.6666666666667,1385.0018515173408,434.3333333333333,1345.6767070086705,446.3333333333333C1306.3515625,458.3333333333333,1306.3515625,466.6666666666667,1306.3515625,470.8333333333333L1306.3515625,475"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M2585.71484375,532L2585.71484375,536.1666666666666C2585.71484375,540.3333333333334,2585.71484375,548.6666666666666,2533.7272135416665,560.1634195346091C2481.7395833333335,571.6601724025517,2377.7643229166665,586.3203448051034,2325.7766927083335,593.6504310063792L2273.7890625,600.9805172076551"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M2771.984375,403.52862471071967L2818.685546875,411.2738539255997C2865.38671875,419.0190831404798,2958.7890625,434.5095415702399,3005.490234375,446.42143745178663C3052.19140625,458.3333333333333,3052.19140625,466.6666666666667,3052.19140625,470.8333333333333L3052.19140625,475"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M2389.789333453757,425L2380.2476216281307,429.1666666666667C2370.7059098025047,433.3333333333333,2351.6224861512524,441.6666666666667,2318.7480920339594,451.38469990445583C2285.8736979166665,461.102733142245,2239.2083333333335,472.20546628449,2215.8756510416665,477.75683285561246L2192.54296875,483.308199426735"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M2375.5696802745665,425L2365.0645773121387,429.1666666666667C2354.559474349711,433.3333333333333,2333.549268424855,441.6666666666667,2344.319537833923,450C2355.0898072429904,458.3333333333333,2397.6405519859813,466.6666666666667,2418.9159243574763,470.8333333333333L2440.191296728972,475"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M2289.265625,398.4582502109401L2229.9563802083335,407.04854184245005C2170.6471354166665,415.6388334739601,2052.0286458333335,432.81941673698003,1979.7947028329438,445.5763750351567C1907.5607598325544,458.3333333333333,1881.711363415109,466.6666666666667,1868.786665206386,470.8333333333333L1855.8619669976636,475"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id17" d="M3738.25,532L3738.25,536.1666666666666C3738.25,540.3333333333334,3738.25,548.6666666666666,3734.5397135416665,558.4181320291607C3730.8294270833335,568.1695973916547,3723.4088541666665,579.3391947833095,3719.6985677083335,584.9239934791368L3715.98828125,590.5087921749642"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id18" d="M3667.012485397196,532L3656.597644080997,536.1666666666666C3646.182802764797,540.3333333333334,3625.3531201323985,548.6666666666666,3460.0137996495328,561.1696617294621C3294.6744791666665,573.6726567922576,2984.8255208333335,590.3453135845152,2829.9010416666665,598.681641980644L2674.9765625,607.0179703767728"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id19" d="M3479.1171875,532L3479.1171875,536.1666666666666C3479.1171875,540.3333333333334,3479.1171875,548.6666666666666,3345.09375,561.085898231322C3211.0703125,573.505129795977,2943.0234375,590.0102595919542,2809,598.2628244899428L2674.9765625,606.5153893879312"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id20" d="M3315.5348641939254,532L3323.156006619938,536.1666666666666C3330.7771490459504,540.3333333333334,3346.019433897975,548.6666666666666,3408.3345867406547,561.4031670670785C3470.6497395833335,574.1396674674903,3580.0377604166665,591.2793349349807,3634.7317708333335,599.849168668726L3689.42578125,608.4190024024712"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id21" d="M3286.175452686916,532L3289.504283489097,536.1666666666666C3292.833114291277,540.3333333333334,3299.4907758956383,548.6666666666666,3331.371038989486,561.1084453144289C3363.2513020833335,573.5502239621909,3420.3541666666665,590.1004479243819,3448.9055989583335,598.3755599054774L3477.45703125,606.6506718865728"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id22" d="M3224.6619816004672,532L3218.99761487539,536.1666666666666C3213.3332481503116,540.3333333333334,3202.004514700156,548.6666666666666,3227.8277781834113,561.1643404488232C3253.6510416666665,573.6620142309797,3316.6263020833335,590.3240284619595,3348.1139322916665,598.6550355774493L3379.6015625,606.9860426929392"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id23" d="M3207.9918954439254,532L3199.890381619938,536.1666666666666C3191.7888677959504,540.3333333333334,3175.585840147975,548.6666666666666,3086.7499513239877,560.6992118030361C2997.9140625,572.7317569394055,2836.4453125,588.4635138788111,2755.7109375,596.3293923485139L2674.9765625,604.1952708182167"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id24" d="M3406.7609375,234L3418.8203125,239.66666666666666C3430.8796875000003,245.33333333333334,3454.9984375,256.6666666666667,3467.0578124999997,278.25C3479.1171875,299.8333333333333,3479.1171875,331.6666666666667,3479.1171875,362C3479.1171875,392.3333333333333,3479.1171875,421.1666666666667,3479.1171875,439.75C3479.1171875,458.3333333333333,3479.1171875,466.6666666666667,3479.1171875,470.8333333333333L3479.1171875,475"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id25" d="M3308.39675,234L3300.898333333333,239.66666666666666C3293.3999166666667,245.33333333333334,3278.403083333333,256.6666666666667,3270.904666666667,278.25C3263.40625,299.8333333333333,3263.40625,331.6666666666667,3263.40625,362C3263.40625,392.3333333333333,3263.40625,421.1666666666667,3263.40625,439.75C3263.40625,458.3333333333333,3263.40625,466.6666666666667,3263.40625,470.8333333333333L3263.40625,475"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id26" d="M3113.65625,214.54904990146224L2884.8138020833335,223.45754158455188C2655.9713541666665,232.36603326764148,2198.2864583333335,250.18301663382076,1969.4440104166667,268.4248416502437C1740.6015625,286.6666666666667,1740.6015625,305.3333333333333,1740.6015625,314.6666666666667L1740.6015625,324"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id27" d="M3684.5748890532545,109L3693.520740877712,114.66666666666667C3702.4665927021692,120.33333333333333,3720.358296351085,131.66666666666666,3729.3041481755427,147.75C3738.25,163.83333333333334,3738.25,184.66666666666666,3738.25,205.5C3738.25,226.33333333333334,3738.25,247.16666666666666,3738.25,273.5C3738.25,299.8333333333333,3738.25,331.6666666666667,3738.25,362C3738.25,392.3333333333333,3738.25,421.1666666666667,3738.25,439.75C3738.25,458.3333333333333,3738.25,466.6666666666667,3738.25,470.8333333333333L3738.25,475"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id28" d="M3450.218657544379,109L3432.8671104536493,114.66666666666667C3415.5155633629197,120.33333333333333,3380.8124691814596,131.66666666666666,3363.4609220907296,143C3346.109375,154.33333333333334,3346.109375,165.66666666666666,3346.109375,171.33333333333334L3346.109375,177"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -395,7 +390,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8">
+        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0002055044356505752139-0" class="node default clickable">
             <rect height="57" width="129.421875" y="-28.5" x="-64.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="64.7109375" x1="-64.7109375" class="divider"/>
@@ -414,7 +409,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L11">
+        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L11">
           <g title="type_list" id="classId-C_0001536403088019105838-1" class="node default clickable">
             <rect height="57" width="225.421875" y="-28.5" x="-112.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.7109375" x1="-112.7109375" class="divider"/>
@@ -433,7 +428,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L13">
+        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L13">
           <g title="type_list" id="classId-C_0001613293628874851145-2" class="node default clickable">
             <rect height="57" width="190.765625" y="-28.5" x="-95.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.3828125" x1="-95.3828125" class="divider"/>
@@ -452,7 +447,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17">
+        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17">
           <g title="type_list" id="classId-C_0000096201031647373215-3" class="node default clickable">
             <rect height="57" width="181.890625" y="-28.5" x="-90.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="90.9453125" x1="-90.9453125" class="divider"/>
@@ -471,7 +466,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L17">
+        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17">
           <g title="head" id="classId-C_0001342666740698875376-4" class="node default clickable">
             <rect height="57" width="237.921875" y="-28.5" x="-118.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="118.9609375" x1="-118.9609375" class="divider"/>
@@ -490,7 +485,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L21">
+        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L21">
           <g title="type_list" id="classId-C_0000074655005329778311-5" class="node default clickable">
             <rect height="57" width="148.09375" y="-28.5" x="-74.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.046875" x1="-74.046875" class="divider"/>
@@ -509,7 +504,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27">
+        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27">
           <g title="type_list" id="classId-C_0001877705309010128195-6" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -528,7 +523,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27">
+        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27">
           <g title="type_list" id="classId-C_0001737554639587928188-7" class="node default clickable">
             <rect height="57" width="169.734375" y="-28.5" x="-84.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="84.8671875" x1="-84.8671875" class="divider"/>
@@ -547,7 +542,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L27">
+        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27">
           <g title="type_group_pair" id="classId-C_0001313421318785708660-8" class="node default clickable">
             <rect height="79" width="449.828125" y="-39.5" x="-224.9140625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="224.9140625" x1="-224.9140625" class="divider"/>
@@ -571,7 +566,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0002110316024454672764-9" class="node default clickable">
             <rect height="57" width="135.03125" y="-28.5" x="-67.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.515625" x1="-67.515625" class="divider"/>
@@ -590,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0000476531044436856932-10" class="node default clickable">
             <rect height="57" width="686.34375" y="-28.5" x="-343.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="343.171875" x1="-343.171875" class="divider"/>
@@ -609,7 +604,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L35">
+        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L35">
           <g title="type_group_pair_it" id="classId-C_0001024383802991748694-11" class="node default clickable">
             <rect height="123" width="482.71875" y="-61.5" x="-241.359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="241.359375" x1="-241.359375" class="divider"/>
@@ -625,25 +620,25 @@
                   <span class="nodeLabel">type_group_pair_it&lt;It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -233.859375, -8)" height="18" width="384.65625">
+              <foreignObject transform="translate( -233.859375, -8)" height="18" width="375.765625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+find(const value_type &amp; v) : : [constexpr] unsigned int</span>
+                  <span class="nodeLabel">+find(const value_type &amp; v) : [constexpr] unsigned int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -233.859375, 14)" height="18" width="190.78125">
+              <foreignObject transform="translate( -233.859375, 14)" height="18" width="181.890625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get(unsigned int i) : : ref_t</span>
+                  <span class="nodeLabel">+get(unsigned int i) : ref_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -233.859375, 36)" height="18" width="287.734375">
+              <foreignObject transform="translate( -233.859375, 36)" height="18" width="278.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+getp(unsigned int i) : : const value_type</span>
+                  <span style="font-style:italic;" class="nodeLabel">+getp(unsigned int i) : const value_type</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L51">
+        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L51">
           <g title="A" id="classId-C_0000586286676481245707-12" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -662,7 +657,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L52">
+        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L52">
           <g title="B" id="classId-C_0001353306307770366167-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -681,7 +676,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L53">
+        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L53">
           <g title="C" id="classId-C_0000598044391549147725-14" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -700,7 +695,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L8">
+        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0000425551452299939770-15" class="node default clickable">
             <rect height="57" width="172.359375" y="-28.5" x="-86.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="86.1796875" x1="-86.1796875" class="divider"/>
@@ -719,7 +714,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0000179850898515269194-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -738,7 +733,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0001070380438303872295-17" class="node default clickable">
             <rect height="57" width="142.15625" y="-28.5" x="-71.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="71.078125" x1="-71.078125" class="divider"/>
@@ -757,7 +752,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0001854055939974723413-18" class="node default clickable">
             <rect height="57" width="464.90625" y="-28.5" x="-232.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="232.453125" x1="-232.453125" class="divider"/>
@@ -776,7 +771,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L55">
+        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L55">
           <g title="R" id="classId-C_0002161425587790795236-19" class="node default clickable">
             <rect height="101" width="481.546875" y="-50.5" x="-240.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="240.7734375" x1="-240.7734375" class="divider"/>
@@ -805,7 +800,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L25">
+        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0000271990753639572557-20" class="node default clickable">
             <rect height="57" width="312.890625" y="-28.5" x="-156.4453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="156.4453125" x1="-156.4453125" class="divider"/>
@@ -824,7 +819,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L33">
+        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L33">
           <g title="type_group_pair_it" id="classId-C_0001057906395469156958-21" class="node default clickable">
             <rect height="57" width="410.703125" y="-28.5" x="-205.3515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="205.3515625" x1="-205.3515625" class="divider"/>
@@ -843,7 +838,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00064/t00064.cc#L15">
+        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L15">
           <g title="head" id="classId-C_0001317314479884183399-22" class="node default clickable">
             <rect height="57" width="145.734375" y="-28.5" x="-72.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.8671875" x1="-72.8671875" class="divider"/>
diff --git a/docs/test_cases/t00065.md b/docs/test_cases/t00065.md
index 1765ece3..4001872e 100644
--- a/docs/test_cases/t00065.md
+++ b/docs/test_cases/t00065.md
@@ -29,39 +29,6 @@ struct R {
 }
 }
 ```
-File `tests/t00065/module1/module1.h`
-```cpp
-#include "submodule1a/submodule1a.h"
-
-#pragma once
-
-namespace clanguml {
-namespace t00065 {
-
-enum class ABC { a, b, c };
-
-enum XYZ { x, y, z };
-
-struct A {
-    ABC abc;
-    XYZ xyz;
-    detail::AImpl *pimpl;
-};
-}
-}
-```
-File `tests/t00065/module1/submodule1a/submodule1a.h`
-```cpp
-#pragma once
-
-namespace clanguml {
-namespace t00065 {
-namespace detail {
-struct AImpl { };
-}
-}
-}
-```
 File `tests/t00065/module2/module2.h`
 ```cpp
 #pragma once
@@ -100,6 +67,39 @@ concept bconcept = requires(T t) {
                        t.b();
                    };
 
+}
+}
+```
+File `tests/t00065/module1/module1.h`
+```cpp
+#include "submodule1a/submodule1a.h"
+
+#pragma once
+
+namespace clanguml {
+namespace t00065 {
+
+enum class ABC { a, b, c };
+
+enum XYZ { x, y, z };
+
+struct A {
+    ABC abc;
+    XYZ xyz;
+    detail::AImpl *pimpl;
+};
+}
+}
+```
+File `tests/t00065/module1/submodule1a/submodule1a.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t00065 {
+namespace detail {
+struct AImpl { };
+}
 }
 }
 ```
@@ -116,11 +116,11 @@ concept bconcept = requires(T t) {
       "display_name": "module1",
       "elements": [
         {
-          "display_name": "module1::submodule1a",
+          "display_name": "submodule1a",
           "elements": [
             {
               "bases": [],
-              "display_name": "clanguml::t00065::detail::AImpl",
+              "display_name": "detail::AImpl",
               "id": "674757414308736755",
               "is_abstract": false,
               "is_nested": false,
@@ -150,7 +150,7 @@ concept bconcept = requires(T t) {
             "b",
             "c"
           ],
-          "display_name": "clanguml::t00065::ABC",
+          "display_name": "ABC",
           "id": "2145362985538918973",
           "is_nested": false,
           "name": "ABC",
@@ -169,7 +169,7 @@ concept bconcept = requires(T t) {
             "y",
             "z"
           ],
-          "display_name": "clanguml::t00065::XYZ",
+          "display_name": "XYZ",
           "id": "1435940218810141944",
           "is_nested": false,
           "name": "XYZ",
@@ -184,7 +184,7 @@ concept bconcept = requires(T t) {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00065::A",
+          "display_name": "A",
           "id": "1178194542408300737",
           "is_abstract": false,
           "is_nested": false,
@@ -249,10 +249,10 @@ concept bconcept = requires(T t) {
       "display_name": "module2",
       "elements": [
         {
-          "display_name": "module2::concepts",
+          "display_name": "concepts",
           "elements": [
             {
-              "display_name": "clanguml::t00065::bconcept<T>",
+              "display_name": "bconcept<T>",
               "id": "1325475407133721370",
               "name": "bconcept",
               "namespace": "clanguml::t00065",
@@ -280,7 +280,7 @@ concept bconcept = requires(T t) {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00065::B",
+          "display_name": "B",
           "id": "1651810571114530033",
           "is_abstract": false,
           "is_nested": false,
@@ -355,7 +355,7 @@ concept bconcept = requires(T t) {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00065::C<T>",
+          "display_name": "C<T>",
           "id": "1157378014768957235",
           "is_abstract": false,
           "is_nested": false,
@@ -397,7 +397,7 @@ concept bconcept = requires(T t) {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00065::C<int>",
+          "display_name": "C<int>",
           "id": "580575003920044707",
           "is_abstract": false,
           "is_nested": false,
@@ -426,7 +426,7 @@ concept bconcept = requires(T t) {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00065::D<clanguml::t00065::bconcept T>",
+          "display_name": "D<bconcept T>",
           "id": "1719752929087851944",
           "is_abstract": false,
           "is_nested": false,
@@ -480,7 +480,7 @@ concept bconcept = requires(T t) {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00065::C<clanguml::t00065::B>",
+          "display_name": "C<B>",
           "id": "1373403346245688670",
           "is_abstract": false,
           "is_nested": false,
@@ -509,7 +509,7 @@ concept bconcept = requires(T t) {
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00065::D<clanguml::t00065::B>",
+          "display_name": "D<B>",
           "id": "2024276012622729482",
           "is_abstract": false,
           "is_nested": false,
@@ -542,7 +542,7 @@ concept bconcept = requires(T t) {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00065::R",
+      "display_name": "R",
       "id": "1082111961413727438",
       "is_abstract": false,
       "is_nested": false,
@@ -601,6 +601,7 @@ concept bconcept = requires(T t) {
     }
   ],
   "name": "t00065_class",
+  "package_type": "directory",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00065_class.svg b/docs/test_cases/t00065_class.svg
index d49d88f9..803fdd91 100644
--- a/docs/test_cases/t00065_class.svg
+++ b/docs/test_cases/t00065_class.svg
@@ -1,310 +1,258 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="837px" preserveAspectRatio="none" style="width:743px;height:837px;background:#FFFFFF;" version="1.1" viewBox="0 0 743 837" width="743px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="792px" preserveAspectRatio="none" style="width:767px;height:792px;" version="1.1" viewBox="0 0 767 792" width="767px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="flqbg7k4w0m42" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001412157780338101779">
-      <path d="M8.5,168.4 L68.5,168.4 A3.75,3.75 0 0 1 71,170.9 L78,191.1999 L357.5,191.1999 A2.5,2.5 0 0 1 360,193.6999 L360,490.7 A2.5,2.5 0 0 1 357.5,493.2 L8.5,493.2 A2.5,2.5 0 0 1 6,490.7 L6,170.9 A2.5,2.5 0 0 1 8.5,168.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="78" y1="191.1999" y2="191.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="59" x="10" y="183.4059">module1</text>
-    </g>
-    <g id="cluster_C_0001297703398614094707">
-      <path d="M196.5,369 L290.5,369 A3.75,3.75 0 0 1 293,371.5 L300,391.7999 L333.5,391.7999 A2.5,2.5 0 0 1 336,394.2999 L336,465.5 A2.5,2.5 0 0 1 333.5,468 L196.5,468 A2.5,2.5 0 0 1 194,465.5 L194,371.5 A2.5,2.5 0 0 1 196.5,369 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="194" x2="300" y1="391.7999" y2="391.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="93" x="198" y="384.0059">submodule1a</text>
-    </g>
-    <g id="cluster_C_0001820314545546323131">
-      <path d="M386.5,193.6 L446.5,193.6 A3.75,3.75 0 0 1 449,196.1 L456,216.3999 L733.5,216.3999 A2.5,2.5 0 0 1 736,218.8999 L736,827.9 A2.5,2.5 0 0 1 733.5,830.4 L386.5,830.4 A2.5,2.5 0 0 1 384,827.9 L384,196.1 A2.5,2.5 0 0 1 386.5,193.6 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="384" x2="456" y1="216.3999" y2="216.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="59" x="388" y="208.6059">module2</text>
-    </g>
-    <g id="cluster_C_0000611808069975917158">
-      <path d="M487.5,542.2 L552.5,542.2 A3.75,3.75 0 0 1 555,544.7 L562,564.9999 L616.5,564.9999 A2.5,2.5 0 0 1 619,567.4999 L619,700.1 A2.5,2.5 0 0 1 616.5,702.6 L487.5,702.6 A2.5,2.5 0 0 1 485,700.1 L485,544.7 A2.5,2.5 0 0 1 487.5,542.2 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="485" x2="562" y1="564.9999" y2="564.9999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="64" x="489" y="557.2059">concepts</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
-      <g id="elem_C_0002145362985538918973">
-        <rect codeLine="9" fill="#F1F1F1" height="98.3998" id="C_0002145362985538918973" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="60" x="115" y="378.8"/>
-        <ellipse cx="130" cy="394.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M128.8594,395.8625 L130.1719,395.8625 L130.1719,395.9094 C130.1719,396.3156 130.1875,396.4719 130.2969,396.6281 C130.4688,396.8781 130.7656,397.05 131.0781,397.05 C131.3594,397.05 131.6563,396.9094 131.8281,396.6906 C131.9531,396.5031 132,396.3625 132,395.9094 L132,394.0656 C132,393.7375 131.9844,393.6281 131.9219,393.4562 C131.8125,393.1594 131.4531,392.9094 131.0781,392.9094 C130.7813,392.9094 130.5156,393.05 130.3438,393.2687 C130.2031,393.4562 130.1719,393.6281 130.1719,394.0656 L130.1719,394.1281 L128.8594,394.1281 L128.8594,391.9562 L132.7031,391.9562 L132.7031,392.7062 C132.7031,393.0969 132.7344,393.2844 132.8438,393.4406 C133.0156,393.6906 133.3125,393.8625 133.625,393.8625 C133.9219,393.8625 134.1875,393.7375 134.375,393.5031 C134.5156,393.3156 134.5469,393.175 134.5469,392.7062 L134.5469,390.2062 L126.8438,390.2062 C126.3906,390.2062 126.2656,390.2219 126.0938,390.3312 C125.8281,390.5031 125.6563,390.7687 125.6563,391.0812 C125.6563,391.3625 125.7813,391.6281 126.0313,391.8 C126.2188,391.925 126.4063,391.9562 126.8438,391.9562 L127.0313,391.9562 L127.0313,398.05 L126.8438,398.05 C126.4219,398.05 126.2656,398.0812 126.0938,398.175 C125.8281,398.3312 125.6563,398.6125 125.6563,398.9094 C125.6563,399.4875 126.0625,399.8 126.8438,399.8 L134.9219,399.8 L134.9219,397.2687 C134.9219,396.8625 134.8906,396.6906 134.7813,396.5344 C134.6094,396.2687 134.3281,396.1125 134,396.1125 C133.7188,396.1125 133.4375,396.2531 133.25,396.4719 C133.1094,396.6594 133.0781,396.8156 133.0781,397.2687 L133.0781,398.05 L128.8594,398.05 L128.8594,395.8625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28" x="144" y="399.406">ABC</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="116" x2="174" y1="410.8" y2="410.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="121" y="427.8059">a</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="8" x="121" y="444.6059">b</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="121" y="461.4058">c</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="116" x2="174" y1="469.1998" y2="469.1998"/>
-      </g>
+    <polygon fill="#FFFFFF" filter="url(#flqbg7k4w0m42)" points="22,157,96,157,103,179.2969,368,179.2969,368,464,22,464,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="103" y1="179.2969" y2="179.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="26" y="171.9951">module1</text>
+    <polygon fill="#FFFFFF" filter="url(#flqbg7k4w0m42)" points="204,341,316,341,323,363.2969,344,363.2969,344,440,204,440,204,341" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="323" y1="363.2969" y2="363.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="106" x="208" y="355.9951">submodule1a</text>
+    <polygon fill="#FFFFFF" filter="url(#flqbg7k4w0m42)" points="392,176,466,176,473,198.2969,745,198.2969,745,780,392,780,392,176" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="392" x2="473" y1="198.2969" y2="198.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="396" y="190.9951">module2</text>
+    <polygon fill="#FFFFFF" filter="url(#flqbg7k4w0m42)" points="486,513,565,513,572,535.2969,622,535.2969,622,656,486,656,486,513" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="486" x2="572" y1="535.2969" y2="535.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="73" x="490" y="527.9951">concepts</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="86.4141" id="C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="129" y="357"/>
+      <ellipse cx="144" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M148.1094,379 L140.3906,379 L140.3906,366.6094 L148.1094,366.6094 L148.1094,368.7656 L142.8438,368.7656 L142.8438,371.4375 L147.6094,371.4375 L147.6094,373.5938 L142.8438,373.5938 L142.8438,376.8438 L148.1094,376.8438 L148.1094,379 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="158" y="377.1543">ABC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="130" x2="184" y1="389" y2="389"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="7" x="135" y="403.2104">a</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="7" x="135" y="416.0151">b</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="135" y="428.8198">c</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="130" x2="184" y1="435.4141" y2="435.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
-      <g id="elem_C_0001435940218810141944">
-        <rect codeLine="15" fill="#F1F1F1" height="98.3998" id="C_0001435940218810141944" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="21.5" y="378.8"/>
-        <ellipse cx="36.5" cy="394.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M35.3594,395.8625 L36.6719,395.8625 L36.6719,395.9094 C36.6719,396.3156 36.6875,396.4719 36.7969,396.6281 C36.9688,396.8781 37.2656,397.05 37.5781,397.05 C37.8594,397.05 38.1563,396.9094 38.3281,396.6906 C38.4531,396.5031 38.5,396.3625 38.5,395.9094 L38.5,394.0656 C38.5,393.7375 38.4844,393.6281 38.4219,393.4562 C38.3125,393.1594 37.9531,392.9094 37.5781,392.9094 C37.2813,392.9094 37.0156,393.05 36.8438,393.2687 C36.7031,393.4562 36.6719,393.6281 36.6719,394.0656 L36.6719,394.1281 L35.3594,394.1281 L35.3594,391.9562 L39.2031,391.9562 L39.2031,392.7062 C39.2031,393.0969 39.2344,393.2844 39.3438,393.4406 C39.5156,393.6906 39.8125,393.8625 40.125,393.8625 C40.4219,393.8625 40.6875,393.7375 40.875,393.5031 C41.0156,393.3156 41.0469,393.175 41.0469,392.7062 L41.0469,390.2062 L33.3438,390.2062 C32.8906,390.2062 32.7656,390.2219 32.5938,390.3312 C32.3281,390.5031 32.1563,390.7687 32.1563,391.0812 C32.1563,391.3625 32.2813,391.6281 32.5313,391.8 C32.7188,391.925 32.9063,391.9562 33.3438,391.9562 L33.5313,391.9562 L33.5313,398.05 L33.3438,398.05 C32.9219,398.05 32.7656,398.0812 32.5938,398.175 C32.3281,398.3312 32.1563,398.6125 32.1563,398.9094 C32.1563,399.4875 32.5625,399.8 33.3438,399.8 L41.4219,399.8 L41.4219,397.2687 C41.4219,396.8625 41.3906,396.6906 41.2813,396.5344 C41.1094,396.2687 40.8281,396.1125 40.5,396.1125 C40.2188,396.1125 39.9375,396.2531 39.75,396.4719 C39.6094,396.6594 39.5781,396.8156 39.5781,397.2687 L39.5781,398.05 L35.3594,398.05 L35.3594,395.8625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="50.5" y="399.406">XYZ</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="79.5" y1="410.8" y2="410.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="27.5" y="427.8059">x</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="27.5" y="444.6059">y</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="7" x="27.5" y="461.4058">z</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="79.5" y1="469.1998" y2="469.1998"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="86.4141" id="C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="38.5" y="357"/>
+      <ellipse cx="53.5" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M57.6094,379 L49.8906,379 L49.8906,366.6094 L57.6094,366.6094 L57.6094,368.7656 L52.3438,368.7656 L52.3438,371.4375 L57.1094,371.4375 L57.1094,373.5938 L52.3438,373.5938 L52.3438,376.8438 L57.6094,376.8438 L57.6094,379 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="67.5" y="377.1543">XYZ</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="92.5" y1="389" y2="389"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="44.5" y="403.2104">x</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="44.5" y="416.0151">y</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="5" x="44.5" y="428.8198">z</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="92.5" y1="435.4141" y2="435.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001178194542408300737">
-        <rect codeLine="21" fill="#F1F1F1" height="98.3998" id="C_0001178194542408300737" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="159" x="124.5" y="203.4"/>
-        <ellipse cx="195.25" cy="219.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M190.25,220.5562 C190.25,223.0562 192.3906,224.8687 195.3125,224.8687 C196.5469,224.8687 197.7188,224.5719 198.4688,224.0562 C199.0781,223.6344 199.4063,223.2125 199.4063,222.8062 C199.4063,222.3375 198.9844,221.9312 198.4844,221.9312 C198.25,221.9312 198.0313,222.0094 197.8281,222.2125 C197.3906,222.65 197.3906,222.65 197.2188,222.7437 C196.7656,222.9781 196.125,223.1187 195.3594,223.1187 C193.3594,223.1187 192.0781,222.1031 192.0781,220.525 L192.0781,219.4781 C192.0781,217.775 193.2969,216.5719 195,216.5719 C195.5781,216.5719 196.1563,216.7125 196.625,216.9625 C197.0938,217.2281 197.2656,217.4156 197.3281,217.775 C197.4531,218.4469 197.7031,218.6969 198.2344,218.6969 C198.5156,218.6969 198.7969,218.5562 198.9844,218.3375 C199.1094,218.1656 199.1563,217.9937 199.1563,217.5562 L199.1563,216.1969 C199.1563,215.775 199.1406,215.6344 199.0156,215.4625 C198.8438,215.2125 198.5625,215.0562 198.2344,215.0562 C197.9219,215.0562 197.7188,215.1656 197.5,215.4312 C196.3281,214.9312 195.8906,214.8219 194.9375,214.8219 C192.2656,214.8219 190.25,216.8375 190.25,219.4625 L190.25,220.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="215.75" y="224.006">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="125.5" x2="282.5" y1="235.4" y2="235.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="125.5" x2="282.5" y1="243.4" y2="243.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="130.5" y="252.3"/>
-          <ellipse cx="135.5" cy="257.3" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="144.5" y="260.4059">abc : ABC</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="130.5" y="269.0999"/>
-          <ellipse cx="135.5" cy="274.0999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="144.5" y="277.2059">pimpl : detail::AImpl *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="130.5" y="285.8998"/>
-          <ellipse cx="135.5" cy="290.8998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="144.5" y="294.0058">xyz : XYZ</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="86.4141" id="C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="140.5" y="192"/>
+      <ellipse cx="206.75" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M209.7188,213.6406 Q209.1406,213.9375 208.5,214.0781 Q207.8594,214.2344 207.1563,214.2344 Q204.6563,214.2344 203.3281,212.5938 Q202.0156,210.9375 202.0156,207.8125 Q202.0156,204.6875 203.3281,203.0313 Q204.6563,201.375 207.1563,201.375 Q207.8594,201.375 208.5,201.5313 Q209.1563,201.6875 209.7188,201.9844 L209.7188,204.7031 Q209.0938,204.125 208.5,203.8594 Q207.9063,203.5781 207.2813,203.5781 Q205.9375,203.5781 205.25,204.6563 Q204.5625,205.7188 204.5625,207.8125 Q204.5625,209.9063 205.25,210.9844 Q205.9375,212.0469 207.2813,212.0469 Q207.9063,212.0469 208.5,211.7813 Q209.0938,211.5 209.7188,210.9219 L209.7188,213.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="227.25" y="212.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="141.5" x2="288.5" y1="224" y2="224"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="141.5" x2="288.5" y1="232" y2="232"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
-      <g id="elem_C_0000674757414308736755">
-        <rect codeLine="4" fill="#F1F1F1" height="48" id="C_0000674757414308736755" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="110" x="210" y="404"/>
-        <ellipse cx="225" cy="420" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M220,421.1563 C220,423.6563 222.1406,425.4688 225.0625,425.4688 C226.2969,425.4688 227.4688,425.1719 228.2188,424.6563 C228.8281,424.2344 229.1563,423.8125 229.1563,423.4063 C229.1563,422.9375 228.7344,422.5313 228.2344,422.5313 C228,422.5313 227.7813,422.6094 227.5781,422.8125 C227.1406,423.25 227.1406,423.25 226.9688,423.3438 C226.5156,423.5781 225.875,423.7188 225.1094,423.7188 C223.1094,423.7188 221.8281,422.7031 221.8281,421.125 L221.8281,420.0781 C221.8281,418.375 223.0469,417.1719 224.75,417.1719 C225.3281,417.1719 225.9063,417.3125 226.375,417.5625 C226.8438,417.8281 227.0156,418.0156 227.0781,418.375 C227.2031,419.0469 227.4531,419.2969 227.9844,419.2969 C228.2656,419.2969 228.5469,419.1563 228.7344,418.9375 C228.8594,418.7656 228.9063,418.5938 228.9063,418.1563 L228.9063,416.7969 C228.9063,416.375 228.8906,416.2344 228.7656,416.0625 C228.5938,415.8125 228.3125,415.6563 227.9844,415.6563 C227.6719,415.6563 227.4688,415.7656 227.25,416.0313 C226.0781,415.5313 225.6406,415.4219 224.6875,415.4219 C222.0156,415.4219 220,417.4375 220,420.0625 L220,421.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="239" y="424.606">detail::AImpl</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="211" x2="319" y1="436" y2="436"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="211" x2="319" y1="444" y2="444"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="238"/>
+      <ellipse cx="151.5" cy="243" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001651810571114530033">
-        <rect codeLine="39" fill="#F1F1F1" height="89.5999" id="C_0001651810571114530033" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="142" x="437" y="383.2"/>
-        <ellipse cx="499.25" cy="399.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M494.25,400.3563 C494.25,402.8563 496.3906,404.6688 499.3125,404.6688 C500.5469,404.6688 501.7188,404.3719 502.4688,403.8563 C503.0781,403.4344 503.4063,403.0125 503.4063,402.6063 C503.4063,402.1375 502.9844,401.7313 502.4844,401.7313 C502.25,401.7313 502.0313,401.8094 501.8281,402.0125 C501.3906,402.45 501.3906,402.45 501.2188,402.5438 C500.7656,402.7781 500.125,402.9188 499.3594,402.9188 C497.3594,402.9188 496.0781,401.9031 496.0781,400.325 L496.0781,399.2781 C496.0781,397.575 497.2969,396.3719 499,396.3719 C499.5781,396.3719 500.1563,396.5125 500.625,396.7625 C501.0938,397.0281 501.2656,397.2156 501.3281,397.575 C501.4531,398.2469 501.7031,398.4969 502.2344,398.4969 C502.5156,398.4969 502.7969,398.3563 502.9844,398.1375 C503.1094,397.9656 503.1563,397.7938 503.1563,397.3563 L503.1563,395.9969 C503.1563,395.575 503.1406,395.4344 503.0156,395.2625 C502.8438,395.0125 502.5625,394.8563 502.2344,394.8563 C501.9219,394.8563 501.7188,394.9656 501.5,395.2313 C500.3281,394.7313 499.8906,394.6219 498.9375,394.6219 C496.2656,394.6219 494.25,396.6375 494.25,399.2625 L494.25,400.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="519.75" y="403.806">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="438" x2="578" y1="415.2" y2="415.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="443" y="424.1"/>
-          <ellipse cx="448" cy="429.1" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="457" y="432.2059">B() = default : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="438" x2="578" y1="439.9999" y2="439.9999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="443" y="448.8999"/>
-          <ellipse cx="448" cy="453.8999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="457" y="457.0059">b() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="438" x2="578" y1="464.7999" y2="464.7999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="160.5" y="246.2104">abc : ABC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001157378014768957235">
-        <rect codeLine="46" fill="#F1F1F1" height="64.7999" id="C_0001157378014768957235" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="60" x="518" y="749.6"/>
-        <ellipse cx="536.15" cy="765.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M531.15,766.7563 C531.15,769.2563 533.2906,771.0688 536.2125,771.0688 C537.4469,771.0688 538.6188,770.7719 539.3688,770.2563 C539.9781,769.8344 540.3063,769.4125 540.3063,769.0063 C540.3063,768.5375 539.8844,768.1313 539.3844,768.1313 C539.15,768.1313 538.9313,768.2094 538.7281,768.4125 C538.2906,768.85 538.2906,768.85 538.1188,768.9438 C537.6656,769.1781 537.025,769.3188 536.2594,769.3188 C534.2594,769.3188 532.9781,768.3031 532.9781,766.725 L532.9781,765.6781 C532.9781,763.975 534.1969,762.7719 535.9,762.7719 C536.4781,762.7719 537.0563,762.9125 537.525,763.1625 C537.9938,763.4281 538.1656,763.6156 538.2281,763.975 C538.3531,764.6469 538.6031,764.8969 539.1344,764.8969 C539.4156,764.8969 539.6969,764.7563 539.8844,764.5375 C540.0094,764.3656 540.0563,764.1938 540.0563,763.7563 L540.0563,762.3969 C540.0563,761.975 540.0406,761.8344 539.9156,761.6625 C539.7438,761.4125 539.4625,761.2563 539.1344,761.2563 C538.8219,761.2563 538.6188,761.3656 538.4,761.6313 C537.2281,761.1313 536.7906,761.0219 535.8375,761.0219 C533.1656,761.0219 531.15,763.0375 531.15,765.6625 L531.15,766.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="550.85" y="770.206">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="572" y="746.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="573" y="760.8001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="519" x2="577" y1="781.6" y2="781.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="519" x2="577" y1="789.6" y2="789.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="524" y="798.5"/>
-          <ellipse cx="529" cy="803.5" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="538" y="806.6059">t : T *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="250.8047"/>
+      <ellipse cx="151.5" cy="255.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0000580575003920044707">
-        <rect codeLine="51" fill="#F1F1F1" height="48" id="C_0000580575003920044707" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="637.5" y="607.9"/>
-        <ellipse cx="652.5" cy="623.9" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M647.5,625.0563 C647.5,627.5563 649.6406,629.3688 652.5625,629.3688 C653.7969,629.3688 654.9688,629.0719 655.7188,628.5563 C656.3281,628.1344 656.6563,627.7125 656.6563,627.3063 C656.6563,626.8375 656.2344,626.4313 655.7344,626.4313 C655.5,626.4313 655.2813,626.5094 655.0781,626.7125 C654.6406,627.15 654.6406,627.15 654.4688,627.2438 C654.0156,627.4781 653.375,627.6188 652.6094,627.6188 C650.6094,627.6188 649.3281,626.6031 649.3281,625.025 L649.3281,623.9781 C649.3281,622.275 650.5469,621.0719 652.25,621.0719 C652.8281,621.0719 653.4063,621.2125 653.875,621.4625 C654.3438,621.7281 654.5156,621.9156 654.5781,622.275 C654.7031,622.9469 654.9531,623.1969 655.4844,623.1969 C655.7656,623.1969 656.0469,623.0563 656.2344,622.8375 C656.3594,622.6656 656.4063,622.4938 656.4063,622.0563 L656.4063,620.6969 C656.4063,620.275 656.3906,620.1344 656.2656,619.9625 C656.0938,619.7125 655.8125,619.5563 655.4844,619.5563 C655.1719,619.5563 654.9688,619.6656 654.75,619.9313 C653.5781,619.4313 653.1406,619.3219 652.1875,619.3219 C649.5156,619.3219 647.5,621.3375 647.5,623.9625 L647.5,625.0563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="666.5" y="628.506">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="15" x="684.5" y="604.9"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="13" x="685.5" y="619.1001">int</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="638.5" x2="695.5" y1="639.9" y2="639.9"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="638.5" x2="695.5" y1="647.9" y2="647.9"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="160.5" y="259.0151">pimpl : detail::AImpl *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001719752929087851944">
-        <rect codeLine="55" fill="#F1F1F1" height="81.5999" id="C_0001719752929087851944" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="106" x="614" y="387.2"/>
-        <ellipse cx="629" cy="403.2" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M624,404.3563 C624,406.8563 626.1406,408.6688 629.0625,408.6688 C630.2969,408.6688 631.4688,408.3719 632.2188,407.8563 C632.8281,407.4344 633.1563,407.0125 633.1563,406.6063 C633.1563,406.1375 632.7344,405.7313 632.2344,405.7313 C632,405.7313 631.7813,405.8094 631.5781,406.0125 C631.1406,406.45 631.1406,406.45 630.9688,406.5438 C630.5156,406.7781 629.875,406.9188 629.1094,406.9188 C627.1094,406.9188 625.8281,405.9031 625.8281,404.325 L625.8281,403.2781 C625.8281,401.575 627.0469,400.3719 628.75,400.3719 C629.3281,400.3719 629.9063,400.5125 630.375,400.7625 C630.8438,401.0281 631.0156,401.2156 631.0781,401.575 C631.2031,402.2469 631.4531,402.4969 631.9844,402.4969 C632.2656,402.4969 632.5469,402.3563 632.7344,402.1375 C632.8594,401.9656 632.9063,401.7938 632.9063,401.3563 L632.9063,399.9969 C632.9063,399.575 632.8906,399.4344 632.7656,399.2625 C632.5938,399.0125 632.3125,398.8563 631.9844,398.8563 C631.6719,398.8563 631.4688,398.9656 631.25,399.2313 C630.0781,398.7313 629.6406,398.6219 628.6875,398.6219 C626.0156,398.6219 624,400.6375 624,403.2625 L624,404.3563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="643" y="407.806">D</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="62" x="661" y="384.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="60" x="662" y="398.4001">bconcept T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="719" y1="419.2" y2="419.2"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="615" x2="719" y1="427.2" y2="427.2"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="620" y="436.1"/>
-          <ellipse cx="625" cy="441.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="634" y="444.2059">c : C&lt;int&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="620" y="452.8999"/>
-          <ellipse cx="625" cy="457.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="634" y="461.0059">t : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="263.6094"/>
+      <ellipse cx="151.5" cy="268.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001373403346245688670">
-        <rect codeLine="61" fill="#F1F1F1" height="48" id="C_0001373403346245688670" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="400" y="228.6"/>
-        <ellipse cx="415" cy="244.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M410,245.7563 C410,248.2563 412.1406,250.0688 415.0625,250.0688 C416.2969,250.0688 417.4688,249.7719 418.2188,249.2563 C418.8281,248.8344 419.1563,248.4125 419.1563,248.0063 C419.1563,247.5375 418.7344,247.1313 418.2344,247.1313 C418,247.1313 417.7813,247.2094 417.5781,247.4125 C417.1406,247.85 417.1406,247.85 416.9688,247.9438 C416.5156,248.1781 415.875,248.3188 415.1094,248.3188 C413.1094,248.3188 411.8281,247.3031 411.8281,245.725 L411.8281,244.6781 C411.8281,242.975 413.0469,241.7719 414.75,241.7719 C415.3281,241.7719 415.9063,241.9125 416.375,242.1625 C416.8438,242.4281 417.0156,242.6156 417.0781,242.975 C417.2031,243.6469 417.4531,243.8969 417.9844,243.8969 C418.2656,243.8969 418.5469,243.7563 418.7344,243.5375 C418.8594,243.3656 418.9063,243.1938 418.9063,242.7563 L418.9063,241.3969 C418.9063,240.975 418.8906,240.8344 418.7656,240.6625 C418.5938,240.4125 418.3125,240.2563 417.9844,240.2563 C417.6719,240.2563 417.4688,240.3656 417.25,240.6313 C416.0781,240.1313 415.6406,240.0219 414.6875,240.0219 C412.0156,240.0219 410,242.0375 410,244.6625 L410,245.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="429" y="249.206">C</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="10" x="447" y="225.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="8" x="448" y="239.8001">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="401" x2="453" y1="260.6" y2="260.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="401" x2="453" y1="268.6" y2="268.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="160.5" y="271.8198">xyz : XYZ</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0002024276012622729482">
-        <rect codeLine="65" fill="#F1F1F1" height="48" id="C_0002024276012622729482" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="489" y="228.6"/>
-        <ellipse cx="504" cy="244.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M499,245.7563 C499,248.2563 501.1406,250.0688 504.0625,250.0688 C505.2969,250.0688 506.4688,249.7719 507.2188,249.2563 C507.8281,248.8344 508.1563,248.4125 508.1563,248.0063 C508.1563,247.5375 507.7344,247.1313 507.2344,247.1313 C507,247.1313 506.7813,247.2094 506.5781,247.4125 C506.1406,247.85 506.1406,247.85 505.9688,247.9438 C505.5156,248.1781 504.875,248.3188 504.1094,248.3188 C502.1094,248.3188 500.8281,247.3031 500.8281,245.725 L500.8281,244.6781 C500.8281,242.975 502.0469,241.7719 503.75,241.7719 C504.3281,241.7719 504.9063,241.9125 505.375,242.1625 C505.8438,242.4281 506.0156,242.6156 506.0781,242.975 C506.2031,243.6469 506.4531,243.8969 506.9844,243.8969 C507.2656,243.8969 507.5469,243.7563 507.7344,243.5375 C507.8594,243.3656 507.9063,243.1938 507.9063,242.7563 L507.9063,241.3969 C507.9063,240.975 507.8906,240.8344 507.7656,240.6625 C507.5938,240.4125 507.3125,240.2563 506.9844,240.2563 C506.6719,240.2563 506.4688,240.3656 506.25,240.6313 C505.0781,240.1313 504.6406,240.0219 503.6875,240.0219 C501.0156,240.0219 499,242.0375 499,244.6625 L499,245.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="518" y="249.206">D</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="10" x="536" y="225.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="8" x="537" y="239.8001">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="490" x2="542" y1="260.6" y2="260.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="490" x2="542" y1="268.6" y2="268.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="48" id="C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="220" y="376"/>
+      <ellipse cx="235" cy="392" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M237.9688,397.6406 Q237.3906,397.9375 236.75,398.0781 Q236.1094,398.2344 235.4063,398.2344 Q232.9063,398.2344 231.5781,396.5938 Q230.2656,394.9375 230.2656,391.8125 Q230.2656,388.6875 231.5781,387.0313 Q232.9063,385.375 235.4063,385.375 Q236.1094,385.375 236.75,385.5313 Q237.4063,385.6875 237.9688,385.9844 L237.9688,388.7031 Q237.3438,388.125 236.75,387.8594 Q236.1563,387.5781 235.5313,387.5781 Q234.1875,387.5781 233.5,388.6563 Q232.8125,389.7188 232.8125,391.8125 Q232.8125,393.9063 233.5,394.9844 Q234.1875,396.0469 235.5313,396.0469 Q236.1563,396.0469 236.75,395.7813 Q237.3438,395.5 237.9688,394.9219 L237.9688,397.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="249" y="396.1543">detail::AImpl</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="327" y1="408" y2="408"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="327" y1="416" y2="416"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
-      <g id="elem_C_0001325475407133721370">
-        <rect codeLine="31" fill="#F1F1F1" height="109.3998" id="C_0001325475407133721370" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="501.5" y="577.2"/>
-        <ellipse cx="516.5" cy="598.7" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M511.5,599.8563 C511.5,602.3563 513.6406,604.1688 516.5625,604.1688 C517.7969,604.1688 518.9688,603.8719 519.7188,603.3563 C520.3281,602.9344 520.6563,602.5125 520.6563,602.1063 C520.6563,601.6375 520.2344,601.2313 519.7344,601.2313 C519.5,601.2313 519.2813,601.3094 519.0781,601.5125 C518.6406,601.95 518.6406,601.95 518.4688,602.0438 C518.0156,602.2781 517.375,602.4188 516.6094,602.4188 C514.6094,602.4188 513.3281,601.4031 513.3281,599.825 L513.3281,598.7781 C513.3281,597.075 514.5469,595.8719 516.25,595.8719 C516.8281,595.8719 517.4063,596.0125 517.875,596.2625 C518.3438,596.5281 518.5156,596.7156 518.5781,597.075 C518.7031,597.7469 518.9531,597.9969 519.4844,597.9969 C519.7656,597.9969 520.0469,597.8563 520.2344,597.6375 C520.3594,597.4656 520.4063,597.2938 520.4063,596.8563 L520.4063,595.4969 C520.4063,595.075 520.3906,594.9344 520.2656,594.7625 C520.0938,594.5125 519.8125,594.3563 519.4844,594.3563 C519.1719,594.3563 518.9688,594.4656 518.75,594.7313 C517.5781,594.2313 517.1406,594.1219 516.1875,594.1219 C513.5156,594.1219 511.5,596.1375 511.5,598.7625 L511.5,599.8563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="57" x="531" y="595.4001">«concept»</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58" x="530.5" y="611.4061">bconcept</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="596.5" y="574.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="597.5" y="588.4001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="502.5" x2="601.5" y1="620.2" y2="620.2"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="507.5" y="637.206">(T t)</text>
-        <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:1.0,2.0;" x1="502.5" x2="601.5" y1="645" y2="645"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="19" x="507.5" y="662.0059">T{}</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="26" x="507.5" y="678.8058">t.b()</text>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="81.6094" id="C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="445.5" y="359"/>
+      <ellipse cx="503.75" cy="375" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M506.7188,380.6406 Q506.1406,380.9375 505.5,381.0781 Q504.8594,381.2344 504.1563,381.2344 Q501.6563,381.2344 500.3281,379.5938 Q499.0156,377.9375 499.0156,374.8125 Q499.0156,371.6875 500.3281,370.0313 Q501.6563,368.375 504.1563,368.375 Q504.8594,368.375 505.5,368.5313 Q506.1563,368.6875 506.7188,368.9844 L506.7188,371.7031 Q506.0938,371.125 505.5,370.8594 Q504.9063,370.5781 504.2813,370.5781 Q502.9375,370.5781 502.25,371.6563 Q501.5625,372.7188 501.5625,374.8125 Q501.5625,376.9063 502.25,377.9844 Q502.9375,379.0469 504.2813,379.0469 Q504.9063,379.0469 505.5,378.7813 Q506.0938,378.5 506.7188,377.9219 L506.7188,380.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="524.25" y="379.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="446.5" x2="577.5" y1="391" y2="391"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001082111961413727438">
-        <rect codeLine="70" fill="#F1F1F1" height="98.3998" id="C_0001082111961413727438" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="81" x="386.5" y="7"/>
-        <ellipse cx="419.05" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M414.05,24.1563 C414.05,26.6563 416.1906,28.4688 419.1125,28.4688 C420.3469,28.4688 421.5188,28.1719 422.2688,27.6563 C422.8781,27.2344 423.2063,26.8125 423.2063,26.4063 C423.2063,25.9375 422.7844,25.5313 422.2844,25.5313 C422.05,25.5313 421.8313,25.6094 421.6281,25.8125 C421.1906,26.25 421.1906,26.25 421.0188,26.3438 C420.5656,26.5781 419.925,26.7188 419.1594,26.7188 C417.1594,26.7188 415.8781,25.7031 415.8781,24.125 L415.8781,23.0781 C415.8781,21.375 417.0969,20.1719 418.8,20.1719 C419.3781,20.1719 419.9563,20.3125 420.425,20.5625 C420.8938,20.8281 421.0656,21.0156 421.1281,21.375 C421.2531,22.0469 421.5031,22.2969 422.0344,22.2969 C422.3156,22.2969 422.5969,22.1563 422.7844,21.9375 C422.9094,21.7656 422.9563,21.5938 422.9563,21.1563 L422.9563,19.7969 C422.9563,19.375 422.9406,19.2344 422.8156,19.0625 C422.6438,18.8125 422.3625,18.6563 422.0344,18.6563 C421.7219,18.6563 421.5188,18.7656 421.3,19.0313 C420.1281,18.5313 419.6906,18.4219 418.7375,18.4219 C416.0656,18.4219 414.05,20.4375 414.05,23.0625 L414.05,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="436.95" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="387.5" x2="466.5" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="387.5" x2="466.5" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="392.5" y="55.9"/>
-          <ellipse cx="397.5" cy="60.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="406.5" y="64.0059">a : A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="392.5" y="72.6999"/>
-          <ellipse cx="397.5" cy="77.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="406.5" y="80.8059">c : C&lt;B&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="392.5" y="89.4998"/>
-          <ellipse cx="397.5" cy="94.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="406.5" y="97.6058">d : D&lt;B&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="451.5" y="397"/>
+      <ellipse cx="456.5" cy="402" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0001178194542408300737_C_0002145362985538918973">
-      <path codeLine="76" d="M181.3839,313.5346 C177.8039,323.2846 178.29,322.21 175,331.8 C169.83,346.88 164.5,363.42 159.8,378.42 " fill="none" id="C_0001178194542408300737-backto-C_0002145362985538918973" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="185.52,302.27,179.697,306.5236,181.3839,313.5346,187.2068,309.281,185.52,302.27" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="181" cy="341.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="188" y="344.877">abc</text>
-    </g>
-    <g id="link_C_0001178194542408300737_C_0001435940218810141944">
-      <path codeLine="77" d="M144.1558,310.7663 C126.2058,328.6363 114.85,340.94 98,361 C92.21,367.89 86.38,375.46 80.88,382.94 " fill="none" id="C_0001178194542408300737-backto-C_0001435940218810141944" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="152.66,302.3,145.5858,303.6984,144.1558,310.7663,151.23,309.3679,152.66,302.3" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="129" cy="341.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="136" y="344.877">xyz</text>
-    </g>
-    <g id="link_C_0001178194542408300737_C_0000674757414308736755">
-      <path codeLine="78" d="M220.99,301.9 C232.7,335.17 245.7386,372.2401 254.8586,398.1601 " fill="none" id="C_0001178194542408300737-to-C_0000674757414308736755" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="256.85,403.82,257.6361,394.0026,255.1905,399.1034,250.0896,396.6578,256.85,403.82" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="242" cy="341.1" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="249" y="344.877">pimpl</text>
-    </g>
-    <g id="link_C_0000580575003920044707_C_0001157378014768957235">
-      <path codeLine="79" d="M654.48,656.29 C645.5,672.23 632.61,693.47 619,710.6 C606.8,725.96 604.5938,729.087 591.3538,741.637 " fill="none" id="C_0000580575003920044707-to-C_0001157378014768957235" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="578.29,754.02,595.4814,745.9916,587.2261,737.2824,578.29,754.02" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001719752929087851944_C_0001325475407133721370">
-      <path codeLine="80" d="M644.05,469.21 C632.87,488.81 619.23,512.73 607,534.2 C599.11,548.05 593.5671,557.795 585.6471,571.715 " fill="none" id="C_0001719752929087851944-to-C_0001325475407133721370" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="582.68,576.93,590.6074,571.0856,585.1526,572.5842,583.6541,567.1294,582.68,576.93" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="621" y="522.277">T</text>
-    </g>
-    <g id="link_C_0001719752929087851944_C_0000580575003920044707">
-      <path codeLine="81" d="M667,480.89 C667,522.26 667,573.55 667,607.48 " fill="none" id="C_0001719752929087851944-backto-C_0000580575003920044707" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="667,468.89,663,474.89,667,480.89,671,474.89,667,468.89" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="668" y="522.277">+c</text>
-    </g>
-    <g id="link_C_0001373403346245688670_C_0001651810571114530033">
-      <path codeLine="82" d="M437.92,276.99 C450.58,304.07 469.1615,343.8435 484.9115,377.5735 " fill="none" id="C_0001373403346245688670-to-C_0001651810571114530033" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="487.45,383.01,487.2665,373.1629,485.3345,378.4796,480.0178,376.5476,487.45,383.01" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001373403346245688670_C_0001157378014768957235">
-      <path codeLine="83" d="M423.59,276.98 C417.75,321.11 407.62,419.57 420,501.2 C434.61,597.55 436.96,625.82 485,710.6 C493.65,725.87 493.6412,727.6594 505.1712,739.7194 " fill="none" id="C_0001373403346245688670-to-C_0001157378014768957235" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="517.61,752.73,509.508,735.5731,500.8343,743.8657,517.61,752.73" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002024276012622729482_C_0001651810571114530033">
-      <path codeLine="84" d="M514.92,276.99 C513.67,304.07 511.8672,343.2864 510.3072,377.0164 " fill="none" id="C_0002024276012622729482-to-C_0001651810571114530033" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="510.03,383.01,514.4415,374.2044,510.261,378.0153,506.4501,373.8348,510.03,383.01" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002024276012622729482_C_0001719752929087851944">
-      <path codeLine="85" d="M536.36,276.99 C560.84,305.09 590.4794,339.1353 620.1294,373.1853 " fill="none" id="C_0002024276012622729482-to-C_0001719752929087851944" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="631.95,386.76,624.6543,369.2451,615.6045,377.1255,631.95,386.76" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001082111961413727438_C_0001178194542408300737">
-      <path codeLine="86" d="M386.1,92.86 C350.64,123.77 303.5226,164.8371 264.2826,199.0471 " fill="none" id="C_0001082111961413727438-to-C_0001178194542408300737" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="259.76,202.99,269.1725,200.0908,263.5288,199.7043,263.9153,194.0606,259.76,202.99" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="336" y="148.477">+a</text>
-    </g>
-    <g id="link_C_0001082111961413727438_C_0001373403346245688670">
-      <path codeLine="87" d="M427,117.75 C427,156.89 427,198.2 427,228.34 " fill="none" id="C_0001082111961413727438-backto-C_0001373403346245688670" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="427,105.75,423,111.75,427,117.75,431,111.75,427,105.75" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="428" y="148.477">+c</text>
-    </g>
-    <g id="link_C_0001082111961413727438_C_0002024276012622729482">
-      <path codeLine="88" d="M454.2254,116.6608 C472.1454,155.8008 491.55,198.2 505.35,228.34 " fill="none" id="C_0001082111961413727438-backto-C_0002024276012622729482" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="449.23,105.75,448.0908,112.8705,454.2254,116.6608,455.3647,109.5403,449.23,105.75" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="469" y="148.477">+d</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="465.5" y="405.2104">B() = default : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="446.5" x2="577.5" y1="411.8047" y2="411.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="451.5" y="417.8047"/>
+      <ellipse cx="456.5" cy="422.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="465.5" y="426.0151">b() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="446.5" x2="577.5" y1="432.6094" y2="432.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="60.8047" id="C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="524.5" y="703"/>
+      <ellipse cx="543.1" cy="719" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M546.0688,724.6406 Q545.4906,724.9375 544.85,725.0781 Q544.2094,725.2344 543.5063,725.2344 Q541.0063,725.2344 539.6781,723.5938 Q538.3656,721.9375 538.3656,718.8125 Q538.3656,715.6875 539.6781,714.0313 Q541.0063,712.375 543.5063,712.375 Q544.2094,712.375 544.85,712.5313 Q545.5063,712.6875 546.0688,712.9844 L546.0688,715.7031 Q545.4438,715.125 544.85,714.8594 Q544.2563,714.5781 543.6313,714.5781 Q542.2875,714.5781 541.6,715.6563 Q540.9125,716.7188 540.9125,718.8125 Q540.9125,720.9063 541.6,721.9844 Q542.2875,723.0469 543.6313,723.0469 Q544.2563,723.0469 544.85,722.7813 Q545.4438,722.5 546.0688,721.9219 L546.0688,724.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="557.9" y="723.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="577.5" y="700"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="578.5" y="712.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="525.5" x2="582.5" y1="735" y2="735"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="525.5" x2="582.5" y1="743" y2="743"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="530.5" y="749"/>
+      <ellipse cx="535.5" cy="754" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="544.5" y="757.2104">t : T *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="48" id="C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="641" y="570"/>
+      <ellipse cx="656" cy="586" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M658.9688,591.6406 Q658.3906,591.9375 657.75,592.0781 Q657.1094,592.2344 656.4063,592.2344 Q653.9063,592.2344 652.5781,590.5938 Q651.2656,588.9375 651.2656,585.8125 Q651.2656,582.6875 652.5781,581.0313 Q653.9063,579.375 656.4063,579.375 Q657.1094,579.375 657.75,579.5313 Q658.4063,579.6875 658.9688,579.9844 L658.9688,582.7031 Q658.3438,582.125 657.75,581.8594 Q657.1563,581.5781 656.5313,581.5781 Q655.1875,581.5781 654.5,582.6563 Q653.8125,583.7188 653.8125,585.8125 Q653.8125,587.9063 654.5,588.9844 Q655.1875,590.0469 656.5313,590.0469 Q657.1563,590.0469 657.75,589.7813 Q658.3438,589.5 658.9688,588.9219 L658.9688,591.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="670" y="590.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="686" y="567"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="687" y="579.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="700" y1="602" y2="602"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="700" y1="610" y2="610"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="73.6094" id="C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="613.5" y="363"/>
+      <ellipse cx="628.5" cy="379" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M631.4688,384.6406 Q630.8906,384.9375 630.25,385.0781 Q629.6094,385.2344 628.9063,385.2344 Q626.4063,385.2344 625.0781,383.5938 Q623.7656,381.9375 623.7656,378.8125 Q623.7656,375.6875 625.0781,374.0313 Q626.4063,372.375 628.9063,372.375 Q629.6094,372.375 630.25,372.5313 Q630.9063,372.6875 631.4688,372.9844 L631.4688,375.7031 Q630.8438,375.125 630.25,374.8594 Q629.6563,374.5781 629.0313,374.5781 Q627.6875,374.5781 627,375.6563 Q626.3125,376.7188 626.3125,378.8125 Q626.3125,380.9063 627,381.9844 Q627.6875,383.0469 629.0313,383.0469 Q629.6563,383.0469 630.25,382.7813 Q630.8438,382.5 631.4688,381.9219 L631.4688,384.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="642.5" y="383.1543">D</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="72" x="659.5" y="360"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="70" x="660.5" y="372.1387">bconcept T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="614.5" x2="727.5" y1="395" y2="395"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="614.5" x2="727.5" y1="403" y2="403"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="619.5" y="409"/>
+      <ellipse cx="624.5" cy="414" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="633.5" y="417.2104">c : C&lt;int&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="619.5" y="421.8047"/>
+      <ellipse cx="624.5" cy="426.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="633.5" y="430.0151">t : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="48" id="C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="408" y="211"/>
+      <ellipse cx="423" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M425.9688,232.6406 Q425.3906,232.9375 424.75,233.0781 Q424.1094,233.2344 423.4063,233.2344 Q420.9063,233.2344 419.5781,231.5938 Q418.2656,229.9375 418.2656,226.8125 Q418.2656,223.6875 419.5781,222.0313 Q420.9063,220.375 423.4063,220.375 Q424.1094,220.375 424.75,220.5313 Q425.4063,220.6875 425.9688,220.9844 L425.9688,223.7031 Q425.3438,223.125 424.75,222.8594 Q424.1563,222.5781 423.5313,222.5781 Q422.1875,222.5781 421.5,223.6563 Q420.8125,224.7188 420.8125,226.8125 Q420.8125,228.9063 421.5,229.9844 Q422.1875,231.0469 423.5313,231.0469 Q424.1563,231.0469 424.75,230.7813 Q425.3438,230.5 425.9688,229.9219 L425.9688,232.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="437" y="231.1543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="453" y="208"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="454" y="220.1387">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="409" x2="459" y1="243" y2="243"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="409" x2="459" y1="251" y2="251"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="48" id="C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="495.5" y="211"/>
+      <ellipse cx="510.5" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M513.4688,232.6406 Q512.8906,232.9375 512.25,233.0781 Q511.6094,233.2344 510.9063,233.2344 Q508.4063,233.2344 507.0781,231.5938 Q505.7656,229.9375 505.7656,226.8125 Q505.7656,223.6875 507.0781,222.0313 Q508.4063,220.375 510.9063,220.375 Q511.6094,220.375 512.25,220.5313 Q512.9063,220.6875 513.4688,220.9844 L513.4688,223.7031 Q512.8438,223.125 512.25,222.8594 Q511.6563,222.5781 511.0313,222.5781 Q509.6875,222.5781 509,223.6563 Q508.3125,224.7188 508.3125,226.8125 Q508.3125,228.9063 509,229.9844 Q509.6875,231.0469 511.0313,231.0469 Q511.6563,231.0469 512.25,230.7813 Q512.8438,230.5 513.4688,229.9219 L513.4688,232.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="524.5" y="231.1543">D</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="541.5" y="208"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.5" y="220.1387">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="496.5" x2="547.5" y1="243" y2="243"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="496.5" x2="547.5" y1="251" y2="251"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="92.3516" id="C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="502" y="548"/>
+      <ellipse cx="517" cy="566.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M519.9688,572.6094 Q519.3906,572.9063 518.75,573.0469 Q518.1094,573.2031 517.4063,573.2031 Q514.9063,573.2031 513.5781,571.5625 Q512.2656,569.9063 512.2656,566.7813 Q512.2656,563.6563 513.5781,562 Q514.9063,560.3438 517.4063,560.3438 Q518.1094,560.3438 518.75,560.5 Q519.4063,560.6563 519.9688,560.9531 L519.9688,563.6719 Q519.3438,563.0938 518.75,562.8281 Q518.1563,562.5469 517.5313,562.5469 Q516.1875,562.5469 515.5,563.625 Q514.8125,564.6875 514.8125,566.7813 Q514.8125,568.875 515.5,569.9531 Q516.1875,571.0156 517.5313,571.0156 Q518.1563,571.0156 518.75,570.75 Q519.3438,570.4688 519.9688,569.8906 L519.9688,572.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="529" y="564.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="532" y="578.1074">bconcept</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="600" y="545"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="601" y="557.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="605" y1="585.9375" y2="585.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="508" y="600.1479">(T t)</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="503" x2="605" y1="606.7422" y2="606.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="508" y="620.9526">T{}</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="508" y="633.7573">t.b()</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="86.4141" id="C_0001082111961413727438" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="394.5" y="8"/>
+      <ellipse cx="427.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M430.0188,29.6406 Q429.4406,29.9375 428.8,30.0781 Q428.1594,30.2344 427.4563,30.2344 Q424.9563,30.2344 423.6281,28.5938 Q422.3156,26.9375 422.3156,23.8125 Q422.3156,20.6875 423.6281,19.0313 Q424.9563,17.375 427.4563,17.375 Q428.1594,17.375 428.8,17.5313 Q429.4563,17.6875 430.0188,17.9844 L430.0188,20.7031 Q429.3938,20.125 428.8,19.8594 Q428.2063,19.5781 427.5813,19.5781 Q426.2375,19.5781 425.55,20.6563 Q424.8625,21.7188 424.8625,23.8125 Q424.8625,25.9063 425.55,26.9844 Q426.2375,28.0469 427.5813,28.0469 Q428.2063,28.0469 428.8,27.7813 Q429.3938,27.5 430.0188,26.9219 L430.0188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="444.95" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="472.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="472.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="54"/>
+      <ellipse cx="405.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="414.5" y="62.2104">a : A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="66.8047"/>
+      <ellipse cx="405.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="414.5" y="75.0151">c : C&lt;B&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="79.6094"/>
+      <ellipse cx="405.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="414.5" y="87.8198">d : D&lt;B&gt;</text>
+    </a>
+    <path d="M190.81,290.32 C188.41,296.25 186.09,302.23 184,308 C178.28,323.8 172.83,341.46 168.34,356.98 " fill="none" id="C_0001178194542408300737&lt;-C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="195.8,278.31,189.8041,282.3161,191.1959,289.3916,197.1918,285.3855,195.8,278.31" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="190" cy="317.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="197" y="321.0669">abc</text>
+    <path d="M154.99,287.06 C139.85,301.22 124.18,317.09 111,333 C104.81,340.48 98.64,348.8 92.94,356.94 " fill="none" id="C_0001178194542408300737&lt;-C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="164.82,278.02,157.6958,279.1363,155.9862,286.1418,163.1104,285.0255,164.82,278.02" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="138" cy="317.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="145" y="321.0669">xyz</text>
+    <path d="M230.35,278.4 C240.91,307.58 254.65,345.53 263.86,371 " fill="none" id="C_0001178194542408300737-&gt;C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="265.65,375.92,266.3503,366.0961,263.9493,371.2181,258.8273,368.8172,265.65,375.92" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="252" cy="317.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="35" x="259" y="321.0669">pimpl</text>
+    <path d="M656.01,618.07 C646.74,631.82 634.3,649.39 622,664 C614.49,672.92 606.03,682.06 597.71,690.63 " fill="none" id="C_0000580575003920044707-&gt;C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="602.62,695.62,583.54,704.83,592.71,685.73,602.62,695.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M648.99,437.11 C630.68,467.16 604.44,510.23 584.17,543.49 " fill="none" id="C_0001719752929087851944-&gt;C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="581.48,547.91,589.5763,542.302,584.0797,543.639,582.7427,538.1424,581.48,547.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="620" y="493.0669">T</text>
+    <path d="M671,450.34 C671,488.73 671,540.27 671,569.73 " fill="none" id="C_0001719752929087851944&lt;-C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="671,437.11,667,443.11,671,449.11,675,443.11,671,437.11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="672" y="493.0669">+c</text>
+    <path d="M445.01,259.01 C456.77,283.58 475.7,323.15 490.45,353.96 " fill="none" id="C_0001373403346245688670-&gt;C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="492.78,358.83,492.5087,348.9849,490.6242,354.3186,485.2905,352.4341,492.78,358.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M430.78,259.27 C425.48,301.79 416.59,394.76 428,472 C441.03,560.18 440.36,587.43 486,664 C492.45,674.83 500.99,685.21 509.82,694.46 " fill="none" id="C_0001373403346245688670-&gt;C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="514.71,689.46,524.16,708.43,504.95,699.49,514.71,689.46" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M520.59,259.01 C519.09,283.48 516.67,322.82 514.79,353.58 " fill="none" id="C_0002024276012622729482-&gt;C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="514.46,358.83,518.9918,350.0857,514.7595,353.839,511.0062,349.6066,514.46,358.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M543.03,259.01 C564.07,282.02 597.14,318.2 624.39,348.01 " fill="none" id="C_0002024276012622729482-&gt;C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="629.68,343.43,638.01,362.91,619.35,352.87,629.68,343.43" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M394.34,84.96 C359.49,113.92 308.45,156.33 269.73,188.52 " fill="none" id="C_0001082111961413727438-&gt;C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="265.54,192,275.0206,189.332,269.3881,188.8075,269.9126,183.175,265.54,192" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="345" y="137.0669">+a</text>
+    <path d="M434,107.53 C434,142.21 434,185.04 434,210.9 " fill="none" id="C_0001082111961413727438&lt;-C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="434,94.21,430,100.21,434,106.21,438,100.21,434,94.21" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="435" y="137.0669">+c</text>
+    <path d="M460.19,106.16 C477.07,141.07 498.16,184.7 510.83,210.9 " fill="none" id="C_0001082111961413727438&lt;-C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="454.41,94.21,453.4243,101.3534,459.6391,105.0107,460.6248,97.8673,454.41,94.21" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="476" y="137.0669">+d</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00065_class_mermaid.svg b/docs/test_cases/t00065_class_mermaid.svg
index 98fe284a..610f20b7 100644
--- a/docs/test_cases/t00065_class_mermaid.svg
+++ b/docs/test_cases/t00065_class_mermaid.svg
@@ -1,73 +1,68 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 983.390625 885" style="max-width: 983.391px; background-color: white;" width="983.390625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 974.5 885" style="max-width: 974.5px; background-color: white;" width="974.5" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M142.91684803056788,314.82971477776283L130.57654002547324,321.691428981469C118.23623202037858,328.5531431851752,93.55561601018928,342.2765715925876,81.21530800509464,354.8049524629605C68.875,367.3333333333333,68.875,378.6666666666667,68.875,384.3333333333333L68.875,390"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M240.625,340L240.625,342.6666666666667C240.625,345.3333333333333,240.625,350.6666666666667,240.625,359C240.625,367.3333333333333,240.625,378.6666666666667,240.625,384.3333333333333L240.625,390"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M322.6015625,307.42930735728L336.7421875,315.5244227977333C350.8828125,323.61953823818664,379.1640625,339.80976911909335,393.3046875,359.90488455954664C407.4453125,380,407.4453125,404,407.4453125,416L407.4453125,428"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M942.9921875,704L942.9921875,715.5C942.9921875,727,942.9921875,750,930.2211913837477,768.3650808305355C917.4501952674954,786.7301616610708,891.9082030349906,800.4603233221419,879.1372069187383,807.3254041526774L866.3662108024861,814.1904849832129"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M840.0300396126761,513L833.9091475938967,522.3333333333334C827.7882555751174,531.6666666666666,815.5464715375587,550.3333333333334,809.4255795187793,564.3333333333334C803.3046875,578.3333333333334,803.3046875,587.6666666666666,803.3046875,592.3333333333334L803.3046875,597"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M916.1380201804043,528.0519005703884L920.6137147336702,534.876583808657C925.0894092869362,541.7012670469256,934.040798393468,555.3506335234628,938.516492946734,575.1753167617313C942.9921875,595,942.9921875,621,942.9921875,634L942.9921875,647"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M632.8022742146596,289L626.119082678883,300.1666666666667C619.4358911431065,311.3333333333333,606.0695080715532,333.6666666666667,599.3863165357766,353.1666666666667C592.703125,372.6666666666667,592.703125,389.3333333333333,592.703125,397.6666666666667L592.703125,406"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M666.9164757853404,289L673.599667321117,300.1666666666667C680.2828588568935,311.3333333333333,693.6492419284468,333.6666666666667,700.3324334642234,362.5833333333333C707.015625,391.5,707.015625,427,707.015625,462.5C707.015625,498,707.015625,533.5,707.015625,569C707.015625,604.5,707.015625,640,707.015625,674C707.015625,708,707.015625,740.5,719.1404937873211,763.4925262996749C731.2653625746424,786.4850525993497,755.5151001492846,799.9701051986996,767.6399689366058,806.7126314983744L779.7648377239269,813.4551577980494"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M834.75,286.0882136144179L821.818359375,297.7401780120149C808.88671875,309.39214240961195,783.0234375,332.69607120480595,756.5186555377473,353.1378060453582C730.0138735754946,373.5795408859104,702.8675909009893,391.1590817718208,689.2944495637366,399.948852214776L675.7213082264839,408.73862265773124"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M866.1327306937172,289L867.302015161431,300.1666666666667C868.4712996291449,311.3333333333333,870.8098685645724,333.6666666666667,871.9791530322863,351.1666666666667C873.1484375,368.6666666666667,873.1484375,381.3333333333333,873.1484375,387.6666666666667L873.1484375,394"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M606.109375,79.7096139895384L545.1953125,93.92467832461534C484.28125,108.13974265969227,362.453125,136.56987132984614,301.5390625,155.45160233158973C240.625,174.33333333333334,240.625,183.66666666666666,240.625,188.33333333333334L240.625,193"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M649.859375,149L649.859375,151.66666666666666C649.859375,154.33333333333334,649.859375,159.66666666666666,649.859375,173.5C649.859375,187.33333333333334,649.859375,209.66666666666666,649.859375,220.83333333333334L649.859375,232"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M710.0377710537011,96.44482668621818L735.5562154614177,107.87068890518181C761.074659869134,119.29655112414544,812.1115486845671,142.1482755620727,837.6299930922836,164.74080444770303C863.1484375,187.33333333333334,863.1484375,209.66666666666666,863.1484375,220.83333333333334L863.1484375,232"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M158.6484375,306.0823098617176L143.68619791666666,314.40192488476464C128.72395833333334,322.72153990781175,98.79947916666667,339.36076995390584,83.83723958333333,353.3470516436196C68.875,367.3333333333333,68.875,378.6666666666667,68.875,384.3333333333333L68.875,390"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M240.625,322L240.625,327.6666666666667C240.625,333.3333333333333,240.625,344.6666666666667,240.625,356C240.625,367.3333333333333,240.625,378.6666666666667,240.625,384.3333333333333L240.625,390"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M322.6015625,307.42930735728L336.7421875,315.5244227977333C350.8828125,323.61953823818664,379.1640625,339.80976911909335,393.3046875,360.90488455954664C407.4453125,382,407.4453125,408,407.4453125,421L407.4453125,434"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M934.1015625,704L934.1015625,715.5C934.1015625,727,934.1015625,750,918.6881510416666,769.7855177914511C903.2747395833334,789.571035582902,872.4479166666666,806.1420711658039,857.0345052083334,814.427588957255L841.62109375,822.713106748706"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M831.1394146126761,513L825.0185225938967,522.3333333333334C818.8976305751174,531.6666666666666,806.6558465375587,550.3333333333334,800.5349545187793,565.3333333333334C794.4140625,580.3333333333334,794.4140625,591.6666666666666,794.4140625,597.3333333333334L794.4140625,603"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M897.3762103873239,513L903.4971024061033,522.3333333333334C909.6179944248826,531.6666666666666,921.8597784624413,550.3333333333334,927.9806704812207,572.6666666666666C934.1015625,595,934.1015625,621,934.1015625,634L934.1015625,647"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M626.7976112565445,289L620.3743114637872,300.1666666666667C613.9510116710297,311.3333333333333,601.1044120855148,333.6666666666667,594.6811122927575,354.1666666666667C588.2578125,374.6666666666667,588.2578125,393.3333333333333,588.2578125,402.6666666666667L588.2578125,412"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M659.5852012434555,289L666.0085010362128,300.1666666666667C672.4318008289703,311.3333333333333,685.2784004144851,333.6666666666667,691.7017002072425,362.5833333333333C698.125,391.5,698.125,427,698.125,462.5C698.125,498,698.125,533.5,698.125,569C698.125,604.5,698.125,640,698.125,674C698.125,708,698.125,740.5,712.8717447916666,764.9505270602499C727.6184895833334,789.4010541204998,757.1119791666666,805.8021082409996,771.8587239583334,814.0026353012495L786.60546875,822.2031623614994"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M825.859375,286.0882136144179L812.927734375,297.7401780120149C799.99609375,309.39214240961195,774.1328125,332.69607120480595,747.0104166666666,353.79306526331646C719.8880208333334,374.89005932182704,691.5065104166666,393.7801186436541,677.3157552083334,403.22514830456754L663.125,412.67017796548106"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M857.2421056937172,289L858.411390161431,300.1666666666667C859.5806746291449,311.3333333333333,861.9192435645724,333.6666666666667,863.0885280322863,354.1666666666667C864.2578125,374.6666666666667,864.2578125,393.3333333333333,864.2578125,402.6666666666667L864.2578125,412"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M599.44140625,79.87872245456398L539.638671875,94.06560204546999C479.8359375,108.25248163637599,360.23046875,136.626240818188,300.427734375,156.47978707576067C240.625,176.33333333333334,240.625,187.66666666666666,240.625,193.33333333333334L240.625,199"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M643.19140625,131L643.19140625,136.66666666666666C643.19140625,142.33333333333334,643.19140625,153.66666666666666,643.19140625,170.5C643.19140625,187.33333333333334,643.19140625,209.66666666666666,643.19140625,220.83333333333334L643.19140625,232"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M686.94140625,89.29531027335148L714.8274739583334,101.91275856112622C742.7135416666666,114.53020684890099,798.4856770833334,139.76510342445047,826.3717447916666,163.5492183788919C854.2578125,187.33333333333334,854.2578125,209.66666666666666,854.2578125,220.83333333333334L854.2578125,232"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(68.875, 356)" class="edgeLabel">
@@ -114,7 +109,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(803.3046875, 569)" class="edgeLabel">
+        <g transform="translate(794.4140625, 569)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -125,7 +120,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(942.9921875, 569)" class="edgeLabel">
+        <g transform="translate(934.1015625, 569)" class="edgeLabel">
           <g transform="translate(-8.671875, -9)" class="label">
             <foreignObject height="18" width="17.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -191,7 +186,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(649.859375, 165)" class="edgeLabel">
+        <g transform="translate(643.19140625, 165)" class="edgeLabel">
           <g transform="translate(-8.671875, -9)" class="label">
             <foreignObject height="18" width="17.34375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -202,7 +197,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(863.1484375, 165)" class="edgeLabel">
+        <g transform="translate(854.2578125, 165)" class="edgeLabel">
           <g transform="translate(-9.125, -9)" class="label">
             <foreignObject height="18" width="18.25">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -215,7 +210,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/submodule1a/submodule1a.h#L6">
+        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/submodule1a/submodule1a.h#L6">
           <g title="AImpl" id="classId-C_0000674757414308736755-0" class="node default clickable">
             <rect height="57" width="111.890625" y="-28.5" x="-55.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.9453125" x1="-55.9453125" class="divider"/>
@@ -234,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L8">
+        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L8">
           <g title="ABC" id="classId-C_0002145362985538918973-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -268,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L10">
+        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L10">
           <g title="XYZ" id="classId-C_0001435940218810141944-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -302,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module1/module1.h#L12">
+        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L12">
           <g title="A" id="classId-C_0001178194542408300737-3" class="node default clickable">
             <rect height="123" width="163.953125" y="-61.5" x="-81.9765625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.9765625" x1="-81.9765625" class="divider"/>
@@ -325,7 +320,7 @@
               </foreignObject>
               <foreignObject transform="translate( -74.4765625, 2)" height="18" width="148.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+pimpl : detail::AImpl</span>
+                  <span style="font-style:italic;" class="nodeLabel">+pimpl : detail::AImpl </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -74.4765625, 24)" height="18" width="77.796875">
@@ -336,7 +331,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(803.3046875, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/concepts/concepts.h#L7">
+        <a transform="translate(794.4140625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/concepts/concepts.h#L7">
           <g title="bconcept" id="classId-C_0001325475407133721370-4" class="node default clickable">
             <rect height="145" width="114.578125" y="-72.5" x="-57.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="57.2890625" x1="-57.2890625" class="divider"/>
@@ -362,19 +357,19 @@
                   <span class="nodeLabel">"t.b()"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -49.7890625, 47)" height="18" width="53.734375">
+              <foreignObject transform="translate( -49.7890625, 47)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"(T t) : "</span>
+                  <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(592.703125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L7">
+        <a transform="translate(588.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L7">
           <g title="B" id="classId-C_0001651810571114530033-5" class="node default clickable">
-            <rect height="101" width="158.625" y="-50.5" x="-79.3125" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="79.3125" x1="-79.3125" class="divider"/>
-            <line y2="-4.5" y1="-4.5" x2="79.3125" x1="-79.3125" class="divider"/>
+            <rect height="101" width="149.734375" y="-50.5" x="-74.8671875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="74.8671875" x1="-74.8671875" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="74.8671875" x1="-74.8671875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -386,20 +381,20 @@
                   <span class="nodeLabel">B</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -71.8125, 3)" height="18" width="143.625">
+              <foreignObject transform="translate( -67.3671875, 3)" height="18" width="134.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+B() : : [default] void</span>
+                  <span class="nodeLabel">+B() : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -71.8125, 25)" height="18" width="80.484375">
+              <foreignObject transform="translate( -67.3671875, 25)" height="18" width="71.59375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+b() : : void</span>
+                  <span class="nodeLabel">+b() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(823.00390625, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(814.11328125, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001157378014768957235-6" class="node default clickable">
             <rect height="79" width="55.015625" y="-39.5" x="-27.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
@@ -417,13 +412,13 @@
               </foreignObject>
               <foreignObject transform="translate( -20.0078125, 2)" height="18" width="36.90625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+t : T</span>
+                  <span style="font-style:italic;" class="nodeLabel">+t : T </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(942.9921875, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(934.1015625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0000580575003920044707-7" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -442,7 +437,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(873.1484375, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(864.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0001719752929087851944-8" class="node default clickable">
             <rect height="101" width="130.578125" y="-50.5" x="-65.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.2890625" x1="-65.2890625" class="divider"/>
@@ -471,7 +466,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(649.859375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(643.19140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001373403346245688670-9" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -490,7 +485,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(863.1484375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(854.2578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0002024276012622729482-10" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -509,7 +504,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(649.859375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00065/t00065.cc#L6">
+        <a transform="translate(643.19140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L6">
           <g title="R" id="classId-C_0001082111961413727438-11" class="node default clickable">
             <rect height="123" width="87.5" y="-61.5" x="-43.75" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="43.75" x1="-43.75" class="divider"/>
@@ -527,7 +522,7 @@
               </foreignObject>
               <foreignObject transform="translate( -36.25, -20)" height="18" width="41.65625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+a : A</span>
+                  <span style="font-style:italic;" class="nodeLabel">+a : A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -36.25, 2)" height="18" width="71.59375">
diff --git a/docs/test_cases/t00066.md b/docs/test_cases/t00066.md
index fab6b6ee..b0335cc5 100644
--- a/docs/test_cases/t00066.md
+++ b/docs/test_cases/t00066.md
@@ -97,7 +97,7 @@ int A::static_int = 1;
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00066::A",
+      "display_name": "A",
       "id": "1899957281758233935",
       "is_abstract": false,
       "is_nested": false,
@@ -821,6 +821,7 @@ int A::static_int = 1;
     }
   ],
   "name": "t00066_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00066"
 }
diff --git a/docs/test_cases/t00066_class.svg b/docs/test_cases/t00066_class.svg
index ed29597e..6322e651 100644
--- a/docs/test_cases/t00066_class.svg
+++ b/docs/test_cases/t00066_class.svg
@@ -1,227 +1,231 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="572px" preserveAspectRatio="none" style="width:369px;height:572px;background:#FFFFFF;" version="1.1" viewBox="0 0 369 572" width="369px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="450px" preserveAspectRatio="none" style="width:347px;height:450px;" version="1.1" viewBox="0 0 347 450" width="347px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fk1booxwm4w83" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001899957281758233935">
-        <rect codeLine="2" fill="#F1F1F1" height="551.9978" id="C_0001899957281758233935" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="348" x="7" y="7"/>
-        <ellipse cx="172.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M167.25,24.1563 C167.25,26.6563 169.3906,28.4688 172.3125,28.4688 C173.5469,28.4688 174.7188,28.1719 175.4688,27.6563 C176.0781,27.2344 176.4063,26.8125 176.4063,26.4063 C176.4063,25.9375 175.9844,25.5313 175.4844,25.5313 C175.25,25.5313 175.0313,25.6094 174.8281,25.8125 C174.3906,26.25 174.3906,26.25 174.2188,26.3438 C173.7656,26.5781 173.125,26.7188 172.3594,26.7188 C170.3594,26.7188 169.0781,25.7031 169.0781,24.125 L169.0781,23.0781 C169.0781,21.375 170.2969,20.1719 172,20.1719 C172.5781,20.1719 173.1563,20.3125 173.625,20.5625 C174.0938,20.8281 174.2656,21.0156 174.3281,21.375 C174.4531,22.0469 174.7031,22.2969 175.2344,22.2969 C175.5156,22.2969 175.7969,22.1563 175.9844,21.9375 C176.1094,21.7656 176.1563,21.5938 176.1563,21.1563 L176.1563,19.7969 C176.1563,19.375 176.1406,19.2344 176.0156,19.0625 C175.8438,18.8125 175.5625,18.6563 175.2344,18.6563 C174.9219,18.6563 174.7188,18.7656 174.5,19.0313 C173.3281,18.5313 172.8906,18.4219 171.9375,18.4219 C169.2656,18.4219 167.25,20.4375 167.25,23.0625 L167.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.75" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="47.9"/>
-          <ellipse cx="18" cy="52.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="27" y="56.0059">public_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="64.6999"/>
-          <polygon fill="none" points="18,64.6999,22,68.6999,18,72.6999,14,68.6999" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="27" y="72.8059">protected_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="81.4998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="83.4998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="27" y="89.6058">private_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="98.2997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="100.2997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="106.4057">a_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="115.0997"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="117.0997"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="123.2057">b_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="131.8996"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="133.8996"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="27" y="140.0056">c_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="148.6995"/>
-          <ellipse cx="18" cy="153.6995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="83" x="27" y="156.8055">static_int : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="165.4995"/>
-          <ellipse cx="18" cy="170.4995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="163" x="27" y="173.6054">static_const_int : const int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="182.2994"/>
-          <ellipse cx="18" cy="187.2994" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="228" x="27" y="190.4054">auto_member : const unsigned long</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="198.1993" y2="198.1993"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="207.0993"/>
-          <ellipse cx="18" cy="212.0993" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="27" y="215.2053">A() = default : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.8992"/>
-          <ellipse cx="18" cy="228.8992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="27" y="232.0052">A(int i) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="240.6992"/>
-          <ellipse cx="18" cy="245.6992" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="248.8051">A(A &amp;&amp;) = default : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="257.4991"/>
-          <ellipse cx="18" cy="262.4991" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="180" x="27" y="265.6051">A(const A &amp;) = deleted : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="274.299"/>
-          <ellipse cx="18" cy="279.299" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="124" x="27" y="282.405">~A() = default : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="291.0989"/>
-          <ellipse cx="18" cy="296.0989" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="27" y="299.2049">basic_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="307.8989"/>
-          <ellipse cx="18" cy="312.8989" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="126" x="27" y="316.0048">static_method() : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="324.6988"/>
-          <ellipse cx="18" cy="329.6988" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="27" y="332.8048">const_method() const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="341.4987"/>
-          <ellipse cx="18" cy="346.4987" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="27" y="349.6047">auto_method() : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="358.2986"/>
-          <ellipse cx="18" cy="363.2986" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="114" x="27" y="366.4046">operator++() : A &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="375.0986"/>
-          <ellipse cx="18" cy="380.0986" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="236" x="27" y="383.2046">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="391.8985"/>
-          <ellipse cx="18" cy="396.8985" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="27" y="400.0045">operator=(A &amp; other) noexcept : A &amp;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="408.6984"/>
-          <ellipse cx="18" cy="413.6984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="27" y="416.8044">size() const : std::size_t</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="425.4984"/>
-          <ellipse cx="18" cy="430.4984" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="27" y="433.6043">double_int(const int i) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="442.2983"/>
-          <ellipse cx="18" cy="447.2983" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="258" x="27" y="450.4043">sum(const double a, const double b) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="459.0982"/>
-          <ellipse cx="18" cy="464.0982" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="27" y="467.2042">default_int(int i = 12) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="475.8981"/>
-          <ellipse cx="18" cy="480.8981" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="27" y="484.0041">default_string(int i, std::string s = "abc") : std::string</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="492.6981"/>
-          <ellipse cx="18" cy="497.6981" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="153" x="27" y="500.804">create_from_int(int i) : A</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="509.498"/>
-          <polygon fill="#FFFF44" points="18,509.498,22,513.498,18,517.498,14,513.498" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="164" x="27" y="517.604">protected_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="526.2979"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="528.2979"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="534.4039">private_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="543.0978"/>
-          <polygon fill="#FFFF44" points="18,543.0978,22,547.0978,18,551.0978,14,547.0978" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="255" x="27" y="551.2038">compare : std::function&lt;bool (const int)&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk1booxwm4w83)" height="432.1406" id="C_0001899957281758233935" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+      <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
+      <ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="53.2104">public_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
+      <polygon fill="none" points="18,57.8047,22,61.8047,18,65.8047,14,61.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="66.0151">protected_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="72.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="78.8198">private_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="85.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="91.6245">a_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="98.2188"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="104.4292">b_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="117.2339">c_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
+      <ellipse cx="18" cy="126.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="130.0386">static_int : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
+      <ellipse cx="18" cy="139.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="142.8433">static_const_int : const int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
+      <ellipse cx="18" cy="152.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="155.6479">auto_member : const unsigned long</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="168.2422"/>
+      <ellipse cx="18" cy="173.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="176.4526">A() = default : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="181.0469"/>
+      <ellipse cx="18" cy="186.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="189.2573">A(int i) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="193.8516"/>
+      <ellipse cx="18" cy="198.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="202.062">A(A &amp;&amp;) = default : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="206.6563"/>
+      <ellipse cx="18" cy="211.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="214.8667">A(const A &amp;) = deleted : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="219.4609"/>
+      <ellipse cx="18" cy="224.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="227.6714">~A() = default : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
+      <ellipse cx="18" cy="237.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="240.4761">basic_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
+      <ellipse cx="18" cy="250.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="253.2808">static_method() : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
+      <ellipse cx="18" cy="262.875" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="266.0854">const_method() const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
+      <ellipse cx="18" cy="275.6797" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="278.8901">auto_method() : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
+      <ellipse cx="18" cy="288.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="291.6948">operator++() : A &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
+      <ellipse cx="18" cy="301.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="304.4995">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="309.0938"/>
+      <ellipse cx="18" cy="314.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="317.3042">operator=(A &amp; other) noexcept : A &amp;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="321.8984"/>
+      <ellipse cx="18" cy="326.8984" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="330.1089">size() const : std::size_t</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="334.7031"/>
+      <ellipse cx="18" cy="339.7031" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="342.9136">double_int(const int i) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="347.5078"/>
+      <ellipse cx="18" cy="352.5078" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="355.7183">sum(const double a, const double b) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="360.3125"/>
+      <ellipse cx="18" cy="365.3125" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="368.5229">default_int(int i = 12) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="373.1172"/>
+      <ellipse cx="18" cy="378.1172" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="381.3276">default_string(int i, std::string s = "abc") : std::string</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="385.9219"/>
+      <ellipse cx="18" cy="390.9219" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="394.1323">create_from_int(int i) : A</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="398.7266"/>
+      <polygon fill="#FFFF44" points="18,398.7266,22,402.7266,18,406.7266,14,402.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="406.937">protected_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="411.5313"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="413.5313"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="419.7417">private_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="424.3359"/>
+      <polygon fill="#FFFF44" points="18,424.3359,22,428.3359,18,432.3359,14,428.3359" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="432.5464">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00066_class_mermaid.svg b/docs/test_cases/t00066_class_mermaid.svg
index 368a6ff6..40546ea7 100644
--- a/docs/test_cases/t00066_class_mermaid.svg
+++ b/docs/test_cases/t00066_class_mermaid.svg
@@ -1,55 +1,50 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 409.640625 733" style="max-width: 409.641px; background-color: white;" width="409.640625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 733" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,11 +52,11 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(204.8203125, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00066/t00066.cc#L7">
+        <a transform="translate(200.375, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L7">
           <g title="A" id="classId-C_0001899957281758233935-0" class="node default clickable">
-            <rect height="717" width="393.640625" y="-358.5" x="-196.8203125" class="outer title-state"/>
-            <line y2="-328.5" y1="-328.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
-            <line y2="-92.5" y1="-92.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
+            <rect height="717" width="384.75" y="-358.5" x="-192.375" class="outer title-state"/>
+            <line y2="-328.5" y1="-328.5" x2="192.375" x1="-192.375" class="divider"/>
+            <line y2="-92.5" y1="-92.5" x2="192.375" x1="-192.375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -73,154 +68,154 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -317)" height="18" width="148.96875">
+              <foreignObject transform="translate( -184.875, -317)" height="18" width="148.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+public_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -295)" height="18" width="173.421875">
+              <foreignObject transform="translate( -184.875, -295)" height="18" width="173.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#protected_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -273)" height="18" width="294.390625">
+              <foreignObject transform="translate( -184.875, -273)" height="18" width="294.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#compare : std::function&lt;bool (const int)&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -251)" height="18" width="151.171875">
+              <foreignObject transform="translate( -184.875, -251)" height="18" width="151.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-private_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -229)" height="18" width="53.359375">
+              <foreignObject transform="translate( -184.875, -229)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-a_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -207)" height="18" width="53.359375">
+              <foreignObject transform="translate( -184.875, -207)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-b_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -185)" height="18" width="52.46875">
+              <foreignObject transform="translate( -184.875, -185)" height="18" width="52.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-c_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -163)" height="18" width="102.71875">
+              <foreignObject transform="translate( -184.875, -163)" height="18" width="102.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -141)" height="18" width="192.546875">
+              <foreignObject transform="translate( -184.875, -141)" height="18" width="192.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_const_int : const int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -119)" height="18" width="263.734375">
+              <foreignObject transform="translate( -184.875, -119)" height="18" width="263.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+auto_member : const unsigned long</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -85)" height="18" width="143.625">
+              <foreignObject transform="translate( -184.875, -85)" height="18" width="134.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A() : : [default] void</span>
+                  <span class="nodeLabel">+A() : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -63)" height="18" width="107.15625">
+              <foreignObject transform="translate( -184.875, -63)" height="18" width="98.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(int i) : : void</span>
+                  <span class="nodeLabel">+A(int i) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -41)" height="18" width="179.203125">
+              <foreignObject transform="translate( -184.875, -41)" height="18" width="170.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(A &amp;&amp;) : : [default] void</span>
+                  <span class="nodeLabel">+A(A &amp;&amp;) : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -19)" height="18" width="148.96875">
+              <foreignObject transform="translate( -184.875, -19)" height="18" width="140.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+A(const A &amp;) : : void</span>
+                  <span class="nodeLabel">+A(const A &amp;) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 3)" height="18" width="152.96875">
+              <foreignObject transform="translate( -184.875, 3)" height="18" width="144.078125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~A() : : [default] void</span>
+                  <span class="nodeLabel">+~A() : [default] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 25)" height="18" width="171.203125">
+              <foreignObject transform="translate( -184.875, 25)" height="18" width="162.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+basic_method() : : void</span>
+                  <span class="nodeLabel">+basic_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 47)" height="18" width="158.734375">
+              <foreignObject transform="translate( -184.875, 47)" height="18" width="149.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+static_method() : : int</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+static_method() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 69)" height="18" width="223.671875">
+              <foreignObject transform="translate( -184.875, 69)" height="18" width="214.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : : [const] void</span>
+                  <span class="nodeLabel">+const_method() : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 91)" height="18" width="152.53125">
+              <foreignObject transform="translate( -184.875, 91)" height="18" width="143.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+auto_method() : : int</span>
+                  <span class="nodeLabel">+auto_method() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 113)" height="18" width="144.53125">
+              <foreignObject transform="translate( -184.875, 113)" height="18" width="135.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator++() : : A &amp;</span>
+                  <span class="nodeLabel">+operator++() : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 135)" height="18" width="211.6875">
+              <foreignObject transform="translate( -184.875, 135)" height="18" width="202.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(A &amp;&amp; other) : : A &amp;</span>
+                  <span class="nodeLabel">+operator=(A &amp;&amp; other) : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 157)" height="18" width="201.015625">
+              <foreignObject transform="translate( -184.875, 157)" height="18" width="192.125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+operator=(A &amp; other) : : A &amp;</span>
+                  <span class="nodeLabel">+operator=(A &amp; other) : A &amp;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 179)" height="18" width="194.296875">
+              <foreignObject transform="translate( -184.875, 179)" height="18" width="185.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : : [const] std::size_t</span>
+                  <span class="nodeLabel">+size() : [const] std::size_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 201)" height="18" width="200.5625">
+              <foreignObject transform="translate( -184.875, 201)" height="18" width="191.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+double_int(const int i) : : int</span>
+                  <span class="nodeLabel">+double_int(const int i) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 223)" height="18" width="306.40625">
+              <foreignObject transform="translate( -184.875, 223)" height="18" width="297.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sum(const double a, const double b) : : int</span>
+                  <span class="nodeLabel">+sum(const double a, const double b) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 245)" height="18" width="193.890625">
+              <foreignObject transform="translate( -184.875, 245)" height="18" width="185">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_int(int i = 12) : : int</span>
+                  <span class="nodeLabel">+default_int(int i = 12) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 267)" height="18" width="378.640625">
+              <foreignObject transform="translate( -184.875, 267)" height="18" width="369.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : : std::string</span>
+                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 289)" height="18" width="188.078125">
+              <foreignObject transform="translate( -184.875, 289)" height="18" width="179.1875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="text-decoration: underline; display: inline-block; white-space: nowrap;">
-                  <span style="text-decoration:underline;" class="nodeLabel">+create_from_int(int i) : : A</span>
+                  <span style="text-decoration:underline;" class="nodeLabel">+create_from_int(int i) : A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 311)" height="18" width="200.109375">
+              <foreignObject transform="translate( -184.875, 311)" height="18" width="191.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#protected_method() : : void</span>
+                  <span class="nodeLabel">#protected_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 333)" height="18" width="177.859375">
+              <foreignObject transform="translate( -184.875, 333)" height="18" width="168.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-private_method() : : void</span>
+                  <span class="nodeLabel">-private_method() : void</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00067.md b/docs/test_cases/t00067.md
index 17eba7dc..caf5131f 100644
--- a/docs/test_cases/t00067.md
+++ b/docs/test_cases/t00067.md
@@ -100,7 +100,7 @@ int A::static_int = 1;
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00067::A",
+      "display_name": "A",
       "id": "541140581420098839",
       "is_abstract": false,
       "is_nested": false,
@@ -534,6 +534,7 @@ int A::static_int = 1;
     }
   ],
   "name": "t00067_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00067"
 }
diff --git a/docs/test_cases/t00067_class.svg b/docs/test_cases/t00067_class.svg
index 80ae2940..61c4fbbd 100644
--- a/docs/test_cases/t00067_class.svg
+++ b/docs/test_cases/t00067_class.svg
@@ -1,157 +1,161 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="404px" preserveAspectRatio="none" style="width:369px;height:404px;background:#FFFFFF;" version="1.1" viewBox="0 0 369 404" width="369px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="322px" preserveAspectRatio="none" style="width:347px;height:322px;" version="1.1" viewBox="0 0 347 322" width="347px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1577k0guxl5hh" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000541140581420098839">
-        <rect codeLine="2" fill="#F1F1F1" height="383.9985" id="C_0000541140581420098839" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="348" x="7" y="7"/>
-        <ellipse cx="172.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M167.25,24.1563 C167.25,26.6563 169.3906,28.4688 172.3125,28.4688 C173.5469,28.4688 174.7188,28.1719 175.4688,27.6563 C176.0781,27.2344 176.4063,26.8125 176.4063,26.4063 C176.4063,25.9375 175.9844,25.5313 175.4844,25.5313 C175.25,25.5313 175.0313,25.6094 174.8281,25.8125 C174.3906,26.25 174.3906,26.25 174.2188,26.3438 C173.7656,26.5781 173.125,26.7188 172.3594,26.7188 C170.3594,26.7188 169.0781,25.7031 169.0781,24.125 L169.0781,23.0781 C169.0781,21.375 170.2969,20.1719 172,20.1719 C172.5781,20.1719 173.1563,20.3125 173.625,20.5625 C174.0938,20.8281 174.2656,21.0156 174.3281,21.375 C174.4531,22.0469 174.7031,22.2969 175.2344,22.2969 C175.5156,22.2969 175.7969,22.1563 175.9844,21.9375 C176.1094,21.7656 176.1563,21.5938 176.1563,21.1563 L176.1563,19.7969 C176.1563,19.375 176.1406,19.2344 176.0156,19.0625 C175.8438,18.8125 175.5625,18.6563 175.2344,18.6563 C174.9219,18.6563 174.7188,18.7656 174.5,19.0313 C173.3281,18.5313 172.8906,18.4219 171.9375,18.4219 C169.2656,18.4219 167.25,20.4375 167.25,23.0625 L167.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.75" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="47.9"/>
-          <ellipse cx="18" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="27" y="56.0059">auto_method() : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="64.6999"/>
-          <ellipse cx="18" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="27" y="72.8059">basic_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="81.4998"/>
-          <ellipse cx="18" cy="86.4998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="176" x="27" y="89.6058">const_method() const : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="98.2997"/>
-          <ellipse cx="18" cy="103.2997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="27" y="106.4057">default_int(int i = 12) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="115.0997"/>
-          <ellipse cx="18" cy="120.0997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="322" x="27" y="123.2057">default_string(int i, std::string s = "abc") : std::string</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="131.8996"/>
-          <ellipse cx="18" cy="136.8996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="163" x="27" y="140.0056">double_int(const int i) : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="148.6995"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="150.6995"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="27" y="156.8055">private_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="165.4995"/>
-          <polygon fill="#FFFF44" points="18,165.4995,22,169.4995,18,173.4995,14,169.4995" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="164" x="27" y="173.6054">protected_method() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="182.2994"/>
-          <ellipse cx="18" cy="187.2994" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="27" y="190.4054">size() const : std::size_t</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="199.0993"/>
-          <ellipse cx="18" cy="204.0993" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="258" x="27" y="207.2053">sum(const double a, const double b) : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="354" y1="214.9993" y2="214.9993"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.8992"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="225.8992"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="232.0052">a_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="240.6992"/>
-          <ellipse cx="18" cy="245.6992" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="228" x="27" y="248.8051">auto_member : const unsigned long</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="257.4991"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="259.4991"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="43" x="27" y="265.6051">b_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="274.299"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="276.299"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="42" x="27" y="282.405">c_ : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="291.0989"/>
-          <polygon fill="#FFFF44" points="18,291.0989,22,295.0989,18,299.0989,14,295.0989" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="255" x="27" y="299.2049">compare : std::function&lt;bool (const int)&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="307.8989"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="15" y="309.8989"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="131" x="27" y="316.0048">private_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="324.6988"/>
-          <polygon fill="none" points="18,324.6988,22,328.6988,18,332.6988,14,328.6988" style="stroke:#B38D22;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="148" x="27" y="332.8048">protected_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="341.4987"/>
-          <ellipse cx="18" cy="346.4987" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="27" y="349.6047">public_member : int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="358.2986"/>
-          <ellipse cx="18" cy="363.2986" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="163" x="27" y="366.4046">static_const_int : const int</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="375.0986"/>
-          <ellipse cx="18" cy="380.0986" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" text-decoration="underline" textLength="83" x="27" y="383.2046">static_int : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1577k0guxl5hh)" height="304.0938" id="C_0000541140581420098839" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+      <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
+      <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="53.2104">auto_method() : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
+      <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="66.0151">basic_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
+      <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="78.8198">const_method() const : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
+      <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="91.6245">default_int(int i = 12) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
+      <ellipse cx="18" cy="101.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="104.4292">default_string(int i, std::string s = "abc") : std::string</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
+      <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="117.2339">double_int(const int i) : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="123.8281"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="130.0386">private_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
+      <polygon fill="#FFFF44" points="18,134.6328,22,138.6328,18,142.6328,14,138.6328" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="142.8433">protected_method() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
+      <ellipse cx="18" cy="152.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="155.6479">size() const : std::size_t</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="160.2422"/>
+      <ellipse cx="18" cy="165.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="168.4526">sum(const double a, const double b) : int</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="175.0469" y2="175.0469"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="181.0469"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="183.0469"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="189.2573">a_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="193.8516"/>
+      <ellipse cx="18" cy="198.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="202.062">auto_member : const unsigned long</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="206.6563"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="208.6563"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="214.8667">b_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="219.4609"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="221.4609"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="227.6714">c_ : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
+      <polygon fill="#FFFF44" points="18,232.2656,22,236.2656,18,240.2656,14,236.2656" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="240.4761">compare : std::function&lt;bool (const int)&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="247.0703"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="253.2808">private_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
+      <polygon fill="none" points="18,257.875,22,261.875,18,265.875,14,261.875" style="stroke: #B38D22; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="266.0854">protected_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
+      <ellipse cx="18" cy="275.6797" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="278.8901">public_member : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
+      <ellipse cx="18" cy="288.4844" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="291.6948">static_const_int : const int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
+      <ellipse cx="18" cy="301.2891" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="304.4995">static_int : int</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00067_class_mermaid.svg b/docs/test_cases/t00067_class_mermaid.svg
index 00b6e59f..0c352cce 100644
--- a/docs/test_cases/t00067_class_mermaid.svg
+++ b/docs/test_cases/t00067_class_mermaid.svg
@@ -1,55 +1,50 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 409.640625 513" style="max-width: 409.641px; background-color: white;" width="409.640625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 400.75 513" style="max-width: 400.75px; background-color: white;" width="400.75" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,11 +52,11 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(204.8203125, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00067/t00067.cc#L6">
+        <a transform="translate(200.375, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L6">
           <g title="A" id="classId-C_0000541140581420098839-0" class="node default clickable">
-            <rect height="497" width="393.640625" y="-248.5" x="-196.8203125" class="outer title-state"/>
-            <line y2="-218.5" y1="-218.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="196.8203125" x1="-196.8203125" class="divider"/>
+            <rect height="497" width="384.75" y="-248.5" x="-192.375" class="outer title-state"/>
+            <line y2="-218.5" y1="-218.5" x2="192.375" x1="-192.375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="192.375" x1="-192.375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -73,104 +68,104 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -207)" height="18" width="53.359375">
+              <foreignObject transform="translate( -184.875, -207)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-a_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -185)" height="18" width="263.734375">
+              <foreignObject transform="translate( -184.875, -185)" height="18" width="263.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+auto_member : const unsigned long</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -163)" height="18" width="53.359375">
+              <foreignObject transform="translate( -184.875, -163)" height="18" width="53.359375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-b_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -141)" height="18" width="52.46875">
+              <foreignObject transform="translate( -184.875, -141)" height="18" width="52.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-c_ : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -119)" height="18" width="294.390625">
+              <foreignObject transform="translate( -184.875, -119)" height="18" width="294.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#compare : std::function&lt;bool (const int)&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -97)" height="18" width="151.171875">
+              <foreignObject transform="translate( -184.875, -97)" height="18" width="151.171875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-private_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -75)" height="18" width="173.421875">
+              <foreignObject transform="translate( -184.875, -75)" height="18" width="173.421875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">#protected_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -53)" height="18" width="148.96875">
+              <foreignObject transform="translate( -184.875, -53)" height="18" width="148.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+public_member : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -31)" height="18" width="192.546875">
+              <foreignObject transform="translate( -184.875, -31)" height="18" width="192.546875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_const_int : const int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, -9)" height="18" width="102.71875">
+              <foreignObject transform="translate( -184.875, -9)" height="18" width="102.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+static_int : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 25)" height="18" width="152.53125">
+              <foreignObject transform="translate( -184.875, 25)" height="18" width="143.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+auto_method() : : int</span>
+                  <span class="nodeLabel">+auto_method() : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 47)" height="18" width="171.203125">
+              <foreignObject transform="translate( -184.875, 47)" height="18" width="162.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+basic_method() : : void</span>
+                  <span class="nodeLabel">+basic_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 69)" height="18" width="223.671875">
+              <foreignObject transform="translate( -184.875, 69)" height="18" width="214.78125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+const_method() : : [const] void</span>
+                  <span class="nodeLabel">+const_method() : [const] void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 91)" height="18" width="193.890625">
+              <foreignObject transform="translate( -184.875, 91)" height="18" width="185">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_int(int i = 12) : : int</span>
+                  <span class="nodeLabel">+default_int(int i = 12) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 113)" height="18" width="378.640625">
+              <foreignObject transform="translate( -184.875, 113)" height="18" width="369.75">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : : std::string</span>
+                  <span class="nodeLabel">+default_string(int i, std::string s = "abc") : std::string</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 135)" height="18" width="200.5625">
+              <foreignObject transform="translate( -184.875, 135)" height="18" width="191.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+double_int(const int i) : : int</span>
+                  <span class="nodeLabel">+double_int(const int i) : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 157)" height="18" width="177.859375">
+              <foreignObject transform="translate( -184.875, 157)" height="18" width="168.96875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-private_method() : : void</span>
+                  <span class="nodeLabel">-private_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 179)" height="18" width="200.109375">
+              <foreignObject transform="translate( -184.875, 179)" height="18" width="191.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">#protected_method() : : void</span>
+                  <span class="nodeLabel">#protected_method() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 201)" height="18" width="194.296875">
+              <foreignObject transform="translate( -184.875, 201)" height="18" width="185.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+size() : : [const] std::size_t</span>
+                  <span class="nodeLabel">+size() : [const] std::size_t</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -189.3203125, 223)" height="18" width="306.40625">
+              <foreignObject transform="translate( -184.875, 223)" height="18" width="297.515625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+sum(const double a, const double b) : : int</span>
+                  <span class="nodeLabel">+sum(const double a, const double b) : int</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00068.md b/docs/test_cases/t00068.md
index 2c9e55a5..f4939ccb 100644
--- a/docs/test_cases/t00068.md
+++ b/docs/test_cases/t00068.md
@@ -100,7 +100,7 @@ struct RR {
           "name": "clanguml::t00068::AA"
         }
       ],
-      "display_name": "clanguml::t00068::AAA",
+      "display_name": "AAA",
       "id": "1484819281509619918",
       "is_abstract": false,
       "is_nested": false,
@@ -147,6 +147,7 @@ struct RR {
     }
   ],
   "name": "t00068_r0_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
@@ -179,7 +180,7 @@ struct RR {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00068::BB",
+      "display_name": "BB",
       "id": "1427649116338755656",
       "is_abstract": false,
       "is_nested": false,
@@ -218,7 +219,7 @@ struct RR {
         "TwoA",
         "ThreeA"
       ],
-      "display_name": "clanguml::t00068::AKind",
+      "display_name": "AKind",
       "id": "1888428536574868284",
       "is_nested": false,
       "name": "AKind",
@@ -240,7 +241,7 @@ struct RR {
           "name": "clanguml::t00068::A"
         }
       ],
-      "display_name": "clanguml::t00068::AA",
+      "display_name": "AA",
       "id": "577981285610429577",
       "is_abstract": false,
       "is_nested": false,
@@ -269,7 +270,7 @@ struct RR {
           "name": "clanguml::t00068::AA"
         }
       ],
-      "display_name": "clanguml::t00068::AAA",
+      "display_name": "AAA",
       "id": "1484819281509619918",
       "is_abstract": false,
       "is_nested": false,
@@ -316,7 +317,7 @@ struct RR {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00068::R",
+      "display_name": "R",
       "id": "999621481464424961",
       "is_abstract": false,
       "is_nested": false,
@@ -351,6 +352,7 @@ struct RR {
     }
   ],
   "name": "t00068_r1_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
@@ -403,7 +405,7 @@ struct RR {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00068::B",
+      "display_name": "B",
       "id": "359183874441719256",
       "is_abstract": false,
       "is_nested": false,
@@ -425,7 +427,7 @@ struct RR {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00068::BB",
+      "display_name": "BB",
       "id": "1427649116338755656",
       "is_abstract": false,
       "is_nested": false,
@@ -464,7 +466,7 @@ struct RR {
         "TwoA",
         "ThreeA"
       ],
-      "display_name": "clanguml::t00068::AKind",
+      "display_name": "AKind",
       "id": "1888428536574868284",
       "is_nested": false,
       "name": "AKind",
@@ -479,7 +481,7 @@ struct RR {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00068::A",
+      "display_name": "A",
       "id": "1297439817144700057",
       "is_abstract": false,
       "is_nested": false,
@@ -508,7 +510,7 @@ struct RR {
           "name": "clanguml::t00068::A"
         }
       ],
-      "display_name": "clanguml::t00068::AA",
+      "display_name": "AA",
       "id": "577981285610429577",
       "is_abstract": false,
       "is_nested": false,
@@ -537,7 +539,7 @@ struct RR {
           "name": "clanguml::t00068::AA"
         }
       ],
-      "display_name": "clanguml::t00068::AAA",
+      "display_name": "AAA",
       "id": "1484819281509619918",
       "is_abstract": false,
       "is_nested": false,
@@ -584,7 +586,7 @@ struct RR {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00068::R",
+      "display_name": "R",
       "id": "999621481464424961",
       "is_abstract": false,
       "is_nested": false,
@@ -619,7 +621,7 @@ struct RR {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00068::RR",
+      "display_name": "RR",
       "id": "1168375787542426694",
       "is_abstract": false,
       "is_nested": false,
@@ -654,6 +656,7 @@ struct RR {
     }
   ],
   "name": "t00068_r2_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00068_r0_class.svg b/docs/test_cases/t00068_r0_class.svg
index 79fb3dbc..1b511858 100644
--- a/docs/test_cases/t00068_r0_class.svg
+++ b/docs/test_cases/t00068_r0_class.svg
@@ -1,32 +1,36 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="140px" preserveAspectRatio="none" style="width:191px;height:140px;background:#FFFFFF;" version="1.1" viewBox="0 0 191 140" width="191px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="112px" preserveAspectRatio="none" style="width:222px;height:112px;" version="1.1" viewBox="0 0 222 112" width="222px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f11ewtfjqytom9" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="163" x="10" y="23.0059">AAA context of radius 0</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <g id="elem_C_0001484819281509619918">
-        <rect codeLine="3" fill="#F1F1F1" height="81.5999" id="C_0001484819281509619918" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="37.5" y="44.7999"/>
-        <ellipse cx="75" cy="60.7999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M70,61.9562 C70,64.4562 72.1406,66.2687 75.0625,66.2687 C76.2969,66.2687 77.4688,65.9718 78.2188,65.4562 C78.8281,65.0343 79.1563,64.6124 79.1563,64.2062 C79.1563,63.7374 78.7344,63.3312 78.2344,63.3312 C78,63.3312 77.7813,63.4093 77.5781,63.6124 C77.1406,64.0499 77.1406,64.0499 76.9688,64.1437 C76.5156,64.3781 75.875,64.5187 75.1094,64.5187 C73.1094,64.5187 71.8281,63.5031 71.8281,61.9249 L71.8281,60.8781 C71.8281,59.1749 73.0469,57.9718 74.75,57.9718 C75.3281,57.9718 75.9063,58.1124 76.375,58.3624 C76.8438,58.6281 77.0156,58.8156 77.0781,59.1749 C77.2031,59.8468 77.4531,60.0968 77.9844,60.0968 C78.2656,60.0968 78.5469,59.9562 78.7344,59.7374 C78.8594,59.5656 78.9063,59.3937 78.9063,58.9562 L78.9063,57.5968 C78.9063,57.1749 78.8906,57.0343 78.7656,56.8624 C78.5938,56.6124 78.3125,56.4562 77.9844,56.4562 C77.6719,56.4562 77.4688,56.5656 77.25,56.8312 C76.0781,56.3312 75.6406,56.2218 74.6875,56.2218 C72.0156,56.2218 70,58.2374 70,60.8624 L70,61.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="94" y="65.4059">AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="38.5" x2="145.5" y1="76.7999" y2="76.7999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="38.5" x2="145.5" y1="84.7999" y2="84.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="43.5" y="93.6999"/>
-          <ellipse cx="48.5" cy="98.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="57.5" y="101.8059">akind : AKind</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="43.5" y="110.4998"/>
-          <ellipse cx="48.5" cy="115.4998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="57.5" y="118.6058">bb : BB *</text>
-        </a>
-      </g>
+    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="2" y="16.708">AAA context of radius 0</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11ewtfjqytom9)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="56.5" y="27.9531"/>
+      <ellipse cx="90.85" cy="43.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M93.8188,49.5938 Q93.2406,49.8906 92.6,50.0313 Q91.9594,50.1875 91.2563,50.1875 Q88.7563,50.1875 87.4281,48.5469 Q86.1156,46.8906 86.1156,43.7656 Q86.1156,40.6406 87.4281,38.9844 Q88.7563,37.3281 91.2563,37.3281 Q91.9594,37.3281 92.6,37.4844 Q93.2563,37.6406 93.8188,37.9375 L93.8188,40.6563 Q93.1938,40.0781 92.6,39.8125 Q92.0063,39.5313 91.3813,39.5313 Q90.0375,39.5313 89.35,40.6094 Q88.6625,41.6719 88.6625,43.7656 Q88.6625,45.8594 89.35,46.9375 Q90.0375,48 91.3813,48 Q92.0063,48 92.6,47.7344 Q93.1938,47.4531 93.8188,46.875 L93.8188,49.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="109.15" y="48.1074">AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="57.5" x2="154.5" y1="59.9531" y2="59.9531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="57.5" x2="154.5" y1="67.9531" y2="67.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="62.5" y="73.9531"/>
+      <ellipse cx="67.5" cy="78.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="76.5" y="82.1636">akind : AKind</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="62.5" y="86.7578"/>
+      <ellipse cx="67.5" cy="91.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="76.5" y="94.9683">bb : BB *</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00068_r0_class_mermaid.svg b/docs/test_cases/t00068_r0_class_mermaid.svg
index 5fc69921..504d9966 100644
--- a/docs/test_cases/t00068_r0_class_mermaid.svg
+++ b/docs/test_cases/t00068_r0_class_mermaid.svg
@@ -1,55 +1,51 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-34.6875 -49 203.125 166" style="max-width: 203.125px; background-color: white;" width="203.125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="-34.6875 -49 203.125 166" style="max-width: 203.125px; background-color: white;" width="203.125" id="my-svg">
+  <title id="chart-title-my-svg">AAA context of radius 0</title>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,7 +53,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(66.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19">
+        <a transform="translate(66.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-0" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -80,7 +76,7 @@
               </foreignObject>
               <foreignObject transform="translate( -51.375, 13)" height="18" width="61.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+bb : BB</span>
+                  <span style="font-style:italic;" class="nodeLabel">+bb : BB </span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00068_r1_class.svg b/docs/test_cases/t00068_r1_class.svg
index 1461974d..433e4630 100644
--- a/docs/test_cases/t00068_r1_class.svg
+++ b/docs/test_cases/t00068_r1_class.svg
@@ -1,111 +1,99 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="450px" preserveAspectRatio="none" style="width:255px;height:450px;background:#FFFFFF;" version="1.1" viewBox="0 0 255 450" width="255px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="415px" preserveAspectRatio="none" style="width:250px;height:415px;" version="1.1" viewBox="0 0 250 415" width="250px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fu0yqwj1wirvb" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="163" x="39.25" y="23.0059">AAA context of radius 1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <g id="elem_C_0001427649116338755656">
-        <rect codeLine="3" fill="#F1F1F1" height="64.7999" id="C_0001427649116338755656" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="7" y="361.9999"/>
-        <ellipse cx="62.25" cy="377.9999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M57.25,379.1562 C57.25,381.6562 59.3906,383.4687 62.3125,383.4687 C63.5469,383.4687 64.7188,383.1718 65.4688,382.6562 C66.0781,382.2343 66.4063,381.8124 66.4063,381.4062 C66.4063,380.9374 65.9844,380.5312 65.4844,380.5312 C65.25,380.5312 65.0313,380.6093 64.8281,380.8124 C64.3906,381.2499 64.3906,381.2499 64.2188,381.3437 C63.7656,381.5781 63.125,381.7187 62.3594,381.7187 C60.3594,381.7187 59.0781,380.7031 59.0781,379.1249 L59.0781,378.0781 C59.0781,376.3749 60.2969,375.1718 62,375.1718 C62.5781,375.1718 63.1563,375.3124 63.625,375.5624 C64.0938,375.8281 64.2656,376.0156 64.3281,376.3749 C64.4531,377.0468 64.7031,377.2968 65.2344,377.2968 C65.5156,377.2968 65.7969,377.1562 65.9844,376.9374 C66.1094,376.7656 66.1563,376.5937 66.1563,376.1562 L66.1563,374.7968 C66.1563,374.3749 66.1406,374.2343 66.0156,374.0624 C65.8438,373.8124 65.5625,373.6562 65.2344,373.6562 C64.9219,373.6562 64.7188,373.7656 64.5,374.0312 C63.3281,373.5312 62.8906,373.4218 61.9375,373.4218 C59.2656,373.4218 57.25,375.4374 57.25,378.0624 L57.25,379.1562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="82.75" y="382.6059">BB</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="143" y1="393.9999" y2="393.9999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="143" y1="401.9999" y2="401.9999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="410.8999"/>
-          <ellipse cx="18" cy="415.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="27" y="419.0059">b : std::vector&lt;B&gt;</text>
-        </a>
-      </g>
+    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="24.5" y="16.708">AAA context of radius 1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="330.4531"/>
+      <ellipse cx="59.75" cy="346.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M62.7188,352.0938 Q62.1406,352.3906 61.5,352.5313 Q60.8594,352.6875 60.1563,352.6875 Q57.6563,352.6875 56.3281,351.0469 Q55.0156,349.3906 55.0156,346.2656 Q55.0156,343.1406 56.3281,341.4844 Q57.6563,339.8281 60.1563,339.8281 Q60.8594,339.8281 61.5,339.9844 Q62.1563,340.1406 62.7188,340.4375 L62.7188,343.1563 Q62.0938,342.5781 61.5,342.3125 Q60.9063,342.0313 60.2813,342.0313 Q58.9375,342.0313 58.25,343.1094 Q57.5625,344.1719 57.5625,346.2656 Q57.5625,348.3594 58.25,349.4375 Q58.9375,350.5 60.2813,350.5 Q60.9063,350.5 61.5,350.2344 Q62.0938,349.9531 62.7188,349.375 L62.7188,352.0938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="80.25" y="350.6074">BB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="362.4531" y2="362.4531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="370.4531" y2="370.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
-      <g id="elem_C_0001888428536574868284">
-        <rect codeLine="8" fill="#F1F1F1" height="98.3998" id="C_0001888428536574868284" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="69" x="179" y="345.1999"/>
-        <ellipse cx="194" cy="361.1999" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M192.8594,362.2624 L194.1719,362.2624 L194.1719,362.3093 C194.1719,362.7156 194.1875,362.8718 194.2969,363.0281 C194.4688,363.2781 194.7656,363.4499 195.0781,363.4499 C195.3594,363.4499 195.6563,363.3093 195.8281,363.0906 C195.9531,362.9031 196,362.7624 196,362.3093 L196,360.4656 C196,360.1374 195.9844,360.0281 195.9219,359.8562 C195.8125,359.5593 195.4531,359.3093 195.0781,359.3093 C194.7813,359.3093 194.5156,359.4499 194.3438,359.6687 C194.2031,359.8562 194.1719,360.0281 194.1719,360.4656 L194.1719,360.5281 L192.8594,360.5281 L192.8594,358.3562 L196.7031,358.3562 L196.7031,359.1062 C196.7031,359.4968 196.7344,359.6843 196.8438,359.8406 C197.0156,360.0906 197.3125,360.2624 197.625,360.2624 C197.9219,360.2624 198.1875,360.1374 198.375,359.9031 C198.5156,359.7156 198.5469,359.5749 198.5469,359.1062 L198.5469,356.6062 L190.8438,356.6062 C190.3906,356.6062 190.2656,356.6218 190.0938,356.7312 C189.8281,356.9031 189.6563,357.1687 189.6563,357.4812 C189.6563,357.7624 189.7813,358.0281 190.0313,358.1999 C190.2188,358.3249 190.4063,358.3562 190.8438,358.3562 L191.0313,358.3562 L191.0313,364.4499 L190.8438,364.4499 C190.4219,364.4499 190.2656,364.4812 190.0938,364.5749 C189.8281,364.7312 189.6563,365.0124 189.6563,365.3093 C189.6563,365.8874 190.0625,366.1999 190.8438,366.1999 L198.9219,366.1999 L198.9219,363.6687 C198.9219,363.2624 198.8906,363.0906 198.7813,362.9343 C198.6094,362.6687 198.3281,362.5124 198,362.5124 C197.7188,362.5124 197.4375,362.6531 197.25,362.8718 C197.1094,363.0593 197.0781,363.2156 197.0781,363.6687 L197.0781,364.4499 L192.8594,364.4499 L192.8594,362.2624 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="208" y="365.8059">AKind</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="180" x2="247" y1="377.1999" y2="377.1999"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="185" y="394.2059">OneA</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="185" y="411.0058">TwoA</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="185" y="427.8057">ThreeA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="180" x2="247" y1="435.5997" y2="435.5997"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="376.4531"/>
+      <ellipse cx="17" cy="381.4531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <g id="elem_C_0000577981285610429577">
-        <rect codeLine="14" fill="#F1F1F1" height="48" id="C_0000577981285610429577" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="65.5" y="53.1999"/>
-        <ellipse cx="80.5" cy="69.1999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M75.5,70.3562 C75.5,72.8562 77.6406,74.6687 80.5625,74.6687 C81.7969,74.6687 82.9688,74.3718 83.7188,73.8562 C84.3281,73.4343 84.6563,73.0124 84.6563,72.6062 C84.6563,72.1374 84.2344,71.7312 83.7344,71.7312 C83.5,71.7312 83.2813,71.8093 83.0781,72.0124 C82.6406,72.4499 82.6406,72.4499 82.4688,72.5437 C82.0156,72.7781 81.375,72.9187 80.6094,72.9187 C78.6094,72.9187 77.3281,71.9031 77.3281,70.3249 L77.3281,69.2781 C77.3281,67.5749 78.5469,66.3718 80.25,66.3718 C80.8281,66.3718 81.4063,66.5124 81.875,66.7624 C82.3438,67.0281 82.5156,67.2156 82.5781,67.5749 C82.7031,68.2468 82.9531,68.4968 83.4844,68.4968 C83.7656,68.4968 84.0469,68.3562 84.2344,68.1374 C84.3594,67.9656 84.4063,67.7937 84.4063,67.3562 L84.4063,65.9968 C84.4063,65.5749 84.3906,65.4343 84.2656,65.2624 C84.0938,65.0124 83.8125,64.8562 83.4844,64.8562 C83.1719,64.8562 82.9688,64.9656 82.75,65.2312 C81.5781,64.7312 81.1406,64.6218 80.1875,64.6218 C77.5156,64.6218 75.5,66.6374 75.5,69.2624 L75.5,70.3562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="94.5" y="73.8059">AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="66.5" x2="114.5" y1="85.1999" y2="85.1999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="66.5" x2="114.5" y1="93.1999" y2="93.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="384.6636">b : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <g id="elem_C_0001484819281509619918">
-        <rect codeLine="18" fill="#F1F1F1" height="81.5999" id="C_0001484819281509619918" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="90" y="186.5999"/>
-        <ellipse cx="127.5" cy="202.5999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M122.5,203.7562 C122.5,206.2562 124.6406,208.0687 127.5625,208.0687 C128.7969,208.0687 129.9688,207.7718 130.7188,207.2562 C131.3281,206.8343 131.6563,206.4124 131.6563,206.0062 C131.6563,205.5374 131.2344,205.1312 130.7344,205.1312 C130.5,205.1312 130.2813,205.2093 130.0781,205.4124 C129.6406,205.8499 129.6406,205.8499 129.4688,205.9437 C129.0156,206.1781 128.375,206.3187 127.6094,206.3187 C125.6094,206.3187 124.3281,205.3031 124.3281,203.7249 L124.3281,202.6781 C124.3281,200.9749 125.5469,199.7718 127.25,199.7718 C127.8281,199.7718 128.4063,199.9124 128.875,200.1624 C129.3438,200.4281 129.5156,200.6156 129.5781,200.9749 C129.7031,201.6468 129.9531,201.8968 130.4844,201.8968 C130.7656,201.8968 131.0469,201.7562 131.2344,201.5374 C131.3594,201.3656 131.4063,201.1937 131.4063,200.7562 L131.4063,199.3968 C131.4063,198.9749 131.3906,198.8343 131.2656,198.6624 C131.0938,198.4124 130.8125,198.2562 130.4844,198.2562 C130.1719,198.2562 129.9688,198.3656 129.75,198.6312 C128.5781,198.1312 128.1406,198.0218 127.1875,198.0218 C124.5156,198.0218 122.5,200.0374 122.5,202.6624 L122.5,203.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="146.5" y="207.2059">AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="198" y1="218.5999" y2="218.5999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="198" y1="226.5999" y2="226.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="235.4999"/>
-          <ellipse cx="101" cy="240.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="110" y="243.6059">akind : AKind</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="252.2998"/>
-          <ellipse cx="101" cy="257.2998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="110" y="260.4058">bb : BB *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="317.9531"/>
+      <ellipse cx="188" cy="333.9531" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M192.1094,339.9531 L184.3906,339.9531 L184.3906,327.5625 L192.1094,327.5625 L192.1094,329.7188 L186.8438,329.7188 L186.8438,332.3906 L191.6094,332.3906 L191.6094,334.5469 L186.8438,334.5469 L186.8438,337.7969 L192.1094,337.7969 L192.1094,339.9531 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="34" x="202" y="338.1074">AKind</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="349.9531" y2="349.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="364.1636">OneA</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="376.9683">TwoA</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="179" y="389.7729">ThreeA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="396.3672" y2="396.3672"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000999621481464424961">
-        <rect codeLine="24" fill="#F1F1F1" height="64.7999" id="C_0000999621481464424961" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="98" x="150.5" y="44.7999"/>
-        <ellipse cx="190.7" cy="60.7999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M185.7,61.9562 C185.7,64.4562 187.8406,66.2687 190.7625,66.2687 C191.9969,66.2687 193.1688,65.9718 193.9188,65.4562 C194.5281,65.0343 194.8563,64.6124 194.8563,64.2062 C194.8563,63.7374 194.4344,63.3312 193.9344,63.3312 C193.7,63.3312 193.4813,63.4093 193.2781,63.6124 C192.8406,64.0499 192.8406,64.0499 192.6688,64.1437 C192.2156,64.3781 191.575,64.5187 190.8094,64.5187 C188.8094,64.5187 187.5281,63.5031 187.5281,61.9249 L187.5281,60.8781 C187.5281,59.1749 188.7469,57.9718 190.45,57.9718 C191.0281,57.9718 191.6063,58.1124 192.075,58.3624 C192.5438,58.6281 192.7156,58.8156 192.7781,59.1749 C192.9031,59.8468 193.1531,60.0968 193.6844,60.0968 C193.9656,60.0968 194.2469,59.9562 194.4344,59.7374 C194.5594,59.5656 194.6063,59.3937 194.6063,58.9562 L194.6063,57.5968 C194.6063,57.1749 194.5906,57.0343 194.4656,56.8624 C194.2938,56.6124 194.0125,56.4562 193.6844,56.4562 C193.3719,56.4562 193.1688,56.5656 192.95,56.8312 C191.7781,56.3312 191.3406,56.2218 190.3875,56.2218 C187.7156,56.2218 185.7,58.2374 185.7,60.8624 L185.7,61.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="210.3" y="65.4059">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="247.5" y1="76.7999" y2="76.7999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="151.5" x2="247.5" y1="84.7999" y2="84.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="156.5" y="93.6999"/>
-          <ellipse cx="161.5" cy="98.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="170.5" y="101.8059">aaa : AAA *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="35.4531"/>
+      <ellipse cx="78" cy="51.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M80.9688,57.0938 Q80.3906,57.3906 79.75,57.5313 Q79.1094,57.6875 78.4063,57.6875 Q75.9063,57.6875 74.5781,56.0469 Q73.2656,54.3906 73.2656,51.2656 Q73.2656,48.1406 74.5781,46.4844 Q75.9063,44.8281 78.4063,44.8281 Q79.1094,44.8281 79.75,44.9844 Q80.4063,45.1406 80.9688,45.4375 L80.9688,48.1563 Q80.3438,47.5781 79.75,47.3125 Q79.1563,47.0313 78.5313,47.0313 Q77.1875,47.0313 76.5,48.1094 Q75.8125,49.1719 75.8125,51.2656 Q75.8125,53.3594 76.5,54.4375 Q77.1875,55.5 78.5313,55.5 Q79.1563,55.5 79.75,55.2344 Q80.3438,54.9531 80.9688,54.375 L80.9688,57.0938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="92" y="55.6074">AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="67.4531" y2="67.4531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="75.4531" y2="75.4531"/>
     </a>
-    <g id="link_C_0001484819281509619918_C_0001427649116338755656">
-      <path codeLine="28" d="M127.8,268.3399 C115.83,296.9499 102.2439,329.4341 91.1339,356.0141 " fill="none" id="C_0001484819281509619918-to-C_0001427649116338755656" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="88.82,361.5499,95.9814,354.7887,90.7483,356.9367,88.6003,351.7035,88.82,361.5499" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="120.5" cy="307.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="127.5" y="311.2769">bb</text>
-    </g>
-    <g id="link_C_0001484819281509619918_C_0001888428536574868284">
-      <path codeLine="29" d="M165.829,279.4112 C175.479,302.4912 183.07,320.6199 193.26,344.9999 " fill="none" id="C_0001484819281509619918-backto-C_0001888428536574868284" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="161.2,268.3399,159.8241,275.4185,165.829,279.4112,167.2049,272.3325,161.2,268.3399" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="184.5" cy="307.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="191.5" y="311.2769">akind</text>
-    </g>
-    <g id="link_C_0000577981285610429577_C_0001484819281509619918">
-      <path codeLine="30" d="M105.2174,118.594 C113.4774,141.284 120.01,159.1899 129.88,186.2799 " fill="none" id="C_0000577981285610429577-backto-C_0001484819281509619918" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="99.06,101.6799,99.5793,120.6465,110.8554,116.5416,99.06,101.6799" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000999621481464424961_C_0001484819281509619918">
-      <path codeLine="31" d="M187.7,109.9899 C179.43,132.2799 170.3966,156.6145 161.5166,180.5545 " fill="none" id="C_0000999621481464424961-to-C_0001484819281509619918" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="159.43,186.1799,166.3103,179.1328,161.1689,181.492,158.8096,176.3506,159.43,186.1799" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="180.5" cy="148.8999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="187.5" y="152.6769">aaa</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="166.9531"/>
+      <ellipse cx="123.85" cy="182.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M126.8188,188.5938 Q126.2406,188.8906 125.6,189.0313 Q124.9594,189.1875 124.2563,189.1875 Q121.7563,189.1875 120.4281,187.5469 Q119.1156,185.8906 119.1156,182.7656 Q119.1156,179.6406 120.4281,177.9844 Q121.7563,176.3281 124.2563,176.3281 Q124.9594,176.3281 125.6,176.4844 Q126.2563,176.6406 126.8188,176.9375 L126.8188,179.6563 Q126.1938,179.0781 125.6,178.8125 Q125.0063,178.5313 124.3813,178.5313 Q123.0375,178.5313 122.35,179.6094 Q121.6625,180.6719 121.6625,182.7656 Q121.6625,184.8594 122.35,185.9375 Q123.0375,187 124.3813,187 Q125.0063,187 125.6,186.7344 Q126.1938,186.4531 126.8188,185.875 L126.8188,188.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="142.15" y="187.1074">AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="198.9531" y2="198.9531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="206.9531" y2="206.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="212.9531"/>
+      <ellipse cx="100.5" cy="217.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="109.5" y="221.1636">akind : AKind</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="225.7578"/>
+      <ellipse cx="100.5" cy="230.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="109.5" y="233.9683">bb : BB *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="146" y="28.9531"/>
+      <ellipse cx="183.5" cy="44.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M186.4688,50.5938 Q185.8906,50.8906 185.25,51.0313 Q184.6094,51.1875 183.9063,51.1875 Q181.4063,51.1875 180.0781,49.5469 Q178.7656,47.8906 178.7656,44.7656 Q178.7656,41.6406 180.0781,39.9844 Q181.4063,38.3281 183.9063,38.3281 Q184.6094,38.3281 185.25,38.4844 Q185.9063,38.6406 186.4688,38.9375 L186.4688,41.6563 Q185.8438,41.0781 185.25,40.8125 Q184.6563,40.5313 184.0313,40.5313 Q182.6875,40.5313 182,41.6094 Q181.3125,42.6719 181.3125,44.7656 Q181.3125,46.8594 182,47.9375 Q182.6875,49 184.0313,49 Q184.6563,49 185.25,48.7344 Q185.8438,48.4531 186.4688,47.875 L186.4688,50.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="202.5" y="49.1074">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="147" x2="235" y1="60.9531" y2="60.9531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="147" x2="235" y1="68.9531" y2="68.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="152" y="74.9531"/>
+      <ellipse cx="157" cy="79.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="64" x="166" y="83.1636">aaa : AAA *</text>
+    </a>
+    <path d="M123.29,241.2931 C112.3,266.7131 97.72,300.4531 86.91,325.4531 " fill="none" id="C_0001484819281509619918-&gt;C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="84.8,330.3331,92.0469,323.6637,86.7868,325.7448,84.7057,320.4847,84.8,330.3331" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="116" cy="280.0195" 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="123" y="284.02">bb</text>
+    <path d="M159.92,253.3531 C168.85,274.0031 179.17,297.8831 187.78,317.8031 " fill="none" id="C_0001484819281509619918&lt;-C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="154.71,241.2931,153.4195,248.3878,159.472,252.3078,160.7626,245.2131,154.71,241.2931" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="180" cy="280.0195" 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="34" x="187" y="284.02">akind</text>
+    <path d="M102.35,102.5131 C109.82,122.9831 118.7,147.3331 125.85,166.9331 " fill="none" id="C_0000577981285610429577&lt;-C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="95.75,104.8531,95.47,83.6631,108.9,100.0531,95.75,104.8531" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M180.23,89.9831 C172.62,110.8331 162.32,139.0531 153.92,162.0631 " fill="none" id="C_0000999621481464424961-&gt;C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="152.16,166.8931,159.0018,159.8086,153.8733,162.1958,151.4861,157.0673,152.16,166.8931" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="174" cy="129.0195" 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="181" y="133.02">aaa</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00068_r1_class_mermaid.svg b/docs/test_cases/t00068_r1_class_mermaid.svg
index b28fe765..8018a8ad 100644
--- a/docs/test_cases/t00068_r1_class_mermaid.svg
+++ b/docs/test_cases/t00068_r1_class_mermaid.svg
@@ -1,64 +1,60 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 337.5 526" style="max-width: 337.5px; background-color: white;" width="337.5" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 337.5 526" style="max-width: 337.5px; background-color: white;" width="337.5" id="my-svg">
+  <title id="chart-title-my-svg">AAA context of radius 1</title>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M120.2448224852071,256L114.01651873767258,261.6666666666667C107.78821499013806,267.3333333333333,95.33160749506904,278.6666666666667,89.10330374753453,294.5C82.875,310.3333333333333,82.875,330.6666666666667,82.875,340.8333333333333L82.875,351"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M244.5692327868808,268.1134607859104L248.57852732240067,271.76121732159197C252.58782185792052,275.40897385727357,260.60641092896026,282.70448692863675,264.61570546448013,292.01891013098503C268.625,301.3333333333333,268.625,312.6666666666667,268.625,318.3333333333333L268.625,324"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M117.2734375,94L117.2734375,98.5C117.2734375,103,117.2734375,112,121.19494267751479,122.16666666666667C125.11644785502959,132.33333333333334,132.95945821005918,143.66666666666666,136.88096338757396,149.33333333333334L140.80246856508876,155"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M234.2265625,87L234.2265625,92.66666666666667C234.2265625,98.33333333333333,234.2265625,109.66666666666667,230.87411311026017,120.17770108208765C227.52166372052034,130.68873549750865,220.81676494104067,140.37747099501726,217.46431555130084,145.2218387437716L214.11186616156098,150.0662064925259"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M120.2448224852071,256L114.01651873767258,261.6666666666667C107.78821499013806,267.3333333333333,95.33160749506904,278.6666666666667,89.10330374753453,295.5C82.875,312.3333333333333,82.875,334.6666666666667,82.875,345.8333333333333L82.875,357"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M231.2551775147929,256L237.48348126232744,261.6666666666667C243.71178500986193,267.3333333333333,256.168392504931,278.6666666666667,262.39669625246546,290C268.625,301.3333333333333,268.625,312.6666666666667,268.625,318.3333333333333L268.625,324"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M117.2734375,76L117.2734375,83.5C117.2734375,91,117.2734375,106,121.19494267751479,119.16666666666667C125.11644785502959,132.33333333333334,132.95945821005918,143.66666666666666,136.88096338757396,149.33333333333334L140.80246856508876,155"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M234.2265625,87L234.2265625,92.66666666666667C234.2265625,98.33333333333333,234.2265625,109.66666666666667,230.30505732248523,121C226.38355214497042,132.33333333333334,218.54054178994082,143.66666666666666,214.61903661242604,149.33333333333334L210.69753143491124,155"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(82.875, 290)" class="edgeLabel">
@@ -105,7 +101,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9">
+        <a transform="translate(82.875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9">
           <g title="BB" id="classId-C_0001427649116338755656-0" class="node default clickable">
             <rect height="79" width="149.75" y="-39.5" x="-74.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -129,7 +125,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.625, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13">
+        <a transform="translate(268.625, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13">
           <g title="AKind" id="classId-C_0001888428536574868284-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -163,7 +159,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17">
+        <a transform="translate(117.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17">
           <g title="AA" id="classId-C_0000577981285610429577-2" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -182,7 +178,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.75, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19">
+        <a transform="translate(175.75, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-3" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -205,13 +201,13 @@
               </foreignObject>
               <foreignObject transform="translate( -51.375, 13)" height="18" width="61.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+bb : BB</span>
+                  <span style="font-style:italic;" class="nodeLabel">+bb : BB </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(234.2265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24">
+        <a transform="translate(234.2265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24">
           <g title="R" id="classId-C_0000999621481464424961-4" class="node default clickable">
             <rect height="79" width="95.796875" y="-39.5" x="-47.8984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="47.8984375" x1="-47.8984375" class="divider"/>
@@ -229,7 +225,7 @@
               </foreignObject>
               <foreignObject transform="translate( -40.3984375, 2)" height="18" width="80.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+aaa : AAA</span>
+                  <span style="font-style:italic;" class="nodeLabel">+aaa : AAA </span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00068_r2_class.svg b/docs/test_cases/t00068_r2_class.svg
index a6a545b5..5ca2ba3c 100644
--- a/docs/test_cases/t00068_r2_class.svg
+++ b/docs/test_cases/t00068_r2_class.svg
@@ -1,162 +1,138 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="717px" preserveAspectRatio="none" style="width:310px;height:717px;background:#FFFFFF;" version="1.1" viewBox="0 0 310 717" width="310px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="677px" preserveAspectRatio="none" style="width:301px;height:677px;" version="1.1" viewBox="0 0 301 677" width="301px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1a3k7smt3p4br" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="163" x="66.5" y="23.0059">AAA context of radius 2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0000359183874441719256">
-        <rect codeLine="3" fill="#F1F1F1" height="48" id="C_0000359183874441719256" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="55" y="662.3999"/>
-        <ellipse cx="70" cy="678.3999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M65,679.5562 C65,682.0562 67.1406,683.8687 70.0625,683.8687 C71.2969,683.8687 72.4688,683.5718 73.2188,683.0562 C73.8281,682.6343 74.1563,682.2124 74.1563,681.8062 C74.1563,681.3374 73.7344,680.9312 73.2344,680.9312 C73,680.9312 72.7813,681.0093 72.5781,681.2124 C72.1406,681.6499 72.1406,681.6499 71.9688,681.7437 C71.5156,681.9781 70.875,682.1187 70.1094,682.1187 C68.1094,682.1187 66.8281,681.1031 66.8281,679.5249 L66.8281,678.4781 C66.8281,676.7749 68.0469,675.5718 69.75,675.5718 C70.3281,675.5718 70.9063,675.7124 71.375,675.9624 C71.8438,676.2281 72.0156,676.4156 72.0781,676.7749 C72.2031,677.4468 72.4531,677.6968 72.9844,677.6968 C73.2656,677.6968 73.5469,677.5562 73.7344,677.3374 C73.8594,677.1656 73.9063,676.9937 73.9063,676.5562 L73.9063,675.1968 C73.9063,674.7749 73.8906,674.6343 73.7656,674.4624 C73.5938,674.2124 73.3125,674.0562 72.9844,674.0562 C72.6719,674.0562 72.4688,674.1656 72.25,674.4312 C71.0781,673.9312 70.6406,673.8218 69.6875,673.8218 C67.0156,673.8218 65,675.8374 65,678.4624 L65,679.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="84" y="683.0059">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="56" x2="95" y1="694.3999" y2="694.3999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="56" x2="95" y1="702.3999" y2="702.3999"/>
-      </g>
+    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="50" y="16.708">AAA context of radius 2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="48" id="C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="52" y="618.9531"/>
+      <ellipse cx="67" cy="634.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M69.9688,640.5938 Q69.3906,640.8906 68.75,641.0313 Q68.1094,641.1875 67.4063,641.1875 Q64.9063,641.1875 63.5781,639.5469 Q62.2656,637.8906 62.2656,634.7656 Q62.2656,631.6406 63.5781,629.9844 Q64.9063,628.3281 67.4063,628.3281 Q68.1094,628.3281 68.75,628.4844 Q69.4063,628.6406 69.9688,628.9375 L69.9688,631.6563 Q69.3438,631.0781 68.75,630.8125 Q68.1563,630.5313 67.5313,630.5313 Q66.1875,630.5313 65.5,631.6094 Q64.8125,632.6719 64.8125,634.7656 Q64.8125,636.8594 65.5,637.9375 Q66.1875,639 67.5313,639 Q68.1563,639 68.75,638.7344 Q69.3438,638.4531 69.9688,637.875 L69.9688,640.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="81" y="639.1074">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="53" x2="91" y1="650.9531" y2="650.9531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="53" x2="91" y1="658.9531" y2="658.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <g id="elem_C_0001427649116338755656">
-        <rect codeLine="7" fill="#F1F1F1" height="64.7999" id="C_0001427649116338755656" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="7" y="503.7999"/>
-        <ellipse cx="62.25" cy="519.7999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M57.25,520.9562 C57.25,523.4562 59.3906,525.2687 62.3125,525.2687 C63.5469,525.2687 64.7188,524.9718 65.4688,524.4562 C66.0781,524.0343 66.4063,523.6124 66.4063,523.2062 C66.4063,522.7374 65.9844,522.3312 65.4844,522.3312 C65.25,522.3312 65.0313,522.4093 64.8281,522.6124 C64.3906,523.0499 64.3906,523.0499 64.2188,523.1437 C63.7656,523.3781 63.125,523.5187 62.3594,523.5187 C60.3594,523.5187 59.0781,522.5031 59.0781,520.9249 L59.0781,519.8781 C59.0781,518.1749 60.2969,516.9718 62,516.9718 C62.5781,516.9718 63.1563,517.1124 63.625,517.3624 C64.0938,517.6281 64.2656,517.8156 64.3281,518.1749 C64.4531,518.8468 64.7031,519.0968 65.2344,519.0968 C65.5156,519.0968 65.7969,518.9562 65.9844,518.7374 C66.1094,518.5656 66.1563,518.3937 66.1563,517.9562 L66.1563,516.5968 C66.1563,516.1749 66.1406,516.0343 66.0156,515.8624 C65.8438,515.6124 65.5625,515.4562 65.2344,515.4562 C64.9219,515.4562 64.7188,515.5656 64.5,515.8312 C63.3281,515.3312 62.8906,515.2218 61.9375,515.2218 C59.2656,515.2218 57.25,517.2374 57.25,519.8624 L57.25,520.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="82.75" y="524.4059">BB</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="143" y1="535.7999" y2="535.7999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="143" y1="543.7999" y2="543.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="552.6999"/>
-          <ellipse cx="18" cy="557.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="27" y="560.8059">b : std::vector&lt;B&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="468.4531"/>
+      <ellipse cx="59.75" cy="484.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M62.7188,490.0938 Q62.1406,490.3906 61.5,490.5313 Q60.8594,490.6875 60.1563,490.6875 Q57.6563,490.6875 56.3281,489.0469 Q55.0156,487.3906 55.0156,484.2656 Q55.0156,481.1406 56.3281,479.4844 Q57.6563,477.8281 60.1563,477.8281 Q60.8594,477.8281 61.5,477.9844 Q62.1563,478.1406 62.7188,478.4375 L62.7188,481.1563 Q62.0938,480.5781 61.5,480.3125 Q60.9063,480.0313 60.2813,480.0313 Q58.9375,480.0313 58.25,481.1094 Q57.5625,482.1719 57.5625,484.2656 Q57.5625,486.3594 58.25,487.4375 Q58.9375,488.5 60.2813,488.5 Q60.9063,488.5 61.5,488.2344 Q62.0938,487.9531 62.7188,487.375 L62.7188,490.0938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="80.25" y="488.6074">BB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="500.4531" y2="500.4531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="508.4531" y2="508.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
-      <g id="elem_C_0001888428536574868284">
-        <rect codeLine="12" fill="#F1F1F1" height="98.3998" id="C_0001888428536574868284" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="69" x="179" y="486.9999"/>
-        <ellipse cx="194" cy="502.9999" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M192.8594,504.0624 L194.1719,504.0624 L194.1719,504.1093 C194.1719,504.5156 194.1875,504.6718 194.2969,504.8281 C194.4688,505.0781 194.7656,505.2499 195.0781,505.2499 C195.3594,505.2499 195.6563,505.1093 195.8281,504.8906 C195.9531,504.7031 196,504.5624 196,504.1093 L196,502.2656 C196,501.9374 195.9844,501.8281 195.9219,501.6562 C195.8125,501.3593 195.4531,501.1093 195.0781,501.1093 C194.7813,501.1093 194.5156,501.2499 194.3438,501.4687 C194.2031,501.6562 194.1719,501.8281 194.1719,502.2656 L194.1719,502.3281 L192.8594,502.3281 L192.8594,500.1562 L196.7031,500.1562 L196.7031,500.9062 C196.7031,501.2968 196.7344,501.4843 196.8438,501.6406 C197.0156,501.8906 197.3125,502.0624 197.625,502.0624 C197.9219,502.0624 198.1875,501.9374 198.375,501.7031 C198.5156,501.5156 198.5469,501.3749 198.5469,500.9062 L198.5469,498.4062 L190.8438,498.4062 C190.3906,498.4062 190.2656,498.4218 190.0938,498.5312 C189.8281,498.7031 189.6563,498.9687 189.6563,499.2812 C189.6563,499.5624 189.7813,499.8281 190.0313,499.9999 C190.2188,500.1249 190.4063,500.1562 190.8438,500.1562 L191.0313,500.1562 L191.0313,506.2499 L190.8438,506.2499 C190.4219,506.2499 190.2656,506.2812 190.0938,506.3749 C189.8281,506.5312 189.6563,506.8124 189.6563,507.1093 C189.6563,507.6874 190.0625,507.9999 190.8438,507.9999 L198.9219,507.9999 L198.9219,505.4687 C198.9219,505.0624 198.8906,504.8906 198.7813,504.7343 C198.6094,504.4687 198.3281,504.3124 198,504.3124 C197.7188,504.3124 197.4375,504.4531 197.25,504.6718 C197.1094,504.8593 197.0781,505.0156 197.0781,505.4687 L197.0781,506.2499 L192.8594,506.2499 L192.8594,504.0624 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37" x="208" y="507.6059">AKind</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="180" x2="247" y1="518.9999" y2="518.9999"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="185" y="536.0059">OneA</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="185" y="552.8058">TwoA</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="185" y="569.6057">ThreeA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="180" x2="247" y1="577.3997" y2="577.3997"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="514.4531"/>
+      <ellipse cx="17" cy="519.4531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0001297439817144700057">
-        <rect codeLine="18" fill="#F1F1F1" height="48" id="C_0001297439817144700057" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="62" y="53.1999"/>
-        <ellipse cx="77" cy="69.1999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M72,70.3562 C72,72.8562 74.1406,74.6687 77.0625,74.6687 C78.2969,74.6687 79.4688,74.3718 80.2188,73.8562 C80.8281,73.4343 81.1563,73.0124 81.1563,72.6062 C81.1563,72.1374 80.7344,71.7312 80.2344,71.7312 C80,71.7312 79.7813,71.8093 79.5781,72.0124 C79.1406,72.4499 79.1406,72.4499 78.9688,72.5437 C78.5156,72.7781 77.875,72.9187 77.1094,72.9187 C75.1094,72.9187 73.8281,71.9031 73.8281,70.3249 L73.8281,69.2781 C73.8281,67.5749 75.0469,66.3718 76.75,66.3718 C77.3281,66.3718 77.9063,66.5124 78.375,66.7624 C78.8438,67.0281 79.0156,67.2156 79.0781,67.5749 C79.2031,68.2468 79.4531,68.4968 79.9844,68.4968 C80.2656,68.4968 80.5469,68.3562 80.7344,68.1374 C80.8594,67.9656 80.9063,67.7937 80.9063,67.3562 L80.9063,65.9968 C80.9063,65.5749 80.8906,65.4343 80.7656,65.2624 C80.5938,65.0124 80.3125,64.8562 79.9844,64.8562 C79.6719,64.8562 79.4688,64.9656 79.25,65.2312 C78.0781,64.7312 77.6406,64.6218 76.6875,64.6218 C74.0156,64.6218 72,66.6374 72,69.2624 L72,70.3562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="91" y="73.8059">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="63" x2="102" y1="85.1999" y2="85.1999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="63" x2="102" y1="93.1999" y2="93.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="522.6636">b : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <g id="elem_C_0000577981285610429577">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0000577981285610429577" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="65.5" y="194.9999"/>
-        <ellipse cx="80.5" cy="210.9999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M75.5,212.1562 C75.5,214.6562 77.6406,216.4687 80.5625,216.4687 C81.7969,216.4687 82.9688,216.1718 83.7188,215.6562 C84.3281,215.2343 84.6563,214.8124 84.6563,214.4062 C84.6563,213.9374 84.2344,213.5312 83.7344,213.5312 C83.5,213.5312 83.2813,213.6093 83.0781,213.8124 C82.6406,214.2499 82.6406,214.2499 82.4688,214.3437 C82.0156,214.5781 81.375,214.7187 80.6094,214.7187 C78.6094,214.7187 77.3281,213.7031 77.3281,212.1249 L77.3281,211.0781 C77.3281,209.3749 78.5469,208.1718 80.25,208.1718 C80.8281,208.1718 81.4063,208.3124 81.875,208.5624 C82.3438,208.8281 82.5156,209.0156 82.5781,209.3749 C82.7031,210.0468 82.9531,210.2968 83.4844,210.2968 C83.7656,210.2968 84.0469,210.1562 84.2344,209.9374 C84.3594,209.7656 84.4063,209.5937 84.4063,209.1562 L84.4063,207.7968 C84.4063,207.3749 84.3906,207.2343 84.2656,207.0624 C84.0938,206.8124 83.8125,206.6562 83.4844,206.6562 C83.1719,206.6562 82.9688,206.7656 82.75,207.0312 C81.5781,206.5312 81.1406,206.4218 80.1875,206.4218 C77.5156,206.4218 75.5,208.4374 75.5,211.0624 L75.5,212.1562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="94.5" y="215.6059">AA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="66.5" x2="114.5" y1="226.9999" y2="226.9999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="66.5" x2="114.5" y1="234.9999" y2="234.9999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="455.9531"/>
+      <ellipse cx="188" cy="471.9531" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M192.1094,477.9531 L184.3906,477.9531 L184.3906,465.5625 L192.1094,465.5625 L192.1094,467.7188 L186.8438,467.7188 L186.8438,470.3906 L191.6094,470.3906 L191.6094,472.5469 L186.8438,472.5469 L186.8438,475.7969 L192.1094,475.7969 L192.1094,477.9531 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="34" x="202" y="476.1074">AKind</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="487.9531" y2="487.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="502.1636">OneA</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="514.9683">TwoA</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="179" y="527.7729">ThreeA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="534.3672" y2="534.3672"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <g id="elem_C_0001484819281509619918">
-        <rect codeLine="26" fill="#F1F1F1" height="81.5999" id="C_0001484819281509619918" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="109" x="90" y="328.3999"/>
-        <ellipse cx="127.5" cy="344.3999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M122.5,345.5562 C122.5,348.0562 124.6406,349.8687 127.5625,349.8687 C128.7969,349.8687 129.9688,349.5718 130.7188,349.0562 C131.3281,348.6343 131.6563,348.2124 131.6563,347.8062 C131.6563,347.3374 131.2344,346.9312 130.7344,346.9312 C130.5,346.9312 130.2813,347.0093 130.0781,347.2124 C129.6406,347.6499 129.6406,347.6499 129.4688,347.7437 C129.0156,347.9781 128.375,348.1187 127.6094,348.1187 C125.6094,348.1187 124.3281,347.1031 124.3281,345.5249 L124.3281,344.4781 C124.3281,342.7749 125.5469,341.5718 127.25,341.5718 C127.8281,341.5718 128.4063,341.7124 128.875,341.9624 C129.3438,342.2281 129.5156,342.4156 129.5781,342.7749 C129.7031,343.4468 129.9531,343.6968 130.4844,343.6968 C130.7656,343.6968 131.0469,343.5562 131.2344,343.3374 C131.3594,343.1656 131.4063,342.9937 131.4063,342.5562 L131.4063,341.1968 C131.4063,340.7749 131.3906,340.6343 131.2656,340.4624 C131.0938,340.2124 130.8125,340.0562 130.4844,340.0562 C130.1719,340.0562 129.9688,340.1656 129.75,340.4312 C128.5781,339.9312 128.1406,339.8218 127.1875,339.8218 C124.5156,339.8218 122.5,341.8374 122.5,344.4624 L122.5,345.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="146.5" y="349.0059">AAA</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="198" y1="360.3999" y2="360.3999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="91" x2="198" y1="368.3999" y2="368.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="377.2999"/>
-          <ellipse cx="101" cy="382.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="110" y="385.4059">akind : AKind</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="96" y="394.0998"/>
-          <ellipse cx="101" cy="399.0998" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="55" x="110" y="402.2058">bb : BB *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="48" id="C_0001297439817144700057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="59" y="35.4531"/>
+      <ellipse cx="74" cy="51.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M76.9688,57.0938 Q76.3906,57.3906 75.75,57.5313 Q75.1094,57.6875 74.4063,57.6875 Q71.9063,57.6875 70.5781,56.0469 Q69.2656,54.3906 69.2656,51.2656 Q69.2656,48.1406 70.5781,46.4844 Q71.9063,44.8281 74.4063,44.8281 Q75.1094,44.8281 75.75,44.9844 Q76.4063,45.1406 76.9688,45.4375 L76.9688,48.1563 Q76.3438,47.5781 75.75,47.3125 Q75.1563,47.0313 74.5313,47.0313 Q73.1875,47.0313 72.5,48.1094 Q71.8125,49.1719 71.8125,51.2656 Q71.8125,53.3594 72.5,54.4375 Q73.1875,55.5 74.5313,55.5 Q75.1563,55.5 75.75,55.2344 Q76.3438,54.9531 76.9688,54.375 L76.9688,57.0938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="88" y="55.6074">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="60" x2="98" y1="67.4531" y2="67.4531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="60" x2="98" y1="75.4531" y2="75.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0000999621481464424961">
-        <rect codeLine="32" fill="#F1F1F1" height="64.7999" id="C_0000999621481464424961" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="98" x="164.5" y="186.5999"/>
-        <ellipse cx="204.7" cy="202.5999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M199.7,203.7562 C199.7,206.2562 201.8406,208.0687 204.7625,208.0687 C205.9969,208.0687 207.1688,207.7718 207.9188,207.2562 C208.5281,206.8343 208.8563,206.4124 208.8563,206.0062 C208.8563,205.5374 208.4344,205.1312 207.9344,205.1312 C207.7,205.1312 207.4813,205.2093 207.2781,205.4124 C206.8406,205.8499 206.8406,205.8499 206.6688,205.9437 C206.2156,206.1781 205.575,206.3187 204.8094,206.3187 C202.8094,206.3187 201.5281,205.3031 201.5281,203.7249 L201.5281,202.6781 C201.5281,200.9749 202.7469,199.7718 204.45,199.7718 C205.0281,199.7718 205.6063,199.9124 206.075,200.1624 C206.5438,200.4281 206.7156,200.6156 206.7781,200.9749 C206.9031,201.6468 207.1531,201.8968 207.6844,201.8968 C207.9656,201.8968 208.2469,201.7562 208.4344,201.5374 C208.5594,201.3656 208.6063,201.1937 208.6063,200.7562 L208.6063,199.3968 C208.6063,198.9749 208.5906,198.8343 208.4656,198.6624 C208.2938,198.4124 208.0125,198.2562 207.6844,198.2562 C207.3719,198.2562 207.1688,198.3656 206.95,198.6312 C205.7781,198.1312 205.3406,198.0218 204.3875,198.0218 C201.7156,198.0218 199.7,200.0374 199.7,202.6624 L199.7,203.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="224.3" y="207.2059">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="165.5" x2="261.5" y1="218.5999" y2="218.5999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="165.5" x2="261.5" y1="226.5999" y2="226.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="170.5" y="235.4999"/>
-          <ellipse cx="175.5" cy="240.4999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="184.5" y="243.6059">aaa : AAA *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="173.4531"/>
+      <ellipse cx="78" cy="189.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M80.9688,195.0938 Q80.3906,195.3906 79.75,195.5313 Q79.1094,195.6875 78.4063,195.6875 Q75.9063,195.6875 74.5781,194.0469 Q73.2656,192.3906 73.2656,189.2656 Q73.2656,186.1406 74.5781,184.4844 Q75.9063,182.8281 78.4063,182.8281 Q79.1094,182.8281 79.75,182.9844 Q80.4063,183.1406 80.9688,183.4375 L80.9688,186.1563 Q80.3438,185.5781 79.75,185.3125 Q79.1563,185.0313 78.5313,185.0313 Q77.1875,185.0313 76.5,186.1094 Q75.8125,187.1719 75.8125,189.2656 Q75.8125,191.3594 76.5,192.4375 Q77.1875,193.5 78.5313,193.5 Q79.1563,193.5 79.75,193.2344 Q80.3438,192.9531 80.9688,192.375 L80.9688,195.0938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="92" y="193.6074">AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="205.4531" y2="205.4531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="213.4531" y2="213.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L28" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L28" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <g id="elem_C_0001168375787542426694">
-        <rect codeLine="37" fill="#F1F1F1" height="64.7999" id="C_0001168375787542426694" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="165" x="138" y="44.7999"/>
-        <ellipse cx="206.25" cy="60.7999" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M201.25,61.9562 C201.25,64.4562 203.3906,66.2687 206.3125,66.2687 C207.5469,66.2687 208.7188,65.9718 209.4688,65.4562 C210.0781,65.0343 210.4063,64.6124 210.4063,64.2062 C210.4063,63.7374 209.9844,63.3312 209.4844,63.3312 C209.25,63.3312 209.0313,63.4093 208.8281,63.6124 C208.3906,64.0499 208.3906,64.0499 208.2188,64.1437 C207.7656,64.3781 207.125,64.5187 206.3594,64.5187 C204.3594,64.5187 203.0781,63.5031 203.0781,61.9249 L203.0781,60.8781 C203.0781,59.1749 204.2969,57.9718 206,57.9718 C206.5781,57.9718 207.1563,58.1124 207.625,58.3624 C208.0938,58.6281 208.2656,58.8156 208.3281,59.1749 C208.4531,59.8468 208.7031,60.0968 209.2344,60.0968 C209.5156,60.0968 209.7969,59.9562 209.9844,59.7374 C210.1094,59.5656 210.1563,59.3937 210.1563,58.9562 L210.1563,57.5968 C210.1563,57.1749 210.1406,57.0343 210.0156,56.8624 C209.8438,56.6124 209.5625,56.4562 209.2344,56.4562 C208.9219,56.4562 208.7188,56.5656 208.5,56.8312 C207.3281,56.3312 206.8906,56.2218 205.9375,56.2218 C203.2656,56.2218 201.25,58.2374 201.25,60.8624 L201.25,61.9562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="226.75" y="65.4059">RR</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="302" y1="76.7999" y2="76.7999"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="302" y1="84.7999" y2="84.7999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="144" y="93.6999"/>
-          <ellipse cx="149" cy="98.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139" x="158" y="101.8059">r : std::shared_ptr&lt;R&gt;</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="304.9531"/>
+      <ellipse cx="123.85" cy="320.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M126.8188,326.5938 Q126.2406,326.8906 125.6,327.0313 Q124.9594,327.1875 124.2563,327.1875 Q121.7563,327.1875 120.4281,325.5469 Q119.1156,323.8906 119.1156,320.7656 Q119.1156,317.6406 120.4281,315.9844 Q121.7563,314.3281 124.2563,314.3281 Q124.9594,314.3281 125.6,314.4844 Q126.2563,314.6406 126.8188,314.9375 L126.8188,317.6563 Q126.1938,317.0781 125.6,316.8125 Q125.0063,316.5313 124.3813,316.5313 Q123.0375,316.5313 122.35,317.6094 Q121.6625,318.6719 121.6625,320.7656 Q121.6625,322.8594 122.35,323.9375 Q123.0375,325 124.3813,325 Q125.0063,325 125.6,324.7344 Q126.1938,324.4531 126.8188,323.875 L126.8188,326.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="142.15" y="325.1074">AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="336.9531" y2="336.9531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="344.9531" y2="344.9531"/>
     </a>
-    <g id="link_C_0001427649116338755656_C_0000359183874441719256">
-      <path codeLine="41" d="M75.5,580.9899 C75.5,608.8899 75.5,636.8199 75.5,661.9099 " fill="none" id="C_0001427649116338755656-backto-C_0000359183874441719256" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="75.5,568.9899,71.5,574.9899,75.5,580.9899,79.5,574.9899,75.5,568.9899" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="76.5" y="628.4769">+b</text>
-    </g>
-    <g id="link_C_0001297439817144700057_C_0000577981285610429577">
-      <path codeLine="42" d="M84.8705,119.5704 C86.3505,145.3804 87.68,168.6899 89.16,194.5199 " fill="none" id="C_0001297439817144700057-backto-C_0000577981285610429577" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="83.84,101.5999,78.8803,119.9139,90.8606,119.2269,83.84,101.5999" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001484819281509619918_C_0001427649116338755656">
-      <path codeLine="43" d="M127.8,410.1399 C115.83,438.7499 102.2439,471.2341 91.1339,497.8141 " fill="none" id="C_0001484819281509619918-to-C_0001427649116338755656" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="88.82,503.3499,95.9814,496.5887,90.7483,498.7367,88.6003,493.5035,88.82,503.3499" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="120.5" cy="449.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="14" x="127.5" y="453.0769">bb</text>
-    </g>
-    <g id="link_C_0001484819281509619918_C_0001888428536574868284">
-      <path codeLine="44" d="M165.829,421.2112 C175.479,444.2912 183.07,462.4199 193.26,486.7999 " fill="none" id="C_0001484819281509619918-backto-C_0001888428536574868284" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="161.2,410.1399,159.8241,417.2185,165.829,421.2112,167.2049,414.1325,161.2,410.1399" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="185.5" cy="449.2999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="192.5" y="453.0769">akind</text>
-    </g>
-    <g id="link_C_0000577981285610429577_C_0001484819281509619918">
-      <path codeLine="45" d="M105.2174,260.394 C113.4774,283.084 120.01,300.9899 129.88,328.0799 " fill="none" id="C_0000577981285610429577-backto-C_0001484819281509619918" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="99.06,243.4799,99.5793,262.4465,110.8554,258.3416,99.06,243.4799" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000999621481464424961_C_0001484819281509619918">
-      <path codeLine="46" d="M198.7,251.7899 C188.32,274.0799 176.9013,298.6 165.7613,322.54 " fill="none" id="C_0000999621481464424961-to-C_0001484819281509619918" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="163.23,327.9799,170.6536,321.5077,165.3395,323.4467,163.4004,318.1325,163.23,327.9799" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="189.5" cy="290.6999" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="21" x="196.5" y="294.4769">aaa</text>
-    </g>
-    <g id="link_C_0001168375787542426694_C_0000999621481464424961">
-      <path codeLine="47" d="M218.91,109.9199 C217.77,132.7999 216.5316,157.5575 215.3816,180.4075 " fill="none" id="C_0001168375787542426694-to-C_0000999621481464424961" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="215.08,186.3999,219.5273,177.6124,215.3313,181.4062,211.5374,177.2102,215.08,186.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="218.5" y="152.6769">+r</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="350.9531"/>
+      <ellipse cx="100.5" cy="355.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="109.5" y="359.1636">akind : AKind</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="363.7578"/>
+      <ellipse cx="100.5" cy="368.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="109.5" y="371.9683">bb : BB *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="160" y="166.9531"/>
+      <ellipse cx="197.5" cy="182.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M200.4688,188.5938 Q199.8906,188.8906 199.25,189.0313 Q198.6094,189.1875 197.9063,189.1875 Q195.4063,189.1875 194.0781,187.5469 Q192.7656,185.8906 192.7656,182.7656 Q192.7656,179.6406 194.0781,177.9844 Q195.4063,176.3281 197.9063,176.3281 Q198.6094,176.3281 199.25,176.4844 Q199.9063,176.6406 200.4688,176.9375 L200.4688,179.6563 Q199.8438,179.0781 199.25,178.8125 Q198.6563,178.5313 198.0313,178.5313 Q196.6875,178.5313 196,179.6094 Q195.3125,180.6719 195.3125,182.7656 Q195.3125,184.8594 196,185.9375 Q196.6875,187 198.0313,187 Q198.6563,187 199.25,186.7344 Q199.8438,186.4531 200.4688,185.875 L200.4688,188.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="216.5" y="187.1074">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="249" y1="198.9531" y2="198.9531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="249" y1="206.9531" y2="206.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="212.9531"/>
+      <ellipse cx="171" cy="217.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="64" x="180" y="221.1636">aaa : AAA *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L28" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L28" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="60.8047" id="C_0001168375787542426694" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="134" y="28.9531"/>
+      <ellipse cx="199.75" cy="44.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M202.7188,50.5938 Q202.1406,50.8906 201.5,51.0313 Q200.8594,51.1875 200.1563,51.1875 Q197.6563,51.1875 196.3281,49.5469 Q195.0156,47.8906 195.0156,44.7656 Q195.0156,41.6406 196.3281,39.9844 Q197.6563,38.3281 200.1563,38.3281 Q200.8594,38.3281 201.5,38.4844 Q202.1563,38.6406 202.7188,38.9375 L202.7188,41.6563 Q202.0938,41.0781 201.5,40.8125 Q200.9063,40.5313 200.2813,40.5313 Q198.9375,40.5313 198.25,41.6094 Q197.5625,42.6719 197.5625,44.7656 Q197.5625,46.8594 198.25,47.9375 Q198.9375,49 200.2813,49 Q200.9063,49 201.5,48.7344 Q202.0938,48.4531 202.7188,47.875 L202.7188,50.5938 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="220.25" y="49.1074">RR</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="289" y1="60.9531" y2="60.9531"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="289" y1="68.9531" y2="68.9531"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="140" y="74.9531"/>
+      <ellipse cx="145" cy="79.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="154" y="83.1636">r : std::shared_ptr&lt;R&gt;</text>
+    </a>
+    <path d="M72,542.9131 C72,567.8431 72,598.2831 72,618.7731 " fill="none" id="C_0001427649116338755656&lt;-C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="72,529.7231,68,535.7231,72,541.7231,76,535.7231,72,529.7231" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="73" y="585.02">+b</text>
+    <path d="M81.53,103.5031 C82.89,126.6131 84.51,154.1831 85.64,173.2731 " fill="none" id="C_0001297439817144700057&lt;-C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="74.54,103.9031,80.36,83.5231,88.52,103.0731,74.54,103.9031" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M123.29,379.2931 C112.3,404.7131 97.72,438.4531 86.91,463.4531 " fill="none" id="C_0001484819281509619918-&gt;C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="84.8,468.3331,92.0469,461.6637,86.7868,463.7448,84.7057,458.4847,84.8,468.3331" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="116" cy="418.0195" 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="123" y="422.02">bb</text>
+    <path d="M159.92,391.3531 C168.85,412.0031 179.17,435.8831 187.78,455.8031 " fill="none" id="C_0001484819281509619918&lt;-C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="154.71,379.2931,153.4195,386.3878,159.472,390.3078,160.7626,383.2131,154.71,379.2931" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="180" cy="418.0195" 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="34" x="187" y="422.02">akind</text>
+    <path d="M102.35,240.5131 C109.82,260.9831 118.7,285.3331 125.85,304.9331 " fill="none" id="C_0000577981285610429577&lt;-C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="95.75,242.8531,95.47,221.6631,108.9,238.0531,95.75,242.8531" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M191.32,227.9831 C181.63,248.9231 168.49,277.2831 157.8,300.3531 " fill="none" id="C_0000999621481464424961-&gt;C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="155.7,304.8931,163.1072,298.4022,157.798,300.3546,155.8456,295.0453,155.7,304.8931" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="181" cy="267.0195" 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="188" y="271.02">aaa</text>
+    <path d="M210.48,89.9631 C209.4,110.9331 207.95,139.1931 206.81,161.3331 " fill="none" id="C_0001168375787542426694-&gt;C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="206.54,166.5331,210.9983,157.7511,206.7975,161.5398,203.0089,157.339,206.54,166.5331" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="209" y="133.02">+r</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00068_r2_class_mermaid.svg b/docs/test_cases/t00068_r2_class_mermaid.svg
index 18a1239c..ec5f8eb8 100644
--- a/docs/test_cases/t00068_r2_class_mermaid.svg
+++ b/docs/test_cases/t00068_r2_class_mermaid.svg
@@ -1,67 +1,63 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 350.37890625 798" style="max-width: 350.379px; background-color: white;" width="350.37890625" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 -49 350.37890625 798" style="max-width: 350.379px; background-color: white;" width="350.37890625" id="my-svg">
+  <title id="chart-title-my-svg">AAA context of radius 2</title>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M82.875,601L82.875,609.1666666666666C82.875,617.3333333333334,82.875,633.6666666666666,82.875,647.5C82.875,661.3333333333334,82.875,672.6666666666666,82.875,678.3333333333334L82.875,684"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M99.11328125,94L99.11328125,98.5C99.11328125,103,99.11328125,112,99.11328125,124C99.11328125,136,99.11328125,151,99.11328125,158.5L99.11328125,166"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M120.2448224852071,403L114.01651873767258,408.6666666666667C107.78821499013806,414.3333333333333,95.33160749506904,425.6666666666667,89.10330374753453,441.5C82.875,457.3333333333333,82.875,477.6666666666667,82.875,487.8333333333333L82.875,498"/>
-        <path marker-start="url(#my-svg_classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M244.5692327868808,415.1134607859104L248.57852732240067,418.761217321592C252.58782185792052,422.40897385727357,260.60641092896026,429.70448692863675,264.61570546448013,439.01891013098503C268.625,448.3333333333333,268.625,459.6666666666667,268.625,465.3333333333333L268.625,471"/>
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M99.11328125,241L99.11328125,245.5C99.11328125,250,99.11328125,259,104.25262728057199,269.1666666666667C109.39197331114399,279.3333333333333,119.67066537228796,290.6666666666667,124.81001140285996,296.3333333333333L129.94935743343194,302"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M252.38671875,234L252.38671875,239.66666666666666C252.38671875,245.33333333333334,252.38671875,256.6666666666667,247.91917411326082,267.25926868079966C243.45162947652167,277.85187069493264,234.51654020304332,287.7037413898653,230.04899556630414,292.62967673733164L225.58145092956497,297.55561208479793"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M252.38671875,87L252.38671875,92.66666666666667C252.38671875,98.33333333333333,252.38671875,109.66666666666667,252.38671875,120C252.38671875,130.33333333333334,252.38671875,139.66666666666666,252.38671875,144.33333333333334L252.38671875,149"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M82.875,583L82.875,594.1666666666666C82.875,605.3333333333334,82.875,627.6666666666666,82.875,644.5C82.875,661.3333333333334,82.875,672.6666666666666,82.875,678.3333333333334L82.875,684"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M99.11328125,76L99.11328125,83.5C99.11328125,91,99.11328125,106,99.11328125,121C99.11328125,136,99.11328125,151,99.11328125,158.5L99.11328125,166"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M120.2448224852071,403L114.01651873767258,408.6666666666667C107.78821499013806,414.3333333333333,95.33160749506904,425.6666666666667,89.10330374753453,442.5C82.875,459.3333333333333,82.875,481.6666666666667,82.875,492.8333333333333L82.875,504"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M231.2551775147929,403L237.48348126232744,408.6666666666667C243.71178500986193,414.3333333333333,256.168392504931,425.6666666666667,262.39669625246546,437C268.625,448.3333333333333,268.625,459.6666666666667,268.625,465.3333333333333L268.625,471"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M99.11328125,223L99.11328125,230.5C99.11328125,238,99.11328125,253,104.25262728057199,266.1666666666667C109.39197331114399,279.3333333333333,119.67066537228796,290.6666666666667,124.81001140285996,296.3333333333333L129.94935743343194,302"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M252.38671875,234L252.38671875,239.66666666666666C252.38671875,245.33333333333334,252.38671875,256.6666666666667,247.247372719428,268C242.10802668885603,279.3333333333333,231.82933462771203,290.6666666666667,226.68998859714006,296.3333333333333L221.55064256656806,302"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M252.38671875,87L252.38671875,92.66666666666667C252.38671875,98.33333333333333,252.38671875,109.66666666666667,252.38671875,121C252.38671875,132.33333333333334,252.38671875,143.66666666666666,252.38671875,149.33333333333334L252.38671875,155"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(82.875, 650)" class="edgeLabel">
@@ -139,7 +135,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.875, 712.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L7">
+        <a transform="translate(82.875, 712.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L7">
           <g title="B" id="classId-C_0000359183874441719256-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -158,7 +154,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(82.875, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L9">
+        <a transform="translate(82.875, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9">
           <g title="BB" id="classId-C_0001427649116338755656-1" class="node default clickable">
             <rect height="79" width="149.75" y="-39.5" x="-74.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -182,7 +178,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.625, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L13">
+        <a transform="translate(268.625, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13">
           <g title="AKind" id="classId-C_0001888428536574868284-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -216,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.11328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L15">
+        <a transform="translate(99.11328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L15">
           <g title="A" id="classId-C_0001297439817144700057-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -235,7 +231,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.11328125, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L17">
+        <a transform="translate(99.11328125, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17">
           <g title="AA" id="classId-C_0000577981285610429577-4" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -254,7 +250,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.75, 352.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L19">
+        <a transform="translate(175.75, 352.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-5" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -277,13 +273,13 @@
               </foreignObject>
               <foreignObject transform="translate( -51.375, 13)" height="18" width="61.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+bb : BB</span>
+                  <span style="font-style:italic;" class="nodeLabel">+bb : BB </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(252.38671875, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L24">
+        <a transform="translate(252.38671875, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24">
           <g title="R" id="classId-C_0000999621481464424961-6" class="node default clickable">
             <rect height="79" width="95.796875" y="-39.5" x="-47.8984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="47.8984375" x1="-47.8984375" class="divider"/>
@@ -301,13 +297,13 @@
               </foreignObject>
               <foreignObject transform="translate( -40.3984375, 2)" height="18" width="80.796875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">+aaa : AAA</span>
+                  <span style="font-style:italic;" class="nodeLabel">+aaa : AAA </span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(252.38671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00068/t00068.cc#L28">
+        <a transform="translate(252.38671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L28">
           <g title="RR" id="classId-C_0001168375787542426694-7" class="node default clickable">
             <rect height="79" width="179.984375" y="-39.5" x="-89.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="89.9921875" x1="-89.9921875" class="divider"/>
diff --git a/docs/test_cases/t00069.md b/docs/test_cases/t00069.md
index 69fa153d..e544d504 100644
--- a/docs/test_cases/t00069.md
+++ b/docs/test_cases/t00069.md
@@ -90,7 +90,7 @@ private:
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00069::generator<T>",
+      "display_name": "generator<T>",
       "id": "2142496233889685657",
       "is_abstract": false,
       "is_nested": false,
@@ -202,7 +202,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00069::generator::promise_type",
+      "display_name": "generator::promise_type",
       "id": "721812727497968117",
       "is_abstract": false,
       "is_nested": true,
@@ -405,7 +405,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00069::generator<unsigned long>",
+      "display_name": "generator<unsigned long>",
       "id": "1604358347140526608",
       "is_abstract": false,
       "is_nested": false,
@@ -434,7 +434,7 @@ private:
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00069::A",
+      "display_name": "A",
       "id": "2160142503252767290",
       "is_abstract": false,
       "is_nested": false,
@@ -522,6 +522,7 @@ private:
     }
   ],
   "name": "t00069_class",
+  "package_type": "namespace",
   "relationships": [
     {
       "access": "public",
diff --git a/docs/test_cases/t00069_class.svg b/docs/test_cases/t00069_class.svg
index 13da91c0..c5fbb07a 100644
--- a/docs/test_cases/t00069_class.svg
+++ b/docs/test_cases/t00069_class.svg
@@ -1,165 +1,157 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="529px" preserveAspectRatio="none" style="width:805px;height:529px;background:#FFFFFF;" version="1.1" viewBox="0 0 805 529" width="805px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="474px" preserveAspectRatio="none" style="width:760px;height:474px;" version="1.1" viewBox="0 0 760 474" width="760px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f195ry649pk535" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
-      <g id="elem_C_0002142496233889685657">
-        <rect codeLine="2" fill="#F1F1F1" height="115.1997" id="C_0002142496233889685657" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="226" x="338" y="407.8"/>
-        <ellipse cx="410.25" cy="423.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M405.25,424.9563 C405.25,427.4563 407.3906,429.2688 410.3125,429.2688 C411.5469,429.2688 412.7188,428.9719 413.4688,428.4563 C414.0781,428.0344 414.4063,427.6125 414.4063,427.2063 C414.4063,426.7375 413.9844,426.3313 413.4844,426.3313 C413.25,426.3313 413.0313,426.4094 412.8281,426.6125 C412.3906,427.05 412.3906,427.05 412.2188,427.1438 C411.7656,427.3781 411.125,427.5188 410.3594,427.5188 C408.3594,427.5188 407.0781,426.5031 407.0781,424.925 L407.0781,423.8781 C407.0781,422.175 408.2969,420.9719 410,420.9719 C410.5781,420.9719 411.1563,421.1125 411.625,421.3625 C412.0938,421.6281 412.2656,421.8156 412.3281,422.175 C412.4531,422.8469 412.7031,423.0969 413.2344,423.0969 C413.5156,423.0969 413.7969,422.9563 413.9844,422.7375 C414.1094,422.5656 414.1563,422.3938 414.1563,421.9563 L414.1563,420.5969 C414.1563,420.175 414.1406,420.0344 414.0156,419.8625 C413.8438,419.6125 413.5625,419.4563 413.2344,419.4563 C412.9219,419.4563 412.7188,419.5656 412.5,419.8313 C411.3281,419.3313 410.8906,419.2219 409.9375,419.2219 C407.2656,419.2219 405.25,421.2375 405.25,423.8625 L405.25,424.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="430.75" y="428.406">generator</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="558" y="404.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="559" y="419.0001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="339" x2="563" y1="439.8" y2="439.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="344" y="448.7"/>
-          <ellipse cx="349" cy="453.7" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="200" x="358" y="456.8059">generator(handle_type h) : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="344" y="465.4999"/>
-          <ellipse cx="349" cy="470.4999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="118" x="358" y="473.6059">~generator() : void</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="339" x2="563" y1="481.3999" y2="481.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="344" y="490.2998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="346" y="492.2998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="65" x="358" y="498.4058">full_ : bool</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="344" y="507.0997"/>
-          <ellipse cx="349" cy="512.0997" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="358" y="515.2057">h_ : handle_type</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f195ry649pk535)" height="99.2188" id="C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="319" y="364"/>
+      <ellipse cx="379.75" cy="380" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M382.7188,385.6406 Q382.1406,385.9375 381.5,386.0781 Q380.8594,386.2344 380.1563,386.2344 Q377.6563,386.2344 376.3281,384.5938 Q375.0156,382.9375 375.0156,379.8125 Q375.0156,376.6875 376.3281,375.0313 Q377.6563,373.375 380.1563,373.375 Q380.8594,373.375 381.5,373.5313 Q382.1563,373.6875 382.7188,373.9844 L382.7188,376.7031 Q382.0938,376.125 381.5,375.8594 Q380.9063,375.5781 380.2813,375.5781 Q378.9375,375.5781 378.25,376.6563 Q377.5625,377.7188 377.5625,379.8125 Q377.5625,381.9063 378.25,382.9844 Q378.9375,384.0469 380.2813,384.0469 Q380.9063,384.0469 381.5,383.7813 Q382.0938,383.5 382.7188,382.9219 L382.7188,385.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="400.25" y="384.1543">generator</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="517" y="361"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="518" y="373.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="320" x2="522" y1="396" y2="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L18" target="_top" title="generator##promise_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L18" xlink:show="new" xlink:title="generator##promise_type" xlink:type="simple">
-      <g id="elem_C_0000721812727497968117">
-        <rect codeLine="10" fill="#F1F1F1" height="182.3994" id="C_0000721812727497968117" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="510" x="7" y="165.4"/>
-        <ellipse cx="179.75" cy="181.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M174.75,182.5562 C174.75,185.0562 176.8906,186.8687 179.8125,186.8687 C181.0469,186.8687 182.2188,186.5719 182.9688,186.0562 C183.5781,185.6344 183.9063,185.2125 183.9063,184.8062 C183.9063,184.3375 183.4844,183.9312 182.9844,183.9312 C182.75,183.9312 182.5313,184.0094 182.3281,184.2125 C181.8906,184.65 181.8906,184.65 181.7188,184.7437 C181.2656,184.9781 180.625,185.1187 179.8594,185.1187 C177.8594,185.1187 176.5781,184.1031 176.5781,182.525 L176.5781,181.4781 C176.5781,179.775 177.7969,178.5719 179.5,178.5719 C180.0781,178.5719 180.6563,178.7125 181.125,178.9625 C181.5938,179.2281 181.7656,179.4156 181.8281,179.775 C181.9531,180.4469 182.2031,180.6969 182.7344,180.6969 C183.0156,180.6969 183.2969,180.5562 183.4844,180.3375 C183.6094,180.1656 183.6563,179.9937 183.6563,179.5562 L183.6563,178.1969 C183.6563,177.775 183.6406,177.6344 183.5156,177.4625 C183.3438,177.2125 183.0625,177.0562 182.7344,177.0562 C182.4219,177.0562 182.2188,177.1656 182,177.4312 C180.8281,176.9312 180.3906,176.8219 179.4375,176.8219 C176.7656,176.8219 174.75,178.8375 174.75,181.4625 L174.75,182.5562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="156" x="200.25" y="186.006">generator::promise_type</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="516" y1="197.4" y2="197.4"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="206.3"/>
-          <ellipse cx="18" cy="211.3" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="304" x="27" y="214.4059">final_suspend() noexcept : std::suspend_always</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="223.0999"/>
-          <ellipse cx="18" cy="228.0999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="27" y="231.2059">get_return_object() : generator&lt;T&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="239.8998"/>
-          <ellipse cx="18" cy="244.8998" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248" x="27" y="248.0058">initial_suspend() : std::suspend_always</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="256.6997"/>
-          <ellipse cx="18" cy="261.6997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="27" y="264.8057">return_void() : void</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="273.4997"/>
-          <ellipse cx="18" cy="278.4997" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="184" x="27" y="281.6057">unhandled_exception() : void</text>
-        </a>
-        <ellipse cx="18" cy="295.2996" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="484" x="27" y="298.4056">yield_value&lt;std::convertible_to From&gt;(From &amp;&amp; from) : std::suspend_always</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="516" y1="306.1996" y2="306.1996"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="315.0995"/>
-          <ellipse cx="18" cy="320.0995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="194" x="27" y="323.2055">exception_ : std::exception_ptr</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="13" y="331.8995"/>
-          <ellipse cx="18" cy="336.8995" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="27" y="340.0054">value_ : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="402"/>
+      <ellipse cx="330" cy="407" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
-      <g id="elem_C_0001604358347140526608">
-        <rect codeLine="22" fill="#F1F1F1" height="48" id="C_0001604358347140526608" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="176" x="552" y="232.6"/>
-        <ellipse cx="567" cy="248.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M562,249.7563 C562,252.2563 564.1406,254.0688 567.0625,254.0688 C568.2969,254.0688 569.4688,253.7719 570.2188,253.2563 C570.8281,252.8344 571.1563,252.4125 571.1563,252.0063 C571.1563,251.5375 570.7344,251.1313 570.2344,251.1313 C570,251.1313 569.7813,251.2094 569.5781,251.4125 C569.1406,251.85 569.1406,251.85 568.9688,251.9438 C568.5156,252.1781 567.875,252.3188 567.1094,252.3188 C565.1094,252.3188 563.8281,251.3031 563.8281,249.725 L563.8281,248.6781 C563.8281,246.975 565.0469,245.7719 566.75,245.7719 C567.3281,245.7719 567.9063,245.9125 568.375,246.1625 C568.8438,246.4281 569.0156,246.6156 569.0781,246.975 C569.2031,247.6469 569.4531,247.8969 569.9844,247.8969 C570.2656,247.8969 570.5469,247.7563 570.7344,247.5375 C570.8594,247.3656 570.9063,247.1938 570.9063,246.7563 L570.9063,245.3969 C570.9063,244.975 570.8906,244.8344 570.7656,244.6625 C570.5938,244.4125 570.3125,244.2563 569.9844,244.2563 C569.6719,244.2563 569.4688,244.3656 569.25,244.6313 C568.0781,244.1313 567.6406,244.0219 566.6875,244.0219 C564.0156,244.0219 562,246.0375 562,248.6625 L562,249.7563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="581" y="253.206">generator</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="80" x="651" y="229.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="78" x="652" y="243.8001">unsigned long</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="553" x2="727" y1="264.6" y2="264.6"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="553" x2="727" y1="272.6" y2="272.6"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="178" x="339" y="410.2104">generator(handle_type h) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L48" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L48" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002160142503252767290">
-        <rect codeLine="26" fill="#F1F1F1" height="98.3998" id="C_0002160142503252767290" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="317" x="481.5" y="7"/>
-        <ellipse cx="631.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M626.25,24.1563 C626.25,26.6563 628.3906,28.4688 631.3125,28.4688 C632.5469,28.4688 633.7188,28.1719 634.4688,27.6563 C635.0781,27.2344 635.4063,26.8125 635.4063,26.4063 C635.4063,25.9375 634.9844,25.5313 634.4844,25.5313 C634.25,25.5313 634.0313,25.6094 633.8281,25.8125 C633.3906,26.25 633.3906,26.25 633.2188,26.3438 C632.7656,26.5781 632.125,26.7188 631.3594,26.7188 C629.3594,26.7188 628.0781,25.7031 628.0781,24.125 L628.0781,23.0781 C628.0781,21.375 629.2969,20.1719 631,20.1719 C631.5781,20.1719 632.1563,20.3125 632.625,20.5625 C633.0938,20.8281 633.2656,21.0156 633.3281,21.375 C633.4531,22.0469 633.7031,22.2969 634.2344,22.2969 C634.5156,22.2969 634.7969,22.1563 634.9844,21.9375 C635.1094,21.7656 635.1563,21.5938 635.1563,21.1563 L635.1563,19.7969 C635.1563,19.375 635.1406,19.2344 635.0156,19.0625 C634.8438,18.8125 634.5625,18.6563 634.2344,18.6563 C633.9219,18.6563 633.7188,18.7656 633.5,19.0313 C632.3281,18.5313 631.8906,18.4219 630.9375,18.4219 C628.2656,18.4219 626.25,20.4375 626.25,23.0625 L626.25,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="651.75" y="27.606">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="482.5" x2="797.5" y1="39" y2="39"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="487.5" y="47.9"/>
-          <ellipse cx="492.5" cy="52.9" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="283" x="501.5" y="56.0059">iota() [coroutine] : generator&lt;unsigned long&gt;</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="487.5" y="64.6999"/>
-          <ellipse cx="492.5" cy="69.6999" fill="#84BE84" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="291" x="501.5" y="72.8059">seed() [coroutine] : generator&lt;unsigned long&gt;</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="482.5" x2="797.5" y1="80.5999" y2="80.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="487.5" y="89.4998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="489.5" y="91.4998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="157" x="501.5" y="97.6058">counter_ : unsigned long</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="414.8047"/>
+      <ellipse cx="330" cy="419.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <g id="link_C_0000721812727497968117_C_0002142496233889685657">
-      <path codeLine="32" d="M344.62,348.01 C363.1,368.22 371.3947,377.3006 388.2147,395.7006 " fill="none" id="C_0000721812727497968117-to-C_0002142496233889685657" style="stroke:#181818;stroke-width:1.0;"/>
-      <ellipse cx="393.6123" cy="401.6053" fill="#FFFFFF" rx="8" ry="8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="388.2147" x2="399.01" y1="395.7006" y2="407.51"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="399.517" x2="387.7077" y1="396.2077" y2="407.003"/>
-    </g>
-    <g id="link_C_0001604358347140526608_C_0002142496233889685657">
-      <path codeLine="33" d="M618.69,280.92 C590.79,311.45 553.1049,352.6846 514.9849,394.3846 " fill="none" id="C_0001604358347140526608-to-C_0002142496233889685657" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="none" points="502.84,407.67,519.4133,398.4329,510.5564,390.3363,502.84,407.67" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002160142503252767290_C_0001604358347140526608">
-      <path codeLine="34" d="M640,105.73 C640,145.89 640,195.18 640,226.14 " fill="none" id="C_0002160142503252767290-to-C_0001604358347140526608" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="640,232.14,644,223.14,640,227.14,636,223.14,640,232.14" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="339" y="423.0151">~generator() : void</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="320" x2="522" y1="429.6094" y2="429.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="435.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="327" y="437.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="59" x="339" y="443.8198">full_ : bool</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="448.4141"/>
+      <ellipse cx="330" cy="453.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="339" y="456.6245">h_ : handle_type</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L18" target="_top" title="generator##promise_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L18" xlink:show="new" xlink:title="generator##promise_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f195ry649pk535)" height="150.4375" id="C_0000721812727497968117" style="stroke: #A80036; stroke-width: 1.5;" width="468" x="6" y="154"/>
+      <ellipse cx="158.75" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M161.7188,175.6406 Q161.1406,175.9375 160.5,176.0781 Q159.8594,176.2344 159.1563,176.2344 Q156.6563,176.2344 155.3281,174.5938 Q154.0156,172.9375 154.0156,169.8125 Q154.0156,166.6875 155.3281,165.0313 Q156.6563,163.375 159.1563,163.375 Q159.8594,163.375 160.5,163.5313 Q161.1563,163.6875 161.7188,163.9844 L161.7188,166.7031 Q161.0938,166.125 160.5,165.8594 Q159.9063,165.5781 159.2813,165.5781 Q157.9375,165.5781 157.25,166.6563 Q156.5625,167.7188 156.5625,169.8125 Q156.5625,171.9063 157.25,172.9844 Q157.9375,174.0469 159.2813,174.0469 Q159.9063,174.0469 160.5,173.7813 Q161.0938,173.5 161.7188,172.9219 L161.7188,175.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="154" x="179.25" y="174.1543">generator::promise_type</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="473" y1="186" y2="186"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="192"/>
+      <ellipse cx="17" cy="197" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="274" x="26" y="200.2104">final_suspend() noexcept : std::suspend_always</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="204.8047"/>
+      <ellipse cx="17" cy="209.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="200" x="26" y="213.0151">get_return_object() : generator&lt;T&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="217.6094"/>
+      <ellipse cx="17" cy="222.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="26" y="225.8198">initial_suspend() : std::suspend_always</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="230.4141"/>
+      <ellipse cx="17" cy="235.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="26" y="238.6245">return_void() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="243.2188"/>
+      <ellipse cx="17" cy="248.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="26" y="251.4292">unhandled_exception() : void</text>
+    </a>
+    <ellipse cx="17" cy="261.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="442" x="26" y="264.2339">yield_value&lt;std::convertible_to From&gt;(From &amp;&amp; from) : std::suspend_always</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="473" y1="270.8281" y2="270.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="276.8281"/>
+      <ellipse cx="17" cy="281.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="174" x="26" y="285.0386">exception_ : std::exception_ptr</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="289.6328"/>
+      <ellipse cx="17" cy="294.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="297.8433">value_ : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f195ry649pk535)" height="48" id="C_0001604358347140526608" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="509.5" y="205"/>
+      <ellipse cx="524.5" cy="221" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M527.4688,226.6406 Q526.8906,226.9375 526.25,227.0781 Q525.6094,227.2344 524.9063,227.2344 Q522.4063,227.2344 521.0781,225.5938 Q519.7656,223.9375 519.7656,220.8125 Q519.7656,217.6875 521.0781,216.0313 Q522.4063,214.375 524.9063,214.375 Q525.6094,214.375 526.25,214.5313 Q526.9063,214.6875 527.4688,214.9844 L527.4688,217.7031 Q526.8438,217.125 526.25,216.8594 Q525.6563,216.5781 525.0313,216.5781 Q523.6875,216.5781 523,217.6563 Q522.3125,218.7188 522.3125,220.8125 Q522.3125,222.9063 523,223.9844 Q523.6875,225.0469 525.0313,225.0469 Q525.6563,225.0469 526.25,224.7813 Q526.8438,224.5 527.4688,223.9219 L527.4688,226.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="538.5" y="225.1543">generator</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="90" x="609.5" y="202"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="88" x="610.5" y="214.1387">unsigned long</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="695.5" y1="237" y2="237"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="695.5" y1="245" y2="245"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L48" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L48" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f195ry649pk535)" height="86.4141" id="C_0002160142503252767290" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="456.5" y="8"/>
+      <ellipse cx="594.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M597.7188,29.6406 Q597.1406,29.9375 596.5,30.0781 Q595.8594,30.2344 595.1563,30.2344 Q592.6563,30.2344 591.3281,28.5938 Q590.0156,26.9375 590.0156,23.8125 Q590.0156,20.6875 591.3281,19.0313 Q592.6563,17.375 595.1563,17.375 Q595.8594,17.375 596.5,17.5313 Q597.1563,17.6875 597.7188,17.9844 L597.7188,20.7031 Q597.0938,20.125 596.5,19.8594 Q595.9063,19.5781 595.2813,19.5781 Q593.9375,19.5781 593.25,20.6563 Q592.5625,21.7188 592.5625,23.8125 Q592.5625,25.9063 593.25,26.9844 Q593.9375,28.0469 595.2813,28.0469 Q595.9063,28.0469 596.5,27.7813 Q597.0938,27.5 597.7188,26.9219 L597.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="615.25" y="28.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="457.5" x2="748.5" y1="40" y2="40"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="46"/>
+      <ellipse cx="467.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="260" x="476.5" y="54.2104">iota() [coroutine] : generator&lt;unsigned long&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="58.8047"/>
+      <ellipse cx="467.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="267" x="476.5" y="67.0151">seed() [coroutine] : generator&lt;unsigned long&gt;</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="457.5" x2="748.5" y1="73.6094" y2="73.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="79.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="464.5" y="81.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="476.5" y="87.8198">counter_ : unsigned long</text>
+    </a>
+    <path d="M313.62,304.23 C329.69,320.43 346.49,337.37 361.9,352.91 " fill="none" id="C_0000721812727497968117-&gt;C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="367.2199" cy="358.2665" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="361.5897" x2="372.85" y1="352.5831" y2="363.95"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="372.9033" x2="361.5364" y1="352.6364" y2="363.8967"/>
+    <path d="M579.95,253.11 C555.87,277.26 517.04,316.19 483.79,349.54 " fill="none" id="C_0001604358347140526608-&gt;C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="488.54,354.69,469.46,363.91,478.63,344.8,488.54,354.69" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M603,94.16 C603,126.71 603,170.87 603,199.4 " fill="none" id="C_0002160142503252767290-&gt;C_0001604358347140526608" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="603,204.54,607,195.54,603,199.54,599,195.54,603,204.54" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00069_class_mermaid.svg b/docs/test_cases/t00069_class_mermaid.svg
index 53a99bab..adf70563 100644
--- a/docs/test_cases/t00069_class_mermaid.svg
+++ b/docs/test_cases/t00069_class_mermaid.svg
@@ -1,63 +1,58 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 401.375 724" style="max-width: 401.375px; background-color: white;" width="401.375" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 392.484375 724" style="max-width: 392.484px; background-color: white;" width="392.484375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M200.6875,446.5L200.6875,448.4166666666667C200.6875,450.3333333333333,200.6875,454.1666666666667,200.6875,460.25C200.6875,466.3333333333333,200.6875,474.6666666666667,200.6875,478.8333333333333L200.6875,483"/>
-        <path marker-end="url(#my-svg_classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M200.6875,238L200.6875,242.16666666666666C200.6875,246.33333333333334,200.6875,254.66666666666666,200.6875,260C200.6875,265.3333333333333,200.6875,267.6666666666667,200.6875,268.8333333333333L200.6875,270"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M200.6875,131L200.6875,135.16666666666666C200.6875,139.33333333333334,200.6875,147.66666666666666,200.6875,155C200.6875,162.33333333333334,200.6875,168.66666666666666,200.6875,171.83333333333334L200.6875,175"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M196.2421875,433L196.2421875,437.1666666666667C196.2421875,441.3333333333333,196.2421875,449.6666666666667,196.2421875,458C196.2421875,466.3333333333333,196.2421875,474.6666666666667,196.2421875,478.8333333333333L196.2421875,483"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M196.2421875,238L196.2421875,242.16666666666666C196.2421875,246.33333333333334,196.2421875,254.66666666666666,196.2421875,263C196.2421875,271.3333333333333,196.2421875,279.6666666666667,196.2421875,283.8333333333333L196.2421875,288"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M196.2421875,131L196.2421875,135.16666666666666C196.2421875,139.33333333333334,196.2421875,147.66666666666666,196.2421875,156C196.2421875,164.33333333333334,196.2421875,172.66666666666666,196.2421875,176.83333333333334L196.2421875,181"/>
       </g>
       <g class="edgeLabels">
         <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -95,11 +90,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(200.6875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7">
+        <a transform="translate(196.2421875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7">
           <g title="generator" id="classId-C_0002142496233889685657-0" class="node default clickable">
-            <rect height="145" width="255.609375" y="-72.5" x="-127.8046875" class="outer title-state"/>
-            <line y2="-42.5" y1="-42.5" x2="127.8046875" x1="-127.8046875" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="127.8046875" x1="-127.8046875" class="divider"/>
+            <rect height="145" width="246.71875" y="-72.5" x="-123.359375" class="outer title-state"/>
+            <line y2="-42.5" y1="-42.5" x2="123.359375" x1="-123.359375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="123.359375" x1="-123.359375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -111,34 +106,34 @@
                   <span class="nodeLabel">generator&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.3046875, -31)" height="18" width="78.265625">
+              <foreignObject transform="translate( -115.859375, -31)" height="18" width="78.265625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-full_ : bool</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.3046875, -9)" height="18" width="127.671875">
+              <foreignObject transform="translate( -115.859375, -9)" height="18" width="127.671875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+h_ : handle_type</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.3046875, 25)" height="18" width="240.609375">
+              <foreignObject transform="translate( -115.859375, 25)" height="18" width="231.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+generator(handle_type h) : : void</span>
+                  <span class="nodeLabel">+generator(handle_type h) : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -120.3046875, 47)" height="18" width="149.421875">
+              <foreignObject transform="translate( -115.859375, 47)" height="18" width="140.53125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+~generator() : : void</span>
+                  <span class="nodeLabel">+~generator() : void</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(200.6875, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L18">
+        <a transform="translate(196.2421875, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L18">
           <g title="generator##promise_type" id="classId-C_0000721812727497968117-1" class="node default clickable">
-            <rect height="233" width="385.375" y="-116.5" x="-192.6875" class="outer title-state"/>
-            <line y2="-86.5" y1="-86.5" x2="192.6875" x1="-192.6875" class="divider"/>
-            <line y2="-26.5" y1="-26.5" x2="192.6875" x1="-192.6875" class="divider"/>
+            <rect height="233" width="376.484375" y="-116.5" x="-188.2421875" class="outer title-state"/>
+            <line y2="-86.5" y1="-86.5" x2="188.2421875" x1="-188.2421875" class="divider"/>
+            <line y2="-26.5" y1="-26.5" x2="188.2421875" x1="-188.2421875" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -150,50 +145,50 @@
                   <span class="nodeLabel">generator::promise_type</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -185.1875, -75)" height="18" width="226.375">
+              <foreignObject transform="translate( -180.7421875, -75)" height="18" width="226.375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+exception_ : std::exception_ptr</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -185.1875, -53)" height="18" width="79.3125">
+              <foreignObject transform="translate( -180.7421875, -53)" height="18" width="79.3125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">+value_ : T</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -185.1875, -19)" height="18" width="289.5">
+              <foreignObject transform="translate( -180.7421875, -19)" height="18" width="280.609375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+final_suspend() : : std::suspend_always</span>
+                  <span class="nodeLabel">+final_suspend() : std::suspend_always</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -185.1875, 3)" height="18" width="263.71875">
+              <foreignObject transform="translate( -180.7421875, 3)" height="18" width="254.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+get_return_object() : : generator&lt;T&gt;</span>
+                  <span class="nodeLabel">+get_return_object() : generator&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -185.1875, 25)" height="18" width="296.609375">
+              <foreignObject transform="translate( -180.7421875, 25)" height="18" width="287.71875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+initial_suspend() : : std::suspend_always</span>
+                  <span class="nodeLabel">+initial_suspend() : std::suspend_always</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -185.1875, 47)" height="18" width="151.625">
+              <foreignObject transform="translate( -180.7421875, 47)" height="18" width="142.734375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+return_void() : : void</span>
+                  <span class="nodeLabel">+return_void() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -185.1875, 69)" height="18" width="223.71875">
+              <foreignObject transform="translate( -180.7421875, 69)" height="18" width="214.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+unhandled_exception() : : void</span>
+                  <span class="nodeLabel">+unhandled_exception() : void</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -185.1875, 91)" height="18" width="370.375">
+              <foreignObject transform="translate( -180.7421875, 91)" height="18" width="361.484375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+yield_value(From &amp;&amp; from) : : std::suspend_always</span>
+                  <span class="nodeLabel">+yield_value(From &amp;&amp; from) : std::suspend_always</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(200.6875, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L7">
+        <a transform="translate(196.2421875, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7">
           <g title="generator" id="classId-C_0001604358347140526608-2" class="node default clickable">
             <rect height="57" width="216.8125" y="-28.5" x="-108.40625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="108.40625" x1="-108.40625" class="divider"/>
@@ -212,11 +207,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(200.6875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00069/t00069.cc#L48">
+        <a transform="translate(196.2421875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L48">
           <g title="A" id="classId-C_0002160142503252767290-3" class="node default clickable">
-            <rect height="123" width="357.90625" y="-61.5" x="-178.953125" class="outer title-state"/>
-            <line y2="-31.5" y1="-31.5" x2="178.953125" x1="-178.953125" class="divider"/>
-            <line y2="6.5" y1="6.5" x2="178.953125" x1="-178.953125" class="divider"/>
+            <rect height="123" width="349.015625" y="-61.5" x="-174.5078125" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="174.5078125" x1="-174.5078125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="174.5078125" x1="-174.5078125" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -228,19 +223,19 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -171.453125, -20)" height="18" width="180.578125">
+              <foreignObject transform="translate( -167.0078125, -20)" height="18" width="180.578125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-counter_ : unsigned long</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -171.453125, 14)" height="18" width="334">
+              <foreignObject transform="translate( -167.0078125, 14)" height="18" width="325.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+iota() : : [coroutine] generator&lt;unsigned long&gt;</span>
+                  <span class="nodeLabel">+iota() : [coroutine] generator&lt;unsigned long&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -171.453125, 36)" height="18" width="342.90625">
+              <foreignObject transform="translate( -167.0078125, 36)" height="18" width="334.015625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">+seed() : : [coroutine] generator&lt;unsigned long&gt;</span>
+                  <span class="nodeLabel">+seed() : [coroutine] generator&lt;unsigned long&gt;</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00070.md b/docs/test_cases/t00070.md
index 4d317017..047fa287 100644
--- a/docs/test_cases/t00070.md
+++ b/docs/test_cases/t00070.md
@@ -35,6 +35,34 @@ int tmain()
 }
 }
 ```
+File `tests/t00070/src/common.cppm`
+```cpp
+export module t00070;
+export import t00070.lib1;
+export import t00070.lib2;
+
+export namespace clanguml::t00070 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
+```
+File `tests/t00070/src/lib2.cppm`
+```cpp
+export module t00070.lib2;
+
+export namespace clanguml::t00070 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+enum class CCC { ccc1, ccc2 };
+}
+```
 File `tests/t00070/src/lib1.cppm`
 ```cpp
 export module t00070.lib1;
@@ -54,34 +82,6 @@ namespace clanguml::t00070 {
 class BBBB { };
 }
 ```
-File `tests/t00070/src/lib2.cppm`
-```cpp
-export module t00070.lib2;
-
-export namespace clanguml::t00070 {
-class C { };
-
-template <typename T> class CC {
-    T t;
-};
-
-enum class CCC { ccc1, ccc2 };
-}
-```
-File `tests/t00070/src/common.cppm`
-```cpp
-export module t00070;
-export import t00070.lib1;
-export import t00070.lib2;
-
-export namespace clanguml::t00070 {
-class A {
-    int get() { return a; }
-
-    int a;
-};
-}
-```
 ## Generated PlantUML diagrams
 ![t00070_class](./t00070_class.svg "Diagram filter based on C++20 modules")
 ## Generated Mermaid diagrams
@@ -93,7 +93,7 @@ class A {
   "elements": [
     {
       "bases": [],
-      "display_name": "clanguml::t00070::B",
+      "display_name": "B",
       "id": "1364261599035905834",
       "is_abstract": false,
       "is_nested": false,
@@ -119,7 +119,7 @@ class A {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00070::BB<T>",
+      "display_name": "BB<T>",
       "id": "1485755083045282660",
       "is_abstract": false,
       "is_nested": false,
@@ -168,7 +168,7 @@ class A {
         "bbb1",
         "bbb2"
       ],
-      "display_name": "clanguml::t00070::BBB",
+      "display_name": "BBB",
       "id": "1734694076622541097",
       "is_nested": false,
       "module": {
@@ -187,7 +187,7 @@ class A {
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00070::A",
+      "display_name": "A",
       "id": "668221430913861424",
       "is_abstract": false,
       "is_nested": false,
@@ -253,6 +253,7 @@ class A {
     }
   ],
   "name": "t00070_class",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t00070"
 }
diff --git a/docs/test_cases/t00070_class.svg b/docs/test_cases/t00070_class.svg
index ba83c587..e565509b 100644
--- a/docs/test_cases/t00070_class.svg
+++ b/docs/test_cases/t00070_class.svg
@@ -1,72 +1,70 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="223px" preserveAspectRatio="none" style="width:191px;height:223px;background:#FFFFFF;" version="1.1" viewBox="0 0 191 223" width="191px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:186px;height:213px;" version="1.1" viewBox="0 0 186 213" width="186px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1xdj2zc8no9nj" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001364261599035905834">
-        <rect codeLine="2" fill="#F1F1F1" height="48" id="C_0001364261599035905834" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="16" y="18.4"/>
-        <ellipse cx="31" cy="34.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M26,35.5563 C26,38.0563 28.1406,39.8688 31.0625,39.8688 C32.2969,39.8688 33.4688,39.5719 34.2188,39.0563 C34.8281,38.6344 35.1563,38.2125 35.1563,37.8063 C35.1563,37.3375 34.7344,36.9313 34.2344,36.9313 C34,36.9313 33.7813,37.0094 33.5781,37.2125 C33.1406,37.65 33.1406,37.65 32.9688,37.7438 C32.5156,37.9781 31.875,38.1188 31.1094,38.1188 C29.1094,38.1188 27.8281,37.1031 27.8281,35.525 L27.8281,34.4781 C27.8281,32.775 29.0469,31.5719 30.75,31.5719 C31.3281,31.5719 31.9063,31.7125 32.375,31.9625 C32.8438,32.2281 33.0156,32.4156 33.0781,32.775 C33.2031,33.4469 33.4531,33.6969 33.9844,33.6969 C34.2656,33.6969 34.5469,33.5563 34.7344,33.3375 C34.8594,33.1656 34.9063,32.9938 34.9063,32.5563 L34.9063,31.1969 C34.9063,30.775 34.8906,30.6344 34.7656,30.4625 C34.5938,30.2125 34.3125,30.0563 33.9844,30.0563 C33.6719,30.0563 33.4688,30.1656 33.25,30.4313 C32.0781,29.9313 31.6406,29.8219 30.6875,29.8219 C28.0156,29.8219 26,31.8375 26,34.4625 L26,35.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="45" y="39.006">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="17" x2="56" y1="50.4" y2="50.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="17" x2="56" y1="58.4" y2="58.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xdj2zc8no9nj)" height="48" id="C_0001364261599035905834" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="14" y="14.5"/>
+      <ellipse cx="29" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M31.9688,36.1406 Q31.3906,36.4375 30.75,36.5781 Q30.1094,36.7344 29.4063,36.7344 Q26.9063,36.7344 25.5781,35.0938 Q24.2656,33.4375 24.2656,30.3125 Q24.2656,27.1875 25.5781,25.5313 Q26.9063,23.875 29.4063,23.875 Q30.1094,23.875 30.75,24.0313 Q31.4063,24.1875 31.9688,24.4844 L31.9688,27.2031 Q31.3438,26.625 30.75,26.3594 Q30.1563,26.0781 29.5313,26.0781 Q28.1875,26.0781 27.5,27.1563 Q26.8125,28.2188 26.8125,30.3125 Q26.8125,32.4063 27.5,33.4844 Q28.1875,34.5469 29.5313,34.5469 Q30.1563,34.5469 30.75,34.2813 Q31.3438,34 31.9688,33.4219 L31.9688,36.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="43" y="34.6543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="53" y1="46.5" y2="46.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="53" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <g id="elem_C_0001485755083045282660">
-        <rect codeLine="6" fill="#F1F1F1" height="64.7999" id="C_0001485755083045282660" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="92" y="10"/>
-        <ellipse cx="107" cy="26" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M102,27.1563 C102,29.6563 104.1406,31.4688 107.0625,31.4688 C108.2969,31.4688 109.4688,31.1719 110.2188,30.6563 C110.8281,30.2344 111.1563,29.8125 111.1563,29.4063 C111.1563,28.9375 110.7344,28.5313 110.2344,28.5313 C110,28.5313 109.7813,28.6094 109.5781,28.8125 C109.1406,29.25 109.1406,29.25 108.9688,29.3438 C108.5156,29.5781 107.875,29.7188 107.1094,29.7188 C105.1094,29.7188 103.8281,28.7031 103.8281,27.125 L103.8281,26.0781 C103.8281,24.375 105.0469,23.1719 106.75,23.1719 C107.3281,23.1719 107.9063,23.3125 108.375,23.5625 C108.8438,23.8281 109.0156,24.0156 109.0781,24.375 C109.2031,25.0469 109.4531,25.2969 109.9844,25.2969 C110.2656,25.2969 110.5469,25.1563 110.7344,24.9375 C110.8594,24.7656 110.9063,24.5938 110.9063,24.1563 L110.9063,22.7969 C110.9063,22.375 110.8906,22.2344 110.7656,22.0625 C110.5938,21.8125 110.3125,21.6563 109.9844,21.6563 C109.6719,21.6563 109.4688,21.7656 109.25,22.0313 C108.0781,21.5313 107.6406,21.4219 106.6875,21.4219 C104.0156,21.4219 102,23.4375 102,26.0625 L102,27.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="121" y="30.606">BB</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="147" y="7"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="148" y="21.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="93" x2="152" y1="42" y2="42"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="93" x2="152" y1="50" y2="50"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="98" y="58.9"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="100" y="60.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="112" y="67.0059">t : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xdj2zc8no9nj)" height="60.8047" id="C_0001485755083045282660" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="89.5" y="8"/>
+      <ellipse cx="104.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M107.4688,29.6406 Q106.8906,29.9375 106.25,30.0781 Q105.6094,30.2344 104.9063,30.2344 Q102.4063,30.2344 101.0781,28.5938 Q99.7656,26.9375 99.7656,23.8125 Q99.7656,20.6875 101.0781,19.0313 Q102.4063,17.375 104.9063,17.375 Q105.6094,17.375 106.25,17.5313 Q106.9063,17.6875 107.4688,17.9844 L107.4688,20.7031 Q106.8438,20.125 106.25,19.8594 Q105.6563,19.5781 105.0313,19.5781 Q103.6875,19.5781 103,20.6563 Q102.3125,21.7188 102.3125,23.8125 Q102.3125,25.9063 103,26.9844 Q103.6875,28.0469 105.0313,28.0469 Q105.6563,28.0469 106.25,27.7813 Q106.8438,27.5 107.4688,26.9219 L107.4688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="118.5" y="28.1543">BB</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="142.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="143.5" y="17.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="147.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="147.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L10" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L10" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <g id="elem_C_0001734694076622541097">
-        <rect codeLine="11" fill="#F1F1F1" height="81.5999" id="C_0001734694076622541097" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="7" y="134.8"/>
-        <ellipse cx="22" cy="150.8" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M20.8594,151.8625 L22.1719,151.8625 L22.1719,151.9094 C22.1719,152.3156 22.1875,152.4719 22.2969,152.6281 C22.4688,152.8781 22.7656,153.05 23.0781,153.05 C23.3594,153.05 23.6563,152.9094 23.8281,152.6906 C23.9531,152.5031 24,152.3625 24,151.9094 L24,150.0656 C24,149.7375 23.9844,149.6281 23.9219,149.4563 C23.8125,149.1594 23.4531,148.9094 23.0781,148.9094 C22.7813,148.9094 22.5156,149.05 22.3438,149.2688 C22.2031,149.4563 22.1719,149.6281 22.1719,150.0656 L22.1719,150.1281 L20.8594,150.1281 L20.8594,147.9563 L24.7031,147.9563 L24.7031,148.7063 C24.7031,149.0969 24.7344,149.2844 24.8438,149.4406 C25.0156,149.6906 25.3125,149.8625 25.625,149.8625 C25.9219,149.8625 26.1875,149.7375 26.375,149.5031 C26.5156,149.3156 26.5469,149.175 26.5469,148.7063 L26.5469,146.2063 L18.8438,146.2063 C18.3906,146.2063 18.2656,146.2219 18.0938,146.3313 C17.8281,146.5031 17.6563,146.7688 17.6563,147.0813 C17.6563,147.3625 17.7813,147.6281 18.0313,147.8 C18.2188,147.925 18.4063,147.9563 18.8438,147.9563 L19.0313,147.9563 L19.0313,154.05 L18.8438,154.05 C18.4219,154.05 18.2656,154.0813 18.0938,154.175 C17.8281,154.3313 17.6563,154.6125 17.6563,154.9094 C17.6563,155.4875 18.0625,155.8 18.8438,155.8 L26.9219,155.8 L26.9219,153.2688 C26.9219,152.8625 26.8906,152.6906 26.7813,152.5344 C26.6094,152.2688 26.3281,152.1125 26,152.1125 C25.7188,152.1125 25.4375,152.2531 25.25,152.4719 C25.1094,152.6594 25.0781,152.8156 25.0781,153.2688 L25.0781,154.05 L20.8594,154.05 L20.8594,151.8625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="27" x="36" y="155.406">BBB</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="65" y1="166.8" y2="166.8"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="13" y="183.8059">bbb1</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="13" y="200.6059">bbb2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="65" y1="208.3999" y2="208.3999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="54"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="97.5" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0000668221430913861424">
-        <rect codeLine="16" fill="#F1F1F1" height="81.5999" id="C_0000668221430913861424" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="101" y="134.8"/>
-        <ellipse cx="134.9" cy="150.8" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M129.9,151.9563 C129.9,154.4563 132.0406,156.2688 134.9625,156.2688 C136.1969,156.2688 137.3688,155.9719 138.1188,155.4563 C138.7281,155.0344 139.0563,154.6125 139.0563,154.2063 C139.0563,153.7375 138.6344,153.3313 138.1344,153.3313 C137.9,153.3313 137.6813,153.4094 137.4781,153.6125 C137.0406,154.05 137.0406,154.05 136.8688,154.1438 C136.4156,154.3781 135.775,154.5188 135.0094,154.5188 C133.0094,154.5188 131.7281,153.5031 131.7281,151.925 L131.7281,150.8781 C131.7281,149.175 132.9469,147.9719 134.65,147.9719 C135.2281,147.9719 135.8063,148.1125 136.275,148.3625 C136.7438,148.6281 136.9156,148.8156 136.9781,149.175 C137.1031,149.8469 137.3531,150.0969 137.8844,150.0969 C138.1656,150.0969 138.4469,149.9563 138.6344,149.7375 C138.7594,149.5656 138.8063,149.3938 138.8063,148.9563 L138.8063,147.5969 C138.8063,147.175 138.7906,147.0344 138.6656,146.8625 C138.4938,146.6125 138.2125,146.4563 137.8844,146.4563 C137.5719,146.4563 137.3688,146.5656 137.15,146.8313 C135.9781,146.3313 135.5406,146.2219 134.5875,146.2219 C131.9156,146.2219 129.9,148.2375 129.9,150.8625 L129.9,151.9563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="153.1" y="155.406">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="102" x2="183" y1="166.8" y2="166.8"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="107" y="175.7"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="109" y="177.7"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="121" y="183.8059">get() : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="102" x2="183" y1="191.5999" y2="191.5999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="107" y="200.4999"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="109" y="202.4999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="121" y="208.6059">a : int</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="109.5" y="62.2104">t : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L10" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L10" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xdj2zc8no9nj)" height="73.6094" id="C_0001734694076622541097" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="6" y="129"/>
+      <ellipse cx="21" cy="145" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M25.1094,151 L17.3906,151 L17.3906,138.6094 L25.1094,138.6094 L25.1094,140.7656 L19.8438,140.7656 L19.8438,143.4375 L24.6094,143.4375 L24.6094,145.5938 L19.8438,145.5938 L19.8438,148.8438 L25.1094,148.8438 L25.1094,151 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="35" y="149.1543">BBB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="61" y1="161" y2="161"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="12" y="175.2104">bbb1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="12" y="188.0151">bbb2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="61" y1="194.6094" y2="194.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xdj2zc8no9nj)" height="73.6094" id="C_0000668221430913861424" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="97" y="129"/>
+      <ellipse cx="129.1" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M132.0688,150.6406 Q131.4906,150.9375 130.85,151.0781 Q130.2094,151.2344 129.5063,151.2344 Q127.0063,151.2344 125.6781,149.5938 Q124.3656,147.9375 124.3656,144.8125 Q124.3656,141.6875 125.6781,140.0313 Q127.0063,138.375 129.5063,138.375 Q130.2094,138.375 130.85,138.5313 Q131.5063,138.6875 132.0688,138.9844 L132.0688,141.7031 Q131.4438,141.125 130.85,140.8594 Q130.2563,140.5781 129.6313,140.5781 Q128.2875,140.5781 127.6,141.6563 Q126.9125,142.7188 126.9125,144.8125 Q126.9125,146.9063 127.6,147.9844 Q128.2875,149.0469 129.6313,149.0469 Q130.2563,149.0469 130.85,148.7813 Q131.4438,148.5 132.0688,147.9219 L132.0688,150.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="146.9" y="149.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="174" y1="161" y2="161"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="103" y="167"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="105" y="169"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="117" y="175.2104">get() : int</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="174" y1="181.8047" y2="181.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="103" y="187.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="105" y="189.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="117" y="196.0151">a : int</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00070_class_mermaid.svg b/docs/test_cases/t00070_class_mermaid.svg
index f611352c..93b009ed 100644
--- a/docs/test_cases/t00070_class_mermaid.svg
+++ b/docs/test_cases/t00070_class_mermaid.svg
@@ -1,55 +1,50 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 473.25 139" style="max-width: 473.25px; background-color: white;" width="473.25" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 464.359375 139" style="max-width: 464.359px; background-color: white;" width="464.359375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
@@ -57,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L4">
+        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L4">
           <g title="B" id="classId-C_0001364261599035905834-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -76,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L6">
+        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L6">
           <g title="BB" id="classId-C_0001485755083045282660-1" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -100,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/lib1.cppm#L10">
+        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L10">
           <g title="BBB" id="classId-C_0001734694076622541097-2" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -129,11 +124,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(419.0703125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00070/src/common.cppm#L6">
+        <a transform="translate(414.625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L6">
           <g title="A" id="classId-C_0000668221430913861424-3" class="node default clickable">
-            <rect height="101" width="92.359375" y="-50.5" x="-46.1796875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
+            <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="41.734375" x1="-41.734375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -145,14 +140,14 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -38.6796875, -9)" height="18" width="44.46875">
+              <foreignObject transform="translate( -34.234375, -9)" height="18" width="44.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-a : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -38.6796875, 25)" height="18" width="77.359375">
+              <foreignObject transform="translate( -34.234375, 25)" height="18" width="68.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-get() : : int</span>
+                  <span class="nodeLabel">-get() : int</span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00071.md b/docs/test_cases/t00071.md
index 279feac0..abf6dfcd 100644
--- a/docs/test_cases/t00071.md
+++ b/docs/test_cases/t00071.md
@@ -33,20 +33,26 @@ class R {
 }
 }
 ```
-File `tests/t00071/src/lib1.cppm`
+File `tests/t00071/src/lib1mod2.cppm`
 ```cpp
-export module t00071.app.lib1;
+export module t00071.app.lib1.mod2;
 
 export namespace clanguml::t00071 {
-class B { };
+class E { };
+}
+```
+File `tests/t00071/src/t00071_mod.cppm`
+```cpp
+export module t00071.app;
+export import t00071.app.lib1;
+export import t00071.app.lib2;
 
-template <typename T> class BB {
-    T t;
+export namespace clanguml::t00071 {
+class A {
+    int get() { return a; }
+
+    int a;
 };
-
-namespace detail {
-enum class BBB { bbb1, bbb2 };
-} // namespace detail
 }
 ```
 File `tests/t00071/src/lib2.cppm`
@@ -65,6 +71,22 @@ enum class CCC { ccc1, ccc2 };
 }
 }
 ```
+File `tests/t00071/src/lib1.cppm`
+```cpp
+export module t00071.app.lib1;
+
+export namespace clanguml::t00071 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+}
+```
 File `tests/t00071/src/lib1mod1.cppm`
 ```cpp
 export module t00071.app.lib1.mod1;
@@ -73,28 +95,6 @@ export namespace clanguml::t00071 {
 class D { };
 }
 ```
-File `tests/t00071/src/t00071_mod.cppm`
-```cpp
-export module t00071.app;
-export import t00071.app.lib1;
-export import t00071.app.lib2;
-
-export namespace clanguml::t00071 {
-class A {
-    int get() { return a; }
-
-    int a;
-};
-}
-```
-File `tests/t00071/src/lib1mod2.cppm`
-```cpp
-export module t00071.app.lib1.mod2;
-
-export namespace clanguml::t00071 {
-class E { };
-}
-```
 ## Generated PlantUML diagrams
 ![t00071_class](./t00071_class.svg "Class diagram with C++20 modules generated as packages")
 ## Generated Mermaid diagrams
@@ -108,11 +108,11 @@ class E { };
       "display_name": "app",
       "elements": [
         {
-          "display_name": "app::lib1",
+          "display_name": "lib1",
           "elements": [
             {
               "bases": [],
-              "display_name": "clanguml::t00071::B",
+              "display_name": "B",
               "id": "1319862510251967999",
               "is_abstract": false,
               "is_nested": false,
@@ -138,7 +138,7 @@ class E { };
             },
             {
               "bases": [],
-              "display_name": "clanguml::t00071::BB<T>",
+              "display_name": "BB<T>",
               "id": "569632796637866961",
               "is_abstract": false,
               "is_nested": false,
@@ -187,7 +187,7 @@ class E { };
                 "bbb1",
                 "bbb2"
               ],
-              "display_name": "clanguml::t00071::detail::BBB",
+              "display_name": "detail::BBB",
               "id": "1625078061541942293",
               "is_nested": false,
               "module": {
@@ -205,11 +205,11 @@ class E { };
               "type": "enum"
             },
             {
-              "display_name": "app::lib1::mod1",
+              "display_name": "mod1",
               "elements": [
                 {
                   "bases": [],
-                  "display_name": "clanguml::t00071::D",
+                  "display_name": "D",
                   "id": "1168777064323042894",
                   "is_abstract": false,
                   "is_nested": false,
@@ -238,11 +238,11 @@ class E { };
               "type": "module"
             },
             {
-              "display_name": "app::lib1::mod2",
+              "display_name": "mod2",
               "elements": [
                 {
                   "bases": [],
-                  "display_name": "clanguml::t00071::E",
+                  "display_name": "E",
                   "id": "1302694761523535504",
                   "is_abstract": false,
                   "is_nested": false,
@@ -275,11 +275,11 @@ class E { };
           "type": "module"
         },
         {
-          "display_name": "app::lib2",
+          "display_name": "lib2",
           "elements": [
             {
               "bases": [],
-              "display_name": "clanguml::t00071::C",
+              "display_name": "C",
               "id": "1697463991772603674",
               "is_abstract": false,
               "is_nested": false,
@@ -305,7 +305,7 @@ class E { };
             },
             {
               "bases": [],
-              "display_name": "clanguml::t00071::CC<T>",
+              "display_name": "CC<T>",
               "id": "1911193033649971391",
               "is_abstract": false,
               "is_nested": false,
@@ -354,7 +354,7 @@ class E { };
                 "ccc1",
                 "ccc2"
               ],
-              "display_name": "clanguml::t00071::detail::CCC",
+              "display_name": "detail::CCC",
               "id": "931278702894205804",
               "is_nested": false,
               "module": {
@@ -377,7 +377,7 @@ class E { };
         },
         {
           "bases": [],
-          "display_name": "clanguml::t00071::A",
+          "display_name": "A",
           "id": "2210005074053139118",
           "is_abstract": false,
           "is_nested": false,
@@ -447,7 +447,7 @@ class E { };
     },
     {
       "bases": [],
-      "display_name": "clanguml::t00071::R",
+      "display_name": "R",
       "id": "1629943620359873327",
       "is_abstract": false,
       "is_nested": false,
@@ -506,6 +506,7 @@ class E { };
     }
   ],
   "name": "t00071_class",
+  "package_type": "module",
   "relationships": [
     {
       "access": "private",
@@ -529,6 +530,7 @@ class E { };
       "type": "association"
     }
   ],
+  "using_module": "t00071",
   "using_namespace": "clanguml::t00071"
 }
 ```
diff --git a/docs/test_cases/t00071_class.svg b/docs/test_cases/t00071_class.svg
index e6978d13..9437afb6 100644
--- a/docs/test_cases/t00071_class.svg
+++ b/docs/test_cases/t00071_class.svg
@@ -1,204 +1,174 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="408px" preserveAspectRatio="none" style="width:992px;height:408px;background:#FFFFFF;" version="1.1" viewBox="0 0 992 408" width="992px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1004px;height:402px;" version="1.1" viewBox="0 0 1004 402" width="1004px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1cavn93cid27x" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0002001320261642080149">
-      <path d="M8.5,168.4 L35.5,168.4 A3.75,3.75 0 0 1 38,170.9 L45,191.1999 L982.5,191.1999 A2.5,2.5 0 0 1 985,193.6999 L985,398.9 A2.5,2.5 0 0 1 982.5,401.4 L8.5,401.4 A2.5,2.5 0 0 1 6,398.9 L6,170.9 A2.5,2.5 0 0 1 8.5,168.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="45" y1="191.1999" y2="191.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="10" y="183.4059">app</text>
-    </g>
-    <g id="cluster_C_0000134702274523771711">
-      <path d="M126.5,211.4 L152.5,211.4 A3.75,3.75 0 0 1 155,213.9 L162,234.1999 L624.5,234.1999 A2.5,2.5 0 0 1 627,236.6999 L627,374.9 A2.5,2.5 0 0 1 624.5,377.4 L126.5,377.4 A2.5,2.5 0 0 1 124,374.9 L124,213.9 A2.5,2.5 0 0 1 126.5,211.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="124" x2="162" y1="234.1999" y2="234.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="128" y="226.4059">lib1</text>
-    </g>
-    <g id="cluster_C_0001936594361848936362">
-      <path d="M531.5,254.4 L570.5,254.4 A3.75,3.75 0 0 1 573,256.9 L580,277.1999 L600.5,277.1999 A2.5,2.5 0 0 1 603,279.6999 L603,350.9 A2.5,2.5 0 0 1 600.5,353.4 L531.5,353.4 A2.5,2.5 0 0 1 529,350.9 L529,256.9 A2.5,2.5 0 0 1 531.5,254.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="529" x2="580" y1="277.1999" y2="277.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="533" y="269.4059">mod1</text>
-    </g>
-    <g id="cluster_C_0001593800309768706851">
-      <path d="M435.5,254.4 L474.5,254.4 A3.75,3.75 0 0 1 477,256.9 L484,277.1999 L502.5,277.1999 A2.5,2.5 0 0 1 505,279.6999 L505,350.9 A2.5,2.5 0 0 1 502.5,353.4 L435.5,353.4 A2.5,2.5 0 0 1 433,350.9 L433,256.9 A2.5,2.5 0 0 1 435.5,254.4 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="433" x2="484" y1="277.1999" y2="277.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="437" y="269.4059">mod2</text>
-    </g>
-    <g id="cluster_C_0000572912820161417686">
-      <path d="M653.5,237.6 L679.5,237.6 A3.75,3.75 0 0 1 682,240.1 L689,260.3999 L958.5,260.3999 A2.5,2.5 0 0 1 961,262.8999 L961,367.7 A2.5,2.5 0 0 1 958.5,370.2 L653.5,370.2 A2.5,2.5 0 0 1 651,367.7 L651,240.1 A2.5,2.5 0 0 1 653.5,237.6 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="651" x2="689" y1="260.3999" y2="260.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="655" y="252.6059">lib2</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <g id="elem_C_0002210005074053139118">
-        <rect codeLine="47" fill="#F1F1F1" height="81.5999" id="C_0002210005074053139118" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="83" x="22.5" y="272.6"/>
-        <ellipse cx="56.4" cy="288.6" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M51.4,289.7562 C51.4,292.2562 53.5406,294.0687 56.4625,294.0687 C57.6969,294.0687 58.8688,293.7719 59.6188,293.2562 C60.2281,292.8344 60.5563,292.4125 60.5563,292.0062 C60.5563,291.5375 60.1344,291.1312 59.6344,291.1312 C59.4,291.1312 59.1813,291.2094 58.9781,291.4125 C58.5406,291.85 58.5406,291.85 58.3688,291.9437 C57.9156,292.1781 57.275,292.3187 56.5094,292.3187 C54.5094,292.3187 53.2281,291.3031 53.2281,289.725 L53.2281,288.6781 C53.2281,286.975 54.4469,285.7719 56.15,285.7719 C56.7281,285.7719 57.3063,285.9125 57.775,286.1625 C58.2438,286.4281 58.4156,286.6156 58.4781,286.975 C58.6031,287.6469 58.8531,287.8969 59.3844,287.8969 C59.6656,287.8969 59.9469,287.7562 60.1344,287.5375 C60.2594,287.3656 60.3063,287.1937 60.3063,286.7562 L60.3063,285.3969 C60.3063,284.975 60.2906,284.8344 60.1656,284.6625 C59.9938,284.4125 59.7125,284.2562 59.3844,284.2562 C59.0719,284.2562 58.8688,284.3656 58.65,284.6312 C57.4781,284.1312 57.0406,284.0219 56.0875,284.0219 C53.4156,284.0219 51.4,286.0375 51.4,288.6625 L51.4,289.7562 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="74.6" y="293.206">A</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="23.5" x2="104.5" y1="304.6" y2="304.6"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="28.5" y="313.5"/>
-          <rect fill="#F24D5C" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="30.5" y="315.5"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="42.5" y="321.6059">get() : int</text>
-        </a>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="23.5" x2="104.5" y1="329.3999" y2="329.3999"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="28.5" y="338.2999"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="30.5" y="340.2999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="42.5" y="346.4059">a : int</text>
-        </a>
-      </g>
+    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="22,157,57,157,64,179.2969,982,179.2969,982,390,22,390,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="179.2969" y2="179.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="171.9951">app</text>
+    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="135,200,169,200,176,222.2969,633,222.2969,633,366,135,366,135,200" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="135" x2="176" y1="222.2969" y2="222.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="139" y="214.9951">lib1</text>
+    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="535,243,585,243,592,265.2969,609,265.2969,609,342,535,342,535,243" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="535" x2="592" y1="265.2969" y2="265.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="539" y="257.9951">mod1</text>
+    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="439,243,489,243,496,265.2969,511,265.2969,511,342,439,342,439,243" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="439" x2="496" y1="265.2969" y2="265.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="443" y="257.9951">mod2</text>
+    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="657,230,691,230,698,252.2969,958,252.2969,958,355,657,355,657,230" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="657" x2="698" y1="252.2969" y2="252.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="661" y="244.9951">lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="73.6094" id="C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="265"/>
+      <ellipse cx="70.1" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M73.0688,286.6406 Q72.4906,286.9375 71.85,287.0781 Q71.2094,287.2344 70.5063,287.2344 Q68.0063,287.2344 66.6781,285.5938 Q65.3656,283.9375 65.3656,280.8125 Q65.3656,277.6875 66.6781,276.0313 Q68.0063,274.375 70.5063,274.375 Q71.2094,274.375 71.85,274.5313 Q72.5063,274.6875 73.0688,274.9844 L73.0688,277.7031 Q72.4438,277.125 71.85,276.8594 Q71.2563,276.5781 70.6313,276.5781 Q69.2875,276.5781 68.6,277.6563 Q67.9125,278.7188 67.9125,280.8125 Q67.9125,282.9063 68.6,283.9844 Q69.2875,285.0469 70.6313,285.0469 Q71.2563,285.0469 71.85,284.7813 Q72.4438,284.5 73.0688,283.9219 L73.0688,286.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="87.9" y="285.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <g id="elem_C_0001319862510251967999">
-        <rect codeLine="4" fill="#F1F1F1" height="48" id="C_0001319862510251967999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="372.5" y="289.4"/>
-        <ellipse cx="387.5" cy="305.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M382.5,306.5563 C382.5,309.0563 384.6406,310.8688 387.5625,310.8688 C388.7969,310.8688 389.9688,310.5719 390.7188,310.0563 C391.3281,309.6344 391.6563,309.2125 391.6563,308.8063 C391.6563,308.3375 391.2344,307.9313 390.7344,307.9313 C390.5,307.9313 390.2813,308.0094 390.0781,308.2125 C389.6406,308.65 389.6406,308.65 389.4688,308.7438 C389.0156,308.9781 388.375,309.1188 387.6094,309.1188 C385.6094,309.1188 384.3281,308.1031 384.3281,306.525 L384.3281,305.4781 C384.3281,303.775 385.5469,302.5719 387.25,302.5719 C387.8281,302.5719 388.4063,302.7125 388.875,302.9625 C389.3438,303.2281 389.5156,303.4156 389.5781,303.775 C389.7031,304.4469 389.9531,304.6969 390.4844,304.6969 C390.7656,304.6969 391.0469,304.5563 391.2344,304.3375 C391.3594,304.1656 391.4063,303.9938 391.4063,303.5563 L391.4063,302.1969 C391.4063,301.775 391.3906,301.6344 391.2656,301.4625 C391.0938,301.2125 390.8125,301.0563 390.4844,301.0563 C390.1719,301.0563 389.9688,301.1656 389.75,301.4313 C388.5781,300.9313 388.1406,300.8219 387.1875,300.8219 C384.5156,300.8219 382.5,302.8375 382.5,305.4625 L382.5,306.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="401.5" y="310.006">B</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="373.5" x2="412.5" y1="321.4" y2="321.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="373.5" x2="412.5" y1="329.4" y2="329.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="303"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <g id="elem_C_0000569632796637866961">
-        <rect codeLine="8" fill="#F1F1F1" height="64.7999" id="C_0000569632796637866961" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="61" x="276.5" y="281"/>
-        <ellipse cx="291.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M286.5,298.1563 C286.5,300.6563 288.6406,302.4688 291.5625,302.4688 C292.7969,302.4688 293.9688,302.1719 294.7188,301.6563 C295.3281,301.2344 295.6563,300.8125 295.6563,300.4063 C295.6563,299.9375 295.2344,299.5313 294.7344,299.5313 C294.5,299.5313 294.2813,299.6094 294.0781,299.8125 C293.6406,300.25 293.6406,300.25 293.4688,300.3438 C293.0156,300.5781 292.375,300.7188 291.6094,300.7188 C289.6094,300.7188 288.3281,299.7031 288.3281,298.125 L288.3281,297.0781 C288.3281,295.375 289.5469,294.1719 291.25,294.1719 C291.8281,294.1719 292.4063,294.3125 292.875,294.5625 C293.3438,294.8281 293.5156,295.0156 293.5781,295.375 C293.7031,296.0469 293.9531,296.2969 294.4844,296.2969 C294.7656,296.2969 295.0469,296.1563 295.2344,295.9375 C295.3594,295.7656 295.4063,295.5938 295.4063,295.1563 L295.4063,293.7969 C295.4063,293.375 295.3906,293.2344 295.2656,293.0625 C295.0938,292.8125 294.8125,292.6563 294.4844,292.6563 C294.1719,292.6563 293.9688,292.7656 293.75,293.0313 C292.5781,292.5313 292.1406,292.4219 291.1875,292.4219 C288.5156,292.4219 286.5,294.4375 286.5,297.0625 L286.5,298.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="305.5" y="301.606">BB</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="331.5" y="278"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="332.5" y="292.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="277.5" x2="336.5" y1="313" y2="313"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="277.5" x2="336.5" y1="321" y2="321"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="282.5" y="329.9"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="284.5" y="331.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="296.5" y="338.0059">t : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="58" y="311.2104">get() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <g id="elem_C_0001625078061541942293">
-        <rect codeLine="13" fill="#F1F1F1" height="81.5999" id="C_0001625078061541942293" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="140.5" y="272.6"/>
-        <ellipse cx="155.5" cy="288.6" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M154.3594,289.6625 L155.6719,289.6625 L155.6719,289.7094 C155.6719,290.1156 155.6875,290.2719 155.7969,290.4281 C155.9688,290.6781 156.2656,290.85 156.5781,290.85 C156.8594,290.85 157.1563,290.7094 157.3281,290.4906 C157.4531,290.3031 157.5,290.1625 157.5,289.7094 L157.5,287.8656 C157.5,287.5375 157.4844,287.4281 157.4219,287.2562 C157.3125,286.9594 156.9531,286.7094 156.5781,286.7094 C156.2813,286.7094 156.0156,286.85 155.8438,287.0687 C155.7031,287.2562 155.6719,287.4281 155.6719,287.8656 L155.6719,287.9281 L154.3594,287.9281 L154.3594,285.7562 L158.2031,285.7562 L158.2031,286.5062 C158.2031,286.8969 158.2344,287.0844 158.3438,287.2406 C158.5156,287.4906 158.8125,287.6625 159.125,287.6625 C159.4219,287.6625 159.6875,287.5375 159.875,287.3031 C160.0156,287.1156 160.0469,286.975 160.0469,286.5062 L160.0469,284.0062 L152.3438,284.0062 C151.8906,284.0062 151.7656,284.0219 151.5938,284.1312 C151.3281,284.3031 151.1563,284.5687 151.1563,284.8812 C151.1563,285.1625 151.2813,285.4281 151.5313,285.6 C151.7188,285.725 151.9063,285.7562 152.3438,285.7562 L152.5313,285.7562 L152.5313,291.85 L152.3438,291.85 C151.9219,291.85 151.7656,291.8812 151.5938,291.975 C151.3281,292.1312 151.1563,292.4125 151.1563,292.7094 C151.1563,293.2875 151.5625,293.6 152.3438,293.6 L160.4219,293.6 L160.4219,291.0687 C160.4219,290.6625 160.3906,290.4906 160.2813,290.3344 C160.1094,290.0687 159.8281,289.9125 159.5,289.9125 C159.2188,289.9125 158.9375,290.0531 158.75,290.2719 C158.6094,290.4594 158.5781,290.6156 158.5781,291.0687 L158.5781,291.85 L154.3594,291.85 L154.3594,289.6625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69" x="169.5" y="293.206">detail::BBB</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="141.5" x2="240.5" y1="304.6" y2="304.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="146.5" y="321.6059">bbb1</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="146.5" y="338.4059">bbb2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="141.5" x2="240.5" y1="346.1999" y2="346.1999"/>
-      </g>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="317.8047" y2="317.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="323.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="325.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <g id="elem_C_0001168777064323042894">
-        <rect codeLine="19" fill="#F1F1F1" height="48" id="C_0001168777064323042894" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="545" y="289.4"/>
-        <ellipse cx="560" cy="305.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M555,306.5563 C555,309.0563 557.1406,310.8688 560.0625,310.8688 C561.2969,310.8688 562.4688,310.5719 563.2188,310.0563 C563.8281,309.6344 564.1563,309.2125 564.1563,308.8063 C564.1563,308.3375 563.7344,307.9313 563.2344,307.9313 C563,307.9313 562.7813,308.0094 562.5781,308.2125 C562.1406,308.65 562.1406,308.65 561.9688,308.7438 C561.5156,308.9781 560.875,309.1188 560.1094,309.1188 C558.1094,309.1188 556.8281,308.1031 556.8281,306.525 L556.8281,305.4781 C556.8281,303.775 558.0469,302.5719 559.75,302.5719 C560.3281,302.5719 560.9063,302.7125 561.375,302.9625 C561.8438,303.2281 562.0156,303.4156 562.0781,303.775 C562.2031,304.4469 562.4531,304.6969 562.9844,304.6969 C563.2656,304.6969 563.5469,304.5563 563.7344,304.3375 C563.8594,304.1656 563.9063,303.9938 563.9063,303.5563 L563.9063,302.1969 C563.9063,301.775 563.8906,301.6344 563.7656,301.4625 C563.5938,301.2125 563.3125,301.0563 562.9844,301.0563 C562.6719,301.0563 562.4688,301.1656 562.25,301.4313 C561.0781,300.9313 560.6406,300.8219 559.6875,300.8219 C557.0156,300.8219 555,302.8375 555,305.4625 L555,306.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="574" y="310.006">D</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="546" x2="586" y1="321.4" y2="321.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="546" x2="586" y1="329.4" y2="329.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="58" y="332.0151">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <g id="elem_C_0001302694761523535504">
-        <rect codeLine="25" fill="#F1F1F1" height="48" id="C_0001302694761523535504" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="41" x="448.5" y="289.4"/>
-        <ellipse cx="463.5" cy="305.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M458.5,306.5563 C458.5,309.0563 460.6406,310.8688 463.5625,310.8688 C464.7969,310.8688 465.9688,310.5719 466.7188,310.0563 C467.3281,309.6344 467.6563,309.2125 467.6563,308.8063 C467.6563,308.3375 467.2344,307.9313 466.7344,307.9313 C466.5,307.9313 466.2813,308.0094 466.0781,308.2125 C465.6406,308.65 465.6406,308.65 465.4688,308.7438 C465.0156,308.9781 464.375,309.1188 463.6094,309.1188 C461.6094,309.1188 460.3281,308.1031 460.3281,306.525 L460.3281,305.4781 C460.3281,303.775 461.5469,302.5719 463.25,302.5719 C463.8281,302.5719 464.4063,302.7125 464.875,302.9625 C465.3438,303.2281 465.5156,303.4156 465.5781,303.775 C465.7031,304.4469 465.9531,304.6969 466.4844,304.6969 C466.7656,304.6969 467.0469,304.5563 467.2344,304.3375 C467.3594,304.1656 467.4063,303.9938 467.4063,303.5563 L467.4063,302.1969 C467.4063,301.775 467.3906,301.6344 467.2656,301.4625 C467.0938,301.2125 466.8125,301.0563 466.4844,301.0563 C466.1719,301.0563 465.9688,301.1656 465.75,301.4313 C464.5781,300.9313 464.1406,300.8219 463.1875,300.8219 C460.5156,300.8219 458.5,302.8375 458.5,305.4625 L458.5,306.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="477.5" y="310.006">E</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="449.5" x2="488.5" y1="321.4" y2="321.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="449.5" x2="488.5" y1="329.4" y2="329.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="48" id="C_0001319862510251967999" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="380" y="278"/>
+      <ellipse cx="395" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M397.9688,299.6406 Q397.3906,299.9375 396.75,300.0781 Q396.1094,300.2344 395.4063,300.2344 Q392.9063,300.2344 391.5781,298.5938 Q390.2656,296.9375 390.2656,293.8125 Q390.2656,290.6875 391.5781,289.0313 Q392.9063,287.375 395.4063,287.375 Q396.1094,287.375 396.75,287.5313 Q397.4063,287.6875 397.9688,287.9844 L397.9688,290.7031 Q397.3438,290.125 396.75,289.8594 Q396.1563,289.5781 395.5313,289.5781 Q394.1875,289.5781 393.5,290.6563 Q392.8125,291.7188 392.8125,293.8125 Q392.8125,295.9063 393.5,296.9844 Q394.1875,298.0469 395.5313,298.0469 Q396.1563,298.0469 396.75,297.7813 Q397.3438,297.5 397.9688,296.9219 L397.9688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="409" y="298.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="381" x2="419" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="381" x2="419" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <g id="elem_C_0001697463991772603674">
-        <rect codeLine="32" fill="#F1F1F1" height="48" id="C_0001697463991772603674" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="42" x="903" y="289.4"/>
-        <ellipse cx="918" cy="305.4" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M913,306.5563 C913,309.0563 915.1406,310.8688 918.0625,310.8688 C919.2969,310.8688 920.4688,310.5719 921.2188,310.0563 C921.8281,309.6344 922.1563,309.2125 922.1563,308.8063 C922.1563,308.3375 921.7344,307.9313 921.2344,307.9313 C921,307.9313 920.7813,308.0094 920.5781,308.2125 C920.1406,308.65 920.1406,308.65 919.9688,308.7438 C919.5156,308.9781 918.875,309.1188 918.1094,309.1188 C916.1094,309.1188 914.8281,308.1031 914.8281,306.525 L914.8281,305.4781 C914.8281,303.775 916.0469,302.5719 917.75,302.5719 C918.3281,302.5719 918.9063,302.7125 919.375,302.9625 C919.8438,303.2281 920.0156,303.4156 920.0781,303.775 C920.2031,304.4469 920.4531,304.6969 920.9844,304.6969 C921.2656,304.6969 921.5469,304.5563 921.7344,304.3375 C921.8594,304.1656 921.9063,303.9938 921.9063,303.5563 L921.9063,302.1969 C921.9063,301.775 921.8906,301.6344 921.7656,301.4625 C921.5938,301.2125 921.3125,301.0563 920.9844,301.0563 C920.6719,301.0563 920.4688,301.1656 920.25,301.4313 C919.0781,300.9313 918.6406,300.8219 917.6875,300.8219 C915.0156,300.8219 913,302.8375 913,305.4625 L913,306.5563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="932" y="310.006">C</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="904" x2="944" y1="321.4" y2="321.4"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="904" x2="944" y1="329.4" y2="329.4"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="60.8047" id="C_0000569632796637866961" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="285.5" y="271.5"/>
+      <ellipse cx="300.5" cy="287.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M303.4688,293.1406 Q302.8906,293.4375 302.25,293.5781 Q301.6094,293.7344 300.9063,293.7344 Q298.4063,293.7344 297.0781,292.0938 Q295.7656,290.4375 295.7656,287.3125 Q295.7656,284.1875 297.0781,282.5313 Q298.4063,280.875 300.9063,280.875 Q301.6094,280.875 302.25,281.0313 Q302.9063,281.1875 303.4688,281.4844 L303.4688,284.2031 Q302.8438,283.625 302.25,283.3594 Q301.6563,283.0781 301.0313,283.0781 Q299.6875,283.0781 299,284.1563 Q298.3125,285.2188 298.3125,287.3125 Q298.3125,289.4063 299,290.4844 Q299.6875,291.5469 301.0313,291.5469 Q301.6563,291.5469 302.25,291.2813 Q302.8438,291 303.4688,290.4219 L303.4688,293.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="314.5" y="291.6543">BB</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="338.5" y="268.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="339.5" y="280.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="286.5" x2="343.5" y1="303.5" y2="303.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="286.5" x2="343.5" y1="311.5" y2="311.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <g id="elem_C_0001911193033649971391">
-        <rect codeLine="36" fill="#F1F1F1" height="64.7999" id="C_0001911193033649971391" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="805.5" y="281"/>
-        <ellipse cx="820.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M815.5,298.1563 C815.5,300.6563 817.6406,302.4688 820.5625,302.4688 C821.7969,302.4688 822.9688,302.1719 823.7188,301.6563 C824.3281,301.2344 824.6563,300.8125 824.6563,300.4063 C824.6563,299.9375 824.2344,299.5313 823.7344,299.5313 C823.5,299.5313 823.2813,299.6094 823.0781,299.8125 C822.6406,300.25 822.6406,300.25 822.4688,300.3438 C822.0156,300.5781 821.375,300.7188 820.6094,300.7188 C818.6094,300.7188 817.3281,299.7031 817.3281,298.125 L817.3281,297.0781 C817.3281,295.375 818.5469,294.1719 820.25,294.1719 C820.8281,294.1719 821.4063,294.3125 821.875,294.5625 C822.3438,294.8281 822.5156,295.0156 822.5781,295.375 C822.7031,296.0469 822.9531,296.2969 823.4844,296.2969 C823.7656,296.2969 824.0469,296.1563 824.2344,295.9375 C824.3594,295.7656 824.4063,295.5938 824.4063,295.1563 L824.4063,293.7969 C824.4063,293.375 824.3906,293.2344 824.2656,293.0625 C824.0938,292.8125 823.8125,292.6563 823.4844,292.6563 C823.1719,292.6563 822.9688,292.7656 822.75,293.0313 C821.5781,292.5313 821.1406,292.4219 820.1875,292.4219 C817.5156,292.4219 815.5,294.4375 815.5,297.0625 L815.5,298.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="20" x="834.5" y="301.606">CC</text>
-        <rect fill="#FFFFFF" height="18.2001" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" width="9" x="862.5" y="278"/>
-        <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="7" x="863.5" y="292.2001">T</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="806.5" x2="867.5" y1="313" y2="313"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="806.5" x2="867.5" y1="321" y2="321"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="811.5" y="329.9"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="813.5" y="331.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="825.5" y="338.0059">t : T</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="291.5" y="317.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="293.5" y="319.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <g id="elem_C_0000931278702894205804">
-        <rect codeLine="41" fill="#F1F1F1" height="81.5999" id="C_0000931278702894205804" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="667" y="272.6"/>
-        <ellipse cx="682" cy="288.6" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M680.8594,289.6625 L682.1719,289.6625 L682.1719,289.7094 C682.1719,290.1156 682.1875,290.2719 682.2969,290.4281 C682.4688,290.6781 682.7656,290.85 683.0781,290.85 C683.3594,290.85 683.6563,290.7094 683.8281,290.4906 C683.9531,290.3031 684,290.1625 684,289.7094 L684,287.8656 C684,287.5375 683.9844,287.4281 683.9219,287.2562 C683.8125,286.9594 683.4531,286.7094 683.0781,286.7094 C682.7813,286.7094 682.5156,286.85 682.3438,287.0687 C682.2031,287.2562 682.1719,287.4281 682.1719,287.8656 L682.1719,287.9281 L680.8594,287.9281 L680.8594,285.7562 L684.7031,285.7562 L684.7031,286.5062 C684.7031,286.8969 684.7344,287.0844 684.8438,287.2406 C685.0156,287.4906 685.3125,287.6625 685.625,287.6625 C685.9219,287.6625 686.1875,287.5375 686.375,287.3031 C686.5156,287.1156 686.5469,286.975 686.5469,286.5062 L686.5469,284.0062 L678.8438,284.0062 C678.3906,284.0062 678.2656,284.0219 678.0938,284.1312 C677.8281,284.3031 677.6563,284.5687 677.6563,284.8812 C677.6563,285.1625 677.7813,285.4281 678.0313,285.6 C678.2188,285.725 678.4063,285.7562 678.8438,285.7562 L679.0313,285.7562 L679.0313,291.85 L678.8438,291.85 C678.4219,291.85 678.2656,291.8812 678.0938,291.975 C677.8281,292.1312 677.6563,292.4125 677.6563,292.7094 C677.6563,293.2875 678.0625,293.6 678.8438,293.6 L686.9219,293.6 L686.9219,291.0687 C686.9219,290.6625 686.8906,290.4906 686.7813,290.3344 C686.6094,290.0687 686.3281,289.9125 686,289.9125 C685.7188,289.9125 685.4375,290.0531 685.25,290.2719 C685.1094,290.4594 685.0781,290.6156 685.0781,291.0687 L685.0781,291.85 L680.8594,291.85 L680.8594,289.6625 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="696" y="293.206">detail::CCC</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="668" x2="770" y1="304.6" y2="304.6"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="673" y="321.6059">ccc1</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="29" x="673" y="338.4059">ccc2</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="668" x2="770" y1="346.1999" y2="346.1999"/>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="305.5" y="325.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <g id="elem_C_0001629943620359873327">
-        <rect codeLine="54" fill="#F1F1F1" height="98.3998" id="C_0001629943620359873327" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="64" x="361" y="7"/>
-        <ellipse cx="385.9" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-        <path d="M380.9,24.1563 C380.9,26.6563 383.0406,28.4688 385.9625,28.4688 C387.1969,28.4688 388.3688,28.1719 389.1188,27.6563 C389.7281,27.2344 390.0563,26.8125 390.0563,26.4063 C390.0563,25.9375 389.6344,25.5313 389.1344,25.5313 C388.9,25.5313 388.6813,25.6094 388.4781,25.8125 C388.0406,26.25 388.0406,26.25 387.8688,26.3438 C387.4156,26.5781 386.775,26.7188 386.0094,26.7188 C384.0094,26.7188 382.7281,25.7031 382.7281,24.125 L382.7281,23.0781 C382.7281,21.375 383.9469,20.1719 385.65,20.1719 C386.2281,20.1719 386.8063,20.3125 387.275,20.5625 C387.7438,20.8281 387.9156,21.0156 387.9781,21.375 C388.1031,22.0469 388.3531,22.2969 388.8844,22.2969 C389.1656,22.2969 389.4469,22.1563 389.6344,21.9375 C389.7594,21.7656 389.8063,21.5938 389.8063,21.1563 L389.8063,19.7969 C389.8063,19.375 389.7906,19.2344 389.6656,19.0625 C389.4938,18.8125 389.2125,18.6563 388.8844,18.6563 C388.5719,18.6563 388.3688,18.7656 388.15,19.0313 C386.9781,18.5313 386.5406,18.4219 385.5875,18.4219 C382.9156,18.4219 380.9,20.4375 380.9,23.0625 L380.9,24.1563 Z " fill="#000000"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="402.1" y="27.606">R</text>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="424" y1="39" y2="39"/>
-        <line style="stroke:#181818;stroke-width:0.5;" x1="362" x2="424" y1="47" y2="47"/>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="55.9"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="369" y="57.9"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="381" y="64.0059">a : A *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="72.6999"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="369" y="74.6999"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="381" y="80.8059">b : B *</text>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <rect fill="#F1F1F1" height="10" style="stroke:none;stroke-width:1.0;" width="20" x="367" y="89.4998"/>
-          <rect fill="none" height="6" style="stroke:#C82930;stroke-width:1.0;" width="6" x="369" y="91.4998"/>
-        </a>
-        <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
-          <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="38" x="381" y="97.6058">c : C *</text>
-        </a>
-      </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="73.6094" id="C_0001625078061541942293" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="151.5" y="265"/>
+      <ellipse cx="166.5" cy="281" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M170.6094,287 L162.8906,287 L162.8906,274.6094 L170.6094,274.6094 L170.6094,276.7656 L165.3438,276.7656 L165.3438,279.4375 L170.1094,279.4375 L170.1094,281.5938 L165.3438,281.5938 L165.3438,284.8438 L170.6094,284.8438 L170.6094,287 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="180.5" y="285.1543">detail::BBB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="297" y2="297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="157.5" y="311.2104">bbb1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="157.5" y="324.0151">bbb2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="330.6094" y2="330.6094"/>
     </a>
-    <g id="link_C_0001629943620359873327_C_0002210005074053139118">
-      <path codeLine="60" d="M360.73,61.1 C305.17,69.46 190.99,94.05 124,160.4 C93.46,190.65 79.3435,232.4711 71.8635,266.3511 " fill="none" id="C_0001629943620359873327-to-C_0002210005074053139118" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="70.57,272.21,76.4162,264.284,71.6479,267.3276,68.6043,262.5593,70.57,272.21" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="155" y="148.477">-a</text>
-    </g>
-    <g id="link_C_0001629943620359873327_C_0001319862510251967999">
-      <path codeLine="61" d="M393,105.8 C393,160.61 393,241.48 393,282.92 " fill="none" id="C_0001629943620359873327-to-C_0001319862510251967999" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="393,288.92,397,279.92,393,283.92,389,279.92,393,288.92" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="394" y="148.477">-b</text>
-    </g>
-    <g id="link_C_0001629943620359873327_C_0001697463991772603674">
-      <path codeLine="62" d="M425.42,59.57 C524.25,67.47 819.12,96.06 886,160.4 C921.28,194.35 925.8243,249.7006 925.3543,283.1406 " fill="none" id="C_0001629943620359873327-to-C_0001697463991772603674" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="925.27,289.14,929.3961,280.1971,925.3403,284.1405,921.3969,280.0847,925.27,289.14" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="875" y="148.477">-c</text>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="48" id="C_0001168777064323042894" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="551.5" y="278"/>
+      <ellipse cx="566.5" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M569.4688,299.6406 Q568.8906,299.9375 568.25,300.0781 Q567.6094,300.2344 566.9063,300.2344 Q564.4063,300.2344 563.0781,298.5938 Q561.7656,296.9375 561.7656,293.8125 Q561.7656,290.6875 563.0781,289.0313 Q564.4063,287.375 566.9063,287.375 Q567.6094,287.375 568.25,287.5313 Q568.9063,287.6875 569.4688,287.9844 L569.4688,290.7031 Q568.8438,290.125 568.25,289.8594 Q567.6563,289.5781 567.0313,289.5781 Q565.6875,289.5781 565,290.6563 Q564.3125,291.7188 564.3125,293.8125 Q564.3125,295.9063 565,296.9844 Q565.6875,298.0469 567.0313,298.0469 Q567.6563,298.0469 568.25,297.7813 Q568.8438,297.5 569.4688,296.9219 L569.4688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="580.5" y="298.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="591.5" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="591.5" y1="318" y2="318"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="48" id="C_0001302694761523535504" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="455" y="278"/>
+      <ellipse cx="470" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M472.9688,299.6406 Q472.3906,299.9375 471.75,300.0781 Q471.1094,300.2344 470.4063,300.2344 Q467.9063,300.2344 466.5781,298.5938 Q465.2656,296.9375 465.2656,293.8125 Q465.2656,290.6875 466.5781,289.0313 Q467.9063,287.375 470.4063,287.375 Q471.1094,287.375 471.75,287.5313 Q472.4063,287.6875 472.9688,287.9844 L472.9688,290.7031 Q472.3438,290.125 471.75,289.8594 Q471.1563,289.5781 470.5313,289.5781 Q469.1875,289.5781 468.5,290.6563 Q467.8125,291.7188 467.8125,293.8125 Q467.8125,295.9063 468.5,296.9844 Q469.1875,298.0469 470.5313,298.0469 Q471.1563,298.0469 471.75,297.7813 Q472.3438,297.5 472.9688,296.9219 L472.9688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="484" y="298.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="456" x2="494" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="456" x2="494" y1="318" y2="318"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="48" id="C_0001697463991772603674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="902" y="278"/>
+      <ellipse cx="917" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M919.9688,299.6406 Q919.3906,299.9375 918.75,300.0781 Q918.1094,300.2344 917.4063,300.2344 Q914.9063,300.2344 913.5781,298.5938 Q912.2656,296.9375 912.2656,293.8125 Q912.2656,290.6875 913.5781,289.0313 Q914.9063,287.375 917.4063,287.375 Q918.1094,287.375 918.75,287.5313 Q919.4063,287.6875 919.9688,287.9844 L919.9688,290.7031 Q919.3438,290.125 918.75,289.8594 Q918.1563,289.5781 917.5313,289.5781 Q916.1875,289.5781 915.5,290.6563 Q914.8125,291.7188 914.8125,293.8125 Q914.8125,295.9063 915.5,296.9844 Q916.1875,298.0469 917.5313,298.0469 Q918.1563,298.0469 918.75,297.7813 Q919.3438,297.5 919.9688,296.9219 L919.9688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="931" y="298.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="903" x2="941" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="903" x2="941" y1="318" y2="318"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="60.8047" id="C_0001911193033649971391" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="807.5" y="271.5"/>
+      <ellipse cx="822.5" cy="287.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M825.4688,293.1406 Q824.8906,293.4375 824.25,293.5781 Q823.6094,293.7344 822.9063,293.7344 Q820.4063,293.7344 819.0781,292.0938 Q817.7656,290.4375 817.7656,287.3125 Q817.7656,284.1875 819.0781,282.5313 Q820.4063,280.875 822.9063,280.875 Q823.6094,280.875 824.25,281.0313 Q824.9063,281.1875 825.4688,281.4844 L825.4688,284.2031 Q824.8438,283.625 824.25,283.3594 Q823.6563,283.0781 823.0313,283.0781 Q821.6875,283.0781 821,284.1563 Q820.3125,285.2188 820.3125,287.3125 Q820.3125,289.4063 821,290.4844 Q821.6875,291.5469 823.0313,291.5469 Q823.6563,291.5469 824.25,291.2813 Q824.8438,291 825.4688,290.4219 L825.4688,293.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="836.5" y="291.6543">CC</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="860.5" y="268.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="861.5" y="280.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808.5" x2="865.5" y1="303.5" y2="303.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808.5" x2="865.5" y1="311.5" y2="311.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="813.5" y="317.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="815.5" y="319.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="827.5" y="325.7104">t : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="73.6094" id="C_0000931278702894205804" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="673.5" y="265"/>
+      <ellipse cx="688.5" cy="281" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M692.6094,287 L684.8906,287 L684.8906,274.6094 L692.6094,274.6094 L692.6094,276.7656 L687.3438,276.7656 L687.3438,279.4375 L692.1094,279.4375 L692.1094,281.5938 L687.3438,281.5938 L687.3438,284.8438 L692.6094,284.8438 L692.6094,287 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="702.5" y="285.1543">detail::CCC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="771.5" y1="297" y2="297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="679.5" y="311.2104">ccc1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="679.5" y="324.0151">ccc2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="771.5" y1="330.6094" y2="330.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="86.4141" id="C_0001629943620359873327" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="368.5" y="8"/>
+      <ellipse cx="393.85" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M396.8188,29.6406 Q396.2406,29.9375 395.6,30.0781 Q394.9594,30.2344 394.2563,30.2344 Q391.7563,30.2344 390.4281,28.5938 Q389.1156,26.9375 389.1156,23.8125 Q389.1156,20.6875 390.4281,19.0313 Q391.7563,17.375 394.2563,17.375 Q394.9594,17.375 395.6,17.5313 Q396.2563,17.6875 396.8188,17.9844 L396.8188,20.7031 Q396.1938,20.125 395.6,19.8594 Q395.0063,19.5781 394.3813,19.5781 Q393.0375,19.5781 392.35,20.6563 Q391.6625,21.7188 391.6625,23.8125 Q391.6625,25.9063 392.35,26.9844 Q393.0375,28.0469 394.3813,28.0469 Q395.0063,28.0469 395.6,27.7813 Q396.1938,27.5 396.8188,26.9219 L396.8188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="410.15" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="369.5" x2="430.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="369.5" x2="430.5" y1="48" y2="48"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="54"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="56"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="388.5" y="62.2104">a : A *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="66.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="68.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="388.5" y="75.0151">b : B *</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="79.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="81.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="388.5" y="87.8198">c : C *</text>
+    </a>
+    <path d="M368.16,55.15 C313.35,62.21 200.75,84.15 135,149 C104.94,178.65 90.21,225.51 83.15,259.37 " fill="none" id="C_0001629943620359873327-&gt;C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="82.09,264.68,87.7819,256.6424,83.0733,259.7776,79.9381,255.0691,82.09,264.68" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="166" y="137.0669">-a</text>
+    <path d="M400,94.24 C400,145.04 400,228.91 400,272.58 " fill="none" id="C_0001629943620359873327-&gt;C_0001319862510251967999" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="400,277.7,404,268.7,400,272.7,396,268.7,400,277.7" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="401" y="137.0669">-b</text>
+    <path d="M431.81,54.03 C528.8,60.87 818.19,86.23 884,149 C917.72,181.17 923.33,238.36 923.35,272.68 " fill="none" id="C_0001629943620359873327-&gt;C_0001697463991772603674" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="923.3,277.98,927.3514,269.003,923.3286,272.9801,919.3515,268.9573,923.3,277.98" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="873" y="137.0669">-c</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00071_class_mermaid.svg b/docs/test_cases/t00071_class_mermaid.svg
index 1197683a..b93a0674 100644
--- a/docs/test_cases/t00071_class_mermaid.svg
+++ b/docs/test_cases/t00071_class_mermaid.svg
@@ -1,66 +1,61 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 823.0703125 308" style="max-width: 823.07px; background-color: white;" width="823.0703125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M736.890625,86.70525091216751L716.703125,99.75437576013958C696.515625,112.80350060811168,656.140625,138.90175030405584,635.953125,156.61754181869458C615.765625,174.33333333333334,615.765625,183.66666666666666,615.765625,188.33333333333334L615.765625,193"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M738.8554892015707,131L736.5840014179756,136.66666666666666C734.3125136343805,142.33333333333334,729.7695380671903,153.66666666666666,727.4980502835951,167.66666666666666C725.2265625,181.66666666666666,725.2265625,198.33333333333334,725.2265625,206.66666666666666L725.2265625,215"/>
-        <path marker-end="url(#my-svg_classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M788.1601357984293,131L790.4316235820244,136.66666666666666C792.7031113656195,142.33333333333334,797.2460869328097,153.66666666666666,799.5175747164049,167.66666666666666C801.7890625,181.66666666666666,801.7890625,198.33333333333334,801.7890625,206.66666666666666L801.7890625,215"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M736.890625,87.23898702431578L717.4440104166666,100.19915585359648C697.9973958333334,113.15932468287718,659.1041666666666,139.0796623414386,639.6575520833334,157.70649783738597C620.2109375,176.33333333333334,620.2109375,187.66666666666666,620.2109375,193.33333333333334L620.2109375,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M738.8554892015707,131L736.5840014179756,136.66666666666666C734.3125136343805,142.33333333333334,729.7695380671903,153.66666666666666,727.4980502835951,168.66666666666666C725.2265625,183.66666666666666,725.2265625,202.33333333333334,725.2265625,211.66666666666666L725.2265625,221"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M788.1601357984293,131L790.4316235820244,136.66666666666666C792.7031113656195,142.33333333333334,797.2460869328097,153.66666666666666,799.5175747164049,168.66666666666666C801.7890625,183.66666666666666,801.7890625,202.33333333333334,801.7890625,211.66666666666666L801.7890625,221"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(615.765625, 165)" class="edgeLabel">
+        <g transform="translate(620.2109375, 165)" class="edgeLabel">
           <g transform="translate(-7.1171875, -9)" class="label">
             <foreignObject height="18" width="14.234375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -95,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(725.2265625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L4">
+        <a transform="translate(725.2265625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L4">
           <g title="B" id="classId-C_0001319862510251967999-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -114,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(41.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L6">
+        <a transform="translate(41.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L6">
           <g title="BB" id="classId-C_0000569632796637866961-1" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -138,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.453125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1.cppm#L11">
+        <a transform="translate(185.453125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L11">
           <g title="BBB" id="classId-C_0001625078061541942293-2" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -167,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(309.609375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod1.cppm#L4">
+        <a transform="translate(309.609375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod1.cppm#L4">
           <g title="D" id="classId-C_0001168777064323042894-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -186,7 +181,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(385.7265625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib1mod2.cppm#L4">
+        <a transform="translate(385.7265625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod2.cppm#L4">
           <g title="E" id="classId-C_0001302694761523535504-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -205,7 +200,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.7890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L4">
+        <a transform="translate(801.7890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L4">
           <g title="C" id="classId-C_0001697463991772603674-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(481.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L6">
+        <a transform="translate(481.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L6">
           <g title="CC" id="classId-C_0001911193033649971391-6" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -248,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(626.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/lib2.cppm#L11">
+        <a transform="translate(626.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L11">
           <g title="CCC" id="classId-C_0000931278702894205804-7" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -277,11 +272,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(615.765625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/src/t00071_mod.cppm#L6">
+        <a transform="translate(620.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L6">
           <g title="A" id="classId-C_0002210005074053139118-8" class="node default clickable">
-            <rect height="101" width="92.359375" y="-50.5" x="-46.1796875" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
-            <line y2="17.5" y1="17.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
+            <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="41.734375" x1="-41.734375" class="divider"/>
             <g class="label">
               <foreignObject height="0" width="0">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -293,20 +288,20 @@
                   <span class="nodeLabel">A</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -38.6796875, -9)" height="18" width="44.46875">
+              <foreignObject transform="translate( -34.234375, -9)" height="18" width="44.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">-a : int</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -38.6796875, 25)" height="18" width="77.359375">
+              <foreignObject transform="translate( -34.234375, 25)" height="18" width="68.46875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">-get() : : int</span>
+                  <span class="nodeLabel">-get() : int</span>
                 </div>
               </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(763.5078125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t00071/t00071.cc#L9">
+        <a transform="translate(763.5078125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L9">
           <g title="R" id="classId-C_0001629943620359873327-9" class="node default clickable">
             <rect height="123" width="53.234375" y="-61.5" x="-26.6171875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="26.6171875" x1="-26.6171875" class="divider"/>
@@ -324,17 +319,17 @@
               </foreignObject>
               <foreignObject transform="translate( -19.1171875, -20)" height="18" width="37.640625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-a : A</span>
+                  <span style="font-style:italic;" class="nodeLabel">-a : A </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -19.1171875, 2)" height="18" width="38.234375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-b : B</span>
+                  <span style="font-style:italic;" class="nodeLabel">-b : B </span>
                 </div>
               </foreignObject>
               <foreignObject transform="translate( -19.1171875, 24)" height="18" width="38.21875">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
-                  <span style="font-style:italic;" class="nodeLabel">-c : C</span>
+                  <span style="font-style:italic;" class="nodeLabel">-c : C </span>
                 </div>
               </foreignObject>
             </g>
diff --git a/docs/test_cases/t00072.md b/docs/test_cases/t00072.md
new file mode 100644
index 00000000..1e0137d5
--- /dev/null
+++ b/docs/test_cases/t00072.md
@@ -0,0 +1,448 @@
+# t00072 - Class diagram with C++20 module partitions generated as packages
+## Config
+```yaml
+diagrams:
+  t00072_class:
+    type: class
+    glob:
+      - t00072.cc
+    generate_packages: true
+    package_type: module
+    include:
+      modules:
+        - t00072
+    using_module: t00072
+    using_namespace: clanguml::t00072
+```
+## Source code
+File `tests/t00072/t00072.cc`
+```cpp
+import t00072.app;
+
+namespace clanguml {
+namespace t00072 {
+}
+}
+```
+File `tests/t00072/src/lib1mod2.cppm`
+```cpp
+export module t00072.app:lib1.mod2;
+
+export namespace clanguml::t00072 {
+class E { };
+}
+```
+File `tests/t00072/src/t00072_mod.cppm`
+```cpp
+export module t00072.app;
+export import :lib1;
+export import :lib1.mod1;
+export import :lib1.mod2;
+export import :lib2;
+
+export namespace clanguml::t00072 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+}
+```
+File `tests/t00072/src/lib2.cppm`
+```cpp
+export module t00072.app:lib2;
+
+export namespace clanguml::t00072 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+namespace detail {
+enum class CCC { ccc1, ccc2 };
+}
+}
+```
+File `tests/t00072/src/lib1.cppm`
+```cpp
+export module t00072.app:lib1;
+
+export namespace clanguml::t00072 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+}
+```
+File `tests/t00072/src/lib1mod1.cppm`
+```cpp
+export module t00072.app:lib1.mod1;
+
+export namespace clanguml::t00072 {
+class D { };
+}
+```
+## Generated PlantUML diagrams
+![t00072_class](./t00072_class.svg "Class diagram with C++20 module partitions generated as packages")
+## Generated Mermaid diagrams
+![t00072_class](./t00072_class_mermaid.svg "Class diagram with C++20 module partitions generated as packages")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "display_name": "app",
+      "elements": [
+        {
+          "display_name": ":lib1",
+          "elements": [
+            {
+              "bases": [],
+              "display_name": "B",
+              "id": "1450150421445257774",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "module": {
+                "is_private": false,
+                "name": "t00072.app:lib1"
+              },
+              "name": "B",
+              "namespace": "clanguml::t00072",
+              "source_location": {
+                "column": 7,
+                "file": "src/lib1.cppm",
+                "line": 4,
+                "translation_unit": "t00072.cc"
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [],
+              "display_name": "BB<T>",
+              "id": "744925471008373109",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": true,
+              "is_union": false,
+              "members": [
+                {
+                  "access": "private",
+                  "is_static": false,
+                  "name": "t",
+                  "source_location": {
+                    "column": 7,
+                    "file": "src/lib1.cppm",
+                    "line": 7,
+                    "translation_unit": "t00072.cc"
+                  },
+                  "type": "T"
+                }
+              ],
+              "methods": [],
+              "module": {
+                "is_private": false,
+                "name": "t00072.app:lib1"
+              },
+              "name": "BB",
+              "namespace": "clanguml::t00072",
+              "source_location": {
+                "column": 29,
+                "file": "src/lib1.cppm",
+                "line": 6,
+                "translation_unit": "t00072.cc"
+              },
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "template_type",
+                  "name": "T",
+                  "template_parameters": []
+                }
+              ],
+              "type": "class"
+            },
+            {
+              "constants": [
+                "bbb1",
+                "bbb2"
+              ],
+              "display_name": "detail::BBB",
+              "id": "610293402618118513",
+              "is_nested": false,
+              "module": {
+                "is_private": false,
+                "name": "t00072.app:lib1"
+              },
+              "name": "BBB",
+              "namespace": "clanguml::t00072::detail",
+              "source_location": {
+                "column": 12,
+                "file": "src/lib1.cppm",
+                "line": 11,
+                "translation_unit": "t00072.cc"
+              },
+              "type": "enum"
+            },
+            {
+              "display_name": "mod1",
+              "elements": [
+                {
+                  "bases": [],
+                  "display_name": "D",
+                  "id": "516204432765266678",
+                  "is_abstract": false,
+                  "is_nested": false,
+                  "is_struct": false,
+                  "is_template": false,
+                  "is_union": false,
+                  "members": [],
+                  "methods": [],
+                  "module": {
+                    "is_private": false,
+                    "name": "t00072.app:lib1.mod1"
+                  },
+                  "name": "D",
+                  "namespace": "clanguml::t00072",
+                  "source_location": {
+                    "column": 7,
+                    "file": "src/lib1mod1.cppm",
+                    "line": 4,
+                    "translation_unit": "t00072.cc"
+                  },
+                  "template_parameters": [],
+                  "type": "class"
+                }
+              ],
+              "name": "mod1",
+              "type": "module"
+            },
+            {
+              "display_name": "mod2",
+              "elements": [
+                {
+                  "bases": [],
+                  "display_name": "E",
+                  "id": "347204883768272660",
+                  "is_abstract": false,
+                  "is_nested": false,
+                  "is_struct": false,
+                  "is_template": false,
+                  "is_union": false,
+                  "members": [],
+                  "methods": [],
+                  "module": {
+                    "is_private": false,
+                    "name": "t00072.app:lib1.mod2"
+                  },
+                  "name": "E",
+                  "namespace": "clanguml::t00072",
+                  "source_location": {
+                    "column": 7,
+                    "file": "src/lib1mod2.cppm",
+                    "line": 4,
+                    "translation_unit": "t00072.cc"
+                  },
+                  "template_parameters": [],
+                  "type": "class"
+                }
+              ],
+              "name": "mod2",
+              "type": "module"
+            }
+          ],
+          "name": ":lib1",
+          "type": "module"
+        },
+        {
+          "display_name": ":lib2",
+          "elements": [
+            {
+              "bases": [],
+              "display_name": "C",
+              "id": "1144612141363797057",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "module": {
+                "is_private": false,
+                "name": "t00072.app:lib2"
+              },
+              "name": "C",
+              "namespace": "clanguml::t00072",
+              "source_location": {
+                "column": 7,
+                "file": "src/lib2.cppm",
+                "line": 4,
+                "translation_unit": "t00072.cc"
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [],
+              "display_name": "CC<T>",
+              "id": "1472938318775327089",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": true,
+              "is_union": false,
+              "members": [
+                {
+                  "access": "private",
+                  "is_static": false,
+                  "name": "t",
+                  "source_location": {
+                    "column": 7,
+                    "file": "src/lib2.cppm",
+                    "line": 7,
+                    "translation_unit": "t00072.cc"
+                  },
+                  "type": "T"
+                }
+              ],
+              "methods": [],
+              "module": {
+                "is_private": false,
+                "name": "t00072.app:lib2"
+              },
+              "name": "CC",
+              "namespace": "clanguml::t00072",
+              "source_location": {
+                "column": 29,
+                "file": "src/lib2.cppm",
+                "line": 6,
+                "translation_unit": "t00072.cc"
+              },
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "template_type",
+                  "name": "T",
+                  "template_parameters": []
+                }
+              ],
+              "type": "class"
+            },
+            {
+              "constants": [
+                "ccc1",
+                "ccc2"
+              ],
+              "display_name": "detail::CCC",
+              "id": "448885573685763285",
+              "is_nested": false,
+              "module": {
+                "is_private": false,
+                "name": "t00072.app:lib2"
+              },
+              "name": "CCC",
+              "namespace": "clanguml::t00072::detail",
+              "source_location": {
+                "column": 12,
+                "file": "src/lib2.cppm",
+                "line": 11,
+                "translation_unit": "t00072.cc"
+              },
+              "type": "enum"
+            }
+          ],
+          "name": ":lib2",
+          "type": "module"
+        },
+        {
+          "bases": [],
+          "display_name": "A",
+          "id": "1552096180171121044",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": false,
+          "is_template": false,
+          "is_union": false,
+          "members": [
+            {
+              "access": "private",
+              "is_static": false,
+              "name": "a",
+              "source_location": {
+                "column": 9,
+                "file": "src/t00072_mod.cppm",
+                "line": 11,
+                "translation_unit": "t00072.cc"
+              },
+              "type": "int"
+            }
+          ],
+          "methods": [
+            {
+              "access": "private",
+              "is_const": false,
+              "is_consteval": false,
+              "is_constexpr": false,
+              "is_constructor": false,
+              "is_copy_assignment": false,
+              "is_coroutine": false,
+              "is_defaulted": false,
+              "is_deleted": false,
+              "is_move_assignment": false,
+              "is_noexcept": false,
+              "is_operator": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "get",
+              "parameters": [],
+              "source_location": {
+                "column": 9,
+                "file": "src/t00072_mod.cppm",
+                "line": 9,
+                "translation_unit": "t00072.cc"
+              },
+              "type": "int"
+            }
+          ],
+          "module": {
+            "is_private": false,
+            "name": "t00072.app"
+          },
+          "name": "A",
+          "namespace": "clanguml::t00072",
+          "source_location": {
+            "column": 7,
+            "file": "src/t00072_mod.cppm",
+            "line": 8,
+            "translation_unit": "t00072.cc"
+          },
+          "template_parameters": [],
+          "type": "class"
+        }
+      ],
+      "name": "app",
+      "type": "module"
+    }
+  ],
+  "name": "t00072_class",
+  "package_type": "module",
+  "relationships": [],
+  "using_module": "t00072",
+  "using_namespace": "clanguml::t00072"
+}
+```
diff --git a/docs/test_cases/t00072_class.svg b/docs/test_cases/t00072_class.svg
new file mode 100644
index 00000000..40154dc9
--- /dev/null
+++ b/docs/test_cases/t00072_class.svg
@@ -0,0 +1,136 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="392px" preserveAspectRatio="none" style="width:736px;height:392px;" version="1.1" viewBox="0 0 736 392" width="736px" zoomAndPan="magnify">
+  <defs>
+    <filter height="300%" id="ftd2fgpo1j0zm" 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>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="22,24,57,24,64,46.2969,714,46.2969,714,380,22,380,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
+    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="326,67,366,67,373,89.2969,690,89.2969,690,356,326,356,326,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="326" x2="373" y1="89.2969" y2="89.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="330" y="81.9951">:lib1</text>
+    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="592,110,642,110,649,132.2969,666,132.2969,666,209,592,209,592,110" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="592" x2="649" y1="132.2969" y2="132.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="596" y="124.9951">mod1</text>
+    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="496,110,546,110,553,132.2969,568,132.2969,568,209,496,209,496,110" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="496" x2="553" y1="132.2969" y2="132.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="500" y="124.9951">mod2</text>
+    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="135,103.5,175,103.5,182,125.7969,302,125.7969,302,356,135,356,135,103.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="135" x2="182" y1="125.7969" y2="125.7969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="139" y="118.4951">:lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="73.6094" id="C_0001552096180171121044" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="132"/>
+      <ellipse cx="70.1" cy="148" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M73.0688,153.6406 Q72.4906,153.9375 71.85,154.0781 Q71.2094,154.2344 70.5063,154.2344 Q68.0063,154.2344 66.6781,152.5938 Q65.3656,150.9375 65.3656,147.8125 Q65.3656,144.6875 66.6781,143.0313 Q68.0063,141.375 70.5063,141.375 Q71.2094,141.375 71.85,141.5313 Q72.5063,141.6875 73.0688,141.9844 L73.0688,144.7031 Q72.4438,144.125 71.85,143.8594 Q71.2563,143.5781 70.6313,143.5781 Q69.2875,143.5781 68.6,144.6563 Q67.9125,145.7188 67.9125,147.8125 Q67.9125,149.9063 68.6,150.9844 Q69.2875,152.0469 70.6313,152.0469 Q71.2563,152.0469 71.85,151.7813 Q72.4438,151.5 73.0688,150.9219 L73.0688,153.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="87.9" y="152.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="164" y2="164"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="170"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="172"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="58" y="178.2104">get() : int</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="184.8047" y2="184.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="190.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="192.8047"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="58" y="199.0151">a : int</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="48" id="C_0001450150421445257774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="342" y="145"/>
+      <ellipse cx="357" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M359.9688,166.6406 Q359.3906,166.9375 358.75,167.0781 Q358.1094,167.2344 357.4063,167.2344 Q354.9063,167.2344 353.5781,165.5938 Q352.2656,163.9375 352.2656,160.8125 Q352.2656,157.6875 353.5781,156.0313 Q354.9063,154.375 357.4063,154.375 Q358.1094,154.375 358.75,154.5313 Q359.4063,154.6875 359.9688,154.9844 L359.9688,157.7031 Q359.3438,157.125 358.75,156.8594 Q358.1563,156.5781 357.5313,156.5781 Q356.1875,156.5781 355.5,157.6563 Q354.8125,158.7188 354.8125,160.8125 Q354.8125,162.9063 355.5,163.9844 Q356.1875,165.0469 357.5313,165.0469 Q358.1563,165.0469 358.75,164.7813 Q359.3438,164.5 359.9688,163.9219 L359.9688,166.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="371" y="165.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="343" x2="381" y1="177" y2="177"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="343" x2="381" y1="185" y2="185"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="60.8047" id="C_0000744925471008373109" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="417.5" y="138.5"/>
+      <ellipse cx="432.5" cy="154.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M435.4688,160.1406 Q434.8906,160.4375 434.25,160.5781 Q433.6094,160.7344 432.9063,160.7344 Q430.4063,160.7344 429.0781,159.0938 Q427.7656,157.4375 427.7656,154.3125 Q427.7656,151.1875 429.0781,149.5313 Q430.4063,147.875 432.9063,147.875 Q433.6094,147.875 434.25,148.0313 Q434.9063,148.1875 435.4688,148.4844 L435.4688,151.2031 Q434.8438,150.625 434.25,150.3594 Q433.6563,150.0781 433.0313,150.0781 Q431.6875,150.0781 431,151.1563 Q430.3125,152.2188 430.3125,154.3125 Q430.3125,156.4063 431,157.4844 Q431.6875,158.5469 433.0313,158.5469 Q433.6563,158.5469 434.25,158.2813 Q434.8438,158 435.4688,157.4219 L435.4688,160.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="446.5" y="158.6543">BB</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="470.5" y="135.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="471.5" y="147.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="418.5" x2="475.5" y1="170.5" y2="170.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="418.5" x2="475.5" y1="178.5" y2="178.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="423.5" y="184.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="425.5" y="186.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="437.5" y="192.7104">t : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="73.6094" id="C_0000610293402618118513" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="342.5" y="266"/>
+      <ellipse cx="357.5" cy="282" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M361.6094,288 L353.8906,288 L353.8906,275.6094 L361.6094,275.6094 L361.6094,277.7656 L356.3438,277.7656 L356.3438,280.4375 L361.1094,280.4375 L361.1094,282.5938 L356.3438,282.5938 L356.3438,285.8438 L361.6094,285.8438 L361.6094,288 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="371.5" y="286.1543">detail::BBB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="343.5" x2="440.5" y1="298" y2="298"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="348.5" y="312.2104">bbb1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="348.5" y="325.0151">bbb2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="343.5" x2="440.5" y1="331.6094" y2="331.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="48" id="C_0000516204432765266678" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="608.5" y="145"/>
+      <ellipse cx="623.5" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M626.4688,166.6406 Q625.8906,166.9375 625.25,167.0781 Q624.6094,167.2344 623.9063,167.2344 Q621.4063,167.2344 620.0781,165.5938 Q618.7656,163.9375 618.7656,160.8125 Q618.7656,157.6875 620.0781,156.0313 Q621.4063,154.375 623.9063,154.375 Q624.6094,154.375 625.25,154.5313 Q625.9063,154.6875 626.4688,154.9844 L626.4688,157.7031 Q625.8438,157.125 625.25,156.8594 Q624.6563,156.5781 624.0313,156.5781 Q622.6875,156.5781 622,157.6563 Q621.3125,158.7188 621.3125,160.8125 Q621.3125,162.9063 622,163.9844 Q622.6875,165.0469 624.0313,165.0469 Q624.6563,165.0469 625.25,164.7813 Q625.8438,164.5 626.4688,163.9219 L626.4688,166.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="637.5" y="165.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="609.5" x2="648.5" y1="177" y2="177"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="609.5" x2="648.5" y1="185" y2="185"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="48" id="C_0000347204883768272660" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="512" y="145"/>
+      <ellipse cx="527" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M529.9688,166.6406 Q529.3906,166.9375 528.75,167.0781 Q528.1094,167.2344 527.4063,167.2344 Q524.9063,167.2344 523.5781,165.5938 Q522.2656,163.9375 522.2656,160.8125 Q522.2656,157.6875 523.5781,156.0313 Q524.9063,154.375 527.4063,154.375 Q528.1094,154.375 528.75,154.5313 Q529.4063,154.6875 529.9688,154.9844 L529.9688,157.7031 Q529.3438,157.125 528.75,156.8594 Q528.1563,156.5781 527.5313,156.5781 Q526.1875,156.5781 525.5,157.6563 Q524.8125,158.7188 524.8125,160.8125 Q524.8125,162.9063 525.5,163.9844 Q526.1875,165.0469 527.5313,165.0469 Q528.1563,165.0469 528.75,164.7813 Q529.3438,164.5 529.9688,163.9219 L529.9688,166.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="541" y="165.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="513" x2="551" y1="177" y2="177"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="513" x2="551" y1="185" y2="185"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="48" id="C_0001144612141363797057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="151" y="145"/>
+      <ellipse cx="166" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M168.9688,166.6406 Q168.3906,166.9375 167.75,167.0781 Q167.1094,167.2344 166.4063,167.2344 Q163.9063,167.2344 162.5781,165.5938 Q161.2656,163.9375 161.2656,160.8125 Q161.2656,157.6875 162.5781,156.0313 Q163.9063,154.375 166.4063,154.375 Q167.1094,154.375 167.75,154.5313 Q168.4063,154.6875 168.9688,154.9844 L168.9688,157.7031 Q168.3438,157.125 167.75,156.8594 Q167.1563,156.5781 166.5313,156.5781 Q165.1875,156.5781 164.5,157.6563 Q163.8125,158.7188 163.8125,160.8125 Q163.8125,162.9063 164.5,163.9844 Q165.1875,165.0469 166.5313,165.0469 Q167.1563,165.0469 167.75,164.7813 Q168.3438,164.5 168.9688,163.9219 L168.9688,166.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="180" y="165.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="190" y1="177" y2="177"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="190" y1="185" y2="185"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="60.8047" id="C_0001472938318775327089" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="226.5" y="138.5"/>
+      <ellipse cx="241.5" cy="154.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M244.4688,160.1406 Q243.8906,160.4375 243.25,160.5781 Q242.6094,160.7344 241.9063,160.7344 Q239.4063,160.7344 238.0781,159.0938 Q236.7656,157.4375 236.7656,154.3125 Q236.7656,151.1875 238.0781,149.5313 Q239.4063,147.875 241.9063,147.875 Q242.6094,147.875 243.25,148.0313 Q243.9063,148.1875 244.4688,148.4844 L244.4688,151.2031 Q243.8438,150.625 243.25,150.3594 Q242.6563,150.0781 242.0313,150.0781 Q240.6875,150.0781 240,151.1563 Q239.3125,152.2188 239.3125,154.3125 Q239.3125,156.4063 240,157.4844 Q240.6875,158.5469 242.0313,158.5469 Q242.6563,158.5469 243.25,158.2813 Q243.8438,158 244.4688,157.4219 L244.4688,160.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="255.5" y="158.6543">CC</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="279.5" y="135.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="280.5" y="147.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="227.5" x2="284.5" y1="170.5" y2="170.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="227.5" x2="284.5" y1="178.5" y2="178.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="232.5" y="184.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="234.5" y="186.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="246.5" y="192.7104">t : T</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="73.6094" id="C_0000448885573685763285" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="151.5" y="266"/>
+      <ellipse cx="166.5" cy="282" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M170.6094,288 L162.8906,288 L162.8906,275.6094 L170.6094,275.6094 L170.6094,277.7656 L165.3438,277.7656 L165.3438,280.4375 L170.1094,280.4375 L170.1094,282.5938 L165.3438,282.5938 L165.3438,285.8438 L170.6094,285.8438 L170.6094,288 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="180.5" y="286.1543">detail::CCC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="298" y2="298"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="157.5" y="312.2104">ccc1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="157.5" y="325.0151">ccc2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="331.6094" y2="331.6094"/>
+    </a>
+  </g>
+</svg>
diff --git a/docs/test_cases/t00072_class_mermaid.svg b/docs/test_cases/t00072_class_mermaid.svg
new file mode 100644
index 00000000..bf3d312e
--- /dev/null
+++ b/docs/test_cases/t00072_class_mermaid.svg
@@ -0,0 +1,269 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 981.484375 139" style="max-width: 981.484px; background-color: white;" width="981.484375" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+      <style type="text/css">a:hover { text-decoration: underline; }</style>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
+        <path d="M 1,7 L18,13 V 1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
+        <path d="M 1,1 V 13 L18,7 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
+        <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
+        <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
+        <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
+      </marker>
+    </defs>
+    <defs>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
+      </marker>
+    </defs>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths"/>
+      <g class="edgeLabels"/>
+      <g class="nodes">
+        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L4">
+          <g title="B" id="classId-C_0001450150421445257774-0" class="node default clickable">
+            <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -21)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">B</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L6">
+          <g title="BB" id="classId-C_0000744925471008373109-1" class="node default clickable">
+            <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, -32)" height="18" width="51.578125" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">BB&lt;T&gt;</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, 2)" height="18" width="32.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-t : T</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L11">
+          <g title="BBB" id="classId-C_0000610293402618118513-2" class="node default clickable">
+            <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
+            <g class="label">
+              <foreignObject transform="translate( -53.375, -54)" height="18" width="106.75">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">«enumeration»</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -43.5546875, -32)" height="18" width="87.109375" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">detail::BBB</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 2)" height="18" width="35.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">bbb1</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 24)" height="18" width="35.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">bbb2</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(386.171875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod1.cppm#L4">
+          <g title="D" id="classId-C_0000516204432765266678-3" class="node default clickable">
+            <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -21)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">D</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(462.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod2.cppm#L4">
+          <g title="E" id="classId-C_0000347204883768272660-4" class="node default clickable">
+            <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.3359375, -21)" height="18" width="10.671875" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">E</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(538.40625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L4">
+          <g title="C" id="classId-C_0001144612141363797057-5" class="node default clickable">
+            <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
+            <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -21)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">C</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(634.9765625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L6">
+          <g title="CC" id="classId-C_0001472938318775327089-6" class="node default clickable">
+            <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, -32)" height="18" width="51.578125" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">CC&lt;T&gt;</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -25.7890625, 2)" height="18" width="32.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-t : T</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(779.140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L11">
+          <g title="CCC" id="classId-C_0000448885573685763285-7" class="node default clickable">
+            <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
+            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
+            <g class="label">
+              <foreignObject transform="translate( -53.375, -54)" height="18" width="106.75">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">«enumeration»</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -43.5546875, -32)" height="18" width="87.109375" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">detail::CCC</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 2)" height="18" width="32.90625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">ccc1</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 24)" height="18" width="32.90625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">ccc2</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(931.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L8">
+          <g title="A" id="classId-C_0001552096180171121044-8" class="node default clickable">
+            <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="41.734375" x1="-41.734375" class="divider"/>
+            <g class="label">
+              <foreignObject height="0" width="0">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel"/>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -5.78125, -43)" height="18" width="11.5625" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">A</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -34.234375, -9)" height="18" width="44.46875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-a : int</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -34.234375, 25)" height="18" width="68.46875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-get() : int</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md
index c6b2fc47..94e14048 100644
--- a/docs/test_cases/t20001.md
+++ b/docs/test_cases/t20001.md
@@ -119,8 +119,10 @@ int tmain()
   "name": "t20001_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "622672604730036140",
-      "name": "clanguml::t20001::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20001",
       "source_location": {
         "column": 5,
         "file": "t20001.cc",
@@ -130,8 +132,64 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "A()",
+          "id": "275353461034438145",
+          "name": "A",
+          "namespace": "",
+          "source_location": {
+            "column": 5,
+            "file": "t20001.cc",
+            "line": 15,
+            "translation_unit": "t20001.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "add(int,int)",
+          "id": "1131549932713395402",
+          "name": "add",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20001.cc",
+            "line": 17,
+            "translation_unit": "t20001.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "add3(int,int,int)",
+          "id": "2090436635449419593",
+          "name": "add3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20001.cc",
+            "line": 19,
+            "translation_unit": "t20001.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "log_result(int)",
+          "id": "1205947631808952097",
+          "name": "log_result",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20001.cc",
+            "line": 30,
+            "translation_unit": "t20001.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1771943546649183134",
-      "name": "clanguml::t20001::A",
+      "name": "A",
+      "namespace": "clanguml::t20001",
       "source_location": {
         "column": 7,
         "file": "t20001.cc",
@@ -141,8 +199,38 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "B(A &)",
+          "id": "2235477658795500000",
+          "name": "B",
+          "namespace": "",
+          "source_location": {
+            "column": 5,
+            "file": "t20001.cc",
+            "line": 38,
+            "translation_unit": "t20001.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "wrap_add3(int,int,int)",
+          "id": "642550151323208936",
+          "name": "wrap_add3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20001.cc",
+            "line": 50,
+            "translation_unit": "t20001.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "272433898507800600",
-      "name": "clanguml::t20001::B",
+      "name": "B",
+      "namespace": "clanguml::t20001",
       "source_location": {
         "column": 7,
         "file": "t20001.cc",
@@ -158,9 +246,7 @@ int tmain()
         {
           "from": {
             "activity_id": "622672604730036140",
-            "activity_name": "clanguml::t20001::tmain()",
-            "participant_id": "622672604730036140",
-            "participant_name": "clanguml::t20001::tmain()"
+            "participant_id": "622672604730036140"
           },
           "name": "A()",
           "return_type": "void",
@@ -173,7 +259,6 @@ int tmain()
           },
           "to": {
             "activity_id": "275353461034438145",
-            "activity_name": "clanguml::t20001::A::A()",
             "participant_id": "1771943546649183134"
           },
           "type": "message"
@@ -181,9 +266,7 @@ int tmain()
         {
           "from": {
             "activity_id": "622672604730036140",
-            "activity_name": "clanguml::t20001::tmain()",
-            "participant_id": "622672604730036140",
-            "participant_name": "clanguml::t20001::tmain()"
+            "participant_id": "622672604730036140"
           },
           "name": "B(A &)",
           "return_type": "void",
@@ -196,7 +279,6 @@ int tmain()
           },
           "to": {
             "activity_id": "2235477658795500000",
-            "activity_name": "clanguml::t20001::B::B(A &)",
             "participant_id": "272433898507800600"
           },
           "type": "message"
@@ -205,9 +287,7 @@ int tmain()
           "comment": "\\uml{note Just add 2 numbers}",
           "from": {
             "activity_id": "622672604730036140",
-            "activity_name": "clanguml::t20001::tmain()",
-            "participant_id": "622672604730036140",
-            "participant_name": "clanguml::t20001::tmain()"
+            "participant_id": "622672604730036140"
           },
           "name": "add(int,int)",
           "return_type": "int",
@@ -220,7 +300,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1131549932713395402",
-            "activity_name": "clanguml::t20001::A::add(int,int)",
             "participant_id": "1771943546649183134"
           },
           "type": "message"
@@ -229,9 +308,7 @@ int tmain()
           "comment": "\\uml{note[] And now add another 2}",
           "from": {
             "activity_id": "622672604730036140",
-            "activity_name": "clanguml::t20001::tmain()",
-            "participant_id": "622672604730036140",
-            "participant_name": "clanguml::t20001::tmain()"
+            "participant_id": "622672604730036140"
           },
           "name": "wrap_add3(int,int,int)",
           "return_type": "int",
@@ -244,7 +321,6 @@ int tmain()
           },
           "to": {
             "activity_id": "642550151323208936",
-            "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)",
             "participant_id": "272433898507800600"
           },
           "type": "message"
@@ -252,7 +328,6 @@ int tmain()
         {
           "from": {
             "activity_id": "642550151323208936",
-            "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)",
             "participant_id": "272433898507800600"
           },
           "name": "add3(int,int,int)",
@@ -266,7 +341,6 @@ int tmain()
           },
           "to": {
             "activity_id": "2090436635449419593",
-            "activity_name": "clanguml::t20001::A::add3(int,int,int)",
             "participant_id": "1771943546649183134"
           },
           "type": "message"
@@ -274,7 +348,6 @@ int tmain()
         {
           "from": {
             "activity_id": "2090436635449419593",
-            "activity_name": "clanguml::t20001::A::add3(int,int,int)",
             "participant_id": "1771943546649183134"
           },
           "name": "add(int,int)",
@@ -288,7 +361,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1131549932713395402",
-            "activity_name": "clanguml::t20001::A::add(int,int)",
             "participant_id": "1771943546649183134"
           },
           "type": "message"
@@ -296,7 +368,6 @@ int tmain()
         {
           "from": {
             "activity_id": "2090436635449419593",
-            "activity_name": "clanguml::t20001::A::add3(int,int,int)",
             "participant_id": "1771943546649183134"
           },
           "name": "log_result(int)",
@@ -310,7 +381,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1205947631808952097",
-            "activity_name": "clanguml::t20001::A::log_result(int)",
             "participant_id": "1771943546649183134"
           },
           "type": "message"
@@ -318,7 +388,6 @@ int tmain()
         {
           "from": {
             "activity_id": "642550151323208936",
-            "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)",
             "participant_id": "272433898507800600"
           },
           "name": "log_result(int)",
@@ -332,7 +401,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1205947631808952097",
-            "activity_name": "clanguml::t20001::A::log_result(int)",
             "participant_id": "1771943546649183134"
           },
           "type": "message"
diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg
index 3537b01e..2afc4173 100644
--- a/docs/test_cases/t20001_sequence.svg
+++ b/docs/test_cases/t20001_sequence.svg
@@ -1,110 +1,116 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="688px" preserveAspectRatio="none" style="width:304px;height:688px;background:#FFFFFF;" version="1.1" viewBox="0 0 304 688" width="304px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="699px" preserveAspectRatio="none" style="width:341px;height:699px;" version="1.1" viewBox="0 0 341 699" width="341px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fegc0xa174elw" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="229" x="36.5" y="28.0059">Basic sequence diagram example</text>
-    <rect fill="#FFFFFF" height="515.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="76.5" y="84.5999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="106.1999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="260.9999"/>
-    <rect fill="#FFFFFF" height="156.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="369.7999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="171.5" y="407.4"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="171.5" y="477"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="555.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="281.5" y="165.7999"/>
-    <rect fill="#FFFFFF" height="259.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="281.5" y="340.1999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="81" x2="81" y1="74.5999" y2="653.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="171" x2="171" y1="74.5999" y2="653.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="286" x2="286" y1="74.5999" y2="653.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="52" y="42.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="59" y="62.8059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="52" y="652.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="59" y="672.2059">tmain()</text>
+    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="293" x="24.5" y="26.708">Basic sequence diagram example</text>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="94" x2="94" y1="73.25" y2="658.7109"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="73.25" y2="658.7109"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="320" x2="320" y1="73.25" y2="658.7109"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="37.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="68" y="57.9482">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="657.7109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="68" y="677.7061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="160" y="42.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="167" y="62.8059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="160" y="652.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="167" y="672.2059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="37.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="57.9482">A</text>
+      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="657.7109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="677.7061">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="275" y="42.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="282" y="62.8059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="275" y="652.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="282" y="672.2059">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="37.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="313" y="57.9482">B</text>
+      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="657.7109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="313" y="677.7061">B</text>
     </a>
-    <rect fill="#FFFFFF" height="515.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="76.5" y="84.5999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="106.1999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="260.9999"/>
-    <rect fill="#FFFFFF" height="156.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="369.7999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="171.5" y="407.4"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="171.5" y="477"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="166.5" y="555.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="281.5" y="165.7999"/>
-    <rect fill="#FFFFFF" height="259.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="281.5" y="340.1999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="154.5,102.1999,164.5,106.1999,154.5,110.1999,158.5,106.1999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="86.5" x2="160.5" y1="106.1999" y2="106.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="93.5" y="100.6769">A()</text>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
+    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="176,100.3828,186,104.3828,176,108.3828,180,104.3828" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="182" y1="104.3828" y2="104.3828"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="106" y="99.3169">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="269.5,161.7999,279.5,165.7999,269.5,169.7999,273.5,165.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="86.5" x2="275.5" y1="165.7999" y2="165.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="39" x="93.5" y="160.2769">B(A &amp;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="303,159.5156,313,163.5156,303,167.5156,307,163.5156" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="309" y1="163.5156" y2="163.5156"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="106" y="158.4497">B(A &amp;)</text>
     </a>
-    <path d="M13,208.7999 L13,233.7999 L149,233.7999 L149,218.7999 L139,208.7999 L13,208.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M139,208.7999 L139,218.7999 L149,218.7999 L139,208.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="115" x="19" y="225.8769">Just add 2 numbers</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="154.5,256.9999,164.5,260.9999,154.5,264.9999,158.5,260.9999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="86.5" x2="160.5" y1="260.9999" y2="260.9999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="93.5" y="255.4769">add(int,int)</text>
+    <path d="M19,206.5156 L19,231.5156 L164,231.5156 L164,216.5156 L154,206.5156 L19,206.5156 " fill="#FBFB77" filter="url(#fegc0xa174elw)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M154,206.5156 L154,216.5156 L164,216.5156 L154,206.5156 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="124" x="25" y="223.5825">Just add 2 numbers</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="176,257.7813,186,261.7813,176,265.7813,180,261.7813" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="182" y1="261.7813" y2="261.7813"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="106" y="256.7153">add(int,int)</text>
     </a>
-    <polygon fill="#181818" points="97.5,270.9999,87.5,274.9999,97.5,278.9999,93.5,274.9999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="91.5" x2="170.5" y1="274.9999" y2="274.9999"/>
-    <path d="M5,287.9999 L5,312.9999 L159,312.9999 L159,297.9999 L149,287.9999 L5,287.9999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M149,287.9999 L149,297.9999 L159,297.9999 L149,287.9999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="133" x="11" y="305.0769">And now add another 2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="269.5,336.1999,279.5,340.1999,269.5,344.1999,273.5,340.1999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="86.5" x2="275.5" y1="340.1999" y2="340.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="120" x="93.5" y="334.6769">wrap_add3(int,int,int)</text>
+    <polygon fill="#A80036" points="110,271.7813,100,275.7813,110,279.7813,106,275.7813" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="104" x2="192" y1="275.7813" y2="275.7813"/>
+    <path d="M8,288.7813 L8,313.7813 L177,313.7813 L177,298.7813 L167,288.7813 L8,288.7813 " fill="#FBFB77" filter="url(#fegc0xa174elw)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M167,288.7813 L167,298.7813 L177,298.7813 L167,288.7813 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="148" x="14" y="305.8481">And now add another 2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="303,340.0469,313,344.0469,303,348.0469,307,344.0469" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="309" y1="344.0469" y2="344.0469"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="106" y="338.981">wrap_add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="187.5,365.7999,177.5,369.7999,187.5,373.7999,183.5,369.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="181.5" x2="280.5" y1="369.7999" y2="369.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="86" x="193.5" y="364.2769">add3(int,int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="209,369.1797,199,373.1797,209,377.1797,205,373.1797" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="314" y1="373.1797" y2="373.1797"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="215" y="368.1138">add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="176.5" x2="223.5" y1="394.4" y2="394.4"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="223.5" y1="394.4" y2="407.4"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="223.5" y1="407.4" y2="407.4"/>
-      <polygon fill="#181818" points="192.5,403.4,182.5,407.4,192.5,411.4,188.5,407.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="188.5" y="388.877">add(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="198" x2="245" y1="397.3125" y2="397.3125"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="245" y1="397.3125" y2="410.3125"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204" x2="245" y1="410.3125" y2="410.3125"/>
+      <polygon fill="#A80036" points="214,406.3125,204,410.3125,214,414.3125,210,410.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="210" y="392.2466">add(int,int)</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="181.5" x2="223.5" y1="431.4" y2="431.4"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="223.5" x2="223.5" y1="431.4" y2="444.4"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="176.5" x2="223.5" y1="444.4" y2="444.4"/>
-    <polygon fill="#181818" points="186.5,440.4,176.5,444.4,186.5,448.4,182.5,444.4" style="stroke:#181818;stroke-width:1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="181.5" x2="223.5" y1="469" y2="469"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="223.5" y1="469" y2="482"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="223.5" y1="482" y2="482"/>
-      <polygon fill="#181818" points="192.5,478,182.5,482,192.5,486,188.5,482" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="78" x="188.5" y="463.477">log_result(int)</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="203" x2="245" y1="434.3125" y2="434.3125"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="245" x2="245" y1="434.3125" y2="447.3125"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="198" x2="245" y1="447.3125" y2="447.3125"/>
+    <polygon fill="#A80036" points="208,443.3125,198,447.3125,208,451.3125,204,447.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="245" y1="471.4453" y2="471.4453"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="245" y1="471.4453" y2="484.4453"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204" x2="245" y1="484.4453" y2="484.4453"/>
+      <polygon fill="#A80036" points="214,480.4453,204,484.4453,214,488.4453,210,484.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="210" y="466.3794">log_result(int)</text>
     </a>
-    <polygon fill="#181818" points="269.5,522,279.5,526,269.5,530,273.5,526" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="171.5" x2="275.5" y1="526" y2="526"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="187.5,551.6,177.5,555.6,187.5,559.6,183.5,555.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="181.5" x2="280.5" y1="555.6" y2="555.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="78" x="193.5" y="550.077">log_result(int)</text>
+    <polygon fill="#A80036" points="303,524.4453,313,528.4453,303,532.4453,307,528.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193" x2="309" y1="528.4453" y2="528.4453"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="209,553.5781,199,557.5781,209,561.5781,205,557.5781" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="314" y1="557.5781" y2="557.5781"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="215" y="552.5122">log_result(int)</text>
     </a>
-    <polygon fill="#181818" points="92.5,595.6,82.5,599.6,92.5,603.6,88.5,599.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="86.5" x2="285.5" y1="599.6" y2="599.6"/>
-    <path d="M19,612.6 L19,637.6 L144,637.6 L144,622.6 L134,612.6 L19,612.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M134,612.6 L134,622.6 L144,622.6 L134,612.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="104" x="25" y="629.677">Main test function</text>
+    <polygon fill="#A80036" points="105,597.5781,95,601.5781,105,605.5781,101,601.5781" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="99" x2="319" y1="601.5781" y2="601.5781"/>
+    <path d="M24,614.5781 L24,639.5781 L159,639.5781 L159,624.5781 L149,614.5781 L24,614.5781 " fill="#FBFB77" filter="url(#fegc0xa174elw)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M149,614.5781 L149,624.5781 L159,624.5781 L149,614.5781 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="30" y="631.645">Main test function</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t20001_sequence_mermaid.svg b/docs/test_cases/t20001_sequence_mermaid.svg
index ef11462d..51e39579 100644
--- a/docs/test_cases/t20001_sequence_mermaid.svg
+++ b/docs/test_cases/t20001_sequence_mermaid.svg
@@ -1,4 +1,5 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-60 -50 660 850" style="max-width: 660px; background-color: white;" width="660" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-60 -50 660 850" style="max-width: 660px; background-color: white;" width="660" id="my-svg">
+  <title id="chart-title-my-svg">Basic sequence diagram example</title>
   <g>
     <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="724" x="400"/>
     <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="756.5" x="475">
@@ -63,17 +64,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -127,29 +128,29 @@
       <tspan x="75">Main test function</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">A()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="276">B(A &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="219" x="176">add(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="250" x2="271" y1="250" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="265" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="260" x2="83" y1="260" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="322" x="276">wrap_add3(int,int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="353" x2="471" y1="353" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="368" x="375">add3(int,int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="399" x2="279" y1="399" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">A()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="278">B(A &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="219" x="178">add(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="250" x2="275" y1="250" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="265" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="260" x2="80" y1="260" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="322" x="278">wrap_add3(int,int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="353" x2="475" y1="353" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="368" x="373">add3(int,int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="399" x2="275" y1="399" x1="470"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="414" x="280">add(int,int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,445 C 340,435 340,475 280,465"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="490" x="285">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 285,485 C 345,475 345,515 285,505"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="530" x="280">log_result(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,561 C 340,551 340,591 280,581"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="606" x="374">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="601" x2="467" y1="601" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="616" x="375">log_result(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="647" x2="279" y1="647" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="662" x="277">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="657" x2="83" y1="657" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="606" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="601" x2="470" y1="601" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="616" x="373">log_result(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="647" x2="275" y1="647" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="662" x="275">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="657" x2="80" y1="657" x1="470"/>
   <text y="-25" x="180">Basic sequence diagram example</text>
 </svg>
diff --git a/docs/test_cases/t20002.md b/docs/test_cases/t20002.md
index c4176911..1c2908c0 100644
--- a/docs/test_cases/t20002.md
+++ b/docs/test_cases/t20002.md
@@ -46,8 +46,10 @@ void m1() { m2(); }
   "name": "t20002_sequence",
   "participants": [
     {
+      "display_name": "m1()",
       "id": "1619421429271064154",
-      "name": "clanguml::t20002::m1()",
+      "name": "m1",
+      "namespace": "clanguml::t20002",
       "source_location": {
         "column": 6,
         "file": "t20002.cc",
@@ -57,8 +59,10 @@ void m1() { m2(); }
       "type": "function"
     },
     {
+      "display_name": "m2()",
       "id": "1575240232156112674",
-      "name": "clanguml::t20002::m2()",
+      "name": "m2",
+      "namespace": "clanguml::t20002",
       "source_location": {
         "column": 6,
         "file": "t20002.cc",
@@ -68,8 +72,10 @@ void m1() { m2(); }
       "type": "function"
     },
     {
+      "display_name": "m3()",
       "id": "1838809176089209580",
-      "name": "clanguml::t20002::m3()",
+      "name": "m3",
+      "namespace": "clanguml::t20002",
       "source_location": {
         "column": 6,
         "file": "t20002.cc",
@@ -79,8 +85,10 @@ void m1() { m2(); }
       "type": "function"
     },
     {
+      "display_name": "m4()",
       "id": "63715062711218534",
-      "name": "clanguml::t20002::m4()",
+      "name": "m4",
+      "namespace": "clanguml::t20002",
       "source_location": {
         "column": 6,
         "file": "t20002.cc",
@@ -96,9 +104,7 @@ void m1() { m2(); }
         {
           "from": {
             "activity_id": "1619421429271064154",
-            "activity_name": "clanguml::t20002::m1()",
-            "participant_id": "1619421429271064154",
-            "participant_name": "clanguml::t20002::m1()"
+            "participant_id": "1619421429271064154"
           },
           "name": "",
           "return_type": "void",
@@ -111,7 +117,6 @@ void m1() { m2(); }
           },
           "to": {
             "activity_id": "1575240232156112674",
-            "activity_name": "clanguml::t20002::m2()",
             "participant_id": "1575240232156112674"
           },
           "type": "message"
@@ -119,9 +124,7 @@ void m1() { m2(); }
         {
           "from": {
             "activity_id": "1575240232156112674",
-            "activity_name": "clanguml::t20002::m2()",
-            "participant_id": "1575240232156112674",
-            "participant_name": "clanguml::t20002::m2()"
+            "participant_id": "1575240232156112674"
           },
           "name": "",
           "return_type": "void",
@@ -134,7 +137,6 @@ void m1() { m2(); }
           },
           "to": {
             "activity_id": "1838809176089209580",
-            "activity_name": "clanguml::t20002::m3()",
             "participant_id": "1838809176089209580"
           },
           "type": "message"
@@ -142,9 +144,7 @@ void m1() { m2(); }
         {
           "from": {
             "activity_id": "1838809176089209580",
-            "activity_name": "clanguml::t20002::m3()",
-            "participant_id": "1838809176089209580",
-            "participant_name": "clanguml::t20002::m3()"
+            "participant_id": "1838809176089209580"
           },
           "name": "",
           "return_type": "void",
@@ -157,7 +157,6 @@ void m1() { m2(); }
           },
           "to": {
             "activity_id": "63715062711218534",
-            "activity_name": "clanguml::t20002::m4()",
             "participant_id": "63715062711218534"
           },
           "type": "message"
diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg
index 4ce8e8c6..8d8ea9ab 100644
--- a/docs/test_cases/t20002_sequence.svg
+++ b/docs/test_cases/t20002_sequence.svg
@@ -1,55 +1,61 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="164px" preserveAspectRatio="none" style="width:217px;height:164px;background:#FFFFFF;" version="1.1" viewBox="0 0 217 164" width="217px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:245px;height:170px;" version="1.1" viewBox="0 0 245 170" width="245px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f13li9123nhsut" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="64" style="stroke:#181818;stroke-width:1.0;" width="10" x="22" y="46.7999"/>
-    <rect fill="#FFFFFF" height="58" style="stroke:#181818;stroke-width:1.0;" width="10" x="76" y="52.7999"/>
-    <rect fill="#FFFFFF" height="44" style="stroke:#181818;stroke-width:1.0;" width="10" x="130" y="66.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="80.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="27" x2="27" y1="36.7999" y2="128.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="81" x2="81" y1="36.7999" y2="128.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="135" x2="135" y1="36.7999" y2="128.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="189" x2="189" y1="36.7999" y2="128.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="12" y="25.0059">m1()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="5" y="127.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="12" y="147.8059">m1()</text>
+    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="33" x2="33" y1="38.2969" y2="130.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="93" x2="93" y1="38.2969" y2="130.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="153" x2="153" y1="38.2969" y2="130.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="213" x2="213" y1="38.2969" y2="130.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="22.9951">m1()</text>
+      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="149.292">m1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="59" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="66" y="25.0059">m2()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="59" y="127.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="66" y="147.8059">m2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="22.9951">m2()</text>
+      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="149.292">m2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="113" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="120" y="25.0059">m3()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="113" y="127.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="120" y="147.8059">m3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="22.9951">m3()</text>
+      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="149.292">m3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="167" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="174" y="25.0059">m4()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="44" x="167" y="127.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="174" y="147.8059">m4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="22.9951">m4()</text>
+      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="149.292">m4()</text>
     </a>
-    <rect fill="#FFFFFF" height="64" style="stroke:#181818;stroke-width:1.0;" width="10" x="22" y="46.7999"/>
-    <rect fill="#FFFFFF" height="58" style="stroke:#181818;stroke-width:1.0;" width="10" x="76" y="52.7999"/>
-    <rect fill="#FFFFFF" height="44" style="stroke:#181818;stroke-width:1.0;" width="10" x="130" y="66.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="80.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="64,48.7999,74,52.7999,64,56.7999,68,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="32" x2="70" y1="52.7999" y2="52.7999"/>
+    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="76,50.2969,86,54.2969,76,58.2969,80,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="82" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="118,62.7999,128,66.7999,118,70.7999,122,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="86" x2="124" y1="66.7999" y2="66.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="136,64.2969,146,68.2969,136,72.2969,140,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="98" x2="142" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="172,76.7999,182,80.7999,172,84.7999,176,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="140" x2="178" y1="80.7999" y2="80.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="196,78.2969,206,82.2969,196,86.2969,200,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="158" x2="202" y1="82.2969" y2="82.2969"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20002_sequence_mermaid.svg b/docs/test_cases/t20002_sequence_mermaid.svg
index 53f2199c..856d0a45 100644
--- a/docs/test_cases/t20002_sequence_mermaid.svg
+++ b/docs/test_cases/t20002_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -109,10 +109,10 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="89" x="670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="376">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="471" y1="85" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="576">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="671" y1="95" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="378">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="475" y1="85" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="578">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="675" y1="95" x1="480"/>
 </svg>
diff --git a/docs/test_cases/t20003.md b/docs/test_cases/t20003.md
index 92d17d1c..a8383069 100644
--- a/docs/test_cases/t20003.md
+++ b/docs/test_cases/t20003.md
@@ -42,8 +42,10 @@ template <typename T> void m1(T p) { m2<T>(p); }
   "name": "t20003_sequence",
   "participants": [
     {
+      "display_name": "m1<T>(T)",
       "id": "469205740799240869",
-      "name": "clanguml::t20003::m1<T>(T)",
+      "name": "m1",
+      "namespace": "clanguml::t20003",
       "source_location": {
         "column": 28,
         "file": "t20003.cc",
@@ -53,8 +55,10 @@ template <typename T> void m1(T p) { m2<T>(p); }
       "type": "function_template"
     },
     {
+      "display_name": "m2<T>(T)",
       "id": "1502957449367040488",
-      "name": "clanguml::t20003::m2<T>(T)",
+      "name": "m2",
+      "namespace": "clanguml::t20003",
       "source_location": {
         "column": 28,
         "file": "t20003.cc",
@@ -64,8 +68,10 @@ template <typename T> void m1(T p) { m2<T>(p); }
       "type": "function_template"
     },
     {
+      "display_name": "m3<T>(T)",
       "id": "613477682313507585",
-      "name": "clanguml::t20003::m3<T>(T)",
+      "name": "m3",
+      "namespace": "clanguml::t20003",
       "source_location": {
         "column": 28,
         "file": "t20003.cc",
@@ -75,8 +81,10 @@ template <typename T> void m1(T p) { m2<T>(p); }
       "type": "function_template"
     },
     {
+      "display_name": "m4<T>(T)",
       "id": "619960023608507925",
-      "name": "clanguml::t20003::m4<T>(T)",
+      "name": "m4",
+      "namespace": "clanguml::t20003",
       "source_location": {
         "column": 28,
         "file": "t20003.cc",
@@ -92,9 +100,7 @@ template <typename T> void m1(T p) { m2<T>(p); }
         {
           "from": {
             "activity_id": "469205740799240869",
-            "activity_name": "clanguml::t20003::m1<T>(T)",
-            "participant_id": "469205740799240869",
-            "participant_name": "clanguml::t20003::m1<T>(T)"
+            "participant_id": "469205740799240869"
           },
           "name": "",
           "return_type": "void",
@@ -107,7 +113,6 @@ template <typename T> void m1(T p) { m2<T>(p); }
           },
           "to": {
             "activity_id": "1502957449367040488",
-            "activity_name": "clanguml::t20003::m2<T>(T)",
             "participant_id": "1502957449367040488"
           },
           "type": "message"
@@ -115,9 +120,7 @@ template <typename T> void m1(T p) { m2<T>(p); }
         {
           "from": {
             "activity_id": "1502957449367040488",
-            "activity_name": "clanguml::t20003::m2<T>(T)",
-            "participant_id": "1502957449367040488",
-            "participant_name": "clanguml::t20003::m2<T>(T)"
+            "participant_id": "1502957449367040488"
           },
           "name": "",
           "return_type": "void",
@@ -130,7 +133,6 @@ template <typename T> void m1(T p) { m2<T>(p); }
           },
           "to": {
             "activity_id": "613477682313507585",
-            "activity_name": "clanguml::t20003::m3<T>(T)",
             "participant_id": "613477682313507585"
           },
           "type": "message"
@@ -138,9 +140,7 @@ template <typename T> void m1(T p) { m2<T>(p); }
         {
           "from": {
             "activity_id": "613477682313507585",
-            "activity_name": "clanguml::t20003::m3<T>(T)",
-            "participant_id": "613477682313507585",
-            "participant_name": "clanguml::t20003::m3<T>(T)"
+            "participant_id": "613477682313507585"
           },
           "name": "",
           "return_type": "void",
@@ -153,7 +153,6 @@ template <typename T> void m1(T p) { m2<T>(p); }
           },
           "to": {
             "activity_id": "619960023608507925",
-            "activity_name": "clanguml::t20003::m4<T>(T)",
             "participant_id": "619960023608507925"
           },
           "type": "message"
diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg
index 302a670e..0ac9f853 100644
--- a/docs/test_cases/t20003_sequence.svg
+++ b/docs/test_cases/t20003_sequence.svg
@@ -1,55 +1,61 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="164px" preserveAspectRatio="none" style="width:353px;height:164px;background:#FFFFFF;" version="1.1" viewBox="0 0 353 164" width="353px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:413px;height:170px;" version="1.1" viewBox="0 0 413 170" width="413px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fx3fhns3wg80c" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="64" style="stroke:#181818;stroke-width:1.0;" width="10" x="39" y="46.7999"/>
-    <rect fill="#FFFFFF" height="58" style="stroke:#181818;stroke-width:1.0;" width="10" x="127" y="52.7999"/>
-    <rect fill="#FFFFFF" height="44" style="stroke:#181818;stroke-width:1.0;" width="10" x="215" y="66.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="303" y="80.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="44" x2="44" y1="36.7999" y2="128.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="132" x2="132" y1="36.7999" y2="128.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="220" x2="220" y1="36.7999" y2="128.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="308" x2="308" y1="36.7999" y2="128.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="12" y="25.0059">m1&lt;T&gt;(T)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="5" y="127.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="12" y="147.8059">m1&lt;T&gt;(T)</text>
+    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="54" x2="54" y1="38.2969" y2="130.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="156" x2="156" y1="38.2969" y2="130.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="258" x2="258" y1="38.2969" y2="130.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="360" x2="360" y1="38.2969" y2="130.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="22.9951">m1&lt;T&gt;(T)</text>
+      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="149.292">m1&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="93" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="100" y="25.0059">m2&lt;T&gt;(T)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="93" y="127.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="100" y="147.8059">m2&lt;T&gt;(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="22.9951">m2&lt;T&gt;(T)</text>
+      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="149.292">m2&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="181" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="188" y="25.0059">m3&lt;T&gt;(T)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="181" y="127.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="188" y="147.8059">m3&lt;T&gt;(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="22.9951">m3&lt;T&gt;(T)</text>
+      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="149.292">m3&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="269" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="276" y="25.0059">m4&lt;T&gt;(T)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="78" x="269" y="127.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64" x="276" y="147.8059">m4&lt;T&gt;(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="22.9951">m4&lt;T&gt;(T)</text>
+      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="149.292">m4&lt;T&gt;(T)</text>
     </a>
-    <rect fill="#FFFFFF" height="64" style="stroke:#181818;stroke-width:1.0;" width="10" x="39" y="46.7999"/>
-    <rect fill="#FFFFFF" height="58" style="stroke:#181818;stroke-width:1.0;" width="10" x="127" y="52.7999"/>
-    <rect fill="#FFFFFF" height="44" style="stroke:#181818;stroke-width:1.0;" width="10" x="215" y="66.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="303" y="80.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="115,48.7999,125,52.7999,115,56.7999,119,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="49" x2="121" y1="52.7999" y2="52.7999"/>
+    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="139,50.2969,149,54.2969,139,58.2969,143,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="59" x2="145" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="203,62.7999,213,66.7999,203,70.7999,207,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137" x2="209" y1="66.7999" y2="66.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="241,64.2969,251,68.2969,241,72.2969,245,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="247" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="291,76.7999,301,80.7999,291,84.7999,295,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="225" x2="297" y1="80.7999" y2="80.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="343,78.2969,353,82.2969,343,86.2969,347,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="263" x2="349" y1="82.2969" y2="82.2969"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20003_sequence_mermaid.svg b/docs/test_cases/t20003_sequence_mermaid.svg
index 1da4bead..6541cbff 100644
--- a/docs/test_cases/t20003_sequence_mermaid.svg
+++ b/docs/test_cases/t20003_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -109,10 +109,10 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="89" x="670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="376">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="471" y1="85" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="576">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="671" y1="95" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="378">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="475" y1="85" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="578">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="675" y1="95" x1="480"/>
 </svg>
diff --git a/docs/test_cases/t20004.md b/docs/test_cases/t20004.md
index d688fe04..a8c5edd5 100644
--- a/docs/test_cases/t20004.md
+++ b/docs/test_cases/t20004.md
@@ -78,8 +78,10 @@ int main()
   "name": "t20004_sequence",
   "participants": [
     {
+      "display_name": "main()",
       "id": "2299662004367884401",
-      "name": "clanguml::t20004::main()",
+      "name": "main",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 5,
         "file": "t20004.cc",
@@ -89,8 +91,10 @@ int main()
       "type": "function"
     },
     {
+      "display_name": "m1<float>(float)",
       "id": "138925040763435897",
-      "name": "clanguml::t20004::m1<float>(float)",
+      "name": "m1",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 36,
         "file": "t20004.cc",
@@ -100,8 +104,10 @@ int main()
       "type": "function_template"
     },
     {
+      "display_name": "m1<unsigned long>(unsigned long)",
       "id": "1239083518717603720",
-      "name": "clanguml::t20004::m1<unsigned long>(unsigned long)",
+      "name": "m1",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 44,
         "file": "t20004.cc",
@@ -111,8 +117,10 @@ int main()
       "type": "function_template"
     },
     {
+      "display_name": "m4<unsigned long>(unsigned long)",
       "id": "376599675205498367",
-      "name": "clanguml::t20004::m4<unsigned long>(unsigned long)",
+      "name": "m4",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 44,
         "file": "t20004.cc",
@@ -122,8 +130,10 @@ int main()
       "type": "function_template"
     },
     {
+      "display_name": "m1<std::string>(std::string)",
       "id": "1845817984839618223",
-      "name": "clanguml::t20004::m1<std::string>(std::string)",
+      "name": "m1",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 42,
         "file": "t20004.cc",
@@ -133,8 +143,10 @@ int main()
       "type": "function_template"
     },
     {
+      "display_name": "m2<std::string>(std::string)",
       "id": "1735054254122948614",
-      "name": "clanguml::t20004::m2<std::string>(std::string)",
+      "name": "m2",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 42,
         "file": "t20004.cc",
@@ -144,8 +156,10 @@ int main()
       "type": "function_template"
     },
     {
+      "display_name": "m1<int>(int)",
       "id": "121663532044911922",
-      "name": "clanguml::t20004::m1<int>(int)",
+      "name": "m1",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 25,
         "file": "t20004.cc",
@@ -155,8 +169,10 @@ int main()
       "type": "function_template"
     },
     {
+      "display_name": "m2<int>(int)",
       "id": "1475362124497386656",
-      "name": "clanguml::t20004::m2<int>(int)",
+      "name": "m2",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 25,
         "file": "t20004.cc",
@@ -166,8 +182,10 @@ int main()
       "type": "function_template"
     },
     {
+      "display_name": "m3<int>(int)",
       "id": "734999226157549914",
-      "name": "clanguml::t20004::m3<int>(int)",
+      "name": "m3",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 25,
         "file": "t20004.cc",
@@ -177,8 +195,10 @@ int main()
       "type": "function_template"
     },
     {
+      "display_name": "m4<int>(int)",
       "id": "1006390865908497562",
-      "name": "clanguml::t20004::m4<int>(int)",
+      "name": "m4",
+      "namespace": "clanguml::t20004",
       "source_location": {
         "column": 34,
         "file": "t20004.cc",
@@ -194,9 +214,7 @@ int main()
         {
           "from": {
             "activity_id": "2299662004367884401",
-            "activity_name": "clanguml::t20004::main()",
-            "participant_id": "2299662004367884401",
-            "participant_name": "clanguml::t20004::main()"
+            "participant_id": "2299662004367884401"
           },
           "name": "",
           "return_type": "",
@@ -209,7 +227,6 @@ int main()
           },
           "to": {
             "activity_id": "138925040763435897",
-            "activity_name": "clanguml::t20004::m1<float>(float)",
             "participant_id": "138925040763435897"
           },
           "type": "message"
@@ -217,9 +234,7 @@ int main()
         {
           "from": {
             "activity_id": "2299662004367884401",
-            "activity_name": "clanguml::t20004::main()",
-            "participant_id": "2299662004367884401",
-            "participant_name": "clanguml::t20004::main()"
+            "participant_id": "2299662004367884401"
           },
           "name": "",
           "return_type": "",
@@ -232,7 +247,6 @@ int main()
           },
           "to": {
             "activity_id": "1239083518717603720",
-            "activity_name": "clanguml::t20004::m1<unsigned long>(unsigned long)",
             "participant_id": "1239083518717603720"
           },
           "type": "message"
@@ -240,9 +254,7 @@ int main()
         {
           "from": {
             "activity_id": "1239083518717603720",
-            "activity_name": "clanguml::t20004::m1<unsigned long>(unsigned long)",
-            "participant_id": "1239083518717603720",
-            "participant_name": "clanguml::t20004::m1<unsigned long>(unsigned long)"
+            "participant_id": "1239083518717603720"
           },
           "name": "",
           "return_type": "",
@@ -255,7 +267,6 @@ int main()
           },
           "to": {
             "activity_id": "376599675205498367",
-            "activity_name": "clanguml::t20004::m4<unsigned long>(unsigned long)",
             "participant_id": "376599675205498367"
           },
           "type": "message"
@@ -263,9 +274,7 @@ int main()
         {
           "from": {
             "activity_id": "2299662004367884401",
-            "activity_name": "clanguml::t20004::main()",
-            "participant_id": "2299662004367884401",
-            "participant_name": "clanguml::t20004::main()"
+            "participant_id": "2299662004367884401"
           },
           "name": "",
           "return_type": "",
@@ -278,7 +287,6 @@ int main()
           },
           "to": {
             "activity_id": "1845817984839618223",
-            "activity_name": "clanguml::t20004::m1<std::string>(std::string)",
             "participant_id": "1845817984839618223"
           },
           "type": "message"
@@ -286,9 +294,7 @@ int main()
         {
           "from": {
             "activity_id": "1845817984839618223",
-            "activity_name": "clanguml::t20004::m1<std::string>(std::string)",
-            "participant_id": "1845817984839618223",
-            "participant_name": "clanguml::t20004::m1<std::string>(std::string)"
+            "participant_id": "1845817984839618223"
           },
           "name": "",
           "return_type": "",
@@ -301,7 +307,6 @@ int main()
           },
           "to": {
             "activity_id": "1735054254122948614",
-            "activity_name": "clanguml::t20004::m2<std::string>(std::string)",
             "participant_id": "1735054254122948614"
           },
           "type": "message"
@@ -309,9 +314,7 @@ int main()
         {
           "from": {
             "activity_id": "2299662004367884401",
-            "activity_name": "clanguml::t20004::main()",
-            "participant_id": "2299662004367884401",
-            "participant_name": "clanguml::t20004::main()"
+            "participant_id": "2299662004367884401"
           },
           "name": "",
           "return_type": "",
@@ -324,7 +327,6 @@ int main()
           },
           "to": {
             "activity_id": "121663532044911922",
-            "activity_name": "clanguml::t20004::m1<int>(int)",
             "participant_id": "121663532044911922"
           },
           "type": "message"
@@ -332,9 +334,7 @@ int main()
         {
           "from": {
             "activity_id": "121663532044911922",
-            "activity_name": "clanguml::t20004::m1<int>(int)",
-            "participant_id": "121663532044911922",
-            "participant_name": "clanguml::t20004::m1<int>(int)"
+            "participant_id": "121663532044911922"
           },
           "name": "",
           "return_type": "",
@@ -347,7 +347,6 @@ int main()
           },
           "to": {
             "activity_id": "1475362124497386656",
-            "activity_name": "clanguml::t20004::m2<int>(int)",
             "participant_id": "1475362124497386656"
           },
           "type": "message"
@@ -355,9 +354,7 @@ int main()
         {
           "from": {
             "activity_id": "1475362124497386656",
-            "activity_name": "clanguml::t20004::m2<int>(int)",
-            "participant_id": "1475362124497386656",
-            "participant_name": "clanguml::t20004::m2<int>(int)"
+            "participant_id": "1475362124497386656"
           },
           "name": "",
           "return_type": "",
@@ -370,7 +367,6 @@ int main()
           },
           "to": {
             "activity_id": "734999226157549914",
-            "activity_name": "clanguml::t20004::m3<int>(int)",
             "participant_id": "734999226157549914"
           },
           "type": "message"
@@ -378,9 +374,7 @@ int main()
         {
           "from": {
             "activity_id": "734999226157549914",
-            "activity_name": "clanguml::t20004::m3<int>(int)",
-            "participant_id": "734999226157549914",
-            "participant_name": "clanguml::t20004::m3<int>(int)"
+            "participant_id": "734999226157549914"
           },
           "name": "",
           "return_type": "",
@@ -393,7 +387,6 @@ int main()
           },
           "to": {
             "activity_id": "1006390865908497562",
-            "activity_name": "clanguml::t20004::m4<int>(int)",
             "participant_id": "1006390865908497562"
           },
           "type": "message"
diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg
index e412a4a4..f43c2ef4 100644
--- a/docs/test_cases/t20004_sequence.svg
+++ b/docs/test_cases/t20004_sequence.svg
@@ -1,151 +1,157 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="344px" preserveAspectRatio="none" style="width:1474px;height:344px;background:#FFFFFF;" version="1.1" viewBox="0 0 1474 344" width="1474px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="350px" preserveAspectRatio="none" style="width:1706px;height:350px;" version="1.1" viewBox="0 0 1706 350" width="1706px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f7dg1s7t3ugty" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="244" style="stroke:#181818;stroke-width:1.0;" width="10" x="27.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="122" y="52.7999"/>
-    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="308" y="80.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="556" y="94.7999"/>
-    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="777" y="136.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="971" y="150.7999"/>
-    <rect fill="#FFFFFF" height="98" style="stroke:#181818;stroke-width:1.0;" width="10" x="1118" y="192.7999"/>
-    <rect fill="#FFFFFF" height="70" style="stroke:#181818;stroke-width:1.0;" width="10" x="1218" y="206.7999"/>
-    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="1318" y="220.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="1418" y="234.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="32" x2="32" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="127" x2="127" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="313" x2="313" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="561" x2="561" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="782" x2="782" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="976" x2="976" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1123" x2="1123" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1223" x2="1223" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1323" x2="1323" y1="36.7999" y2="308.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1423" x2="1423" y1="36.7999" y2="308.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="12" y="25.0059">main()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="5" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="12" y="327.8059">main()</text>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="38" x2="38" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="145" x2="145" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="357" x2="357" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="639" x2="639" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="893" x2="893" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1119" x2="1119" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1291" x2="1291" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1409" x2="1409" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1527" x2="1527" y1="38.2969" y2="310.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1645" x2="1645" y1="38.2969" y2="310.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="22.9951">main()</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="329.292">main()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="70" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="77" y="25.0059">m1&lt;float&gt;(float)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="70" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="77" y="327.8059">m1&lt;float&gt;(float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="22.9951">m1&lt;float&gt;(float)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="329.292">m1&lt;float&gt;(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="194" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224" x="201" y="25.0059">m1&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="194" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224" x="201" y="327.8059">m1&lt;unsigned long&gt;(unsigned long)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="22.9951">m1&lt;unsigned long&gt;(unsigned long)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="329.292">m1&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="442" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224" x="449" y="25.0059">m4&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="238" x="442" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="224" x="449" y="327.8059">m4&lt;unsigned long&gt;(unsigned long)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="22.9951">m4&lt;unsigned long&gt;(unsigned long)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="329.292">m4&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="690" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="697" y="25.0059">m1&lt;std::string&gt;(std::string)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="690" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="697" y="327.8059">m1&lt;std::string&gt;(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="22.9951">m1&lt;std::string&gt;(std::string)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="329.292">m1&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="884" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="891" y="25.0059">m2&lt;std::string&gt;(std::string)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="884" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="891" y="327.8059">m2&lt;std::string&gt;(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="22.9951">m2&lt;std::string&gt;(std::string)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="329.292">m2&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1078" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1085" y="25.0059">m1&lt;int&gt;(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1078" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1085" y="327.8059">m1&lt;int&gt;(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="22.9951">m1&lt;int&gt;(int)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="329.292">m1&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1178" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1185" y="25.0059">m2&lt;int&gt;(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1178" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1185" y="327.8059">m2&lt;int&gt;(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="22.9951">m2&lt;int&gt;(int)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="329.292">m2&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1278" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1285" y="25.0059">m3&lt;int&gt;(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1278" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1285" y="327.8059">m3&lt;int&gt;(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="22.9951">m3&lt;int&gt;(int)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="329.292">m3&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1378" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1385" y="25.0059">m4&lt;int&gt;(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="90" x="1378" y="307.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="1385" y="327.8059">m4&lt;int&gt;(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="22.9951">m4&lt;int&gt;(int)</text>
+      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="329.292">m4&lt;int&gt;(int)</text>
     </a>
-    <rect fill="#FFFFFF" height="244" style="stroke:#181818;stroke-width:1.0;" width="10" x="27.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="122" y="52.7999"/>
-    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="308" y="80.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="556" y="94.7999"/>
-    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="777" y="136.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="971" y="150.7999"/>
-    <rect fill="#FFFFFF" height="98" style="stroke:#181818;stroke-width:1.0;" width="10" x="1118" y="192.7999"/>
-    <rect fill="#FFFFFF" height="70" style="stroke:#181818;stroke-width:1.0;" width="10" x="1218" y="206.7999"/>
-    <rect fill="#FFFFFF" height="42" style="stroke:#181818;stroke-width:1.0;" width="10" x="1318" y="220.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="1418" y="234.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="110,48.7999,120,52.7999,110,56.7999,114,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="37.5" x2="116" y1="52.7999" y2="52.7999"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="128,50.2969,138,54.2969,128,58.2969,132,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="134" y1="54.2969" y2="54.2969"/>
     </a>
-    <polygon fill="#181818" points="48.5,62.7999,38.5,66.7999,48.5,70.7999,44.5,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="42.5" x2="126" y1="66.7999" y2="66.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="296,76.7999,306,80.7999,296,84.7999,300,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="37.5" x2="302" y1="80.7999" y2="80.7999"/>
+    <polygon fill="#A80036" points="54.5,64.2969,44.5,68.2969,54.5,72.2969,50.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="144" y1="68.2969" y2="68.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="340,78.2969,350,82.2969,340,86.2969,344,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="346" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="544,90.7999,554,94.7999,544,98.7999,548,94.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="318" x2="550" y1="94.7999" y2="94.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="622,92.2969,632,96.2969,622,100.2969,626,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="362" x2="628" y1="96.2969" y2="96.2969"/>
     </a>
-    <polygon fill="#181818" points="329,104.7999,319,108.7999,329,112.7999,325,108.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="323" x2="560" y1="108.7999" y2="108.7999"/>
-    <polygon fill="#181818" points="48.5,118.7999,38.5,122.7999,48.5,126.7999,44.5,122.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="42.5" x2="312" y1="122.7999" y2="122.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="765,132.7999,775,136.7999,765,140.7999,769,136.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="37.5" x2="771" y1="136.7999" y2="136.7999"/>
+    <polygon fill="#A80036" points="373,106.2969,363,110.2969,373,114.2969,369,110.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="367" x2="638" y1="110.2969" y2="110.2969"/>
+    <polygon fill="#A80036" points="54.5,120.2969,44.5,124.2969,54.5,128.2969,50.5,124.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="356" y1="124.2969" y2="124.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="876,134.2969,886,138.2969,876,142.2969,880,138.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="882" y1="138.2969" y2="138.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="959,146.7999,969,150.7999,959,154.7999,963,150.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="787" x2="965" y1="150.7999" y2="150.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="1102,148.2969,1112,152.2969,1102,156.2969,1106,152.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="898" x2="1108" y1="152.2969" y2="152.2969"/>
     </a>
-    <polygon fill="#181818" points="798,160.7999,788,164.7999,798,168.7999,794,164.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="792" x2="975" y1="164.7999" y2="164.7999"/>
-    <polygon fill="#181818" points="48.5,174.7999,38.5,178.7999,48.5,182.7999,44.5,178.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="42.5" x2="781" y1="178.7999" y2="178.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="1106,188.7999,1116,192.7999,1106,196.7999,1110,192.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="37.5" x2="1112" y1="192.7999" y2="192.7999"/>
+    <polygon fill="#A80036" points="909,162.2969,899,166.2969,909,170.2969,905,166.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="903" x2="1118" y1="166.2969" y2="166.2969"/>
+    <polygon fill="#A80036" points="54.5,176.2969,44.5,180.2969,54.5,184.2969,50.5,180.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="892" y1="180.2969" y2="180.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="1274,190.2969,1284,194.2969,1274,198.2969,1278,194.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="1280" y1="194.2969" y2="194.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="1206,202.7999,1216,206.7999,1206,210.7999,1210,206.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="1128" x2="1212" y1="206.7999" y2="206.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="1392,204.2969,1402,208.2969,1392,212.2969,1396,208.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="1296" x2="1398" y1="208.2969" y2="208.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="1306,216.7999,1316,220.7999,1306,224.7999,1310,220.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="1228" x2="1312" y1="220.7999" y2="220.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="1510,218.2969,1520,222.2969,1510,226.2969,1514,222.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="1414" x2="1516" y1="222.2969" y2="222.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="1406,230.7999,1416,234.7999,1406,238.7999,1410,234.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="1328" x2="1412" y1="234.7999" y2="234.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="1628,232.2969,1638,236.2969,1628,240.2969,1632,236.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="1532" x2="1634" y1="236.2969" y2="236.2969"/>
     </a>
-    <polygon fill="#181818" points="1339,244.7999,1329,248.7999,1339,252.7999,1335,248.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="1333" x2="1422" y1="248.7999" y2="248.7999"/>
-    <polygon fill="#181818" points="1239,258.7999,1229,262.7999,1239,266.7999,1235,262.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="1233" x2="1322" y1="262.7999" y2="262.7999"/>
-    <polygon fill="#181818" points="1139,272.7999,1129,276.7999,1139,280.7999,1135,276.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="1133" x2="1222" y1="276.7999" y2="276.7999"/>
-    <polygon fill="#181818" points="43.5,286.7999,33.5,290.7999,43.5,294.7999,39.5,290.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="37.5" x2="1122" y1="290.7999" y2="290.7999"/>
+    <polygon fill="#A80036" points="1543,246.2969,1533,250.2969,1543,254.2969,1539,250.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1537" x2="1644" y1="250.2969" y2="250.2969"/>
+    <polygon fill="#A80036" points="1425,260.2969,1415,264.2969,1425,268.2969,1421,264.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1419" x2="1526" y1="264.2969" y2="264.2969"/>
+    <polygon fill="#A80036" points="1307,274.2969,1297,278.2969,1307,282.2969,1303,278.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1301" x2="1408" y1="278.2969" y2="278.2969"/>
+    <polygon fill="#A80036" points="49.5,288.2969,39.5,292.2969,49.5,296.2969,45.5,292.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="43.5" x2="1290" y1="292.2969" y2="292.2969"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20004_sequence_mermaid.svg b/docs/test_cases/t20004_sequence_mermaid.svg
index 65a0309a..20b66b63 100644
--- a/docs/test_cases/t20004_sequence_mermaid.svg
+++ b/docs/test_cases/t20004_sequence_mermaid.svg
@@ -168,17 +168,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -217,40 +217,40 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="209" x="2164"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="83" y1="85" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="301">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="521" y1="95" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="110" x="676">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="105" x2="821" y1="105" x1="530"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="120" x="677">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="115" x2="533" y1="115" x1="820"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="130" x="302">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="125" x2="83" y1="125" x1="520"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="140" x="587">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="135" x2="1094.5" y1="135" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="150" x="1223">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="145" x2="1341.5" y1="145" x1="1103.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="160" x="1224">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="155" x2="1106.5" y1="155" x1="1340.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="170" x="588">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="165" x2="83" y1="165" x1="1093.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="180" x="823">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="175" x2="1565" y1="175" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="190" x="1670">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="185" x2="1765" y1="185" x1="1574"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="200" x="1870">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="195" x2="1965" y1="195" x1="1774"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="210" x="2070">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="205" x2="2165" y1="205" x1="1974"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="220" x="2071">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="215" x2="1977" y1="215" x1="2164"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="230" x="1871">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="225" x2="1777" y1="225" x1="1964"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="240" x="1671">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="235" x2="1577" y1="235" x1="1764"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="250" x="824">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="245" x2="83" y1="245" x1="1564"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="80" y1="85" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="303">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="525" y1="95" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="110" x="678">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="105" x2="825" y1="105" x1="530"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="120" x="675">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="115" x2="530" y1="115" x1="820"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="130" x="300">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="125" x2="80" y1="125" x1="520"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="140" x="589">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="135" x2="1098.5" y1="135" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="150" x="1225">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="145" x2="1345.5" y1="145" x1="1103.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="160" x="1222">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="155" x2="1103.5" y1="155" x1="1340.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="170" x="587">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="165" x2="80" y1="165" x1="1093.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="180" x="825">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="175" x2="1569" y1="175" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="190" x="1672">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="185" x2="1769" y1="185" x1="1574"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="200" x="1872">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="195" x2="1969" y1="195" x1="1774"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="210" x="2072">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="205" x2="2169" y1="205" x1="1974"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="220" x="2069">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="215" x2="1974" y1="215" x1="2164"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="230" x="1869">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="225" x2="1774" y1="225" x1="1964"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="240" x="1669">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="235" x2="1574" y1="235" x1="1764"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="250" x="822">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="245" x2="80" y1="245" x1="1564"/>
 </svg>
diff --git a/docs/test_cases/t20005.md b/docs/test_cases/t20005.md
index 28f8a757..daa14c5a 100644
--- a/docs/test_cases/t20005.md
+++ b/docs/test_cases/t20005.md
@@ -49,8 +49,25 @@ template <typename T> struct C {
   "name": "t20005_sequence",
   "participants": [
     {
+      "activities": [
+        {
+          "display_name": "c(T)",
+          "id": "578718872965404973",
+          "name": "c",
+          "namespace": "",
+          "source_location": {
+            "column": 7,
+            "file": "t20005.cc",
+            "line": 15,
+            "translation_unit": "t20005.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "C<T>",
       "id": "365569130532127604",
-      "name": "clanguml::t20005::C<T>",
+      "name": "C",
+      "namespace": "clanguml::t20005",
       "source_location": {
         "column": 30,
         "file": "t20005.cc",
@@ -60,8 +77,25 @@ template <typename T> struct C {
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(T)",
+          "id": "870466496899932117",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 7,
+            "file": "t20005.cc",
+            "line": 9,
+            "translation_unit": "t20005.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<T>",
       "id": "666000829532846850",
-      "name": "clanguml::t20005::B<T>",
+      "name": "B",
+      "namespace": "clanguml::t20005",
       "source_location": {
         "column": 30,
         "file": "t20005.cc",
@@ -71,8 +105,25 @@ template <typename T> struct C {
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a(T)",
+          "id": "124853455814403745",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 7,
+            "file": "t20005.cc",
+            "line": 5,
+            "translation_unit": "t20005.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<T>",
       "id": "1278330455625941185",
-      "name": "clanguml::t20005::A<T>",
+      "name": "A",
+      "namespace": "clanguml::t20005",
       "source_location": {
         "column": 30,
         "file": "t20005.cc",
@@ -88,7 +139,6 @@ template <typename T> struct C {
         {
           "from": {
             "activity_id": "578718872965404973",
-            "activity_name": "clanguml::t20005::C<T>::c(T)",
             "participant_id": "365569130532127604"
           },
           "name": "b(T)",
@@ -102,7 +152,6 @@ template <typename T> struct C {
           },
           "to": {
             "activity_id": "870466496899932117",
-            "activity_name": "clanguml::t20005::B<T>::b(T)",
             "participant_id": "666000829532846850"
           },
           "type": "message"
@@ -110,7 +159,6 @@ template <typename T> struct C {
         {
           "from": {
             "activity_id": "870466496899932117",
-            "activity_name": "clanguml::t20005::B<T>::b(T)",
             "participant_id": "666000829532846850"
           },
           "name": "a(T)",
@@ -124,7 +172,6 @@ template <typename T> struct C {
           },
           "to": {
             "activity_id": "124853455814403745",
-            "activity_name": "clanguml::t20005::A<T>::a(T)",
             "participant_id": "1278330455625941185"
           },
           "type": "message"
diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg
index b9afa284..89a435f3 100644
--- a/docs/test_cases/t20005_sequence.svg
+++ b/docs/test_cases/t20005_sequence.svg
@@ -1,53 +1,59 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="223px" preserveAspectRatio="none" style="width:193px;height:223px;background:#FFFFFF;" version="1.1" viewBox="0 0 193 223" width="193px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:229px;height:227px;" version="1.1" viewBox="0 0 229 227" width="229px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1hwsv1mlulyhx" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="101.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="42" y="68.3999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="100.5" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="158.5" y="127.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="46.5" x2="46.5" y1="36.7999" y2="187.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="105.5" x2="105.5" y1="36.7999" y2="187.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="163.5" x2="163.5" y1="36.7999" y2="187.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="49" x="22.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="29.5" y="25.0059">C&lt;T&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="49" x="22.5" y="186.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="29.5" y="206.6059">C&lt;T&gt;</text>
+    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="50.5" x2="50.5" y1="38.2969" y2="187.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="121.5" x2="121.5" y1="38.2969" y2="187.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="38.2969" y2="187.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="22.9951">C&lt;T&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="206.6904">C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="48" x="81.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="88.5" y="25.0059">B&lt;T&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="48" x="81.5" y="186.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="88.5" y="206.6059">B&lt;T&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="22.9951">B&lt;T&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="206.6904">B&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="48" x="139.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="146.5" y="25.0059">A&lt;T&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="48" x="139.5" y="186.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="146.5" y="206.6059">A&lt;T&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="22.9951">A&lt;T&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="206.6904">A&lt;T&gt;</text>
     </a>
-    <rect fill="#FFFFFF" height="101.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="42" y="68.3999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="100.5" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="158.5" y="127.6"/>
-    <polygon fill="#181818" points="30,64.3999,40,68.3999,30,72.3999,34,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="36" y1="68.3999" y2="68.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="23" x="7" y="62.8769">c(T)</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="88.5,94,98.5,98,88.5,102,92.5,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="52" x2="94.5" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="23" x="59" y="92.477">b(T)</text>
+    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <polygon fill="#A80036" points="34,65.4297,44,69.4297,34,73.4297,38,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="40" y1="69.4297" y2="69.4297"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="10" y="64.3638">c(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="105,94.5625,115,98.5625,105,102.5625,109,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="56" x2="111" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="63" y="93.4966">b(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="146.5,123.6,156.5,127.6,146.5,131.6,150.5,127.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="110.5" x2="152.5" y1="127.6" y2="127.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="23" x="117.5" y="122.077">a(T)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="175.5,123.6953,185.5,127.6953,175.5,131.6953,179.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="127" x2="181.5" y1="127.6953" y2="127.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="134" y="122.6294">a(T)</text>
     </a>
-    <polygon fill="#181818" points="121.5,137.6,111.5,141.6,121.5,145.6,117.5,141.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="115.5" x2="162.5" y1="141.6" y2="141.6"/>
-    <polygon fill="#181818" points="63,151.6,53,155.6,63,159.6,59,155.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="57" x2="104.5" y1="155.6" y2="155.6"/>
-    <polygon fill="#181818" points="11,165.6,1,169.6,11,173.6,7,169.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="5" x2="46" y1="169.6" y2="169.6"/>
+    <polygon fill="#A80036" points="138,137.6953,128,141.6953,138,145.6953,134,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="132" x2="191.5" y1="141.6953" y2="141.6953"/>
+    <polygon fill="#A80036" points="67,151.6953,57,155.6953,67,159.6953,63,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="61" x2="121" y1="155.6953" y2="155.6953"/>
+    <polygon fill="#A80036" points="14,165.6953,4,169.6953,14,173.6953,10,169.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="8" x2="50" y1="169.6953" y2="169.6953"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20005_sequence_mermaid.svg b/docs/test_cases/t20005_sequence_mermaid.svg
index d0bced3a..63cb6780 100644
--- a/docs/test_cases/t20005_sequence_mermaid.svg
+++ b/docs/test_cases/t20005_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -106,16 +106,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="207" x="670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="177">c(T)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="79" y1="111" x1="274"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="276">b(T)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="576">a(T)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="213" x2="483" y1="213" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="277">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="83" y1="223" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="176">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="233" x2="271" y1="233" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">c(T)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="75" y1="111" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="278">b(T)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="578">a(T)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="575">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="213" x2="480" y1="213" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="275">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="80" y1="223" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="178">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="233" x2="275" y1="233" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20006.md b/docs/test_cases/t20006.md
index c3f22f38..afb11868 100644
--- a/docs/test_cases/t20006.md
+++ b/docs/test_cases/t20006.md
@@ -107,8 +107,10 @@ void tmain()
   "name": "t20006_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "363965584448680958",
-      "name": "clanguml::t20006::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 6,
         "file": "t20006.cc",
@@ -118,8 +120,25 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(int)",
+          "id": "250247217888843587",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 7,
+            "file": "t20006.cc",
+            "line": 12,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<int>",
       "id": "2197760498261923035",
-      "name": "clanguml::t20006::B<int>",
+      "name": "B",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 30,
         "file": "t20006.cc",
@@ -129,8 +148,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1(int)",
+          "id": "196390487987395669",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 7,
+            "file": "t20006.cc",
+            "line": 7,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<int>",
       "id": "596484796124829039",
-      "name": "clanguml::t20006::A<int>",
+      "name": "A",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 30,
         "file": "t20006.cc",
@@ -140,8 +176,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(std::string)",
+          "id": "13049632552871157",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20006.cc",
+            "line": 17,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<std::string>",
       "id": "2102622661983365981",
-      "name": "clanguml::t20006::B<std::string>",
+      "name": "B",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 20,
         "file": "t20006.cc",
@@ -151,8 +204,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a2(std::string)",
+          "id": "11762588624112907",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 7,
+            "file": "t20006.cc",
+            "line": 8,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<std::string>",
       "id": "413459875415381273",
-      "name": "clanguml::t20006::A<std::string>",
+      "name": "A",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 30,
         "file": "t20006.cc",
@@ -162,8 +232,51 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "BB(AA<int> *)",
+          "id": "381732876807761480",
+          "name": "BB",
+          "namespace": "",
+          "source_location": {
+            "column": 5,
+            "file": "t20006.cc",
+            "line": 37,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bb1(int,std::string)",
+          "id": "1062874005712014125",
+          "name": "bb1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20006.cc",
+            "line": 34,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bb2(int,std::string)",
+          "id": "787705189994778234",
+          "name": "bb2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20006.cc",
+            "line": 35,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "BB<int,std::string>",
       "id": "2269742833301555472",
-      "name": "clanguml::t20006::BB<int,std::string>",
+      "name": "BB",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 30,
         "file": "t20006.cc",
@@ -173,8 +286,51 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "BB(AA<int> &)",
+          "id": "1051013203072323842",
+          "name": "BB",
+          "namespace": "",
+          "source_location": {
+            "column": 5,
+            "file": "t20006.cc",
+            "line": 49,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bb1(int,float)",
+          "id": "1463188845572485713",
+          "name": "bb1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20006.cc",
+            "line": 46,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bb2(int,float)",
+          "id": "732362671329401903",
+          "name": "bb2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20006.cc",
+            "line": 47,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "BB<int,float>",
       "id": "1743503037360505162",
-      "name": "clanguml::t20006::BB<int,float>",
+      "name": "BB",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 30,
         "file": "t20006.cc",
@@ -184,8 +340,38 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "bb1(int,int)",
+          "id": "1213865121829347654",
+          "name": "bb1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20006.cc",
+            "line": 27,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bb2(int,int)",
+          "id": "361650123916792854",
+          "name": "bb2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20006.cc",
+            "line": 28,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "BB<int,int>",
       "id": "264392653889863384",
-      "name": "clanguml::t20006::BB<int,int>",
+      "name": "BB",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 42,
         "file": "t20006.cc",
@@ -195,8 +381,38 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "aa1(int)",
+          "id": "1235428163990670191",
+          "name": "aa1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20006.cc",
+            "line": 22,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "aa2(int)",
+          "id": "582097827335267290",
+          "name": "aa2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20006.cc",
+            "line": 23,
+            "translation_unit": "t20006.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "AA<int>",
       "id": "1903567228894636312",
-      "name": "clanguml::t20006::AA<int>",
+      "name": "AA",
+      "namespace": "clanguml::t20006",
       "source_location": {
         "column": 30,
         "file": "t20006.cc",
@@ -212,9 +428,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "b(int)",
           "return_type": "int",
@@ -227,7 +441,6 @@ void tmain()
           },
           "to": {
             "activity_id": "250247217888843587",
-            "activity_name": "clanguml::t20006::B<int>::b(int)",
             "participant_id": "2197760498261923035"
           },
           "type": "message"
@@ -235,7 +448,6 @@ void tmain()
         {
           "from": {
             "activity_id": "250247217888843587",
-            "activity_name": "clanguml::t20006::B<int>::b(int)",
             "participant_id": "2197760498261923035"
           },
           "name": "a1(int)",
@@ -249,7 +461,6 @@ void tmain()
           },
           "to": {
             "activity_id": "196390487987395669",
-            "activity_name": "clanguml::t20006::A<int>::a1(int)",
             "participant_id": "596484796124829039"
           },
           "type": "message"
@@ -257,9 +468,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "b(std::string)",
           "return_type": "std::string",
@@ -272,7 +481,6 @@ void tmain()
           },
           "to": {
             "activity_id": "13049632552871157",
-            "activity_name": "clanguml::t20006::B<std::string>::b(std::string)",
             "participant_id": "2102622661983365981"
           },
           "type": "message"
@@ -280,7 +488,6 @@ void tmain()
         {
           "from": {
             "activity_id": "13049632552871157",
-            "activity_name": "clanguml::t20006::B<std::string>::b(std::string)",
             "participant_id": "2102622661983365981"
           },
           "name": "a2(std::string)",
@@ -294,7 +501,6 @@ void tmain()
           },
           "to": {
             "activity_id": "11762588624112907",
-            "activity_name": "clanguml::t20006::A<std::string>::a2(std::string)",
             "participant_id": "413459875415381273"
           },
           "type": "message"
@@ -302,9 +508,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "BB(AA<int> *)",
           "return_type": "void",
@@ -317,7 +521,6 @@ void tmain()
           },
           "to": {
             "activity_id": "381732876807761480",
-            "activity_name": "clanguml::t20006::BB<int,std::string>::BB(AA<int> *)",
             "participant_id": "2269742833301555472"
           },
           "type": "message"
@@ -325,9 +528,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "BB(AA<int> &)",
           "return_type": "void",
@@ -340,7 +541,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1051013203072323842",
-            "activity_name": "clanguml::t20006::BB<int,float>::BB(AA<int> &)",
             "participant_id": "1743503037360505162"
           },
           "type": "message"
@@ -348,9 +548,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "bb1(int,int)",
           "return_type": "void",
@@ -363,7 +561,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1213865121829347654",
-            "activity_name": "clanguml::t20006::BB<int,int>::bb1(int,int)",
             "participant_id": "264392653889863384"
           },
           "type": "message"
@@ -371,7 +568,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1213865121829347654",
-            "activity_name": "clanguml::t20006::BB<int,int>::bb1(int,int)",
             "participant_id": "264392653889863384"
           },
           "name": "aa1(int)",
@@ -385,7 +581,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1235428163990670191",
-            "activity_name": "clanguml::t20006::AA<int>::aa1(int)",
             "participant_id": "1903567228894636312"
           },
           "type": "message"
@@ -393,9 +588,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "bb2(int,int)",
           "return_type": "void",
@@ -408,7 +601,6 @@ void tmain()
           },
           "to": {
             "activity_id": "361650123916792854",
-            "activity_name": "clanguml::t20006::BB<int,int>::bb2(int,int)",
             "participant_id": "264392653889863384"
           },
           "type": "message"
@@ -416,7 +608,6 @@ void tmain()
         {
           "from": {
             "activity_id": "361650123916792854",
-            "activity_name": "clanguml::t20006::BB<int,int>::bb2(int,int)",
             "participant_id": "264392653889863384"
           },
           "name": "aa2(int)",
@@ -430,7 +621,6 @@ void tmain()
           },
           "to": {
             "activity_id": "582097827335267290",
-            "activity_name": "clanguml::t20006::AA<int>::aa2(int)",
             "participant_id": "1903567228894636312"
           },
           "type": "message"
@@ -438,9 +628,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "bb1(int,std::string)",
           "return_type": "void",
@@ -453,7 +641,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1062874005712014125",
-            "activity_name": "clanguml::t20006::BB<int,std::string>::bb1(int,std::string)",
             "participant_id": "2269742833301555472"
           },
           "type": "message"
@@ -461,7 +648,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1062874005712014125",
-            "activity_name": "clanguml::t20006::BB<int,std::string>::bb1(int,std::string)",
             "participant_id": "2269742833301555472"
           },
           "name": "aa2(int)",
@@ -475,7 +661,6 @@ void tmain()
           },
           "to": {
             "activity_id": "582097827335267290",
-            "activity_name": "clanguml::t20006::AA<int>::aa2(int)",
             "participant_id": "1903567228894636312"
           },
           "type": "message"
@@ -483,9 +668,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "bb2(int,std::string)",
           "return_type": "void",
@@ -498,7 +681,6 @@ void tmain()
           },
           "to": {
             "activity_id": "787705189994778234",
-            "activity_name": "clanguml::t20006::BB<int,std::string>::bb2(int,std::string)",
             "participant_id": "2269742833301555472"
           },
           "type": "message"
@@ -506,7 +688,6 @@ void tmain()
         {
           "from": {
             "activity_id": "787705189994778234",
-            "activity_name": "clanguml::t20006::BB<int,std::string>::bb2(int,std::string)",
             "participant_id": "2269742833301555472"
           },
           "name": "aa1(int)",
@@ -520,7 +701,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1235428163990670191",
-            "activity_name": "clanguml::t20006::AA<int>::aa1(int)",
             "participant_id": "1903567228894636312"
           },
           "type": "message"
@@ -528,9 +708,7 @@ void tmain()
         {
           "from": {
             "activity_id": "363965584448680958",
-            "activity_name": "clanguml::t20006::tmain()",
-            "participant_id": "363965584448680958",
-            "participant_name": "clanguml::t20006::tmain()"
+            "participant_id": "363965584448680958"
           },
           "name": "bb1(int,float)",
           "return_type": "void",
@@ -543,7 +721,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1463188845572485713",
-            "activity_name": "clanguml::t20006::BB<int,float>::bb1(int,float)",
             "participant_id": "1743503037360505162"
           },
           "type": "message"
@@ -551,7 +728,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1463188845572485713",
-            "activity_name": "clanguml::t20006::BB<int,float>::bb1(int,float)",
             "participant_id": "1743503037360505162"
           },
           "name": "bb2(int,float)",
@@ -565,7 +741,6 @@ void tmain()
           },
           "to": {
             "activity_id": "732362671329401903",
-            "activity_name": "clanguml::t20006::BB<int,float>::bb2(int,float)",
             "participant_id": "1743503037360505162"
           },
           "type": "message"
@@ -573,7 +748,6 @@ void tmain()
         {
           "from": {
             "activity_id": "732362671329401903",
-            "activity_name": "clanguml::t20006::BB<int,float>::bb2(int,float)",
             "participant_id": "1743503037360505162"
           },
           "name": "aa2(int)",
@@ -587,7 +761,6 @@ void tmain()
           },
           "to": {
             "activity_id": "582097827335267290",
-            "activity_name": "clanguml::t20006::AA<int>::aa2(int)",
             "participant_id": "1903567228894636312"
           },
           "type": "message"
diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg
index 7ce2ed72..7c688f8f 100644
--- a/docs/test_cases/t20006_sequence.svg
+++ b/docs/test_cases/t20006_sequence.svg
@@ -1,201 +1,207 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="874px" preserveAspectRatio="none" style="width:829px;height:874px;background:#FFFFFF;" version="1.1" viewBox="0 0 829 874" width="829px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="872px" preserveAspectRatio="none" style="width:986px;height:872px;" version="1.1" viewBox="0 0 986 872" width="986px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1i1sk01hz21d1" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="774.2002" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="98"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="248.5" y="155.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="359.5" y="185.2"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="242.8"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="540.4001"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="629.6001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="606" y="302.4"/>
-    <rect fill="#FFFFFF" height="102.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="606" y="718.8001"/>
-    <rect fill="#FFFFFF" height="64.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="611" y="756.4001"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="704" y="362"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="704" y="451.2001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="391.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="480.8001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="570.0001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="659.2001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="791.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="839.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="101" x2="101" y1="36.7999" y2="839.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="166" x2="166" y1="36.7999" y2="839.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="253" x2="253" y1="36.7999" y2="839.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="364" x2="364" y1="36.7999" y2="839.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="489" x2="489" y1="36.7999" y2="839.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="611" x2="611" y1="36.7999" y2="839.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="709" x2="709" y1="36.7999" y2="839.0002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="791" x2="791" y1="36.7999" y2="839.0002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="858.0061">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="832.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="832.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="832.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="302" x2="302" y1="38.2969" y2="832.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="435" x2="435" y1="38.2969" y2="832.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="583" x2="583" y1="38.2969" y2="832.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="832.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="842" x2="842" y1="38.2969" y2="832.5547"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="940" x2="940" y1="38.2969" y2="832.5547"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="851.5498">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="25.0059">B&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="858.0061">B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="851.5498">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="139" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="146" y="25.0059">A&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="139" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="146" y="858.0061">A&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="851.5498">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="203" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="210" y="25.0059">B&lt;std::string&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="203" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="210" y="858.0061">B&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="22.9951">B&lt;std::string&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="851.5498">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="314" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="321" y="25.0059">A&lt;std::string&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="314" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="321" y="858.0061">A&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="22.9951">A&lt;std::string&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="851.5498">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="425" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="432" y="25.0059">BB&lt;int,std::string&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="425" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="115" x="432" y="858.0061">BB&lt;int,std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="22.9951">BB&lt;int,std::string&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="851.5498">BB&lt;int,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="564" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="571" y="25.0059">BB&lt;int,float&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="94" x="564" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="571" y="858.0061">BB&lt;int,float&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="22.9951">BB&lt;int,float&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="851.5498">BB&lt;int,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="668" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="675" y="25.0059">BB&lt;int,int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="668" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="675" y="858.0061">BB&lt;int,int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="22.9951">BB&lt;int,int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="851.5498">BB&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="760" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="767" y="25.0059">AA&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="760" y="838.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="767" y="858.0061">AA&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="22.9951">AA&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="831.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="851.5498">AA&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" height="774.2002" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="98"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="248.5" y="155.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="359.5" y="185.2"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="242.8"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="540.4001"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="484.5" y="629.6001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="606" y="302.4"/>
-    <rect fill="#FFFFFF" height="102.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="606" y="718.8001"/>
-    <rect fill="#FFFFFF" height="64.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="611" y="756.4001"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="704" y="362"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="704" y="451.2001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="391.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="480.8001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="570.0001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="659.2001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="786.5" y="791.0002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84,64.3999,94,68.3999,84,72.3999,88,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="62.8769">b(int)</text>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="149,94,159,98,149,102,153,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="155" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="113" y="92.477">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
     </a>
-    <polygon fill="#181818" points="117,108,107,112,117,116,113,112" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="111" x2="165" y1="112" y2="112"/>
-    <polygon fill="#181818" points="50.5,122,40.5,126,50.5,130,46.5,126" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="100" y1="126" y2="126"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="236.5,151.6,246.5,155.6,236.5,159.6,240.5,155.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="242.5" y1="155.6" y2="155.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="46.5" y="150.077">b(std::string)</text>
+    <polygon fill="#A80036" points="134.5,108.5625,124.5,112.5625,134.5,116.5625,130.5,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="128.5" x2="196" y1="112.5625" y2="112.5625"/>
+    <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="117.5" y1="126.5625" y2="126.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="285.5,151.6953,295.5,155.6953,285.5,159.6953,289.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="291.5" y1="155.6953" y2="155.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="150.6294">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="347.5,181.2,357.5,185.2,347.5,189.2,351.5,185.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="258.5" x2="353.5" y1="185.2" y2="185.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="80" x="265.5" y="179.677">a2(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="418,180.8281,428,184.8281,418,188.8281,422,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="307.5" x2="424" y1="184.8281" y2="184.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="314.5" y="179.7622">a2(std::string)</text>
     </a>
-    <polygon fill="#181818" points="269.5,195.2,259.5,199.2,269.5,203.2,265.5,199.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="263.5" x2="363.5" y1="199.2" y2="199.2"/>
-    <polygon fill="#181818" points="50.5,209.2,40.5,213.2,50.5,217.2,46.5,213.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="252.5" y1="213.2" y2="213.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="472.5,238.8,482.5,242.8,472.5,246.8,476.5,242.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="478.5" y1="242.8" y2="242.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="83" x="46.5" y="237.277">BB(AA&lt;int&gt; *)</text>
+    <polygon fill="#A80036" points="318.5,194.8281,308.5,198.8281,318.5,202.8281,314.5,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="312.5" x2="434" y1="198.8281" y2="198.8281"/>
+    <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="301.5" y1="212.8281" y2="212.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="566,237.9609,576,241.9609,566,245.9609,570,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="241.9609" y2="241.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="53" y="236.895">BB(AA&lt;int&gt; *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="594,298.4,604,302.4,594,306.4,598,302.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="600" y1="302.4" y2="302.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="87" x="46.5" y="296.877">BB(AA&lt;int&gt; &amp;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="709,297.0938,719,301.0938,709,305.0938,713,301.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="301.0938" y2="301.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="99" x="53" y="296.0278">BB(AA&lt;int&gt; &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="692,358,702,362,692,366,696,362" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="698" y1="362" y2="362"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="46.5" y="356.477">bb1(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="825,356.2266,835,360.2266,825,364.2266,829,360.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="360.2266" y2="360.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="355.1606">bb1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="774.5,387.6,784.5,391.6,774.5,395.6,778.5,391.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="714" x2="780.5" y1="391.6" y2="391.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="721" y="386.077">aa1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="923.5,385.3594,933.5,389.3594,923.5,393.3594,927.5,389.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="389.3594" y2="389.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="384.2935">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="692,447.2001,702,451.2001,692,455.2001,696,451.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="698" y1="451.2001" y2="451.2001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="46.5" y="445.677">bb2(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="825,444.4922,835,448.4922,825,452.4922,829,448.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="448.4922" y2="448.4922"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="443.4263">bb2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="774.5,476.8001,784.5,480.8001,774.5,484.8001,778.5,480.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="714" x2="780.5" y1="480.8001" y2="480.8001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="721" y="475.2771">aa2(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="923.5,473.625,933.5,477.625,923.5,481.625,927.5,477.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="477.625" y2="477.625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="472.5591">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="472.5,536.4001,482.5,540.4001,472.5,544.4001,476.5,540.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="478.5" y1="540.4001" y2="540.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="46.5" y="534.8771">bb1(int,std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="566,532.7578,576,536.7578,566,540.7578,570,536.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="536.7578" y2="536.7578"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="531.6919">bb1(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="774.5,566.0001,784.5,570.0001,774.5,574.0001,778.5,570.0001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="494.5" x2="780.5" y1="570.0001" y2="570.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="501.5" y="564.4771">aa2(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="923.5,561.8906,933.5,565.8906,923.5,569.8906,927.5,565.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="565.8906" y2="565.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="560.8247">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="472.5,625.6001,482.5,629.6001,472.5,633.6001,476.5,629.6001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="478.5" y1="629.6001" y2="629.6001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="46.5" y="624.0771">bb2(int,std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="566,621.0234,576,625.0234,566,629.0234,570,625.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="625.0234" y2="625.0234"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="619.9575">bb2(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="774.5,655.2001,784.5,659.2001,774.5,663.2001,778.5,659.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="494.5" x2="780.5" y1="659.2001" y2="659.2001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="501.5" y="653.6771">aa1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="923.5,650.1563,933.5,654.1563,923.5,658.1563,927.5,654.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="654.1563" y2="654.1563"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="649.0903">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="594,714.8001,604,718.8001,594,722.8001,598,718.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="600" y1="718.8001" y2="718.8001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="46.5" y="713.2771">bb1(int,float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="709,709.2891,719,713.2891,709,717.2891,713,713.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="713.2891" y2="713.2891"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="708.2231">bb1(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="616" x2="663" y1="743.4001" y2="743.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="663" x2="663" y1="743.4001" y2="756.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="622" x2="663" y1="756.4001" y2="756.4001"/>
-      <polygon fill="#181818" points="632,752.4001,622,756.4001,632,760.4001,628,756.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="628" y="737.8771">bb2(int,float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="731" x2="778" y1="737.4219" y2="737.4219"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="778" x2="778" y1="737.4219" y2="750.4219"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="737" x2="778" y1="750.4219" y2="750.4219"/>
+      <polygon fill="#A80036" points="747,746.4219,737,750.4219,747,754.4219,743,750.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="743" y="732.356">bb2(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="774.5,787.0002,784.5,791.0002,774.5,795.0002,778.5,791.0002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="621" x2="780.5" y1="791.0002" y2="791.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="628" y="785.4772">aa2(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="923.5,780.5547,933.5,784.5547,923.5,788.5547,927.5,784.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="736" x2="929.5" y1="784.5547" y2="784.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="743" y="779.4888">aa2(int)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20006_sequence_mermaid.svg b/docs/test_cases/t20006_sequence_mermaid.svg
index e291068d..33f9eca7 100644
--- a/docs/test_cases/t20006_sequence_mermaid.svg
+++ b/docs/test_cases/t20006_sequence_mermaid.svg
@@ -153,17 +153,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -226,46 +226,46 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="911" x="1670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="283" y1="167" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="83" y1="177" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="376">b(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="671" y1="223" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="776">a2(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="871" y1="269" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="777">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="683" y1="279" x1="870"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="83" y1="289" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="576">BB(AA&lt;int&gt; *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="1071" y1="335" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="676">BB(AA&lt;int&gt; &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="1271" y1="381" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="776">bb1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="427" x2="1471" y1="427" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="442" x="1576">aa1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="473" x2="1671" y1="473" x1="1480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="488" x="776">bb2(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="519" x2="1471" y1="519" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="534" x="1576">aa2(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="565" x2="1671" y1="565" x1="1480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="580" x="576">bb1(int,std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="611" x2="1071" y1="611" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="626" x="1376">aa2(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="657" x2="1671" y1="657" x1="1080"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="672" x="576">bb2(int,std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="703" x2="1071" y1="703" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="718" x="1376">aa1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="749" x2="1671" y1="749" x1="1080"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="764" x="676">bb1(int,float)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="795" x2="1271" y1="795" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="280" y1="167" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="80" y1="177" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="378">b(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="675" y1="223" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="778">a2(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="875" y1="269" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="775">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="680" y1="279" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="80" y1="289" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="578">BB(AA&lt;int&gt; *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="1075" y1="335" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="678">BB(AA&lt;int&gt; &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="1275" y1="381" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="778">bb1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="427" x2="1475" y1="427" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="442" x="1578">aa1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="473" x2="1675" y1="473" x1="1480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="488" x="778">bb2(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="519" x2="1475" y1="519" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="534" x="1578">aa2(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="565" x2="1675" y1="565" x1="1480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="580" x="578">bb1(int,std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="611" x2="1075" y1="611" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="626" x="1378">aa2(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="657" x2="1675" y1="657" x1="1080"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="672" x="578">bb2(int,std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="703" x2="1075" y1="703" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="718" x="1378">aa1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="749" x2="1675" y1="749" x1="1080"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="764" x="678">bb1(int,float)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="795" x2="1275" y1="795" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="810" x="1280">bb2(int,float)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1280,841 C 1340,831 1340,871 1280,861"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="886" x="1478">aa2(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="917" x2="1671" y1="917" x1="1285"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="886" x="1480">aa2(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="917" x2="1675" y1="917" x1="1285"/>
 </svg>
diff --git a/docs/test_cases/t20007.md b/docs/test_cases/t20007.md
index ef03fdd1..8b727497 100644
--- a/docs/test_cases/t20007.md
+++ b/docs/test_cases/t20007.md
@@ -53,8 +53,10 @@ void tmain()
   "name": "t20007_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "622662006747239840",
-      "name": "clanguml::t20007::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20007",
       "source_location": {
         "column": 6,
         "file": "t20007.cc",
@@ -64,8 +66,25 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "add(int &&,int &&)",
+          "id": "438133719207269065",
+          "name": "add",
+          "namespace": "",
+          "source_location": {
+            "column": 11,
+            "file": "t20007.cc",
+            "line": 8,
+            "translation_unit": "t20007.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Adder<int,int>",
       "id": "1742497005509009302",
-      "name": "clanguml::t20007::Adder<int,int>",
+      "name": "Adder",
+      "namespace": "clanguml::t20007",
       "source_location": {
         "column": 52,
         "file": "t20007.cc",
@@ -75,8 +94,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "add(int &&,float &&,double &&)",
+          "id": "9522724767688870",
+          "name": "add",
+          "namespace": "",
+          "source_location": {
+            "column": 11,
+            "file": "t20007.cc",
+            "line": 8,
+            "translation_unit": "t20007.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Adder<int,float,double>",
       "id": "599640474306956868",
-      "name": "clanguml::t20007::Adder<int,float,double>",
+      "name": "Adder",
+      "namespace": "clanguml::t20007",
       "source_location": {
         "column": 52,
         "file": "t20007.cc",
@@ -86,8 +122,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "add(std::string &&,std::string &&,std::string &&)",
+          "id": "384866641042941480",
+          "name": "add",
+          "namespace": "",
+          "source_location": {
+            "column": 11,
+            "file": "t20007.cc",
+            "line": 8,
+            "translation_unit": "t20007.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Adder<std::string,std::string,std::string>",
       "id": "228191787514523926",
-      "name": "clanguml::t20007::Adder<std::string,std::string,std::string>",
+      "name": "Adder",
+      "namespace": "clanguml::t20007",
       "source_location": {
         "column": 52,
         "file": "t20007.cc",
@@ -103,9 +156,7 @@ void tmain()
         {
           "from": {
             "activity_id": "622662006747239840",
-            "activity_name": "clanguml::t20007::tmain()",
-            "participant_id": "622662006747239840",
-            "participant_name": "clanguml::t20007::tmain()"
+            "participant_id": "622662006747239840"
           },
           "name": "add(int &&,int &&)",
           "return_type": "int",
@@ -118,7 +169,6 @@ void tmain()
           },
           "to": {
             "activity_id": "438133719207269065",
-            "activity_name": "clanguml::t20007::Adder<int,int>::add(int &&,int &&)",
             "participant_id": "1742497005509009302"
           },
           "type": "message"
@@ -126,9 +176,7 @@ void tmain()
         {
           "from": {
             "activity_id": "622662006747239840",
-            "activity_name": "clanguml::t20007::tmain()",
-            "participant_id": "622662006747239840",
-            "participant_name": "clanguml::t20007::tmain()"
+            "participant_id": "622662006747239840"
           },
           "name": "add(int &&,float &&,double &&)",
           "return_type": "int",
@@ -141,7 +189,6 @@ void tmain()
           },
           "to": {
             "activity_id": "9522724767688870",
-            "activity_name": "clanguml::t20007::Adder<int,float,double>::add(int &&,float &&,double &&)",
             "participant_id": "599640474306956868"
           },
           "type": "message"
@@ -149,9 +196,7 @@ void tmain()
         {
           "from": {
             "activity_id": "622662006747239840",
-            "activity_name": "clanguml::t20007::tmain()",
-            "participant_id": "622662006747239840",
-            "participant_name": "clanguml::t20007::tmain()"
+            "participant_id": "622662006747239840"
           },
           "name": "add(std::string &&,std::string &&,std::string &&)",
           "return_type": "std::basic_string<char>",
@@ -164,7 +209,6 @@ void tmain()
           },
           "to": {
             "activity_id": "384866641042941480",
-            "activity_name": "clanguml::t20007::Adder<std::string,std::string,std::string>::add(std::string &&,std::string &&,std::string &&)",
             "participant_id": "228191787514523926"
           },
           "type": "message"
diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg
index a823cc7a..ac92f4dc 100644
--- a/docs/test_cases/t20007_sequence.svg
+++ b/docs/test_cases/t20007_sequence.svg
@@ -1,64 +1,70 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="223px" preserveAspectRatio="none" style="width:668px;height:223px;background:#FFFFFF;" version="1.1" viewBox="0 0 668 223" width="668px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:768px;height:227px;" version="1.1" viewBox="0 0 768 227" width="768px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="foo45pt7fkqc7" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="122.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="163.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="305" y="112"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="526.5" y="155.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="187.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="168.5" x2="168.5" y1="36.7999" y2="187.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="309.5" x2="309.5" y1="36.7999" y2="187.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="531.5" x2="531.5" y1="36.7999" y2="187.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="186.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="206.6059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="187.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191.5" x2="191.5" y1="38.2969" y2="187.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="354.5" x2="354.5" y1="38.2969" y2="187.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="609.5" x2="609.5" y1="38.2969" y2="187.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="206.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="102" x="117.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="124.5" y="25.0059">Adder&lt;int,int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="102" x="117.5" y="186.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="124.5" y="206.6059">Adder&lt;int,int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="22.9951">Adder&lt;int,int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="206.6904">Adder&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="161" x="229.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="236.5" y="25.0059">Adder&lt;int,float,double&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="161" x="229.5" y="186.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="147" x="236.5" y="206.6059">Adder&lt;int,float,double&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="22.9951">Adder&lt;int,float,double&gt;</text>
+      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="206.6904">Adder&lt;int,float,double&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="262" x="400.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248" x="407.5" y="25.0059">Adder&lt;std::string,std::string,std::string&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="262" x="400.5" y="186.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="248" x="407.5" y="206.6059">Adder&lt;std::string,std::string,std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="22.9951">Adder&lt;std::string,std::string,std::string&gt;</text>
+      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="206.6904">Adder&lt;std::string,std::string,std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" height="122.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="163.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="305" y="112"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="526.5" y="155.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="151.5,64.3999,161.5,68.3999,151.5,72.3999,155.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="157.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="46.5" y="62.8769">add(int &amp;&amp;,int &amp;&amp;)</text>
+    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="175,65.4297,185,69.4297,175,73.4297,179,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="181" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="53" y="64.3638">add(int &amp;&amp;,int &amp;&amp;)</text>
     </a>
-    <polygon fill="#181818" points="50.5,78.3999,40.5,82.3999,50.5,86.3999,46.5,82.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="167.5" y1="82.3999" y2="82.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="293,108,303,112,293,116,297,112" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="299" y1="112" y2="112"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="180" x="46.5" y="106.477">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
+    <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="191" y1="83.4297" y2="83.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="338,108.5625,348,112.5625,338,116.5625,342,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="344" y1="112.5625" y2="112.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="207" x="53" y="107.4966">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
     </a>
-    <polygon fill="#181818" points="50.5,122,40.5,126,50.5,130,46.5,126" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="309" y1="126" y2="126"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="514.5,151.6,524.5,155.6,514.5,159.6,518.5,155.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="520.5" y1="155.6" y2="155.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="277" x="46.5" y="150.077">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
+    <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="354" y1="126.5625" y2="126.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="592.5,151.6953,602.5,155.6953,592.5,159.6953,596.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="598.5" y1="155.6953" y2="155.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="312" x="53" y="150.6294">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
     </a>
-    <polygon fill="#181818" points="45.5,165.6,35.5,169.6,45.5,173.6,41.5,169.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="530.5" y1="169.6" y2="169.6"/>
+    <polygon fill="#A80036" points="52,165.6953,42,169.6953,52,173.6953,48,169.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="608.5" y1="169.6953" y2="169.6953"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20007_sequence_mermaid.svg b/docs/test_cases/t20007_sequence_mermaid.svg
index d8e74d36..44578764 100644
--- a/docs/test_cases/t20007_sequence_mermaid.svg
+++ b/docs/test_cases/t20007_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -109,16 +109,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="227" x="760"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">add(int &amp;&amp;,int &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="121" x2="83" y1="121" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="282">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="167" x2="484" y1="167" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="283">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="83" y1="177" x1="483"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="421">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="761" y1="223" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="422">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="233" x2="83" y1="233" x1="760"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">add(int &amp;&amp;,int &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="121" x2="80" y1="121" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="284">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="167" x2="488" y1="167" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="282">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="80" y1="177" x1="483"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="423">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="765" y1="223" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="420">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="233" x2="80" y1="233" x1="760"/>
 </svg>
diff --git a/docs/test_cases/t20008.md b/docs/test_cases/t20008.md
index 84b5a01a..7db49a43 100644
--- a/docs/test_cases/t20008.md
+++ b/docs/test_cases/t20008.md
@@ -71,8 +71,10 @@ void tmain()
   "name": "t20008_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1180776240543224244",
-      "name": "clanguml::t20008::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20008",
       "source_location": {
         "column": 6,
         "file": "t20008.cc",
@@ -82,8 +84,25 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(int)",
+          "id": "379850145437051189",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20008.cc",
+            "line": 16,
+            "translation_unit": "t20008.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<int>",
       "id": "1906510289157013670",
-      "name": "clanguml::t20008::B<int>",
+      "name": "B",
+      "namespace": "clanguml::t20008",
       "source_location": {
         "column": 30,
         "file": "t20008.cc",
@@ -93,8 +112,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1(int)",
+          "id": "2066363630174644719",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20008.cc",
+            "line": 8,
+            "translation_unit": "t20008.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<int>",
       "id": "1376149084762923197",
-      "name": "clanguml::t20008::A<int>",
+      "name": "A",
+      "namespace": "clanguml::t20008",
       "source_location": {
         "column": 30,
         "file": "t20008.cc",
@@ -104,8 +140,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(const char *)",
+          "id": "1347162523481637780",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20008.cc",
+            "line": 16,
+            "translation_unit": "t20008.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<const char *>",
       "id": "867098551202196741",
-      "name": "clanguml::t20008::B<const char *>",
+      "name": "B",
+      "namespace": "clanguml::t20008",
       "source_location": {
         "column": 30,
         "file": "t20008.cc",
@@ -115,8 +168,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a2(const char *)",
+          "id": "718650834962275580",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20008.cc",
+            "line": 9,
+            "translation_unit": "t20008.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<const char *>",
       "id": "144833378017373200",
-      "name": "clanguml::t20008::A<const char *>",
+      "name": "A",
+      "namespace": "clanguml::t20008",
       "source_location": {
         "column": 30,
         "file": "t20008.cc",
@@ -126,8 +196,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(std::string)",
+          "id": "1286410946666951254",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20008.cc",
+            "line": 16,
+            "translation_unit": "t20008.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<std::string>",
       "id": "927702553742507923",
-      "name": "clanguml::t20008::B<std::string>",
+      "name": "B",
+      "namespace": "clanguml::t20008",
       "source_location": {
         "column": 30,
         "file": "t20008.cc",
@@ -137,8 +224,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a3(std::string)",
+          "id": "1404594247101138737",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20008.cc",
+            "line": 10,
+            "translation_unit": "t20008.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<std::string>",
       "id": "390605614583363778",
-      "name": "clanguml::t20008::A<std::string>",
+      "name": "A",
+      "namespace": "clanguml::t20008",
       "source_location": {
         "column": 30,
         "file": "t20008.cc",
@@ -154,9 +258,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1180776240543224244",
-            "activity_name": "clanguml::t20008::tmain()",
-            "participant_id": "1180776240543224244",
-            "participant_name": "clanguml::t20008::tmain()"
+            "participant_id": "1180776240543224244"
           },
           "name": "b(int)",
           "return_type": "void",
@@ -169,7 +271,6 @@ void tmain()
           },
           "to": {
             "activity_id": "379850145437051189",
-            "activity_name": "clanguml::t20008::B<int>::b(int)",
             "participant_id": "1906510289157013670"
           },
           "type": "message"
@@ -177,7 +278,6 @@ void tmain()
         {
           "from": {
             "activity_id": "379850145437051189",
-            "activity_name": "clanguml::t20008::B<int>::b(int)",
             "participant_id": "1906510289157013670"
           },
           "name": "a1(int)",
@@ -191,7 +291,6 @@ void tmain()
           },
           "to": {
             "activity_id": "2066363630174644719",
-            "activity_name": "clanguml::t20008::A<int>::a1(int)",
             "participant_id": "1376149084762923197"
           },
           "type": "message"
@@ -199,9 +298,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1180776240543224244",
-            "activity_name": "clanguml::t20008::tmain()",
-            "participant_id": "1180776240543224244",
-            "participant_name": "clanguml::t20008::tmain()"
+            "participant_id": "1180776240543224244"
           },
           "name": "b(const char *)",
           "return_type": "void",
@@ -214,7 +311,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1347162523481637780",
-            "activity_name": "clanguml::t20008::B<const char *>::b(const char *)",
             "participant_id": "867098551202196741"
           },
           "type": "message"
@@ -222,7 +318,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1347162523481637780",
-            "activity_name": "clanguml::t20008::B<const char *>::b(const char *)",
             "participant_id": "867098551202196741"
           },
           "name": "a2(const char *)",
@@ -236,7 +331,6 @@ void tmain()
           },
           "to": {
             "activity_id": "718650834962275580",
-            "activity_name": "clanguml::t20008::A<const char *>::a2(const char *)",
             "participant_id": "144833378017373200"
           },
           "type": "message"
@@ -244,9 +338,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1180776240543224244",
-            "activity_name": "clanguml::t20008::tmain()",
-            "participant_id": "1180776240543224244",
-            "participant_name": "clanguml::t20008::tmain()"
+            "participant_id": "1180776240543224244"
           },
           "name": "b(std::string)",
           "return_type": "void",
@@ -259,7 +351,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1286410946666951254",
-            "activity_name": "clanguml::t20008::B<std::string>::b(std::string)",
             "participant_id": "927702553742507923"
           },
           "type": "message"
@@ -267,7 +358,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1286410946666951254",
-            "activity_name": "clanguml::t20008::B<std::string>::b(std::string)",
             "participant_id": "927702553742507923"
           },
           "name": "a3(std::string)",
@@ -281,7 +371,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1404594247101138737",
-            "activity_name": "clanguml::t20008::A<std::string>::a3(std::string)",
             "participant_id": "390605614583363778"
           },
           "type": "message"
diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg
index e6a2e2ae..361541c7 100644
--- a/docs/test_cases/t20008_sequence.svg
+++ b/docs/test_cases/t20008_sequence.svg
@@ -1,100 +1,106 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="360px" preserveAspectRatio="none" style="width:669px;height:360px;background:#FFFFFF;" version="1.1" viewBox="0 0 669 360" width="669px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:794px;height:363px;" version="1.1" viewBox="0 0 794 363" width="794px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fnupw1sa9px5v" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="259.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="98"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="255" y="157.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="379" y="187.2"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="496.5" y="246.8"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="607.5" y="276.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="101" x2="101" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="166" x2="166" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="260" x2="260" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="384" x2="384" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="501" x2="501" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="612" x2="612" y1="36.7999" y2="324.4"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="343.406">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="309" x2="309" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="454" x2="454" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="593" x2="593" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="323.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="25.0059">B&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="343.406">B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="139" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="146" y="25.0059">A&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="139" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="146" y="343.406">A&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="203" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="210" y="25.0059">B&lt;const char *&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="203" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="210" y="343.406">B&lt;const char *&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="22.9951">B&lt;const char *&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="342.0889">B&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="327" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="334" y="25.0059">A&lt;const char *&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="327" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="334" y="343.406">A&lt;const char *&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="22.9951">A&lt;const char *&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="342.0889">A&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="451" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="458" y="25.0059">B&lt;std::string&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="451" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="458" y="343.406">B&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="22.9951">B&lt;std::string&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="562" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="569" y="25.0059">A&lt;std::string&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="562" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="569" y="343.406">A&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="22.9951">A&lt;std::string&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" height="259.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="98"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="255" y="157.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="379" y="187.2"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="496.5" y="246.8"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="607.5" y="276.4"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84,64.3999,94,68.3999,84,72.3999,88,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="62.8769">b(int)</text>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="149,94,159,98,149,102,153,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="155" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="113" y="92.477">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="243,153.6,253,157.6,243,161.6,247,157.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="249" y1="157.6" y2="157.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="46.5" y="152.077">b(const char *)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="292,153.6953,302,157.6953,292,161.6953,296,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="298" y1="157.6953" y2="157.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="53" y="152.6294">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="367,183.2,377,187.2,367,191.2,371,187.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="265" x2="373" y1="187.2" y2="187.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="272" y="181.677">a2(const char *)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="437.5,182.8281,447.5,186.8281,437.5,190.8281,441.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="314" x2="443.5" y1="186.8281" y2="186.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="321" y="181.7622">a2(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="484.5,242.8,494.5,246.8,484.5,250.8,488.5,246.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="490.5" y1="246.8" y2="246.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="46.5" y="241.277">b(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="576.5,241.9609,586.5,245.9609,576.5,249.9609,580.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="582.5" y1="245.9609" y2="245.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="240.895">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="595.5,272.4,605.5,276.4,595.5,280.4,599.5,276.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="506.5" x2="601.5" y1="276.4" y2="276.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="80" x="513.5" y="270.877">a3(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="709,271.0938,719,275.0938,709,279.0938,713,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="598.5" x2="715" y1="275.0938" y2="275.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="605.5" y="270.0278">a3(std::string)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20008_sequence_mermaid.svg b/docs/test_cases/t20008_sequence_mermaid.svg
index 7ed8f2b4..12de9b96 100644
--- a/docs/test_cases/t20008_sequence_mermaid.svg
+++ b/docs/test_cases/t20008_sequence_mermaid.svg
@@ -123,17 +123,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -163,16 +163,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="335" x="1270"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="376">b(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="776">a2(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="576">b(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1071" y1="295" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1176">a3(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1271" y1="341" x1="1080"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="378">b(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="778">a2(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="578">b(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1075" y1="295" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1178">a3(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1275" y1="341" x1="1080"/>
 </svg>
diff --git a/docs/test_cases/t20009.md b/docs/test_cases/t20009.md
index 86ec38cd..4df3f8d4 100644
--- a/docs/test_cases/t20009.md
+++ b/docs/test_cases/t20009.md
@@ -57,8 +57,10 @@ void tmain()
   "name": "t20009_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "791066686606379857",
-      "name": "clanguml::t20009::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20009",
       "source_location": {
         "column": 6,
         "file": "t20009.cc",
@@ -68,8 +70,25 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(std::string)",
+          "id": "1960266381909090879",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20009.cc",
+            "line": 11,
+            "translation_unit": "t20009.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<std::string>",
       "id": "450813573860627679",
-      "name": "clanguml::t20009::B<std::string>",
+      "name": "B",
+      "namespace": "clanguml::t20009",
       "source_location": {
         "column": 30,
         "file": "t20009.cc",
@@ -79,8 +98,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a(std::string)",
+          "id": "1716775846967761286",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20009.cc",
+            "line": 7,
+            "translation_unit": "t20009.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<std::string>",
       "id": "1197403810800583218",
-      "name": "clanguml::t20009::A<std::string>",
+      "name": "A",
+      "namespace": "clanguml::t20009",
       "source_location": {
         "column": 30,
         "file": "t20009.cc",
@@ -90,8 +126,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(int)",
+          "id": "660557928399203634",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20009.cc",
+            "line": 11,
+            "translation_unit": "t20009.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<int>",
       "id": "2002310682025149090",
-      "name": "clanguml::t20009::B<int>",
+      "name": "B",
+      "namespace": "clanguml::t20009",
       "source_location": {
         "column": 30,
         "file": "t20009.cc",
@@ -101,8 +154,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a(int)",
+          "id": "2030629454810805092",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20009.cc",
+            "line": 7,
+            "translation_unit": "t20009.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<int>",
       "id": "1228498754558363121",
-      "name": "clanguml::t20009::A<int>",
+      "name": "A",
+      "namespace": "clanguml::t20009",
       "source_location": {
         "column": 30,
         "file": "t20009.cc",
@@ -112,8 +182,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(float)",
+          "id": "367805163135583282",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20009.cc",
+            "line": 11,
+            "translation_unit": "t20009.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<float>",
       "id": "1461902328659683203",
-      "name": "clanguml::t20009::B<float>",
+      "name": "B",
+      "namespace": "clanguml::t20009",
       "source_location": {
         "column": 30,
         "file": "t20009.cc",
@@ -123,8 +210,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a(float)",
+          "id": "1643733911490581293",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20009.cc",
+            "line": 7,
+            "translation_unit": "t20009.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<float>",
       "id": "1243520246309441967",
-      "name": "clanguml::t20009::A<float>",
+      "name": "A",
+      "namespace": "clanguml::t20009",
       "source_location": {
         "column": 30,
         "file": "t20009.cc",
@@ -140,9 +244,7 @@ void tmain()
         {
           "from": {
             "activity_id": "791066686606379857",
-            "activity_name": "clanguml::t20009::tmain()",
-            "participant_id": "791066686606379857",
-            "participant_name": "clanguml::t20009::tmain()"
+            "participant_id": "791066686606379857"
           },
           "name": "b(std::string)",
           "return_type": "void",
@@ -155,7 +257,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1960266381909090879",
-            "activity_name": "clanguml::t20009::B<std::string>::b(std::string)",
             "participant_id": "450813573860627679"
           },
           "type": "message"
@@ -163,7 +264,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1960266381909090879",
-            "activity_name": "clanguml::t20009::B<std::string>::b(std::string)",
             "participant_id": "450813573860627679"
           },
           "name": "a(std::string)",
@@ -177,7 +277,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1716775846967761286",
-            "activity_name": "clanguml::t20009::A<std::string>::a(std::string)",
             "participant_id": "1197403810800583218"
           },
           "type": "message"
@@ -185,9 +284,7 @@ void tmain()
         {
           "from": {
             "activity_id": "791066686606379857",
-            "activity_name": "clanguml::t20009::tmain()",
-            "participant_id": "791066686606379857",
-            "participant_name": "clanguml::t20009::tmain()"
+            "participant_id": "791066686606379857"
           },
           "name": "b(int)",
           "return_type": "void",
@@ -200,7 +297,6 @@ void tmain()
           },
           "to": {
             "activity_id": "660557928399203634",
-            "activity_name": "clanguml::t20009::B<int>::b(int)",
             "participant_id": "2002310682025149090"
           },
           "type": "message"
@@ -208,7 +304,6 @@ void tmain()
         {
           "from": {
             "activity_id": "660557928399203634",
-            "activity_name": "clanguml::t20009::B<int>::b(int)",
             "participant_id": "2002310682025149090"
           },
           "name": "a(int)",
@@ -222,7 +317,6 @@ void tmain()
           },
           "to": {
             "activity_id": "2030629454810805092",
-            "activity_name": "clanguml::t20009::A<int>::a(int)",
             "participant_id": "1228498754558363121"
           },
           "type": "message"
@@ -230,9 +324,7 @@ void tmain()
         {
           "from": {
             "activity_id": "791066686606379857",
-            "activity_name": "clanguml::t20009::tmain()",
-            "participant_id": "791066686606379857",
-            "participant_name": "clanguml::t20009::tmain()"
+            "participant_id": "791066686606379857"
           },
           "name": "b(float)",
           "return_type": "void",
@@ -245,7 +337,6 @@ void tmain()
           },
           "to": {
             "activity_id": "367805163135583282",
-            "activity_name": "clanguml::t20009::B<float>::b(float)",
             "participant_id": "1461902328659683203"
           },
           "type": "message"
@@ -253,7 +344,6 @@ void tmain()
         {
           "from": {
             "activity_id": "367805163135583282",
-            "activity_name": "clanguml::t20009::B<float>::b(float)",
             "participant_id": "1461902328659683203"
           },
           "name": "a(float)",
@@ -267,7 +357,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1643733911490581293",
-            "activity_name": "clanguml::t20009::A<float>::a(float)",
             "participant_id": "1243520246309441967"
           },
           "type": "message"
diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg
index 36710d01..11a27c1c 100644
--- a/docs/test_cases/t20009_sequence.svg
+++ b/docs/test_cases/t20009_sequence.svg
@@ -1,100 +1,106 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="360px" preserveAspectRatio="none" style="width:584px;height:360px;background:#FFFFFF;" version="1.1" viewBox="0 0 584 360" width="584px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:690px;height:363px;" version="1.1" viewBox="0 0 690 363" width="690px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f2f24llcwbacg" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="259.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="131.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="242.5" y="98"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="330" y="157.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="394" y="187.2"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="464" y="246.8"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="540" y="276.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="136" x2="136" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="247" x2="247" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="335" x2="335" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="399" x2="399" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="469" x2="469" y1="36.7999" y2="324.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="545" x2="545" y1="36.7999" y2="324.4"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="343.406">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="284.5" x2="284.5" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="389.5" x2="389.5" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="468.5" x2="468.5" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="552.5" x2="552.5" y1="38.2969" y2="323.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="643.5" x2="643.5" y1="38.2969" y2="323.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="86" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="93" y="25.0059">B&lt;std::string&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="86" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="93" y="343.406">B&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="22.9951">B&lt;std::string&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="197" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="204" y="25.0059">A&lt;std::string&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="101" x="197" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="204" y="343.406">A&lt;std::string&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="22.9951">A&lt;std::string&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="308" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="315" y="25.0059">B&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="308" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="315" y="343.406">B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="22.9951">B&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="372" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="379" y="25.0059">A&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="372" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="379" y="343.406">A&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="22.9951">A&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="436" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="443" y="25.0059">B&lt;float&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="436" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="443" y="343.406">B&lt;float&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="22.9951">B&lt;float&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="342.0889">B&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="512" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="519" y="25.0059">A&lt;float&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="512" y="323.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="519" y="343.406">A&lt;float&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="22.9951">A&lt;float&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="342.0889">A&lt;float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" height="259.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="131.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="242.5" y="98"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="330" y="157.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="394" y="187.2"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="464" y="246.8"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="540" y="276.4"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="119.5,64.3999,129.5,68.3999,119.5,72.3999,123.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="125.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="46.5" y="62.8769">b(std::string)</text>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="135,65.4297,145,69.4297,135,73.4297,139,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="141" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="64.3638">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="230.5,94,240.5,98,230.5,102,234.5,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="141.5" x2="236.5" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="73" x="148.5" y="92.477">a(std::string)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="267.5,94.5625,277.5,98.5625,267.5,102.5625,271.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="273.5" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164" y="93.4966">a(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="318,153.6,328,157.6,318,161.6,322,157.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="324" y1="157.6" y2="157.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="152.077">b(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="373,153.6953,383,157.6953,373,161.6953,377,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="379" y1="157.6953" y2="157.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="152.6294">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="382,183.2,392,187.2,382,191.2,386,187.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="340" x2="388" y1="187.2" y2="187.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="347" y="181.677">a(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="451.5,182.8281,461.5,186.8281,451.5,190.8281,455.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="395" x2="457.5" y1="186.8281" y2="186.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="402" y="181.7622">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="452,242.8,462,246.8,452,250.8,456,246.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="458" y1="246.8" y2="246.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="241.277">b(float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="536,241.9609,546,245.9609,536,249.9609,540,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="542" y1="245.9609" y2="245.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="53" y="240.895">b(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="528,272.4,538,276.4,528,280.4,532,276.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="474" x2="534" y1="276.4" y2="276.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="481" y="270.877">a(float)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="626.5,271.0938,636.5,275.0938,626.5,279.0938,630.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="558" x2="632.5" y1="275.0938" y2="275.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="565" y="270.0278">a(float)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20009_sequence_mermaid.svg b/docs/test_cases/t20009_sequence_mermaid.svg
index f53d5c87..a5ffc27e 100644
--- a/docs/test_cases/t20009_sequence_mermaid.svg
+++ b/docs/test_cases/t20009_sequence_mermaid.svg
@@ -123,17 +123,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -163,16 +163,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="335" x="1270"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a(std::string)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="376">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="776">a(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="576">b(float)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1071" y1="295" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1176">a(float)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1271" y1="341" x1="1080"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a(std::string)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="378">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="778">a(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="578">b(float)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1075" y1="295" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1178">a(float)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1275" y1="341" x1="1080"/>
 </svg>
diff --git a/docs/test_cases/t20010.md b/docs/test_cases/t20010.md
index 3d66e51b..56336dc4 100644
--- a/docs/test_cases/t20010.md
+++ b/docs/test_cases/t20010.md
@@ -67,8 +67,10 @@ void tmain()
   "name": "t20010_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1364660609791735244",
-      "name": "clanguml::t20010::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20010",
       "source_location": {
         "column": 6,
         "file": "t20010.cc",
@@ -78,8 +80,64 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b1()",
+          "id": "343626060927491836",
+          "name": "b1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20010.cc",
+            "line": 17,
+            "translation_unit": "t20010.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b2()",
+          "id": "1633031113603062043",
+          "name": "b2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20010.cc",
+            "line": 18,
+            "translation_unit": "t20010.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b3()",
+          "id": "786218543654309692",
+          "name": "b3",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20010.cc",
+            "line": 19,
+            "translation_unit": "t20010.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b4()",
+          "id": "1866068965397702666",
+          "name": "b4",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20010.cc",
+            "line": 20,
+            "translation_unit": "t20010.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<int>",
       "id": "2154977200904210115",
-      "name": "clanguml::t20010::B<int>",
+      "name": "B",
+      "namespace": "clanguml::t20010",
       "source_location": {
         "column": 30,
         "file": "t20010.cc",
@@ -89,8 +147,64 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1()",
+          "id": "981184681827469850",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20010.cc",
+            "line": 10,
+            "translation_unit": "t20010.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2()",
+          "id": "664370880632146592",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20010.cc",
+            "line": 11,
+            "translation_unit": "t20010.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a3()",
+          "id": "2145739294823015899",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20010.cc",
+            "line": 12,
+            "translation_unit": "t20010.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a4()",
+          "id": "1224936485834400821",
+          "name": "a4",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20010.cc",
+            "line": 13,
+            "translation_unit": "t20010.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "102070351492425113",
-      "name": "clanguml::t20010::A",
+      "name": "A",
+      "namespace": "clanguml::t20010",
       "source_location": {
         "column": 8,
         "file": "t20010.cc",
@@ -106,9 +220,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1364660609791735244",
-            "activity_name": "clanguml::t20010::tmain()",
-            "participant_id": "1364660609791735244",
-            "participant_name": "clanguml::t20010::tmain()"
+            "participant_id": "1364660609791735244"
           },
           "name": "b1()",
           "return_type": "void",
@@ -121,7 +233,6 @@ void tmain()
           },
           "to": {
             "activity_id": "343626060927491836",
-            "activity_name": "clanguml::t20010::B<int>::b1()",
             "participant_id": "2154977200904210115"
           },
           "type": "message"
@@ -129,7 +240,6 @@ void tmain()
         {
           "from": {
             "activity_id": "343626060927491836",
-            "activity_name": "clanguml::t20010::B<int>::b1()",
             "participant_id": "2154977200904210115"
           },
           "name": "a1()",
@@ -143,7 +253,6 @@ void tmain()
           },
           "to": {
             "activity_id": "981184681827469850",
-            "activity_name": "clanguml::t20010::A::a1()",
             "participant_id": "102070351492425113"
           },
           "type": "message"
@@ -151,9 +260,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1364660609791735244",
-            "activity_name": "clanguml::t20010::tmain()",
-            "participant_id": "1364660609791735244",
-            "participant_name": "clanguml::t20010::tmain()"
+            "participant_id": "1364660609791735244"
           },
           "name": "b2()",
           "return_type": "void",
@@ -166,7 +273,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1633031113603062043",
-            "activity_name": "clanguml::t20010::B<int>::b2()",
             "participant_id": "2154977200904210115"
           },
           "type": "message"
@@ -174,7 +280,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1633031113603062043",
-            "activity_name": "clanguml::t20010::B<int>::b2()",
             "participant_id": "2154977200904210115"
           },
           "name": "a2()",
@@ -188,7 +293,6 @@ void tmain()
           },
           "to": {
             "activity_id": "664370880632146592",
-            "activity_name": "clanguml::t20010::A::a2()",
             "participant_id": "102070351492425113"
           },
           "type": "message"
@@ -196,9 +300,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1364660609791735244",
-            "activity_name": "clanguml::t20010::tmain()",
-            "participant_id": "1364660609791735244",
-            "participant_name": "clanguml::t20010::tmain()"
+            "participant_id": "1364660609791735244"
           },
           "name": "b3()",
           "return_type": "void",
@@ -211,7 +313,6 @@ void tmain()
           },
           "to": {
             "activity_id": "786218543654309692",
-            "activity_name": "clanguml::t20010::B<int>::b3()",
             "participant_id": "2154977200904210115"
           },
           "type": "message"
@@ -219,7 +320,6 @@ void tmain()
         {
           "from": {
             "activity_id": "786218543654309692",
-            "activity_name": "clanguml::t20010::B<int>::b3()",
             "participant_id": "2154977200904210115"
           },
           "name": "a3()",
@@ -233,7 +333,6 @@ void tmain()
           },
           "to": {
             "activity_id": "2145739294823015899",
-            "activity_name": "clanguml::t20010::A::a3()",
             "participant_id": "102070351492425113"
           },
           "type": "message"
@@ -241,9 +340,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1364660609791735244",
-            "activity_name": "clanguml::t20010::tmain()",
-            "participant_id": "1364660609791735244",
-            "participant_name": "clanguml::t20010::tmain()"
+            "participant_id": "1364660609791735244"
           },
           "name": "b4()",
           "return_type": "void",
@@ -256,7 +353,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1866068965397702666",
-            "activity_name": "clanguml::t20010::B<int>::b4()",
             "participant_id": "2154977200904210115"
           },
           "type": "message"
@@ -264,7 +360,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1866068965397702666",
-            "activity_name": "clanguml::t20010::B<int>::b4()",
             "participant_id": "2154977200904210115"
           },
           "name": "a4()",
@@ -278,7 +373,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1224936485834400821",
-            "activity_name": "clanguml::t20010::A::a4()",
             "participant_id": "102070351492425113"
           },
           "type": "message"
diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg
index 7e058705..43dee0b8 100644
--- a/docs/test_cases/t20010_sequence.svg
+++ b/docs/test_cases/t20010_sequence.svg
@@ -1,86 +1,92 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="449px" preserveAspectRatio="none" style="width:169px;height:449px;background:#FFFFFF;" version="1.1" viewBox="0 0 169 449" width="169px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:197px;height:451px;" version="1.1" viewBox="0 0 197 451" width="197px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fjz4xx6uc632a" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="348.8001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="157.6"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="246.8"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="336"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="98"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="187.2"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="276.4"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="365.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="413.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="101" x2="101" y1="36.7999" y2="413.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="151.5" x2="151.5" y1="36.7999" y2="413.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="412.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="432.606">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="411.3594"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="176" x2="176" y1="38.2969" y2="411.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="25.0059">B&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="54" x="74" y="412.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="81" y="432.606">B&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="430.3545">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="140.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="147.5" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="140.5" y="412.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="147.5" y="432.606">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="430.3545">A</text>
     </a>
-    <rect fill="#FFFFFF" height="348.8001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="68.3999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="157.6"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="246.8"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="96" y="336"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="98"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="187.2"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="276.4"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="365.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84,64.3999,94,68.3999,84,72.3999,88,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="46.5" y="62.8769">b1()</text>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="64.3638">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="135,94,145,98,135,102,139,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="141" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="113" y="92.477">a1()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="159.5,94.5625,169.5,98.5625,159.5,102.5625,163.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="93.4966">a1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84,153.6,94,157.6,84,161.6,88,157.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="157.6" y2="157.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="46.5" y="152.077">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="101.5,153.6953,111.5,157.6953,101.5,161.6953,105.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="157.6953" y2="157.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="152.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="135,183.2,145,187.2,135,191.2,139,187.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="141" y1="187.2" y2="187.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="113" y="181.677">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="159.5,182.8281,169.5,186.8281,159.5,190.8281,163.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="186.8281" y2="186.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="181.7622">a2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84,242.8,94,246.8,84,250.8,88,246.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="246.8" y2="246.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="46.5" y="241.277">b3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="101.5,241.9609,111.5,245.9609,101.5,249.9609,105.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="245.9609" y2="245.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="240.895">b3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="135,272.4,145,276.4,135,280.4,139,276.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="141" y1="276.4" y2="276.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="113" y="270.877">a3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="159.5,271.0938,169.5,275.0938,159.5,279.0938,163.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="275.0938" y2="275.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="270.0278">a3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84,332,94,336,84,340,88,336" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="90" y1="336" y2="336"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="46.5" y="330.477">b4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="101.5,330.2266,111.5,334.2266,101.5,338.2266,105.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="334.2266" y2="334.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="329.1606">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="135,361.6,145,365.6,135,369.6,139,365.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="106" x2="141" y1="365.6" y2="365.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="113" y="360.077">a4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="159.5,359.3594,169.5,363.3594,159.5,367.3594,163.5,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="363.3594" y2="363.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="358.2935">a4()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20010_sequence_mermaid.svg b/docs/test_cases/t20010_sequence_mermaid.svg
index 787ae425..f8beb39e 100644
--- a/docs/test_cases/t20010_sequence_mermaid.svg
+++ b/docs/test_cases/t20010_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -109,20 +109,20 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="427" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="176">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="271" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="376">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="471" y1="249" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="176">b3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="271" y1="295" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="376">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="471" y1="341" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="176">b4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="271" y1="387" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="376">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="471" y1="433" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="178">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="275" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="378">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="475" y1="249" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="178">b3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="275" y1="295" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="378">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="475" y1="341" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="178">b4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="275" y1="387" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="378">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="475" y1="433" x1="280"/>
 </svg>
diff --git a/docs/test_cases/t20011.md b/docs/test_cases/t20011.md
index 38f5d1fe..9fa3443a 100644
--- a/docs/test_cases/t20011.md
+++ b/docs/test_cases/t20011.md
@@ -59,8 +59,10 @@ void tmain()
   "name": "t20011_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1866210527166391126",
-      "name": "clanguml::t20011::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20011",
       "source_location": {
         "column": 6,
         "file": "t20011.cc",
@@ -70,8 +72,64 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "a(int)",
+          "id": "1647578261840204206",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20011.cc",
+            "line": 5,
+            "translation_unit": "t20011.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b(int)",
+          "id": "305456175818875420",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20011.cc",
+            "line": 11,
+            "translation_unit": "t20011.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c(int)",
+          "id": "963268672079901211",
+          "name": "c",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20011.cc",
+            "line": 12,
+            "translation_unit": "t20011.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "d(int)",
+          "id": "1874311762268001137",
+          "name": "d",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20011.cc",
+            "line": 13,
+            "translation_unit": "t20011.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "816061502062128285",
-      "name": "clanguml::t20011::A",
+      "name": "A",
+      "namespace": "clanguml::t20011",
       "source_location": {
         "column": 8,
         "file": "t20011.cc",
@@ -87,9 +145,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1866210527166391126",
-            "activity_name": "clanguml::t20011::tmain()",
-            "participant_id": "1866210527166391126",
-            "participant_name": "clanguml::t20011::tmain()"
+            "participant_id": "1866210527166391126"
           },
           "name": "a(int)",
           "return_type": "void",
@@ -102,7 +158,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1647578261840204206",
-            "activity_name": "clanguml::t20011::A::a(int)",
             "participant_id": "816061502062128285"
           },
           "type": "message"
@@ -115,7 +170,6 @@ void tmain()
                 {
                   "from": {
                     "activity_id": "1647578261840204206",
-                    "activity_name": "clanguml::t20011::A::a(int)",
                     "participant_id": "816061502062128285"
                   },
                   "name": "a(int)",
@@ -129,7 +183,6 @@ void tmain()
                   },
                   "to": {
                     "activity_id": "1647578261840204206",
-                    "activity_name": "clanguml::t20011::A::a(int)",
                     "participant_id": "816061502062128285"
                   },
                   "type": "message"
@@ -144,9 +197,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1866210527166391126",
-            "activity_name": "clanguml::t20011::tmain()",
-            "participant_id": "1866210527166391126",
-            "participant_name": "clanguml::t20011::tmain()"
+            "participant_id": "1866210527166391126"
           },
           "name": "b(int)",
           "return_type": "void",
@@ -159,7 +210,6 @@ void tmain()
           },
           "to": {
             "activity_id": "305456175818875420",
-            "activity_name": "clanguml::t20011::A::b(int)",
             "participant_id": "816061502062128285"
           },
           "type": "message"
@@ -167,7 +217,6 @@ void tmain()
         {
           "from": {
             "activity_id": "305456175818875420",
-            "activity_name": "clanguml::t20011::A::b(int)",
             "participant_id": "816061502062128285"
           },
           "name": "c(int)",
@@ -181,7 +230,6 @@ void tmain()
           },
           "to": {
             "activity_id": "963268672079901211",
-            "activity_name": "clanguml::t20011::A::c(int)",
             "participant_id": "816061502062128285"
           },
           "type": "message"
@@ -189,7 +237,6 @@ void tmain()
         {
           "from": {
             "activity_id": "963268672079901211",
-            "activity_name": "clanguml::t20011::A::c(int)",
             "participant_id": "816061502062128285"
           },
           "name": "d(int)",
@@ -203,7 +250,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1874311762268001137",
-            "activity_name": "clanguml::t20011::A::d(int)",
             "participant_id": "816061502062128285"
           },
           "type": "message"
@@ -216,7 +262,6 @@ void tmain()
                 {
                   "from": {
                     "activity_id": "1874311762268001137",
-                    "activity_name": "clanguml::t20011::A::d(int)",
                     "participant_id": "816061502062128285"
                   },
                   "name": "b(int)",
@@ -230,7 +275,6 @@ void tmain()
                   },
                   "to": {
                     "activity_id": "305456175818875420",
-                    "activity_name": "clanguml::t20011::A::b(int)",
                     "participant_id": "816061502062128285"
                   },
                   "type": "message"
@@ -238,7 +282,6 @@ void tmain()
                 {
                   "from": {
                     "activity_id": "1874311762268001137",
-                    "activity_name": "clanguml::t20011::A::d(int)",
                     "participant_id": "816061502062128285"
                   },
                   "name": "a(int)",
@@ -252,7 +295,6 @@ void tmain()
                   },
                   "to": {
                     "activity_id": "1647578261840204206",
-                    "activity_name": "clanguml::t20011::A::a(int)",
                     "participant_id": "816061502062128285"
                   },
                   "type": "message"
diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg
index 10ea35d2..4119da5a 100644
--- a/docs/test_cases/t20011_sequence.svg
+++ b/docs/test_cases/t20011_sequence.svg
@@ -1,103 +1,109 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="592px" preserveAspectRatio="none" style="width:183px;height:592px;background:#FFFFFF;" version="1.1" viewBox="0 0 183 592" width="183px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="593px" preserveAspectRatio="none" style="width:203px;height:593px;" version="1.1" viewBox="0 0 203 593" width="203px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1t3rvwjo71yys" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="499.6002" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="112.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="87.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="92.5" y="130.6"/>
-    <rect fill="#FFFFFF" height="344.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="87.5" y="202.2"/>
-    <rect fill="#FFFFFF" height="306.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="92.5" y="239.8"/>
-    <rect fill="#FFFFFF" height="264.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="97.5" y="282.4"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="102.5" y="349.6"/>
-    <rect fill="#FFFFFF" height="117.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="102.5" y="422.2001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="107.5" y="489.4001"/>
-    <rect fill="none" height="90.2" style="stroke:#000000;stroke-width:1.5;" width="81.5" x="71" y="83.3999"/>
-    <rect fill="none" height="237.0001" style="stroke:#000000;stroke-width:1.5;" width="116.5" x="61" y="302.4"/>
-    <rect fill="none" height="90.2" style="stroke:#000000;stroke-width:1.5;" width="96.5" x="71" y="442.2001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="556.4001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="92" x2="92" y1="36.7999" y2="556.4001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="555.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="575.406">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="552.7578"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="103.5" x2="103.5" y1="38.2969" y2="552.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1t3rvwjo71yys)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1t3rvwjo71yys)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="571.7529">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="81" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="88" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="81" y="555.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="88" y="575.406">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1t3rvwjo71yys)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1t3rvwjo71yys)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="571.7529">A</text>
     </a>
-    <rect fill="#FFFFFF" height="499.6002" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="112.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="87.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="92.5" y="130.6"/>
-    <rect fill="#FFFFFF" height="344.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="87.5" y="202.2"/>
-    <rect fill="#FFFFFF" height="306.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="92.5" y="239.8"/>
-    <rect fill="#FFFFFF" height="264.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="97.5" y="282.4"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="102.5" y="349.6"/>
-    <rect fill="#FFFFFF" height="117.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="102.5" y="422.2001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="107.5" y="489.4001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="75.5,64.3999,85.5,68.3999,75.5,72.3999,79.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="81.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="62.8769">a(int)</text>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="87,65.4297,97,69.4297,87,73.4297,91,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">a(int)</text>
     </a>
-    <path d="M71,83.3999 L131,83.3999 L131,91 L121,101 L71,101 L71,83.3999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="90.2" style="stroke:#000000;stroke-width:1.5;" width="81.5" x="71" y="83.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="86" y="96.477">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="102.5" x2="144.5" y1="122.6" y2="122.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="144.5" x2="144.5" y1="122.6" y2="135.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="103.5" x2="144.5" y1="135.6" y2="135.6"/>
-      <polygon fill="#181818" points="113.5,131.6,103.5,135.6,113.5,139.6,109.5,135.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="109.5" y="117.077">a(int)</text>
+    <path d="M80.5,84.4297 L144.5,84.4297 L144.5,91.4297 L134.5,101.4297 L80.5,101.4297 L80.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="97.4966">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="156" y1="122.6953" y2="122.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="122.6953" y2="135.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="135.6953" y2="135.6953"/>
+      <polygon fill="#A80036" points="125,131.6953,115,135.6953,125,139.6953,121,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="121" y="117.6294">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="75.5,198.2,85.5,202.2,75.5,206.2,79.5,202.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="81.5" y1="202.2" y2="202.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="46.5" y="196.677">b(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="87,197.8281,97,201.8281,87,205.8281,91,201.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="201.8281" y2="201.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="196.7622">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="97.5" x2="144.5" y1="226.8" y2="226.8"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="144.5" x2="144.5" y1="226.8" y2="239.8"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="103.5" x2="144.5" y1="239.8" y2="239.8"/>
-      <polygon fill="#181818" points="113.5,235.8,103.5,239.8,113.5,243.8,109.5,239.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="109.5" y="221.277">c(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="109" x2="156" y1="225.9609" y2="225.9609"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="225.9609" y2="238.9609"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="238.9609" y2="238.9609"/>
+      <polygon fill="#A80036" points="125,234.9609,115,238.9609,125,242.9609,121,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="121" y="220.895">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="102.5" x2="149.5" y1="269.4" y2="269.4"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="149.5" x2="149.5" y1="269.4" y2="282.4"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="108.5" x2="149.5" y1="282.4" y2="282.4"/>
-      <polygon fill="#181818" points="118.5,278.4,108.5,282.4,118.5,286.4,114.5,282.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="114.5" y="263.877">d(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="161" y1="268.0938" y2="268.0938"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="161" y1="268.0938" y2="281.0938"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="120" x2="161" y1="281.0938" y2="281.0938"/>
+      <polygon fill="#A80036" points="130,277.0938,120,281.0938,130,285.0938,126,281.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="126" y="263.0278">d(int)</text>
     </a>
-    <path d="M61,302.4 L121,302.4 L121,310 L111,320 L61,320 L61,302.4 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="237.0001" style="stroke:#000000;stroke-width:1.5;" width="116.5" x="61" y="302.4"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="76" y="315.477">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="112.5" x2="154.5" y1="341.6" y2="341.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="154.5" x2="154.5" y1="341.6" y2="354.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="113.5" x2="154.5" y1="354.6" y2="354.6"/>
-      <polygon fill="#181818" points="123.5,350.6,113.5,354.6,123.5,358.6,119.5,354.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="119.5" y="336.077">b(int)</text>
+    <path d="M70.5,301.0938 L134.5,301.0938 L134.5,308.0938 L124.5,318.0938 L70.5,318.0938 L70.5,301.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85.5" y="314.1606">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="124" x2="166" y1="339.3594" y2="339.3594"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="339.3594" y2="352.3594"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="352.3594" y2="352.3594"/>
+      <polygon fill="#A80036" points="135,348.3594,125,352.3594,135,356.3594,131,352.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="334.2935">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="107.5" x2="154.5" y1="409.2001" y2="409.2001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="154.5" x2="154.5" y1="409.2001" y2="422.2001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="113.5" x2="154.5" y1="422.2001" y2="422.2001"/>
-      <polygon fill="#181818" points="123.5,418.2001,113.5,422.2001,123.5,426.2001,119.5,422.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="119.5" y="403.677">a(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="119" x2="166" y1="406.4922" y2="406.4922"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="406.4922" y2="419.4922"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="419.4922" y2="419.4922"/>
+      <polygon fill="#A80036" points="135,415.4922,125,419.4922,135,423.4922,131,419.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="401.4263">a(int)</text>
     </a>
-    <path d="M71,442.2001 L131,442.2001 L131,449.8001 L121,459.8001 L71,459.8001 L71,442.2001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="90.2" style="stroke:#000000;stroke-width:1.5;" width="96.5" x="71" y="442.2001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="86" y="455.2771">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="117.5" x2="159.5" y1="481.4001" y2="481.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="159.5" x2="159.5" y1="481.4001" y2="494.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="118.5" x2="159.5" y1="494.4001" y2="494.4001"/>
-      <polygon fill="#181818" points="128.5,490.4001,118.5,494.4001,128.5,498.4001,124.5,494.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="124.5" y="475.8771">a(int)</text>
+    <path d="M80.5,439.4922 L144.5,439.4922 L144.5,446.4922 L134.5,456.4922 L80.5,456.4922 L80.5,439.4922 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="452.5591">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="129" x2="171" y1="477.7578" y2="477.7578"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="171" x2="171" y1="477.7578" y2="490.7578"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="171" y1="490.7578" y2="490.7578"/>
+      <polygon fill="#A80036" points="140,486.7578,130,490.7578,140,494.7578,136,490.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="136" y="472.6919">a(int)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20011_sequence_mermaid.svg b/docs/test_cases/t20011_sequence_mermaid.svg
index 1080c061..c412119f 100644
--- a/docs/test_cases/t20011_sequence_mermaid.svg
+++ b/docs/test_cases/t20011_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -127,12 +127,12 @@
       <tspan x="320">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="280">a(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,182 C 340,172 340,212 280,202"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="267" x="176">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="298" x2="271" y1="298" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="267" x="178">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="298" x2="275" y1="298" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="313" x="280">c(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,344 C 340,334 340,374 280,364"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="389" x="285">d(int)</text>
diff --git a/docs/test_cases/t20012.md b/docs/test_cases/t20012.md
index 9cb1a56a..811072f9 100644
--- a/docs/test_cases/t20012.md
+++ b/docs/test_cases/t20012.md
@@ -134,8 +134,10 @@ void tmain()
   "name": "t20012_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "893699278278125827",
-      "name": "clanguml::t20012::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20012",
       "source_location": {
         "column": 6,
         "file": "t20012.cc",
@@ -145,19 +147,73 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "operator()()",
+          "id": "1314931307342523651",
+          "name": "operator()",
+          "namespace": "",
+          "type": "method"
+        }
+      ],
+      "display_name": "tmain()::(lambda t20012.cc:67:20)",
       "id": "1823127147500894672",
-      "name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)",
+      "name": "tmain()::(lambda t20012.cc:67:20)",
+      "namespace": "clanguml::t20012",
       "source_location": {
         "column": 20,
         "file": "t20012.cc",
         "line": 67,
         "translation_unit": "t20012.cc"
       },
-      "type": "class"
+      "type": "lambda"
     },
     {
+      "activities": [
+        {
+          "display_name": "a()",
+          "id": "1871432932744498976",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 11,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "aa()",
+          "id": "1100933039353876539",
+          "name": "aa",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 13,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "aaa()",
+          "id": "941636185823691898",
+          "name": "aaa",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 15,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1798184226128732119",
-      "name": "clanguml::t20012::A",
+      "name": "A",
+      "namespace": "clanguml::t20012",
       "source_location": {
         "column": 8,
         "file": "t20012.cc",
@@ -167,8 +223,51 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b()",
+          "id": "2142697410385270633",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 19,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bb()",
+          "id": "973718340784931313",
+          "name": "bb",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 21,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bbb()",
+          "id": "195788529004378403",
+          "name": "bbb",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 23,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1893469899260202653",
-      "name": "clanguml::t20012::B",
+      "name": "B",
+      "namespace": "clanguml::t20012",
       "source_location": {
         "column": 8,
         "file": "t20012.cc",
@@ -178,19 +277,73 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "operator()()",
+          "id": "1464047298179756286",
+          "name": "operator()",
+          "namespace": "",
+          "type": "method"
+        }
+      ],
+      "display_name": "tmain()::(lambda t20012.cc:80:20)",
       "id": "2103332104162021186",
-      "name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)",
+      "name": "tmain()::(lambda t20012.cc:80:20)",
+      "namespace": "clanguml::t20012",
       "source_location": {
         "column": 20,
         "file": "t20012.cc",
         "line": 80,
         "translation_unit": "t20012.cc"
       },
-      "type": "class"
+      "type": "lambda"
     },
     {
+      "activities": [
+        {
+          "display_name": "c()",
+          "id": "675369415318225607",
+          "name": "c",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 29,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "cc()",
+          "id": "1451821704315336057",
+          "name": "cc",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 31,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "ccc()",
+          "id": "1956141408799600460",
+          "name": "ccc",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 33,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "C",
       "id": "2071958121786360262",
-      "name": "clanguml::t20012::C",
+      "name": "C",
+      "namespace": "clanguml::t20012",
       "source_location": {
         "column": 8,
         "file": "t20012.cc",
@@ -200,8 +353,38 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&)",
+          "id": "1225911104877544354",
+          "name": "R",
+          "namespace": "",
+          "source_location": {
+            "column": 5,
+            "file": "t20012.cc",
+            "line": 49,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "r()",
+          "id": "984475898639439059",
+          "name": "r",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20012.cc",
+            "line": 54,
+            "translation_unit": "t20012.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "R<R::(lambda t20012.cc:86:9)>",
       "id": "943938410171869397",
-      "name": "clanguml::t20012::R<R::(lambda t20012.cc:86:9)>",
+      "name": "R",
+      "namespace": "clanguml::t20012",
       "source_location": {
         "column": 30,
         "file": "t20012.cc",
@@ -211,15 +394,26 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "operator()()",
+          "id": "1801444422355429914",
+          "name": "operator()",
+          "namespace": "",
+          "type": "method"
+        }
+      ],
+      "display_name": "tmain()::(lambda t20012.cc:86:9)",
       "id": "1523229682883773614",
-      "name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)",
+      "name": "tmain()::(lambda t20012.cc:86:9)",
+      "namespace": "clanguml::t20012",
       "source_location": {
         "column": 9,
         "file": "t20012.cc",
         "line": 86,
         "translation_unit": "t20012.cc"
       },
-      "type": "class"
+      "type": "lambda"
     }
   ],
   "sequences": [
@@ -228,9 +422,7 @@ void tmain()
         {
           "from": {
             "activity_id": "893699278278125827",
-            "activity_name": "clanguml::t20012::tmain()",
-            "participant_id": "893699278278125827",
-            "participant_name": "clanguml::t20012::tmain()"
+            "participant_id": "893699278278125827"
           },
           "name": "operator()()",
           "return_type": "",
@@ -243,7 +435,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1314931307342523651",
-            "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:67:20)::operator()()",
             "participant_id": "1823127147500894672"
           },
           "type": "message"
@@ -251,7 +442,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1314931307342523651",
-            "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)::operator()()",
             "participant_id": "1823127147500894672"
           },
           "name": "a()",
@@ -265,7 +455,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1871432932744498976",
-            "activity_name": "clanguml::t20012::A::a()",
             "participant_id": "1798184226128732119"
           },
           "type": "message"
@@ -273,7 +462,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1871432932744498976",
-            "activity_name": "clanguml::t20012::A::a()",
             "participant_id": "1798184226128732119"
           },
           "name": "aa()",
@@ -287,7 +475,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1100933039353876539",
-            "activity_name": "clanguml::t20012::A::aa()",
             "participant_id": "1798184226128732119"
           },
           "type": "message"
@@ -295,7 +482,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1100933039353876539",
-            "activity_name": "clanguml::t20012::A::aa()",
             "participant_id": "1798184226128732119"
           },
           "name": "aaa()",
@@ -309,7 +495,6 @@ void tmain()
           },
           "to": {
             "activity_id": "941636185823691898",
-            "activity_name": "clanguml::t20012::A::aaa()",
             "participant_id": "1798184226128732119"
           },
           "type": "message"
@@ -317,7 +502,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1314931307342523651",
-            "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)::operator()()",
             "participant_id": "1823127147500894672"
           },
           "name": "b()",
@@ -331,7 +515,6 @@ void tmain()
           },
           "to": {
             "activity_id": "2142697410385270633",
-            "activity_name": "clanguml::t20012::B::b()",
             "participant_id": "1893469899260202653"
           },
           "type": "message"
@@ -339,7 +522,6 @@ void tmain()
         {
           "from": {
             "activity_id": "2142697410385270633",
-            "activity_name": "clanguml::t20012::B::b()",
             "participant_id": "1893469899260202653"
           },
           "name": "bb()",
@@ -353,7 +535,6 @@ void tmain()
           },
           "to": {
             "activity_id": "973718340784931313",
-            "activity_name": "clanguml::t20012::B::bb()",
             "participant_id": "1893469899260202653"
           },
           "type": "message"
@@ -361,7 +542,6 @@ void tmain()
         {
           "from": {
             "activity_id": "973718340784931313",
-            "activity_name": "clanguml::t20012::B::bb()",
             "participant_id": "1893469899260202653"
           },
           "name": "bbb()",
@@ -375,7 +555,6 @@ void tmain()
           },
           "to": {
             "activity_id": "195788529004378403",
-            "activity_name": "clanguml::t20012::B::bbb()",
             "participant_id": "1893469899260202653"
           },
           "type": "message"
@@ -383,9 +562,7 @@ void tmain()
         {
           "from": {
             "activity_id": "893699278278125827",
-            "activity_name": "clanguml::t20012::tmain()",
-            "participant_id": "893699278278125827",
-            "participant_name": "clanguml::t20012::tmain()"
+            "participant_id": "893699278278125827"
           },
           "name": "operator()()",
           "return_type": "",
@@ -398,7 +575,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1464047298179756286",
-            "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:80:20)::operator()()",
             "participant_id": "2103332104162021186"
           },
           "type": "message"
@@ -406,7 +582,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1464047298179756286",
-            "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)::operator()()",
             "participant_id": "2103332104162021186"
           },
           "name": "c()",
@@ -420,7 +595,6 @@ void tmain()
           },
           "to": {
             "activity_id": "675369415318225607",
-            "activity_name": "clanguml::t20012::C::c()",
             "participant_id": "2071958121786360262"
           },
           "type": "message"
@@ -428,7 +602,6 @@ void tmain()
         {
           "from": {
             "activity_id": "675369415318225607",
-            "activity_name": "clanguml::t20012::C::c()",
             "participant_id": "2071958121786360262"
           },
           "name": "cc()",
@@ -442,7 +615,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1451821704315336057",
-            "activity_name": "clanguml::t20012::C::cc()",
             "participant_id": "2071958121786360262"
           },
           "type": "message"
@@ -450,7 +622,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1451821704315336057",
-            "activity_name": "clanguml::t20012::C::cc()",
             "participant_id": "2071958121786360262"
           },
           "name": "ccc()",
@@ -464,7 +635,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1956141408799600460",
-            "activity_name": "clanguml::t20012::C::ccc()",
             "participant_id": "2071958121786360262"
           },
           "type": "message"
@@ -472,7 +642,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1464047298179756286",
-            "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)::operator()()",
             "participant_id": "2103332104162021186"
           },
           "name": "operator()()",
@@ -486,7 +655,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1314931307342523651",
-            "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:67:20)::operator()()",
             "participant_id": "1823127147500894672"
           },
           "type": "message"
@@ -494,9 +662,7 @@ void tmain()
         {
           "from": {
             "activity_id": "893699278278125827",
-            "activity_name": "clanguml::t20012::tmain()",
-            "participant_id": "893699278278125827",
-            "participant_name": "clanguml::t20012::tmain()"
+            "participant_id": "893699278278125827"
           },
           "name": "R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&)",
           "return_type": "void",
@@ -509,7 +675,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1225911104877544354",
-            "activity_name": "clanguml::t20012::R<R##(lambda t20012.cc:86:9)>::R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&)",
             "participant_id": "943938410171869397"
           },
           "type": "message"
@@ -517,9 +682,7 @@ void tmain()
         {
           "from": {
             "activity_id": "893699278278125827",
-            "activity_name": "clanguml::t20012::tmain()",
-            "participant_id": "893699278278125827",
-            "participant_name": "clanguml::t20012::tmain()"
+            "participant_id": "893699278278125827"
           },
           "name": "r()",
           "return_type": "void",
@@ -532,7 +695,6 @@ void tmain()
           },
           "to": {
             "activity_id": "984475898639439059",
-            "activity_name": "clanguml::t20012::R<R##(lambda t20012.cc:86:9)>::r()",
             "participant_id": "943938410171869397"
           },
           "type": "message"
@@ -540,7 +702,6 @@ void tmain()
         {
           "from": {
             "activity_id": "984475898639439059",
-            "activity_name": "clanguml::t20012::R<R::(lambda t20012.cc:86:9)>::r()",
             "participant_id": "943938410171869397"
           },
           "name": "operator()()",
@@ -554,7 +715,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1801444422355429914",
-            "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:86:9)::operator()()",
             "participant_id": "1523229682883773614"
           },
           "type": "message"
@@ -562,7 +722,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1801444422355429914",
-            "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)::operator()()",
             "participant_id": "1523229682883773614"
           },
           "name": "c()",
@@ -576,7 +735,6 @@ void tmain()
           },
           "to": {
             "activity_id": "675369415318225607",
-            "activity_name": "clanguml::t20012::C::c()",
             "participant_id": "2071958121786360262"
           },
           "type": "message"
diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg
index dbd2da97..82308366 100644
--- a/docs/test_cases/t20012_sequence.svg
+++ b/docs/test_cases/t20012_sequence.svg
@@ -1,265 +1,271 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1225px" preserveAspectRatio="none" style="width:1132px;height:1225px;background:#FFFFFF;" version="1.1" viewBox="0 0 1132 1225" width="1132px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1219px" preserveAspectRatio="none" style="width:1261px;height:1219px;" version="1.1" viewBox="0 0 1261 1219" width="1261px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1x9f2kbp8g77b" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="1124.4003" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="303.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="68.3999"/>
-    <rect fill="#FFFFFF" height="303.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="576.0001"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="320.5" y="98"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="325.5" y="135.6"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="330.5" y="178.2"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="320.5" y="605.6001"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="325.5" y="643.2001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="330.5" y="685.8001"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="380.5" y="242.8"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="385.5" y="280.4"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="390.5" y="323"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="380.5" y="750.4001"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="385.5" y="788.0002"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="390.5" y="830.6002"/>
-    <rect fill="#FFFFFF" height="492.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="517" y="401.6"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="654" y="431.2001"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="659" y="468.8001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="664" y="511.4001"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="654" y="1042.0002"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="659" y="1079.6002"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="664" y="1122.2003"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="782.5" y="923.2002"/>
-    <rect fill="#FFFFFF" height="188.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="782.5" y="982.8002"/>
-    <rect fill="#FFFFFF" height="158.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="1010" y="1012.4002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="1189.2003"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="189" x2="189" y1="36.7999" y2="1189.2003"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="325" x2="325" y1="36.7999" y2="1189.2003"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="385" x2="385" y1="36.7999" y2="1189.2003"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="522" x2="522" y1="36.7999" y2="1189.2003"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="659" x2="659" y1="36.7999" y2="1189.2003"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="787" x2="787" y1="36.7999" y2="1189.2003"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="1015" x2="1015" y1="36.7999" y2="1189.2003"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="1188.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="1208.2062">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="1033.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1070.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1112.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="974.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1126" y="1004.0859"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1179.4844"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="212" x2="212" y1="38.2969" y2="1179.4844"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="363" x2="363" y1="38.2969" y2="1179.4844"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="426.5" x2="426.5" y1="38.2969" y2="1179.4844"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="578.5" x2="578.5" y1="38.2969" y2="1179.4844"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="730.5" x2="730.5" y1="38.2969" y2="1179.4844"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="875.5" x2="875.5" y1="38.2969" y2="1179.4844"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1130.5" x2="1130.5" y1="38.2969" y2="1179.4844"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1178.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1198.4795">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:67:20)" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="81" y="25.0059">tmain()::(lambda t20012.cc:67:20)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="74" y="1188.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="81" y="1208.2062">tmain()::(lambda t20012.cc:67:20)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:67:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="91" y="22.9951">tmain()::(lambda t20012.cc:67:20)</text>
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="1178.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="91" y="1198.4795">tmain()::(lambda t20012.cc:67:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="314" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="321" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="314" y="1188.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="321" y="1208.2062">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="357" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="1178.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="357" y="1198.4795">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="374" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="381" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="374" y="1188.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="381" y="1208.2062">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="419.5" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="1178.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="419.5" y="1198.4795">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:80:20)" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="407" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="414" y="25.0059">tmain()::(lambda t20012.cc:80:20)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="230" x="407" y="1188.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="414" y="1208.2062">tmain()::(lambda t20012.cc:80:20)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:80:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="457.5" y="22.9951">tmain()::(lambda t20012.cc:80:20)</text>
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="1178.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="457.5" y="1198.4795">tmain()::(lambda t20012.cc:80:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="647" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="654" y="25.0059">C</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="647" y="1188.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="654" y="1208.2062">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="723.5" y="22.9951">C</text>
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="1178.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="723.5" y="1198.4795">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="681" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="688" y="25.0059">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="681" y="1188.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="199" x="688" y="1208.2062">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="239" x="754.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="225" x="761.5" y="22.9951">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="239" x="754.5" y="1178.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="225" x="761.5" y="1198.4795">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:86:9)" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="222" x="904" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="208" x="911" y="25.0059">tmain()::(lambda t20012.cc:86:9)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="222" x="904" y="1188.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="208" x="911" y="1208.2062">tmain()::(lambda t20012.cc:86:9)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:86:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1007.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1014.5" y="22.9951">tmain()::(lambda t20012.cc:86:9)</text>
+      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1007.5" y="1178.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1014.5" y="1198.4795">tmain()::(lambda t20012.cc:86:9)</text>
     </a>
-    <rect fill="#FFFFFF" height="1124.4003" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="303.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="68.3999"/>
-    <rect fill="#FFFFFF" height="303.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="184" y="576.0001"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="320.5" y="98"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="325.5" y="135.6"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="330.5" y="178.2"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="320.5" y="605.6001"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="325.5" y="643.2001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="330.5" y="685.8001"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="380.5" y="242.8"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="385.5" y="280.4"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="390.5" y="323"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="380.5" y="750.4001"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="385.5" y="788.0002"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="390.5" y="830.6002"/>
-    <rect fill="#FFFFFF" height="492.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="517" y="401.6"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="654" y="431.2001"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="659" y="468.8001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="664" y="511.4001"/>
-    <rect fill="#FFFFFF" height="108.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="654" y="1042.0002"/>
-    <rect fill="#FFFFFF" height="70.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="659" y="1079.6002"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="664" y="1122.2003"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="782.5" y="923.2002"/>
-    <rect fill="#FFFFFF" height="188.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="782.5" y="982.8002"/>
-    <rect fill="#FFFFFF" height="158.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="1010" y="1012.4002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="172,64.3999,182,68.3999,172,72.3999,176,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="178" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="46.5" y="62.8769">operator()()</text>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="1033.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1070.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1112.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="974.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1126" y="1004.0859"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="195,65.4297,205,69.4297,195,73.4297,199,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="201" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="64.3638">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="308.5,94,318.5,98,308.5,102,312.5,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="194" x2="314.5" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="201" y="92.477">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="346.5,94.5625,356.5,98.5625,346.5,102.5625,350.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="352.5" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="93.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="330.5" x2="377.5" y1="122.6" y2="122.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="377.5" x2="377.5" y1="122.6" y2="135.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="336.5" x2="377.5" y1="135.6" y2="135.6"/>
-      <polygon fill="#181818" points="346.5,131.6,336.5,135.6,346.5,139.6,342.5,135.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="342.5" y="117.077">aa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="368.5" x2="415.5" y1="122.6953" y2="122.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="415.5" x2="415.5" y1="122.6953" y2="135.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="374.5" x2="415.5" y1="135.6953" y2="135.6953"/>
+      <polygon fill="#A80036" points="384.5,131.6953,374.5,135.6953,384.5,139.6953,380.5,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="380.5" y="117.6294">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="340.5" x2="382.5" y1="170.2" y2="170.2"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="382.5" x2="382.5" y1="170.2" y2="183.2"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="341.5" x2="382.5" y1="183.2" y2="183.2"/>
-      <polygon fill="#181818" points="351.5,179.2,341.5,183.2,351.5,187.2,347.5,183.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="347.5" y="164.677">aaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="378.5" x2="420.5" y1="169.8281" y2="169.8281"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="420.5" x2="420.5" y1="169.8281" y2="182.8281"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="379.5" x2="420.5" y1="182.8281" y2="182.8281"/>
+      <polygon fill="#A80036" points="389.5,178.8281,379.5,182.8281,389.5,186.8281,385.5,182.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="385.5" y="164.7622">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="368.5,238.8,378.5,242.8,368.5,246.8,372.5,242.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="194" x2="374.5" y1="242.8" y2="242.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="201" y="237.277">b()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="409.5,237.9609,419.5,241.9609,409.5,245.9609,413.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="415.5" y1="241.9609" y2="241.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="236.895">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="390.5" x2="437.5" y1="267.4" y2="267.4"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="437.5" x2="437.5" y1="267.4" y2="280.4"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="396.5" x2="437.5" y1="280.4" y2="280.4"/>
-      <polygon fill="#181818" points="406.5,276.4,396.5,280.4,406.5,284.4,402.5,280.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="402.5" y="261.877">bb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="431.5" x2="478.5" y1="266.0938" y2="266.0938"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="478.5" x2="478.5" y1="266.0938" y2="279.0938"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="437.5" x2="478.5" y1="279.0938" y2="279.0938"/>
+      <polygon fill="#A80036" points="447.5,275.0938,437.5,279.0938,447.5,283.0938,443.5,279.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="443.5" y="261.0278">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="400.5" x2="442.5" y1="315" y2="315"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="442.5" x2="442.5" y1="315" y2="328"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="401.5" x2="442.5" y1="328" y2="328"/>
-      <polygon fill="#181818" points="411.5,324,401.5,328,411.5,332,407.5,328" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="407.5" y="309.477">bbb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="441.5" x2="483.5" y1="313.2266" y2="313.2266"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="483.5" x2="483.5" y1="313.2266" y2="326.2266"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="442.5" x2="483.5" y1="326.2266" y2="326.2266"/>
+      <polygon fill="#A80036" points="452.5,322.2266,442.5,326.2266,452.5,330.2266,448.5,326.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="448.5" y="308.1606">bbb()</text>
     </a>
-    <polygon fill="#181818" points="50.5,368,40.5,372,50.5,376,46.5,372" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="188" y1="372" y2="372"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="505,397.6,515,401.6,505,405.6,509,401.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="511" y1="401.6" y2="401.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="46.5" y="396.077">operator()()</text>
+    <polygon fill="#A80036" points="57,366.2266,47,370.2266,57,374.2266,53,370.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="211" y1="370.2266" y2="370.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="561.5,395.3594,571.5,399.3594,561.5,403.3594,565.5,399.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="567.5" y1="399.3594" y2="399.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="394.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="642,427.2001,652,431.2001,642,435.2001,646,431.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="527" x2="648" y1="431.2001" y2="431.2001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="534" y="425.677">c()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="713.5,424.4922,723.5,428.4922,713.5,432.4922,717.5,428.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="583.5" x2="719.5" y1="428.4922" y2="428.4922"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="590.5" y="423.4263">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="664" x2="711" y1="455.8001" y2="455.8001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="711" x2="711" y1="455.8001" y2="468.8001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="670" x2="711" y1="468.8001" y2="468.8001"/>
-      <polygon fill="#181818" points="680,464.8001,670,468.8001,680,472.8001,676,468.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="676" y="450.2771">cc()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="735.5" x2="782.5" y1="452.625" y2="452.625"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="782.5" x2="782.5" y1="452.625" y2="465.625"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="741.5" x2="782.5" y1="465.625" y2="465.625"/>
+      <polygon fill="#A80036" points="751.5,461.625,741.5,465.625,751.5,469.625,747.5,465.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="747.5" y="447.5591">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="674" x2="716" y1="503.4001" y2="503.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="716" x2="716" y1="503.4001" y2="516.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="675" x2="716" y1="516.4001" y2="516.4001"/>
-      <polygon fill="#181818" points="685,512.4001,675,516.4001,685,520.4001,681,516.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="681" y="497.8771">ccc()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="745.5" x2="787.5" y1="499.7578" y2="499.7578"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="787.5" x2="787.5" y1="499.7578" y2="512.7578"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="746.5" x2="787.5" y1="512.7578" y2="512.7578"/>
+      <polygon fill="#A80036" points="756.5,508.7578,746.5,512.7578,756.5,516.7578,752.5,512.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="752.5" y="494.6919">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="205,572.0001,195,576.0001,205,580.0001,201,576.0001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="199" x2="516" y1="576.0001" y2="576.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="211" y="570.4771">operator()()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="228,567.8906,218,571.8906,228,575.8906,224,571.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="572.5" y1="571.8906" y2="571.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="234" y="566.8247">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="308.5,601.6001,318.5,605.6001,308.5,609.6001,312.5,605.6001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="194" x2="314.5" y1="605.6001" y2="605.6001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="201" y="600.0771">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="346.5,597.0234,356.5,601.0234,346.5,605.0234,350.5,601.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="352.5" y1="601.0234" y2="601.0234"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="595.9575">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="330.5" x2="377.5" y1="630.2001" y2="630.2001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="377.5" x2="377.5" y1="630.2001" y2="643.2001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="336.5" x2="377.5" y1="643.2001" y2="643.2001"/>
-      <polygon fill="#181818" points="346.5,639.2001,336.5,643.2001,346.5,647.2001,342.5,643.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="342.5" y="624.6771">aa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="368.5" x2="415.5" y1="625.1563" y2="625.1563"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="415.5" x2="415.5" y1="625.1563" y2="638.1563"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="374.5" x2="415.5" y1="638.1563" y2="638.1563"/>
+      <polygon fill="#A80036" points="384.5,634.1563,374.5,638.1563,384.5,642.1563,380.5,638.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="380.5" y="620.0903">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="340.5" x2="382.5" y1="677.8001" y2="677.8001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="382.5" x2="382.5" y1="677.8001" y2="690.8001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="341.5" x2="382.5" y1="690.8001" y2="690.8001"/>
-      <polygon fill="#181818" points="351.5,686.8001,341.5,690.8001,351.5,694.8001,347.5,690.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="347.5" y="672.2771">aaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="378.5" x2="420.5" y1="672.2891" y2="672.2891"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="420.5" x2="420.5" y1="672.2891" y2="685.2891"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="379.5" x2="420.5" y1="685.2891" y2="685.2891"/>
+      <polygon fill="#A80036" points="389.5,681.2891,379.5,685.2891,389.5,689.2891,385.5,685.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="385.5" y="667.2231">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="368.5,746.4001,378.5,750.4001,368.5,754.4001,372.5,750.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="194" x2="374.5" y1="750.4001" y2="750.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="201" y="744.8771">b()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="409.5,740.4219,419.5,744.4219,409.5,748.4219,413.5,744.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="415.5" y1="744.4219" y2="744.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="739.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="390.5" x2="437.5" y1="775.0002" y2="775.0002"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="437.5" x2="437.5" y1="775.0002" y2="788.0002"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="396.5" x2="437.5" y1="788.0002" y2="788.0002"/>
-      <polygon fill="#181818" points="406.5,784.0002,396.5,788.0002,406.5,792.0002,402.5,788.0002" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="402.5" y="769.4772">bb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="431.5" x2="478.5" y1="768.5547" y2="768.5547"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="478.5" x2="478.5" y1="768.5547" y2="781.5547"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="437.5" x2="478.5" y1="781.5547" y2="781.5547"/>
+      <polygon fill="#A80036" points="447.5,777.5547,437.5,781.5547,447.5,785.5547,443.5,781.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="443.5" y="763.4888">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="400.5" x2="442.5" y1="822.6002" y2="822.6002"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="442.5" x2="442.5" y1="822.6002" y2="835.6002"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="401.5" x2="442.5" y1="835.6002" y2="835.6002"/>
-      <polygon fill="#181818" points="411.5,831.6002,401.5,835.6002,411.5,839.6002,407.5,835.6002" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="407.5" y="817.0772">bbb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="441.5" x2="483.5" y1="815.6875" y2="815.6875"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="483.5" x2="483.5" y1="815.6875" y2="828.6875"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="442.5" x2="483.5" y1="828.6875" y2="828.6875"/>
+      <polygon fill="#A80036" points="452.5,824.6875,442.5,828.6875,452.5,832.6875,448.5,828.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="448.5" y="810.6216">bbb()</text>
     </a>
-    <polygon fill="#181818" points="505,875.6002,515,879.6002,505,883.6002,509,879.6002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="511" y1="879.6002" y2="879.6002"/>
-    <polygon fill="#181818" points="50.5,889.6002,40.5,893.6002,50.5,897.6002,46.5,893.6002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="521" y1="893.6002" y2="893.6002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="770.5,919.2002,780.5,923.2002,770.5,927.2002,774.5,923.2002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="776.5" y1="923.2002" y2="923.2002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="445" x="46.5" y="917.6772">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
+    <polygon fill="#A80036" points="561.5,868.6875,571.5,872.6875,561.5,876.6875,565.5,872.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="212" x2="567.5" y1="872.6875" y2="872.6875"/>
+    <polygon fill="#A80036" points="57,882.6875,47,886.6875,57,890.6875,53,886.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="577.5" y1="886.6875" y2="886.6875"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="859,911.8203,869,915.8203,859,919.8203,863,915.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="865" y1="915.8203" y2="915.8203"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="498" x="53" y="910.7544">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="770.5,978.8002,780.5,982.8002,770.5,986.8002,774.5,982.8002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="776.5" y1="982.8002" y2="982.8002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="12" x="46.5" y="977.2772">r()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="859,970.9531,869,974.9531,859,978.9531,863,974.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="865" y1="974.9531" y2="974.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="969.8872">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="998,1008.4002,1008,1012.4002,998,1016.4002,1002,1012.4002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="792.5" x2="1004" y1="1012.4002" y2="1012.4002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="799.5" y="1006.8772">operator()()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="1114,1000.0859,1124,1004.0859,1114,1008.0859,1118,1004.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="881" x2="1120" y1="1004.0859" y2="1004.0859"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="888" y="999.02">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="675,1038.0002,665,1042.0002,675,1046.0002,671,1042.0002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="669" x2="1009" y1="1042.0002" y2="1042.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="681" y="1036.4772">c()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="746.5,1029.2188,736.5,1033.2188,746.5,1037.2188,742.5,1033.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="740.5" x2="1125" y1="1033.2188" y2="1033.2188"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="752.5" y="1028.1528">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="664" x2="711" y1="1066.6002" y2="1066.6002"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="711" x2="711" y1="1066.6002" y2="1079.6002"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="670" x2="711" y1="1079.6002" y2="1079.6002"/>
-      <polygon fill="#181818" points="680,1075.6002,670,1079.6002,680,1083.6002,676,1079.6002" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="676" y="1061.0772">cc()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="735.5" x2="782.5" y1="1057.3516" y2="1057.3516"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="782.5" x2="782.5" y1="1057.3516" y2="1070.3516"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="741.5" x2="782.5" y1="1070.3516" y2="1070.3516"/>
+      <polygon fill="#A80036" points="751.5,1066.3516,741.5,1070.3516,751.5,1074.3516,747.5,1070.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="747.5" y="1052.2856">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="674" x2="716" y1="1114.2003" y2="1114.2003"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="716" x2="716" y1="1114.2003" y2="1127.2003"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="675" x2="716" y1="1127.2003" y2="1127.2003"/>
-      <polygon fill="#181818" points="685,1123.2003,675,1127.2003,685,1131.2003,681,1127.2003" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="681" y="1108.6773">ccc()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="745.5" x2="787.5" y1="1104.4844" y2="1104.4844"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="787.5" x2="787.5" y1="1104.4844" y2="1117.4844"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="746.5" x2="787.5" y1="1117.4844" y2="1117.4844"/>
+      <polygon fill="#A80036" points="756.5,1113.4844,746.5,1117.4844,756.5,1121.4844,752.5,1117.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="752.5" y="1099.4185">ccc()</text>
     </a>
-    <polygon fill="#181818" points="798.5,1167.2003,788.5,1171.2003,798.5,1175.2003,794.5,1171.2003" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="792.5" x2="1014" y1="1171.2003" y2="1171.2003"/>
+    <polygon fill="#A80036" points="887,1157.4844,877,1161.4844,887,1165.4844,883,1161.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="881" x2="1130" y1="1161.4844" y2="1161.4844"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20012_sequence_mermaid.svg b/docs/test_cases/t20012_sequence_mermaid.svg
index c0ac5669..45caec59 100644
--- a/docs/test_cases/t20012_sequence_mermaid.svg
+++ b/docs/test_cases/t20012_sequence_mermaid.svg
@@ -138,17 +138,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -232,60 +232,60 @@
   <g>
     <rect class="activation2" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="1553" x="1262"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="198">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="316.5" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="444">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="562" y1="157" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="200">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="320.5" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="446">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="566" y1="157" x1="325.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="571">aa()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 571,203 C 631,193 631,233 571,223"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="248" x="576">aaa()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 576,279 C 636,269 636,309 576,299"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="324" x="544">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="355" x2="762" y1="355" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="324" x="546">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="355" x2="766" y1="355" x1="325.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="370" x="771">bb()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 771,401 C 831,391 831,431 771,421"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="446" x="776">bbb()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 776,477 C 836,467 836,507 776,497"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="522" x="199">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="517" x2="83" y1="517" x1="315.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="532" x="544">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="563" x2="1007.5" y1="563" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="578" x="1135">c()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="609" x2="1253" y1="609" x1="1016.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="522" x="198">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="517" x2="80" y1="517" x1="315.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="532" x="546">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="563" x2="1011.5" y1="563" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="578" x="1137">c()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="609" x2="1257" y1="609" x1="1016.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="624" x="1262">cc()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1262,655 C 1322,645 1322,685 1262,675"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="700" x="1267">ccc()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1267,731 C 1327,721 1327,761 1267,751"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="666">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="807" x2="324.5" y1="807" x1="1006.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="822" x="444">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="853" x2="562" y1="853" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="664">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="807" x2="320.5" y1="807" x1="1006.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="822" x="446">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="853" x2="566" y1="853" x1="325.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="868" x="571">aa()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 571,899 C 631,889 631,929 571,919"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="944" x="576">aaa()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 576,975 C 636,965 636,1005 576,995"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1020" x="544">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1051" x2="762" y1="1051" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1020" x="546">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1051" x2="766" y1="1051" x1="325.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1066" x="771">bb()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 771,1097 C 831,1087 831,1127 771,1117"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1142" x="776">bbb()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 776,1173 C 836,1163 836,1203 776,1193"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1218" x="665">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1213" x2="1003.5" y1="1213" x1="325.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1228" x="545">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1223" x2="83" y1="1223" x1="1006.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1238" x="786">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1269" x2="1491" y1="1269" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1284" x="786">r()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1315" x2="1491" y1="1315" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1330" x="1635">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1361" x2="1770.5" y1="1361" x1="1500"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1376" x="1515">c()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1407" x2="1261" y1="1407" x1="1769.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1218" x="666">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1213" x2="1006.5" y1="1213" x1="325.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1228" x="543">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1223" x2="80" y1="1223" x1="1006.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1238" x="788">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1269" x2="1495" y1="1269" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1284" x="788">r()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1315" x2="1495" y1="1315" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1330" x="1637">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1361" x2="1774.5" y1="1361" x1="1500"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1376" x="1513">c()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1407" x2="1257" y1="1407" x1="1769.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1422" x="1262">cc()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1262,1453 C 1322,1443 1322,1483 1262,1473"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1498" x="1267">ccc()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 1267,1529 C 1327,1519 1327,1559 1267,1549"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1574" x="1636">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1569" x2="1503" y1="1569" x1="1769.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1574" x="1635">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1569" x2="1500" y1="1569" x1="1769.5"/>
 </svg>
diff --git a/docs/test_cases/t20013.md b/docs/test_cases/t20013.md
index 8967c979..98eef980 100644
--- a/docs/test_cases/t20013.md
+++ b/docs/test_cases/t20013.md
@@ -55,8 +55,10 @@ void tmain(int argc, char **argv)
   "name": "t20013_sequence",
   "participants": [
     {
+      "display_name": "tmain(int,char **)",
       "id": "1249768632077843821",
-      "name": "clanguml::t20013::tmain(int,char **)",
+      "name": "tmain",
+      "namespace": "clanguml::t20013",
       "source_location": {
         "column": 6,
         "file": "t20013.cc",
@@ -66,8 +68,51 @@ void tmain(int argc, char **argv)
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(int)",
+          "id": "2144804108273682993",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20013.cc",
+            "line": 11,
+            "translation_unit": "t20013.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b(double)",
+          "id": "640747884486165287",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 12,
+            "file": "t20013.cc",
+            "line": 12,
+            "translation_unit": "t20013.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b(const char *)",
+          "id": "1066935874364409142",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20013.cc",
+            "line": 13,
+            "translation_unit": "t20013.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1106407610612951303",
-      "name": "clanguml::t20013::B",
+      "name": "B",
+      "namespace": "clanguml::t20013",
       "source_location": {
         "column": 8,
         "file": "t20013.cc",
@@ -77,8 +122,51 @@ void tmain(int argc, char **argv)
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1(int)",
+          "id": "1034027282942033004",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20013.cc",
+            "line": 5,
+            "translation_unit": "t20013.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2(double)",
+          "id": "394053399890813915",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 12,
+            "file": "t20013.cc",
+            "line": 6,
+            "translation_unit": "t20013.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a3(const char *)",
+          "id": "1841239321495867611",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20013.cc",
+            "line": 7,
+            "translation_unit": "t20013.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "976623130699225079",
-      "name": "clanguml::t20013::A",
+      "name": "A",
+      "namespace": "clanguml::t20013",
       "source_location": {
         "column": 8,
         "file": "t20013.cc",
@@ -94,9 +182,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1249768632077843821",
-            "activity_name": "clanguml::t20013::tmain(int,char **)",
-            "participant_id": "1249768632077843821",
-            "participant_name": "clanguml::t20013::tmain(int,char **)"
+            "participant_id": "1249768632077843821"
           },
           "name": "b(int)",
           "return_type": "int",
@@ -109,7 +195,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "2144804108273682993",
-            "activity_name": "clanguml::t20013::B::b(int)",
             "participant_id": "1106407610612951303"
           },
           "type": "message"
@@ -117,7 +202,6 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "2144804108273682993",
-            "activity_name": "clanguml::t20013::B::b(int)",
             "participant_id": "1106407610612951303"
           },
           "name": "a1(int)",
@@ -131,7 +215,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1034027282942033004",
-            "activity_name": "clanguml::t20013::A::a1(int)",
             "participant_id": "976623130699225079"
           },
           "type": "message"
@@ -139,9 +222,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1249768632077843821",
-            "activity_name": "clanguml::t20013::tmain(int,char **)",
-            "participant_id": "1249768632077843821",
-            "participant_name": "clanguml::t20013::tmain(int,char **)"
+            "participant_id": "1249768632077843821"
           },
           "name": "b(double)",
           "return_type": "double",
@@ -154,7 +235,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "640747884486165287",
-            "activity_name": "clanguml::t20013::B::b(double)",
             "participant_id": "1106407610612951303"
           },
           "type": "message"
@@ -162,7 +242,6 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "640747884486165287",
-            "activity_name": "clanguml::t20013::B::b(double)",
             "participant_id": "1106407610612951303"
           },
           "name": "a2(double)",
@@ -176,7 +255,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "394053399890813915",
-            "activity_name": "clanguml::t20013::A::a2(double)",
             "participant_id": "976623130699225079"
           },
           "type": "message"
@@ -184,9 +262,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1249768632077843821",
-            "activity_name": "clanguml::t20013::tmain(int,char **)",
-            "participant_id": "1249768632077843821",
-            "participant_name": "clanguml::t20013::tmain(int,char **)"
+            "participant_id": "1249768632077843821"
           },
           "name": "b(const char *)",
           "return_type": "const char *",
@@ -199,7 +275,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1066935874364409142",
-            "activity_name": "clanguml::t20013::B::b(const char *)",
             "participant_id": "1106407610612951303"
           },
           "type": "message"
@@ -207,7 +282,6 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1066935874364409142",
-            "activity_name": "clanguml::t20013::B::b(const char *)",
             "participant_id": "1106407610612951303"
           },
           "name": "a3(const char *)",
@@ -221,7 +295,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1841239321495867611",
-            "activity_name": "clanguml::t20013::A::a3(const char *)",
             "participant_id": "976623130699225079"
           },
           "type": "message"
diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg
index 51f6a6fb..f1f6fb96 100644
--- a/docs/test_cases/t20013_sequence.svg
+++ b/docs/test_cases/t20013_sequence.svg
@@ -1,84 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="354px" preserveAspectRatio="none" style="width:317px;height:354px;background:#FFFFFF;" version="1.1" viewBox="0 0 317 354" width="317px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:354px;height:357px;" version="1.1" viewBox="0 0 354 357" width="354px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1kfxeomkwypop" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="253.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="68.3999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="155.6"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="242.8"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="185.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="272.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="65" x2="65" y1="36.7999" y2="318.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="178.5" x2="178.5" y1="36.7999" y2="318.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="299.5" x2="299.5" y1="36.7999" y2="318.4"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="25.0059">tmain(int,char **)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="317.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="337.406">tmain(int,char **)</text>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="317.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="317.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="317.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
+      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="336.0889">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="167.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="174.5" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="167.5" y="317.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="174.5" y="337.406">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="336.0889">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="288.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="295.5" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="288.5" y="317.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="295.5" y="337.406">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="336.0889">A</text>
     </a>
-    <rect fill="#FFFFFF" height="253.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="68.3999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="155.6"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="242.8"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="185.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="272.4"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162,64.3999,172,68.3999,162,72.3999,166,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="77" y="62.8769">b(int)</text>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="283,94,293,98,283,102,287,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="191" y="92.477">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
     </a>
-    <polygon fill="#181818" points="195,108,185,112,195,116,191,112" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="112" y2="112"/>
-    <polygon fill="#181818" points="81,122,71,126,81,130,77,126" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="178" y1="126" y2="126"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162,151.6,172,155.6,162,159.6,166,155.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="155.6" y2="155.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="77" y="150.077">b(double)</text>
+    <polygon fill="#A80036" points="216.5,108.5625,206.5,112.5625,216.5,116.5625,212.5,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="112.5625" y2="112.5625"/>
+    <polygon fill="#A80036" points="91.5,122.5625,81.5,126.5625,91.5,130.5625,87.5,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="126.5625" y2="126.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="183.5,151.6953,193.5,155.6953,183.5,159.6953,187.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="155.6953" y2="155.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="150.6294">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="283,181.2,293,185.2,283,189.2,287,185.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="185.2" y2="185.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="60" x="191" y="179.677">a2(double)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="316.5,180.8281,326.5,184.8281,316.5,188.8281,320.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="184.8281" y2="184.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="179.7622">a2(double)</text>
     </a>
-    <polygon fill="#181818" points="195,195.2,185,199.2,195,203.2,191,199.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="199.2" y2="199.2"/>
-    <polygon fill="#181818" points="81,209.2,71,213.2,81,217.2,77,213.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="178" y1="213.2" y2="213.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162,238.8,172,242.8,162,246.8,166,242.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="242.8" y2="242.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="77" y="237.277">b(const char *)</text>
+    <polygon fill="#A80036" points="216.5,194.8281,206.5,198.8281,216.5,202.8281,212.5,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="198.8281" y2="198.8281"/>
+    <polygon fill="#A80036" points="91.5,208.8281,81.5,212.8281,91.5,216.8281,87.5,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="212.8281" y2="212.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="183.5,237.9609,193.5,241.9609,183.5,245.9609,187.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="241.9609" y2="241.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="236.895">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="283,268.4,293,272.4,283,276.4,287,272.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="272.4" y2="272.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="191" y="266.877">a3(const char *)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="316.5,267.0938,326.5,271.0938,316.5,275.0938,320.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="271.0938" y2="271.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="266.0278">a3(const char *)</text>
     </a>
-    <polygon fill="#181818" points="195,282.4,185,286.4,195,290.4,191,286.4" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="286.4" y2="286.4"/>
-    <polygon fill="#181818" points="76,296.4,66,300.4,76,304.4,72,300.4" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="70" x2="178" y1="300.4" y2="300.4"/>
+    <polygon fill="#A80036" points="216.5,281.0938,206.5,285.0938,216.5,289.0938,212.5,285.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="285.0938" y2="285.0938"/>
+    <polygon fill="#A80036" points="86.5,295.0938,76.5,299.0938,86.5,303.0938,82.5,299.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="80.5" x2="199.5" y1="299.0938" y2="299.0938"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20013_sequence_mermaid.svg b/docs/test_cases/t20013_sequence_mermaid.svg
index 1cc14dee..9113c14e 100644
--- a/docs/test_cases/t20013_sequence_mermaid.svg
+++ b/docs/test_cases/t20013_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -103,28 +103,28 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="385" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="283" y1="167" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="83" y1="177" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="176">b(double)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="271" y1="223" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="376">a2(double)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="471" y1="269" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="283" y1="279" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="83" y1="289" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="176">b(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="271" y1="335" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="376">a3(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="471" y1="381" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="391" x2="283" y1="391" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="406" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="401" x2="83" y1="401" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="280" y1="167" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="80" y1="177" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="178">b(double)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="275" y1="223" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="378">a2(double)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="475" y1="269" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="280" y1="279" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="80" y1="289" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="178">b(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="275" y1="335" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="378">a3(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="475" y1="381" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="391" x2="280" y1="391" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="406" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="401" x2="80" y1="401" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20014.md b/docs/test_cases/t20014.md
index 682a3f78..59d155bd 100644
--- a/docs/test_cases/t20014.md
+++ b/docs/test_cases/t20014.md
@@ -17,32 +17,6 @@ diagrams:
       - function: "clanguml::t20014::tmain()"
 ```
 ## Source code
-File `tests/t20014/t20014_a.cc`
-```cpp
-#include "include/t20014_a.h"
-namespace clanguml {
-namespace t20014 {
-
-int A::a1(int i, int j) { return i + j; }
-
-int A::a2(int i, int j) { return i - j; }
-
-}
-}
-```
-File `tests/t20014/t20014_b.cc`
-```cpp
-#include "include/t20014_b.h"
-namespace clanguml {
-namespace t20014 {
-
-int B::b1(int i, int j) { return a_.a1(i, j); }
-
-int B::b2(int i, int j) { return a_.a2(i, j); }
-
-}
-}
-```
 File `tests/t20014/t20014.cc`
 ```cpp
 #include "include/t20014.h"
@@ -66,6 +40,32 @@ int tmain()
 
     return 0;
 }
+}
+}
+```
+File `tests/t20014/t20014_a.cc`
+```cpp
+#include "include/t20014_a.h"
+namespace clanguml {
+namespace t20014 {
+
+int A::a1(int i, int j) { return i + j; }
+
+int A::a2(int i, int j) { return i - j; }
+
+}
+}
+```
+File `tests/t20014/t20014_b.cc`
+```cpp
+#include "include/t20014_b.h"
+namespace clanguml {
+namespace t20014 {
+
+int B::b1(int i, int j) { return a_.a1(i, j); }
+
+int B::b2(int i, int j) { return a_.a2(i, j); }
+
 }
 }
 ```
@@ -76,18 +76,6 @@ File `tests/t20014/t20014_c.cc`
 namespace clanguml {
 namespace t20014 {
 
-}
-}
-```
-File `tests/t20014/include/t20014.h`
-```cpp
-#pragma once
-
-namespace clanguml {
-namespace t20014 {
-
-int tmain();
-
 }
 }
 ```
@@ -107,6 +95,18 @@ struct B {
     A a_;
 };
 
+}
+}
+```
+File `tests/t20014/include/t20014.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t20014 {
+
+int tmain();
+
 }
 }
 ```
@@ -154,8 +154,10 @@ struct A {
   "name": "t20014_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "512436830818921250",
-      "name": "clanguml::t20014::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20014",
       "source_location": {
         "column": 5,
         "file": "t20014.cc",
@@ -165,8 +167,38 @@ struct A {
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b1(int,int)",
+          "id": "1251633571711578431",
+          "name": "b1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "include/t20014_b.h",
+            "line": 9,
+            "translation_unit": "t20014.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b2(int,int)",
+          "id": "767830966714379991",
+          "name": "b2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "include/t20014_b.h",
+            "line": 10,
+            "translation_unit": "t20014.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1537634076295867978",
-      "name": "clanguml::t20014::B",
+      "name": "B",
+      "namespace": "clanguml::t20014",
       "source_location": {
         "column": 8,
         "file": "include/t20014_b.h",
@@ -176,8 +208,38 @@ struct A {
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1(int,int)",
+          "id": "1753682948110709616",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "include/t20014_a.h",
+            "line": 7,
+            "translation_unit": "t20014.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2(int,int)",
+          "id": "1943487088673912694",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "include/t20014_a.h",
+            "line": 8,
+            "translation_unit": "t20014.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1504706415756333840",
-      "name": "clanguml::t20014::A",
+      "name": "A",
+      "namespace": "clanguml::t20014",
       "source_location": {
         "column": 8,
         "file": "include/t20014_a.h",
@@ -187,8 +249,25 @@ struct A {
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "c1(int,int)",
+          "id": "407559038402563981",
+          "name": "c1",
+          "namespace": "",
+          "source_location": {
+            "column": 7,
+            "file": "include/t20014_c.h",
+            "line": 7,
+            "translation_unit": "t20014.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "C<B,int>",
       "id": "500712304857049435",
-      "name": "clanguml::t20014::C<clanguml::t20014::B,int>",
+      "name": "C",
+      "namespace": "clanguml::t20014",
       "source_location": {
         "column": 42,
         "file": "include/t20014_c.h",
@@ -204,9 +283,7 @@ struct A {
         {
           "from": {
             "activity_id": "512436830818921250",
-            "activity_name": "clanguml::t20014::tmain()",
-            "participant_id": "512436830818921250",
-            "participant_name": "clanguml::t20014::tmain()"
+            "participant_id": "512436830818921250"
           },
           "name": "b1(int,int)",
           "return_type": "int",
@@ -219,7 +296,6 @@ struct A {
           },
           "to": {
             "activity_id": "1251633571711578431",
-            "activity_name": "clanguml::t20014::B::b1(int,int)",
             "participant_id": "1537634076295867978"
           },
           "type": "message"
@@ -227,7 +303,6 @@ struct A {
         {
           "from": {
             "activity_id": "1251633571711578431",
-            "activity_name": "clanguml::t20014::B::b1(int,int)",
             "participant_id": "1537634076295867978"
           },
           "name": "a1(int,int)",
@@ -241,7 +316,6 @@ struct A {
           },
           "to": {
             "activity_id": "1753682948110709616",
-            "activity_name": "clanguml::t20014::A::a1(int,int)",
             "participant_id": "1504706415756333840"
           },
           "type": "message"
@@ -249,9 +323,7 @@ struct A {
         {
           "from": {
             "activity_id": "512436830818921250",
-            "activity_name": "clanguml::t20014::tmain()",
-            "participant_id": "512436830818921250",
-            "participant_name": "clanguml::t20014::tmain()"
+            "participant_id": "512436830818921250"
           },
           "name": "b2(int,int)",
           "return_type": "int",
@@ -264,7 +336,6 @@ struct A {
           },
           "to": {
             "activity_id": "767830966714379991",
-            "activity_name": "clanguml::t20014::B::b2(int,int)",
             "participant_id": "1537634076295867978"
           },
           "type": "message"
@@ -272,7 +343,6 @@ struct A {
         {
           "from": {
             "activity_id": "767830966714379991",
-            "activity_name": "clanguml::t20014::B::b2(int,int)",
             "participant_id": "1537634076295867978"
           },
           "name": "a2(int,int)",
@@ -286,7 +356,6 @@ struct A {
           },
           "to": {
             "activity_id": "1943487088673912694",
-            "activity_name": "clanguml::t20014::A::a2(int,int)",
             "participant_id": "1504706415756333840"
           },
           "type": "message"
@@ -294,9 +363,7 @@ struct A {
         {
           "from": {
             "activity_id": "512436830818921250",
-            "activity_name": "clanguml::t20014::tmain()",
-            "participant_id": "512436830818921250",
-            "participant_name": "clanguml::t20014::tmain()"
+            "participant_id": "512436830818921250"
           },
           "name": "c1(int,int)",
           "return_type": "int",
@@ -309,7 +376,6 @@ struct A {
           },
           "to": {
             "activity_id": "407559038402563981",
-            "activity_name": "clanguml::t20014::C<clanguml::t20014::B,int>::c1(int,int)",
             "participant_id": "500712304857049435"
           },
           "type": "message"
@@ -317,7 +383,6 @@ struct A {
         {
           "from": {
             "activity_id": "407559038402563981",
-            "activity_name": "clanguml::t20014::C<clanguml::t20014::B,int>::c1(int,int)",
             "participant_id": "500712304857049435"
           },
           "name": "b1(int,int)",
@@ -331,7 +396,6 @@ struct A {
           },
           "to": {
             "activity_id": "1251633571711578431",
-            "activity_name": "clanguml::t20014::B::b1(int,int)",
             "participant_id": "1537634076295867978"
           },
           "type": "message"
diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg
index 99748fb3..64f1274c 100644
--- a/docs/test_cases/t20014_sequence.svg
+++ b/docs/test_cases/t20014_sequence.svg
@@ -1,100 +1,106 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="397px" preserveAspectRatio="none" style="width:296px;height:397px;background:#FFFFFF;" version="1.1" viewBox="0 0 296 397" width="296px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="400px" preserveAspectRatio="none" style="width:336px;height:400px;" version="1.1" viewBox="0 0 336 400" width="336px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1ul9jjl8lonc3" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="297.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="155.6"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="272.4"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="185.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="302"/>
-    <rect fill="#FFFFFF" height="101.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="251" y="242.8"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="362"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="117" x2="117" y1="36.7999" y2="362"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="200" x2="200" y1="36.7999" y2="362"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="256" x2="256" y1="36.7999" y2="362"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="361"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="381.006">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="360.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="360.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="222.5" x2="222.5" y1="38.2969" y2="360.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287.5" x2="287.5" y1="38.2969" y2="360.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="379.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="106" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="113" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="106" y="361"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="113" y="381.006">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="379.2217">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="189" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="196" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="189" y="361"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="196" y="381.006">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="379.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="222" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="229" y="25.0059">C&lt;B,int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="68" x="222" y="361"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="54" x="229" y="381.006">C&lt;B,int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="22.9951">C&lt;B,int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="379.2217">C&lt;B,int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" height="297.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="155.6"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="112.5" y="272.4"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="185.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="195.5" y="302"/>
-    <rect fill="#FFFFFF" height="101.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="251" y="242.8"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="100.5,64.3999,110.5,68.3999,100.5,72.3999,104.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="106.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="46.5" y="62.8769">b1(int,int)</text>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="115,65.4297,125,69.4297,115,73.4297,119,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="64.3638">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="183.5,94,193.5,98,183.5,102,187.5,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="122.5" x2="189.5" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="129.5" y="92.477">a1(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="206,94.5625,216,98.5625,206,102.5625,210,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="93.4966">a1(int,int)</text>
     </a>
-    <polygon fill="#181818" points="133.5,108,123.5,112,133.5,116,129.5,112" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="127.5" x2="199.5" y1="112" y2="112"/>
-    <polygon fill="#181818" points="50.5,122,40.5,126,50.5,130,46.5,126" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="116.5" y1="126" y2="126"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="100.5,151.6,110.5,155.6,100.5,159.6,104.5,155.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="106.5" y1="155.6" y2="155.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="46.5" y="150.077">b2(int,int)</text>
+    <polygon fill="#A80036" points="148,108.5625,138,112.5625,148,116.5625,144,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="112.5625" y2="112.5625"/>
+    <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="126.5625" y2="126.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="115,151.6953,125,155.6953,115,159.6953,119,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="155.6953" y2="155.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="150.6294">b2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="183.5,181.2,193.5,185.2,183.5,189.2,187.5,185.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="122.5" x2="189.5" y1="185.2" y2="185.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="129.5" y="179.677">a2(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="206,180.8281,216,184.8281,206,188.8281,210,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="184.8281" y2="184.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="179.7622">a2(int,int)</text>
     </a>
-    <polygon fill="#181818" points="133.5,195.2,123.5,199.2,133.5,203.2,129.5,199.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="127.5" x2="199.5" y1="199.2" y2="199.2"/>
-    <polygon fill="#181818" points="50.5,209.2,40.5,213.2,50.5,217.2,46.5,213.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="116.5" y1="213.2" y2="213.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="239,238.8,249,242.8,239,246.8,243,242.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="245" y1="242.8" y2="242.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="46.5" y="237.277">c1(int,int)</text>
+    <polygon fill="#A80036" points="148,194.8281,138,198.8281,148,202.8281,144,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="198.8281" y2="198.8281"/>
+    <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="212.8281" y2="212.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="271,237.9609,281,241.9609,271,245.9609,275,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="277" y1="241.9609" y2="241.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="53" y="236.895">c1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="133.5,268.4,123.5,272.4,133.5,276.4,129.5,272.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="127.5" x2="250" y1="272.4" y2="272.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="139.5" y="266.877">b1(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="148,267.0938,138,271.0938,148,275.0938,144,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="142" x2="282" y1="271.0938" y2="271.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="154" y="266.0278">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="183.5,298,193.5,302,183.5,306,187.5,302" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="122.5" x2="189.5" y1="302" y2="302"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="129.5" y="296.477">a1(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="206,296.2266,216,300.2266,206,304.2266,210,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="300.2266" y2="300.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="295.1606">a1(int,int)</text>
     </a>
-    <polygon fill="#181818" points="133.5,312,123.5,316,133.5,320,129.5,316" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="127.5" x2="199.5" y1="316" y2="316"/>
-    <polygon fill="#181818" points="239,326,249,330,239,334,243,330" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="117.5" x2="245" y1="330" y2="330"/>
-    <polygon fill="#181818" points="45.5,340,35.5,344,45.5,348,41.5,344" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="255" y1="344" y2="344"/>
+    <polygon fill="#A80036" points="148,310.2266,138,314.2266,148,318.2266,144,314.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="314.2266" y2="314.2266"/>
+    <polygon fill="#A80036" points="271,324.2266,281,328.2266,271,332.2266,275,328.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="132" x2="277" y1="328.2266" y2="328.2266"/>
+    <polygon fill="#A80036" points="52,338.2266,42,342.2266,52,346.2266,48,342.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="287" y1="342.2266" y2="342.2266"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20014_sequence_mermaid.svg b/docs/test_cases/t20014_sequence_mermaid.svg
index 863079c3..701f40f7 100644
--- a/docs/test_cases/t20014_sequence_mermaid.svg
+++ b/docs/test_cases/t20014_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -121,32 +121,32 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="431" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="283" y1="167" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="83" y1="177" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="176">b2(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="271" y1="223" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="376">a2(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="471" y1="269" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="283" y1="279" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="83" y1="289" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="376">c1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="671" y1="335" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="475">b1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="279" y1="381" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="376">a1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="427" x2="471" y1="427" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="442" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="437" x2="283" y1="437" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="452" x="474">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="447" x2="667" y1="447" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="462" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="457" x2="83" y1="457" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="280" y1="167" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="177" x2="80" y1="177" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="178">b2(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="223" x2="275" y1="223" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="378">a2(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="475" y1="269" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="280" y1="279" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="289" x2="80" y1="289" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="378">c1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="675" y1="335" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="473">b1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="275" y1="381" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="378">a1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="427" x2="475" y1="427" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="442" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="437" x2="280" y1="437" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="452" x="475">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="447" x2="670" y1="447" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="462" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="457" x2="80" y1="457" x1="670"/>
 </svg>
diff --git a/docs/test_cases/t20015.md b/docs/test_cases/t20015.md
index 450f464e..3cd38edd 100644
--- a/docs/test_cases/t20015.md
+++ b/docs/test_cases/t20015.md
@@ -71,8 +71,10 @@ void tmain()
   "name": "t20015_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1011496551872082945",
-      "name": "clanguml::t20015::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20015",
       "source_location": {
         "column": 6,
         "file": "t20015.cc",
@@ -82,8 +84,25 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "setup_a(std::shared_ptr<detail::A> &)",
+          "id": "431575772398797060",
+          "name": "setup_a",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20015.cc",
+            "line": 23,
+            "translation_unit": "t20015.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1302656676783358645",
-      "name": "clanguml::t20015::B",
+      "name": "B",
+      "namespace": "clanguml::t20015",
       "source_location": {
         "column": 7,
         "file": "t20015.cc",
@@ -99,9 +118,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1011496551872082945",
-            "activity_name": "clanguml::t20015::tmain()",
-            "participant_id": "1011496551872082945",
-            "participant_name": "clanguml::t20015::tmain()"
+            "participant_id": "1011496551872082945"
           },
           "name": "setup_a(std::shared_ptr<detail::A> &)",
           "return_type": "void",
@@ -114,7 +131,6 @@ void tmain()
           },
           "to": {
             "activity_id": "431575772398797060",
-            "activity_name": "clanguml::t20015::B::setup_a(std::shared_ptr<detail::A> &)",
             "participant_id": "1302656676783358645"
           },
           "type": "message"
diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg
index 85679e02..73dee18e 100644
--- a/docs/test_cases/t20015_sequence.svg
+++ b/docs/test_cases/t20015_sequence.svg
@@ -1,30 +1,36 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="152px" preserveAspectRatio="none" style="width:299px;height:152px;background:#FFFFFF;" version="1.1" viewBox="0 0 299 152" width="299px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:338px;height:157px;" version="1.1" viewBox="0 0 338 157" width="338px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1pxnzo1ly20py" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="276.5" y="68.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="116.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="281" x2="281" y1="36.7999" y2="116.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="115.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="135.4059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1pxnzo1ly20py)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1pxnzo1ly20py)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="317" x2="317" y1="38.2969" y2="117.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxnzo1ly20py)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1pxnzo1ly20py)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="270" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="277" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="270" y="115.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="277" y="135.4059">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxnzo1ly20py)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f1pxnzo1ly20py)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="136.4248">B</text>
     </a>
-    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="276.5" y="68.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="264.5,64.3999,274.5,68.3999,264.5,72.3999,268.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="270.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="218" x="46.5" y="62.8769">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
+    <rect fill="#FFFFFF" filter="url(#f1pxnzo1ly20py)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1pxnzo1ly20py)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="300,65.4297,310,69.4297,300,73.4297,304,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="306" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="53" y="64.3638">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20015_sequence_mermaid.svg b/docs/test_cases/t20015_sequence_mermaid.svg
index 1ad5fd15..15fab6f5 100644
--- a/docs/test_cases/t20015_sequence_mermaid.svg
+++ b/docs/test_cases/t20015_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -73,6 +73,6 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="105" x="385"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="233">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="386" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="235">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="390" y1="111" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20016.md b/docs/test_cases/t20016.md
index 240d4618..1dd9921c 100644
--- a/docs/test_cases/t20016.md
+++ b/docs/test_cases/t20016.md
@@ -53,8 +53,10 @@ void tmain()
   "name": "t20016_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1912662358651926712",
-      "name": "clanguml::t20016::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20016",
       "source_location": {
         "column": 6,
         "file": "t20016.cc",
@@ -64,8 +66,38 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b1(long)",
+          "id": "2064264710178722261",
+          "name": "b1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20016.cc",
+            "line": 9,
+            "translation_unit": "t20016.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b2(long)",
+          "id": "203381140188081853",
+          "name": "b2",
+          "namespace": "",
+          "source_location": {
+            "column": 29,
+            "file": "t20016.cc",
+            "line": 11,
+            "translation_unit": "t20016.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B<long>",
       "id": "1688340912643326666",
-      "name": "clanguml::t20016::B<long>",
+      "name": "B",
+      "namespace": "clanguml::t20016",
       "source_location": {
         "column": 30,
         "file": "t20016.cc",
@@ -75,8 +107,38 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1(int)",
+          "id": "1198371121423942542",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20016.cc",
+            "line": 4,
+            "translation_unit": "t20016.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2(const long &)",
+          "id": "1208784669530380166",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 29,
+            "file": "t20016.cc",
+            "line": 5,
+            "translation_unit": "t20016.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1351242594275053195",
-      "name": "clanguml::t20016::A",
+      "name": "A",
+      "namespace": "clanguml::t20016",
       "source_location": {
         "column": 8,
         "file": "t20016.cc",
@@ -92,9 +154,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1912662358651926712",
-            "activity_name": "clanguml::t20016::tmain()",
-            "participant_id": "1912662358651926712",
-            "participant_name": "clanguml::t20016::tmain()"
+            "participant_id": "1912662358651926712"
           },
           "name": "b1(long)",
           "return_type": "void",
@@ -107,7 +167,6 @@ void tmain()
           },
           "to": {
             "activity_id": "2064264710178722261",
-            "activity_name": "clanguml::t20016::B<long>::b1(long)",
             "participant_id": "1688340912643326666"
           },
           "type": "message"
@@ -115,7 +174,6 @@ void tmain()
         {
           "from": {
             "activity_id": "2064264710178722261",
-            "activity_name": "clanguml::t20016::B<long>::b1(long)",
             "participant_id": "1688340912643326666"
           },
           "name": "a1(int)",
@@ -129,7 +187,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1198371121423942542",
-            "activity_name": "clanguml::t20016::A::a1(int)",
             "participant_id": "1351242594275053195"
           },
           "type": "message"
@@ -137,9 +194,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1912662358651926712",
-            "activity_name": "clanguml::t20016::tmain()",
-            "participant_id": "1912662358651926712",
-            "participant_name": "clanguml::t20016::tmain()"
+            "participant_id": "1912662358651926712"
           },
           "name": "b2(long)",
           "return_type": "F",
@@ -152,7 +207,6 @@ void tmain()
           },
           "to": {
             "activity_id": "203381140188081853",
-            "activity_name": "clanguml::t20016::B<long>::b2(long)",
             "participant_id": "1688340912643326666"
           },
           "type": "message"
@@ -160,7 +214,6 @@ void tmain()
         {
           "from": {
             "activity_id": "203381140188081853",
-            "activity_name": "clanguml::t20016::B<long>::b2(long)",
             "participant_id": "1688340912643326666"
           },
           "name": "a2(const long &)",
@@ -174,7 +227,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1208784669530380166",
-            "activity_name": "clanguml::t20016::A::a2(const long &)",
             "participant_id": "1351242594275053195"
           },
           "type": "message"
diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg
index 58671b0b..1c99303d 100644
--- a/docs/test_cases/t20016_sequence.svg
+++ b/docs/test_cases/t20016_sequence.svg
@@ -1,62 +1,68 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="268px" preserveAspectRatio="none" style="width:251px;height:268px;background:#FFFFFF;" version="1.1" viewBox="0 0 251 268" width="251px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="273px" preserveAspectRatio="none" style="width:281px;height:273px;" version="1.1" viewBox="0 0 281 273" width="281px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fu07mihkvsjh4" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="168.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="104.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="104.5" y="157.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="228.5" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="228.5" y="187.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="233.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="109.5" x2="109.5" y1="36.7999" y2="233.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="233" x2="233" y1="36.7999" y2="233.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="232.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="252.2059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="232.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="125" x2="125" y1="38.2969" y2="232.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="260.5" x2="260.5" y1="38.2969" y2="232.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="251.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="76.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="83.5" y="25.0059">B&lt;long&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="66" x="76.5" y="232.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52" x="83.5" y="252.2059">B&lt;long&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="22.9951">B&lt;long&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="251.8232">B&lt;long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="222" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="229" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="222" y="232.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="229" y="252.2059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="251.8232">A</text>
     </a>
-    <rect fill="#FFFFFF" height="168.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="104.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="104.5" y="157.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="228.5" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="228.5" y="187.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="92.5,64.3999,102.5,68.3999,92.5,72.3999,96.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="98.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="46.5" y="62.8769">b1(long)</text>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="108,65.4297,118,69.4297,108,73.4297,112,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="64.3638">b1(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="216.5,94,226.5,98,216.5,102,220.5,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="114.5" x2="222.5" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="121.5" y="92.477">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="244,94.5625,254,98.5625,244,102.5625,248,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="137" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="92.5,153.6,102.5,157.6,92.5,161.6,96.5,157.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="98.5" y1="157.6" y2="157.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="46" x="46.5" y="152.077">b2(long)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="108,153.6953,118,157.6953,108,161.6953,112,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="157.6953" y2="157.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="152.6294">b2(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="216.5,183.2,226.5,187.2,216.5,191.2,220.5,187.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="114.5" x2="222.5" y1="187.2" y2="187.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="95" x="121.5" y="181.677">a2(const long &amp;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="244,182.8281,254,186.8281,244,190.8281,248,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="186.8281" y2="186.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="107" x="137" y="181.7622">a2(const long &amp;)</text>
     </a>
-    <polygon fill="#181818" points="125.5,197.2,115.5,201.2,125.5,205.2,121.5,201.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="119.5" x2="232.5" y1="201.2" y2="201.2"/>
-    <polygon fill="#181818" points="45.5,211.2,35.5,215.2,45.5,219.2,41.5,215.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="108.5" y1="215.2" y2="215.2"/>
+    <polygon fill="#A80036" points="141,196.8281,131,200.8281,141,204.8281,137,200.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="135" x2="260" y1="200.8281" y2="200.8281"/>
+    <polygon fill="#A80036" points="52,210.8281,42,214.8281,52,218.8281,48,214.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="124" y1="214.8281" y2="214.8281"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20016_sequence_mermaid.svg b/docs/test_cases/t20016_sequence_mermaid.svg
index ab1dfed3..a4e11094 100644
--- a/docs/test_cases/t20016_sequence_mermaid.svg
+++ b/docs/test_cases/t20016_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -97,16 +97,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="253" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b1(long)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="176">b2(long)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="271" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="376">a2(const long &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="471" y1="249" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="259" x2="283" y1="259" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="274" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="269" x2="83" y1="269" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b1(long)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="178">b2(long)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="275" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="378">a2(const long &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="475" y1="249" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="259" x2="280" y1="259" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="274" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="269" x2="80" y1="269" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20017.md b/docs/test_cases/t20017.md
index 84ac052b..f783f2c3 100644
--- a/docs/test_cases/t20017.md
+++ b/docs/test_cases/t20017.md
@@ -39,18 +39,6 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); }
 }
 }
 ```
-File `tests/t20017/include/t20017_b.h`
-```cpp
-#pragma once
-
-namespace clanguml {
-namespace t20017 {
-int b1(int x, int y);
-
-template <typename T> T b2(T x, T y) { return x / y; }
-}
-}
-```
 File `tests/t20017/include/t20017_a.h`
 ```cpp
 #pragma once
@@ -63,6 +51,18 @@ int a3(int x, int y) { return x * y; }
 }
 }
 ```
+File `tests/t20017/include/t20017_b.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t20017 {
+int b1(int x, int y);
+
+template <typename T> T b2(T x, T y) { return x / y; }
+}
+}
+```
 ## Generated PlantUML diagrams
 ![t20017_sequence](./t20017_sequence.svg "Test case for combine_free_functions_into_file_participants option")
 ## Generated Mermaid diagrams
@@ -74,37 +74,109 @@ int a3(int x, int y) { return x * y; }
   "name": "t20017_sequence",
   "participants": [
     {
+      "activities": [
+        {
+          "display_name": "tmain()",
+          "id": "1484746432546296115",
+          "name": "tmain",
+          "namespace": "clanguml::t20017",
+          "source_location": {
+            "column": 5,
+            "file": "t20017.cc",
+            "line": 6,
+            "translation_unit": "t20017.cc"
+          },
+          "type": "function"
+        }
+      ],
+      "display_name": "t20017.cc",
       "id": "294332401323799021",
       "name": "t20017.cc",
-      "source_location": {
-        "column": 5,
-        "file": "t20017.cc",
-        "line": 6,
-        "translation_unit": "t20017.cc"
-      },
-      "type": "function"
+      "namespace": "clanguml::t20017",
+      "type": "file"
     },
     {
+      "activities": [
+        {
+          "display_name": "a3(int,int)",
+          "id": "1681392050252260928",
+          "name": "a3",
+          "namespace": "clanguml::t20017",
+          "source_location": {
+            "column": 5,
+            "file": "include/t20017_a.h",
+            "line": 7,
+            "translation_unit": "t20017.cc"
+          },
+          "type": "function"
+        },
+        {
+          "display_name": "a2(int,int)",
+          "id": "291553542743365259",
+          "name": "a2",
+          "namespace": "clanguml::t20017",
+          "source_location": {
+            "column": 5,
+            "file": "include/t20017_a.h",
+            "line": 6,
+            "translation_unit": "t20017.cc"
+          },
+          "type": "function"
+        },
+        {
+          "display_name": "a1(int,int)",
+          "id": "113759676939330212",
+          "name": "a1",
+          "namespace": "clanguml::t20017",
+          "source_location": {
+            "column": 5,
+            "file": "include/t20017_a.h",
+            "line": 5,
+            "translation_unit": "t20017.cc"
+          },
+          "type": "function"
+        }
+      ],
+      "display_name": "include/t20017_a.h",
       "id": "1591222867263639510",
-      "name": "include/t20017_a.h",
-      "source_location": {
-        "column": 5,
-        "file": "include/t20017_a.h",
-        "line": 7,
-        "translation_unit": "t20017.cc"
-      },
-      "type": "function"
+      "name": "t20017_a.h",
+      "namespace": "clanguml::t20017",
+      "type": "file"
     },
     {
+      "activities": [
+        {
+          "display_name": "b1(int,int)",
+          "id": "1714277838806105702",
+          "name": "b1",
+          "namespace": "clanguml::t20017",
+          "source_location": {
+            "column": 5,
+            "file": "include/t20017_b.h",
+            "line": 5,
+            "translation_unit": "t20017.cc"
+          },
+          "type": "function"
+        },
+        {
+          "display_name": "b2<int>(int,int)",
+          "id": "775081116464505528",
+          "name": "b2",
+          "namespace": "clanguml::t20017",
+          "source_location": {
+            "column": 25,
+            "file": "include/t20017_b.h",
+            "line": 7,
+            "translation_unit": "t20017.cc"
+          },
+          "type": "function_template"
+        }
+      ],
+      "display_name": "include/t20017_b.h",
       "id": "1113611539183189365",
-      "name": "include/t20017_b.h",
-      "source_location": {
-        "column": 5,
-        "file": "include/t20017_b.h",
-        "line": 5,
-        "translation_unit": "t20017.cc"
-      },
-      "type": "function"
+      "name": "t20017_b.h",
+      "namespace": "clanguml::t20017",
+      "type": "file"
     }
   ],
   "sequences": [
@@ -113,7 +185,6 @@ int a3(int x, int y) { return x * y; }
         {
           "from": {
             "activity_id": "1484746432546296115",
-            "activity_name": "clanguml::t20017::tmain()",
             "participant_id": "294332401323799021"
           },
           "name": "a3(int,int)",
@@ -127,7 +198,6 @@ int a3(int x, int y) { return x * y; }
           },
           "to": {
             "activity_id": "1681392050252260928",
-            "activity_name": "clanguml::t20017::a3(int,int)",
             "participant_id": "1591222867263639510"
           },
           "type": "message"
@@ -135,7 +205,6 @@ int a3(int x, int y) { return x * y; }
         {
           "from": {
             "activity_id": "1484746432546296115",
-            "activity_name": "clanguml::t20017::tmain()",
             "participant_id": "294332401323799021"
           },
           "name": "b1(int,int)",
@@ -149,7 +218,6 @@ int a3(int x, int y) { return x * y; }
           },
           "to": {
             "activity_id": "1714277838806105702",
-            "activity_name": "clanguml::t20017::b1(int,int)",
             "participant_id": "1113611539183189365"
           },
           "type": "message"
@@ -157,7 +225,6 @@ int a3(int x, int y) { return x * y; }
         {
           "from": {
             "activity_id": "1484746432546296115",
-            "activity_name": "clanguml::t20017::tmain()",
             "participant_id": "294332401323799021"
           },
           "name": "a2(int,int)",
@@ -171,7 +238,6 @@ int a3(int x, int y) { return x * y; }
           },
           "to": {
             "activity_id": "291553542743365259",
-            "activity_name": "clanguml::t20017::a2(int,int)",
             "participant_id": "1591222867263639510"
           },
           "type": "message"
@@ -179,7 +245,6 @@ int a3(int x, int y) { return x * y; }
         {
           "from": {
             "activity_id": "1484746432546296115",
-            "activity_name": "clanguml::t20017::tmain()",
             "participant_id": "294332401323799021"
           },
           "name": "a1(int,int)",
@@ -193,7 +258,6 @@ int a3(int x, int y) { return x * y; }
           },
           "to": {
             "activity_id": "113759676939330212",
-            "activity_name": "clanguml::t20017::a1(int,int)",
             "participant_id": "1591222867263639510"
           },
           "type": "message"
@@ -201,7 +265,6 @@ int a3(int x, int y) { return x * y; }
         {
           "from": {
             "activity_id": "1484746432546296115",
-            "activity_name": "clanguml::t20017::tmain()",
             "participant_id": "294332401323799021"
           },
           "name": "b2<int>(int,int)",
@@ -215,7 +278,6 @@ int a3(int x, int y) { return x * y; }
           },
           "to": {
             "activity_id": "775081116464505528",
-            "activity_name": "clanguml::t20017::b2<int>(int,int)",
             "participant_id": "1113611539183189365"
           },
           "type": "message"
diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg
index 281ddfec..ede48086 100644
--- a/docs/test_cases/t20017_sequence.svg
+++ b/docs/test_cases/t20017_sequence.svg
@@ -1,74 +1,80 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="354px" preserveAspectRatio="none" style="width:398px;height:354px;background:#FFFFFF;" version="1.1" viewBox="0 0 398 354" width="398px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:448px;height:357px;" version="1.1" viewBox="0 0 448 357" width="448px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f14005pc6mzhdq" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="232.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="59" y="68.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="185.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="228.8"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="319.5" y="141.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="319.5" y="272.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="64" x2="64" y1="36.7999" y2="318.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="179" x2="179" y1="36.7999" y2="318.4"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="324" x2="324" y1="36.7999" y2="318.4"/>
-    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="76" x="26" y="5"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="33" y="25.0059">t20017.cc</text>
-    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="76" x="26" y="317.4"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="33" y="337.406">t20017.cc</text>
-    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="112" y="5"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="119" y="25.0059">include/t20017_a.h</text>
-    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="112" y="317.4"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="119" y="337.406">include/t20017_a.h</text>
-    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="257" y="5"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="264" y="25.0059">include/t20017_b.h</text>
-    <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="257" y="317.4"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="264" y="337.406">include/t20017_b.h</text>
-    <rect fill="#FFFFFF" height="232.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="59" y="68.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="98"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="185.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="174.5" y="228.8"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="319.5" y="141.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="319.5" y="272.4"/>
-    <polygon fill="#181818" points="47,64.3999,57,68.3999,47,72.3999,51,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="53" y1="68.3999" y2="68.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="7" y="62.8769">tmain()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162.5,94,172.5,98,162.5,102,166.5,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="168.5" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="76" y="92.477">a3(int,int)</text>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="74" x2="74" y1="38.2969" y2="317.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="203" x2="203" y1="38.2969" y2="317.0938"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="317.0938"/>
+    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="22.9951">t20017.cc</text>
+    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="336.0889">t20017.cc</text>
+    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="22.9951">include/t20017_a.h</text>
+    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="336.0889">include/t20017_a.h</text>
+    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="22.9951">include/t20017_b.h</text>
+    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="336.0889">include/t20017_b.h</text>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <polygon fill="#A80036" points="57,65.4297,67,69.4297,57,73.4297,61,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="63" y1="69.4297" y2="69.4297"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="10" y="64.3638">tmain()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="186.5,94.5625,196.5,98.5625,186.5,102.5625,190.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="93.4966">a3(int,int)</text>
     </a>
-    <polygon fill="#181818" points="80,108,70,112,80,116,76,112" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="178.5" y1="112" y2="112"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="307.5,137.6,317.5,141.6,307.5,145.6,311.5,141.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="313.5" y1="141.6" y2="141.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="76" y="136.077">b1(int,int)</text>
+    <polygon fill="#A80036" points="90,108.5625,80,112.5625,90,116.5625,86,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="112.5625" y2="112.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="348,137.6953,358,141.6953,348,145.6953,352,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="141.6953" y2="141.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="136.6294">b1(int,int)</text>
     </a>
-    <polygon fill="#181818" points="80,151.6,70,155.6,80,159.6,76,155.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="323.5" y1="155.6" y2="155.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162.5,181.2,172.5,185.2,162.5,189.2,166.5,185.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="168.5" y1="185.2" y2="185.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="76" y="179.677">a2(int,int)</text>
+    <polygon fill="#A80036" points="90,151.6953,80,155.6953,90,159.6953,86,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="155.6953" y2="155.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="186.5,180.8281,196.5,184.8281,186.5,188.8281,190.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="184.8281" y2="184.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="179.7622">a2(int,int)</text>
     </a>
-    <polygon fill="#181818" points="80,195.2,70,199.2,80,203.2,76,199.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="178.5" y1="199.2" y2="199.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162.5,224.8,172.5,228.8,162.5,232.8,166.5,228.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="168.5" y1="228.8" y2="228.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="76" y="223.277">a1(int,int)</text>
+    <polygon fill="#A80036" points="90,194.8281,80,198.8281,90,202.8281,86,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="198.8281" y2="198.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="186.5,223.9609,196.5,227.9609,186.5,231.9609,190.5,227.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="227.9609" y2="227.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="222.895">a1(int,int)</text>
     </a>
-    <polygon fill="#181818" points="80,238.8,70,242.8,80,246.8,76,242.8" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="178.5" y1="242.8" y2="242.8"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="307.5,268.4,317.5,272.4,307.5,276.4,311.5,272.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="69" x2="313.5" y1="272.4" y2="272.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="84" x="76" y="266.877">b2&lt;int&gt;(int,int)</text>
+    <polygon fill="#A80036" points="90,237.9609,80,241.9609,90,245.9609,86,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="241.9609" y2="241.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="348,267.0938,358,271.0938,348,275.0938,352,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="271.0938" y2="271.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="86" y="266.0278">b2&lt;int&gt;(int,int)</text>
     </a>
-    <polygon fill="#181818" points="80,282.4,70,286.4,80,290.4,76,286.4" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74" x2="323.5" y1="286.4" y2="286.4"/>
-    <polygon fill="#181818" points="11,296.4,1,300.4,11,304.4,7,300.4" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="5" x2="63" y1="300.4" y2="300.4"/>
+    <polygon fill="#A80036" points="90,281.0938,80,285.0938,90,289.0938,86,285.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="285.0938" y2="285.0938"/>
+    <polygon fill="#A80036" points="14,295.0938,4,299.0938,14,303.0938,10,299.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="8" x2="73" y1="299.0938" y2="299.0938"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20017_sequence_mermaid.svg b/docs/test_cases/t20017_sequence_mermaid.svg
index 61f8c28f..27d40e19 100644
--- a/docs/test_cases/t20017_sequence_mermaid.svg
+++ b/docs/test_cases/t20017_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -115,28 +115,28 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="385" x="677.5"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="177">tmain()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="79" y1="111" x1="274"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="277">a3(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="473.5" y1="157" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="278">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="83" y1="167" x1="472.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="379">b1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="213" x2="678.5" y1="213" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="380">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="83" y1="223" x1="677.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="277">a2(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="473.5" y1="269" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="278">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="83" y1="279" x1="472.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="277">a1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="325" x2="473.5" y1="325" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="340" x="278">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="335" x2="83" y1="335" x1="472.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="379">b2&lt;int&gt;(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="678.5" y1="381" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="380">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="391" x2="83" y1="391" x1="677.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="406" x="176">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="401" x2="271" y1="401" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">tmain()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="75" y1="111" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="279">a3(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="477.5" y1="157" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="276">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="80" y1="167" x1="472.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="381">b1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="213" x2="682.5" y1="213" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="379">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="80" y1="223" x1="677.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="279">a2(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="477.5" y1="269" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="276">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="80" y1="279" x1="472.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="294" x="279">a1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="325" x2="477.5" y1="325" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="340" x="276">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="335" x2="80" y1="335" x1="472.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="350" x="381">b2&lt;int&gt;(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="381" x2="682.5" y1="381" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="379">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="391" x2="80" y1="391" x1="677.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="406" x="178">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="401" x2="275" y1="401" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20018.md b/docs/test_cases/t20018.md
index 993ada3e..79814f4e 100644
--- a/docs/test_cases/t20018.md
+++ b/docs/test_cases/t20018.md
@@ -55,8 +55,10 @@ void tmain() { Answer<Factorial<5>>::print(); }
   "name": "t20018_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "227581758025403815",
-      "name": "clanguml::t20018::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20018",
       "source_location": {
         "column": 6,
         "file": "t20018.cc",
@@ -66,8 +68,25 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "print()",
+          "id": "1185770766239304952",
+          "name": "print",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20018.cc",
+            "line": 22,
+            "translation_unit": "t20018.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Answer<Factorial<5>,120>",
       "id": "1163521725351533502",
-      "name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>",
+      "name": "Answer",
+      "namespace": "clanguml::t20018",
       "source_location": {
         "column": 48,
         "file": "t20018.cc",
@@ -77,8 +96,25 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "print(int)",
+          "id": "833100888453299461",
+          "name": "print",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20018.cc",
+            "line": 9,
+            "translation_unit": "t20018.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Factorial<5>",
       "id": "1482779373563849921",
-      "name": "clanguml::t20018::Factorial<5>",
+      "name": "Factorial",
+      "namespace": "clanguml::t20018",
       "source_location": {
         "column": 25,
         "file": "t20018.cc",
@@ -88,8 +124,25 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "print(int)",
+          "id": "1782586643813991247",
+          "name": "print",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20018.cc",
+            "line": 9,
+            "translation_unit": "t20018.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Factorial<4>",
       "id": "52416404065514823",
-      "name": "clanguml::t20018::Factorial<4>",
+      "name": "Factorial",
+      "namespace": "clanguml::t20018",
       "source_location": {
         "column": 25,
         "file": "t20018.cc",
@@ -99,8 +152,25 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "print(int)",
+          "id": "1238078028595736678",
+          "name": "print",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20018.cc",
+            "line": 9,
+            "translation_unit": "t20018.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Factorial<3>",
       "id": "1658728078296100018",
-      "name": "clanguml::t20018::Factorial<3>",
+      "name": "Factorial",
+      "namespace": "clanguml::t20018",
       "source_location": {
         "column": 25,
         "file": "t20018.cc",
@@ -110,8 +180,25 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "print(int)",
+          "id": "2163270950475476780",
+          "name": "print",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20018.cc",
+            "line": 9,
+            "translation_unit": "t20018.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Factorial<2>",
       "id": "969903469166760124",
-      "name": "clanguml::t20018::Factorial<2>",
+      "name": "Factorial",
+      "namespace": "clanguml::t20018",
       "source_location": {
         "column": 25,
         "file": "t20018.cc",
@@ -121,8 +208,25 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "print(int)",
+          "id": "501166016325937670",
+          "name": "print",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20018.cc",
+            "line": 9,
+            "translation_unit": "t20018.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Factorial<1>",
       "id": "2032621198190600516",
-      "name": "clanguml::t20018::Factorial<1>",
+      "name": "Factorial",
+      "namespace": "clanguml::t20018",
       "source_location": {
         "column": 25,
         "file": "t20018.cc",
@@ -132,8 +236,25 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "print(int)",
+          "id": "577232827352391544",
+          "name": "print",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20018.cc",
+            "line": 15,
+            "translation_unit": "t20018.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Factorial<0>",
       "id": "1581865799666386458",
-      "name": "clanguml::t20018::Factorial<0>",
+      "name": "Factorial",
+      "namespace": "clanguml::t20018",
       "source_location": {
         "column": 20,
         "file": "t20018.cc",
@@ -149,9 +270,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
         {
           "from": {
             "activity_id": "227581758025403815",
-            "activity_name": "clanguml::t20018::tmain()",
-            "participant_id": "227581758025403815",
-            "participant_name": "clanguml::t20018::tmain()"
+            "participant_id": "227581758025403815"
           },
           "name": "print()",
           "return_type": "void",
@@ -164,7 +283,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
           },
           "to": {
             "activity_id": "1185770766239304952",
-            "activity_name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>::print()",
             "participant_id": "1163521725351533502"
           },
           "type": "message"
@@ -172,7 +290,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
         {
           "from": {
             "activity_id": "1185770766239304952",
-            "activity_name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>::print()",
             "participant_id": "1163521725351533502"
           },
           "name": "print(int)",
@@ -186,7 +303,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
           },
           "to": {
             "activity_id": "833100888453299461",
-            "activity_name": "clanguml::t20018::Factorial<5>::print(int)",
             "participant_id": "1482779373563849921"
           },
           "type": "message"
@@ -194,7 +310,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
         {
           "from": {
             "activity_id": "833100888453299461",
-            "activity_name": "clanguml::t20018::Factorial<5>::print(int)",
             "participant_id": "1482779373563849921"
           },
           "name": "print(int)",
@@ -208,7 +323,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
           },
           "to": {
             "activity_id": "1782586643813991247",
-            "activity_name": "clanguml::t20018::Factorial<4>::print(int)",
             "participant_id": "52416404065514823"
           },
           "type": "message"
@@ -216,7 +330,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
         {
           "from": {
             "activity_id": "1782586643813991247",
-            "activity_name": "clanguml::t20018::Factorial<4>::print(int)",
             "participant_id": "52416404065514823"
           },
           "name": "print(int)",
@@ -230,7 +343,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
           },
           "to": {
             "activity_id": "1238078028595736678",
-            "activity_name": "clanguml::t20018::Factorial<3>::print(int)",
             "participant_id": "1658728078296100018"
           },
           "type": "message"
@@ -238,7 +350,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
         {
           "from": {
             "activity_id": "1238078028595736678",
-            "activity_name": "clanguml::t20018::Factorial<3>::print(int)",
             "participant_id": "1658728078296100018"
           },
           "name": "print(int)",
@@ -252,7 +363,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
           },
           "to": {
             "activity_id": "2163270950475476780",
-            "activity_name": "clanguml::t20018::Factorial<2>::print(int)",
             "participant_id": "969903469166760124"
           },
           "type": "message"
@@ -260,7 +370,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
         {
           "from": {
             "activity_id": "2163270950475476780",
-            "activity_name": "clanguml::t20018::Factorial<2>::print(int)",
             "participant_id": "969903469166760124"
           },
           "name": "print(int)",
@@ -274,7 +383,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
           },
           "to": {
             "activity_id": "501166016325937670",
-            "activity_name": "clanguml::t20018::Factorial<1>::print(int)",
             "participant_id": "2032621198190600516"
           },
           "type": "message"
@@ -282,7 +390,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
         {
           "from": {
             "activity_id": "501166016325937670",
-            "activity_name": "clanguml::t20018::Factorial<1>::print(int)",
             "participant_id": "2032621198190600516"
           },
           "name": "print(int)",
@@ -296,7 +403,6 @@ void tmain() { Answer<Factorial<5>>::print(); }
           },
           "to": {
             "activity_id": "577232827352391544",
-            "activity_name": "clanguml::t20018::Factorial<0>::print(int)",
             "participant_id": "1581865799666386458"
           },
           "type": "message"
diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg
index 52eeb7a4..148bd602 100644
--- a/docs/test_cases/t20018_sequence.svg
+++ b/docs/test_cases/t20018_sequence.svg
@@ -1,114 +1,120 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="329px" preserveAspectRatio="none" style="width:882px;height:329px;background:#FFFFFF;" version="1.1" viewBox="0 0 882 329" width="882px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="332px" preserveAspectRatio="none" style="width:1013px;height:332px;" version="1.1" viewBox="0 0 1013 332" width="1013px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1x77mssqdcili" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="229.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="207.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="68.3999"/>
-    <rect fill="#FFFFFF" height="178.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="309.5" y="98"/>
-    <rect fill="#FFFFFF" height="148.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="412.5" y="127.6"/>
-    <rect fill="#FFFFFF" height="118.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="515.5" y="157.2"/>
-    <rect fill="#FFFFFF" height="89.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="618.5" y="186.8"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="721.5" y="216.4"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="824.5" y="246"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="294"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="166" x2="166" y1="36.7999" y2="294"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="314" x2="314" y1="36.7999" y2="294"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="417" x2="417" y1="36.7999" y2="294"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="520" x2="520" y1="36.7999" y2="294"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="623" x2="623" y1="36.7999" y2="294"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="726" x2="726" y1="36.7999" y2="294"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="829" x2="829" y1="36.7999" y2="294"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="313.006">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="292.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191" x2="191" y1="38.2969" y2="292.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="362" x2="362" y1="38.2969" y2="292.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="480" x2="480" y1="38.2969" y2="292.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="598" x2="598" y1="38.2969" y2="292.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="716" x2="716" y1="38.2969" y2="292.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="834" x2="834" y1="38.2969" y2="292.2266"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="952" x2="952" y1="38.2969" y2="292.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="311.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="81" y="25.0059">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="184" x="74" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="81" y="313.006">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="22.9951">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="311.2217">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="268" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="275" y="25.0059">Factorial&lt;5&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="268" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="275" y="313.006">Factorial&lt;5&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="22.9951">Factorial&lt;5&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="311.2217">Factorial&lt;5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="371" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="378" y="25.0059">Factorial&lt;4&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="371" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="378" y="313.006">Factorial&lt;4&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="22.9951">Factorial&lt;4&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="311.2217">Factorial&lt;4&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="474" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="481" y="25.0059">Factorial&lt;3&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="474" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="481" y="313.006">Factorial&lt;3&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="22.9951">Factorial&lt;3&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="311.2217">Factorial&lt;3&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="577" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="584" y="25.0059">Factorial&lt;2&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="577" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="584" y="313.006">Factorial&lt;2&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="22.9951">Factorial&lt;2&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="311.2217">Factorial&lt;2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="680" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="687" y="25.0059">Factorial&lt;1&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="680" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="687" y="313.006">Factorial&lt;1&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="22.9951">Factorial&lt;1&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="311.2217">Factorial&lt;1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="783" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="790" y="25.0059">Factorial&lt;0&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="783" y="293"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="79" x="790" y="313.006">Factorial&lt;0&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="22.9951">Factorial&lt;0&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="311.2217">Factorial&lt;0&gt;</text>
     </a>
-    <rect fill="#FFFFFF" height="229.2001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="207.6001" style="stroke:#181818;stroke-width:1.0;" width="10" x="161" y="68.3999"/>
-    <rect fill="#FFFFFF" height="178.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="309.5" y="98"/>
-    <rect fill="#FFFFFF" height="148.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="412.5" y="127.6"/>
-    <rect fill="#FFFFFF" height="118.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="515.5" y="157.2"/>
-    <rect fill="#FFFFFF" height="89.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="618.5" y="186.8"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="721.5" y="216.4"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="824.5" y="246"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="149,64.3999,159,68.3999,149,72.3999,153,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="155" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="33" x="46.5" y="62.8769">print()</text>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="174,65.4297,184,69.4297,174,73.4297,178,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="180" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="39" x="53" y="64.3638">print()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="297.5,94,307.5,98,297.5,102,301.5,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="171" x2="303.5" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="178" y="92.477">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="345,94.5625,355,98.5625,345,102.5625,349,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="196" x2="351" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="203" y="93.4966">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="400.5,123.6,410.5,127.6,400.5,131.6,404.5,127.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="319.5" x2="406.5" y1="127.6" y2="127.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="326.5" y="122.077">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="463,123.6953,473,127.6953,463,131.6953,467,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="367" x2="469" y1="127.6953" y2="127.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="374" y="122.6294">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="503.5,153.2,513.5,157.2,503.5,161.2,507.5,157.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="422.5" x2="509.5" y1="157.2" y2="157.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="429.5" y="151.677">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="581,152.8281,591,156.8281,581,160.8281,585,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="485" x2="587" y1="156.8281" y2="156.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="492" y="151.7622">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="606.5,182.8,616.5,186.8,606.5,190.8,610.5,186.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="525.5" x2="612.5" y1="186.8" y2="186.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="532.5" y="181.277">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="699,181.9609,709,185.9609,699,189.9609,703,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="603" x2="705" y1="185.9609" y2="185.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="610" y="180.895">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="709.5,212.4,719.5,216.4,709.5,220.4,713.5,216.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="628.5" x2="715.5" y1="216.4" y2="216.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="635.5" y="210.877">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="817,211.0938,827,215.0938,817,219.0938,821,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="721" x2="823" y1="215.0938" y2="215.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="728" y="210.0278">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="812.5,242,822.5,246,812.5,250,816.5,246" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="731.5" x2="818.5" y1="246" y2="246"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" text-decoration="underline" textLength="47" x="738.5" y="240.477">print(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="935,240.2266,945,244.2266,935,248.2266,939,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="839" x2="941" y1="244.2266" y2="244.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="846" y="239.1606">print(int)</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20018_sequence_mermaid.svg b/docs/test_cases/t20018_sequence_mermaid.svg
index f4234234..93ba205f 100644
--- a/docs/test_cases/t20018_sequence_mermaid.svg
+++ b/docs/test_cases/t20018_sequence_mermaid.svg
@@ -138,17 +138,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -181,18 +181,18 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="381" x="1519"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="188">print()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="295.5" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="412">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="520" y1="157" x1="304.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="625">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="720" y1="203" x1="529"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="825">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="920" y1="249" x1="729"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="1025">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1120" y1="295" x1="929"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1225">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1320" y1="341" x1="1129"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="1425">print(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="1520" y1="387" x1="1329"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="190">print()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="299.5" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="414">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="524" y1="157" x1="304.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="627">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="724" y1="203" x1="529"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="827">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="924" y1="249" x1="729"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="1027">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="1124" y1="295" x1="929"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="1227">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="1324" y1="341" x1="1129"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="1427">print(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="1524" y1="387" x1="1329"/>
 </svg>
diff --git a/docs/test_cases/t20019.md b/docs/test_cases/t20019.md
index 255e972b..b8f1358d 100644
--- a/docs/test_cases/t20019.md
+++ b/docs/test_cases/t20019.md
@@ -62,8 +62,10 @@ void tmain()
   "name": "t20019_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "375304196268652861",
-      "name": "clanguml::t20019::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20019",
       "source_location": {
         "column": 6,
         "file": "t20019.cc",
@@ -73,8 +75,25 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "name()",
+          "id": "1038853547136467401",
+          "name": "name",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20019.cc",
+            "line": 9,
+            "translation_unit": "t20019.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Base<D1>",
       "id": "381327373934972004",
-      "name": "clanguml::t20019::Base<clanguml::t20019::D1>",
+      "name": "Base",
+      "namespace": "clanguml::t20019",
       "source_location": {
         "column": 33,
         "file": "t20019.cc",
@@ -84,8 +103,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "impl()",
+          "id": "603969604599968603",
+          "name": "impl",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20019.cc",
+            "line": 13,
+            "translation_unit": "t20019.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "D1",
       "id": "1282259011856139592",
-      "name": "clanguml::t20019::D1",
+      "name": "D1",
+      "namespace": "clanguml::t20019",
       "source_location": {
         "column": 8,
         "file": "t20019.cc",
@@ -95,8 +131,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "name()",
+          "id": "1918672956676175365",
+          "name": "name",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20019.cc",
+            "line": 9,
+            "translation_unit": "t20019.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Base<D2>",
       "id": "1659477498076328530",
-      "name": "clanguml::t20019::Base<clanguml::t20019::D2>",
+      "name": "Base",
+      "namespace": "clanguml::t20019",
       "source_location": {
         "column": 33,
         "file": "t20019.cc",
@@ -106,8 +159,25 @@ void tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "impl()",
+          "id": "861400435979772695",
+          "name": "impl",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20019.cc",
+            "line": 17,
+            "translation_unit": "t20019.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "D2",
       "id": "1307471723138212117",
-      "name": "clanguml::t20019::D2",
+      "name": "D2",
+      "namespace": "clanguml::t20019",
       "source_location": {
         "column": 8,
         "file": "t20019.cc",
@@ -123,9 +193,7 @@ void tmain()
         {
           "from": {
             "activity_id": "375304196268652861",
-            "activity_name": "clanguml::t20019::tmain()",
-            "participant_id": "375304196268652861",
-            "participant_name": "clanguml::t20019::tmain()"
+            "participant_id": "375304196268652861"
           },
           "name": "name()",
           "return_type": "void",
@@ -138,7 +206,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1038853547136467401",
-            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D1>::name()",
             "participant_id": "381327373934972004"
           },
           "type": "message"
@@ -146,7 +213,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1038853547136467401",
-            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D1>::name()",
             "participant_id": "381327373934972004"
           },
           "name": "impl()",
@@ -160,7 +226,6 @@ void tmain()
           },
           "to": {
             "activity_id": "603969604599968603",
-            "activity_name": "clanguml::t20019::D1::impl()",
             "participant_id": "1282259011856139592"
           },
           "type": "message"
@@ -168,9 +233,7 @@ void tmain()
         {
           "from": {
             "activity_id": "375304196268652861",
-            "activity_name": "clanguml::t20019::tmain()",
-            "participant_id": "375304196268652861",
-            "participant_name": "clanguml::t20019::tmain()"
+            "participant_id": "375304196268652861"
           },
           "name": "name()",
           "return_type": "void",
@@ -183,7 +246,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1918672956676175365",
-            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D2>::name()",
             "participant_id": "1659477498076328530"
           },
           "type": "message"
@@ -191,7 +253,6 @@ void tmain()
         {
           "from": {
             "activity_id": "1918672956676175365",
-            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D2>::name()",
             "participant_id": "1659477498076328530"
           },
           "name": "impl()",
@@ -205,7 +266,6 @@ void tmain()
           },
           "to": {
             "activity_id": "861400435979772695",
-            "activity_name": "clanguml::t20019::D2::impl()",
             "participant_id": "1307471723138212117"
           },
           "type": "message"
@@ -213,9 +273,7 @@ void tmain()
         {
           "from": {
             "activity_id": "375304196268652861",
-            "activity_name": "clanguml::t20019::tmain()",
-            "participant_id": "375304196268652861",
-            "participant_name": "clanguml::t20019::tmain()"
+            "participant_id": "375304196268652861"
           },
           "name": "name()",
           "return_type": "void",
@@ -228,7 +286,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1038853547136467401",
-            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D1>::name()",
             "participant_id": "381327373934972004"
           },
           "type": "message"
@@ -236,9 +293,7 @@ void tmain()
         {
           "from": {
             "activity_id": "375304196268652861",
-            "activity_name": "clanguml::t20019::tmain()",
-            "participant_id": "375304196268652861",
-            "participant_name": "clanguml::t20019::tmain()"
+            "participant_id": "375304196268652861"
           },
           "name": "name()",
           "return_type": "void",
@@ -251,7 +306,6 @@ void tmain()
           },
           "to": {
             "activity_id": "1918672956676175365",
-            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D2>::name()",
             "participant_id": "1659477498076328530"
           },
           "type": "message"
diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg
index 56ea902d..ee0323af 100644
--- a/docs/test_cases/t20019_sequence.svg
+++ b/docs/test_cases/t20019_sequence.svg
@@ -1,100 +1,106 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="449px" preserveAspectRatio="none" style="width:334px;height:449px;background:#FFFFFF;" version="1.1" viewBox="0 0 334 449" width="334px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:391px;height:451px;" version="1.1" viewBox="0 0 391 451" width="391px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fh3ww13dt8b5k" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="348.8001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="109" y="68.3999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="109" y="246.8"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="175" y="98"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="175" y="276.4"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="241" y="157.6"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="241" y="336"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="307" y="187.2"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="307" y="365.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="413.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="114" x2="114" y1="36.7999" y2="413.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="180" x2="180" y1="36.7999" y2="413.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="246" x2="246" y1="36.7999" y2="413.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="312" x2="312" y1="36.7999" y2="413.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="412.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="432.606">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="411.3594"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="210" x2="210" y1="38.2969" y2="411.3594"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287" x2="287" y1="38.2969" y2="411.3594"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="411.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="81" y="25.0059">Base&lt;D1&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="74" y="412.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="81" y="432.606">Base&lt;D1&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="22.9951">Base&lt;D1&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="430.3545">Base&lt;D1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="164" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="171" y="25.0059">D1</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="164" y="412.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="171" y="432.606">D1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="22.9951">D1</text>
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="430.3545">D1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="206" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="213" y="25.0059">Base&lt;D2&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="80" x="206" y="412.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="66" x="213" y="432.606">Base&lt;D2&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="22.9951">Base&lt;D2&gt;</text>
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="430.3545">Base&lt;D2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="296" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="303" y="25.0059">D2</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="296" y="412.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="303" y="432.606">D2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="22.9951">D2</text>
+      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="430.3545">D2</text>
     </a>
-    <rect fill="#FFFFFF" height="348.8001" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="109" y="68.3999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="109" y="246.8"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="175" y="98"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="175" y="276.4"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="241" y="157.6"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="241" y="336"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="307" y="187.2"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="307" y="365.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="97,64.3999,107,68.3999,97,72.3999,101,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="103" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="62.8769">name()</text>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="115.5,65.4297,125.5,69.4297,115.5,73.4297,119.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="64.3638">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="163,94,173,98,163,102,167,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="119" x2="169" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="126" y="92.477">impl()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="193,94.5625,203,98.5625,193,102.5625,197,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="93.4966">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="229,153.6,239,157.6,229,161.6,233,157.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="235" y1="157.6" y2="157.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="152.077">name()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="270.5,153.6953,280.5,157.6953,270.5,161.6953,274.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="157.6953" y2="157.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="152.6294">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="295,183.2,305,187.2,295,191.2,299,187.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="251" x2="301" y1="187.2" y2="187.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="258" y="181.677">impl()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="348,182.8281,358,186.8281,348,190.8281,352,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="186.8281" y2="186.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="181.7622">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="97,242.8,107,246.8,97,250.8,101,246.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="103" y1="246.8" y2="246.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="241.277">name()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="115.5,241.9609,125.5,245.9609,115.5,249.9609,119.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="245.9609" y2="245.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="240.895">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="163,272.4,173,276.4,163,280.4,167,276.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="119" x2="169" y1="276.4" y2="276.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="126" y="270.877">impl()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="193,271.0938,203,275.0938,193,279.0938,197,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="275.0938" y2="275.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="270.0278">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="229,332,239,336,229,340,233,336" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="235" y1="336" y2="336"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="46.5" y="330.477">name()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="270.5,330.2266,280.5,334.2266,270.5,338.2266,274.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="334.2266" y2="334.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="329.1606">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="295,361.6,305,365.6,295,369.6,299,365.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="251" x2="301" y1="365.6" y2="365.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="32" x="258" y="360.077">impl()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="348,359.3594,358,363.3594,348,367.3594,352,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="363.3594" y2="363.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="358.2935">impl()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20019_sequence_mermaid.svg b/docs/test_cases/t20019_sequence_mermaid.svg
index 0faa67ed..51597fd2 100644
--- a/docs/test_cases/t20019_sequence_mermaid.svg
+++ b/docs/test_cases/t20019_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -139,20 +139,20 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="427" x="870"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">name()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">impl()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="376">name()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="776">impl()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="176">name()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="271" y1="295" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="376">impl()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="471" y1="341" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="376">name()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="671" y1="387" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="776">impl()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="871" y1="433" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">name()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">impl()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="378">name()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="778">impl()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="178">name()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="275" y1="295" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="378">impl()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="475" y1="341" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="378">name()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="675" y1="387" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="778">impl()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="875" y1="433" x1="680"/>
 </svg>
diff --git a/docs/test_cases/t20020.md b/docs/test_cases/t20020.md
index 07fd03cf..26b80d87 100644
--- a/docs/test_cases/t20020.md
+++ b/docs/test_cases/t20020.md
@@ -118,8 +118,10 @@ int tmain()
   "name": "t20020_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "432124388562400664",
-      "name": "clanguml::t20020::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20020",
       "source_location": {
         "column": 5,
         "file": "t20020.cc",
@@ -129,8 +131,77 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1()",
+          "id": "43928675765534701",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20020.cc",
+            "line": 7,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a5()",
+          "id": "1613457246223182826",
+          "name": "a5",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20020.cc",
+            "line": 11,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2()",
+          "id": "1289745252290688140",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20020.cc",
+            "line": 8,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a3()",
+          "id": "1983660679554669898",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20020.cc",
+            "line": 9,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a4()",
+          "id": "20573198999978866",
+          "name": "a4",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20020.cc",
+            "line": 10,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "208941846648931609",
-      "name": "clanguml::t20020::A",
+      "name": "A",
+      "namespace": "clanguml::t20020",
       "source_location": {
         "column": 8,
         "file": "t20020.cc",
@@ -140,8 +211,64 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "c3(int)",
+          "id": "1303438784842196201",
+          "name": "c3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20020.cc",
+            "line": 32,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c1() const",
+          "id": "1473521613404783653",
+          "name": "c1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20020.cc",
+            "line": 24,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c2() const",
+          "id": "1789116382725485914",
+          "name": "c2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20020.cc",
+            "line": 30,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "log() const",
+          "id": "635780525021572670",
+          "name": "log",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20020.cc",
+            "line": 22,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "C",
       "id": "1562462306909405383",
-      "name": "clanguml::t20020::C",
+      "name": "C",
+      "namespace": "clanguml::t20020",
       "source_location": {
         "column": 8,
         "file": "t20020.cc",
@@ -151,8 +278,51 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b1()",
+          "id": "542196582335607343",
+          "name": "b1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20020.cc",
+            "line": 17,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b2()",
+          "id": "505760236964179187",
+          "name": "b2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20020.cc",
+            "line": 18,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "log()",
+          "id": "1436250788704205026",
+          "name": "log",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20020.cc",
+            "line": 15,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1342563483612170412",
-      "name": "clanguml::t20020::B",
+      "name": "B",
+      "namespace": "clanguml::t20020",
       "source_location": {
         "column": 8,
         "file": "t20020.cc",
@@ -162,8 +332,25 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "d1(int,int)",
+          "id": "1780002010052842766",
+          "name": "d1",
+          "namespace": "",
+          "source_location": {
+            "column": 7,
+            "file": "t20020.cc",
+            "line": 37,
+            "translation_unit": "t20020.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "D<int>",
       "id": "1605914310746811866",
-      "name": "clanguml::t20020::D<int>",
+      "name": "D",
+      "namespace": "clanguml::t20020",
       "source_location": {
         "column": 30,
         "file": "t20020.cc",
@@ -184,9 +371,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "432124388562400664",
-                    "activity_name": "clanguml::t20020::tmain()",
-                    "participant_id": "432124388562400664",
-                    "participant_name": "clanguml::t20020::tmain()"
+                    "participant_id": "432124388562400664"
                   },
                   "name": "a1()",
                   "return_type": "int",
@@ -199,7 +384,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "43928675765534701",
-                    "activity_name": "clanguml::t20020::A::a1()",
                     "participant_id": "208941846648931609"
                   },
                   "type": "message"
@@ -212,9 +396,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "432124388562400664",
-                    "activity_name": "clanguml::t20020::tmain()",
-                    "participant_id": "432124388562400664",
-                    "participant_name": "clanguml::t20020::tmain()"
+                    "participant_id": "432124388562400664"
                   },
                   "name": "a5()",
                   "return_type": "int",
@@ -227,7 +409,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1613457246223182826",
-                    "activity_name": "clanguml::t20020::A::a5()",
                     "participant_id": "208941846648931609"
                   },
                   "type": "message"
@@ -245,9 +426,7 @@ int tmain()
                         {
                           "from": {
                             "activity_id": "432124388562400664",
-                            "activity_name": "clanguml::t20020::tmain()",
-                            "participant_id": "432124388562400664",
-                            "participant_name": "clanguml::t20020::tmain()"
+                            "participant_id": "432124388562400664"
                           },
                           "name": "a2()",
                           "return_type": "int",
@@ -260,7 +439,6 @@ int tmain()
                           },
                           "to": {
                             "activity_id": "1289745252290688140",
-                            "activity_name": "clanguml::t20020::A::a2()",
                             "participant_id": "208941846648931609"
                           },
                           "type": "message"
@@ -268,9 +446,7 @@ int tmain()
                         {
                           "from": {
                             "activity_id": "432124388562400664",
-                            "activity_name": "clanguml::t20020::tmain()",
-                            "participant_id": "432124388562400664",
-                            "participant_name": "clanguml::t20020::tmain()"
+                            "participant_id": "432124388562400664"
                           },
                           "name": "c3(int)",
                           "return_type": "int",
@@ -283,7 +459,6 @@ int tmain()
                           },
                           "to": {
                             "activity_id": "1303438784842196201",
-                            "activity_name": "clanguml::t20020::C::c3(int)",
                             "participant_id": "1562462306909405383"
                           },
                           "type": "message"
@@ -291,9 +466,7 @@ int tmain()
                         {
                           "from": {
                             "activity_id": "432124388562400664",
-                            "activity_name": "clanguml::t20020::tmain()",
-                            "participant_id": "432124388562400664",
-                            "participant_name": "clanguml::t20020::tmain()"
+                            "participant_id": "432124388562400664"
                           },
                           "name": "b1()",
                           "return_type": "int",
@@ -306,7 +479,6 @@ int tmain()
                           },
                           "to": {
                             "activity_id": "542196582335607343",
-                            "activity_name": "clanguml::t20020::B::b1()",
                             "participant_id": "1342563483612170412"
                           },
                           "type": "message"
@@ -319,9 +491,7 @@ int tmain()
                         {
                           "from": {
                             "activity_id": "432124388562400664",
-                            "activity_name": "clanguml::t20020::tmain()",
-                            "participant_id": "432124388562400664",
-                            "participant_name": "clanguml::t20020::tmain()"
+                            "participant_id": "432124388562400664"
                           },
                           "name": "a3()",
                           "return_type": "int",
@@ -334,7 +504,6 @@ int tmain()
                           },
                           "to": {
                             "activity_id": "1983660679554669898",
-                            "activity_name": "clanguml::t20020::A::a3()",
                             "participant_id": "208941846648931609"
                           },
                           "type": "message"
@@ -342,9 +511,7 @@ int tmain()
                         {
                           "from": {
                             "activity_id": "432124388562400664",
-                            "activity_name": "clanguml::t20020::tmain()",
-                            "participant_id": "432124388562400664",
-                            "participant_name": "clanguml::t20020::tmain()"
+                            "participant_id": "432124388562400664"
                           },
                           "name": "b2()",
                           "return_type": "int",
@@ -357,7 +524,6 @@ int tmain()
                           },
                           "to": {
                             "activity_id": "505760236964179187",
-                            "activity_name": "clanguml::t20020::B::b2()",
                             "participant_id": "1342563483612170412"
                           },
                           "type": "message"
@@ -377,9 +543,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "432124388562400664",
-                    "activity_name": "clanguml::t20020::tmain()",
-                    "participant_id": "432124388562400664",
-                    "participant_name": "clanguml::t20020::tmain()"
+                    "participant_id": "432124388562400664"
                   },
                   "name": "a4()",
                   "return_type": "int",
@@ -392,7 +556,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "20573198999978866",
-                    "activity_name": "clanguml::t20020::A::a4()",
                     "participant_id": "208941846648931609"
                   },
                   "type": "message"
@@ -407,9 +570,7 @@ int tmain()
         {
           "from": {
             "activity_id": "432124388562400664",
-            "activity_name": "clanguml::t20020::tmain()",
-            "participant_id": "432124388562400664",
-            "participant_name": "clanguml::t20020::tmain()"
+            "participant_id": "432124388562400664"
           },
           "name": "log()",
           "return_type": "void",
@@ -422,7 +583,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1436250788704205026",
-            "activity_name": "clanguml::t20020::B::log()",
             "participant_id": "1342563483612170412"
           },
           "type": "message"
@@ -435,9 +595,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "432124388562400664",
-                    "activity_name": "clanguml::t20020::tmain()",
-                    "participant_id": "432124388562400664",
-                    "participant_name": "clanguml::t20020::tmain()"
+                    "participant_id": "432124388562400664"
                   },
                   "name": "c1() const",
                   "return_type": "void",
@@ -450,7 +608,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1473521613404783653",
-                    "activity_name": "clanguml::t20020::C::c1() const",
                     "participant_id": "1562462306909405383"
                   },
                   "type": "message"
@@ -463,7 +620,6 @@ int tmain()
                         {
                           "from": {
                             "activity_id": "1473521613404783653",
-                            "activity_name": "clanguml::t20020::C::c1() const",
                             "participant_id": "1562462306909405383"
                           },
                           "name": "c2() const",
@@ -477,7 +633,6 @@ int tmain()
                           },
                           "to": {
                             "activity_id": "1789116382725485914",
-                            "activity_name": "clanguml::t20020::C::c2() const",
                             "participant_id": "1562462306909405383"
                           },
                           "type": "message"
@@ -485,7 +640,6 @@ int tmain()
                         {
                           "from": {
                             "activity_id": "1473521613404783653",
-                            "activity_name": "clanguml::t20020::C::c1() const",
                             "participant_id": "1562462306909405383"
                           },
                           "name": "log() const",
@@ -499,7 +653,6 @@ int tmain()
                           },
                           "to": {
                             "activity_id": "635780525021572670",
-                            "activity_name": "clanguml::t20020::C::log() const",
                             "participant_id": "1562462306909405383"
                           },
                           "type": "message"
@@ -526,9 +679,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "432124388562400664",
-                    "activity_name": "clanguml::t20020::tmain()",
-                    "participant_id": "432124388562400664",
-                    "participant_name": "clanguml::t20020::tmain()"
+                    "participant_id": "432124388562400664"
                   },
                   "name": "d1(int,int)",
                   "return_type": "int",
@@ -541,7 +692,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1780002010052842766",
-                    "activity_name": "clanguml::t20020::D<int>::d1(int,int)",
                     "participant_id": "1605914310746811866"
                   },
                   "type": "message"
diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg
index f03f9db4..105d3614 100644
--- a/docs/test_cases/t20020_sequence.svg
+++ b/docs/test_cases/t20020_sequence.svg
@@ -1,193 +1,203 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="882px" preserveAspectRatio="none" style="width:334px;height:882px;background:#FFFFFF;" version="1.1" viewBox="0 0 334 882" width="334px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="879px" preserveAspectRatio="none" style="width:385px;height:879px;" version="1.1" viewBox="0 0 385 879" width="385px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1mt6zsdpqz6v4" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="789.8002" style="stroke:#181818;stroke-width:1.0;" width="10" x="54.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="93"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="138.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="208.8"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="341.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="437.8001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="252.4"/>
-    <rect fill="#FFFFFF" height="181.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="572.6001"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152" y="634.8001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="152" y="704.4001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="296"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="385.2001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="488.4001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="286" y="807.6002"/>
-    <rect fill="none" height="406.0001" style="stroke:#000000;stroke-width:1.5;" width="263.5" x="10" y="53.7999"/>
-    <rect fill="none" height="237.6001" style="stroke:#000000;stroke-width:1.5;" width="243.5" x="20" y="169.6"/>
-    <rect fill="none" height="221.0001" style="stroke:#000000;stroke-width:1.5;" width="237" x="20" y="533.4001"/>
-    <rect fill="none" height="159.8" style="stroke:#000000;stroke-width:1.5;" width="117" x="130" y="587.6001"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="308.5" x="20" y="768.4001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="59" x2="59" y1="36.7999" y2="846.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="118" x2="118" y1="36.7999" y2="846.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="152" x2="152" y1="36.7999" y2="846.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="241.5" x2="241.5" y1="36.7999" y2="846.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="290.5" x2="290.5" y1="36.7999" y2="846.6002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="30" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="37" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="30" y="845.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="37" y="865.6061">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="115.5625"/>
+    <rect fill="#FFFFFF" height="250.7969" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="160.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
+    <rect fill="#FFFFFF" height="88.2656" style="stroke: none; stroke-width: 1.0;" width="271.5" x="23" y="316.2266"/>
+    <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="411.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="839.6875"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132.5" x2="132.5" y1="38.2969" y2="839.6875"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="170.5" x2="170.5" y1="38.2969" y2="839.6875"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="839.6875"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="329.5" x2="329.5" y1="38.2969" y2="839.6875"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="838.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="858.6826">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="107" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="114" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="107" y="845.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="114" y="865.6061">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="838.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="858.6826">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="140" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="147" y="25.0059">C</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="140" y="845.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="147" y="865.6061">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="22.9951">C</text>
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="838.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="858.6826">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="230.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="237.5" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="230.5" y="845.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="237.5" y="865.6061">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="838.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="858.6826">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="263.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="270.5" y="25.0059">D&lt;int&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="263.5" y="845.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="270.5" y="865.6061">D&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="22.9951">D&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="838.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="858.6826">D&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" height="789.8002" style="stroke:#181818;stroke-width:1.0;" width="10" x="54.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="93"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="138.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="208.8"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="341.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="113.5" y="437.8001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="252.4"/>
-    <rect fill="#FFFFFF" height="181.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="147" y="572.6001"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152" y="634.8001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="152" y="704.4001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="296"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="385.2001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="237" y="488.4001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="286" y="807.6002"/>
-    <path d="M10,53.7999 L70,53.7999 L70,61.3999 L60,71.3999 L10,71.3999 L10,53.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="406.0001" style="stroke:#000000;stroke-width:1.5;" width="263.5" x="10" y="53.7999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="66.8769">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="101.5,89,111.5,93,101.5,97,105.5,93" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="93" y2="93"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="87.477">a1()</text>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
+    <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="116,89.5625,126,93.5625,116,97.5625,120,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="93.5625" y2="93.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="88.4966">a1()</text>
     </a>
-    <polygon fill="#181818" points="75.5,103,65.5,107,75.5,111,71.5,107" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="107" y2="107"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="273.5" y1="116" y2="116"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="101.5,134.6,111.5,138.6,101.5,142.6,105.5,138.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="138.6" y2="138.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="133.077">a5()</text>
+    <polygon fill="#A80036" points="82,103.5625,72,107.5625,82,111.5625,78,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="107.5625" y2="107.5625"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="116.5625" y2="116.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="116,134.6953,126,138.6953,116,142.6953,120,138.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="138.6953" y2="138.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="133.6294">a5()</text>
     </a>
-    <polygon fill="#181818" points="75.5,148.6,65.5,152.6,75.5,156.6,71.5,152.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="152.6" y2="152.6"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="273.5" y1="161.6" y2="161.6"/>
-    <path d="M20,169.6 L80,169.6 L80,177.2 L70,187.2 L20,187.2 L20,169.6 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="237.6001" style="stroke:#000000;stroke-width:1.5;" width="243.5" x="20" y="169.6"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="35" y="182.677">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="101.5,204.8,111.5,208.8,101.5,212.8,105.5,208.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="208.8" y2="208.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="71.5" y="203.277">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="75.5" y="203.277">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="97.5" y="203.277">]</text>
+    <polygon fill="#A80036" points="82,148.6953,72,152.6953,82,156.6953,78,152.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="152.6953" y2="152.6953"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="161.6953" y2="161.6953"/>
+    <path d="M23,169.6953 L87,169.6953 L87,176.6953 L77,186.6953 L23,186.6953 L23,169.6953 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="182.7622">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="116,203.9609,126,207.9609,116,211.9609,120,207.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="207.9609" y2="207.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="202.895">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="84" y="202.895">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="110" y="202.895">]</text>
     </a>
-    <polygon fill="#181818" points="75.5,218.8,65.5,222.8,75.5,226.8,71.5,222.8" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="222.8" y2="222.8"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="135,248.4,145,252.4,135,256.4,139,252.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="141" y1="252.4" y2="252.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="71.5" y="246.877">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="75.5" y="246.877">c3(int)</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="111.5" y="246.877">]</text>
+    <polygon fill="#A80036" points="82,217.9609,72,221.9609,82,225.9609,78,221.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="221.9609" y2="221.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="153.5,247.0938,163.5,251.0938,153.5,255.0938,157.5,251.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="251.0938" y2="251.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="246.0278">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="41" x="84" y="246.0278">c3(int)</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="125" y="246.0278">]</text>
     </a>
-    <polygon fill="#181818" points="75.5,262.4,65.5,266.4,75.5,270.4,71.5,266.4" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="151" y1="266.4" y2="266.4"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="225,292,235,296,225,300,229,296" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="231" y1="296" y2="296"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="290.477">b1()</text>
+    <polygon fill="#A80036" points="82,261.0938,72,265.0938,82,269.0938,78,265.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="169.5" y1="265.0938" y2="265.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="253.5,290.2266,263.5,294.2266,253.5,298.2266,257.5,294.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="294.2266" y2="294.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="289.1606">b1()</text>
     </a>
-    <polygon fill="#181818" points="75.5,306,65.5,310,75.5,314,71.5,310" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="241" y1="310" y2="310"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="20" x2="263.5" y1="319" y2="319"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="101.5,337.6,111.5,341.6,101.5,345.6,105.5,341.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="341.6" y2="341.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="71.5" y="336.077">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="75.5" y="336.077">a3()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="97.5" y="336.077">]</text>
+    <polygon fill="#A80036" points="82,304.2266,72,308.2266,82,312.2266,78,308.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="269.5" y1="308.2266" y2="308.2266"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="23" x2="294.5" y1="317.2266" y2="317.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="116,335.3594,126,339.3594,116,343.3594,120,339.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="339.3594" y2="339.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="334.2935">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="84" y="334.2935">a3()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="110" y="334.2935">]</text>
     </a>
-    <polygon fill="#181818" points="75.5,351.6,65.5,355.6,75.5,359.6,71.5,355.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="355.6" y2="355.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="225,381.2001,235,385.2001,225,389.2001,229,385.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="231" y1="385.2001" y2="385.2001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="379.677">b2()</text>
+    <polygon fill="#A80036" points="82,349.3594,72,353.3594,82,357.3594,78,353.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="353.3594" y2="353.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="253.5,378.4922,263.5,382.4922,253.5,386.4922,257.5,382.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="382.4922" y2="382.4922"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="377.4263">b2()</text>
     </a>
-    <polygon fill="#181818" points="75.5,395.2001,65.5,399.2001,75.5,403.2001,71.5,399.2001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="241" y1="399.2001" y2="399.2001"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="273.5" y1="415.2001" y2="415.2001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="101.5,433.8001,111.5,437.8001,101.5,441.8001,105.5,437.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="107.5" y1="437.8001" y2="437.8001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="71.5" y="432.2771">a4()</text>
+    <polygon fill="#A80036" points="82,392.4922,72,396.4922,82,400.4922,78,396.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="269.5" y1="396.4922" y2="396.4922"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="412.4922" y2="412.4922"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="116,430.625,126,434.625,116,438.625,120,434.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="434.625" y2="434.625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="429.5591">a4()</text>
     </a>
-    <polygon fill="#181818" points="75.5,447.8001,65.5,451.8001,75.5,455.8001,71.5,451.8001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="117.5" y1="451.8001" y2="451.8001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="225,484.4001,235,488.4001,225,492.4001,229,488.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="231" y1="488.4001" y2="488.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="25" x="71.5" y="482.8771">log()</text>
+    <polygon fill="#A80036" points="82,444.625,72,448.625,82,452.625,78,448.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="448.625" y2="448.625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="253.5,480.7578,263.5,484.7578,253.5,488.7578,257.5,484.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="484.7578" y2="484.7578"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="29" x="78" y="479.6919">log()</text>
     </a>
-    <path d="M20,533.4001 L80,533.4001 L80,541.0001 L70,551.0001 L20,551.0001 L20,533.4001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="221.0001" style="stroke:#000000;stroke-width:1.5;" width="237" x="20" y="533.4001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="35" y="546.4771">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="135,568.6001,145,572.6001,135,576.6001,139,572.6001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="141" y1="572.6001" y2="572.6001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="71.5" y="567.0771">c1() const</text>
+    <path d="M23,529.7578 L87,529.7578 L87,536.7578 L77,546.7578 L23,546.7578 L23,529.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="542.8247">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="153.5,564.0234,163.5,568.0234,153.5,572.0234,157.5,568.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="568.0234" y2="568.0234"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="78" y="562.9575">c1() const</text>
     </a>
-    <path d="M130,587.6001 L190,587.6001 L190,595.2001 L180,605.2001 L130,605.2001 L130,587.6001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="159.8" style="stroke:#000000;stroke-width:1.5;" width="117" x="130" y="587.6001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="145" y="600.6771">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="157" x2="204" y1="621.8001" y2="621.8001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="204" x2="204" y1="621.8001" y2="634.8001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="163" x2="204" y1="634.8001" y2="634.8001"/>
-      <polygon fill="#181818" points="173,630.8001,163,634.8001,173,638.8001,169,634.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="169" y="616.2771">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="173" y="616.2771">c2() const</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="231" y="616.2771">]</text>
+    <path d="M146.5,583.0234 L210.5,583.0234 L210.5,590.0234 L200.5,600.0234 L146.5,600.0234 L146.5,583.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="161.5" y="596.0903">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="222.5" y1="616.2891" y2="616.2891"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="616.2891" y2="629.2891"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="629.2891" y2="629.2891"/>
+      <polygon fill="#A80036" points="191.5,625.2891,181.5,629.2891,191.5,633.2891,187.5,629.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="187.5" y="611.2231">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="193.5" y="611.2231">c2() const</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="257.5" y="611.2231">]</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162" x2="204" y1="658.8001" y2="658.8001"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204" x2="204" y1="658.8001" y2="671.8001"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157" x2="204" y1="671.8001" y2="671.8001"/>
-    <polygon fill="#181818" points="167,667.8001,157,671.8001,167,675.8001,163,671.8001" style="stroke:#181818;stroke-width:1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="162" x2="204" y1="696.4001" y2="696.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="204" x2="204" y1="696.4001" y2="709.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="163" x2="204" y1="709.4001" y2="709.4001"/>
-      <polygon fill="#181818" points="173,705.4001,163,709.4001,173,713.4001,169,709.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="61" x="169" y="690.8771">log() const</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180.5" x2="222.5" y1="653.2891" y2="653.2891"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222.5" x2="222.5" y1="653.2891" y2="666.2891"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175.5" x2="222.5" y1="666.2891" y2="666.2891"/>
+    <polygon fill="#A80036" points="185.5,662.2891,175.5,666.2891,185.5,670.2891,181.5,666.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="180.5" x2="222.5" y1="690.4219" y2="690.4219"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="690.4219" y2="703.4219"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="703.4219" y2="703.4219"/>
+      <polygon fill="#A80036" points="191.5,699.4219,181.5,703.4219,191.5,707.4219,187.5,703.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="68" x="187.5" y="685.356">log() const</text>
     </a>
-    <path d="M20,768.4001 L80,768.4001 L80,776.0002 L70,786.0002 L20,786.0002 L20,768.4001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="308.5" x="20" y="768.4001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="35" y="781.4772">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="274,803.6002,284,807.6002,274,811.6002,278,807.6002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="64.5" x2="280" y1="807.6002" y2="807.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="71.5" y="802.0772">d1(int,int)</text>
+    <path d="M23,762.4219 L87,762.4219 L87,769.4219 L77,779.4219 L23,779.4219 L23,762.4219 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="775.4888">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="312.5,796.6875,322.5,800.6875,312.5,804.6875,316.5,800.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="318.5" y1="800.6875" y2="800.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="78" y="795.6216">d1(int,int)</text>
     </a>
-    <polygon fill="#181818" points="75.5,817.6002,65.5,821.6002,75.5,825.6002,71.5,821.6002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="69.5" x2="290" y1="821.6002" y2="821.6002"/>
+    <polygon fill="#A80036" points="82,810.6875,72,814.6875,82,818.6875,78,814.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="328.5" y1="814.6875" y2="814.6875"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20020_sequence_mermaid.svg b/docs/test_cases/t20020_sequence_mermaid.svg
index 5d5264f7..df3f9b5a 100644
--- a/docs/test_cases/t20020_sequence_mermaid.svg
+++ b/docs/test_cases/t20020_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -213,50 +213,50 @@
       <tspan x="500">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="176">a1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="271" y1="136" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="146" x2="83" y1="146" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="186" x="176">a5()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="217" x2="271" y1="217" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="232" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="227" x2="83" y1="227" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="292" x="176">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="323" x2="271" y1="323" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="338" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="333" x2="83" y1="333" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="348" x="276">[c3(int)]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="379" x2="471" y1="379" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="394" x="277">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="389" x2="83" y1="389" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="376">b1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="435" x2="671" y1="435" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="450" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="445" x2="83" y1="445" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="485" x="176">[a3()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="516" x2="271" y1="516" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="531" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="526" x2="83" y1="526" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="376">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="572" x2="671" y1="572" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="587" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="582" x2="83" y1="582" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="644" x="176">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="675" x2="271" y1="675" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="690" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="685" x2="83" y1="685" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="722" x="376">log()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="753" x2="671" y1="753" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="793" x="276">c1() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="824" x2="471" y1="824" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="178">a1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="275" y1="136" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="146" x2="80" y1="146" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="186" x="178">a5()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="217" x2="275" y1="217" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="232" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="227" x2="80" y1="227" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="292" x="178">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="323" x2="275" y1="323" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="338" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="333" x2="80" y1="333" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="348" x="278">[c3(int)]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="379" x2="475" y1="379" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="394" x="275">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="389" x2="80" y1="389" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="378">b1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="435" x2="675" y1="435" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="450" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="445" x2="80" y1="445" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="485" x="178">[a3()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="516" x2="275" y1="516" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="531" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="526" x2="80" y1="526" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="378">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="572" x2="675" y1="572" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="587" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="582" x2="80" y1="582" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="644" x="178">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="675" x2="275" y1="675" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="690" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="685" x2="80" y1="685" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="722" x="378">log()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="753" x2="675" y1="753" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="793" x="278">c1() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="824" x2="475" y1="824" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="864" x="480">[c2() const]</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,895 C 540,885 540,925 480,915"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="940" x="485">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 485,935 C 545,925 545,965 485,955"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="980" x="480">log() const</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,1011 C 540,1001 540,1041 480,1031"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1131" x="476">d1(int,int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1162" x2="871" y1="1162" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1177" x="477">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1172" x2="83" y1="1172" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1131" x="478">d1(int,int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1162" x2="875" y1="1162" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1177" x="475">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1172" x2="80" y1="1172" x1="870"/>
 </svg>
diff --git a/docs/test_cases/t20021.md b/docs/test_cases/t20021.md
index dd372543..aaa507b9 100644
--- a/docs/test_cases/t20021.md
+++ b/docs/test_cases/t20021.md
@@ -85,8 +85,10 @@ int tmain()
   "name": "t20021_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1682631020380557915",
-      "name": "clanguml::t20021::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20021",
       "source_location": {
         "column": 5,
         "file": "t20021.cc",
@@ -96,8 +98,90 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "c4()",
+          "id": "124927877622321176",
+          "name": "c4",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 22,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c5()",
+          "id": "1325720714179808628",
+          "name": "c5",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 23,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c1()",
+          "id": "2143764740072323303",
+          "name": "c1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 19,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c2()",
+          "id": "1707693479408501017",
+          "name": "c2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 20,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c3()",
+          "id": "1302892753246800390",
+          "name": "c3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 21,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "contents()",
+          "id": "814405216385697964",
+          "name": "contents",
+          "namespace": "",
+          "source_location": {
+            "column": 23,
+            "file": "t20021.cc",
+            "line": 25,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "C",
       "id": "451128000259357438",
-      "name": "clanguml::t20021::C",
+      "name": "C",
+      "namespace": "clanguml::t20021",
       "source_location": {
         "column": 8,
         "file": "t20021.cc",
@@ -107,8 +191,51 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a3()",
+          "id": "1867955233624891190",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 8,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2()",
+          "id": "1139294797758415018",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 7,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a1()",
+          "id": "1659488549696810992",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 6,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1280483607329510730",
-      "name": "clanguml::t20021::A",
+      "name": "A",
+      "namespace": "clanguml::t20021",
       "source_location": {
         "column": 8,
         "file": "t20021.cc",
@@ -118,8 +245,25 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b2() const",
+          "id": "1561040999276563077",
+          "name": "b2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20021.cc",
+            "line": 15,
+            "translation_unit": "t20021.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1849696080443395393",
-      "name": "clanguml::t20021::B",
+      "name": "B",
+      "namespace": "clanguml::t20021",
       "source_location": {
         "column": 8,
         "file": "t20021.cc",
@@ -138,9 +282,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "1682631020380557915",
-                "activity_name": "clanguml::t20021::tmain()",
-                "participant_id": "1682631020380557915",
-                "participant_name": "clanguml::t20021::tmain()"
+                "participant_id": "1682631020380557915"
               },
               "name": "c4()",
               "return_type": "int",
@@ -153,7 +295,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "124927877622321176",
-                "activity_name": "clanguml::t20021::C::c4()",
                 "participant_id": "451128000259357438"
               },
               "type": "message"
@@ -161,7 +302,6 @@ int tmain()
             {
               "from": {
                 "activity_id": "124927877622321176",
-                "activity_name": "clanguml::t20021::C::c4()",
                 "participant_id": "451128000259357438"
               },
               "name": "c5()",
@@ -175,7 +315,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "1325720714179808628",
-                "activity_name": "clanguml::t20021::C::c5()",
                 "participant_id": "451128000259357438"
               },
               "type": "message"
@@ -183,9 +322,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "1682631020380557915",
-                "activity_name": "clanguml::t20021::tmain()",
-                "participant_id": "1682631020380557915",
-                "participant_name": "clanguml::t20021::tmain()"
+                "participant_id": "1682631020380557915"
               },
               "name": "a3()",
               "return_type": "int",
@@ -198,7 +335,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "1867955233624891190",
-                "activity_name": "clanguml::t20021::A::a3()",
                 "participant_id": "1280483607329510730"
               },
               "type": "message"
@@ -212,9 +348,7 @@ int tmain()
                     {
                       "from": {
                         "activity_id": "1682631020380557915",
-                        "activity_name": "clanguml::t20021::tmain()",
-                        "participant_id": "1682631020380557915",
-                        "participant_name": "clanguml::t20021::tmain()"
+                        "participant_id": "1682631020380557915"
                       },
                       "name": "a2()",
                       "return_type": "int",
@@ -227,7 +361,6 @@ int tmain()
                       },
                       "to": {
                         "activity_id": "1139294797758415018",
-                        "activity_name": "clanguml::t20021::A::a2()",
                         "participant_id": "1280483607329510730"
                       },
                       "type": "message"
@@ -235,9 +368,7 @@ int tmain()
                     {
                       "from": {
                         "activity_id": "1682631020380557915",
-                        "activity_name": "clanguml::t20021::tmain()",
-                        "participant_id": "1682631020380557915",
-                        "participant_name": "clanguml::t20021::tmain()"
+                        "participant_id": "1682631020380557915"
                       },
                       "name": "c1()",
                       "return_type": "int",
@@ -250,7 +381,6 @@ int tmain()
                       },
                       "to": {
                         "activity_id": "2143764740072323303",
-                        "activity_name": "clanguml::t20021::C::c1()",
                         "participant_id": "451128000259357438"
                       },
                       "type": "message"
@@ -258,9 +388,7 @@ int tmain()
                     {
                       "from": {
                         "activity_id": "1682631020380557915",
-                        "activity_name": "clanguml::t20021::tmain()",
-                        "participant_id": "1682631020380557915",
-                        "participant_name": "clanguml::t20021::tmain()"
+                        "participant_id": "1682631020380557915"
                       },
                       "name": "c2()",
                       "return_type": "int",
@@ -273,7 +401,6 @@ int tmain()
                       },
                       "to": {
                         "activity_id": "1707693479408501017",
-                        "activity_name": "clanguml::t20021::C::c2()",
                         "participant_id": "451128000259357438"
                       },
                       "type": "message"
@@ -281,9 +408,7 @@ int tmain()
                     {
                       "from": {
                         "activity_id": "1682631020380557915",
-                        "activity_name": "clanguml::t20021::tmain()",
-                        "participant_id": "1682631020380557915",
-                        "participant_name": "clanguml::t20021::tmain()"
+                        "participant_id": "1682631020380557915"
                       },
                       "name": "a1()",
                       "return_type": "int",
@@ -296,7 +421,6 @@ int tmain()
                       },
                       "to": {
                         "activity_id": "1659488549696810992",
-                        "activity_name": "clanguml::t20021::A::a1()",
                         "participant_id": "1280483607329510730"
                       },
                       "type": "message"
@@ -308,9 +432,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1682631020380557915",
-                    "activity_name": "clanguml::t20021::tmain()",
-                    "participant_id": "1682631020380557915",
-                    "participant_name": "clanguml::t20021::tmain()"
+                    "participant_id": "1682631020380557915"
                   },
                   "name": "c3()",
                   "return_type": "int",
@@ -323,7 +445,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1302892753246800390",
-                    "activity_name": "clanguml::t20021::C::c3()",
                     "participant_id": "451128000259357438"
                   },
                   "type": "message"
@@ -342,9 +463,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "1682631020380557915",
-                "activity_name": "clanguml::t20021::tmain()",
-                "participant_id": "1682631020380557915",
-                "participant_name": "clanguml::t20021::tmain()"
+                "participant_id": "1682631020380557915"
               },
               "name": "b2() const",
               "return_type": "int",
@@ -357,7 +476,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "1561040999276563077",
-                "activity_name": "clanguml::t20021::B::b2() const",
                 "participant_id": "1849696080443395393"
               },
               "type": "message"
@@ -372,9 +490,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "1682631020380557915",
-                "activity_name": "clanguml::t20021::tmain()",
-                "participant_id": "1682631020380557915",
-                "participant_name": "clanguml::t20021::tmain()"
+                "participant_id": "1682631020380557915"
               },
               "name": "contents()",
               "return_type": "std::vector<int> &",
@@ -387,7 +503,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "814405216385697964",
-                "activity_name": "clanguml::t20021::C::contents()",
                 "participant_id": "451128000259357438"
               },
               "type": "message"
@@ -399,9 +514,7 @@ int tmain()
         {
           "from": {
             "activity_id": "1682631020380557915",
-            "activity_name": "clanguml::t20021::tmain()",
-            "participant_id": "1682631020380557915",
-            "participant_name": "clanguml::t20021::tmain()"
+            "participant_id": "1682631020380557915"
           },
           "name": "b2() const",
           "return_type": "int",
@@ -414,7 +527,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1561040999276563077",
-            "activity_name": "clanguml::t20021::B::b2() const",
             "participant_id": "1849696080443395393"
           },
           "type": "message"
diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg
index 42f16e13..420f0175 100644
--- a/docs/test_cases/t20021_sequence.svg
+++ b/docs/test_cases/t20021_sequence.svg
@@ -1,172 +1,178 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="756px" preserveAspectRatio="none" style="width:285px;height:756px;background:#FFFFFF;" version="1.1" viewBox="0 0 285 756" width="285px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:315px;height:754px;" version="1.1" viewBox="0 0 315 754" width="315px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fpyfi1s0f808c" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="655.6002" style="stroke:#181818;stroke-width:1.0;" width="10" x="64.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="83.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="93"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="164.5" y="130.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="342.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="386.2001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="480.4001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="637.8001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="206.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="299"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="429.8001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="252.5" y="562.6001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="252.5" y="688.4001"/>
-    <rect fill="none" height="455.6002" style="stroke:#000000;stroke-width:1.5;" width="256" x="10" y="53.7999"/>
-    <rect fill="none" height="267.2001" style="stroke:#000000;stroke-width:1.5;" width="236" x="20" y="235.2"/>
-    <rect fill="none" height="192.0001" style="stroke:#000000;stroke-width:1.5;" width="216" x="30" y="259.8"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="249" x="30" y="523.4001"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="156.5" x="30" y="598.6001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="69" x2="69" y1="36.7999" y2="720.4001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="164.5" x2="164.5" y1="36.7999" y2="720.4001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="224" x2="224" y1="36.7999" y2="720.4001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="257" x2="257" y1="36.7999" y2="720.4001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="40" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="47" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="40" y="719.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="47" y="739.4061">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="76" x2="76" y1="38.2969" y2="714.4219"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="183" x2="183" y1="38.2969" y2="714.4219"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="242.5" x2="242.5" y1="38.2969" y2="714.4219"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="280.5" x2="280.5" y1="38.2969" y2="714.4219"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="733.417">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="152.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="159.5" y="25.0059">C</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="152.5" y="719.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="159.5" y="739.4061">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="22.9951">C</text>
+      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="733.417">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="213" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="220" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="213" y="719.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="220" y="739.4061">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="733.417">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="246" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="253" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="246" y="719.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="253" y="739.4061">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="733.417">B</text>
     </a>
-    <rect fill="#FFFFFF" height="655.6002" style="stroke:#181818;stroke-width:1.0;" width="10" x="64.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="83.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="93"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="164.5" y="130.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="342.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="386.2001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="480.4001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="159.5" y="637.8001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="206.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="299"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="219.5" y="429.8001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="252.5" y="562.6001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="252.5" y="688.4001"/>
-    <path d="M10,53.7999 L83,53.7999 L83,61.3999 L73,71.3999 L10,71.3999 L10,53.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="455.6002" style="stroke:#000000;stroke-width:1.5;" width="256" x="10" y="53.7999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="66.8769">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="147.5,89,157.5,93,147.5,97,151.5,93" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="93" y2="93"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="87.477">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="87.477">c4()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="87.477">]</text>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <path d="M13,55.2969 L90,55.2969 L90,62.2969 L80,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="68.3638">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="166,89.5625,176,93.5625,166,97.5625,170,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="93.5625" y2="93.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="88.4966">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="88.4966">c4()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="88.4966">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="169.5" x2="216.5" y1="117.6" y2="117.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="216.5" x2="216.5" y1="117.6" y2="130.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="175.5" x2="216.5" y1="130.6" y2="130.6"/>
-      <polygon fill="#181818" points="185.5,126.6,175.5,130.6,185.5,134.6,181.5,130.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="181.5" y="112.077">c5()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="235" y1="117.6953" y2="117.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="235" x2="235" y1="117.6953" y2="130.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="235" y1="130.6953" y2="130.6953"/>
+      <polygon fill="#A80036" points="204,126.6953,194,130.6953,204,134.6953,200,130.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="200" y="112.6294">c5()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="174.5" x2="216.5" y1="154.6" y2="154.6"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="216.5" x2="216.5" y1="154.6" y2="167.6"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="169.5" x2="216.5" y1="167.6" y2="167.6"/>
-    <polygon fill="#181818" points="179.5,163.6,169.5,167.6,179.5,171.6,175.5,167.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <polygon fill="#181818" points="85.5,172.6,75.5,176.6,85.5,180.6,81.5,176.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="176.6" y2="176.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="207.5,202.2,217.5,206.2,207.5,210.2,211.5,206.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="213.5" y1="206.2" y2="206.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="81.5" y="200.677">a3()</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193" x2="235" y1="154.6953" y2="154.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="235" x2="235" y1="154.6953" y2="167.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="188" x2="235" y1="167.6953" y2="167.6953"/>
+    <polygon fill="#A80036" points="198,163.6953,188,167.6953,198,171.6953,194,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="92,172.6953,82,176.6953,92,180.6953,88,176.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="176.6953" y2="176.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="226,201.8281,236,205.8281,226,209.8281,230,205.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="205.8281" y2="205.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="200.7622">a3()</text>
     </a>
-    <polygon fill="#181818" points="85.5,216.2,75.5,220.2,85.5,224.2,81.5,220.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="223.5" y1="220.2" y2="220.2"/>
-    <path d="M20,235.2 L93,235.2 L93,242.8 L83,252.8 L20,252.8 L20,235.2 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="267.2001" style="stroke:#000000;stroke-width:1.5;" width="236" x="20" y="235.2"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="35" y="248.277">loop</text>
-    <path d="M30,259.8 L103,259.8 L103,267.4 L93,277.4 L30,277.4 L30,259.8 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="192.0001" style="stroke:#000000;stroke-width:1.5;" width="216" x="30" y="259.8"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="45" y="272.877">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="207.5,295,217.5,299,207.5,303,211.5,299" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="213.5" y1="299" y2="299"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="293.477">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="293.477">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="293.477">]</text>
+    <polygon fill="#A80036" points="92,215.8281,82,219.8281,92,223.8281,88,219.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="219.8281" y2="219.8281"/>
+    <path d="M23,234.8281 L100,234.8281 L100,241.8281 L90,251.8281 L23,251.8281 L23,234.8281 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="38" y="247.895">loop</text>
+    <path d="M33,258.9609 L110,258.9609 L110,265.9609 L100,275.9609 L33,275.9609 L33,258.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="272.0278">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="226,293.2266,236,297.2266,226,301.2266,230,297.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="297.2266" y2="297.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="292.1606">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="94" y="292.1606">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="120" y="292.1606">]</text>
     </a>
-    <polygon fill="#181818" points="85.5,309,75.5,313,85.5,317,81.5,313" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="223.5" y1="313" y2="313"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="147.5,338.6,157.5,342.6,147.5,346.6,151.5,342.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="342.6" y2="342.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="337.077">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="337.077">c1()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="337.077">]</text>
+    <polygon fill="#A80036" points="92,307.2266,82,311.2266,92,315.2266,88,311.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="311.2266" y2="311.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="166,336.3594,176,340.3594,166,344.3594,170,340.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="340.3594" y2="340.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="335.2935">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="335.2935">c1()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="335.2935">]</text>
     </a>
-    <polygon fill="#181818" points="85.5,352.6,75.5,356.6,85.5,360.6,81.5,356.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="356.6" y2="356.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="147.5,382.2001,157.5,386.2001,147.5,390.2001,151.5,386.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="386.2001" y2="386.2001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="380.677">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="380.677">c2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="380.677">]</text>
+    <polygon fill="#A80036" points="92,350.3594,82,354.3594,92,358.3594,88,354.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="354.3594" y2="354.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="166,379.4922,176,383.4922,166,387.4922,170,383.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="383.4922" y2="383.4922"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="378.4263">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="378.4263">c2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="378.4263">]</text>
     </a>
-    <polygon fill="#181818" points="85.5,396.2001,75.5,400.2001,85.5,404.2001,81.5,400.2001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="400.2001" y2="400.2001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="207.5,425.8001,217.5,429.8001,207.5,433.8001,211.5,429.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="213.5" y1="429.8001" y2="429.8001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="81.5" y="424.2771">a1()</text>
+    <polygon fill="#A80036" points="92,393.4922,82,397.4922,92,401.4922,88,397.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="397.4922" y2="397.4922"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="226,422.625,236,426.625,226,430.625,230,426.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="426.625" y2="426.625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="421.5591">a1()</text>
     </a>
-    <polygon fill="#181818" points="85.5,439.8001,75.5,443.8001,85.5,447.8001,81.5,443.8001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="223.5" y1="443.8001" y2="443.8001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="147.5,476.4001,157.5,480.4001,147.5,484.4001,151.5,480.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="480.4001" y2="480.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="474.8771">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="85.5" y="474.8771">c3()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="107.5" y="474.8771">]</text>
+    <polygon fill="#A80036" points="92,436.625,82,440.625,92,444.625,88,440.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="440.625" y2="440.625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="166,472.7578,176,476.7578,166,480.7578,170,476.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="476.7578" y2="476.7578"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="471.6919">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="471.6919">c3()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="471.6919">]</text>
     </a>
-    <polygon fill="#181818" points="85.5,490.4001,75.5,494.4001,85.5,498.4001,81.5,494.4001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="494.4001" y2="494.4001"/>
-    <path d="M30,523.4001 L103,523.4001 L103,531.0001 L93,541.0001 L30,541.0001 L30,523.4001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="249" x="30" y="523.4001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="45" y="536.4771">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="240.5,558.6001,250.5,562.6001,240.5,566.6001,244.5,562.6001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="246.5" y1="562.6001" y2="562.6001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="81.5" y="557.0771">b2() const</text>
+    <polygon fill="#A80036" points="92,486.7578,82,490.7578,92,494.7578,88,490.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="490.7578" y2="490.7578"/>
+    <path d="M33,519.7578 L110,519.7578 L110,526.7578 L100,536.7578 L33,536.7578 L33,519.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="532.8247">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="263.5,554.0234,273.5,558.0234,263.5,562.0234,267.5,558.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="558.0234" y2="558.0234"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="88" y="552.9575">b2() const</text>
     </a>
-    <polygon fill="#181818" points="85.5,572.6001,75.5,576.6001,85.5,580.6001,81.5,576.6001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="256.5" y1="576.6001" y2="576.6001"/>
-    <path d="M30,598.6001 L103,598.6001 L103,606.2001 L93,616.2001 L30,616.2001 L30,598.6001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="156.5" x="30" y="598.6001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="45" y="611.6771">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="147.5,633.8001,157.5,637.8001,147.5,641.8001,151.5,637.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="153.5" y1="637.8001" y2="637.8001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="81.5" y="632.2771">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="85.5" y="632.2771">contents()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="143.5" y="632.2771">]</text>
+    <polygon fill="#A80036" points="92,568.0234,82,572.0234,92,576.0234,88,572.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="279.5" y1="572.0234" y2="572.0234"/>
+    <path d="M33,594.0234 L110,594.0234 L110,601.0234 L100,611.0234 L33,611.0234 L33,594.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="607.0903">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="166,628.2891,176,632.2891,166,636.2891,170,632.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="632.2891" y2="632.2891"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="627.2231">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="66" x="94" y="627.2231">contents()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="160" y="627.2231">]</text>
     </a>
-    <polygon fill="#181818" points="85.5,647.8001,75.5,651.8001,85.5,655.8001,81.5,651.8001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="79.5" x2="163.5" y1="651.8001" y2="651.8001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="240.5,684.4001,250.5,688.4001,240.5,692.4001,244.5,688.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="74.5" x2="246.5" y1="688.4001" y2="688.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="58" x="81.5" y="682.8771">b2() const</text>
+    <polygon fill="#A80036" points="92,642.2891,82,646.2891,92,650.2891,88,646.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="646.2891" y2="646.2891"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="263.5,678.4219,273.5,682.4219,263.5,686.4219,267.5,682.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="682.4219" y2="682.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="88" y="677.356">b2() const</text>
     </a>
-    <polygon fill="#181818" points="80.5,698.4001,70.5,702.4001,80.5,706.4001,76.5,702.4001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="74.5" x2="256.5" y1="702.4001" y2="702.4001"/>
+    <polygon fill="#A80036" points="87,692.4219,77,696.4219,87,700.4219,83,696.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="81" x2="279.5" y1="696.4219" y2="696.4219"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20021_sequence_mermaid.svg b/docs/test_cases/t20021_sequence_mermaid.svg
index 304da27e..5b801fd5 100644
--- a/docs/test_cases/t20021_sequence_mermaid.svg
+++ b/docs/test_cases/t20021_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -188,48 +188,48 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="958" x="670"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="176">[c4()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="271" y1="136" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="178">[c4()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="275" y1="136" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="280">c5()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,182 C 340,172 340,212 280,202"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="227" x="285">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 285,222 C 345,212 345,252 285,242"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="267" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="262" x2="83" y1="262" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="277" x="276">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="308" x2="471" y1="308" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="323" x="277">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="318" x2="83" y1="318" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="383" x="276">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="414" x2="471" y1="414" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="429" x="277">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="424" x2="83" y1="424" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="439" x="176">[c1()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="470" x2="271" y1="470" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="485" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="480" x2="83" y1="480" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="495" x="176">[c2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="526" x2="271" y1="526" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="536" x2="83" y1="536" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="551" x="276">a1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="582" x2="471" y1="582" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="597" x="277">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="592" x2="83" y1="592" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="629" x="176">[c3()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="660" x2="271" y1="660" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="675" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="670" x2="83" y1="670" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="742" x="376">b2() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="773" x2="671" y1="773" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="788" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="783" x2="83" y1="783" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="845" x="176">[contents()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="876" x2="271" y1="876" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="891" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="886" x2="83" y1="886" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="923" x="376">b2() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="954" x2="671" y1="954" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="969" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="964" x2="83" y1="964" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="267" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="262" x2="80" y1="262" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="277" x="278">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="308" x2="475" y1="308" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="323" x="275">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="318" x2="80" y1="318" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="383" x="278">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="414" x2="475" y1="414" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="429" x="275">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="424" x2="80" y1="424" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="439" x="178">[c1()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="470" x2="275" y1="470" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="485" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="480" x2="80" y1="480" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="495" x="178">[c2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="526" x2="275" y1="526" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="536" x2="80" y1="536" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="551" x="278">a1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="582" x2="475" y1="582" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="597" x="275">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="592" x2="80" y1="592" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="629" x="178">[c3()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="660" x2="275" y1="660" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="675" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="670" x2="80" y1="670" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="742" x="378">b2() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="773" x2="675" y1="773" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="788" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="783" x2="80" y1="783" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="845" x="178">[contents()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="876" x2="275" y1="876" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="891" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="886" x2="80" y1="886" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="923" x="378">b2() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="954" x2="675" y1="954" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="969" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="964" x2="80" y1="964" x1="670"/>
 </svg>
diff --git a/docs/test_cases/t20022.md b/docs/test_cases/t20022.md
index 4227c200..3a5b201f 100644
--- a/docs/test_cases/t20022.md
+++ b/docs/test_cases/t20022.md
@@ -65,8 +65,10 @@ int tmain()
   "name": "t20022_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1374011101998494743",
-      "name": "clanguml::t20022::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20022",
       "source_location": {
         "column": 5,
         "file": "t20022.cc",
@@ -76,8 +78,38 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "A(std::unique_ptr<B>)",
+          "id": "1226569306557207632",
+          "name": "A",
+          "namespace": "",
+          "source_location": {
+            "column": 4,
+            "file": "t20022.cc",
+            "line": 21,
+            "translation_unit": "t20022.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a()",
+          "id": "1158824701633811441",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20022.cc",
+            "line": 26,
+            "translation_unit": "t20022.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1535467498096081224",
-      "name": "clanguml::t20022::A",
+      "name": "A",
+      "namespace": "clanguml::t20022",
       "source_location": {
         "column": 7,
         "file": "t20022.cc",
@@ -87,8 +119,25 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b()",
+          "id": "2114222968575993291",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20022.cc",
+            "line": 18,
+            "translation_unit": "t20022.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1316821731069034940",
-      "name": "clanguml::t20022::B",
+      "name": "B",
+      "namespace": "clanguml::t20022",
       "source_location": {
         "column": 7,
         "file": "t20022.cc",
@@ -104,9 +153,7 @@ int tmain()
         {
           "from": {
             "activity_id": "1374011101998494743",
-            "activity_name": "clanguml::t20022::tmain()",
-            "participant_id": "1374011101998494743",
-            "participant_name": "clanguml::t20022::tmain()"
+            "participant_id": "1374011101998494743"
           },
           "name": "A(std::unique_ptr<B>)",
           "return_type": "void",
@@ -119,7 +166,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1226569306557207632",
-            "activity_name": "clanguml::t20022::A::A(std::unique_ptr<B>)",
             "participant_id": "1535467498096081224"
           },
           "type": "message"
@@ -127,9 +173,7 @@ int tmain()
         {
           "from": {
             "activity_id": "1374011101998494743",
-            "activity_name": "clanguml::t20022::tmain()",
-            "participant_id": "1374011101998494743",
-            "participant_name": "clanguml::t20022::tmain()"
+            "participant_id": "1374011101998494743"
           },
           "name": "a()",
           "return_type": "void",
@@ -142,7 +186,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1158824701633811441",
-            "activity_name": "clanguml::t20022::A::a()",
             "participant_id": "1535467498096081224"
           },
           "type": "message"
@@ -150,7 +193,6 @@ int tmain()
         {
           "from": {
             "activity_id": "1158824701633811441",
-            "activity_name": "clanguml::t20022::A::a()",
             "participant_id": "1535467498096081224"
           },
           "name": "b()",
@@ -164,7 +206,6 @@ int tmain()
           },
           "to": {
             "activity_id": "2114222968575993291",
-            "activity_name": "clanguml::t20022::B::b()",
             "participant_id": "1316821731069034940"
           },
           "type": "message"
diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg
index 45010b5c..49ddfb09 100644
--- a/docs/test_cases/t20022_sequence.svg
+++ b/docs/test_cases/t20022_sequence.svg
@@ -1,52 +1,58 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:228px;height:241px;background:#FFFFFF;" version="1.1" viewBox="0 0 228 241" width="228px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="245px" preserveAspectRatio="none" style="width:254px;height:245px;" version="1.1" viewBox="0 0 254 245" width="254px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1cvmzka6scnf" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="140.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="161.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="161.5" y="128"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="157.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="205.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="166" x2="166" y1="36.7999" y2="205.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="210" x2="210" y1="36.7999" y2="205.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="204.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="224.6059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="205.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="185.5" x2="185.5" y1="38.2969" y2="205.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="233" x2="233" y1="38.2969" y2="205.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="204.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="224.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="155" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="162" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="155" y="204.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="162" y="224.6059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="204.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="224.6904">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="199" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="206" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="199" y="204.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="206" y="224.6059">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="204.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="224.6904">B</text>
     </a>
-    <rect fill="#FFFFFF" height="140.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="161.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="59.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="161.5" y="128"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="157.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="149.5,64.3999,159.5,68.3999,149.5,72.3999,153.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="155.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="99" x="46.5" y="62.8769">A(std::unique_ptr</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="145.5" y="62.8769">)</text>
+    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="169,65.4297,179,69.4297,169,73.4297,173,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="53" y="64.3638">A(std::unique_ptr</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="163" y="64.3638">)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="149.5,124,159.5,128,149.5,132,153.5,128" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="155.5" y1="128" y2="128"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="122.477">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="169,124.5625,179,128.5625,169,132.5625,173,128.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="128.5625" y2="128.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="123.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="193.5,153.6,203.5,157.6,193.5,161.6,197.5,157.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="171.5" x2="199.5" y1="157.6" y2="157.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="178.5" y="152.077">b()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="216,153.6953,226,157.6953,216,161.6953,220,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="191" x2="222" y1="157.6953" y2="157.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="198" y="152.6294">b()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20022_sequence_mermaid.svg b/docs/test_cases/t20022_sequence_mermaid.svg
index d5311f88..d9408adc 100644
--- a/docs/test_cases/t20022_sequence_mermaid.svg
+++ b/docs/test_cases/t20022_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -94,10 +94,10 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="197" x="488"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="185">A(std::unique_ptr&lt;B&gt;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="289" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="185">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="289" y1="157" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="394">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="489" y1="203" x1="298"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="187">A(std::unique_ptr&lt;B&gt;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="293" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="187">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="293" y1="157" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="396">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="493" y1="203" x1="298"/>
 </svg>
diff --git a/docs/test_cases/t20023.md b/docs/test_cases/t20023.md
index 46a8368f..2c6e8223 100644
--- a/docs/test_cases/t20023.md
+++ b/docs/test_cases/t20023.md
@@ -68,8 +68,10 @@ int tmain()
   "name": "t20023_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "761552264135157511",
-      "name": "clanguml::t20023::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20023",
       "source_location": {
         "column": 5,
         "file": "t20023.cc",
@@ -79,8 +81,77 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "a()",
+          "id": "530651320277188697",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20023.cc",
+            "line": 12,
+            "translation_unit": "t20023.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a1()",
+          "id": "94135113932519208",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20023.cc",
+            "line": 7,
+            "translation_unit": "t20023.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2()",
+          "id": "2060438178899014465",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20023.cc",
+            "line": 8,
+            "translation_unit": "t20023.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a3()",
+          "id": "1776927259621603017",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20023.cc",
+            "line": 9,
+            "translation_unit": "t20023.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a4()",
+          "id": "1082587698374248813",
+          "name": "a4",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20023.cc",
+            "line": 10,
+            "translation_unit": "t20023.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "750638294800359616",
-      "name": "clanguml::t20023::A",
+      "name": "A",
+      "namespace": "clanguml::t20023",
       "source_location": {
         "column": 8,
         "file": "t20023.cc",
@@ -96,9 +167,7 @@ int tmain()
         {
           "from": {
             "activity_id": "761552264135157511",
-            "activity_name": "clanguml::t20023::tmain()",
-            "participant_id": "761552264135157511",
-            "participant_name": "clanguml::t20023::tmain()"
+            "participant_id": "761552264135157511"
           },
           "name": "a()",
           "return_type": "int",
@@ -111,7 +180,6 @@ int tmain()
           },
           "to": {
             "activity_id": "530651320277188697",
-            "activity_name": "clanguml::t20023::A::a()",
             "participant_id": "750638294800359616"
           },
           "type": "message"
@@ -124,7 +192,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "530651320277188697",
-                    "activity_name": "clanguml::t20023::A::a()",
                     "participant_id": "750638294800359616"
                   },
                   "name": "a1()",
@@ -138,7 +205,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "94135113932519208",
-                    "activity_name": "clanguml::t20023::A::a1()",
                     "participant_id": "750638294800359616"
                   },
                   "type": "message"
@@ -151,7 +217,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "530651320277188697",
-                    "activity_name": "clanguml::t20023::A::a()",
                     "participant_id": "750638294800359616"
                   },
                   "name": "a2()",
@@ -165,7 +230,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "2060438178899014465",
-                    "activity_name": "clanguml::t20023::A::a2()",
                     "participant_id": "750638294800359616"
                   },
                   "type": "message"
@@ -178,7 +242,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "530651320277188697",
-                    "activity_name": "clanguml::t20023::A::a()",
                     "participant_id": "750638294800359616"
                   },
                   "name": "a3()",
@@ -192,7 +255,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1776927259621603017",
-                    "activity_name": "clanguml::t20023::A::a3()",
                     "participant_id": "750638294800359616"
                   },
                   "type": "message"
@@ -205,7 +267,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "530651320277188697",
-                    "activity_name": "clanguml::t20023::A::a()",
                     "participant_id": "750638294800359616"
                   },
                   "name": "a4()",
@@ -219,7 +280,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1082587698374248813",
-                    "activity_name": "clanguml::t20023::A::a4()",
                     "participant_id": "750638294800359616"
                   },
                   "type": "message"
diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg
index 4b194beb..e2aa8b90 100644
--- a/docs/test_cases/t20023_sequence.svg
+++ b/docs/test_cases/t20023_sequence.svg
@@ -1,94 +1,103 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="491px" preserveAspectRatio="none" style="width:192px;height:491px;background:#FFFFFF;" version="1.1" viewBox="0 0 192 491" width="192px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:229px;height:493px;" version="1.1" viewBox="0 0 229 493" width="229px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f5zygmput0888" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="391.1998" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="369.5998" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="130.6"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="215.3999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="300.1998"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="384.9997"/>
-    <rect fill="none" height="341.5998" style="stroke:#000000;stroke-width:1.5;" width="121" x="64" y="83.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="455.9997"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="85" x2="85" y1="36.7999" y2="455.9997"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="454.9997"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="475.0057">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
+    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="170.6953"/>
+    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="254.6328"/>
+    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="338.5703"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="453.5078"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="453.5078"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5zygmput0888)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f5zygmput0888)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="472.5029">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="454.9997"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="475.0057">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5zygmput0888)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f5zygmput0888)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="472.5029">A</text>
     </a>
-    <rect fill="#FFFFFF" height="391.1998" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="369.5998" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="130.6"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="215.3999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="300.1998"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="85.5" y="384.9997"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="68.5,64.3999,78.5,68.3999,68.5,72.3999,72.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="74.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="62.8769">a()</text>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <path d="M64,83.3999 L125,83.3999 L125,91 L115,101 L64,101 L64,83.3999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="341.5998" style="stroke:#000000;stroke-width:1.5;" width="121" x="64" y="83.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="16" x="79" y="96.477">try</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="90.5" x2="137.5" y1="117.6" y2="117.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="137.5" y1="117.6" y2="130.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="96.5" x2="137.5" y1="130.6" y2="130.6"/>
-      <polygon fill="#181818" points="106.5,126.6,96.5,130.6,106.5,134.6,102.5,130.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="102.5" y="112.077">a1()</text>
+    <path d="M74,84.4297 L139,84.4297 L139,91.4297 L129,101.4297 L74,101.4297 L74,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="97.4966">try</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="117.6953" y2="117.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="117.6953" y2="130.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="130.6953" y2="130.6953"/>
+      <polygon fill="#A80036" points="118.5,126.6953,108.5,130.6953,118.5,134.6953,114.5,130.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="112.6294">a1()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="95.5" x2="137.5" y1="154.6" y2="154.6"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="137.5" x2="137.5" y1="154.6" y2="167.6"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="90.5" x2="137.5" y1="167.6" y2="167.6"/>
-    <polygon fill="#181818" points="100.5,163.6,90.5,167.6,100.5,171.6,96.5,167.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="64" x2="185" y1="171.6" y2="171.6"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="116" x="69" y="181.8189">[std::runtime_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="90.5" x2="137.5" y1="202.3999" y2="202.3999"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="137.5" y1="202.3999" y2="215.3999"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="96.5" x2="137.5" y1="215.3999" y2="215.3999"/>
-      <polygon fill="#181818" points="106.5,211.3999,96.5,215.3999,106.5,219.3999,102.5,215.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="102.5" y="196.8769">a2()</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="107.5" x2="149.5" y1="154.6953" y2="154.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="149.5" x2="149.5" y1="154.6953" y2="167.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="149.5" y1="167.6953" y2="167.6953"/>
+    <polygon fill="#A80036" points="112.5,163.6953,102.5,167.6953,112.5,171.6953,108.5,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="171.6953" y2="171.6953"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="79" y="181.9058">[std::runtime_error &amp;]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="201.6328" y2="201.6328"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="201.6328" y2="214.6328"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="214.6328" y2="214.6328"/>
+      <polygon fill="#A80036" points="118.5,210.6328,108.5,214.6328,118.5,218.6328,114.5,214.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="196.5669">a2()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="95.5" x2="137.5" y1="239.3999" y2="239.3999"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="137.5" x2="137.5" y1="239.3999" y2="252.3999"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="90.5" x2="137.5" y1="252.3999" y2="252.3999"/>
-    <polygon fill="#181818" points="100.5,248.3999,90.5,252.3999,100.5,256.3999,96.5,252.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="64" x2="185" y1="256.3999" y2="256.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="101" x="69" y="266.6188">[std::logic_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="90.5" x2="137.5" y1="287.1998" y2="287.1998"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="137.5" y1="287.1998" y2="300.1998"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="96.5" x2="137.5" y1="300.1998" y2="300.1998"/>
-      <polygon fill="#181818" points="106.5,296.1998,96.5,300.1998,106.5,304.1998,102.5,300.1998" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="102.5" y="281.6768">a3()</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="107.5" x2="149.5" y1="238.6328" y2="238.6328"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="149.5" x2="149.5" y1="238.6328" y2="251.6328"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="149.5" y1="251.6328" y2="251.6328"/>
+    <polygon fill="#A80036" points="112.5,247.6328,102.5,251.6328,112.5,255.6328,108.5,251.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="255.6328" y2="255.6328"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="120" x="79" y="265.8433">[std::logic_error &amp;]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="285.5703" y2="285.5703"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="285.5703" y2="298.5703"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="298.5703" y2="298.5703"/>
+      <polygon fill="#A80036" points="118.5,294.5703,108.5,298.5703,118.5,302.5703,114.5,298.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="280.5044">a3()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="95.5" x2="137.5" y1="324.1998" y2="324.1998"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="137.5" x2="137.5" y1="324.1998" y2="337.1998"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="90.5" x2="137.5" y1="337.1998" y2="337.1998"/>
-    <polygon fill="#181818" points="100.5,333.1998,90.5,337.1998,100.5,341.1998,96.5,337.1998" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="64" x2="185" y1="341.1998" y2="341.1998"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="17" x="69" y="351.4187">[...]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="90.5" x2="137.5" y1="371.9997" y2="371.9997"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="137.5" y1="371.9997" y2="384.9997"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="96.5" x2="137.5" y1="384.9997" y2="384.9997"/>
-      <polygon fill="#181818" points="106.5,380.9997,96.5,384.9997,106.5,388.9997,102.5,384.9997" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="102.5" y="366.4767">a4()</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="107.5" x2="149.5" y1="322.5703" y2="322.5703"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="149.5" x2="149.5" y1="322.5703" y2="335.5703"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="149.5" y1="335.5703" y2="335.5703"/>
+    <polygon fill="#A80036" points="112.5,331.5703,102.5,335.5703,112.5,339.5703,108.5,335.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="339.5703" y2="339.5703"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="79" y="349.7808">[...]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="369.5078" y2="369.5078"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="369.5078" y2="382.5078"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="382.5078" y2="382.5078"/>
+      <polygon fill="#A80036" points="118.5,378.5078,108.5,382.5078,118.5,386.5078,114.5,382.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="364.4419">a4()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="95.5" x2="137.5" y1="408.9997" y2="408.9997"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="137.5" x2="137.5" y1="408.9997" y2="421.9997"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="90.5" x2="137.5" y1="421.9997" y2="421.9997"/>
-    <polygon fill="#181818" points="100.5,417.9997,90.5,421.9997,100.5,425.9997,96.5,421.9997" style="stroke:#181818;stroke-width:1.0;"/>
-    <polygon fill="#181818" points="45.5,433.9997,35.5,437.9997,45.5,441.9997,41.5,437.9997" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="84.5" y1="437.9997" y2="437.9997"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="107.5" x2="149.5" y1="406.5078" y2="406.5078"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="149.5" x2="149.5" y1="406.5078" y2="419.5078"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="102.5" x2="149.5" y1="419.5078" y2="419.5078"/>
+    <polygon fill="#A80036" points="112.5,415.5078,102.5,419.5078,112.5,423.5078,108.5,419.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="52,431.5078,42,435.5078,52,439.5078,48,435.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="96.5" y1="435.5078" y2="435.5078"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20023_sequence_mermaid.svg b/docs/test_cases/t20023_sequence_mermaid.svg
index fd33db0c..724fa9de 100644
--- a/docs/test_cases/t20023_sequence_mermaid.svg
+++ b/docs/test_cases/t20023_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -104,8 +104,8 @@
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="479" x="282.5">rror &amp;]</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="637" x="282.5">[...]</text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="280">a1()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,182 C 340,172 340,212 280,202"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="227" x="285">​</text>
@@ -122,6 +122,6 @@
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,695 C 340,685 340,725 280,715"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="740" x="285">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 285,735 C 345,725 345,765 285,755"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="820" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="815" x2="83" y1="815" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="820" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="815" x2="80" y1="815" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20024.md b/docs/test_cases/t20024.md
index 421c3b2b..83fdb4c9 100644
--- a/docs/test_cases/t20024.md
+++ b/docs/test_cases/t20024.md
@@ -93,8 +93,10 @@ int tmain()
   "name": "t20024_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1919714441225983014",
-      "name": "clanguml::t20024::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20024",
       "source_location": {
         "column": 5,
         "file": "t20024.cc",
@@ -104,8 +106,77 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "select(enum_a)",
+          "id": "1200587047701031901",
+          "name": "select",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20024.cc",
+            "line": 9,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a0()",
+          "id": "1859614580641799156",
+          "name": "a0",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20024.cc",
+            "line": 23,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a1()",
+          "id": "501598940454911460",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20024.cc",
+            "line": 24,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2()",
+          "id": "1698866541173753340",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20024.cc",
+            "line": 25,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a3()",
+          "id": "490376438551958259",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20024.cc",
+            "line": 26,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "40786919835708828",
-      "name": "clanguml::t20024::A",
+      "name": "A",
+      "namespace": "clanguml::t20024",
       "source_location": {
         "column": 8,
         "file": "t20024.cc",
@@ -115,8 +186,77 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "select(colors)",
+          "id": "286108218156977422",
+          "name": "select",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20024.cc",
+            "line": 30,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "red()",
+          "id": "112014563206084467",
+          "name": "red",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20024.cc",
+            "line": 47,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "orange()",
+          "id": "2222823236498505185",
+          "name": "orange",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20024.cc",
+            "line": 48,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "green()",
+          "id": "519021723720658376",
+          "name": "green",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20024.cc",
+            "line": 49,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "grey()",
+          "id": "1813557671878544737",
+          "name": "grey",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20024.cc",
+            "line": 50,
+            "translation_unit": "t20024.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "933287014626440872",
-      "name": "clanguml::t20024::B",
+      "name": "B",
+      "namespace": "clanguml::t20024",
       "source_location": {
         "column": 8,
         "file": "t20024.cc",
@@ -132,9 +272,7 @@ int tmain()
         {
           "from": {
             "activity_id": "1919714441225983014",
-            "activity_name": "clanguml::t20024::tmain()",
-            "participant_id": "1919714441225983014",
-            "participant_name": "clanguml::t20024::tmain()"
+            "participant_id": "1919714441225983014"
           },
           "name": "select(enum_a)",
           "return_type": "int",
@@ -147,7 +285,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1200587047701031901",
-            "activity_name": "clanguml::t20024::A::select(enum_a)",
             "participant_id": "40786919835708828"
           },
           "type": "message"
@@ -160,7 +297,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1200587047701031901",
-                    "activity_name": "clanguml::t20024::A::select(enum_a)",
                     "participant_id": "40786919835708828"
                   },
                   "name": "a0()",
@@ -174,7 +310,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1859614580641799156",
-                    "activity_name": "clanguml::t20024::A::a0()",
                     "participant_id": "40786919835708828"
                   },
                   "type": "message"
@@ -188,7 +323,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1200587047701031901",
-                    "activity_name": "clanguml::t20024::A::select(enum_a)",
                     "participant_id": "40786919835708828"
                   },
                   "name": "a1()",
@@ -202,7 +336,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "501598940454911460",
-                    "activity_name": "clanguml::t20024::A::a1()",
                     "participant_id": "40786919835708828"
                   },
                   "type": "message"
@@ -216,7 +349,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1200587047701031901",
-                    "activity_name": "clanguml::t20024::A::select(enum_a)",
                     "participant_id": "40786919835708828"
                   },
                   "name": "a2()",
@@ -230,7 +362,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1698866541173753340",
-                    "activity_name": "clanguml::t20024::A::a2()",
                     "participant_id": "40786919835708828"
                   },
                   "type": "message"
@@ -244,7 +375,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1200587047701031901",
-                    "activity_name": "clanguml::t20024::A::select(enum_a)",
                     "participant_id": "40786919835708828"
                   },
                   "name": "a3()",
@@ -258,7 +388,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "490376438551958259",
-                    "activity_name": "clanguml::t20024::A::a3()",
                     "participant_id": "40786919835708828"
                   },
                   "type": "message"
@@ -274,9 +403,7 @@ int tmain()
         {
           "from": {
             "activity_id": "1919714441225983014",
-            "activity_name": "clanguml::t20024::tmain()",
-            "participant_id": "1919714441225983014",
-            "participant_name": "clanguml::t20024::tmain()"
+            "participant_id": "1919714441225983014"
           },
           "name": "select(colors)",
           "return_type": "void",
@@ -289,7 +416,6 @@ int tmain()
           },
           "to": {
             "activity_id": "286108218156977422",
-            "activity_name": "clanguml::t20024::B::select(colors)",
             "participant_id": "933287014626440872"
           },
           "type": "message"
@@ -302,7 +428,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "286108218156977422",
-                    "activity_name": "clanguml::t20024::B::select(colors)",
                     "participant_id": "933287014626440872"
                   },
                   "name": "red()",
@@ -316,7 +441,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "112014563206084467",
-                    "activity_name": "clanguml::t20024::B::red()",
                     "participant_id": "933287014626440872"
                   },
                   "type": "message"
@@ -330,7 +454,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "286108218156977422",
-                    "activity_name": "clanguml::t20024::B::select(colors)",
                     "participant_id": "933287014626440872"
                   },
                   "name": "orange()",
@@ -344,7 +467,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "2222823236498505185",
-                    "activity_name": "clanguml::t20024::B::orange()",
                     "participant_id": "933287014626440872"
                   },
                   "type": "message"
@@ -358,7 +480,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "286108218156977422",
-                    "activity_name": "clanguml::t20024::B::select(colors)",
                     "participant_id": "933287014626440872"
                   },
                   "name": "green()",
@@ -372,7 +493,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "519021723720658376",
-                    "activity_name": "clanguml::t20024::B::green()",
                     "participant_id": "933287014626440872"
                   },
                   "type": "message"
@@ -386,7 +506,6 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "286108218156977422",
-                    "activity_name": "clanguml::t20024::B::select(colors)",
                     "participant_id": "933287014626440872"
                   },
                   "name": "grey()",
@@ -400,7 +519,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1813557671878544737",
-                    "activity_name": "clanguml::t20024::B::grey()",
                     "participant_id": "933287014626440872"
                   },
                   "type": "message"
diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg
index 09ffcf86..7d41ac6e 100644
--- a/docs/test_cases/t20024_sequence.svg
+++ b/docs/test_cases/t20024_sequence.svg
@@ -1,158 +1,172 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="919px" preserveAspectRatio="none" style="width:322px;height:919px;background:#FFFFFF;" version="1.1" viewBox="0 0 322 919" width="322px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="916px" preserveAspectRatio="none" style="width:364px;height:916px;" version="1.1" viewBox="0 0 364 916" width="364px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f19omyprinzh9e" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="826.7994" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="384.7997" style="stroke:#181818;stroke-width:1.0;" width="10" x="147.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="145.7999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="230.5998"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="315.3997"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="400.1996"/>
-    <rect fill="#FFFFFF" height="390.7997" style="stroke:#181818;stroke-width:1.0;" width="10" x="207.5" y="482.7996"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="560.1996"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="647.9995"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="735.7994"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="823.5993"/>
-    <rect fill="none" height="356.7997" style="stroke:#000000;stroke-width:1.5;" width="90" x="131" y="83.3999"/>
-    <rect fill="none" height="368.7997" style="stroke:#000000;stroke-width:1.5;" width="124" x="191" y="497.7996"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="883.5993"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="152" x2="152" y1="36.7999" y2="883.5993"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="212" x2="212" y1="36.7999" y2="883.5993"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="882.5993"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="902.6052">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
+    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="101.5625"/>
+    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="185.5"/>
+    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="269.4375"/>
+    <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="353.375"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
+    <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="511.5781"/>
+    <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="598.5156"/>
+    <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="685.4531"/>
+    <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="772.3906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="876.3281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="169.5" x2="169.5" y1="38.2969" y2="876.3281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="230" x2="230" y1="38.2969" y2="876.3281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="895.3232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="141" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="148" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="141" y="882.5993"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="148" y="902.6052">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="895.3232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="201" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="208" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="201" y="882.5993"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="208" y="902.6052">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="895.3232">B</text>
     </a>
-    <rect fill="#FFFFFF" height="826.7994" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="384.7997" style="stroke:#181818;stroke-width:1.0;" width="10" x="147.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="145.7999"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="230.5998"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="315.3997"/>
-    <rect fill="#FFFFFF" height="25" style="stroke:#181818;stroke-width:1.0;" width="10" x="152.5" y="400.1996"/>
-    <rect fill="#FFFFFF" height="390.7997" style="stroke:#181818;stroke-width:1.0;" width="10" x="207.5" y="482.7996"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="560.1996"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="647.9995"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="735.7994"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="212.5" y="823.5993"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="135.5,64.3999,145.5,68.3999,135.5,72.3999,139.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="141.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="89" x="46.5" y="62.8769">select(enum_a)</text>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="153,65.4297,163,69.4297,153,73.4297,157,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="159" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="53" y="64.3638">select(enum_a)</text>
     </a>
-    <path d="M131,83.3999 L216,83.3999 L216,91 L206,101 L131,101 L131,83.3999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="356.7997" style="stroke:#000000;stroke-width:1.5;" width="90" x="131" y="83.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="40" x="146" y="96.477">switch</text>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="131" x2="221" y1="102" y2="102"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="31" x="136" y="112.2189">[zero]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="157.5" x2="204.5" y1="132.7999" y2="132.7999"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="204.5" x2="204.5" y1="132.7999" y2="145.7999"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="163.5" x2="204.5" y1="145.7999" y2="145.7999"/>
-      <polygon fill="#181818" points="173.5,141.7999,163.5,145.7999,173.5,149.7999,169.5,145.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="169.5" y="127.2769">a0()</text>
+    <path d="M146.5,84.4297 L238.5,84.4297 L238.5,91.4297 L228.5,101.4297 L146.5,101.4297 L146.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="161.5" y="97.4966">switch</text>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="102.5625" y2="102.5625"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="38" x="151.5" y="112.7729">[zero]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="132.5" y2="132.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="132.5" y2="145.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="145.5" y2="145.5"/>
+      <polygon fill="#A80036" points="191,141.5,181,145.5,191,149.5,187,145.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="187" y="127.4341">a0()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162.5" x2="204.5" y1="169.7999" y2="169.7999"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204.5" x2="204.5" y1="169.7999" y2="182.7999"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157.5" x2="204.5" y1="182.7999" y2="182.7999"/>
-    <polygon fill="#181818" points="167.5,178.7999,157.5,182.7999,167.5,186.7999,163.5,182.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="131" x2="221" y1="186.7999" y2="186.7999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="28" x="136" y="197.0188">[one]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="157.5" x2="204.5" y1="217.5998" y2="217.5998"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="204.5" x2="204.5" y1="217.5998" y2="230.5998"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="163.5" x2="204.5" y1="230.5998" y2="230.5998"/>
-      <polygon fill="#181818" points="173.5,226.5998,163.5,230.5998,173.5,234.5998,169.5,230.5998" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="169.5" y="212.0768">a1()</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180" x2="222" y1="169.5" y2="169.5"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222" x2="222" y1="169.5" y2="182.5"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175" x2="222" y1="182.5" y2="182.5"/>
+    <polygon fill="#A80036" points="185,178.5,175,182.5,185,186.5,181,182.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="186.5" y2="186.5"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="196.7104">[one]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="216.4375" y2="216.4375"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="216.4375" y2="229.4375"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="229.4375" y2="229.4375"/>
+      <polygon fill="#A80036" points="191,225.4375,181,229.4375,191,233.4375,187,229.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="187" y="211.3716">a1()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162.5" x2="204.5" y1="254.5998" y2="254.5998"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204.5" x2="204.5" y1="254.5998" y2="267.5998"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157.5" x2="204.5" y1="267.5998" y2="267.5998"/>
-    <polygon fill="#181818" points="167.5,263.5998,157.5,267.5998,167.5,271.5998,163.5,267.5998" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="131" x2="221" y1="271.5998" y2="271.5998"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="28" x="136" y="281.8187">[two]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="157.5" x2="204.5" y1="302.3997" y2="302.3997"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="204.5" x2="204.5" y1="302.3997" y2="315.3997"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="163.5" x2="204.5" y1="315.3997" y2="315.3997"/>
-      <polygon fill="#181818" points="173.5,311.3997,163.5,315.3997,173.5,319.3997,169.5,315.3997" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="169.5" y="296.8767">a2()</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180" x2="222" y1="253.4375" y2="253.4375"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222" x2="222" y1="253.4375" y2="266.4375"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175" x2="222" y1="266.4375" y2="266.4375"/>
+    <polygon fill="#A80036" points="185,262.4375,175,266.4375,185,270.4375,181,266.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="270.4375" y2="270.4375"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="280.6479">[two]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="300.375" y2="300.375"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="300.375" y2="313.375"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="313.375" y2="313.375"/>
+      <polygon fill="#A80036" points="191,309.375,181,313.375,191,317.375,187,313.375" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="187" y="295.3091">a2()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162.5" x2="204.5" y1="339.3997" y2="339.3997"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204.5" x2="204.5" y1="339.3997" y2="352.3997"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157.5" x2="204.5" y1="352.3997" y2="352.3997"/>
-    <polygon fill="#181818" points="167.5,348.3997,157.5,352.3997,167.5,356.3997,163.5,352.3997" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="131" x2="221" y1="356.3997" y2="356.3997"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="45" x="136" y="366.6186">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="157.5" x2="204.5" y1="387.1996" y2="387.1996"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="204.5" x2="204.5" y1="387.1996" y2="400.1996"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="163.5" x2="204.5" y1="400.1996" y2="400.1996"/>
-      <polygon fill="#181818" points="173.5,396.1996,163.5,400.1996,173.5,404.1996,169.5,400.1996" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="169.5" y="381.6766">a3()</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180" x2="222" y1="337.375" y2="337.375"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222" x2="222" y1="337.375" y2="350.375"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175" x2="222" y1="350.375" y2="350.375"/>
+    <polygon fill="#A80036" points="185,346.375,175,350.375,185,354.375,181,350.375" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="354.375" y2="354.375"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="151.5" y="364.5854">[default]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="384.3125" y2="384.3125"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="384.3125" y2="397.3125"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="397.3125" y2="397.3125"/>
+      <polygon fill="#A80036" points="191,393.3125,181,397.3125,191,401.3125,187,397.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="187" y="379.2466">a3()</text>
     </a>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="162.5" x2="204.5" y1="424.1996" y2="424.1996"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="204.5" x2="204.5" y1="424.1996" y2="437.1996"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="157.5" x2="204.5" y1="437.1996" y2="437.1996"/>
-    <polygon fill="#181818" points="167.5,433.1996,157.5,437.1996,167.5,441.1996,163.5,437.1996" style="stroke:#181818;stroke-width:1.0;"/>
-    <polygon fill="#181818" points="50.5,449.1996,40.5,453.1996,50.5,457.1996,46.5,453.1996" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="151.5" y1="453.1996" y2="453.1996"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="195.5,478.7996,205.5,482.7996,195.5,486.7996,199.5,482.7996" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="201.5" y1="482.7996" y2="482.7996"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="78" x="46.5" y="477.2766">select(colors)</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="180" x2="222" y1="421.3125" y2="421.3125"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222" x2="222" y1="421.3125" y2="434.3125"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175" x2="222" y1="434.3125" y2="434.3125"/>
+    <polygon fill="#A80036" points="185,430.3125,175,434.3125,185,438.3125,181,434.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="57,446.3125,47,450.3125,57,454.3125,53,450.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="169" y1="450.3125" y2="450.3125"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="213,475.4453,223,479.4453,213,483.4453,217,479.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="219" y1="479.4453" y2="479.4453"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="86" x="53" y="474.3794">select(colors)</text>
     </a>
-    <path d="M191,497.7996 L276,497.7996 L276,505.3996 L266,515.3996 L191,515.3996 L191,497.7996 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="368.7997" style="stroke:#000000;stroke-width:1.5;" width="124" x="191" y="497.7996"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="40" x="206" y="510.8766">switch</text>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="191" x2="315" y1="516.3996" y2="516.3996"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="99" x="196" y="526.6186">[enum colors::red]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="222.5" x2="264.5" y1="552.1996" y2="552.1996"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="264.5" x2="264.5" y1="552.1996" y2="565.1996"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="264.5" y1="565.1996" y2="565.1996"/>
-      <polygon fill="#181818" points="233.5,561.1996,223.5,565.1996,233.5,569.1996,229.5,565.1996" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="229.5" y="546.6766">red()</text>
+    <path d="M206,494.4453 L298,494.4453 L298,501.4453 L288,511.4453 L206,511.4453 L206,494.4453 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="221" y="507.5122">switch</text>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="512.5781" y2="512.5781"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="117" x="211" y="522.7886">[enum colors::red]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="547.5156" y2="547.5156"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="547.5156" y2="560.5156"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="560.5156" y2="560.5156"/>
+      <polygon fill="#A80036" points="251,556.5156,241,560.5156,251,564.5156,247,560.5156" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="247" y="542.4497">red()</text>
     </a>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="191" x2="315" y1="604.1996" y2="604.1996"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="119" x="196" y="614.4185">[enum colors::orange]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="222.5" x2="264.5" y1="639.9995" y2="639.9995"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="264.5" x2="264.5" y1="639.9995" y2="652.9995"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="264.5" y1="652.9995" y2="652.9995"/>
-      <polygon fill="#181818" points="233.5,648.9995,223.5,652.9995,233.5,656.9995,229.5,652.9995" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="47" x="229.5" y="634.4765">orange()</text>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="599.5156" y2="599.5156"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="211" y="609.7261">[enum colors::orange]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="634.4531" y2="634.4531"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="634.4531" y2="647.4531"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="647.4531" y2="647.4531"/>
+      <polygon fill="#A80036" points="251,643.4531,241,647.4531,251,651.4531,247,647.4531" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="55" x="247" y="629.3872">orange()</text>
     </a>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="191" x2="315" y1="691.9995" y2="691.9995"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="112" x="196" y="702.2184">[enum colors::green]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="222.5" x2="264.5" y1="727.7994" y2="727.7994"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="264.5" x2="264.5" y1="727.7994" y2="740.7994"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="264.5" y1="740.7994" y2="740.7994"/>
-      <polygon fill="#181818" points="233.5,736.7994,223.5,740.7994,233.5,744.7994,229.5,740.7994" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="229.5" y="722.2764">green()</text>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="686.4531" y2="686.4531"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="133" x="211" y="696.6636">[enum colors::green]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="721.3906" y2="721.3906"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="721.3906" y2="734.3906"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="734.3906" y2="734.3906"/>
+      <polygon fill="#A80036" points="251,730.3906,241,734.3906,251,738.3906,247,734.3906" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="247" y="716.3247">green()</text>
     </a>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="191" x2="315" y1="779.7994" y2="779.7994"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="45" x="196" y="790.0183">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="222.5" x2="264.5" y1="815.5993" y2="815.5993"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="264.5" x2="264.5" y1="815.5993" y2="828.5993"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="223.5" x2="264.5" y1="828.5993" y2="828.5993"/>
-      <polygon fill="#181818" points="233.5,824.5993,223.5,828.5993,233.5,832.5993,229.5,828.5993" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="33" x="229.5" y="810.0763">grey()</text>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="773.3906" y2="773.3906"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="211" y="783.6011">[default]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="808.3281" y2="808.3281"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="808.3281" y2="821.3281"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="821.3281" y2="821.3281"/>
+      <polygon fill="#A80036" points="251,817.3281,241,821.3281,251,825.3281,247,821.3281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="38" x="247" y="803.2622">grey()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20024_sequence_mermaid.svg b/docs/test_cases/t20024_sequence_mermaid.svg
index b75ef24a..f7db7c3e 100644
--- a/docs/test_cases/t20024_sequence_mermaid.svg
+++ b/docs/test_cases/t20024_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -158,8 +158,8 @@
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="1256" x="480">]</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="1375" x="480">[default]</text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">select(enum_a)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">select(enum_a)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="196" x="280">a0()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,227 C 340,217 340,257 280,247"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="272" x="285">​</text>
@@ -176,10 +176,10 @@
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 280,710 C 340,700 340,740 280,730"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="755" x="285">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 285,750 C 345,740 345,780 285,770"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="835" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="830" x2="83" y1="830" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="845" x="276">select(colors)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="876" x2="471" y1="876" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="835" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="830" x2="80" y1="830" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="845" x="278">select(colors)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="876" x2="475" y1="876" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="975" x="480">red()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,1006 C 540,996 540,1036 480,1026"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1128" x="480">orange()</text>
diff --git a/docs/test_cases/t20025.md b/docs/test_cases/t20025.md
index 01286289..fccaf773 100644
--- a/docs/test_cases/t20025.md
+++ b/docs/test_cases/t20025.md
@@ -73,8 +73,10 @@ int tmain()
   "name": "t20025_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1268545806896171690",
-      "name": "clanguml::t20025::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20025",
       "source_location": {
         "column": 5,
         "file": "t20025.cc",
@@ -84,8 +86,25 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "a()",
+          "id": "1119830104994271584",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20025.cc",
+            "line": 15,
+            "translation_unit": "t20025.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "2144852170258286289",
-      "name": "clanguml::t20025::A",
+      "name": "A",
+      "namespace": "clanguml::t20025",
       "source_location": {
         "column": 8,
         "file": "t20025.cc",
@@ -95,8 +114,10 @@ int tmain()
       "type": "class"
     },
     {
+      "display_name": "add(int,int)",
       "id": "228843323046630374",
-      "name": "clanguml::t20025::add(int,int)",
+      "name": "add",
+      "namespace": "clanguml::t20025",
       "source_location": {
         "column": 5,
         "file": "t20025.cc",
@@ -112,9 +133,7 @@ int tmain()
         {
           "from": {
             "activity_id": "1268545806896171690",
-            "activity_name": "clanguml::t20025::tmain()",
-            "participant_id": "1268545806896171690",
-            "participant_name": "clanguml::t20025::tmain()"
+            "participant_id": "1268545806896171690"
           },
           "name": "a()",
           "return_type": "int",
@@ -127,7 +146,6 @@ int tmain()
           },
           "to": {
             "activity_id": "1119830104994271584",
-            "activity_name": "clanguml::t20025::A::a()",
             "participant_id": "2144852170258286289"
           },
           "type": "message"
@@ -135,9 +153,7 @@ int tmain()
         {
           "from": {
             "activity_id": "1268545806896171690",
-            "activity_name": "clanguml::t20025::tmain()",
-            "participant_id": "1268545806896171690",
-            "participant_name": "clanguml::t20025::tmain()"
+            "participant_id": "1268545806896171690"
           },
           "name": "",
           "return_type": "int",
@@ -150,7 +166,6 @@ int tmain()
           },
           "to": {
             "activity_id": "228843323046630374",
-            "activity_name": "clanguml::t20025::add(int,int)",
             "participant_id": "228843323046630374"
           },
           "type": "message"
diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg
index e55861a2..8db3b07b 100644
--- a/docs/test_cases/t20025_sequence.svg
+++ b/docs/test_cases/t20025_sequence.svg
@@ -1,47 +1,53 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="164px" preserveAspectRatio="none" style="width:195px;height:164px;background:#FFFFFF;" version="1.1" viewBox="0 0 195 164" width="195px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="169px" preserveAspectRatio="none" style="width:220px;height:169px;" version="1.1" viewBox="0 0 220 169" width="220px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f24pa7ezc9t8u" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="63.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="143" y="96.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="128.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="85" x2="85" y1="36.7999" y2="128.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="148" x2="148" y1="36.7999" y2="128.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="127.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="147.4059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="129.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="129.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="167" x2="167" y1="38.2969" y2="129.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="128.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="148.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="127.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="147.4059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="128.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="148.4248">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="107" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114" y="25.0059">add(int,int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="107" y="127.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114" y="147.4059">add(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="22.9951">add(int,int)</text>
+      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="128.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="148.4248">add(int,int)</text>
     </a>
-    <rect fill="#FFFFFF" height="63.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="143" y="96.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="68.5,64.3999,78.5,68.3999,68.5,72.3999,72.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="74.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="62.8769">a()</text>
+    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <polygon fill="#181818" points="50.5,78.3999,40.5,82.3999,50.5,86.3999,46.5,82.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="44.5" x2="84.5" y1="82.3999" y2="82.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="131,92.3999,141,96.3999,131,100.3999,135,96.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="137" y1="96.3999" y2="96.3999"/>
+    <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="96.5" y1="83.4297" y2="83.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="150,93.4297,160,97.4297,150,101.4297,154,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="156" y1="97.4297" y2="97.4297"/>
     </a>
-    <polygon fill="#181818" points="45.5,106.3999,35.5,110.3999,45.5,114.3999,41.5,110.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="39.5" x2="147" y1="110.3999" y2="110.3999"/>
+    <polygon fill="#A80036" points="52,107.4297,42,111.4297,52,115.4297,48,111.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="166" y1="111.4297" y2="111.4297"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20025_sequence_mermaid.svg b/docs/test_cases/t20025_sequence_mermaid.svg
index c0d86545..35762bd1 100644
--- a/docs/test_cases/t20025_sequence_mermaid.svg
+++ b/docs/test_cases/t20025_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -91,12 +91,12 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="135" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="121" x2="83" y1="121" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="276">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="471" y1="131" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="277">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="141" x2="83" y1="141" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="121" x2="80" y1="121" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="278">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="475" y1="131" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="275">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="141" x2="80" y1="141" x1="470"/>
 </svg>
diff --git a/docs/test_cases/t20026.md b/docs/test_cases/t20026.md
index 68641dfe..dcb559c4 100644
--- a/docs/test_cases/t20026.md
+++ b/docs/test_cases/t20026.md
@@ -53,8 +53,10 @@ int tmain()
   "name": "t20026_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "2268697350307997040",
-      "name": "clanguml::t20026::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20026",
       "source_location": {
         "column": 5,
         "file": "t20026.cc",
@@ -64,8 +66,25 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "a()",
+          "id": "600590770418147864",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 18,
+            "file": "t20026.cc",
+            "line": 5,
+            "translation_unit": "t20026.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1962121823853291899",
-      "name": "clanguml::t20026::A",
+      "name": "A",
+      "namespace": "clanguml::t20026",
       "source_location": {
         "column": 8,
         "file": "t20026.cc",
@@ -81,9 +100,7 @@ int tmain()
         {
           "from": {
             "activity_id": "2268697350307997040",
-            "activity_name": "clanguml::t20026::tmain()",
-            "participant_id": "2268697350307997040",
-            "participant_name": "clanguml::t20026::tmain()"
+            "participant_id": "2268697350307997040"
           },
           "name": "a()",
           "return_type": "void",
@@ -96,7 +113,6 @@ int tmain()
           },
           "to": {
             "activity_id": "600590770418147864",
-            "activity_name": "clanguml::t20026::A::a()",
             "participant_id": "1962121823853291899"
           },
           "type": "message"
diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg
index 61829ec1..fe9ada8c 100644
--- a/docs/test_cases/t20026_sequence.svg
+++ b/docs/test_cases/t20026_sequence.svg
@@ -1,30 +1,36 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="152px" preserveAspectRatio="none" style="width:103px;height:152px;background:#FFFFFF;" version="1.1" viewBox="0 0 103 152" width="103px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1dzwjsnkezj9" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="116.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="85" x2="85" y1="36.7999" y2="116.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="115.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="135.4059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1dzwjsnkezj9)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1dzwjsnkezj9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dzwjsnkezj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1dzwjsnkezj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="115.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="135.4059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dzwjsnkezj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1dzwjsnkezj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="68.5,64.3999,78.5,68.3999,68.5,72.3999,72.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="74.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="62.8769">a()</text>
+    <rect fill="#FFFFFF" filter="url(#f1dzwjsnkezj9)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1dzwjsnkezj9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20026_sequence_mermaid.svg b/docs/test_cases/t20026_sequence_mermaid.svg
index aa7c3fe8..121a3afb 100644
--- a/docs/test_cases/t20026_sequence_mermaid.svg
+++ b/docs/test_cases/t20026_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -73,6 +73,6 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="105" x="270"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20027.md b/docs/test_cases/t20027.md
index 960a38e8..debe9624 100644
--- a/docs/test_cases/t20027.md
+++ b/docs/test_cases/t20027.md
@@ -52,8 +52,10 @@ void tmain()
   "name": "t20027_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1581009482994430286",
-      "name": "clanguml::t20027::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20027",
       "source_location": {
         "column": 6,
         "file": "t20027.cc",
@@ -63,8 +65,25 @@ void tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "a()",
+          "id": "910514967786202717",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20027.cc",
+            "line": 6,
+            "translation_unit": "t20027.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "583525629936262089",
-      "name": "clanguml::t20027::A",
+      "name": "A",
+      "namespace": "clanguml::t20027",
       "source_location": {
         "column": 7,
         "file": "t20027.cc",
@@ -80,9 +99,7 @@ void tmain()
         {
           "from": {
             "activity_id": "1581009482994430286",
-            "activity_name": "clanguml::t20027::tmain()",
-            "participant_id": "1581009482994430286",
-            "participant_name": "clanguml::t20027::tmain()"
+            "participant_id": "1581009482994430286"
           },
           "name": "a()",
           "return_type": "void",
@@ -95,7 +112,6 @@ void tmain()
           },
           "to": {
             "activity_id": "910514967786202717",
-            "activity_name": "clanguml::t20027::A::a()",
             "participant_id": "583525629936262089"
           },
           "type": "message"
diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg
index bf5a9d45..873a91ec 100644
--- a/docs/test_cases/t20027_sequence.svg
+++ b/docs/test_cases/t20027_sequence.svg
@@ -1,30 +1,36 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="152px" preserveAspectRatio="none" style="width:103px;height:152px;background:#FFFFFF;" version="1.1" viewBox="0 0 103 152" width="103px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f168qgf7r1ntn0" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="34" x2="34" y1="36.7999" y2="116.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="85" x2="85" y1="36.7999" y2="116.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="5" y="115.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="12" y="135.4059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f168qgf7r1ntn0)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f168qgf7r1ntn0)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168qgf7r1ntn0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f168qgf7r1ntn0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="74" y="115.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="81" y="135.4059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168qgf7r1ntn0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f168qgf7r1ntn0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" height="51.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="29.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="80.5" y="68.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="68.5,64.3999,78.5,68.3999,68.5,72.3999,72.5,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="39.5" x2="74.5" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="46.5" y="62.8769">a()</text>
+    <rect fill="#FFFFFF" filter="url(#f168qgf7r1ntn0)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f168qgf7r1ntn0)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20027_sequence_mermaid.svg b/docs/test_cases/t20027_sequence_mermaid.svg
index aa7c3fe8..121a3afb 100644
--- a/docs/test_cases/t20027_sequence_mermaid.svg
+++ b/docs/test_cases/t20027_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -73,6 +73,6 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="105" x="270"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
 </svg>
diff --git a/docs/test_cases/t20028.md b/docs/test_cases/t20028.md
index ecaa82ba..9f698cdd 100644
--- a/docs/test_cases/t20028.md
+++ b/docs/test_cases/t20028.md
@@ -62,8 +62,10 @@ int tmain()
   "name": "t20028_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1347206662193933194",
-      "name": "clanguml::t20028::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20028",
       "source_location": {
         "column": 5,
         "file": "t20028.cc",
@@ -73,8 +75,64 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "a()",
+          "id": "666210834901940781",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20028.cc",
+            "line": 5,
+            "translation_unit": "t20028.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b()",
+          "id": "793793464184037795",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20028.cc",
+            "line": 6,
+            "translation_unit": "t20028.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c()",
+          "id": "1582152567698110078",
+          "name": "c",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20028.cc",
+            "line": 7,
+            "translation_unit": "t20028.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "d()",
+          "id": "1178268687951492696",
+          "name": "d",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20028.cc",
+            "line": 8,
+            "translation_unit": "t20028.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "2073479923903128898",
-      "name": "clanguml::t20028::A",
+      "name": "A",
+      "namespace": "clanguml::t20028",
       "source_location": {
         "column": 8,
         "file": "t20028.cc",
@@ -95,9 +153,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1347206662193933194",
-                    "activity_name": "clanguml::t20028::tmain()",
-                    "participant_id": "1347206662193933194",
-                    "participant_name": "clanguml::t20028::tmain()"
+                    "participant_id": "1347206662193933194"
                   },
                   "name": "a()",
                   "return_type": "int",
@@ -110,7 +166,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "666210834901940781",
-                    "activity_name": "clanguml::t20028::A::a()",
                     "participant_id": "2073479923903128898"
                   },
                   "type": "message"
@@ -118,9 +173,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1347206662193933194",
-                    "activity_name": "clanguml::t20028::tmain()",
-                    "participant_id": "1347206662193933194",
-                    "participant_name": "clanguml::t20028::tmain()"
+                    "participant_id": "1347206662193933194"
                   },
                   "name": "b()",
                   "return_type": "int",
@@ -133,7 +186,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "793793464184037795",
-                    "activity_name": "clanguml::t20028::A::b()",
                     "participant_id": "2073479923903128898"
                   },
                   "type": "message"
@@ -141,9 +193,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1347206662193933194",
-                    "activity_name": "clanguml::t20028::tmain()",
-                    "participant_id": "1347206662193933194",
-                    "participant_name": "clanguml::t20028::tmain()"
+                    "participant_id": "1347206662193933194"
                   },
                   "name": "c()",
                   "return_type": "int",
@@ -156,7 +206,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1582152567698110078",
-                    "activity_name": "clanguml::t20028::A::c()",
                     "participant_id": "2073479923903128898"
                   },
                   "type": "message"
@@ -169,9 +218,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "1347206662193933194",
-                    "activity_name": "clanguml::t20028::tmain()",
-                    "participant_id": "1347206662193933194",
-                    "participant_name": "clanguml::t20028::tmain()"
+                    "participant_id": "1347206662193933194"
                   },
                   "name": "d()",
                   "return_type": "int",
@@ -184,7 +231,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1178268687951492696",
-                    "activity_name": "clanguml::t20028::A::d()",
                     "participant_id": "2073479923903128898"
                   },
                   "type": "message"
diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg
index 48bbd873..60928af7 100644
--- a/docs/test_cases/t20028_sequence.svg
+++ b/docs/test_cases/t20028_sequence.svg
@@ -1,66 +1,73 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="300px" preserveAspectRatio="none" style="width:130px;height:300px;background:#FFFFFF;" version="1.1" viewBox="0 0 130 300" width="130px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:150px;height:304px;" version="1.1" viewBox="0 0 150 304" width="150px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1jbb3bp5yd1ut" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="208.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="44.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="93"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="136.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="180.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="225.8"/>
-    <rect fill="none" height="194.0001" style="stroke:#000000;stroke-width:1.5;" width="113" x="10" y="53.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="49" x2="49" y1="36.7999" y2="264.8"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="101" x2="101" y1="36.7999" y2="264.8"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="20" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="27" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="20" y="263.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="27" y="283.8059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="125.5" x="13" y="201.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="263.9609"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="114.5" x2="114.5" y1="38.2969" y2="263.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jbb3bp5yd1ut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1jbb3bp5yd1ut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="282.9561">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="90" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="97" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="90" y="263.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="97" y="283.8059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jbb3bp5yd1ut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1jbb3bp5yd1ut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="262.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="282.9561">A</text>
     </a>
-    <rect fill="#FFFFFF" height="208.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="44.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="93"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="136.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="180.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="96.5" y="225.8"/>
-    <path d="M10,53.7999 L70,53.7999 L70,61.3999 L60,71.3999 L10,71.3999 L10,53.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="194.0001" style="stroke:#000000;stroke-width:1.5;" width="113" x="10" y="53.7999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="66.8769">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84.5,89,94.5,93,84.5,97,88.5,93" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="90.5" y1="93" y2="93"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="87.477">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="65.5" y="87.477">a()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="80.5" y="87.477">]</text>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
+    <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="98,89.5625,108,93.5625,98,97.5625,102,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="93.5625" y2="93.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="88.4966">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="74" y="88.4966">a()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="92" y="88.4966">]</text>
     </a>
-    <polygon fill="#181818" points="65.5,103,55.5,107,65.5,111,61.5,107" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="100.5" y1="107" y2="107"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84.5,132.6,94.5,136.6,84.5,140.6,88.5,136.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="90.5" y1="136.6" y2="136.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="61.5" y="131.077">b()</text>
+    <polygon fill="#A80036" points="72,103.5625,62,107.5625,72,111.5625,68,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="107.5625" y2="107.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="98,132.6953,108,136.6953,98,140.6953,102,136.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="136.6953" y2="136.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="131.6294">b()</text>
     </a>
-    <polygon fill="#181818" points="65.5,146.6,55.5,150.6,65.5,154.6,61.5,150.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="100.5" y1="150.6" y2="150.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84.5,176.2,94.5,180.2,84.5,184.2,88.5,180.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="90.5" y1="180.2" y2="180.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="61.5" y="174.677">c()</text>
+    <polygon fill="#A80036" points="72,146.6953,62,150.6953,72,154.6953,68,150.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="150.6953" y2="150.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="98,175.8281,108,179.8281,98,183.8281,102,179.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="179.8281" y2="179.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="68" y="174.7622">c()</text>
     </a>
-    <polygon fill="#181818" points="65.5,190.2,55.5,194.2,65.5,198.2,61.5,194.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="100.5" y1="194.2" y2="194.2"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="123" y1="203.2" y2="203.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="84.5,221.8,94.5,225.8,84.5,229.8,88.5,225.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="90.5" y1="225.8" y2="225.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="61.5" y="220.277">d()</text>
+    <polygon fill="#A80036" points="72,189.8281,62,193.8281,72,197.8281,68,193.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="193.8281" y2="193.8281"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="138.5" y1="202.8281" y2="202.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="98,220.9609,108,224.9609,98,228.9609,102,224.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="224.9609" y2="224.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="219.895">d()</text>
     </a>
-    <polygon fill="#181818" points="65.5,235.8,55.5,239.8,65.5,243.8,61.5,239.8" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="100.5" y1="239.8" y2="239.8"/>
+    <polygon fill="#A80036" points="72,234.9609,62,238.9609,72,242.9609,68,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="238.9609" y2="238.9609"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20028_sequence_mermaid.svg b/docs/test_cases/t20028_sequence_mermaid.svg
index 8e6a25b5..0ebc51b3 100644
--- a/docs/test_cases/t20028_sequence_mermaid.svg
+++ b/docs/test_cases/t20028_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -94,20 +94,20 @@
       <tspan x="200">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="176">[a()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="271" y1="136" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="146" x2="83" y1="146" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="161" x="176">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="192" x2="271" y1="192" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="207" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="202" x2="83" y1="202" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="217" x="176">c()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="248" x2="271" y1="248" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="263" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="258" x2="83" y1="258" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="298" x="176">d()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="329" x2="271" y1="329" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="344" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="339" x2="83" y1="339" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="105" x="178">[a()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="136" x2="275" y1="136" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="151" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="146" x2="80" y1="146" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="161" x="178">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="192" x2="275" y1="192" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="207" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="202" x2="80" y1="202" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="217" x="178">c()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="248" x2="275" y1="248" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="263" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="258" x2="80" y1="258" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="298" x="178">d()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="329" x2="275" y1="329" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="344" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="339" x2="80" y1="339" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20029.md b/docs/test_cases/t20029.md
index 3dae67cb..5adbaa45 100644
--- a/docs/test_cases/t20029.md
+++ b/docs/test_cases/t20029.md
@@ -115,8 +115,10 @@ int tmain()
   "name": "t20029_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "2091374738808319642",
-      "name": "clanguml::t20029::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20029",
       "source_location": {
         "column": 5,
         "file": "t20029.cc",
@@ -126,8 +128,38 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "send(std::string &&)",
+          "id": "2026763864005979273",
+          "name": "send",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20029.cc",
+            "line": 13,
+            "translation_unit": "t20029.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "encode(std::string &&)",
+          "id": "1468258269466480773",
+          "name": "encode",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20029.cc",
+            "line": 22,
+            "translation_unit": "t20029.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Encoder<Retrier<ConnectionPool>>",
       "id": "1673261195873192383",
-      "name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>",
+      "name": "Encoder",
+      "namespace": "clanguml::t20029",
       "source_location": {
         "column": 29,
         "file": "t20029.cc",
@@ -137,8 +169,25 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "send(std::string &&)",
+          "id": "30515971485361302",
+          "name": "send",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20029.cc",
+            "line": 27,
+            "translation_unit": "t20029.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "Retrier<ConnectionPool>",
       "id": "658058855590948094",
-      "name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>",
+      "name": "Retrier",
+      "namespace": "clanguml::t20029",
       "source_location": {
         "column": 29,
         "file": "t20029.cc",
@@ -148,8 +197,38 @@ int tmain()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "connect()",
+          "id": "940428568182104530",
+          "name": "connect",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20029.cc",
+            "line": 45,
+            "translation_unit": "t20029.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "send(const std::string &)",
+          "id": "972625940114169157",
+          "name": "send",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20029.cc",
+            "line": 51,
+            "translation_unit": "t20029.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "ConnectionPool",
       "id": "1896406205097618937",
-      "name": "clanguml::t20029::ConnectionPool",
+      "name": "ConnectionPool",
+      "namespace": "clanguml::t20029",
       "source_location": {
         "column": 7,
         "file": "t20029.cc",
@@ -159,8 +238,10 @@ int tmain()
       "type": "class"
     },
     {
+      "display_name": "encode_b64(std::string &&)",
       "id": "1362646431260879440",
-      "name": "clanguml::t20029::encode_b64(std::string &&)",
+      "name": "encode_b64",
+      "namespace": "clanguml::t20029",
       "source_location": {
         "column": 13,
         "file": "t20029.cc",
@@ -177,9 +258,7 @@ int tmain()
           "comment": "Establish connection to the remote server synchronously",
           "from": {
             "activity_id": "2091374738808319642",
-            "activity_name": "clanguml::t20029::tmain()",
-            "participant_id": "2091374738808319642",
-            "participant_name": "clanguml::t20029::tmain()"
+            "participant_id": "2091374738808319642"
           },
           "name": "connect()",
           "return_type": "void",
@@ -192,7 +271,6 @@ int tmain()
           },
           "to": {
             "activity_id": "940428568182104530",
-            "activity_name": "clanguml::t20029::ConnectionPool::connect()",
             "participant_id": "1896406205097618937"
           },
           "type": "message"
@@ -208,9 +286,7 @@ int tmain()
                     {
                       "from": {
                         "activity_id": "2091374738808319642",
-                        "activity_name": "clanguml::t20029::tmain()",
-                        "participant_id": "2091374738808319642",
-                        "participant_name": "clanguml::t20029::tmain()"
+                        "participant_id": "2091374738808319642"
                       },
                       "name": "send(std::string &&)",
                       "return_type": "bool",
@@ -223,7 +299,6 @@ int tmain()
                       },
                       "to": {
                         "activity_id": "2026763864005979273",
-                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::send(std::string &&)",
                         "participant_id": "1673261195873192383"
                       },
                       "type": "message"
@@ -232,7 +307,6 @@ int tmain()
                       "comment": "Encode the message using Base64 encoding and pass it to the next\nlayer",
                       "from": {
                         "activity_id": "2026763864005979273",
-                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::send(std::string &&)",
                         "participant_id": "1673261195873192383"
                       },
                       "name": "encode(std::string &&)",
@@ -246,7 +320,6 @@ int tmain()
                       },
                       "to": {
                         "activity_id": "1468258269466480773",
-                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::encode(std::string &&)",
                         "participant_id": "1673261195873192383"
                       },
                       "type": "message"
@@ -254,7 +327,6 @@ int tmain()
                     {
                       "from": {
                         "activity_id": "1468258269466480773",
-                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::encode(std::string &&)",
                         "participant_id": "1673261195873192383"
                       },
                       "name": "",
@@ -268,7 +340,6 @@ int tmain()
                       },
                       "to": {
                         "activity_id": "1362646431260879440",
-                        "activity_name": "clanguml::t20029::encode_b64(std::string &&)",
                         "participant_id": "1362646431260879440"
                       },
                       "type": "message"
@@ -276,7 +347,6 @@ int tmain()
                     {
                       "from": {
                         "activity_id": "2026763864005979273",
-                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::send(std::string &&)",
                         "participant_id": "1673261195873192383"
                       },
                       "name": "send(std::string &&)",
@@ -290,7 +360,6 @@ int tmain()
                       },
                       "to": {
                         "activity_id": "30515971485361302",
-                        "activity_name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>::send(std::string &&)",
                         "participant_id": "658058855590948094"
                       },
                       "type": "message"
@@ -306,7 +375,6 @@ int tmain()
                                 {
                                   "from": {
                                     "activity_id": "30515971485361302",
-                                    "activity_name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>::send(std::string &&)",
                                     "participant_id": "658058855590948094"
                                   },
                                   "name": "send(const std::string &)",
@@ -320,7 +388,6 @@ int tmain()
                                   },
                                   "to": {
                                     "activity_id": "972625940114169157",
-                                    "activity_name": "clanguml::t20029::ConnectionPool::send(const std::string &)",
                                     "participant_id": "1896406205097618937"
                                   },
                                   "type": "message"
diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg
index 3445eb7c..e106d422 100644
--- a/docs/test_cases/t20029_sequence.svg
+++ b/docs/test_cases/t20029_sequence.svg
@@ -1,136 +1,142 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="727px" preserveAspectRatio="none" style="width:937px;height:727px;background:#FFFFFF;" version="1.1" viewBox="0 0 937 727" width="937px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="740px" preserveAspectRatio="none" style="width:1064px;height:740px;" version="1.1" viewBox="0 0 1064 740" width="1064px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f404tswkdv0mx" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="634.8002" style="stroke:#181818;stroke-width:1.0;" width="10" x="94.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="380.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="255" y="279.6"/>
-    <rect fill="#FFFFFF" height="53" style="stroke:#181818;stroke-width:1.0;" width="10" x="260" y="384.0001"/>
-    <rect fill="#FFFFFF" height="172.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="472.5" y="473.6001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="652.5" y="119.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="652.5" y="603.6002"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="813" y="403.0001"/>
-    <rect fill="none" height="458.8002" style="stroke:#000000;stroke-width:1.5;" width="881.5" x="50" y="215.8"/>
-    <rect fill="none" height="427.2002" style="stroke:#000000;stroke-width:1.5;" width="861.5" x="60" y="240.4"/>
-    <rect fill="none" height="92.8" style="stroke:#000000;stroke-width:1.5;" width="363.5" x="371" y="539.8001"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="343.5" x="381" y="564.4001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="99" x2="99" y1="36.7999" y2="691.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="260" x2="260" y1="36.7999" y2="691.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="477" x2="477" y1="36.7999" y2="691.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="657.5" x2="657.5" y1="36.7999" y2="691.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="817.5" x2="817.5" y1="36.7999" y2="691.6002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="70" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="77" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="70" y="690.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="77" y="710.6061">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="460.7266" style="stroke: #000000; stroke-width: 2.0;" width="993" x="60" y="222.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="426" y="550.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="113" x2="113" y1="38.2969" y2="700.6875"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="296" x2="296" y1="38.2969" y2="700.6875"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="545" x2="545" y1="38.2969" y2="700.6875"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="745" x2="745" y1="38.2969" y2="700.6875"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="926" x2="926" y1="38.2969" y2="700.6875"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="87" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="699.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="87" y="719.6826">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="242" x="139" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="228" x="146" y="25.0059">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="242" x="139" y="690.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="228" x="146" y="710.6061">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="163" y="22.9951">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="699.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="163" y="719.6826">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L25" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L25" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="173" x="391" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="398" y="25.0059">Retrier&lt;ConnectionPool&gt;</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="173" x="391" y="690.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="159" x="398" y="710.6061">Retrier&lt;ConnectionPool&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L25" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L25" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="453" y="22.9951">Retrier&lt;ConnectionPool&gt;</text>
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="699.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="453" y="719.6826">Retrier&lt;ConnectionPool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L43" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L43" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="600.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="607.5" y="25.0059">ConnectionPool</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="114" x="600.5" y="690.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="100" x="607.5" y="710.6061">ConnectionPool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L43" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L43" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="688" y="22.9951">ConnectionPool</text>
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="699.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="688" y="719.6826">ConnectionPool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="187" x="724.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="731.5" y="25.0059">encode_b64(std::string &amp;&amp;)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="187" x="724.5" y="690.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="173" x="731.5" y="710.6061">encode_b64(std::string &amp;&amp;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="826" y="22.9951">encode_b64(std::string &amp;&amp;)</text>
+      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="699.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="826" y="719.6826">encode_b64(std::string &amp;&amp;)</text>
     </a>
-    <rect fill="#FFFFFF" height="634.8002" style="stroke:#181818;stroke-width:1.0;" width="10" x="94.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="380.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="255" y="279.6"/>
-    <rect fill="#FFFFFF" height="53" style="stroke:#181818;stroke-width:1.0;" width="10" x="260" y="384.0001"/>
-    <rect fill="#FFFFFF" height="172.0001" style="stroke:#181818;stroke-width:1.0;" width="10" x="472.5" y="473.6001"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="652.5" y="119.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="652.5" y="603.6002"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="813" y="403.0001"/>
-    <path d="M5,51.7999 L5,92.7999 L194,92.7999 L194,61.7999 L184,51.7999 L5,51.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M184,51.7999 L184,61.7999 L194,61.7999 L184,51.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="158" x="11" y="68.8769">Establish connection to the</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="168" x="11" y="84.477">remote server synchronously</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="640.5,115.6,650.5,119.6,640.5,123.6,644.5,119.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="104.5" x2="646.5" y1="119.6" y2="119.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="111.5" y="114.077">connect()</text>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
+    <path d="M8,53.2969 L8,93.2969 L215,93.2969 L215,63.2969 L205,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f404tswkdv0mx)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M205,53.2969 L205,63.2969 L215,63.2969 L205,53.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="173" x="14" y="70.3638">Establish connection to the</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="186" x="14" y="85.4966">remote server synchronously</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="728,119.6953,738,123.6953,728,127.6953,732,123.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="118" x2="734" y1="123.6953" y2="123.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="125" y="118.6294">connect()</text>
     </a>
-    <path d="M13,162.6 L13,203.6 L186,203.6 L186,172.6 L176,162.6 L13,162.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M176,162.6 L176,172.6 L186,172.6 L176,162.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="152" x="19" y="179.677">Repeat for each line in the</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="19" y="195.277">input stream</text>
-    <path d="M50,215.8 L123,215.8 L123,223.4 L113,233.4 L50,233.4 L50,215.8 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="458.8002" style="stroke:#000000;stroke-width:1.5;" width="881.5" x="50" y="215.8"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="65" y="228.877">loop</text>
-    <path d="M60,240.4 L120,240.4 L120,248 L110,258 L60,258 L60,240.4 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="427.2002" style="stroke:#000000;stroke-width:1.5;" width="861.5" x="60" y="240.4"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="75" y="253.477">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="243,275.6,253,279.6,243,283.6,247,279.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="104.5" x2="249" y1="279.6" y2="279.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="111.5" y="274.077">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="116" x="115.5" y="274.077">send(std::string &amp;&amp;)</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="231.5" y="274.077">]</text>
+    <path d="M17,166.6953 L17,206.6953 L205,206.6953 L205,176.6953 L195,166.6953 L17,166.6953 " fill="#FBFB77" filter="url(#f404tswkdv0mx)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M195,166.6953 L195,176.6953 L205,176.6953 L195,166.6953 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="167" x="23" y="183.7622">Repeat for each line in the</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="23" y="198.895">input stream</text>
+    <path d="M60,222.9609 L137,222.9609 L137,229.9609 L127,239.9609 L60,239.9609 L60,222.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="460.7266" style="stroke: #000000; stroke-width: 2.0;" width="993" x="60" y="222.9609"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="236.0278">loop</text>
+    <path d="M70,247.0938 L134,247.0938 L134,254.0938 L124,264.0938 L70,264.0938 L70,247.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85" y="260.1606">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="279,281.3594,289,285.3594,279,289.3594,283,285.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="118" x2="285" y1="285.3594" y2="285.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="125" y="280.2935">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="131" y="280.2935">send(std::string &amp;&amp;)</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="262" y="280.2935">]</text>
     </a>
-    <path d="M170,292.6 L170,348.6 L349,348.6 L349,302.6 L339,292.6 L170,292.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M339,292.6 L339,302.6 L349,302.6 L339,292.6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="158" x="176" y="309.677">Encode the message using</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="157" x="176" y="325.2771">Base64 encoding and pass</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="105" x="176" y="340.8771">it to the next layer</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="265" x2="312" y1="371.0001" y2="371.0001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="312" x2="312" y1="371.0001" y2="384.0001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="271" x2="312" y1="384.0001" y2="384.0001"/>
-      <polygon fill="#181818" points="281,380.0001,271,384.0001,281,388.0001,277,384.0001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="130" x="277" y="365.4771">encode(std::string &amp;&amp;)</text>
+    <path d="M197,298.3594 L197,353.3594 L391,353.3594 L391,308.3594 L381,298.3594 L197,298.3594 " fill="#FBFB77" filter="url(#f404tswkdv0mx)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M381,298.3594 L381,308.3594 L391,308.3594 L381,298.3594 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="173" x="203" y="315.4263">Encode the message using</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="172" x="203" y="330.5591">Base64 encoding and pass</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="117" x="203" y="345.6919">it to the next layer</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="348" y1="378.8906" y2="378.8906"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="348" x2="348" y1="378.8906" y2="391.8906"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="307" x2="348" y1="391.8906" y2="391.8906"/>
+      <polygon fill="#A80036" points="317,387.8906,307,391.8906,317,395.8906,313,391.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="147" x="313" y="373.8247">encode(std::string &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="801,399.0001,811,403.0001,801,407.0001,805,403.0001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="270" x2="807" y1="403.0001" y2="403.0001"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="909,406.8906,919,410.8906,909,414.8906,913,410.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="306" x2="915" y1="410.8906" y2="410.8906"/>
     </a>
-    <polygon fill="#181818" points="281,413.0001,271,417.0001,281,421.0001,277,417.0001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="275" x2="817" y1="417.0001" y2="417.0001"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="270" x2="312" y1="436.0001" y2="436.0001"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="312" x2="312" y1="436.0001" y2="449.0001"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="265" x2="312" y1="449.0001" y2="449.0001"/>
-    <polygon fill="#181818" points="275,445.0001,265,449.0001,275,453.0001,271,449.0001" style="stroke:#181818;stroke-width:1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="460.5,469.6001,470.5,473.6001,460.5,477.6001,464.5,473.6001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="265" x2="466.5" y1="473.6001" y2="473.6001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="116" x="272" y="468.0771">send(std::string &amp;&amp;)</text>
+    <polygon fill="#A80036" points="317,420.8906,307,424.8906,317,428.8906,313,424.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="311" x2="925" y1="424.8906" y2="424.8906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="306" x2="348" y1="443.8906" y2="443.8906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="348" x2="348" y1="443.8906" y2="456.8906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="301" x2="348" y1="456.8906" y2="456.8906"/>
+    <polygon fill="#A80036" points="311,452.8906,301,456.8906,311,460.8906,307,456.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="528,477.0234,538,481.0234,528,485.0234,532,481.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="534" y1="481.0234" y2="481.0234"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="308" y="475.9575">send(std::string &amp;&amp;)</text>
     </a>
-    <path d="M382,486.6001 L382,527.6001 L572,527.6001 L572,496.6001 L562,486.6001 L382,486.6001 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M562,486.6001 L562,496.6001 L572,496.6001 L562,486.6001 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="169" x="388" y="503.6771">Repeat until send() succeeds</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="151" x="388" y="519.2771">or retry count is exceeded</text>
-    <path d="M371,539.8001 L444,539.8001 L444,547.4001 L434,557.4001 L371,557.4001 L371,539.8001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="92.8" style="stroke:#000000;stroke-width:1.5;" width="363.5" x="371" y="539.8001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="386" y="552.8771">loop</text>
-    <path d="M381,564.4001 L441,564.4001 L441,572.0002 L431,582.0002 L381,582.0002 L381,564.4001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="343.5" x="381" y="564.4001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="396" y="577.4772">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20029/t20029.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="640.5,599.6002,650.5,603.6002,640.5,607.6002,644.5,603.6002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="482.5" x2="646.5" y1="603.6002" y2="603.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="489.5" y="598.0772">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="143" x="493.5" y="598.0772">send(const std::string &amp;)</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="636.5" y="598.0772">]</text>
+    <path d="M440,494.0234 L440,534.0234 L646,534.0234 L646,504.0234 L636,494.0234 L440,494.0234 " fill="#FBFB77" filter="url(#f404tswkdv0mx)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M636,494.0234 L636,504.0234 L646,504.0234 L636,494.0234 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="446" y="511.0903">Repeat until send() succeeds</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="167" x="446" y="526.2231">or retry count is exceeded</text>
+    <path d="M426,550.2891 L503,550.2891 L503,557.2891 L493,567.2891 L426,567.2891 L426,550.2891 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="426" y="550.2891"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="441" y="563.356">loop</text>
+    <path d="M436,574.4219 L500,574.4219 L500,581.4219 L490,591.4219 L436,591.4219 L436,574.4219 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="451" y="587.4888">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="728,608.6875,738,612.6875,728,616.6875,732,612.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="550" x2="734" y1="612.6875" y2="612.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="557" y="607.6216">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="159" x="563" y="607.6216">send(const std::string &amp;)</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="722" y="607.6216">]</text>
     </a>
-    <polygon fill="#181818" points="493.5,613.6002,483.5,617.6002,493.5,621.6002,489.5,617.6002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="487.5" x2="656.5" y1="617.6002" y2="617.6002"/>
-    <polygon fill="#181818" points="276,641.6002,266,645.6002,276,649.6002,272,645.6002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="270" x2="476.5" y1="645.6002" y2="645.6002"/>
-    <polygon fill="#181818" points="115.5,655.6002,105.5,659.6002,115.5,663.6002,111.5,659.6002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="109.5" x2="259" y1="659.6002" y2="659.6002"/>
+    <polygon fill="#A80036" points="561,622.6875,551,626.6875,561,630.6875,557,626.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="555" x2="744" y1="626.6875" y2="626.6875"/>
+    <polygon fill="#A80036" points="312,650.6875,302,654.6875,312,658.6875,308,654.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="306" x2="544" y1="654.6875" y2="654.6875"/>
+    <polygon fill="#A80036" points="129,664.6875,119,668.6875,129,672.6875,125,668.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="123" x2="295" y1="668.6875" y2="668.6875"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20029_sequence_mermaid.svg b/docs/test_cases/t20029_sequence_mermaid.svg
index 1938095e..262a0097 100644
--- a/docs/test_cases/t20029_sequence_mermaid.svg
+++ b/docs/test_cases/t20029_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -216,26 +216,26 @@
       <tspan x="594.75">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="144" x="458">connect()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="175" x2="835" y1="175" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="202">[send(std::string &amp;&amp;)]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="324.5" y1="335" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="144" x="460">connect()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="175" x2="839" y1="175" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="304" x="204">[send(std::string &amp;&amp;)]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="335" x2="328.5" y1="335" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="431" x="334">encode(std::string &amp;&amp;)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 333.5,462 C 393.5,452 393.5,492 333.5,482"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="507" x="700">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="502" x2="1060.5" y1="502" x1="338.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="517" x="701">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="512" x2="341.5" y1="512" x1="1059.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="507" x="702">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="502" x2="1064.5" y1="502" x1="338.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="517" x="699">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="512" x2="338.5" y1="512" x1="1059.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="527" x="339">​</text>
   <path style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" d="M 338.5,522 C 398.5,512 398.5,552 338.5,542"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="567" x="465">send(std::string &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="598" x2="596" y1="598" x1="333.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="727" x="720">[send(const std::string &amp;)]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="758" x2="835" y1="758" x1="605"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="773" x="721">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="768" x2="608" y1="768" x1="834"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="815" x="466">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="810" x2="336.5" y1="810" x1="595"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="825" x="203">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="820" x2="83" y1="820" x1="323.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="567" x="467">send(std::string &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="598" x2="600" y1="598" x1="333.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="727" x="722">[send(const std::string &amp;)]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="758" x2="839" y1="758" x1="605"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="773" x="720">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="768" x2="605" y1="768" x1="834"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="815" x="464">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="810" x2="333.5" y1="810" x1="595"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="825" x="202">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="820" x2="80" y1="820" x1="323.5"/>
 </svg>
diff --git a/docs/test_cases/t20030.md b/docs/test_cases/t20030.md
index 769f29df..1046ed4f 100644
--- a/docs/test_cases/t20030.md
+++ b/docs/test_cases/t20030.md
@@ -80,8 +80,10 @@ int tmain(bool f, int a)
   "name": "t20030_sequence",
   "participants": [
     {
+      "display_name": "tmain(int)",
       "id": "1264643561983920529",
-      "name": "clanguml::t20030::tmain(int)",
+      "name": "tmain",
+      "namespace": "clanguml::t20030",
       "source_location": {
         "column": 6,
         "file": "t20030.cc",
@@ -91,8 +93,10 @@ int tmain(bool f, int a)
       "type": "function"
     },
     {
+      "display_name": "magic()",
       "id": "1038740565367213967",
-      "name": "clanguml::t20030::magic()",
+      "name": "magic",
+      "namespace": "clanguml::t20030",
       "source_location": {
         "column": 5,
         "file": "t20030.cc",
@@ -102,8 +106,116 @@ int tmain(bool f, int a)
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "A(int)",
+          "id": "2192298168642377389",
+          "name": "A",
+          "namespace": "",
+          "source_location": {
+            "column": 5,
+            "file": "t20030.cc",
+            "line": 10,
+            "translation_unit": "t20030.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "operator+=(int)",
+          "id": "2032167997122548080",
+          "name": "operator+=",
+          "namespace": "",
+          "source_location": {
+            "column": 8,
+            "file": "t20030.cc",
+            "line": 18,
+            "translation_unit": "t20030.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "add(int)",
+          "id": "2174827432067616124",
+          "name": "add",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20030.cc",
+            "line": 29,
+            "translation_unit": "t20030.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "A()",
+          "id": "32184916294885915",
+          "name": "A",
+          "namespace": "",
+          "source_location": {
+            "column": 5,
+            "file": "t20030.cc",
+            "line": 8,
+            "translation_unit": "t20030.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "create()",
+          "id": "890578100069139188",
+          "name": "create",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20030.cc",
+            "line": 27,
+            "translation_unit": "t20030.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "operator=(const A &)",
+          "id": "1796303685088700396",
+          "name": "operator=",
+          "namespace": "",
+          "source_location": {
+            "column": 8,
+            "file": "t20030.cc",
+            "line": 12,
+            "translation_unit": "t20030.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "set(int)",
+          "id": "2212978510776223413",
+          "name": "set",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20030.cc",
+            "line": 30,
+            "translation_unit": "t20030.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "value() const",
+          "id": "1754957340376276968",
+          "name": "value",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20030.cc",
+            "line": 24,
+            "translation_unit": "t20030.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1081707114848460702",
-      "name": "clanguml::t20030::A",
+      "name": "A",
+      "namespace": "clanguml::t20030",
       "source_location": {
         "column": 7,
         "file": "t20030.cc",
@@ -113,8 +225,10 @@ int tmain(bool f, int a)
       "type": "class"
     },
     {
+      "display_name": "tmain(bool,int)",
       "id": "36090614888670483",
-      "name": "clanguml::t20030::tmain(bool,int)",
+      "name": "tmain",
+      "namespace": "clanguml::t20030",
       "source_location": {
         "column": 5,
         "file": "t20030.cc",
@@ -130,9 +244,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "1264643561983920529",
-            "activity_name": "clanguml::t20030::tmain(int)",
-            "participant_id": "1264643561983920529",
-            "participant_name": "clanguml::t20030::tmain(int)"
+            "participant_id": "1264643561983920529"
           },
           "name": "",
           "return_type": "int",
@@ -145,7 +257,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "1038740565367213967",
-            "activity_name": "clanguml::t20030::magic()",
             "participant_id": "1038740565367213967"
           },
           "type": "message"
@@ -153,9 +264,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "1264643561983920529",
-            "activity_name": "clanguml::t20030::tmain(int)",
-            "participant_id": "1264643561983920529",
-            "participant_name": "clanguml::t20030::tmain(int)"
+            "participant_id": "1264643561983920529"
           },
           "name": "A(int)",
           "return_type": "void",
@@ -168,7 +277,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "2192298168642377389",
-            "activity_name": "clanguml::t20030::A::A(int)",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -176,9 +284,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "1264643561983920529",
-            "activity_name": "clanguml::t20030::tmain(int)",
-            "participant_id": "1264643561983920529",
-            "participant_name": "clanguml::t20030::tmain(int)"
+            "participant_id": "1264643561983920529"
           },
           "name": "operator+=(int)",
           "return_type": "A &",
@@ -191,7 +297,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "2032167997122548080",
-            "activity_name": "clanguml::t20030::A::operator+=(int)",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -199,7 +304,6 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "2032167997122548080",
-            "activity_name": "clanguml::t20030::A::operator+=(int)",
             "participant_id": "1081707114848460702"
           },
           "name": "add(int)",
@@ -213,7 +317,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "2174827432067616124",
-            "activity_name": "clanguml::t20030::A::add(int)",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -229,9 +332,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "36090614888670483",
-            "activity_name": "clanguml::t20030::tmain(bool,int)",
-            "participant_id": "36090614888670483",
-            "participant_name": "clanguml::t20030::tmain(bool,int)"
+            "participant_id": "36090614888670483"
           },
           "name": "A()",
           "return_type": "void",
@@ -244,7 +345,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "32184916294885915",
-            "activity_name": "clanguml::t20030::A::A()",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -252,7 +352,6 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "32184916294885915",
-            "activity_name": "clanguml::t20030::A::A()",
             "participant_id": "1081707114848460702"
           },
           "name": "create()",
@@ -266,7 +365,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "890578100069139188",
-            "activity_name": "clanguml::t20030::A::create()",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -274,9 +372,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "36090614888670483",
-            "activity_name": "clanguml::t20030::tmain(bool,int)",
-            "participant_id": "36090614888670483",
-            "participant_name": "clanguml::t20030::tmain(bool,int)"
+            "participant_id": "36090614888670483"
           },
           "name": "A()",
           "return_type": "void",
@@ -289,7 +385,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "32184916294885915",
-            "activity_name": "clanguml::t20030::A::A()",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -297,9 +392,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "36090614888670483",
-            "activity_name": "clanguml::t20030::tmain(bool,int)",
-            "participant_id": "36090614888670483",
-            "participant_name": "clanguml::t20030::tmain(bool,int)"
+            "participant_id": "36090614888670483"
           },
           "name": "operator+=(int)",
           "return_type": "A &",
@@ -312,7 +405,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "2032167997122548080",
-            "activity_name": "clanguml::t20030::A::operator+=(int)",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -320,7 +412,6 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "2032167997122548080",
-            "activity_name": "clanguml::t20030::A::operator+=(int)",
             "participant_id": "1081707114848460702"
           },
           "name": "add(int)",
@@ -334,7 +425,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "2174827432067616124",
-            "activity_name": "clanguml::t20030::A::add(int)",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -342,9 +432,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "36090614888670483",
-            "activity_name": "clanguml::t20030::tmain(bool,int)",
-            "participant_id": "36090614888670483",
-            "participant_name": "clanguml::t20030::tmain(bool,int)"
+            "participant_id": "36090614888670483"
           },
           "name": "operator=(const A &)",
           "return_type": "A &",
@@ -357,7 +445,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "1796303685088700396",
-            "activity_name": "clanguml::t20030::A::operator=(const A &)",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -365,7 +452,6 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "1796303685088700396",
-            "activity_name": "clanguml::t20030::A::operator=(const A &)",
             "participant_id": "1081707114848460702"
           },
           "name": "set(int)",
@@ -379,7 +465,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "2212978510776223413",
-            "activity_name": "clanguml::t20030::A::set(int)",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
@@ -387,9 +472,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "36090614888670483",
-            "activity_name": "clanguml::t20030::tmain(bool,int)",
-            "participant_id": "36090614888670483",
-            "participant_name": "clanguml::t20030::tmain(bool,int)"
+            "participant_id": "36090614888670483"
           },
           "name": "value() const",
           "return_type": "int",
@@ -402,7 +485,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "1754957340376276968",
-            "activity_name": "clanguml::t20030::A::value() const",
             "participant_id": "1081707114848460702"
           },
           "type": "message"
diff --git a/docs/test_cases/t20030_sequence.svg b/docs/test_cases/t20030_sequence.svg
index 79bc502d..9bb0ff87 100644
--- a/docs/test_cases/t20030_sequence.svg
+++ b/docs/test_cases/t20030_sequence.svg
@@ -1,149 +1,155 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="776px" preserveAspectRatio="none" style="width:381px;height:776px;background:#FFFFFF;" version="1.1" viewBox="0 0 381 776" width="381px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="777px" preserveAspectRatio="none" style="width:427px;height:777px;" version="1.1" viewBox="0 0 427 777" width="427px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fqdkzjffhj3sa" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="195.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="37" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="115" y="52.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="96.3999"/>
-    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="156"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="193.6"/>
-    <rect fill="#FFFFFF" height="65.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="272.2"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="309.8"/>
-    <rect fill="#FFFFFF" height="65.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="374.4"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="412"/>
-    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="476.6"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="514.2001"/>
-    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="592.8001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="630.4001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="709.0001"/>
-    <rect fill="#FFFFFF" height="480.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="317.5" y="242.6"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="42" x2="42" y1="36.7999" y2="741.0001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="120" x2="120" y1="36.7999" y2="741.0001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="172" x2="172" y1="36.7999" y2="741.0001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="322" x2="322" y1="36.7999" y2="741.0001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="12" y="25.0059">tmain(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="5" y="740.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="12" y="760.006">tmain(int)</text>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="736.8906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="736.8906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="193" x2="193" y1="38.2969" y2="736.8906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="361" x2="361" y1="38.2969" y2="736.8906"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
+      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="735.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="755.8857">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="89" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="96" y="25.0059">magic()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="89" y="740.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="96" y="760.006">magic()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
+      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="735.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="755.8857">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="161" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="168" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="161" y="740.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="168" y="760.006">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="735.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="755.8857">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="270" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="277" y="25.0059">tmain(bool,int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="270" y="740.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="277" y="760.006">tmain(bool,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="22.9951">tmain(bool,int)</text>
+      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="735.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="755.8857">tmain(bool,int)</text>
     </a>
-    <rect fill="#FFFFFF" height="195.8" style="stroke:#181818;stroke-width:1.0;" width="10" x="37" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="115" y="52.7999"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="96.3999"/>
-    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="156"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="193.6"/>
-    <rect fill="#FFFFFF" height="65.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="272.2"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="309.8"/>
-    <rect fill="#FFFFFF" height="65.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="374.4"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="412"/>
-    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="476.6"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="514.2001"/>
-    <rect fill="#FFFFFF" height="86.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="592.8001"/>
-    <rect fill="#FFFFFF" height="28" style="stroke:#181818;stroke-width:1.0;" width="10" x="172.5" y="630.4001"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="167.5" y="709.0001"/>
-    <rect fill="#FFFFFF" height="480.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="317.5" y="242.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="103,48.7999,113,52.7999,103,56.7999,107,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="109" y1="52.7999" y2="52.7999"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
     </a>
-    <polygon fill="#181818" points="58,62.7999,48,66.7999,58,70.7999,54,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="52" x2="119" y1="66.7999" y2="66.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="155.5,92.3999,165.5,96.3999,155.5,100.3999,159.5,96.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="161.5" y1="96.3999" y2="96.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="31" x="54" y="90.8769">A(int)</text>
+    <polygon fill="#A80036" points="65.5,64.2969,55.5,68.2969,65.5,72.2969,61.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="59.5" x2="134.5" y1="68.2969" y2="68.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="176.5,93.4297,186.5,97.4297,176.5,101.4297,180.5,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="97.4297" y2="97.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="61.5" y="92.3638">A(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="155.5,152,165.5,156,155.5,160,159.5,156" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="161.5" y1="156" y2="156"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="54" y="150.477">operator+=(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="176.5,152.5625,186.5,156.5625,176.5,160.5625,180.5,156.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="156.5625" y2="156.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="61.5" y="151.4966">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="185.6" y2="185.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="185.6" y2="198.6"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="198.6" y2="198.6"/>
-      <polygon fill="#181818" points="193.5,194.6,183.5,198.6,193.5,202.6,189.5,198.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="189.5" y="180.077">add(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="185.6953" y2="185.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="185.6953" y2="198.6953"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="198.6953" y2="198.6953"/>
+      <polygon fill="#A80036" points="214.5,194.6953,204.5,198.6953,214.5,202.6953,210.5,198.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="210.5" y="180.6294">add(int)</text>
     </a>
-    <polygon fill="#181818" points="53,238.6,43,242.6,53,246.6,49,242.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="47" x2="171.5" y1="242.6" y2="242.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="188.5,268.2,178.5,272.2,188.5,276.2,184.5,272.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="272.2" y2="272.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="194.5" y="266.677">A()</text>
+    <polygon fill="#A80036" points="60.5,238.6953,50.5,242.6953,60.5,246.6953,56.5,242.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="192.5" y1="242.6953" y2="242.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="209.5,267.8281,199.5,271.8281,209.5,275.8281,205.5,271.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="271.8281" y2="271.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="266.7622">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="301.8" y2="301.8"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="301.8" y2="314.8"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="314.8" y2="314.8"/>
-      <polygon fill="#181818" points="193.5,310.8,183.5,314.8,193.5,318.8,189.5,314.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="189.5" y="296.277">create()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="300.9609" y2="300.9609"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="300.9609" y2="313.9609"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="313.9609" y2="313.9609"/>
+      <polygon fill="#A80036" points="214.5,309.9609,204.5,313.9609,214.5,317.9609,210.5,313.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="295.895">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="188.5,370.4,178.5,374.4,188.5,378.4,184.5,374.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="374.4" y2="374.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="194.5" y="368.877">A()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="209.5,369.0938,199.5,373.0938,209.5,377.0938,205.5,373.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="373.0938" y2="373.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="368.0278">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="404" y2="404"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="404" y2="417"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="417" y2="417"/>
-      <polygon fill="#181818" points="193.5,413,183.5,417,193.5,421,189.5,417" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="189.5" y="398.477">create()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="402.2266" y2="402.2266"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="402.2266" y2="415.2266"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="415.2266" y2="415.2266"/>
+      <polygon fill="#A80036" points="214.5,411.2266,204.5,415.2266,214.5,419.2266,210.5,415.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="397.1606">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="188.5,472.6,178.5,476.6,188.5,480.6,184.5,476.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="476.6" y2="476.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="194.5" y="471.077">operator+=(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="209.5,470.3594,199.5,474.3594,209.5,478.3594,205.5,474.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="474.3594" y2="474.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="215.5" y="469.2935">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="506.2001" y2="506.2001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="506.2001" y2="519.2001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="519.2001" y2="519.2001"/>
-      <polygon fill="#181818" points="193.5,515.2001,183.5,519.2001,193.5,523.2001,189.5,519.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="189.5" y="500.677">add(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="503.4922" y2="503.4922"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="503.4922" y2="516.4922"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="516.4922" y2="516.4922"/>
+      <polygon fill="#A80036" points="214.5,512.4922,204.5,516.4922,214.5,520.4922,210.5,516.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="210.5" y="498.4263">add(int)</text>
     </a>
-    <polygon fill="#181818" points="305.5,559.2001,315.5,563.2001,305.5,567.2001,309.5,563.2001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="172.5" x2="311.5" y1="563.2001" y2="563.2001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="188.5,588.8001,178.5,592.8001,188.5,596.8001,184.5,592.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="592.8001" y2="592.8001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="121" x="194.5" y="587.2771">operator=(const A &amp;)</text>
+    <polygon fill="#A80036" points="344.5,556.4922,354.5,560.4922,344.5,564.4922,348.5,560.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="560.4922" y2="560.4922"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="209.5,585.625,199.5,589.625,209.5,593.625,205.5,589.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="589.625" y2="589.625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="215.5" y="584.5591">operator=(const A &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="224.5" y1="622.4001" y2="622.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="224.5" x2="224.5" y1="622.4001" y2="635.4001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="183.5" x2="224.5" y1="635.4001" y2="635.4001"/>
-      <polygon fill="#181818" points="193.5,631.4001,183.5,635.4001,193.5,639.4001,189.5,635.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="40" x="189.5" y="616.8771">set(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="618.7578" y2="618.7578"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="618.7578" y2="631.7578"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="631.7578" y2="631.7578"/>
+      <polygon fill="#A80036" points="214.5,627.7578,204.5,631.7578,214.5,635.7578,210.5,631.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="210.5" y="613.6919">set(int)</text>
     </a>
-    <polygon fill="#181818" points="305.5,675.4001,315.5,679.4001,305.5,683.4001,309.5,679.4001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="172.5" x2="311.5" y1="679.4001" y2="679.4001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="188.5,705.0001,178.5,709.0001,188.5,713.0001,184.5,709.0001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="182.5" x2="316.5" y1="709.0001" y2="709.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="75" x="194.5" y="703.4771">value() const</text>
+    <polygon fill="#A80036" points="344.5,671.7578,354.5,675.7578,344.5,679.7578,348.5,675.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="675.7578" y2="675.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="209.5,700.8906,199.5,704.8906,209.5,708.8906,205.5,704.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="704.8906" y2="704.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="215.5" y="699.8247">value() const</text>
     </a>
-    <polygon fill="#181818" points="310.5,719.0001,320.5,723.0001,310.5,727.0001,314.5,723.0001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="172.5" x2="316.5" y1="723.0001" y2="723.0001"/>
+    <polygon fill="#A80036" points="349.5,714.8906,359.5,718.8906,349.5,722.8906,353.5,718.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="355.5" y1="718.8906" y2="718.8906"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20030_sequence_mermaid.svg b/docs/test_cases/t20030_sequence_mermaid.svg
index 5fd85c74..13ec0fcc 100644
--- a/docs/test_cases/t20030_sequence_mermaid.svg
+++ b/docs/test_cases/t20030_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -142,40 +142,40 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="821" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="83" y1="85" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="276">A(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="471" y1="131" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="276">operator+=(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="177" x2="471" y1="177" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="80" y1="85" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="278">A(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="475" y1="131" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="278">operator+=(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="177" x2="475" y1="177" x1="80"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="192" x="480">add(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,223 C 540,213 540,253 480,243"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="268" x="277">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="263" x2="83" y1="263" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="278" x="578">A()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="309" x2="479" y1="309" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="268" x="275">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="263" x2="80" y1="263" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="278" x="576">A()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="309" x2="475" y1="309" x1="677"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="324" x="480">create()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,355 C 540,345 540,385 480,375"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="400" x="578">A()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="431" x2="479" y1="431" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="400" x="576">A()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="431" x2="475" y1="431" x1="677"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="446" x="480">create()</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,477 C 540,467 540,507 480,497"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="522" x="578">operator+=(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="553" x2="479" y1="553" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="522" x="576">operator+=(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="553" x2="475" y1="553" x1="677"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="568" x="480">add(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,599 C 540,589 540,629 480,619"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="644" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="639" x2="674" y1="639" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="654" x="578">operator=(const A &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="685" x2="479" y1="685" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="644" x="579">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="639" x2="677" y1="639" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="654" x="576">operator=(const A &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="685" x2="475" y1="685" x1="677"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="700" x="480">set(int)</text>
   <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 480,731 C 540,721 540,761 480,751"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="771" x2="674" y1="771" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="786" x="578">value() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="817" x2="479" y1="817" x1="677"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="832" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="827" x2="674" y1="827" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="579">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="771" x2="677" y1="771" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="786" x="576">value() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="817" x2="475" y1="817" x1="677"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="832" x="579">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="827" x2="677" y1="827" x1="480"/>
 </svg>
diff --git a/docs/test_cases/t20031.md b/docs/test_cases/t20031.md
index 87b24b2c..90ac6d95 100644
--- a/docs/test_cases/t20031.md
+++ b/docs/test_cases/t20031.md
@@ -96,8 +96,10 @@ int tmain(bool f, int a)
   "name": "t20031_sequence",
   "participants": [
     {
+      "display_name": "tmain(int)",
       "id": "1045973591033429178",
-      "name": "clanguml::t20031::tmain(int)",
+      "name": "tmain",
+      "namespace": "clanguml::t20031",
       "source_location": {
         "column": 6,
         "file": "t20031.cc",
@@ -107,8 +109,10 @@ int tmain(bool f, int a)
       "type": "function"
     },
     {
+      "display_name": "magic()",
       "id": "2265790048300959619",
-      "name": "clanguml::t20031::magic()",
+      "name": "magic",
+      "namespace": "clanguml::t20031",
       "source_location": {
         "column": 5,
         "file": "t20031.cc",
@@ -118,8 +122,10 @@ int tmain(bool f, int a)
       "type": "function"
     },
     {
+      "display_name": "tmain(bool,int)",
       "id": "2189754495514350927",
-      "name": "clanguml::t20031::tmain(bool,int)",
+      "name": "tmain",
+      "namespace": "clanguml::t20031",
       "source_location": {
         "column": 5,
         "file": "t20031.cc",
@@ -129,8 +135,10 @@ int tmain(bool f, int a)
       "type": "function"
     },
     {
+      "display_name": "execute(std::function<int ()>)",
       "id": "2230160420908832598",
-      "name": "clanguml::t20031::execute(std::function<int ()>)",
+      "name": "execute",
+      "namespace": "clanguml::t20031",
       "source_location": {
         "column": 5,
         "file": "t20031.cc",
@@ -140,8 +148,25 @@ int tmain(bool f, int a)
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "value() const",
+          "id": "1089278431155817348",
+          "name": "value",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20031.cc",
+            "line": 28,
+            "translation_unit": "t20031.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1081580052625775404",
-      "name": "clanguml::t20031::A",
+      "name": "A",
+      "namespace": "clanguml::t20031",
       "source_location": {
         "column": 7,
         "file": "t20031.cc",
@@ -157,9 +182,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "1045973591033429178",
-            "activity_name": "clanguml::t20031::tmain(int)",
-            "participant_id": "1045973591033429178",
-            "participant_name": "clanguml::t20031::tmain(int)"
+            "participant_id": "1045973591033429178"
           },
           "name": "",
           "return_type": "int",
@@ -172,7 +195,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "2265790048300959619",
-            "activity_name": "clanguml::t20031::magic()",
             "participant_id": "2265790048300959619"
           },
           "type": "message"
@@ -188,9 +210,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "2189754495514350927",
-            "activity_name": "clanguml::t20031::tmain(bool,int)",
-            "participant_id": "2189754495514350927",
-            "participant_name": "clanguml::t20031::tmain(bool,int)"
+            "participant_id": "2189754495514350927"
           },
           "name": "",
           "return_type": "int",
@@ -203,7 +223,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "2230160420908832598",
-            "activity_name": "clanguml::t20031::execute(std::function<int ()>)",
             "participant_id": "2230160420908832598"
           },
           "type": "message"
@@ -211,9 +230,7 @@ int tmain(bool f, int a)
         {
           "from": {
             "activity_id": "2189754495514350927",
-            "activity_name": "clanguml::t20031::tmain(bool,int)",
-            "participant_id": "2189754495514350927",
-            "participant_name": "clanguml::t20031::tmain(bool,int)"
+            "participant_id": "2189754495514350927"
           },
           "name": "value() const",
           "return_type": "int",
@@ -226,7 +243,6 @@ int tmain(bool f, int a)
           },
           "to": {
             "activity_id": "1089278431155817348",
-            "activity_name": "clanguml::t20031::A::value() const",
             "participant_id": "1081580052625775404"
           },
           "type": "message"
diff --git a/docs/test_cases/t20031_sequence.svg b/docs/test_cases/t20031_sequence.svg
index 14adda5a..6b4f7e6a 100644
--- a/docs/test_cases/t20031_sequence.svg
+++ b/docs/test_cases/t20031_sequence.svg
@@ -1,71 +1,77 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="192px" preserveAspectRatio="none" style="width:511px;height:192px;background:#FFFFFF;" version="1.1" viewBox="0 0 511 192" width="511px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="197px" preserveAspectRatio="none" style="width:578px;height:197px;" version="1.1" viewBox="0 0 578 197" width="578px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1i7r8jfvxr6f8" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="20" style="stroke:#181818;stroke-width:1.0;" width="10" x="37" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="115" y="52.7999"/>
-    <rect fill="#FFFFFF" height="71.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="208.5" y="66.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="369" y="80.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="124.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="42" x2="42" y1="36.7999" y2="156.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="120" x2="120" y1="36.7999" y2="156.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="213" x2="213" y1="36.7999" y2="156.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="374" x2="374" y1="36.7999" y2="156.3999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="493" x2="493" y1="36.7999" y2="156.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="12" y="25.0059">tmain(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="74" x="5" y="155.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="12" y="175.4059">tmain(int)</text>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="157.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="157.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="238" x2="238" y1="38.2969" y2="157.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="420" x2="420" y1="38.2969" y2="157.4297"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="557" x2="557" y1="38.2969" y2="157.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="156.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="176.4248">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="89" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="96" y="25.0059">magic()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="62" x="89" y="155.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="48" x="96" y="175.4059">magic()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="156.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="176.4248">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="161" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="168" y="25.0059">tmain(bool,int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="161" y="155.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="168" y="175.4059">tmain(bool,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="22.9951">tmain(bool,int)</text>
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="156.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="176.4248">tmain(bool,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="196" x="276" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="283" y="25.0059">execute(std::function&lt;int ()&gt;)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="196" x="276" y="155.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="182" x="283" y="175.4059">execute(std::function&lt;int ()&gt;)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="22.9951">execute(std::function&lt;int ()&gt;)</text>
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="156.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="176.4248">execute(std::function&lt;int ()&gt;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="482" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="489" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="482" y="155.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="489" y="175.4059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="156.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="176.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" height="20" style="stroke:#181818;stroke-width:1.0;" width="10" x="37" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="115" y="52.7999"/>
-    <rect fill="#FFFFFF" height="71.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="208.5" y="66.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="369" y="80.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="124.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="103,48.7999,113,52.7999,103,56.7999,107,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="109" y1="52.7999" y2="52.7999"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
     </a>
-    <polygon fill="#181818" points="53,62.7999,43,66.7999,53,70.7999,49,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="47" x2="119" y1="66.7999" y2="66.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="357,76.7999,367,80.7999,357,84.7999,361,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="218.5" x2="363" y1="80.7999" y2="80.7999"/>
+    <polygon fill="#A80036" points="60.5,64.2969,50.5,68.2969,60.5,72.2969,56.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="134.5" y1="68.2969" y2="68.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="403.5,78.2969,413.5,82.2969,403.5,86.2969,407.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="409.5" y1="82.2969" y2="82.2969"/>
     </a>
-    <polygon fill="#181818" points="229.5,90.7999,219.5,94.7999,229.5,98.7999,225.5,94.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="223.5" x2="373" y1="94.7999" y2="94.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="476.5,120.3999,486.5,124.3999,476.5,128.3999,480.5,124.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="218.5" x2="482.5" y1="124.3999" y2="124.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="75" x="225.5" y="118.8769">value() const</text>
+    <polygon fill="#A80036" points="254.5,92.2969,244.5,96.2969,254.5,100.2969,250.5,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="248.5" x2="419.5" y1="96.2969" y2="96.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="540.5,121.4297,550.5,125.4297,540.5,129.4297,544.5,125.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="546.5" y1="125.4297" y2="125.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="250.5" y="120.3638">value() const</text>
     </a>
-    <polygon fill="#181818" points="224.5,134.3999,214.5,138.3999,224.5,142.3999,220.5,138.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="218.5" x2="492.5" y1="138.3999" y2="138.3999"/>
+    <polygon fill="#A80036" points="249.5,135.4297,239.5,139.4297,249.5,143.4297,245.5,139.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="243.5" x2="556.5" y1="139.4297" y2="139.4297"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20031_sequence_mermaid.svg b/docs/test_cases/t20031_sequence_mermaid.svg
index 7bf65719..c6200e3a 100644
--- a/docs/test_cases/t20031_sequence_mermaid.svg
+++ b/docs/test_cases/t20031_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -127,16 +127,16 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="155" x="930"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="83" y1="85" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="591">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="701" y1="95" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="110" x="592">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="105" x2="483" y1="105" x1="700"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="120" x="706">value() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="151" x2="931" y1="151" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="166" x="707">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="161" x2="483" y1="161" x1="930"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="85" x2="80" y1="85" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="593">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="705" y1="95" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="110" x="590">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="105" x2="480" y1="105" x1="700"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="120" x="708">value() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="151" x2="935" y1="151" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="166" x="705">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="161" x2="480" y1="161" x1="930"/>
 </svg>
diff --git a/docs/test_cases/t20032.md b/docs/test_cases/t20032.md
index 5bfad6bc..2692af8c 100644
--- a/docs/test_cases/t20032.md
+++ b/docs/test_cases/t20032.md
@@ -56,8 +56,10 @@ void tmain(int argc, char **argv)
   "name": "t20032_sequence",
   "participants": [
     {
+      "display_name": "tmain(int,char **)",
       "id": "2159371207846335450",
-      "name": "clanguml::t20032::tmain(int,char **)",
+      "name": "tmain",
+      "namespace": "clanguml::t20032",
       "source_location": {
         "column": 6,
         "file": "t20032.cc",
@@ -67,8 +69,51 @@ void tmain(int argc, char **argv)
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b(int)",
+          "id": "1775727925274471949",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20032.cc",
+            "line": 11,
+            "translation_unit": "t20032.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b(double)",
+          "id": "404223226092650061",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 12,
+            "file": "t20032.cc",
+            "line": 12,
+            "translation_unit": "t20032.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b(const char *)",
+          "id": "1676684483397143166",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20032.cc",
+            "line": 13,
+            "translation_unit": "t20032.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "775765108342558014",
-      "name": "clanguml::t20032::B",
+      "name": "B",
+      "namespace": "clanguml::t20032",
       "source_location": {
         "column": 8,
         "file": "t20032.cc",
@@ -78,8 +123,51 @@ void tmain(int argc, char **argv)
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1(int)",
+          "id": "913842443932719355",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20032.cc",
+            "line": 5,
+            "translation_unit": "t20032.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2(double)",
+          "id": "1293114170675037977",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 12,
+            "file": "t20032.cc",
+            "line": 6,
+            "translation_unit": "t20032.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a3(const char *)",
+          "id": "2099821524363509275",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 17,
+            "file": "t20032.cc",
+            "line": 7,
+            "translation_unit": "t20032.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1674177120713592616",
-      "name": "clanguml::t20032::A",
+      "name": "A",
+      "namespace": "clanguml::t20032",
       "source_location": {
         "column": 8,
         "file": "t20032.cc",
@@ -95,9 +183,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "2159371207846335450",
-            "activity_name": "clanguml::t20032::tmain(int,char **)",
-            "participant_id": "2159371207846335450",
-            "participant_name": "clanguml::t20032::tmain(int,char **)"
+            "participant_id": "2159371207846335450"
           },
           "name": "b(int)",
           "return_type": "int",
@@ -110,7 +196,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1775727925274471949",
-            "activity_name": "clanguml::t20032::B::b(int)",
             "participant_id": "775765108342558014"
           },
           "type": "message"
@@ -118,7 +203,6 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1775727925274471949",
-            "activity_name": "clanguml::t20032::B::b(int)",
             "participant_id": "775765108342558014"
           },
           "name": "a1(int)",
@@ -132,7 +216,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "913842443932719355",
-            "activity_name": "clanguml::t20032::A::a1(int)",
             "participant_id": "1674177120713592616"
           },
           "type": "message"
@@ -140,9 +223,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "2159371207846335450",
-            "activity_name": "clanguml::t20032::tmain(int,char **)",
-            "participant_id": "2159371207846335450",
-            "participant_name": "clanguml::t20032::tmain(int,char **)"
+            "participant_id": "2159371207846335450"
           },
           "name": "b(double)",
           "return_type": "double",
@@ -155,7 +236,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "404223226092650061",
-            "activity_name": "clanguml::t20032::B::b(double)",
             "participant_id": "775765108342558014"
           },
           "type": "message"
@@ -163,7 +243,6 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "404223226092650061",
-            "activity_name": "clanguml::t20032::B::b(double)",
             "participant_id": "775765108342558014"
           },
           "name": "a2(double)",
@@ -177,7 +256,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1293114170675037977",
-            "activity_name": "clanguml::t20032::A::a2(double)",
             "participant_id": "1674177120713592616"
           },
           "type": "message"
@@ -185,9 +263,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "2159371207846335450",
-            "activity_name": "clanguml::t20032::tmain(int,char **)",
-            "participant_id": "2159371207846335450",
-            "participant_name": "clanguml::t20032::tmain(int,char **)"
+            "participant_id": "2159371207846335450"
           },
           "name": "b(const char *)",
           "return_type": "const char *",
@@ -200,7 +276,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1676684483397143166",
-            "activity_name": "clanguml::t20032::B::b(const char *)",
             "participant_id": "775765108342558014"
           },
           "type": "message"
@@ -208,7 +283,6 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1676684483397143166",
-            "activity_name": "clanguml::t20032::B::b(const char *)",
             "participant_id": "775765108342558014"
           },
           "name": "a3(const char *)",
@@ -222,7 +296,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "2099821524363509275",
-            "activity_name": "clanguml::t20032::A::a3(const char *)",
             "participant_id": "1674177120713592616"
           },
           "type": "message"
diff --git a/docs/test_cases/t20032_sequence.svg b/docs/test_cases/t20032_sequence.svg
index fb258bd5..c39fd82c 100644
--- a/docs/test_cases/t20032_sequence.svg
+++ b/docs/test_cases/t20032_sequence.svg
@@ -1,90 +1,96 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="459px" preserveAspectRatio="none" style="width:317px;height:459px;background:#FFFFFF;" version="1.1" viewBox="0 0 317 459" width="317px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="448px" preserveAspectRatio="none" style="width:354px;height:448px;" version="1.1" viewBox="0 0 354 448" width="354px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f9ppgu0zeko6a" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="358.9002" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
-    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="68.3999"/>
-    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="190.7"/>
-    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="313.0001"/>
-    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="98"/>
-    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="220.3"/>
-    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="342.6001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="65" x2="65" y1="36.7999" y2="423.7001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="178.5" x2="178.5" y1="36.7999" y2="423.7001"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="299.5" x2="299.5" y1="36.7999" y2="423.7001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="25.0059">tmain(int,char **)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="422.7001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="442.706">tmain(int,char **)</text>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="407.8906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="407.8906"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="407.8906"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
+      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="406.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="426.8857">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="167.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="174.5" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="167.5" y="422.7001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="174.5" y="442.706">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="406.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="426.8857">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="288.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="295.5" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="288.5" y="422.7001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="295.5" y="442.706">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="406.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="426.8857">A</text>
     </a>
-    <rect fill="#FFFFFF" height="358.9002" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
-    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="68.3999"/>
-    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="190.7"/>
-    <rect fill="#FFFFFF" height="92.7" style="stroke:#181818;stroke-width:1.0;" width="10" x="174" y="313.0001"/>
-    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="98"/>
-    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="220.3"/>
-    <rect fill="#FFFFFF" height="31.55" style="stroke:#181818;stroke-width:1.0;" width="10" x="295" y="342.6001"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162,64.3999,172,68.3999,162,72.3999,166,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="68.3999" y2="68.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="77" y="62.8769">b(int)</text>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="283,94,293,98,283,102,287,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="191" y="92.477">a1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
     </a>
-    <polygon fill="#181818" points="195,125.55,185,129.55,195,133.55,191,129.55" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="129.55" y2="129.55"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="14" x="201" y="124.3">int</text>
-    <polygon fill="#181818" points="81,157.1,71,161.1,81,165.1,77,161.1" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="178" y1="161.1" y2="161.1"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="14" x="87" y="155.85">int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162,186.7,172,190.7,162,194.7,166,190.7" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="190.7" y2="190.7"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="53" x="77" y="185.177">b(double)</text>
+    <polygon fill="#A80036" points="216.5,123.6953,206.5,127.6953,216.5,131.6953,212.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="127.6953" y2="127.6953"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="222.5" y="122.6294">int</text>
+    <polygon fill="#A80036" points="91.5,152.8281,81.5,156.8281,91.5,160.8281,87.5,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="156.8281" y2="156.8281"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="97.5" y="151.7622">int</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="183.5,181.9609,193.5,185.9609,183.5,189.9609,187.5,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="185.9609" y2="185.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="180.895">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="283,216.3,293,220.3,283,224.3,287,220.3" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="220.3" y2="220.3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="60" x="191" y="214.777">a2(double)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="316.5,211.0938,326.5,215.0938,316.5,219.0938,320.5,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="215.0938" y2="215.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="210.0278">a2(double)</text>
     </a>
-    <polygon fill="#181818" points="195,247.85,185,251.85,195,255.85,191,251.85" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="251.85" y2="251.85"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="38" x="201" y="246.6">double</text>
-    <polygon fill="#181818" points="81,279.4,71,283.4,81,287.4,77,283.4" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="178" y1="283.4" y2="283.4"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="38" x="87" y="278.15">double</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="162,309.0001,172,313.0001,162,317.0001,166,313.0001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="168" y1="313.0001" y2="313.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="77" y="307.4771">b(const char *)</text>
+    <polygon fill="#A80036" points="216.5,240.2266,206.5,244.2266,216.5,248.2266,212.5,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="244.2266" y2="244.2266"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="222.5" y="239.1606">double</text>
+    <polygon fill="#A80036" points="91.5,269.3594,81.5,273.3594,91.5,277.3594,87.5,273.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="273.3594" y2="273.3594"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="97.5" y="268.2935">double</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="183.5,298.4922,193.5,302.4922,183.5,306.4922,187.5,302.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="302.4922" y2="302.4922"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="297.4263">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="283,338.6001,293,342.6001,283,346.6001,287,342.6001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="184" x2="289" y1="342.6001" y2="342.6001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="92" x="191" y="337.0771">a3(const char *)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="316.5,327.625,326.5,331.625,316.5,335.625,320.5,331.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="331.625" y2="331.625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="326.5591">a3(const char *)</text>
     </a>
-    <polygon fill="#181818" points="195,370.1501,185,374.1501,195,378.1501,191,374.1501" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="189" x2="299" y1="374.1501" y2="374.1501"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="70" x="201" y="368.9001">const char *</text>
-    <polygon fill="#181818" points="76,401.7001,66,405.7001,76,409.7001,72,405.7001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="70" x2="178" y1="405.7001" y2="405.7001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacing" textLength="70" x="82" y="400.4501">const char *</text>
+    <polygon fill="#A80036" points="216.5,356.7578,206.5,360.7578,216.5,364.7578,212.5,360.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="360.7578" y2="360.7578"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="222.5" y="355.6919">const char *</text>
+    <polygon fill="#A80036" points="86.5,385.8906,76.5,389.8906,86.5,393.8906,82.5,389.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="80.5" x2="199.5" y1="389.8906" y2="389.8906"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="78" x="92.5" y="384.8247">const char *</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t20032_sequence_mermaid.svg b/docs/test_cases/t20032_sequence_mermaid.svg
index 8e19e3e6..86fd4f5a 100644
--- a/docs/test_cases/t20032_sequence_mermaid.svg
+++ b/docs/test_cases/t20032_sequence_mermaid.svg
@@ -63,17 +63,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -103,28 +103,28 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="42" width="10" stroke="#666" fill="#EDF2AE" y="519" x="470"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">b(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="376">a1(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="377">int</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="201" x2="283" y1="201" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="216" x="177">int</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="245" x2="83" y1="245" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="260" x="176">b(double)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="291" x2="271" y1="291" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="306" x="376">a2(double)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="337" x2="471" y1="337" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="352" x="377">double</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="381" x2="283" y1="381" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="177">double</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="425" x2="83" y1="425" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="440" x="176">b(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="471" x2="271" y1="471" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="486" x="376">a3(const char *)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="517" x2="471" y1="517" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="532" x="377">const char *</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="561" x2="283" y1="561" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="576" x="177">const char *</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="605" x2="83" y1="605" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">b(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a1(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">int</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="201" x2="280" y1="201" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="216" x="175">int</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="245" x2="80" y1="245" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="260" x="178">b(double)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="291" x2="275" y1="291" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="306" x="378">a2(double)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="337" x2="475" y1="337" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="352" x="375">double</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="381" x2="280" y1="381" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="396" x="175">double</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="425" x2="80" y1="425" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="440" x="178">b(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="471" x2="275" y1="471" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="486" x="378">a3(const char *)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="517" x2="475" y1="517" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="532" x="375">const char *</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="561" x2="280" y1="561" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="576" x="175">const char *</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="605" x2="80" y1="605" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20033.md b/docs/test_cases/t20033.md
index 213cd2bf..1c01220c 100644
--- a/docs/test_cases/t20033.md
+++ b/docs/test_cases/t20033.md
@@ -94,8 +94,10 @@ int tmain()
   "name": "t20033_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "2284981553733959328",
-      "name": "clanguml::t20033::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20033",
       "source_location": {
         "column": 5,
         "file": "t20033.cc",
@@ -105,8 +107,64 @@ int tmain()
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "a1()",
+          "id": "558885502745634115",
+          "name": "a1",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20033.cc",
+            "line": 8,
+            "translation_unit": "t20033.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a2()",
+          "id": "748502947476611794",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20033.cc",
+            "line": 9,
+            "translation_unit": "t20033.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a3()",
+          "id": "55903385814245839",
+          "name": "a3",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20033.cc",
+            "line": 10,
+            "translation_unit": "t20033.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "a4()",
+          "id": "1686426476339443579",
+          "name": "a4",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20033.cc",
+            "line": 11,
+            "translation_unit": "t20033.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "615995652843962691",
-      "name": "clanguml::t20033::A",
+      "name": "A",
+      "namespace": "clanguml::t20033",
       "source_location": {
         "column": 8,
         "file": "t20033.cc",
@@ -130,9 +188,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a1()",
                   "return_type": "int",
@@ -145,7 +201,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "558885502745634115",
-                    "activity_name": "clanguml::t20033::A::a1()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -158,9 +213,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a2()",
                   "return_type": "int",
@@ -173,7 +226,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "748502947476611794",
-                    "activity_name": "clanguml::t20033::A::a2()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -186,9 +238,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a2()",
                   "return_type": "int",
@@ -201,7 +251,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "748502947476611794",
-                    "activity_name": "clanguml::t20033::A::a2()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -209,9 +258,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a3()",
                   "return_type": "int",
@@ -224,7 +271,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "55903385814245839",
-                    "activity_name": "clanguml::t20033::A::a3()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -232,9 +278,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a3()",
                   "return_type": "int",
@@ -247,7 +291,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "55903385814245839",
-                    "activity_name": "clanguml::t20033::A::a3()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -260,9 +303,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a4()",
                   "return_type": "int",
@@ -275,7 +316,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1686426476339443579",
-                    "activity_name": "clanguml::t20033::A::a4()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -296,9 +336,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a2()",
                   "return_type": "int",
@@ -311,7 +349,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "748502947476611794",
-                    "activity_name": "clanguml::t20033::A::a2()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -319,9 +356,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a3()",
                   "return_type": "int",
@@ -334,7 +369,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "55903385814245839",
-                    "activity_name": "clanguml::t20033::A::a3()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -354,9 +388,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "2284981553733959328",
-                "activity_name": "clanguml::t20033::tmain()",
-                "participant_id": "2284981553733959328",
-                "participant_name": "clanguml::t20033::tmain()"
+                "participant_id": "2284981553733959328"
               },
               "name": "a2()",
               "return_type": "int",
@@ -369,7 +401,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "748502947476611794",
-                "activity_name": "clanguml::t20033::A::a2()",
                 "participant_id": "615995652843962691"
               },
               "type": "message"
@@ -377,9 +408,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "2284981553733959328",
-                "activity_name": "clanguml::t20033::tmain()",
-                "participant_id": "2284981553733959328",
-                "participant_name": "clanguml::t20033::tmain()"
+                "participant_id": "2284981553733959328"
               },
               "name": "a3()",
               "return_type": "int",
@@ -392,7 +421,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "55903385814245839",
-                "activity_name": "clanguml::t20033::A::a3()",
                 "participant_id": "615995652843962691"
               },
               "type": "message"
@@ -404,9 +432,7 @@ int tmain()
         {
           "from": {
             "activity_id": "2284981553733959328",
-            "activity_name": "clanguml::t20033::tmain()",
-            "participant_id": "2284981553733959328",
-            "participant_name": "clanguml::t20033::tmain()"
+            "participant_id": "2284981553733959328"
           },
           "name": "a3()",
           "return_type": "int",
@@ -419,7 +445,6 @@ int tmain()
           },
           "to": {
             "activity_id": "55903385814245839",
-            "activity_name": "clanguml::t20033::A::a3()",
             "participant_id": "615995652843962691"
           },
           "type": "message"
@@ -431,9 +456,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "2284981553733959328",
-                "activity_name": "clanguml::t20033::tmain()",
-                "participant_id": "2284981553733959328",
-                "participant_name": "clanguml::t20033::tmain()"
+                "participant_id": "2284981553733959328"
               },
               "name": "a2()",
               "return_type": "int",
@@ -446,7 +469,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "748502947476611794",
-                "activity_name": "clanguml::t20033::A::a2()",
                 "participant_id": "615995652843962691"
               },
               "type": "message"
@@ -462,9 +484,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "2284981553733959328",
-                "activity_name": "clanguml::t20033::tmain()",
-                "participant_id": "2284981553733959328",
-                "participant_name": "clanguml::t20033::tmain()"
+                "participant_id": "2284981553733959328"
               },
               "name": "a4()",
               "return_type": "int",
@@ -477,7 +497,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "1686426476339443579",
-                "activity_name": "clanguml::t20033::A::a4()",
                 "participant_id": "615995652843962691"
               },
               "type": "message"
@@ -485,9 +504,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "2284981553733959328",
-                "activity_name": "clanguml::t20033::tmain()",
-                "participant_id": "2284981553733959328",
-                "participant_name": "clanguml::t20033::tmain()"
+                "participant_id": "2284981553733959328"
               },
               "name": "a3()",
               "return_type": "int",
@@ -500,7 +517,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "55903385814245839",
-                "activity_name": "clanguml::t20033::A::a3()",
                 "participant_id": "615995652843962691"
               },
               "type": "message"
@@ -517,9 +533,7 @@ int tmain()
                 {
                   "from": {
                     "activity_id": "2284981553733959328",
-                    "activity_name": "clanguml::t20033::tmain()",
-                    "participant_id": "2284981553733959328",
-                    "participant_name": "clanguml::t20033::tmain()"
+                    "participant_id": "2284981553733959328"
                   },
                   "name": "a4()",
                   "return_type": "int",
@@ -532,7 +546,6 @@ int tmain()
                   },
                   "to": {
                     "activity_id": "1686426476339443579",
-                    "activity_name": "clanguml::t20033::A::a4()",
                     "participant_id": "615995652843962691"
                   },
                   "type": "message"
@@ -555,9 +568,7 @@ int tmain()
             {
               "from": {
                 "activity_id": "2284981553733959328",
-                "activity_name": "clanguml::t20033::tmain()",
-                "participant_id": "2284981553733959328",
-                "participant_name": "clanguml::t20033::tmain()"
+                "participant_id": "2284981553733959328"
               },
               "name": "a4()",
               "return_type": "int",
@@ -570,7 +581,6 @@ int tmain()
               },
               "to": {
                 "activity_id": "1686426476339443579",
-                "activity_name": "clanguml::t20033::A::a4()",
                 "participant_id": "615995652843962691"
               },
               "type": "message"
diff --git a/docs/test_cases/t20033_sequence.svg b/docs/test_cases/t20033_sequence.svg
index b2757a42..27567f15 100644
--- a/docs/test_cases/t20033_sequence.svg
+++ b/docs/test_cases/t20033_sequence.svg
@@ -1,222 +1,233 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1060px" preserveAspectRatio="none" style="width:270px;height:1060px;background:#FFFFFF;" version="1.1" viewBox="0 0 270 1060" width="270px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1055px" preserveAspectRatio="none" style="width:340px;height:1055px;" version="1.1" viewBox="0 0 340 1055" width="340px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1em8sckz8zr6m" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="968.4" style="stroke:#181818;stroke-width:1.0;" width="10" x="44.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="108.1999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="166.9998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="225.7997"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="269.3997"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="312.9997"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="358.5997"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="433.7998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="477.3998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="552.5998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="596.1998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="646.7998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="714.9999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="790.1999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="833.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="908.9999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="986.1999"/>
-    <rect fill="none" height="326.7998" style="stroke:#000000;stroke-width:1.5;" width="253" x="10" y="53.7999"/>
-    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="181" x="10" y="394.5997"/>
-    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="212" x="10" y="513.3998"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="170" x="10" y="675.7998"/>
-    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="215" x="10" y="750.9999"/>
-    <rect fill="none" height="63.2" style="stroke:#000000;stroke-width:1.5;" width="139" x="10" y="869.7999"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="121" x="10" y="946.9999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="49" x2="49" y1="36.7999" y2="1025.1999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="108" x2="108" y1="36.7999" y2="1025.1999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="20" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="27" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="20" y="1024.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="27" y="1044.2059">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="72.4297"/>
+    <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="130.3672"/>
+    <rect fill="#FFFFFF" height="144.2031" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="188.3047"/>
+    <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="332.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
+    <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="159" x="13" y="921.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="1014.7656"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="122.5" x2="122.5" y1="38.2969" y2="1014.7656"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1em8sckz8zr6m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1em8sckz8zr6m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="1013.7656"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="1033.7607">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="97" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="104" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="97" y="1024.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="104" y="1044.2059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1em8sckz8zr6m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1em8sckz8zr6m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="1013.7656"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="1033.7607">A</text>
     </a>
-    <rect fill="#FFFFFF" height="968.4" style="stroke:#181818;stroke-width:1.0;" width="10" x="44.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="108.1999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="166.9998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="225.7997"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="269.3997"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="312.9997"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="358.5997"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="433.7998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="477.3998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="552.5998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="596.1998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="646.7998"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="714.9999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="790.1999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="833.7999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="908.9999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="103.5" y="986.1999"/>
-    <path d="M10,53.7999 L70,53.7999 L70,61.3999 L60,71.3999 L10,71.3999 L10,53.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="326.7998" style="stroke:#000000;stroke-width:1.5;" width="253" x="10" y="53.7999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="66.8769">alt</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="33" x="85" y="66.0189">[false]</text>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="263" y1="72.3999" y2="72.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="248" x="15" y="82.6189">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 100 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,104.1999,101.5,108.1999,91.5,112.1999,95.5,108.1999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="108.1999" y2="108.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="102.6769">a1()</text>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
+    <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="42" x="92" y="67.5073">[false]</text>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="73.4297" y2="73.4297"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="310" x="18" y="83.6401">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 100 == 0ULL]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,104.3672,116,108.3672,106,112.3672,110,108.3672" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="108.3672" y2="108.3672"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="103.3013">a1()</text>
     </a>
-    <polygon fill="#181818" points="65.5,118.1999,55.5,122.1999,65.5,126.1999,61.5,122.1999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="122.1999" y2="122.1999"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="263" y1="131.1999" y2="131.1999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="242" x="15" y="141.4188">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 64 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,162.9998,101.5,166.9998,91.5,170.9998,95.5,166.9998" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="166.9998" y2="166.9998"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="161.4768">a2()</text>
+    <polygon fill="#A80036" points="72,118.3672,62,122.3672,72,126.3672,68,122.3672" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="122.3672" y2="122.3672"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="131.3672" y2="131.3672"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="302" x="18" y="141.5776">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 64 == 0ULL]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,162.3047,116,166.3047,106,170.3047,110,166.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="166.3047" y2="166.3047"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="161.2388">a2()</text>
     </a>
-    <polygon fill="#181818" points="65.5,176.9998,55.5,180.9998,65.5,184.9998,61.5,180.9998" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="180.9998" y2="180.9998"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="263" y1="189.9998" y2="189.9998"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="136" x="15" y="200.2187">[a.a2() == 2 &amp;&amp; a.a3() == 3]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,221.7997,101.5,225.7997,91.5,229.7997,95.5,225.7997" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="225.7997" y2="225.7997"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="220.2767">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="220.2767">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="220.2767">]</text>
+    <polygon fill="#A80036" points="72,176.3047,62,180.3047,72,184.3047,68,180.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="180.3047" y2="180.3047"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="189.3047" y2="189.3047"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="182" x="18" y="199.5151">[a.a2() == 2 &amp;&amp; a.a3() == 3]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,220.2422,116,224.2422,106,228.2422,110,224.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="224.2422" y2="224.2422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="219.1763">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="219.1763">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="219.1763">]</text>
     </a>
-    <polygon fill="#181818" points="65.5,235.7997,55.5,239.7997,65.5,243.7997,61.5,239.7997" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="239.7997" y2="239.7997"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,265.3997,101.5,269.3997,91.5,273.3997,95.5,269.3997" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="269.3997" y2="269.3997"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="263.8767">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="263.8767">a3()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="263.8767">]</text>
+    <polygon fill="#A80036" points="72,234.2422,62,238.2422,72,242.2422,68,238.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="238.2422" y2="238.2422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,263.375,116,267.375,106,271.375,110,267.375" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="267.375" y2="267.375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="262.3091">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="262.3091">a3()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="262.3091">]</text>
     </a>
-    <polygon fill="#181818" points="65.5,279.3997,55.5,283.3997,65.5,287.3997,61.5,283.3997" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="283.3997" y2="283.3997"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,308.9997,101.5,312.9997,91.5,316.9997,95.5,312.9997" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="312.9997" y2="312.9997"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="307.4767">a3()</text>
+    <polygon fill="#A80036" points="72,277.375,62,281.375,72,285.375,68,281.375" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="281.375" y2="281.375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,306.5078,116,310.5078,106,314.5078,110,310.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="310.5078" y2="310.5078"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="305.4419">a3()</text>
     </a>
-    <polygon fill="#181818" points="65.5,322.9997,55.5,326.9997,65.5,330.9997,61.5,326.9997" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="326.9997" y2="326.9997"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="263" y1="335.9997" y2="335.9997"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,354.5997,101.5,358.5997,91.5,362.5997,95.5,358.5997" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="358.5997" y2="358.5997"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="353.0767">a4()</text>
+    <polygon fill="#A80036" points="72,320.5078,62,324.5078,72,328.5078,68,324.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="324.5078" y2="324.5078"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="333.5078" y2="333.5078"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,351.6406,116,355.6406,106,359.6406,110,355.6406" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="355.6406" y2="355.6406"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="350.5747">a4()</text>
     </a>
-    <polygon fill="#181818" points="65.5,368.5997,55.5,372.5997,65.5,376.5997,61.5,372.5997" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="372.5997" y2="372.5997"/>
-    <path d="M10,394.5997 L70,394.5997 L70,402.1997 L60,412.1997 L10,412.1997 L10,394.5997 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="181" x="10" y="394.5997"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="407.6767">alt</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="101" x="85" y="406.8187">[int i = a.a2(); i != 2]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,429.7998,101.5,433.7998,91.5,437.7998,95.5,433.7998" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="433.7998" y2="433.7998"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="428.2768">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="428.2768">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="428.2768">]</text>
+    <polygon fill="#A80036" points="72,365.6406,62,369.6406,72,373.6406,68,369.6406" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="369.6406" y2="369.6406"/>
+    <path d="M13,391.6406 L77,391.6406 L77,398.6406 L67,408.6406 L13,408.6406 L13,391.6406 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="404.7075">alt</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="132" x="92" y="403.8511">[int i = a.a2(); i != 2]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,425.9063,116,429.9063,106,433.9063,110,429.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="429.9063" y2="429.9063"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="424.8403">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="424.8403">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="424.8403">]</text>
     </a>
-    <polygon fill="#181818" points="65.5,443.7998,55.5,447.7998,65.5,451.7998,61.5,447.7998" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="447.7998" y2="447.7998"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,473.3998,101.5,477.3998,91.5,481.3998,95.5,477.3998" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="477.3998" y2="477.3998"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="471.8768">a3()</text>
+    <polygon fill="#A80036" points="72,439.9063,62,443.9063,72,447.9063,68,443.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="443.9063" y2="443.9063"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,469.0391,116,473.0391,106,477.0391,110,473.0391" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="473.0391" y2="473.0391"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="467.9731">a3()</text>
     </a>
-    <polygon fill="#181818" points="65.5,487.3998,55.5,491.3998,65.5,495.3998,61.5,491.3998" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="491.3998" y2="491.3998"/>
-    <path d="M10,513.3998 L83,513.3998 L83,520.9998 L73,530.9998 L10,530.9998 L10,513.3998 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="212" x="10" y="513.3998"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="526.4768">loop</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="119" x="98" y="525.6187">[int i = 0; i &lt; a.a2(); i++]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,548.5998,101.5,552.5998,91.5,556.5998,95.5,552.5998" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="552.5998" y2="552.5998"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="547.0768">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="547.0768">a2()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="547.0768">]</text>
+    <polygon fill="#A80036" points="72,483.0391,62,487.0391,72,491.0391,68,487.0391" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="487.0391" y2="487.0391"/>
+    <path d="M13,509.0391 L90,509.0391 L90,516.0391 L80,526.0391 L13,526.0391 L13,509.0391 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="522.106">loop</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="157" x="105" y="521.2495">[int i = 0; i &lt; a.a2(); i++]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,543.3047,116,547.3047,106,551.3047,110,547.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="547.3047" y2="547.3047"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="542.2388">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="542.2388">a2()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="542.2388">]</text>
     </a>
-    <polygon fill="#181818" points="65.5,562.5998,55.5,566.5998,65.5,570.5998,61.5,566.5998" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="566.5998" y2="566.5998"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,592.1998,101.5,596.1998,91.5,600.1998,95.5,596.1998" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="596.1998" y2="596.1998"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="590.6768">a3()</text>
+    <polygon fill="#A80036" points="72,557.3047,62,561.3047,72,565.3047,68,561.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="561.3047" y2="561.3047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,586.4375,116,590.4375,106,594.4375,110,590.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="590.4375" y2="590.4375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="585.3716">a3()</text>
     </a>
-    <polygon fill="#181818" points="65.5,606.1998,55.5,610.1998,65.5,614.1998,61.5,610.1998" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="610.1998" y2="610.1998"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,642.7998,101.5,646.7998,91.5,650.7998,95.5,646.7998" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="646.7998" y2="646.7998"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="641.2768">a3()</text>
+    <polygon fill="#A80036" points="72,600.4375,62,604.4375,72,608.4375,68,604.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="604.4375" y2="604.4375"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,636.5703,116,640.5703,106,644.5703,110,640.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="640.5703" y2="640.5703"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="635.5044">a3()</text>
     </a>
-    <polygon fill="#181818" points="65.5,656.7998,55.5,660.7998,65.5,664.7998,61.5,660.7998" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="660.7998" y2="660.7998"/>
-    <path d="M10,675.7998 L83,675.7998 L83,683.3998 L73,693.3998 L10,693.3998 L10,675.7998 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="170" x="10" y="675.7998"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="688.8768">loop</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="77" x="98" y="688.0187">[retry_count--]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,710.9999,101.5,714.9999,91.5,718.9999,95.5,714.9999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="714.9999" y2="714.9999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="709.4768">a2()</text>
+    <polygon fill="#A80036" points="72,650.5703,62,654.5703,72,658.5703,68,654.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="654.5703" y2="654.5703"/>
+    <path d="M13,669.5703 L90,669.5703 L90,676.5703 L80,686.5703 L13,686.5703 L13,669.5703 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="682.6372">loop</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="92" x="105" y="681.7808">[retry_count--]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,703.8359,116,707.8359,106,711.8359,110,707.8359" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="707.8359" y2="707.8359"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="702.77">a2()</text>
     </a>
-    <polygon fill="#181818" points="65.5,724.9999,55.5,728.9999,65.5,732.9999,61.5,728.9999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="728.9999" y2="728.9999"/>
-    <path d="M10,750.9999 L83,750.9999 L83,758.5999 L73,768.5999 L10,768.5999 L10,750.9999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="215" x="10" y="750.9999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="764.0769">loop</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="122" x="98" y="763.2188">[retry_count++ &lt; a.a3()]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,786.1999,101.5,790.1999,91.5,794.1999,95.5,790.1999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="790.1999" y2="790.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="784.6769">a4()</text>
+    <polygon fill="#A80036" points="72,717.8359,62,721.8359,72,725.8359,68,721.8359" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="721.8359" y2="721.8359"/>
+    <path d="M13,743.8359 L90,743.8359 L90,750.8359 L80,760.8359 L13,760.8359 L13,743.8359 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="756.9028">loop</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="155" x="105" y="756.0464">[retry_count++ &lt; a.a3()]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,778.1016,116,782.1016,106,786.1016,110,782.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="782.1016" y2="782.1016"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="777.0356">a4()</text>
     </a>
-    <polygon fill="#181818" points="65.5,800.1999,55.5,804.1999,65.5,808.1999,61.5,804.1999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="804.1999" y2="804.1999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,829.7999,101.5,833.7999,91.5,837.7999,95.5,833.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="833.7999" y2="833.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="828.2769">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="828.2769">a3()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="828.2769">]</text>
+    <polygon fill="#A80036" points="72,792.1016,62,796.1016,72,800.1016,68,796.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="796.1016" y2="796.1016"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,821.2344,116,825.2344,106,829.2344,110,825.2344" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="825.2344" y2="825.2344"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="820.1685">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="820.1685">a3()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="820.1685">]</text>
     </a>
-    <polygon fill="#181818" points="65.5,843.7999,55.5,847.7999,65.5,851.7999,61.5,847.7999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="847.7999" y2="847.7999"/>
-    <path d="M10,869.7999 L70,869.7999 L70,877.3999 L60,887.3999 L10,887.3999 L10,869.7999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="63.2" style="stroke:#000000;stroke-width:1.5;" width="139" x="10" y="869.7999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="25" y="882.8769">alt</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="59" x="85" y="882.0188">[a.a4() % 6]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,904.9999,101.5,908.9999,91.5,912.9999,95.5,908.9999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="908.9999" y2="908.9999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="61.5" y="903.4769">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="65.5" y="903.4769">a4()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="87.5" y="903.4769">]</text>
+    <polygon fill="#A80036" points="72,835.2344,62,839.2344,72,843.2344,68,839.2344" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="839.2344" y2="839.2344"/>
+    <path d="M13,861.2344 L77,861.2344 L77,868.2344 L67,878.2344 L13,878.2344 L13,861.2344 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="874.3013">alt</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="75" x="92" y="873.4448">[a.a4() % 6]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,895.5,116,899.5,106,903.5,110,899.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="899.5" y2="899.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="894.4341">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="74" y="894.4341">a4()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="100" y="894.4341">]</text>
     </a>
-    <polygon fill="#181818" points="65.5,918.9999,55.5,922.9999,65.5,926.9999,61.5,922.9999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="922.9999" y2="922.9999"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="10" x2="149" y1="931.9999" y2="931.9999"/>
-    <path d="M10,946.9999 L83,946.9999 L83,954.5999 L73,964.5999 L10,964.5999 L10,946.9999 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="61.2" style="stroke:#000000;stroke-width:1.5;" width="121" x="10" y="946.9999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="25" y="960.0769">loop</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacing" textLength="28" x="98" y="959.2188">[ints]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="91.5,982.1999,101.5,986.1999,91.5,990.1999,95.5,986.1999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="54.5" x2="97.5" y1="986.1999" y2="986.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="61.5" y="980.6769">a4()</text>
+    <polygon fill="#A80036" points="72,909.5,62,913.5,72,917.5,68,913.5" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="913.5" y2="913.5"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="172" y1="922.5" y2="922.5"/>
+    <path d="M13,937.5 L90,937.5 L90,944.5 L80,954.5 L13,954.5 L13,937.5 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="950.5669">loop</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="105" y="949.7104">[ints]</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="106,971.7656,116,975.7656,106,979.7656,110,975.7656" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="975.7656" y2="975.7656"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="970.6997">a4()</text>
     </a>
-    <polygon fill="#181818" points="65.5,996.1999,55.5,1000.1999,65.5,1004.1999,61.5,1000.1999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="59.5" x2="107.5" y1="1000.1999" y2="1000.1999"/>
+    <polygon fill="#A80036" points="72,985.7656,62,989.7656,72,993.7656,68,989.7656" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="989.7656" y2="989.7656"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20033_sequence_mermaid.svg b/docs/test_cases/t20033_sequence_mermaid.svg
index da3436dd..95d14083 100644
--- a/docs/test_cases/t20033_sequence_mermaid.svg
+++ b/docs/test_cases/t20033_sequence_mermaid.svg
@@ -48,17 +48,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -102,11 +102,11 @@
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="93" x="200">
       <tspan x="200">[false]</tspan>
     </text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="143" x="175">[reinterpret_cast&lt;uint-</text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="161" x="175">64_t&gt;(&amp;a) % 100 ==</text>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="143" x="175">[reinterpret_cast&lt;uint6-</text>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="161" x="175">4_t&gt;(&amp;a) % 100 ==</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="179" x="175">0ULL]</text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="277" x="175">[reinterpret_cast&lt;uint-</text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="295" x="175">64_t&gt;(&amp;a) % 64 ==</text>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="277" x="175">[reinterpret_cast&lt;uint6-</text>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="295" x="175">4_t&gt;(&amp;a) % 64 ==</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="313" x="175">0ULL]</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="411" x="175">[a.a2() == 2 &amp;&amp;</text>
     <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="428" x="175">a.a3() == 3]</text>
@@ -217,68 +217,68 @@
       <tspan x="200">[ints]</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="203" x="176">a1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="234" x2="271" y1="234" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="249" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="244" x2="83" y1="244" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="337" x="176">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="368" x2="271" y1="368" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="383" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="378" x2="83" y1="378" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="454" x="176">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="485" x2="271" y1="485" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="500" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="495" x2="83" y1="495" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="510" x="176">[a3()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="541" x2="271" y1="541" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="556" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="551" x2="83" y1="551" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="566" x="176">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="597" x2="271" y1="597" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="612" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="607" x2="83" y1="607" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="647" x="176">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="678" x2="271" y1="678" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="693" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="688" x2="83" y1="688" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="785" x="176">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="816" x2="271" y1="816" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="831" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="826" x2="83" y1="826" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="841" x="176">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="872" x2="271" y1="872" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="887" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="882" x2="83" y1="882" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="979" x="176">[a2()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1010" x2="271" y1="1010" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1025" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1020" x2="83" y1="1020" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1035" x="176">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1066" x2="271" y1="1066" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1081" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1076" x2="83" y1="1076" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1113" x="176">a3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1144" x2="271" y1="1144" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1159" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1154" x2="83" y1="1154" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1214" x="176">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1245" x2="271" y1="1245" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1260" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1255" x2="83" y1="1255" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1353" x="176">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1384" x2="271" y1="1384" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1399" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1394" x2="83" y1="1394" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1409" x="176">[a3()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1440" x2="271" y1="1440" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1455" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1450" x2="83" y1="1450" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1532" x="176">[a4()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1563" x2="271" y1="1563" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1578" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1573" x2="83" y1="1573" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1655" x="176">a4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1686" x2="271" y1="1686" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1701" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1696" x2="83" y1="1696" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="203" x="178">a1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="234" x2="275" y1="234" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="249" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="244" x2="80" y1="244" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="337" x="178">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="368" x2="275" y1="368" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="383" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="378" x2="80" y1="378" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="454" x="178">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="485" x2="275" y1="485" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="500" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="495" x2="80" y1="495" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="510" x="178">[a3()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="541" x2="275" y1="541" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="556" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="551" x2="80" y1="551" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="566" x="178">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="597" x2="275" y1="597" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="612" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="607" x2="80" y1="607" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="647" x="178">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="678" x2="275" y1="678" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="693" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="688" x2="80" y1="688" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="785" x="178">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="816" x2="275" y1="816" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="831" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="826" x2="80" y1="826" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="841" x="178">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="872" x2="275" y1="872" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="887" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="882" x2="80" y1="882" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="979" x="178">[a2()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1010" x2="275" y1="1010" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1025" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1020" x2="80" y1="1020" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1035" x="178">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1066" x2="275" y1="1066" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1081" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1076" x2="80" y1="1076" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1113" x="178">a3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1144" x2="275" y1="1144" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1159" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1154" x2="80" y1="1154" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1214" x="178">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1245" x2="275" y1="1245" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1260" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1255" x2="80" y1="1255" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1353" x="178">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1384" x2="275" y1="1384" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1399" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1394" x2="80" y1="1394" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1409" x="178">[a3()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1440" x2="275" y1="1440" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1455" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1450" x2="80" y1="1450" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1532" x="178">[a4()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1563" x2="275" y1="1563" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1578" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1573" x2="80" y1="1573" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1655" x="178">a4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1686" x2="275" y1="1686" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1701" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1696" x2="80" y1="1696" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20034.md b/docs/test_cases/t20034.md
index 5eab7fee..39cb673b 100644
--- a/docs/test_cases/t20034.md
+++ b/docs/test_cases/t20034.md
@@ -100,8 +100,25 @@ void B::b4()
   "name": "t20034_sequence",
   "participants": [
     {
+      "activities": [
+        {
+          "display_name": "d2()",
+          "id": "1707514178726476738",
+          "name": "d2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20034.cc",
+            "line": 46,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "D",
       "id": "272777525372220260",
-      "name": "clanguml::t20034::D",
+      "name": "D",
+      "namespace": "clanguml::t20034",
       "source_location": {
         "column": 8,
         "file": "t20034.cc",
@@ -111,8 +128,64 @@ void B::b4()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "c2()",
+          "id": "472904899982022039",
+          "name": "c2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20034.cc",
+            "line": 30,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c4()",
+          "id": "395720534444062628",
+          "name": "c4",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20034.cc",
+            "line": 39,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c1()",
+          "id": "148530508384958711",
+          "name": "c1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20034.cc",
+            "line": 29,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c3()",
+          "id": "2116989777037608337",
+          "name": "c3",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20034.cc",
+            "line": 31,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "C",
       "id": "2153793652884753477",
-      "name": "clanguml::t20034::C",
+      "name": "C",
+      "namespace": "clanguml::t20034",
       "source_location": {
         "column": 8,
         "file": "t20034.cc",
@@ -122,8 +195,51 @@ void B::b4()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b2()",
+          "id": "1034410188120190919",
+          "name": "b2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20034.cc",
+            "line": 19,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b4()",
+          "id": "1774155279072101253",
+          "name": "b4",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20034.cc",
+            "line": 65,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b1()",
+          "id": "289899516984058785",
+          "name": "b1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20034.cc",
+            "line": 14,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1214895773389400008",
-      "name": "clanguml::t20034::B",
+      "name": "B",
+      "namespace": "clanguml::t20034",
       "source_location": {
         "column": 8,
         "file": "t20034.cc",
@@ -133,8 +249,25 @@ void B::b4()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a2()",
+          "id": "1307188853155365430",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20034.cc",
+            "line": 7,
+            "translation_unit": "t20034.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1029414747563549012",
-      "name": "clanguml::t20034::A",
+      "name": "A",
+      "namespace": "clanguml::t20034",
       "source_location": {
         "column": 8,
         "file": "t20034.cc",
@@ -144,15 +277,26 @@ void B::b4()
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "operator()()",
+          "id": "1996671438591925718",
+          "name": "operator()",
+          "namespace": "",
+          "type": "method"
+        }
+      ],
+      "display_name": "D::d2()::(lambda t20034.cc:56:18)",
       "id": "1026588549514900751",
-      "name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)",
+      "name": "D::d2()::(lambda t20034.cc:56:18)",
+      "namespace": "clanguml::t20034",
       "source_location": {
         "column": 18,
         "file": "t20034.cc",
         "line": 56,
         "translation_unit": "t20034.cc"
       },
-      "type": "class"
+      "type": "lambda"
     }
   ],
   "sequences": [
@@ -173,7 +317,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1707514178726476738",
-                "activity_name": "clanguml::t20034::D::d2()",
                 "participant_id": "272777525372220260"
               },
               "name": "c2()",
@@ -187,7 +330,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "472904899982022039",
-                "activity_name": "clanguml::t20034::C::c2()",
                 "participant_id": "2153793652884753477"
               },
               "type": "message"
@@ -195,7 +337,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "472904899982022039",
-                "activity_name": "clanguml::t20034::C::c2()",
                 "participant_id": "2153793652884753477"
               },
               "name": "b2()",
@@ -209,7 +350,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1034410188120190919",
-                "activity_name": "clanguml::t20034::B::b2()",
                 "participant_id": "1214895773389400008"
               },
               "type": "message"
@@ -217,7 +357,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1034410188120190919",
-                "activity_name": "clanguml::t20034::B::b2()",
                 "participant_id": "1214895773389400008"
               },
               "name": "a2()",
@@ -231,7 +370,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1307188853155365430",
-                "activity_name": "clanguml::t20034::A::a2()",
                 "participant_id": "1029414747563549012"
               },
               "type": "message"
@@ -243,7 +381,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1707514178726476738",
-                "activity_name": "clanguml::t20034::D::d2()",
                 "participant_id": "272777525372220260"
               },
               "name": "a2()",
@@ -257,7 +394,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1307188853155365430",
-                "activity_name": "clanguml::t20034::A::a2()",
                 "participant_id": "1029414747563549012"
               },
               "type": "message"
@@ -269,7 +405,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1707514178726476738",
-                "activity_name": "clanguml::t20034::D::d2()",
                 "participant_id": "272777525372220260"
               },
               "name": "operator()()",
@@ -283,7 +418,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1996671438591925718",
-                "activity_name": "clanguml::t20034::D::d2()##(lambda t20034.cc:56:18)::operator()()",
                 "participant_id": "1026588549514900751"
               },
               "type": "message"
@@ -291,7 +425,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1996671438591925718",
-                "activity_name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)::operator()()",
                 "participant_id": "1026588549514900751"
               },
               "name": "a2()",
@@ -305,7 +438,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1307188853155365430",
-                "activity_name": "clanguml::t20034::A::a2()",
                 "participant_id": "1029414747563549012"
               },
               "type": "message"
@@ -317,7 +449,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1707514178726476738",
-                "activity_name": "clanguml::t20034::D::d2()",
                 "participant_id": "272777525372220260"
               },
               "name": "c4()",
@@ -331,7 +462,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "395720534444062628",
-                "activity_name": "clanguml::t20034::C::c4()",
                 "participant_id": "2153793652884753477"
               },
               "type": "message"
@@ -339,7 +469,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "395720534444062628",
-                "activity_name": "clanguml::t20034::C::c4()",
                 "participant_id": "2153793652884753477"
               },
               "name": "b4()",
@@ -353,7 +482,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1774155279072101253",
-                "activity_name": "clanguml::t20034::B::b4()",
                 "participant_id": "1214895773389400008"
               },
               "type": "message"
@@ -361,7 +489,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1774155279072101253",
-                "activity_name": "clanguml::t20034::B::b4()",
                 "participant_id": "1214895773389400008"
               },
               "name": "b2()",
@@ -375,7 +502,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1034410188120190919",
-                "activity_name": "clanguml::t20034::B::b2()",
                 "participant_id": "1214895773389400008"
               },
               "type": "message"
@@ -383,7 +509,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1034410188120190919",
-                "activity_name": "clanguml::t20034::B::b2()",
                 "participant_id": "1214895773389400008"
               },
               "name": "a2()",
@@ -397,7 +522,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1307188853155365430",
-                "activity_name": "clanguml::t20034::A::a2()",
                 "participant_id": "1029414747563549012"
               },
               "type": "message"
@@ -409,7 +533,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1707514178726476738",
-                "activity_name": "clanguml::t20034::D::d2()",
                 "participant_id": "272777525372220260"
               },
               "name": "c1()",
@@ -423,7 +546,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "148530508384958711",
-                "activity_name": "clanguml::t20034::C::c1()",
                 "participant_id": "2153793652884753477"
               },
               "type": "message"
@@ -431,7 +553,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "148530508384958711",
-                "activity_name": "clanguml::t20034::C::c1()",
                 "participant_id": "2153793652884753477"
               },
               "name": "b1()",
@@ -445,7 +566,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "289899516984058785",
-                "activity_name": "clanguml::t20034::B::b1()",
                 "participant_id": "1214895773389400008"
               },
               "type": "message"
@@ -453,7 +573,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "289899516984058785",
-                "activity_name": "clanguml::t20034::B::b1()",
                 "participant_id": "1214895773389400008"
               },
               "name": "a2()",
@@ -467,7 +586,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1307188853155365430",
-                "activity_name": "clanguml::t20034::A::a2()",
                 "participant_id": "1029414747563549012"
               },
               "type": "message"
@@ -479,7 +597,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1707514178726476738",
-                "activity_name": "clanguml::t20034::D::d2()",
                 "participant_id": "272777525372220260"
               },
               "name": "c3()",
@@ -493,7 +610,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "2116989777037608337",
-                "activity_name": "clanguml::t20034::C::c3()",
                 "participant_id": "2153793652884753477"
               },
               "type": "message"
@@ -501,7 +617,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "2116989777037608337",
-                "activity_name": "clanguml::t20034::C::c3()",
                 "participant_id": "2153793652884753477"
               },
               "name": "c2()",
@@ -515,7 +630,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "472904899982022039",
-                "activity_name": "clanguml::t20034::C::c2()",
                 "participant_id": "2153793652884753477"
               },
               "type": "message"
@@ -523,7 +637,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "472904899982022039",
-                "activity_name": "clanguml::t20034::C::c2()",
                 "participant_id": "2153793652884753477"
               },
               "name": "b2()",
@@ -537,7 +650,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1034410188120190919",
-                "activity_name": "clanguml::t20034::B::b2()",
                 "participant_id": "1214895773389400008"
               },
               "type": "message"
@@ -545,7 +657,6 @@ void B::b4()
             {
               "from": {
                 "activity_id": "1034410188120190919",
-                "activity_name": "clanguml::t20034::B::b2()",
                 "participant_id": "1214895773389400008"
               },
               "name": "a2()",
@@ -559,7 +670,6 @@ void B::b4()
               },
               "to": {
                 "activity_id": "1307188853155365430",
-                "activity_name": "clanguml::t20034::A::a2()",
                 "participant_id": "1029414747563549012"
               },
               "type": "message"
diff --git a/docs/test_cases/t20034_sequence.svg b/docs/test_cases/t20034_sequence.svg
index d12a4ac2..e640f39c 100644
--- a/docs/test_cases/t20034_sequence.svg
+++ b/docs/test_cases/t20034_sequence.svg
@@ -1,164 +1,170 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="939px" preserveAspectRatio="none" style="width:446px;height:939px;background:#FFFFFF;" version="1.1" viewBox="0 0 446 939" width="446px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="934px" preserveAspectRatio="none" style="width:499px;height:934px;" version="1.1" viewBox="0 0 499 934" width="499px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f2zg8zg1z3czu" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="46" x2="46" y1="36.7999" y2="903.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="92" x2="92" y1="36.7999" y2="903.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="137.5" x2="137.5" y1="36.7999" y2="903.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="183.5" x2="183.5" y1="36.7999" y2="903.6002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="319.5" x2="319.5" y1="36.7999" y2="903.6002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="34" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="41" y="25.0059">D</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="34" y="902.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="41" y="922.6062">D</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="52.5" x2="52.5" y1="38.2969" y2="894.3516"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="102" x2="102" y1="38.2969" y2="894.3516"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="152" x2="152" y1="38.2969" y2="894.3516"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="894.3516"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="353.5" x2="353.5" y1="38.2969" y2="894.3516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="22.9951">D</text>
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="893.3516"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="913.3467">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="80" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="87" y="25.0059">C</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="80" y="902.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="87" y="922.6062">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">C</text>
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="893.3516"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="913.3467">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="126.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="133.5" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="126.5" y="902.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="133.5" y="922.6062">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="893.3516"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="913.3467">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="172.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="179.5" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="172.5" y="902.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="179.5" y="922.6062">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="893.3516"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="913.3467">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda t20034.cc:56:18)" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="205.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215" x="212.5" y="25.0059">D::d2()::(lambda t20034.cc:56:18)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="229" x="205.5" y="902.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="215" x="212.5" y="922.6062">D::d2()::(lambda t20034.cc:56:18)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda t20034.cc:56:18)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="239" x="232.5" y="22.9951">D::d2()::(lambda t20034.cc:56:18)</text>
+      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="893.3516"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="239" x="232.5" y="913.3467">D::d2()::(lambda t20034.cc:56:18)</text>
     </a>
-    <polygon fill="#181818" points="34,64.3999,44,68.3999,34,72.3999,38,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="68.3999" y2="68.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="62.8769">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,94,90,98,80,102,84,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="92.477">c2()</text>
+    <polygon fill="#A80036" points="41,65.4297,51,69.4297,41,73.4297,45,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="69.4297" y2="69.4297"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="64.3638">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="93.4966">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,123.6,136,127.6,126,131.6,130,127.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="127.6" y2="127.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="122.077">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="172,153.2,182,157.2,172,161.2,176,157.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="178" y1="157.2" y2="157.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="151.677">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="190,152.8281,200,156.8281,190,160.8281,194,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="156.8281" y2="156.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="151.7622">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="178.2"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="178.2" y2="178.2"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="181.2" y2="181.2"/>
-    <polygon fill="#181818" points="34,210.8,44,214.8,34,218.8,38,214.8" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="214.8" y2="214.8"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="209.277">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="172,240.4,182,244.4,172,248.4,176,244.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="178" y1="244.4" y2="244.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="238.877">a2()</text>
+    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="177.8281"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="177.8281" y2="177.8281"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="180.8281" y2="180.8281"/>
+    <polygon fill="#A80036" points="41,209.9609,51,213.9609,41,217.9609,45,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="213.9609" y2="213.9609"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="208.895">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="190,239.0938,200,243.0938,190,247.0938,194,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="196" y1="243.0938" y2="243.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="60" y="238.0278">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="265.4"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="265.4" y2="265.4"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="268.4" y2="268.4"/>
-    <polygon fill="#181818" points="34,298,44,302,34,306,38,302" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="302" y2="302"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="296.477">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="308,327.6,318,331.6,308,335.6,312,331.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="314" y1="331.6" y2="331.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63" x="53" y="326.077">operator()()</text>
+    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="264.0938"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="264.0938" y2="264.0938"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="267.0938" y2="267.0938"/>
+    <polygon fill="#A80036" points="41,296.2266,51,300.2266,41,304.2266,45,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="300.2266" y2="300.2266"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="295.1606">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="342,325.3594,352,329.3594,342,333.3594,346,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="348" y1="329.3594" y2="329.3594"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="60" y="324.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="195,357.2001,185,361.2001,195,365.2001,191,361.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="189" x2="319" y1="361.2001" y2="361.2001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="201" y="355.677">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="213,354.4922,203,358.4922,213,362.4922,209,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="207" x2="353" y1="358.4922" y2="358.4922"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="219" y="353.4263">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="382.2001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="382.2001" y2="382.2001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="385.2001" y2="385.2001"/>
-    <polygon fill="#181818" points="34,414.8001,44,418.8001,34,422.8001,38,418.8001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="418.8001" y2="418.8001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="413.2771">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,444.4001,90,448.4001,80,452.4001,84,448.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="448.4001" y2="448.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="442.8771">c4()</text>
+    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="379.4922"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="379.4922" y2="379.4922"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="382.4922" y2="382.4922"/>
+    <polygon fill="#A80036" points="41,411.625,51,415.625,41,419.625,45,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="415.625" y2="415.625"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="410.5591">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="444.7578" y2="444.7578"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="439.6919">c4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,474.0001,136,478.0001,126,482.0001,130,478.0001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="478.0001" y2="478.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="472.4771">b4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="180" y1="507.6001" y2="507.6001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="180" x2="180" y1="507.6001" y2="520.6001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="139" x2="180" y1="520.6001" y2="520.6001"/>
-      <polygon fill="#181818" points="149,516.6001,139,520.6001,149,524.6001,145,520.6001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="502.0771">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="194" y1="503.0234" y2="503.0234"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="194" y1="503.0234" y2="516.0234"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="153" x2="194" y1="516.0234" y2="516.0234"/>
+      <polygon fill="#A80036" points="163,512.0234,153,516.0234,163,520.0234,159,516.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="497.9575">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="172,546.2001,182,550.2001,172,554.2001,176,550.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="178" y1="550.2001" y2="550.2001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="544.6771">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="190,541.1563,200,545.1563,190,549.1563,194,545.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="545.1563" y2="545.1563"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="540.0903">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="571.2001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="571.2001" y2="571.2001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="574.2001" y2="574.2001"/>
-    <polygon fill="#181818" points="34,603.8001,44,607.8001,34,611.8001,38,607.8001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="607.8001" y2="607.8001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="602.2771">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,633.4001,90,637.4001,80,641.4001,84,637.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="637.4001" y2="637.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="631.8771">c1()</text>
+    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="566.1563"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="566.1563" y2="566.1563"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="569.1563" y2="569.1563"/>
+    <polygon fill="#A80036" points="41,598.2891,51,602.2891,41,606.2891,45,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="602.2891" y2="602.2891"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="597.2231">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,627.4219,100,631.4219,90,635.4219,94,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="631.4219" y2="631.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="626.356">c1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,663.0002,136,667.0002,126,671.0002,130,667.0002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="667.0002" y2="667.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="661.4772">b1()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,656.5547,150,660.5547,140,664.5547,144,660.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="660.5547" y2="660.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="655.4888">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="172,692.6002,182,696.6002,172,700.6002,176,696.6002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="178" y1="696.6002" y2="696.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="691.0772">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="190,685.6875,200,689.6875,190,693.6875,194,689.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="689.6875" y2="689.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="684.6216">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="439.5" x="0" y="717.6002"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="717.6002" y2="717.6002"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="439.5" y1="720.6002" y2="720.6002"/>
-    <polygon fill="#181818" points="34,750.2002,44,754.2002,34,758.2002,38,754.2002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="754.2002" y2="754.2002"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="748.6772">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,779.8002,90,783.8002,80,787.8002,84,783.8002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="783.8002" y2="783.8002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="778.2772">c3()</text>
+    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="710.6875"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="710.6875" y2="710.6875"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="713.6875" y2="713.6875"/>
+    <polygon fill="#A80036" points="41,742.8203,51,746.8203,41,750.8203,45,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="746.8203" y2="746.8203"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="741.7544">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,771.9531,100,775.9531,90,779.9531,94,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="775.9531" y2="775.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="770.8872">c3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="134" y1="813.4002" y2="813.4002"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="134" x2="134" y1="813.4002" y2="826.4002"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="93" x2="134" y1="826.4002" y2="826.4002"/>
-      <polygon fill="#181818" points="103,822.4002,93,826.4002,103,830.4002,99,826.4002" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="807.8772">c2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="144" y1="805.0859" y2="805.0859"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="144" x2="144" y1="805.0859" y2="818.0859"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="103" x2="144" y1="818.0859" y2="818.0859"/>
+      <polygon fill="#A80036" points="113,814.0859,103,818.0859,113,822.0859,109,818.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="109" y="800.02">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,852.0002,136,856.0002,126,860.0002,130,856.0002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="856.0002" y2="856.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="850.4772">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,843.2188,150,847.2188,140,851.2188,144,847.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="847.2188" y2="847.2188"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="842.1528">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="172,881.6002,182,885.6002,172,889.6002,176,885.6002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="138" x2="178" y1="885.6002" y2="885.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="145" y="880.0772">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="190,872.3516,200,876.3516,190,880.3516,194,876.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="876.3516" y2="876.3516"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="871.2856">a2()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20034_sequence_mermaid.svg b/docs/test_cases/t20034_sequence_mermaid.svg
index 50735c40..e8db8167 100644
--- a/docs/test_cases/t20034_sequence_mermaid.svg
+++ b/docs/test_cases/t20034_sequence_mermaid.svg
@@ -108,17 +108,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -127,50 +127,50 @@
       <circle r="6" cy="15" cx="15"/>
     </marker>
   </defs>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="174">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="271" y1="111" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="374">c2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="574">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="476"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="774">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="676"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="174">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="271" y1="295" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="574">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="871" y1="341" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="174">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="271" y1="387" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="696">operator()()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="1116.5" y1="433" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="448" x="999">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="479" x2="879" y1="479" x1="1119.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="494" x="174">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="271" y1="525" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="374">c4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="471" y1="571" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="574">b4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="671" y1="617" x1="476"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="676">b2()</text>
-  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 676,663 C 736,653 736,693 676,683"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="708" x="774">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="739" x2="871" y1="739" x1="676"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="754" x="174">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="785" x2="271" y1="785" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="800" x="374">c1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="831" x2="471" y1="831" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="846" x="574">b1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="877" x2="671" y1="877" x1="476"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="892" x="774">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="923" x2="871" y1="923" x1="676"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="938" x="174">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="969" x2="271" y1="969" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="984" x="374">c3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1015" x2="471" y1="1015" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1030" x="476">c2()</text>
-  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 476,1061 C 536,1051 536,1091 476,1081"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1106" x="574">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1137" x2="671" y1="1137" x1="476"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1152" x="774">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1183" x2="871" y1="1183" x1="676"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="375">c2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="575">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="775">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="675"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="175">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="275" y1="295" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="575">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="875" y1="341" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="175">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="275" y1="387" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="698">operator()()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="1120.5" y1="433" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="448" x="998">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="479" x2="875" y1="479" x1="1120.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="494" x="175">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="275" y1="525" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="375">c4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="475" y1="571" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="575">b4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="675" y1="617" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="675">b2()</text>
+  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 675,663 C 735,653 735,693 675,683"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="708" x="775">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="739" x2="875" y1="739" x1="675"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="754" x="175">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="785" x2="275" y1="785" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="800" x="375">c1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="831" x2="475" y1="831" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="846" x="575">b1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="877" x2="675" y1="877" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="892" x="775">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="923" x2="875" y1="923" x1="675"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="938" x="175">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="969" x2="275" y1="969" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="984" x="375">c3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1015" x2="475" y1="1015" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1030" x="475">c2()</text>
+  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 475,1061 C 535,1051 535,1091 475,1081"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1106" x="575">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1137" x2="675" y1="1137" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1152" x="775">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1183" x2="875" y1="1183" x1="675"/>
 </svg>
diff --git a/docs/test_cases/t20035.md b/docs/test_cases/t20035.md
index 65eb29c0..a9d791df 100644
--- a/docs/test_cases/t20035.md
+++ b/docs/test_cases/t20035.md
@@ -43,8 +43,10 @@ int tmain(int argc, char **argv) { return a(argc); }
   "name": "t20035_sequence",
   "participants": [
     {
+      "display_name": "tmain(int,char **)",
       "id": "1380099746477810520",
-      "name": "clanguml::t20035::tmain(int,char **)",
+      "name": "tmain",
+      "namespace": "clanguml::t20035",
       "source_location": {
         "column": 5,
         "file": "t20035.cc",
@@ -54,8 +56,10 @@ int tmain(int argc, char **argv) { return a(argc); }
       "type": "function"
     },
     {
+      "display_name": "a(int)",
       "id": "1503144831959453736",
-      "name": "clanguml::t20035::a(int)",
+      "name": "a",
+      "namespace": "clanguml::t20035",
       "source_location": {
         "column": 5,
         "file": "t20035.cc",
@@ -65,8 +69,10 @@ int tmain(int argc, char **argv) { return a(argc); }
       "type": "function"
     },
     {
+      "display_name": "b1(int)",
       "id": "440199113909747659",
-      "name": "clanguml::t20035::b1(int)",
+      "name": "b1",
+      "namespace": "clanguml::t20035",
       "source_location": {
         "column": 5,
         "file": "t20035.cc",
@@ -76,8 +82,10 @@ int tmain(int argc, char **argv) { return a(argc); }
       "type": "function"
     },
     {
+      "display_name": "c(int)",
       "id": "709102392181022891",
-      "name": "clanguml::t20035::c(int)",
+      "name": "c",
+      "namespace": "clanguml::t20035",
       "source_location": {
         "column": 5,
         "file": "t20035.cc",
@@ -105,9 +113,7 @@ int tmain(int argc, char **argv) { return a(argc); }
             {
               "from": {
                 "activity_id": "1380099746477810520",
-                "activity_name": "clanguml::t20035::tmain(int,char **)",
-                "participant_id": "1380099746477810520",
-                "participant_name": "clanguml::t20035::tmain(int,char **)"
+                "participant_id": "1380099746477810520"
               },
               "name": "",
               "return_type": "int",
@@ -120,7 +126,6 @@ int tmain(int argc, char **argv) { return a(argc); }
               },
               "to": {
                 "activity_id": "1503144831959453736",
-                "activity_name": "clanguml::t20035::a(int)",
                 "participant_id": "1503144831959453736"
               },
               "type": "message"
@@ -128,9 +133,7 @@ int tmain(int argc, char **argv) { return a(argc); }
             {
               "from": {
                 "activity_id": "1503144831959453736",
-                "activity_name": "clanguml::t20035::a(int)",
-                "participant_id": "1503144831959453736",
-                "participant_name": "clanguml::t20035::a(int)"
+                "participant_id": "1503144831959453736"
               },
               "name": "",
               "return_type": "int",
@@ -143,7 +146,6 @@ int tmain(int argc, char **argv) { return a(argc); }
               },
               "to": {
                 "activity_id": "440199113909747659",
-                "activity_name": "clanguml::t20035::b1(int)",
                 "participant_id": "440199113909747659"
               },
               "type": "message"
@@ -151,9 +153,7 @@ int tmain(int argc, char **argv) { return a(argc); }
             {
               "from": {
                 "activity_id": "440199113909747659",
-                "activity_name": "clanguml::t20035::b1(int)",
-                "participant_id": "440199113909747659",
-                "participant_name": "clanguml::t20035::b1(int)"
+                "participant_id": "440199113909747659"
               },
               "name": "",
               "return_type": "int",
@@ -166,7 +166,6 @@ int tmain(int argc, char **argv) { return a(argc); }
               },
               "to": {
                 "activity_id": "709102392181022891",
-                "activity_name": "clanguml::t20035::c(int)",
                 "participant_id": "709102392181022891"
               },
               "type": "message"
diff --git a/docs/test_cases/t20035_sequence.svg b/docs/test_cases/t20035_sequence.svg
index 3a9db5a3..524d34bc 100644
--- a/docs/test_cases/t20035_sequence.svg
+++ b/docs/test_cases/t20035_sequence.svg
@@ -1,47 +1,53 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="134px" preserveAspectRatio="none" style="width:309px;height:134px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 134" width="309px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="140px" preserveAspectRatio="none" style="width:349px;height:140px;" version="1.1" viewBox="0 0 349 140" width="349px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f2qpfz35b7j78" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="65" x2="65" y1="36.7999" y2="98.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="158" x2="158" y1="36.7999" y2="98.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="219" x2="219" y1="36.7999" y2="98.7999"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="280" x2="280" y1="36.7999" y2="98.7999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="25.0059">tmain(int,char **)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="97.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="117.8059">tmain(int,char **)</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="100.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="179" x2="179" y1="38.2969" y2="100.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="247" x2="247" y1="38.2969" y2="100.2969"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="315" x2="315" y1="38.2969" y2="100.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
+      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="99.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="119.292">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="47" x="135" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="142" y="25.0059">a(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="47" x="135" y="97.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="142" y="117.8059">a(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="22.9951">a(int)</text>
+      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="99.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="119.292">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="192" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="199" y="25.0059">b1(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="192" y="97.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="199" y="117.8059">b1(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="22.9951">b1(int)</text>
+      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="99.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="119.292">b1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="46" x="257" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="264" y="25.0059">c(int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="46" x="257" y="97.7999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32" x="264" y="117.8059">c(int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="22.9951">c(int)</text>
+      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="99.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="119.292">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="146.5,48.7999,156.5,52.7999,146.5,56.7999,150.5,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="65" x2="152.5" y1="52.7999" y2="52.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="167.5,50.2969,177.5,54.2969,167.5,58.2969,171.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="75.5" x2="173.5" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="207.5,62.7999,217.5,66.7999,207.5,70.7999,211.5,66.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="158.5" x2="213.5" y1="66.7999" y2="66.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="235.5,64.2969,245.5,68.2969,235.5,72.2969,239.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="179.5" x2="241.5" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="268,76.7999,278,80.7999,268,84.7999,272,80.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="219.5" x2="274" y1="80.7999" y2="80.7999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="303.5,78.2969,313.5,82.2969,303.5,86.2969,307.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="247.5" x2="309.5" y1="82.2969" y2="82.2969"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20035_sequence_mermaid.svg b/docs/test_cases/t20035_sequence_mermaid.svg
index f0b89c98..dbd1dab4 100644
--- a/docs/test_cases/t20035_sequence_mermaid.svg
+++ b/docs/test_cases/t20035_sequence_mermaid.svg
@@ -78,17 +78,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -97,10 +97,10 @@
       <circle r="6" cy="15" cx="15"/>
     </marker>
   </defs>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="174">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="374">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="471" y1="85" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="574">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="671" y1="95" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="375">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="85" x2="475" y1="85" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="100" x="575">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="95" x2="675" y1="95" x1="475"/>
 </svg>
diff --git a/docs/test_cases/t20036.md b/docs/test_cases/t20036.md
index 0c56f2a7..9b3e4dae 100644
--- a/docs/test_cases/t20036.md
+++ b/docs/test_cases/t20036.md
@@ -72,8 +72,64 @@ struct D {
   "name": "t20036_sequence",
   "participants": [
     {
+      "activities": [
+        {
+          "display_name": "c1()",
+          "id": "1742507735898803374",
+          "name": "c1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 20,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c2()",
+          "id": "128745191811378037",
+          "name": "c2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 21,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c4()",
+          "id": "1735839766717973272",
+          "name": "c4",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 30,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "c3()",
+          "id": "1523531372012294984",
+          "name": "c3",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 22,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "C",
       "id": "589458700000736705",
-      "name": "clanguml::t20036::C",
+      "name": "C",
+      "namespace": "clanguml::t20036",
       "source_location": {
         "column": 8,
         "file": "t20036.cc",
@@ -83,8 +139,38 @@ struct D {
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "b1()",
+          "id": "203660950902052846",
+          "name": "b1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 12,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "b2()",
+          "id": "1726094580455938498",
+          "name": "b2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 13,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "607147607288902300",
-      "name": "clanguml::t20036::B",
+      "name": "B",
+      "namespace": "clanguml::t20036",
       "source_location": {
         "column": 8,
         "file": "t20036.cc",
@@ -94,8 +180,25 @@ struct D {
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a2()",
+          "id": "2124074228514438863",
+          "name": "a2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 7,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "399722216848214287",
-      "name": "clanguml::t20036::A",
+      "name": "A",
+      "namespace": "clanguml::t20036",
       "source_location": {
         "column": 8,
         "file": "t20036.cc",
@@ -105,8 +208,51 @@ struct D {
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "d1()",
+          "id": "701488875613014930",
+          "name": "d1",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 36,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "d3()",
+          "id": "1897648539724183065",
+          "name": "d3",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 38,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "d2()",
+          "id": "1534436779969087203",
+          "name": "d2",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20036.cc",
+            "line": 37,
+            "translation_unit": "t20036.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "D",
       "id": "847434467114564641",
-      "name": "clanguml::t20036::D",
+      "name": "D",
+      "namespace": "clanguml::t20036",
       "source_location": {
         "column": 8,
         "file": "t20036.cc",
@@ -124,7 +270,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1742507735898803374",
-                "activity_name": "clanguml::t20036::C::c1()",
                 "participant_id": "589458700000736705"
               },
               "name": "b1()",
@@ -138,7 +283,6 @@ struct D {
               },
               "to": {
                 "activity_id": "203660950902052846",
-                "activity_name": "clanguml::t20036::B::b1()",
                 "participant_id": "607147607288902300"
               },
               "type": "message"
@@ -146,7 +290,6 @@ struct D {
             {
               "from": {
                 "activity_id": "203660950902052846",
-                "activity_name": "clanguml::t20036::B::b1()",
                 "participant_id": "607147607288902300"
               },
               "name": "a2()",
@@ -160,7 +303,6 @@ struct D {
               },
               "to": {
                 "activity_id": "2124074228514438863",
-                "activity_name": "clanguml::t20036::A::a2()",
                 "participant_id": "399722216848214287"
               },
               "type": "message"
@@ -172,7 +314,6 @@ struct D {
             {
               "from": {
                 "activity_id": "701488875613014930",
-                "activity_name": "clanguml::t20036::D::d1()",
                 "participant_id": "847434467114564641"
               },
               "name": "c2()",
@@ -186,7 +327,6 @@ struct D {
               },
               "to": {
                 "activity_id": "128745191811378037",
-                "activity_name": "clanguml::t20036::C::c2()",
                 "participant_id": "589458700000736705"
               },
               "type": "message"
@@ -194,7 +334,6 @@ struct D {
             {
               "from": {
                 "activity_id": "128745191811378037",
-                "activity_name": "clanguml::t20036::C::c2()",
                 "participant_id": "589458700000736705"
               },
               "name": "b2()",
@@ -208,7 +347,6 @@ struct D {
               },
               "to": {
                 "activity_id": "1726094580455938498",
-                "activity_name": "clanguml::t20036::B::b2()",
                 "participant_id": "607147607288902300"
               },
               "type": "message"
@@ -216,7 +354,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1726094580455938498",
-                "activity_name": "clanguml::t20036::B::b2()",
                 "participant_id": "607147607288902300"
               },
               "name": "a2()",
@@ -230,7 +367,6 @@ struct D {
               },
               "to": {
                 "activity_id": "2124074228514438863",
-                "activity_name": "clanguml::t20036::A::a2()",
                 "participant_id": "399722216848214287"
               },
               "type": "message"
@@ -242,7 +378,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1897648539724183065",
-                "activity_name": "clanguml::t20036::D::d3()",
                 "participant_id": "847434467114564641"
               },
               "name": "a2()",
@@ -256,7 +391,6 @@ struct D {
               },
               "to": {
                 "activity_id": "2124074228514438863",
-                "activity_name": "clanguml::t20036::A::a2()",
                 "participant_id": "399722216848214287"
               },
               "type": "message"
@@ -268,7 +402,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1735839766717973272",
-                "activity_name": "clanguml::t20036::C::c4()",
                 "participant_id": "589458700000736705"
               },
               "name": "b2()",
@@ -282,7 +415,6 @@ struct D {
               },
               "to": {
                 "activity_id": "1726094580455938498",
-                "activity_name": "clanguml::t20036::B::b2()",
                 "participant_id": "607147607288902300"
               },
               "type": "message"
@@ -290,7 +422,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1726094580455938498",
-                "activity_name": "clanguml::t20036::B::b2()",
                 "participant_id": "607147607288902300"
               },
               "name": "a2()",
@@ -304,7 +435,6 @@ struct D {
               },
               "to": {
                 "activity_id": "2124074228514438863",
-                "activity_name": "clanguml::t20036::A::a2()",
                 "participant_id": "399722216848214287"
               },
               "type": "message"
@@ -316,7 +446,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1523531372012294984",
-                "activity_name": "clanguml::t20036::C::c3()",
                 "participant_id": "589458700000736705"
               },
               "name": "c2()",
@@ -330,7 +459,6 @@ struct D {
               },
               "to": {
                 "activity_id": "128745191811378037",
-                "activity_name": "clanguml::t20036::C::c2()",
                 "participant_id": "589458700000736705"
               },
               "type": "message"
@@ -338,7 +466,6 @@ struct D {
             {
               "from": {
                 "activity_id": "128745191811378037",
-                "activity_name": "clanguml::t20036::C::c2()",
                 "participant_id": "589458700000736705"
               },
               "name": "b2()",
@@ -352,7 +479,6 @@ struct D {
               },
               "to": {
                 "activity_id": "1726094580455938498",
-                "activity_name": "clanguml::t20036::B::b2()",
                 "participant_id": "607147607288902300"
               },
               "type": "message"
@@ -360,7 +486,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1726094580455938498",
-                "activity_name": "clanguml::t20036::B::b2()",
                 "participant_id": "607147607288902300"
               },
               "name": "a2()",
@@ -374,7 +499,6 @@ struct D {
               },
               "to": {
                 "activity_id": "2124074228514438863",
-                "activity_name": "clanguml::t20036::A::a2()",
                 "participant_id": "399722216848214287"
               },
               "type": "message"
@@ -386,7 +510,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1534436779969087203",
-                "activity_name": "clanguml::t20036::D::d2()",
                 "participant_id": "847434467114564641"
               },
               "name": "c2()",
@@ -400,7 +523,6 @@ struct D {
               },
               "to": {
                 "activity_id": "128745191811378037",
-                "activity_name": "clanguml::t20036::C::c2()",
                 "participant_id": "589458700000736705"
               },
               "type": "message"
@@ -408,7 +530,6 @@ struct D {
             {
               "from": {
                 "activity_id": "128745191811378037",
-                "activity_name": "clanguml::t20036::C::c2()",
                 "participant_id": "589458700000736705"
               },
               "name": "b2()",
@@ -422,7 +543,6 @@ struct D {
               },
               "to": {
                 "activity_id": "1726094580455938498",
-                "activity_name": "clanguml::t20036::B::b2()",
                 "participant_id": "607147607288902300"
               },
               "type": "message"
@@ -430,7 +550,6 @@ struct D {
             {
               "from": {
                 "activity_id": "1726094580455938498",
-                "activity_name": "clanguml::t20036::B::b2()",
                 "participant_id": "607147607288902300"
               },
               "name": "a2()",
@@ -444,7 +563,6 @@ struct D {
               },
               "to": {
                 "activity_id": "2124074228514438863",
-                "activity_name": "clanguml::t20036::A::a2()",
                 "participant_id": "399722216848214287"
               },
               "type": "message"
diff --git a/docs/test_cases/t20036_sequence.svg b/docs/test_cases/t20036_sequence.svg
index e4b965f7..25f29695 100644
--- a/docs/test_cases/t20036_sequence.svg
+++ b/docs/test_cases/t20036_sequence.svg
@@ -1,140 +1,146 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="837px" preserveAspectRatio="none" style="width:208px;height:837px;background:#FFFFFF;" version="1.1" viewBox="0 0 208 837" width="208px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="834px" preserveAspectRatio="none" style="width:233px;height:834px;" version="1.1" viewBox="0 0 233 834" width="233px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f96e9ixcc1epj" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="46" x2="46" y1="36.7999" y2="801.8002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="91.5" x2="91.5" y1="36.7999" y2="801.8002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="137.5" x2="137.5" y1="36.7999" y2="801.8002"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="184" x2="184" y1="36.7999" y2="801.8002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="34" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="41" y="25.0059">C</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="34" y="800.8002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="41" y="820.8061">C</text>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="52" x2="52" y1="38.2969" y2="793.9531"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="102" x2="102" y1="38.2969" y2="793.9531"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="793.9531"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="793.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="22.9951">C</text>
+      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="792.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="812.9482">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="80.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="87.5" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="80.5" y="800.8002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="87.5" y="820.8061">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="792.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="812.9482">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="126.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="133.5" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="126.5" y="800.8002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="133.5" y="820.8061">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="792.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="812.9482">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="172" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="179" y="25.0059">D</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="24" x="172" y="800.8002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="10" x="179" y="820.8061">D</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="22.9951">D</text>
+      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="792.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="812.9482">D</text>
     </a>
-    <polygon fill="#181818" points="34,64.3999,44,68.3999,34,72.3999,38,68.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="68.3999" y2="68.3999"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="62.8769">c1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,94,90,98,80,102,84,98" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="98" y2="98"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="92.477">b1()</text>
+    <polygon fill="#A80036" points="40,65.4297,50,69.4297,40,73.4297,44,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="69.4297" y2="69.4297"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="64.3638">c1()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="93.4966">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,123.6,136,127.6,126,131.6,130,127.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="127.6" y2="127.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="122.077">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="148.6"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="148.6" y2="148.6"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="151.6" y2="151.6"/>
-    <polygon fill="#181818" points="172,181.2,182,185.2,172,189.2,176,185.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="178" y1="185.2" y2="185.2"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="179.677">d1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="57,210.8,47,214.8,57,218.8,53,214.8" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="51" x2="183" y1="214.8" y2="214.8"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="63" y="209.277">c2()</text>
+    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="148.6953"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="148.6953" y2="148.6953"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="151.6953" y2="151.6953"/>
+    <polygon fill="#A80036" points="190,180.8281,200,184.8281,190,188.8281,194,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="184.8281" y2="184.8281"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="179.7622">d1()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="63,209.9609,53,213.9609,63,217.9609,59,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="213.9609" y2="213.9609"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="208.895">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,240.4,90,244.4,80,248.4,84,244.4" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="244.4" y2="244.4"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="238.877">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,239.0938,100,243.0938,90,247.0938,94,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="243.0938" y2="243.0938"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="238.0278">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,270,136,274,126,278,130,274" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="274" y2="274"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="268.477">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,268.2266,150,272.2266,140,276.2266,144,272.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="272.2266" y2="272.2266"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="267.1606">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="295"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="295" y2="295"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="298" y2="298"/>
-    <polygon fill="#181818" points="172,327.6,182,331.6,172,335.6,176,331.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="178" y1="331.6" y2="331.6"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="326.077">d3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="149,357.2001,139,361.2001,149,365.2001,145,361.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="143" x2="183" y1="361.2001" y2="361.2001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="155" y="355.677">a2()</text>
+    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="293.2266"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="293.2266" y2="293.2266"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="296.2266" y2="296.2266"/>
+    <polygon fill="#A80036" points="190,325.3594,200,329.3594,190,333.3594,194,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="329.3594" y2="329.3594"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="324.2935">d3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="163,354.4922,153,358.4922,163,362.4922,159,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="201" y1="358.4922" y2="358.4922"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="169" y="353.4263">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="382.2001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="382.2001" y2="382.2001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="385.2001" y2="385.2001"/>
-    <polygon fill="#181818" points="34,414.8001,44,418.8001,34,422.8001,38,418.8001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="418.8001" y2="418.8001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="413.2771">c4()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,444.4001,90,448.4001,80,452.4001,84,448.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="448.4001" y2="448.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="442.8771">b2()</text>
+    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="379.4922"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="379.4922" y2="379.4922"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="382.4922" y2="382.4922"/>
+    <polygon fill="#A80036" points="40,411.625,50,415.625,40,419.625,44,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="415.625" y2="415.625"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="410.5591">c4()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="444.7578" y2="444.7578"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="439.6919">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,474.0001,136,478.0001,126,482.0001,130,478.0001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="478.0001" y2="478.0001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="472.4771">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="499.0001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="499.0001" y2="499.0001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="502.0001" y2="502.0001"/>
-    <polygon fill="#181818" points="34,531.6001,44,535.6001,34,539.6001,38,535.6001" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="40" y1="535.6001" y2="535.6001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="530.0771">c3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="88" y1="565.2001" y2="565.2001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="88" x2="88" y1="565.2001" y2="578.2001"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="47" x2="88" y1="578.2001" y2="578.2001"/>
-      <polygon fill="#181818" points="57,574.2001,47,578.2001,57,582.2001,53,578.2001" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="559.6771">c2()</text>
+    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="494.8906"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="494.8906" y2="494.8906"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="497.8906" y2="497.8906"/>
+    <polygon fill="#A80036" points="40,527.0234,50,531.0234,40,535.0234,44,531.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="531.0234" y2="531.0234"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="525.9575">c3()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="94" y1="560.1563" y2="560.1563"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="94" x2="94" y1="560.1563" y2="573.1563"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="94" y1="573.1563" y2="573.1563"/>
+      <polygon fill="#A80036" points="63,569.1563,53,573.1563,63,577.1563,59,573.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="59" y="555.0903">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,603.8001,90,607.8001,80,611.8001,84,607.8001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="607.8001" y2="607.8001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="602.2771">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,598.2891,100,602.2891,90,606.2891,94,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="602.2891" y2="602.2891"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="597.2231">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,633.4001,136,637.4001,126,641.4001,130,637.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="637.4001" y2="637.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="631.8771">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,627.4219,150,631.4219,140,635.4219,144,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="631.4219" y2="631.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="626.356">a2()</text>
     </a>
-    <rect fill="#EEEEEE" height="3" style="stroke:#EEEEEE;stroke-width:1.0;" width="201" x="0" y="658.4001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="658.4001" y2="658.4001"/>
-    <line style="stroke:#000000;stroke-width:1.0;" x1="0" x2="201" y1="661.4001" y2="661.4001"/>
-    <polygon fill="#181818" points="172,691.0002,182,695.0002,172,699.0002,176,695.0002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;" x1="0" x2="178" y1="695.0002" y2="695.0002"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="7" y="689.4772">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="57,720.6002,47,724.6002,57,728.6002,53,724.6002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="51" x2="183" y1="724.6002" y2="724.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="63" y="719.0772">c2()</text>
+    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="652.4219"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="652.4219" y2="652.4219"/>
+    <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="655.4219" y2="655.4219"/>
+    <polygon fill="#A80036" points="190,684.5547,200,688.5547,190,692.5547,194,688.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="688.5547" y2="688.5547"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="683.4888">d2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="63,713.6875,53,717.6875,63,721.6875,59,717.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="717.6875" y2="717.6875"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="712.6216">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="80,750.2002,90,754.2002,80,758.2002,84,754.2002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="46" x2="86" y1="754.2002" y2="754.2002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="53" y="748.6772">b2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="90,742.8203,100,746.8203,90,750.8203,94,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="746.8203" y2="746.8203"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="741.7544">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="126,779.8002,136,783.8002,126,787.8002,130,783.8002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="92" x2="132" y1="783.8002" y2="783.8002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="99" y="778.2772">a2()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="140,771.9531,150,775.9531,140,779.9531,144,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="775.9531" y2="775.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="770.8872">a2()</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t20036_sequence_mermaid.svg b/docs/test_cases/t20036_sequence_mermaid.svg
index 8614a6c3..cd661d11 100644
--- a/docs/test_cases/t20036_sequence_mermaid.svg
+++ b/docs/test_cases/t20036_sequence_mermaid.svg
@@ -93,17 +93,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -112,44 +112,44 @@
       <circle r="6" cy="15" cx="15"/>
     </marker>
   </defs>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="177">c1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="79" y1="111" x1="274"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="274">b1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="471" y1="157" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="574">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="671" y1="203" x1="476"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="574">d1()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="871" y1="249" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="477">c2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="79" y1="295" x1="874"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="274">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="471" y1="341" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="574">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="671" y1="387" x1="476"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="574">d3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="871" y1="433" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="448" x="777">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="479" x2="679" y1="479" x1="874"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="494" x="177">c4()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="79" y1="525" x1="274"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="274">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="471" y1="571" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="574">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="671" y1="617" x1="476"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="177">c3()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="663" x2="79" y1="663" x1="274"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="678" x="76">c2()</text>
-  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 76,709 C 136,699 136,739 76,729"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="754" x="274">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="785" x2="471" y1="785" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="800" x="574">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="831" x2="671" y1="831" x1="476"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="846" x="574">d2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="877" x2="871" y1="877" x1="276"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="892" x="477">c2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="923" x2="79" y1="923" x1="874"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="938" x="274">b2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="969" x2="471" y1="969" x1="76"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="984" x="574">a2()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1015" x2="671" y1="1015" x1="476"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="175">c1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="75" y1="111" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="275">b1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="575">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="675" y1="203" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="575">d1()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="875" y1="249" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="475">c2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="75" y1="295" x1="875"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="275">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="475" y1="341" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="575">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="387" x2="675" y1="387" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="402" x="575">d3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="433" x2="875" y1="433" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="448" x="775">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="479" x2="675" y1="479" x1="875"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="494" x="175">c4()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="75" y1="525" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="275">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="475" y1="571" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="575">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="675" y1="617" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="175">c3()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="663" x2="75" y1="663" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="678" x="75">c2()</text>
+  <path style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" d="M 75,709 C 135,699 135,739 75,729"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="754" x="275">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="785" x2="475" y1="785" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="800" x="575">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="831" x2="675" y1="831" x1="475"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="846" x="575">d2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="877" x2="875" y1="877" x1="275"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="892" x="475">c2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="923" x2="75" y1="923" x1="875"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="938" x="275">b2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="969" x2="475" y1="969" x1="75"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="984" x="575">a2()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1015" x2="675" y1="1015" x1="475"/>
 </svg>
diff --git a/docs/test_cases/t20037.md b/docs/test_cases/t20037.md
index 92392e02..216ef07c 100644
--- a/docs/test_cases/t20037.md
+++ b/docs/test_cases/t20037.md
@@ -66,8 +66,10 @@ void tmain(int argc, char **argv)
   "name": "t20037_sequence",
   "participants": [
     {
+      "display_name": "tmain(int,char **)",
       "id": "1676651465274088148",
-      "name": "clanguml::t20037::tmain(int,char **)",
+      "name": "tmain",
+      "namespace": "clanguml::t20037",
       "source_location": {
         "column": 6,
         "file": "t20037.cc",
@@ -77,8 +79,10 @@ void tmain(int argc, char **argv)
       "type": "function"
     },
     {
+      "display_name": "a()",
       "id": "150460916850164805",
-      "name": "clanguml::t20037::a()",
+      "name": "a",
+      "namespace": "clanguml::t20037",
       "source_location": {
         "column": 5,
         "file": "t20037.cc",
@@ -88,8 +92,25 @@ void tmain(int argc, char **argv)
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "A()",
+          "id": "1135451191676888496",
+          "name": "A",
+          "namespace": "",
+          "source_location": {
+            "column": 5,
+            "file": "t20037.cc",
+            "line": 5,
+            "translation_unit": "t20037.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "1329920824155530080",
-      "name": "clanguml::t20037::A",
+      "name": "A",
+      "namespace": "clanguml::t20037",
       "source_location": {
         "column": 8,
         "file": "t20037.cc",
@@ -99,8 +120,10 @@ void tmain(int argc, char **argv)
       "type": "class"
     },
     {
+      "display_name": "initb()",
       "id": "1303264946914255327",
-      "name": "clanguml::t20037::initb()",
+      "name": "initb",
+      "namespace": "clanguml::t20037",
       "source_location": {
         "column": 3,
         "file": "t20037.cc",
@@ -110,8 +133,25 @@ void tmain(int argc, char **argv)
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "get()",
+          "id": "107877908217538137",
+          "name": "get",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20037.cc",
+            "line": 14,
+            "translation_unit": "t20037.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1746900845528413124",
-      "name": "clanguml::t20037::B",
+      "name": "B",
+      "namespace": "clanguml::t20037",
       "source_location": {
         "column": 8,
         "file": "t20037.cc",
@@ -121,8 +161,10 @@ void tmain(int argc, char **argv)
       "type": "class"
     },
     {
+      "display_name": "c()",
       "id": "1349992361928784583",
-      "name": "clanguml::t20037::c()",
+      "name": "c",
+      "namespace": "clanguml::t20037",
       "source_location": {
         "column": 5,
         "file": "t20037.cc",
@@ -138,9 +180,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1676651465274088148",
-            "activity_name": "clanguml::t20037::tmain(int,char **)",
-            "participant_id": "1676651465274088148",
-            "participant_name": "clanguml::t20037::tmain(int,char **)"
+            "participant_id": "1676651465274088148"
           },
           "name": "",
           "return_type": "int",
@@ -153,7 +193,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "150460916850164805",
-            "activity_name": "clanguml::t20037::a()",
             "participant_id": "150460916850164805"
           },
           "type": "message"
@@ -161,9 +200,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "150460916850164805",
-            "activity_name": "clanguml::t20037::a()",
-            "participant_id": "150460916850164805",
-            "participant_name": "clanguml::t20037::a()"
+            "participant_id": "150460916850164805"
           },
           "name": "A()",
           "return_type": "void",
@@ -176,7 +213,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1135451191676888496",
-            "activity_name": "clanguml::t20037::A::A()",
             "participant_id": "1329920824155530080"
           },
           "type": "message"
@@ -184,9 +220,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "150460916850164805",
-            "activity_name": "clanguml::t20037::a()",
-            "participant_id": "150460916850164805",
-            "participant_name": "clanguml::t20037::a()"
+            "participant_id": "150460916850164805"
           },
           "name": "",
           "return_type": "B",
@@ -199,7 +233,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1303264946914255327",
-            "activity_name": "clanguml::t20037::initb()",
             "participant_id": "1303264946914255327"
           },
           "type": "message"
@@ -207,9 +240,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "150460916850164805",
-            "activity_name": "clanguml::t20037::a()",
-            "participant_id": "150460916850164805",
-            "participant_name": "clanguml::t20037::a()"
+            "participant_id": "150460916850164805"
           },
           "name": "get()",
           "return_type": "int",
@@ -222,7 +253,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "107877908217538137",
-            "activity_name": "clanguml::t20037::B::get()",
             "participant_id": "1746900845528413124"
           },
           "type": "message"
@@ -230,9 +260,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "150460916850164805",
-            "activity_name": "clanguml::t20037::a()",
-            "participant_id": "150460916850164805",
-            "participant_name": "clanguml::t20037::a()"
+            "participant_id": "150460916850164805"
           },
           "name": "",
           "return_type": "int",
@@ -245,7 +273,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "1349992361928784583",
-            "activity_name": "clanguml::t20037::c()",
             "participant_id": "1349992361928784583"
           },
           "type": "message"
@@ -253,9 +280,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1676651465274088148",
-            "activity_name": "clanguml::t20037::tmain(int,char **)",
-            "participant_id": "1676651465274088148",
-            "participant_name": "clanguml::t20037::tmain(int,char **)"
+            "participant_id": "1676651465274088148"
           },
           "name": "",
           "return_type": "int",
@@ -268,7 +293,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "150460916850164805",
-            "activity_name": "clanguml::t20037::a()",
             "participant_id": "150460916850164805"
           },
           "type": "message"
@@ -276,9 +300,7 @@ void tmain(int argc, char **argv)
         {
           "from": {
             "activity_id": "1676651465274088148",
-            "activity_name": "clanguml::t20037::tmain(int,char **)",
-            "participant_id": "1676651465274088148",
-            "participant_name": "clanguml::t20037::tmain(int,char **)"
+            "participant_id": "1676651465274088148"
           },
           "name": "",
           "return_type": "int",
@@ -291,7 +313,6 @@ void tmain(int argc, char **argv)
           },
           "to": {
             "activity_id": "150460916850164805",
-            "activity_name": "clanguml::t20037::a()",
             "participant_id": "150460916850164805"
           },
           "type": "message"
diff --git a/docs/test_cases/t20037_sequence.svg b/docs/test_cases/t20037_sequence.svg
index 14f65d44..fcece6cb 100644
--- a/docs/test_cases/t20037_sequence.svg
+++ b/docs/test_cases/t20037_sequence.svg
@@ -1,141 +1,147 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="478px" preserveAspectRatio="none" style="width:348px;height:478px;background:#FFFFFF;" version="1.1" viewBox="0 0 348 478" width="348px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="483px" preserveAspectRatio="none" style="width:390px;height:483px;" version="1.1" viewBox="0 0 390 483" width="390px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f6ykgh2epvef1" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="378.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
-    <rect fill="#FFFFFF" height="173.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="52.7999"/>
-    <rect fill="#FFFFFF" height="85.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="240"/>
-    <rect fill="#FFFFFF" height="85.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="339.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="192" y="82.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="238.5" y="126.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="170"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="269.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="369.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="198"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="297.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="397.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="65" x2="65" y1="36.7999" y2="443.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="151" x2="151" y1="36.7999" y2="443.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="196.5" x2="196.5" y1="36.7999" y2="443.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="243.5" x2="243.5" y1="36.7999" y2="443.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="289.5" x2="289.5" y1="36.7999" y2="443.2"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="326.5" x2="326.5" y1="36.7999" y2="443.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="25.0059">tmain(int,char **)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="120" x="5" y="442.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="12" y="462.2059">tmain(int,char **)</text>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="442.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="171" x2="171" y1="38.2969" y2="442.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="218.5" x2="218.5" y1="38.2969" y2="442.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="442.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="323.5" x2="323.5" y1="38.2969" y2="442.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365.5" x2="365.5" y1="38.2969" y2="442.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="441.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="461.8232">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L23" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L23" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="135" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="142" y="25.0059">a()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="32" x="135" y="442.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="18" x="142" y="462.2059">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L23" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L23" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="160" y="22.9951">a()</text>
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="441.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="160" y="461.8232">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="185.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.5" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="185.5" y="442.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="192.5" y="462.2059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="212.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="441.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="212.5" y="461.8232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L19" target="_top" title="initb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L19" xlink:show="new" xlink:title="initb" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="218.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="225.5" y="25.0059">initb()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="50" x="218.5" y="442.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36" x="225.5" y="462.2059">initb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L19" target="_top" title="initb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L19" xlink:show="new" xlink:title="initb" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="249.5" y="22.9951">initb()</text>
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="441.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="249.5" y="461.8232">initb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="278.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="285.5" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="278.5" y="442.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="285.5" y="462.2059">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="316.5" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="441.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="316.5" y="461.8232">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L21" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L21" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="31" x="311.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="318.5" y="25.0059">c()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="31" x="311.5" y="442.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="17" x="318.5" y="462.2059">c()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L21" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L21" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="354.5" y="22.9951">c()</text>
+      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="441.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="354.5" y="461.8232">c()</text>
     </a>
-    <rect fill="#FFFFFF" height="378.4001" style="stroke:#181818;stroke-width:1.0;" width="10" x="60" y="46.7999"/>
-    <rect fill="#FFFFFF" height="173.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="52.7999"/>
-    <rect fill="#FFFFFF" height="85.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="240"/>
-    <rect fill="#FFFFFF" height="85.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="146" y="339.6"/>
-    <rect fill="#FFFFFF" height="30" style="stroke:#181818;stroke-width:1.0;" width="10" x="192" y="82.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="238.5" y="126.3999"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="170"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="269.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="285" y="369.2"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="198"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="297.6"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="322" y="397.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="134,48.7999,144,52.7999,134,56.7999,138,52.7999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="140" y1="52.7999" y2="52.7999"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="154,50.2969,164,54.2969,154,58.2969,158,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="180,78.3999,190,82.3999,180,86.3999,184,82.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="186" y1="82.3999" y2="82.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="17" x="163" y="76.8769">A()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="202,79.4297,212,83.4297,202,87.4297,206,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="208" y1="83.4297" y2="83.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="183" y="78.3638">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="226.5,122.3999,236.5,126.3999,226.5,130.3999,230.5,126.3999" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="232.5" y1="126.3999" y2="126.3999"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="254,123.4297,264,127.4297,254,131.4297,258,127.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="260" y1="127.4297" y2="127.4297"/>
     </a>
-    <polygon fill="#181818" points="167,136.3999,157,140.3999,167,144.3999,163,140.3999" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="242.5" y1="140.3999" y2="140.3999"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="273,166,283,170,273,174,277,170" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="279" y1="170" y2="170"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="163" y="164.477">get()</text>
+    <polygon fill="#A80036" points="187,137.4297,177,141.4297,187,145.4297,183,141.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="270" y1="141.4297" y2="141.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="306.5,166.5625,316.5,170.5625,306.5,174.5625,310.5,170.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="170.5625" y2="170.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="165.4966">get()</text>
     </a>
-    <polygon fill="#181818" points="167,180,157,184,167,188,163,184" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="289" y1="184" y2="184"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="310,194,320,198,310,202,314,198" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="316" y1="198" y2="198"/>
+    <polygon fill="#A80036" points="187,180.5625,177,184.5625,187,188.5625,183,184.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="184.5625" y2="184.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="348.5,194.5625,358.5,198.5625,348.5,202.5625,352.5,198.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="198.5625" y2="198.5625"/>
     </a>
-    <polygon fill="#181818" points="167,208,157,212,167,216,163,212" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="326" y1="212" y2="212"/>
-    <polygon fill="#181818" points="81,222,71,226,81,230,77,226" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="150" y1="226" y2="226"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="134,236,144,240,134,244,138,240" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="140" y1="240" y2="240"/>
+    <polygon fill="#A80036" points="187,208.5625,177,212.5625,187,216.5625,183,212.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="212.5625" y2="212.5625"/>
+    <polygon fill="#A80036" points="91.5,222.5625,81.5,226.5625,91.5,230.5625,87.5,226.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="170" y1="226.5625" y2="226.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="154,236.5625,164,240.5625,154,244.5625,158,240.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="240.5625" y2="240.5625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="273,265.6,283,269.6,273,273.6,277,269.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="279" y1="269.6" y2="269.6"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="163" y="264.077">get()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="306.5,265.6953,316.5,269.6953,306.5,273.6953,310.5,269.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="269.6953" y2="269.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="264.6294">get()</text>
     </a>
-    <polygon fill="#181818" points="167,279.6,157,283.6,167,287.6,163,283.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="289" y1="283.6" y2="283.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="310,293.6,320,297.6,310,301.6,314,297.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="316" y1="297.6" y2="297.6"/>
+    <polygon fill="#A80036" points="187,279.6953,177,283.6953,187,287.6953,183,283.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="283.6953" y2="283.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="348.5,293.6953,358.5,297.6953,348.5,301.6953,352.5,297.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="297.6953" y2="297.6953"/>
     </a>
-    <polygon fill="#181818" points="167,307.6,157,311.6,167,315.6,163,311.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="326" y1="311.6" y2="311.6"/>
-    <polygon fill="#181818" points="81,321.6,71,325.6,81,329.6,77,325.6" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="75" x2="150" y1="325.6" y2="325.6"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="134,335.6,144,339.6,134,343.6,138,339.6" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="70" x2="140" y1="339.6" y2="339.6"/>
+    <polygon fill="#A80036" points="187,307.6953,177,311.6953,187,315.6953,183,311.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="311.6953" y2="311.6953"/>
+    <polygon fill="#A80036" points="91.5,321.6953,81.5,325.6953,91.5,329.6953,87.5,325.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="170" y1="325.6953" y2="325.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="154,335.6953,164,339.6953,154,343.6953,158,339.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="339.6953" y2="339.6953"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="273,365.2,283,369.2,273,373.2,277,369.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="279" y1="369.2" y2="369.2"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="26" x="163" y="363.677">get()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="306.5,364.8281,316.5,368.8281,306.5,372.8281,310.5,368.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="368.8281" y2="368.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="363.7622">get()</text>
     </a>
-    <polygon fill="#181818" points="167,379.2,157,383.2,167,387.2,163,383.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="289" y1="383.2" y2="383.2"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="310,393.2,320,397.2,310,401.2,314,397.2" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="156" x2="316" y1="397.2" y2="397.2"/>
+    <polygon fill="#A80036" points="187,378.8281,177,382.8281,187,386.8281,183,382.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="382.8281" y2="382.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="348.5,392.8281,358.5,396.8281,348.5,400.8281,352.5,396.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="396.8281" y2="396.8281"/>
     </a>
-    <polygon fill="#181818" points="167,407.2,157,411.2,167,415.2,163,411.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="161" x2="326" y1="411.2" y2="411.2"/>
-    <polygon fill="#181818" points="76,421.2,66,425.2,76,429.2,72,425.2" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="70" x2="150" y1="425.2" y2="425.2"/>
+    <polygon fill="#A80036" points="187,406.8281,177,410.8281,187,414.8281,183,410.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="410.8281" y2="410.8281"/>
+    <polygon fill="#A80036" points="86.5,420.8281,76.5,424.8281,86.5,428.8281,82.5,424.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="80.5" x2="170" y1="424.8281" y2="424.8281"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20037_sequence_mermaid.svg b/docs/test_cases/t20037_sequence_mermaid.svg
index 531e44ec..eaf8a91c 100644
--- a/docs/test_cases/t20037_sequence_mermaid.svg
+++ b/docs/test_cases/t20037_sequence_mermaid.svg
@@ -108,17 +108,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -163,46 +163,46 @@
   <g>
     <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="403" x="1070"/>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="176">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="271" y1="75" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="376">A()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="121" x2="471" y1="121" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="476">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="671" y1="131" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="477">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="141" x2="283" y1="141" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="156" x="576">get()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="187" x2="871" y1="187" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="202" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="197" x2="283" y1="197" x1="870"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="212" x="676">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="207" x2="1071" y1="207" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="222" x="677">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="217" x2="283" y1="217" x1="1070"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="232" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="227" x2="83" y1="227" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="242" x="176">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="237" x2="271" y1="237" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="252" x="576">get()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="283" x2="871" y1="283" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="298" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="293" x2="283" y1="293" x1="870"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="308" x="676">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="303" x2="1071" y1="303" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="318" x="677">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="313" x2="283" y1="313" x1="1070"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="328" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="323" x2="83" y1="323" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="338" x="176">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="333" x2="271" y1="333" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="348" x="576">get()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="379" x2="871" y1="379" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="394" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="389" x2="283" y1="389" x1="870"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="676">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="399" x2="1071" y1="399" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="414" x="677">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="409" x2="283" y1="409" x1="1070"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="424" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="419" x2="83" y1="419" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="75" x2="275" y1="75" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="90" x="378">A()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="121" x2="475" y1="121" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="136" x="478">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="131" x2="675" y1="131" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="146" x="475">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="141" x2="280" y1="141" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="156" x="578">get()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="187" x2="875" y1="187" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="202" x="575">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="197" x2="280" y1="197" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="212" x="678">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="207" x2="1075" y1="207" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="222" x="675">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="217" x2="280" y1="217" x1="1070"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="232" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="227" x2="80" y1="227" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="242" x="178">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="237" x2="275" y1="237" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="252" x="578">get()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="283" x2="875" y1="283" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="298" x="575">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="293" x2="280" y1="293" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="308" x="678">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="303" x2="1075" y1="303" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="318" x="675">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="313" x2="280" y1="313" x1="1070"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="328" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="323" x2="80" y1="323" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="338" x="178">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="333" x2="275" y1="333" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="348" x="578">get()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="379" x2="875" y1="379" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="394" x="575">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="389" x2="280" y1="389" x1="870"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="678">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="399" x2="1075" y1="399" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="414" x="675">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="409" x2="280" y1="409" x1="1070"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="424" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="419" x2="80" y1="419" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t20038.md b/docs/test_cases/t20038.md
index 681ad014..f6ffab1e 100644
--- a/docs/test_cases/t20038.md
+++ b/docs/test_cases/t20038.md
@@ -140,8 +140,10 @@ template <typename T> T add(T a, T b)
   "name": "t20038_sequence",
   "participants": [
     {
+      "display_name": "tmain()",
       "id": "1013610625329227974",
-      "name": "clanguml::t20038::tmain()",
+      "name": "tmain",
+      "namespace": "clanguml::t20038",
       "source_location": {
         "column": 5,
         "file": "t20038.cc",
@@ -151,8 +153,77 @@ template <typename T> T add(T a, T b)
       "type": "function"
     },
     {
+      "activities": [
+        {
+          "display_name": "b()",
+          "id": "690314603725772987",
+          "name": "b",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20038.cc",
+            "line": 29,
+            "translation_unit": "t20038.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bbb()",
+          "id": "1902331999195245434",
+          "name": "bbb",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20038.cc",
+            "line": 33,
+            "translation_unit": "t20038.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bbbb()",
+          "id": "57189865474209187",
+          "name": "bbbb",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20038.cc",
+            "line": 35,
+            "translation_unit": "t20038.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "wrap(int)",
+          "id": "732774941205637034",
+          "name": "wrap",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20038.cc",
+            "line": 39,
+            "translation_unit": "t20038.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "bbbbb()",
+          "id": "726295067786650864",
+          "name": "bbbbb",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20038.cc",
+            "line": 37,
+            "translation_unit": "t20038.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "B",
       "id": "1040787777721396414",
-      "name": "clanguml::t20038::B",
+      "name": "B",
+      "namespace": "clanguml::t20038",
       "source_location": {
         "column": 8,
         "file": "t20038.cc",
@@ -162,8 +233,51 @@ template <typename T> T add(T a, T b)
       "type": "class"
     },
     {
+      "activities": [
+        {
+          "display_name": "a()",
+          "id": "1311298747919334371",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20038.cc",
+            "line": 9,
+            "translation_unit": "t20038.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "aaa()",
+          "id": "2157208254318041144",
+          "name": "aaa",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20038.cc",
+            "line": 21,
+            "translation_unit": "t20038.cc"
+          },
+          "type": "method"
+        },
+        {
+          "display_name": "aaaa()",
+          "id": "1370854824770046153",
+          "name": "aaaa",
+          "namespace": "",
+          "source_location": {
+            "column": 9,
+            "file": "t20038.cc",
+            "line": 23,
+            "translation_unit": "t20038.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A",
       "id": "2022724814881480995",
-      "name": "clanguml::t20038::A",
+      "name": "A",
+      "namespace": "clanguml::t20038",
       "source_location": {
         "column": 8,
         "file": "t20038.cc",
@@ -173,8 +287,10 @@ template <typename T> T add(T a, T b)
       "type": "class"
     },
     {
+      "display_name": "add<int>(int,int)",
       "id": "2008308445790932614",
-      "name": "clanguml::t20038::add<int>(int,int)",
+      "name": "add",
+      "namespace": "clanguml::t20038",
       "source_location": {
         "column": 25,
         "file": "include/t20038.h",
@@ -184,8 +300,10 @@ template <typename T> T add(T a, T b)
       "type": "function_template"
     },
     {
+      "display_name": "add_impl<int>(int,int)",
       "id": "1863007445376981099",
-      "name": "clanguml::t20038::add_impl<int>(int,int)",
+      "name": "add_impl",
+      "namespace": "clanguml::t20038",
       "source_location": {
         "column": 25,
         "file": "include/t20038.h",
@@ -195,8 +313,10 @@ template <typename T> T add(T a, T b)
       "type": "function_template"
     },
     {
+      "display_name": "add_impl<double>(double,double)",
       "id": "1722521509166427875",
-      "name": "clanguml::t20038::add_impl<double>(double,double)",
+      "name": "add_impl",
+      "namespace": "clanguml::t20038",
       "source_location": {
         "column": 25,
         "file": "include/t20038.h",
@@ -220,9 +340,7 @@ template <typename T> T add(T a, T b)
                     {
                       "from": {
                         "activity_id": "1013610625329227974",
-                        "activity_name": "clanguml::t20038::tmain()",
-                        "participant_id": "1013610625329227974",
-                        "participant_name": "clanguml::t20038::tmain()"
+                        "participant_id": "1013610625329227974"
                       },
                       "name": "b()",
                       "return_type": "int",
@@ -235,7 +353,6 @@ template <typename T> T add(T a, T b)
                       },
                       "to": {
                         "activity_id": "690314603725772987",
-                        "activity_name": "clanguml::t20038::B::b()",
                         "participant_id": "1040787777721396414"
                       },
                       "type": "message"
@@ -243,7 +360,6 @@ template <typename T> T add(T a, T b)
                     {
                       "from": {
                         "activity_id": "690314603725772987",
-                        "activity_name": "clanguml::t20038::B::b()",
                         "participant_id": "1040787777721396414"
                       },
                       "name": "a()",
@@ -257,7 +373,6 @@ template <typename T> T add(T a, T b)
                       },
                       "to": {
                         "activity_id": "1311298747919334371",
-                        "activity_name": "clanguml::t20038::A::a()",
                         "participant_id": "2022724814881480995"
                       },
                       "type": "message"
@@ -275,9 +390,7 @@ template <typename T> T add(T a, T b)
                   "comment": "... or just once",
                   "from": {
                     "activity_id": "1013610625329227974",
-                    "activity_name": "clanguml::t20038::tmain()",
-                    "participant_id": "1013610625329227974",
-                    "participant_name": "clanguml::t20038::tmain()"
+                    "participant_id": "1013610625329227974"
                   },
                   "name": "b()",
                   "return_type": "int",
@@ -290,7 +403,6 @@ template <typename T> T add(T a, T b)
                   },
                   "to": {
                     "activity_id": "690314603725772987",
-                    "activity_name": "clanguml::t20038::B::b()",
                     "participant_id": "1040787777721396414"
                   },
                   "type": "message"
@@ -305,9 +417,7 @@ template <typename T> T add(T a, T b)
         {
           "from": {
             "activity_id": "1013610625329227974",
-            "activity_name": "clanguml::t20038::tmain()",
-            "participant_id": "1013610625329227974",
-            "participant_name": "clanguml::t20038::tmain()"
+            "participant_id": "1013610625329227974"
           },
           "name": "bbb()",
           "return_type": "int",
@@ -320,7 +430,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "1902331999195245434",
-            "activity_name": "clanguml::t20038::B::bbb()",
             "participant_id": "1040787777721396414"
           },
           "type": "message"
@@ -328,7 +437,6 @@ template <typename T> T add(T a, T b)
         {
           "from": {
             "activity_id": "1902331999195245434",
-            "activity_name": "clanguml::t20038::B::bbb()",
             "participant_id": "1040787777721396414"
           },
           "name": "aaa()",
@@ -342,7 +450,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "2157208254318041144",
-            "activity_name": "clanguml::t20038::A::aaa()",
             "participant_id": "2022724814881480995"
           },
           "type": "message"
@@ -350,9 +457,7 @@ template <typename T> T add(T a, T b)
         {
           "from": {
             "activity_id": "1013610625329227974",
-            "activity_name": "clanguml::t20038::tmain()",
-            "participant_id": "1013610625329227974",
-            "participant_name": "clanguml::t20038::tmain()"
+            "participant_id": "1013610625329227974"
           },
           "name": "bbbb()",
           "return_type": "int",
@@ -365,7 +470,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "57189865474209187",
-            "activity_name": "clanguml::t20038::B::bbbb()",
             "participant_id": "1040787777721396414"
           },
           "type": "message"
@@ -373,7 +477,6 @@ template <typename T> T add(T a, T b)
         {
           "from": {
             "activity_id": "57189865474209187",
-            "activity_name": "clanguml::t20038::B::bbbb()",
             "participant_id": "1040787777721396414"
           },
           "name": "aaaa()",
@@ -387,7 +490,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "1370854824770046153",
-            "activity_name": "clanguml::t20038::A::aaaa()",
             "participant_id": "2022724814881480995"
           },
           "type": "message"
@@ -395,7 +497,6 @@ template <typename T> T add(T a, T b)
         {
           "from": {
             "activity_id": "1370854824770046153",
-            "activity_name": "clanguml::t20038::A::aaaa()",
             "participant_id": "2022724814881480995"
           },
           "name": "",
@@ -409,7 +510,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "2008308445790932614",
-            "activity_name": "clanguml::t20038::add<int>(int,int)",
             "participant_id": "2008308445790932614"
           },
           "type": "message"
@@ -418,9 +518,7 @@ template <typename T> T add(T a, T b)
           "comment": "Invoke 'add' implementation",
           "from": {
             "activity_id": "2008308445790932614",
-            "activity_name": "clanguml::t20038::add<int>(int,int)",
-            "participant_id": "2008308445790932614",
-            "participant_name": "clanguml::t20038::add<int>(int,int)"
+            "participant_id": "2008308445790932614"
           },
           "name": "",
           "return_type": "",
@@ -433,7 +531,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "1863007445376981099",
-            "activity_name": "clanguml::t20038::add_impl<int>(int,int)",
             "participant_id": "1863007445376981099"
           },
           "type": "message"
@@ -442,9 +539,7 @@ template <typename T> T add(T a, T b)
           "comment": "This comment should be rendered only once",
           "from": {
             "activity_id": "1013610625329227974",
-            "activity_name": "clanguml::t20038::tmain()",
-            "participant_id": "1013610625329227974",
-            "participant_name": "clanguml::t20038::tmain()"
+            "participant_id": "1013610625329227974"
           },
           "name": "wrap(int)",
           "return_type": "int",
@@ -457,7 +552,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "732774941205637034",
-            "activity_name": "clanguml::t20038::B::wrap(int)",
             "participant_id": "1040787777721396414"
           },
           "type": "message"
@@ -466,9 +560,7 @@ template <typename T> T add(T a, T b)
           "comment": "What is 2 + 2?",
           "from": {
             "activity_id": "1013610625329227974",
-            "activity_name": "clanguml::t20038::tmain()",
-            "participant_id": "1013610625329227974",
-            "participant_name": "clanguml::t20038::tmain()"
+            "participant_id": "1013610625329227974"
           },
           "name": "",
           "return_type": "",
@@ -481,7 +573,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "1722521509166427875",
-            "activity_name": "clanguml::t20038::add_impl<double>(double,double)",
             "participant_id": "1722521509166427875"
           },
           "type": "message"
@@ -490,9 +581,7 @@ template <typename T> T add(T a, T b)
           "comment": "This is a generic comment about calling bbbbb()\n\n\\uml{note:some_other_diagram[] This is specific for some_other_diagram}\n\\uml{note:t20038_sequence[] Calling B::bbbbb()}",
           "from": {
             "activity_id": "1013610625329227974",
-            "activity_name": "clanguml::t20038::tmain()",
-            "participant_id": "1013610625329227974",
-            "participant_name": "clanguml::t20038::tmain()"
+            "participant_id": "1013610625329227974"
           },
           "name": "bbbbb()",
           "return_type": "int",
@@ -505,7 +594,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "726295067786650864",
-            "activity_name": "clanguml::t20038::B::bbbbb()",
             "participant_id": "1040787777721396414"
           },
           "type": "message"
@@ -513,7 +601,6 @@ template <typename T> T add(T a, T b)
         {
           "from": {
             "activity_id": "726295067786650864",
-            "activity_name": "clanguml::t20038::B::bbbbb()",
             "participant_id": "1040787777721396414"
           },
           "name": "aaaa()",
@@ -527,7 +614,6 @@ template <typename T> T add(T a, T b)
           },
           "to": {
             "activity_id": "1370854824770046153",
-            "activity_name": "clanguml::t20038::A::aaaa()",
             "participant_id": "2022724814881480995"
           },
           "type": "message"
@@ -540,9 +626,7 @@ template <typename T> T add(T a, T b)
                 {
                   "from": {
                     "activity_id": "1013610625329227974",
-                    "activity_name": "clanguml::t20038::tmain()",
-                    "participant_id": "1013610625329227974",
-                    "participant_name": "clanguml::t20038::tmain()"
+                    "participant_id": "1013610625329227974"
                   },
                   "name": "bbb()",
                   "return_type": "int",
@@ -555,7 +639,6 @@ template <typename T> T add(T a, T b)
                   },
                   "to": {
                     "activity_id": "1902331999195245434",
-                    "activity_name": "clanguml::t20038::B::bbb()",
                     "participant_id": "1040787777721396414"
                   },
                   "type": "message"
diff --git a/docs/test_cases/t20038_sequence.svg b/docs/test_cases/t20038_sequence.svg
index 193c7e9a..51bd9f06 100644
--- a/docs/test_cases/t20038_sequence.svg
+++ b/docs/test_cases/t20038_sequence.svg
@@ -1,263 +1,271 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1405px" preserveAspectRatio="none" style="width:814px;height:1405px;background:#FFFFFF;" version="1.1" viewBox="0 0 814 1405" width="814px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1430px" preserveAspectRatio="none" style="width:917px;height:1430px;" version="1.1" viewBox="0 0 917 1430" width="917px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1bulyusnguzdk" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" height="1313.2005" style="stroke:#181818;stroke-width:1.0;" width="10" x="127.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="360.4001"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="492.2002"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="586.4002"/>
-    <rect fill="#FFFFFF" height="149.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="673.6002"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="903.6003"/>
-    <rect fill="#FFFFFF" height="149.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="1046.4004"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="1285.4004"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="390.0002"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="521.8002"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="616.0002"/>
-    <rect fill="#FFFFFF" height="105.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="703.2003"/>
-    <rect fill="#FFFFFF" height="105.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="1076.0004"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="1315.0004"/>
-    <rect fill="#FFFFFF" height="77.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="348.5" y="717.2003"/>
-    <rect fill="#FFFFFF" height="77.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="348.5" y="1090.0004"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="766.8003"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="1139.6004"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="687.5" y="967.2003"/>
-    <rect fill="none" height="296.8001" style="stroke:#000000;stroke-width:1.5;" width="245" x="62" y="261.0001"/>
-    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="204" x="93" y="321.2001"/>
-    <rect fill="none" height="106.8" style="stroke:#000000;stroke-width:1.5;" width="204" x="93" y="1246.2004"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="132" x2="132" y1="36.7999" y2="1370.0004"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="210" x2="210" y1="36.7999" y2="1370.0004"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="275" x2="275" y1="36.7999" y2="1370.0004"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="353" x2="353" y1="36.7999" y2="1370.0004"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="493" x2="493" y1="36.7999" y2="1370.0004"/>
-    <line style="stroke:#181818;stroke-width:0.5;stroke-dasharray:5.0,5.0;" x1="692" x2="692" y1="36.7999" y2="1370.0004"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L44" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L44" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="103" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="110" y="25.0059">tmain()</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="59" x="103" y="1369.0004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="110" y="1389.0064">tmain()</text>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="1331.9141" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="912.0156"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1061.4141"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1306.0781"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1090.5469"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1335.2109"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1104.5469"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="772.6172"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1157.6797"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="979.1484"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
+    <rect fill="#FFFFFF" height="127.3984" style="stroke: none; stroke-width: 1.0;" width="266.5" x="72" y="434.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="105.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="1267.8125"/>
+    <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="222.5" x="106" y="1371.2109"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="149" x2="149" y1="38.2969" y2="1390.2109"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="234" x2="234" y1="38.2969" y2="1390.2109"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="304.5" x2="304.5" y1="38.2969" y2="1390.2109"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="394.5" x2="394.5" y1="38.2969" y2="1390.2109"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="555.5" x2="555.5" y1="38.2969" y2="1390.2109"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="779.5" x2="779.5" y1="38.2969" y2="1390.2109"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L44" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L44" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="123" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="1389.2109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="123" y="1409.2061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="199" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="206" y="25.0059">B</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="199" y="1369.0004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="206" y="1389.0064">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="227" y="22.9951">B</text>
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="1389.2109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="227" y="1409.2061">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="264" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="271" y="25.0059">A</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="23" x="264" y="1369.0004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="9" x="271" y="1389.0064">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="298.5" y="22.9951">A</text>
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="1389.2109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="298.5" y="1409.2061">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L8" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L8" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="297" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="304" y="25.0059">add&lt;int&gt;(int,int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="113" x="297" y="1369.0004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="304" y="1389.0064">add&lt;int&gt;(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L8" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L8" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="335.5" y="22.9951">add&lt;int&gt;(int,int)</text>
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="1389.2109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="335.5" y="1409.2061">add&lt;int&gt;(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="147" x="420" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="427" y="25.0059">add_impl&lt;int&gt;(int,int)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="147" x="420" y="1369.0004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="133" x="427" y="1389.0064">add_impl&lt;int&gt;(int,int)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="150" x="478.5" y="22.9951">add_impl&lt;int&gt;(int,int)</text>
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="1389.2109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="150" x="478.5" y="1409.2061">add_impl&lt;int&gt;(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="231" x="577" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="217" x="584" y="25.0059">add_impl&lt;double&gt;(double,double)</text>
-      <rect fill="#E2E2F0" height="30.7999" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="231" x="577" y="1369.0004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="217" x="584" y="1389.0064">add_impl&lt;double&gt;(double,double)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="243" x="656.5" y="22.9951">add_impl&lt;double&gt;(double,double)</text>
+      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="1389.2109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="243" x="656.5" y="1409.2061">add_impl&lt;double&gt;(double,double)</text>
     </a>
-    <rect fill="#FFFFFF" height="1313.2005" style="stroke:#181818;stroke-width:1.0;" width="10" x="127.5" y="46.7999"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="360.4001"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="492.2002"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="586.4002"/>
-    <rect fill="#FFFFFF" height="149.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="673.6002"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="903.6003"/>
-    <rect fill="#FFFFFF" height="149.2" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="1046.4004"/>
-    <rect fill="#FFFFFF" height="57.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="205.5" y="1285.4004"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="390.0002"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="521.8002"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="616.0002"/>
-    <rect fill="#FFFFFF" height="105.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="703.2003"/>
-    <rect fill="#FFFFFF" height="105.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="1076.0004"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="270.5" y="1315.0004"/>
-    <rect fill="#FFFFFF" height="77.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="348.5" y="717.2003"/>
-    <rect fill="#FFFFFF" height="77.6" style="stroke:#181818;stroke-width:1.0;" width="10" x="348.5" y="1090.0004"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="766.8003"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="488.5" y="1139.6004"/>
-    <rect fill="#FFFFFF" height="14" style="stroke:#181818;stroke-width:1.0;" width="10" x="687.5" y="967.2003"/>
-    <path d="M5,51.7999 L5,248.7999 L260,248.7999 L260,61.7999 L250,51.7999 L5,51.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M250,51.7999 L250,61.7999 L260,61.7999 L250,51.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="232" x="11" y="68.8769">Nisl purus in mollis nunc sed id semper.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="201" x="11" y="84.477">Varius vel pharetra vel turpis. Arcu</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="214" x="11" y="100.077">cursus vitae congue mauris rhoncus.</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="202" x="11" y="115.677">Risus feugiat in ante metus dictum</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="217" x="11" y="131.277">at tempor. Lacus vel facilisis volutpat</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="222" x="11" y="146.877">est. Auctor urna nunc id cursus metus</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="207" x="11" y="162.477">aliquam. Diam sit amet nisl suscipit</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="201" x="11" y="178.077">adipiscing. Potenti nullam ac tortor</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="234" x="11" y="193.677">vitae purus faucibus ornare suspendisse</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="225" x="11" y="209.2771">sed. Lobortis feugiat vivamus at augue</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="202" x="11" y="224.8771">eget arcu dictum varius. Non tellus</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="83" x="11" y="240.4771">orci ac auctor.</text>
-    <path d="M62,261.0001 L122,261.0001 L122,268.6001 L112,278.6001 L62,278.6001 L62,261.0001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="296.8001" style="stroke:#000000;stroke-width:1.5;" width="245" x="62" y="261.0001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="77" y="274.0771">alt</text>
-    <path d="M72,283.6001 L72,308.6001 L193,308.6001 L193,293.6001 L183,283.6001 L72,283.6001 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M183,283.6001 L183,293.6001 L193,293.6001 L183,283.6001 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="100" x="78" y="300.6771">Repeat 5 times...</text>
-    <path d="M93,321.2001 L166,321.2001 L166,328.8001 L156,338.8001 L93,338.8001 L93,321.2001 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="104.8" style="stroke:#000000;stroke-width:1.5;" width="204" x="93" y="321.2001"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="28" x="108" y="334.2771">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="193.5,356.4001,203.5,360.4001,193.5,364.4001,197.5,360.4001" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="360.4001" y2="360.4001"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="144.5" y="354.8771">b()</text>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="1331.9141" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="912.0156"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1061.4141"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1306.0781"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1090.5469"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1335.2109"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1104.5469"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="772.6172"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1157.6797"/>
+    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="979.1484"/>
+    <path d="M8,53.2969 L8,244.2969 L286,244.2969 L286,63.2969 L276,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M276,53.2969 L276,63.2969 L286,63.2969 L276,53.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="253" x="14" y="70.3638">Nisl purus in mollis nunc sed id semper.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="220" x="14" y="85.4966">Varius vel pharetra vel turpis. Arcu</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="235" x="14" y="100.6294">cursus vitae congue mauris rhoncus.</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="222" x="14" y="115.7622">Risus feugiat in ante metus dictum</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="236" x="14" y="130.895">at tempor. Lacus vel facilisis volutpat</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="244" x="14" y="146.0278">est. Auctor urna nunc id cursus metus</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="227" x="14" y="161.1606">aliquam. Diam sit amet nisl suscipit</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="222" x="14" y="176.2935">adipiscing. Potenti nullam ac tortor</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="257" x="14" y="191.4263">vitae purus faucibus ornare suspendisse</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="248" x="14" y="206.5591">sed. Lobortis feugiat vivamus at augue</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="223" x="14" y="221.6919">eget arcu dictum varius. Non tellus</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="91" x="14" y="236.8247">orci ac auctor.</text>
+    <path d="M72,260.8906 L136,260.8906 L136,267.8906 L126,277.8906 L72,277.8906 L72,260.8906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="87" y="273.9575">alt</text>
+    <path d="M82,283.0234 L82,308.0234 L212,308.0234 L212,293.0234 L202,283.0234 L82,283.0234 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M202,283.0234 L202,293.0234 L212,293.0234 L202,283.0234 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="109" x="88" y="300.0903">Repeat 5 times...</text>
+    <path d="M106,324.1563 L183,324.1563 L183,331.1563 L173,341.1563 L106,341.1563 L106,324.1563 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="121" y="337.2231">loop</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="217,358.4219,227,362.4219,217,366.4219,221,362.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="362.4219" y2="362.4219"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="161" y="357.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="258.5,386.0002,268.5,390.0002,258.5,394.0002,262.5,390.0002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="390.0002" y2="390.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="222.5" y="384.4772">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="288,387.5547,298,391.5547,288,395.5547,292,391.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="391.5547" y2="391.5547"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="246" y="386.4888">a()</text>
     </a>
-    <polygon fill="#181818" points="226.5,400.0002,216.5,404.0002,226.5,408.0002,222.5,404.0002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="404.0002" y2="404.0002"/>
-    <polygon fill="#181818" points="148.5,414.0002,138.5,418.0002,148.5,422.0002,144.5,418.0002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="418.0002" y2="418.0002"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="62" x2="307" y1="434.0002" y2="434.0002"/>
-    <path d="M80,440.0002 L80,465.0002 L185,465.0002 L185,450.0002 L175,440.0002 L80,440.0002 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M175,440.0002 L175,450.0002 L185,450.0002 L175,440.0002 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="84" x="86" y="457.0772">... or just once</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="193.5,488.2002,203.5,492.2002,193.5,496.2002,197.5,492.2002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="492.2002" y2="492.2002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="144.5" y="486.6772">b()</text>
+    <polygon fill="#A80036" points="250,401.5547,240,405.5547,250,409.5547,246,405.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="405.5547" y2="405.5547"/>
+    <polygon fill="#A80036" points="165,415.5547,155,419.5547,165,423.5547,161,419.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="419.5547" y2="419.5547"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="72" x2="338.5" y1="435.5547" y2="435.5547"/>
+    <path d="M91,441.5547 L91,466.5547 L203,466.5547 L203,451.5547 L193,441.5547 L91,441.5547 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M193,441.5547 L193,451.5547 L203,451.5547 L193,441.5547 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="91" x="97" y="458.6216">... or just once</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="217,492.8203,227,496.8203,217,500.8203,221,496.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="496.8203" y2="496.8203"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="161" y="491.7544">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="258.5,517.8002,268.5,521.8002,258.5,525.8002,262.5,521.8002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="521.8002" y2="521.8002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="15" x="222.5" y="516.2772">a()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="288,521.9531,298,525.9531,288,529.9531,292,525.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="525.9531" y2="525.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="246" y="520.8872">a()</text>
     </a>
-    <polygon fill="#181818" points="226.5,531.8002,216.5,535.8002,226.5,539.8002,222.5,535.8002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="535.8002" y2="535.8002"/>
-    <polygon fill="#181818" points="148.5,545.8002,138.5,549.8002,148.5,553.8002,144.5,549.8002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="549.8002" y2="549.8002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="193.5,582.4002,203.5,586.4002,193.5,590.4002,197.5,586.4002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="586.4002" y2="586.4002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="144.5" y="580.8772">bbb()</text>
+    <polygon fill="#A80036" points="250,535.9531,240,539.9531,250,543.9531,246,539.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="539.9531" y2="539.9531"/>
+    <polygon fill="#A80036" points="165,549.9531,155,553.9531,165,557.9531,161,553.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="553.9531" y2="553.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="217,586.0859,227,590.0859,217,594.0859,221,590.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="590.0859" y2="590.0859"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="161" y="585.02">bbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="258.5,612.0002,268.5,616.0002,258.5,620.0002,262.5,616.0002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="616.0002" y2="616.0002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="222.5" y="610.4772">aaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="288,615.2188,298,619.2188,288,623.2188,292,619.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="619.2188" y2="619.2188"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="246" y="614.1528">aaa()</text>
     </a>
-    <polygon fill="#181818" points="226.5,626.0002,216.5,630.0002,226.5,634.0002,222.5,630.0002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="630.0002" y2="630.0002"/>
-    <polygon fill="#181818" points="148.5,640.0002,138.5,644.0002,148.5,648.0002,144.5,644.0002" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="644.0002" y2="644.0002"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="193.5,669.6002,203.5,673.6002,193.5,677.6002,197.5,673.6002" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="673.6002" y2="673.6002"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="144.5" y="668.0772">bbbb()</text>
+    <polygon fill="#A80036" points="250,629.2188,240,633.2188,250,637.2188,246,633.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="633.2188" y2="633.2188"/>
+    <polygon fill="#A80036" points="165,643.2188,155,647.2188,165,651.2188,161,647.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="647.2188" y2="647.2188"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="217,672.3516,227,676.3516,217,680.3516,221,676.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="676.3516" y2="676.3516"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="161" y="671.2856">bbbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="258.5,699.2003,268.5,703.2003,258.5,707.2003,262.5,703.2003" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="703.2003" y2="703.2003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="222.5" y="697.6773">aaaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="288,701.4844,298,705.4844,288,709.4844,292,705.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="705.4844" y2="705.4844"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="246" y="700.4185">aaaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="336.5,713.2003,346.5,717.2003,336.5,721.2003,340.5,717.2003" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="280.5" x2="342.5" y1="717.2003" y2="717.2003"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="378,715.4844,388,719.4844,378,723.4844,382,719.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="310" x2="384" y1="719.4844" y2="719.4844"/>
     </a>
-    <path d="M263,730.2003 L263,755.2003 L444,755.2003 L444,740.2003 L434,730.2003 L263,730.2003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M434,730.2003 L434,740.2003 L444,740.2003 L434,730.2003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="160" x="269" y="747.2773">Invoke 'add' implementation</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="476.5,762.8003,486.5,766.8003,476.5,770.8003,480.5,766.8003" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="358.5" x2="482.5" y1="766.8003" y2="766.8003"/>
+    <path d="M292,732.4844 L292,757.4844 L493,757.4844 L493,742.4844 L483,732.4844 L292,732.4844 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M483,732.4844 L483,742.4844 L493,742.4844 L483,732.4844 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="180" x="298" y="749.5513">Invoke 'add' implementation</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="538.5,768.6172,548.5,772.6172,538.5,776.6172,542.5,772.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="544.5" y1="772.6172" y2="772.6172"/>
     </a>
-    <polygon fill="#181818" points="369.5,776.8003,359.5,780.8003,369.5,784.8003,365.5,780.8003" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="363.5" x2="492.5" y1="780.8003" y2="780.8003"/>
-    <polygon fill="#181818" points="291.5,790.8003,281.5,794.8003,291.5,798.8003,287.5,794.8003" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="285.5" x2="352.5" y1="794.8003" y2="794.8003"/>
-    <polygon fill="#181818" points="226.5,804.8003,216.5,808.8003,226.5,812.8003,222.5,808.8003" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="808.8003" y2="808.8003"/>
-    <polygon fill="#181818" points="148.5,818.8003,138.5,822.8003,148.5,826.8003,144.5,822.8003" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="822.8003" y2="822.8003"/>
-    <path d="M9,835.8003 L9,876.8003 L255,876.8003 L255,845.8003 L245,835.8003 L9,835.8003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M245,835.8003 L245,845.8003 L255,845.8003 L245,835.8003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="225" x="15" y="852.8773">This comment should be rendered only</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="15" y="868.4773">once</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="193.5,899.6003,203.5,903.6003,193.5,907.6003,197.5,903.6003" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="903.6003" y2="903.6003"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="49" x="144.5" y="898.0773">wrap(int)</text>
+    <polygon fill="#A80036" points="411,782.6172,401,786.6172,411,790.6172,407,786.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="405" x2="554.5" y1="786.6172" y2="786.6172"/>
+    <polygon fill="#A80036" points="321,796.6172,311,800.6172,321,804.6172,317,800.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="315" x2="394" y1="800.6172" y2="800.6172"/>
+    <polygon fill="#A80036" points="250,810.6172,240,814.6172,250,818.6172,246,814.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="814.6172" y2="814.6172"/>
+    <polygon fill="#A80036" points="165,824.6172,155,828.6172,165,832.6172,161,828.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="828.6172" y2="828.6172"/>
+    <path d="M12,841.6172 L12,881.6172 L282,881.6172 L282,851.6172 L272,841.6172 L12,841.6172 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M272,841.6172 L272,851.6172 L282,851.6172 L272,841.6172 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="249" x="18" y="858.6841">This comment should be rendered only</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="18" y="873.8169">once</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="217,908.0156,227,912.0156,217,916.0156,221,912.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="912.0156" y2="912.0156"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="56" x="161" y="906.9497">wrap(int)</text>
     </a>
-    <polygon fill="#181818" points="148.5,913.6003,138.5,917.6003,148.5,921.6003,144.5,917.6003" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="917.6003" y2="917.6003"/>
-    <path d="M79,930.6003 L79,955.6003 L185,955.6003 L185,940.6003 L175,930.6003 L79,930.6003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M175,930.6003 L175,940.6003 L185,940.6003 L175,930.6003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="85" x="85" y="947.6773">What is 2 + 2?</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L79" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L79" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="675.5,963.2003,685.5,967.2003,675.5,971.2003,679.5,967.2003" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="681.5" y1="967.2003" y2="967.2003"/>
+    <polygon fill="#A80036" points="165,922.0156,155,926.0156,165,930.0156,161,926.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="926.0156" y2="926.0156"/>
+    <path d="M90,939.0156 L90,964.0156 L203,964.0156 L203,949.0156 L193,939.0156 L90,939.0156 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M193,939.0156 L193,949.0156 L203,949.0156 L193,939.0156 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="92" x="96" y="956.0825">What is 2 + 2?</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L79" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L79" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="763,975.1484,773,979.1484,763,983.1484,767,979.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="769" y1="979.1484" y2="979.1484"/>
     </a>
-    <polygon fill="#181818" points="148.5,977.2003,138.5,981.2003,148.5,985.2003,144.5,981.2003" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="691.5" y1="981.2003" y2="981.2003"/>
-    <path d="M70,994.2003 L70,1019.2003 L194,1019.2003 L194,1004.2003 L184,994.2003 L70,994.2003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M184,994.2003 L184,1004.2003 L194,1004.2003 L184,994.2003 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="103" x="76" y="1011.2773">Calling B::bbbbb()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="193.5,1042.4004,203.5,1046.4004,193.5,1050.4004,197.5,1046.4004" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="1046.4004" y2="1046.4004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="144.5" y="1040.8773">bbbbb()</text>
+    <polygon fill="#A80036" points="165,989.1484,155,993.1484,165,997.1484,161,993.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="779" y1="993.1484" y2="993.1484"/>
+    <path d="M80,1006.1484 L80,1031.1484 L214,1031.1484 L214,1016.1484 L204,1006.1484 L80,1006.1484 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M204,1006.1484 L204,1016.1484 L214,1016.1484 L204,1006.1484 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="113" x="86" y="1023.2153">Calling B::bbbbb()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="217,1057.4141,227,1061.4141,217,1065.4141,221,1061.4141" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="1061.4141" y2="1061.4141"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="161" y="1056.3481">bbbbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="258.5,1072.0004,268.5,1076.0004,258.5,1080.0004,262.5,1076.0004" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="1076.0004" y2="1076.0004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="222.5" y="1070.4774">aaaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="288,1086.5469,298,1090.5469,288,1094.5469,292,1090.5469" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="1090.5469" y2="1090.5469"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="246" y="1085.481">aaaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="336.5,1086.0004,346.5,1090.0004,336.5,1094.0004,340.5,1090.0004" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="280.5" x2="342.5" y1="1090.0004" y2="1090.0004"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="378,1100.5469,388,1104.5469,378,1108.5469,382,1104.5469" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="310" x2="384" y1="1104.5469" y2="1104.5469"/>
     </a>
-    <path d="M263,1103.0004 L263,1128.0004 L444,1128.0004 L444,1113.0004 L434,1103.0004 L263,1103.0004 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M434,1103.0004 L434,1113.0004 L444,1113.0004 L434,1103.0004 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="160" x="269" y="1120.0774">Invoke 'add' implementation</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="476.5,1135.6004,486.5,1139.6004,476.5,1143.6004,480.5,1139.6004" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="358.5" x2="482.5" y1="1139.6004" y2="1139.6004"/>
+    <path d="M292,1117.5469 L292,1142.5469 L493,1142.5469 L493,1127.5469 L483,1117.5469 L292,1117.5469 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M483,1117.5469 L483,1127.5469 L493,1127.5469 L483,1117.5469 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="180" x="298" y="1134.6138">Invoke 'add' implementation</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="538.5,1153.6797,548.5,1157.6797,538.5,1161.6797,542.5,1157.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="544.5" y1="1157.6797" y2="1157.6797"/>
     </a>
-    <polygon fill="#181818" points="369.5,1149.6004,359.5,1153.6004,369.5,1157.6004,365.5,1153.6004" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="363.5" x2="492.5" y1="1153.6004" y2="1153.6004"/>
-    <polygon fill="#181818" points="291.5,1163.6004,281.5,1167.6004,291.5,1171.6004,287.5,1167.6004" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="285.5" x2="352.5" y1="1167.6004" y2="1167.6004"/>
-    <polygon fill="#181818" points="226.5,1177.6004,216.5,1181.6004,226.5,1185.6004,222.5,1181.6004" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="1181.6004" y2="1181.6004"/>
-    <polygon fill="#181818" points="148.5,1191.6004,138.5,1195.6004,148.5,1199.6004,144.5,1195.6004" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="1195.6004" y2="1195.6004"/>
-    <path d="M38,1208.6004 L38,1233.6004 L226,1233.6004 L226,1218.6004 L216,1208.6004 L38,1208.6004 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <path d="M216,1208.6004 L216,1218.6004 L226,1218.6004 L216,1208.6004 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="167" x="44" y="1225.6774">This is a conditional operator</text>
-    <path d="M93,1246.2004 L153,1246.2004 L153,1253.8004 L143,1263.8004 L93,1263.8004 L93,1246.2004 " fill="#EEEEEE" style="stroke:#000000;stroke-width:1.5;"/>
-    <rect fill="none" height="106.8" style="stroke:#000000;stroke-width:1.5;" width="204" x="93" y="1246.2004"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="15" x="108" y="1259.2774">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="193.5,1281.4004,203.5,1285.4004,193.5,1289.4004,197.5,1285.4004" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="137.5" x2="199.5" y1="1285.4004" y2="1285.4004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="144.5" y="1279.8774">[</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="148.5" y="1279.8774">bbb()</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacing" textLength="4" x="177.5" y="1279.8774">]</text>
+    <polygon fill="#A80036" points="411,1167.6797,401,1171.6797,411,1175.6797,407,1171.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="405" x2="554.5" y1="1171.6797" y2="1171.6797"/>
+    <polygon fill="#A80036" points="321,1181.6797,311,1185.6797,321,1189.6797,317,1185.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="315" x2="394" y1="1185.6797" y2="1185.6797"/>
+    <polygon fill="#A80036" points="250,1195.6797,240,1199.6797,250,1203.6797,246,1199.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="1199.6797" y2="1199.6797"/>
+    <polygon fill="#A80036" points="165,1209.6797,155,1213.6797,165,1217.6797,161,1213.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="1213.6797" y2="1213.6797"/>
+    <path d="M45,1226.6797 L45,1251.6797 L249,1251.6797 L249,1236.6797 L239,1226.6797 L45,1226.6797 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M239,1226.6797 L239,1236.6797 L249,1236.6797 L239,1226.6797 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="183" x="51" y="1243.7466">This is a conditional operator</text>
+    <path d="M106,1267.8125 L170,1267.8125 L170,1274.8125 L160,1284.8125 L106,1284.8125 L106,1267.8125 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
+    <rect fill="none" height="105.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="1267.8125"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="121" y="1280.8794">alt</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="217,1302.0781,227,1306.0781,217,1310.0781,221,1306.0781" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="1306.0781" y2="1306.0781"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="161" y="1301.0122">[</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="167" y="1301.0122">bbb()</text>
+      <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="201" y="1301.0122">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#181818" points="258.5,1311.0004,268.5,1315.0004,258.5,1319.0004,262.5,1315.0004" style="stroke:#181818;stroke-width:1.0;"/>
-      <line style="stroke:#181818;stroke-width:1.0;" x1="215.5" x2="264.5" y1="1315.0004" y2="1315.0004"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="222.5" y="1309.4774">aaa()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="288,1331.2109,298,1335.2109,288,1339.2109,292,1335.2109" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="1335.2109" y2="1335.2109"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="246" y="1330.145">aaa()</text>
     </a>
-    <polygon fill="#181818" points="226.5,1325.0004,216.5,1329.0004,226.5,1333.0004,222.5,1329.0004" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="220.5" x2="274.5" y1="1329.0004" y2="1329.0004"/>
-    <polygon fill="#181818" points="148.5,1339.0004,138.5,1343.0004,148.5,1347.0004,144.5,1343.0004" style="stroke:#181818;stroke-width:1.0;"/>
-    <line style="stroke:#181818;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="142.5" x2="209.5" y1="1343.0004" y2="1343.0004"/>
-    <line style="stroke:#000000;stroke-width:1.0;stroke-dasharray:2.0,2.0;" x1="93" x2="297" y1="1352.0004" y2="1352.0004"/>
+    <polygon fill="#A80036" points="250,1345.2109,240,1349.2109,250,1353.2109,246,1349.2109" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="1349.2109" y2="1349.2109"/>
+    <polygon fill="#A80036" points="165,1359.2109,155,1363.2109,165,1367.2109,161,1363.2109" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="1363.2109" y2="1363.2109"/>
+    <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="106" x2="328.5" y1="1372.2109" y2="1372.2109"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20038_sequence_mermaid.svg b/docs/test_cases/t20038_sequence_mermaid.svg
index 25f5c352..91eb0a95 100644
--- a/docs/test_cases/t20038_sequence_mermaid.svg
+++ b/docs/test_cases/t20038_sequence_mermaid.svg
@@ -108,17 +108,17 @@
     </symbol>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
       <path d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
   </defs>
   <defs>
-    <marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
       <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
     </marker>
   </defs>
   <defs>
-    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head">
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
       <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
     </marker>
   </defs>
@@ -309,76 +309,76 @@
       <tspan x="300">​</tspan>
     </text>
   </g>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="411" x="176">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="442" x2="271" y1="442" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="457" x="376">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="488" x2="471" y1="488" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="503" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="498" x2="283" y1="498" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="513" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="508" x2="83" y1="508" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="607" x="176">b()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="638" x2="271" y1="638" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="653" x="376">a()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="684" x2="471" y1="684" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="699" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="694" x2="283" y1="694" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="709" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="704" x2="83" y1="704" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="731" x="176">bbb()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="762" x2="271" y1="762" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="777" x="376">aaa()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="808" x2="471" y1="808" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="823" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="818" x2="283" y1="818" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="833" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="828" x2="83" y1="828" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="843" x="176">bbbb()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="874" x2="271" y1="874" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="889" x="376">aaaa()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="920" x2="471" y1="920" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="935" x="576">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="930" x2="671" y1="930" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="992" x="779">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="987" x2="878" y1="987" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1002" x="780">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="997" x2="683" y1="997" x1="877"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1012" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1007" x2="483" y1="1007" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1022" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1017" x2="283" y1="1017" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1032" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1027" x2="83" y1="1027" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1106" x="176">wrap(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1137" x2="271" y1="1137" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1152" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1147" x2="83" y1="1147" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1209" x="606">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1204" x2="1132" y1="1204" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1219" x="607">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1214" x2="83" y1="1214" x1="1131"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1276" x="176">bbbbb()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1307" x2="271" y1="1307" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1322" x="376">aaaa()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1353" x2="471" y1="1353" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1368" x="576">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1363" x2="671" y1="1363" x1="480"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1425" x="779">​</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1420" x2="878" y1="1420" x1="680"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1435" x="780">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1430" x2="683" y1="1430" x1="877"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1445" x="577">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1440" x2="483" y1="1440" x1="670"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1455" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1450" x2="283" y1="1450" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1465" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1460" x2="83" y1="1460" x1="270"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1547" x="176">[bbb()]</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1578" x2="271" y1="1578" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1593" x="376">aaa()</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1624" x2="471" y1="1624" x1="280"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1639" x="377">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1634" x2="283" y1="1634" x1="470"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1649" x="177">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1644" x2="83" y1="1644" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="411" x="178">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="442" x2="275" y1="442" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="457" x="378">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="488" x2="475" y1="488" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="503" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="498" x2="280" y1="498" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="513" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="508" x2="80" y1="508" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="607" x="178">b()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="638" x2="275" y1="638" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="653" x="378">a()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="684" x2="475" y1="684" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="699" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="694" x2="280" y1="694" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="709" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="704" x2="80" y1="704" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="731" x="178">bbb()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="762" x2="275" y1="762" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="777" x="378">aaa()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="808" x2="475" y1="808" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="823" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="818" x2="280" y1="818" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="833" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="828" x2="80" y1="828" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="843" x="178">bbbb()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="874" x2="275" y1="874" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="889" x="378">aaaa()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="920" x2="475" y1="920" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="935" x="578">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="930" x2="675" y1="930" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="992" x="781">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="987" x2="882" y1="987" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1002" x="779">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="997" x2="680" y1="997" x1="877"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1012" x="575">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1007" x2="480" y1="1007" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1022" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1017" x2="280" y1="1017" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1032" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1027" x2="80" y1="1027" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1106" x="178">wrap(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1137" x2="275" y1="1137" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1152" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1147" x2="80" y1="1147" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1209" x="608">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1204" x2="1136" y1="1204" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1219" x="606">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1214" x2="80" y1="1214" x1="1131"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1276" x="178">bbbbb()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1307" x2="275" y1="1307" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1322" x="378">aaaa()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1353" x2="475" y1="1353" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1368" x="578">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1363" x2="675" y1="1363" x1="480"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1425" x="781">​</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1420" x2="882" y1="1420" x1="680"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1435" x="779">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1430" x2="680" y1="1430" x1="877"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1445" x="575">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1440" x2="480" y1="1440" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1455" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1450" x2="280" y1="1450" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1465" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1460" x2="80" y1="1460" x1="270"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1547" x="178">[bbb()]</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1578" x2="275" y1="1578" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1593" x="378">aaa()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1624" x2="475" y1="1624" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1639" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1634" x2="280" y1="1634" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1649" x="175">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1644" x2="80" y1="1644" x1="270"/>
 </svg>
diff --git a/docs/test_cases/t30001.md b/docs/test_cases/t30001.md
index 911cfd67..a827202e 100644
--- a/docs/test_cases/t30001.md
+++ b/docs/test_cases/t30001.md
@@ -76,48 +76,21 @@ namespace BB {
   "diagram_type": "package",
   "elements": [
     {
-      "display_name": "clanguml",
-      "elements": [
-        {
-          "display_name": "clanguml::t30001",
-          "id": "1807513669798383046",
-          "is_deprecated": false,
-          "name": "t30001",
-          "source_location": {
-            "column": 11,
-            "file": "t30001.cc",
-            "line": 2,
-            "translation_unit": "t30001.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30001.cc",
-        "line": 1,
-        "translation_unit": "t30001.cc"
-      },
-      "type": "namespace"
-    },
-    {
-      "display_name": "clanguml::t30001::A",
+      "display_name": "A",
       "elements": [
         {
           "comment": {
             "formatted": "This is namespace AA in namespace A",
             "raw": "/// This is namespace AA in namespace A"
           },
-          "display_name": "clanguml::t30001::A::AA",
+          "display_name": "AA",
           "elements": [
             {
-              "display_name": "clanguml::t30001::A::AA::AAA",
+              "display_name": "AAA",
               "id": "274638237740249424",
               "is_deprecated": false,
               "name": "AAA",
+              "namespace": "clanguml::t30001::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30001.cc",
@@ -127,10 +100,11 @@ namespace BB {
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30001::A::AA::BBB",
+              "display_name": "BBB",
               "id": "2129154382024012563",
               "is_deprecated": false,
               "name": "BBB",
+              "namespace": "clanguml::t30001::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30001.cc",
@@ -143,6 +117,7 @@ namespace BB {
           "id": "1528517990989164155",
           "is_deprecated": false,
           "name": "AA",
+          "namespace": "clanguml::t30001::A",
           "source_location": {
             "column": 11,
             "file": "t30001.cc",
@@ -152,10 +127,11 @@ namespace BB {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30001::A::BB",
+          "display_name": "BB",
           "id": "983199564524723281",
           "is_deprecated": false,
           "name": "BB",
+          "namespace": "clanguml::t30001::A",
           "source_location": {
             "column": 11,
             "file": "t30001.cc",
@@ -168,6 +144,7 @@ namespace BB {
       "id": "1184614645531659789",
       "is_deprecated": false,
       "name": "A",
+      "namespace": "clanguml::t30001",
       "source_location": {
         "column": 11,
         "file": "t30001.cc",
@@ -177,20 +154,21 @@ namespace BB {
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30001::B",
+      "display_name": "B",
       "elements": [
         {
           "comment": {
             "formatted": "This is namespace AA in namespace B",
             "raw": "/// This is namespace AA in namespace B"
           },
-          "display_name": "clanguml::t30001::B::AA",
+          "display_name": "AA",
           "elements": [
             {
-              "display_name": "clanguml::t30001::B::AA::AAA",
+              "display_name": "AAA",
               "id": "262162485307734028",
               "is_deprecated": false,
               "name": "AAA",
+              "namespace": "clanguml::t30001::B::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30001.cc",
@@ -200,10 +178,11 @@ namespace BB {
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30001::B::AA::BBB",
+              "display_name": "BBB",
               "id": "18542334992237803",
               "is_deprecated": false,
               "name": "BBB",
+              "namespace": "clanguml::t30001::B::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30001.cc",
@@ -216,6 +195,7 @@ namespace BB {
           "id": "895913707182089871",
           "is_deprecated": false,
           "name": "AA",
+          "namespace": "clanguml::t30001::B",
           "source_location": {
             "column": 11,
             "file": "t30001.cc",
@@ -225,10 +205,11 @@ namespace BB {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30001::B::BB",
+          "display_name": "BB",
           "id": "2230464321696304488",
           "is_deprecated": false,
           "name": "BB",
+          "namespace": "clanguml::t30001::B",
           "source_location": {
             "column": 11,
             "file": "t30001.cc",
@@ -241,6 +222,7 @@ namespace BB {
       "id": "1931735210112054430",
       "is_deprecated": false,
       "name": "B",
+      "namespace": "clanguml::t30001",
       "source_location": {
         "column": 11,
         "file": "t30001.cc",
@@ -251,6 +233,7 @@ namespace BB {
     }
   ],
   "name": "t30001_package",
+  "package_type": "namespace",
   "relationships": [],
   "title": "Basic package diagram example",
   "using_namespace": "clanguml::t30001"
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index b33ae30d..36e8b100 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -1,87 +1,76 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="295px" preserveAspectRatio="none" style="width:818px;height:295px;background:#FFFFFF;" version="1.1" viewBox="0 0 818 295" width="818px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="284px" preserveAspectRatio="none" style="width:854px;height:284px;" version="1.1" viewBox="0 0 854 284" width="854px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1gwq2me517zi4" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="220" x="292.25" y="23.0059">Basic package diagram example</text>
-    <g id="cluster_C_0001184614645531659789">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-        <path d="M43,85.3999 L54,85.3999 A3.75,3.75 0 0 1 56.5,87.8999 L63.5,108.1999 L355,108.1999 A2.5,2.5 0 0 1 357.5,110.6999 L357.5,286.4999 A2.5,2.5 0 0 1 355,288.9999 L43,288.9999 A2.5,2.5 0 0 1 40.5,286.4999 L40.5,87.8999 A2.5,2.5 0 0 1 43,85.3999 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="40.5" x2="63.5" y1="108.1999" y2="108.1999"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="44.5" y="100.4059">A</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001528517990989164155">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
-        <path d="M126,136.3999 L147,136.3999 A3.75,3.75 0 0 1 149.5,138.8999 L156.5,159.1999 L323,159.1999 A2.5,2.5 0 0 1 325.5,161.6999 L325.5,254.4999 A2.5,2.5 0 0 1 323,256.9999 L126,256.9999 A2.5,2.5 0 0 1 123.5,254.4999 L123.5,138.8999 A2.5,2.5 0 0 1 126,136.3999 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="123.5" x2="156.5" y1="159.1999" y2="159.1999"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="127.5" y="151.4059">AA</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001931735210112054430">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-        <path d="M497,85.3999 L508,85.3999 A3.75,3.75 0 0 1 510.5,87.8999 L517.5,108.1999 L809,108.1999 A2.5,2.5 0 0 1 811.5,110.6999 L811.5,286.4999 A2.5,2.5 0 0 1 809,288.9999 L497,288.9999 A2.5,2.5 0 0 1 494.5,286.4999 L494.5,87.8999 A2.5,2.5 0 0 1 497,85.3999 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="494.5" x2="517.5" y1="108.1999" y2="108.1999"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="498.5" y="100.4059">B</text>
-      </a>
-    </g>
-    <g id="cluster_C_0000895913707182089871">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
-        <path d="M580,136.3999 L601,136.3999 A3.75,3.75 0 0 1 603.5,138.8999 L610.5,159.1999 L777,159.1999 A2.5,2.5 0 0 1 779.5,161.6999 L779.5,254.4999 A2.5,2.5 0 0 1 777,256.9999 L580,256.9999 A2.5,2.5 0 0 1 577.5,254.4999 L577.5,138.8999 A2.5,2.5 0 0 1 580,136.3999 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="577.5" x2="610.5" y1="159.1999" y2="159.1999"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="581.5" y="151.4059">AA</text>
-      </a>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <path d="M254,179.3999 L285,179.3999 A3.75,3.75 0 0 1 287.5,181.8999 L294.5,202.1999 L299,202.1999 A2.5,2.5 0 0 1 301.5,204.6999 L301.5,230.4998 A2.5,2.5 0 0 1 299,232.9998 L254,232.9998 A2.5,2.5 0 0 1 251.5,230.4998 L251.5,181.8999 A2.5,2.5 0 0 1 254,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="251.5" x2="294.5" y1="202.1999" y2="202.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="255.5" y="194.4059">AAA</text>
+    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="282" x="292" y="16.708">Basic package diagram example</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="49,69.9531,66,69.9531,73,92.25,370,92.25,370,272.9531,49,272.9531,49,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="49" x2="73" y1="92.25" y2="92.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="53" y="84.9482">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <path d="M169,179.3999 L200,179.3999 A3.75,3.75 0 0 1 202.5,181.8999 L209.5,202.1999 L214,202.1999 A2.5,2.5 0 0 1 216.5,204.6999 L216.5,230.4998 A2.5,2.5 0 0 1 214,232.9998 L169,232.9998 A2.5,2.5 0 0 1 166.5,230.4998 L166.5,181.8999 A2.5,2.5 0 0 1 169,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="166.5" x2="209.5" y1="202.1999" y2="202.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="170.5" y="194.4059">BBB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="132,120.9531,160,120.9531,167,143.25,338,143.25,338,240.9531,132,240.9531,132,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="132" x2="167" y1="143.25" y2="143.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="136" y="135.9482">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <path d="M59,179.3999 L80,179.3999 A3.75,3.75 0 0 1 82.5,181.8999 L89.5,202.1999 L94,202.1999 A2.5,2.5 0 0 1 96.5,204.6999 L96.5,230.4998 A2.5,2.5 0 0 1 94,232.9998 L59,232.9998 A2.5,2.5 0 0 1 56.5,230.4998 L56.5,181.8999 A2.5,2.5 0 0 1 59,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="56.5" x2="89.5" y1="202.1999" y2="202.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="60.5" y="194.4059">BB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="511,69.9531,527,69.9531,534,92.25,832,92.25,832,272.9531,511,272.9531,511,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="511" x2="534" y1="92.25" y2="92.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="515" y="84.9482">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <path d="M708,179.3999 L739,179.3999 A3.75,3.75 0 0 1 741.5,181.8999 L748.5,202.1999 L753,202.1999 A2.5,2.5 0 0 1 755.5,204.6999 L755.5,230.4998 A2.5,2.5 0 0 1 753,232.9998 L708,232.9998 A2.5,2.5 0 0 1 705.5,230.4998 L705.5,181.8999 A2.5,2.5 0 0 1 708,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="705.5" x2="748.5" y1="202.1999" y2="202.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="709.5" y="194.4059">AAA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="594,120.9531,622,120.9531,629,143.25,800,143.25,800,240.9531,594,240.9531,594,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="594" x2="629" y1="143.25" y2="143.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="598" y="135.9482">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <path d="M623,179.3999 L654,179.3999 A3.75,3.75 0 0 1 656.5,181.8999 L663.5,202.1999 L668,202.1999 A2.5,2.5 0 0 1 670.5,204.6999 L670.5,230.4998 A2.5,2.5 0 0 1 668,232.9998 L623,232.9998 A2.5,2.5 0 0 1 620.5,230.4998 L620.5,181.8999 A2.5,2.5 0 0 1 623,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="620.5" x2="663.5" y1="202.1999" y2="202.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="624.5" y="194.4059">BBB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="260.5,163.9531,299.5,163.9531,306.5,186.25,313.5,186.25,313.5,216.5469,260.5,216.5469,260.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="260.5" x2="306.5" y1="186.25" y2="186.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="264.5" y="178.9482">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <path d="M513,179.3999 L534,179.3999 A3.75,3.75 0 0 1 536.5,181.8999 L543.5,202.1999 L548,202.1999 A2.5,2.5 0 0 1 550.5,204.6999 L550.5,230.4998 A2.5,2.5 0 0 1 548,232.9998 L513,232.9998 A2.5,2.5 0 0 1 510.5,230.4998 L510.5,181.8999 A2.5,2.5 0 0 1 513,179.3999 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="510.5" x2="543.5" y1="202.1999" y2="202.1999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="514.5" y="194.4059">BB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="175,163.9531,211,163.9531,218,186.25,225,186.25,225,216.5469,175,216.5469,175,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="218" y1="186.25" y2="186.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="178.9482">BBB</text>
     </a>
-    <g id="elem_GMN12">
-      <path d="M373.5,193.3999 L373.5,202.1999 L301.94,206.1999 L373.5,210.1999 L373.5,218.9999 A0,0 0 0 0 373.5,218.9999 L475.5,218.9999 A0,0 0 0 0 475.5,218.9999 L475.5,203.3999 L465.5,193.3999 L373.5,193.3999 A0,0 0 0 0 373.5,193.3999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M465.5,193.3999 L465.5,203.3999 L475.5,203.3999 L465.5,193.3999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="81" x="379.5" y="210.4769">A AAA note...</text>
-    </g>
-    <g id="elem_GMN15">
-      <path d="M6,43.7999 L6,69.3999 L257,69.3999 L257,53.7999 L247,43.7999 L6,43.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M247,43.7999 L247,53.7999 L257,53.7999 L247,43.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="230" x="12" y="60.8769">This is namespace AA in namespace A</text>
-    </g>
-    <g id="elem_GMN18">
-      <path d="M460,43.7999 L460,69.3999 L711,69.3999 L711,53.7999 L701,43.7999 L460,43.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M701,43.7999 L701,53.7999 L711,53.7999 L701,43.7999 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="230" x="466" y="60.8769">This is namespace AA in namespace B</text>
-    </g>
-    <g id="link_GMN15_C_0001528517990989164155">
-      <path d="M131.5,69.6799 C131.5,78.3549 131.5,90.9674 131.5,105.0541 C131.5,112.0975 131.5,119.5094 131.5,126.982 C131.5,128.8501 131.5,130.722 131.5,132.593 C131.5,133.5284 131.5,134.4636 131.5,135.398 C131.5,135.6315 131.5,135.8651 131.5,136.0985 " fill="none" id="GMN15-C_0001528517990989164155" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-    </g>
-    <g id="link_GMN18_C_0000895913707182089871">
-      <path d="M585.5,69.6799 C585.5,78.3549 585.5,90.9674 585.5,105.0541 C585.5,112.0975 585.5,119.5094 585.5,126.982 C585.5,128.8501 585.5,130.722 585.5,132.593 C585.5,133.5284 585.5,134.4636 585.5,135.398 C585.5,135.6315 585.5,135.8651 585.5,136.0985 " fill="none" id="GMN18-C_0000895913707182089871" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="65,163.9531,91,163.9531,98,186.25,105,186.25,105,216.5469,65,216.5469,65,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="98" y1="186.25" y2="186.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="69" y="178.9482">BB</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="722.5,163.9531,761.5,163.9531,768.5,186.25,775.5,186.25,775.5,216.5469,722.5,216.5469,722.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="722.5" x2="768.5" y1="186.25" y2="186.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="726.5" y="178.9482">AAA</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="637,163.9531,673,163.9531,680,186.25,687,186.25,687,216.5469,637,216.5469,637,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="637" x2="680" y1="186.25" y2="186.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="641" y="178.9482">BBB</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="527,163.9531,553,163.9531,560,186.25,567,186.25,567,216.5469,527,216.5469,527,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="527" x2="560" y1="186.25" y2="186.25"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="531" y="178.9482">BB</text>
+    </a>
+    <path d="M386,177.9531 L386,203.0859 L492,203.0859 L492,187.9531 L482,177.9531 L386,177.9531 " fill="#FBFB77" filter="url(#f1gwq2me517zi4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M482,177.9531 L482,187.9531 L492,187.9531 L482,177.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="392" y="195.02">A AAA note...</text>
+    <path d="M6,28.9531 L6,54.0859 L274,54.0859 L274,38.9531 L264,28.9531 L6,28.9531 " fill="#FBFB77" filter="url(#f1gwq2me517zi4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M264,28.9531 L264,38.9531 L274,38.9531 L264,28.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="12" y="46.02">This is namespace AA in namespace A</text>
+    <path d="M468,28.9531 L468,54.0859 L736,54.0859 L736,38.9531 L726,28.9531 L468,28.9531 " fill="#FBFB77" filter="url(#f1gwq2me517zi4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M726,28.9531 L726,38.9531 L736,38.9531 L726,28.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="474" y="46.02">This is namespace AA in namespace B</text>
+    <path d="M313.72,190.4531 C337.7,190.4531 361.68,190.4531 385.66,190.4531 " fill="none" id="C_0000274638237740249424-GMN1274" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M140,53.9831 C140,62.5131 140,75.0494 140,89.1034 C140,96.1305 140,103.537 140,111.0118 C140,112.8806 140,114.7536 140,116.626 C140,117.5622 140,118.4982 140,119.4335 C140,119.9012 140,120.3686 140,120.8358 " fill="none" id="GMN1277-C_0001528517990989164155" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M602,53.9831 C602,62.5131 602,75.0494 602,89.1034 C602,96.1305 602,103.537 602,111.0118 C602,112.8806 602,114.7536 602,116.626 C602,117.5622 602,118.4982 602,119.4335 C602,119.9012 602,120.3686 602,120.8358 " fill="none" id="GMN1280-C_0000895913707182089871" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30001_package_mermaid.svg b/docs/test_cases/t30001_package_mermaid.svg
index 93264eee..a1082ce0 100644
--- a/docs/test_cases/t30001_package_mermaid.svg
+++ b/docs/test_cases/t30001_package_mermaid.svg
@@ -1,22 +1,23 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -49 864.64453125 426" style="max-width: 864.645px; background-color: white;" width="864.64453125" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -49 864.64453125 426" style="max-width: 864.645px; background-color: white;" width="864.64453125" id="my-svg">
+  <title id="chart-title-my-svg">Basic package diagram example</title>
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
diff --git a/docs/test_cases/t30002.md b/docs/test_cases/t30002.md
index 30880dce..f3e95fdb 100644
--- a/docs/test_cases/t30002.md
+++ b/docs/test_cases/t30002.md
@@ -150,44 +150,17 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
   "diagram_type": "package",
   "elements": [
     {
-      "display_name": "clanguml",
+      "display_name": "A",
       "elements": [
         {
-          "display_name": "clanguml::t30002",
-          "id": "1283027613970360489",
-          "is_deprecated": false,
-          "name": "t30002",
-          "source_location": {
-            "column": 11,
-            "file": "t30002.cc",
-            "line": 8,
-            "translation_unit": "t30002.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30002.cc",
-        "line": 7,
-        "translation_unit": "t30002.cc"
-      },
-      "type": "namespace"
-    },
-    {
-      "display_name": "clanguml::t30002::A",
-      "elements": [
-        {
-          "display_name": "clanguml::t30002::A::AA",
+          "display_name": "AA",
           "elements": [
             {
-              "display_name": "clanguml::t30002::A::AA::A1",
+              "display_name": "A1",
               "id": "1164966689017271053",
               "is_deprecated": false,
               "name": "A1",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -197,10 +170,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A2",
+              "display_name": "A2",
               "id": "695366113361481509",
               "is_deprecated": false,
               "name": "A2",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -210,10 +184,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A3",
+              "display_name": "A3",
               "id": "1267709074800873528",
               "is_deprecated": false,
               "name": "A3",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -223,10 +198,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A4",
+              "display_name": "A4",
               "id": "299262817531370604",
               "is_deprecated": false,
               "name": "A4",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -236,10 +212,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A5",
+              "display_name": "A5",
               "id": "1207764290216680521",
               "is_deprecated": false,
               "name": "A5",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -249,10 +226,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A6",
+              "display_name": "A6",
               "id": "899091126727901939",
               "is_deprecated": false,
               "name": "A6",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -262,10 +240,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A7",
+              "display_name": "A7",
               "id": "563861734550555261",
               "is_deprecated": false,
               "name": "A7",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -275,10 +254,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A8",
+              "display_name": "A8",
               "id": "839146342143718390",
               "is_deprecated": false,
               "name": "A8",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -288,10 +268,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A9",
+              "display_name": "A9",
               "id": "1650835159458422245",
               "is_deprecated": false,
               "name": "A9",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -301,10 +282,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A10",
+              "display_name": "A10",
               "id": "1453242941322376182",
               "is_deprecated": false,
               "name": "A10",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -314,10 +296,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A11",
+              "display_name": "A11",
               "id": "384833776371876986",
               "is_deprecated": false,
               "name": "A11",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -327,10 +310,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A12",
+              "display_name": "A12",
               "id": "1199527037490355138",
               "is_deprecated": false,
               "name": "A12",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -340,10 +324,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A13",
+              "display_name": "A13",
               "id": "620689743711615190",
               "is_deprecated": false,
               "name": "A13",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -353,10 +338,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A14",
+              "display_name": "A14",
               "id": "301858476377711436",
               "is_deprecated": false,
               "name": "A14",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -366,10 +352,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A15",
+              "display_name": "A15",
               "id": "561239706327729436",
               "is_deprecated": false,
               "name": "A15",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -379,10 +366,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A16",
+              "display_name": "A16",
               "id": "1415398383158410524",
               "is_deprecated": false,
               "name": "A16",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -392,10 +380,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A17",
+              "display_name": "A17",
               "id": "532437874530119999",
               "is_deprecated": false,
               "name": "A17",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -405,10 +394,11 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
               "type": "namespace"
             },
             {
-              "display_name": "clanguml::t30002::A::AA::A18",
+              "display_name": "A18",
               "id": "405712335116487393",
               "is_deprecated": false,
               "name": "A18",
+              "namespace": "clanguml::t30002::A::AA",
               "source_location": {
                 "column": 11,
                 "file": "t30002.cc",
@@ -421,6 +411,7 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
           "id": "1669745471968085401",
           "is_deprecated": false,
           "name": "AA",
+          "namespace": "clanguml::t30002::A",
           "source_location": {
             "column": 14,
             "file": "t30002.cc",
@@ -433,6 +424,7 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
       "id": "1543480715632256641",
       "is_deprecated": false,
       "name": "A",
+      "namespace": "clanguml::t30002",
       "source_location": {
         "column": 11,
         "file": "t30002.cc",
@@ -442,16 +434,17 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30002::B",
+      "display_name": "B",
       "elements": [
         {
-          "display_name": "clanguml::t30002::B::BB",
+          "display_name": "BB",
           "elements": [
             {
-              "display_name": "clanguml::t30002::B::BB::BBB",
+              "display_name": "BBB",
               "id": "2255521339657425355",
               "is_deprecated": false,
               "name": "BBB",
+              "namespace": "clanguml::t30002::B::BB",
               "source_location": {
                 "column": 18,
                 "file": "t30002.cc",
@@ -464,6 +457,7 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
           "id": "1938861639623819235",
           "is_deprecated": false,
           "name": "BB",
+          "namespace": "clanguml::t30002::B",
           "source_location": {
             "column": 14,
             "file": "t30002.cc",
@@ -476,6 +470,7 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
       "id": "145302773464360955",
       "is_deprecated": false,
       "name": "B",
+      "namespace": "clanguml::t30002",
       "source_location": {
         "column": 11,
         "file": "t30002.cc",
@@ -486,6 +481,7 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
     }
   ],
   "name": "t30002_package",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "839146342143718390",
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index 679b9d8f..abcb8eb2 100644
--- a/docs/test_cases/t30002_package.svg
+++ b/docs/test_cases/t30002_package.svg
@@ -1,202 +1,164 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:1444px;height:380px;background:#FFFFFF;" version="1.1" viewBox="0 0 1444 380" width="1444px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1548px;height:402px;" version="1.1" viewBox="0 0 1548 402" width="1548px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f10kidrnllwcwz" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001543480715632256641">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-        <path d="M8.5,201.894 L19.5,201.894 A3.75,3.75 0 0 1 22,204.394 L29,224.6939 L1434.5,224.6939 A2.5,2.5 0 0 1 1437,227.1939 L1437,370.994 A2.5,2.5 0 0 1 1434.5,373.494 L8.5,373.494 A2.5,2.5 0 0 1 6,370.994 L6,204.394 A2.5,2.5 0 0 1 8.5,201.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="29" y1="224.6939" y2="224.6939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="10" y="216.8999">A</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001669745471968085401">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
-        <path d="M32.5,244.894 L53.5,244.894 A3.75,3.75 0 0 1 56,247.394 L63,267.6939 L1410.5,267.6939 A2.5,2.5 0 0 1 1413,270.1939 L1413,346.994 A2.5,2.5 0 0 1 1410.5,349.494 L32.5,349.494 A2.5,2.5 0 0 1 30,346.994 L30,247.394 A2.5,2.5 0 0 1 32.5,244.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="63" y1="267.6939" y2="267.6939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="34" y="259.8999">AA</text>
-      </a>
-    </g>
-    <g id="cluster_C_0000145302773464360955">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
-        <path d="M692.5,6.294 L703.5,6.294 A3.75,3.75 0 0 1 706,8.794 L713,29.0939 L817.5,29.0939 A2.5,2.5 0 0 1 820,31.5939 L820,175.394 A2.5,2.5 0 0 1 817.5,177.894 L692.5,177.894 A2.5,2.5 0 0 1 690,175.394 L690,8.794 A2.5,2.5 0 0 1 692.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="690" x2="713" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="694" y="21.2999">B</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001938861639623819235">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
-        <path d="M716.5,49.294 L737.5,49.294 A3.75,3.75 0 0 1 740,51.794 L747,72.0939 L793.5,72.0939 A2.5,2.5 0 0 1 796,74.5939 L796,151.394 A2.5,2.5 0 0 1 793.5,153.894 L716.5,153.894 A2.5,2.5 0 0 1 714,151.394 L714,51.794 A2.5,2.5 0 0 1 716.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="714" x2="747" y1="72.0939" y2="72.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="718" y="64.2999">BB</text>
-      </a>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <path d="M1361.5,279.894 L1380.5,279.894 A3.75,3.75 0 0 1 1383,282.394 L1390,302.6939 L1394.5,302.6939 A2.5,2.5 0 0 1 1397,305.1939 L1397,330.9938 A2.5,2.5 0 0 1 1394.5,333.4938 L1361.5,333.4938 A2.5,2.5 0 0 1 1359,330.9938 L1359,282.394 A2.5,2.5 0 0 1 1361.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1359" x2="1390" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1363" y="294.8999">A1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="22,219,39,219,46,241.2969,1526,241.2969,1526,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="241.2969" y2="241.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <path d="M1288.5,279.894 L1307.5,279.894 A3.75,3.75 0 0 1 1310,282.394 L1317,302.6939 L1321.5,302.6939 A2.5,2.5 0 0 1 1324,305.1939 L1324,330.9938 A2.5,2.5 0 0 1 1321.5,333.4938 L1288.5,333.4938 A2.5,2.5 0 0 1 1286,330.9938 L1286,282.394 A2.5,2.5 0 0 1 1288.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1286" x2="1317" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1290" y="294.8999">A2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="46,262,74,262,81,284.2969,1502,284.2969,1502,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="81" y1="284.2969" y2="284.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="50" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
-      <path d="M1215.5,279.894 L1234.5,279.894 A3.75,3.75 0 0 1 1237,282.394 L1244,302.6939 L1248.5,302.6939 A2.5,2.5 0 0 1 1251,305.1939 L1251,330.9938 A2.5,2.5 0 0 1 1248.5,333.4938 L1215.5,333.4938 A2.5,2.5 0 0 1 1213,330.9938 L1213,282.394 A2.5,2.5 0 0 1 1215.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1213" x2="1244" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1217" y="294.8999">A3</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="751,24,767,24,774,46.2969,881,46.2969,881,195,751,195,751,24" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="751" x2="774" y1="46.2969" y2="46.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="755" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
-      <path d="M1142.5,279.894 L1161.5,279.894 A3.75,3.75 0 0 1 1164,282.394 L1171,302.6939 L1175.5,302.6939 A2.5,2.5 0 0 1 1178,305.1939 L1178,330.9938 A2.5,2.5 0 0 1 1175.5,333.4938 L1142.5,333.4938 A2.5,2.5 0 0 1 1140,330.9938 L1140,282.394 A2.5,2.5 0 0 1 1142.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1140" x2="1171" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1144" y="294.8999">A4</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="775,67,801,67,808,89.2969,857,89.2969,857,171,775,171,775,67" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="775" x2="808" y1="89.2969" y2="89.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="779" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
-      <path d="M1069.5,279.894 L1088.5,279.894 A3.75,3.75 0 0 1 1091,282.394 L1098,302.6939 L1102.5,302.6939 A2.5,2.5 0 0 1 1105,305.1939 L1105,330.9938 A2.5,2.5 0 0 1 1102.5,333.4938 L1069.5,333.4938 A2.5,2.5 0 0 1 1067,330.9938 L1067,282.394 A2.5,2.5 0 0 1 1069.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1067" x2="1098" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="1071" y="294.8999">A5</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1444.5,297,1471.5,297,1478.5,319.2969,1485.5,319.2969,1485.5,349.5938,1444.5,349.5938,1444.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1444.5" x2="1478.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1448.5" y="311.9951">A1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
-      <path d="M996.5,279.894 L1015.5,279.894 A3.75,3.75 0 0 1 1018,282.394 L1025,302.6939 L1029.5,302.6939 A2.5,2.5 0 0 1 1032,305.1939 L1032,330.9938 A2.5,2.5 0 0 1 1029.5,333.4938 L996.5,333.4938 A2.5,2.5 0 0 1 994,330.9938 L994,282.394 A2.5,2.5 0 0 1 996.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="994" x2="1025" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="998" y="294.8999">A6</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1368.5,297,1395.5,297,1402.5,319.2969,1409.5,319.2969,1409.5,349.5938,1368.5,349.5938,1368.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1368.5" x2="1402.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1372.5" y="311.9951">A2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
-      <path d="M923.5,279.894 L942.5,279.894 A3.75,3.75 0 0 1 945,282.394 L952,302.6939 L956.5,302.6939 A2.5,2.5 0 0 1 959,305.1939 L959,330.9938 A2.5,2.5 0 0 1 956.5,333.4938 L923.5,333.4938 A2.5,2.5 0 0 1 921,330.9938 L921,282.394 A2.5,2.5 0 0 1 923.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="921" x2="952" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="925" y="294.8999">A7</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1292.5,297,1319.5,297,1326.5,319.2969,1333.5,319.2969,1333.5,349.5938,1292.5,349.5938,1292.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1292.5" x2="1326.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1296.5" y="311.9951">A3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
-      <path d="M850.5,279.894 L869.5,279.894 A3.75,3.75 0 0 1 872,282.394 L879,302.6939 L883.5,302.6939 A2.5,2.5 0 0 1 886,305.1939 L886,330.9938 A2.5,2.5 0 0 1 883.5,333.4938 L850.5,333.4938 A2.5,2.5 0 0 1 848,330.9938 L848,282.394 A2.5,2.5 0 0 1 850.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="848" x2="879" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="852" y="294.8999">A8</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1216.5,297,1243.5,297,1250.5,319.2969,1257.5,319.2969,1257.5,349.5938,1216.5,349.5938,1216.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1216.5" x2="1250.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1220.5" y="311.9951">A4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
-      <path d="M777.5,279.894 L796.5,279.894 A3.75,3.75 0 0 1 799,282.394 L806,302.6939 L810.5,302.6939 A2.5,2.5 0 0 1 813,305.1939 L813,330.9938 A2.5,2.5 0 0 1 810.5,333.4938 L777.5,333.4938 A2.5,2.5 0 0 1 775,330.9938 L775,282.394 A2.5,2.5 0 0 1 777.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="775" x2="806" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="18" x="779" y="294.8999">A9</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1140.5,297,1167.5,297,1174.5,319.2969,1181.5,319.2969,1181.5,349.5938,1140.5,349.5938,1140.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1140.5" x2="1174.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1144.5" y="311.9951">A5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
-      <path d="M696.5,279.894 L723.5,279.894 A3.75,3.75 0 0 1 726,282.394 L733,302.6939 L737.5,302.6939 A2.5,2.5 0 0 1 740,305.1939 L740,330.9938 A2.5,2.5 0 0 1 737.5,333.4938 L696.5,333.4938 A2.5,2.5 0 0 1 694,330.9938 L694,282.394 A2.5,2.5 0 0 1 696.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="694" x2="733" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="698" y="294.8999">A10</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1064.5,297,1091.5,297,1098.5,319.2969,1105.5,319.2969,1105.5,349.5938,1064.5,349.5938,1064.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1064.5" x2="1098.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1068.5" y="311.9951">A6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
-      <path d="M615.5,279.894 L642.5,279.894 A3.75,3.75 0 0 1 645,282.394 L652,302.6939 L656.5,302.6939 A2.5,2.5 0 0 1 659,305.1939 L659,330.9938 A2.5,2.5 0 0 1 656.5,333.4938 L615.5,333.4938 A2.5,2.5 0 0 1 613,330.9938 L613,282.394 A2.5,2.5 0 0 1 615.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="613" x2="652" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="617" y="294.8999">A11</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="988.5,297,1015.5,297,1022.5,319.2969,1029.5,319.2969,1029.5,349.5938,988.5,349.5938,988.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="988.5" x2="1022.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="992.5" y="311.9951">A7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
-      <path d="M534.5,279.894 L561.5,279.894 A3.75,3.75 0 0 1 564,282.394 L571,302.6939 L575.5,302.6939 A2.5,2.5 0 0 1 578,305.1939 L578,330.9938 A2.5,2.5 0 0 1 575.5,333.4938 L534.5,333.4938 A2.5,2.5 0 0 1 532,330.9938 L532,282.394 A2.5,2.5 0 0 1 534.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="532" x2="571" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="536" y="294.8999">A12</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="912.5,297,939.5,297,946.5,319.2969,953.5,319.2969,953.5,349.5938,912.5,349.5938,912.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="912.5" x2="946.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="916.5" y="311.9951">A8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
-      <path d="M453.5,279.894 L480.5,279.894 A3.75,3.75 0 0 1 483,282.394 L490,302.6939 L494.5,302.6939 A2.5,2.5 0 0 1 497,305.1939 L497,330.9938 A2.5,2.5 0 0 1 494.5,333.4938 L453.5,333.4938 A2.5,2.5 0 0 1 451,330.9938 L451,282.394 A2.5,2.5 0 0 1 453.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="451" x2="490" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="455" y="294.8999">A13</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="836.5,297,863.5,297,870.5,319.2969,877.5,319.2969,877.5,349.5938,836.5,349.5938,836.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="836.5" x2="870.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="840.5" y="311.9951">A9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
-      <path d="M372.5,279.894 L399.5,279.894 A3.75,3.75 0 0 1 402,282.394 L409,302.6939 L413.5,302.6939 A2.5,2.5 0 0 1 416,305.1939 L416,330.9938 A2.5,2.5 0 0 1 413.5,333.4938 L372.5,333.4938 A2.5,2.5 0 0 1 370,330.9938 L370,282.394 A2.5,2.5 0 0 1 372.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="370" x2="409" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="374" y="294.8999">A14</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="750.5,297,787.5,297,794.5,319.2969,801.5,319.2969,801.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="750.5" x2="794.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="754.5" y="311.9951">A10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
-      <path d="M291.5,279.894 L318.5,279.894 A3.75,3.75 0 0 1 321,282.394 L328,302.6939 L332.5,302.6939 A2.5,2.5 0 0 1 335,305.1939 L335,330.9938 A2.5,2.5 0 0 1 332.5,333.4938 L291.5,333.4938 A2.5,2.5 0 0 1 289,330.9938 L289,282.394 A2.5,2.5 0 0 1 291.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="289" x2="328" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="293" y="294.8999">A15</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="664.5" x2="708.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="668.5" y="311.9951">A11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
-      <path d="M210.5,279.894 L237.5,279.894 A3.75,3.75 0 0 1 240,282.394 L247,302.6939 L251.5,302.6939 A2.5,2.5 0 0 1 254,305.1939 L254,330.9938 A2.5,2.5 0 0 1 251.5,333.4938 L210.5,333.4938 A2.5,2.5 0 0 1 208,330.9938 L208,282.394 A2.5,2.5 0 0 1 210.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="208" x2="247" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="212" y="294.8999">A16</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="578.5" x2="622.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="582.5" y="311.9951">A12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
-      <path d="M129.5,279.894 L156.5,279.894 A3.75,3.75 0 0 1 159,282.394 L166,302.6939 L170.5,302.6939 A2.5,2.5 0 0 1 173,305.1939 L173,330.9938 A2.5,2.5 0 0 1 170.5,333.4938 L129.5,333.4938 A2.5,2.5 0 0 1 127,330.9938 L127,282.394 A2.5,2.5 0 0 1 129.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="127" x2="166" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="131" y="294.8999">A17</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="492.5" x2="536.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="496.5" y="311.9951">A13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
-      <path d="M48.5,279.894 L75.5,279.894 A3.75,3.75 0 0 1 78,282.394 L85,302.6939 L89.5,302.6939 A2.5,2.5 0 0 1 92,305.1939 L92,330.9938 A2.5,2.5 0 0 1 89.5,333.4938 L48.5,333.4938 A2.5,2.5 0 0 1 46,330.9938 L46,282.394 A2.5,2.5 0 0 1 48.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="46" x2="85" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="50" y="294.8999">A18</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="450.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="410.5" y="311.9951">A14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <path d="M732.5,84.294 L763.5,84.294 A3.75,3.75 0 0 1 766,86.794 L773,107.0939 L777.5,107.0939 A2.5,2.5 0 0 1 780,109.5939 L780,135.3938 A2.5,2.5 0 0 1 777.5,137.8938 L732.5,137.8938 A2.5,2.5 0 0 1 730,135.3938 L730,86.794 A2.5,2.5 0 0 1 732.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="730" x2="773" y1="107.0939" y2="107.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="734" y="99.2999">BBB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A15</text>
     </a>
-    <g id="link_C_0002255521339657425355_C_0000839146342143718390">
-      <path codeLine="48" d="M780.29,133.834 C796.75,149.164 817.57,170.984 831,193.894 C846.88,220.984 855.365,250.0899 860.655,273.6399 " fill="none" id="C_0002255521339657425355-to-C_0000839146342143718390" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="861.97,279.494,863.9002,269.8361,860.8742,274.6155,856.0947,271.5895,861.97,279.494" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0001650835159458422245">
-      <path codeLine="49" d="M760.26,138.204 C767.72,175.254 780.1257,236.812 787.5757,273.812 " fill="none" id="C_0002255521339657425355-to-C_0001650835159458422245" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="788.76,279.694,790.9048,270.0815,787.7731,274.7924,783.0622,271.6606,788.76,279.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0001164966689017271053">
-      <path codeLine="50" d="M780.38,112.164 C881.58,112.944 1255.05,120.824 1342,193.894 C1367.13,215.014 1374.3585,247.8176 1376.6585,273.6776 " fill="none" id="C_0002255521339657425355-to-C_0001164966689017271053" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1377.19,279.654,1380.377,270.335,1376.747,274.6736,1372.4084,271.0437,1377.19,279.654" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000695366113361481509">
-      <path codeLine="51" d="M780.35,112.724 C873.33,115.514 1194.13,129.734 1269,193.894 C1293.93,215.254 1301.1907,247.9992 1303.5607,273.7792 " fill="none" id="C_0002255521339657425355-to-C_0000695366113361481509" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1304.11,279.754,1307.2693,270.4256,1303.6523,274.775,1299.3029,271.158,1304.11,279.754" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0001267709074800873528">
-      <path codeLine="52" d="M780.47,113.464 C864.81,118.494 1133.14,138.614 1196,193.894 C1220.5,215.444 1227.8566,247.7524 1230.3666,273.4424 " fill="none" id="C_0002255521339657425355-to-C_0001267709074800873528" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1230.95,279.414,1234.0559,270.0677,1230.4638,274.4377,1226.0938,270.8456,1230.95,279.414" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000299262817531370604">
-      <path codeLine="53" d="M780.38,114.474 C855.06,121.974 1071.96,147.384 1123,193.894 C1147.12,215.874 1154.5356,248.0755 1157.1656,273.6255 " fill="none" id="C_0002255521339657425355-to-C_0000299262817531370604" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1157.78,279.594,1160.8374,270.2317,1157.268,274.6203,1152.8795,271.0509,1157.78,279.594" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000561239706327729436">
-      <path codeLine="54" d="M729.57,114.034 C650.3,120.544 409.47,144.114 352,193.894 C327.07,215.484 318.4997,247.8202 314.9597,273.4902 " fill="none" id="C_0002255521339657425355-to-C_0000561239706327729436" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="314.14,279.434,319.332,271.0648,314.8231,274.4809,311.407,269.9719,314.14,279.434" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000405712335116487393">
-      <path codeLine="55" d="M729.75,111.884 C622.66,111.494 207.06,115.144 109,193.894 C83.12,214.674 74.708,247.5795 71.488,273.5595 " fill="none" id="C_0002255521339657425355-to-C_0000405712335116487393" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="70.75,279.514,75.8266,271.0743,71.365,274.552,67.8874,270.0903,70.75,279.514" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0001415398383158410524">
-      <path codeLine="56" d="M729.66,113.074 C640.36,117.024 341.88,134.514 271,193.894 C245.56,215.204 237.0771,247.9845 233.7071,273.7845 " fill="none" id="C_0002255521339657425355-to-C_0001415398383158410524" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="232.93,279.734,238.062,271.3279,233.5776,274.7761,230.1294,270.2917,232.93,279.734" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000301858476377711436">
-      <path codeLine="57" d="M729.96,115.384 C662.21,124.764 477.38,153.534 433,193.894 C408.6,216.084 399.9348,248.2766 396.2248,273.7466 " fill="none" id="C_0002255521339657425355-to-C_0000301858476377711436" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="395.36,279.684,400.6155,271.3545,396.0807,274.7362,392.699,270.2014,395.36,279.684" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0001207764290216680521">
-      <path codeLine="58" d="M780.16,111.554 C836.4,111.764 973.31,120.294 1050,193.894 C1073.54,216.484 1081.0564,248.5508 1083.8764,273.8908 " fill="none" id="C_0002255521339657425355-to-C_0001207764290216680521" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1084.54,279.854,1087.52,270.4668,1083.987,274.8847,1079.5691,271.3516,1084.54,279.854" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000563861734550555261">
-      <path codeLine="59" d="M780.44,119.514 C813.57,130.464 871.12,154.074 904,193.894 C924.38,218.584 932.3666,249.107 936.2266,273.617 " fill="none" id="C_0002255521339657425355-to-C_0000563861734550555261" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="937.16,279.544,939.7112,270.0313,936.3822,274.6049,931.8086,271.2758,937.16,279.544" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000532437874530119999">
-      <path codeLine="60" d="M729.63,112.394 C631,114.074 274.4,124.874 190,193.894 C164.31,214.904 155.8658,247.7518 152.5758,273.6618 " fill="none" id="C_0002255521339657425355-to-C_0000532437874530119999" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="151.82,279.614,156.9218,271.1895,152.4498,274.6538,148.9856,270.1818,151.82,279.614" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000899091126727901939">
-      <path codeLine="61" d="M780.16,114.284 C825.84,119.614 922.69,137.284 977,193.894 C999.45,217.294 1007.1438,248.8018 1010.3238,273.8318 " fill="none" id="C_0002255521339657425355-to-C_0000899091126727901939" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1011.08,279.784,1013.9138,270.3516,1010.4498,274.8239,1005.9776,271.3599,1011.08,279.784" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0001453242941322376182">
-      <path codeLine="62" d="M749.88,138.204 C742.6,175.254 730.5268,236.8066 723.2568,273.8066 " fill="none" id="C_0002255521339657425355-to-C_0001453242941322376182" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="722.1,279.694,727.7602,271.634,723.064,274.7878,719.9102,270.0916,722.1,279.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000384833776371876986">
-      <path codeLine="63" d="M729.65,133.124 C712.53,148.474 690.48,170.584 676,193.894 C659.25,220.864 649.6982,250.0392 643.5282,273.6292 " fill="none" id="C_0002255521339657425355-to-C_0000384833776371876986" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="642.01,279.434,648.1572,271.739,643.2752,274.5967,640.4175,269.7147,642.01,279.434" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0001199527037490355138">
-      <path codeLine="64" d="M729.7,118.634 C694.69,128.924 631.65,152.174 595,193.894 C573.5,218.364 564.4131,249.3181 559.7631,273.9481 " fill="none" id="C_0002255521339657425355-to-C_0001199527037490355138" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="558.65,279.844,564.2502,271.7423,559.5776,274.9308,556.3891,270.2581,558.65,279.844" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002255521339657425355_C_0000620689743711615190">
-      <path codeLine="65" d="M729.82,113.624 C681.45,117.884 574.95,133.934 514,193.894 C490.63,216.884 481.8135,248.5202 477.7635,273.6802 " fill="none" id="C_0002255521339657425355-to-C_0000620689743711615190" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="476.81,279.604,482.1895,271.3541,477.6046,274.6675,474.2912,270.0827,476.81,279.604" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A16</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A17</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A18</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="791,102,827,102,834,124.2969,841,124.2969,841,154.5938,791,154.5938,791,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="791" x2="834" y1="124.2969" y2="124.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="795" y="116.9951">BBB</text>
+    </a>
+    <path d="M841.09,150.04 C858.32,165.3 880.6,187.47 895,211 C910.38,236.14 920.49,268.3 926.38,291.62 " fill="none" id="C_0002255521339657425355-&gt;C_0000839146342143718390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="927.65,296.75,929.3746,287.0533,926.4508,291.8959,921.6081,288.9721,927.65,296.75" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M821.44,155.13 C828.95,190.46 842.45,254.03 850.49,291.83 " fill="none" id="C_0002255521339657425355-&gt;C_0001650835159458422245" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="851.53,296.77,853.5689,287.1345,850.4892,291.8795,845.7441,288.7998,851.53,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M841.31,129.44 C944.9,129.71 1335.4,135.79 1427,211 C1451,230.71 1459.9,266.28 1463.17,291.95 " fill="none" id="C_0002255521339657425355-&gt;C_0001164966689017271053" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1463.75,296.94,1466.6961,287.5421,1463.179,291.9727,1458.7484,288.4556,1463.75,296.94" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M841.03,129.97 C935.9,132.24 1272.01,144.9 1351,211 C1374.67,230.81 1383.64,266.02 1387.01,291.58 " fill="none" id="C_0002255521339657425355-&gt;C_0000695366113361481509" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1387.62,296.56,1390.5096,287.1446,1387.0192,291.5962,1382.5675,288.1059,1387.62,296.56" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M841.26,130.68 C927.5,135.19 1208.66,154.09 1275,211 C1298.33,231.01 1307.36,265.96 1310.85,291.41 " fill="none" id="C_0002255521339657425355-&gt;C_0001267709074800873528" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1311.51,296.69,1314.3461,287.2583,1310.881,291.7297,1306.4096,288.2647,1311.51,296.69" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M841.01,131.63 C917.28,138.61 1145.05,163.1 1199,211 C1221.99,231.41 1231.08,266.29 1234.67,291.61 " fill="none" id="C_0002255521339657425355-&gt;C_0000299262817531370604" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1235.36,296.86,1238.1728,287.4213,1234.7188,291.9013,1230.2388,288.4473,1235.36,296.86" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M790.87,131.14 C708.92,136.96 451.13,159.13 389,211 C364.96,231.07 354.32,266.23 349.64,291.72 " fill="none" id="C_0002255521339657425355-&gt;C_0000561239706327729436" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="348.78,296.68,354.2669,288.5012,349.6391,291.7544,346.3859,287.1266,348.78,296.68" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M790.79,129.14 C679.95,128.03 236.68,128.88 131,211 C106.12,230.33 95.63,265.97 91.21,291.76 " fill="none" id="C_0002255521339657425355-&gt;C_0000405712335116487393" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="90.4,296.78,95.7633,288.5196,91.1849,291.842,87.8625,287.2636,90.4,296.78" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M790.82,130.26 C698.42,133.51 379.51,149.11 303,211 C278.5,230.82 267.94,266.36 263.4,292 " fill="none" id="C_0002255521339657425355-&gt;C_0001415398383158410524" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="262.57,296.99,268.0067,288.7777,263.3989,292.0592,260.1175,287.4514,262.57,296.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M790.83,132.47 C720.33,141.24 522.93,169.07 475,211 C451.43,231.62 440.71,266.68 435.87,291.99 " fill="none" id="C_0002255521339657425355-&gt;C_0000301858476377711436" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="434.98,296.92,440.5129,288.7722,435.8669,291.9993,432.6398,287.3532,434.98,296.92" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M841.2,128.7 C898.93,128.26 1041.97,135.37 1123,211 C1145.33,231.84 1154.54,266.32 1158.34,291.43 " fill="none" id="C_0002255521339657425355-&gt;C_0001207764290216680521" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1159.07,296.64,1161.7723,287.1691,1158.3709,291.6891,1153.8509,288.2877,1159.07,296.64" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M841.18,136.31 C875.31,146.8 936.02,170.11 971,211 C990.61,233.92 1000.24,267.45 1004.88,291.75 " fill="none" id="C_0002255521339657425355-&gt;C_0000563861734550555261" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1005.79,296.79,1008.1082,287.2179,1004.8918,291.8713,1000.2383,288.655,1005.79,296.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M790.92,129.62 C689.14,130.58 308.08,139 217,211 C192.28,230.54 181.76,266.14 177.29,291.87 " fill="none" id="C_0002255521339657425355-&gt;C_0000532437874530119999" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="176.47,296.87,181.8603,288.6272,177.2711,291.9346,173.9637,287.3454,176.47,296.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M841.33,131.35 C888.35,136.13 989.57,152.95 1047,211 C1068.35,232.58 1077.72,266.62 1081.82,291.42 " fill="none" id="C_0002255521339657425355-&gt;C_0000899091126727901939" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1082.62,296.56,1085.1843,287.0508,1081.849,291.6198,1077.28,288.2845,1082.62,296.56" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M810.69,155.13 C803.37,190.46 790.19,254.03 782.36,291.83 " fill="none" id="C_0002255521339657425355-&gt;C_0001453242941322376182" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="781.33,296.77,787.0713,288.7676,782.3435,291.8738,779.2373,287.146,781.33,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M790.65,149.33 C772.56,164.58 748.75,187.03 733,211 C716.51,236.09 704.93,268.44 697.97,291.83 " fill="none" id="C_0002255521339657425355-&gt;C_0000384833776371876986" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="696.55,296.68,702.91,289.16,697.95,291.88,695.23,286.92,696.55,296.68" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M790.97,135.3 C754.52,144.98 686.85,167.77 647,211 C626.26,233.5 615.14,267.09 609.45,291.52 " fill="none" id="C_0002255521339657425355-&gt;C_0001199527037490355138" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="608.31,296.59,614.172,288.6757,609.3977,291.7097,606.3636,286.9354,608.31,296.59" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M790.7,130.59 C740.38,134.08 626.94,148.82 561,211 C538.45,232.26 527.58,266.67 522.43,291.65 " fill="none" id="C_0002255521339657425355-&gt;C_0000620689743711615190" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="521.42,296.83,527.0712,288.7638,522.3786,291.9227,519.2196,287.2301,521.42,296.83" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30002_package_mermaid.svg b/docs/test_cases/t30002_package_mermaid.svg
index 7f16d003..652965df 100644
--- a/docs/test_cases/t30002_package_mermaid.svg
+++ b/docs/test_cases/t30002_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 1677.234375 332" style="max-width: 1677.23px; background-color: white;" width="1677.234375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -63,24 +63,24 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000839146342143718390" id="L-C_0002255521339657425355-C_0000839146342143718390-0" d="M769.91796875,74.05732744273308L752.3209635416666,79.71443953561091C734.7239583333334,85.37155162848872,699.5299479166666,96.68577581424437,681.9329427083334,106.50955457378886C664.3359375,116.33333333333333,664.3359375,124.66666666666667,664.3359375,133C664.3359375,141.33333333333334,664.3359375,149.66666666666666,664.3359375,158C664.3359375,166.33333333333334,664.3359375,174.66666666666666,664.3359375,183C664.3359375,191.33333333333334,664.3359375,199.66666666666666,664.3359375,207.11666666666667C664.3359375,214.5666666666667,664.3359375,221.13333333333333,664.3359375,224.41666666666666L664.3359375,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001650835159458422245" id="L-C_0002255521339657425355-C_0001650835159458422245-0" d="M775.7283509036145,83L771.2593028363453,87.16666666666667C766.7902547690763,91.33333333333333,757.8521586345381,99.66666666666667,753.383110567269,108C748.9140625,116.33333333333333,748.9140625,124.66666666666667,748.9140625,133C748.9140625,141.33333333333334,748.9140625,149.66666666666666,748.9140625,158C748.9140625,166.33333333333334,748.9140625,174.66666666666666,748.9140625,183C748.9140625,191.33333333333334,748.9140625,199.66666666666666,748.9140625,207.11666666666667C748.9140625,214.5666666666667,748.9140625,221.13333333333333,748.9140625,224.41666666666666L748.9140625,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001164966689017271053" id="L-C_0002255521339657425355-C_0001164966689017271053-0" d="M769.91796875,67.85282837967402L653.646484375,74.54402364972835C537.375,81.23521891978268,304.83203125,94.61760945989134,188.560546875,105.47547139661235C72.2890625,116.33333333333333,72.2890625,124.66666666666667,72.2890625,133C72.2890625,141.33333333333334,72.2890625,149.66666666666666,72.2890625,158C72.2890625,166.33333333333334,72.2890625,174.66666666666666,72.2890625,183C72.2890625,191.33333333333334,72.2890625,199.66666666666666,72.2890625,207.11666666666667C72.2890625,214.5666666666667,72.2890625,221.13333333333333,72.2890625,224.41666666666666L72.2890625,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000695366113361481509" id="L-C_0002255521339657425355-C_0000695366113361481509-0" d="M769.91796875,68.03257567854492L667.7428385416666,74.6938130654541C565.5677083333334,81.35505045236327,361.2174479166667,94.67752522618163,259.0423177083333,105.50542927975748C156.8671875,116.33333333333333,156.8671875,124.66666666666667,156.8671875,133C156.8671875,141.33333333333334,156.8671875,149.66666666666666,156.8671875,158C156.8671875,166.33333333333334,156.8671875,174.66666666666666,156.8671875,183C156.8671875,191.33333333333334,156.8671875,199.66666666666666,156.8671875,207.11666666666667C156.8671875,214.5666666666667,156.8671875,221.13333333333333,156.8671875,224.41666666666666L156.8671875,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001267709074800873528" id="L-C_0002255521339657425355-C_0001267709074800873528-0" d="M769.91796875,68.26740713481993L681.8391927083334,74.88950594568327C593.7604166666666,81.51160475654662,417.6028645833333,94.7558023782733,329.5240885416667,105.54456785580332C241.4453125,116.33333333333333,241.4453125,124.66666666666667,241.4453125,133C241.4453125,141.33333333333334,241.4453125,149.66666666666666,241.4453125,158C241.4453125,166.33333333333334,241.4453125,174.66666666666666,241.4453125,183C241.4453125,191.33333333333334,241.4453125,199.66666666666666,241.4453125,207.11666666666667C241.4453125,214.5666666666667,241.4453125,221.13333333333333,241.4453125,224.41666666666666L241.4453125,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000299262817531370604" id="L-C_0002255521339657425355-C_0000299262817531370604-0" d="M769.91796875,68.58722577410055L695.935546875,75.15602147841712C621.953125,81.7248171827337,473.98828125,94.86240859136684,400.005859375,105.59787096235009C326.0234375,116.33333333333333,326.0234375,124.66666666666667,326.0234375,133C326.0234375,141.33333333333334,326.0234375,149.66666666666666,326.0234375,158C326.0234375,166.33333333333334,326.0234375,174.66666666666666,326.0234375,183C326.0234375,191.33333333333334,326.0234375,199.66666666666666,326.0234375,207.11666666666667C326.0234375,214.5666666666667,326.0234375,221.13333333333333,326.0234375,224.41666666666666L326.0234375,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000561239706327729436" id="L-C_0002255521339657425355-C_0000561239706327729436-0" d="M816.93359375,68.41038850769901L898.126953125,75.00865708974918C979.3203125,81.60692567179935,1141.70703125,94.80346283589967,1222.900390625,105.5683980846165C1304.09375,116.33333333333333,1304.09375,124.66666666666667,1304.09375,133C1304.09375,141.33333333333334,1304.09375,149.66666666666666,1304.09375,158C1304.09375,166.33333333333334,1304.09375,174.66666666666666,1304.09375,183C1304.09375,191.33333333333334,1304.09375,199.66666666666666,1304.09375,207.11666666666667C1304.09375,214.5666666666667,1304.09375,221.13333333333333,1304.09375,224.41666666666666L1304.09375,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000405712335116487393" id="L-C_0002255521339657425355-C_0000405712335116487393-0" d="M816.93359375,67.7332271683579L944.861328125,74.44435597363157C1072.7890625,81.15548477890526,1328.64453125,94.57774238945262,1456.572265625,105.45553786139298C1584.5,116.33333333333333,1584.5,124.66666666666667,1584.5,133C1584.5,141.33333333333334,1584.5,149.66666666666666,1584.5,158C1584.5,166.33333333333334,1584.5,174.66666666666666,1584.5,183C1584.5,191.33333333333334,1584.5,199.66666666666666,1584.5,207.11666666666667C1584.5,214.5666666666667,1584.5,221.13333333333333,1584.5,224.41666666666666L1584.5,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001415398383158410524" id="L-C_0002255521339657425355-C_0001415398383158410524-0" d="M816.93359375,68.1148235796171L913.705078125,74.76235298301425C1010.4765625,81.4098823864114,1204.01953125,94.7049411932057,1300.791015625,105.51913726326951C1397.5625,116.33333333333333,1397.5625,124.66666666666667,1397.5625,133C1397.5625,141.33333333333334,1397.5625,149.66666666666666,1397.5625,158C1397.5625,166.33333333333334,1397.5625,174.66666666666666,1397.5625,183C1397.5625,191.33333333333334,1397.5625,199.66666666666666,1397.5625,207.11666666666667C1397.5625,214.5666666666667,1397.5625,221.13333333333333,1397.5625,224.41666666666666L1397.5625,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000301858476377711436" id="L-C_0002255521339657425355-C_0000301858476377711436-0" d="M816.93359375,68.83838937108509L882.548828125,75.36532447590425C948.1640625,81.89225958072339,1079.39453125,94.9461297903617,1145.009765625,105.63973156184751C1210.625,116.33333333333333,1210.625,124.66666666666667,1210.625,133C1210.625,141.33333333333334,1210.625,149.66666666666666,1210.625,158C1210.625,166.33333333333334,1210.625,174.66666666666666,1210.625,183C1210.625,191.33333333333334,1210.625,199.66666666666666,1210.625,207.11666666666667C1210.625,214.5666666666667,1210.625,221.13333333333333,1210.625,224.41666666666666L1210.625,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001207764290216680521" id="L-C_0002255521339657425355-C_0001207764290216680521-0" d="M769.91796875,69.0483607644664L710.0319010416666,75.54030063705532C650.1458333333334,82.03224050964427,530.3736979166666,95.01612025482213,470.4876302083333,105.67472679407774C410.6015625,116.33333333333333,410.6015625,124.66666666666667,410.6015625,133C410.6015625,141.33333333333334,410.6015625,149.66666666666666,410.6015625,158C410.6015625,166.33333333333334,410.6015625,174.66666666666666,410.6015625,183C410.6015625,191.33333333333334,410.6015625,199.66666666666666,410.6015625,207.11666666666667C410.6015625,214.5666666666667,410.6015625,221.13333333333333,410.6015625,224.41666666666666L410.6015625,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000563861734550555261" id="L-C_0002255521339657425355-C_0000563861734550555261-0" d="M769.91796875,71.06584215433554L738.224609375,77.22153512861296C706.53125,83.37722810289036,643.14453125,95.68861405144519,611.451171875,106.01097369238926C579.7578125,116.33333333333333,579.7578125,124.66666666666667,579.7578125,133C579.7578125,141.33333333333334,579.7578125,149.66666666666666,579.7578125,158C579.7578125,166.33333333333334,579.7578125,174.66666666666666,579.7578125,183C579.7578125,191.33333333333334,579.7578125,199.66666666666666,579.7578125,207.11666666666667C579.7578125,214.5666666666667,579.7578125,221.13333333333333,579.7578125,224.41666666666666L579.7578125,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000532437874530119999" id="L-C_0002255521339657425355-C_0000532437874530119999-0" d="M816.93359375,67.89846125417864L929.283203125,74.58205104514887C1041.6328125,81.26564083611909,1266.33203125,94.63282041805955,1378.681640625,105.48307687569644C1491.03125,116.33333333333333,1491.03125,124.66666666666667,1491.03125,133C1491.03125,141.33333333333334,1491.03125,149.66666666666666,1491.03125,158C1491.03125,166.33333333333334,1491.03125,174.66666666666666,1491.03125,183C1491.03125,191.33333333333334,1491.03125,199.66666666666666,1491.03125,207.11666666666667C1491.03125,214.5666666666667,1491.03125,221.13333333333333,1491.03125,224.41666666666666L1491.03125,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000899091126727901939" id="L-C_0002255521339657425355-C_0000899091126727901939-0" d="M769.91796875,69.77103770743015L724.1282552083334,76.14253142285845C678.3385416666666,82.51402513828677,586.7591145833334,95.25701256914338,540.9694010416666,105.79517295123837C495.1796875,116.33333333333333,495.1796875,124.66666666666667,495.1796875,133C495.1796875,141.33333333333334,495.1796875,149.66666666666666,495.1796875,158C495.1796875,166.33333333333334,495.1796875,174.66666666666666,495.1796875,183C495.1796875,191.33333333333334,495.1796875,199.66666666666666,495.1796875,207.11666666666667C495.1796875,214.5666666666667,495.1796875,221.13333333333333,495.1796875,224.41666666666666L495.1796875,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001453242941322376182" id="L-C_0002255521339657425355-C_0001453242941322376182-0" d="M811.1232115963855,83L815.5922596636547,87.16666666666667C820.0613077309237,91.33333333333333,828.9994038654619,99.66666666666667,833.468451932731,108C837.9375,116.33333333333333,837.9375,124.66666666666667,837.9375,133C837.9375,141.33333333333334,837.9375,149.66666666666666,837.9375,158C837.9375,166.33333333333334,837.9375,174.66666666666666,837.9375,183C837.9375,191.33333333333334,837.9375,199.66666666666666,837.9375,207.11666666666667C837.9375,214.5666666666667,837.9375,221.13333333333333,837.9375,224.41666666666666L837.9375,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000384833776371876986" id="L-C_0002255521339657425355-C_0000384833776371876986-0" d="M816.93359375,73.60093542975747L835.9134114583334,79.33411285813122C854.8932291666666,85.06729028650498,892.8528645833334,96.53364514325249,911.8326822916666,106.4334892382929C930.8125,116.33333333333333,930.8125,124.66666666666667,930.8125,133C930.8125,141.33333333333334,930.8125,149.66666666666666,930.8125,158C930.8125,166.33333333333334,930.8125,174.66666666666666,930.8125,183C930.8125,191.33333333333334,930.8125,199.66666666666666,930.8125,207.11666666666667C930.8125,214.5666666666667,930.8125,221.13333333333333,930.8125,224.41666666666666L930.8125,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001199527037490355138" id="L-C_0002255521339657425355-C_0001199527037490355138-0" d="M816.93359375,70.73680594432287L851.392578125,76.94733828693573C885.8515625,83.15787062954858,954.76953125,95.5789353147743,989.228515625,105.95613432405382C1023.6875,116.33333333333333,1023.6875,124.66666666666667,1023.6875,133C1023.6875,141.33333333333334,1023.6875,149.66666666666666,1023.6875,158C1023.6875,166.33333333333334,1023.6875,174.66666666666666,1023.6875,183C1023.6875,191.33333333333334,1023.6875,199.66666666666666,1023.6875,207.11666666666667C1023.6875,214.5666666666667,1023.6875,221.13333333333333,1023.6875,224.41666666666666L1023.6875,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000620689743711615190" id="L-C_0002255521339657425355-C_0000620689743711615190-0" d="M816.93359375,69.51353846153846L866.970703125,75.92794871794872C917.0078125,82.34235897435897,1017.08203125,95.17117948717949,1067.119140625,105.75225641025641C1117.15625,116.33333333333333,1117.15625,124.66666666666667,1117.15625,133C1117.15625,141.33333333333334,1117.15625,149.66666666666666,1117.15625,158C1117.15625,166.33333333333334,1117.15625,174.66666666666666,1117.15625,183C1117.15625,191.33333333333334,1117.15625,199.66666666666666,1117.15625,207.11666666666667C1117.15625,214.5666666666667,1117.15625,221.13333333333333,1117.15625,224.41666666666666L1117.15625,227.7"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000839146342143718390" id="L-C_0002255521339657425355-C_0000839146342143718390-0" d="M769.91796875,74.05732744273308L752.3209635416666,79.71443953561091C734.7239583333334,85.37155162848872,699.5299479166666,96.68577581424437,681.9329427083334,106.50955457378886C664.3359375,116.33333333333333,664.3359375,124.66666666666667,664.3359375,133C664.3359375,141.33333333333334,664.3359375,149.66666666666666,664.3359375,158C664.3359375,166.33333333333334,664.3359375,174.66666666666666,664.3359375,183C664.3359375,191.33333333333334,664.3359375,199.66666666666666,664.3359375,208C664.3359375,216.33333333333334,664.3359375,224.66666666666666,664.3359375,228.83333333333334L664.3359375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001650835159458422245" id="L-C_0002255521339657425355-C_0001650835159458422245-0" d="M775.7283509036145,83L771.2593028363453,87.16666666666667C766.7902547690763,91.33333333333333,757.8521586345381,99.66666666666667,753.383110567269,108C748.9140625,116.33333333333333,748.9140625,124.66666666666667,748.9140625,133C748.9140625,141.33333333333334,748.9140625,149.66666666666666,748.9140625,158C748.9140625,166.33333333333334,748.9140625,174.66666666666666,748.9140625,183C748.9140625,191.33333333333334,748.9140625,199.66666666666666,748.9140625,208C748.9140625,216.33333333333334,748.9140625,224.66666666666666,748.9140625,228.83333333333334L748.9140625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001164966689017271053" id="L-C_0002255521339657425355-C_0001164966689017271053-0" d="M769.91796875,67.85282837967402L653.646484375,74.54402364972835C537.375,81.23521891978268,304.83203125,94.61760945989134,188.560546875,105.47547139661235C72.2890625,116.33333333333333,72.2890625,124.66666666666667,72.2890625,133C72.2890625,141.33333333333334,72.2890625,149.66666666666666,72.2890625,158C72.2890625,166.33333333333334,72.2890625,174.66666666666666,72.2890625,183C72.2890625,191.33333333333334,72.2890625,199.66666666666666,72.2890625,208C72.2890625,216.33333333333334,72.2890625,224.66666666666666,72.2890625,228.83333333333334L72.2890625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000695366113361481509" id="L-C_0002255521339657425355-C_0000695366113361481509-0" d="M769.91796875,68.03257567854492L667.7428385416666,74.6938130654541C565.5677083333334,81.35505045236327,361.2174479166667,94.67752522618163,259.0423177083333,105.50542927975748C156.8671875,116.33333333333333,156.8671875,124.66666666666667,156.8671875,133C156.8671875,141.33333333333334,156.8671875,149.66666666666666,156.8671875,158C156.8671875,166.33333333333334,156.8671875,174.66666666666666,156.8671875,183C156.8671875,191.33333333333334,156.8671875,199.66666666666666,156.8671875,208C156.8671875,216.33333333333334,156.8671875,224.66666666666666,156.8671875,228.83333333333334L156.8671875,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001267709074800873528" id="L-C_0002255521339657425355-C_0001267709074800873528-0" d="M769.91796875,68.26740713481993L681.8391927083334,74.88950594568327C593.7604166666666,81.51160475654662,417.6028645833333,94.7558023782733,329.5240885416667,105.54456785580332C241.4453125,116.33333333333333,241.4453125,124.66666666666667,241.4453125,133C241.4453125,141.33333333333334,241.4453125,149.66666666666666,241.4453125,158C241.4453125,166.33333333333334,241.4453125,174.66666666666666,241.4453125,183C241.4453125,191.33333333333334,241.4453125,199.66666666666666,241.4453125,208C241.4453125,216.33333333333334,241.4453125,224.66666666666666,241.4453125,228.83333333333334L241.4453125,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000299262817531370604" id="L-C_0002255521339657425355-C_0000299262817531370604-0" d="M769.91796875,68.58722577410055L695.935546875,75.15602147841712C621.953125,81.7248171827337,473.98828125,94.86240859136684,400.005859375,105.59787096235009C326.0234375,116.33333333333333,326.0234375,124.66666666666667,326.0234375,133C326.0234375,141.33333333333334,326.0234375,149.66666666666666,326.0234375,158C326.0234375,166.33333333333334,326.0234375,174.66666666666666,326.0234375,183C326.0234375,191.33333333333334,326.0234375,199.66666666666666,326.0234375,208C326.0234375,216.33333333333334,326.0234375,224.66666666666666,326.0234375,228.83333333333334L326.0234375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000561239706327729436" id="L-C_0002255521339657425355-C_0000561239706327729436-0" d="M816.93359375,68.41038850769901L898.126953125,75.00865708974918C979.3203125,81.60692567179935,1141.70703125,94.80346283589967,1222.900390625,105.5683980846165C1304.09375,116.33333333333333,1304.09375,124.66666666666667,1304.09375,133C1304.09375,141.33333333333334,1304.09375,149.66666666666666,1304.09375,158C1304.09375,166.33333333333334,1304.09375,174.66666666666666,1304.09375,183C1304.09375,191.33333333333334,1304.09375,199.66666666666666,1304.09375,208C1304.09375,216.33333333333334,1304.09375,224.66666666666666,1304.09375,228.83333333333334L1304.09375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000405712335116487393" id="L-C_0002255521339657425355-C_0000405712335116487393-0" d="M816.93359375,67.7332271683579L944.861328125,74.44435597363157C1072.7890625,81.15548477890526,1328.64453125,94.57774238945262,1456.572265625,105.45553786139298C1584.5,116.33333333333333,1584.5,124.66666666666667,1584.5,133C1584.5,141.33333333333334,1584.5,149.66666666666666,1584.5,158C1584.5,166.33333333333334,1584.5,174.66666666666666,1584.5,183C1584.5,191.33333333333334,1584.5,199.66666666666666,1584.5,208C1584.5,216.33333333333334,1584.5,224.66666666666666,1584.5,228.83333333333334L1584.5,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001415398383158410524" id="L-C_0002255521339657425355-C_0001415398383158410524-0" d="M816.93359375,68.1148235796171L913.705078125,74.76235298301425C1010.4765625,81.4098823864114,1204.01953125,94.7049411932057,1300.791015625,105.51913726326951C1397.5625,116.33333333333333,1397.5625,124.66666666666667,1397.5625,133C1397.5625,141.33333333333334,1397.5625,149.66666666666666,1397.5625,158C1397.5625,166.33333333333334,1397.5625,174.66666666666666,1397.5625,183C1397.5625,191.33333333333334,1397.5625,199.66666666666666,1397.5625,208C1397.5625,216.33333333333334,1397.5625,224.66666666666666,1397.5625,228.83333333333334L1397.5625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000301858476377711436" id="L-C_0002255521339657425355-C_0000301858476377711436-0" d="M816.93359375,68.83838937108509L882.548828125,75.36532447590425C948.1640625,81.89225958072339,1079.39453125,94.9461297903617,1145.009765625,105.63973156184751C1210.625,116.33333333333333,1210.625,124.66666666666667,1210.625,133C1210.625,141.33333333333334,1210.625,149.66666666666666,1210.625,158C1210.625,166.33333333333334,1210.625,174.66666666666666,1210.625,183C1210.625,191.33333333333334,1210.625,199.66666666666666,1210.625,208C1210.625,216.33333333333334,1210.625,224.66666666666666,1210.625,228.83333333333334L1210.625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001207764290216680521" id="L-C_0002255521339657425355-C_0001207764290216680521-0" d="M769.91796875,69.0483607644664L710.0319010416666,75.54030063705532C650.1458333333334,82.03224050964427,530.3736979166666,95.01612025482213,470.4876302083333,105.67472679407774C410.6015625,116.33333333333333,410.6015625,124.66666666666667,410.6015625,133C410.6015625,141.33333333333334,410.6015625,149.66666666666666,410.6015625,158C410.6015625,166.33333333333334,410.6015625,174.66666666666666,410.6015625,183C410.6015625,191.33333333333334,410.6015625,199.66666666666666,410.6015625,208C410.6015625,216.33333333333334,410.6015625,224.66666666666666,410.6015625,228.83333333333334L410.6015625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000563861734550555261" id="L-C_0002255521339657425355-C_0000563861734550555261-0" d="M769.91796875,71.06584215433554L738.224609375,77.22153512861296C706.53125,83.37722810289036,643.14453125,95.68861405144519,611.451171875,106.01097369238926C579.7578125,116.33333333333333,579.7578125,124.66666666666667,579.7578125,133C579.7578125,141.33333333333334,579.7578125,149.66666666666666,579.7578125,158C579.7578125,166.33333333333334,579.7578125,174.66666666666666,579.7578125,183C579.7578125,191.33333333333334,579.7578125,199.66666666666666,579.7578125,208C579.7578125,216.33333333333334,579.7578125,224.66666666666666,579.7578125,228.83333333333334L579.7578125,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000532437874530119999" id="L-C_0002255521339657425355-C_0000532437874530119999-0" d="M816.93359375,67.89846125417864L929.283203125,74.58205104514887C1041.6328125,81.26564083611909,1266.33203125,94.63282041805955,1378.681640625,105.48307687569644C1491.03125,116.33333333333333,1491.03125,124.66666666666667,1491.03125,133C1491.03125,141.33333333333334,1491.03125,149.66666666666666,1491.03125,158C1491.03125,166.33333333333334,1491.03125,174.66666666666666,1491.03125,183C1491.03125,191.33333333333334,1491.03125,199.66666666666666,1491.03125,208C1491.03125,216.33333333333334,1491.03125,224.66666666666666,1491.03125,228.83333333333334L1491.03125,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000899091126727901939" id="L-C_0002255521339657425355-C_0000899091126727901939-0" d="M769.91796875,69.77103770743015L724.1282552083334,76.14253142285845C678.3385416666666,82.51402513828677,586.7591145833334,95.25701256914338,540.9694010416666,105.79517295123837C495.1796875,116.33333333333333,495.1796875,124.66666666666667,495.1796875,133C495.1796875,141.33333333333334,495.1796875,149.66666666666666,495.1796875,158C495.1796875,166.33333333333334,495.1796875,174.66666666666666,495.1796875,183C495.1796875,191.33333333333334,495.1796875,199.66666666666666,495.1796875,208C495.1796875,216.33333333333334,495.1796875,224.66666666666666,495.1796875,228.83333333333334L495.1796875,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001453242941322376182" id="L-C_0002255521339657425355-C_0001453242941322376182-0" d="M811.1232115963855,83L815.5922596636547,87.16666666666667C820.0613077309237,91.33333333333333,828.9994038654619,99.66666666666667,833.468451932731,108C837.9375,116.33333333333333,837.9375,124.66666666666667,837.9375,133C837.9375,141.33333333333334,837.9375,149.66666666666666,837.9375,158C837.9375,166.33333333333334,837.9375,174.66666666666666,837.9375,183C837.9375,191.33333333333334,837.9375,199.66666666666666,837.9375,208C837.9375,216.33333333333334,837.9375,224.66666666666666,837.9375,228.83333333333334L837.9375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000384833776371876986" id="L-C_0002255521339657425355-C_0000384833776371876986-0" d="M816.93359375,73.60093542975747L835.9134114583334,79.33411285813122C854.8932291666666,85.06729028650498,892.8528645833334,96.53364514325249,911.8326822916666,106.4334892382929C930.8125,116.33333333333333,930.8125,124.66666666666667,930.8125,133C930.8125,141.33333333333334,930.8125,149.66666666666666,930.8125,158C930.8125,166.33333333333334,930.8125,174.66666666666666,930.8125,183C930.8125,191.33333333333334,930.8125,199.66666666666666,930.8125,208C930.8125,216.33333333333334,930.8125,224.66666666666666,930.8125,228.83333333333334L930.8125,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0001199527037490355138" id="L-C_0002255521339657425355-C_0001199527037490355138-0" d="M816.93359375,70.73680594432287L851.392578125,76.94733828693573C885.8515625,83.15787062954858,954.76953125,95.5789353147743,989.228515625,105.95613432405382C1023.6875,116.33333333333333,1023.6875,124.66666666666667,1023.6875,133C1023.6875,141.33333333333334,1023.6875,149.66666666666666,1023.6875,158C1023.6875,166.33333333333334,1023.6875,174.66666666666666,1023.6875,183C1023.6875,191.33333333333334,1023.6875,199.66666666666666,1023.6875,208C1023.6875,216.33333333333334,1023.6875,224.66666666666666,1023.6875,228.83333333333334L1023.6875,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002255521339657425355 LE-C_0000620689743711615190" id="L-C_0002255521339657425355-C_0000620689743711615190-0" d="M816.93359375,69.51353846153846L866.970703125,75.92794871794872C917.0078125,82.34235897435897,1017.08203125,95.17117948717949,1067.119140625,105.75225641025641C1117.15625,116.33333333333333,1117.15625,124.66666666666667,1117.15625,133C1117.15625,141.33333333333334,1117.15625,149.66666666666666,1117.15625,158C1117.15625,166.33333333333334,1117.15625,174.66666666666666,1117.15625,183C1117.15625,191.33333333333334,1117.15625,199.66666666666666,1117.15625,208C1117.15625,216.33333333333334,1117.15625,224.66666666666666,1117.15625,228.83333333333334L1117.15625,233"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30003.md b/docs/test_cases/t30003.md
index 8d45e2e6..87edcc38 100644
--- a/docs/test_cases/t30003.md
+++ b/docs/test_cases/t30003.md
@@ -55,41 +55,14 @@ class B : public ns1::ns2::Anon { };
   "diagram_type": "package",
   "elements": [
     {
-      "display_name": "clanguml",
+      "display_name": "ns1",
       "elements": [
         {
-          "display_name": "clanguml::t30003",
-          "id": "1288549465151585544",
-          "is_deprecated": false,
-          "name": "t30003",
-          "source_location": {
-            "column": 11,
-            "file": "t30003.cc",
-            "line": 2,
-            "translation_unit": "t30003.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30003.cc",
-        "line": 1,
-        "translation_unit": "t30003.cc"
-      },
-      "type": "namespace"
-    },
-    {
-      "display_name": "clanguml::t30003::ns1",
-      "elements": [
-        {
-          "display_name": "clanguml::t30003::ns1::ns2_v1_0_0",
+          "display_name": "ns2_v1_0_0",
           "id": "647755950450743637",
           "is_deprecated": false,
           "name": "ns2_v1_0_0",
+          "namespace": "clanguml::t30003::ns1",
           "source_location": {
             "column": 11,
             "file": "t30003.cc",
@@ -99,10 +72,11 @@ class B : public ns1::ns2::Anon { };
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30003::ns1::ns2_v0_9_0",
+          "display_name": "ns2_v0_9_0",
           "id": "1013406647495422406",
           "is_deprecated": true,
           "name": "ns2_v0_9_0",
+          "namespace": "clanguml::t30003::ns1",
           "source_location": {
             "column": 26,
             "file": "t30003.cc",
@@ -115,6 +89,7 @@ class B : public ns1::ns2::Anon { };
       "id": "600452871069546589",
       "is_deprecated": false,
       "name": "ns1",
+      "namespace": "clanguml::t30003",
       "source_location": {
         "column": 11,
         "file": "t30003.cc",
@@ -124,16 +99,17 @@ class B : public ns1::ns2::Anon { };
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30003::ns3",
+      "display_name": "ns3",
       "elements": [
         {
-          "display_name": "clanguml::t30003::ns3::ns1",
+          "display_name": "ns1",
           "elements": [
             {
-              "display_name": "clanguml::t30003::ns3::ns1::ns2",
+              "display_name": "ns2",
               "id": "820462660523726751",
               "is_deprecated": false,
               "name": "ns2",
+              "namespace": "clanguml::t30003::ns3::ns1",
               "source_location": {
                 "column": 16,
                 "file": "t30003.cc",
@@ -146,6 +122,7 @@ class B : public ns1::ns2::Anon { };
           "id": "1209144861141334061",
           "is_deprecated": false,
           "name": "ns1",
+          "namespace": "clanguml::t30003::ns3",
           "source_location": {
             "column": 11,
             "file": "t30003.cc",
@@ -158,6 +135,7 @@ class B : public ns1::ns2::Anon { };
       "id": "427104404739526818",
       "is_deprecated": true,
       "name": "ns3",
+      "namespace": "clanguml::t30003",
       "source_location": {
         "column": 26,
         "file": "t30003.cc",
@@ -168,6 +146,7 @@ class B : public ns1::ns2::Anon { };
     }
   ],
   "name": "t30003_package",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "647755950450743637",
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index a50afa51..6c6fbe95 100644
--- a/docs/test_cases/t30003_package.svg
+++ b/docs/test_cases/t30003_package.svg
@@ -1,49 +1,47 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="334px" preserveAspectRatio="none" style="width:292px;height:334px;background:#FFFFFF;" version="1.1" viewBox="0 0 292 334" width="292px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="f13mpkvaocj8qz" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0000600452871069546589">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-        <path d="M8.5,220.894 L34.5,220.894 A3.75,3.75 0 0 1 37,223.394 L44,243.6939 L282.5,243.6939 A2.5,2.5 0 0 1 285,246.1939 L285,325.094 A2.5,2.5 0 0 1 282.5,327.594 L8.5,327.594 A2.5,2.5 0 0 1 6,325.094 L6,223.394 A2.5,2.5 0 0 1 8.5,220.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="44" y1="243.6939" y2="243.6939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="10" y="235.8999">ns1</text>
-      </a>
-    </g>
-    <g id="cluster_C_0000427104404739526818">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
-        <path d="M157.5,6.294 L183.5,6.294 A3.75,3.75 0 0 1 186,8.794 L193,29.0939 L278.5,29.0939 A2.5,2.5 0 0 1 281,31.5939 L281,194.394 A2.5,2.5 0 0 1 278.5,196.894 L157.5,196.894 A2.5,2.5 0 0 1 155,194.394 L155,8.794 A2.5,2.5 0 0 1 157.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="155" x2="193" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="159" y="21.2999">ns3</text>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="88" x="178" y="46.4938">«deprecated»</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001209144861141334061">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-        <path d="M181.5,68.294 L207.5,68.294 A3.75,3.75 0 0 1 210,70.794 L217,91.0939 L254.5,91.0939 A2.5,2.5 0 0 1 257,93.5939 L257,170.394 A2.5,2.5 0 0 1 254.5,172.894 L181.5,172.894 A2.5,2.5 0 0 1 179,170.394 L179,70.794 A2.5,2.5 0 0 1 181.5,68.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="179" x2="217" y1="91.0939" y2="91.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="183" y="83.2999">ns1</text>
-      </a>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
-      <path d="M170,256.944 L252,256.944 A3.75,3.75 0 0 1 254.5,259.444 L261.5,279.7439 L266,279.7439 A2.5,2.5 0 0 1 268.5,282.2439 L268.5,308.0438 A2.5,2.5 0 0 1 266,310.5438 L170,310.5438 A2.5,2.5 0 0 1 167.5,308.0438 L167.5,259.444 A2.5,2.5 0 0 1 170,256.944 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="167.5" x2="261.5" y1="279.7439" y2="279.7439"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="81" x="171.5" y="271.9499">ns2_v1_0_0</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
-      <path d="M24.5,255.894 L106.5,255.894 A3.75,3.75 0 0 1 109,258.394 L116,278.6939 L129.5,278.6939 A2.5,2.5 0 0 1 132,281.1939 L132,309.0938 A2.5,2.5 0 0 1 129.5,311.5938 L24.5,311.5938 A2.5,2.5 0 0 1 22,309.0938 L22,258.394 A2.5,2.5 0 0 1 24.5,255.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="22" x2="116" y1="278.6939" y2="278.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="81" x="26" y="270.8999">ns2_v0_9_0</text>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacing" textLength="88" x="37" y="296.0938">«deprecated»</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
-      <path d="M198,103.294 L224,103.294 A3.75,3.75 0 0 1 226.5,105.794 L233.5,126.0939 L238,126.0939 A2.5,2.5 0 0 1 240.5,128.5939 L240.5,154.3938 A2.5,2.5 0 0 1 238,156.8938 L198,156.8938 A2.5,2.5 0 0 1 195.5,154.3938 L195.5,105.794 A2.5,2.5 0 0 1 198,103.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="195.5" x2="233.5" y1="126.0939" y2="126.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="199.5" y="118.2999">ns2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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>
     </a>
-    <g id="link_C_0000820462660523726751_C_0000647755950450743637">
-      <path codeLine="14" d="M218,157.164 C218,184.944 218,222.664 218,250.504 " fill="none" id="C_0000820462660523726751-to-C_0000647755950450743637" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="218,256.504,222,247.504,218,251.504,214,247.504,218,256.504" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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>
+    </a>
+    <path d="M248,171.29 C248,197.04 248,236.67 248,264.21 " fill="none" id="C_0000820462660523726751-&gt;C_0000647755950450743637" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="248,269.55,252,260.55,248,264.55,244,260.55,248,269.55" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30003_package_mermaid.svg b/docs/test_cases/t30003_package_mermaid.svg
index a33de6b3..0a3b23e0 100644
--- a/docs/test_cases/t30003_package_mermaid.svg
+++ b/docs/test_cases/t30003_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 308.984375 222" style="max-width: 308.984px; background-color: white;" width="308.984375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -48,7 +48,7 @@
             </g>
           </g>
           <g class="edgePaths">
-            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000820462660523726751 LE-C_0000647755950450743637" id="L-C_0000820462660523726751-C_0000647755950450743637-0" d="M98.796875,79.5L102.96354166666667,79.5C107.13020833333333,79.5,115.46354166666667,79.5,123.796875,79.5C132.13020833333334,79.5,140.46354166666666,79.5,147.91354166666667,79.5C155.36354166666666,79.5,161.93020833333333,79.5,165.21354166666666,79.5L168.496875,79.5"/>
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000820462660523726751 LE-C_0000647755950450743637" id="L-C_0000820462660523726751-C_0000647755950450743637-0" d="M98.796875,79.5L102.96354166666667,79.5C107.13020833333333,79.5,115.46354166666667,79.5,123.796875,79.5C132.13020833333334,79.5,140.46354166666666,79.5,148.796875,79.5C157.13020833333334,79.5,165.46354166666666,79.5,169.63020833333334,79.5L173.796875,79.5"/>
           </g>
           <g class="edgeLabels">
             <g class="edgeLabel">
diff --git a/docs/test_cases/t30004.md b/docs/test_cases/t30004.md
index 20c609f3..19712438 100644
--- a/docs/test_cases/t30004.md
+++ b/docs/test_cases/t30004.md
@@ -62,50 +62,23 @@ namespace CCC {
 {
   "diagram_type": "package",
   "elements": [
-    {
-      "display_name": "clanguml",
-      "elements": [
-        {
-          "display_name": "clanguml::t30004",
-          "id": "678274068594347618",
-          "is_deprecated": false,
-          "name": "t30004",
-          "source_location": {
-            "column": 11,
-            "file": "t30004.cc",
-            "line": 2,
-            "translation_unit": "t30004.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30004.cc",
-        "line": 1,
-        "translation_unit": "t30004.cc"
-      },
-      "type": "namespace"
-    },
     {
       "comment": {
         "formatted": "@uml{style[#green]}",
         "raw": "/// @uml{style[#green]}"
       },
-      "display_name": "clanguml::t30004::A",
+      "display_name": "A",
       "elements": [
         {
           "comment": {
             "formatted": "@uml{note[ bottom ] Package AAA.}",
             "raw": "/// @uml{note[ bottom ] Package AAA.}"
           },
-          "display_name": "clanguml::t30004::A::AAA",
+          "display_name": "AAA",
           "id": "1517185300862579159",
           "is_deprecated": false,
           "name": "AAA",
+          "namespace": "clanguml::t30004::A",
           "source_location": {
             "column": 11,
             "file": "t30004.cc",
@@ -119,10 +92,11 @@ namespace CCC {
             "formatted": "\\uml{note[right] Package BBB.}",
             "raw": "/// \\uml{note[right] Package BBB.}"
           },
-          "display_name": "clanguml::t30004::A::BBB",
+          "display_name": "BBB",
           "id": "1982379087062354928",
           "is_deprecated": false,
           "name": "BBB",
+          "namespace": "clanguml::t30004::A",
           "source_location": {
             "column": 11,
             "file": "t30004.cc",
@@ -136,10 +110,11 @@ namespace CCC {
             "formatted": "\n @uml{note:t30004_package[bottom] CCCC package note.}\n This is package CCC.",
             "raw": "///\n/// @uml{note:t30004_package[bottom] CCCC package note.}\n/// This is package CCC."
           },
-          "display_name": "clanguml::t30004::A::CCC",
+          "display_name": "CCC",
           "id": "2304726195556701567",
           "is_deprecated": false,
           "name": "CCC",
+          "namespace": "clanguml::t30004::A",
           "source_location": {
             "column": 11,
             "file": "t30004.cc",
@@ -153,10 +128,11 @@ namespace CCC {
             "formatted": "@uml{style[#pink;line:red;line.bold;text:red]}\n\\uml{note[top] We skipped DDD.}",
             "raw": "/// @uml{style[#pink;line:red;line.bold;text:red]}\n/// \\uml{note[top] We skipped DDD.}"
           },
-          "display_name": "clanguml::t30004::A::EEE",
+          "display_name": "EEE",
           "id": "1084924732216290779",
           "is_deprecated": false,
           "name": "EEE",
+          "namespace": "clanguml::t30004::A",
           "source_location": {
             "column": 11,
             "file": "t30004.cc",
@@ -169,6 +145,7 @@ namespace CCC {
       "id": "33410665874039845",
       "is_deprecated": false,
       "name": "A",
+      "namespace": "clanguml::t30004",
       "source_location": {
         "column": 11,
         "file": "t30004.cc",
@@ -179,6 +156,7 @@ namespace CCC {
     }
   ],
   "name": "t30004_package",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t30004"
 }
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index 46b98bef..b4898de0 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -1,54 +1,54 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:565px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 565 231" width="565px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="253px" preserveAspectRatio="none" style="width:614px;height:253px;" version="1.1" viewBox="0 0 614 253" width="614px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1oistctiv1t7j" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0000033410665874039845">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-        <path d="M8.5,6.294 L19.5,6.294 A3.75,3.75 0 0 1 22,8.794 L29,29.0939 L555.5,29.0939 A2.5,2.5 0 0 1 558,31.5939 L558,221.994 A2.5,2.5 0 0 1 555.5,224.494 L8.5,224.494 A2.5,2.5 0 0 1 6,221.994 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="#008000" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="29" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="10" y="21.2999">A</text>
-      </a>
-    </g>
-    <g id="elem_GMN4">
-      <path d="M199.5,168.894 L199.5,194.494 A0,0 0 0 0 199.5,194.494 L306.5,194.494 A0,0 0 0 0 306.5,194.494 L306.5,178.894 L296.5,168.894 L243.97,168.894 L157.37,92.494 L235.97,168.894 L199.5,168.894 A0,0 0 0 0 199.5,168.894 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M296.5,168.894 L296.5,178.894 L306.5,178.894 L296.5,168.894 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="86" x="205.5" y="185.971">Package AAA.</text>
-    </g>
-    <g id="elem_GMN8">
-      <path d="M435.5,55.294 L435.5,64.094 L401.16,68.094 L435.5,72.094 L435.5,80.894 A0,0 0 0 0 435.5,80.894 L542.5,80.894 A0,0 0 0 0 542.5,80.894 L542.5,65.294 L532.5,55.294 L435.5,55.294 A0,0 0 0 0 435.5,55.294 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M532.5,55.294 L532.5,65.294 L542.5,65.294 L532.5,55.294 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="86" x="441.5" y="72.371">Package BBB.</text>
-    </g>
-    <g id="elem_GMN12">
-      <path d="M21.5,168.894 L21.5,194.494 A0,0 0 0 0 21.5,194.494 L164.5,194.494 A0,0 0 0 0 164.5,194.494 L164.5,178.894 L154.5,168.894 L91.94,168.894 L57.78,95.264 L83.94,168.894 L21.5,168.894 A0,0 0 0 0 21.5,168.894 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M154.5,168.894 L154.5,178.894 L164.5,178.894 L154.5,168.894 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="122" x="27.5" y="185.971">CCCC package note.</text>
-    </g>
-    <g id="elem_GMN16">
-      <path d="M192,55.294 L192,80.894 A0,0 0 0 0 192,80.894 L261.88,80.894 L341.19,156.754 L269.88,80.894 L316,80.894 A0,0 0 0 0 316,80.894 L316,65.294 L306,55.294 L192,55.294 A0,0 0 0 0 192,55.294 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M306,55.294 L306,65.294 L316,65.294 L306,55.294 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="103" x="198" y="72.371">We skipped DDD.</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <path d="M109.5,41.294 L140.5,41.294 A3.75,3.75 0 0 1 143,43.794 L150,64.0939 L154.5,64.0939 A2.5,2.5 0 0 1 157,66.5939 L157,92.3938 A2.5,2.5 0 0 1 154.5,94.8938 L109.5,94.8938 A2.5,2.5 0 0 1 107,92.3938 L107,43.794 A2.5,2.5 0 0 1 109.5,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="107" x2="150" y1="64.0939" y2="64.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="111" y="56.2999">AAA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#008000" filter="url(#f1oistctiv1t7j)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <path d="M353.5,41.294 L384.5,41.294 A3.75,3.75 0 0 1 387,43.794 L394,64.0939 L398.5,64.0939 A2.5,2.5 0 0 1 401,66.5939 L401,92.3938 A2.5,2.5 0 0 1 398.5,94.8938 L353.5,94.8938 A2.5,2.5 0 0 1 351,92.3938 L351,43.794 A2.5,2.5 0 0 1 353.5,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="351" x2="394" y1="64.0939" y2="64.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="355" y="56.2999">BBB</text>
+    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1oistctiv1t7j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M325,186 L325,196 L335,196 L325,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="231" y="203.0669">Package AAA.</text>
+    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1oistctiv1t7j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M566,73 L566,83 L576,83 L566,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="472" y="90.0669">Package BBB.</text>
+    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1oistctiv1t7j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M180,186 L180,196 L190,196 L180,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="44" y="203.0669">CCCC package note.</text>
+    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1oistctiv1t7j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M335.5,73 L335.5,83 L345.5,83 L335.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="220.5" y="90.0669">We skipped DDD.</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1oistctiv1t7j)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="126.5" x2="172.5" y1="81.2969" y2="81.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="130.5" y="73.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <path d="M24.5,41.294 L55.5,41.294 A3.75,3.75 0 0 1 58,43.794 L65,64.0939 L69.5,64.0939 A2.5,2.5 0 0 1 72,66.5939 L72,92.3938 A2.5,2.5 0 0 1 69.5,94.8938 L24.5,94.8938 A2.5,2.5 0 0 1 22,92.3938 L22,43.794 A2.5,2.5 0 0 1 24.5,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="22" x2="65" y1="64.0939" y2="64.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="26" y="56.2999">CCC</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1oistctiv1t7j)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="381" x2="424" y1="81.2969" y2="81.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="385" y="73.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
-      <path d="M344,154.894 L372,154.894 A3.75,3.75 0 0 1 374.5,157.394 L381.5,177.6939 L386,177.6939 A2.5,2.5 0 0 1 388.5,180.1939 L388.5,205.9938 A2.5,2.5 0 0 1 386,208.4938 L344,208.4938 A2.5,2.5 0 0 1 341.5,205.9938 L341.5,157.394 A2.5,2.5 0 0 1 344,154.894 " fill="#FFC0CB" style="stroke:#FF0000;stroke-width:2.0;"/>
-      <line style="stroke:#FF0000;stroke-width:2.0;" x1="341.5" x2="381.5" y1="177.6939" y2="177.6939"/>
-      <text fill="#FF0000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="27" x="345.5" y="169.8999">EEE</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1oistctiv1t7j)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">CCC</text>
     </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
+      <polygon fill="#FFC0CB" filter="url(#f1oistctiv1t7j)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="370.5" x2="410.5" y1="194.2969" y2="194.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="374.5" y="186.9951">EEE</text>
+    </a>
+    <path d="M179.62,109.77 C206.24,133.04 246.1,167.87 266.66,185.84 " fill="none" id="C_0001517185300862579159-GMN1361" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M431.16,85.5 C442.74,85.5 454.32,85.5 465.9,85.5 " fill="none" id="C_0001982379087062354928-GMN1365" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M76.36,112.24 C86.6,135.43 101.18,168.45 108.84,185.8 " fill="none" id="C_0002304726195556701567-GMN1369" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M292.2,98.38 C310.81,116.5 346.63,151.38 370.43,174.55 " fill="none" id="GMN1373-C_0001084924732216290779" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30004_package_mermaid.svg b/docs/test_cases/t30004_package_mermaid.svg
index 1a3774e1..b3da38b3 100644
--- a/docs/test_cases/t30004_package_mermaid.svg
+++ b/docs/test_cases/t30004_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 331.859375 368" style="max-width: 331.859px; background-color: white;" width="331.859375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
diff --git a/docs/test_cases/t30005.md b/docs/test_cases/t30005.md
index ce2481b6..3fccc9a0 100644
--- a/docs/test_cases/t30005.md
+++ b/docs/test_cases/t30005.md
@@ -55,44 +55,17 @@ struct C2 {
   "diagram_type": "package",
   "elements": [
     {
-      "display_name": "clanguml",
+      "display_name": "A",
       "elements": [
         {
-          "display_name": "clanguml::t30005",
-          "id": "1344350061092822214",
-          "is_deprecated": false,
-          "name": "t30005",
-          "source_location": {
-            "column": 11,
-            "file": "t30005.cc",
-            "line": 2,
-            "translation_unit": "t30005.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30005.cc",
-        "line": 1,
-        "translation_unit": "t30005.cc"
-      },
-      "type": "namespace"
-    },
-    {
-      "display_name": "clanguml::t30005::A",
-      "elements": [
-        {
-          "display_name": "clanguml::t30005::A::AA",
+          "display_name": "AA",
           "elements": [
             {
-              "display_name": "clanguml::t30005::A::AA::AAA",
+              "display_name": "AAA",
               "id": "914090901927655181",
               "is_deprecated": false,
               "name": "AAA",
+              "namespace": "clanguml::t30005::A::AA",
               "source_location": {
                 "column": 18,
                 "file": "t30005.cc",
@@ -105,6 +78,7 @@ struct C2 {
           "id": "1777547159021391040",
           "is_deprecated": false,
           "name": "AA",
+          "namespace": "clanguml::t30005::A",
           "source_location": {
             "column": 14,
             "file": "t30005.cc",
@@ -117,6 +91,7 @@ struct C2 {
       "id": "1768303675686131578",
       "is_deprecated": false,
       "name": "A",
+      "namespace": "clanguml::t30005",
       "source_location": {
         "column": 11,
         "file": "t30005.cc",
@@ -126,16 +101,17 @@ struct C2 {
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30005::B",
+      "display_name": "B",
       "elements": [
         {
-          "display_name": "clanguml::t30005::B::BB",
+          "display_name": "BB",
           "elements": [
             {
-              "display_name": "clanguml::t30005::B::BB::BBB",
+              "display_name": "BBB",
               "id": "1871026935460001668",
               "is_deprecated": false,
               "name": "BBB",
+              "namespace": "clanguml::t30005::B::BB",
               "source_location": {
                 "column": 18,
                 "file": "t30005.cc",
@@ -148,6 +124,7 @@ struct C2 {
           "id": "1696631362104244809",
           "is_deprecated": false,
           "name": "BB",
+          "namespace": "clanguml::t30005::B",
           "source_location": {
             "column": 14,
             "file": "t30005.cc",
@@ -160,6 +137,7 @@ struct C2 {
       "id": "378529216628023051",
       "is_deprecated": false,
       "name": "B",
+      "namespace": "clanguml::t30005",
       "source_location": {
         "column": 11,
         "file": "t30005.cc",
@@ -169,16 +147,17 @@ struct C2 {
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30005::C",
+      "display_name": "C",
       "elements": [
         {
-          "display_name": "clanguml::t30005::C::CC",
+          "display_name": "CC",
           "elements": [
             {
-              "display_name": "clanguml::t30005::C::CC::CCC",
+              "display_name": "CCC",
               "id": "1763279540133487999",
               "is_deprecated": false,
               "name": "CCC",
+              "namespace": "clanguml::t30005::C::CC",
               "source_location": {
                 "column": 18,
                 "file": "t30005.cc",
@@ -191,6 +170,7 @@ struct C2 {
           "id": "2134234141727442046",
           "is_deprecated": false,
           "name": "CC",
+          "namespace": "clanguml::t30005::C",
           "source_location": {
             "column": 14,
             "file": "t30005.cc",
@@ -203,6 +183,7 @@ struct C2 {
       "id": "1041076320925403190",
       "is_deprecated": false,
       "name": "C",
+      "namespace": "clanguml::t30005",
       "source_location": {
         "column": 11,
         "file": "t30005.cc",
@@ -213,6 +194,7 @@ struct C2 {
     }
   ],
   "name": "t30005_package",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "914090901927655181",
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index 41a8bca1..45299bae 100644
--- a/docs/test_cases/t30005_package.svg
+++ b/docs/test_cases/t30005_package.svg
@@ -1,72 +1,62 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:297px;height:380px;background:#FFFFFF;" version="1.1" viewBox="0 0 297 380" width="297px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="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="fpbe7d6ns1bze" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001768303675686131578">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-        <path d="M85.5,201.894 L96.5,201.894 A3.75,3.75 0 0 1 99,204.394 L106,224.6939 L210.5,224.6939 A2.5,2.5 0 0 1 213,227.1939 L213,370.994 A2.5,2.5 0 0 1 210.5,373.494 L85.5,373.494 A2.5,2.5 0 0 1 83,370.994 L83,204.394 A2.5,2.5 0 0 1 85.5,201.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="83" x2="106" y1="224.6939" y2="224.6939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="87" y="216.8999">A</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001777547159021391040">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-        <path d="M109.5,244.894 L130.5,244.894 A3.75,3.75 0 0 1 133,247.394 L140,267.6939 L186.5,267.6939 A2.5,2.5 0 0 1 189,270.1939 L189,346.994 A2.5,2.5 0 0 1 186.5,349.494 L109.5,349.494 A2.5,2.5 0 0 1 107,346.994 L107,247.394 A2.5,2.5 0 0 1 109.5,244.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="107" x2="140" y1="267.6939" y2="267.6939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="111" y="259.8999">AA</text>
-      </a>
-    </g>
-    <g id="cluster_C_0000378529216628023051">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-        <path d="M8.5,6.294 L19.5,6.294 A3.75,3.75 0 0 1 22,8.794 L29,29.0939 L133.5,29.0939 A2.5,2.5 0 0 1 136,31.5939 L136,175.394 A2.5,2.5 0 0 1 133.5,177.894 L8.5,177.894 A2.5,2.5 0 0 1 6,175.394 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="29" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="10" y="21.2999">B</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001696631362104244809">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
-        <path d="M32.5,49.294 L53.5,49.294 A3.75,3.75 0 0 1 56,51.794 L63,72.0939 L109.5,72.0939 A2.5,2.5 0 0 1 112,74.5939 L112,151.394 A2.5,2.5 0 0 1 109.5,153.894 L32.5,153.894 A2.5,2.5 0 0 1 30,151.394 L30,51.794 A2.5,2.5 0 0 1 32.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="63" y1="72.0939" y2="72.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="34" y="64.2999">BB</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001041076320925403190">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-        <path d="M162.5,6.294 L173.5,6.294 A3.75,3.75 0 0 1 176,8.794 L183,29.0939 L287.5,29.0939 A2.5,2.5 0 0 1 290,31.5939 L290,175.394 A2.5,2.5 0 0 1 287.5,177.894 L162.5,177.894 A2.5,2.5 0 0 1 160,175.394 L160,8.794 A2.5,2.5 0 0 1 162.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="160" x2="183" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="164" y="21.2999">C</text>
-      </a>
-    </g>
-    <g id="cluster_C_0002134234141727442046">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
-        <path d="M186.5,49.294 L207.5,49.294 A3.75,3.75 0 0 1 210,51.794 L217,72.0939 L263.5,72.0939 A2.5,2.5 0 0 1 266,74.5939 L266,151.394 A2.5,2.5 0 0 1 263.5,153.894 L186.5,153.894 A2.5,2.5 0 0 1 184,151.394 L184,51.794 A2.5,2.5 0 0 1 186.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="184" x2="217" y1="72.0939" y2="72.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="188" y="64.2999">CC</text>
-      </a>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <path d="M125.5,279.894 L156.5,279.894 A3.75,3.75 0 0 1 159,282.394 L166,302.6939 L170.5,302.6939 A2.5,2.5 0 0 1 173,305.1939 L173,330.9938 A2.5,2.5 0 0 1 170.5,333.4938 L125.5,333.4938 A2.5,2.5 0 0 1 123,330.9938 L123,282.394 A2.5,2.5 0 0 1 125.5,279.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="123" x2="166" y1="302.6939" y2="302.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="127" y="294.8999">AAA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="98" x2="122" y1="241.2969" y2="241.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="102" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <path d="M48.5,84.294 L79.5,84.294 A3.75,3.75 0 0 1 82,86.794 L89,107.0939 L93.5,107.0939 A2.5,2.5 0 0 1 96,109.5939 L96,135.3938 A2.5,2.5 0 0 1 93.5,137.8938 L48.5,137.8938 A2.5,2.5 0 0 1 46,135.3938 L46,86.794 A2.5,2.5 0 0 1 48.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="46" x2="89" y1="107.0939" y2="107.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="50" y="99.2999">BBB</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="122" x2="157" y1="284.2969" y2="284.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="126" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <path d="M202.5,84.294 L233.5,84.294 A3.75,3.75 0 0 1 236,86.794 L243,107.0939 L247.5,107.0939 A2.5,2.5 0 0 1 250,109.5939 L250,135.3938 A2.5,2.5 0 0 1 247.5,137.8938 L202.5,137.8938 A2.5,2.5 0 0 1 200,135.3938 L200,86.794 A2.5,2.5 0 0 1 202.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="200" x2="243" y1="107.0939" y2="107.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="30" x="204" y="99.2999">CCC</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="45" y1="46.2969" y2="46.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="26" y="38.9951">B</text>
     </a>
-    <g id="link_C_0001871026935460001668_C_0000914090901927655181">
-      <path codeLine="20" d="M81.38,138.204 C96.12,175.254 120.7221,237.119 135.4421,274.119 " fill="none" id="C_0001871026935460001668-to-C_0000914090901927655181" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="137.66,279.694,138.0497,269.8528,135.8117,275.0481,130.6164,272.8101,137.66,279.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001763279540133487999_C_0000914090901927655181">
-      <path codeLine="21" d="M214.62,138.204 C199.88,175.254 175.2779,237.119 160.5579,274.119 " fill="none" id="C_0001763279540133487999-to-C_0000914090901927655181" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="158.34,279.694,165.3836,272.8101,160.1883,275.0481,157.9503,269.8528,158.34,279.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="79" y1="89.2969" y2="89.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="50" y="81.9951">BB</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="176" x2="200" y1="46.2969" y2="46.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="180" y="38.9951">C</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="216.5" x2="262.5" y1="124.2969" y2="124.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="220.5" y="116.9951">CCC</text>
+    </a>
+    <path d="M97.36,155.13 C111.64,190.46 137.33,254.03 152.61,291.83 " fill="none" id="C_0001871026935460001668-&gt;C_0000914090901927655181" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="154.6,296.77,154.9193,286.9263,152.7185,292.1375,147.5073,289.9367,154.6,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M232.64,155.13 C218.36,190.46 192.67,254.03 177.39,291.83 " fill="none" id="C_0001763279540133487999-&gt;C_0000914090901927655181" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="175.4,296.77,182.4927,289.9367,177.2815,292.1375,175.0807,286.9263,175.4,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30005_package_mermaid.svg b/docs/test_cases/t30005_package_mermaid.svg
index 5cf8401d..f97615b4 100644
--- a/docs/test_cases/t30005_package_mermaid.svg
+++ b/docs/test_cases/t30005_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 352.6875 332" style="max-width: 352.688px; background-color: white;" width="352.6875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -83,8 +83,8 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001871026935460001668 LE-C_0000914090901927655181" id="L-C_0001871026935460001668-C_0000914090901927655181-0" d="M78.5078125,83L78.5078125,87.16666666666667C78.5078125,91.33333333333333,78.5078125,99.66666666666667,78.5078125,108C78.5078125,116.33333333333333,78.5078125,124.66666666666667,78.5078125,133C78.5078125,141.33333333333334,78.5078125,149.66666666666666,78.5078125,158C78.5078125,166.33333333333334,78.5078125,174.66666666666666,78.5078125,183C78.5078125,191.33333333333334,78.5078125,199.66666666666666,88.65097081349477,208.55389202978367C98.7941291269895,217.44111739290065,119.080445753979,226.88223478580133,129.22360406747376,231.60279348225166L139.3667623809685,236.323352178702"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001763279540133487999 LE-C_0000914090901927655181" id="L-C_0001763279540133487999-C_0000914090901927655181-0" d="M256.8515625,83L256.8515625,87.16666666666667C256.8515625,91.33333333333333,256.8515625,99.66666666666667,256.8515625,108C256.8515625,116.33333333333333,256.8515625,124.66666666666667,256.8515625,133C256.8515625,141.33333333333334,256.8515625,149.66666666666666,256.8515625,158C256.8515625,166.33333333333334,256.8515625,174.66666666666666,256.8515625,183C256.8515625,191.33333333333334,256.8515625,199.66666666666666,246.70840418650525,208.55389202978367C236.56524587301047,217.44111739290065,216.278929246021,226.88223478580133,206.13577093252624,231.60279348225166L195.9926126190315,236.323352178702"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001871026935460001668 LE-C_0000914090901927655181" id="L-C_0001871026935460001668-C_0000914090901927655181-0" d="M78.5078125,83L78.5078125,87.16666666666667C78.5078125,91.33333333333333,78.5078125,99.66666666666667,78.5078125,108C78.5078125,116.33333333333333,78.5078125,124.66666666666667,78.5078125,133C78.5078125,141.33333333333334,78.5078125,149.66666666666666,78.5078125,158C78.5078125,166.33333333333334,78.5078125,174.66666666666666,78.5078125,183C78.5078125,191.33333333333334,78.5078125,199.66666666666666,89.45182291666667,208.92660329420013C100.39583333333333,218.18653992173356,122.28385416666667,228.37307984346708,133.22786458333334,233.46634980433387L144.171875,238.55961976520064"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001763279540133487999 LE-C_0000914090901927655181" id="L-C_0001763279540133487999-C_0000914090901927655181-0" d="M256.8515625,83L256.8515625,87.16666666666667C256.8515625,91.33333333333333,256.8515625,99.66666666666667,256.8515625,108C256.8515625,116.33333333333333,256.8515625,124.66666666666667,256.8515625,133C256.8515625,141.33333333333334,256.8515625,149.66666666666666,256.8515625,158C256.8515625,166.33333333333334,256.8515625,174.66666666666666,256.8515625,183C256.8515625,191.33333333333334,256.8515625,199.66666666666666,245.90755208333334,208.92660329420013C234.96354166666666,218.18653992173356,213.07552083333334,228.37307984346708,202.13151041666666,233.46634980433387L191.1875,238.55961976520064"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30006.md b/docs/test_cases/t30006.md
index 52d45f23..22b46edc 100644
--- a/docs/test_cases/t30006.md
+++ b/docs/test_cases/t30006.md
@@ -55,38 +55,11 @@ struct A2 {
   "diagram_type": "package",
   "elements": [
     {
-      "display_name": "clanguml",
-      "elements": [
-        {
-          "display_name": "clanguml::t30006",
-          "id": "1391231216610531704",
-          "is_deprecated": false,
-          "name": "t30006",
-          "source_location": {
-            "column": 11,
-            "file": "t30006.cc",
-            "line": 2,
-            "translation_unit": "t30006.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30006.cc",
-        "line": 1,
-        "translation_unit": "t30006.cc"
-      },
-      "type": "namespace"
-    },
-    {
-      "display_name": "clanguml::t30006::B",
+      "display_name": "B",
       "id": "1659090172211944144",
       "is_deprecated": false,
       "name": "B",
+      "namespace": "clanguml::t30006",
       "source_location": {
         "column": 11,
         "file": "t30006.cc",
@@ -100,10 +73,11 @@ struct A2 {
         "formatted": "\\uml{note[top] Top A note.}",
         "raw": "/// \\uml{note[top] Top A note.}"
       },
-      "display_name": "clanguml::t30006::A",
+      "display_name": "A",
       "id": "1499919423527579699",
       "is_deprecated": false,
       "name": "A",
+      "namespace": "clanguml::t30006",
       "source_location": {
         "column": 11,
         "file": "t30006.cc",
@@ -113,10 +87,11 @@ struct A2 {
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30006::C",
+      "display_name": "C",
       "id": "1380567463986115369",
       "is_deprecated": false,
       "name": "C",
+      "namespace": "clanguml::t30006",
       "source_location": {
         "column": 11,
         "file": "t30006.cc",
@@ -127,6 +102,7 @@ struct A2 {
     }
   ],
   "name": "t30006_package",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "1659090172211944144",
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index b66473a9..c7957dbd 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -1,35 +1,36 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="265px" preserveAspectRatio="none" style="width:108px;height:265px;background:#FFFFFF;" version="1.1" viewBox="0 0 108 265" width="108px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:124px;height:270px;" version="1.1" viewBox="0 0 124 270" width="124px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="few2cqx8xbx6" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <path d="M8.5,205.2 L19.5,205.2 A3.75,3.75 0 0 1 22,207.7 L29,227.9999 L33.5,227.9999 A2.5,2.5 0 0 1 36,230.4999 L36,256.2999 A2.5,2.5 0 0 1 33.5,258.7999 L8.5,258.7999 A2.5,2.5 0 0 1 6,256.2999 L6,207.7 A2.5,2.5 0 0 1 8.5,205.2 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="6" x2="29" y1="227.9999" y2="227.9999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="10" y="220.2059">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#few2cqx8xbx6)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <path d="M40.5,91.6 L51.5,91.6 A3.75,3.75 0 0 1 54,94.1 L61,114.3999 L65.5,114.3999 A2.5,2.5 0 0 1 68,116.8999 L68,142.6999 A2.5,2.5 0 0 1 65.5,145.1999 L40.5,145.1999 A2.5,2.5 0 0 1 38,142.6999 L38,94.1 A2.5,2.5 0 0 1 40.5,91.6 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="38" x2="61" y1="114.3999" y2="114.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="42" y="106.6059">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#few2cqx8xbx6)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="115.2969" y2="115.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="107.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <path d="M73.5,205.2 L84.5,205.2 A3.75,3.75 0 0 1 87,207.7 L94,227.9999 L98.5,227.9999 A2.5,2.5 0 0 1 101,230.4999 L101,256.2999 A2.5,2.5 0 0 1 98.5,258.7999 L73.5,258.7999 A2.5,2.5 0 0 1 71,256.2999 L71,207.7 A2.5,2.5 0 0 1 73.5,205.2 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="71" x2="94" y1="227.9999" y2="227.9999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="75" y="220.2059">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#few2cqx8xbx6)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text>
     </a>
-    <g id="elem_GMN4">
-      <path d="M8.5,6 L8.5,31.6 A0,0 0 0 0 8.5,31.6 L49,31.6 L53,91.39 L57,31.6 L97.5,31.6 A0,0 0 0 0 97.5,31.6 L97.5,16 L87.5,6 L8.5,6 A0,0 0 0 0 8.5,6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M87.5,6 L87.5,16 L97.5,16 L87.5,6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="68" x="14.5" y="23.077">Top A note.</text>
-    </g>
-    <g id="link_C_0001499919423527579699_C_0001659090172211944144">
-      <path codeLine="11" d="M45.5,145.57 C40.36,163.48 35.2317,181.3518 30.1117,199.2318 " fill="none" id="C_0001499919423527579699-to-C_0001659090172211944144" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="28.46,205,34.783,197.4489,29.8364,200.1932,27.0922,195.2466,28.46,205" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001499919423527579699_C_0001380567463986115369">
-      <path codeLine="12" d="M60.74,145.57 C66.03,163.48 71.3307,181.3657 76.6107,199.2457 " fill="none" id="C_0001499919423527579699-to-C_0001380567463986115369" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="78.31,205,79.5973,195.2356,76.8939,200.2047,71.9249,197.5013,78.31,205" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#few2cqx8xbx6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M91,8 L91,18 L101,18 L91,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="13" y="25.0669">Top A note.</text>
+    <path d="M54,33.01 C54,47.66 54,73.41 54,92.83 " fill="none" id="GMN1396-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M46.35,146.24 C41.51,162.5 35.25,183.58 30.15,200.71 " fill="none" id="C_0001499919423527579699-&gt;C_0001659090172211944144" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="28.61,205.89,35.0172,198.4102,30.0402,201.0989,27.3514,196.1219,28.61,205.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M61.65,146.24 C66.49,162.5 72.75,183.58 77.85,200.71 " fill="none" id="C_0001499919423527579699-&gt;C_0001380567463986115369" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="79.39,205.89,80.6486,196.1219,77.9598,201.0989,72.9828,198.4102,79.39,205.89" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30006_package_mermaid.svg b/docs/test_cases/t30006_package_mermaid.svg
index 525d94bd..6bc8f006 100644
--- a/docs/test_cases/t30006_package_mermaid.svg
+++ b/docs/test_cases/t30006_package_mermaid.svg
@@ -1,30 +1,30 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 118.234375 215" style="max-width: 118.234px; background-color: white;" width="118.234375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
         <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0001499919423527579699" id="L-N_0-C_0001499919423527579699-0" d="M50.89453125,33L50.89453125,37.166666666666664C50.89453125,41.333333333333336,50.89453125,49.666666666666664,50.89453125,58C50.89453125,66.33333333333333,50.89453125,74.66666666666667,50.89453125,78.83333333333333L50.89453125,83"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001659090172211944144" id="L-C_0001499919423527579699-C_0001659090172211944144-0" d="M38.05859375,113.49661295288925L33.854817708333336,118.08051079407437C29.651041666666668,122.6644086352595,21.243489583333332,131.83220431762973,17.039713541666668,139.69943549214818C12.8359375,147.56666666666666,12.8359375,154.13333333333333,12.8359375,157.41666666666666L12.8359375,160.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001380567463986115369" id="L-C_0001499919423527579699-C_0001380567463986115369-0" d="M63.73046875,113.49661295288925L67.93424479166667,118.08051079407437C72.13802083333333,122.6644086352595,80.54557291666667,131.83220431762973,84.74934895833333,139.69943549214818C88.953125,147.56666666666666,88.953125,154.13333333333333,88.953125,157.41666666666666L88.953125,160.7"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001659090172211944144" id="L-C_0001499919423527579699-C_0001659090172211944144-0" d="M38.05859375,113.49661295288925L33.854817708333336,118.08051079407437C29.651041666666668,122.6644086352595,21.243489583333332,131.83220431762973,17.039713541666668,140.58276882548154C12.8359375,149.33333333333334,12.8359375,157.66666666666666,12.8359375,161.83333333333334L12.8359375,166"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001499919423527579699 LE-C_0001380567463986115369" id="L-C_0001499919423527579699-C_0001380567463986115369-0" d="M63.73046875,113.49661295288925L67.93424479166667,118.08051079407437C72.13802083333333,122.6644086352595,80.54557291666667,131.83220431762973,84.74934895833333,140.58276882548154C88.953125,149.33333333333334,88.953125,157.66666666666666,88.953125,161.83333333333334L88.953125,166"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30007.md b/docs/test_cases/t30007.md
index b252925c..4255fa0e 100644
--- a/docs/test_cases/t30007.md
+++ b/docs/test_cases/t30007.md
@@ -63,38 +63,11 @@ struct A2 {
   "diagram_type": "package",
   "elements": [
     {
-      "display_name": "clanguml",
-      "elements": [
-        {
-          "display_name": "clanguml::t30007",
-          "id": "279529588091010017",
-          "is_deprecated": false,
-          "name": "t30007",
-          "source_location": {
-            "column": 11,
-            "file": "t30007.cc",
-            "line": 2,
-            "translation_unit": "t30007.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30007.cc",
-        "line": 1,
-        "translation_unit": "t30007.cc"
-      },
-      "type": "namespace"
-    },
-    {
-      "display_name": "clanguml::t30007::B",
+      "display_name": "B",
       "id": "1852704221005355550",
       "is_deprecated": false,
       "name": "B",
+      "namespace": "clanguml::t30007",
       "source_location": {
         "column": 11,
         "file": "t30007.cc",
@@ -108,13 +81,14 @@ struct A2 {
         "formatted": "\\uml{note[top] Compare layout with t30006.}",
         "raw": "/// \\uml{note[top] Compare layout with t30006.}"
       },
-      "display_name": "clanguml::t30007::A",
+      "display_name": "A",
       "elements": [
         {
-          "display_name": "clanguml::t30007::A::AA",
+          "display_name": "AA",
           "id": "357722505818238170",
           "is_deprecated": false,
           "name": "AA",
+          "namespace": "clanguml::t30007::A",
           "source_location": {
             "column": 11,
             "file": "t30007.cc",
@@ -127,6 +101,7 @@ struct A2 {
       "id": "870874615388866345",
       "is_deprecated": false,
       "name": "A",
+      "namespace": "clanguml::t30007",
       "source_location": {
         "column": 11,
         "file": "t30007.cc",
@@ -136,10 +111,11 @@ struct A2 {
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30007::C",
+      "display_name": "C",
       "id": "937791537887318363",
       "is_deprecated": false,
       "name": "C",
+      "namespace": "clanguml::t30007",
       "source_location": {
         "column": 11,
         "file": "t30007.cc",
@@ -150,6 +126,7 @@ struct A2 {
     }
   ],
   "name": "t30007_package",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "1852704221005355550",
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 9d0544ab..72cbcfcb 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -1,45 +1,41 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="272px" preserveAspectRatio="none" style="width:205px;height:272px;background:#FFFFFF;" version="1.1" viewBox="0 0 205 272" width="205px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:234px;height:277px;" version="1.1" viewBox="0 0 234 277" width="234px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fs7zudhnzg3cc" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0000870874615388866345">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-        <path d="M93.5,55.6 L104.5,55.6 A3.75,3.75 0 0 1 107,58.1 L114,78.3999 L195.5,78.3999 A2.5,2.5 0 0 1 198,80.8999 L198,173.7 A2.5,2.5 0 0 1 195.5,176.2 L93.5,176.2 A2.5,2.5 0 0 1 91,173.7 L91,58.1 A2.5,2.5 0 0 1 93.5,55.6 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="91" x2="114" y1="78.3999" y2="78.3999"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="95" y="70.6059">A</text>
-      </a>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <path d="M76.5,212.2 L87.5,212.2 A3.75,3.75 0 0 1 90,214.7 L97,234.9999 L101.5,234.9999 A2.5,2.5 0 0 1 104,237.4999 L104,263.2999 A2.5,2.5 0 0 1 101.5,265.7999 L76.5,265.7999 A2.5,2.5 0 0 1 74,263.2999 L74,214.7 A2.5,2.5 0 0 1 76.5,212.2 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="74" x2="97" y1="234.9999" y2="234.9999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="78" y="227.2059">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs7zudhnzg3cc)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="100.5" x2="124.5" y1="79.2969" y2="79.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="104.5" y="71.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <path d="M136.5,98.6 L157.5,98.6 A3.75,3.75 0 0 1 160,101.1 L167,121.3999 L171.5,121.3999 A2.5,2.5 0 0 1 174,123.8999 L174,149.6999 A2.5,2.5 0 0 1 171.5,152.1999 L136.5,152.1999 A2.5,2.5 0 0 1 134,149.6999 L134,101.1 A2.5,2.5 0 0 1 136.5,98.6 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="134" x2="167" y1="121.3999" y2="121.3999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="20" x="138" y="113.6059">AA</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs7zudhnzg3cc)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="182.5" x2="205.5" y1="235.2969" y2="235.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="186.5" y="227.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <path d="M141.5,212.2 L152.5,212.2 A3.75,3.75 0 0 1 155,214.7 L162,234.9999 L166.5,234.9999 A2.5,2.5 0 0 1 169,237.4999 L169,263.2999 A2.5,2.5 0 0 1 166.5,265.7999 L141.5,265.7999 A2.5,2.5 0 0 1 139,263.2999 L139,214.7 A2.5,2.5 0 0 1 141.5,212.2 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="139" x2="162" y1="234.9999" y2="234.9999"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="143" y="227.2059">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs7zudhnzg3cc)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="143.5" x2="178.5" y1="122.2969" y2="122.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="147.5" y="114.9951">AA</text>
     </a>
-    <g id="elem_GMN5">
-      <path d="M6,6 L6,31.6 L192,31.6 L192,16 L182,6 L6,6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M182,6 L182,16 L192,16 L182,6 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="165" x="12" y="23.077">Compare layout with t30006.</text>
-    </g>
-    <g id="link_GMN5_C_0000870874615388866345">
-      <path d="M99,31.8 C99,35.18 99,39.1302 99,43.459 C99,45.6234 99,47.8825 99,50.2123 C99,51.3772 99,52.5598 99,53.7571 C99,54.3557 99,54.958 99,55.5636 " fill="none" id="GMN5-C_0000870874615388866345" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-    </g>
-    <g id="link_C_0000357722505818238170_C_0001852704221005355550">
-      <path codeLine="13" d="M147.03,152.42 C143.05,164.95 137.38,179.89 130,192.2 C122.98,203.92 116.9677,211.1224 108.4677,219.6424 " fill="none" id="C_0000357722505818238170-to-C_0001852704221005355550" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="104.23,223.89,113.4182,220.3437,107.7614,220.3503,107.7547,214.6935,104.23,223.89" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000357722505818238170_C_0000937791537887318363">
-      <path codeLine="14" d="M143.01,152.57 C140.66,170.48 139.8716,188.172 142.2416,206.052 " fill="none" id="C_0000357722505818238170-to-C_0000937791537887318363" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="143.03,212,145.8127,202.5524,142.373,207.0434,137.8821,203.6036,143.03,212" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fs7zudhnzg3cc)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="116" x2="140" y1="235.2969" y2="235.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="120" y="227.9951">C</text>
+    </a>
+    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#fs7zudhnzg3cc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M201,8 L201,18 L211,18 L201,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="12" y="25.0669">Compare layout with t30006.</text>
+    <path d="M108.5,33.03 C108.5,36.3613 108.5,40.2728 108.5,44.5714 C108.5,46.7207 108.5,48.9668 108.5,51.2855 C108.5,52.4448 108.5,53.6223 108.5,54.8149 C108.5,55.4112 108.5,56.0113 108.5,56.6148 " fill="none" id="GMN1408-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M172.15,153.24 C176.99,169.5 183.25,190.58 188.35,207.71 " fill="none" id="C_0000357722505818238170-&gt;C_0001852704221005355550" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="189.89,212.89,191.1486,203.1219,188.4598,208.0989,183.4828,205.4102,189.89,212.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M145.89,153.24 C138.89,169.5 132.42,190.58 129.1,207.71 " fill="none" id="C_0000357722505818238170-&gt;C_0000937791537887318363" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="128.17,212.89,133.6759,204.7239,129.0406,207.9664,125.7981,203.331,128.17,212.89" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30007_package_mermaid.svg b/docs/test_cases/t30007_package_mermaid.svg
index 2422f95b..bb0c362d 100644
--- a/docs/test_cases/t30007_package_mermaid.svg
+++ b/docs/test_cases/t30007_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 234.671875 265" style="max-width: 234.672px; background-color: white;" width="234.671875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -33,8 +33,8 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0001852704221005355550" id="L-C_0000357722505818238170-C_0001852704221005355550-0" d="M94.20420745481928,141L90.38306350401608,145.16666666666666C86.56191955321286,149.33333333333334,78.91963165160642,157.66666666666666,75.09848770080322,166C71.27734375,174.33333333333334,71.27734375,182.66666666666666,71.27734375,190.11666666666667C71.27734375,197.5666666666667,71.27734375,204.13333333333333,71.27734375,207.41666666666666L71.27734375,210.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0000937791537887318363" id="L-C_0000357722505818238170-C_0000937791537887318363-0" d="M124.46766754518072,141L128.28881149598394,145.16666666666666C132.10995544678715,149.33333333333334,139.75224334839356,157.66666666666666,143.57338729919678,166C147.39453125,174.33333333333334,147.39453125,182.66666666666666,147.39453125,190.11666666666667C147.39453125,197.5666666666667,147.39453125,204.13333333333333,147.39453125,207.41666666666666L147.39453125,210.7"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0001852704221005355550" id="L-C_0000357722505818238170-C_0001852704221005355550-0" d="M94.20420745481928,141L90.38306350401608,145.16666666666666C86.56191955321286,149.33333333333334,78.91963165160642,157.66666666666666,75.09848770080322,166C71.27734375,174.33333333333334,71.27734375,182.66666666666666,71.27734375,191C71.27734375,199.33333333333334,71.27734375,207.66666666666666,71.27734375,211.83333333333334L71.27734375,216"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000357722505818238170 LE-C_0000937791537887318363" id="L-C_0000357722505818238170-C_0000937791537887318363-0" d="M124.46766754518072,141L128.28881149598394,145.16666666666666C132.10995544678715,149.33333333333334,139.75224334839356,157.66666666666666,143.57338729919678,166C147.39453125,174.33333333333334,147.39453125,182.66666666666666,147.39453125,191C147.39453125,199.33333333333334,147.39453125,207.66666666666666,147.39453125,211.83333333333334L147.39453125,216"/>
         <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_0 LE-C_0000870874615388866345" id="L-N_0-C_0000870874615388866345-0" d="M109.3359375,33L109.3359375,37.166666666666664C109.3359375,41.333333333333336,109.3359375,49.666666666666664,109.3359375,58C109.3359375,66.33333333333333,109.3359375,74.66666666666667,109.3359375,78.83333333333333L109.3359375,83"/>
       </g>
       <g class="edgeLabels">
diff --git a/docs/test_cases/t30008.md b/docs/test_cases/t30008.md
index ddde9f23..dabb9b6b 100644
--- a/docs/test_cases/t30008.md
+++ b/docs/test_cases/t30008.md
@@ -73,41 +73,14 @@ struct FF {
   "diagram_type": "package",
   "elements": [
     {
-      "display_name": "clanguml",
+      "display_name": "dependants",
       "elements": [
         {
-          "display_name": "clanguml::t30008",
-          "id": "588296309731944574",
-          "is_deprecated": false,
-          "name": "t30008",
-          "source_location": {
-            "column": 11,
-            "file": "t30008.cc",
-            "line": 2,
-            "translation_unit": "t30008.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30008.cc",
-        "line": 1,
-        "translation_unit": "t30008.cc"
-      },
-      "type": "namespace"
-    },
-    {
-      "display_name": "clanguml::t30008::dependants",
-      "elements": [
-        {
-          "display_name": "clanguml::t30008::dependants::A",
+          "display_name": "A",
           "id": "2096441629244782012",
           "is_deprecated": false,
           "name": "A",
+          "namespace": "clanguml::t30008::dependants",
           "source_location": {
             "column": 11,
             "file": "t30008.cc",
@@ -117,10 +90,11 @@ struct FF {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30008::dependants::B",
+          "display_name": "B",
           "id": "500208250168931957",
           "is_deprecated": false,
           "name": "B",
+          "namespace": "clanguml::t30008::dependants",
           "source_location": {
             "column": 11,
             "file": "t30008.cc",
@@ -130,10 +104,11 @@ struct FF {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30008::dependants::C",
+          "display_name": "C",
           "id": "1095841247154575825",
           "is_deprecated": false,
           "name": "C",
+          "namespace": "clanguml::t30008::dependants",
           "source_location": {
             "column": 11,
             "file": "t30008.cc",
@@ -146,6 +121,7 @@ struct FF {
       "id": "1601960042765615222",
       "is_deprecated": false,
       "name": "dependants",
+      "namespace": "clanguml::t30008",
       "source_location": {
         "column": 11,
         "file": "t30008.cc",
@@ -155,13 +131,14 @@ struct FF {
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30008::dependencies",
+      "display_name": "dependencies",
       "elements": [
         {
-          "display_name": "clanguml::t30008::dependencies::D",
+          "display_name": "D",
           "id": "912387297717034254",
           "is_deprecated": false,
           "name": "D",
+          "namespace": "clanguml::t30008::dependencies",
           "source_location": {
             "column": 11,
             "file": "t30008.cc",
@@ -171,10 +148,11 @@ struct FF {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30008::dependencies::E",
+          "display_name": "E",
           "id": "1114997990364518938",
           "is_deprecated": false,
           "name": "E",
+          "namespace": "clanguml::t30008::dependencies",
           "source_location": {
             "column": 11,
             "file": "t30008.cc",
@@ -184,10 +162,11 @@ struct FF {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30008::dependencies::F",
+          "display_name": "F",
           "id": "1062827161678172094",
           "is_deprecated": false,
           "name": "F",
+          "namespace": "clanguml::t30008::dependencies",
           "source_location": {
             "column": 11,
             "file": "t30008.cc",
@@ -200,6 +179,7 @@ struct FF {
       "id": "2103969167872217960",
       "is_deprecated": false,
       "name": "dependencies",
+      "namespace": "clanguml::t30008",
       "source_location": {
         "column": 11,
         "file": "t30008.cc",
@@ -210,6 +190,7 @@ struct FF {
     }
   ],
   "name": "t30008_package",
+  "package_type": "namespace",
   "relationships": [
     {
       "destination": "2096441629244782012",
diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg
index 96487672..8649cdb3 100644
--- a/docs/test_cases/t30008_package.svg
+++ b/docs/test_cases/t30008_package.svg
@@ -1,67 +1,61 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="345px" preserveAspectRatio="none" style="width:248px;height:345px;background:#FFFFFF;" version="1.1" viewBox="0 0 248 345" width="248px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="366px" preserveAspectRatio="none" style="width:306px;height:366px;" version="1.1" viewBox="0 0 306 366" width="306px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f3usm3uo9lzx2" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001601960042765615222">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
-        <path d="M8.5,6.294 L91.5,6.294 A3.75,3.75 0 0 1 94,8.794 L101,29.0939 L101.5,29.0939 A2.5,2.5 0 0 1 104,31.5939 L104,335.594 A2.5,2.5 0 0 1 101.5,338.094 L8.5,338.094 A2.5,2.5 0 0 1 6,335.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="101" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="10" y="21.2999">dependants</text>
-      </a>
-    </g>
-    <g id="cluster_C_0002103969167872217960">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
-        <path d="M130.5,6.294 L228.5,6.294 A3.75,3.75 0 0 1 231,8.794 L238,29.0939 L238.5,29.0939 A2.5,2.5 0 0 1 241,31.5939 L241,335.594 A2.5,2.5 0 0 1 238.5,338.094 L130.5,338.094 A2.5,2.5 0 0 1 128,335.594 L128,8.794 A2.5,2.5 0 0 1 130.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="128" x2="238" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="97" x="132" y="21.2999">dependencies</text>
-      </a>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <path d="M42.5,268.494 L53.5,268.494 A3.75,3.75 0 0 1 56,270.994 L63,291.2939 L67.5,291.2939 A2.5,2.5 0 0 1 70,293.7939 L70,319.5938 A2.5,2.5 0 0 1 67.5,322.0938 L42.5,322.0938 A2.5,2.5 0 0 1 40,319.5938 L40,270.994 A2.5,2.5 0 0 1 42.5,268.494 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="63" y1="291.2939" y2="291.2939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="44" y="283.4999">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <path d="M42.5,154.894 L53.5,154.894 A3.75,3.75 0 0 1 56,157.394 L63,177.6939 L67.5,177.6939 A2.5,2.5 0 0 1 70,180.1939 L70,205.9938 A2.5,2.5 0 0 1 67.5,208.4938 L42.5,208.4938 A2.5,2.5 0 0 1 40,205.9938 L40,157.394 A2.5,2.5 0 0 1 42.5,154.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="63" y1="177.6939" y2="177.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="44" y="169.8999">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="156" x2="281" y1="46.2969" y2="46.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="160" y="38.9951">dependencies</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <path d="M42.5,41.294 L53.5,41.294 A3.75,3.75 0 0 1 56,43.794 L63,64.0939 L67.5,64.0939 A2.5,2.5 0 0 1 70,66.5939 L70,92.3938 A2.5,2.5 0 0 1 67.5,94.8938 L42.5,94.8938 A2.5,2.5 0 0 1 40,92.3938 L40,43.794 A2.5,2.5 0 0 1 42.5,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="40" x2="63" y1="64.0939" y2="64.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="44" y="56.2999">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="307.2969" y2="307.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="299.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <path d="M171.5,268.494 L182.5,268.494 A3.75,3.75 0 0 1 185,270.994 L192,291.2939 L196.5,291.2939 A2.5,2.5 0 0 1 199,293.7939 L199,319.5938 A2.5,2.5 0 0 1 196.5,322.0938 L171.5,322.0938 A2.5,2.5 0 0 1 169,319.5938 L169,270.994 A2.5,2.5 0 0 1 171.5,268.494 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="169" x2="192" y1="291.2939" y2="291.2939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="173" y="283.4999">D</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="85" y1="194.2969" y2="194.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="66" y="186.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <path d="M172,154.894 L182,154.894 A3.75,3.75 0 0 1 184.5,157.394 L191.5,177.6939 L196,177.6939 A2.5,2.5 0 0 1 198.5,180.1939 L198.5,205.9938 A2.5,2.5 0 0 1 196,208.4938 L172,208.4938 A2.5,2.5 0 0 1 169.5,205.9938 L169.5,157.394 A2.5,2.5 0 0 1 172,154.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="169.5" x2="191.5" y1="177.6939" y2="177.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="9" x="173.5" y="169.8999">E</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="81.2969" y2="81.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="73.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <path d="M172,41.294 L182,41.294 A3.75,3.75 0 0 1 184.5,43.794 L191.5,64.0939 L196,64.0939 A2.5,2.5 0 0 1 198.5,66.5939 L198.5,92.3938 A2.5,2.5 0 0 1 196,94.8938 L172,94.8938 A2.5,2.5 0 0 1 169.5,92.3938 L169.5,43.794 A2.5,2.5 0 0 1 172,41.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="169.5" x2="191.5" y1="64.0939" y2="64.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="9" x="173.5" y="56.2999">F</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="204.5" x2="228.5" y1="307.2969" y2="307.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="208.5" y="299.9951">D</text>
     </a>
-    <g id="link_C_0000500208250168931957_C_0002096441629244782012">
-      <path codeLine="18" d="M55,208.864 C55,226.774 55,244.414 55,262.294 " fill="none" id="C_0000500208250168931957-to-C_0002096441629244782012" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="55,268.294,59,259.294,55,263.294,51,259.294,55,268.294" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001095841247154575825_C_0000500208250168931957">
-      <path codeLine="19" d="M55,95.264 C55,113.174 55,130.814 55,148.694 " fill="none" id="C_0001095841247154575825-to-C_0000500208250168931957" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="55,154.694,59,145.694,55,149.694,51,145.694,55,154.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001114997990364518938_C_0000912387297717034254">
-      <path codeLine="20" d="M184,208.864 C184,226.774 184,244.414 184,262.294 " fill="none" id="C_0001114997990364518938-to-C_0000912387297717034254" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="184,268.294,188,259.294,184,263.294,180,259.294,184,268.294" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001062827161678172094_C_0001114997990364518938">
-      <path codeLine="21" d="M184,95.264 C184,113.174 184,130.814 184,148.694 " fill="none" id="C_0001062827161678172094-to-C_0001114997990364518938" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="184,154.694,188,145.694,184,149.694,180,145.694,184,154.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="194.2969" y2="194.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="186.9951">E</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="81.2969" y2="81.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="73.9951">F</text>
+    </a>
+    <path d="M77,225.24 C77,241.5 77,262.58 77,279.71 " fill="none" id="C_0000500208250168931957-&gt;C_0002096441629244782012" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="77,284.89,81.0257,275.9015,77.0143,279.89,73.0257,275.8786,77,284.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M77,112.24 C77,128.5 77,149.58 77,166.71 " fill="none" id="C_0001095841247154575825-&gt;C_0000500208250168931957" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="77,171.89,81.0257,162.9015,77.0143,166.89,73.0257,162.8786,77,171.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M220,225.24 C220,241.5 220,262.58 220,279.71 " fill="none" id="C_0001114997990364518938-&gt;C_0000912387297717034254" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="220,284.89,224.0257,275.9015,220.0143,279.89,216.0257,275.8786,220,284.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M220,112.24 C220,128.5 220,149.58 220,166.71 " fill="none" id="C_0001062827161678172094-&gt;C_0001114997990364518938" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="220,171.89,224.0257,162.9015,220.0143,166.89,216.0257,162.8786,220,171.89" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30008_package_mermaid.svg b/docs/test_cases/t30008_package_mermaid.svg
index 7acd7df5..6d9fc16a 100644
--- a/docs/test_cases/t30008_package_mermaid.svg
+++ b/docs/test_cases/t30008_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 520.921875 119" style="max-width: 520.922px; background-color: white;" width="520.921875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -38,8 +38,8 @@
             </g>
           </g>
           <g class="edgePaths">
-            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001114997990364518938 LE-C_0000912387297717034254" id="L-C_0001114997990364518938-C_0000912387297717034254-0" d="M133.453125,59.5L137.61979166666666,59.5C141.78645833333334,59.5,150.11979166666666,59.5,157.56979166666667,59.5C165.01979166666666,59.5,171.58645833333333,59.5,174.86979166666666,59.5L178.153125,59.5"/>
-            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001062827161678172094 LE-C_0001114997990364518938" id="L-C_0001062827161678172094-C_0001114997990364518938-0" d="M57.78125,59.5L61.947916666666664,59.5C66.11458333333333,59.5,74.44791666666667,59.5,81.89791666666666,59.5C89.34791666666666,59.5,95.91458333333333,59.5,99.19791666666667,59.5L102.48125,59.5"/>
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001114997990364518938 LE-C_0000912387297717034254" id="L-C_0001114997990364518938-C_0000912387297717034254-0" d="M133.453125,59.5L137.61979166666666,59.5C141.78645833333334,59.5,150.11979166666666,59.5,158.453125,59.5C166.78645833333334,59.5,175.11979166666666,59.5,179.28645833333334,59.5L183.453125,59.5"/>
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001062827161678172094 LE-C_0001114997990364518938" id="L-C_0001062827161678172094-C_0001114997990364518938-0" d="M57.78125,59.5L61.947916666666664,59.5C66.11458333333333,59.5,74.44791666666667,59.5,82.78125,59.5C91.11458333333333,59.5,99.44791666666667,59.5,103.61458333333333,59.5L107.78125,59.5"/>
           </g>
           <g class="edgeLabels">
             <g class="edgeLabel">
@@ -111,8 +111,8 @@
             </g>
           </g>
           <g class="edgePaths">
-            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000500208250168931957 LE-C_0002096441629244782012" id="L-C_0000500208250168931957-C_0002096441629244782012-0" d="M135.234375,59.5L139.40104166666666,59.5C143.56770833333334,59.5,151.90104166666666,59.5,159.35104166666667,59.5C166.80104166666666,59.5,173.36770833333333,59.5,176.65104166666666,59.5L179.934375,59.5"/>
-            <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001095841247154575825 LE-C_0000500208250168931957" id="L-C_0001095841247154575825-C_0000500208250168931957-0" d="M59.5625,59.5L63.729166666666664,59.5C67.89583333333333,59.5,76.22916666666667,59.5,83.67916666666666,59.5C91.12916666666666,59.5,97.69583333333333,59.5,100.97916666666667,59.5L104.2625,59.5"/>
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000500208250168931957 LE-C_0002096441629244782012" id="L-C_0000500208250168931957-C_0002096441629244782012-0" d="M135.234375,59.5L139.40104166666666,59.5C143.56770833333334,59.5,151.90104166666666,59.5,160.234375,59.5C168.56770833333334,59.5,176.90104166666666,59.5,181.06770833333334,59.5L185.234375,59.5"/>
+            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001095841247154575825 LE-C_0000500208250168931957" id="L-C_0001095841247154575825-C_0000500208250168931957-0" d="M59.5625,59.5L63.729166666666664,59.5C67.89583333333333,59.5,76.22916666666667,59.5,84.5625,59.5C92.89583333333333,59.5,101.22916666666667,59.5,105.39583333333333,59.5L109.5625,59.5"/>
           </g>
           <g class="edgeLabels">
             <g class="edgeLabel">
diff --git a/docs/test_cases/t30009.md b/docs/test_cases/t30009.md
index c74c63b4..cafa282e 100644
--- a/docs/test_cases/t30009.md
+++ b/docs/test_cases/t30009.md
@@ -53,41 +53,14 @@ namespace D {
   "diagram_type": "package",
   "elements": [
     {
-      "display_name": "clanguml",
+      "display_name": "One",
       "elements": [
         {
-          "display_name": "clanguml::t30009",
-          "id": "1266799397652663064",
-          "is_deprecated": false,
-          "name": "t30009",
-          "source_location": {
-            "column": 21,
-            "file": "t30009.cc",
-            "line": 1,
-            "translation_unit": "t30009.cc"
-          },
-          "type": "namespace"
-        }
-      ],
-      "id": "2174271399507040339",
-      "is_deprecated": false,
-      "name": "clanguml",
-      "source_location": {
-        "column": 11,
-        "file": "t30009.cc",
-        "line": 1,
-        "translation_unit": "t30009.cc"
-      },
-      "type": "namespace"
-    },
-    {
-      "display_name": "clanguml::t30009::One",
-      "elements": [
-        {
-          "display_name": "clanguml::t30009::One::A",
+          "display_name": "A",
           "id": "1189741240939898414",
           "is_deprecated": false,
           "name": "A",
+          "namespace": "clanguml::t30009::One",
           "source_location": {
             "column": 11,
             "file": "t30009.cc",
@@ -97,10 +70,11 @@ namespace D {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30009::One::B",
+          "display_name": "B",
           "id": "209763670816643341",
           "is_deprecated": false,
           "name": "B",
+          "namespace": "clanguml::t30009::One",
           "source_location": {
             "column": 11,
             "file": "t30009.cc",
@@ -110,10 +84,11 @@ namespace D {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30009::One::C",
+          "display_name": "C",
           "id": "946522260503371974",
           "is_deprecated": false,
           "name": "C",
+          "namespace": "clanguml::t30009::One",
           "source_location": {
             "column": 11,
             "file": "t30009.cc",
@@ -123,10 +98,11 @@ namespace D {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30009::One::D",
+          "display_name": "D",
           "id": "1181245940399690936",
           "is_deprecated": false,
           "name": "D",
+          "namespace": "clanguml::t30009::One",
           "source_location": {
             "column": 11,
             "file": "t30009.cc",
@@ -139,6 +115,7 @@ namespace D {
       "id": "1187941209208108244",
       "is_deprecated": false,
       "name": "One",
+      "namespace": "clanguml::t30009",
       "source_location": {
         "column": 11,
         "file": "t30009.cc",
@@ -148,13 +125,14 @@ namespace D {
       "type": "namespace"
     },
     {
-      "display_name": "clanguml::t30009::Two",
+      "display_name": "Two",
       "elements": [
         {
-          "display_name": "clanguml::t30009::Two::A",
+          "display_name": "A",
           "id": "986505573514384282",
           "is_deprecated": false,
           "name": "A",
+          "namespace": "clanguml::t30009::Two",
           "source_location": {
             "column": 11,
             "file": "t30009.cc",
@@ -164,10 +142,11 @@ namespace D {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30009::Two::B",
+          "display_name": "B",
           "id": "2156827588463114203",
           "is_deprecated": false,
           "name": "B",
+          "namespace": "clanguml::t30009::Two",
           "source_location": {
             "column": 11,
             "file": "t30009.cc",
@@ -177,10 +156,11 @@ namespace D {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30009::Two::C",
+          "display_name": "C",
           "id": "1653274432960093632",
           "is_deprecated": false,
           "name": "C",
+          "namespace": "clanguml::t30009::Two",
           "source_location": {
             "column": 11,
             "file": "t30009.cc",
@@ -190,10 +170,11 @@ namespace D {
           "type": "namespace"
         },
         {
-          "display_name": "clanguml::t30009::Two::D",
+          "display_name": "D",
           "id": "263095551354153183",
           "is_deprecated": false,
           "name": "D",
+          "namespace": "clanguml::t30009::Two",
           "source_location": {
             "column": 11,
             "file": "t30009.cc",
@@ -206,6 +187,7 @@ namespace D {
       "id": "1940839474792549233",
       "is_deprecated": false,
       "name": "Two",
+      "namespace": "clanguml::t30009",
       "source_location": {
         "column": 11,
         "file": "t30009.cc",
@@ -216,6 +198,7 @@ namespace D {
     }
   ],
   "name": "t30009_package",
+  "package_type": "namespace",
   "relationships": [],
   "using_namespace": "clanguml::t30009"
 }
diff --git a/docs/test_cases/t30009_package.svg b/docs/test_cases/t30009_package.svg
index 82a6186e..339e3526 100644
--- a/docs/test_cases/t30009_package.svg
+++ b/docs/test_cases/t30009_package.svg
@@ -1,61 +1,63 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="133px" preserveAspectRatio="none" style="width:567px;height:133px;background:#FFFFFF;" version="1.1" viewBox="0 0 567 133" width="567px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:639px;height:188px;" version="1.1" viewBox="0 0 639 188" width="639px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fpxogudnib74o" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001187941209208108244">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
-        <path d="M8.5,6.294 L37.5,6.294 A3.75,3.75 0 0 1 40,8.794 L47,29.0939 L268.5,29.0939 A2.5,2.5 0 0 1 271,31.5939 L271,124.394 A2.5,2.5 0 0 1 268.5,126.894 L8.5,126.894 A2.5,2.5 0 0 1 6,124.394 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="47" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="28" x="10" y="21.2999">One</text>
-      </a>
-    </g>
-    <g id="cluster_C_0001940839474792549233">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
-        <path d="M297.5,6.294 L327.5,6.294 A3.75,3.75 0 0 1 330,8.794 L337,29.0939 L557.5,29.0939 A2.5,2.5 0 0 1 560,31.5939 L560,124.394 A2.5,2.5 0 0 1 557.5,126.894 L297.5,126.894 A2.5,2.5 0 0 1 295,124.394 L295,8.794 A2.5,2.5 0 0 1 297.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="295" x2="337" y1="29.0939" y2="29.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="29" x="299" y="21.2999">Two</text>
-      </a>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <path d="M89.5,49.294 L100.5,49.294 A3.75,3.75 0 0 1 103,51.794 L110,72.0939 L114.5,72.0939 A2.5,2.5 0 0 1 117,74.5939 L117,100.3938 A2.5,2.5 0 0 1 114.5,102.8938 L89.5,102.8938 A2.5,2.5 0 0 1 87,100.3938 L87,51.794 A2.5,2.5 0 0 1 89.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="87" x2="110" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="91" y="64.2999">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="22,24,60,24,67,46.2969,308,46.2969,308,176,22,176,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="67" y1="46.2969" y2="46.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="26" y="38.9951">One</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <path d="M24.5,49.294 L35.5,49.294 A3.75,3.75 0 0 1 38,51.794 L45,72.0939 L49.5,72.0939 A2.5,2.5 0 0 1 52,74.5939 L52,100.3938 A2.5,2.5 0 0 1 49.5,102.8938 L24.5,102.8938 A2.5,2.5 0 0 1 22,100.3938 L22,51.794 A2.5,2.5 0 0 1 24.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="22" x2="45" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="26" y="64.2999">D</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="332,24,372,24,379,46.2969,617,46.2969,617,176,332,176,332,24" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="332" x2="379" y1="46.2969" y2="46.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="336" y="38.9951">Two</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <path d="M219.5,49.294 L230.5,49.294 A3.75,3.75 0 0 1 233,51.794 L240,72.0939 L244.5,72.0939 A2.5,2.5 0 0 1 247,74.5939 L247,100.3938 A2.5,2.5 0 0 1 244.5,102.8938 L219.5,102.8938 A2.5,2.5 0 0 1 217,100.3938 L217,51.794 A2.5,2.5 0 0 1 219.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="217" x2="240" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="221" y="64.2999">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="105,83,121,83,128,105.2969,135,105.2969,135,135.5938,105,135.5938,105,83" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="128" y1="105.2969" y2="105.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="109" y="97.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <path d="M154.5,49.294 L165.5,49.294 A3.75,3.75 0 0 1 168,51.794 L175,72.0939 L179.5,72.0939 A2.5,2.5 0 0 1 182,74.5939 L182,100.3938 A2.5,2.5 0 0 1 179.5,102.8938 L154.5,102.8938 A2.5,2.5 0 0 1 152,100.3938 L152,51.794 A2.5,2.5 0 0 1 154.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="152" x2="175" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="156" y="64.2999">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="38.5,83,55.5,83,62.5,105.2969,69.5,105.2969,69.5,135.5938,38.5,135.5938,38.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="105.2969" y2="105.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="97.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <path d="M313.5,49.294 L324.5,49.294 A3.75,3.75 0 0 1 327,51.794 L334,72.0939 L338.5,72.0939 A2.5,2.5 0 0 1 341,74.5939 L341,100.3938 A2.5,2.5 0 0 1 338.5,102.8938 L313.5,102.8938 A2.5,2.5 0 0 1 311,100.3938 L311,51.794 A2.5,2.5 0 0 1 313.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="311" x2="334" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="315" y="64.2999">A</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="236.5,83,253.5,83,260.5,105.2969,267.5,105.2969,267.5,135.5938,236.5,135.5938,236.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="236.5" x2="260.5" y1="105.2969" y2="105.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="240.5" y="97.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <path d="M508.5,49.294 L519.5,49.294 A3.75,3.75 0 0 1 522,51.794 L529,72.0939 L533.5,72.0939 A2.5,2.5 0 0 1 536,74.5939 L536,100.3938 A2.5,2.5 0 0 1 533.5,102.8938 L508.5,102.8938 A2.5,2.5 0 0 1 506,100.3938 L506,51.794 A2.5,2.5 0 0 1 508.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="506" x2="529" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="510" y="64.2999">B</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="170.5,83,187.5,83,194.5,105.2969,201.5,105.2969,201.5,135.5938,170.5,135.5938,170.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="170.5" x2="194.5" y1="105.2969" y2="105.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="174.5" y="97.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <path d="M443.5,49.294 L454.5,49.294 A3.75,3.75 0 0 1 457,51.794 L464,72.0939 L468.5,72.0939 A2.5,2.5 0 0 1 471,74.5939 L471,100.3938 A2.5,2.5 0 0 1 468.5,102.8938 L443.5,102.8938 A2.5,2.5 0 0 1 441,100.3938 L441,51.794 A2.5,2.5 0 0 1 443.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="441" x2="464" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="445" y="64.2999">C</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="348.5,83,365.5,83,372.5,105.2969,379.5,105.2969,379.5,135.5938,348.5,135.5938,348.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="348.5" x2="372.5" y1="105.2969" y2="105.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="352.5" y="97.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <path d="M378.5,49.294 L389.5,49.294 A3.75,3.75 0 0 1 392,51.794 L399,72.0939 L403.5,72.0939 A2.5,2.5 0 0 1 406,74.5939 L406,100.3938 A2.5,2.5 0 0 1 403.5,102.8938 L378.5,102.8938 A2.5,2.5 0 0 1 376,100.3938 L376,51.794 A2.5,2.5 0 0 1 378.5,49.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="376" x2="399" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="10" x="380" y="64.2999">D</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="547,83,563,83,570,105.2969,577,105.2969,577,135.5938,547,135.5938,547,83" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="547" x2="570" y1="105.2969" y2="105.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="551" y="97.9951">B</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="480.5,83,497.5,83,504.5,105.2969,511.5,105.2969,511.5,135.5938,480.5,135.5938,480.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="480.5" x2="504.5" y1="105.2969" y2="105.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="484.5" y="97.9951">C</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="414.5,83,431.5,83,438.5,105.2969,445.5,105.2969,445.5,135.5938,414.5,135.5938,414.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="414.5" x2="438.5" y1="105.2969" y2="105.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="418.5" y="97.9951">D</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t30009_package_mermaid.svg b/docs/test_cases/t30009_package_mermaid.svg
index 96147c29..903c6979 100644
--- a/docs/test_cases/t30009_package_mermaid.svg
+++ b/docs/test_cases/t30009_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 219.125 368" style="max-width: 219.125px; background-color: white;" width="219.125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
diff --git a/docs/test_cases/t30010.md b/docs/test_cases/t30010.md
index c15a4e41..c2b5e03a 100644
--- a/docs/test_cases/t30010.md
+++ b/docs/test_cases/t30010.md
@@ -27,34 +27,6 @@ App app;
 } // namespace t30002
 } // namespace clanguml
 
-```
-File `tests/t30010/libraries/lib3/lib3.h`
-```cpp
-#pragma once
-
-namespace clanguml {
-namespace t30010 {
-namespace library3 {
-
-enum E { e1, e2, e3 };
-
-}
-}
-}
-```
-File `tests/t30010/libraries/lib4/lib4.h`
-```cpp
-#pragma once
-
-namespace clanguml {
-namespace t30010 {
-namespace library4 {
-
-struct C { };
-
-}
-}
-}
 ```
 File `tests/t30010/libraries/lib1/lib1.h`
 ```cpp
@@ -82,6 +54,34 @@ template <typename T> struct B {
     T b;
 };
 
+}
+}
+}
+```
+File `tests/t30010/libraries/lib3/lib3.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t30010 {
+namespace library3 {
+
+enum E { e1, e2, e3 };
+
+}
+}
+}
+```
+File `tests/t30010/libraries/lib4/lib4.h`
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t30010 {
+namespace library4 {
+
+struct C { };
+
 }
 }
 }
@@ -126,74 +126,81 @@ struct App {
           "id": "879212264535378961",
           "is_deprecated": false,
           "name": "lib1",
+          "path": "",
           "source_location": {
             "column": 8,
             "file": "libraries/lib1/lib1.h",
             "line": 7,
             "translation_unit": "t30010.cc"
           },
-          "type": "namespace"
+          "type": "directory"
         },
         {
           "display_name": "lib2",
           "id": "1522606219626203424",
           "is_deprecated": false,
           "name": "lib2",
+          "path": "",
           "source_location": {
             "column": 30,
             "file": "libraries/lib2/lib2.h",
             "line": 7,
             "translation_unit": "t30010.cc"
           },
-          "type": "namespace"
+          "type": "directory"
         },
         {
           "display_name": "lib3",
           "id": "2263709579652581325",
           "is_deprecated": false,
           "name": "lib3",
+          "path": "",
           "source_location": {
             "column": 6,
             "file": "libraries/lib3/lib3.h",
             "line": 7,
             "translation_unit": "t30010.cc"
           },
-          "type": "namespace"
+          "type": "directory"
         },
         {
           "display_name": "lib4",
           "id": "1103453030023410219",
           "is_deprecated": false,
           "name": "lib4",
+          "path": "",
           "source_location": {
             "column": 8,
             "file": "libraries/lib4/lib4.h",
             "line": 7,
             "translation_unit": "t30010.cc"
           },
-          "type": "namespace"
+          "type": "directory"
         }
       ],
       "id": "879401191375500756",
       "is_deprecated": false,
       "name": "libraries",
-      "type": "namespace"
+      "path": "",
+      "type": "directory"
     },
     {
       "display_name": "app",
       "id": "2001320261642080149",
       "is_deprecated": false,
       "name": "app",
+      "path": "",
       "source_location": {
         "column": 8,
         "file": "app/app.h",
         "line": 11,
         "translation_unit": "t30010.cc"
       },
-      "type": "namespace"
+      "type": "directory"
     }
   ],
   "name": "t30010_package",
+  "package_type": "directory",
   "relationships": [
     {
       "destination": "879212264535378961",
diff --git a/docs/test_cases/t30010_package.svg b/docs/test_cases/t30010_package.svg
index c9d07b64..659cb5bd 100644
--- a/docs/test_cases/t30010_package.svg
+++ b/docs/test_cases/t30010_package.svg
@@ -1,53 +1,49 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="196px" preserveAspectRatio="none" style="width:331px;height:196px;background:#FFFFFF;" version="1.1" viewBox="0 0 331 196" width="331px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="202px" preserveAspectRatio="none" style="width:373px;height:202px;" version="1.1" viewBox="0 0 373 202" width="373px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f17dnoc1lbmb9g" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0000879401191375500756">
-      <path d="M8.5,84.894 L64.5,84.894 A3.75,3.75 0 0 1 67,87.394 L74,107.6939 L321.5,107.6939 A2.5,2.5 0 0 1 324,110.1939 L324,186.994 A2.5,2.5 0 0 1 321.5,189.494 L8.5,189.494 A2.5,2.5 0 0 1 6,186.994 L6,87.394 A2.5,2.5 0 0 1 8.5,84.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="74" y1="107.6939" y2="107.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="55" x="10" y="99.8999">libraries</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib1/lib1.h#L7" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib1/lib1.h#L7" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <path d="M265,119.894 L291,119.894 A3.75,3.75 0 0 1 293.5,122.394 L300.5,142.6939 L305,142.6939 A2.5,2.5 0 0 1 307.5,145.1939 L307.5,170.9938 A2.5,2.5 0 0 1 305,173.4938 L265,173.4938 A2.5,2.5 0 0 1 262.5,170.9938 L262.5,122.394 A2.5,2.5 0 0 1 265,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="262.5" x2="300.5" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="266.5" y="134.8999">lib1</text>
+    <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="99" y1="108.2969" y2="108.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="26" y="100.9951">libraries</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib1/lib1.h#L7" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib1/lib1.h#L7" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="287" x2="328" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="291" y="135.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib2/lib2.h#L7" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib2/lib2.h#L7" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <path d="M185,119.894 L211,119.894 A3.75,3.75 0 0 1 213.5,122.394 L220.5,142.6939 L225,142.6939 A2.5,2.5 0 0 1 227.5,145.1939 L227.5,170.9938 A2.5,2.5 0 0 1 225,173.4938 L185,173.4938 A2.5,2.5 0 0 1 182.5,170.9938 L182.5,122.394 A2.5,2.5 0 0 1 185,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="182.5" x2="220.5" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="186.5" y="134.8999">lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib2/lib2.h#L7" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib2/lib2.h#L7" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="245" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="208" y="135.9951">lib2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib3/lib3.h#L7" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib3/lib3.h#L7" xlink:show="new" xlink:title="lib3" xlink:type="simple">
-      <path d="M105,119.894 L131,119.894 A3.75,3.75 0 0 1 133.5,122.394 L140.5,142.6939 L145,142.6939 A2.5,2.5 0 0 1 147.5,145.1939 L147.5,170.9938 A2.5,2.5 0 0 1 145,173.4938 L105,173.4938 A2.5,2.5 0 0 1 102.5,170.9938 L102.5,122.394 A2.5,2.5 0 0 1 105,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="102.5" x2="140.5" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="106.5" y="134.8999">lib3</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib3/lib3.h#L7" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib3/lib3.h#L7" xlink:show="new" xlink:title="lib3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="162" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="125" y="135.9951">lib3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib4/lib4.h#L7" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/libraries/lib4/lib4.h#L7" xlink:show="new" xlink:title="lib4" xlink:type="simple">
-      <path d="M25,119.894 L51,119.894 A3.75,3.75 0 0 1 53.5,122.394 L60.5,142.6939 L65,142.6939 A2.5,2.5 0 0 1 67.5,145.1939 L67.5,170.9938 A2.5,2.5 0 0 1 65,173.4938 L25,173.4938 A2.5,2.5 0 0 1 22.5,170.9938 L22.5,122.394 A2.5,2.5 0 0 1 25,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="60.5" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="26.5" y="134.8999">lib4</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib4/lib4.h#L7" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib4/lib4.h#L7" xlink:show="new" xlink:title="lib4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="135.9951">lib4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/app/app.h#L11" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30010/app/app.h#L11" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <path d="M144.5,6.294 L171.5,6.294 A3.75,3.75 0 0 1 174,8.794 L181,29.0939 L185.5,29.0939 A2.5,2.5 0 0 1 188,31.5939 L188,57.3938 A2.5,2.5 0 0 1 185.5,59.8938 L144.5,59.8938 A2.5,2.5 0 0 1 142,57.3938 L142,8.794 A2.5,2.5 0 0 1 144.5,6.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="142" x2="181" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="146" y="21.2999">app</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/app/app.h#L11" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/app/app.h#L11" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="161.5" x2="203.5" y1="30.2969" y2="30.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="165.5" y="22.9951">app</text>
     </a>
-    <g id="link_C_0002001320261642080149_C_0000879212264535378961">
-      <path codeLine="13" d="M188.17,42.454 C205.41,49.564 228.68,61.144 245,76.894 C257.43,88.884 264.6148,100.1836 271.4248,114.1136 " fill="none" id="C_0002001320261642080149-to-C_0000879212264535378961" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="274.06,119.504,273.7008,109.6617,271.864,115.012,266.5137,113.1753,274.06,119.504" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002001320261642080149_C_0001522606219626203424">
-      <path codeLine="14" d="M174.38,60.264 C180.8,78.174 187.2452,96.166 193.6552,114.046 " fill="none" id="C_0002001320261642080149-to-C_0001522606219626203424" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="195.68,119.694,196.4081,109.8721,193.9926,114.9873,188.8774,112.5718,195.68,119.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002001320261642080149_C_0002263709579652581325">
-      <path codeLine="15" d="M155.62,60.264 C149.2,78.174 142.7548,96.166 136.3448,114.046 " fill="none" id="C_0002001320261642080149-to-C_0002263709579652581325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="134.32,119.694,141.1226,112.5718,136.0074,114.9873,133.5919,109.8721,134.32,119.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002001320261642080149_C_0001103453030023410219">
-      <path codeLine="16" d="M141.83,42.454 C124.59,49.564 101.32,61.144 85,76.894 C72.57,88.884 65.3852,100.1836 58.5752,114.1136 " fill="none" id="C_0002001320261642080149-to-C_0001103453030023410219" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="55.94,119.504,63.4863,113.1753,58.136,115.012,56.2992,109.6617,55.94,119.504" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <path d="M210.65,43.72 C228.69,50.68 252.9,62.07 270,78 C281.47,88.69 290.81,103.3 297.66,116.29 " fill="none" id="C_0002001320261642080149-&gt;C_0000879212264535378961" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="300.07,120.99,299.5224,111.1564,297.7884,116.5409,292.4039,114.8069,300.07,120.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M195.74,61.24 C201.94,77.64 210.01,98.94 216.52,116.16 " fill="none" id="C_0002001320261642080149-&gt;C_0001522606219626203424" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="218.31,120.89,218.859,111.0565,216.5372,116.2148,211.3788,113.893,218.31,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M176.49,61.24 C170.44,77.64 162.57,98.94 156.21,116.16 " fill="none" id="C_0002001320261642080149-&gt;C_0002263709579652581325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="154.46,120.89,161.3277,113.8306,156.1905,116.199,153.8221,111.0618,154.46,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M161.24,44.2 C143.75,51.27 120.55,62.6 104,78 C92.54,88.66 83.06,103.14 76.02,116.04 " fill="none" id="C_0002001320261642080149-&gt;C_0001103453030023410219" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="73.54,120.71,81.3078,114.6551,75.8952,116.2994,74.2508,110.8868,73.54,120.71" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30010_package_mermaid.svg b/docs/test_cases/t30010_package_mermaid.svg
index 8b12ecd0..897b1799 100644
--- a/docs/test_cases/t30010_package_mermaid.svg
+++ b/docs/test_cases/t30010_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 395.625 182" style="max-width: 395.625px; background-color: white;" width="395.625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -33,10 +33,10 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,82.11666666666666C54.953125,89.56666666666666,54.953125,96.13333333333333,54.953125,99.41666666666667L54.953125,102.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,82.11666666666666C144.859375,89.56666666666666,144.859375,96.13333333333333,144.859375,99.41666666666667L144.859375,102.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,82.11666666666666C234.765625,89.56666666666666,234.765625,96.13333333333333,234.765625,99.41666666666667L234.765625,102.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,82.11666666666666C324.671875,89.56666666666666,324.671875,96.13333333333333,324.671875,99.41666666666667L324.671875,102.7"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,83C54.953125,91.33333333333333,54.953125,99.66666666666667,54.953125,103.83333333333333L54.953125,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,83C144.859375,91.33333333333333,144.859375,99.66666666666667,144.859375,103.83333333333333L144.859375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,83C234.765625,91.33333333333333,234.765625,99.66666666666667,234.765625,103.83333333333333L234.765625,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,83C324.671875,91.33333333333333,324.671875,99.66666666666667,324.671875,103.83333333333333L324.671875,108"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30011.md b/docs/test_cases/t30011.md
index e158714f..bec2152a 100644
--- a/docs/test_cases/t30011.md
+++ b/docs/test_cases/t30011.md
@@ -18,22 +18,6 @@ File `tests/t30011/t30011.c`
 
 struct t30011_App app;
 
-```
-File `tests/t30011/libraries/lib3/lib3.h`
-```cpp
-#pragma once
-
-enum t30011_E { e1, e2, e3 };
-
-```
-File `tests/t30011/libraries/lib4/lib4.h`
-```cpp
-#pragma once
-
-struct t30011_C {
-    int c;
-};
-
 ```
 File `tests/t30011/libraries/lib1/lib1.h`
 ```cpp
@@ -52,6 +36,22 @@ struct t30011_B {
     int b;
 };
 
+```
+File `tests/t30011/libraries/lib3/lib3.h`
+```cpp
+#pragma once
+
+enum t30011_E { e1, e2, e3 };
+
+```
+File `tests/t30011/libraries/lib4/lib4.h`
+```cpp
+#pragma once
+
+struct t30011_C {
+    int c;
+};
+
 ```
 File `tests/t30011/app/app.h`
 ```cpp
@@ -88,74 +88,81 @@ void c(struct t30011_App *app, struct t30011_C *c) { }
           "id": "879212264535378961",
           "is_deprecated": false,
           "name": "lib1",
+          "path": "",
           "source_location": {
             "column": 8,
             "file": "libraries/lib1/lib1.h",
             "line": 3,
             "translation_unit": "t30011.c"
           },
-          "type": "namespace"
+          "type": "directory"
         },
         {
           "display_name": "lib2",
           "id": "1522606219626203424",
           "is_deprecated": false,
           "name": "lib2",
+          "path": "",
           "source_location": {
             "column": 8,
             "file": "libraries/lib2/lib2.h",
             "line": 3,
             "translation_unit": "t30011.c"
           },
-          "type": "namespace"
+          "type": "directory"
         },
         {
           "display_name": "lib3",
           "id": "2263709579652581325",
           "is_deprecated": false,
           "name": "lib3",
+          "path": "",
           "source_location": {
             "column": 6,
             "file": "libraries/lib3/lib3.h",
             "line": 3,
             "translation_unit": "t30011.c"
           },
-          "type": "namespace"
+          "type": "directory"
         },
         {
           "display_name": "lib4",
           "id": "1103453030023410219",
           "is_deprecated": false,
           "name": "lib4",
+          "path": "",
           "source_location": {
             "column": 8,
             "file": "libraries/lib4/lib4.h",
             "line": 3,
             "translation_unit": "t30011.c"
           },
-          "type": "namespace"
+          "type": "directory"
         }
       ],
       "id": "879401191375500756",
       "is_deprecated": false,
       "name": "libraries",
-      "type": "namespace"
+      "path": "",
+      "type": "directory"
     },
     {
       "display_name": "app",
       "id": "2001320261642080149",
       "is_deprecated": false,
       "name": "app",
+      "path": "",
       "source_location": {
         "column": 8,
         "file": "app/app.h",
         "line": 8,
         "translation_unit": "t30011.c"
       },
-      "type": "namespace"
+      "type": "directory"
     }
   ],
   "name": "t30011_package",
+  "package_type": "directory",
   "relationships": [
     {
       "destination": "879212264535378961",
diff --git a/docs/test_cases/t30011_package.svg b/docs/test_cases/t30011_package.svg
index 8af66c7a..3cde2fcb 100644
--- a/docs/test_cases/t30011_package.svg
+++ b/docs/test_cases/t30011_package.svg
@@ -1,53 +1,49 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="196px" preserveAspectRatio="none" style="width:331px;height:196px;background:#FFFFFF;" version="1.1" viewBox="0 0 331 196" width="331px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="202px" preserveAspectRatio="none" style="width:373px;height:202px;" version="1.1" viewBox="0 0 373 202" width="373px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fbnsh20s89p3x" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0000879401191375500756">
-      <path d="M8.5,84.894 L64.5,84.894 A3.75,3.75 0 0 1 67,87.394 L74,107.6939 L321.5,107.6939 A2.5,2.5 0 0 1 324,110.1939 L324,186.994 A2.5,2.5 0 0 1 321.5,189.494 L8.5,189.494 A2.5,2.5 0 0 1 6,186.994 L6,87.394 A2.5,2.5 0 0 1 8.5,84.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="74" y1="107.6939" y2="107.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="55" x="10" y="99.8999">libraries</text>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib1/lib1.h#L3" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib1/lib1.h#L3" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <path d="M265,119.894 L291,119.894 A3.75,3.75 0 0 1 293.5,122.394 L300.5,142.6939 L305,142.6939 A2.5,2.5 0 0 1 307.5,145.1939 L307.5,170.9938 A2.5,2.5 0 0 1 305,173.4938 L265,173.4938 A2.5,2.5 0 0 1 262.5,170.9938 L262.5,122.394 A2.5,2.5 0 0 1 265,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="262.5" x2="300.5" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="266.5" y="134.8999">lib1</text>
+    <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="99" y1="108.2969" y2="108.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="26" y="100.9951">libraries</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib1/lib1.h#L3" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib1/lib1.h#L3" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="287" x2="328" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="291" y="135.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib2/lib2.h#L3" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib2/lib2.h#L3" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <path d="M185,119.894 L211,119.894 A3.75,3.75 0 0 1 213.5,122.394 L220.5,142.6939 L225,142.6939 A2.5,2.5 0 0 1 227.5,145.1939 L227.5,170.9938 A2.5,2.5 0 0 1 225,173.4938 L185,173.4938 A2.5,2.5 0 0 1 182.5,170.9938 L182.5,122.394 A2.5,2.5 0 0 1 185,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="182.5" x2="220.5" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="186.5" y="134.8999">lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib2/lib2.h#L3" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib2/lib2.h#L3" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="245" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="208" y="135.9951">lib2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib3/lib3.h#L3" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib3/lib3.h#L3" xlink:show="new" xlink:title="lib3" xlink:type="simple">
-      <path d="M105,119.894 L131,119.894 A3.75,3.75 0 0 1 133.5,122.394 L140.5,142.6939 L145,142.6939 A2.5,2.5 0 0 1 147.5,145.1939 L147.5,170.9938 A2.5,2.5 0 0 1 145,173.4938 L105,173.4938 A2.5,2.5 0 0 1 102.5,170.9938 L102.5,122.394 A2.5,2.5 0 0 1 105,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="102.5" x2="140.5" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="106.5" y="134.8999">lib3</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib3/lib3.h#L3" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib3/lib3.h#L3" xlink:show="new" xlink:title="lib3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="162" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="125" y="135.9951">lib3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib4/lib4.h#L3" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/libraries/lib4/lib4.h#L3" xlink:show="new" xlink:title="lib4" xlink:type="simple">
-      <path d="M25,119.894 L51,119.894 A3.75,3.75 0 0 1 53.5,122.394 L60.5,142.6939 L65,142.6939 A2.5,2.5 0 0 1 67.5,145.1939 L67.5,170.9938 A2.5,2.5 0 0 1 65,173.4938 L25,173.4938 A2.5,2.5 0 0 1 22.5,170.9938 L22.5,122.394 A2.5,2.5 0 0 1 25,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="60.5" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="26.5" y="134.8999">lib4</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib4/lib4.h#L3" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib4/lib4.h#L3" xlink:show="new" xlink:title="lib4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="135.9951">lib4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/app/app.h#L8" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30011/app/app.h#L8" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <path d="M144.5,6.294 L171.5,6.294 A3.75,3.75 0 0 1 174,8.794 L181,29.0939 L185.5,29.0939 A2.5,2.5 0 0 1 188,31.5939 L188,57.3938 A2.5,2.5 0 0 1 185.5,59.8938 L144.5,59.8938 A2.5,2.5 0 0 1 142,57.3938 L142,8.794 A2.5,2.5 0 0 1 144.5,6.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="142" x2="181" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="146" y="21.2999">app</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/app/app.h#L8" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/app/app.h#L8" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="161.5" x2="203.5" y1="30.2969" y2="30.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="165.5" y="22.9951">app</text>
     </a>
-    <g id="link_C_0002001320261642080149_C_0000879212264535378961">
-      <path codeLine="13" d="M188.17,42.454 C205.41,49.564 228.68,61.144 245,76.894 C257.43,88.884 264.6148,100.1836 271.4248,114.1136 " fill="none" id="C_0002001320261642080149-to-C_0000879212264535378961" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="274.06,119.504,273.7008,109.6617,271.864,115.012,266.5137,113.1753,274.06,119.504" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002001320261642080149_C_0001522606219626203424">
-      <path codeLine="14" d="M174.38,60.264 C180.8,78.174 187.2452,96.166 193.6552,114.046 " fill="none" id="C_0002001320261642080149-to-C_0001522606219626203424" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="195.68,119.694,196.4081,109.8721,193.9926,114.9873,188.8774,112.5718,195.68,119.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002001320261642080149_C_0002263709579652581325">
-      <path codeLine="15" d="M155.62,60.264 C149.2,78.174 142.7548,96.166 136.3448,114.046 " fill="none" id="C_0002001320261642080149-to-C_0002263709579652581325" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="134.32,119.694,141.1226,112.5718,136.0074,114.9873,133.5919,109.8721,134.32,119.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002001320261642080149_C_0001103453030023410219">
-      <path codeLine="16" d="M141.83,42.454 C124.59,49.564 101.32,61.144 85,76.894 C72.57,88.884 65.3852,100.1836 58.5752,114.1136 " fill="none" id="C_0002001320261642080149-to-C_0001103453030023410219" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="55.94,119.504,63.4863,113.1753,58.136,115.012,56.2992,109.6617,55.94,119.504" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <path d="M210.65,43.72 C228.69,50.68 252.9,62.07 270,78 C281.47,88.69 290.81,103.3 297.66,116.29 " fill="none" id="C_0002001320261642080149-&gt;C_0000879212264535378961" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="300.07,120.99,299.5224,111.1564,297.7884,116.5409,292.4039,114.8069,300.07,120.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M195.74,61.24 C201.94,77.64 210.01,98.94 216.52,116.16 " fill="none" id="C_0002001320261642080149-&gt;C_0001522606219626203424" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="218.31,120.89,218.859,111.0565,216.5372,116.2148,211.3788,113.893,218.31,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M176.49,61.24 C170.44,77.64 162.57,98.94 156.21,116.16 " fill="none" id="C_0002001320261642080149-&gt;C_0002263709579652581325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="154.46,120.89,161.3277,113.8306,156.1905,116.199,153.8221,111.0618,154.46,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M161.24,44.2 C143.75,51.27 120.55,62.6 104,78 C92.54,88.66 83.06,103.14 76.02,116.04 " fill="none" id="C_0002001320261642080149-&gt;C_0001103453030023410219" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="73.54,120.71,81.3078,114.6551,75.8952,116.2994,74.2508,110.8868,73.54,120.71" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30011_package_mermaid.svg b/docs/test_cases/t30011_package_mermaid.svg
index 8b12ecd0..897b1799 100644
--- a/docs/test_cases/t30011_package_mermaid.svg
+++ b/docs/test_cases/t30011_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 395.625 182" style="max-width: 395.625px; background-color: white;" width="395.625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -33,10 +33,10 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,82.11666666666666C54.953125,89.56666666666666,54.953125,96.13333333333333,54.953125,99.41666666666667L54.953125,102.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,82.11666666666666C144.859375,89.56666666666666,144.859375,96.13333333333333,144.859375,99.41666666666667L144.859375,102.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,82.11666666666666C234.765625,89.56666666666666,234.765625,96.13333333333333,234.765625,99.41666666666667L234.765625,102.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,82.11666666666666C324.671875,89.56666666666666,324.671875,96.13333333333333,324.671875,99.41666666666667L324.671875,102.7"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0000879212264535378961" id="L-C_0002001320261642080149-C_0000879212264535378961-0" d="M168.9609375,22.9166087359518L149.95963541666666,28.763840613293166C130.95833333333334,34.611072490634534,92.95572916666667,46.30553624531726,73.95442708333333,56.3194347893253C54.953125,66.33333333333333,54.953125,74.66666666666667,54.953125,83C54.953125,91.33333333333333,54.953125,99.66666666666667,54.953125,103.83333333333333L54.953125,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001522606219626203424" id="L-C_0002001320261642080149-C_0001522606219626203424-0" d="M171.93957078313252,33L167.4262048192771,37.166666666666664C162.91283885542168,41.333333333333336,153.88610692771084,49.666666666666664,149.37274096385542,58C144.859375,66.33333333333333,144.859375,74.66666666666667,144.859375,83C144.859375,91.33333333333333,144.859375,99.66666666666667,144.859375,103.83333333333333L144.859375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0002263709579652581325" id="L-C_0002001320261642080149-C_0002263709579652581325-0" d="M207.68542921686748,33L212.1987951807229,37.166666666666664C216.71216114457832,41.333333333333336,225.7388930722892,49.666666666666664,230.25225903614458,58C234.765625,66.33333333333333,234.765625,74.66666666666667,234.765625,83C234.765625,91.33333333333333,234.765625,99.66666666666667,234.765625,103.83333333333333L234.765625,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0002001320261642080149 LE-C_0001103453030023410219" id="L-C_0002001320261642080149-C_0001103453030023410219-0" d="M210.6640625,22.9166087359518L229.66536458333334,28.763840613293166C248.66666666666666,34.611072490634534,286.6692708333333,46.30553624531726,305.6705729166667,56.3194347893253C324.671875,66.33333333333333,324.671875,74.66666666666667,324.671875,83C324.671875,91.33333333333333,324.671875,99.66666666666667,324.671875,103.83333333333333L324.671875,108"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30012.md b/docs/test_cases/t30012.md
index c0933708..30f3695c 100644
--- a/docs/test_cases/t30012.md
+++ b/docs/test_cases/t30012.md
@@ -31,20 +31,12 @@ class R {
 }
 }
 ```
-File `tests/t30012/src/lib1.cppm`
+File `tests/t30012/src/lib1mod2.cppm`
 ```cpp
-export module t30012.app.lib1;
+export module t30012.app.lib1.mod2;
 
 export namespace clanguml::t30012 {
-class B { };
-
-template <typename T> class BB {
-    T t;
-};
-
-namespace detail {
-enum class BBB { bbb1, bbb2 };
-} // namespace detail
+class E { };
 }
 ```
 File `tests/t30012/src/lib2.cppm`
@@ -63,12 +55,20 @@ enum class CCC { ccc1, ccc2 };
 }
 }
 ```
-File `tests/t30012/src/lib1mod1.cppm`
+File `tests/t30012/src/lib1.cppm`
 ```cpp
-export module t30012.app.lib1.mod1;
+export module t30012.app.lib1;
 
 export namespace clanguml::t30012 {
-class D { };
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
 }
 ```
 File `tests/t30012/src/t30012_mod.cppm`
@@ -85,12 +85,12 @@ class A {
 };
 }
 ```
-File `tests/t30012/src/lib1mod2.cppm`
+File `tests/t30012/src/lib1mod1.cppm`
 ```cpp
-export module t30012.app.lib1.mod2;
+export module t30012.app.lib1.mod1;
 
 export namespace clanguml::t30012 {
-class E { };
+class D { };
 }
 ```
 ## Generated PlantUML diagrams
@@ -106,67 +106,74 @@ class E { };
       "display_name": "app",
       "elements": [
         {
-          "display_name": "app.lib1",
+          "display_name": "lib1",
           "elements": [
             {
-              "display_name": "app.lib1.mod1",
+              "display_name": "mod1",
               "id": "1890617159212924206",
               "is_deprecated": false,
               "name": "mod1",
+              "namespace": "t30012.app.lib1",
               "source_location": {
                 "column": 7,
                 "file": "src/lib1mod1.cppm",
                 "line": 4,
                 "translation_unit": "t30012.cc"
               },
-              "type": "namespace"
+              "type": "module"
             },
             {
-              "display_name": "app.lib1.mod2",
+              "display_name": "mod2",
               "id": "206451677325228178",
               "is_deprecated": false,
               "name": "mod2",
+              "namespace": "t30012.app.lib1",
               "source_location": {
                 "column": 7,
                 "file": "src/lib1mod2.cppm",
                 "line": 4,
                 "translation_unit": "t30012.cc"
               },
-              "type": "namespace"
+              "type": "module"
             }
           ],
           "id": "2078388864960203240",
           "is_deprecated": false,
           "name": "lib1",
+          "namespace": "t30012.app",
           "source_location": {
             "column": 7,
             "file": "src/lib1.cppm",
             "line": 4,
             "translation_unit": "t30012.cc"
           },
-          "type": "namespace"
+          "type": "module"
         },
         {
-          "display_name": "app.lib2",
+          "display_name": "lib2",
           "id": "765684581621927632",
           "is_deprecated": false,
           "name": "lib2",
+          "namespace": "t30012.app",
           "source_location": {
             "column": 7,
             "file": "src/lib2.cppm",
             "line": 4,
             "translation_unit": "t30012.cc"
           },
-          "type": "namespace"
+          "type": "module"
         }
       ],
       "id": "381866731754697815",
       "is_deprecated": false,
       "name": "app",
-      "type": "namespace"
+      "namespace": "t30012",
+      "type": "module"
     }
   ],
   "name": "t30012_package",
-  "relationships": []
+  "package_type": "module",
+  "relationships": [],
+  "using_module": "t30012"
 }
 ```
diff --git a/docs/test_cases/t30012_package.svg b/docs/test_cases/t30012_package.svg
index c8c27bbb..94271210 100644
--- a/docs/test_cases/t30012_package.svg
+++ b/docs/test_cases/t30012_package.svg
@@ -1,34 +1,36 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="184px" preserveAspectRatio="none" style="width:301px;height:184px;background:#FFFFFF;" version="1.1" viewBox="0 0 301 184" width="301px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:346px;height:207px;" version="1.1" viewBox="0 0 346 207" width="346px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1axvf5xu1laap" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0000381866731754697815">
-      <path d="M8.5,6.294 L35.5,6.294 A3.75,3.75 0 0 1 38,8.794 L45,29.0939 L291.5,29.0939 A2.5,2.5 0 0 1 294,31.5939 L294,175.394 A2.5,2.5 0 0 1 291.5,177.894 L8.5,177.894 A2.5,2.5 0 0 1 6,175.394 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="45" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="10" y="21.2999">app</text>
-    </g>
-    <g id="cluster_C_0002078388864960203240">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1.cppm#L4" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1.cppm#L4" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-        <path d="M89.5,49.294 L115.5,49.294 A3.75,3.75 0 0 1 118,51.794 L125,72.0939 L267.5,72.0939 A2.5,2.5 0 0 1 270,74.5939 L270,151.394 A2.5,2.5 0 0 1 267.5,153.894 L89.5,153.894 A2.5,2.5 0 0 1 87,151.394 L87,51.794 A2.5,2.5 0 0 1 89.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-        <line style="stroke:#000000;stroke-width:1.5;" x1="87" x2="125" y1="72.0939" y2="72.0939"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="91" y="64.2999">lib1</text>
-      </a>
-    </g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
-      <path d="M198.5,84.294 L237.5,84.294 A3.75,3.75 0 0 1 240,86.794 L247,107.0939 L251.5,107.0939 A2.5,2.5 0 0 1 254,109.5939 L254,135.3938 A2.5,2.5 0 0 1 251.5,137.8938 L198.5,137.8938 A2.5,2.5 0 0 1 196,135.3938 L196,86.794 A2.5,2.5 0 0 1 198.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="196" x2="247" y1="107.0939" y2="107.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="200" y="99.2999">mod1</text>
+    <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="22,24,57,24,64,46.2969,324,46.2969,324,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1.cppm#L4" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1.cppm#L4" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="105,67,139,67,146,89.2969,300,89.2969,300,171,105,171,105,67" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="146" y1="89.2969" y2="89.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="109" y="81.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
-      <path d="M105.5,84.294 L144.5,84.294 A3.75,3.75 0 0 1 147,86.794 L154,107.0939 L158.5,107.0939 A2.5,2.5 0 0 1 161,109.5939 L161,135.3938 A2.5,2.5 0 0 1 158.5,137.8938 L105.5,137.8938 A2.5,2.5 0 0 1 103,135.3938 L103,86.794 A2.5,2.5 0 0 1 105.5,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="103" x2="154" y1="107.0939" y2="107.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="107" y="99.2999">mod2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="220,102,270,102,277,124.2969,284,124.2969,284,154.5938,220,154.5938,220,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="220" x2="277" y1="124.2969" y2="124.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="224" y="116.9951">mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib2.cppm#L4" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30012/src/lib2.cppm#L4" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <path d="M25,84.294 L51,84.294 A3.75,3.75 0 0 1 53.5,86.794 L60.5,107.0939 L65,107.0939 A2.5,2.5 0 0 1 67.5,109.5939 L67.5,135.3938 A2.5,2.5 0 0 1 65,137.8938 L25,137.8938 A2.5,2.5 0 0 1 22.5,135.3938 L22.5,86.794 A2.5,2.5 0 0 1 25,84.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="22.5" x2="60.5" y1="107.0939" y2="107.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="26.5" y="99.2999">lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="121,102,171,102,178,124.2969,185,124.2969,185,154.5938,121,154.5938,121,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="178" y1="124.2969" y2="124.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="125" y="116.9951">mod2</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib2.cppm#L4" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib2.cppm#L4" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="38,102,72,102,79,124.2969,86,124.2969,86,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="79" y1="124.2969" y2="124.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="116.9951">lib2</text>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t30012_package_mermaid.svg b/docs/test_cases/t30012_package_mermaid.svg
index bb6e2a9d..62b5da66 100644
--- a/docs/test_cases/t30012_package_mermaid.svg
+++ b/docs/test_cases/t30012_package_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 296.0625 252" style="max-width: 296.062px; background-color: white;" width="296.0625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
diff --git a/docs/test_cases/t30013.md b/docs/test_cases/t30013.md
index 21727a0a..b38523b4 100644
--- a/docs/test_cases/t30013.md
+++ b/docs/test_cases/t30013.md
@@ -16,6 +16,7 @@ diagrams:
 File `tests/t30013/t30013.cc`
 ```cpp
 import t30013.app;
+import t30013.mod1;
 import t30013.mod2;
 import t30013.mod3;
 import t30013.mod4;
@@ -40,6 +41,62 @@ class R {
 };
 } // namespace clanguml::t30013
 ```
+File `tests/t30013/src/mod7.cppm`
+```cpp
+export module t30013.mod7;
+
+export namespace clanguml::t30013 {
+struct CG { };
+}
+```
+File `tests/t30013/src/mod11.cppm`
+```cpp
+export module t30013.mod11;
+
+export namespace clanguml::t30013 {
+struct CK { };
+}
+```
+File `tests/t30013/src/mod17.cppm`
+```cpp
+export module t30013.mod17;
+
+export namespace clanguml::t30013 {
+struct CR { };
+}
+```
+File `tests/t30013/src/mod16.cppm`
+```cpp
+export module t30013.mod16;
+
+export namespace clanguml::t30013 {
+struct CP { };
+}
+```
+File `tests/t30013/src/mod10.cppm`
+```cpp
+export module t30013.mod10;
+
+export namespace clanguml::t30013 {
+struct CJ { };
+}
+```
+File `tests/t30013/src/mod4.cppm`
+```cpp
+export module t30013.mod4;
+
+export namespace clanguml::t30013 {
+struct CD { };
+}
+```
+File `tests/t30013/src/mod1.cppm`
+```cpp
+export module t30013.mod1;
+
+export namespace clanguml::t30013 {
+struct CA { };
+}
+```
 File `tests/t30013/src/app.cppm`
 ```cpp
 module;
@@ -114,6 +171,14 @@ template <typename T> std::map<T, std::shared_ptr<CM>> cm() { return {}; }
 
 } // namespace clanguml::t30013
 ```
+File `tests/t30013/src/mod13.cppm`
+```cpp
+export module t30013.mod13;
+
+export namespace clanguml::t30013 {
+struct CM { };
+}
+```
 File `tests/t30013/src/mod9.cppm`
 ```cpp
 export module t30013.mod9;
@@ -122,12 +187,12 @@ export namespace clanguml::t30013 {
 struct CI { };
 }
 ```
-File `tests/t30013/src/mod4.cppm`
+File `tests/t30013/src/mod5.cppm`
 ```cpp
-export module t30013.mod4;
+export module t30013.mod5;
 
 export namespace clanguml::t30013 {
-struct CD { };
+struct CE { };
 }
 ```
 File `tests/t30013/src/mod18.cppm`
@@ -138,12 +203,46 @@ export namespace clanguml::t30013 {
 enum class S { s1, s2, s3 };
 }
 ```
-File `tests/t30013/src/mod7.cppm`
+File `tests/t30013/src/mod2.cppm`
 ```cpp
-export module t30013.mod7;
+export module t30013.mod2;
 
 export namespace clanguml::t30013 {
-struct CG { };
+template <typename T> struct CB {
+    T cb;
+};
+}
+```
+File `tests/t30013/src/mod14.cppm`
+```cpp
+export module t30013.mod14;
+
+export namespace clanguml::t30013 {
+struct CN { };
+}
+```
+File `tests/t30013/src/mod12.cppm`
+```cpp
+export module t30013.mod12;
+
+export namespace clanguml::t30013 {
+struct CL { };
+}
+```
+File `tests/t30013/src/mod6.cppm`
+```cpp
+export module t30013.mod6;
+
+export namespace clanguml::t30013 {
+struct CF { };
+}
+```
+File `tests/t30013/src/mod8.cppm`
+```cpp
+export module t30013.mod8;
+
+export namespace clanguml::t30013 {
+struct CH { };
 }
 ```
 File `tests/t30013/src/mod3.cppm`
@@ -162,104 +261,6 @@ export namespace clanguml::t30013 {
 struct CO { };
 }
 ```
-File `tests/t30013/src/mod16.cppm`
-```cpp
-export module t30013.mod16;
-
-export namespace clanguml::t30013 {
-struct CP { };
-}
-```
-File `tests/t30013/src/mod11.cppm`
-```cpp
-export module t30013.mod11;
-
-export namespace clanguml::t30013 {
-struct CK { };
-}
-```
-File `tests/t30013/src/mod13.cppm`
-```cpp
-export module t30013.mod13;
-
-export namespace clanguml::t30013 {
-struct CM { };
-}
-```
-File `tests/t30013/src/mod2.cppm`
-```cpp
-export module t30013.mod2;
-
-export namespace clanguml::t30013 {
-template <typename T> struct CB {
-    T cb;
-};
-}
-```
-File `tests/t30013/src/mod17.cppm`
-```cpp
-export module t30013.mod17;
-
-export namespace clanguml::t30013 {
-struct CR { };
-}
-```
-File `tests/t30013/src/mod12.cppm`
-```cpp
-export module t30013.mod12;
-
-export namespace clanguml::t30013 {
-struct CL { };
-}
-```
-File `tests/t30013/src/mod8.cppm`
-```cpp
-export module t30013.mod8;
-
-export namespace clanguml::t30013 {
-struct CH { };
-}
-```
-File `tests/t30013/src/mod10.cppm`
-```cpp
-export module t30013.mod10;
-
-export namespace clanguml::t30013 {
-struct CJ { };
-}
-```
-File `tests/t30013/src/mod14.cppm`
-```cpp
-export module t30013.mod14;
-
-export namespace clanguml::t30013 {
-struct CN { };
-}
-```
-File `tests/t30013/src/mod1.cppm`
-```cpp
-export module t30013.mod1;
-
-export namespace clanguml::t30013 {
-struct CA { };
-}
-```
-File `tests/t30013/src/mod6.cppm`
-```cpp
-export module t30013.mod6;
-
-export namespace clanguml::t30013 {
-struct CF { };
-}
-```
-File `tests/t30013/src/mod5.cppm`
-```cpp
-export module t30013.mod5;
-
-export namespace clanguml::t30013 {
-struct CE { };
-}
-```
 ## Generated PlantUML diagrams
 ![t30013_package](./t30013_package.svg "C++20 modules package dependencies diagram test")
 ## Generated Mermaid diagrams
@@ -274,250 +275,270 @@ struct CE { };
       "id": "2044296282469444594",
       "is_deprecated": false,
       "name": "mod1",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod1.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod2",
       "id": "1532747677179216874",
       "is_deprecated": false,
       "name": "mod2",
+      "namespace": "t30013",
       "source_location": {
         "column": 30,
         "file": "src/mod2.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod3",
       "id": "2181211985644595508",
       "is_deprecated": false,
       "name": "mod3",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod3.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod4",
       "id": "1994575092781206355",
       "is_deprecated": false,
       "name": "mod4",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod4.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod5",
       "id": "83546849245676714",
       "is_deprecated": false,
       "name": "mod5",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod5.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod6",
       "id": "441620369599169965",
       "is_deprecated": false,
       "name": "mod6",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod6.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod7",
       "id": "836435135277319151",
       "is_deprecated": false,
       "name": "mod7",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod7.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod8",
       "id": "420790450869221512",
       "is_deprecated": false,
       "name": "mod8",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod8.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod9",
       "id": "396495954682989840",
       "is_deprecated": false,
       "name": "mod9",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod9.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod10",
       "id": "2177162846045884064",
       "is_deprecated": false,
       "name": "mod10",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod10.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod11",
       "id": "1414886740502603020",
       "is_deprecated": false,
       "name": "mod11",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod11.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod12",
       "id": "1312439587201843275",
       "is_deprecated": false,
       "name": "mod12",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod12.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod13",
       "id": "1087761784810349022",
       "is_deprecated": false,
       "name": "mod13",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod13.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod14",
       "id": "613410583917815311",
       "is_deprecated": false,
       "name": "mod14",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod14.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod15",
       "id": "1226951305255100636",
       "is_deprecated": false,
       "name": "mod15",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod15.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod16",
       "id": "1931818205177002737",
       "is_deprecated": false,
       "name": "mod16",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod16.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod17",
       "id": "1954698286919808752",
       "is_deprecated": false,
       "name": "mod17",
+      "namespace": "t30013",
       "source_location": {
         "column": 8,
         "file": "src/mod17.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "mod18",
       "id": "984386744169567889",
       "is_deprecated": false,
       "name": "mod18",
+      "namespace": "t30013",
       "source_location": {
         "column": 12,
         "file": "src/mod18.cppm",
         "line": 4,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     },
     {
       "display_name": "app",
       "id": "45223532970498010",
       "is_deprecated": false,
       "name": "app",
+      "namespace": "t30013",
       "source_location": {
         "column": 7,
         "file": "src/app.cppm",
         "line": 32,
         "translation_unit": "t30013.cc"
       },
-      "type": "namespace"
+      "type": "module"
     }
   ],
   "name": "t30013_package",
+  "package_type": "module",
   "relationships": [
     {
       "destination": "420790450869221512",
@@ -609,6 +630,7 @@ struct CE { };
       "source": "45223532970498010",
       "type": "dependency"
     }
-  ]
+  ],
+  "using_module": "t30013"
 }
 ```
diff --git a/docs/test_cases/t30013_package.svg b/docs/test_cases/t30013_package.svg
index 2fb2f341..8ce4750f 100644
--- a/docs/test_cases/t30013_package.svg
+++ b/docs/test_cases/t30013_package.svg
@@ -1,174 +1,144 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="180px" preserveAspectRatio="none" style="width:1724px;height:180px;background:#FFFFFF;" version="1.1" viewBox="0 0 1724 180" width="1724px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="185px" preserveAspectRatio="none" style="width:1865px;height:185px;" version="1.1" viewBox="0 0 1865 185" width="1865px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1dvgilhbgsogz" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
-      <path d="M8.5,119.894 L47.5,119.894 A3.75,3.75 0 0 1 50,122.394 L57,142.6939 L61.5,142.6939 A2.5,2.5 0 0 1 64,145.1939 L64,170.9938 A2.5,2.5 0 0 1 61.5,173.4938 L8.5,173.4938 A2.5,2.5 0 0 1 6,170.9938 L6,122.394 A2.5,2.5 0 0 1 8.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="6" x2="57" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="10" y="134.8999">mod1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="6,121,56,121,63,143.2969,70,143.2969,70,173.5938,6,173.5938,6,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="63" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="10" y="135.9951">mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
-      <path d="M101.5,119.894 L140.5,119.894 A3.75,3.75 0 0 1 143,122.394 L150,142.6939 L154.5,142.6939 A2.5,2.5 0 0 1 157,145.1939 L157,170.9938 A2.5,2.5 0 0 1 154.5,173.4938 L101.5,173.4938 A2.5,2.5 0 0 1 99,170.9938 L99,122.394 A2.5,2.5 0 0 1 101.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="99" x2="150" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="103" y="134.8999">mod2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="105,121,155,121,162,143.2969,169,143.2969,169,173.5938,105,173.5938,105,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="162" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="109" y="135.9951">mod2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod3.cppm#L4" target="_top" title="mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod3.cppm#L4" xlink:show="new" xlink:title="mod3" xlink:type="simple">
-      <path d="M194.5,119.894 L233.5,119.894 A3.75,3.75 0 0 1 236,122.394 L243,142.6939 L247.5,142.6939 A2.5,2.5 0 0 1 250,145.1939 L250,170.9938 A2.5,2.5 0 0 1 247.5,173.4938 L194.5,173.4938 A2.5,2.5 0 0 1 192,170.9938 L192,122.394 A2.5,2.5 0 0 1 194.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="192" x2="243" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="196" y="134.8999">mod3</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod3.cppm#L4" target="_top" title="mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod3.cppm#L4" xlink:show="new" xlink:title="mod3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="204,121,254,121,261,143.2969,268,143.2969,268,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="261" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="208" y="135.9951">mod3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod4.cppm#L4" target="_top" title="mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod4.cppm#L4" xlink:show="new" xlink:title="mod4" xlink:type="simple">
-      <path d="M287.5,119.894 L326.5,119.894 A3.75,3.75 0 0 1 329,122.394 L336,142.6939 L340.5,142.6939 A2.5,2.5 0 0 1 343,145.1939 L343,170.9938 A2.5,2.5 0 0 1 340.5,173.4938 L287.5,173.4938 A2.5,2.5 0 0 1 285,170.9938 L285,122.394 A2.5,2.5 0 0 1 287.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="285" x2="336" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="289" y="134.8999">mod4</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod4.cppm#L4" target="_top" title="mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod4.cppm#L4" xlink:show="new" xlink:title="mod4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="303,121,353,121,360,143.2969,367,143.2969,367,173.5938,303,173.5938,303,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="303" x2="360" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="307" y="135.9951">mod4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod5.cppm#L4" target="_top" title="mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod5.cppm#L4" xlink:show="new" xlink:title="mod5" xlink:type="simple">
-      <path d="M380.5,119.894 L419.5,119.894 A3.75,3.75 0 0 1 422,122.394 L429,142.6939 L433.5,142.6939 A2.5,2.5 0 0 1 436,145.1939 L436,170.9938 A2.5,2.5 0 0 1 433.5,173.4938 L380.5,173.4938 A2.5,2.5 0 0 1 378,170.9938 L378,122.394 A2.5,2.5 0 0 1 380.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="378" x2="429" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="382" y="134.8999">mod5</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod5.cppm#L4" target="_top" title="mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod5.cppm#L4" xlink:show="new" xlink:title="mod5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="402,121,452,121,459,143.2969,466,143.2969,466,173.5938,402,173.5938,402,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="402" x2="459" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="406" y="135.9951">mod5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod6.cppm#L4" target="_top" title="mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod6.cppm#L4" xlink:show="new" xlink:title="mod6" xlink:type="simple">
-      <path d="M473.5,119.894 L512.5,119.894 A3.75,3.75 0 0 1 515,122.394 L522,142.6939 L526.5,142.6939 A2.5,2.5 0 0 1 529,145.1939 L529,170.9938 A2.5,2.5 0 0 1 526.5,173.4938 L473.5,173.4938 A2.5,2.5 0 0 1 471,170.9938 L471,122.394 A2.5,2.5 0 0 1 473.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="471" x2="522" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="475" y="134.8999">mod6</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod6.cppm#L4" target="_top" title="mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod6.cppm#L4" xlink:show="new" xlink:title="mod6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="501,121,551,121,558,143.2969,565,143.2969,565,173.5938,501,173.5938,501,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="501" x2="558" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="505" y="135.9951">mod6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod7.cppm#L4" target="_top" title="mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod7.cppm#L4" xlink:show="new" xlink:title="mod7" xlink:type="simple">
-      <path d="M566.5,119.894 L605.5,119.894 A3.75,3.75 0 0 1 608,122.394 L615,142.6939 L619.5,142.6939 A2.5,2.5 0 0 1 622,145.1939 L622,170.9938 A2.5,2.5 0 0 1 619.5,173.4938 L566.5,173.4938 A2.5,2.5 0 0 1 564,170.9938 L564,122.394 A2.5,2.5 0 0 1 566.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="564" x2="615" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="568" y="134.8999">mod7</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod7.cppm#L4" target="_top" title="mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod7.cppm#L4" xlink:show="new" xlink:title="mod7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="600,121,650,121,657,143.2969,664,143.2969,664,173.5938,600,173.5938,600,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="600" x2="657" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="604" y="135.9951">mod7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod8.cppm#L4" target="_top" title="mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod8.cppm#L4" xlink:show="new" xlink:title="mod8" xlink:type="simple">
-      <path d="M659.5,119.894 L698.5,119.894 A3.75,3.75 0 0 1 701,122.394 L708,142.6939 L712.5,142.6939 A2.5,2.5 0 0 1 715,145.1939 L715,170.9938 A2.5,2.5 0 0 1 712.5,173.4938 L659.5,173.4938 A2.5,2.5 0 0 1 657,170.9938 L657,122.394 A2.5,2.5 0 0 1 659.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="657" x2="708" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="661" y="134.8999">mod8</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod8.cppm#L4" target="_top" title="mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod8.cppm#L4" xlink:show="new" xlink:title="mod8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="699,121,749,121,756,143.2969,763,143.2969,763,173.5938,699,173.5938,699,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="699" x2="756" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="703" y="135.9951">mod8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod9.cppm#L4" target="_top" title="mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod9.cppm#L4" xlink:show="new" xlink:title="mod9" xlink:type="simple">
-      <path d="M752.5,119.894 L791.5,119.894 A3.75,3.75 0 0 1 794,122.394 L801,142.6939 L805.5,142.6939 A2.5,2.5 0 0 1 808,145.1939 L808,170.9938 A2.5,2.5 0 0 1 805.5,173.4938 L752.5,173.4938 A2.5,2.5 0 0 1 750,170.9938 L750,122.394 A2.5,2.5 0 0 1 752.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="750" x2="801" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="754" y="134.8999">mod9</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod9.cppm#L4" target="_top" title="mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod9.cppm#L4" xlink:show="new" xlink:title="mod9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="798,121,848,121,855,143.2969,862,143.2969,862,173.5938,798,173.5938,798,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="798" x2="855" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="802" y="135.9951">mod9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod10.cppm#L4" target="_top" title="mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod10.cppm#L4" xlink:show="new" xlink:title="mod10" xlink:type="simple">
-      <path d="M845.5,119.894 L892.5,119.894 A3.75,3.75 0 0 1 895,122.394 L902,142.6939 L906.5,142.6939 A2.5,2.5 0 0 1 909,145.1939 L909,170.9938 A2.5,2.5 0 0 1 906.5,173.4938 L845.5,173.4938 A2.5,2.5 0 0 1 843,170.9938 L843,122.394 A2.5,2.5 0 0 1 845.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="843" x2="902" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="847" y="134.8999">mod10</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod10.cppm#L4" target="_top" title="mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod10.cppm#L4" xlink:show="new" xlink:title="mod10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="897,121,957,121,964,143.2969,971,143.2969,971,173.5938,897,173.5938,897,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="897" x2="964" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="901" y="135.9951">mod10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod11.cppm#L4" target="_top" title="mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod11.cppm#L4" xlink:show="new" xlink:title="mod11" xlink:type="simple">
-      <path d="M946.5,119.894 L993.5,119.894 A3.75,3.75 0 0 1 996,122.394 L1003,142.6939 L1007.5,142.6939 A2.5,2.5 0 0 1 1010,145.1939 L1010,170.9938 A2.5,2.5 0 0 1 1007.5,173.4938 L946.5,173.4938 A2.5,2.5 0 0 1 944,170.9938 L944,122.394 A2.5,2.5 0 0 1 946.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="944" x2="1003" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="948" y="134.8999">mod11</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod11.cppm#L4" target="_top" title="mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod11.cppm#L4" xlink:show="new" xlink:title="mod11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1006,121,1066,121,1073,143.2969,1080,143.2969,1080,173.5938,1006,173.5938,1006,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1006" x2="1073" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1010" y="135.9951">mod11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod12.cppm#L4" target="_top" title="mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod12.cppm#L4" xlink:show="new" xlink:title="mod12" xlink:type="simple">
-      <path d="M1047.5,119.894 L1094.5,119.894 A3.75,3.75 0 0 1 1097,122.394 L1104,142.6939 L1108.5,142.6939 A2.5,2.5 0 0 1 1111,145.1939 L1111,170.9938 A2.5,2.5 0 0 1 1108.5,173.4938 L1047.5,173.4938 A2.5,2.5 0 0 1 1045,170.9938 L1045,122.394 A2.5,2.5 0 0 1 1047.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1045" x2="1104" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1049" y="134.8999">mod12</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod12.cppm#L4" target="_top" title="mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod12.cppm#L4" xlink:show="new" xlink:title="mod12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1115,121,1175,121,1182,143.2969,1189,143.2969,1189,173.5938,1115,173.5938,1115,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1115" x2="1182" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1119" y="135.9951">mod12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod13.cppm#L4" target="_top" title="mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod13.cppm#L4" xlink:show="new" xlink:title="mod13" xlink:type="simple">
-      <path d="M1148.5,119.894 L1195.5,119.894 A3.75,3.75 0 0 1 1198,122.394 L1205,142.6939 L1209.5,142.6939 A2.5,2.5 0 0 1 1212,145.1939 L1212,170.9938 A2.5,2.5 0 0 1 1209.5,173.4938 L1148.5,173.4938 A2.5,2.5 0 0 1 1146,170.9938 L1146,122.394 A2.5,2.5 0 0 1 1148.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1146" x2="1205" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1150" y="134.8999">mod13</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod13.cppm#L4" target="_top" title="mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod13.cppm#L4" xlink:show="new" xlink:title="mod13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1224,121,1284,121,1291,143.2969,1298,143.2969,1298,173.5938,1224,173.5938,1224,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1224" x2="1291" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1228" y="135.9951">mod13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod14.cppm#L4" target="_top" title="mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod14.cppm#L4" xlink:show="new" xlink:title="mod14" xlink:type="simple">
-      <path d="M1249.5,119.894 L1296.5,119.894 A3.75,3.75 0 0 1 1299,122.394 L1306,142.6939 L1310.5,142.6939 A2.5,2.5 0 0 1 1313,145.1939 L1313,170.9938 A2.5,2.5 0 0 1 1310.5,173.4938 L1249.5,173.4938 A2.5,2.5 0 0 1 1247,170.9938 L1247,122.394 A2.5,2.5 0 0 1 1249.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1247" x2="1306" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1251" y="134.8999">mod14</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod14.cppm#L4" target="_top" title="mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod14.cppm#L4" xlink:show="new" xlink:title="mod14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1333,121,1393,121,1400,143.2969,1407,143.2969,1407,173.5938,1333,173.5938,1333,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1333" x2="1400" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1337" y="135.9951">mod14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod15.cppm#L4" target="_top" title="mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod15.cppm#L4" xlink:show="new" xlink:title="mod15" xlink:type="simple">
-      <path d="M1350.5,119.894 L1397.5,119.894 A3.75,3.75 0 0 1 1400,122.394 L1407,142.6939 L1411.5,142.6939 A2.5,2.5 0 0 1 1414,145.1939 L1414,170.9938 A2.5,2.5 0 0 1 1411.5,173.4938 L1350.5,173.4938 A2.5,2.5 0 0 1 1348,170.9938 L1348,122.394 A2.5,2.5 0 0 1 1350.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1348" x2="1407" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1352" y="134.8999">mod15</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod15.cppm#L4" target="_top" title="mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod15.cppm#L4" xlink:show="new" xlink:title="mod15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1442,121,1502,121,1509,143.2969,1516,143.2969,1516,173.5938,1442,173.5938,1442,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1442" x2="1509" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1446" y="135.9951">mod15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod16.cppm#L4" target="_top" title="mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod16.cppm#L4" xlink:show="new" xlink:title="mod16" xlink:type="simple">
-      <path d="M1451.5,119.894 L1498.5,119.894 A3.75,3.75 0 0 1 1501,122.394 L1508,142.6939 L1512.5,142.6939 A2.5,2.5 0 0 1 1515,145.1939 L1515,170.9938 A2.5,2.5 0 0 1 1512.5,173.4938 L1451.5,173.4938 A2.5,2.5 0 0 1 1449,170.9938 L1449,122.394 A2.5,2.5 0 0 1 1451.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1449" x2="1508" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1453" y="134.8999">mod16</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod16.cppm#L4" target="_top" title="mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod16.cppm#L4" xlink:show="new" xlink:title="mod16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1551,121,1611,121,1618,143.2969,1625,143.2969,1625,173.5938,1551,173.5938,1551,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1551" x2="1618" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1555" y="135.9951">mod16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod17.cppm#L4" target="_top" title="mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod17.cppm#L4" xlink:show="new" xlink:title="mod17" xlink:type="simple">
-      <path d="M1552.5,119.894 L1599.5,119.894 A3.75,3.75 0 0 1 1602,122.394 L1609,142.6939 L1613.5,142.6939 A2.5,2.5 0 0 1 1616,145.1939 L1616,170.9938 A2.5,2.5 0 0 1 1613.5,173.4938 L1552.5,173.4938 A2.5,2.5 0 0 1 1550,170.9938 L1550,122.394 A2.5,2.5 0 0 1 1552.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1550" x2="1609" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1554" y="134.8999">mod17</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod17.cppm#L4" target="_top" title="mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod17.cppm#L4" xlink:show="new" xlink:title="mod17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1660,121,1720,121,1727,143.2969,1734,143.2969,1734,173.5938,1660,173.5938,1660,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1660" x2="1727" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1664" y="135.9951">mod17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod18.cppm#L4" target="_top" title="mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/mod18.cppm#L4" xlink:show="new" xlink:title="mod18" xlink:type="simple">
-      <path d="M1653.5,119.894 L1700.5,119.894 A3.75,3.75 0 0 1 1703,122.394 L1710,142.6939 L1714.5,142.6939 A2.5,2.5 0 0 1 1717,145.1939 L1717,170.9938 A2.5,2.5 0 0 1 1714.5,173.4938 L1653.5,173.4938 A2.5,2.5 0 0 1 1651,170.9938 L1651,122.394 A2.5,2.5 0 0 1 1653.5,119.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="1651" x2="1710" y1="142.6939" y2="142.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="46" x="1655" y="134.8999">mod18</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod18.cppm#L4" target="_top" title="mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod18.cppm#L4" xlink:show="new" xlink:title="mod18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1769,121,1829,121,1836,143.2969,1843,143.2969,1843,173.5938,1769,173.5938,1769,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1769" x2="1836" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1773" y="135.9951">mod18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/app.cppm#L32" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t30013/src/app.cppm#L32" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <path d="M806.5,6.294 L833.5,6.294 A3.75,3.75 0 0 1 836,8.794 L843,29.0939 L847.5,29.0939 A2.5,2.5 0 0 1 850,31.5939 L850,57.3938 A2.5,2.5 0 0 1 847.5,59.8938 L806.5,59.8938 A2.5,2.5 0 0 1 804,57.3938 L804,8.794 A2.5,2.5 0 0 1 806.5,6.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="804" x2="843" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="26" x="808" y="21.2999">app</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/app.cppm#L32" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/app.cppm#L32" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="857.5,8,892.5,8,899.5,30.2969,906.5,30.2969,906.5,60.5938,857.5,60.5938,857.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="857.5" x2="899.5" y1="30.2969" y2="30.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="861.5" y="22.9951">app</text>
     </a>
-    <g id="link_C_0000045223532970498010_C_0000420790450869221512">
-      <path codeLine="39" d="M803.72,52.524 C779.55,71.654 746.3739,97.8993 720.1439,118.6693 " fill="none" id="C_0000045223532970498010-to-C_0000420790450869221512" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="715.44,122.394,724.979,119.9428,719.3599,119.29,720.0127,113.671,715.44,122.394" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0000396495954682989840">
-      <path codeLine="40" d="M815.75,60.264 C808.04,78.174 800.2406,96.3021 792.5506,114.1821 " fill="none" id="C_0000045223532970498010-to-C_0000396495954682989840" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="790.18,119.694,797.4104,113.0066,792.1555,115.1008,790.0613,109.8458,790.18,119.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0002044296282469444594">
-      <path codeLine="41" d="M803.71,35.534 C693.16,42.544 220.86,74.654 81,119.894 C75.42,121.694 75.0984,121.4751 69.7384,124.2251 " fill="none" id="C_0000045223532970498010-to-C_0002044296282469444594" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="64.4,126.964,74.2335,126.4145,68.8487,124.6816,70.5816,119.2967,64.4,126.964" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0001532747677179216874">
-      <path codeLine="42" d="M803.74,34.004 C717.75,34.334 410.54,41.274 174,119.894 C168.44,121.744 168.1122,121.5331 162.7622,124.2931 " fill="none" id="C_0000045223532970498010-to-C_0001532747677179216874" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="157.43,127.044,167.2623,126.4726,161.8735,124.7516,163.5945,119.3629,157.43,127.044" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0002181211985644595508">
-      <path codeLine="43" d="M803.62,34.704 C725.43,37.354 466.71,51.134 267,119.894 C261.46,121.804 261.1341,121.5974 255.7841,124.3774 " fill="none" id="C_0000045223532970498010-to-C_0002181211985644595508" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="250.46,127.144,260.2905,126.5436,254.8968,124.8385,256.6018,119.4447,250.46,127.144" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0001994575092781206355">
-      <path codeLine="44" d="M803.95,35.644 C734.77,40.844 523.6,60.834 360,119.894 C354.32,121.944 353.8093,121.8591 348.3193,124.7491 " fill="none" id="C_0000045223532970498010-to-C_0001994575092781206355" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="343.01,127.544,352.8372,126.8912,347.4344,125.2149,349.1107,119.8121,343.01,127.544" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0001226951305255100636">
-      <path codeLine="45" d="M850.47,35.524 C923.47,40.504 1152.32,60.184 1331,119.894 C1336.56,121.754 1336.8372,121.5863 1342.3072,124.1763 " fill="none" id="C_0000045223532970498010-to-C_0001226951305255100636" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1347.73,126.744,1341.3075,119.2773,1343.211,124.6043,1337.884,126.5077,1347.73,126.744" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0000984386744169567889">
-      <path codeLine="46" d="M850.21,35.404 C965.91,42.104 1480.98,74.044 1634,119.894 C1639.52,121.544 1639.7052,121.2932 1645.1052,123.7932 " fill="none" id="C_0000045223532970498010-to-C_0000984386744169567889" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1650.55,126.314,1644.0633,118.903,1646.0127,124.2134,1640.7023,126.1627,1650.55,126.314" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0001931818205177002737">
-      <path codeLine="47" d="M850.42,34.614 C932.42,37.034 1213.43,50.214 1432,119.894 C1437.58,121.674 1437.8733,121.4744 1443.3433,124.0544 " fill="none" id="C_0000045223532970498010-to-C_0001931818205177002737" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1448.77,126.614,1442.3364,119.1569,1444.2478,124.481,1438.9236,126.3924,1448.77,126.614" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0000613410583917815311">
-      <path codeLine="48" d="M850.32,36.844 C913.13,44.724 1090.55,70.084 1230,119.894 C1235.52,121.864 1235.7867,121.7463 1241.2467,124.3563 " fill="none" id="C_0000045223532970498010-to-C_0000613410583917815311" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1246.66,126.944,1240.2652,119.4536,1242.1489,124.7876,1236.8149,126.6713,1246.66,126.944" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0000083546849245676714">
-      <path codeLine="49" d="M803.55,37.094 C743.59,45.284 580.41,70.724 453,119.894 C447.36,122.074 446.8652,122.0125 441.3852,124.9325 " fill="none" id="C_0000045223532970498010-to-C_0000083546849245676714" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="436.09,127.754,445.9138,127.0518,440.5027,125.4027,442.1518,119.9916,436.09,127.754" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0000836435135277319151">
-      <path codeLine="50" d="M803.55,44.054 C767.68,59.444 697.23,90.344 639,119.894 C633.61,122.634 633.1899,122.7591 627.7499,125.7691 " fill="none" id="C_0000045223532970498010-to-C_0000836435135277319151" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="622.5,128.674,632.3115,127.8167,626.875,126.2533,628.4384,120.8168,622.5,128.674" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0001954698286919808752">
-      <path codeLine="51" d="M850.47,33.964 C940.87,34.094 1274.27,40.244 1533,119.894 C1538.51,121.594 1538.689,121.3449 1544.089,123.8549 " fill="none" id="C_0000045223532970498010-to-C_0001954698286919808752" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1549.53,126.384,1543.0546,118.9631,1544.9959,124.2765,1539.6825,126.2177,1549.53,126.384" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0000441620369599169965">
-      <path codeLine="52" d="M803.83,39.374 C755,50.884 638.41,80.414 546,119.894 C540.44,122.264 539.975,122.2934 534.505,125.2334 " fill="none" id="C_0000045223532970498010-to-C_0000441620369599169965" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="529.22,128.074,539.0412,127.3365,533.6242,125.7068,535.2538,120.2898,529.22,128.074" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0002177162846045884064">
-      <path codeLine="53" d="M838.49,60.264 C846.35,78.174 854.3306,96.319 862.1706,114.199 " fill="none" id="C_0000045223532970498010-to-C_0002177162846045884064" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="864.58,119.694,864.6292,109.8452,862.5721,115.1148,857.3025,113.0578,864.58,119.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0001414886740502603020">
-      <path codeLine="54" d="M850.44,51.534 C875.49,70.164 910.5957,96.2931 938.8957,117.3431 " fill="none" id="C_0000045223532970498010-to-C_0001414886740502603020" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="943.71,120.924,938.8759,112.3431,939.6981,117.9399,934.1013,118.7621,943.71,120.924" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0001312439587201843275">
-      <path codeLine="55" d="M850.46,43.454 C888.22,58.674 964.66,90.084 1028,119.894 C1033.39,122.434 1033.6952,122.5174 1039.1952,125.2974 " fill="none" id="C_0000045223532970498010-to-C_0001312439587201843275" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1044.55,128.004,1038.3222,120.3742,1040.0876,125.7485,1034.7133,127.5139,1044.55,128.004" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000045223532970498010_C_0001087761784810349022">
-      <path codeLine="56" d="M850.25,39.024 C901.6,50.284 1028.13,80.004 1129,119.894 C1134.45,122.054 1134.698,121.9823 1140.148,124.6423 " fill="none" id="C_0000045223532970498010-to-C_0001087761784810349022" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="1145.54,127.274,1139.2064,119.7317,1141.0466,125.0809,1135.6975,126.9211,1145.54,127.274" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <path d="M857.4,53.58 C832.95,71.56 795.16,99.33 767.27,119.84 " fill="none" id="C_0000045223532970498010-&gt;C_0000420790450869221512" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="763.23,122.81,772.8521,120.7089,767.2607,119.8513,768.1182,114.2599,763.23,122.81" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M869.94,61.24 C862.26,77.64 852.28,98.94 844.22,116.16 " fill="none" id="C_0000045223532970498010-&gt;C_0000396495954682989840" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="842,120.89,849.4485,114.4464,844.1269,116.3649,842.2084,111.0433,842,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M857.22,36.92 C739.55,43.87 236.82,75.72 87,121 C82.98,122.22 78.89,123.76 74.89,125.49 " fill="none" id="C_0000045223532970498010-&gt;C_0002044296282469444594" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="70.23,127.6,80.0787,127.5429,74.7872,125.5428,76.7872,120.2513,70.23,127.6" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M857.3,35.39 C765.96,35.64 439.46,42.31 186,121 C181.98,122.25 177.91,123.81 173.91,125.56 " fill="none" id="C_0000045223532970498010-&gt;C_0001532747677179216874" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="169.25,127.67,179.0985,127.5872,173.8018,125.601,175.7881,120.3043,169.25,127.67" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M857.46,36.08 C774.73,38.63 499.31,52.1 285,121 C280.93,122.31 276.79,123.93 272.74,125.73 " fill="none" id="C_0000045223532970498010-&gt;C_0002181211985644595508" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="268.02,127.9,277.8681,127.78,272.564,125.8138,274.5302,120.5096,268.02,127.9" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M857.24,37.04 C783.45,42.19 559.2,61.98 384,121 C379.95,122.36 375.83,124.03 371.77,125.84 " fill="none" id="C_0000045223532970498010-&gt;C_0001994575092781206355" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="367.06,128.03,376.9076,127.8726,371.596,125.9265,373.5421,120.615,367.06,128.03" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906.64,36.88 C984.41,41.76 1230.96,61.26 1425,121 C1428.99,122.23 1433.06,123.7 1437.08,125.31 " fill="none" id="C_0000045223532970498010-&gt;C_0001226951305255100636" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1441.78,127.26,1434.9998,120.1166,1437.1617,125.344,1431.9342,127.5059,1441.78,127.26" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906.57,36.78 C1030.33,43.38 1585.96,75.12 1752,121 C1756.02,122.11 1760.11,123.5 1764.16,125.06 " fill="none" id="C_0000045223532970498010-&gt;C_0000984386744169567889" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1768.87,126.96,1762.0068,119.8963,1764.2296,125.0981,1759.0278,127.3209,1768.87,126.96" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906.54,35.99 C993.8,38.32 1296.59,51.24 1534,121 C1538,122.18 1542.08,123.61 1546.12,125.2 " fill="none" id="C_0000045223532970498010-&gt;C_0001931818205177002737" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1550.82,127.12,1544.0132,120.0019,1546.1945,125.2213,1540.9752,127.4027,1550.82,127.12" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906.53,38.18 C973.51,45.96 1164.63,71.2 1316,121 C1319.96,122.3 1324.02,123.83 1328.03,125.47 " fill="none" id="C_0000045223532970498010-&gt;C_0000613410583917815311" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1332.72,127.45,1325.9775,120.2709,1328.1118,125.5097,1322.8731,127.644,1332.72,127.45" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M857.07,38.47 C793.3,46.58 619.65,71.82 483,121 C478.98,122.45 474.87,124.16 470.83,126.01 " fill="none" id="C_0000045223532970498010-&gt;C_0000083546849245676714" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="466.13,128.23,475.9767,128.0216,470.6551,126.1031,472.5736,120.7815,466.13,128.23" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M857.28,45.29 C819.09,60.58 743.59,91.46 681,121 C677.07,122.85 673,124.85 668.96,126.88 " fill="none" id="C_0000045223532970498010-&gt;C_0000836435135277319151" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="664.24,129.27,674.0763,128.7725,668.7006,127.0111,670.462,121.6354,664.24,129.27" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906.55,35.36 C1002.66,35.41 1361.94,41.24 1643,121 C1647.01,122.14 1651.1,123.55 1655.14,125.12 " fill="none" id="C_0000045223532970498010-&gt;C_0001954698286919808752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1659.85,127.03,1653.0056,119.9481,1655.2146,125.1558,1650.0068,127.3648,1659.85,127.03" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M857.34,40.74 C805.35,52.19 681.13,81.55 582,121 C578.03,122.58 573.96,124.38 569.94,126.28 " fill="none" id="C_0000045223532970498010-&gt;C_0000441620369599169965" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="565.25,128.55,575.0932,128.2159,569.7475,126.3655,571.598,121.0198,565.25,128.55" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M894.06,61.24 C901.74,77.64 911.72,98.94 919.78,116.16 " fill="none" id="C_0000045223532970498010-&gt;C_0002177162846045884064" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="922,120.89,921.7916,111.0433,919.8731,116.3649,914.5515,114.4464,922,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906.8,52.6 C932.02,69.99 971.55,97.24 1001.54,117.92 " fill="none" id="C_0000045223532970498010-&gt;C_0001414886740502603020" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1005.9,120.92,1000.7497,112.5251,1001.7798,118.0874,996.2175,119.1174,1005.9,120.92" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906.5,44.61 C946.78,59.72 1029.36,91.24 1098,121 C1101.97,122.72 1106.07,124.55 1110.17,126.42 " fill="none" id="C_0000045223532970498010-&gt;C_0001312439587201843275" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1114.96,128.63,1108.4498,121.2396,1110.416,126.5438,1105.1119,128.51,1114.96,128.63" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906.52,40.34 C961.35,51.5 1097.63,81.17 1207,121 C1210.99,122.45 1215.09,124.09 1219.15,125.83 " fill="none" id="C_0000045223532970498010-&gt;C_0001087761784810349022" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1223.91,127.9,1217.2595,120.6356,1219.3269,125.9012,1214.0614,127.9685,1223.91,127.9" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30013_package_mermaid.svg b/docs/test_cases/t30013_package_mermaid.svg
index 9e88cc84..ec097879 100644
--- a/docs/test_cases/t30013_package_mermaid.svg
+++ b/docs/test_cases/t30013_package_mermaid.svg
@@ -1,45 +1,45 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 1935.390625 132" style="max-width: 1935.39px; background-color: white;" width="1935.390625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000420790450869221512" id="L-C_0000045223532970498010-C_0000420790450869221512-0" d="M926.1015625,17.44116222554551L776.3372395833334,24.200968521287923C626.5729166666666,30.96077481703034,327.0442708333333,44.48038740851516,177.27994791666666,54.52352703759092C27.515625,64.56666666666666,27.515625,71.13333333333334,27.515625,74.41666666666667L27.515625,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000396495954682989840" id="L-C_0000045223532970498010-C_0000396495954682989840-0" d="M926.1015625,17.56254076973255L793.8424479166666,24.302117308110457C661.5833333333334,31.041693846488368,397.0651041666667,44.520846923244186,264.8059895833333,54.54375679495542C132.546875,64.56666666666666,132.546875,71.13333333333334,132.546875,74.41666666666667L132.546875,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002044296282469444594" id="L-C_0000045223532970498010-C_0002044296282469444594-0" d="M926.1015625,17.71986233480176L811.34765625,24.433218612334798C696.59375,31.14657488986784,467.0859375,44.57328744493392,352.33203125,54.56997705580029C237.578125,64.56666666666666,237.578125,71.13333333333334,237.578125,74.41666666666667L237.578125,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001532747677179216874" id="L-C_0000045223532970498010-C_0001532747677179216874-0" d="M926.1015625,17.9318669527897L828.8528645833334,24.60988912732475C731.6041666666666,31.287911301859804,537.1067708333334,44.643955650929904,439.8580729166667,54.60531115879829C342.609375,64.56666666666666,342.609375,71.13333333333334,342.609375,74.41666666666667L342.609375,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002181211985644595508" id="L-C_0000045223532970498010-C_0002181211985644595508-0" d="M926.1015625,18.233062648641884L846.3580729166666,24.860885540534905C766.6145833333334,31.488708432427924,607.1276041666666,44.744354216213964,527.3841145833334,54.65551044144032C447.640625,64.56666666666666,447.640625,71.13333333333334,447.640625,74.41666666666667L447.640625,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001994575092781206355" id="L-C_0000045223532970498010-C_0001994575092781206355-0" d="M926.1015625,18.694727351985417L863.86328125,25.24560612665452C801.625,31.796484901323613,677.1484375,44.898242450661805,614.91015625,54.73245455866424C552.671875,64.56666666666666,552.671875,71.13333333333334,552.671875,74.41666666666667L552.671875,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001226951305255100636" id="L-C_0000045223532970498010-C_0001226951305255100636-0" d="M926.1015625,19.538362364559045L882.109375,25.948635303799204C838.1171875,32.358908243039366,750.1328125,45.17945412151968,706.140625,54.87306039409318C662.1484375,64.56666666666666,662.1484375,71.13333333333334,662.1484375,74.41666666666667L662.1484375,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000984386744169567889" id="L-C_0000045223532970498010-C_0000984386744169567889-0" d="M926.1015625,21.563937274265076L901.0963541666666,27.636614395220892C876.0911458333334,33.70929151617671,826.0807291666666,45.85464575808836,801.0755208333334,55.21065621237751C776.0703125,64.56666666666666,776.0703125,71.13333333333334,776.0703125,74.41666666666667L776.0703125,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001931818205177002737" id="L-C_0000045223532970498010-C_0001931818205177002737-0" d="M926.1015625,31.691811822795227L920.0833333333334,36.07650985232936C914.0651041666666,40.46120788186349,902.0286458333334,49.230603940931736,896.0104166666666,56.8986353037992C889.9921875,64.56666666666666,889.9921875,71.13333333333334,889.9921875,74.41666666666667L889.9921875,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000613410583917815311" id="L-C_0000045223532970498010-C_0000613410583917815311-0" d="M967.8046875,31.691811822795227L973.8229166666666,36.07650985232936C979.8411458333334,40.46120788186349,991.8776041666666,49.230603940931736,997.8958333333334,56.8986353037992C1003.9140625,64.56666666666666,1003.9140625,71.13333333333334,1003.9140625,74.41666666666667L1003.9140625,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000083546849245676714" id="L-C_0000045223532970498010-C_0000083546849245676714-0" d="M967.8046875,21.699187945925647L992.0690104166666,27.74932328827137C1016.3333333333334,33.799458630617096,1064.8619791666667,45.89972931530855,1089.1263020833333,55.233197990987605C1113.390625,64.56666666666666,1113.390625,71.13333333333334,1113.390625,74.41666666666667L1113.390625,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000836435135277319151" id="L-C_0000045223532970498010-C_0000836435135277319151-0" d="M967.8046875,19.68762230919765L1009.57421875,26.073018590998043C1051.34375,32.458414872798436,1134.8828125,45.229207436399214,1176.65234375,54.89793705153294C1218.421875,64.56666666666666,1218.421875,71.13333333333334,1218.421875,74.41666666666667L1218.421875,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001954698286919808752" id="L-C_0000045223532970498010-C_0001954698286919808752-0" d="M967.8046875,18.771559237915547L1027.8203125,25.309632698262956C1087.8359375,31.847706158610364,1207.8671875,44.92385307930518,1267.8828125,54.74525987298592C1327.8984375,64.56666666666666,1327.8984375,71.13333333333334,1327.8984375,74.41666666666667L1327.8984375,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000441620369599169965" id="L-C_0000045223532970498010-C_0000441620369599169965-0" d="M967.8046875,18.264480517411666L1046.06640625,24.887067097843055C1124.328125,31.509653678274447,1280.8515625,44.75482683913722,1359.11328125,54.66074675290195C1437.375,64.56666666666666,1437.375,71.13333333333334,1437.375,74.41666666666667L1437.375,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002177162846045884064" id="L-C_0000045223532970498010-C_0002177162846045884064-0" d="M967.8046875,17.942477242241527L1064.3125,24.618731035201268C1160.8203125,31.294984828161017,1353.8359375,44.64749241408051,1450.34375,54.60707954037358C1546.8515625,64.56666666666666,1546.8515625,71.13333333333334,1546.8515625,74.41666666666667L1546.8515625,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001414886740502603020" id="L-C_0000045223532970498010-C_0001414886740502603020-0" d="M967.8046875,17.713274840349204L1083.2005208333333,24.427729033624335C1198.5963541666667,31.142183226899466,1429.3880208333333,44.57109161344974,1544.7838541666667,54.56887914005821C1660.1796875,64.56666666666666,1660.1796875,71.13333333333334,1660.1796875,74.41666666666667L1660.1796875,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001312439587201843275" id="L-C_0000045223532970498010-C_0001312439587201843275-0" d="M967.8046875,17.546923883968656L1102.0885416666667,24.289103236640546C1236.3723958333333,31.03128258931244,1504.9401041666667,44.51564129465621,1639.2239583333333,54.54115398066144C1773.5078125,64.56666666666666,1773.5078125,71.13333333333334,1773.5078125,74.41666666666667L1773.5078125,77.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001087761784810349022" id="L-C_0000045223532970498010-C_0001087761784810349022-0" d="M967.8046875,17.420107824324436L1121.0755208333333,24.18342318693703C1274.3463541666667,30.94673854954962,1580.8880208333333,44.47336927477482,1734.1588541666667,54.520017970720744C1887.4296875,64.56666666666666,1887.4296875,71.13333333333334,1887.4296875,74.41666666666667L1887.4296875,77.7"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000420790450869221512" id="L-C_0000045223532970498010-C_0000420790450869221512-0" d="M926.1015625,17.44116222554551L776.3372395833334,24.200968521287923C626.5729166666666,30.96077481703034,327.0442708333333,44.48038740851516,177.27994791666666,55.40686037092425C27.515625,66.33333333333333,27.515625,74.66666666666667,27.515625,78.83333333333333L27.515625,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000396495954682989840" id="L-C_0000045223532970498010-C_0000396495954682989840-0" d="M926.1015625,17.56254076973255L793.8424479166666,24.302117308110457C661.5833333333334,31.041693846488368,397.0651041666667,44.520846923244186,264.8059895833333,55.42709012828876C132.546875,66.33333333333333,132.546875,74.66666666666667,132.546875,78.83333333333333L132.546875,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002044296282469444594" id="L-C_0000045223532970498010-C_0002044296282469444594-0" d="M926.1015625,17.71986233480176L811.34765625,24.433218612334798C696.59375,31.14657488986784,467.0859375,44.57328744493392,352.33203125,55.45331038913363C237.578125,66.33333333333333,237.578125,74.66666666666667,237.578125,78.83333333333333L237.578125,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001532747677179216874" id="L-C_0000045223532970498010-C_0001532747677179216874-0" d="M926.1015625,17.9318669527897L828.8528645833334,24.60988912732475C731.6041666666666,31.287911301859804,537.1067708333334,44.643955650929904,439.8580729166667,55.48864449213162C342.609375,66.33333333333333,342.609375,74.66666666666667,342.609375,78.83333333333333L342.609375,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002181211985644595508" id="L-C_0000045223532970498010-C_0002181211985644595508-0" d="M926.1015625,18.233062648641884L846.3580729166666,24.860885540534905C766.6145833333334,31.488708432427924,607.1276041666666,44.744354216213964,527.3841145833334,55.538843774773646C447.640625,66.33333333333333,447.640625,74.66666666666667,447.640625,78.83333333333333L447.640625,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001994575092781206355" id="L-C_0000045223532970498010-C_0001994575092781206355-0" d="M926.1015625,18.694727351985417L863.86328125,25.24560612665452C801.625,31.796484901323613,677.1484375,44.898242450661805,614.91015625,55.61578789199757C552.671875,66.33333333333333,552.671875,74.66666666666667,552.671875,78.83333333333333L552.671875,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001226951305255100636" id="L-C_0000045223532970498010-C_0001226951305255100636-0" d="M926.1015625,19.538362364559045L882.109375,25.948635303799204C838.1171875,32.358908243039366,750.1328125,45.17945412151968,706.140625,55.756393727426506C662.1484375,66.33333333333333,662.1484375,74.66666666666667,662.1484375,78.83333333333333L662.1484375,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000984386744169567889" id="L-C_0000045223532970498010-C_0000984386744169567889-0" d="M926.1015625,21.563937274265076L901.0963541666666,27.636614395220892C876.0911458333334,33.70929151617671,826.0807291666666,45.85464575808836,801.0755208333334,56.09398954571085C776.0703125,66.33333333333333,776.0703125,74.66666666666667,776.0703125,78.83333333333333L776.0703125,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001931818205177002737" id="L-C_0000045223532970498010-C_0001931818205177002737-0" d="M926.1015625,31.691811822795227L920.0833333333334,36.07650985232936C914.0651041666666,40.46120788186349,902.0286458333334,49.230603940931736,896.0104166666666,57.781968637132536C889.9921875,66.33333333333333,889.9921875,74.66666666666667,889.9921875,78.83333333333333L889.9921875,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000613410583917815311" id="L-C_0000045223532970498010-C_0000613410583917815311-0" d="M967.8046875,31.691811822795227L973.8229166666666,36.07650985232936C979.8411458333334,40.46120788186349,991.8776041666666,49.230603940931736,997.8958333333334,57.781968637132536C1003.9140625,66.33333333333333,1003.9140625,74.66666666666667,1003.9140625,78.83333333333333L1003.9140625,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000083546849245676714" id="L-C_0000045223532970498010-C_0000083546849245676714-0" d="M967.8046875,21.699187945925647L992.0690104166666,27.74932328827137C1016.3333333333334,33.799458630617096,1064.8619791666667,45.89972931530855,1089.1263020833333,56.11653132432094C1113.390625,66.33333333333333,1113.390625,74.66666666666667,1113.390625,78.83333333333333L1113.390625,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000836435135277319151" id="L-C_0000045223532970498010-C_0000836435135277319151-0" d="M967.8046875,19.68762230919765L1009.57421875,26.073018590998043C1051.34375,32.458414872798436,1134.8828125,45.229207436399214,1176.65234375,55.781270384866275C1218.421875,66.33333333333333,1218.421875,74.66666666666667,1218.421875,78.83333333333333L1218.421875,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001954698286919808752" id="L-C_0000045223532970498010-C_0001954698286919808752-0" d="M967.8046875,18.771559237915547L1027.8203125,25.309632698262956C1087.8359375,31.847706158610364,1207.8671875,44.92385307930518,1267.8828125,55.62859320631926C1327.8984375,66.33333333333333,1327.8984375,74.66666666666667,1327.8984375,78.83333333333333L1327.8984375,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0000441620369599169965" id="L-C_0000045223532970498010-C_0000441620369599169965-0" d="M967.8046875,18.264480517411666L1046.06640625,24.887067097843055C1124.328125,31.509653678274447,1280.8515625,44.75482683913722,1359.11328125,55.54408008623528C1437.375,66.33333333333333,1437.375,74.66666666666667,1437.375,78.83333333333333L1437.375,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0002177162846045884064" id="L-C_0000045223532970498010-C_0002177162846045884064-0" d="M967.8046875,17.942477242241527L1064.3125,24.618731035201268C1160.8203125,31.294984828161017,1353.8359375,44.64749241408051,1450.34375,55.49041287370692C1546.8515625,66.33333333333333,1546.8515625,74.66666666666667,1546.8515625,78.83333333333333L1546.8515625,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001414886740502603020" id="L-C_0000045223532970498010-C_0001414886740502603020-0" d="M967.8046875,17.713274840349204L1083.2005208333333,24.427729033624335C1198.5963541666667,31.142183226899466,1429.3880208333333,44.57109161344974,1544.7838541666667,55.45221247339153C1660.1796875,66.33333333333333,1660.1796875,74.66666666666667,1660.1796875,78.83333333333333L1660.1796875,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001312439587201843275" id="L-C_0000045223532970498010-C_0001312439587201843275-0" d="M967.8046875,17.546923883968656L1102.0885416666667,24.289103236640546C1236.3723958333333,31.03128258931244,1504.9401041666667,44.51564129465621,1639.2239583333333,55.424487313994774C1773.5078125,66.33333333333333,1773.5078125,74.66666666666667,1773.5078125,78.83333333333333L1773.5078125,83"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000045223532970498010 LE-C_0001087761784810349022" id="L-C_0000045223532970498010-C_0001087761784810349022-0" d="M967.8046875,17.420107824324436L1121.0755208333333,24.18342318693703C1274.3463541666667,30.94673854954962,1580.8880208333333,44.47336927477482,1734.1588541666667,55.40335130405407C1887.4296875,66.33333333333333,1887.4296875,74.66666666666667,1887.4296875,78.83333333333333L1887.4296875,83"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
diff --git a/docs/test_cases/t30014.md b/docs/test_cases/t30014.md
new file mode 100644
index 00000000..f68feaca
--- /dev/null
+++ b/docs/test_cases/t30014.md
@@ -0,0 +1,161 @@
+# t30014 - C++20 modules package diagram test with partitions
+## Config
+```yaml
+diagrams:
+  t30014_package:
+    type: package
+    glob:
+      - t30014.cc
+    package_type: module
+    include:
+      modules:
+        - t30014
+    exclude:
+      modules:
+        - t30014.app:lib1.mod2
+    using_module: t30014
+```
+## Source code
+File `tests/t30014/t30014.cc`
+```cpp
+import t30014.app;
+
+namespace clanguml {
+namespace t30014 {
+}
+}
+```
+File `tests/t30014/src/lib1mod2.cppm`
+```cpp
+export module t30014.app:lib1.mod2;
+
+export namespace clanguml::t30014 {
+class E { };
+} // namespace clanguml::t30014
+```
+File `tests/t30014/src/t30014_mod.cppm`
+```cpp
+export module t30014.app;
+import :lib1;
+import :lib1.mod1;
+import :lib1.mod2;
+import :lib2;
+
+export namespace clanguml::t30014 {
+class A {
+    int get() { return a; }
+
+    int a;
+};
+} // namespace clanguml::t30014
+```
+File `tests/t30014/src/lib2.cppm`
+```cpp
+export module t30014.app:lib2;
+
+export namespace clanguml::t30014 {
+class C { };
+
+template <typename T> class CC {
+    T t;
+};
+
+namespace detail {
+enum class CCC { ccc1, ccc2 };
+} // namespace detail
+} // namespace clanguml::t30014
+```
+File `tests/t30014/src/lib1.cppm`
+```cpp
+export module t30014.app:lib1;
+
+export namespace clanguml::t30014 {
+class B { };
+
+template <typename T> class BB {
+    T t;
+};
+
+namespace detail {
+enum class BBB { bbb1, bbb2 };
+} // namespace detail
+} // namespace clanguml::t30014
+```
+File `tests/t30014/src/lib1mod1.cppm`
+```cpp
+export module t30014.app:lib1.mod1;
+
+export namespace clanguml::t30014 {
+class D { };
+} // namespace clanguml::t30014
+```
+## Generated PlantUML diagrams
+![t30014_package](./t30014_package.svg "C++20 modules package diagram test with partitions")
+## Generated Mermaid diagrams
+![t30014_package](./t30014_package_mermaid.svg "C++20 modules package diagram test with partitions")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "app",
+      "elements": [
+        {
+          "display_name": ":lib1",
+          "elements": [
+            {
+              "display_name": "mod1",
+              "id": "2034114360803168801",
+              "is_deprecated": false,
+              "name": "mod1",
+              "namespace": "t30014.app:lib1",
+              "source_location": {
+                "column": 7,
+                "file": "src/lib1mod1.cppm",
+                "line": 4,
+                "translation_unit": "t30014.cc"
+              },
+              "type": "module"
+            }
+          ],
+          "id": "1618985722491582169",
+          "is_deprecated": false,
+          "name": ":lib1",
+          "namespace": "t30014.app",
+          "source_location": {
+            "column": 7,
+            "file": "src/lib1.cppm",
+            "line": 4,
+            "translation_unit": "t30014.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":lib2",
+          "id": "1569901875704270760",
+          "is_deprecated": false,
+          "name": ":lib2",
+          "namespace": "t30014.app",
+          "source_location": {
+            "column": 7,
+            "file": "src/lib2.cppm",
+            "line": 4,
+            "translation_unit": "t30014.cc"
+          },
+          "type": "module"
+        }
+      ],
+      "id": "1932503454610788726",
+      "is_deprecated": false,
+      "name": "app",
+      "namespace": "t30014",
+      "type": "module"
+    }
+  ],
+  "name": "t30014_package",
+  "package_type": "module",
+  "relationships": [],
+  "using_module": "t30014"
+}
+```
diff --git a/docs/test_cases/t30014_package.svg b/docs/test_cases/t30014_package.svg
new file mode 100644
index 00000000..fb04c4fc
--- /dev/null
+++ b/docs/test_cases/t30014_package.svg
@@ -0,0 +1,31 @@
+<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:253px;height:207px;" version="1.1" viewBox="0 0 253 207" width="253px" zoomAndPan="magnify">
+  <defs>
+    <filter height="300%" id="f1hzk3rstcv3l1" 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>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <polygon fill="#FFFFFF" filter="url(#f1hzk3rstcv3l1)" points="22,24,57,24,64,46.2969,231,46.2969,231,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib1.cppm#L4" target="_top" title=":lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib1.cppm#L4" xlink:show="new" xlink:title=":lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzk3rstcv3l1)" points="111,67,151,67,158,89.2969,207,89.2969,207,171,111,171,111,67" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="111" x2="158" y1="89.2969" y2="89.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="115" y="81.9951">:lib1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzk3rstcv3l1)" points="127,102,177,102,184,124.2969,191,124.2969,191,154.5938,127,154.5938,127,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="127" x2="184" y1="124.2969" y2="124.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="131" y="116.9951">mod1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib2.cppm#L4" target="_top" title=":lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib2.cppm#L4" xlink:show="new" xlink:title=":lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzk3rstcv3l1)" points="38,102,78,102,85,124.2969,92,124.2969,92,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="85" y1="124.2969" y2="124.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="42" y="116.9951">:lib2</text>
+    </a>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30014_package_mermaid.svg b/docs/test_cases/t30014_package_mermaid.svg
new file mode 100644
index 00000000..bf069df7
--- /dev/null
+++ b/docs/test_cases/t30014_package_mermaid.svg
@@ -0,0 +1,88 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 191.03125 252" style="max-width: 191.031px; background-color: white;" width="191.03125" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters"/>
+      <g class="edgePaths"/>
+      <g class="edgeLabels"/>
+      <g class="nodes">
+        <g transform="translate(-7.5, -8)" class="root">
+          <g class="clusters">
+            <g id="C_0001932503454610788726" class="cluster default flowchart-label">
+              <rect height="236" width="175.03125" y="8" x="8" ry="0" rx="0" style=""/>
+              <g transform="translate(82.1640625, 8)" class="cluster-label">
+                <foreignObject height="18" width="26.703125">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">app</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+          <g class="edgePaths"/>
+          <g class="edgeLabels"/>
+          <g class="nodes">
+            <g transform="translate(25.5, 35)" class="root">
+              <g class="clusters">
+                <g id="C_0001618985722491582169" class="cluster clickable flowchart-label">
+                  <rect height="83" width="125.03125" y="8" x="8" ry="0" rx="0" style=""/>
+                  <g transform="translate(55.8359375, 8)" class="cluster-label">
+                    <foreignObject height="18" width="29.359375">
+                      <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                        <span class="nodeLabel">:lib1</span>
+                      </div>
+                    </foreignObject>
+                  </g>
+                </g>
+              </g>
+              <g class="edgePaths"/>
+              <g class="edgeLabels"/>
+              <g class="nodes">
+                <g transform="translate(70.515625, 49.5)" title="mod1" id="flowchart-C_0002034114360803168801-3" class="node default clickable flowchart-label">
+                  <rect height="33" width="55.03125" y="-16.5" x="-27.515625" ry="0" rx="0" style="" class="basic label-container"/>
+                  <g transform="translate(-20.015625, -9)" style="" class="label">
+                    <rect/>
+                    <foreignObject height="18" width="40.03125">
+                      <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                        <span class="nodeLabel">mod1</span>
+                      </div>
+                    </foreignObject>
+                  </g>
+                </g>
+              </g>
+            </g>
+            <g transform="translate(95.515625, 192.5)" title=":lib2" id="flowchart-C_0001569901875704270760-1" class="node default clickable flowchart-label">
+              <rect height="33" width="44.359375" y="-16.5" x="-22.1796875" ry="0" rx="0" style="" class="basic label-container"/>
+              <g transform="translate(-14.6796875, -9)" style="" class="label">
+                <rect/>
+                <foreignObject height="18" width="29.359375">
+                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                    <span class="nodeLabel">:lib2</span>
+                  </div>
+                </foreignObject>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30015.md b/docs/test_cases/t30015.md
new file mode 100644
index 00000000..d6651ad7
--- /dev/null
+++ b/docs/test_cases/t30015.md
@@ -0,0 +1,655 @@
+# t30015 - C++20 modules package diagram test with partition dependencies
+## Config
+```yaml
+diagrams:
+  t30015_package:
+    type: package
+    glob:
+      - t30015.cc
+    package_type: module
+    include:
+      modules:
+        - t30015
+    using_module: t30015
+```
+## Source code
+File `tests/t30015/t30015.cc`
+```cpp
+import t30015.app;
+
+namespace clanguml {
+namespace t30015 {
+}
+}
+```
+File `tests/t30015/src/mod7.cppm`
+```cpp
+export module t30015.lib1:mod7;
+
+export namespace clanguml::t30015 {
+struct CG { };
+}
+```
+File `tests/t30015/src/mod11.cppm`
+```cpp
+export module t30015.lib1:mod11;
+
+export namespace clanguml::t30015 {
+struct CK { };
+}
+```
+File `tests/t30015/src/mod17.cppm`
+```cpp
+export module t30015.lib1:mod17;
+
+export namespace clanguml::t30015 {
+struct CR { };
+}
+```
+File `tests/t30015/src/mod16.cppm`
+```cpp
+export module t30015.lib1:mod16;
+
+export namespace clanguml::t30015 {
+struct CP { };
+}
+```
+File `tests/t30015/src/mod10.cppm`
+```cpp
+export module t30015.lib1:mod10;
+
+export namespace clanguml::t30015 {
+struct CJ { };
+}
+```
+File `tests/t30015/src/mod4.cppm`
+```cpp
+export module t30015.lib1:mod4;
+
+export namespace clanguml::t30015 {
+struct CD { };
+}
+```
+File `tests/t30015/src/mod1.cppm`
+```cpp
+export module t30015.lib1:mod1;
+
+export namespace clanguml::t30015 {
+struct CA { };
+}
+```
+File `tests/t30015/src/app.cppm`
+```cpp
+module;
+
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+export module t30015.app;
+import t30015.lib1;
+
+// import t30015.app;
+// import t30015.mod2;
+// import t30015.mod3;
+// import t30015.mod4;
+// import t30015.mod5;
+// import t30015.mod6;
+// import t30015.mod7;
+// import t30015.mod8;
+// import t30015.mod9;
+// import t30015.mod10;
+// import t30015.mod11;
+// import t30015.mod12;
+// import t30015.mod13;
+// import t30015.mod14;
+// import t30015.mod15;
+// import t30015.mod16;
+// import t30015.mod17;
+// import t30015.mod18;
+
+export namespace clanguml::t30015 {
+
+class CBA : public CF {
+public:
+    CA *ca_;
+    CB<int> cb_;
+    std::shared_ptr<CC> cc_;
+    std::map<std::string, std::unique_ptr<CD>> *cd_;
+    std::array<CO, 5> co_;
+    static CP *cp_;
+
+    CBA() = default;
+
+    CBA(CN *cn) { }
+
+    friend CR;
+
+    template <typename... Item> CBA(std::tuple<Item...> &items) { }
+
+    void ce(const std::vector<CE> /*ce_*/) { }
+
+    std::shared_ptr<CG> cg() { return {}; }
+
+    template <typename T> void ch(std::map<T, std::shared_ptr<CH>> &ch_) { }
+
+    template <typename T> std::map<T, std::shared_ptr<CI>> ci(T * /*t*/)
+    {
+        return {};
+    }
+
+    S s;
+};
+
+void cj(std::unique_ptr<CJ> /*cj_*/) { }
+
+std::unique_ptr<CK> ck() { return {}; }
+
+template <typename T> void cl(std::map<T, std::shared_ptr<CL>> & /*ch_*/) { }
+
+template <typename T> std::map<T, std::shared_ptr<CM>> cm() { return {}; }
+
+} // namespace clanguml::t30013
+```
+File `tests/t30015/src/mod13.cppm`
+```cpp
+export module t30015.lib1:mod13;
+
+export namespace clanguml::t30015 {
+struct CM { };
+}
+```
+File `tests/t30015/src/mod9.cppm`
+```cpp
+export module t30015.lib1:mod9;
+
+export namespace clanguml::t30015 {
+struct CI { };
+}
+```
+File `tests/t30015/src/mod5.cppm`
+```cpp
+export module t30015.lib1:mod5;
+
+export namespace clanguml::t30015 {
+struct CE { };
+}
+```
+File `tests/t30015/src/mod18.cppm`
+```cpp
+export module t30015.lib1:mod18;
+
+export namespace clanguml::t30015 {
+enum class S { s1, s2, s3 };
+}
+```
+File `tests/t30015/src/mod2.cppm`
+```cpp
+export module t30015.lib1:mod2;
+
+export namespace clanguml::t30015 {
+template <typename T> struct CB {
+    T cb;
+};
+}
+```
+File `tests/t30015/src/mod14.cppm`
+```cpp
+export module t30015.lib1:mod14;
+
+export namespace clanguml::t30015 {
+struct CN { };
+}
+```
+File `tests/t30015/src/mod12.cppm`
+```cpp
+export module t30015.lib1:mod12;
+
+export namespace clanguml::t30015 {
+struct CL { };
+}
+```
+File `tests/t30015/src/mod6.cppm`
+```cpp
+export module t30015.lib1:mod6;
+
+export namespace clanguml::t30015 {
+struct CF { };
+}
+```
+File `tests/t30015/src/mod8.cppm`
+```cpp
+export module t30015.lib1:mod8;
+
+export namespace clanguml::t30015 {
+struct CH { };
+}
+```
+File `tests/t30015/src/mod3.cppm`
+```cpp
+export module t30015.lib1:mod3;
+
+export namespace clanguml::t30015 {
+struct CC { };
+}
+```
+File `tests/t30015/src/lib1.cppm`
+```cpp
+export module t30015.lib1;
+
+export import :mod1;
+export import :mod2;
+export import :mod3;
+export import :mod4;
+export import :mod5;
+export import :mod6;
+export import :mod7;
+export import :mod8;
+export import :mod9;
+export import :mod10;
+export import :mod11;
+export import :mod12;
+export import :mod13;
+export import :mod14;
+export import :mod15;
+export import :mod16;
+export import :mod17;
+export import :mod18;
+
+export namespace clanguml::t30015 {
+
+}
+```
+File `tests/t30015/src/mod15.cppm`
+```cpp
+export module t30015.lib1:mod15;
+
+export namespace clanguml::t30015 {
+struct CO { };
+}
+```
+## Generated PlantUML diagrams
+![t30015_package](./t30015_package.svg "C++20 modules package diagram test with partition dependencies")
+## Generated Mermaid diagrams
+![t30015_package](./t30015_package_mermaid.svg "C++20 modules package diagram test with partition dependencies")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "lib1",
+      "elements": [
+        {
+          "display_name": ":mod1",
+          "id": "2078789731210233181",
+          "is_deprecated": false,
+          "name": ":mod1",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod1.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod2",
+          "id": "108157285110421434",
+          "is_deprecated": false,
+          "name": ":mod2",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 30,
+            "file": "src/mod2.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod3",
+          "id": "1466337333501241721",
+          "is_deprecated": false,
+          "name": ":mod3",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod3.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod4",
+          "id": "2181077882404368936",
+          "is_deprecated": false,
+          "name": ":mod4",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod4.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod5",
+          "id": "1045004042628075747",
+          "is_deprecated": false,
+          "name": ":mod5",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod5.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod6",
+          "id": "536067780214444138",
+          "is_deprecated": false,
+          "name": ":mod6",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod6.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod7",
+          "id": "1678616733221858020",
+          "is_deprecated": false,
+          "name": ":mod7",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod7.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod8",
+          "id": "240013230569803405",
+          "is_deprecated": false,
+          "name": ":mod8",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod8.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod9",
+          "id": "179175577447017767",
+          "is_deprecated": false,
+          "name": ":mod9",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod9.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod10",
+          "id": "485628131931062884",
+          "is_deprecated": false,
+          "name": ":mod10",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod10.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod11",
+          "id": "791090113373006765",
+          "is_deprecated": false,
+          "name": ":mod11",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod11.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod12",
+          "id": "500107934060144677",
+          "is_deprecated": false,
+          "name": ":mod12",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod12.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod13",
+          "id": "1195842122299166493",
+          "is_deprecated": false,
+          "name": ":mod13",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod13.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod14",
+          "id": "581129920847850526",
+          "is_deprecated": false,
+          "name": ":mod14",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod14.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod15",
+          "id": "1715856257738182160",
+          "is_deprecated": false,
+          "name": ":mod15",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod15.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod16",
+          "id": "1435303665523039114",
+          "is_deprecated": false,
+          "name": ":mod16",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod16.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod17",
+          "id": "1327885001907982070",
+          "is_deprecated": false,
+          "name": ":mod17",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 8,
+            "file": "src/mod17.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        },
+        {
+          "display_name": ":mod18",
+          "id": "2193691762152553973",
+          "is_deprecated": false,
+          "name": ":mod18",
+          "namespace": "t30015.lib1",
+          "source_location": {
+            "column": 12,
+            "file": "src/mod18.cppm",
+            "line": 4,
+            "translation_unit": "t30015.cc"
+          },
+          "type": "module"
+        }
+      ],
+      "id": "1208975031146850353",
+      "is_deprecated": false,
+      "name": "lib1",
+      "namespace": "t30015",
+      "type": "module"
+    },
+    {
+      "display_name": "app",
+      "id": "1200268042616700255",
+      "is_deprecated": false,
+      "name": "app",
+      "namespace": "t30015",
+      "source_location": {
+        "column": 7,
+        "file": "src/app.cppm",
+        "line": 33,
+        "translation_unit": "t30015.cc"
+      },
+      "type": "module"
+    }
+  ],
+  "name": "t30015_package",
+  "package_type": "module",
+  "relationships": [
+    {
+      "destination": "240013230569803405",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "179175577447017767",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "2078789731210233181",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "108157285110421434",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "1466337333501241721",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "2181077882404368936",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "1715856257738182160",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "2193691762152553973",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "1435303665523039114",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "581129920847850526",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "1045004042628075747",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "1678616733221858020",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "1327885001907982070",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "536067780214444138",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "485628131931062884",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "791090113373006765",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "500107934060144677",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    },
+    {
+      "destination": "1195842122299166493",
+      "source": "1200268042616700255",
+      "type": "dependency"
+    }
+  ],
+  "using_module": "t30015"
+}
+```
diff --git a/docs/test_cases/t30015_package.svg b/docs/test_cases/t30015_package.svg
new file mode 100644
index 00000000..77606193
--- /dev/null
+++ b/docs/test_cases/t30015_package.svg
@@ -0,0 +1,147 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="202px" preserveAspectRatio="none" style="width:2021px;height:202px;" version="1.1" viewBox="0 0 2021 202" width="2021px" zoomAndPan="magnify">
+  <defs>
+    <filter height="300%" id="f1euomjq08fspe" 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>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="22,86,56,86,63,108.2969,1999,108.2969,1999,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="63" y1="108.2969" y2="108.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="26" y="100.9951">lib1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod1.cppm#L4" target="_top" title=":mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod1.cppm#L4" xlink:show="new" xlink:title=":mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1913,121,1969,121,1976,143.2969,1983,143.2969,1983,173.5938,1913,173.5938,1913,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1913" x2="1976" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1917" y="135.9951">:mod1</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod2.cppm#L4" target="_top" title=":mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod2.cppm#L4" xlink:show="new" xlink:title=":mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1808,121,1864,121,1871,143.2969,1878,143.2969,1878,173.5938,1808,173.5938,1808,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1808" x2="1871" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1812" y="135.9951">:mod2</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod3.cppm#L4" target="_top" title=":mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod3.cppm#L4" xlink:show="new" xlink:title=":mod3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1703,121,1759,121,1766,143.2969,1773,143.2969,1773,173.5938,1703,173.5938,1703,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1703" x2="1766" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1707" y="135.9951">:mod3</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod4.cppm#L4" target="_top" title=":mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod4.cppm#L4" xlink:show="new" xlink:title=":mod4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1598,121,1654,121,1661,143.2969,1668,143.2969,1668,173.5938,1598,173.5938,1598,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1598" x2="1661" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1602" y="135.9951">:mod4</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod5.cppm#L4" target="_top" title=":mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod5.cppm#L4" xlink:show="new" xlink:title=":mod5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1493,121,1549,121,1556,143.2969,1563,143.2969,1563,173.5938,1493,173.5938,1493,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1493" x2="1556" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1497" y="135.9951">:mod5</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod6.cppm#L4" target="_top" title=":mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod6.cppm#L4" xlink:show="new" xlink:title=":mod6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1388,121,1444,121,1451,143.2969,1458,143.2969,1458,173.5938,1388,173.5938,1388,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1388" x2="1451" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1392" y="135.9951">:mod6</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod7.cppm#L4" target="_top" title=":mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod7.cppm#L4" xlink:show="new" xlink:title=":mod7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1283,121,1339,121,1346,143.2969,1353,143.2969,1353,173.5938,1283,173.5938,1283,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1283" x2="1346" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1287" y="135.9951">:mod7</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod8.cppm#L4" target="_top" title=":mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod8.cppm#L4" xlink:show="new" xlink:title=":mod8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1178,121,1234,121,1241,143.2969,1248,143.2969,1248,173.5938,1178,173.5938,1178,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1178" x2="1241" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1182" y="135.9951">:mod8</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod9.cppm#L4" target="_top" title=":mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod9.cppm#L4" xlink:show="new" xlink:title=":mod9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1073,121,1129,121,1136,143.2969,1143,143.2969,1143,173.5938,1073,173.5938,1073,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1073" x2="1136" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1077" y="135.9951">:mod9</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod10.cppm#L4" target="_top" title=":mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod10.cppm#L4" xlink:show="new" xlink:title=":mod10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="958,121,1024,121,1031,143.2969,1038,143.2969,1038,173.5938,958,173.5938,958,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="958" x2="1031" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="962" y="135.9951">:mod10</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod11.cppm#L4" target="_top" title=":mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod11.cppm#L4" xlink:show="new" xlink:title=":mod11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="843,121,909,121,916,143.2969,923,143.2969,923,173.5938,843,173.5938,843,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="843" x2="916" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="847" y="135.9951">:mod11</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod12.cppm#L4" target="_top" title=":mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod12.cppm#L4" xlink:show="new" xlink:title=":mod12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="728,121,794,121,801,143.2969,808,143.2969,808,173.5938,728,173.5938,728,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="728" x2="801" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="732" y="135.9951">:mod12</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod13.cppm#L4" target="_top" title=":mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod13.cppm#L4" xlink:show="new" xlink:title=":mod13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="613,121,679,121,686,143.2969,693,143.2969,693,173.5938,613,173.5938,613,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="613" x2="686" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="617" y="135.9951">:mod13</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod14.cppm#L4" target="_top" title=":mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod14.cppm#L4" xlink:show="new" xlink:title=":mod14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="498,121,564,121,571,143.2969,578,143.2969,578,173.5938,498,173.5938,498,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="498" x2="571" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="502" y="135.9951">:mod14</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod15.cppm#L4" target="_top" title=":mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod15.cppm#L4" xlink:show="new" xlink:title=":mod15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="383,121,449,121,456,143.2969,463,143.2969,463,173.5938,383,173.5938,383,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="383" x2="456" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="387" y="135.9951">:mod15</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod16.cppm#L4" target="_top" title=":mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod16.cppm#L4" xlink:show="new" xlink:title=":mod16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="268,121,334,121,341,143.2969,348,143.2969,348,173.5938,268,173.5938,268,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="268" x2="341" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="272" y="135.9951">:mod16</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod17.cppm#L4" target="_top" title=":mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod17.cppm#L4" xlink:show="new" xlink:title=":mod17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="153,121,219,121,226,143.2969,233,143.2969,233,173.5938,153,173.5938,153,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="153" x2="226" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="157" y="135.9951">:mod17</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod18.cppm#L4" target="_top" title=":mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod18.cppm#L4" xlink:show="new" xlink:title=":mod18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="38,121,104,121,111,143.2969,118,143.2969,118,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="111" y1="143.2969" y2="143.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="42" y="135.9951">:mod18</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/app.cppm#L33" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/app.cppm#L33" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1028.5,8,1063.5,8,1070.5,30.2969,1077.5,30.2969,1077.5,60.5938,1028.5,60.5938,1028.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+      <line style="stroke: #000000; stroke-width: 1.5;" x1="1028.5" x2="1070.5" y1="30.2969" y2="30.2969"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="1032.5" y="22.9951">app</text>
+    </a>
+    <path d="M1077.65,41.08 C1100.87,47.24 1135.78,58.9 1161,78 C1174.69,88.37 1186.57,103.24 1195.51,116.48 " fill="none" id="C_0001200268042616700255-&gt;C_0000240013230569803405" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1198.43,120.9,1196.8276,111.1824,1195.683,116.7222,1190.1431,115.5776,1198.43,120.9" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1065.76,61.24 C1073.88,77.64 1084.44,98.94 1092.96,116.16 " fill="none" id="C_0001200268042616700255-&gt;C_0000179175577447017767" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1095.31,120.89,1094.9131,111.0491,1093.0968,116.4065,1087.7395,114.5903,1095.31,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1077.53,35.51 C1208.48,35.74 1821.98,38.9 1896,78 C1911.91,86.4 1924.37,102.08 1933.1,116.32 " fill="none" id="C_0001200268042616700255-&gt;C_0002078789731210233181" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1935.68,120.68,1934.5419,110.8971,1933.1349,116.3762,1927.6558,114.9693,1935.68,120.68" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1077.59,35.7 C1198.5,36.86 1726.86,43.83 1791,78 C1806.88,86.46 1819.34,102.14 1828.07,116.36 " fill="none" id="C_0001200268042616700255-&gt;C_0000108157285110421434" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1830.66,120.72,1829.4978,110.94,1828.1043,116.4225,1822.6218,115.029,1830.66,120.72" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1077.65,35.95 C1187.78,38.15 1631.7,48.74 1686,78 C1701.84,86.54 1714.29,102.22 1723.04,116.43 " fill="none" id="C_0001200268042616700255-&gt;C_0001466337333501241721" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1725.63,120.78,1724.4535,111.0017,1723.0681,116.4862,1717.5835,115.1008,1725.63,120.78" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1077.74,36.31 C1176.14,39.69 1536.48,53.63 1581,78 C1596.79,86.64 1609.23,102.33 1617.99,116.52 " fill="none" id="C_0001200268042616700255-&gt;C_0002181077882404368936" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1620.59,120.86,1619.3895,111.0846,1618.0175,116.5725,1612.5296,115.2005,1620.59,120.86" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1028.37,36.21 C925.12,39.34 530.3,52.88 481,78 C464.26,86.53 450.43,102.21 440.48,116.42 " fill="none" id="C_0001200268042616700255-&gt;C_0001715856257738182160" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="437.51,120.77,445.8844,115.5864,440.3262,116.6386,439.2741,111.0804,437.51,120.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1028.19,35.47 C889.96,35.49 218.05,37.63 136,78 C119.02,86.35 105.1,102.2 95.15,116.54 " fill="none" id="C_0001200268042616700255-&gt;C_0002193691762152553973" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="92.2,120.94,100.5537,115.7232,94.9998,116.7974,93.9256,111.2435,92.2,120.94" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1028.25,35.89 C912.32,37.85 426.15,47.82 366,78 C349.21,86.42 335.38,102.1 325.43,116.33 " fill="none" id="C_0001200268042616700255-&gt;C_0001435303665523039114" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="322.47,120.69,330.836,115.493,325.2796,116.554,324.2185,110.9976,322.47,120.69" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1028.31,35.38 C944.56,35.32 672.23,38.27 596,78 C579.34,86.68 565.52,102.37 555.54,116.55 " fill="none" id="C_0001200268042616700255-&gt;C_0000581129920847850526" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="552.57,120.89,560.9566,115.7262,555.396,116.7652,554.3569,111.2046,552.57,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1077.58,35.44 C1157.22,35.62 1407.03,39.35 1476,78 C1491.7,86.8 1504.14,102.5 1512.92,116.65 " fill="none" id="C_0001200268042616700255-&gt;C_0001045004042628075747" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1515.52,120.98,1514.2956,111.2075,1512.937,116.6988,1507.4457,115.3403,1515.52,120.98" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1077.72,34.94 C1119.66,35.13 1206.07,40.49 1266,78 C1280.9,87.32 1293.09,102.55 1301.91,116.29 " fill="none" id="C_0001200268042616700255-&gt;C_0001678616733221858020" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1304.77,120.88,1303.4068,111.1259,1302.1264,116.636,1296.6164,115.3557,1304.77,120.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1028.45,35.65 C901.46,36.57 322.12,42.71 251,78 C234.05,86.41 220.13,102.26 210.18,116.59 " fill="none" id="C_0001200268042616700255-&gt;C_0001327885001907982070" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="207.22,120.98,215.5613,115.7434,210.01,116.8308,208.9226,111.2794,207.22,120.98" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1077.54,36.37 C1143.15,39.06 1321.06,48.93 1371,78 C1386.44,86.99 1398.8,102.53 1407.59,116.54 " fill="none" id="C_0001200268042616700255-&gt;C_0000536067780214444138" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1410.21,120.83,1408.9473,111.0624,1407.6103,116.559,1402.1137,115.222,1410.21,120.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1040.24,61.24 C1032.12,77.64 1021.56,98.94 1013.04,116.16 " fill="none" id="C_0001200268042616700255-&gt;C_0000485628131931062884" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="1010.69,120.89,1018.2605,114.5903,1012.9032,116.4065,1011.0869,111.0491,1010.69,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1028.12,41.08 C1004.21,47.29 967.83,59.03 941,78 C926.24,88.44 912.95,103.48 902.82,116.81 " fill="none" id="C_0001200268042616700255-&gt;C_0000791090113373006765" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="899.79,120.89,908.3707,116.0557,902.774,116.878,901.9516,111.2813,899.79,120.89" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1028.3,34.88 C984.51,34.87 891.68,39.81 826,78 C810.01,87.3 796.37,102.7 786.35,116.55 " fill="none" id="C_0001200268042616700255-&gt;C_0000500107934060144677" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="783.36,120.79,791.8194,115.7463,786.2445,116.706,785.2849,111.1311,783.36,120.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1028.21,36.26 C959.14,38.75 765.99,48.25 711,78 C694.6,86.87 680.87,102.41 670.88,116.44 " fill="none" id="C_0001200268042616700255-&gt;C_0001195842122299166493" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="667.91,120.74,676.317,115.6095,670.7523,116.6265,669.7354,111.0618,667.91,120.74" style="stroke: #A80036; stroke-width: 1.0;"/>
+  </g>
+</svg>
diff --git a/docs/test_cases/t30015_package_mermaid.svg b/docs/test_cases/t30015_package_mermaid.svg
new file mode 100644
index 00000000..b7cd9ad0
--- /dev/null
+++ b/docs/test_cases/t30015_package_mermaid.svg
@@ -0,0 +1,432 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 2085.40625 182" style="max-width: 2085.41px; background-color: white;" width="2085.40625" id="my-svg">
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
+      <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
+      <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
+      <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
+    </marker>
+    <g class="root">
+      <g class="clusters">
+        <g id="C_0001208975031146850353" class="cluster default flowchart-label">
+          <rect height="83" width="2069.40625" y="83" x="0" ry="0" rx="0" style=""/>
+          <g transform="translate(1022.25, 83)" class="cluster-label">
+            <foreignObject height="18" width="24.90625">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">lib1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0000240013230569803405" id="L-C_0001200268042616700255-C_0000240013230569803405-0" d="M976.59375,21.699432004881942L952.3307291666666,27.74952667073495C928.0677083333334,33.79962133658796,879.5416666666666,45.89981066829398,855.2786458333334,56.116572000813655C831.015625,66.33333333333333,831.015625,74.66666666666667,831.015625,83C831.015625,91.33333333333333,831.015625,99.66666666666667,831.015625,103.83333333333333L831.015625,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0000179175577447017767" id="L-C_0001200268042616700255-C_0000179175577447017767-0" d="M976.59375,31.691811822795227L970.5755208333334,36.07650985232936C964.5572916666666,40.46120788186349,952.5208333333334,49.230603940931736,946.5026041666666,57.781968637132536C940.484375,66.33333333333333,940.484375,74.66666666666667,940.484375,83C940.484375,91.33333333333333,940.484375,99.66666666666667,940.484375,103.83333333333333L940.484375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0002078789731210233181" id="L-C_0001200268042616700255-C_0002078789731210233181-0" d="M976.59375,17.42776851751028L824.6171875,24.189807097925236C672.640625,30.951845678340188,368.6875,44.475922839170096,216.7109375,55.40462808625171C64.734375,66.33333333333333,64.734375,74.66666666666667,64.734375,83C64.734375,91.33333333333333,64.734375,99.66666666666667,64.734375,103.83333333333333L64.734375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0000108157285110421434" id="L-C_0001200268042616700255-C_0000108157285110421434-0" d="M976.59375,17.551136417556346L842.8619791666666,24.292613681296956C709.1302083333334,31.034090945037565,441.6666666666667,44.51704547251878,307.9348958333333,55.42518940292606C174.203125,66.33333333333333,174.203125,74.66666666666667,174.203125,83C174.203125,91.33333333333333,174.203125,99.66666666666667,174.203125,103.83333333333333L174.203125,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0001466337333501241721" id="L-C_0001200268042616700255-C_0001466337333501241721-0" d="M976.59375,17.71234526011624L861.1067708333334,24.4269543834302C745.6197916666666,31.14156350674416,514.6458333333334,44.57078175337208,399.1588541666667,55.45205754335271C283.671875,66.33333333333333,283.671875,74.66666666666667,283.671875,83C283.671875,91.33333333333333,283.671875,99.66666666666667,283.671875,103.83333333333333L283.671875,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0002181077882404368936" id="L-C_0001200268042616700255-C_0002181077882404368936-0" d="M976.59375,17.931959509250042L879.3515625,24.60996625770837C782.109375,31.287973006166695,587.625,44.64398650308335,490.3828125,55.48865991820835C393.140625,66.33333333333333,393.140625,74.66666666666667,393.140625,83C393.140625,91.33333333333333,393.140625,99.66666666666667,393.140625,103.83333333333333L393.140625,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0001715856257738182160" id="L-C_0001200268042616700255-C_0001715856257738182160-0" d="M1018.296875,17.83612588812893L1122.7630208333333,24.53010490677411C1227.2291666666667,31.22408392541929,1436.1614583333333,44.61204196270964,1540.6276041666667,55.472687648021484C1645.09375,66.33333333333333,1645.09375,74.66666666666667,1645.09375,83C1645.09375,91.33333333333333,1645.09375,99.66666666666667,1645.09375,103.83333333333333L1645.09375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0002193691762152553973" id="L-C_0001200268042616700255-C_0002193691762152553973-0" d="M1018.296875,17.362946515523355L1181.9505208333333,24.13578876293613C1345.6041666666667,30.908631010348902,1672.9114583333333,44.454315505174456,1836.5651041666667,55.393824419253896C2000.21875,66.33333333333333,2000.21875,74.66666666666667,2000.21875,83C2000.21875,91.33333333333333,2000.21875,99.66666666666667,2000.21875,103.83333333333333L2000.21875,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0001435303665523039114" id="L-C_0001200268042616700255-C_0001435303665523039114-0" d="M1018.296875,17.629651915839716L1142.4921875,24.35804326319976C1266.6875,31.08643461055981,1515.078125,44.5432173052799,1639.2734375,55.43827531930662C1763.46875,66.33333333333333,1763.46875,74.66666666666667,1763.46875,83C1763.46875,91.33333333333333,1763.46875,99.66666666666667,1763.46875,103.83333333333333L1763.46875,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0000581129920847850526" id="L-C_0001200268042616700255-C_0000581129920847850526-0" d="M1018.296875,18.134958005520538L1103.0338541666667,24.779131671267113C1187.7708333333333,31.42330533701369,1357.2447916666667,44.711652668506844,1441.9817708333333,55.522493000920086C1526.71875,66.33333333333333,1526.71875,74.66666666666667,1526.71875,83C1526.71875,91.33333333333333,1526.71875,99.66666666666667,1526.71875,103.83333333333333L1526.71875,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0001045004042628075747" id="L-C_0001200268042616700255-C_0001045004042628075747-0" d="M976.59375,18.24874090212981L897.5963541666666,24.873950751774842C818.5989583333334,31.499160601419874,660.6041666666666,44.74958030070994,581.6067708333334,55.54145681702164C502.609375,66.33333333333333,502.609375,74.66666666666667,502.609375,83C502.609375,91.33333333333333,502.609375,99.66666666666667,502.609375,103.83333333333333L502.609375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0001678616733221858020" id="L-C_0001200268042616700255-C_0001678616733221858020-0" d="M976.59375,19.636443437632735L934.0859375,26.030369531360616C891.578125,32.42429562508849,806.5625,45.21214781254425,764.0546875,55.772740572938794C721.546875,66.33333333333333,721.546875,74.66666666666667,721.546875,83C721.546875,91.33333333333333,721.546875,99.66666666666667,721.546875,103.83333333333333L721.546875,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0001327885001907982070" id="L-C_0001200268042616700255-C_0001327885001907982070-0" d="M1018.296875,17.478450217750414L1162.2213541666667,24.232041848125345C1306.1458333333333,30.985633478500276,1593.9947916666667,44.49281673925014,1737.9192708333333,55.41307503629173C1881.84375,66.33333333333333,1881.84375,74.66666666666667,1881.84375,83C1881.84375,91.33333333333333,1881.84375,99.66666666666667,1881.84375,103.83333333333333L1881.84375,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0000536067780214444138" id="L-C_0001200268042616700255-C_0000536067780214444138-0" d="M976.59375,18.745494354004904L915.8411458333334,25.287911961670755C855.0885416666666,31.8303295693366,733.5833333333334,44.9151647846683,672.8307291666666,55.62424905900082C612.078125,66.33333333333333,612.078125,74.66666666666667,612.078125,83C612.078125,91.33333333333333,612.078125,99.66666666666667,612.078125,103.83333333333333L612.078125,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0000485628131931062884" id="L-C_0001200268042616700255-C_0000485628131931062884-0" d="M1018.296875,31.691811822795227L1024.3151041666667,36.07650985232936C1030.3333333333333,40.46120788186349,1042.3697916666667,49.230603940931736,1048.3880208333333,57.781968637132536C1054.40625,66.33333333333333,1054.40625,74.66666666666667,1054.40625,83C1054.40625,91.33333333333333,1054.40625,99.66666666666667,1054.40625,103.83333333333333L1054.40625,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0000791090113373006765" id="L-C_0001200268042616700255-C_0000791090113373006765-0" d="M1018.296875,21.452094603657173L1043.9453125,27.543412169714312C1069.59375,33.63472973577145,1120.890625,45.81736486788572,1146.5390625,56.075349100609536C1172.1875,66.33333333333333,1172.1875,74.66666666666667,1172.1875,83C1172.1875,91.33333333333333,1172.1875,99.66666666666667,1172.1875,103.83333333333333L1172.1875,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0000500107934060144677" id="L-C_0001200268042616700255-C_0000500107934060144677-0" d="M1018.296875,19.45818978180167L1063.5755208333333,25.88182481816806C1108.8541666666667,32.30545985453445,1199.4114583333333,45.152729927267224,1244.6901041666667,55.74303163030029C1289.96875,66.33333333333333,1289.96875,74.66666666666667,1289.96875,83C1289.96875,91.33333333333333,1289.96875,99.66666666666667,1289.96875,103.83333333333333L1289.96875,108"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001200268042616700255 LE-C_0001195842122299166493" id="L-C_0001200268042616700255-C_0001195842122299166493-0" d="M1018.296875,18.605970149253732L1083.3046875,25.171641791044777C1148.3125,31.737313432835823,1278.328125,44.86865671641791,1343.3359375,55.60099502487562C1408.34375,66.33333333333333,1408.34375,74.66666666666667,1408.34375,83C1408.34375,91.33333333333333,1408.34375,99.66666666666667,1408.34375,103.83333333333333L1408.34375,108"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="nodes">
+        <g transform="translate(64.734375, 124.5)" title=":mod1" id="flowchart-C_0002078789731210233181-5" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(174.203125, 124.5)" title=":mod2" id="flowchart-C_0000108157285110421434-7" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod2</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(283.671875, 124.5)" title=":mod3" id="flowchart-C_0001466337333501241721-9" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod3</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(393.140625, 124.5)" title=":mod4" id="flowchart-C_0002181077882404368936-11" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod4</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(502.609375, 124.5)" title=":mod5" id="flowchart-C_0001045004042628075747-21" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod5</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(612.078125, 124.5)" title=":mod6" id="flowchart-C_0000536067780214444138-27" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod6</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(721.546875, 124.5)" title=":mod7" id="flowchart-C_0001678616733221858020-23" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod7</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(831.015625, 124.5)" title=":mod8" id="flowchart-C_0000240013230569803405-1" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod8</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(940.484375, 124.5)" title=":mod9" id="flowchart-C_0000179175577447017767-3" class="node default clickable flowchart-label">
+          <rect height="33" width="59.46875" y="-16.5" x="-29.734375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-22.234375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="44.46875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod9</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1054.40625, 124.5)" title=":mod10" id="flowchart-C_0000485628131931062884-29" class="node default clickable flowchart-label">
+          <rect height="33" width="68.375" y="-16.5" x="-34.1875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.6875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="53.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod10</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1172.1875, 124.5)" title=":mod11" id="flowchart-C_0000791090113373006765-31" class="node default clickable flowchart-label">
+          <rect height="33" width="67.1875" y="-16.5" x="-33.59375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.09375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="52.1875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod11</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1289.96875, 124.5)" title=":mod12" id="flowchart-C_0000500107934060144677-33" class="node default clickable flowchart-label">
+          <rect height="33" width="68.375" y="-16.5" x="-34.1875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.6875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="53.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod12</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1408.34375, 124.5)" title=":mod13" id="flowchart-C_0001195842122299166493-35" class="node default clickable flowchart-label">
+          <rect height="33" width="68.375" y="-16.5" x="-34.1875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.6875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="53.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod13</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1526.71875, 124.5)" title=":mod14" id="flowchart-C_0000581129920847850526-19" class="node default clickable flowchart-label">
+          <rect height="33" width="68.375" y="-16.5" x="-34.1875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.6875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="53.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod14</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1645.09375, 124.5)" title=":mod15" id="flowchart-C_0001715856257738182160-13" class="node default clickable flowchart-label">
+          <rect height="33" width="68.375" y="-16.5" x="-34.1875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.6875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="53.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod15</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1763.46875, 124.5)" title=":mod16" id="flowchart-C_0001435303665523039114-17" class="node default clickable flowchart-label">
+          <rect height="33" width="68.375" y="-16.5" x="-34.1875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.6875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="53.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod16</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(1881.84375, 124.5)" title=":mod17" id="flowchart-C_0001327885001907982070-25" class="node default clickable flowchart-label">
+          <rect height="33" width="68.375" y="-16.5" x="-34.1875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.6875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="53.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod17</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(2000.21875, 124.5)" title=":mod18" id="flowchart-C_0002193691762152553973-15" class="node default clickable flowchart-label">
+          <rect height="33" width="68.375" y="-16.5" x="-34.1875" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-26.6875, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="53.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">:mod18</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(997.4453125, 16.5)" title="app" id="flowchart-C_0001200268042616700255-0" class="node default clickable flowchart-label">
+          <rect height="33" width="41.703125" y="-16.5" x="-20.8515625" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-13.3515625, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="26.703125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">app</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg
index 8899e51b..d815c4e5 100644
--- a/docs/test_cases/t40001_include.svg
+++ b/docs/test_cases/t40001_include.svg
@@ -1,97 +1,65 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="394px" preserveAspectRatio="none" style="width:627px;height:394px;background:#FFFFFF;" version="1.1" viewBox="0 0 627 394" width="627px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="397px" preserveAspectRatio="none" style="width:676px;height:397px;" version="1.1" viewBox="0 0 676 397" width="676px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f14d3jxuziq22z" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="213" x="200" y="23.0059">Basic include diagram example</text>
-    <g id="cluster_C_0001387619747296316447">
-      <path d="M173.5,44.0939 L195.5,44.0939 A3.75,3.75 0 0 1 198,46.5939 L205,66.8938 L282.5,66.8938 A2.5,2.5 0 0 1 285,69.3938 L285,129.3939 A2.5,2.5 0 0 1 282.5,131.8939 L173.5,131.8939 A2.5,2.5 0 0 1 171,129.3939 L171,46.5939 A2.5,2.5 0 0 1 173.5,44.0939 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="171" x2="205" y1="66.8938" y2="66.8938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="21" x="175" y="59.0999">src</text>
-    </g>
-    <g id="cluster_C_0000989412417490706876">
-      <path d="M8.5,155.8939 L60.5,155.8939 A3.75,3.75 0 0 1 63,158.3939 L70,178.6938 L188.5,178.6938 A2.5,2.5 0 0 1 191,181.1938 L191,384.9939 A2.5,2.5 0 0 1 188.5,387.4939 L8.5,387.4939 A2.5,2.5 0 0 1 6,384.9939 L6,158.3939 A2.5,2.5 0 0 1 8.5,155.8939 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="70" y1="178.6938" y2="178.6938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="51" x="10" y="170.8999">include</text>
-    </g>
-    <g id="cluster_C_0001687675335949018432">
-      <path d="M40.5,251.6939 L66.5,251.6939 A3.75,3.75 0 0 1 69,254.1939 L76,274.4938 L156.5,274.4938 A2.5,2.5 0 0 1 159,276.9938 L159,352.9939 A2.5,2.5 0 0 1 156.5,355.4939 L40.5,355.4939 A2.5,2.5 0 0 1 38,352.9939 L38,254.1939 A2.5,2.5 0 0 1 40.5,251.6939 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="38" x2="76" y1="274.4938" y2="274.4938"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="42" y="266.6999">lib1</text>
-    </g>
-    <g id="elem_C_0001755015016680017839">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
-        <path d="M187,81.5939 L187,113.3938 A2.5,2.5 0 0 0 189.5,115.8938 L266.5,115.8938 A2.5,2.5 0 0 0 269,113.3938 L269,89.0939 L259,79.0939 L189.5,79.0939 A2.5,2.5 0 0 0 187,81.5939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M259,79.0939 L259,86.5939 A2.5,2.5 0 0 0 261.5,89.0939 L269,89.0939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="197" y="102.0999">t40001.cc</text>
-      </a>
-    </g>
-    <g id="elem_C_0001926692816440595520">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
-        <path d="M37.5,193.3939 L37.5,225.1938 A2.5,2.5 0 0 0 40,227.6938 L172,227.6938 A2.5,2.5 0 0 0 174.5,225.1938 L174.5,200.8939 L164.5,190.8939 L40,190.8939 A2.5,2.5 0 0 0 37.5,193.3939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M164.5,190.8939 L164.5,198.3939 A2.5,2.5 0 0 0 167,200.8939 L174.5,200.8939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="47.5" y="213.8999">t40001_include1.h</text>
-      </a>
-    </g>
-    <g id="elem_C_0002193549214042244690">
-      <path d="M81,297.1939 L81,328.9938 A2.5,2.5 0 0 0 83.5,331.4938 L132.5,331.4938 A2.5,2.5 0 0 0 135,328.9938 L135,304.6939 L125,294.6939 L83.5,294.6939 A2.5,2.5 0 0 0 81,297.1939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M125,294.6939 L125,302.1939 A2.5,2.5 0 0 0 127.5,304.6939 L135,304.6939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="91" y="317.6999">lib1.h</text>
-    </g>
-    <g id="elem_C_0001687197357150905926">
-      <path d="M365.5,297.1939 L365.5,328.9938 A2.5,2.5 0 0 0 368,331.4938 L418,331.4938 A2.5,2.5 0 0 0 420.5,328.9938 L420.5,304.6939 L410.5,294.6939 L368,294.6939 A2.5,2.5 0 0 0 365.5,297.1939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M410.5,294.6939 L410.5,302.1939 A2.5,2.5 0 0 0 413,304.6939 L420.5,304.6939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="375.5" y="317.6999">string</text>
-    </g>
-    <g id="elem_C_0000405203884025072971">
-      <path d="M280.5,193.3939 L280.5,225.1938 A2.5,2.5 0 0 0 283,227.6938 L337,227.6938 A2.5,2.5 0 0 0 339.5,225.1938 L339.5,200.8939 L329.5,190.8939 L283,190.8939 A2.5,2.5 0 0 0 280.5,193.3939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M329.5,190.8939 L329.5,198.3939 A2.5,2.5 0 0 0 332,200.8939 L339.5,200.8939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="290.5" y="213.8999">vector</text>
-    </g>
-    <g id="elem_C_0001659736894483045485">
-      <path d="M207,297.1939 L207,328.9938 A2.5,2.5 0 0 0 209.5,331.4938 L328.5,331.4938 A2.5,2.5 0 0 0 331,328.9938 L331,304.6939 L321,294.6939 L209.5,294.6939 A2.5,2.5 0 0 0 207,297.1939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M321,294.6939 L321,302.1939 A2.5,2.5 0 0 0 323.5,304.6939 L331,304.6939 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="104" x="217" y="317.6999">yaml-cpp/yaml.h</text>
-    </g>
-    <g id="elem_GMN17">
-      <path d="M455,300.2939 L455,325.8939 L613,325.8939 L613,310.2939 L603,300.2939 L455,300.2939 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M603,300.2939 L603,310.2939 L613,310.2939 L603,300.2939 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="137" x="461" y="317.3709">This is a lib1 include dir</text>
-    </g>
-    <g id="elem_GMN20">
-      <path d="M374,196.4939 L374,222.0939 L620,222.0939 L620,206.4939 L610,196.4939 L374,196.4939 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M610,196.4939 L610,206.4939 L620,206.4939 L610,196.4939 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="225" x="380" y="213.5709">This is a t40001_include1.h include file</text>
-    </g>
-    <g id="link_C_0001755015016680017839_C_0001687197357150905926">
-      <path d="M227,115.9439 C226.44,144.2639 229.94,199.8439 263,227.6939 C277.51,239.9139 331.99,225.5139 348,235.6939 C369.18,249.1539 379.6678,270.7738 385.9178,288.8338 " fill="none" id="C_0001755015016680017839-to-C_0001687197357150905926" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="387.88,294.5039,388.7167,284.6907,386.2448,289.7789,381.1566,287.307,387.88,294.5039" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001755015016680017839_C_0000405203884025072971">
-      <path d="M241.17,116.1339 C256.48,136.6239 277.9794,165.4169 293.2694,185.8869 " fill="none" id="C_0001755015016680017839-to-C_0000405203884025072971" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="296.86,190.6939,294.6788,181.0896,293.8678,186.688,288.2694,185.8771,296.86,190.6939" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001755015016680017839_C_0001926692816440595520">
-      <path d="M208.13,116.3839 C185.44,136.7939 153.0108,165.9913 130.3208,186.4013 " fill="none" id="C_0001755015016680017839-to-C_0001926692816440595520" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="125.86,190.4139,135.2263,187.3689,129.5774,187.0701,129.8762,181.4211,125.86,190.4139" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001926692816440595520_C_0002193549214042244690">
-      <path d="M106.35,228.0239 C106.71,246.5939 107.1608,269.6051 107.5308,288.2251 " fill="none" id="C_0001926692816440595520-to-C_0002193549214042244690" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="107.65,294.2239,111.4704,285.1462,107.5507,289.2249,103.472,285.3052,107.65,294.2239" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001926692816440595520_C_0001659736894483045485">
-      <path d="M138.1,228.0939 C142.46,230.6039 146.86,233.1839 151,235.6939 C182.95,255.0239 213.8548,275.2201 237.5848,291.0101 " fill="none" id="C_0001926692816440595520-to-C_0001659736894483045485" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="242.58,294.3339,237.3031,286.018,238.4173,291.5641,232.8713,292.6783,242.58,294.3339" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001926692816440595520_C_0001687197357150905926">
-      <path d="M174.8,223.8339 C183.92,225.3139 193.17,226.6539 202,227.6939 C218.14,229.5939 334.12,227.2539 348,235.6939 C369.44,248.7339 379.8927,270.4619 386.0627,288.6519 " fill="none" id="C_0001926692816440595520-to-C_0001687197357150905926" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-      <polygon fill="#181818" points="387.99,294.3339,388.887,284.526,386.3839,289.5989,381.311,287.0958,387.99,294.3339" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001687675335949018432_GMN17">
-      <path d="M54.0669,251.6353 C54.1767,251.3987 54.2877,251.1629 54.4001,250.9277 C55.299,249.0465 56.2833,247.212 57.3605,245.4403 C59.515,241.897 62.0412,238.6052 65,235.6939 C70.69,230.0939 74.57,232.5839 82.5,231.6939 C119.82,227.4839 383.18,227.4839 420.5,231.6939 C465.8,236.8039 505.78,278.3039 523.82,299.9939 " fill="none" id="C_0001687675335949018432-GMN17" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-    </g>
-    <g id="link_C_0001926692816440595520_GMN20">
-      <path d="M140.81,190.4039 C175.14,173.1939 229.7,149.6239 280.5,143.8939 C306.56,140.9539 313.44,140.9539 339.5,143.8939 C391.57,149.7739 446.93,178.7839 476.14,196.1339 " fill="none" id="C_0001926692816440595520-GMN20" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-    </g>
+    <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="273" x="204.5" y="16.708">Basic include diagram example</text>
+    <polygon fill="#FFFFFF" filter="url(#f14d3jxuziq22z)" points="187,44.9531,218,44.9531,225,67.25,309,67.25,309,131.9531,187,131.9531,187,44.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="225" y1="67.25" y2="67.25"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="191" y="59.9482">src</text>
+    <polygon fill="#FFFFFF" filter="url(#f14d3jxuziq22z)" points="22,155.9531,85,155.9531,92,178.25,211,178.25,211,385.9531,22,385.9531,22,155.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="92" y1="178.25" y2="178.25"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="26" y="170.9482">include</text>
+    <polygon fill="#FFFFFF" filter="url(#f14d3jxuziq22z)" points="54,250.9531,88,250.9531,95,273.25,179,273.25,179,353.9531,54,353.9531,54,250.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="54" x2="95" y1="273.25" y2="273.25"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="58" y="265.9482">lib1</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="203,79.9531,203,116.25,293,116.25,293,89.9531,283,79.9531,203,79.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M283,79.9531 L283,89.9531 L293,89.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="213" y="102.9482">t40001.cc</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="46.5,190.9531,46.5,227.25,195.5,227.25,195.5,200.9531,185.5,190.9531,46.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M185.5,190.9531 L185.5,200.9531 L195.5,200.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="129" x="56.5" y="213.9482">t40001_include1.h</text>
+    </a>
+    <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="97.5,293.9531,97.5,330.25,154.5,330.25,154.5,303.9531,144.5,293.9531,97.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <path d="M144.5,293.9531 L144.5,303.9531 L154.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="107.5" y="316.9482">lib1.h</text>
+    <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="393.5,293.9531,393.5,330.25,452.5,330.25,452.5,303.9531,442.5,293.9531,393.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <path d="M442.5,293.9531 L442.5,303.9531 L452.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="403.5" y="316.9482">string</text>
+    <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="301.5,190.9531,301.5,227.25,364.5,227.25,364.5,200.9531,354.5,190.9531,301.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <path d="M354.5,190.9531 L354.5,200.9531 L364.5,200.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="311.5" y="213.9482">vector</text>
+    <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="227.5,293.9531,227.5,330.25,358.5,330.25,358.5,303.9531,348.5,293.9531,227.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <path d="M348.5,293.9531 L348.5,303.9531 L358.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="111" x="237.5" y="316.9482">yaml-cpp/yaml.h</text>
+    <path d="M487.5,299.4531 L487.5,324.5859 L654.5,324.5859 L654.5,309.4531 L644.5,299.4531 L487.5,299.4531 " fill="#FBFB77" filter="url(#f14d3jxuziq22z)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M644.5,299.4531 L644.5,309.4531 L654.5,309.4531 L644.5,299.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="146" x="493.5" y="316.52">This is a lib1 include dir</text>
+    <path d="M400,196.4531 L400,221.5859 L664,221.5859 L664,206.4531 L654,196.4531 L400,196.4531 " fill="#FBFB77" filter="url(#f14d3jxuziq22z)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M654,196.4531 L654,206.4531 L664,206.4531 L654,196.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="406" y="213.52">This is a t40001_include1.h include file</text>
+    <path d="M247.19,116.2831 C246.91,144.4031 250.93,199.5631 284,226.9531 C299.81,240.0431 358.52,224.1931 376,234.9531 C395.8,247.1431 408.53,271.1231 415.68,288.8931 " fill="none" id="C_0001755015016680017839-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="417.55,293.7331,418.0465,283.8968,415.7522,289.0675,410.5815,286.7732,417.55,293.7331" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M261.28,115.9831 C276.16,135.0731 300.31,166.0331 316.42,186.6931 " fill="none" id="C_0001755015016680017839-&gt;C_0000405203884025072971" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="319.53,190.6831,317.1548,181.125,316.4573,186.7387,310.8436,186.0412,319.53,190.6831" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M228.16,115.9831 C205.73,135.2331 169.24,166.5531 145.17,187.2131 " fill="none" id="C_0001755015016680017839-&gt;C_0001926692816440595520" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="141.12,190.6831,150.5565,187.863,144.9163,187.4292,145.3501,181.789,141.12,190.6831" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M121.85,227.0831 C122.69,244.0631 123.98,270.1431 124.9,288.7131 " fill="none" id="C_0001926692816440595520-&gt;C_0002193549214042244690" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="125.15,293.7331,128.6825,284.5396,124.8932,288.7397,120.693,284.9504,125.15,293.7331" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M156.19,227.0231 C161.2,229.6131 166.26,232.2931 171,234.9531 C202.98,252.8531 238.42,275.2331 262.82,291.0531 " fill="none" id="C_0001926692816440595520-&gt;C_0001659736894483045485" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="267.25,293.9331,261.882,285.6757,263.0571,291.2092,257.5237,292.3843,267.25,293.9331" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M195.6,223.5031 C204.48,224.8131 213.43,226.0131 222,226.9531 C239.03,228.8231 361.25,226.2231 376,234.9531 C396.14,246.8731 408.86,271.1231 415.91,289.0431 " fill="none" id="C_0001926692816440595520-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="417.76,293.9131,418.309,284.0796,415.9872,289.238,410.8288,286.9161,417.76,293.9131" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M70.1058,250.8082 C70.2152,250.5729 70.326,250.3383 70.4381,250.1044 C71.3346,248.2331 72.316,246.4084 73.3896,244.6463 C75.537,241.122 78.0538,237.8481 81,234.9531 C86.69,229.3631 90.57,231.8431 98.5,230.9531 C137.59,226.5431 413.41,226.5431 452.5,230.9531 C499.3,236.2331 541.59,277.8631 560.52,299.2931 " fill="none" id="C_0001687675335949018432-GMN1632" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M155.77,190.9031 C191.28,173.8231 248.55,149.9231 301.5,143.9531 C329.32,140.8131 336.68,140.8131 364.5,143.9531 C419.83,150.1931 479.43,179.3331 510.45,196.4031 " fill="none" id="C_0001926692816440595520-GMN1635" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t40001_include_mermaid.svg b/docs/test_cases/t40001_include_mermaid.svg
index 672e1c65..24b9afec 100644
--- a/docs/test_cases/t40001_include_mermaid.svg
+++ b/docs/test_cases/t40001_include_mermaid.svg
@@ -1,22 +1,23 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -49 898.53515625 406" style="max-width: 898.535px; background-color: white;" width="898.53515625" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-labelledby="chart-title-my-svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -49 898.53515625 406" style="max-width: 898.535px; background-color: white;" width="898.53515625" id="my-svg">
+  <title id="chart-title-my-svg">Basic include diagram example</title>
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -53,12 +54,12 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0001687197357150905926" id="L-C_0001755015016680017839-C_0001687197357150905926-0" d="M622.7975809487951,58L631.3293643323293,62.166666666666664C639.8611477158635,66.33333333333333,656.9247144829318,74.66666666666667,665.4564978664658,83C673.98828125,91.33333333333333,673.98828125,99.66666666666667,673.98828125,108C673.98828125,116.33333333333333,673.98828125,124.66666666666667,673.98828125,135.75C673.98828125,146.83333333333334,673.98828125,160.66666666666666,673.98828125,174.5C673.98828125,188.33333333333334,673.98828125,202.16666666666666,673.98828125,213.25C673.98828125,224.33333333333334,673.98828125,232.66666666666666,673.98828125,240.11666666666667C673.98828125,247.5666666666667,673.98828125,254.13333333333333,673.98828125,257.4166666666667L673.98828125,260.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0000405203884025072971" id="L-C_0001755015016680017839-C_0000405203884025072971-0" d="M546.81640625,51.17106767631006L523.6712239583334,56.47588973025838C500.5260416666667,61.78071178420671,454.2356770833333,72.39035589210336,406.5305989583333,81.86184461271834C358.8255208333333,91.33333333333333,309.7057291666667,99.66666666666667,285.1458333333333,108C260.5859375,116.33333333333333,260.5859375,124.66666666666667,260.5859375,132.11666666666667C260.5859375,139.56666666666666,260.5859375,146.13333333333333,260.5859375,149.41666666666666L260.5859375,152.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001755015016680017839 LE-C_0001926692816440595520" id="L-C_0001755015016680017839-C_0001926692816440595520-0" d="M572.6980892319277,58L568.5784858182732,62.166666666666664C564.4588824046185,66.33333333333333,556.2196755773092,74.66666666666667,552.1000721636547,83C547.98046875,91.33333333333333,547.98046875,99.66666666666667,547.98046875,108C547.98046875,116.33333333333333,547.98046875,124.66666666666667,544.2105122275317,132.39351271952913C540.4405557050635,140.12035877239157,532.900642660127,147.24071754478317,529.1306861376587,150.80089693097895L525.3607296151905,154.36107631717474"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001926692816440595520 LE-C_0002193549214042244690" id="L-C_0001926692816440595520-C_0002193549214042244690-0" d="M473.53096762048193,191L465.8278896837349,195.16666666666666C458.124811746988,199.33333333333334,442.718655873494,207.66666666666666,435.015577936747,216C427.3125,224.33333333333334,427.3125,232.66666666666666,426.1148150397421,240.16864264336746C424.91713007948414,247.67061862006827,422.5217601589682,254.3412372401365,421.3240751987103,257.67654655017066L420.1263902384524,261.0118558602048"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001659736894483045485" id="L-C_0001926692816440595520-C_0001659736894483045485-0" d="M525.4832925451807,191L530.8994885793172,195.16666666666666C536.3156846134538,199.33333333333334,547.1480766817268,207.66666666666666,552.5642727158635,216C557.98046875,224.33333333333334,557.98046875,232.66666666666666,589.2866623082919,241.8532107838781C620.5928558665837,251.0397549010895,683.2052429831674,261.07950980217896,714.5114365414591,266.0993872527237L745.817630099751,271.11926470326847"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001687197357150905926" id="L-C_0001926692816440595520-C_0001687197357150905926-0" d="M500.0592526355422,191L499.05523657128515,195.16666666666666C498.0512205070281,199.33333333333334,496.04318837851406,207.66666666666666,495.03917231425703,216C494.03515625,224.33333333333334,494.03515625,232.66666666666666,518.6561858987039,242.51132714656228C543.277215547408,252.3559876264579,592.5192748448161,263.7119752529158,617.14030449352,269.3899690661447L641.7613341422241,275.0679628793737"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0001687197357150905926" id="L-C_0001755015016680017839-C_0001687197357150905926-0" d="M622.7975809487951,58L631.3293643323293,62.166666666666664C639.8611477158635,66.33333333333333,656.9247144829318,74.66666666666667,665.4564978664658,83C673.98828125,91.33333333333333,673.98828125,99.66666666666667,673.98828125,108C673.98828125,116.33333333333333,673.98828125,124.66666666666667,673.98828125,135.75C673.98828125,146.83333333333334,673.98828125,160.66666666666666,673.98828125,174.5C673.98828125,188.33333333333334,673.98828125,202.16666666666666,673.98828125,213.25C673.98828125,224.33333333333334,673.98828125,232.66666666666666,673.98828125,241C673.98828125,249.33333333333334,673.98828125,257.6666666666667,673.98828125,261.8333333333333L673.98828125,266"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001755015016680017839 LE-C_0000405203884025072971" id="L-C_0001755015016680017839-C_0000405203884025072971-0" d="M546.81640625,51.17106767631006L523.6712239583334,56.47588973025838C500.5260416666667,61.78071178420671,454.2356770833333,72.39035589210336,406.5305989583333,81.86184461271834C358.8255208333333,91.33333333333333,309.7057291666667,99.66666666666667,285.1458333333333,108C260.5859375,116.33333333333333,260.5859375,124.66666666666667,260.5859375,133C260.5859375,141.33333333333334,260.5859375,149.66666666666666,260.5859375,153.83333333333334L260.5859375,158"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001755015016680017839 LE-C_0001926692816440595520" id="L-C_0001755015016680017839-C_0001926692816440595520-0" d="M572.6980892319277,58L568.5784858182732,62.166666666666664C564.4588824046185,66.33333333333333,556.2196755773092,74.66666666666667,552.1000721636547,83C547.98046875,91.33333333333333,547.98046875,99.66666666666667,547.98046875,108C547.98046875,116.33333333333333,547.98046875,124.66666666666667,543.5682887801205,133C539.1561088102409,141.33333333333334,530.3317488704819,149.66666666666666,525.9195689006024,153.83333333333334L521.5073889307229,158"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001926692816440595520 LE-C_0002193549214042244690" id="L-C_0001926692816440595520-C_0002193549214042244690-0" d="M473.53096762048193,191L465.8278896837349,195.16666666666666C458.124811746988,199.33333333333334,442.718655873494,207.66666666666666,435.015577936747,216C427.3125,224.33333333333334,427.3125,232.66666666666666,425.8162807479919,241C424.3200614959839,249.33333333333334,421.32762299196787,257.6666666666667,419.8314037399598,261.8333333333333L418.3351844879518,266"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001659736894483045485" id="L-C_0001926692816440595520-C_0001659736894483045485-0" d="M525.4832925451807,191L530.8994885793172,195.16666666666666C536.3156846134538,199.33333333333334,547.1480766817268,207.66666666666666,552.5642727158635,216C557.98046875,224.33333333333334,557.98046875,232.66666666666666,590.1588541666666,241.99306477903886C622.3372395833334,251.31946289141106,686.6940104166666,261.6389257828222,718.8723958333334,266.7986572285277L751.05078125,271.9583886742333"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0001926692816440595520 LE-C_0001687197357150905926" id="L-C_0001926692816440595520-C_0001687197357150905926-0" d="M500.0592526355422,191L499.05523657128515,195.16666666666666C498.0512205070281,199.33333333333334,496.04318837851406,207.66666666666666,495.03917231425703,216C494.03515625,224.33333333333334,494.03515625,232.66666666666666,519.5169270833334,242.70982750137478C544.9986979166666,252.7529883360829,595.9622395833334,264.5059766721658,621.4440104166666,270.3824708402072L646.92578125,276.25896500824865"/>
         <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_00002 LE-C_0001926692816440595520" id="L-N_00002-C_0001926692816440595520-0" d="M169.42578125,58L169.42578125,62.166666666666664C169.42578125,66.33333333333333,169.42578125,74.66666666666667,212.271484375,83C255.1171875,91.33333333333333,340.80859375,99.66666666666667,383.654296875,108C426.5,116.33333333333333,426.5,124.66666666666667,434.28465424196787,133C442.0693084839357,141.33333333333334,457.6386169678715,149.66666666666666,465.42327120983936,153.83333333333334L473.2079254518072,158"/>
         <path style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-N_00001 LE-C_0001687675335949018432" id="L-N_00001-C_0001687675335949018432-0" d="M181.296875,186.83255218337814L217.02864583333334,191.69379348614845C252.76041666666666,196.55503478891876,324.2239583333333,206.27751739445935,359.9557291666667,215.30542536389635C395.6875,224.33333333333334,395.6875,232.66666666666666,395.6875,236.83333333333334L395.6875,241"/>
       </g>
@@ -137,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/include/t40001_include1.h#L0">
+        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/include/t40001_include1.h#L0">
           <g title="t40001_include1.h" id="flowchart-C_0001926692816440595520-3" class="node default clickable flowchart-label">
             <rect height="33" width="145.78125" y="-16.5" x="-72.890625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-65.390625, -9)" style="" class="label">
@@ -150,7 +151,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L0">
+        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L0">
           <g title="lib1.h" id="flowchart-C_0002193549214042244690-4" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -163,7 +164,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40001/src/t40001.cc#L0">
+        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/src/t40001.cc#L0">
           <g title="t40001.cc" id="flowchart-C_0001755015016680017839-0" class="node default clickable flowchart-label">
             <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-34.6953125, -9)" style="" class="label">
diff --git a/docs/test_cases/t40002.md b/docs/test_cases/t40002.md
index 74882ee6..231dba9c 100644
--- a/docs/test_cases/t40002.md
+++ b/docs/test_cases/t40002.md
@@ -83,6 +83,16 @@ int foo1();
 
 int foo();
 
+}
+```
+File `tests/t40002/include/lib2/lib2_detail.h`
+```cpp
+#pragma once
+
+namespace clanguml::t40002::lib2::detail {
+
+int foo22();
+
 }
 ```
 File `tests/t40002/include/lib2/lib2.h`
@@ -99,16 +109,6 @@ int foo3();
 
 int foo();
 
-}
-```
-File `tests/t40002/include/lib2/lib2_detail.h`
-```cpp
-#pragma once
-
-namespace clanguml::t40002::lib2::detail {
-
-int foo22();
-
 }
 ```
 ## Generated PlantUML diagrams
diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg
index bd5f1f40..ea6052a0 100644
--- a/docs/test_cases/t40002_include.svg
+++ b/docs/test_cases/t40002_include.svg
@@ -1,92 +1,66 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="458px" preserveAspectRatio="none" style="width:365px;height:458px;background:#FFFFFF;" version="1.1" viewBox="0 0 365 458" width="365px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:412px;height:479px;" version="1.1" viewBox="0 0 412 479" width="412px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f10aeee663psf6" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001387619747296316447">
-      <path d="M8.5,6.294 L30.5,6.294 A3.75,3.75 0 0 1 33,8.794 L40,29.0939 L355.5,29.0939 A2.5,2.5 0 0 1 358,31.5939 L358,158.594 A2.5,2.5 0 0 1 355.5,161.094 L8.5,161.094 A2.5,2.5 0 0 1 6,158.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="40" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="21" x="10" y="21.2999">src</text>
-    </g>
-    <g id="cluster_C_0001284742705549910910">
-      <path d="M32.5,49.294 L58.5,49.294 A3.75,3.75 0 0 1 61,51.794 L68,72.0939 L119.5,72.0939 A2.5,2.5 0 0 1 122,74.5939 L122,134.594 A2.5,2.5 0 0 1 119.5,137.094 L32.5,137.094 A2.5,2.5 0 0 1 30,134.594 L30,51.794 A2.5,2.5 0 0 1 32.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="68" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="34" y="64.2999">lib1</text>
-    </g>
-    <g id="cluster_C_0001397224709580110803">
-      <path d="M244.5,49.294 L270.5,49.294 A3.75,3.75 0 0 1 273,51.794 L280,72.0939 L331.5,72.0939 A2.5,2.5 0 0 1 334,74.5939 L334,134.594 A2.5,2.5 0 0 1 331.5,137.094 L244.5,137.094 A2.5,2.5 0 0 1 242,134.594 L242,51.794 A2.5,2.5 0 0 1 244.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="242" x2="280" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="246" y="64.2999">lib2</text>
-    </g>
-    <g id="cluster_C_0000989412417490706876">
-      <path d="M46.5,185.094 L98.5,185.094 A3.75,3.75 0 0 1 101,187.594 L108,207.8939 L175.5,207.8939 A2.5,2.5 0 0 1 178,210.3939 L178,449.194 A2.5,2.5 0 0 1 175.5,451.694 L46.5,451.694 A2.5,2.5 0 0 1 44,449.194 L44,187.594 A2.5,2.5 0 0 1 46.5,185.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="44" x2="108" y1="207.8939" y2="207.8939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="51" x="48" y="200.0999">include</text>
-    </g>
-    <g id="cluster_C_0001687675335949018432">
-      <path d="M70.5,228.094 L96.5,228.094 A3.75,3.75 0 0 1 99,230.594 L106,250.8939 L151.5,250.8939 A2.5,2.5 0 0 1 154,253.3939 L154,313.394 A2.5,2.5 0 0 1 151.5,315.894 L70.5,315.894 A2.5,2.5 0 0 1 68,313.394 L68,230.594 A2.5,2.5 0 0 1 70.5,228.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="68" x2="106" y1="250.8939" y2="250.8939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="72" y="243.0999">lib1</text>
-    </g>
-    <g id="cluster_C_0001248530620501446930">
-      <path d="M70.5,339.894 L96.5,339.894 A3.75,3.75 0 0 1 99,342.394 L106,362.6939 L151.5,362.6939 A2.5,2.5 0 0 1 154,365.1939 L154,425.194 A2.5,2.5 0 0 1 151.5,427.694 L70.5,427.694 A2.5,2.5 0 0 1 68,425.194 L68,342.394 A2.5,2.5 0 0 1 70.5,339.894 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="68" x2="106" y1="362.6939" y2="362.6939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="25" x="72" y="354.8999">lib2</text>
-    </g>
-    <g id="elem_C_0001489450289909741706">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
-        <path d="M141,86.794 L141,118.5939 A2.5,2.5 0 0 0 143.5,121.0939 L220.5,121.0939 A2.5,2.5 0 0 0 223,118.5939 L223,94.294 L213,84.294 L143.5,84.294 A2.5,2.5 0 0 0 141,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M213,84.294 L213,91.794 A2.5,2.5 0 0 0 215.5,94.294 L223,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="62" x="151" y="107.2999">t40002.cc</text>
-      </a>
-    </g>
-    <g id="elem_C_0001493913207373215402">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
-        <path d="M46,86.794 L46,118.5939 A2.5,2.5 0 0 0 48.5,121.0939 L103.5,121.0939 A2.5,2.5 0 0 0 106,118.5939 L106,94.294 L96,84.294 L48.5,84.294 A2.5,2.5 0 0 0 46,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M96,84.294 L96,91.794 A2.5,2.5 0 0 0 98.5,94.294 L106,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="56" y="107.2999">lib1.cc</text>
-      </a>
-    </g>
-    <g id="elem_C_0001761875020766116446">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
-        <path d="M258,86.794 L258,118.5939 A2.5,2.5 0 0 0 260.5,121.0939 L315.5,121.0939 A2.5,2.5 0 0 0 318,118.5939 L318,94.294 L308,84.294 L260.5,84.294 A2.5,2.5 0 0 0 258,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M308,84.294 L308,91.794 A2.5,2.5 0 0 0 310.5,94.294 L318,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="268" y="107.2999">lib2.cc</text>
-      </a>
-    </g>
-    <g id="elem_C_0002193549214042244690">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-        <path d="M84,265.594 L84,297.3939 A2.5,2.5 0 0 0 86.5,299.8939 L135.5,299.8939 A2.5,2.5 0 0 0 138,297.3939 L138,273.094 L128,263.094 L86.5,263.094 A2.5,2.5 0 0 0 84,265.594 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M128,263.094 L128,270.594 A2.5,2.5 0 0 0 130.5,273.094 L138,273.094 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="94" y="286.0999">lib1.h</text>
-      </a>
-    </g>
-    <g id="elem_C_0001969674835696841438">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
-        <path d="M84,377.394 L84,409.1939 A2.5,2.5 0 0 0 86.5,411.6939 L135.5,411.6939 A2.5,2.5 0 0 0 138,409.1939 L138,384.894 L128,374.894 L86.5,374.894 A2.5,2.5 0 0 0 84,377.394 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M128,374.894 L128,382.394 A2.5,2.5 0 0 0 130.5,384.894 L138,384.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="94" y="397.8999">lib2.h</text>
-      </a>
-    </g>
-    <g id="link_C_0001489450289909741706_C_0002193549214042244690">
-      <path d="M174.93,121.294 C161.36,155.094 134.0168,223.1865 120.3768,257.1365 " fill="none" id="C_0001489450289909741706-to-C_0002193549214042244690" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="118.14,262.704,125.2069,255.844,120.004,258.0644,117.7836,252.8616,118.14,262.704" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001489450289909741706_C_0001969674835696841438">
-      <path d="M182.3,121.424 C182.41,159.614 179.72,252.054 154,323.894 C147.33,342.514 138.543,356.5539 128.773,369.7339 " fill="none" id="C_0001489450289909741706-to-C_0001969674835696841438" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="125.2,374.554,133.7729,369.7058,128.1775,370.5372,127.3461,364.9418,125.2,374.554" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001493913207373215402_C_0002193549214042244690">
-      <path d="M79.48,121.294 C86.18,155.094 99.595,222.8682 106.315,256.8182 " fill="none" id="C_0001493913207373215402-to-C_0002193549214042244690" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="107.48,262.704,109.6563,253.0986,106.5091,257.7991,101.8086,254.652,107.48,262.704" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001761875020766116446_C_0001969674835696841438">
-      <path d="M283.42,121.414 C272.63,160.794 242.7,257.344 193,323.894 C177.91,344.094 160.5941,358.6489 143.1041,371.1289 " fill="none" id="C_0001761875020766116446-to-C_0001969674835696841438" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="138.22,374.614,147.8695,372.6425,142.2901,371.7098,143.2228,366.1303,138.22,374.614" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002193549214042244690_C_0001969674835696841438">
-      <path d="M111,300.134 C111,320.624 111,348.224 111,368.694 " fill="none" id="C_0002193549214042244690-to-C_0001969674835696841438" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="111,374.694,115,365.694,111,369.694,107,365.694,111,374.694" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
+    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="87" y1="89.2969" y2="89.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="50" y="81.9951">lib1</text>
+    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="270" x2="311" y1="89.2969" y2="89.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="274" y="81.9951">lib2</text>
+    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="135" y1="224.2969" y2="224.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="69" y="216.9951">include</text>
+    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="267.2969" y2="267.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="259.9951">lib1</text>
+    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="378.2969" y2="378.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="370.9951">lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M241,102 L241,112 L251,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="171" y="124.9951">t40002.cc</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="72" y="124.9951">lib1.cc</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M340,102 L340,112 L350,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="296" y="124.9951">lib2.cc</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M152.5,280 L152.5,290 L162.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="302.9951">lib1.h</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M152.5,391 L152.5,401 L162.5,401 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="413.9951">lib2.h</text>
+    </a>
+    <path d="M198.97,138.2 C185.81,170.35 157.51,239.52 143,275.01 " fill="none" id="C_0001489450289909741706-&gt;C_0002193549214042244690" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="140.96,279.99,148.0781,273.1832,142.8587,275.3645,140.6773,270.1452,140.96,279.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M206.51,138.1 C207.07,175.82 205.4,268.48 179,340 C172.75,356.94 161.55,373.89 151.89,386.62 " fill="none" id="C_0001489450289909741706-&gt;C_0001969674835696841438" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="148.68,390.77,157.3477,386.0933,151.7368,386.8133,151.0169,381.2024,148.68,390.77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M97.91,138.2 C105.22,170.35 120.94,239.52 129,275.01 " fill="none" id="C_0001493913207373215402-&gt;C_0002193549214042244690" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="130.13,279.99,132.0225,270.3247,129.0151,275.1159,124.2239,272.1085,130.13,279.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M313.18,138.08 C301.6,176.94 269.34,273.76 218,340 C203.48,358.73 182.85,375.53 165.66,387.75 " fill="none" id="C_0001761875020766116446-&gt;C_0001969674835696841438" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="161.37,390.75,171.0334,388.8476,165.4608,387.875,166.4334,382.3024,161.37,390.75" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M134,316.03 C134,334.8 134,365.05 134,385.7 " fill="none" id="C_0002193549214042244690-&gt;C_0001969674835696841438" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="134,390.73,138,381.73,134,385.73,130,381.73,134,390.73" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t40002_include_mermaid.svg b/docs/test_cases/t40002_include_mermaid.svg
index 720ccb7c..2b698312 100644
--- a/docs/test_cases/t40002_include_mermaid.svg
+++ b/docs/test_cases/t40002_include_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 504.7265625 465" style="max-width: 504.727px; background-color: white;" width="504.7265625" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -83,11 +83,11 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0002193549214042244690" id="L-C_0001489450289909741706-C_0002193549214042244690-0" d="M116.15855609939759,83L120.03382279116465,87.16666666666667C123.90908948293172,91.33333333333333,131.65962286646587,99.66666666666667,135.53488955823295,108C139.41015625,116.33333333333333,139.41015625,124.66666666666667,139.41015625,133C139.41015625,141.33333333333334,139.41015625,149.66666666666666,139.41015625,158C139.41015625,166.33333333333334,139.41015625,174.66666666666666,139.41015625,183C139.41015625,191.33333333333334,139.41015625,199.66666666666666,146.4374356272157,207.806395762344C153.4647150044314,215.94612485802136,167.51927375886282,223.89224971604276,174.54655313607853,227.86531214505342L181.57383251329424,231.8383745740641"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0001969674835696841438" id="L-C_0001489450289909741706-C_0001969674835696841438-0" d="M88.00418862951807,83L84.76976656626506,87.16666666666667C81.53534450301204,91.33333333333333,75.06650037650603,99.66666666666667,71.832078313253,108C68.59765625,116.33333333333333,68.59765625,124.66666666666667,68.59765625,133C68.59765625,141.33333333333334,68.59765625,149.66666666666666,68.59765625,158C68.59765625,166.33333333333334,68.59765625,174.66666666666666,68.59765625,183C68.59765625,191.33333333333334,68.59765625,199.66666666666666,68.59765625,210.75C68.59765625,221.83333333333334,68.59765625,235.66666666666666,68.59765625,249.5C68.59765625,263.3333333333333,68.59765625,277.1666666666667,68.59765625,288.25C68.59765625,299.3333333333333,68.59765625,307.6666666666667,68.59765625,316C68.59765625,324.3333333333333,68.59765625,332.6666666666667,86.97895678854945,342.20533313861364C105.36025732709892,351.7439996105606,142.12285840419784,362.48799922112113,160.5041589427473,367.8599990264015L178.88545948129678,373.2319988316818"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001493913207373215402 LE-C_0002193549214042244690" id="L-C_0001493913207373215402-C_0002193549214042244690-0" d="M253.1875,83L253.1875,87.16666666666667C253.1875,91.33333333333333,253.1875,99.66666666666667,253.1875,108C253.1875,116.33333333333333,253.1875,124.66666666666667,253.1875,133C253.1875,141.33333333333334,253.1875,149.66666666666666,253.1875,158C253.1875,166.33333333333334,253.1875,174.66666666666666,253.1875,183C253.1875,191.33333333333334,253.1875,199.66666666666666,249.74975554460647,207.36686633392358C246.31201108921297,215.0670660011805,239.43652217842592,222.13413200236099,235.9987777230324,225.66766500295125L232.56103326763886,229.2011980035415"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001761875020766116446 LE-C_0001969674835696841438" id="L-C_0001761875020766116446-C_0001969674835696841438-0" d="M403.546875,83L403.546875,87.16666666666667C403.546875,91.33333333333333,403.546875,99.66666666666667,403.546875,108C403.546875,116.33333333333333,403.546875,124.66666666666667,403.546875,133C403.546875,141.33333333333334,403.546875,149.66666666666666,403.546875,158C403.546875,166.33333333333334,403.546875,174.66666666666666,403.546875,183C403.546875,191.33333333333334,403.546875,199.66666666666666,403.546875,210.75C403.546875,221.83333333333334,403.546875,235.66666666666666,403.546875,249.5C403.546875,263.3333333333333,403.546875,277.1666666666667,403.546875,288.25C403.546875,299.3333333333333,403.546875,307.6666666666667,403.546875,316C403.546875,324.3333333333333,403.546875,332.6666666666667,376.68975611567316,342.60982955819594C349.8326372313464,352.5529924497252,296.1183994626928,364.10598489945033,269.261280578366,369.882481124313L242.40416169403917,375.6589773491756"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002193549214042244690 LE-C_0001969674835696841438" id="L-C_0002193549214042244690-C_0001969674835696841438-0" d="M212.8125,266L212.8125,270.1666666666667C212.8125,274.3333333333333,212.8125,282.6666666666667,212.8125,291C212.8125,299.3333333333333,212.8125,307.6666666666667,212.8125,316C212.8125,324.3333333333333,212.8125,332.6666666666667,212.63720239341396,340.1179219971253C212.46190478682794,347.56917732758393,212.11130957365586,354.1383546551679,211.93601196706982,357.4229433189599L211.76071436048377,360.7075319827519"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0002193549214042244690" id="L-C_0001489450289909741706-C_0002193549214042244690-0" d="M116.15855609939759,83L120.03382279116465,87.16666666666667C123.90908948293172,91.33333333333333,131.65962286646587,99.66666666666667,135.53488955823295,108C139.41015625,116.33333333333333,139.41015625,124.66666666666667,139.41015625,133C139.41015625,141.33333333333334,139.41015625,149.66666666666666,139.41015625,158C139.41015625,166.33333333333334,139.41015625,174.66666666666666,139.41015625,183C139.41015625,191.33333333333334,139.41015625,199.66666666666666,147.20638020833334,208.24113937523282C155.00260416666666,216.81561208379898,170.59505208333334,225.63122416759794,178.39127604166666,230.03903020949744L186.1875,234.44683625139695"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001489450289909741706 LE-C_0001969674835696841438" id="L-C_0001489450289909741706-C_0001969674835696841438-0" d="M88.00418862951807,83L84.76976656626506,87.16666666666667C81.53534450301204,91.33333333333333,75.06650037650603,99.66666666666667,71.832078313253,108C68.59765625,116.33333333333333,68.59765625,124.66666666666667,68.59765625,133C68.59765625,141.33333333333334,68.59765625,149.66666666666666,68.59765625,158C68.59765625,166.33333333333334,68.59765625,174.66666666666666,68.59765625,183C68.59765625,191.33333333333334,68.59765625,199.66666666666666,68.59765625,210.75C68.59765625,221.83333333333334,68.59765625,235.66666666666666,68.59765625,249.5C68.59765625,263.3333333333333,68.59765625,277.1666666666667,68.59765625,288.25C68.59765625,299.3333333333333,68.59765625,307.6666666666667,68.59765625,316C68.59765625,324.3333333333333,68.59765625,332.6666666666667,87.82682291666667,342.453125C107.05598958333333,352.2395833333333,145.51432291666666,363.4791666666667,164.74348958333334,369.0989583333333L183.97265625,374.71875"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001493913207373215402 LE-C_0002193549214042244690" id="L-C_0001493913207373215402-C_0002193549214042244690-0" d="M253.1875,83L253.1875,87.16666666666667C253.1875,91.33333333333333,253.1875,99.66666666666667,253.1875,108C253.1875,116.33333333333333,253.1875,124.66666666666667,253.1875,133C253.1875,141.33333333333334,253.1875,149.66666666666666,253.1875,158C253.1875,166.33333333333334,253.1875,174.66666666666666,253.1875,183C253.1875,191.33333333333334,253.1875,199.66666666666666,249.13378514056225,208C245.08007028112448,216.33333333333334,236.97264056224898,224.66666666666666,232.9189257028112,228.83333333333334L228.8652108433735,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001761875020766116446 LE-C_0001969674835696841438" id="L-C_0001761875020766116446-C_0001969674835696841438-0" d="M403.546875,83L403.546875,87.16666666666667C403.546875,91.33333333333333,403.546875,99.66666666666667,403.546875,108C403.546875,116.33333333333333,403.546875,124.66666666666667,403.546875,133C403.546875,141.33333333333334,403.546875,149.66666666666666,403.546875,158C403.546875,166.33333333333334,403.546875,174.66666666666666,403.546875,183C403.546875,191.33333333333334,403.546875,199.66666666666666,403.546875,210.75C403.546875,221.83333333333334,403.546875,235.66666666666666,403.546875,249.5C403.546875,263.3333333333333,403.546875,277.1666666666667,403.546875,288.25C403.546875,299.3333333333333,403.546875,307.6666666666667,403.546875,316C403.546875,324.3333333333333,403.546875,332.6666666666667,375.826171875,342.7955714141108C348.10546875,352.9244761615548,292.6640625,364.84895232310964,264.943359375,370.8111904038871L237.22265625,376.77342848466446"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002193549214042244690 LE-C_0001969674835696841438" id="L-C_0002193549214042244690-C_0001969674835696841438-0" d="M212.8125,266L212.8125,270.1666666666667C212.8125,274.3333333333333,212.8125,282.6666666666667,212.8125,291C212.8125,299.3333333333333,212.8125,307.6666666666667,212.8125,316C212.8125,324.3333333333333,212.8125,332.6666666666667,212.5901261295181,341C212.36775225903614,349.3333333333333,211.92300451807228,357.6666666666667,211.70063064759037,361.8333333333333L211.47825677710844,366"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -137,7 +137,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib2/lib2.h#L0">
+        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib2/lib2.h#L0">
           <g title="lib2.h" id="flowchart-C_0001969674835696841438-4" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/include/lib1/lib1.h#L0">
+        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib1/lib1.h#L0">
           <g title="lib1.h" id="flowchart-C_0002193549214042244690-3" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -163,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/t40002.cc#L0">
+        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/t40002.cc#L0">
           <g title="t40002.cc" id="flowchart-C_0001489450289909741706-0" class="node default clickable flowchart-label">
             <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-34.6953125, -9)" style="" class="label">
@@ -176,7 +176,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib2/lib2.cc#L0">
+        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib2/lib2.cc#L0">
           <g title="lib2.cc" id="flowchart-C_0001761875020766116446-2" class="node default clickable flowchart-label">
             <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-22.6796875, -9)" style="" class="label">
@@ -189,7 +189,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40002/src/lib1/lib1.cc#L0">
+        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib1/lib1.cc#L0">
           <g title="lib1.cc" id="flowchart-C_0001493913207373215402-1" class="node default clickable flowchart-label">
             <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-22.6796875, -9)" style="" class="label">
diff --git a/docs/test_cases/t40003.md b/docs/test_cases/t40003.md
index de50c672..a8deffce 100644
--- a/docs/test_cases/t40003.md
+++ b/docs/test_cases/t40003.md
@@ -48,14 +48,14 @@ void t()
 }
 }
 ```
-File `tests/t40003/include/dependencies/t2.h`
+File `tests/t40003/include/dependencies/t3.h`
 ```cpp
 #pragma once
 
-#include "t1.h"
+#include "t2.h"
 
 namespace clanguml::t40003::dependencies {
-void t2() { t1(); }
+void t3() { t2(); }
 }
 ```
 File `tests/t40003/include/dependencies/t1.h`
@@ -76,16 +76,6 @@ namespace clanguml::t40003::dependencies {
 void t6() { t1(); }
 }
 ```
-File `tests/t40003/include/dependencies/t3.h`
-```cpp
-#pragma once
-
-#include "t2.h"
-
-namespace clanguml::t40003::dependencies {
-void t3() { t2(); }
-}
-```
 File `tests/t40003/include/dependencies/t5.h`
 ```cpp
 #pragma once
@@ -96,16 +86,26 @@ namespace clanguml::t40003::dependencies {
 void t5() { t1(); }
 }
 ```
-File `tests/t40003/include/dependants/t2.h`
+File `tests/t40003/include/dependencies/t2.h`
 ```cpp
 #pragma once
 
 #include "t1.h"
 
-namespace clanguml::t40003::dependants {
+namespace clanguml::t40003::dependencies {
 void t2() { t1(); }
 }
 ```
+File `tests/t40003/include/dependants/t3.h`
+```cpp
+#pragma once
+
+#include "t2.h"
+
+namespace clanguml::t40003::dependants {
+void t3() { t2(); }
+}
+```
 File `tests/t40003/include/dependants/t4.h`
 ```cpp
 #pragma once
@@ -122,14 +122,14 @@ namespace clanguml::t40003::dependants {
 void t1() { }
 }
 ```
-File `tests/t40003/include/dependants/t3.h`
+File `tests/t40003/include/dependants/t2.h`
 ```cpp
 #pragma once
 
-#include "t2.h"
+#include "t1.h"
 
 namespace clanguml::t40003::dependants {
-void t3() { t2(); }
+void t2() { t1(); }
 }
 ```
 ## Generated PlantUML diagrams
diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg
index e4a038fc..acfdecd5 100644
--- a/docs/test_cases/t40003_include.svg
+++ b/docs/test_cases/t40003_include.svg
@@ -1,128 +1,88 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="540px" preserveAspectRatio="none" style="width:344px;height:540px;background:#FFFFFF;" version="1.1" viewBox="0 0 344 540" width="344px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="560px" preserveAspectRatio="none" style="width:395px;height:560px;" version="1.1" viewBox="0 0 395 560" width="395px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="f1jx3ms78lgc71" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="cluster_C_0001387619747296316447">
-      <path d="M8.5,6.294 L30.5,6.294 A3.75,3.75 0 0 1 33,8.794 L40,29.0939 L286.5,29.0939 A2.5,2.5 0 0 1 289,31.5939 L289,158.594 A2.5,2.5 0 0 1 286.5,161.094 L8.5,161.094 A2.5,2.5 0 0 1 6,158.594 L6,8.794 A2.5,2.5 0 0 1 8.5,6.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="6" x2="40" y1="29.0939" y2="29.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="21" x="10" y="21.2999">src</text>
-    </g>
-    <g id="cluster_C_0001128556599972003761">
-      <path d="M32.5,49.294 L115.5,49.294 A3.75,3.75 0 0 1 118,51.794 L125,72.0939 L125.5,72.0939 A2.5,2.5 0 0 1 128,74.5939 L128,134.594 A2.5,2.5 0 0 1 125.5,137.094 L32.5,137.094 A2.5,2.5 0 0 1 30,134.594 L30,51.794 A2.5,2.5 0 0 1 32.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="30" x2="125" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="34" y="64.2999">dependants</text>
-    </g>
-    <g id="cluster_C_0002015386828772336316">
-      <path d="M154.5,49.294 L252.5,49.294 A3.75,3.75 0 0 1 255,51.794 L262,72.0939 L262.5,72.0939 A2.5,2.5 0 0 1 265,74.5939 L265,134.594 A2.5,2.5 0 0 1 262.5,137.094 L154.5,137.094 A2.5,2.5 0 0 1 152,134.594 L152,51.794 A2.5,2.5 0 0 1 154.5,49.294 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="152" x2="262" y1="72.0939" y2="72.0939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="97" x="156" y="64.2999">dependencies</text>
-    </g>
-    <g id="cluster_C_0000989412417490706876">
-      <path d="M14.5,185.094 L66.5,185.094 A3.75,3.75 0 0 1 69,187.594 L76,207.8939 L334.5,207.8939 A2.5,2.5 0 0 1 337,210.3939 L337,530.994 A2.5,2.5 0 0 1 334.5,533.494 L14.5,533.494 A2.5,2.5 0 0 1 12,530.994 L12,187.594 A2.5,2.5 0 0 1 14.5,185.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="12" x2="76" y1="207.8939" y2="207.8939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="51" x="16" y="200.0999">include</text>
-    </g>
-    <g id="cluster_C_0001763526330848915994">
-      <path d="M38.5,228.094 L121.5,228.094 A3.75,3.75 0 0 1 124,230.594 L131,250.8939 L131.5,250.8939 A2.5,2.5 0 0 1 134,253.3939 L134,506.994 A2.5,2.5 0 0 1 131.5,509.494 L38.5,509.494 A2.5,2.5 0 0 1 36,506.994 L36,230.594 A2.5,2.5 0 0 1 38.5,228.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="36" x2="131" y1="250.8939" y2="250.8939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="82" x="40" y="243.0999">dependants</text>
-    </g>
-    <g id="cluster_C_0001833478793852674517">
-      <path d="M160.5,228.094 L258.5,228.094 A3.75,3.75 0 0 1 261,230.594 L268,250.8939 L310.5,250.8939 A2.5,2.5 0 0 1 313,253.3939 L313,506.994 A2.5,2.5 0 0 1 310.5,509.494 L160.5,509.494 A2.5,2.5 0 0 1 158,506.994 L158,230.594 A2.5,2.5 0 0 1 160.5,228.094 " fill="none" style="stroke:#000000;stroke-width:1.5;"/>
-      <line style="stroke:#000000;stroke-width:1.5;" x1="158" x2="268" y1="250.8939" y2="250.8939"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="97" x="162" y="243.0999">dependencies</text>
-    </g>
-    <g id="elem_C_0001215324434184692437">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
-        <path d="M54,86.794 L54,118.5939 A2.5,2.5 0 0 0 56.5,121.0939 L101.5,121.0939 A2.5,2.5 0 0 0 104,118.5939 L104,94.294 L94,84.294 L56.5,84.294 A2.5,2.5 0 0 0 54,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M94,84.294 L94,91.794 A2.5,2.5 0 0 0 96.5,94.294 L104,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="64" y="107.2999">t1.cc</text>
-      </a>
-    </g>
-    <g id="elem_C_0002215849176605856058">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
-        <path d="M187,86.794 L187,118.5939 A2.5,2.5 0 0 0 189.5,121.0939 L234.5,121.0939 A2.5,2.5 0 0 0 237,118.5939 L237,94.294 L227,84.294 L189.5,84.294 A2.5,2.5 0 0 0 187,86.794 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M227,84.294 L227,91.794 A2.5,2.5 0 0 0 229.5,94.294 L237,94.294 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="30" x="197" y="107.2999">t2.cc</text>
-      </a>
-    </g>
-    <g id="elem_C_0000060001020671836182">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-        <path d="M57,265.594 L57,297.3939 A2.5,2.5 0 0 0 59.5,299.8939 L98.5,299.8939 A2.5,2.5 0 0 0 101,297.3939 L101,273.094 L91,263.094 L59.5,263.094 A2.5,2.5 0 0 0 57,265.594 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M91,263.094 L91,270.594 A2.5,2.5 0 0 0 93.5,273.094 L101,273.094 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="67" y="286.0999">t3.h</text>
-      </a>
-    </g>
-    <g id="elem_C_0001921842892192045013">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-        <path d="M57,362.394 L57,394.1939 A2.5,2.5 0 0 0 59.5,396.6939 L98.5,396.6939 A2.5,2.5 0 0 0 101,394.1939 L101,369.894 L91,359.894 L59.5,359.894 A2.5,2.5 0 0 0 57,362.394 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M91,359.894 L91,367.394 A2.5,2.5 0 0 0 93.5,369.894 L101,369.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="67" y="382.8999">t2.h</text>
-      </a>
-    </g>
-    <g id="elem_C_0002295271780650013565">
-      <path d="M57,459.194 L57,490.9939 A2.5,2.5 0 0 0 59.5,493.4939 L98.5,493.4939 A2.5,2.5 0 0 0 101,490.9939 L101,466.694 L91,456.694 L59.5,456.694 A2.5,2.5 0 0 0 57,459.194 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M91,456.694 L91,464.194 A2.5,2.5 0 0 0 93.5,466.694 L101,466.694 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="67" y="479.6999">t1.h</text>
-    </g>
-    <g id="elem_C_0001226843223635488673">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-        <path d="M175,265.594 L175,297.3939 A2.5,2.5 0 0 0 177.5,299.8939 L216.5,299.8939 A2.5,2.5 0 0 0 219,297.3939 L219,273.094 L209,263.094 L177.5,263.094 A2.5,2.5 0 0 0 175,265.594 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M209,263.094 L209,270.594 A2.5,2.5 0 0 0 211.5,273.094 L219,273.094 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="185" y="286.0999">t3.h</text>
-      </a>
-    </g>
-    <g id="elem_C_0001849348825646635129">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-        <path d="M174,362.394 L174,394.1939 A2.5,2.5 0 0 0 176.5,396.6939 L215.5,396.6939 A2.5,2.5 0 0 0 218,394.1939 L218,369.894 L208,359.894 L176.5,359.894 A2.5,2.5 0 0 0 174,362.394 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M208,359.894 L208,367.394 A2.5,2.5 0 0 0 210.5,369.894 L218,369.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="184" y="382.8999">t2.h</text>
-      </a>
-    </g>
-    <g id="elem_C_0001120257488305564427">
-      <path d="M213,459.194 L213,490.9939 A2.5,2.5 0 0 0 215.5,493.4939 L254.5,493.4939 A2.5,2.5 0 0 0 257,490.9939 L257,466.694 L247,456.694 L215.5,456.694 A2.5,2.5 0 0 0 213,459.194 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M247,456.694 L247,464.194 A2.5,2.5 0 0 0 249.5,466.694 L257,466.694 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="223" y="479.6999">t1.h</text>
-    </g>
-    <g id="elem_C_0002106129159239499468">
-      <a href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
-        <path d="M253,362.394 L253,394.1939 A2.5,2.5 0 0 0 255.5,396.6939 L294.5,396.6939 A2.5,2.5 0 0 0 297,394.1939 L297,369.894 L287,359.894 L255.5,359.894 A2.5,2.5 0 0 0 253,362.394 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <path d="M287,359.894 L287,367.394 A2.5,2.5 0 0 0 289.5,369.894 L297,369.894 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/>
-        <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="24" x="263" y="382.8999">t5.h</text>
-      </a>
-    </g>
-    <g id="link_C_0001215324434184692437_C_0000060001020671836182">
-      <path d="M79,121.294 C79,155.094 79,222.754 79,256.704 " fill="none" id="C_0001215324434184692437-to-C_0000060001020671836182" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="79,262.704,83,253.704,79,257.704,75,253.704,79,262.704" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002215849176605856058_C_0001226843223635488673">
-      <path d="M210.51,121.294 C207.64,155.094 201.8972,222.7755 199.0172,256.7255 " fill="none" id="C_0002215849176605856058-to-C_0001226843223635488673" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="198.51,262.704,203.2564,254.0743,198.9326,257.7219,195.2851,253.3981,198.51,262.704" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002215849176605856058_C_0002106129159239499468">
-      <path d="M218.44,121.314 C223.67,136.064 230.98,157.764 236,177.094 C253.28,243.584 265.8283,318.3468 271.3583,353.5268 " fill="none" id="C_0002215849176605856058-to-C_0002106129159239499468" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="272.29,359.454,274.8439,349.942,271.5136,354.5146,266.941,351.1843,272.29,359.454" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0000060001020671836182_C_0001921842892192045013">
-      <path d="M79,300.324 C79,317.274 79,336.624 79,353.544 " fill="none" id="C_0000060001020671836182-to-C_0001921842892192045013" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="79,359.544,83,350.544,79,354.544,75,350.544,79,359.544" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001921842892192045013_C_0002295271780650013565">
-      <path d="M79,397.124 C79,414.074 79,433.424 79,450.344 " fill="none" id="C_0001921842892192045013-to-C_0002295271780650013565" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="79,456.344,83,447.344,79,451.344,75,447.344,79,456.344" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001226843223635488673_C_0001849348825646635129">
-      <path d="M196.81,300.324 C196.63,317.274 196.4338,336.6243 196.2538,353.5443 " fill="none" id="C_0001226843223635488673-to-C_0001849348825646635129" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="196.19,359.544,200.2855,350.587,196.2432,354.5443,192.286,350.5019,196.19,359.544" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0001849348825646635129_C_0001120257488305564427">
-      <path d="M203.34,397.124 C210.31,414.074 218.4575,433.8751 225.4175,450.7951 " fill="none" id="C_0001849348825646635129-to-C_0001120257488305564427" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="227.7,456.344,227.9755,446.499,225.7979,451.7199,220.577,449.5423,227.7,456.344" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_0002106129159239499468_C_0001120257488305564427">
-      <path d="M267.48,397.124 C260.32,414.074 251.9627,433.896 244.8227,450.816 " fill="none" id="C_0002106129159239499468-to-C_0001120257488305564427" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="#181818" points="242.49,456.344,249.6744,449.6072,244.4339,451.7373,242.3038,446.4969,242.49,456.344" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
+    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
+    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="153" y1="89.2969" y2="89.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="50" y="81.9951">dependants</text>
+    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="180" x2="305" y1="89.2969" y2="89.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="184" y="81.9951">dependencies</text>
+    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="29" x2="99" y1="224.2969" y2="224.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="33" y="216.9951">include</text>
+    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="53" x2="160" y1="267.2969" y2="267.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="57" y="259.9951">dependants</text>
+    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="312" y1="267.2969" y2="267.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="191" y="259.9951">dependencies</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="82" y="124.9951">t1.cc</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M266,102 L266,112 L276,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="232" y="124.9951">t2.cc</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M112.5,280 L112.5,290 L122.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="302.9951">t3.h</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M112.5,376 L112.5,386 L122.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="398.9951">t2.h</text>
+    </a>
+    <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <path d="M112.5,472 L112.5,482 L122.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="494.9951">t1.h</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M241.5,280 L241.5,290 L251.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="214.5" y="302.9951">t3.h</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M240.5,376 L240.5,386 L250.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="213.5" y="398.9951">t2.h</text>
+    </a>
+    <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <path d="M281.5,472 L281.5,482 L291.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="254.5" y="494.9951">t1.h</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+      <path d="M322.5,376 L322.5,386 L332.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="295.5" y="398.9951">t5.h</text>
+    </a>
+    <path d="M99,138.2 C99,170.22 99,238.95 99,274.57 " fill="none" id="C_0001215324434184692437-&gt;C_0000060001020671836182" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="99,279.99,103,270.99,99,274.99,95,270.99,99,279.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M246.95,138.2 C243.11,170.35 234.86,239.52 230.62,275.01 " fill="none" id="C_0002215849176605856058-&gt;C_0001226843223635488673" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="230.03,279.99,235.0796,271.5341,230.6291,275.026,227.1372,270.5756,230.03,279.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M254.02,138.02 C258.29,152.76 264.42,174.69 269,194 C284.12,257.73 298.37,333.81 305.04,370.72 " fill="none" id="C_0002215849176605856058-&gt;C_0002106129159239499468" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="305.97,375.88,308.315,366.3144,305.0856,370.9588,300.4412,367.7294,305.97,375.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M99,316.24 C99,331.48 99,353.81 99,370.46 " fill="none" id="C_0000060001020671836182-&gt;C_0001921842892192045013" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="99,375.87,103,366.87,99,370.87,95,366.87,99,375.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M99,412.24 C99,427.48 99,449.81 99,466.46 " fill="none" id="C_0001921842892192045013-&gt;C_0002295271780650013565" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="99,471.87,103,462.87,99,466.87,95,462.87,99,471.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M227.82,316.24 C227.65,331.48 227.42,353.81 227.24,370.46 " fill="none" id="C_0001226843223635488673-&gt;C_0001849348825646635129" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="227.18,375.87,231.2826,366.9163,227.2371,370.8703,223.2831,366.8249,227.18,375.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M234.52,412.24 C241.22,427.61 251.07,450.2 258.36,466.89 " fill="none" id="C_0001849348825646635129-&gt;C_0001120257488305564427" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="260.53,471.87,260.6243,462.0216,258.5432,467.2817,253.2831,465.2005,260.53,471.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M301.48,412.24 C294.78,427.61 284.93,450.2 277.64,466.89 " fill="none" id="C_0002106129159239499468-&gt;C_0001120257488305564427" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="275.47,471.87,282.7169,465.2005,277.4568,467.2817,275.3757,462.0216,275.47,471.87" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t40003_include_mermaid.svg b/docs/test_cases/t40003_include_mermaid.svg
index 80ef7303..b013f46b 100644
--- a/docs/test_cases/t40003_include_mermaid.svg
+++ b/docs/test_cases/t40003_include_mermaid.svg
@@ -1,22 +1,22 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 398.171875 498" style="max-width: 398.172px; background-color: white;" width="398.171875" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="6" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointEnd">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 0 L 10 5 L 0 10 z"/>
     </marker>
-    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="4.5" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-pointStart">
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="0" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointStart">
       <path style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 0 5 L 10 10 L 10 0 z"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="11" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleEnd">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="my-svg_flowchart-circleStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5" refX="-1" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-circleStart">
       <circle style="stroke-width: 1; stroke-dasharray: 1, 0;" class="arrowMarkerPath" r="5" cy="5" cx="5"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossEnd">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="12" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossEnd">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
-    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="my-svg_flowchart-crossStart">
+    <marker orient="auto" markerHeight="11" markerWidth="11" markerUnits="userSpaceOnUse" refY="5.2" refX="-1" viewBox="0 0 11 11" class="marker cross flowchart" id="flowchart-crossStart">
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
@@ -83,14 +83,14 @@
         </g>
       </g>
       <g class="edgePaths">
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001215324434184692437 LE-C_0000060001020671836182" id="L-C_0001215324434184692437-C_0000060001020671836182-0" d="M79.3984375,83L79.3984375,87.16666666666667C79.3984375,91.33333333333333,79.3984375,99.66666666666667,79.3984375,108C79.3984375,116.33333333333333,79.3984375,124.66666666666667,79.3984375,133C79.3984375,141.33333333333334,79.3984375,149.66666666666666,79.3984375,158C79.3984375,166.33333333333334,79.3984375,174.66666666666666,79.3984375,183C79.3984375,191.33333333333334,79.3984375,199.66666666666666,79.3984375,207.11666666666667C79.3984375,214.5666666666667,79.3984375,221.13333333333333,79.3984375,224.41666666666666L79.3984375,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0001226843223635488673" id="L-C_0002215849176605856058-C_0001226843223635488673-0" d="M242.25734186746988,83L237.65455572289156,87.16666666666667C233.05176957831327,91.33333333333333,223.84619728915663,99.66666666666667,219.24341114457832,108C214.640625,116.33333333333333,214.640625,124.66666666666667,214.640625,133C214.640625,141.33333333333334,214.640625,149.66666666666666,214.640625,158C214.640625,166.33333333333334,214.640625,174.66666666666666,214.640625,183C214.640625,191.33333333333334,214.640625,199.66666666666666,214.640625,207.11666666666667C214.640625,214.5666666666667,214.640625,221.13333333333333,214.640625,224.41666666666666L214.640625,227.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0002106129159239499468" id="L-C_0002215849176605856058-C_0002106129159239499468-0" d="M278.7114081325301,83L283.3141942771084,87.16666666666667C287.91698042168673,91.33333333333333,297.12255271084337,99.66666666666667,301.7253388554217,108C306.328125,116.33333333333333,306.328125,124.66666666666667,306.328125,133C306.328125,141.33333333333334,306.328125,149.66666666666666,306.328125,158C306.328125,166.33333333333334,306.328125,174.66666666666666,306.328125,183C306.328125,191.33333333333334,306.328125,199.66666666666666,306.328125,210.75C306.328125,221.83333333333334,306.328125,235.66666666666666,306.328125,249.5C306.328125,263.3333333333333,306.328125,277.1666666666667,306.328125,287.3666666666667C306.328125,297.56666666666666,306.328125,304.1333333333333,306.328125,307.4166666666667L306.328125,310.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0000060001020671836182 LE-C_0001921842892192045013" id="L-C_0000060001020671836182-C_0001921842892192045013-0" d="M79.3984375,266L79.3984375,270.1666666666667C79.3984375,274.3333333333333,79.3984375,282.6666666666667,79.3984375,290.1166666666667C79.3984375,297.56666666666666,79.3984375,304.1333333333333,79.3984375,307.4166666666667L79.3984375,310.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001921842892192045013 LE-C_0002295271780650013565" id="L-C_0001921842892192045013-C_0002295271780650013565-0" d="M79.3984375,349L79.3984375,353.1666666666667C79.3984375,357.3333333333333,79.3984375,365.6666666666667,79.3984375,373.1166666666666C79.3984375,380.56666666666666,79.3984375,387.1333333333334,79.3984375,390.4166666666667L79.3984375,393.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001226843223635488673 LE-C_0001849348825646635129" id="L-C_0001226843223635488673-C_0001849348825646635129-0" d="M214.640625,266L214.640625,270.1666666666667C214.640625,274.3333333333333,214.640625,282.6666666666667,214.640625,290.1166666666667C214.640625,297.56666666666666,214.640625,304.1333333333333,214.640625,307.4166666666667L214.640625,310.7"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001849348825646635129 LE-C_0001120257488305564427" id="L-C_0001849348825646635129-C_0001120257488305564427-0" d="M214.640625,349L214.640625,353.1666666666667C214.640625,357.3333333333333,214.640625,365.6666666666667,218.58854652888726,373.4071845878407C222.53646805777453,381.14770250901466,230.43231111554908,388.29540501802944,234.38023264443635,391.8692562725368L238.32815417332364,395.44310752704416"/>
-        <path marker-end="url(#my-svg_flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002106129159239499468 LE-C_0001120257488305564427" id="L-C_0002106129159239499468-C_0001120257488305564427-0" d="M306.328125,349L306.328125,353.1666666666667C306.328125,357.3333333333333,306.328125,365.6666666666667,302.38020347111274,373.4071845878407C298.4322819422254,381.14770250901466,290.5364388844509,388.29540501802944,286.5885173555636,391.8692562725368L282.6405958266763,395.44310752704416"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001215324434184692437 LE-C_0000060001020671836182" id="L-C_0001215324434184692437-C_0000060001020671836182-0" d="M79.3984375,83L79.3984375,87.16666666666667C79.3984375,91.33333333333333,79.3984375,99.66666666666667,79.3984375,108C79.3984375,116.33333333333333,79.3984375,124.66666666666667,79.3984375,133C79.3984375,141.33333333333334,79.3984375,149.66666666666666,79.3984375,158C79.3984375,166.33333333333334,79.3984375,174.66666666666666,79.3984375,183C79.3984375,191.33333333333334,79.3984375,199.66666666666666,79.3984375,208C79.3984375,216.33333333333334,79.3984375,224.66666666666666,79.3984375,228.83333333333334L79.3984375,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0001226843223635488673" id="L-C_0002215849176605856058-C_0001226843223635488673-0" d="M242.25734186746988,83L237.65455572289156,87.16666666666667C233.05176957831327,91.33333333333333,223.84619728915663,99.66666666666667,219.24341114457832,108C214.640625,116.33333333333333,214.640625,124.66666666666667,214.640625,133C214.640625,141.33333333333334,214.640625,149.66666666666666,214.640625,158C214.640625,166.33333333333334,214.640625,174.66666666666666,214.640625,183C214.640625,191.33333333333334,214.640625,199.66666666666666,214.640625,208C214.640625,216.33333333333334,214.640625,224.66666666666666,214.640625,228.83333333333334L214.640625,233"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002215849176605856058 LE-C_0002106129159239499468" id="L-C_0002215849176605856058-C_0002106129159239499468-0" d="M278.7114081325301,83L283.3141942771084,87.16666666666667C287.91698042168673,91.33333333333333,297.12255271084337,99.66666666666667,301.7253388554217,108C306.328125,116.33333333333333,306.328125,124.66666666666667,306.328125,133C306.328125,141.33333333333334,306.328125,149.66666666666666,306.328125,158C306.328125,166.33333333333334,306.328125,174.66666666666666,306.328125,183C306.328125,191.33333333333334,306.328125,199.66666666666666,306.328125,210.75C306.328125,221.83333333333334,306.328125,235.66666666666666,306.328125,249.5C306.328125,263.3333333333333,306.328125,277.1666666666667,306.328125,288.25C306.328125,299.3333333333333,306.328125,307.6666666666667,306.328125,311.8333333333333L306.328125,316"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0000060001020671836182 LE-C_0001921842892192045013" id="L-C_0000060001020671836182-C_0001921842892192045013-0" d="M79.3984375,266L79.3984375,270.1666666666667C79.3984375,274.3333333333333,79.3984375,282.6666666666667,79.3984375,291C79.3984375,299.3333333333333,79.3984375,307.6666666666667,79.3984375,311.8333333333333L79.3984375,316"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001921842892192045013 LE-C_0002295271780650013565" id="L-C_0001921842892192045013-C_0002295271780650013565-0" d="M79.3984375,349L79.3984375,353.1666666666667C79.3984375,357.3333333333333,79.3984375,365.6666666666667,79.3984375,374C79.3984375,382.3333333333333,79.3984375,390.6666666666667,79.3984375,394.8333333333333L79.3984375,399"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001226843223635488673 LE-C_0001849348825646635129" id="L-C_0001226843223635488673-C_0001849348825646635129-0" d="M214.640625,266L214.640625,270.1666666666667C214.640625,274.3333333333333,214.640625,282.6666666666667,214.640625,291C214.640625,299.3333333333333,214.640625,307.6666666666667,214.640625,311.8333333333333L214.640625,316"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0001849348825646635129 LE-C_0001120257488305564427" id="L-C_0001849348825646635129-C_0001120257488305564427-0" d="M214.640625,349L214.640625,353.1666666666667C214.640625,357.3333333333333,214.640625,365.6666666666667,219.24341114457832,374C223.84619728915663,382.3333333333333,233.05176957831327,390.6666666666667,237.6545557228916,394.8333333333333L242.25734186746988,399"/>
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;" class="edge-thickness-normal edge-pattern-solid flowchart-link LS-C_0002106129159239499468 LE-C_0001120257488305564427" id="L-C_0002106129159239499468-C_0001120257488305564427-0" d="M306.328125,349L306.328125,353.1666666666667C306.328125,357.3333333333333,306.328125,365.6666666666667,301.7253388554217,374C297.12255271084337,382.3333333333333,287.91698042168673,390.6666666666667,283.3141942771084,394.8333333333333L278.7114081325301,399"/>
       </g>
       <g class="edgeLabels">
         <g class="edgeLabel">
@@ -167,7 +167,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t3.h#L0">
+        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t3.h#L0">
           <g title="t3.h" id="flowchart-C_0001226843223635488673-5" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -180,7 +180,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t2.h#L0">
+        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t2.h#L0">
           <g title="t2.h" id="flowchart-C_0001849348825646635129-6" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L0">
+        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L0">
           <g title="t1.h" id="flowchart-C_0001120257488305564427-7" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -206,7 +206,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependencies/t5.h#L0">
+        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t5.h#L0">
           <g title="t5.h" id="flowchart-C_0002106129159239499468-8" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -219,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t3.h#L0">
+        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t3.h#L0">
           <g title="t3.h" id="flowchart-C_0000060001020671836182-2" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -232,7 +232,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/include/dependants/t2.h#L0">
+        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t2.h#L0">
           <g title="t2.h" id="flowchart-C_0001921842892192045013-3" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -245,7 +245,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/#L0">
+        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L0">
           <g title="t1.h" id="flowchart-C_0002295271780650013565-4" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -258,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependencies/t2.cc#L0">
+        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependencies/t2.cc#L0">
           <g title="t2.cc" id="flowchart-C_0002215849176605856058-1" class="node default clickable flowchart-label">
             <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-16.8984375, -9)" style="" class="label">
@@ -271,7 +271,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/427d110b37885e5ce52a6525f175236affea35fa/tests/t40003/src/dependants/t1.cc#L0">
+        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependants/t1.cc#L0">
           <g title="t1.cc" id="flowchart-C_0001215324434184692437-0" class="node default clickable flowchart-label">
             <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-16.8984375, -9)" style="" class="label">
diff --git a/docs/test_cases/t90000.md b/docs/test_cases/t90000.md
index 9fe0d645..a91ef19f 100644
--- a/docs/test_cases/t90000.md
+++ b/docs/test_cases/t90000.md
@@ -48,6 +48,7 @@ File `tests/t90000/t90000.cc`
   "diagram_type": "class",
   "elements": [],
   "name": "t90000_class",
+  "package_type": "namespace",
   "relationships": []
 }
 ```
diff --git a/docs/test_cases/t90000_class.svg b/docs/test_cases/t90000_class.svg
index 03f29593..64b6d962 100644
--- a/docs/test_cases/t90000_class.svg
+++ b/docs/test_cases/t90000_class.svg
@@ -1,60 +1,48 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="396px" preserveAspectRatio="none" style="width:430px;height:396px;background:#FFFFFF;" version="1.1" viewBox="0 0 430 396" width="430px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="396px" preserveAspectRatio="none" style="width:455px;height:396px;" version="1.1" viewBox="0 0 455 396" width="455px" zoomAndPan="magnify">
   <defs>
+    <filter height="300%" id="fna43uwevhc6s" 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>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <g id="elem_C_001">
-      <rect codeLine="2" fill="#F1F1F1" height="64.7999" id="C_001" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="79" x="65" y="115"/>
-      <ellipse cx="89.9" cy="131" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-      <path d="M84.9,132.1563 C84.9,134.6563 87.0406,136.4688 89.9625,136.4688 C91.1969,136.4688 92.3688,136.1719 93.1188,135.6563 C93.7281,135.2344 94.0563,134.8125 94.0563,134.4063 C94.0563,133.9375 93.6344,133.5313 93.1344,133.5313 C92.9,133.5313 92.6813,133.6094 92.4781,133.8125 C92.0406,134.25 92.0406,134.25 91.8688,134.3438 C91.4156,134.5781 90.775,134.7188 90.0094,134.7188 C88.0094,134.7188 86.7281,133.7031 86.7281,132.125 L86.7281,131.0781 C86.7281,129.375 87.9469,128.1719 89.65,128.1719 C90.2281,128.1719 90.8063,128.3125 91.275,128.5625 C91.7438,128.8281 91.9156,129.0156 91.9781,129.375 C92.1031,130.0469 92.3531,130.2969 92.8844,130.2969 C93.1656,130.2969 93.4469,130.1563 93.6344,129.9375 C93.7594,129.7656 93.8063,129.5938 93.8063,129.1563 L93.8063,127.7969 C93.8063,127.375 93.7906,127.2344 93.6656,127.0625 C93.4938,126.8125 93.2125,126.6563 92.8844,126.6563 C92.5719,126.6563 92.3688,126.7656 92.15,127.0313 C90.9781,126.5313 90.5406,126.4219 89.5875,126.4219 C86.9156,126.4219 84.9,128.4375 84.9,131.0625 L84.9,132.1563 Z " fill="#000000"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="106.1" y="135.606">Foo</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="66" x2="143" y1="147" y2="147"/>
-      <ellipse cx="76" cy="160.9" fill="none" rx="3" ry="3" style="stroke:#038048;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53" x="85" y="164.0059">int value</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="66" x2="143" y1="171.7999" y2="171.7999"/>
-    </g>
-    <g id="elem_ArrayList">
-      <rect fill="#F1F1F1" height="48" id="ArrayList" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="88" x="60.5" y="341"/>
-      <ellipse cx="75.5" cy="357" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-      <path d="M70.5,358.1563 C70.5,360.6563 72.6406,362.4688 75.5625,362.4688 C76.7969,362.4688 77.9688,362.1719 78.7188,361.6563 C79.3281,361.2344 79.6563,360.8125 79.6563,360.4063 C79.6563,359.9375 79.2344,359.5313 78.7344,359.5313 C78.5,359.5313 78.2813,359.6094 78.0781,359.8125 C77.6406,360.25 77.6406,360.25 77.4688,360.3438 C77.0156,360.5781 76.375,360.7188 75.6094,360.7188 C73.6094,360.7188 72.3281,359.7031 72.3281,358.125 L72.3281,357.0781 C72.3281,355.375 73.5469,354.1719 75.25,354.1719 C75.8281,354.1719 76.4063,354.3125 76.875,354.5625 C77.3438,354.8281 77.5156,355.0156 77.5781,355.375 C77.7031,356.0469 77.9531,356.2969 78.4844,356.2969 C78.7656,356.2969 79.0469,356.1563 79.2344,355.9375 C79.3594,355.7656 79.4063,355.5938 79.4063,355.1563 L79.4063,353.7969 C79.4063,353.375 79.3906,353.2344 79.2656,353.0625 C79.0938,352.8125 78.8125,352.6563 78.4844,352.6563 C78.1719,352.6563 77.9688,352.7656 77.75,353.0313 C76.5781,352.5313 76.1406,352.4219 75.1875,352.4219 C72.5156,352.4219 70.5,354.4375 70.5,357.0625 L70.5,358.1563 Z " fill="#000000"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="89.5" y="361.606">ArrayList</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="61.5" x2="147.5" y1="373" y2="373"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="61.5" x2="147.5" y1="381" y2="381"/>
-    </g>
-    <g id="elem_GMN5">
-      <path d="M6,18.2 L6,43.8 A0,0 0 0 0 6,43.8 L100.5,43.8 L104.5,114.87 L108.5,43.8 L203,43.8 A0,0 0 0 0 203,43.8 L203,28.2 L193,18.2 L6,18.2 A0,0 0 0 0 6,18.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M193,18.2 L193,28.2 L203,28.2 L193,18.2 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="176" x="12" y="35.277">This is a very important class.</text>
-    </g>
-    <g id="elem_N1">
-      <path d="M238.5,10.4 L238.5,51.6 L330.5,51.6 L330.5,20.4 L320.5,10.4 L238.5,10.4 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M320.5,10.4 L320.5,20.4 L330.5,20.4 L320.5,10.4 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="50" x="244.5" y="27.477">This is a</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="71" x="244.5" y="43.077">floating note</text>
-    </g>
-    <g id="elem_N2">
-      <path d="M93,239.8 L93,281 L246,281 L246,249.8 L236,239.8 L93,239.8 " fill="#FEFFDD" style="stroke:#181818;stroke-width:0.5;"/>
-      <path d="M236,239.8 L236,249.8 L246,249.8 L236,239.8 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="132" x="99" y="256.877">This note is connected</text>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="107" x="99" y="272.477">to several objects.</text>
-    </g>
-    <g id="elem_C_002">
-      <rect codeLine="12" fill="#F1F1F1" height="48" id="C_002" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="57" x="366" y="7"/>
-      <ellipse cx="381" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/>
-      <path d="M376,24.1563 C376,26.6563 378.1406,28.4688 381.0625,28.4688 C382.2969,28.4688 383.4688,28.1719 384.2188,27.6563 C384.8281,27.2344 385.1563,26.8125 385.1563,26.4063 C385.1563,25.9375 384.7344,25.5313 384.2344,25.5313 C384,25.5313 383.7813,25.6094 383.5781,25.8125 C383.1406,26.25 383.1406,26.25 382.9688,26.3438 C382.5156,26.5781 381.875,26.7188 381.1094,26.7188 C379.1094,26.7188 377.8281,25.7031 377.8281,24.125 L377.8281,23.0781 C377.8281,21.375 379.0469,20.1719 380.75,20.1719 C381.3281,20.1719 381.9063,20.3125 382.375,20.5625 C382.8438,20.8281 383.0156,21.0156 383.0781,21.375 C383.2031,22.0469 383.4531,22.2969 383.9844,22.2969 C384.2656,22.2969 384.5469,22.1563 384.7344,21.9375 C384.8594,21.7656 384.9063,21.5938 384.9063,21.1563 L384.9063,19.7969 C384.9063,19.375 384.8906,19.2344 384.7656,19.0625 C384.5938,18.8125 384.3125,18.6563 383.9844,18.6563 C383.6719,18.6563 383.4688,18.7656 383.25,19.0313 C382.0781,18.5313 381.6406,18.4219 380.6875,18.4219 C378.0156,18.4219 376,20.4375 376,23.0625 L376,24.1563 Z " fill="#000000"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25" x="395" y="27.606">Boo</text>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="367" x2="422" y1="39" y2="39"/>
-      <line style="stroke:#181818;stroke-width:0.5;" x1="367" x2="422" y1="47" y2="47"/>
-    </g>
-    <g id="link_C_001_ArrayList">
-      <path codeLine="5" d="M84.2205,196.9667 C74.1505,223.7267 69.61,246.27 75.5,281 C79.02,301.77 87.18,324.26 93.94,340.59 " fill="none" id="C_001-backto-ArrayList" style="stroke:#181818;stroke-width:1.0;"/>
-      <polygon fill="none" points="90.56,180.12,78.6049,194.8535,89.836,199.0798,90.56,180.12" style="stroke:#181818;stroke-width:1.0;"/>
-    </g>
-    <g id="link_C_001_N2">
-      <path codeLine="9" d="M123.13,180.21 C134.31,199.3 148.18,222.99 157.83,239.47 " fill="none" id="C_001-N2" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-    </g>
-    <g id="link_N2_ArrayList">
-      <path codeLine="10" d="M156.97,281.18 C146.2,298.19 130.64,322.73 119.27,340.69 " fill="none" id="N2-ArrayList" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/>
-    </g>
+    <rect fill="#FEFECE" filter="url(#fna43uwevhc6s)" height="60.8047" id="C_001" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="74" y="116"/>
+    <ellipse cx="97.55" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M100.5188,137.6406 Q99.9406,137.9375 99.3,138.0781 Q98.6594,138.2344 97.9563,138.2344 Q95.4563,138.2344 94.1281,136.5938 Q92.8156,134.9375 92.8156,131.8125 Q92.8156,128.6875 94.1281,127.0313 Q95.4563,125.375 97.9563,125.375 Q98.6594,125.375 99.3,125.5313 Q99.9563,125.6875 100.5188,125.9844 L100.5188,128.7031 Q99.8938,128.125 99.3,127.8594 Q98.7063,127.5781 98.0813,127.5781 Q96.7375,127.5781 96.05,128.6563 Q95.3625,129.7188 95.3625,131.8125 Q95.3625,133.9063 96.05,134.9844 Q96.7375,136.0469 98.0813,136.0469 Q98.7063,136.0469 99.3,135.7813 Q99.8938,135.5 100.5188,134.9219 L100.5188,137.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="113.45" y="136.1543">Foo</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="75" x2="147" y1="148" y2="148"/>
+    <ellipse cx="85" cy="159" 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="48" x="94" y="162.2104">int value</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="75" x2="147" y1="168.8047" y2="168.8047"/>
+    <rect fill="#FEFECE" filter="url(#fna43uwevhc6s)" height="48" id="ArrayList" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="68.5" y="337"/>
+    <ellipse cx="83.5" cy="353" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M86.4688,358.6406 Q85.8906,358.9375 85.25,359.0781 Q84.6094,359.2344 83.9063,359.2344 Q81.4063,359.2344 80.0781,357.5938 Q78.7656,355.9375 78.7656,352.8125 Q78.7656,349.6875 80.0781,348.0313 Q81.4063,346.375 83.9063,346.375 Q84.6094,346.375 85.25,346.5313 Q85.9063,346.6875 86.4688,346.9844 L86.4688,349.7031 Q85.8438,349.125 85.25,348.8594 Q84.6563,348.5781 84.0313,348.5781 Q82.6875,348.5781 82,349.6563 Q81.3125,350.7188 81.3125,352.8125 Q81.3125,354.9063 82,355.9844 Q82.6875,357.0469 84.0313,357.0469 Q84.6563,357.0469 85.25,356.7813 Q85.8438,356.5 86.4688,355.9219 L86.4688,358.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="53" x="97.5" y="357.1543">ArrayList</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="69.5" x2="152.5" y1="369" y2="369"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="69.5" x2="152.5" y1="377" y2="377"/>
+    <path d="M6,19.5 L6,44.6328 A0,0 0 0 0 6,44.6328 L107,44.6328 L111,115.66 L115,44.6328 L216,44.6328 A0,0 0 0 0 216,44.6328 L216,29.5 L206,19.5 L6,19.5 A0,0 0 0 0 6,19.5 " fill="#FBFB77" filter="url(#fna43uwevhc6s)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M206,19.5 L206,29.5 L216,29.5 L206,19.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="12" y="36.5669">This is a very important class.</text>
+    <path d="M251.5,12 L251.5,52.2656 L352.5,52.2656 L352.5,22 L342.5,12 L251.5,12 " fill="#FBFB77" filter="url(#fna43uwevhc6s)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M342.5,12 L342.5,22 L352.5,22 L342.5,12 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="257.5" y="29.0669">This is a</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="80" x="257.5" y="44.1997">floating note</text>
+    <path d="M97,237 L97,277.2656 L261,277.2656 L261,247 L251,237 L97,237 " fill="#FBFB77" filter="url(#fna43uwevhc6s)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M251,237 L251,247 L261,247 L251,237 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="103" y="254.0669">This note is connected</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="117" x="103" y="269.1997">to several objects.</text>
+    <rect fill="#FEFECE" filter="url(#fna43uwevhc6s)" height="48" id="C_002" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="388" y="8"/>
+    <ellipse cx="403" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M405.9688,29.6406 Q405.3906,29.9375 404.75,30.0781 Q404.1094,30.2344 403.4063,30.2344 Q400.9063,30.2344 399.5781,28.5938 Q398.2656,26.9375 398.2656,23.8125 Q398.2656,20.6875 399.5781,19.0313 Q400.9063,17.375 403.4063,17.375 Q404.1094,17.375 404.75,17.5313 Q405.4063,17.6875 405.9688,17.9844 L405.9688,20.7031 Q405.3438,20.125 404.75,19.8594 Q404.1563,19.5781 403.5313,19.5781 Q402.1875,19.5781 401.5,20.6563 Q400.8125,21.7188 400.8125,23.8125 Q400.8125,25.9063 401.5,26.9844 Q402.1875,28.0469 403.5313,28.0469 Q404.1563,28.0469 404.75,27.7813 Q405.3438,27.5 405.9688,26.9219 L405.9688,29.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="417" y="28.1543">Boo</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="389" x2="443" y1="40" y2="40"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="389" x2="443" y1="48" y2="48"/>
+    <path d="M88.93,195.94 C80.49,220.14 73.97,249.96 79,277 C82.9,297.95 91.89,320.43 99.36,336.71 " fill="none" id="C_001&lt;-ArrayList" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="82.48,193.22,96.26,177.12,95.53,198.29,82.48,193.22" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M129.58,177.15 C141.54,196.22 156.72,220.44 167.08,236.98 " fill="none" id="C_001-N2" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M166.21,277.19 C154.9,294.15 138.37,318.94 126.35,336.97 " fill="none" id="N2-ArrayList" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t90000_class_mermaid.svg b/docs/test_cases/t90000_class_mermaid.svg
index 11234823..ea66542d 100644
--- a/docs/test_cases/t90000_class_mermaid.svg
+++ b/docs/test_cases/t90000_class_mermaid.svg
@@ -1,61 +1,56 @@
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 490.03125 309" style="max-width: 490.031px; background-color: white;" width="490.03125" id="my-svg">
-  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:transparent!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker aggregation classDiagram" id="classDiagram-aggregationStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
       <style type="text/css">a:hover { text-decoration: underline; }</style>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker aggregation classDiagram" id="my-svg_classDiagram-aggregationEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker aggregation classDiagram" id="classDiagram-aggregationEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker extension classDiagram" id="my-svg_classDiagram-extensionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker extension classDiagram" id="classDiagram-extensionStart">
         <path d="M 1,7 L18,13 V 1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker extension classDiagram" id="my-svg_classDiagram-extensionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker extension classDiagram" id="classDiagram-extensionEnd">
         <path d="M 1,1 V 13 L18,7 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="18" class="marker composition classDiagram" id="my-svg_classDiagram-compositionStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker composition classDiagram" id="classDiagram-compositionStart">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="1" class="marker composition classDiagram" id="my-svg_classDiagram-compositionEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker composition classDiagram" id="classDiagram-compositionEnd">
         <path d="M 18,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="6" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyStart">
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker dependency classDiagram" id="classDiagram-dependencyStart">
         <path d="M 5,7 L9,13 L1,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="13" class="marker dependency classDiagram" id="my-svg_classDiagram-dependencyEnd">
+      <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="19" class="marker dependency classDiagram" id="classDiagram-dependencyEnd">
         <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
       </marker>
     </defs>
     <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="13" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopStart">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
-      </marker>
-    </defs>
-    <defs>
-      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="1" class="marker lollipop classDiagram" id="my-svg_classDiagram-lollipopEnd">
-        <circle r="6" cy="7" cx="7" fill="transparent" stroke="black"/>
+      <marker orient="auto" markerHeight="240" markerWidth="190" refY="7" refX="0" class="marker lollipop classDiagram" id="classDiagram-lollipopStart">
+        <circle r="6" cy="7" cx="6" fill="white" stroke="black"/>
       </marker>
     </defs>
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-start="url(#my-svg_classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M216.9765625,212L216.9765625,213.16666666666666C216.9765625,214.33333333333334,216.9765625,216.66666666666666,216.9765625,222C216.9765625,227.33333333333334,216.9765625,235.66666666666666,216.9765625,239.83333333333334L216.9765625,244"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M216.9765625,194L216.9765625,198.16666666666666C216.9765625,202.33333333333334,216.9765625,210.66666666666666,216.9765625,219C216.9765625,227.33333333333334,216.9765625,235.66666666666666,216.9765625,239.83333333333334L216.9765625,244"/>
         <path style="fill:none" class="edge-pattern-dotted relation" id="edgeNote2" d="M216.9765625,53L216.9765625,59.166666666666664C216.9765625,65.33333333333333,216.9765625,77.66666666666667,216.9765625,88C216.9765625,98.33333333333333,216.9765625,106.66666666666667,216.9765625,110.83333333333333L216.9765625,115"/>
       </g>
       <g class="edgeLabels">

From eec73a79e870bce62a16a4fc538d75c2b9ab17fe Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Mon, 1 Jan 2024 21:49:52 +0100
Subject: [PATCH 14/24] Updated CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 README.md    | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad11ab2b..2564d0ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
 # CHANGELOG
+ 
+ * Refactored and unified JSON generators output (#223)
+ * Added support for C++20 module based packages in class diagrams (#101)
+ * Added support for class diagram filtering based on C++20 modules (#195)
+ * Added support for C++20 coroutines in class diagrams (#221)
+ * Fixed progress indicator characters on Windows (#218)
 
 ### 0.4.2
  * Fixed random typos and omissions in docs (#208)
diff --git a/README.md b/README.md
index 93f9359d..67741c32 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ Main features supported so far include:
 * **Package diagram generation**
     * Generation of package diagram based on C++ namespaces - [_example_](docs/test_cases/t30001.md)
     * Generation of package diagram based on subdirectories - [_example_](docs/test_cases/t30010.md)
+    * Generation of package diagram based on C++20 modules - [_example_](docs/test_cases/t30014.md)
     * Dependencies between packages based on symbols used in the code - [_example_](docs/test_cases/t30002.md)
     * Interactive links to online code to packages - [_example_](https://raw.githubusercontent.com/bkryza/clang-uml/master/docs/test_cases/t30002_package.svg)
 * **Include graph diagram generation**

From da7870f50f138689510a477fe3c147192b36a05e Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Tue, 2 Jan 2024 23:17:32 +0100
Subject: [PATCH 15/24] Fixed clang-tidy warnings

---
 .clang-tidy                                   |  4 ++
 Makefile                                      |  2 +-
 src/class_diagram/model/diagram.cc            |  8 ++--
 src/class_diagram/model/diagram.h             | 11 ++---
 src/class_diagram/visitor/template_builder.cc |  4 +-
 src/class_diagram/visitor/template_builder.h  |  5 +-
 .../visitor/translation_unit_visitor.cc       |  4 +-
 .../visitor/translation_unit_visitor.h        |  2 +-
 src/cli/cli_handler.cc                        | 11 ++---
 src/common/generators/generators.cc           |  4 +-
 src/common/model/diagram.h                    |  7 +--
 src/common/model/diagram_element.cc           |  6 +--
 src/common/model/diagram_element.h            |  8 ++--
 src/common/model/diagram_filter.cc            |  4 +-
 src/common/model/element_view.h               |  3 +-
 src/common/model/path.cc                      |  3 ++
 src/common/visitor/ast_id_mapper.h            |  2 +-
 .../visitor/translation_unit_visitor.cc       |  4 +-
 src/common/visitor/translation_unit_visitor.h |  8 ++--
 src/config/config.h                           |  1 -
 src/include_diagram/model/diagram.cc          |  2 +-
 src/include_diagram/model/diagram.h           |  7 ++-
 src/package_diagram/model/diagram.cc          |  5 +-
 src/package_diagram/model/diagram.h           | 12 ++---
 .../visitor/translation_unit_visitor.cc       | 14 +++---
 .../visitor/translation_unit_visitor.h        | 10 ++--
 .../json/sequence_diagram_generator.cc        | 46 +++++++++----------
 .../json/sequence_diagram_generator.h         |  6 +--
 .../mermaid/sequence_diagram_generator.cc     | 21 ++++-----
 .../mermaid/sequence_diagram_generator.h      |  3 +-
 .../plantuml/sequence_diagram_generator.cc    | 21 ++++-----
 .../plantuml/sequence_diagram_generator.h     |  3 +-
 src/sequence_diagram/model/activity.cc        |  4 +-
 src/sequence_diagram/model/activity.h         |  6 +--
 src/sequence_diagram/model/diagram.cc         | 44 +++++++-----------
 src/sequence_diagram/model/diagram.h          | 41 +++++++----------
 src/sequence_diagram/model/message.cc         | 11 ++---
 src/sequence_diagram/model/message.h          | 15 +++---
 src/sequence_diagram/model/participant.cc     |  4 +-
 src/sequence_diagram/model/participant.h      |  6 +--
 .../visitor/translation_unit_visitor.cc       | 12 ++---
 .../visitor/translation_unit_visitor.h        | 16 +++----
 src/util/query_driver_output_extractor.h      |  4 +-
 43 files changed, 188 insertions(+), 226 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index fb5be52a..9274a133 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -8,6 +8,7 @@ Checks: >-
   -bugprone-branch-clone,
   -bugprone-exception-escape,
   -bugprone-easily-swappable-parameters,
+  -bugprone-empty-catch,
   -clang-analyzer-alpha.*,
   -clang-analyzer-core.StackAddressEscape,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
@@ -16,6 +17,8 @@ Checks: >-
   -cppcoreguidelines-special-member-functions,
   -cppcoreguidelines-avoid-magic-numbers,
   -cppcoreguidelines-non-private-member-variables-in-classes,
+  -cppcoreguidelines-missing-std-forward,
+  -cppcoreguidelines-avoid-const-or-ref-data-members,
   -cert-env33-c,
   -cert-err58-cpp,
   -cert-dcl58-cpp,
@@ -34,6 +37,7 @@ Checks: >-
   -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
   -misc-const-correctness,
+  -misc-include-cleaner,
   -modernize-use-nodiscard,
   -modernize-use-trailing-return-type,
   -modernize-concat-nested-namespaces,
diff --git a/Makefile b/Makefile
index 3ab0d8f9..119b0cbf 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ format:
 
 .PHONY: debug_tidy
 tidy: debug_tidy
-	run-clang-tidy-15 -j $(NUMPROC) -p debug_tidy ./src
+	run-clang-tidy-15 -extra-arg=-Wno-unknown-warning-option -j $(NUMPROC) -p debug_tidy ./src
 
 .PHONY: check-formatting
 check-formatting:
diff --git a/src/class_diagram/model/diagram.cc b/src/class_diagram/model/diagram.cc
index 0831b830..58045da4 100644
--- a/src/class_diagram/model/diagram.cc
+++ b/src/class_diagram/model/diagram.cc
@@ -74,7 +74,7 @@ common::optional_ref<clanguml::common::model::diagram_element> diagram::get(
 }
 
 common::optional_ref<clanguml::common::model::diagram_element> diagram::get(
-    const clanguml::common::model::diagram_element::id_t id) const
+    const clanguml::common::id_t id) const
 {
     common::optional_ref<clanguml::common::model::diagram_element> res;
 
@@ -149,8 +149,7 @@ void diagram::get_parents(
     }
 }
 
-bool diagram::has_element(
-    clanguml::common::model::diagram_element::id_t id) const
+bool diagram::has_element(clanguml::common::id_t id) const
 {
     const auto has_class = std::any_of(classes().begin(), classes().end(),
         [id](const auto &c) { return c.get().id() == id; });
@@ -168,8 +167,7 @@ bool diagram::has_element(
         [id](const auto &c) { return c.get().id() == id; });
 }
 
-std::string diagram::to_alias(
-    clanguml::common::model::diagram_element::id_t id) const
+std::string diagram::to_alias(clanguml::common::id_t id) const
 {
     LOG_DBG("Looking for alias for {}", id);
 
diff --git a/src/class_diagram/model/diagram.h b/src/class_diagram/model/diagram.h
index 12906916..fb3f1f21 100644
--- a/src/class_diagram/model/diagram.h
+++ b/src/class_diagram/model/diagram.h
@@ -103,7 +103,7 @@ public:
      * @param id Element id.
      * @return Optional reference to a diagram element.
      */
-    opt_ref<diagram_element> get(diagram_element::id_t id) const override;
+    opt_ref<diagram_element> get(common::id_t id) const override;
 
     /**
      * @brief Get list of references to classes in the diagram model.
@@ -172,8 +172,7 @@ public:
      * @param id Id of the element
      * @return Optional reference to a diagram element
      */
-    template <typename ElementT>
-    opt_ref<ElementT> find(diagram_element::id_t id) const;
+    template <typename ElementT> opt_ref<ElementT> find(common::id_t id) const;
 
     /**
      * @brief Get reference to vector of elements of specific type
@@ -219,7 +218,7 @@ public:
      * @param id Id of the diagram element.
      * @return PlantUML alias.
      */
-    std::string to_alias(diagram_element::id_t id) const;
+    std::string to_alias(common::id_t id) const;
 
     /**
      * @brief Given an initial set of classes, add all their parents to the
@@ -236,7 +235,7 @@ public:
      * @param id Id of the element.
      * @return True, if diagram contains an element with a specific id.
      */
-    bool has_element(diagram_element::id_t id) const override;
+    bool has_element(common::id_t id) const override;
 
     /**
      * @brief Remove redundant dependency relationships
@@ -421,7 +420,7 @@ std::vector<opt_ref<ElementT>> diagram::find(
 }
 
 template <typename ElementT>
-opt_ref<ElementT> diagram::find(diagram_element::id_t id) const
+opt_ref<ElementT> diagram::find(common::id_t id) const
 {
     for (const auto &element : element_view<ElementT>::view()) {
         if (element.get().id() == id) {
diff --git a/src/class_diagram/visitor/template_builder.cc b/src/class_diagram/visitor/template_builder.cc
index 02de4b8c..51045b28 100644
--- a/src/class_diagram/visitor/template_builder.cc
+++ b/src/class_diagram/visitor/template_builder.cc
@@ -216,7 +216,7 @@ std::unique_ptr<class_> template_builder::build(const clang::NamedDecl *cls,
     std::string best_match_full_name{};
     auto full_template_name = template_instantiation.full_name(false);
     int best_match{};
-    common::model::diagram_element::id_t best_match_id{0};
+    common::id_t best_match_id{0};
 
     for (const auto templ : diagram().classes()) {
         if (templ.get() == template_instantiation)
@@ -318,7 +318,7 @@ template_builder::build_from_class_template_specialization(
     std::string best_match_full_name{};
     auto full_template_name = template_instantiation.full_name(false);
     int best_match{};
-    common::model::diagram_element::id_t best_match_id{0};
+    common::id_t best_match_id{0};
 
     for (const auto templ : diagram().classes()) {
         if (templ.get() == template_instantiation)
diff --git a/src/class_diagram/visitor/template_builder.h b/src/class_diagram/visitor/template_builder.h
index 0ea8612b..5448e01a 100644
--- a/src/class_diagram/visitor/template_builder.h
+++ b/src/class_diagram/visitor/template_builder.h
@@ -30,9 +30,8 @@ using common::model::namespace_;
 using common::model::relationship_t;
 using common::model::template_parameter;
 
-using found_relationships_t =
-    std::vector<std::pair<clanguml::common::model::diagram_element::id_t,
-        common::model::relationship_t>>;
+using found_relationships_t = std::vector<
+    std::pair<clanguml::common::id_t, common::model::relationship_t>>;
 
 class translation_unit_visitor;
 
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 907c742f..eb169f9e 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -116,7 +116,7 @@ bool translation_unit_visitor::VisitEnumDecl(clang::EnumDecl *enm)
 
     const auto *parent = enm->getParent();
 
-    std::optional<common::model::diagram_element::id_t> id_opt;
+    std::optional<common::id_t> id_opt;
 
     if (parent != nullptr) {
         const auto *parent_record_decl =
@@ -863,7 +863,7 @@ void translation_unit_visitor::process_record_parent(
 {
     const auto *parent = cls->getParent();
 
-    std::optional<common::model::diagram_element::id_t> id_opt;
+    std::optional<common::id_t> id_opt;
 
     auto parent_ns = ns;
     if (parent != nullptr) {
diff --git a/src/class_diagram/visitor/translation_unit_visitor.h b/src/class_diagram/visitor/translation_unit_visitor.h
index addbe3ed..59be4f94 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.h
+++ b/src/class_diagram/visitor/translation_unit_visitor.h
@@ -477,7 +477,7 @@ private:
 
     template_builder template_builder_;
 
-    std::map<common::model::diagram_element::id_t,
+    std::map<common::id_t,
         std::unique_ptr<clanguml::class_diagram::model::class_>>
         forward_declarations_;
 
diff --git a/src/cli/cli_handler.cc b/src/cli/cli_handler.cc
index 7d65df61..2e671e39 100644
--- a/src/cli/cli_handler.cc
+++ b/src/cli/cli_handler.cc
@@ -384,14 +384,13 @@ runtime_config cli_handler::get_runtime_config() const
 
 cli_flow_t cli_handler::print_version()
 {
-    ostr_ << "clang-uml " << clanguml::version::CLANG_UML_VERSION << std::endl;
-    ostr_ << "Copyright (C) 2021-2023 Bartek Kryza <bkryza@gmail.com>"
-          << std::endl;
-    ostr_ << util::get_os_name() << std::endl;
+    ostr_ << "clang-uml " << clanguml::version::CLANG_UML_VERSION << '\n';
+    ostr_ << "Copyright (C) 2021-2023 Bartek Kryza <bkryza@gmail.com>" << '\n';
+    ostr_ << util::get_os_name() << '\n';
     ostr_ << "Built against LLVM/Clang libraries version: "
-          << LLVM_VERSION_STRING << std::endl;
+          << LLVM_VERSION_STRING << '\n';
     ostr_ << "Using LLVM/Clang libraries version: "
-          << clang::getClangFullVersion() << std::endl;
+          << clang::getClangFullVersion() << '\n';
 
     return cli_flow_t::kExit;
 }
diff --git a/src/common/generators/generators.cc b/src/common/generators/generators.cc
index 657a3c98..b6ecd648 100644
--- a/src/common/generators/generators.cc
+++ b/src/common/generators/generators.cc
@@ -127,7 +127,7 @@ void generate_diagram_impl(const std::string &name,
             auto from_values = model->list_from_values();
 
             for (const auto &from : from_values) {
-                std::cout << from << std::endl;
+                std::cout << from << '\n';
             }
 
             return;
@@ -136,7 +136,7 @@ void generate_diagram_impl(const std::string &name,
             auto to_values = model->list_to_values();
 
             for (const auto &to : to_values) {
-                std::cout << "|" << to << "|" << std::endl;
+                std::cout << "|" << to << "|" << '\n';
             }
 
             return;
diff --git a/src/common/model/diagram.h b/src/common/model/diagram.h
index 61b10bde..44015f93 100644
--- a/src/common/model/diagram.h
+++ b/src/common/model/diagram.h
@@ -65,7 +65,7 @@ public:
      * @return Optional reference to a diagram element.
      */
     virtual common::optional_ref<clanguml::common::model::diagram_element> get(
-        diagram_element::id_t id) const = 0;
+        common::id_t id) const = 0;
 
     /**
      * Return optional reference to a diagram_element by name and namespace.
@@ -152,10 +152,7 @@ public:
     // Disallow std::string overload
     bool should_include(const std::string &s) const = delete;
 
-    virtual bool has_element(const diagram_element::id_t /*id*/) const
-    {
-        return false;
-    }
+    virtual bool has_element(const common::id_t /*id*/) const { return false; }
 
     virtual bool should_include(
         const namespace_ &ns, const std::string &name) const;
diff --git a/src/common/model/diagram_element.cc b/src/common/model/diagram_element.cc
index 429dc2f2..96f603da 100644
--- a/src/common/model/diagram_element.cc
+++ b/src/common/model/diagram_element.cc
@@ -26,16 +26,16 @@ namespace clanguml::common::model {
 
 diagram_element::diagram_element() = default;
 
-diagram_element::id_t diagram_element::id() const { return id_; }
+common::id_t diagram_element::id() const { return id_; }
 
-void diagram_element::set_id(diagram_element::id_t id) { id_ = id; }
+void diagram_element::set_id(common::id_t id) { id_ = id; }
 
 std::optional<id_t> diagram_element::parent_element_id() const
 {
     return parent_element_id_;
 }
 
-void diagram_element::set_parent_element_id(diagram_element::id_t id)
+void diagram_element::set_parent_element_id(common::id_t id)
 {
     parent_element_id_ = id;
 }
diff --git a/src/common/model/diagram_element.h b/src/common/model/diagram_element.h
index 179b6f0d..f3bb07ef 100644
--- a/src/common/model/diagram_element.h
+++ b/src/common/model/diagram_element.h
@@ -39,8 +39,6 @@ namespace clanguml::common::model {
  */
 class diagram_element : public decorated_element, public source_location {
 public:
-    using id_t = int64_t;
-
     diagram_element();
 
     ~diagram_element() override = default;
@@ -55,14 +53,14 @@ public:
      *
      * @return Elements id.
      */
-    id_t id() const;
+    common::id_t id() const;
 
     /**
      * Set elements id.
      *
      * @param id Elements id.
      */
-    void set_id(id_t id);
+    void set_id(common::id_t id);
 
     /**
      * Get elements parent package id.
@@ -76,7 +74,7 @@ public:
      *
      * @param id Id of parent package.
      */
-    void set_parent_element_id(diagram_element::id_t id);
+    void set_parent_element_id(id_t id);
 
     /**
      * @brief Return elements' diagram alias.
diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc
index 3c0c9fd8..2104a2ed 100644
--- a/src/common/model/diagram_filter.cc
+++ b/src/common/model/diagram_filter.cc
@@ -595,8 +595,8 @@ tvl::value_t module_access_filter::match(
         access_.begin(), access_.end(), [&e](const auto &access) {
             if (access == module_access_t::kPublic)
                 return !e.module_private();
-            else
-                return e.module_private();
+
+            return e.module_private();
         });
 }
 
diff --git a/src/common/model/element_view.h b/src/common/model/element_view.h
index 8d34f0a4..0c2a6b5a 100644
--- a/src/common/model/element_view.h
+++ b/src/common/model/element_view.h
@@ -58,8 +58,7 @@ public:
      *
      * @return
      */
-    common::optional_ref<T> get(
-        clanguml::common::model::diagram_element::id_t id) const
+    common::optional_ref<T> get(clanguml::common::id_t id) const
     {
         for (const auto &e : elements_) {
             if (e.get().id() == id) {
diff --git a/src/common/model/path.cc b/src/common/model/path.cc
index fd642da0..6738d3e4 100644
--- a/src/common/model/path.cc
+++ b/src/common/model/path.cc
@@ -29,6 +29,9 @@ std::string to_string(const path_type pt)
         return "namespace";
     case path_type::kFilesystem:
         return "directory";
+    default:
+        assert(false);
+        return "";
     }
 }
 
diff --git a/src/common/visitor/ast_id_mapper.h b/src/common/visitor/ast_id_mapper.h
index 033c064a..cb5e1374 100644
--- a/src/common/visitor/ast_id_mapper.h
+++ b/src/common/visitor/ast_id_mapper.h
@@ -40,7 +40,7 @@ namespace clanguml::common::visitor {
  */
 class ast_id_mapper {
 public:
-    using id_t = common::model::diagram_element::id_t;
+    using id_t = common::id_t;
 
     ast_id_mapper() = default;
 
diff --git a/src/common/visitor/translation_unit_visitor.cc b/src/common/visitor/translation_unit_visitor.cc
index 8c4212e7..6bde7023 100644
--- a/src/common/visitor/translation_unit_visitor.cc
+++ b/src/common/visitor/translation_unit_visitor.cc
@@ -20,8 +20,10 @@
 
 #include "comment/clang_visitor.h"
 #include "comment/plain_visitor.h"
+#include "common/clang_utils.h"
 
-#include "clang/Basic/Module.h"
+#include <clang/AST/Expr.h>
+#include <clang/Basic/Module.h>
 
 namespace clanguml::common::visitor {
 
diff --git a/src/common/visitor/translation_unit_visitor.h b/src/common/visitor/translation_unit_visitor.h
index 9021dc95..b8e834f2 100644
--- a/src/common/visitor/translation_unit_visitor.h
+++ b/src/common/visitor/translation_unit_visitor.h
@@ -18,9 +18,12 @@
 #pragma once
 
 #include "comment/comment_visitor.h"
+#include "common/model/element.h"
+#include "common/model/source_location.h"
 #include "config/config.h"
 
 #include <clang/AST/Comment.h>
+#include <clang/AST/RawCommentList.h>
 #include <clang/Basic/SourceManager.h>
 
 #include <deque>
@@ -31,9 +34,8 @@
 
 namespace clanguml::common::visitor {
 
-using found_relationships_t =
-    std::vector<std::pair<clanguml::common::model::diagram_element::id_t,
-        common::model::relationship_t>>;
+using found_relationships_t = std::vector<
+    std::pair<clanguml::common::id_t, common::model::relationship_t>>;
 
 /**
  * @brief Diagram translation unit visitor base class
diff --git a/src/config/config.h b/src/config/config.h
index 22a1da17..32c13194 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -17,7 +17,6 @@
  */
 #pragma once
 
-#include "class_diagram/model/diagram.h"
 #include "common/model/enums.h"
 #include "common/types.h"
 #include "option.h"
diff --git a/src/include_diagram/model/diagram.cc b/src/include_diagram/model/diagram.cc
index d21a9f56..8be81e5d 100644
--- a/src/include_diagram/model/diagram.cc
+++ b/src/include_diagram/model/diagram.cc
@@ -35,7 +35,7 @@ common::optional_ref<common::model::diagram_element> diagram::get(
 }
 
 common::optional_ref<common::model::diagram_element> diagram::get(
-    const common::model::diagram_element::id_t id) const
+    const common::id_t id) const
 {
     return find<source_file>(id);
 }
diff --git a/src/include_diagram/model/diagram.h b/src/include_diagram/model/diagram.h
index 44bbc996..0874c217 100644
--- a/src/include_diagram/model/diagram.h
+++ b/src/include_diagram/model/diagram.h
@@ -68,7 +68,7 @@ public:
      * @param id Element id.
      * @return Optional reference to a diagram element.
      */
-    opt_ref<diagram_element> get(diagram_element::id_t id) const override;
+    opt_ref<diagram_element> get(common::id_t id) const override;
 
     /**
      * @brief Add include diagram element, an include file.
@@ -100,8 +100,7 @@ public:
      * @param id Id of the element
      * @return Optional reference to a diagram element
      */
-    template <typename ElementT>
-    opt_ref<ElementT> find(diagram_element::id_t id) const;
+    template <typename ElementT> opt_ref<ElementT> find(common::id_t id) const;
 
     /**
      * @brief Convert element id to PlantUML alias.
@@ -153,7 +152,7 @@ opt_ref<ElementT> diagram::find(const std::string &name) const
 }
 
 template <typename ElementT>
-opt_ref<ElementT> diagram::find(diagram_element::id_t id) const
+opt_ref<ElementT> diagram::find(common::id_t id) const
 {
     for (const auto &element : element_view<ElementT>::view()) {
         if (element.get().id() == id) {
diff --git a/src/package_diagram/model/diagram.cc b/src/package_diagram/model/diagram.cc
index f6e2d45c..8dec8b17 100644
--- a/src/package_diagram/model/diagram.cc
+++ b/src/package_diagram/model/diagram.cc
@@ -41,13 +41,12 @@ common::optional_ref<clanguml::common::model::diagram_element> diagram::get(
 }
 
 common::optional_ref<clanguml::common::model::diagram_element> diagram::get(
-    const clanguml::common::model::diagram_element::id_t id) const
+    const clanguml::common::id_t id) const
 {
     return find<package>(id);
 }
 
-std::string diagram::to_alias(
-    const clanguml::common::model::diagram_element::id_t id) const
+std::string diagram::to_alias(const clanguml::common::id_t id) const
 {
     LOG_DBG("Looking for alias for {}", id);
 
diff --git a/src/package_diagram/model/diagram.h b/src/package_diagram/model/diagram.h
index 0215ae56..5851139c 100644
--- a/src/package_diagram/model/diagram.h
+++ b/src/package_diagram/model/diagram.h
@@ -75,7 +75,7 @@ public:
      * @param id Element id.
      * @return Optional reference to a diagram element.
      */
-    opt_ref<diagram_element> get(diagram_element::id_t id) const override;
+    opt_ref<diagram_element> get(common::id_t id) const override;
 
     /**
      * @brief Find an element in the diagram by name.
@@ -100,8 +100,7 @@ public:
      * @param id Id of the element
      * @return Optional reference to a diagram element
      */
-    template <typename ElementT>
-    opt_ref<ElementT> find(diagram_element::id_t id) const;
+    template <typename ElementT> opt_ref<ElementT> find(common::id_t id) const;
 
     /**
      * @brief Find elements in the diagram by regex pattern.
@@ -135,7 +134,8 @@ public:
         if (parent_path.type() == common::model::path_type::kNamespace) {
             return add_with_namespace_path(std::move(e));
         }
-        else if (parent_path.type() == common::model::path_type::kModule) {
+
+        if (parent_path.type() == common::model::path_type::kModule) {
             return add_with_module_path(parent_path, std::move(e));
         }
 
@@ -148,7 +148,7 @@ public:
      * @param id Id of a package in the diagram
      * @return PlantUML alias of the element
      */
-    std::string to_alias(diagram_element::id_t id) const;
+    std::string to_alias(common::id_t id) const;
 
     /**
      * @brief Return the elements JSON context for inja templates.
@@ -207,7 +207,7 @@ opt_ref<ElementT> diagram::find(const std::string &name) const
 }
 
 template <typename ElementT>
-opt_ref<ElementT> diagram::find(diagram_element::id_t id) const
+opt_ref<ElementT> diagram::find(common::id_t id) const
 {
     for (const auto &element : element_view<ElementT>::view()) {
         if (element.get().id() == id) {
diff --git a/src/package_diagram/visitor/translation_unit_visitor.cc b/src/package_diagram/visitor/translation_unit_visitor.cc
index 9d00d7ca..c2a68883 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.cc
+++ b/src/package_diagram/visitor/translation_unit_visitor.cc
@@ -287,7 +287,7 @@ void translation_unit_visitor::add_relationships(
     auto current_package = diagram().get(current_package_id);
 
     if (current_package) {
-        std::vector<common::model::diagram_element::id_t> parent_ids =
+        std::vector<common::id_t> parent_ids =
             get_parent_package_ids(current_package_id);
 
         for (const auto &dependency : relationships) {
@@ -310,8 +310,7 @@ void translation_unit_visitor::add_relationships(
     }
 }
 
-common::model::diagram_element::id_t translation_unit_visitor::get_package_id(
-    const clang::Decl *cls)
+common::id_t translation_unit_visitor::get_package_id(const clang::Decl *cls)
 {
     if (config().package_type() == config::package_type_t::kNamespace) {
         const auto *namespace_context =
@@ -680,12 +679,11 @@ translation_unit_visitor::config() const
 
 void translation_unit_visitor::finalize() { }
 
-std::vector<common::model::diagram_element::id_t>
-translation_unit_visitor::get_parent_package_ids(
-    common::model::diagram_element::id_t id)
+std::vector<common::id_t> translation_unit_visitor::get_parent_package_ids(
+    common::id_t id)
 {
-    std::vector<common::model::diagram_element::id_t> parent_ids;
-    std::optional<common::model::diagram_element::id_t> parent_id = id;
+    std::vector<common::id_t> parent_ids;
+    std::optional<common::id_t> parent_id = id;
 
     while (parent_id.has_value()) {
         parent_ids.push_back(parent_id.value());
diff --git a/src/package_diagram/visitor/translation_unit_visitor.h b/src/package_diagram/visitor/translation_unit_visitor.h
index 239ae924..ec671a85 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.h
+++ b/src/package_diagram/visitor/translation_unit_visitor.h
@@ -33,9 +33,8 @@
 
 namespace clanguml::package_diagram::visitor {
 
-using found_relationships_t =
-    std::vector<std::pair<clanguml::common::model::diagram_element::id_t,
-        common::model::relationship_t>>;
+using found_relationships_t = std::vector<
+    std::pair<clanguml::common::id_t, common::model::relationship_t>>;
 
 /**
  * @brief Package diagram translation unit visitor
@@ -109,7 +108,7 @@ private:
      * @param cls C++ entity declaration
      * @return Id of the package containing that declaration
      */
-    common::model::diagram_element::id_t get_package_id(const clang::Decl *cls);
+    common::id_t get_package_id(const clang::Decl *cls);
 
     /**
      * @brief Process class declaration
@@ -214,8 +213,7 @@ private:
     void add_relationships(
         clang::Decl *cls, found_relationships_t &relationships);
 
-    std::vector<common::model::diagram_element::id_t> get_parent_package_ids(
-        common::model::diagram_element::id_t id);
+    std::vector<common::id_t> get_parent_package_ids(common::id_t id);
 
     // Reference to the output diagram model
     clanguml::package_diagram::model::diagram &diagram_;
diff --git a/src/sequence_diagram/generators/json/sequence_diagram_generator.cc b/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
index 642cc98b..39c05f75 100644
--- a/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
@@ -170,8 +170,8 @@ void generator::generate_call(const message &m, nlohmann::json &parent) const
         m.from(), to, m.to());
 }
 
-void generator::generate_activity(const activity &a,
-    std::vector<common::model::diagram_element::id_t> &visited) const
+void generator::generate_activity(
+    const activity &a, std::vector<common::id_t> &visited) const
 {
     // Generate calls from this activity to other activities
     for (const auto &m : a.messages()) {
@@ -247,8 +247,8 @@ nlohmann::json &generator::current_block_statement() const
     return block_statements_stack_.back().get();
 }
 
-void generator::process_call_message(const model::message &m,
-    std::vector<common::model::diagram_element::id_t> &visited) const
+void generator::process_call_message(
+    const model::message &m, std::vector<common::id_t> &visited) const
 {
     visited.push_back(m.from());
 
@@ -523,7 +523,7 @@ void generator::generate_participant(
 }
 
 common::id_t generator::generate_participant(
-    nlohmann::json &parent, common::id_t id, bool force) const
+    nlohmann::json & /*parent*/, common::id_t id, bool force) const
 {
     common::id_t participant_id{0};
 
@@ -570,14 +570,13 @@ common::id_t generator::generate_participant(
 
             return class_participant_id;
         }
-        else {
-            if (!is_participant_generated(participant_id)) {
-                for (auto &p : json_["participants"]) {
-                    if (p.at("id") == std::to_string(class_participant_id)) {
-                        generated_participants_.emplace(participant_id);
-                        p["activities"].push_back(participant);
-                        return class_participant_id;
-                    }
+
+        if (!is_participant_generated(participant_id)) {
+            for (auto &p : json_["participants"]) {
+                if (p.at("id") == std::to_string(class_participant_id)) {
+                    generated_participants_.emplace(participant_id);
+                    p["activities"].push_back(participant);
+                    return class_participant_id;
                 }
             }
         }
@@ -619,17 +618,17 @@ common::id_t generator::generate_participant(
 
             return file_participant_id;
         }
-        else {
-            if (!is_participant_generated(participant_id)) {
-                for (auto &p : json_["participants"]) {
-                    if (p.at("id") == std::to_string(file_participant_id)) {
-                        generated_participants_.emplace(participant_id);
-                        p["activities"].push_back(participant);
-                    }
+
+        if (!is_participant_generated(participant_id)) {
+            for (auto &p : json_["participants"]) {
+                if (p.at("id") == std::to_string(file_participant_id)) {
+                    generated_participants_.emplace(participant_id);
+                    p["activities"].push_back(participant);
                 }
             }
-            return file_participant_id;
         }
+
+        return file_participant_id;
     }
     else {
         json_["participants"].push_back(participant);
@@ -745,7 +744,7 @@ void generator::generate_diagram(nlohmann::json &parent) const
 
     for (const auto &sf : config().from()) {
         if (sf.location_type == location_t::function) {
-            common::model::diagram_element::id_t start_from{0};
+            common::id_t start_from{0};
             std::string start_from_str;
             for (const auto &[k, v] : model().sequences()) {
                 const auto &caller = *model().participants().at(v.from());
@@ -765,8 +764,7 @@ void generator::generate_diagram(nlohmann::json &parent) const
             }
 
             // Use this to break out of recurrent loops
-            std::vector<common::model::diagram_element::id_t>
-                visited_participants;
+            std::vector<common::id_t> visited_participants;
 
             const auto &from =
                 model().get_participant<model::function>(start_from);
diff --git a/src/sequence_diagram/generators/json/sequence_diagram_generator.h b/src/sequence_diagram/generators/json/sequence_diagram_generator.h
index ff90f721..e787c572 100644
--- a/src/sequence_diagram/generators/json/sequence_diagram_generator.h
+++ b/src/sequence_diagram/generators/json/sequence_diagram_generator.h
@@ -99,7 +99,7 @@ public:
      *                for breaking infinite recursion on recursive calls
      */
     void generate_activity(const sequence_diagram::model::activity &a,
-        std::vector<common::model::diagram_element::id_t> &visited) const;
+        std::vector<common::id_t> &visited) const;
 
     /**
      * @brief Get reference to the current block statement.
@@ -126,8 +126,8 @@ private:
      * @param m Message model
      * @param visited List of already visited participants
      */
-    void process_call_message(const model::message &m,
-        std::vector<common::model::diagram_element::id_t> &visited) const;
+    void process_call_message(
+        const model::message &m, std::vector<common::id_t> &visited) const;
 
     /**
      * @brief Process `if` statement message
diff --git a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
index 059fa526..a2f25ee3 100644
--- a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
@@ -180,7 +180,7 @@ void generator::generate_return(const message &m, std::ostream &ostr) const
 }
 
 void generator::generate_activity(const activity &a, std::ostream &ostr,
-    std::vector<common::model::diagram_element::id_t> &visited) const
+    std::vector<common::id_t> &visited) const
 {
     for (const auto &m : a.messages()) {
         if (m.in_static_declaration_context()) {
@@ -202,7 +202,7 @@ void generator::generate_activity(const activity &a, std::ostream &ostr,
 
             std::string to_alias = generate_alias(to.value());
 
-            ostr << indent(1) << "activate " << to_alias << std::endl;
+            ostr << indent(1) << "activate " << to_alias << '\n';
 
             if (model().sequences().find(m.to()) != model().sequences().end()) {
                 if (std::find(visited.begin(), visited.end(), m.to()) ==
@@ -220,7 +220,7 @@ void generator::generate_activity(const activity &a, std::ostream &ostr,
 
             generate_return(m, ostr);
 
-            ostr << indent(1) << "deactivate " << to_alias << std::endl;
+            ostr << indent(1) << "deactivate " << to_alias << '\n';
 
             visited.pop_back();
         }
@@ -495,7 +495,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                      << " " << generate_alias(from.value()) << " : "
                      << from.value().message_name(
                             select_method_arguments_render_mode())
-                     << std::endl;
+                     << '\n';
             }
 
             for (const auto &m : mc) {
@@ -528,7 +528,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                      << " " << generate_alias(from.value()) << " : "
                      << from.value().message_name(
                             select_method_arguments_render_mode())
-                     << std::endl;
+                     << '\n';
             }
 
             for (const auto &m : mc) {
@@ -539,7 +539,7 @@ void generator::generate_diagram(std::ostream &ostr) const
 
     for (const auto &sf : config().from()) {
         if (sf.location_type == location_t::function) {
-            common::model::diagram_element::id_t start_from{0};
+            common::id_t start_from{0};
             for (const auto &[k, v] : model().sequences()) {
                 const auto &caller = *model().participants().at(v.from());
                 std::string vfrom = caller.full_name(false);
@@ -558,8 +558,7 @@ void generator::generate_diagram(std::ostream &ostr) const
             }
 
             // Use this to break out of recurrent loops
-            std::vector<common::model::diagram_element::id_t>
-                visited_participants;
+            std::vector<common::id_t> visited_participants;
 
             const auto &from =
                 model().get_participant<model::function>(start_from);
@@ -588,10 +587,10 @@ void generator::generate_diagram(std::ostream &ostr) const
                      << common::generators::mermaid::to_mermaid(
                             message_t::kCall)
                      << " " << from_alias << " : "
-                     << from.value().message_name(render_mode) << std::endl;
+                     << from.value().message_name(render_mode) << '\n';
             }
 
-            ostr << indent(1) << "activate " << from_alias << std::endl;
+            ostr << indent(1) << "activate " << from_alias << '\n';
 
             generate_activity(
                 model().get_activity(start_from), ostr, visited_participants);
@@ -613,7 +612,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                 }
             }
 
-            ostr << indent(1) << "deactivate " << from_alias << std::endl;
+            ostr << indent(1) << "deactivate " << from_alias << '\n';
         }
         else {
             // TODO: Add support for other sequence start location types
diff --git a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h
index ef7f60f3..6aaef53e 100644
--- a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h
+++ b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h
@@ -117,8 +117,7 @@ public:
      *                for breaking infinite recursion on recursive calls
      */
     void generate_activity(const clanguml::sequence_diagram::model::activity &a,
-        std::ostream &ostr,
-        std::vector<common::model::diagram_element::id_t> &visited) const;
+        std::ostream &ostr, std::vector<common::id_t> &visited) const;
 
 private:
     /**
diff --git a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
index 30b28d85..20623b22 100644
--- a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
@@ -134,7 +134,7 @@ void generator::generate_return(const message &m, std::ostream &ostr) const
 }
 
 void generator::generate_activity(const activity &a, std::ostream &ostr,
-    std::vector<common::model::diagram_element::id_t> &visited) const
+    std::vector<common::id_t> &visited) const
 {
     for (const auto &m : a.messages()) {
         if (m.in_static_declaration_context()) {
@@ -156,7 +156,7 @@ void generator::generate_activity(const activity &a, std::ostream &ostr,
 
             std::string to_alias = generate_alias(to.value());
 
-            ostr << "activate " << to_alias << std::endl;
+            ostr << "activate " << to_alias << '\n';
 
             if (model().sequences().find(m.to()) != model().sequences().end()) {
                 if (std::find(visited.begin(), visited.end(), m.to()) ==
@@ -174,7 +174,7 @@ void generator::generate_activity(const activity &a, std::ostream &ostr,
 
             generate_return(m, ostr);
 
-            ostr << "deactivate " << to_alias << std::endl;
+            ostr << "deactivate " << to_alias << '\n';
 
             visited.pop_back();
         }
@@ -498,7 +498,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                      << " " << generate_alias(from.value()) << " : "
                      << from.value().message_name(
                             select_method_arguments_render_mode())
-                     << std::endl;
+                     << '\n';
             }
 
             for (const auto &m : mc) {
@@ -535,7 +535,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                      << " " << generate_alias(from.value()) << " : "
                      << from.value().message_name(
                             select_method_arguments_render_mode())
-                     << std::endl;
+                     << '\n';
             }
 
             for (const auto &m : mc) {
@@ -546,7 +546,7 @@ void generator::generate_diagram(std::ostream &ostr) const
 
     for (const auto &sf : config().from()) {
         if (sf.location_type == location_t::function) {
-            common::model::diagram_element::id_t start_from{0};
+            common::id_t start_from{0};
             for (const auto &[k, v] : model().sequences()) {
                 const auto &caller = *model().participants().at(v.from());
                 std::string vfrom = caller.full_name(false);
@@ -565,8 +565,7 @@ void generator::generate_diagram(std::ostream &ostr) const
             }
 
             // Use this to break out of recurrent loops
-            std::vector<common::model::diagram_element::id_t>
-                visited_participants;
+            std::vector<common::id_t> visited_participants;
 
             const auto &from =
                 model().get_participant<model::function>(start_from);
@@ -593,10 +592,10 @@ void generator::generate_diagram(std::ostream &ostr) const
                 config().combine_free_functions_into_file_participants()) {
                 ostr << "[->"
                      << " " << from_alias << " : "
-                     << from.value().message_name(render_mode) << std::endl;
+                     << from.value().message_name(render_mode) << '\n';
             }
 
-            ostr << "activate " << from_alias << std::endl;
+            ostr << "activate " << from_alias << '\n';
 
             generate_activity(
                 model().get_activity(start_from), ostr, visited_participants);
@@ -615,7 +614,7 @@ void generator::generate_diagram(std::ostream &ostr) const
                 }
             }
 
-            ostr << "deactivate " << from_alias << std::endl;
+            ostr << "deactivate " << from_alias << '\n';
         }
         else {
             // TODO: Add support for other sequence start location types
diff --git a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
index 35dc31ba..6adfb14d 100644
--- a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
+++ b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
@@ -111,8 +111,7 @@ public:
      *                for breaking infinite recursion on recursive calls
      */
     void generate_activity(const clanguml::sequence_diagram::model::activity &a,
-        std::ostream &ostr,
-        std::vector<common::model::diagram_element::id_t> &visited) const;
+        std::ostream &ostr, std::vector<common::id_t> &visited) const;
 
 private:
     /**
diff --git a/src/sequence_diagram/model/activity.cc b/src/sequence_diagram/model/activity.cc
index 31313e84..a5cbcdca 100644
--- a/src/sequence_diagram/model/activity.cc
+++ b/src/sequence_diagram/model/activity.cc
@@ -20,7 +20,7 @@
 
 namespace clanguml::sequence_diagram::model {
 
-activity::activity(common::model::diagram_element::id_t id)
+activity::activity(common::id_t id)
     : from_{id}
 {
 }
@@ -31,6 +31,6 @@ std::vector<message> &activity::messages() { return messages_; }
 
 const std::vector<message> &activity::messages() const { return messages_; }
 
-common::model::diagram_element::id_t activity::from() const { return from_; }
+common::id_t activity::from() const { return from_; }
 
 } // namespace clanguml::sequence_diagram::model
diff --git a/src/sequence_diagram/model/activity.h b/src/sequence_diagram/model/activity.h
index 404b09b4..241b929a 100644
--- a/src/sequence_diagram/model/activity.h
+++ b/src/sequence_diagram/model/activity.h
@@ -35,7 +35,7 @@ public:
      *
      * @param id Id of the participant parent for the activity
      */
-    activity(common::model::diagram_element::id_t id);
+    activity(common::id_t id);
 
     /**
      * @brief Add a message call to the activity
@@ -63,10 +63,10 @@ public:
      *
      * @return Id of activity participant
      */
-    common::model::diagram_element::id_t from() const;
+    common::id_t from() const;
 
 private:
-    common::model::diagram_element::id_t from_;
+    common::id_t from_;
     std::vector<message> messages_;
 };
 
diff --git a/src/sequence_diagram/model/diagram.cc b/src/sequence_diagram/model/diagram.cc
index 26215680..c6dd17c2 100644
--- a/src/sequence_diagram/model/diagram.cc
+++ b/src/sequence_diagram/model/diagram.cc
@@ -42,7 +42,7 @@ common::optional_ref<common::model::diagram_element> diagram::get(
 }
 
 common::optional_ref<common::model::diagram_element> diagram::get(
-    const common::model::diagram_element::id_t id) const
+    const common::id_t id) const
 {
     if (participants_.find(id) != participants_.end())
         return {*participants_.at(id)};
@@ -88,21 +88,17 @@ void diagram::add_participant(std::unique_ptr<participant> p)
     }
 }
 
-void diagram::add_active_participant(common::model::diagram_element::id_t id)
+void diagram::add_active_participant(common::id_t id)
 {
     active_participants_.emplace(id);
 }
 
-const activity &diagram::get_activity(
-    common::model::diagram_element::id_t id) const
+const activity &diagram::get_activity(common::id_t id) const
 {
     return sequences_.at(id);
 }
 
-activity &diagram::get_activity(common::model::diagram_element::id_t id)
-{
-    return sequences_.at(id);
-}
+activity &diagram::get_activity(common::id_t id) { return sequences_.at(id); }
 
 void diagram::add_message(model::message &&message)
 {
@@ -150,37 +146,30 @@ void diagram::add_case_stmt_message(model::message &&m)
     }
 }
 
-std::map<common::model::diagram_element::id_t, activity> &diagram::sequences()
+std::map<common::id_t, activity> &diagram::sequences() { return sequences_; }
+
+const std::map<common::id_t, activity> &diagram::sequences() const
 {
     return sequences_;
 }
 
-const std::map<common::model::diagram_element::id_t, activity> &
-diagram::sequences() const
-{
-    return sequences_;
-}
-
-std::map<common::model::diagram_element::id_t, std::unique_ptr<participant>> &
-diagram::participants()
+std::map<common::id_t, std::unique_ptr<participant>> &diagram::participants()
 {
     return participants_;
 }
 
-const std::map<common::model::diagram_element::id_t,
-    std::unique_ptr<participant>> &
+const std::map<common::id_t, std::unique_ptr<participant>> &
 diagram::participants() const
 {
     return participants_;
 }
 
-std::set<common::model::diagram_element::id_t> &diagram::active_participants()
+std::set<common::id_t> &diagram::active_participants()
 {
     return active_participants_;
 }
 
-const std::set<common::model::diagram_element::id_t> &
-diagram::active_participants() const
+const std::set<common::id_t> &diagram::active_participants() const
 {
     return active_participants_;
 }
@@ -232,10 +221,10 @@ std::vector<std::string> diagram::list_to_values() const
     return result;
 }
 
-common::model::diagram_element::id_t diagram::get_to_activity_id(
+common::id_t diagram::get_to_activity_id(
     const config::source_location &to_location) const
 {
-    common::model::diagram_element::id_t to_activity{0};
+    common::id_t to_activity{0};
 
     for (const auto &[k, v] : sequences()) {
         for (const auto &m : v.messages()) {
@@ -261,10 +250,10 @@ common::model::diagram_element::id_t diagram::get_to_activity_id(
     return to_activity;
 }
 
-common::model::diagram_element::id_t diagram::get_from_activity_id(
+common::id_t diagram::get_from_activity_id(
     const config::source_location &from_location) const
 {
-    common::model::diagram_element::id_t from_activity{0};
+    common::id_t from_activity{0};
 
     for (const auto &[k, v] : sequences()) {
         const auto &caller = *participants().at(v.from());
@@ -286,8 +275,7 @@ common::model::diagram_element::id_t diagram::get_from_activity_id(
 }
 
 std::vector<message_chain_t> diagram::get_all_from_to_message_chains(
-    const common::model::diagram_element::id_t from_activity,
-    const common::model::diagram_element::id_t to_activity) const
+    const common::id_t from_activity, const common::id_t to_activity) const
 {
     std::vector<message_chain_t> message_chains_unique{};
 
diff --git a/src/sequence_diagram/model/diagram.h b/src/sequence_diagram/model/diagram.h
index 4c58e5e1..13192809 100644
--- a/src/sequence_diagram/model/diagram.h
+++ b/src/sequence_diagram/model/diagram.h
@@ -67,7 +67,7 @@ public:
      * @return Optional reference to a diagram element.
      */
     common::optional_ref<common::model::diagram_element> get(
-        common::model::diagram_element::id_t id) const override;
+        common::id_t id) const override;
 
     /**
      * @brief Get participant by id
@@ -76,8 +76,7 @@ public:
      * @return Optional reference to a diagram element.
      */
     template <typename T>
-    common::optional_ref<T> get_participant(
-        common::model::diagram_element::id_t id) const
+    common::optional_ref<T> get_participant(common::id_t id) const
     {
         if (participants_.find(id) == participants_.end()) {
             return {};
@@ -99,7 +98,7 @@ public:
      *
      * @param id Id of participant to activate
      */
-    void add_active_participant(common::model::diagram_element::id_t id);
+    void add_active_participant(common::id_t id);
 
     /**
      * @brief Get reference to current activity of a participant
@@ -107,7 +106,7 @@ public:
      * @param id Participant id
      * @return
      */
-    const activity &get_activity(common::model::diagram_element::id_t id) const;
+    const activity &get_activity(common::id_t id) const;
 
     /**
      * @brief Get reference to current activity of a participant
@@ -115,7 +114,7 @@ public:
      * @param id Participant id
      * @return
      */
-    activity &get_activity(common::model::diagram_element::id_t id);
+    activity &get_activity(common::id_t id);
 
     /**
      * @brief Add message to current activity
@@ -156,31 +155,28 @@ public:
      *
      * @return Map of sequences in the diagram
      */
-    std::map<common::model::diagram_element::id_t, activity> &sequences();
+    std::map<common::id_t, activity> &sequences();
 
     /**
      * @brief Get all sequences in the diagram
      *
      * @return Map of sequences in the diagram
      */
-    const std::map<common::model::diagram_element::id_t, activity> &
-    sequences() const;
+    const std::map<common::id_t, activity> &sequences() const;
 
     /**
      * @brief Get map of all participants in the diagram
      *
      * @return Map of participants in the diagram
      */
-    std::map<common::model::diagram_element::id_t, std::unique_ptr<participant>>
-        &participants();
+    std::map<common::id_t, std::unique_ptr<participant>> &participants();
 
     /**
      * @brief Get map of all participants in the diagram
      *
      * @return Map of participants in the diagram
      */
-    const std::map<common::model::diagram_element::id_t,
-        std::unique_ptr<participant>> &
+    const std::map<common::id_t, std::unique_ptr<participant>> &
     participants() const;
 
     /**
@@ -188,15 +184,14 @@ public:
      *
      * @return Set of all active participant ids
      */
-    std::set<common::model::diagram_element::id_t> &active_participants();
+    std::set<common::id_t> &active_participants();
 
     /**
      * @brief Get all active participants in the diagram
      *
      * @return Set of all active participant ids
      */
-    const std::set<common::model::diagram_element::id_t> &
-    active_participants() const;
+    const std::set<common::id_t> &active_participants() const;
 
     /**
      * @brief Convert element full name to PlantUML alias.
@@ -256,8 +251,7 @@ public:
      * @return List of message chains
      */
     std::vector<message_chain_t> get_all_from_to_message_chains(
-        common::model::diagram_element::id_t from_activity,
-        common::model::diagram_element::id_t to_activity) const;
+        common::id_t from_activity, common::id_t to_activity) const;
 
     /**
      * @brief Get id of a 'to' activity
@@ -265,7 +259,7 @@ public:
      * @param to_location Target activity
      * @return Activity id
      */
-    common::model::diagram_element::id_t get_to_activity_id(
+    common::id_t get_to_activity_id(
         const config::source_location &to_location) const;
 
     /**
@@ -274,7 +268,7 @@ public:
      * @param from_location Source activity
      * @return Activity id
      */
-    common::model::diagram_element::id_t get_from_activity_id(
+    common::id_t get_from_activity_id(
         const config::source_location &from_location) const;
 
     /**
@@ -328,12 +322,11 @@ private:
         return block_end_types.count(mt) > 0;
     };
 
-    std::map<common::model::diagram_element::id_t, activity> sequences_;
+    std::map<common::id_t, activity> sequences_;
 
-    std::map<common::model::diagram_element::id_t, std::unique_ptr<participant>>
-        participants_;
+    std::map<common::id_t, std::unique_ptr<participant>> participants_;
 
-    std::set<common::model::diagram_element::id_t> active_participants_;
+    std::set<common::id_t> active_participants_;
 };
 
 } // namespace clanguml::sequence_diagram::model
diff --git a/src/sequence_diagram/model/message.cc b/src/sequence_diagram/model/message.cc
index 54c7235c..0ec92fec 100644
--- a/src/sequence_diagram/model/message.cc
+++ b/src/sequence_diagram/model/message.cc
@@ -20,8 +20,7 @@
 
 namespace clanguml::sequence_diagram::model {
 
-message::message(
-    common::model::message_t type, common::model::diagram_element::id_t from)
+message::message(common::model::message_t type, common::id_t from)
     : type_{type}
     , from_{from}
 {
@@ -39,13 +38,13 @@ void message::set_type(common::model::message_t t) { type_ = t; }
 
 common::model::message_t message::type() const { return type_; }
 
-void message::set_from(common::model::diagram_element::id_t f) { from_ = f; }
+void message::set_from(common::id_t f) { from_ = f; }
 
-common::model::diagram_element::id_t message::from() const { return from_; }
+common::id_t message::from() const { return from_; }
 
-void message::set_to(common::model::diagram_element::id_t t) { to_ = t; }
+void message::set_to(common::id_t t) { to_ = t; }
 
-common::model::diagram_element::id_t message::to() const { return to_; }
+common::id_t message::to() const { return to_; }
 
 void message::set_message_name(std::string name)
 {
diff --git a/src/sequence_diagram/model/message.h b/src/sequence_diagram/model/message.h
index 1ca7a145..c59563a4 100644
--- a/src/sequence_diagram/model/message.h
+++ b/src/sequence_diagram/model/message.h
@@ -38,8 +38,7 @@ public:
      * @param type Message type
      * @param from Id of originating sequence
      */
-    message(common::model::message_t type,
-        common::model::diagram_element::id_t from);
+    message(common::model::message_t type, common::id_t from);
 
     /**
      * @brief Equality operator
@@ -68,28 +67,28 @@ public:
      *
      * @param f Id of the participant from which message originates
      */
-    void set_from(common::model::diagram_element::id_t f);
+    void set_from(common::id_t f);
 
     /**
      * @brief Get the id of source of message
      *
      * @return
      */
-    common::model::diagram_element::id_t from() const;
+    common::id_t from() const;
 
     /**
      * @brief Set the id of the message target
      *
      * @param t Id of the message target
      */
-    void set_to(common::model::diagram_element::id_t t);
+    void set_to(common::id_t t);
 
     /**
      * @brief Get the id of the message target
      *
      * @return Id of the message target
      */
-    common::model::diagram_element::id_t to() const;
+    common::id_t to() const;
 
     /**
      * @brief Set the message label
@@ -163,9 +162,9 @@ public:
 private:
     common::model::message_t type_{common::model::message_t::kNone};
 
-    common::model::diagram_element::id_t from_{};
+    common::id_t from_{};
 
-    common::model::diagram_element::id_t to_{};
+    common::id_t to_{};
 
     common::model::message_scope_t scope_{
         common::model::message_scope_t::kNormal};
diff --git a/src/sequence_diagram/model/participant.cc b/src/sequence_diagram/model/participant.cc
index 6024fb75..6807d34e 100644
--- a/src/sequence_diagram/model/participant.cc
+++ b/src/sequence_diagram/model/participant.cc
@@ -189,7 +189,7 @@ void method::is_assignment(bool a) { is_assignment_ = a; }
 
 void method::set_method_name(const std::string &name) { method_name_ = name; }
 
-void method::set_class_id(diagram_element::id_t id) { class_id_ = id; }
+void method::set_class_id(common::id_t id) { class_id_ = id; }
 
 void method::set_class_full_name(const std::string &name)
 {
@@ -230,7 +230,7 @@ std::string method::message_name(message_render_mode mode) const
         fmt::join(parameters(), ","), is_const() ? " const" : "", style);
 }
 
-class_::diagram_element::id_t method::class_id() const { return class_id_; }
+common::id_t method::class_id() const { return class_id_; }
 
 std::string method::to_string() const
 {
diff --git a/src/sequence_diagram/model/participant.h b/src/sequence_diagram/model/participant.h
index c738068d..c26bd3c4 100644
--- a/src/sequence_diagram/model/participant.h
+++ b/src/sequence_diagram/model/participant.h
@@ -384,7 +384,7 @@ struct method : public function {
      *
      * @param id Id of the class to which this method belongs to
      */
-    void set_class_id(diagram_element::id_t id);
+    void set_class_id(common::id_t id);
 
     /**
      * @brief Set full qualified name of the class
@@ -414,7 +414,7 @@ struct method : public function {
      *
      * @return Class id
      */
-    diagram_element::id_t class_id() const;
+    common::id_t class_id() const;
 
     /**
      * @brief Create a string representation of the participant
@@ -466,7 +466,7 @@ struct method : public function {
     void is_assignment(bool a);
 
 private:
-    diagram_element::id_t class_id_{};
+    common::id_t class_id_{};
     std::string method_name_;
     std::string class_full_name_;
     bool is_constructor_{false};
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index 0a82c0c8..9f1e7a77 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -1454,7 +1454,7 @@ translation_unit_visitor::create_class_model(clang::CXXRecordDecl *cls)
         // Here we have 2 options, either:
         //  - the parent is a regular C++ class/struct
         //  - the parent is a class template declaration/specialization
-        std::optional<common::model::diagram_element::id_t> id_opt;
+        std::optional<common::id_t> id_opt;
         const auto *parent_record_decl =
             clang::dyn_cast<clang::RecordDecl>(parent);
 
@@ -1626,15 +1626,15 @@ bool translation_unit_visitor::process_template_parameters(
 }
 
 void translation_unit_visitor::set_unique_id(
-    int64_t local_id, common::model::diagram_element::id_t global_id)
+    int64_t local_id, common::id_t global_id)
 {
     LOG_TRACE("Setting local element mapping {} --> {}", local_id, global_id);
 
     local_ast_id_map_[local_id] = global_id;
 }
 
-std::optional<common::model::diagram_element::id_t>
-translation_unit_visitor::get_unique_id(int64_t local_id) const
+std::optional<common::id_t> translation_unit_visitor::get_unique_id(
+    int64_t local_id) const
 {
     if (local_ast_id_map_.find(local_id) == local_ast_id_map_.end())
         return {};
@@ -2228,7 +2228,7 @@ translation_unit_visitor::build_template_instantiation(
     std::string best_match_full_name{};
     auto full_template_name = template_instantiation.full_name(false);
     int best_match{};
-    common::model::diagram_element::id_t best_match_id{0};
+    common::id_t best_match_id{0};
 
     for (const auto &[id, c] : diagram().participants()) {
         const auto *participant_as_class =
@@ -2378,7 +2378,7 @@ void translation_unit_visitor::pop_message_to_diagram(
 
 void translation_unit_visitor::finalize()
 {
-    std::set<common::model::diagram_element::id_t> active_participants_unique;
+    std::set<common::id_t> active_participants_unique;
 
     // Change all active participants AST local ids to diagram global ids
     for (auto id : diagram().active_participants()) {
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.h b/src/sequence_diagram/visitor/translation_unit_visitor.h
index 1f0c688b..8369c871 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.h
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.h
@@ -204,8 +204,7 @@ public:
      * @return Optional reference to participant diagram element
      */
     template <typename T = model::participant>
-    common::optional_ref<T> get_participant(
-        const common::model::diagram_element::id_t id)
+    common::optional_ref<T> get_participant(const common::id_t id)
     {
         if (diagram().participants().find(id) == diagram().participants().end())
             return {};
@@ -222,8 +221,7 @@ public:
      * @return Optional reference to participant diagram element
      */
     template <typename T = model::participant>
-    common::optional_ref<T> get_participant(
-        common::model::diagram_element::id_t id) const
+    common::optional_ref<T> get_participant(common::id_t id) const
     {
         if (diagram().participants().find(id) == diagram().participants().end())
             return {};
@@ -241,8 +239,7 @@ public:
      * @param local_id Local AST element id
      * @param global_id Globa diagram element id
      */
-    void set_unique_id(
-        int64_t local_id, common::model::diagram_element::id_t global_id);
+    void set_unique_id(int64_t local_id, common::id_t global_id);
 
     /**
      * @brief Retrieve the global `clang-uml` entity id based on the Clang
@@ -250,8 +247,7 @@ public:
      * @param local_id AST local element id
      * @return Global diagram element id
      */
-    std::optional<common::model::diagram_element::id_t> get_unique_id(
-        int64_t local_id) const;
+    std::optional<common::id_t> get_unique_id(int64_t local_id) const;
 
     /**
      * @brief Finalize diagram model for this translation unit
@@ -531,7 +527,7 @@ private:
     std::map<clang::CXXConstructExpr *, model::message>
         construct_expr_message_map_;
 
-    std::map<common::model::diagram_element::id_t,
+    std::map<common::id_t,
         std::unique_ptr<clanguml::sequence_diagram::model::class_>>
         forward_declarations_;
 
@@ -539,7 +535,7 @@ private:
      * @todo Refactor to @ref ast_id_mapper
      */
     std::map</* local id from ->getID() */ int64_t,
-        /* global ID based on full name */ common::model::diagram_element::id_t>
+        /* global ID based on full name */ common::id_t>
         local_ast_id_map_;
 
     std::map<int64_t /* local anonymous struct id */,
diff --git a/src/util/query_driver_output_extractor.h b/src/util/query_driver_output_extractor.h
index dd5377c5..80f6ba3e 100644
--- a/src/util/query_driver_output_extractor.h
+++ b/src/util/query_driver_output_extractor.h
@@ -76,8 +76,8 @@ public:
     const std::vector<std::string> &system_include_paths() const;
 
 private:
-    const std::string command_;
-    const std::string language_;
+    std::string command_;
+    std::string language_;
     std::string target_;
     std::vector<std::string> system_include_paths_;
 };

From d8a49f4ac5ed06f1a64571007c587a659439c80c Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Tue, 2 Jan 2024 23:19:46 +0100
Subject: [PATCH 16/24] Updated copyright header

---
 src/class_diagram/generators/json/class_diagram_generator.cc  | 2 +-
 src/class_diagram/generators/json/class_diagram_generator.h   | 2 +-
 .../generators/mermaid/class_diagram_generator.cc             | 2 +-
 .../generators/mermaid/class_diagram_generator.h              | 2 +-
 .../generators/plantuml/class_diagram_generator.cc            | 2 +-
 .../generators/plantuml/class_diagram_generator.h             | 2 +-
 src/class_diagram/model/class.cc                              | 2 +-
 src/class_diagram/model/class.h                               | 2 +-
 src/class_diagram/model/class_element.cc                      | 2 +-
 src/class_diagram/model/class_element.h                       | 2 +-
 src/class_diagram/model/class_member.cc                       | 2 +-
 src/class_diagram/model/class_member.h                        | 2 +-
 src/class_diagram/model/class_method.cc                       | 2 +-
 src/class_diagram/model/class_method.h                        | 2 +-
 src/class_diagram/model/class_parent.cc                       | 2 +-
 src/class_diagram/model/class_parent.h                        | 2 +-
 src/class_diagram/model/concept.cc                            | 2 +-
 src/class_diagram/model/concept.h                             | 2 +-
 src/class_diagram/model/diagram.cc                            | 2 +-
 src/class_diagram/model/diagram.h                             | 2 +-
 src/class_diagram/model/enum.cc                               | 2 +-
 src/class_diagram/model/enum.h                                | 2 +-
 src/class_diagram/model/method_parameter.cc                   | 2 +-
 src/class_diagram/model/method_parameter.h                    | 2 +-
 src/class_diagram/visitor/template_builder.cc                 | 2 +-
 src/class_diagram/visitor/template_builder.h                  | 2 +-
 src/class_diagram/visitor/translation_unit_visitor.cc         | 2 +-
 src/class_diagram/visitor/translation_unit_visitor.h          | 2 +-
 src/cli/cli_handler.cc                                        | 4 ++--
 src/cli/cli_handler.h                                         | 2 +-
 src/common/clang_utils.cc                                     | 2 +-
 src/common/clang_utils.h                                      | 2 +-
 src/common/compilation_database.cc                            | 2 +-
 src/common/compilation_database.h                             | 2 +-
 src/common/generators/generator.h                             | 2 +-
 src/common/generators/generators.cc                           | 2 +-
 src/common/generators/generators.h                            | 2 +-
 src/common/generators/json/generator.cc                       | 2 +-
 src/common/generators/json/generator.h                        | 2 +-
 src/common/generators/mermaid/generator.cc                    | 2 +-
 src/common/generators/mermaid/generator.h                     | 2 +-
 src/common/generators/nested_element_stack.h                  | 2 +-
 src/common/generators/plantuml/generator.cc                   | 2 +-
 src/common/generators/plantuml/generator.h                    | 2 +-
 src/common/generators/progress_indicator.cc                   | 2 +-
 src/common/generators/progress_indicator.h                    | 2 +-
 src/common/model/decorated_element.cc                         | 2 +-
 src/common/model/decorated_element.h                          | 2 +-
 src/common/model/diagram.cc                                   | 2 +-
 src/common/model/diagram.h                                    | 2 +-
 src/common/model/diagram_element.cc                           | 2 +-
 src/common/model/diagram_element.h                            | 2 +-
 src/common/model/diagram_filter.cc                            | 2 +-
 src/common/model/diagram_filter.h                             | 2 +-
 src/common/model/element.cc                                   | 2 +-
 src/common/model/element.h                                    | 2 +-
 src/common/model/element_view.h                               | 2 +-
 src/common/model/enums.cc                                     | 2 +-
 src/common/model/enums.h                                      | 2 +-
 src/common/model/namespace.cc                                 | 2 +-
 src/common/model/namespace.h                                  | 2 +-
 src/common/model/nested_trait.h                               | 2 +-
 src/common/model/package.cc                                   | 2 +-
 src/common/model/package.h                                    | 2 +-
 src/common/model/path.cc                                      | 2 +-
 src/common/model/path.h                                       | 2 +-
 src/common/model/relationship.cc                              | 2 +-
 src/common/model/relationship.h                               | 2 +-
 src/common/model/source_file.cc                               | 2 +-
 src/common/model/source_file.h                                | 2 +-
 src/common/model/source_location.cc                           | 2 +-
 src/common/model/source_location.h                            | 2 +-
 src/common/model/stylable_element.cc                          | 2 +-
 src/common/model/stylable_element.h                           | 2 +-
 src/common/model/template_parameter.cc                        | 2 +-
 src/common/model/template_parameter.h                         | 2 +-
 src/common/model/template_trait.cc                            | 2 +-
 src/common/model/template_trait.h                             | 2 +-
 src/common/model/tvl.h                                        | 2 +-
 src/common/types.cc                                           | 2 +-
 src/common/types.h                                            | 2 +-
 src/common/visitor/ast_id_mapper.cc                           | 2 +-
 src/common/visitor/ast_id_mapper.h                            | 2 +-
 src/common/visitor/comment/clang_visitor.cc                   | 2 +-
 src/common/visitor/comment/clang_visitor.h                    | 2 +-
 src/common/visitor/comment/comment_visitor.cc                 | 2 +-
 src/common/visitor/comment/comment_visitor.h                  | 2 +-
 src/common/visitor/comment/plain_visitor.cc                   | 2 +-
 src/common/visitor/comment/plain_visitor.h                    | 2 +-
 src/common/visitor/translation_unit_visitor.cc                | 2 +-
 src/common/visitor/translation_unit_visitor.h                 | 2 +-
 src/config/config.cc                                          | 2 +-
 src/config/config.h                                           | 2 +-
 src/config/diagram_templates.cc                               | 2 +-
 src/config/diagram_templates.h                                | 2 +-
 src/config/option.h                                           | 2 +-
 src/config/schema.h                                           | 2 +-
 src/config/yaml_decoders.cc                                   | 2 +-
 src/config/yaml_emitters.cc                                   | 2 +-
 src/decorators/decorators.cc                                  | 2 +-
 src/decorators/decorators.h                                   | 2 +-
 src/docs/architecture.cc                                      | 2 +-
 src/docs/architecture.h                                       | 2 +-
 .../generators/json/include_diagram_generator.cc              | 2 +-
 .../generators/json/include_diagram_generator.h               | 2 +-
 .../generators/mermaid/include_diagram_generator.cc           | 2 +-
 .../generators/mermaid/include_diagram_generator.h            | 2 +-
 .../generators/plantuml/include_diagram_generator.cc          | 2 +-
 .../generators/plantuml/include_diagram_generator.h           | 2 +-
 src/include_diagram/model/diagram.cc                          | 2 +-
 src/include_diagram/model/diagram.h                           | 2 +-
 src/include_diagram/visitor/translation_unit_visitor.cc       | 2 +-
 src/include_diagram/visitor/translation_unit_visitor.h        | 2 +-
 src/main.cc                                                   | 2 +-
 .../generators/json/package_diagram_generator.cc              | 2 +-
 .../generators/json/package_diagram_generator.h               | 2 +-
 .../generators/mermaid/package_diagram_generator.cc           | 2 +-
 .../generators/mermaid/package_diagram_generator.h            | 2 +-
 .../generators/plantuml/package_diagram_generator.cc          | 2 +-
 .../generators/plantuml/package_diagram_generator.h           | 2 +-
 src/package_diagram/model/diagram.cc                          | 2 +-
 src/package_diagram/model/diagram.h                           | 2 +-
 src/package_diagram/visitor/translation_unit_visitor.cc       | 2 +-
 src/package_diagram/visitor/translation_unit_visitor.h        | 2 +-
 .../generators/json/sequence_diagram_generator.cc             | 2 +-
 .../generators/json/sequence_diagram_generator.h              | 2 +-
 .../generators/mermaid/sequence_diagram_generator.cc          | 2 +-
 .../generators/mermaid/sequence_diagram_generator.h           | 2 +-
 .../generators/plantuml/sequence_diagram_generator.cc         | 2 +-
 .../generators/plantuml/sequence_diagram_generator.h          | 2 +-
 src/sequence_diagram/model/activity.cc                        | 2 +-
 src/sequence_diagram/model/activity.h                         | 2 +-
 src/sequence_diagram/model/diagram.cc                         | 2 +-
 src/sequence_diagram/model/diagram.h                          | 2 +-
 src/sequence_diagram/model/message.cc                         | 2 +-
 src/sequence_diagram/model/message.h                          | 2 +-
 src/sequence_diagram/model/participant.cc                     | 2 +-
 src/sequence_diagram/model/participant.h                      | 2 +-
 src/sequence_diagram/visitor/call_expression_context.cc       | 2 +-
 src/sequence_diagram/visitor/call_expression_context.h        | 2 +-
 src/sequence_diagram/visitor/translation_unit_visitor.cc      | 2 +-
 src/sequence_diagram/visitor/translation_unit_visitor.h       | 2 +-
 src/util/error.h                                              | 2 +-
 src/util/query_driver_output_extractor.cc                     | 2 +-
 src/util/query_driver_output_extractor.h                      | 2 +-
 src/util/thread_pool_executor.cc                              | 2 +-
 src/util/thread_pool_executor.h                               | 2 +-
 src/util/util.cc                                              | 2 +-
 src/util/util.h                                               | 2 +-
 tests/t00002/test_case.h                                      | 2 +-
 tests/t00003/test_case.h                                      | 2 +-
 tests/t00004/test_case.h                                      | 2 +-
 tests/t00005/test_case.h                                      | 2 +-
 tests/t00006/test_case.h                                      | 2 +-
 tests/t00007/test_case.h                                      | 2 +-
 tests/t00008/test_case.h                                      | 2 +-
 tests/t00009/test_case.h                                      | 2 +-
 tests/t00010/test_case.h                                      | 2 +-
 tests/t00011/test_case.h                                      | 2 +-
 tests/t00012/test_case.h                                      | 2 +-
 tests/t00013/test_case.h                                      | 2 +-
 tests/t00014/test_case.h                                      | 2 +-
 tests/t00015/test_case.h                                      | 2 +-
 tests/t00016/test_case.h                                      | 2 +-
 tests/t00017/test_case.h                                      | 2 +-
 tests/t00018/test_case.h                                      | 2 +-
 tests/t00019/test_case.h                                      | 2 +-
 tests/t00020/test_case.h                                      | 2 +-
 tests/t00021/test_case.h                                      | 2 +-
 tests/t00022/test_case.h                                      | 2 +-
 tests/t00023/test_case.h                                      | 2 +-
 tests/t00024/test_case.h                                      | 2 +-
 tests/t00025/test_case.h                                      | 2 +-
 tests/t00026/test_case.h                                      | 2 +-
 tests/t00027/test_case.h                                      | 2 +-
 tests/t00028/test_case.h                                      | 2 +-
 tests/t00029/test_case.h                                      | 2 +-
 tests/t00030/test_case.h                                      | 2 +-
 tests/t00031/test_case.h                                      | 2 +-
 tests/t00032/test_case.h                                      | 2 +-
 tests/t00033/test_case.h                                      | 2 +-
 tests/t00034/test_case.h                                      | 2 +-
 tests/t00035/test_case.h                                      | 2 +-
 tests/t00036/test_case.h                                      | 2 +-
 tests/t00037/test_case.h                                      | 2 +-
 tests/t00038/test_case.h                                      | 2 +-
 tests/t00039/test_case.h                                      | 2 +-
 tests/t00040/test_case.h                                      | 2 +-
 tests/t00041/test_case.h                                      | 2 +-
 tests/t00042/test_case.h                                      | 2 +-
 tests/t00043/test_case.h                                      | 2 +-
 tests/t00044/test_case.h                                      | 2 +-
 tests/t00045/test_case.h                                      | 2 +-
 tests/t00046/test_case.h                                      | 2 +-
 tests/t00047/test_case.h                                      | 2 +-
 tests/t00048/test_case.h                                      | 2 +-
 tests/t00049/test_case.h                                      | 2 +-
 tests/t00050/test_case.h                                      | 2 +-
 tests/t00051/test_case.h                                      | 2 +-
 tests/t00052/test_case.h                                      | 2 +-
 tests/t00053/test_case.h                                      | 2 +-
 tests/t00054/test_case.h                                      | 2 +-
 tests/t00055/test_case.h                                      | 2 +-
 tests/t00056/test_case.h                                      | 2 +-
 tests/t00057/test_case.h                                      | 2 +-
 tests/t00058/test_case.h                                      | 2 +-
 tests/t00059/test_case.h                                      | 2 +-
 tests/t00060/test_case.h                                      | 2 +-
 tests/t00061/test_case.h                                      | 2 +-
 tests/t00062/test_case.h                                      | 2 +-
 tests/t00063/test_case.h                                      | 2 +-
 tests/t00064/test_case.h                                      | 2 +-
 tests/t00065/test_case.h                                      | 2 +-
 tests/t00066/test_case.h                                      | 2 +-
 tests/t00067/test_case.h                                      | 2 +-
 tests/t00068/test_case.h                                      | 2 +-
 tests/t00069/test_case.h                                      | 2 +-
 tests/t00070/test_case.h                                      | 2 +-
 tests/t00071/test_case.h                                      | 2 +-
 tests/t00072/test_case.h                                      | 2 +-
 tests/t20001/test_case.h                                      | 2 +-
 tests/t20002/test_case.h                                      | 2 +-
 tests/t20003/test_case.h                                      | 2 +-
 tests/t20004/test_case.h                                      | 2 +-
 tests/t20005/test_case.h                                      | 2 +-
 tests/t20006/test_case.h                                      | 2 +-
 tests/t20007/test_case.h                                      | 2 +-
 tests/t20008/test_case.h                                      | 2 +-
 tests/t20009/test_case.h                                      | 2 +-
 tests/t20010/test_case.h                                      | 2 +-
 tests/t20011/test_case.h                                      | 2 +-
 tests/t20012/test_case.h                                      | 2 +-
 tests/t20013/test_case.h                                      | 2 +-
 tests/t20014/test_case.h                                      | 2 +-
 tests/t20015/test_case.h                                      | 2 +-
 tests/t20016/test_case.h                                      | 2 +-
 tests/t20017/test_case.h                                      | 2 +-
 tests/t20018/test_case.h                                      | 2 +-
 tests/t20019/test_case.h                                      | 2 +-
 tests/t20020/test_case.h                                      | 2 +-
 tests/t20021/test_case.h                                      | 2 +-
 tests/t20022/test_case.h                                      | 2 +-
 tests/t20023/test_case.h                                      | 2 +-
 tests/t20024/test_case.h                                      | 2 +-
 tests/t20025/test_case.h                                      | 2 +-
 tests/t20026/test_case.h                                      | 2 +-
 tests/t20027/test_case.h                                      | 2 +-
 tests/t20028/test_case.h                                      | 2 +-
 tests/t20029/test_case.h                                      | 2 +-
 tests/t20030/test_case.h                                      | 2 +-
 tests/t20031/test_case.h                                      | 2 +-
 tests/t20032/test_case.h                                      | 2 +-
 tests/t20033/test_case.h                                      | 2 +-
 tests/t20034/test_case.h                                      | 2 +-
 tests/t20035/test_case.h                                      | 2 +-
 tests/t20036/test_case.h                                      | 2 +-
 tests/t20037/test_case.h                                      | 2 +-
 tests/t20038/test_case.h                                      | 2 +-
 tests/t30001/test_case.h                                      | 2 +-
 tests/t30002/test_case.h                                      | 2 +-
 tests/t30003/test_case.h                                      | 2 +-
 tests/t30004/test_case.h                                      | 2 +-
 tests/t30005/test_case.h                                      | 2 +-
 tests/t30006/test_case.h                                      | 2 +-
 tests/t30007/test_case.h                                      | 2 +-
 tests/t30008/test_case.h                                      | 2 +-
 tests/t30009/test_case.h                                      | 2 +-
 tests/t30010/test_case.h                                      | 2 +-
 tests/t30011/test_case.h                                      | 2 +-
 tests/t30012/test_case.h                                      | 2 +-
 tests/t30013/test_case.h                                      | 2 +-
 tests/t30014/test_case.h                                      | 2 +-
 tests/t30015/test_case.h                                      | 2 +-
 tests/t40001/test_case.h                                      | 2 +-
 tests/t40002/test_case.h                                      | 2 +-
 tests/t40003/test_case.h                                      | 2 +-
 tests/t90000/test_case.h                                      | 2 +-
 tests/test_cases.cc                                           | 2 +-
 tests/test_cases.h                                            | 2 +-
 tests/test_cli_handler.cc                                     | 2 +-
 tests/test_compilation_database.cc                            | 2 +-
 tests/test_config.cc                                          | 2 +-
 tests/test_decorator_parser.cc                                | 2 +-
 tests/test_filters.cc                                         | 2 +-
 tests/test_model.cc                                           | 2 +-
 tests/test_query_driver_output_extractor.cc                   | 2 +-
 tests/test_thread_pool_executor.cc                            | 2 +-
 tests/test_util.cc                                            | 2 +-
 util/templates/test_cases/test_case.h                         | 2 +-
 289 files changed, 290 insertions(+), 290 deletions(-)

diff --git a/src/class_diagram/generators/json/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc
index 1932d4f7..3fe3b00b 100644
--- a/src/class_diagram/generators/json/class_diagram_generator.cc
+++ b/src/class_diagram/generators/json/class_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file rc/class_diagram/generators/json/class_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/generators/json/class_diagram_generator.h b/src/class_diagram/generators/json/class_diagram_generator.h
index b1d31d16..d90ba73f 100644
--- a/src/class_diagram/generators/json/class_diagram_generator.h
+++ b/src/class_diagram/generators/json/class_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/generators/json/class_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/generators/mermaid/class_diagram_generator.cc b/src/class_diagram/generators/mermaid/class_diagram_generator.cc
index b14b4483..eea063ef 100644
--- a/src/class_diagram/generators/mermaid/class_diagram_generator.cc
+++ b/src/class_diagram/generators/mermaid/class_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/generators/mermaid/class_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/generators/mermaid/class_diagram_generator.h b/src/class_diagram/generators/mermaid/class_diagram_generator.h
index 0ec125af..dbde7848 100644
--- a/src/class_diagram/generators/mermaid/class_diagram_generator.h
+++ b/src/class_diagram/generators/mermaid/class_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/generators/mermaid/class_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/generators/plantuml/class_diagram_generator.cc b/src/class_diagram/generators/plantuml/class_diagram_generator.cc
index 231ac18b..451eb552 100644
--- a/src/class_diagram/generators/plantuml/class_diagram_generator.cc
+++ b/src/class_diagram/generators/plantuml/class_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/generators/plantuml/class_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/generators/plantuml/class_diagram_generator.h b/src/class_diagram/generators/plantuml/class_diagram_generator.h
index 7e303dc2..0d19eb2e 100644
--- a/src/class_diagram/generators/plantuml/class_diagram_generator.h
+++ b/src/class_diagram/generators/plantuml/class_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/generators/plantuml/class_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class.cc b/src/class_diagram/model/class.cc
index 90d1025a..8105ee19 100644
--- a/src/class_diagram/model/class.cc
+++ b/src/class_diagram/model/class.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class.h b/src/class_diagram/model/class.h
index dc2aa02e..c3484d43 100644
--- a/src/class_diagram/model/class.h
+++ b/src/class_diagram/model/class.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class_element.cc b/src/class_diagram/model/class_element.cc
index 3bdd1527..3a638589 100644
--- a/src/class_diagram/model/class_element.cc
+++ b/src/class_diagram/model/class_element.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class_element.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class_element.h b/src/class_diagram/model/class_element.h
index ec7c50eb..1bc4fa82 100644
--- a/src/class_diagram/model/class_element.h
+++ b/src/class_diagram/model/class_element.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class_element.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class_member.cc b/src/class_diagram/model/class_member.cc
index e857e527..8d240cfb 100644
--- a/src/class_diagram/model/class_member.cc
+++ b/src/class_diagram/model/class_member.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class_member.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class_member.h b/src/class_diagram/model/class_member.h
index f68fdeb0..c6184b6d 100644
--- a/src/class_diagram/model/class_member.h
+++ b/src/class_diagram/model/class_member.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class_member.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class_method.cc b/src/class_diagram/model/class_method.cc
index 20f8f72d..9d2052ea 100644
--- a/src/class_diagram/model/class_method.cc
+++ b/src/class_diagram/model/class_method.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class_method.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class_method.h b/src/class_diagram/model/class_method.h
index 0e188331..4cf4344b 100644
--- a/src/class_diagram/model/class_method.h
+++ b/src/class_diagram/model/class_method.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class_method.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class_parent.cc b/src/class_diagram/model/class_parent.cc
index f12e84fe..35588082 100644
--- a/src/class_diagram/model/class_parent.cc
+++ b/src/class_diagram/model/class_parent.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class_parent.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/class_parent.h b/src/class_diagram/model/class_parent.h
index cf64fb07..1e0521fe 100644
--- a/src/class_diagram/model/class_parent.h
+++ b/src/class_diagram/model/class_parent.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/class_parent.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/concept.cc b/src/class_diagram/model/concept.cc
index a0d4e38b..9bd3702e 100644
--- a/src/class_diagram/model/concept.cc
+++ b/src/class_diagram/model/concept.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/concept.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/concept.h b/src/class_diagram/model/concept.h
index cde00db7..f40b1c1b 100644
--- a/src/class_diagram/model/concept.h
+++ b/src/class_diagram/model/concept.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/concept.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/diagram.cc b/src/class_diagram/model/diagram.cc
index 58045da4..50aa49c6 100644
--- a/src/class_diagram/model/diagram.cc
+++ b/src/class_diagram/model/diagram.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/diagram.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/diagram.h b/src/class_diagram/model/diagram.h
index fb3f1f21..835035a4 100644
--- a/src/class_diagram/model/diagram.h
+++ b/src/class_diagram/model/diagram.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/diagram.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/enum.cc b/src/class_diagram/model/enum.cc
index 878719b6..cff1d99c 100644
--- a/src/class_diagram/model/enum.cc
+++ b/src/class_diagram/model/enum.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/enum.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/enum.h b/src/class_diagram/model/enum.h
index e69d1e2d..9d0f1bec 100644
--- a/src/class_diagram/model/enum.h
+++ b/src/class_diagram/model/enum.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/enum.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/method_parameter.cc b/src/class_diagram/model/method_parameter.cc
index 13451a5c..aae00c96 100644
--- a/src/class_diagram/model/method_parameter.cc
+++ b/src/class_diagram/model/method_parameter.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/method_parameter.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/model/method_parameter.h b/src/class_diagram/model/method_parameter.h
index f6db2529..253a3f8d 100644
--- a/src/class_diagram/model/method_parameter.h
+++ b/src/class_diagram/model/method_parameter.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/model/method_parameter.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/visitor/template_builder.cc b/src/class_diagram/visitor/template_builder.cc
index 51045b28..ae73733f 100644
--- a/src/class_diagram/visitor/template_builder.cc
+++ b/src/class_diagram/visitor/template_builder.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/visitor/template_builder.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/visitor/template_builder.h b/src/class_diagram/visitor/template_builder.h
index 5448e01a..1a2b58ff 100644
--- a/src/class_diagram/visitor/template_builder.h
+++ b/src/class_diagram/visitor/template_builder.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/visitor/template_builder.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index eb169f9e..cac07180 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/visitor/translation_unit_visitor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/class_diagram/visitor/translation_unit_visitor.h b/src/class_diagram/visitor/translation_unit_visitor.h
index 59be4f94..30e7ea65 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.h
+++ b/src/class_diagram/visitor/translation_unit_visitor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/class_diagram/visitor/translation_unit_visitor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/cli/cli_handler.cc b/src/cli/cli_handler.cc
index 2e671e39..7bc94d21 100644
--- a/src/cli/cli_handler.cc
+++ b/src/cli/cli_handler.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/options/cli_handler.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -385,7 +385,7 @@ runtime_config cli_handler::get_runtime_config() const
 cli_flow_t cli_handler::print_version()
 {
     ostr_ << "clang-uml " << clanguml::version::CLANG_UML_VERSION << '\n';
-    ostr_ << "Copyright (C) 2021-2023 Bartek Kryza <bkryza@gmail.com>" << '\n';
+    ostr_ << "Copyright (C) 2021-2024 Bartek Kryza <bkryza@gmail.com>" << '\n';
     ostr_ << util::get_os_name() << '\n';
     ostr_ << "Built against LLVM/Clang libraries version: "
           << LLVM_VERSION_STRING << '\n';
diff --git a/src/cli/cli_handler.h b/src/cli/cli_handler.h
index 879c13cb..2aec25a7 100644
--- a/src/cli/cli_handler.h
+++ b/src/cli/cli_handler.h
@@ -1,7 +1,7 @@
 /**
  * @file src/options/cli_handler.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/clang_utils.cc b/src/common/clang_utils.cc
index 44e4e3f7..0c4d8b57 100644
--- a/src/common/clang_utils.cc
+++ b/src/common/clang_utils.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/clang_utils.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/clang_utils.h b/src/common/clang_utils.h
index f94c7b4c..2f1ef2ab 100644
--- a/src/common/clang_utils.h
+++ b/src/common/clang_utils.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/clang_utils.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/compilation_database.cc b/src/common/compilation_database.cc
index 0e24819e..dc9fe9ec 100644
--- a/src/common/compilation_database.cc
+++ b/src/common/compilation_database.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/compilation_database.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/compilation_database.h b/src/common/compilation_database.h
index 58b8c670..e1532b87 100644
--- a/src/common/compilation_database.h
+++ b/src/common/compilation_database.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/compilation_database.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/generator.h b/src/common/generators/generator.h
index 116d2770..27b548e1 100644
--- a/src/common/generators/generator.h
+++ b/src/common/generators/generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/generators.cc b/src/common/generators/generators.cc
index b6ecd648..2a3f1e5b 100644
--- a/src/common/generators/generators.cc
+++ b/src/common/generators/generators.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/generators.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/generators.h b/src/common/generators/generators.h
index 79c694c7..d39dd83d 100644
--- a/src/common/generators/generators.h
+++ b/src/common/generators/generators.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/generators.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/json/generator.cc b/src/common/generators/json/generator.cc
index 5f9b6c40..e1fa27c5 100644
--- a/src/common/generators/json/generator.cc
+++ b/src/common/generators/json/generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/json/generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/json/generator.h b/src/common/generators/json/generator.h
index 33c71060..d76037a0 100644
--- a/src/common/generators/json/generator.h
+++ b/src/common/generators/json/generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/json/generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/mermaid/generator.cc b/src/common/generators/mermaid/generator.cc
index 355995d4..d9b3a9c0 100644
--- a/src/common/generators/mermaid/generator.cc
+++ b/src/common/generators/mermaid/generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/mermaid/generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/mermaid/generator.h b/src/common/generators/mermaid/generator.h
index 0ef19f3b..93bedffc 100644
--- a/src/common/generators/mermaid/generator.h
+++ b/src/common/generators/mermaid/generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/mermaid/generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/nested_element_stack.h b/src/common/generators/nested_element_stack.h
index bb6679ea..58717530 100644
--- a/src/common/generators/nested_element_stack.h
+++ b/src/common/generators/nested_element_stack.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/nested_element_stack.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/plantuml/generator.cc b/src/common/generators/plantuml/generator.cc
index 2291dafc..c05932d9 100644
--- a/src/common/generators/plantuml/generator.cc
+++ b/src/common/generators/plantuml/generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/plantuml/generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/plantuml/generator.h b/src/common/generators/plantuml/generator.h
index dbc560ac..4a2446ee 100644
--- a/src/common/generators/plantuml/generator.h
+++ b/src/common/generators/plantuml/generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/plantuml/generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/progress_indicator.cc b/src/common/generators/progress_indicator.cc
index 6dbf48f9..5db13a71 100644
--- a/src/common/generators/progress_indicator.cc
+++ b/src/common/generators/progress_indicator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/progress_indicator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/generators/progress_indicator.h b/src/common/generators/progress_indicator.h
index 6bfc655d..0c5a7279 100644
--- a/src/common/generators/progress_indicator.h
+++ b/src/common/generators/progress_indicator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/generators/progress_indicator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/decorated_element.cc b/src/common/model/decorated_element.cc
index 39951b90..fae18bc7 100644
--- a/src/common/model/decorated_element.cc
+++ b/src/common/model/decorated_element.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/decorated_element.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/decorated_element.h b/src/common/model/decorated_element.h
index 57409872..94805be3 100644
--- a/src/common/model/decorated_element.h
+++ b/src/common/model/decorated_element.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/decorated_element.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/diagram.cc b/src/common/model/diagram.cc
index 22f8e290..b551792d 100644
--- a/src/common/model/diagram.cc
+++ b/src/common/model/diagram.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/diagram.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/diagram.h b/src/common/model/diagram.h
index 44015f93..28f40f47 100644
--- a/src/common/model/diagram.h
+++ b/src/common/model/diagram.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/diagram.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/diagram_element.cc b/src/common/model/diagram_element.cc
index 96f603da..8e307fc0 100644
--- a/src/common/model/diagram_element.cc
+++ b/src/common/model/diagram_element.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/diagram_element.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/diagram_element.h b/src/common/model/diagram_element.h
index f3bb07ef..8aa6264a 100644
--- a/src/common/model/diagram_element.h
+++ b/src/common/model/diagram_element.h
@@ -1,7 +1,7 @@
 /**
  * src/common/model/diagram_element.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc
index 2104a2ed..a784ed56 100644
--- a/src/common/model/diagram_filter.cc
+++ b/src/common/model/diagram_filter.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/diagram_filter.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/diagram_filter.h b/src/common/model/diagram_filter.h
index 416411c6..81cd25b6 100644
--- a/src/common/model/diagram_filter.h
+++ b/src/common/model/diagram_filter.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/diagram_filter.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/element.cc b/src/common/model/element.cc
index ceb90e05..224ed420 100644
--- a/src/common/model/element.cc
+++ b/src/common/model/element.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/element.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/element.h b/src/common/model/element.h
index d7c4876c..34f1915c 100644
--- a/src/common/model/element.h
+++ b/src/common/model/element.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/element.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/element_view.h b/src/common/model/element_view.h
index 0c2a6b5a..b7a25c79 100644
--- a/src/common/model/element_view.h
+++ b/src/common/model/element_view.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/element_view.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/enums.cc b/src/common/model/enums.cc
index 8b553413..98e170a6 100644
--- a/src/common/model/enums.cc
+++ b/src/common/model/enums.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/enums.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/enums.h b/src/common/model/enums.h
index 03d5236e..835b8222 100644
--- a/src/common/model/enums.h
+++ b/src/common/model/enums.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/enums.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/namespace.cc b/src/common/model/namespace.cc
index dd9edf5c..ae89bc81 100644
--- a/src/common/model/namespace.cc
+++ b/src/common/model/namespace.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/namespace.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/namespace.h b/src/common/model/namespace.h
index ae691d6d..32726553 100644
--- a/src/common/model/namespace.h
+++ b/src/common/model/namespace.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/namespace.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/nested_trait.h b/src/common/model/nested_trait.h
index a7050da3..195cc02d 100644
--- a/src/common/model/nested_trait.h
+++ b/src/common/model/nested_trait.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/nested_trait.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/package.cc b/src/common/model/package.cc
index 6cdc2b40..244f2882 100644
--- a/src/common/model/package.cc
+++ b/src/common/model/package.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/package.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/package.h b/src/common/model/package.h
index 3ed6f46c..353b5cf1 100644
--- a/src/common/model/package.h
+++ b/src/common/model/package.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/package.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/path.cc b/src/common/model/path.cc
index 6738d3e4..e294c4ea 100644
--- a/src/common/model/path.cc
+++ b/src/common/model/path.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/path.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/path.h b/src/common/model/path.h
index 090550cb..b81e04a2 100644
--- a/src/common/model/path.h
+++ b/src/common/model/path.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/path.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/relationship.cc b/src/common/model/relationship.cc
index 05a2800b..00800c5d 100644
--- a/src/common/model/relationship.cc
+++ b/src/common/model/relationship.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/relationship.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/relationship.h b/src/common/model/relationship.h
index 61516487..db282908 100644
--- a/src/common/model/relationship.h
+++ b/src/common/model/relationship.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/relationship.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/source_file.cc b/src/common/model/source_file.cc
index 3a9b4d1e..292dd7e0 100644
--- a/src/common/model/source_file.cc
+++ b/src/common/model/source_file.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/source_file.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/source_file.h b/src/common/model/source_file.h
index 6b8920c8..b3a88a65 100644
--- a/src/common/model/source_file.h
+++ b/src/common/model/source_file.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/source_file.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/source_location.cc b/src/common/model/source_location.cc
index 89358a08..56b8fd37 100644
--- a/src/common/model/source_location.cc
+++ b/src/common/model/source_location.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/source_location.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/source_location.h b/src/common/model/source_location.h
index 2dc98af4..25f2ba29 100644
--- a/src/common/model/source_location.h
+++ b/src/common/model/source_location.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/source_location.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/stylable_element.cc b/src/common/model/stylable_element.cc
index d9da4c39..ea61d0ba 100644
--- a/src/common/model/stylable_element.cc
+++ b/src/common/model/stylable_element.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/stylable_element.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/stylable_element.h b/src/common/model/stylable_element.h
index 2a1c429d..201da800 100644
--- a/src/common/model/stylable_element.h
+++ b/src/common/model/stylable_element.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/stylable_element.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/template_parameter.cc b/src/common/model/template_parameter.cc
index 90fdaa75..b31270d9 100644
--- a/src/common/model/template_parameter.cc
+++ b/src/common/model/template_parameter.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/template_parameter.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/template_parameter.h b/src/common/model/template_parameter.h
index 6334188a..c9d0aecc 100644
--- a/src/common/model/template_parameter.h
+++ b/src/common/model/template_parameter.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/template_parameter.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/template_trait.cc b/src/common/model/template_trait.cc
index 139d804a..d80830b0 100644
--- a/src/common/model/template_trait.cc
+++ b/src/common/model/template_trait.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/template_trait.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/template_trait.h b/src/common/model/template_trait.h
index 24309302..535d3a7f 100644
--- a/src/common/model/template_trait.h
+++ b/src/common/model/template_trait.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/template_trait.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/model/tvl.h b/src/common/model/tvl.h
index 9c9bc5e5..b24d51e6 100644
--- a/src/common/model/tvl.h
+++ b/src/common/model/tvl.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/model/tvl.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/types.cc b/src/common/types.cc
index 97719ffe..2fe79d12 100644
--- a/src/common/types.cc
+++ b/src/common/types.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/types.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/types.h b/src/common/types.h
index 0239824b..7da7ea74 100644
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/types.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/ast_id_mapper.cc b/src/common/visitor/ast_id_mapper.cc
index ba985306..b9d22787 100644
--- a/src/common/visitor/ast_id_mapper.cc
+++ b/src/common/visitor/ast_id_mapper.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/ast_id_mapper.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/ast_id_mapper.h b/src/common/visitor/ast_id_mapper.h
index cb5e1374..87a7ef42 100644
--- a/src/common/visitor/ast_id_mapper.h
+++ b/src/common/visitor/ast_id_mapper.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/ast_id_mapper.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/comment/clang_visitor.cc b/src/common/visitor/comment/clang_visitor.cc
index cff24773..1c80b09e 100644
--- a/src/common/visitor/comment/clang_visitor.cc
+++ b/src/common/visitor/comment/clang_visitor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/comment/clang_visitor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/comment/clang_visitor.h b/src/common/visitor/comment/clang_visitor.h
index 6424802f..d2a0c402 100644
--- a/src/common/visitor/comment/clang_visitor.h
+++ b/src/common/visitor/comment/clang_visitor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/comment/clang_visitor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/comment/comment_visitor.cc b/src/common/visitor/comment/comment_visitor.cc
index 3db2f023..129367dc 100644
--- a/src/common/visitor/comment/comment_visitor.cc
+++ b/src/common/visitor/comment/comment_visitor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/comment/comment_visitor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/comment/comment_visitor.h b/src/common/visitor/comment/comment_visitor.h
index 9f331db8..f2a9e51c 100644
--- a/src/common/visitor/comment/comment_visitor.h
+++ b/src/common/visitor/comment/comment_visitor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/comment/comment_visitor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/comment/plain_visitor.cc b/src/common/visitor/comment/plain_visitor.cc
index 834951ad..b348e22f 100644
--- a/src/common/visitor/comment/plain_visitor.cc
+++ b/src/common/visitor/comment/plain_visitor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/comment/plain_visitor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/comment/plain_visitor.h b/src/common/visitor/comment/plain_visitor.h
index 54b2c0a5..1cb90c85 100644
--- a/src/common/visitor/comment/plain_visitor.h
+++ b/src/common/visitor/comment/plain_visitor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/comment/plain_visitor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/translation_unit_visitor.cc b/src/common/visitor/translation_unit_visitor.cc
index 6bde7023..40441b71 100644
--- a/src/common/visitor/translation_unit_visitor.cc
+++ b/src/common/visitor/translation_unit_visitor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/translation_unit_visitor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/common/visitor/translation_unit_visitor.h b/src/common/visitor/translation_unit_visitor.h
index b8e834f2..6dfbc762 100644
--- a/src/common/visitor/translation_unit_visitor.h
+++ b/src/common/visitor/translation_unit_visitor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/common/visitor/translation_unit_visitor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/config/config.cc b/src/config/config.cc
index 1a663a66..d875908c 100644
--- a/src/config/config.cc
+++ b/src/config/config.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/config/config.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/config/config.h b/src/config/config.h
index 32c13194..0db27a25 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -1,7 +1,7 @@
 /**
  * @file src/config/config.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/config/diagram_templates.cc b/src/config/diagram_templates.cc
index 9bde28e9..92d0c1f0 100644
--- a/src/config/diagram_templates.cc
+++ b/src/config/diagram_templates.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/config/diagram_templates.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/config/diagram_templates.h b/src/config/diagram_templates.h
index 3721337b..c7b228a2 100644
--- a/src/config/diagram_templates.h
+++ b/src/config/diagram_templates.h
@@ -1,7 +1,7 @@
 /**
  * @file src/config/diagram_templates.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/config/option.h b/src/config/option.h
index ba8ff331..0f446d59 100644
--- a/src/config/option.h
+++ b/src/config/option.h
@@ -1,7 +1,7 @@
 /**
  * @file src/config/option.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/config/schema.h b/src/config/schema.h
index 4f5b9df2..63f52bce 100644
--- a/src/config/schema.h
+++ b/src/config/schema.h
@@ -1,7 +1,7 @@
 /**
  * @file src/config/schema.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/config/yaml_decoders.cc b/src/config/yaml_decoders.cc
index 0337832f..0c414c4d 100644
--- a/src/config/yaml_decoders.cc
+++ b/src/config/yaml_decoders.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/config/yaml_decoders.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/config/yaml_emitters.cc b/src/config/yaml_emitters.cc
index ddf40344..35c92595 100644
--- a/src/config/yaml_emitters.cc
+++ b/src/config/yaml_emitters.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/config/yaml_emitters.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/decorators/decorators.cc b/src/decorators/decorators.cc
index 38c7a63f..0c39d214 100644
--- a/src/decorators/decorators.cc
+++ b/src/decorators/decorators.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/decorators/decorators.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/decorators/decorators.h b/src/decorators/decorators.h
index 2425607d..b745f87a 100644
--- a/src/decorators/decorators.h
+++ b/src/decorators/decorators.h
@@ -1,7 +1,7 @@
 /**
  * @file src/decorators/decorators.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/docs/architecture.cc b/src/docs/architecture.cc
index f4e1b078..9b2ca0e6 100644
--- a/src/docs/architecture.cc
+++ b/src/docs/architecture.cc
@@ -1,7 +1,7 @@
 /**
  * @file docs/architecture.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/docs/architecture.h b/src/docs/architecture.h
index 1478477b..5a8fdfe3 100644
--- a/src/docs/architecture.h
+++ b/src/docs/architecture.h
@@ -1,7 +1,7 @@
 /**
  * @file docs/architecture.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/generators/json/include_diagram_generator.cc b/src/include_diagram/generators/json/include_diagram_generator.cc
index 56ebaa81..309cc6ee 100644
--- a/src/include_diagram/generators/json/include_diagram_generator.cc
+++ b/src/include_diagram/generators/json/include_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/generators/json/include_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/generators/json/include_diagram_generator.h b/src/include_diagram/generators/json/include_diagram_generator.h
index ad20340f..a3df9b3a 100644
--- a/src/include_diagram/generators/json/include_diagram_generator.h
+++ b/src/include_diagram/generators/json/include_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/generators/json/include_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/generators/mermaid/include_diagram_generator.cc b/src/include_diagram/generators/mermaid/include_diagram_generator.cc
index 48cf3472..475a7733 100644
--- a/src/include_diagram/generators/mermaid/include_diagram_generator.cc
+++ b/src/include_diagram/generators/mermaid/include_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/generators/mermaid/include_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/generators/mermaid/include_diagram_generator.h b/src/include_diagram/generators/mermaid/include_diagram_generator.h
index 4efaf94e..0a530004 100644
--- a/src/include_diagram/generators/mermaid/include_diagram_generator.h
+++ b/src/include_diagram/generators/mermaid/include_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/generators/mermaid/include_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/generators/plantuml/include_diagram_generator.cc b/src/include_diagram/generators/plantuml/include_diagram_generator.cc
index 79cc663b..9dd04e71 100644
--- a/src/include_diagram/generators/plantuml/include_diagram_generator.cc
+++ b/src/include_diagram/generators/plantuml/include_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/generators/plantuml/include_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/generators/plantuml/include_diagram_generator.h b/src/include_diagram/generators/plantuml/include_diagram_generator.h
index 4b9530d2..5ee1fd00 100644
--- a/src/include_diagram/generators/plantuml/include_diagram_generator.h
+++ b/src/include_diagram/generators/plantuml/include_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/generators/plantuml/include_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/model/diagram.cc b/src/include_diagram/model/diagram.cc
index 8be81e5d..9e5b062f 100644
--- a/src/include_diagram/model/diagram.cc
+++ b/src/include_diagram/model/diagram.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/model/diagram.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/model/diagram.h b/src/include_diagram/model/diagram.h
index 0874c217..f9b0dabc 100644
--- a/src/include_diagram/model/diagram.h
+++ b/src/include_diagram/model/diagram.h
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/model/diagram.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/visitor/translation_unit_visitor.cc b/src/include_diagram/visitor/translation_unit_visitor.cc
index cdc24be8..9b12cd15 100644
--- a/src/include_diagram/visitor/translation_unit_visitor.cc
+++ b/src/include_diagram/visitor/translation_unit_visitor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/visitor/translation_unit_visitor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/include_diagram/visitor/translation_unit_visitor.h b/src/include_diagram/visitor/translation_unit_visitor.h
index 68938c5e..d59f258b 100644
--- a/src/include_diagram/visitor/translation_unit_visitor.h
+++ b/src/include_diagram/visitor/translation_unit_visitor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/include_diagram/visitor/translation_unit_visitor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main.cc b/src/main.cc
index f8814c05..70d16bf7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/main.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/generators/json/package_diagram_generator.cc b/src/package_diagram/generators/json/package_diagram_generator.cc
index cbf4a0fe..7fffd3dd 100644
--- a/src/package_diagram/generators/json/package_diagram_generator.cc
+++ b/src/package_diagram/generators/json/package_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/generators/json/package_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/generators/json/package_diagram_generator.h b/src/package_diagram/generators/json/package_diagram_generator.h
index e6a10803..a5881b61 100644
--- a/src/package_diagram/generators/json/package_diagram_generator.h
+++ b/src/package_diagram/generators/json/package_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/generators/json/package_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/generators/mermaid/package_diagram_generator.cc b/src/package_diagram/generators/mermaid/package_diagram_generator.cc
index de81903c..1962d8c6 100644
--- a/src/package_diagram/generators/mermaid/package_diagram_generator.cc
+++ b/src/package_diagram/generators/mermaid/package_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/generators/mermaid/package_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/generators/mermaid/package_diagram_generator.h b/src/package_diagram/generators/mermaid/package_diagram_generator.h
index e17ca55c..b9659fdc 100644
--- a/src/package_diagram/generators/mermaid/package_diagram_generator.h
+++ b/src/package_diagram/generators/mermaid/package_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/generators/mermaid/package_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/generators/plantuml/package_diagram_generator.cc b/src/package_diagram/generators/plantuml/package_diagram_generator.cc
index b8d3c3d1..a7e90722 100644
--- a/src/package_diagram/generators/plantuml/package_diagram_generator.cc
+++ b/src/package_diagram/generators/plantuml/package_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/generators/plantuml/package_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/generators/plantuml/package_diagram_generator.h b/src/package_diagram/generators/plantuml/package_diagram_generator.h
index be74d676..32774fc8 100644
--- a/src/package_diagram/generators/plantuml/package_diagram_generator.h
+++ b/src/package_diagram/generators/plantuml/package_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/generators/plantuml/package_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/model/diagram.cc b/src/package_diagram/model/diagram.cc
index 8dec8b17..4ba5e6f0 100644
--- a/src/package_diagram/model/diagram.cc
+++ b/src/package_diagram/model/diagram.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/model/diagram.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/model/diagram.h b/src/package_diagram/model/diagram.h
index 5851139c..335a5456 100644
--- a/src/package_diagram/model/diagram.h
+++ b/src/package_diagram/model/diagram.h
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/model/diagram.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/visitor/translation_unit_visitor.cc b/src/package_diagram/visitor/translation_unit_visitor.cc
index c2a68883..a48ce9f2 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.cc
+++ b/src/package_diagram/visitor/translation_unit_visitor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/visitor/translation_unit_visitor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/package_diagram/visitor/translation_unit_visitor.h b/src/package_diagram/visitor/translation_unit_visitor.h
index ec671a85..11d8dc14 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.h
+++ b/src/package_diagram/visitor/translation_unit_visitor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/package_diagram/visitor/translation_unit_visitor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/generators/json/sequence_diagram_generator.cc b/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
index 39c05f75..b23816f5 100644
--- a/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/json/sequence_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/generators/json/sequence_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/generators/json/sequence_diagram_generator.h b/src/sequence_diagram/generators/json/sequence_diagram_generator.h
index e787c572..bbf45078 100644
--- a/src/sequence_diagram/generators/json/sequence_diagram_generator.h
+++ b/src/sequence_diagram/generators/json/sequence_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/generators/json/sequence_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
index a2f25ee3..af403651 100644
--- a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h
index 6aaef53e..e8446479 100644
--- a/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h
+++ b/src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/generators/mermaid/sequence_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
index 20623b22..598b0b0f 100644
--- a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
index 6adfb14d..8d02deec 100644
--- a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
+++ b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/generators/plantuml/sequence_diagram_generator.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/model/activity.cc b/src/sequence_diagram/model/activity.cc
index a5cbcdca..c66ba730 100644
--- a/src/sequence_diagram/model/activity.cc
+++ b/src/sequence_diagram/model/activity.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/model/activity.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/model/activity.h b/src/sequence_diagram/model/activity.h
index 241b929a..ac0d1592 100644
--- a/src/sequence_diagram/model/activity.h
+++ b/src/sequence_diagram/model/activity.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/model/activity.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/model/diagram.cc b/src/sequence_diagram/model/diagram.cc
index c6dd17c2..45d2f97a 100644
--- a/src/sequence_diagram/model/diagram.cc
+++ b/src/sequence_diagram/model/diagram.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/model/diagram.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/model/diagram.h b/src/sequence_diagram/model/diagram.h
index 13192809..35f0c465 100644
--- a/src/sequence_diagram/model/diagram.h
+++ b/src/sequence_diagram/model/diagram.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/model/diagram.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/model/message.cc b/src/sequence_diagram/model/message.cc
index 0ec92fec..fad5ca19 100644
--- a/src/sequence_diagram/model/message.cc
+++ b/src/sequence_diagram/model/message.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/model/message.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/model/message.h b/src/sequence_diagram/model/message.h
index c59563a4..476b55fa 100644
--- a/src/sequence_diagram/model/message.h
+++ b/src/sequence_diagram/model/message.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/model/message.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/model/participant.cc b/src/sequence_diagram/model/participant.cc
index 6807d34e..6e393c7a 100644
--- a/src/sequence_diagram/model/participant.cc
+++ b/src/sequence_diagram/model/participant.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/model/participant.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/model/participant.h b/src/sequence_diagram/model/participant.h
index c26bd3c4..ff86fa2e 100644
--- a/src/sequence_diagram/model/participant.h
+++ b/src/sequence_diagram/model/participant.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/model/participant.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/visitor/call_expression_context.cc b/src/sequence_diagram/visitor/call_expression_context.cc
index 336a2747..403d460f 100644
--- a/src/sequence_diagram/visitor/call_expression_context.cc
+++ b/src/sequence_diagram/visitor/call_expression_context.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/visitor/call_expression_context.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/visitor/call_expression_context.h b/src/sequence_diagram/visitor/call_expression_context.h
index 41e22647..ba4958f3 100644
--- a/src/sequence_diagram/visitor/call_expression_context.h
+++ b/src/sequence_diagram/visitor/call_expression_context.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/visitor/call_expression_context.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index 9f1e7a77..5a79a309 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/visitor/translation_unit_visitor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.h b/src/sequence_diagram/visitor/translation_unit_visitor.h
index 8369c871..ddf10ab9 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.h
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/sequence_diagram/visitor/translation_unit_visitor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/util/error.h b/src/util/error.h
index 20f1ff9b..97ccf513 100644
--- a/src/util/error.h
+++ b/src/util/error.h
@@ -1,7 +1,7 @@
 /**
  * @file src/util/error.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/util/query_driver_output_extractor.cc b/src/util/query_driver_output_extractor.cc
index fd7f3765..12cb8629 100644
--- a/src/util/query_driver_output_extractor.cc
+++ b/src/util/query_driver_output_extractor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/util/query_driver_include_extractor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/util/query_driver_output_extractor.h b/src/util/query_driver_output_extractor.h
index 80f6ba3e..182aeb8b 100644
--- a/src/util/query_driver_output_extractor.h
+++ b/src/util/query_driver_output_extractor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/util/query_driver_include_extractor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/util/thread_pool_executor.cc b/src/util/thread_pool_executor.cc
index 150ab247..577f763c 100644
--- a/src/util/thread_pool_executor.cc
+++ b/src/util/thread_pool_executor.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/util/thread_pool_executor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/util/thread_pool_executor.h b/src/util/thread_pool_executor.h
index 9e6820e9..16a13c41 100644
--- a/src/util/thread_pool_executor.h
+++ b/src/util/thread_pool_executor.h
@@ -1,7 +1,7 @@
 /**
  * @file src/util/thread_pool_executor.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/util/util.cc b/src/util/util.cc
index 21b4f41c..e8c139db 100644
--- a/src/util/util.cc
+++ b/src/util/util.cc
@@ -1,7 +1,7 @@
 /**
  * @file src/util/util.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/util/util.h b/src/util/util.h
index 105485ec..391f5b8c 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -1,7 +1,7 @@
 /**
  * @file src/util/util.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00002/test_case.h b/tests/t00002/test_case.h
index b1554983..ed269e3a 100644
--- a/tests/t00002/test_case.h
+++ b/tests/t00002/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00002/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00003/test_case.h b/tests/t00003/test_case.h
index d58bd6a1..9fc98f5a 100644
--- a/tests/t00003/test_case.h
+++ b/tests/t00003/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00003/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00004/test_case.h b/tests/t00004/test_case.h
index c0f54989..1cf42b89 100644
--- a/tests/t00004/test_case.h
+++ b/tests/t00004/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00004/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00005/test_case.h b/tests/t00005/test_case.h
index 7912b25d..b759a51f 100644
--- a/tests/t00005/test_case.h
+++ b/tests/t00005/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00005/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00006/test_case.h b/tests/t00006/test_case.h
index 07462187..7757aa7f 100644
--- a/tests/t00006/test_case.h
+++ b/tests/t00006/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00006/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00007/test_case.h b/tests/t00007/test_case.h
index eaa3102f..98bf9855 100644
--- a/tests/t00007/test_case.h
+++ b/tests/t00007/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00007/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00008/test_case.h b/tests/t00008/test_case.h
index c0a03a36..28fb7676 100644
--- a/tests/t00008/test_case.h
+++ b/tests/t00008/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00008/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00009/test_case.h b/tests/t00009/test_case.h
index 1946f432..c72a3a00 100644
--- a/tests/t00009/test_case.h
+++ b/tests/t00009/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00009/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00010/test_case.h b/tests/t00010/test_case.h
index cd86ec6a..83dca628 100644
--- a/tests/t00010/test_case.h
+++ b/tests/t00010/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00010/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00011/test_case.h b/tests/t00011/test_case.h
index a59c6155..a5c7d53a 100644
--- a/tests/t00011/test_case.h
+++ b/tests/t00011/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00011/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00012/test_case.h b/tests/t00012/test_case.h
index 3145eda6..8b1a9d6a 100644
--- a/tests/t00012/test_case.h
+++ b/tests/t00012/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00012/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00013/test_case.h b/tests/t00013/test_case.h
index 9dfd2281..f12a999b 100644
--- a/tests/t00013/test_case.h
+++ b/tests/t00013/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00013/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00014/test_case.h b/tests/t00014/test_case.h
index faec6fa7..0368ba2d 100644
--- a/tests/t00014/test_case.h
+++ b/tests/t00014/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00014/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00015/test_case.h b/tests/t00015/test_case.h
index 17e930d6..42752d54 100644
--- a/tests/t00015/test_case.h
+++ b/tests/t00015/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00015/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00016/test_case.h b/tests/t00016/test_case.h
index bbafe446..52b6bc3f 100644
--- a/tests/t00016/test_case.h
+++ b/tests/t00016/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00016/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00017/test_case.h b/tests/t00017/test_case.h
index f41b6b5a..865764ba 100644
--- a/tests/t00017/test_case.h
+++ b/tests/t00017/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00017/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00018/test_case.h b/tests/t00018/test_case.h
index 9f3f2f0f..8ca24e0b 100644
--- a/tests/t00018/test_case.h
+++ b/tests/t00018/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00018/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00019/test_case.h b/tests/t00019/test_case.h
index b8b4dc35..d7bdb746 100644
--- a/tests/t00019/test_case.h
+++ b/tests/t00019/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00019/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00020/test_case.h b/tests/t00020/test_case.h
index e64a9463..d959b04c 100644
--- a/tests/t00020/test_case.h
+++ b/tests/t00020/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00020/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00021/test_case.h b/tests/t00021/test_case.h
index 1451d2ec..f916adf3 100644
--- a/tests/t00021/test_case.h
+++ b/tests/t00021/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00021/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00022/test_case.h b/tests/t00022/test_case.h
index 3294ce30..ab38da8c 100644
--- a/tests/t00022/test_case.h
+++ b/tests/t00022/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00022/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00023/test_case.h b/tests/t00023/test_case.h
index c76f72eb..a0c74506 100644
--- a/tests/t00023/test_case.h
+++ b/tests/t00023/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00023/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00024/test_case.h b/tests/t00024/test_case.h
index 1d30537d..7ede8607 100644
--- a/tests/t00024/test_case.h
+++ b/tests/t00024/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00024/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00025/test_case.h b/tests/t00025/test_case.h
index 1e01d5a0..c15ba9e9 100644
--- a/tests/t00025/test_case.h
+++ b/tests/t00025/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00025/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00026/test_case.h b/tests/t00026/test_case.h
index 4b1ffdc6..3de355c2 100644
--- a/tests/t00026/test_case.h
+++ b/tests/t00026/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00026/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00027/test_case.h b/tests/t00027/test_case.h
index 85712839..e9cd07a8 100644
--- a/tests/t00027/test_case.h
+++ b/tests/t00027/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00027/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00028/test_case.h b/tests/t00028/test_case.h
index 372a1038..77b8df35 100644
--- a/tests/t00028/test_case.h
+++ b/tests/t00028/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00028/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00029/test_case.h b/tests/t00029/test_case.h
index de139312..c5ed006b 100644
--- a/tests/t00029/test_case.h
+++ b/tests/t00029/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00029/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00030/test_case.h b/tests/t00030/test_case.h
index cb4ca72c..bd04683e 100644
--- a/tests/t00030/test_case.h
+++ b/tests/t00030/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00030/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00031/test_case.h b/tests/t00031/test_case.h
index 921a4293..eb9d8c50 100644
--- a/tests/t00031/test_case.h
+++ b/tests/t00031/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00031/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00032/test_case.h b/tests/t00032/test_case.h
index 92e20f72..09dad790 100644
--- a/tests/t00032/test_case.h
+++ b/tests/t00032/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00032/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00033/test_case.h b/tests/t00033/test_case.h
index 68967f74..4e9a9c61 100644
--- a/tests/t00033/test_case.h
+++ b/tests/t00033/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00033/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00034/test_case.h b/tests/t00034/test_case.h
index c6894e43..8a6858f7 100644
--- a/tests/t00034/test_case.h
+++ b/tests/t00034/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00034/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00035/test_case.h b/tests/t00035/test_case.h
index 59b9976b..51018e78 100644
--- a/tests/t00035/test_case.h
+++ b/tests/t00035/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00035/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00036/test_case.h b/tests/t00036/test_case.h
index c5ddb1b8..12c58572 100644
--- a/tests/t00036/test_case.h
+++ b/tests/t00036/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00036/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00037/test_case.h b/tests/t00037/test_case.h
index 6742a1d1..e5e62d0f 100644
--- a/tests/t00037/test_case.h
+++ b/tests/t00037/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00037/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00038/test_case.h b/tests/t00038/test_case.h
index b9d1e47c..38363ddc 100644
--- a/tests/t00038/test_case.h
+++ b/tests/t00038/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00038/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00039/test_case.h b/tests/t00039/test_case.h
index d5edad61..9e4c562b 100644
--- a/tests/t00039/test_case.h
+++ b/tests/t00039/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00039/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00040/test_case.h b/tests/t00040/test_case.h
index 8305da37..ec8b0181 100644
--- a/tests/t00040/test_case.h
+++ b/tests/t00040/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00040/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00041/test_case.h b/tests/t00041/test_case.h
index 5d7f19cd..28fc90e3 100644
--- a/tests/t00041/test_case.h
+++ b/tests/t00041/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00041/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00042/test_case.h b/tests/t00042/test_case.h
index 008cb13b..795220eb 100644
--- a/tests/t00042/test_case.h
+++ b/tests/t00042/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00042/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00043/test_case.h b/tests/t00043/test_case.h
index 5355d787..abc539de 100644
--- a/tests/t00043/test_case.h
+++ b/tests/t00043/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00043/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00044/test_case.h b/tests/t00044/test_case.h
index 3a5f90aa..55610f86 100644
--- a/tests/t00044/test_case.h
+++ b/tests/t00044/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00044/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00045/test_case.h b/tests/t00045/test_case.h
index f2f2e2c5..604308b4 100644
--- a/tests/t00045/test_case.h
+++ b/tests/t00045/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00045/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00046/test_case.h b/tests/t00046/test_case.h
index 11272ee2..1352f8b5 100644
--- a/tests/t00046/test_case.h
+++ b/tests/t00046/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00046/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00047/test_case.h b/tests/t00047/test_case.h
index 69d341b8..19854832 100644
--- a/tests/t00047/test_case.h
+++ b/tests/t00047/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00047/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00048/test_case.h b/tests/t00048/test_case.h
index 3bea43d1..38ecc80b 100644
--- a/tests/t00048/test_case.h
+++ b/tests/t00048/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00048/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00049/test_case.h b/tests/t00049/test_case.h
index bf2f6474..01494fc3 100644
--- a/tests/t00049/test_case.h
+++ b/tests/t00049/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00049/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00050/test_case.h b/tests/t00050/test_case.h
index cdb593b8..6a3c50dd 100644
--- a/tests/t00050/test_case.h
+++ b/tests/t00050/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00050/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00051/test_case.h b/tests/t00051/test_case.h
index ed64654b..c2302184 100644
--- a/tests/t00051/test_case.h
+++ b/tests/t00051/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00051/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00052/test_case.h b/tests/t00052/test_case.h
index 264bf190..32319443 100644
--- a/tests/t00052/test_case.h
+++ b/tests/t00052/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00052/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00053/test_case.h b/tests/t00053/test_case.h
index 528b23ff..5cd14eb6 100644
--- a/tests/t00053/test_case.h
+++ b/tests/t00053/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00053/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00054/test_case.h b/tests/t00054/test_case.h
index 060c4900..7fcf352a 100644
--- a/tests/t00054/test_case.h
+++ b/tests/t00054/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00054/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00055/test_case.h b/tests/t00055/test_case.h
index 9f238ba7..f349d5bf 100644
--- a/tests/t00055/test_case.h
+++ b/tests/t00055/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00055/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00056/test_case.h b/tests/t00056/test_case.h
index 418c5079..8d6efee1 100644
--- a/tests/t00056/test_case.h
+++ b/tests/t00056/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00056/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00057/test_case.h b/tests/t00057/test_case.h
index e033db34..1a7331ea 100644
--- a/tests/t00057/test_case.h
+++ b/tests/t00057/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00057/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00058/test_case.h b/tests/t00058/test_case.h
index 4a24abd1..1a31bb60 100644
--- a/tests/t00058/test_case.h
+++ b/tests/t00058/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00058/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00059/test_case.h b/tests/t00059/test_case.h
index 8449ca80..3f72389b 100644
--- a/tests/t00059/test_case.h
+++ b/tests/t00059/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00059/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00060/test_case.h b/tests/t00060/test_case.h
index 3481b8a8..528bfcd4 100644
--- a/tests/t00060/test_case.h
+++ b/tests/t00060/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00060/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00061/test_case.h b/tests/t00061/test_case.h
index 38df0dd5..64b5fdb1 100644
--- a/tests/t00061/test_case.h
+++ b/tests/t00061/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00061/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00062/test_case.h b/tests/t00062/test_case.h
index d441f901..afa222c1 100644
--- a/tests/t00062/test_case.h
+++ b/tests/t00062/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00062/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00063/test_case.h b/tests/t00063/test_case.h
index 3afc52b1..8eac17bc 100644
--- a/tests/t00063/test_case.h
+++ b/tests/t00063/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00063/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00064/test_case.h b/tests/t00064/test_case.h
index 6cc3dfb8..c813798a 100644
--- a/tests/t00064/test_case.h
+++ b/tests/t00064/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00064/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00065/test_case.h b/tests/t00065/test_case.h
index 539d7944..51ccc4c5 100644
--- a/tests/t00065/test_case.h
+++ b/tests/t00065/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00065/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00066/test_case.h b/tests/t00066/test_case.h
index 8492271c..37765b71 100644
--- a/tests/t00066/test_case.h
+++ b/tests/t00066/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00066/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00067/test_case.h b/tests/t00067/test_case.h
index 45d77b35..b1142a5b 100644
--- a/tests/t00067/test_case.h
+++ b/tests/t00067/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00067/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00068/test_case.h b/tests/t00068/test_case.h
index 543f17c5..19836b1b 100644
--- a/tests/t00068/test_case.h
+++ b/tests/t00068/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00068/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00069/test_case.h b/tests/t00069/test_case.h
index 98894ea6..069803e2 100644
--- a/tests/t00069/test_case.h
+++ b/tests/t00069/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00069/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00070/test_case.h b/tests/t00070/test_case.h
index b7e74754..59227728 100644
--- a/tests/t00070/test_case.h
+++ b/tests/t00070/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00070/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00071/test_case.h b/tests/t00071/test_case.h
index b8219023..21821d2d 100644
--- a/tests/t00071/test_case.h
+++ b/tests/t00071/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00071/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t00072/test_case.h b/tests/t00072/test_case.h
index 29f22cb4..10252aed 100644
--- a/tests/t00072/test_case.h
+++ b/tests/t00072/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t00072/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20001/test_case.h b/tests/t20001/test_case.h
index dcdb59d1..f06f150d 100644
--- a/tests/t20001/test_case.h
+++ b/tests/t20001/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20001/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20002/test_case.h b/tests/t20002/test_case.h
index 03986b0c..65b08719 100644
--- a/tests/t20002/test_case.h
+++ b/tests/t20002/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20002/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20003/test_case.h b/tests/t20003/test_case.h
index 7a5dce25..6d8fbe3c 100644
--- a/tests/t20003/test_case.h
+++ b/tests/t20003/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20003/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20004/test_case.h b/tests/t20004/test_case.h
index 70747fb6..67b37ed9 100644
--- a/tests/t20004/test_case.h
+++ b/tests/t20004/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20004/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20005/test_case.h b/tests/t20005/test_case.h
index ac336b83..330bbdb1 100644
--- a/tests/t20005/test_case.h
+++ b/tests/t20005/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20005/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20006/test_case.h b/tests/t20006/test_case.h
index 65c2bed2..c825244f 100644
--- a/tests/t20006/test_case.h
+++ b/tests/t20006/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20006/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20007/test_case.h b/tests/t20007/test_case.h
index d6ee8025..97cfa231 100644
--- a/tests/t20007/test_case.h
+++ b/tests/t20007/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20007/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20008/test_case.h b/tests/t20008/test_case.h
index c6bc3497..0a98e6fd 100644
--- a/tests/t20008/test_case.h
+++ b/tests/t20008/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20008/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20009/test_case.h b/tests/t20009/test_case.h
index 905d034f..64bc4235 100644
--- a/tests/t20009/test_case.h
+++ b/tests/t20009/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20009/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20010/test_case.h b/tests/t20010/test_case.h
index 99f842d4..a4e0f76c 100644
--- a/tests/t20010/test_case.h
+++ b/tests/t20010/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20010/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20011/test_case.h b/tests/t20011/test_case.h
index bda7d30b..e6f4b81a 100644
--- a/tests/t20011/test_case.h
+++ b/tests/t20011/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20011/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20012/test_case.h b/tests/t20012/test_case.h
index 1212189a..12100f25 100644
--- a/tests/t20012/test_case.h
+++ b/tests/t20012/test_case.h
@@ -1,7 +1,7 @@
 /**
  * test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20013/test_case.h b/tests/t20013/test_case.h
index 3f3144d2..733f7e20 100644
--- a/tests/t20013/test_case.h
+++ b/tests/t20013/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20013/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20014/test_case.h b/tests/t20014/test_case.h
index 9b38b110..8bb84bbc 100644
--- a/tests/t20014/test_case.h
+++ b/tests/t20014/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20014/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20015/test_case.h b/tests/t20015/test_case.h
index c2c50ddc..259cafb7 100644
--- a/tests/t20015/test_case.h
+++ b/tests/t20015/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20015/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20016/test_case.h b/tests/t20016/test_case.h
index 5110b8fe..b9bf1d12 100644
--- a/tests/t20016/test_case.h
+++ b/tests/t20016/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20016/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20017/test_case.h b/tests/t20017/test_case.h
index daa4d0dd..37519ce6 100644
--- a/tests/t20017/test_case.h
+++ b/tests/t20017/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20017/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20018/test_case.h b/tests/t20018/test_case.h
index c6b4023f..ae618cae 100644
--- a/tests/t20018/test_case.h
+++ b/tests/t20018/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20018/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20019/test_case.h b/tests/t20019/test_case.h
index 62d55fc3..195655ff 100644
--- a/tests/t20019/test_case.h
+++ b/tests/t20019/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20019/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20020/test_case.h b/tests/t20020/test_case.h
index b68a840d..bc5c2d0d 100644
--- a/tests/t20020/test_case.h
+++ b/tests/t20020/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20020/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20021/test_case.h b/tests/t20021/test_case.h
index 2eed83c1..afcedf98 100644
--- a/tests/t20021/test_case.h
+++ b/tests/t20021/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20021/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20022/test_case.h b/tests/t20022/test_case.h
index 19b88900..330e14fa 100644
--- a/tests/t20022/test_case.h
+++ b/tests/t20022/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20022/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20023/test_case.h b/tests/t20023/test_case.h
index ad50dbb6..130d06b8 100644
--- a/tests/t20023/test_case.h
+++ b/tests/t20023/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20023/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20024/test_case.h b/tests/t20024/test_case.h
index 00257fe8..46d85a0b 100644
--- a/tests/t20024/test_case.h
+++ b/tests/t20024/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20024/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20025/test_case.h b/tests/t20025/test_case.h
index 3ece860b..2875c4f7 100644
--- a/tests/t20025/test_case.h
+++ b/tests/t20025/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20025/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20026/test_case.h b/tests/t20026/test_case.h
index 1151622a..be0bf34d 100644
--- a/tests/t20026/test_case.h
+++ b/tests/t20026/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20026/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20027/test_case.h b/tests/t20027/test_case.h
index d91b462b..97f42249 100644
--- a/tests/t20027/test_case.h
+++ b/tests/t20027/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20027/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20028/test_case.h b/tests/t20028/test_case.h
index 48feb7a7..e0947a9f 100644
--- a/tests/t20028/test_case.h
+++ b/tests/t20028/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20028/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20029/test_case.h b/tests/t20029/test_case.h
index bbfd787b..cfbfc6c4 100644
--- a/tests/t20029/test_case.h
+++ b/tests/t20029/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20029/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20030/test_case.h b/tests/t20030/test_case.h
index 38b24cdb..fdda6293 100644
--- a/tests/t20030/test_case.h
+++ b/tests/t20030/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20030/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20031/test_case.h b/tests/t20031/test_case.h
index f9726b91..f325cb53 100644
--- a/tests/t20031/test_case.h
+++ b/tests/t20031/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20031/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20032/test_case.h b/tests/t20032/test_case.h
index 5116c4ba..c056ed62 100644
--- a/tests/t20032/test_case.h
+++ b/tests/t20032/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20032/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20033/test_case.h b/tests/t20033/test_case.h
index 131acc81..f1f10c63 100644
--- a/tests/t20033/test_case.h
+++ b/tests/t20033/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20033/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20034/test_case.h b/tests/t20034/test_case.h
index 9d1b1287..26290368 100644
--- a/tests/t20034/test_case.h
+++ b/tests/t20034/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20034/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20035/test_case.h b/tests/t20035/test_case.h
index d4eb26dc..8213597d 100644
--- a/tests/t20035/test_case.h
+++ b/tests/t20035/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20035/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20036/test_case.h b/tests/t20036/test_case.h
index 293614aa..f8da4cd2 100644
--- a/tests/t20036/test_case.h
+++ b/tests/t20036/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20036/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20037/test_case.h b/tests/t20037/test_case.h
index c4d60600..15f20df3 100644
--- a/tests/t20037/test_case.h
+++ b/tests/t20037/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20037/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t20038/test_case.h b/tests/t20038/test_case.h
index 9765010e..dc0c8be9 100644
--- a/tests/t20038/test_case.h
+++ b/tests/t20038/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t20038/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30001/test_case.h b/tests/t30001/test_case.h
index d8edcb44..4772e727 100644
--- a/tests/t30001/test_case.h
+++ b/tests/t30001/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30001/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30002/test_case.h b/tests/t30002/test_case.h
index 96bdfcc1..908402ae 100644
--- a/tests/t30002/test_case.h
+++ b/tests/t30002/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30002/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30003/test_case.h b/tests/t30003/test_case.h
index 43ee3d96..4b9f5863 100644
--- a/tests/t30003/test_case.h
+++ b/tests/t30003/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30003/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30004/test_case.h b/tests/t30004/test_case.h
index f6295698..bd66c760 100644
--- a/tests/t30004/test_case.h
+++ b/tests/t30004/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30004/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30005/test_case.h b/tests/t30005/test_case.h
index 826500cf..57248548 100644
--- a/tests/t30005/test_case.h
+++ b/tests/t30005/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30005/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30006/test_case.h b/tests/t30006/test_case.h
index 92f77aac..6201fa50 100644
--- a/tests/t30006/test_case.h
+++ b/tests/t30006/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30006/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30007/test_case.h b/tests/t30007/test_case.h
index 77a28066..653212db 100644
--- a/tests/t30007/test_case.h
+++ b/tests/t30007/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30007/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30008/test_case.h b/tests/t30008/test_case.h
index 25557783..70f52d6a 100644
--- a/tests/t30008/test_case.h
+++ b/tests/t30008/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30008/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30009/test_case.h b/tests/t30009/test_case.h
index e2727d08..84600695 100644
--- a/tests/t30009/test_case.h
+++ b/tests/t30009/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30009/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30010/test_case.h b/tests/t30010/test_case.h
index bdfd1a09..19d06edf 100644
--- a/tests/t30010/test_case.h
+++ b/tests/t30010/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30010/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30011/test_case.h b/tests/t30011/test_case.h
index a9acd471..a8adfd0a 100644
--- a/tests/t30011/test_case.h
+++ b/tests/t30011/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30011/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30012/test_case.h b/tests/t30012/test_case.h
index ad0458ae..1e841adb 100644
--- a/tests/t30012/test_case.h
+++ b/tests/t30012/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30012/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30013/test_case.h b/tests/t30013/test_case.h
index b05a5477..44b9024f 100644
--- a/tests/t30013/test_case.h
+++ b/tests/t30013/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30013/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30014/test_case.h b/tests/t30014/test_case.h
index 5e52a48d..06c30eed 100644
--- a/tests/t30014/test_case.h
+++ b/tests/t30014/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30014/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t30015/test_case.h b/tests/t30015/test_case.h
index 3b9a78a2..85dc7eab 100644
--- a/tests/t30015/test_case.h
+++ b/tests/t30015/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t30015/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t40001/test_case.h b/tests/t40001/test_case.h
index 360352de..c07e8671 100644
--- a/tests/t40001/test_case.h
+++ b/tests/t40001/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t40001/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t40002/test_case.h b/tests/t40002/test_case.h
index 5a6e451c..bf09cb1d 100644
--- a/tests/t40002/test_case.h
+++ b/tests/t40002/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t40002/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t40003/test_case.h b/tests/t40003/test_case.h
index 88bb5bf7..5b44ae41 100644
--- a/tests/t40003/test_case.h
+++ b/tests/t40003/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t40003/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/t90000/test_case.h b/tests/t90000/test_case.h
index 84d50e58..a517f474 100644
--- a/tests/t90000/test_case.h
+++ b/tests/t90000/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/t90000/test_case.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index e67d3964..e49cc89d 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_cases.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_cases.h b/tests/test_cases.h
index e35da169..a1482ef3 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_cases.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_cli_handler.cc b/tests/test_cli_handler.cc
index 763e811b..1eaf8658 100644
--- a/tests/test_cli_handler.cc
+++ b/tests/test_cli_handler.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_cli_handler.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_compilation_database.cc b/tests/test_compilation_database.cc
index d52bdd39..928dd6bc 100644
--- a/tests/test_compilation_database.cc
+++ b/tests/test_compilation_database.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_compilation_database.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_config.cc b/tests/test_config.cc
index ee622e3a..7008b690 100644
--- a/tests/test_config.cc
+++ b/tests/test_config.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_config.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_decorator_parser.cc b/tests/test_decorator_parser.cc
index 0a9fb9e0..5ef6b19a 100644
--- a/tests/test_decorator_parser.cc
+++ b/tests/test_decorator_parser.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_decorator_parser.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_filters.cc b/tests/test_filters.cc
index 97c6f4b6..3590d331 100644
--- a/tests/test_filters.cc
+++ b/tests/test_filters.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_filters.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_model.cc b/tests/test_model.cc
index 680d7cc8..3b925a6c 100644
--- a/tests/test_model.cc
+++ b/tests/test_model.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_model.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_query_driver_output_extractor.cc b/tests/test_query_driver_output_extractor.cc
index 016cb998..ff35ac6f 100644
--- a/tests/test_query_driver_output_extractor.cc
+++ b/tests/test_query_driver_output_extractor.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_query_driver_output_extractor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_thread_pool_executor.cc b/tests/test_thread_pool_executor.cc
index d5d9fbd1..369b70a6 100644
--- a/tests/test_thread_pool_executor.cc
+++ b/tests/test_thread_pool_executor.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_thread_pool_executor.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tests/test_util.cc b/tests/test_util.cc
index d1e8fcaf..5f198049 100644
--- a/tests/test_util.cc
+++ b/tests/test_util.cc
@@ -1,7 +1,7 @@
 /**
  * @file tests/test_util.cc
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/util/templates/test_cases/test_case.h b/util/templates/test_cases/test_case.h
index 23fdafde..13a7c6c9 100644
--- a/util/templates/test_cases/test_case.h
+++ b/util/templates/test_cases/test_case.h
@@ -1,7 +1,7 @@
 /**
  * tests/{{ name }}/test_case.h
  *
- * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 043c13affbc7587b87883ebfbf2f64039c24e556 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Tue, 9 Jan 2024 11:41:34 +0100
Subject: [PATCH 17/24] Fixed module handling on LLVM versions < 15.0.0

---
 src/common/visitor/translation_unit_visitor.cc       | 11 +++++++++--
 .../visitor/translation_unit_visitor.cc              | 12 +++++++++++-
 tests/t00008/test_case.h                             |  5 -----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/common/visitor/translation_unit_visitor.cc b/src/common/visitor/translation_unit_visitor.cc
index 40441b71..80ddc9db 100644
--- a/src/common/visitor/translation_unit_visitor.cc
+++ b/src/common/visitor/translation_unit_visitor.cc
@@ -171,12 +171,19 @@ void translation_unit_visitor::set_owning_module(
     if (const clang::Module *module = decl.getOwningModule();
         module != nullptr) {
         std::string module_name = module->Name;
-        if (module->isPrivateModule()) {
+        bool is_private{false};
+#if LLVM_VERSION_MAJOR < 15
+        is_private =
+            module->Kind == clang::Module::ModuleKind::PrivateModuleFragment;
+#else
+        is_private = module->isPrivateModule();
+#endif
+        if (is_private) {
             // Clang just maps private modules names to "<private>"
             module_name = module->getTopLevelModule()->Name;
         }
         element.set_module(module_name);
-        element.set_module_private(module->isPrivateModule());
+        element.set_module_private(is_private);
     }
 }
 } // namespace clanguml::common::visitor
\ No newline at end of file
diff --git a/src/package_diagram/visitor/translation_unit_visitor.cc b/src/package_diagram/visitor/translation_unit_visitor.cc
index a48ce9f2..1794bee2 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.cc
+++ b/src/package_diagram/visitor/translation_unit_visitor.cc
@@ -247,8 +247,13 @@ void translation_unit_visitor::add_relationships(
         }
 
         std::string module_path_str = module->Name;
-        if (module->isPrivateModule())
+#if LLVM_VERSION_MAJOR < 15
+        if (module->Kind == clang::Module::ModuleKind::PrivateModuleFragment) {
+#else
+        if (module->isPrivateModule()) {
+#endif
             module_path_str = module->getTopLevelModule()->Name;
+        }
 
         common::model::path module_path{
             module_path_str, common::model::path_type::kModule};
@@ -326,7 +331,12 @@ common::id_t translation_unit_visitor::get_package_id(const clang::Decl *cls)
         const auto *module = cls->getOwningModule();
         if (module != nullptr) {
             std::string module_path = module->Name;
+#if LLVM_VERSION_MAJOR < 15
+            if (module->Kind ==
+                clang::Module::ModuleKind::PrivateModuleFragment) {
+#else
             if (module->isPrivateModule()) {
+#endif
                 module_path = module->getTopLevelModule()->Name;
             }
             return common::to_id(module_path);
diff --git a/tests/t00008/test_case.h b/tests/t00008/test_case.h
index 28fb7676..480500be 100644
--- a/tests/t00008/test_case.h
+++ b/tests/t00008/test_case.h
@@ -63,12 +63,7 @@ TEST_CASE("t00008", "[test-case][class]")
 
         using namespace json;
 
-#if LLVM_VERSION_MAJOR >= 16
         REQUIRE(IsClassTemplate(j, "A<T,P=T,CMP=nullptr,int N=3>"));
-#else
-        REQUIRE(IsClassTemplate(
-            j, "A<T,P=T,clanguml::t00008::CMP=nullptr,int N=3>"));
-#endif
         REQUIRE(IsClassTemplate(j, "E::nested_template<ET>"));
         REQUIRE(IsClass(j, "E::nested_template<char>"));
 

From 66dcf1ed5d760281ca8262b1f894bae2f21dc10e Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Tue, 9 Jan 2024 22:13:39 +0100
Subject: [PATCH 18/24] Added is_system header file property to JSON include
 diagram generator

---
 src/common/model/source_file.h                    | 15 +++++++++++++++
 .../generators/json/include_diagram_generator.cc  |  3 +++
 .../visitor/translation_unit_visitor.cc           |  2 ++
 tests/t40001/test_case.h                          |  6 +++---
 tests/test_cases.h                                | 14 ++++++++++++++
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/common/model/source_file.h b/src/common/model/source_file.h
index b3a88a65..24cf26d5 100644
--- a/src/common/model/source_file.h
+++ b/src/common/model/source_file.h
@@ -117,6 +117,20 @@ public:
      */
     source_file_t type() const { return type_; }
 
+    /**
+     * Set whether the file is a system header
+     *
+     * @param is_system Whether the file is a system header
+     */
+    void set_system_header(bool is_system) { is_system_header_ = is_system; }
+
+    /**
+     * Is the file a system header?
+     *
+     * @return True, if the source file is a system header
+     */
+    bool is_system_header() const { return is_system_header_; }
+
     /**
      * Get the source file's parent path.
      *
@@ -185,6 +199,7 @@ private:
     filesystem_path path_{path_type::kFilesystem};
     source_file_t type_{source_file_t::kDirectory};
     bool is_absolute_{false};
+    bool is_system_header_{false};
 };
 } // namespace clanguml::common::model
 
diff --git a/src/include_diagram/generators/json/include_diagram_generator.cc b/src/include_diagram/generators/json/include_diagram_generator.cc
index 309cc6ee..a1c6853b 100644
--- a/src/include_diagram/generators/json/include_diagram_generator.cc
+++ b/src/include_diagram/generators/json/include_diagram_generator.cc
@@ -78,6 +78,9 @@ void generator::generate(const source_file &f, nlohmann::json &parent) const
 
             j["type"] = "file";
             j["file_kind"] = to_string(f.type());
+            if (f.type() == common::model::source_file_t::kHeader) {
+                j["is_system"] = f.is_system_header();
+            }
 
             parent["elements"].push_back(std::move(j));
         }
diff --git a/src/include_diagram/visitor/translation_unit_visitor.cc b/src/include_diagram/visitor/translation_unit_visitor.cc
index 9b12cd15..000c213b 100644
--- a/src/include_diagram/visitor/translation_unit_visitor.cc
+++ b/src/include_diagram/visitor/translation_unit_visitor.cc
@@ -147,6 +147,7 @@ void translation_unit_visitor::include_visitor::process_internal_header(
     include_file.set_file(
         std::filesystem::absolute(include_path).lexically_normal().string());
     include_file.set_line(0);
+    include_file.set_system_header(is_system);
 
     // Add relationship from the currently parsed source file to this
     // include file
@@ -174,6 +175,7 @@ void translation_unit_visitor::include_visitor::process_external_system_header(
     f->set_name(include_path.string());
     f->set_type(common::model::source_file_t::kHeader);
     f->set_id(common::to_id(include_path));
+    f->set_system_header(true);
 
     const auto f_id = f->id();
 
diff --git a/tests/t40001/test_case.h b/tests/t40001/test_case.h
index c07e8671..1bdef77c 100644
--- a/tests/t40001/test_case.h
+++ b/tests/t40001/test_case.h
@@ -67,10 +67,10 @@ TEST_CASE("t40001", "[test-case][include]")
         REQUIRE(IsFolder(j, "include/lib1"));
         REQUIRE(IsFolder(j, "src"));
 
-        REQUIRE(IsFile(j, "include/lib1/lib1.h"));
-        REQUIRE(IsFile(j, "include/t40001_include1.h"));
+        REQUIRE(IsHeader(j, "include/lib1/lib1.h"));
+        REQUIRE(IsHeader(j, "include/t40001_include1.h"));
         REQUIRE(IsFile(j, "src/t40001.cc"));
-        REQUIRE(IsFile(j, "yaml-cpp/yaml.h"));
+        REQUIRE(IsSystemHeader(j, "yaml-cpp/yaml.h"));
 
         REQUIRE(IsFile(j, "string"));
 
diff --git a/tests/test_cases.h b/tests/test_cases.h
index a1482ef3..c6662815 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -1391,6 +1391,20 @@ bool IsFile(const nlohmann::json &j, const std::string &name)
     return e && e->at("type") == "file";
 }
 
+bool IsSystemHeader(const nlohmann::json &j, const std::string &name)
+{
+    auto e = get_element(j, name);
+    return e && e->at("type") == "file" && e->at("file_kind") == "header" &&
+        e->at("is_system");
+}
+
+bool IsHeader(const nlohmann::json &j, const std::string &name)
+{
+    auto e = get_element(j, name);
+    return e && e->at("type") == "file" && e->at("file_kind") == "header" &&
+        !e->at("is_system");
+}
+
 bool IsDeprecated(const nlohmann::json &j, const std::string &name)
 {
     auto e = get_element(j, expand_name(j, name));

From 79971d67e8931c702e0fa35681718a9c2418311b Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Wed, 10 Jan 2024 10:39:30 +0100
Subject: [PATCH 19/24] Documentation fix (#226)

---
 docs/interactive_svg_diagrams.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/interactive_svg_diagrams.md b/docs/interactive_svg_diagrams.md
index 3358057e..f41450b6 100644
--- a/docs/interactive_svg_diagrams.md
+++ b/docs/interactive_svg_diagrams.md
@@ -17,7 +17,11 @@ elements simply add this to your `.clang-uml` file:
 ```yaml
 generate_links:
   link: 'https://github.com/myorg/myrepo/blob/{{ git.commit }}/{{ element.source.path }}#L{{ element.source.line }}'
-  tooltip: '{% if "comment" in element %}{{ abbrv(trim(replace(element.comment, "\n+", " ")), 256) }}{% else %}{{ element.name }}{% endif %}'
+  tooltip: '{% if "comment" in element %}{{ abbrv(trim(replace(element.comment.formatted, "\n+", " ")), 256) }}{% else %}{{ element.name }}{% endif %}'
 ```
 
-You can open example diagram [here](https://raw.githubusercontent.com/bkryza/clang-uml/master/docs/test_cases/t00014_class.svg) to see how it works in action.
\ No newline at end of file
+You can open example diagram [here](https://raw.githubusercontent.com/bkryza/clang-uml/master/docs/test_cases/t00014_class.svg) to see how it works in action.
+
+Full documentation on how to use the [inja](https://github.com/pantor/inja)
+template engine in `clang-uml` configuration files can be found
+[here](./jinja_templates.md).

From 97719e46fc3cc9ec40ddbc9457e0aee3e3254205 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Thu, 11 Jan 2024 11:26:41 +0100
Subject: [PATCH 20/24] Enabled type_aliases config option for sequence
 diagrams (#224)

---
 CHANGELOG.md                                  |  3 +-
 src/config/config.cc                          |  1 +
 src/config/config.h                           |  3 +-
 src/config/option.h                           | 16 ++++-
 src/config/schema.h                           |  2 +
 src/config/yaml_decoders.cc                   |  2 +
 .../visitor/translation_unit_visitor.cc       | 16 ++---
 .../visitor/translation_unit_visitor.h        |  2 +-
 tests/t20039/.clang-uml                       | 14 +++++
 tests/t20039/t20039.cc                        | 34 ++++++++++
 tests/t20039/test_case.h                      | 63 +++++++++++++++++++
 tests/test_cases.cc                           |  1 +
 tests/test_cases.yaml                         |  3 +
 tests/test_config.cc                          | 31 +++++++++
 tests/test_config_data/type_aliases.yml       | 17 +++++
 15 files changed, 195 insertions(+), 13 deletions(-)
 create mode 100644 tests/t20039/.clang-uml
 create mode 100644 tests/t20039/t20039.cc
 create mode 100644 tests/t20039/test_case.h
 create mode 100644 tests/test_config_data/type_aliases.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2564d0ad..85b2f67c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
- 
+
+ * Enabled type_aliases config option for sequence diagrams (#224)
  * Refactored and unified JSON generators output (#223)
  * Added support for C++20 module based packages in class diagrams (#101)
  * Added support for class diagram filtering based on C++20 modules (#195)
diff --git a/src/config/config.cc b/src/config/config.cc
index d875908c..829c1361 100644
--- a/src/config/config.cc
+++ b/src/config/config.cc
@@ -217,6 +217,7 @@ void inheritable_diagram_options::inherit(
         parent.generate_condition_statements);
     debug_mode.override(parent.debug_mode);
     generate_metadata.override(parent.generate_metadata);
+    type_aliases.override(parent.type_aliases);
 }
 
 std::string inheritable_diagram_options::simplify_template_type(
diff --git a/src/config/config.h b/src/config/config.h
index 0db27a25..32944fdd 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -538,7 +538,8 @@ struct inheritable_diagram_options {
     option<std::filesystem::path> base_directory{"__parent_path"};
     option<bool> generate_system_headers{"generate_system_headers", false};
     option<relationship_hints_t> relationship_hints{"relationship_hints"};
-    option<type_aliases_t> type_aliases{"type_aliases"};
+    option<type_aliases_t> type_aliases{
+        "type_aliases", option_inherit_mode::kAppend};
     option<comment_parser_t> comment_parser{
         "comment_parser", comment_parser_t::plain};
     option<bool> combine_free_functions_into_file_participants{
diff --git a/src/config/option.h b/src/config/option.h
index 0f446d59..699e3e59 100644
--- a/src/config/option.h
+++ b/src/config/option.h
@@ -25,6 +25,18 @@ namespace config {
 
 template <typename T> void append_value(T &l, const T &r) { l = r; }
 
+template <typename T>
+void append_value(std::vector<T> &l, const std::vector<T> &r)
+{
+    l.insert(std::end(l), r.begin(), r.end());
+}
+
+template <typename K, typename V>
+void append_value(std::map<K, V> &l, const std::map<K, V> &r)
+{
+    l.insert(r.begin(), r.end());
+}
+
 /**
  * Possible option inheritance methods from top level to diagram level.
  */
@@ -102,9 +114,7 @@ template <typename T> struct option {
             has_value = true;
         }
         else if (!is_declared && o.is_declared) {
-            value = o.value;
-            is_declared = true;
-            has_value = true;
+            set(o.value);
         }
     }
 
diff --git a/src/config/schema.h b/src/config/schema.h
index 63f52bce..b1e05ad7 100644
--- a/src/config/schema.h
+++ b/src/config/schema.h
@@ -205,6 +205,7 @@ types:
             after: !optional [string]
             cmd: !optional string
         relative_to: !optional string
+        type_aliases: !optional map_t<string;string>
         using_namespace: !optional [string, [string]]
         generate_metadata: !optional bool
         title: !optional string
@@ -342,6 +343,7 @@ root:
     package_type: !optional package_type_t
     generate_template_argument_dependencies: !optional bool
     skip_redundant_dependencies: !optional bool
+    type_aliases: !optional map_t<string;string>
 )";
 
 } // namespace clanguml::config
\ No newline at end of file
diff --git a/src/config/yaml_decoders.cc b/src/config/yaml_decoders.cc
index 0c414c4d..691a7c17 100644
--- a/src/config/yaml_decoders.cc
+++ b/src/config/yaml_decoders.cc
@@ -663,6 +663,7 @@ template <> struct convert<sequence_diagram> {
         get_option(node, rhs.generate_method_arguments);
         get_option(node, rhs.generate_message_comments);
         get_option(node, rhs.message_comment_width);
+        get_option(node, rhs.type_aliases);
 
         get_option(node, rhs.get_relative_to());
 
@@ -836,6 +837,7 @@ template <> struct convert<config> {
         get_option(node, rhs.generate_condition_statements);
         get_option(node, rhs.generate_message_comments);
         get_option(node, rhs.message_comment_width);
+        get_option(node, rhs.type_aliases);
 
         rhs.base_directory.set(node["__parent_path"].as<std::string>());
         get_option(node, rhs.get_relative_to());
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index 5a79a309..5b02b279 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -114,8 +114,8 @@ bool translation_unit_visitor::VisitCXXRecordDecl(
     forward_declarations_.erase(class_id);
 
     if (diagram().should_include(class_model)) {
-        LOG_DBG("Adding class {} with id {}", class_model.full_name(false),
-            class_model.id());
+        LOG_DBG("Adding class participant {} with id {}",
+            class_model.full_name(false), class_model.id());
 
         assert(class_model.id() == class_id);
 
@@ -166,7 +166,8 @@ bool translation_unit_visitor::VisitClassTemplateDecl(
     forward_declarations_.erase(id);
 
     if (diagram().should_include(*class_model_ptr)) {
-        LOG_DBG("Adding class template {} with id {}", class_full_name, id);
+        LOG_DBG("Adding class template participant {} with id {}",
+            class_full_name, id);
 
         context().set_caller_id(id);
         context().update(declaration);
@@ -212,7 +213,8 @@ bool translation_unit_visitor::VisitClassTemplateSpecializationDecl(
     forward_declarations_.erase(id);
 
     if (diagram().should_include(*template_specialization_ptr)) {
-        LOG_DBG("Adding class template specialization {} with id {}",
+        LOG_DBG(
+            "Adding class template specialization participant {} with id {}",
             class_full_name, id);
 
         context().set_caller_id(id);
@@ -2047,12 +2049,12 @@ void translation_unit_visitor::process_template_specialization_argument(
                 argument.set_type(type_name);
         }
 
-        LOG_TRACE("Adding template instantiation argument {}",
-            argument.to_string(config().using_namespace(), false));
-
         simplify_system_template(
             argument, argument.to_string(config().using_namespace(), false));
 
+        LOG_TRACE("Adding template instantiation argument {}",
+            argument.to_string(config().using_namespace(), false));
+
         template_instantiation.add_template(std::move(argument));
     }
     else if (argument_kind == clang::TemplateArgument::Integral) {
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.h b/src/sequence_diagram/visitor/translation_unit_visitor.h
index ddf10ab9..d1190096 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.h
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.h
@@ -312,7 +312,7 @@ private:
     bool should_include(const clang::ClassTemplateDecl *decl) const;
 
     /**
-     * @todo Refactor this group of methods to @ref template_builder
+     * @todo #227 Refactor this group of methods to @ref template_builder
      *
      * @{
      */
diff --git a/tests/t20039/.clang-uml b/tests/t20039/.clang-uml
new file mode 100644
index 00000000..ff038945
--- /dev/null
+++ b/tests/t20039/.clang-uml
@@ -0,0 +1,14 @@
+diagrams:
+  t20039_sequence:
+    type: sequence
+    glob:
+      - t20039.cc
+    include:
+      namespaces:
+        - clanguml::t20039
+    using_namespace: clanguml::t20039
+    type_aliases:
+      "std::vector<int>": int_vec_t
+      "std::map<int,int>": int_map_t
+    from:
+      - function: "clanguml::t20039::tmain()"
\ No newline at end of file
diff --git a/tests/t20039/t20039.cc b/tests/t20039/t20039.cc
new file mode 100644
index 00000000..62804d36
--- /dev/null
+++ b/tests/t20039/t20039.cc
@@ -0,0 +1,34 @@
+#include <map>
+#include <string>
+#include <vector>
+
+namespace clanguml {
+namespace t20039 {
+
+template <typename T> struct A {
+    std::vector<std::vector<T>> a(T p) { return {}; }
+};
+
+struct R {
+    A<int> a_int;
+    A<std::vector<int>> a_intvec;
+    A<std::map<int, int>> a_intmap;
+
+    void run()
+    {
+        a_int.a({});
+        a_intvec.a({});
+        a_intmap.a({});
+    }
+};
+
+int tmain()
+{
+    R r;
+
+    r.run();
+
+    return 0;
+}
+}
+}
\ No newline at end of file
diff --git a/tests/t20039/test_case.h b/tests/t20039/test_case.h
new file mode 100644
index 00000000..5c41852d
--- /dev/null
+++ b/tests/t20039/test_case.h
@@ -0,0 +1,63 @@
+/**
+ * tests/t20039/test_case.h
+ *
+ * Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t20039", "[test-case][sequence]")
+{
+    auto [config, db] = load_config("t20039");
+
+    auto diagram = config.diagrams["t20039_sequence"];
+
+    REQUIRE(diagram->name == "t20039_sequence");
+
+    auto model = generate_sequence_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t20039_sequence");
+
+    {
+        auto src = generate_sequence_puml(diagram, *model);
+        AliasMatcher _A(src);
+
+        REQUIRE_THAT(src, StartsWith("@startuml"));
+        REQUIRE_THAT(src, EndsWith("@enduml\n"));
+
+        // Check if all calls exist
+        REQUIRE_THAT(src, HasCall(_A("tmain()"), _A("R"), "run()"));
+        REQUIRE_THAT(src, HasCall(_A("R"), _A("A<int>"), "a(int)"));
+        REQUIRE_THAT(src, HasCall(_A("R"), _A("A<int_vec_t>"), "a(int_vec_t)"));
+        REQUIRE_THAT(src, HasCall(_A("R"), _A("A<int_map_t>"), "a(int_map_t)"));
+
+        save_puml(config.output_directory(), diagram->name + ".puml", src);
+    }
+
+    {
+        auto j = generate_sequence_json(diagram, *model);
+
+        using namespace json;
+
+        save_json(config.output_directory(), diagram->name + ".json", j);
+    }
+
+    {
+        auto src = generate_sequence_mermaid(diagram, *model);
+
+        mermaid::AliasMatcher _A(src);
+        using mermaid::IsClass;
+
+        save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
+    }
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index e49cc89d..260730d5 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -458,6 +458,7 @@ using namespace clanguml::test::matchers;
 #include "t20036/test_case.h"
 #include "t20037/test_case.h"
 #include "t20038/test_case.h"
+#include "t20039/test_case.h"
 
 ///
 /// Package diagram tests
diff --git a/tests/test_cases.yaml b/tests/test_cases.yaml
index 544070c7..5bc0fba0 100644
--- a/tests/test_cases.yaml
+++ b/tests/test_cases.yaml
@@ -328,6 +328,9 @@ test_cases:
     - name: t20038
       title: Sequence diagram comment decorator test case
       description:
+    - name: t20039
+      title: Test case for type aliases config option in sequence diagrams
+      description:
   Package diagrams:
     - name: t30001
       title: Basic package diagram test case
diff --git a/tests/test_config.cc b/tests/test_config.cc
index 7008b690..c31872c2 100644
--- a/tests/test_config.cc
+++ b/tests/test_config.cc
@@ -410,6 +410,37 @@ TEST_CASE("Test config full clang uml dump", "[unit-test]")
     CHECK(cfg.diagrams.size() == 32);
 }
 
+TEST_CASE("Test config type aliases", "[unit-test]")
+{
+    auto cfg = clanguml::config::load("./test_config_data/type_aliases.yml");
+
+    CHECK(cfg.diagrams.size() == 2);
+    auto &def = *cfg.diagrams["class_diagram"];
+    CHECK(
+        def.simplify_template_type(
+            "ns1::ns2::container<ns2::key_t,ns2::value_t>") == "custom_map_t");
+    CHECK(def.simplify_template_type(
+              "ns1::ns2::container<ns1::ns2::key_t,std::string>") ==
+        "string_map_t");
+    CHECK(
+        def.simplify_template_type("std::basic_string<char>") == "std::string");
+    CHECK(def.simplify_template_type("std::basic_string<char32_t>") ==
+        "unicode_t");
+
+    def = *cfg.diagrams["sequence_diagram"];
+    CHECK(
+        def.simplify_template_type(
+            "ns1::ns2::container<ns2::key_t,ns2::value_t>") == "custom_map_t");
+    CHECK(def.simplify_template_type(
+              "ns1::ns2::Object::iterator<std::weak_ptr<Object> "
+              "*,std::vector<std::weak_ptr<Object>,std::allocator<std::weak_"
+              "ptr<Object>>>>") == "ObjectPtrIt");
+    CHECK(
+        def.simplify_template_type("std::basic_string<char>") == "std::string");
+    CHECK(def.simplify_template_type("std::vector<std::basic_string<char>>") ==
+        "std::vector<std::string>");
+}
+
 ///
 /// Main test function
 ///
diff --git a/tests/test_config_data/type_aliases.yml b/tests/test_config_data/type_aliases.yml
new file mode 100644
index 00000000..75775618
--- /dev/null
+++ b/tests/test_config_data/type_aliases.yml
@@ -0,0 +1,17 @@
+type_aliases:
+  "ns1::ns2::container<ns2::key_t,ns2::value_t>": custom_map_t
+diagrams:
+  class_diagram:
+    type: class
+    glob:
+      - test.cc
+    type_aliases:
+      "ns1::ns2::container<ns1::ns2::key_t,std::string>": string_map_t
+      "std::basic_string<char32_t>": unicode_t
+  sequence_diagram:
+    type: class
+    relative_to: .
+    glob:
+      - test.cc
+    type_aliases:
+      "ns1::ns2::Object::iterator<std::weak_ptr<Object> *,std::vector<std::weak_ptr<Object>,std::allocator<std::weak_ptr<Object>>>>": "ObjectPtrIt"

From 3fcb00e8eb38e5b9b76eaf306048df16b2727330 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Thu, 11 Jan 2024 12:20:27 +0100
Subject: [PATCH 21/24] Updated docs on C++20 modules

---
 README.md                |  1 +
 docs/class_diagrams.md   | 38 +++++++++++++++++++++++++
 docs/diagram_filters.md  | 60 ++++++++++++++++++++++++++++------------
 docs/package_diagrams.md | 27 +++++++++++++++---
 4 files changed, 104 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 67741c32..1b0d3cec 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ Main features supported so far include:
     * Diagram content filtering based on namespaces, elements and relationships - [_example_](docs/test_cases/t00040.md)
     * Optional package generation from namespaces (only PlantUML) - [_example_](docs/test_cases/t00036.md)
     * Optional package generation from subdirectories (only PlantUML) - [_example_](docs/test_cases/t00065.md)
+    * Optional package generation from C++20 modules (only PlantUML) - [_example_](docs/test_cases/t00071.md)
     * Interactive links to online code or docs for classes, methods and class fields in SVG diagrams - [_example_](https://raw.githubusercontent.com/bkryza/clang-uml/master/docs/test_cases/t00002_class.svg)
     * Support for plain C99/C11 code (struct, units and their relationships) - [_example_](docs/test_cases/t00057.md)
     * C++20 concept constraints - [_example_](docs/test_cases/t00059.md)
diff --git a/docs/class_diagrams.md b/docs/class_diagrams.md
index a652f2dd..ac6a670b 100644
--- a/docs/class_diagrams.md
+++ b/docs/class_diagrams.md
@@ -8,6 +8,9 @@
   * [Relationships to classes in containers or smart pointers](#relationships-to-classes-in-containers-or-smart-pointers)
 * [Inheritance diagrams](#inheritance-diagrams)
 * [Generating UML packages in the diagram](#generating-uml-packages-in-the-diagram)
+  * [Namespace packages](#namespace-packages)
+  * [Directory packages](#directory-packages)
+  * [Module packages](#module-packages)
 * [Class context diagram](#class-context-diagram)
 * [Disabling dependency relationships](#disabling-dependency-relationships)
 
@@ -132,6 +135,15 @@ rendered. This can be easily achieved in `clang-uml` through inclusion filters:
 ```
 
 ## Generating UML packages in the diagram
+`clang-uml` supports 3 sources for generating UML packages in a diagram:
+* `namespace` - default
+* `directory` - based on relative directory paths within the project source tree
+* `module` - based on C++20 modules
+
+Currently, a specific diagram can only contain packages of one of the above
+types.
+
+### Namespace packages
 By default, `clang-uml` will render all element names including a namespace
 (relative to `using_namespace` property), e.g. `ns1::ns2::MyClass`.
 In order to generate packages in the diagram for each namespace instead, the
@@ -145,6 +157,7 @@ which results in the following diagram:
 
 ![t00036_class](test_cases/t00036_class.svg)
 
+### Directory packages
 In case the code base is structured based on subdirectory instead of namespaces
 (or this is a C project, where namespaces are not available), packages can be
 generated based on the location of a given declaration in the filesystem tree,
@@ -162,6 +175,31 @@ which results in the following diagram:
 > properly configured for your project, if necessary add `relative_to` option to
 > denote the root path against which all relative paths in the config file are
 > calculated.
+ 
+### Module packages
+Finally, to generate UML packages in the diagram based on C++20 modules, use
+the following option:
+
+```yaml
+package_type: module
+```
+
+which can produce the following diagram:
+
+![t00071_class](test_cases/t00071_class.svg)
+
+Packages from modules support internal module partitions, which are represented
+by `:` prefix in the name as well as conventional submodules separated by `.`.
+
+Module paths can be rendered relative to a specific parent module, to enable
+this add the following option:
+```yaml
+using_module: mod1.mod2
+```
+which will render modules relative to `mod1.mod2`.
+
+For examples of this feature check out the following test cases documentation:
+[t00071](test_cases/t00072.md) and [t00072](test_cases/t00072.md).
 
 ## Class context diagram
 Sometimes it's helpful to generate a class diagram depicting only direct
diff --git a/docs/diagram_filters.md b/docs/diagram_filters.md
index 3bfd9f38..759b7c49 100644
--- a/docs/diagram_filters.md
+++ b/docs/diagram_filters.md
@@ -3,6 +3,7 @@
 <!-- toc -->
 
 * [namespaces](#namespaces)
+* [modules](#modules)
 * [elements](#elements)
 * [element_types](#element_types)
 * [paths](#paths)
@@ -12,6 +13,7 @@
 * [parents](#parents)
 * [specializations](#specializations)
 * [access](#access)
+* [module_access](#module_access)
 * [method_types](#method_types)
 * [callee_types](#callee_types)
 * [dependants and dependencies](#dependants-and-dependencies)
@@ -56,22 +58,24 @@ exclude:
 
 The following table specifies the values allowed in each filter:
 
-| Filter name       | Possible values                  | Example values                                                                                                         |
-|-------------------|----------------------------------|------------------------------------------------------------------------------------------------------------------------|
-| `namespaces`      | Qualified name or regex          | ```ns1::ns2::ClassA```, ```r: '.*detail.*'```                                                                            |
-| `elements`        | Qualified name or regex          | ```ns1::ns2::ClassA```, ```r: '.*detail.*'```                                                                            |
-| `element_types`   | Types of diagram elements        | ```class```, ```enum```, ```concept```                                                                                        |
-| `paths`           | File or dir path or glob pattern | ```src/dir1```, ```src/dir2/a.cpp```, ```src/dir3/*.cpp```                                                                    |
-| `context`         | Qualified name or regex          | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                        |
-| `relationships`   | Type of relationship             | ```inheritance```, ```composition```, ```aggregation```, ```ownership```, ```association```, ```instantiation```, ```friendship```, ```dependency``` |
-| `subclasses`      | Qualified name or regex          | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                         |
-| `parents`         | Qualified name or regex          | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                         |
-| `specializations` | Qualified name or regex          | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                         |
-| `access`          | Method or member access scope    | ```public```, ```protected```, ```private```                                                                                  |
-| `method_types`    | Type of class method             | ```constructor```, ```destructor```, ```assignment```, ```operator```, ```defaulted```, ```deleted```, ```static```                          |
-| `dependants`      | Qualified name or regex          | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                         |
-| `dependencies`    | Qualified name or regex          | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                         |
-| `callee_types`    | Callee types in sequence diagrams| ```constructor```, ```assignment```, ```operator```, ```defaulted```, ```static```, ```method```, ```function```, ```function_template```, ```lambda``` |
+| Filter name       | Possible values                   | Example values                                                                                                                                          |
+|-------------------|-----------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `namespaces`      | Qualified name or regex           | ```ns1::ns2::ClassA```, ```r: '.*detail.*'```                                                                                                           |
+| `modules`         | Qualified name or regex           | ```mod1.mod2:par1```, ```r: '.*impl.*'```                                                                                                               |
+| `elements`        | Qualified name or regex           | ```ns1::ns2::ClassA```, ```r: '.*detail.*'```                                                                                                           |
+| `element_types`   | Types of diagram elements         | ```class```, ```enum```, ```concept```                                                                                                                  |
+| `paths`           | File or dir path or glob pattern  | ```src/dir1```, ```src/dir2/a.cpp```, ```src/dir3/*.cpp```                                                                                              |
+| `context`         | Qualified name or regex           | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                                                   |
+| `relationships`   | Type of relationship              | ```inheritance```, ```composition```, ```aggregation```, ```ownership```, ```association```, ```instantiation```, ```friendship```, ```dependency```    |
+| `subclasses`      | Qualified name or regex           | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                                                   |
+| `parents`         | Qualified name or regex           | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                                                   |
+| `specializations` | Qualified name or regex           | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                                                   |
+| `access`          | Method or member access scope     | ```public```, ```protected```, ```private```                                                                                                            |
+| `module_access`   | Module access scope               | ```public```, ```private```                                                                                                            |
+| `method_types`    | Type of class method              | ```constructor```, ```destructor```, ```assignment```, ```operator```, ```defaulted```, ```deleted```, ```static```                                     |
+| `dependants`      | Qualified name or regex           | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                                                   |
+| `dependencies`    | Qualified name or regex           | ```ns1::ns2::ClassA```, ```r: 'ns1::ns2::ClassA.+'```                                                                                                   |
+| `callee_types`    | Callee types in sequence diagrams | ```constructor```, ```assignment```, ```operator```, ```defaulted```, ```static```, ```method```, ```function```, ```function_template```, ```lambda``` |
 
 The following filters are available:
 
@@ -88,6 +92,19 @@ Allows to include or exclude entities from specific namespaces.
       - ns1::ns2::detail
 ```
 
+## modules
+
+Allows to include or exclude entities from specific C++20 module.
+
+```yaml
+  include:
+    modules:
+      - mod1.mod2
+  exclude:
+    modules:
+      - r: ".*impl.*"
+```
+
 ## elements
 
 Allows to directly include or exclude specific entities from the diagrams, for instance to exclude a specific class
@@ -199,15 +216,22 @@ This filter allows to include or exclude specializations and instantiations of a
 
 ## access
 
-This filter allows to include or exclude class methods and members based on their access scope, allowed values ar:
+This filter allows to include or exclude class methods and members based on their access scope, allowed values are:
 
   * `public`
   * `protected`
   * `private`
 
+## module_access
+
+This filter allows to include or exclude diagram elements based on the module in which they are declared, allowed values are:
+
+* `public`
+* `private`
+
 ## method_types
 
-This filter allows to include or exclude various method types from the class diagram, allowed values ar:
+This filter allows to include or exclude various method types from the class diagram, allowed values are:
   * `constructor`
   * `destructor`
   * `assignment`
diff --git a/docs/package_diagrams.md b/docs/package_diagrams.md
index 5e542be2..952436c6 100644
--- a/docs/package_diagrams.md
+++ b/docs/package_diagrams.md
@@ -153,12 +153,31 @@ results the following diagram:
 ![package_deps](./test_cases/t30002_package.svg)
 
 By default, packages are generated from C++ namespaces in the code. However,
-they can also be generated from the subdirectories in the filesystem tree by 
-adding the following option to the configuration file:
+they can also be generated from the subdirectories in the filesystem tree or
+based on C++20 modules
+
+Subdirectory based packages can be enabled by adding the following option to
+the configuration file:
 
 ```yaml
 package_type: directory
 ```
 
-for example checkout this diagram
-![t30011_package](./test_cases/t30011_package.svg)
\ No newline at end of file
+for example check out this diagram
+![t30011_package](./test_cases/t30011_package.svg)
+
+Module based packages can be enabled using the following option:
+
+```yaml
+package_type: module
+```
+
+for example check out this diagram
+![t30014_package](./test_cases/t30011_package.svg)
+
+Diagrams can be rendered relative to a specific module using `using_module`
+option:
+
+```yaml
+using_module: mod1.mod2
+```

From fb2edd51aa8611313aed2688833c455df2339211 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Thu, 11 Jan 2024 13:00:45 +0100
Subject: [PATCH 22/24] Updated test cases documentation

---
 docs/test_cases.md                          |   1 +
 docs/test_cases/t00002_class.svg            |  68 ++---
 docs/test_cases/t00002_class_mermaid.svg    |  10 +-
 docs/test_cases/t00003_class.svg            | 126 ++++-----
 docs/test_cases/t00003_class_mermaid.svg    |   2 +-
 docs/test_cases/t00004_class.svg            |  86 +++---
 docs/test_cases/t00004_class_mermaid.svg    |  32 +--
 docs/test_cases/t00005_class.svg            | 110 ++++----
 docs/test_cases/t00005_class_mermaid.svg    |  24 +-
 docs/test_cases/t00006_class.svg            | 134 ++++-----
 docs/test_cases/t00006_class_mermaid.svg    |  38 +--
 docs/test_cases/t00007_class.svg            |  30 +--
 docs/test_cases/t00007_class_mermaid.svg    |   8 +-
 docs/test_cases/t00008_class.svg            |  82 +++---
 docs/test_cases/t00008_class_mermaid.svg    |  16 +-
 docs/test_cases/t00009_class.svg            |  38 +--
 docs/test_cases/t00009_class_mermaid.svg    |  10 +-
 docs/test_cases/t00010_class.svg            |  38 +--
 docs/test_cases/t00010_class_mermaid.svg    |  10 +-
 docs/test_cases/t00011_class.svg            |  30 +--
 docs/test_cases/t00011_class_mermaid.svg    |   6 +-
 docs/test_cases/t00012_class.svg            |  76 +++---
 docs/test_cases/t00012_class_mermaid.svg    |  18 +-
 docs/test_cases/t00013_class.svg            | 130 ++++-----
 docs/test_cases/t00013_class_mermaid.svg    |  24 +-
 docs/test_cases/t00014_class.svg            | 146 +++++-----
 docs/test_cases/t00014_class_mermaid.svg    |  36 +--
 docs/test_cases/t00015_class.svg            |  22 +-
 docs/test_cases/t00015_class_mermaid.svg    |  10 +-
 docs/test_cases/t00016_class.svg            |  26 +-
 docs/test_cases/t00016_class_mermaid.svg    |  12 +-
 docs/test_cases/t00017_class.svg            |  70 ++---
 docs/test_cases/t00017_class_mermaid.svg    |  24 +-
 docs/test_cases/t00018_class.svg            |  66 ++---
 docs/test_cases/t00018_class_mermaid.svg    |   4 +-
 docs/test_cases/t00019_class.svg            |  84 +++---
 docs/test_cases/t00019_class_mermaid.svg    |  16 +-
 docs/test_cases/t00020_class.svg            |  94 +++----
 docs/test_cases/t00020_class_mermaid.svg    |  18 +-
 docs/test_cases/t00021_class.svg            |  82 +++---
 docs/test_cases/t00021_class_mermaid.svg    |  14 +-
 docs/test_cases/t00022_class.svg            |  42 +--
 docs/test_cases/t00022_class_mermaid.svg    |   6 +-
 docs/test_cases/t00023_class.svg            |  54 ++--
 docs/test_cases/t00023_class_mermaid.svg    |  10 +-
 docs/test_cases/t00024_class.svg            |  62 ++---
 docs/test_cases/t00024_class_mermaid.svg    |   8 +-
 docs/test_cases/t00025_class.svg            |  66 ++---
 docs/test_cases/t00025_class_mermaid.svg    |  12 +-
 docs/test_cases/t00026_class.svg            |  82 +++---
 docs/test_cases/t00026_class_mermaid.svg    |  12 +-
 docs/test_cases/t00027_class.svg            |  98 +++----
 docs/test_cases/t00027_class_mermaid.svg    |  26 +-
 docs/test_cases/t00028_class.svg            |  88 +++---
 docs/test_cases/t00028_class_mermaid.svg    |  18 +-
 docs/test_cases/t00029_class.svg            |  58 ++--
 docs/test_cases/t00029_class_mermaid.svg    |  18 +-
 docs/test_cases/t00030_class.svg            |  46 ++--
 docs/test_cases/t00030_class_mermaid.svg    |  12 +-
 docs/test_cases/t00031_class.svg            |  56 ++--
 docs/test_cases/t00031_class_mermaid.svg    |  12 +-
 docs/test_cases/t00032_class.svg            |  54 ++--
 docs/test_cases/t00032_class_mermaid.svg    |  16 +-
 docs/test_cases/t00033_class.svg            |  54 ++--
 docs/test_cases/t00033_class_mermaid.svg    |  16 +-
 docs/test_cases/t00034_class.svg            |  46 ++--
 docs/test_cases/t00034_class_mermaid.svg    |  14 +-
 docs/test_cases/t00035_class.svg            |  22 +-
 docs/test_cases/t00035_class_mermaid.svg    |  10 +-
 docs/test_cases/t00036_class.svg            |  40 +--
 docs/test_cases/t00036_class_mermaid.svg    |  10 +-
 docs/test_cases/t00037_class.svg            |  58 ++--
 docs/test_cases/t00037_class_mermaid.svg    |   8 +-
 docs/test_cases/t00038_class.svg            |  54 ++--
 docs/test_cases/t00038_class_mermaid.svg    |  24 +-
 docs/test_cases/t00039_class.svg            |  78 +++---
 docs/test_cases/t00039_class_mermaid.svg    |  28 +-
 docs/test_cases/t00040_class.svg            |  38 +--
 docs/test_cases/t00040_class_mermaid.svg    |   8 +-
 docs/test_cases/t00041_class.svg            |  58 ++--
 docs/test_cases/t00041_class_mermaid.svg    |  18 +-
 docs/test_cases/t00042_class.svg            |  42 +--
 docs/test_cases/t00042_class_mermaid.svg    |  12 +-
 docs/test_cases/t00043_class.svg            |  90 +++----
 docs/test_cases/t00043_class_mermaid.svg    |  22 +-
 docs/test_cases/t00044_class.svg            |  42 +--
 docs/test_cases/t00044_class_mermaid.svg    |  14 +-
 docs/test_cases/t00045_class.svg            |  74 ++---
 docs/test_cases/t00045_class_mermaid.svg    |  24 +-
 docs/test_cases/t00046_class.svg            |  66 ++---
 docs/test_cases/t00046_class_mermaid.svg    |  18 +-
 docs/test_cases/t00047_class.svg            |  18 +-
 docs/test_cases/t00047_class_mermaid.svg    |   8 +-
 docs/test_cases/t00048_class.svg            |  74 ++---
 docs/test_cases/t00048_class_mermaid.svg    |  12 +-
 docs/test_cases/t00049_class.svg            |  50 ++--
 docs/test_cases/t00049_class_mermaid.svg    |  10 +-
 docs/test_cases/t00050_class.svg            |  70 ++---
 docs/test_cases/t00050_class_mermaid.svg    |  16 +-
 docs/test_cases/t00051_class.svg            |  82 +++---
 docs/test_cases/t00051_class_mermaid.svg    |  10 +-
 docs/test_cases/t00052_class.svg            |  42 +--
 docs/test_cases/t00052_class_mermaid.svg    |  12 +-
 docs/test_cases/t00053_class.svg            |  70 ++---
 docs/test_cases/t00053_class_mermaid.svg    |  34 +--
 docs/test_cases/t00054_class.svg            |  78 +++---
 docs/test_cases/t00054_class_mermaid.svg    |  34 +--
 docs/test_cases/t00055_class.svg            |  42 +--
 docs/test_cases/t00055_class_mermaid.svg    |  20 +-
 docs/test_cases/t00056_class.svg            |  94 +++----
 docs/test_cases/t00056_class_mermaid.svg    |  28 +-
 docs/test_cases/t00057_class.svg            | 126 ++++-----
 docs/test_cases/t00057_class_mermaid.svg    |  20 +-
 docs/test_cases/t00058_class.svg            |  54 ++--
 docs/test_cases/t00058_class_mermaid.svg    |  16 +-
 docs/test_cases/t00059_class.svg            |  94 +++----
 docs/test_cases/t00059_class_mermaid.svg    |  22 +-
 docs/test_cases/t00060_class.svg            |  38 +--
 docs/test_cases/t00060_class_mermaid.svg    |  12 +-
 docs/test_cases/t00061_class.svg            |   6 +-
 docs/test_cases/t00061_class_mermaid.svg    |   2 +-
 docs/test_cases/t00062_class.svg            | 198 +++++++-------
 docs/test_cases/t00062_class_mermaid.svg    |  44 +--
 docs/test_cases/t00063_class.svg            |   6 +-
 docs/test_cases/t00063_class_mermaid.svg    |   2 +-
 docs/test_cases/t00064_class.svg            | 118 ++++----
 docs/test_cases/t00064_class_mermaid.svg    |  46 ++--
 docs/test_cases/t00065_class.svg            | 102 +++----
 docs/test_cases/t00065_class_mermaid.svg    |  24 +-
 docs/test_cases/t00066_class.svg            | 126 ++++-----
 docs/test_cases/t00066_class_mermaid.svg    |   2 +-
 docs/test_cases/t00067_class.svg            |  86 +++---
 docs/test_cases/t00067_class_mermaid.svg    |   2 +-
 docs/test_cases/t00068_r0_class.svg         |  14 +-
 docs/test_cases/t00068_r0_class_mermaid.svg |   2 +-
 docs/test_cases/t00068_r1_class.svg         |  38 +--
 docs/test_cases/t00068_r1_class_mermaid.svg |  10 +-
 docs/test_cases/t00068_r2_class.svg         |  54 ++--
 docs/test_cases/t00068_r2_class_mermaid.svg |  16 +-
 docs/test_cases/t00069_class.svg            |  74 ++---
 docs/test_cases/t00069_class_mermaid.svg    |   8 +-
 docs/test_cases/t00070_class.svg            |  30 +--
 docs/test_cases/t00070_class_mermaid.svg    |   8 +-
 docs/test_cases/t00071_class.svg            |  80 +++---
 docs/test_cases/t00071_class_mermaid.svg    |  20 +-
 docs/test_cases/t00072_class.svg            |  64 ++---
 docs/test_cases/t00072_class_mermaid.svg    |  18 +-
 docs/test_cases/t20001_sequence.svg         |  78 +++---
 docs/test_cases/t20002_sequence.svg         |  48 ++--
 docs/test_cases/t20003_sequence.svg         |  48 ++--
 docs/test_cases/t20004_sequence.svg         | 120 ++++-----
 docs/test_cases/t20005_sequence.svg         |  36 +--
 docs/test_cases/t20006_sequence.svg         | 162 +++++------
 docs/test_cases/t20007_sequence.svg         |  48 ++--
 docs/test_cases/t20008_sequence.svg         |  84 +++---
 docs/test_cases/t20009_sequence.svg         |  84 +++---
 docs/test_cases/t20010_sequence.svg         |  72 ++---
 docs/test_cases/t20011_sequence.svg         |  72 ++---
 docs/test_cases/t20012_sequence.svg         | 198 +++++++-------
 docs/test_cases/t20013_sequence.svg         |  60 ++---
 docs/test_cases/t20014_sequence.svg         |  72 ++---
 docs/test_cases/t20015_sequence.svg         |  24 +-
 docs/test_cases/t20016_sequence.svg         |  48 ++--
 docs/test_cases/t20017_sequence.svg         |  48 ++--
 docs/test_cases/t20018_sequence.svg         |  96 +++----
 docs/test_cases/t20019_sequence.svg         |  84 +++---
 docs/test_cases/t20020_sequence.svg         | 124 ++++-----
 docs/test_cases/t20021_sequence.svg         | 106 ++++----
 docs/test_cases/t20022_sequence.svg         |  42 +--
 docs/test_cases/t20023_sequence.svg         |  50 ++--
 docs/test_cases/t20024_sequence.svg         |  88 +++---
 docs/test_cases/t20025_sequence.svg         |  36 +--
 docs/test_cases/t20026_sequence.svg         |  24 +-
 docs/test_cases/t20027_sequence.svg         |  24 +-
 docs/test_cases/t20028_sequence.svg         |  44 +--
 docs/test_cases/t20029_sequence.svg         |  88 +++---
 docs/test_cases/t20030_sequence.svg         | 112 ++++----
 docs/test_cases/t20031_sequence.svg         |  58 ++--
 docs/test_cases/t20032_sequence.svg         |  60 ++---
 docs/test_cases/t20033_sequence.svg         | 128 ++++-----
 docs/test_cases/t20034_sequence.svg         |  76 +++---
 docs/test_cases/t20035_sequence.svg         |  32 +--
 docs/test_cases/t20036_sequence.svg         |  64 ++---
 docs/test_cases/t20037_sequence.svg         | 108 ++++----
 docs/test_cases/t20038_sequence.svg         | 174 ++++++------
 docs/test_cases/t20039.md                   | 285 ++++++++++++++++++++
 docs/test_cases/t20039_sequence.svg         |  84 ++++++
 docs/test_cases/t20039_sequence_mermaid.svg | 144 ++++++++++
 docs/test_cases/t30001_package.svg          |  48 ++--
 docs/test_cases/t30002_package.svg          |  94 +++----
 docs/test_cases/t30003_package.svg          |  26 +-
 docs/test_cases/t30004_package.svg          |  30 +--
 docs/test_cases/t30005_package.svg          |  38 +--
 docs/test_cases/t30006_package.svg          |  16 +-
 docs/test_cases/t30007_package.svg          |  20 +-
 docs/test_cases/t30008_package.svg          |  34 +--
 docs/test_cases/t30009_package.svg          |  42 +--
 docs/test_cases/t30010_package.svg          |  24 +-
 docs/test_cases/t30011_package.svg          |  24 +-
 docs/test_cases/t30012_package.svg          |  20 +-
 docs/test_cases/t30013_package.svg          |  78 +++---
 docs/test_cases/t30014_package.svg          |  16 +-
 docs/test_cases/t30015_package.svg          |  80 +++---
 docs/test_cases/t40001.md                   |   5 +
 docs/test_cases/t40001_include.svg          |  28 +-
 docs/test_cases/t40001_include_mermaid.svg  |   6 +-
 docs/test_cases/t40002.md                   |   2 +
 docs/test_cases/t40002_include.svg          |  34 +--
 docs/test_cases/t40002_include_mermaid.svg  |  10 +-
 docs/test_cases/t40003.md                   |   7 +
 docs/test_cases/t40003_include.svg          |  46 ++--
 docs/test_cases/t40003_include_mermaid.svg  |  18 +-
 212 files changed, 5404 insertions(+), 4876 deletions(-)
 create mode 100644 docs/test_cases/t20039.md
 create mode 100644 docs/test_cases/t20039_sequence.svg
 create mode 100644 docs/test_cases/t20039_sequence_mermaid.svg

diff --git a/docs/test_cases.md b/docs/test_cases.md
index 32b4da41..5252dd93 100644
--- a/docs/test_cases.md
+++ b/docs/test_cases.md
@@ -116,6 +116,7 @@
  * [t20036](./test_cases/t20036.md) - Test case for rendering all call chains leading to an activity (to)
  * [t20037](./test_cases/t20037.md) - Test case checking if activities in static variable declarations appear only once
  * [t20038](./test_cases/t20038.md) - Sequence diagram comment decorator test case
+ * [t20039](./test_cases/t20039.md) - Test case for type aliases config option in sequence diagrams
 ## Package diagrams
  * [t30001](./test_cases/t30001.md) - Basic package diagram test case
  * [t30002](./test_cases/t30002.md) - Package dependency test case
diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index d6cd675a..f2764550 100644
--- a/docs/test_cases/t00002_class.svg
+++ b/docs/test_cases/t00002_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="383px" preserveAspectRatio="none" style="width:562px;height:383px;" version="1.1" viewBox="0 0 562 383" width="562px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fwya91ve6c5a5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fcvdqjj6u7ehx" 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"/>
@@ -10,123 +10,123 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="250" x="160" y="16.708">Basic class diagram example</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="28.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcvdqjj6u7ehx)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="28.9531"/>
       <ellipse cx="348.25" cy="44.9531" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M348.3594,40.2969 L347.2031,45.375 L349.5313,45.375 L348.3594,40.2969 Z M346.875,38.0625 L349.8594,38.0625 L353.2188,50.4531 L350.7656,50.4531 L350,47.3906 L346.7188,47.3906 L345.9688,50.4531 L343.5313,50.4531 L346.875,38.0625 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.75" y="49.1074">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="60.9531" y2="60.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="66.9531"/>
       <ellipse cx="305" cy="71.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="314" y="75.1636">foo_a() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="79.7578"/>
       <ellipse cx="305" cy="84.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="314" y="87.9683">foo_c() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="94.5625" y2="94.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="163.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcvdqjj6u7ehx)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="163.9531"/>
       <ellipse cx="111.5" cy="179.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,185.5938 Q113.8906,185.8906 113.25,186.0313 Q112.6094,186.1875 111.9063,186.1875 Q109.4063,186.1875 108.0781,184.5469 Q106.7656,182.8906 106.7656,179.7656 Q106.7656,176.6406 108.0781,174.9844 Q109.4063,173.3281 111.9063,173.3281 Q112.6094,173.3281 113.25,173.4844 Q113.9063,173.6406 114.4688,173.9375 L114.4688,176.6563 Q113.8438,176.0781 113.25,175.8125 Q112.6563,175.5313 112.0313,175.5313 Q110.6875,175.5313 110,176.6094 Q109.3125,177.6719 109.3125,179.7656 Q109.3125,181.8594 110,182.9375 Q110.6875,184 112.0313,184 Q112.6563,184 113.25,183.7344 Q113.8438,183.4531 114.4688,182.875 L114.4688,185.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.5" y="184.1074">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="195.9531" y2="195.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="75.5" y="201.9531"/>
       <ellipse cx="80.5" cy="206.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="89.5" y="210.1636">foo_a() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="216.7578" y2="216.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="163.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcvdqjj6u7ehx)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="163.9531"/>
       <ellipse cx="348.55" cy="179.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.5188,185.5938 Q350.9406,185.8906 350.3,186.0313 Q349.6594,186.1875 348.9563,186.1875 Q346.4563,186.1875 345.1281,184.5469 Q343.8156,182.8906 343.8156,179.7656 Q343.8156,176.6406 345.1281,174.9844 Q346.4563,173.3281 348.9563,173.3281 Q349.6594,173.3281 350.3,173.4844 Q350.9563,173.6406 351.5188,173.9375 L351.5188,176.6563 Q350.8938,176.0781 350.3,175.8125 Q349.7063,175.5313 349.0813,175.5313 Q347.7375,175.5313 347.05,176.6094 Q346.3625,177.6719 346.3625,179.7656 Q346.3625,181.8594 347.05,182.9375 Q347.7375,184 349.0813,184 Q349.7063,184 350.3,183.7344 Q350.8938,183.4531 351.5188,182.875 L351.5188,185.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.45" y="184.1074">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="195.9531" y2="195.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="313" y="201.9531"/>
       <ellipse cx="318" cy="206.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="327" y="210.1636">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="216.7578" y2="216.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="285.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcvdqjj6u7ehx)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="285.9531"/>
       <ellipse cx="98.75" cy="301.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.7188,307.5938 Q101.1406,307.8906 100.5,308.0313 Q99.8594,308.1875 99.1563,308.1875 Q96.6563,308.1875 95.3281,306.5469 Q94.0156,304.8906 94.0156,301.7656 Q94.0156,298.6406 95.3281,296.9844 Q96.6563,295.3281 99.1563,295.3281 Q99.8594,295.3281 100.5,295.4844 Q101.1563,295.6406 101.7188,295.9375 L101.7188,298.6563 Q101.0938,298.0781 100.5,297.8125 Q99.9063,297.5313 99.2813,297.5313 Q97.9375,297.5313 97.25,298.6094 Q96.5625,299.6719 96.5625,301.7656 Q96.5625,303.8594 97.25,304.9375 Q97.9375,306 99.2813,306 Q99.9063,306 100.5,305.7344 Q101.0938,305.4531 101.7188,304.875 L101.7188,307.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="119.25" y="306.1074">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="317.9531" y2="317.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="323.9531"/>
       <ellipse cx="44.5" cy="328.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="53.5" y="332.1636">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="336.7578"/>
       <ellipse cx="44.5" cy="341.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="53.5" y="344.9683">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="351.5625" y2="351.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="357.5625"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="41.5" y="359.5625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="53.5" y="365.7729">as : std::vector&lt;A *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwya91ve6c5a5)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="285.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcvdqjj6u7ehx)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="285.9531"/>
       <ellipse cx="469.25" cy="301.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M472.2188,307.5938 Q471.6406,307.8906 471,308.0313 Q470.3594,308.1875 469.6563,308.1875 Q467.1563,308.1875 465.8281,306.5469 Q464.5156,304.8906 464.5156,301.7656 Q464.5156,298.6406 465.8281,296.9844 Q467.1563,295.3281 469.6563,295.3281 Q470.3594,295.3281 471,295.4844 Q471.6563,295.6406 472.2188,295.9375 L472.2188,298.6563 Q471.5938,298.0781 471,297.8125 Q470.4063,297.5313 469.7813,297.5313 Q468.4375,297.5313 467.75,298.6094 Q467.0625,299.6719 467.0625,301.7656 Q467.0625,303.8594 467.75,304.9375 Q468.4375,306 469.7813,306 Q470.4063,306 471,305.7344 Q471.5938,305.4531 472.2188,304.875 L472.2188,307.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="489.75" y="306.1074">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="317.9531" y2="317.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="323.9531"/>
       <ellipse cx="414.5" cy="328.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="423.5" y="332.1636">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="336.7578"/>
       <ellipse cx="414.5" cy="341.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="423.5" y="344.9683">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="351.5625" y2="351.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="357.5625"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="411.5" y="359.5625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="423.5" y="365.7729">as : std::vector&lt;A *&gt;</text>
     </a>
-    <path d="M150,53.4531 L150,78.5859 A0,0 0 0 0 150,78.5859 L259,78.5859 A0,0 0 0 0 259,78.5859 L259,71.4531 L293.74,65.9531 L259,63.4531 L259,63.4531 L249,53.4531 L150,53.4531 A0,0 0 0 0 150,53.4531 " fill="#FBFB77" filter="url(#fwya91ve6c5a5)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M150,53.4531 L150,78.5859 A0,0 0 0 0 150,78.5859 L259,78.5859 A0,0 0 0 0 259,78.5859 L259,71.4531 L293.74,65.9531 L259,63.4531 L259,63.4531 L249,53.4531 L150,53.4531 A0,0 0 0 0 150,53.4531 " fill="#FBFB77" filter="url(#fcvdqjj6u7ehx)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M249,53.4531 L249,63.4531 L259,63.4531 L249,53.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="156" y="70.52">This is class A</text>
-    <path d="M6,53.4531 L6,78.5859 A0,0 0 0 0 6,78.5859 L61.94,78.5859 L105.69,163.8331 L69.94,78.5859 L115,78.5859 A0,0 0 0 0 115,78.5859 L115,63.4531 L105,53.4531 L6,53.4531 A0,0 0 0 0 6,53.4531 " fill="#FBFB77" filter="url(#fwya91ve6c5a5)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,53.4531 L6,78.5859 A0,0 0 0 0 6,78.5859 L61.94,78.5859 L105.69,163.8331 L69.94,78.5859 L115,78.5859 A0,0 0 0 0 115,78.5859 L115,63.4531 L105,53.4531 L6,53.4531 A0,0 0 0 0 6,53.4531 " fill="#FBFB77" filter="url(#fcvdqjj6u7ehx)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M105,53.4531 L105,63.4531 L115,63.4531 L105,53.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="12" y="70.52">This is class B</text>
-    <path d="M217,285.9531 L217,324.9531 L181.57,328.9531 L217,332.9531 L217,371.6172 A0,0 0 0 0 217,371.6172 L368,371.6172 A0,0 0 0 0 368,371.6172 L368,295.9531 L358,285.9531 L217,285.9531 A0,0 0 0 0 217,285.9531 " fill="#FBFB77" filter="url(#fwya91ve6c5a5)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M217,285.9531 L217,324.9531 L181.57,328.9531 L217,332.9531 L217,371.6172 A0,0 0 0 0 217,371.6172 L368,371.6172 A0,0 0 0 0 368,371.6172 L368,295.9531 L358,285.9531 L217,285.9531 A0,0 0 0 0 217,285.9531 " fill="#FBFB77" filter="url(#fcvdqjj6u7ehx)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M358,285.9531 L358,295.9531 L368,295.9531 L358,285.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="235" y="303.02"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="223" y="318.1528">This is class D</text>
diff --git a/docs/test_cases/t00002_class_mermaid.svg b/docs/test_cases/t00002_class_mermaid.svg
index 691ba536..1b2258d6 100644
--- a/docs/test_cases/t00002_class_mermaid.svg
+++ b/docs/test_cases/t00002_class_mermaid.svg
@@ -169,7 +169,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L7">
+        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L7">
           <g title="This is class A" id="classId-C_0000987634239855407298-0" class="node default clickable">
             <rect height="123" width="117.734375" y="-61.5" x="-58.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
@@ -198,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L16">
+        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L16">
           <g title="This is class B" id="classId-C_0000594234458687375950-1" class="node default clickable">
             <rect height="79" width="117.734375" y="-39.5" x="-58.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L27">
+        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L27">
           <g title="This is class C - class C has a long comment" id="classId-C_0001142499429598587507-2" class="node default clickable">
             <rect height="79" width="116.828125" y="-39.5" x="-58.4140625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.4140625" x1="-58.4140625" class="divider"/>
@@ -246,7 +246,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L36">
+        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L36">
           <g title="D" id="classId-C_0000060950494980414724-3" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -280,7 +280,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00002/t00002.cc#L61">
+        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00002/t00002.cc#L61">
           <g title="E" id="classId-C_0002237886670308966220-4" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index 6c754497..d554e457 100644
--- a/docs/test_cases/t00003_class.svg
+++ b/docs/test_cases/t00003_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="486px" preserveAspectRatio="none" style="width:347px;height:486px;" version="1.1" viewBox="0 0 347 486" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fvtcx625gmrdm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fnvewdgr3j9kc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,227 +9,227 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvtcx625gmrdm)" height="468.9453" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnvewdgr3j9kc)" height="468.9453" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="53.2104">A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="66.0151">A(int i) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="78.8198">A(A &amp;&amp;) = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="91.6245">A(const A &amp;) = deleted : void</text>
     </a>
     <ellipse cx="18" cy="101.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="27" y="104.4292">A&lt;T&gt;(T t) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="117.2339">~A() = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="123.8281" y2="123.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="129.8281"/>
       <ellipse cx="18" cy="134.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="138.0386">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="142.6328"/>
       <ellipse cx="18" cy="147.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="150.8433">operator=(A &amp; other) noexcept : A &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="157.4375" y2="157.4375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="163.4375"/>
       <ellipse cx="18" cy="168.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="171.6479">operator++() : A &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="178.2422" y2="178.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="184.2422"/>
       <ellipse cx="18" cy="189.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="192.4526">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="197.0469"/>
       <ellipse cx="18" cy="202.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="205.2573">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="209.8516"/>
       <ellipse cx="18" cy="214.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="218.062">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="222.6563"/>
       <ellipse cx="18" cy="227.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="230.8667">create_from_int(int i) : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="235.4609"/>
       <ellipse cx="18" cy="240.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="243.6714">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="248.2656"/>
       <ellipse cx="18" cy="253.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="256.4761">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="261.0703"/>
       <ellipse cx="18" cy="266.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="269.2808">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="273.875"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="275.875"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="282.0854">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="286.6797"/>
       <polygon fill="#FFFF44" points="18,286.6797,22,290.6797,18,294.6797,14,290.6797" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="294.8901">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="299.4844"/>
       <ellipse cx="18" cy="304.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="195" x="27" y="307.6948">size() constexpr const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="312.2891"/>
       <ellipse cx="18" cy="317.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="320.4995">static_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="325.0938"/>
       <ellipse cx="18" cy="330.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="333.3042">sum(const double a, const double b) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="339.8984" y2="339.8984"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="345.8984"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="347.8984"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="354.1089">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="358.7031"/>
       <ellipse cx="18" cy="363.7031" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="366.9136">auto_member : const unsigned long</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="371.5078"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="373.5078"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="379.7183">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="384.3125"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="386.3125"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="392.5229">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="397.1172"/>
       <polygon fill="#FFFF44" points="18,397.1172,22,401.1172,18,405.1172,14,401.1172" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="405.3276">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="409.9219"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="411.9219"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="418.1323">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="422.7266"/>
       <polygon fill="none" points="18,422.7266,22,426.7266,18,430.7266,14,426.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="430.937">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="435.5313"/>
       <ellipse cx="18" cy="440.5313" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="443.7417">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="448.3359"/>
       <ellipse cx="18" cy="453.3359" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="456.5464">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="461.1406"/>
       <ellipse cx="18" cy="466.1406" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="469.3511">static_int : int</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00003_class_mermaid.svg b/docs/test_cases/t00003_class_mermaid.svg
index 6fc8ac36..e9e3f595 100644
--- a/docs/test_cases/t00003_class_mermaid.svg
+++ b/docs/test_cases/t00003_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00003/t00003.cc#L7">
+        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00003/t00003.cc#L7">
           <g title="A" id="classId-C_0001371951663534295727-0" class="node default clickable">
             <rect height="739" width="384.75" y="-369.5" x="-192.375" class="outer title-state"/>
             <line y2="-339.5" y1="-339.5" x2="192.375" x1="-192.375" class="divider"/>
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index f470643d..cdd34a5c 100644
--- a/docs/test_cases/t00004_class.svg
+++ b/docs/test_cases/t00004_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="374px" preserveAspectRatio="none" style="width:1071px;height:374px;" version="1.1" viewBox="0 0 1071 374" width="1071px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fj1haj28fkml1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ff7w0g2fnebeh" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
       <ellipse cx="33" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M35.9688,189.6406 Q35.3906,189.9375 34.75,190.0781 Q34.1094,190.2344 33.4063,190.2344 Q30.9063,190.2344 29.5781,188.5938 Q28.2656,186.9375 28.2656,183.8125 Q28.2656,180.6875 29.5781,179.0313 Q30.9063,177.375 33.4063,177.375 Q34.1094,177.375 34.75,177.5313 Q35.4063,177.6875 35.9688,177.9844 L35.9688,180.7031 Q35.3438,180.125 34.75,179.8594 Q34.1563,179.5781 33.5313,179.5781 Q32.1875,179.5781 31.5,180.6563 Q30.8125,181.7188 30.8125,183.8125 Q30.8125,185.9063 31.5,186.9844 Q32.1875,188.0469 33.5313,188.0469 Q34.1563,188.0469 34.75,187.7813 Q35.3438,187.5 35.9688,186.9219 L35.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="188.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M25.1094,30 L17.3906,30 L17.3906,17.6094 L25.1094,17.6094 L25.1094,19.7656 L19.8438,19.7656 L19.8438,22.4375 L24.6094,22.4375 L24.6094,24.5938 L19.8438,24.5938 L19.8438,27.8438 L25.1094,27.8438 L25.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="35" y="28.1543">B::AA</text>
@@ -28,38 +28,38 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
       <ellipse cx="232.75" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,311.6406 Q235.1406,311.9375 234.5,312.0781 Q233.8594,312.2344 233.1563,312.2344 Q230.6563,312.2344 229.3281,310.5938 Q228.0156,308.9375 228.0156,305.8125 Q228.0156,302.6875 229.3281,301.0313 Q230.6563,299.375 233.1563,299.375 Q233.8594,299.375 234.5,299.5313 Q235.1563,299.6875 235.7188,299.9844 L235.7188,302.7031 Q235.0938,302.125 234.5,301.8594 Q233.9063,301.5781 233.2813,301.5781 Q231.9375,301.5781 231.25,302.6563 Q230.5625,303.7188 230.5625,305.8125 Q230.5625,307.9063 231.25,308.9844 Q231.9375,310.0469 233.2813,310.0469 Q233.9063,310.0469 234.5,309.7813 Q235.0938,309.5 235.7188,308.9219 L235.7188,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="253.25" y="310.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="322" y2="322"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="328"/>
       <ellipse cx="187.5" cy="333" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="196.5" y="336.2104">foo() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="340.8047"/>
       <ellipse cx="187.5" cy="345.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="196.5" y="349.0151">foo2() const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="355.6094" y2="355.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
       <ellipse cx="224" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M226.9688,189.6406 Q226.3906,189.9375 225.75,190.0781 Q225.1094,190.2344 224.4063,190.2344 Q221.9063,190.2344 220.5781,188.5938 Q219.2656,186.9375 219.2656,183.8125 Q219.2656,180.6875 220.5781,179.0313 Q221.9063,177.375 224.4063,177.375 Q225.1094,177.375 225.75,177.5313 Q226.4063,177.6875 226.9688,177.9844 L226.9688,180.7031 Q226.3438,180.125 225.75,179.8594 Q225.1563,179.5781 224.5313,179.5781 Q223.1875,179.5781 222.5,180.6563 Q221.8125,181.7188 221.8125,183.8125 Q221.8125,185.9063 222.5,186.9844 Q223.1875,188.0469 224.5313,188.0469 Q225.1563,188.0469 225.75,187.7813 Q226.3438,187.5 226.9688,186.9219 L226.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="238" y="188.1543">A::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
       <ellipse cx="120.5" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.6094,30 L116.8906,30 L116.8906,17.6094 L124.6094,17.6094 L124.6094,19.7656 L119.3438,19.7656 L119.3438,22.4375 L124.1094,22.4375 L124.1094,24.5938 L119.3438,24.5938 L119.3438,27.8438 L124.6094,27.8438 L124.6094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="77" x="134.5" y="28.1543">A::AA::Lights</text>
@@ -69,16 +69,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="111.5" y="79.8198">Red</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
       <ellipse cx="265" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M267.9688,48.6406 Q267.3906,48.9375 266.75,49.0781 Q266.1094,49.2344 265.4063,49.2344 Q262.9063,49.2344 261.5781,47.5938 Q260.2656,45.9375 260.2656,42.8125 Q260.2656,39.6875 261.5781,38.0313 Q262.9063,36.375 265.4063,36.375 Q266.1094,36.375 266.75,36.5313 Q267.4063,36.6875 267.9688,36.9844 L267.9688,39.7031 Q267.3438,39.125 266.75,38.8594 Q266.1563,38.5781 265.5313,38.5781 Q264.1875,38.5781 263.5,39.6563 Q262.8125,40.7188 262.8125,42.8125 Q262.8125,44.9063 263.5,45.9844 Q264.1875,47.0469 265.5313,47.0469 Q266.1563,47.0469 266.75,46.7813 Q267.3438,46.5 267.9688,45.9219 L267.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="279" y="47.1543">A::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
       <ellipse cx="433" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M435.9688,48.6406 Q435.3906,48.9375 434.75,49.0781 Q434.1094,49.2344 433.4063,49.2344 Q430.9063,49.2344 429.5781,47.5938 Q428.2656,45.9375 428.2656,42.8125 Q428.2656,39.6875 429.5781,38.0313 Q430.9063,36.375 433.4063,36.375 Q434.1094,36.375 434.75,36.5313 Q435.4063,36.6875 435.9688,36.9844 L435.9688,39.7031 Q435.3438,39.125 434.75,38.8594 Q434.1563,38.5781 433.5313,38.5781 Q432.1875,38.5781 431.5,39.6563 Q430.8125,40.7188 430.8125,42.8125 Q430.8125,44.9063 431.5,45.9844 Q432.1875,47.0469 433.5313,47.0469 Q434.1563,47.0469 434.75,46.7813 Q435.3438,46.5 435.9688,45.9219 L435.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="447" y="47.1543">C::B</text>
@@ -87,8 +87,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
       <ellipse cx="529.8" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M532.7688,311.6406 Q532.1906,311.9375 531.55,312.0781 Q530.9094,312.2344 530.2063,312.2344 Q527.7063,312.2344 526.3781,310.5938 Q525.0656,308.9375 525.0656,305.8125 Q525.0656,302.6875 526.3781,301.0313 Q527.7063,299.375 530.2063,299.375 Q530.9094,299.375 531.55,299.5313 Q532.2063,299.6875 532.7688,299.9844 L532.7688,302.7031 Q532.1438,302.125 531.55,301.8594 Q530.9563,301.5781 530.3313,301.5781 Q528.9875,301.5781 528.3,302.6563 Q527.6125,303.7188 527.6125,305.8125 Q527.6125,307.9063 528.3,308.9844 Q528.9875,310.0469 530.3313,310.0469 Q530.9563,310.0469 531.55,309.7813 Q532.1438,309.5 532.7688,308.9219 L532.7688,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="549.2" y="310.1543">C</text>
@@ -97,38 +97,38 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="330" y2="330"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="336"/>
       <ellipse cx="501.5" cy="341" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="510.5" y="344.2104">b_int : B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="348.8047"/>
       <ellipse cx="501.5" cy="353.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="510.5" y="357.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
       <ellipse cx="599" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M601.9688,189.6406 Q601.3906,189.9375 600.75,190.0781 Q600.1094,190.2344 599.4063,190.2344 Q596.9063,190.2344 595.5781,188.5938 Q594.2656,186.9375 594.2656,183.8125 Q594.2656,180.6875 595.5781,179.0313 Q596.9063,177.375 599.4063,177.375 Q600.1094,177.375 600.75,177.5313 Q601.4063,177.6875 601.9688,177.9844 L601.9688,180.7031 Q601.3438,180.125 600.75,179.8594 Q600.1563,179.5781 599.5313,179.5781 Q598.1875,179.5781 597.5,180.6563 Q596.8125,181.7188 596.8125,183.8125 Q596.8125,185.9063 597.5,186.9844 Q598.1875,188.0469 599.5313,188.0469 Q600.1563,188.0469 600.75,187.7813 Q601.3438,187.5 601.9688,186.9219 L601.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="613" y="188.1543">C::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
       <ellipse cx="560" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M562.9688,48.6406 Q562.3906,48.9375 561.75,49.0781 Q561.1094,49.2344 560.4063,49.2344 Q557.9063,49.2344 556.5781,47.5938 Q555.2656,45.9375 555.2656,42.8125 Q555.2656,39.6875 556.5781,38.0313 Q557.9063,36.375 560.4063,36.375 Q561.1094,36.375 561.75,36.5313 Q562.4063,36.6875 562.9688,36.9844 L562.9688,39.7031 Q562.3438,39.125 561.75,38.8594 Q561.1563,38.5781 560.5313,38.5781 Q559.1875,38.5781 558.5,39.6563 Q557.8125,40.7188 557.8125,42.8125 Q557.8125,44.9063 558.5,45.9844 Q559.1875,47.0469 560.5313,47.0469 Q561.1563,47.0469 561.75,46.7813 Q562.3438,46.5 562.9688,45.9219 L562.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="574" y="47.1543">C::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
       <ellipse cx="691" cy="30" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M695.1094,36 L687.3906,36 L687.3906,23.6094 L695.1094,23.6094 L695.1094,25.7656 L689.8438,25.7656 L689.8438,28.4375 L694.6094,28.4375 L694.6094,30.5938 L689.8438,30.5938 L689.8438,33.8438 L695.1094,33.8438 L695.1094,36 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="705" y="34.1543">C::AA::CCC</text>
@@ -137,8 +137,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="73.0151">CCC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="79.6094" y2="79.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
       <ellipse cx="381" cy="177.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.9688,183.1406 Q383.3906,183.4375 382.75,183.5781 Q382.1094,183.7344 381.4063,183.7344 Q378.9063,183.7344 377.5781,182.0938 Q376.2656,180.4375 376.2656,177.3125 Q376.2656,174.1875 377.5781,172.5313 Q378.9063,170.875 381.4063,170.875 Q382.1094,170.875 382.75,171.0313 Q383.4063,171.1875 383.9688,171.4844 L383.9688,174.2031 Q383.3438,173.625 382.75,173.3594 Q382.1563,173.0781 381.5313,173.0781 Q380.1875,173.0781 379.5,174.1563 Q378.8125,175.2188 378.8125,177.3125 Q378.8125,179.4063 379.5,180.4844 Q380.1875,181.5469 381.5313,181.5469 Q382.1563,181.5469 382.75,181.2813 Q383.3438,181 383.9688,180.4219 L383.9688,183.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="395" y="181.6543">C::B</text>
@@ -147,15 +147,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="201.5" y2="201.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372" y="207.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="374" y="209.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="386" y="215.7104">b : V</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
       <ellipse cx="698" cy="171" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M702.1094,177 L694.3906,177 L694.3906,164.6094 L702.1094,164.6094 L702.1094,166.7656 L696.8438,166.7656 L696.8438,169.4375 L701.6094,169.4375 L701.6094,171.5938 L696.8438,171.5938 L696.8438,174.8438 L702.1094,174.8438 L702.1094,177 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="712" y="175.1543">C::CC</text>
@@ -164,16 +164,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="214.0151">CC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="220.6094" y2="220.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
       <ellipse cx="906" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M908.9688,189.6406 Q908.3906,189.9375 907.75,190.0781 Q907.1094,190.2344 906.4063,190.2344 Q903.9063,190.2344 902.5781,188.5938 Q901.2656,186.9375 901.2656,183.8125 Q901.2656,180.6875 902.5781,179.0313 Q903.9063,177.375 906.4063,177.375 Q907.1094,177.375 907.75,177.5313 Q908.4063,177.6875 908.9688,177.9844 L908.9688,180.7031 Q908.3438,180.125 907.75,179.8594 Q907.1563,179.5781 906.5313,179.5781 Q905.1875,179.5781 904.5,180.6563 Q903.8125,181.7188 903.8125,183.8125 Q903.8125,185.9063 904.5,186.9844 Q905.1875,188.0469 906.5313,188.0469 Q907.1563,188.0469 907.75,187.7813 Q908.3438,187.5 908.9688,186.9219 L908.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="920" y="188.1543">detail::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
       <ellipse cx="822" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.1094,30 L818.3906,30 L818.3906,17.6094 L826.1094,17.6094 L826.1094,19.7656 L820.8438,19.7656 L820.8438,22.4375 L825.6094,22.4375 L825.6094,24.5938 L820.8438,24.5938 L820.8438,27.8438 L826.1094,27.8438 L826.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="836" y="28.1543">detail::D::AA</text>
@@ -183,8 +183,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj1haj28fkml1)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ff7w0g2fnebeh)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
       <ellipse cx="965" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M967.9688,48.6406 Q967.3906,48.9375 966.75,49.0781 Q966.1094,49.2344 965.4063,49.2344 Q962.9063,49.2344 961.5781,47.5938 Q960.2656,45.9375 960.2656,42.8125 Q960.2656,39.6875 961.5781,38.0313 Q962.9063,36.375 965.4063,36.375 Q966.1094,36.375 966.75,36.5313 Q967.4063,36.6875 967.9688,36.9844 L967.9688,39.7031 Q967.3438,39.125 966.75,38.8594 Q966.1563,38.5781 965.5313,38.5781 Q964.1875,38.5781 963.5,39.6563 Q962.8125,40.7188 962.8125,42.8125 Q962.8125,44.9063 963.5,45.9844 Q964.1875,47.0469 965.5313,47.0469 Q966.1563,47.0469 966.75,46.7813 Q967.3438,46.5 967.9688,45.9219 L967.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="78" x="979" y="47.1543">detail::D::DD</text>
diff --git a/docs/test_cases/t00004_class_mermaid.svg b/docs/test_cases/t00004_class_mermaid.svg
index 682ada70..f1d47fc2 100644
--- a/docs/test_cases/t00004_class_mermaid.svg
+++ b/docs/test_cases/t00004_class_mermaid.svg
@@ -210,7 +210,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L4">
+        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L4">
           <g title="B" id="classId-C_0001232624428734051711-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -229,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L6">
+        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L6">
           <g title="B##AA" id="classId-C_0001630205507215126623-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L9">
+        <a transform="translate(212.359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L9">
           <g title="A" id="classId-C_0001552274940876611774-2" class="node default clickable">
             <rect height="101" width="160.40625" y="-50.5" x="-80.203125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="80.203125" x1="-80.203125" class="divider"/>
@@ -292,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L13">
+        <a transform="translate(212.359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L13">
           <g title="A##AA" id="classId-C_0001742499843727859552-3" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -311,7 +311,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(140.6171875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L15">
+        <a transform="translate(140.6171875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L15">
           <g title="A##AA##Lights" id="classId-C_0000590936874508841244-4" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -345,7 +345,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.3125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L17">
+        <a transform="translate(304.3125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L17">
           <g title="A##AA##AAA" id="classId-C_0001430186633004282131-5" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -364,7 +364,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(437.0859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33">
+        <a transform="translate(437.0859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0000287819369330075965-6" class="node default clickable">
             <rect height="57" width="87" y="-28.5" x="-43.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.5" x1="-43.5" class="divider"/>
@@ -383,7 +383,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(563.5234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L23">
+        <a transform="translate(563.5234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L23">
           <g title="C" id="classId-C_0002278328177727440136-7" class="node default clickable">
             <rect height="101" width="118.640625" y="-50.5" x="-59.3203125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.3203125" x1="-59.3203125" class="divider"/>
@@ -412,7 +412,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1087.015625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L27">
+        <a transform="translate(1087.015625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L27">
           <g title="C##AA" id="classId-C_0000623940132897927654-8" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -431,7 +431,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(872.2421875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L28">
+        <a transform="translate(872.2421875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L28">
           <g title="C##AA##AAA" id="classId-C_0001597801087286500866-9" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -450,7 +450,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1168.86328125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L30">
+        <a transform="translate(1168.86328125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L30">
           <g title="C##AA##CCC" id="classId-C_0000081819202639599734-10" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -479,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(476.3359375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L33">
+        <a transform="translate(476.3359375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0001381298335849583950-11" class="node default clickable">
             <rect height="79" width="78.125" y="-39.5" x="-39.0625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0625" x1="-39.0625" class="divider"/>
@@ -503,7 +503,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(611.4609375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L39">
+        <a transform="translate(611.4609375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L39">
           <g title="C##CC" id="classId-C_0002037378936100378699-12" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -532,7 +532,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(866.83984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L43">
+        <a transform="translate(866.83984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L43">
           <g title="D" id="classId-C_0000612133170877135796-13" class="node default clickable">
             <rect height="57" width="79" y="-28.5" x="-39.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.5" x1="-39.5" class="divider"/>
@@ -551,7 +551,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(783.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L45">
+        <a transform="translate(783.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L45">
           <g title="D##AA" id="classId-C_0001572080057917630922-14" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -585,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.46875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00004/t00004.cc#L47">
+        <a transform="translate(950.46875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00004/t00004.cc#L47">
           <g title="D##DD" id="classId-C_0000600916232677555492-15" class="node default clickable">
             <rect height="57" width="112.765625" y="-28.5" x="-56.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.3828125" x1="-56.3828125" class="divider"/>
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index da677e33..ed43cd1e 100644
--- a/docs/test_cases/t00005_class.svg
+++ b/docs/test_cases/t00005_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="384px" preserveAspectRatio="none" style="width:799px;height:384px;" version="1.1" viewBox="0 0 799 384" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f18xslhdcacxg2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f103lvwn56wu0k" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,205 +9,205 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
       <ellipse cx="21" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,346.6406 Q23.3906,346.9375 22.75,347.0781 Q22.1094,347.2344 21.4063,347.2344 Q18.9063,347.2344 17.5781,345.5938 Q16.2656,343.9375 16.2656,340.8125 Q16.2656,337.6875 17.5781,336.0313 Q18.9063,334.375 21.4063,334.375 Q22.1094,334.375 22.75,334.5313 Q23.4063,334.6875 23.9688,334.9844 L23.9688,337.7031 Q23.3438,337.125 22.75,336.8594 Q22.1563,336.5781 21.5313,336.5781 Q20.1875,336.5781 19.5,337.6563 Q18.8125,338.7188 18.8125,340.8125 Q18.8125,342.9063 19.5,343.9844 Q20.1875,345.0469 21.5313,345.0469 Q22.1563,345.0469 22.75,344.7813 Q23.3438,344.5 23.9688,343.9219 L23.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="345.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
       <ellipse cx="96" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,346.6406 Q98.3906,346.9375 97.75,347.0781 Q97.1094,347.2344 96.4063,347.2344 Q93.9063,347.2344 92.5781,345.5938 Q91.2656,343.9375 91.2656,340.8125 Q91.2656,337.6875 92.5781,336.0313 Q93.9063,334.375 96.4063,334.375 Q97.1094,334.375 97.75,334.5313 Q98.4063,334.6875 98.9688,334.9844 L98.9688,337.7031 Q98.3438,337.125 97.75,336.8594 Q97.1563,336.5781 96.5313,336.5781 Q95.1875,336.5781 94.5,337.6563 Q93.8125,338.7188 93.8125,340.8125 Q93.8125,342.9063 94.5,343.9844 Q95.1875,345.0469 96.5313,345.0469 Q97.1563,345.0469 97.75,344.7813 Q98.3438,344.5 98.9688,343.9219 L98.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="345.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
       <ellipse cx="171" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,346.6406 Q173.3906,346.9375 172.75,347.0781 Q172.1094,347.2344 171.4063,347.2344 Q168.9063,347.2344 167.5781,345.5938 Q166.2656,343.9375 166.2656,340.8125 Q166.2656,337.6875 167.5781,336.0313 Q168.9063,334.375 171.4063,334.375 Q172.1094,334.375 172.75,334.5313 Q173.4063,334.6875 173.9688,334.9844 L173.9688,337.7031 Q173.3438,337.125 172.75,336.8594 Q172.1563,336.5781 171.5313,336.5781 Q170.1875,336.5781 169.5,337.6563 Q168.8125,338.7188 168.8125,340.8125 Q168.8125,342.9063 169.5,343.9844 Q170.1875,345.0469 171.5313,345.0469 Q172.1563,345.0469 172.75,344.7813 Q173.3438,344.5 173.9688,343.9219 L173.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="345.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
       <ellipse cx="246.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,346.6406 Q248.8906,346.9375 248.25,347.0781 Q247.6094,347.2344 246.9063,347.2344 Q244.4063,347.2344 243.0781,345.5938 Q241.7656,343.9375 241.7656,340.8125 Q241.7656,337.6875 243.0781,336.0313 Q244.4063,334.375 246.9063,334.375 Q247.6094,334.375 248.25,334.5313 Q248.9063,334.6875 249.4688,334.9844 L249.4688,337.7031 Q248.8438,337.125 248.25,336.8594 Q247.6563,336.5781 247.0313,336.5781 Q245.6875,336.5781 245,337.6563 Q244.3125,338.7188 244.3125,340.8125 Q244.3125,342.9063 245,343.9844 Q245.6875,345.0469 247.0313,345.0469 Q247.6563,345.0469 248.25,344.7813 Q248.8438,344.5 249.4688,343.9219 L249.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="345.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
       <ellipse cx="323" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,346.6406 Q325.3906,346.9375 324.75,347.0781 Q324.1094,347.2344 323.4063,347.2344 Q320.9063,347.2344 319.5781,345.5938 Q318.2656,343.9375 318.2656,340.8125 Q318.2656,337.6875 319.5781,336.0313 Q320.9063,334.375 323.4063,334.375 Q324.1094,334.375 324.75,334.5313 Q325.4063,334.6875 325.9688,334.9844 L325.9688,337.7031 Q325.3438,337.125 324.75,336.8594 Q324.1563,336.5781 323.5313,336.5781 Q322.1875,336.5781 321.5,337.6563 Q320.8125,338.7188 320.8125,340.8125 Q320.8125,342.9063 321.5,343.9844 Q322.1875,345.0469 323.5313,345.0469 Q324.1563,345.0469 324.75,344.7813 Q325.3438,344.5 325.9688,343.9219 L325.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="345.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
       <ellipse cx="398.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,346.6406 Q400.8906,346.9375 400.25,347.0781 Q399.6094,347.2344 398.9063,347.2344 Q396.4063,347.2344 395.0781,345.5938 Q393.7656,343.9375 393.7656,340.8125 Q393.7656,337.6875 395.0781,336.0313 Q396.4063,334.375 398.9063,334.375 Q399.6094,334.375 400.25,334.5313 Q400.9063,334.6875 401.4688,334.9844 L401.4688,337.7031 Q400.8438,337.125 400.25,336.8594 Q399.6563,336.5781 399.0313,336.5781 Q397.6875,336.5781 397,337.6563 Q396.3125,338.7188 396.3125,340.8125 Q396.3125,342.9063 397,343.9844 Q397.6875,345.0469 399.0313,345.0469 Q399.6563,345.0469 400.25,344.7813 Q400.8438,344.5 401.4688,343.9219 L401.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="345.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
       <ellipse cx="472.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,346.6406 Q474.8906,346.9375 474.25,347.0781 Q473.6094,347.2344 472.9063,347.2344 Q470.4063,347.2344 469.0781,345.5938 Q467.7656,343.9375 467.7656,340.8125 Q467.7656,337.6875 469.0781,336.0313 Q470.4063,334.375 472.9063,334.375 Q473.6094,334.375 474.25,334.5313 Q474.9063,334.6875 475.4688,334.9844 L475.4688,337.7031 Q474.8438,337.125 474.25,336.8594 Q473.6563,336.5781 473.0313,336.5781 Q471.6875,336.5781 471,337.6563 Q470.3125,338.7188 470.3125,340.8125 Q470.3125,342.9063 471,343.9844 Q471.6875,345.0469 473.0313,345.0469 Q473.6563,345.0469 474.25,344.7813 Q474.8438,344.5 475.4688,343.9219 L475.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="345.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
       <ellipse cx="548.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,346.6406 Q550.8906,346.9375 550.25,347.0781 Q549.6094,347.2344 548.9063,347.2344 Q546.4063,347.2344 545.0781,345.5938 Q543.7656,343.9375 543.7656,340.8125 Q543.7656,337.6875 545.0781,336.0313 Q546.4063,334.375 548.9063,334.375 Q549.6094,334.375 550.25,334.5313 Q550.9063,334.6875 551.4688,334.9844 L551.4688,337.7031 Q550.8438,337.125 550.25,336.8594 Q549.6563,336.5781 549.0313,336.5781 Q547.6875,336.5781 547,337.6563 Q546.3125,338.7188 546.3125,340.8125 Q546.3125,342.9063 547,343.9844 Q547.6875,345.0469 549.0313,345.0469 Q549.6563,345.0469 550.25,344.7813 Q550.8438,344.5 551.4688,343.9219 L551.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="345.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
       <ellipse cx="624.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,346.6406 Q626.8906,346.9375 626.25,347.0781 Q625.6094,347.2344 624.9063,347.2344 Q622.4063,347.2344 621.0781,345.5938 Q619.7656,343.9375 619.7656,340.8125 Q619.7656,337.6875 621.0781,336.0313 Q622.4063,334.375 624.9063,334.375 Q625.6094,334.375 626.25,334.5313 Q626.9063,334.6875 627.4688,334.9844 L627.4688,337.7031 Q626.8438,337.125 626.25,336.8594 Q625.6563,336.5781 625.0313,336.5781 Q623.6875,336.5781 623,337.6563 Q622.3125,338.7188 622.3125,340.8125 Q622.3125,342.9063 623,343.9844 Q623.6875,345.0469 625.0313,345.0469 Q625.6563,345.0469 626.25,344.7813 Q626.8438,344.5 627.4688,343.9219 L627.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="345.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
       <ellipse cx="694.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,346.6406 Q696.8906,346.9375 696.25,347.0781 Q695.6094,347.2344 694.9063,347.2344 Q692.4063,347.2344 691.0781,345.5938 Q689.7656,343.9375 689.7656,340.8125 Q689.7656,337.6875 691.0781,336.0313 Q692.4063,334.375 694.9063,334.375 Q695.6094,334.375 696.25,334.5313 Q696.9063,334.6875 697.4688,334.9844 L697.4688,337.7031 Q696.8438,337.125 696.25,336.8594 Q695.6563,336.5781 695.0313,336.5781 Q693.6875,336.5781 693,337.6563 Q692.3125,338.7188 692.3125,340.8125 Q692.3125,342.9063 693,343.9844 Q693.6875,345.0469 695.0313,345.0469 Q695.6563,345.0469 696.25,344.7813 Q696.8438,344.5 697.4688,343.9219 L697.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="345.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
       <ellipse cx="764.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,346.6406 Q766.8906,346.9375 766.25,347.0781 Q765.6094,347.2344 764.9063,347.2344 Q762.4063,347.2344 761.0781,345.5938 Q759.7656,343.9375 759.7656,340.8125 Q759.7656,337.6875 761.0781,336.0313 Q762.4063,334.375 764.9063,334.375 Q765.6094,334.375 766.25,334.5313 Q766.9063,334.6875 767.4688,334.9844 L767.4688,337.7031 Q766.8438,337.125 766.25,336.8594 Q765.6563,336.5781 765.0313,336.5781 Q763.6875,336.5781 763,337.6563 Q762.3125,338.7188 762.3125,340.8125 Q762.3125,342.9063 763,343.9844 Q763.6875,345.0469 765.0313,345.0469 Q765.6563,345.0469 766.25,344.7813 Q766.8438,344.5 767.4688,343.9219 L767.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="345.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xslhdcacxg2)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f103lvwn56wu0k)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
       <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="54"/>
       <ellipse cx="308" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="317" y="62.2104">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="66.8047"/>
       <ellipse cx="308" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="317" y="75.0151">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="79.6094"/>
       <ellipse cx="308" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="317" y="87.8198">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="92.4141"/>
       <ellipse cx="308" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="100.6245">d : const D *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="105.2188"/>
       <ellipse cx="308" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="317" y="113.4292">e : const E &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="118.0234"/>
       <ellipse cx="308" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="317" y="126.2339">f : F &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="130.8281"/>
       <ellipse cx="308" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="44" x="317" y="139.0386">g : G **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="143.6328"/>
       <ellipse cx="308" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="317" y="151.8433">h : H ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="156.4375"/>
       <ellipse cx="308" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="317" y="164.6479">i : I *&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="169.2422"/>
       <ellipse cx="308" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="177.4526">j : volatile J *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="182.0469"/>
       <ellipse cx="308" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="317" y="190.2573">k : K *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="194.8516"/>
       <ellipse cx="308" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="317" y="203.062">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="207.6563"/>
       <ellipse cx="308" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="317" y="215.8667">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="220.4609"/>
       <ellipse cx="308" cy="225.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="317" y="228.6714">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="233.2656"/>
       <ellipse cx="308" cy="238.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="317" y="241.4761">some_int_reference : int &amp;</text>
     </a>
     <path d="M285.16,195.65 C219.46,233.13 136.34,281.08 63,325 C57.55,328.26 51.69,331.86 46.28,335.22 " fill="none" id="C_0000630692407373144211&lt;-C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00005_class_mermaid.svg b/docs/test_cases/t00005_class_mermaid.svg
index 7f1235de..90885aa8 100644
--- a/docs/test_cases/t00005_class_mermaid.svg
+++ b/docs/test_cases/t00005_class_mermaid.svg
@@ -186,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L3">
+        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L3">
           <g title="A" id="classId-C_0000096355893895780319-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L5">
+        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L5">
           <g title="B" id="classId-C_0001909425857334087541-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L7">
+        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L7">
           <g title="C" id="classId-C_0000968176384460064907-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L9">
+        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L9">
           <g title="D" id="classId-C_0001735599590836186693-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L11">
+        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L11">
           <g title="E" id="classId-C_0000887960136921844658-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L13">
+        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L13">
           <g title="F" id="classId-C_0000772719357856231772-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,7 +300,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L15">
+        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L15">
           <g title="G" id="classId-C_0000979147885884736437-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L17">
+        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L17">
           <g title="H" id="classId-C_0001440673301054236675-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,7 +338,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L19">
+        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L19">
           <g title="I" id="classId-C_0000109681731550086430-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L21">
+        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L21">
           <g title="J" id="classId-C_0000338330011969650325-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L23">
+        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L23">
           <g title="K" id="classId-C_0002179119389830432509-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,7 +395,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00005/t00005.cc#L25">
+        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00005/t00005.cc#L25">
           <g title="R" id="classId-C_0000630692407373144211-11" class="node default clickable">
             <rect height="387" width="245.8125" y="-193.5" x="-122.90625" class="outer title-state"/>
             <line y2="-163.5" y1="-163.5" x2="122.90625" x1="-122.90625" class="divider"/>
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index 4ad1613a..1f44cd05 100644
--- a/docs/test_cases/t00006_class.svg
+++ b/docs/test_cases/t00006_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:1390px;height:479px;" version="1.1" viewBox="0 0 1390 479" width="1390px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ft0vqd5osqyw7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1triti74x41sz" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,136 +9,136 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
       <ellipse cx="21" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,320.6406 Q23.3906,320.9375 22.75,321.0781 Q22.1094,321.2344 21.4063,321.2344 Q18.9063,321.2344 17.5781,319.5938 Q16.2656,317.9375 16.2656,314.8125 Q16.2656,311.6875 17.5781,310.0313 Q18.9063,308.375 21.4063,308.375 Q22.1094,308.375 22.75,308.5313 Q23.4063,308.6875 23.9688,308.9844 L23.9688,311.7031 Q23.3438,311.125 22.75,310.8594 Q22.1563,310.5781 21.5313,310.5781 Q20.1875,310.5781 19.5,311.6563 Q18.8125,312.7188 18.8125,314.8125 Q18.8125,316.9063 19.5,317.9844 Q20.1875,319.0469 21.5313,319.0469 Q22.1563,319.0469 22.75,318.7813 Q23.3438,318.5 23.9688,317.9219 L23.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="319.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
       <ellipse cx="96" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,320.6406 Q98.3906,320.9375 97.75,321.0781 Q97.1094,321.2344 96.4063,321.2344 Q93.9063,321.2344 92.5781,319.5938 Q91.2656,317.9375 91.2656,314.8125 Q91.2656,311.6875 92.5781,310.0313 Q93.9063,308.375 96.4063,308.375 Q97.1094,308.375 97.75,308.5313 Q98.4063,308.6875 98.9688,308.9844 L98.9688,311.7031 Q98.3438,311.125 97.75,310.8594 Q97.1563,310.5781 96.5313,310.5781 Q95.1875,310.5781 94.5,311.6563 Q93.8125,312.7188 93.8125,314.8125 Q93.8125,316.9063 94.5,317.9844 Q95.1875,319.0469 96.5313,319.0469 Q97.1563,319.0469 97.75,318.7813 Q98.3438,318.5 98.9688,317.9219 L98.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="319.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
       <ellipse cx="171" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,320.6406 Q173.3906,320.9375 172.75,321.0781 Q172.1094,321.2344 171.4063,321.2344 Q168.9063,321.2344 167.5781,319.5938 Q166.2656,317.9375 166.2656,314.8125 Q166.2656,311.6875 167.5781,310.0313 Q168.9063,308.375 171.4063,308.375 Q172.1094,308.375 172.75,308.5313 Q173.4063,308.6875 173.9688,308.9844 L173.9688,311.7031 Q173.3438,311.125 172.75,310.8594 Q172.1563,310.5781 171.5313,310.5781 Q170.1875,310.5781 169.5,311.6563 Q168.8125,312.7188 168.8125,314.8125 Q168.8125,316.9063 169.5,317.9844 Q170.1875,319.0469 171.5313,319.0469 Q172.1563,319.0469 172.75,318.7813 Q173.3438,318.5 173.9688,317.9219 L173.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="319.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
       <ellipse cx="246.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,320.6406 Q248.8906,320.9375 248.25,321.0781 Q247.6094,321.2344 246.9063,321.2344 Q244.4063,321.2344 243.0781,319.5938 Q241.7656,317.9375 241.7656,314.8125 Q241.7656,311.6875 243.0781,310.0313 Q244.4063,308.375 246.9063,308.375 Q247.6094,308.375 248.25,308.5313 Q248.9063,308.6875 249.4688,308.9844 L249.4688,311.7031 Q248.8438,311.125 248.25,310.8594 Q247.6563,310.5781 247.0313,310.5781 Q245.6875,310.5781 245,311.6563 Q244.3125,312.7188 244.3125,314.8125 Q244.3125,316.9063 245,317.9844 Q245.6875,319.0469 247.0313,319.0469 Q247.6563,319.0469 248.25,318.7813 Q248.8438,318.5 249.4688,317.9219 L249.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
       <ellipse cx="1161" cy="430.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1163.9688,436.1406 Q1163.3906,436.4375 1162.75,436.5781 Q1162.1094,436.7344 1161.4063,436.7344 Q1158.9063,436.7344 1157.5781,435.0938 Q1156.2656,433.4375 1156.2656,430.3125 Q1156.2656,427.1875 1157.5781,425.5313 Q1158.9063,423.875 1161.4063,423.875 Q1162.1094,423.875 1162.75,424.0313 Q1163.4063,424.1875 1163.9688,424.4844 L1163.9688,427.2031 Q1163.3438,426.625 1162.75,426.3594 Q1162.1563,426.0781 1161.5313,426.0781 Q1160.1875,426.0781 1159.5,427.1563 Q1158.8125,428.2188 1158.8125,430.3125 Q1158.8125,432.4063 1159.5,433.4844 Q1160.1875,434.5469 1161.5313,434.5469 Q1162.1563,434.5469 1162.75,434.2813 Q1163.3438,434 1163.9688,433.4219 L1163.9688,436.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1175" y="434.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="446.5" y2="446.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="454.5" y2="454.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
       <ellipse cx="322.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.4688,320.6406 Q324.8906,320.9375 324.25,321.0781 Q323.6094,321.2344 322.9063,321.2344 Q320.4063,321.2344 319.0781,319.5938 Q317.7656,317.9375 317.7656,314.8125 Q317.7656,311.6875 319.0781,310.0313 Q320.4063,308.375 322.9063,308.375 Q323.6094,308.375 324.25,308.5313 Q324.9063,308.6875 325.4688,308.9844 L325.4688,311.7031 Q324.8438,311.125 324.25,310.8594 Q323.6563,310.5781 323.0313,310.5781 Q321.6875,310.5781 321,311.6563 Q320.3125,312.7188 320.3125,314.8125 Q320.3125,316.9063 321,317.9844 Q321.6875,319.0469 323.0313,319.0469 Q323.6563,319.0469 324.25,318.7813 Q324.8438,318.5 325.4688,317.9219 L325.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="336.5" y="319.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
       <ellipse cx="396.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M399.4688,320.6406 Q398.8906,320.9375 398.25,321.0781 Q397.6094,321.2344 396.9063,321.2344 Q394.4063,321.2344 393.0781,319.5938 Q391.7656,317.9375 391.7656,314.8125 Q391.7656,311.6875 393.0781,310.0313 Q394.4063,308.375 396.9063,308.375 Q397.6094,308.375 398.25,308.5313 Q398.9063,308.6875 399.4688,308.9844 L399.4688,311.7031 Q398.8438,311.125 398.25,310.8594 Q397.6563,310.5781 397.0313,310.5781 Q395.6875,310.5781 395,311.6563 Q394.3125,312.7188 394.3125,314.8125 Q394.3125,316.9063 395,317.9844 Q395.6875,319.0469 397.0313,319.0469 Q397.6563,319.0469 398.25,318.7813 Q398.8438,318.5 399.4688,317.9219 L399.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="410.5" y="319.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
       <ellipse cx="472.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,320.6406 Q474.8906,320.9375 474.25,321.0781 Q473.6094,321.2344 472.9063,321.2344 Q470.4063,321.2344 469.0781,319.5938 Q467.7656,317.9375 467.7656,314.8125 Q467.7656,311.6875 469.0781,310.0313 Q470.4063,308.375 472.9063,308.375 Q473.6094,308.375 474.25,308.5313 Q474.9063,308.6875 475.4688,308.9844 L475.4688,311.7031 Q474.8438,311.125 474.25,310.8594 Q473.6563,310.5781 473.0313,310.5781 Q471.6875,310.5781 471,311.6563 Q470.3125,312.7188 470.3125,314.8125 Q470.3125,316.9063 471,317.9844 Q471.6875,319.0469 473.0313,319.0469 Q473.6563,319.0469 474.25,318.7813 Q474.8438,318.5 475.4688,317.9219 L475.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="319.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
       <ellipse cx="548.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,320.6406 Q550.8906,320.9375 550.25,321.0781 Q549.6094,321.2344 548.9063,321.2344 Q546.4063,321.2344 545.0781,319.5938 Q543.7656,317.9375 543.7656,314.8125 Q543.7656,311.6875 545.0781,310.0313 Q546.4063,308.375 548.9063,308.375 Q549.6094,308.375 550.25,308.5313 Q550.9063,308.6875 551.4688,308.9844 L551.4688,311.7031 Q550.8438,311.125 550.25,310.8594 Q549.6563,310.5781 549.0313,310.5781 Q547.6875,310.5781 547,311.6563 Q546.3125,312.7188 546.3125,314.8125 Q546.3125,316.9063 547,317.9844 Q547.6875,319.0469 549.0313,319.0469 Q549.6563,319.0469 550.25,318.7813 Q550.8438,318.5 551.4688,317.9219 L551.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="562.5" y="319.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
       <ellipse cx="618.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M621.4688,320.6406 Q620.8906,320.9375 620.25,321.0781 Q619.6094,321.2344 618.9063,321.2344 Q616.4063,321.2344 615.0781,319.5938 Q613.7656,317.9375 613.7656,314.8125 Q613.7656,311.6875 615.0781,310.0313 Q616.4063,308.375 618.9063,308.375 Q619.6094,308.375 620.25,308.5313 Q620.9063,308.6875 621.4688,308.9844 L621.4688,311.7031 Q620.8438,311.125 620.25,310.8594 Q619.6563,310.5781 619.0313,310.5781 Q617.6875,310.5781 617,311.6563 Q616.3125,312.7188 616.3125,314.8125 Q616.3125,316.9063 617,317.9844 Q617.6875,319.0469 619.0313,319.0469 Q619.6563,319.0469 620.25,318.7813 Q620.8438,318.5 621.4688,317.9219 L621.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="632.5" y="319.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
       <ellipse cx="688.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M691.4688,320.6406 Q690.8906,320.9375 690.25,321.0781 Q689.6094,321.2344 688.9063,321.2344 Q686.4063,321.2344 685.0781,319.5938 Q683.7656,317.9375 683.7656,314.8125 Q683.7656,311.6875 685.0781,310.0313 Q686.4063,308.375 688.9063,308.375 Q689.6094,308.375 690.25,308.5313 Q690.9063,308.6875 691.4688,308.9844 L691.4688,311.7031 Q690.8438,311.125 690.25,310.8594 Q689.6563,310.5781 689.0313,310.5781 Q687.6875,310.5781 687,311.6563 Q686.3125,312.7188 686.3125,314.8125 Q686.3125,316.9063 687,317.9844 Q687.6875,319.0469 689.0313,319.0469 Q689.6563,319.0469 690.25,318.7813 Q690.8438,318.5 691.4688,317.9219 L691.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="702.5" y="319.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
       <ellipse cx="763" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M765.9688,320.6406 Q765.3906,320.9375 764.75,321.0781 Q764.1094,321.2344 763.4063,321.2344 Q760.9063,321.2344 759.5781,319.5938 Q758.2656,317.9375 758.2656,314.8125 Q758.2656,311.6875 759.5781,310.0313 Q760.9063,308.375 763.4063,308.375 Q764.1094,308.375 764.75,308.5313 Q765.4063,308.6875 765.9688,308.9844 L765.9688,311.7031 Q765.3438,311.125 764.75,310.8594 Q764.1563,310.5781 763.5313,310.5781 Q762.1875,310.5781 761.5,311.6563 Q760.8125,312.7188 760.8125,314.8125 Q760.8125,316.9063 761.5,317.9844 Q762.1875,319.0469 763.5313,319.0469 Q764.1563,319.0469 764.75,318.7813 Q765.3438,318.5 765.9688,317.9219 L765.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="6" x="777" y="319.1543">L</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
       <ellipse cx="836" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M838.9688,320.6406 Q838.3906,320.9375 837.75,321.0781 Q837.1094,321.2344 836.4063,321.2344 Q833.9063,321.2344 832.5781,319.5938 Q831.2656,317.9375 831.2656,314.8125 Q831.2656,311.6875 832.5781,310.0313 Q833.9063,308.375 836.4063,308.375 Q837.1094,308.375 837.75,308.5313 Q838.4063,308.6875 838.9688,308.9844 L838.9688,311.7031 Q838.3438,311.125 837.75,310.8594 Q837.1563,310.5781 836.5313,310.5781 Q835.1875,310.5781 834.5,311.6563 Q833.8125,312.7188 833.8125,314.8125 Q833.8125,316.9063 834.5,317.9844 Q835.1875,319.0469 836.5313,319.0469 Q837.1563,319.0469 837.75,318.7813 Q838.3438,318.5 838.9688,317.9219 L838.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="10" x="850" y="319.1543">M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
       <ellipse cx="913.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M916.4688,320.6406 Q915.8906,320.9375 915.25,321.0781 Q914.6094,321.2344 913.9063,321.2344 Q911.4063,321.2344 910.0781,319.5938 Q908.7656,317.9375 908.7656,314.8125 Q908.7656,311.6875 910.0781,310.0313 Q911.4063,308.375 913.9063,308.375 Q914.6094,308.375 915.25,308.5313 Q915.9063,308.6875 916.4688,308.9844 L916.4688,311.7031 Q915.8438,311.125 915.25,310.8594 Q914.6563,310.5781 914.0313,310.5781 Q912.6875,310.5781 912,311.6563 Q911.3125,312.7188 911.3125,314.8125 Q911.3125,316.9063 912,317.9844 Q912.6875,319.0469 914.0313,319.0469 Q914.6563,319.0469 915.25,318.7813 Q915.8438,318.5 916.4688,317.9219 L916.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="927.5" y="319.1543">N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
       <ellipse cx="990" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M992.9688,320.6406 Q992.3906,320.9375 991.75,321.0781 Q991.1094,321.2344 990.4063,321.2344 Q987.9063,321.2344 986.5781,319.5938 Q985.2656,317.9375 985.2656,314.8125 Q985.2656,311.6875 986.5781,310.0313 Q987.9063,308.375 990.4063,308.375 Q991.1094,308.375 991.75,308.5313 Q992.4063,308.6875 992.9688,308.9844 L992.9688,311.7031 Q992.3438,311.125 991.75,310.8594 Q991.1563,310.5781 990.5313,310.5781 Q989.1875,310.5781 988.5,311.6563 Q987.8125,312.7188 987.8125,314.8125 Q987.8125,316.9063 988.5,317.9844 Q989.1875,319.0469 990.5313,319.0469 Q991.1563,319.0469 991.75,318.7813 Q992.3438,318.5 992.9688,317.9219 L992.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="1004" y="319.1543">NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
       <ellipse cx="1075.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1078.4688,320.6406 Q1077.8906,320.9375 1077.25,321.0781 Q1076.6094,321.2344 1075.9063,321.2344 Q1073.4063,321.2344 1072.0781,319.5938 Q1070.7656,317.9375 1070.7656,314.8125 Q1070.7656,311.6875 1072.0781,310.0313 Q1073.4063,308.375 1075.9063,308.375 Q1076.6094,308.375 1077.25,308.5313 Q1077.9063,308.6875 1078.4688,308.9844 L1078.4688,311.7031 Q1077.8438,311.125 1077.25,310.8594 Q1076.6563,310.5781 1076.0313,310.5781 Q1074.6875,310.5781 1074,311.6563 Q1073.3125,312.7188 1073.3125,314.8125 Q1073.3125,316.9063 1074,317.9844 Q1074.6875,319.0469 1076.0313,319.0469 Q1076.6563,319.0469 1077.25,318.7813 Q1077.8438,318.5 1078.4688,317.9219 L1078.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1089.5" y="319.1543">NNN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
       <ellipse cx="1236.5" cy="424" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1239.4688,429.6406 Q1238.8906,429.9375 1238.25,430.0781 Q1237.6094,430.2344 1236.9063,430.2344 Q1234.4063,430.2344 1233.0781,428.5938 Q1231.7656,426.9375 1231.7656,423.8125 Q1231.7656,420.6875 1233.0781,419.0313 Q1234.4063,417.375 1236.9063,417.375 Q1237.6094,417.375 1238.25,417.5313 Q1238.9063,417.6875 1239.4688,417.9844 L1239.4688,420.7031 Q1238.8438,420.125 1238.25,419.8594 Q1237.6563,419.5781 1237.0313,419.5781 Q1235.6875,419.5781 1235,420.6563 Q1234.3125,421.7188 1234.3125,423.8125 Q1234.3125,425.9063 1235,426.9844 Q1235.6875,428.0469 1237.0313,428.0469 Q1237.6563,428.0469 1238.25,427.7813 Q1238.8438,427.5 1239.4688,426.9219 L1239.4688,429.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1250.5" y="428.1543">custom_container</text>
@@ -147,15 +147,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="440" y2="440"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="448" y2="448"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1227.5" y="454"/>
       <ellipse cx="1232.5" cy="459" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="1241.5" y="462.2104">data : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
       <ellipse cx="1170" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1172.9688,320.6406 Q1172.3906,320.9375 1171.75,321.0781 Q1171.1094,321.2344 1170.4063,321.2344 Q1167.9063,321.2344 1166.5781,319.5938 Q1165.2656,317.9375 1165.2656,314.8125 Q1165.2656,311.6875 1166.5781,310.0313 Q1167.9063,308.375 1170.4063,308.375 Q1171.1094,308.375 1171.75,308.5313 Q1172.4063,308.6875 1172.9688,308.9844 L1172.9688,311.7031 Q1172.3438,311.125 1171.75,310.8594 Q1171.1563,310.5781 1170.5313,310.5781 Q1169.1875,310.5781 1168.5,311.6563 Q1167.8125,312.7188 1167.8125,314.8125 Q1167.8125,316.9063 1168.5,317.9844 Q1169.1875,319.0469 1170.5313,319.0469 Q1171.1563,319.0469 1171.75,318.7813 Q1172.3438,318.5 1172.9688,317.9219 L1172.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1184" y="319.1543">custom_container</text>
@@ -164,103 +164,103 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ft0vqd5osqyw7)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1triti74x41sz)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
       <ellipse cx="577.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M580.7188,29.6406 Q580.1406,29.9375 579.5,30.0781 Q578.8594,30.2344 578.1563,30.2344 Q575.6563,30.2344 574.3281,28.5938 Q573.0156,26.9375 573.0156,23.8125 Q573.0156,20.6875 574.3281,19.0313 Q575.6563,17.375 578.1563,17.375 Q578.8594,17.375 579.5,17.5313 Q580.1563,17.6875 580.7188,17.9844 L580.7188,20.7031 Q580.0938,20.125 579.5,19.8594 Q578.9063,19.5781 578.2813,19.5781 Q576.9375,19.5781 576.25,20.6563 Q575.5625,21.7188 575.5625,23.8125 Q575.5625,25.9063 576.25,26.9844 Q576.9375,28.0469 578.2813,28.0469 Q578.9063,28.0469 579.5,27.7813 Q580.0938,27.5 580.7188,26.9219 L580.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="598.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="54"/>
       <ellipse cx="482" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="491" y="62.2104">a : std::vector&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="66.8047"/>
       <ellipse cx="482" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="491" y="75.0151">b : std::vector&lt;B *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="79.6094"/>
       <ellipse cx="482" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="87.8198">c : std::map&lt;int,C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="92.4141"/>
       <ellipse cx="482" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="124" x="491" y="100.6245">d : std::map&lt;int,D *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="105.2188"/>
       <ellipse cx="482" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="491" y="113.4292">e : custom_container&lt;E&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="118.0234"/>
       <ellipse cx="482" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="180" x="491" y="126.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="130.8281"/>
       <ellipse cx="482" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="491" y="139.0386">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="143.6328"/>
       <ellipse cx="482" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="491" y="151.8433">h : std::array&lt;H,10&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="156.4375"/>
       <ellipse cx="482" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="164.6479">i : std::array&lt;I *,5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="169.2422"/>
       <ellipse cx="482" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="491" y="177.4526">j : J[10]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="182.0469"/>
       <ellipse cx="482" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="491" y="190.2573">k : K *[20]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="194.8516"/>
       <ellipse cx="482" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="491" y="203.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="207.6563"/>
       <ellipse cx="482" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="491" y="215.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text>
     </a>
     <path d="M1219.28,347.24 C1208.62,365.3 1193.8,390.41 1182.5,409.56 " fill="none" id="C_0000050153113082434858-&gt;C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00006_class_mermaid.svg b/docs/test_cases/t00006_class_mermaid.svg
index 7de39c54..b4e14635 100644
--- a/docs/test_cases/t00006_class_mermaid.svg
+++ b/docs/test_cases/t00006_class_mermaid.svg
@@ -270,7 +270,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L7">
+        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L7">
           <g title="A" id="classId-C_0000989095304444672400-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -289,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L9">
+        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L9">
           <g title="B" id="classId-C_0000648285260245005311-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -308,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L11">
+        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L11">
           <g title="C" id="classId-C_0000323304333007297774-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -327,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L13">
+        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L13">
           <g title="D" id="classId-C_0001006912399043633492-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -346,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L15">
+        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L15">
           <g title="E" id="classId-C_0001092550394020578978-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -365,7 +365,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L17">
+        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L17">
           <g title="F" id="classId-C_0000965398761810782236-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -384,7 +384,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L19">
+        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L19">
           <g title="G" id="classId-C_0001764732000887030464-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -403,7 +403,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L21">
+        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L21">
           <g title="H" id="classId-C_0001669285599837552146-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -422,7 +422,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L23">
+        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L23">
           <g title="I" id="classId-C_0002234750598599000377-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -441,7 +441,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L25">
+        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L25">
           <g title="J" id="classId-C_0001335933649375465369-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -460,7 +460,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L27">
+        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L27">
           <g title="K" id="classId-C_0001603190364864080123-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -479,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L29">
+        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L29">
           <g title="L" id="classId-C_0000305487238408320046-11" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -498,7 +498,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L31">
+        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L31">
           <g title="M" id="classId-C_0001664744512423723275-12" class="node default clickable">
             <rect height="57" width="28.328125" y="-28.5" x="-14.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="14.1640625" x1="-14.1640625" class="divider"/>
@@ -517,7 +517,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L33">
+        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L33">
           <g title="N" id="classId-C_0000950210019792152600-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -536,7 +536,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L35">
+        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L35">
           <g title="NN" id="classId-C_0001662349735899726224-14" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -555,7 +555,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L37">
+        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L37">
           <g title="NNN" id="classId-C_0001963145075481599858-15" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -574,7 +574,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000916380191954937631-16" class="node default clickable">
             <rect height="79" width="181.28125" y="-39.5" x="-90.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="90.640625" x1="-90.640625" class="divider"/>
@@ -598,7 +598,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000050153113082434858-17" class="node default clickable">
             <rect height="57" width="182.171875" y="-28.5" x="-91.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="91.0859375" x1="-91.0859375" class="divider"/>
@@ -617,7 +617,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00006/t00006.cc#L44">
+        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00006/t00006.cc#L44">
           <g title="R" id="classId-C_0000303025561016882526-18" class="node default clickable">
             <rect height="343" width="263.578125" y="-171.5" x="-131.7890625" class="outer title-state"/>
             <line y2="-141.5" y1="-141.5" x2="131.7890625" x1="-131.7890625" class="divider"/>
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index f55a19ec..ac722d91 100644
--- a/docs/test_cases/t00007_class.svg
+++ b/docs/test_cases/t00007_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:207px;height:230px;" version="1.1" viewBox="0 0 207 230" width="207px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ff919vm8vkghf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1op5r9vmmln1n" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,57 +9,57 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff919vm8vkghf)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1op5r9vmmln1n)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff919vm8vkghf)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1op5r9vmmln1n)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
       <ellipse cx="96" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,192.6406 Q98.3906,192.9375 97.75,193.0781 Q97.1094,193.2344 96.4063,193.2344 Q93.9063,193.2344 92.5781,191.5938 Q91.2656,189.9375 91.2656,186.8125 Q91.2656,183.6875 92.5781,182.0313 Q93.9063,180.375 96.4063,180.375 Q97.1094,180.375 97.75,180.5313 Q98.4063,180.6875 98.9688,180.9844 L98.9688,183.7031 Q98.3438,183.125 97.75,182.8594 Q97.1563,182.5781 96.5313,182.5781 Q95.1875,182.5781 94.5,183.6563 Q93.8125,184.7188 93.8125,186.8125 Q93.8125,188.9063 94.5,189.9844 Q95.1875,191.0469 96.5313,191.0469 Q97.1563,191.0469 97.75,190.7813 Q98.3438,190.5 98.9688,189.9219 L98.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="191.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff919vm8vkghf)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1op5r9vmmln1n)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
       <ellipse cx="171" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,192.6406 Q173.3906,192.9375 172.75,193.0781 Q172.1094,193.2344 171.4063,193.2344 Q168.9063,193.2344 167.5781,191.5938 Q166.2656,189.9375 166.2656,186.8125 Q166.2656,183.6875 167.5781,182.0313 Q168.9063,180.375 171.4063,180.375 Q172.1094,180.375 172.75,180.5313 Q173.4063,180.6875 173.9688,180.9844 L173.9688,183.7031 Q173.3438,183.125 172.75,182.8594 Q172.1563,182.5781 171.5313,182.5781 Q170.1875,182.5781 169.5,183.6563 Q168.8125,184.7188 168.8125,186.8125 Q168.8125,188.9063 169.5,189.9844 Q170.1875,191.0469 171.5313,191.0469 Q172.1563,191.0469 172.75,190.7813 Q173.3438,190.5 173.9688,189.9219 L173.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="191.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff919vm8vkghf)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1op5r9vmmln1n)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
       <ellipse cx="92.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M95.7188,29.6406 Q95.1406,29.9375 94.5,30.0781 Q93.8594,30.2344 93.1563,30.2344 Q90.6563,30.2344 89.3281,28.5938 Q88.0156,26.9375 88.0156,23.8125 Q88.0156,20.6875 89.3281,19.0313 Q90.6563,17.375 93.1563,17.375 Q93.8594,17.375 94.5,17.5313 Q95.1563,17.6875 95.7188,17.9844 L95.7188,20.7031 Q95.0938,20.125 94.5,19.8594 Q93.9063,19.5781 93.2813,19.5781 Q91.9375,19.5781 91.25,20.6563 Q90.5625,21.7188 90.5625,23.8125 Q90.5625,25.9063 91.25,26.9844 Q91.9375,28.0469 93.2813,28.0469 Q93.9063,28.0469 94.5,27.7813 Q95.0938,27.5 95.7188,26.9219 L95.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="54"/>
       <ellipse cx="32.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="41.5" y="62.2104">a : std::unique_ptr&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="66.8047"/>
       <ellipse cx="32.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="41.5" y="75.0151">b : std::shared_ptr&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="79.6094"/>
       <ellipse cx="32.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="41.5" y="87.8198">c : std::weak_ptr&lt;C&gt;</text>
     </a>
     <path d="M72.48,106 C60.66,128.37 47.58,153.14 38.31,170.69 " fill="none" id="C_0000066905874721300157&lt;-C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00007_class_mermaid.svg b/docs/test_cases/t00007_class_mermaid.svg
index 106cf3fb..c5929f5b 100644
--- a/docs/test_cases/t00007_class_mermaid.svg
+++ b/docs/test_cases/t00007_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L5">
+        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L5">
           <g title="A" id="classId-C_0000098876622534017019-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L7">
+        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L7">
           <g title="B" id="classId-C_0000696381312773707784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L9">
+        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L9">
           <g title="C" id="classId-C_0000972031178679364068-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00007/t00007.cc#L11">
+        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00007/t00007.cc#L11">
           <g title="R" id="classId-C_0000066905874721300157-3" class="node default clickable">
             <rect height="123" width="182.671875" y="-61.5" x="-91.3359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="91.3359375" x1="-91.3359375" class="divider"/>
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index 2287d43f..1de1a238 100644
--- a/docs/test_cases/t00008_class.svg
+++ b/docs/test_cases/t00008_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="403px" preserveAspectRatio="none" style="width:1039px;height:403px;" version="1.1" viewBox="0 0 1039 403" width="1039px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fqjohe2et0vne" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fqf2rxvb0rnoq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="124.8281" id="C_0002293517130897538130" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqf2rxvb0rnoq)" height="124.8281" id="C_0002293517130897538130" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
@@ -19,50 +19,50 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="62.2104">comparator : CMP</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
       <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="26" y="75.0151">ints : std::array&lt;int,N&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="79.6094"/>
       <ellipse cx="17" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="26" y="87.8198">pointer : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="92.4141"/>
       <ellipse cx="17" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="88" x="26" y="100.6245">reference : T &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="105.2188"/>
       <ellipse cx="17" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="113.4292">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="118.0234"/>
       <ellipse cx="17" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="26" y="126.2339">values : std::vector&lt;P&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="250" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqf2rxvb0rnoq)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="250" y="40"/>
       <ellipse cx="300.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M303.2188,61.6406 Q302.6406,61.9375 302,62.0781 Q301.3594,62.2344 300.6563,62.2344 Q298.1563,62.2344 296.8281,60.5938 Q295.5156,58.9375 295.5156,55.8125 Q295.5156,52.6875 296.8281,51.0313 Q298.1563,49.375 300.6563,49.375 Q301.3594,49.375 302,49.5313 Q302.6563,49.6875 303.2188,49.9844 L303.2188,52.7031 Q302.5938,52.125 302,51.8594 Q301.4063,51.5781 300.7813,51.5781 Q299.4375,51.5781 298.75,52.6563 Q298.0625,53.7188 298.0625,55.8125 Q298.0625,57.9063 298.75,58.9844 Q299.4375,60.0469 300.7813,60.0469 Q301.4063,60.0469 302,59.7813 Q302.5938,59.5 303.2188,58.9219 L303.2188,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="320.75" y="60.1543">Vector</text>
@@ -71,15 +71,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="72" y2="72"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="80" y2="80"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="86"/>
       <ellipse cx="261" cy="91" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="270" y="94.2104">values : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="490" y="332"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqf2rxvb0rnoq)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="490" y="332"/>
       <ellipse cx="548.75" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.7188,353.6406 Q551.1406,353.9375 550.5,354.0781 Q549.8594,354.2344 549.1563,354.2344 Q546.6563,354.2344 545.3281,352.5938 Q544.0156,350.9375 544.0156,347.8125 Q544.0156,344.6875 545.3281,343.0313 Q546.6563,341.375 549.1563,341.375 Q549.8594,341.375 550.5,341.5313 Q551.1563,341.6875 551.7188,341.9844 L551.7188,344.7031 Q551.0938,344.125 550.5,343.8594 Q549.9063,343.5781 549.2813,343.5781 Q547.9375,343.5781 547.25,344.6563 Q546.5625,345.7188 546.5625,347.8125 Q546.5625,349.9063 547.25,350.9844 Q547.9375,352.0469 549.2813,352.0469 Q549.9063,352.0469 550.5,351.7813 Q551.0938,351.5 551.7188,350.9219 L551.7188,353.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="569.25" y="352.1543">B</text>
@@ -88,15 +88,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="364" y2="364"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="372" y2="372"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496" y="378"/>
       <ellipse cx="501" cy="383" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="510" y="386.2104">template_template : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="526" y="216.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqf2rxvb0rnoq)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="526" y="216.5"/>
       <ellipse cx="541" cy="232.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M543.9688,238.1406 Q543.3906,238.4375 542.75,238.5781 Q542.1094,238.7344 541.4063,238.7344 Q538.9063,238.7344 537.5781,237.0938 Q536.2656,235.4375 536.2656,232.3125 Q536.2656,229.1875 537.5781,227.5313 Q538.9063,225.875 541.4063,225.875 Q542.1094,225.875 542.75,226.0313 Q543.4063,226.1875 543.9688,226.4844 L543.9688,229.2031 Q543.3438,228.625 542.75,228.3594 Q542.1563,228.0781 541.5313,228.0781 Q540.1875,228.0781 539.5,229.1563 Q538.8125,230.2188 538.8125,232.3125 Q538.8125,234.4063 539.5,235.4844 Q540.1875,236.5469 541.5313,236.5469 Q542.1563,236.5469 542.75,236.2813 Q543.3438,236 543.9688,235.4219 L543.9688,238.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="555" y="236.6543">B</text>
@@ -105,8 +105,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="248.5" y2="248.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="256.5" y2="256.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="94.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="446" y="23.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqf2rxvb0rnoq)" height="94.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="446" y="23.5"/>
       <ellipse cx="569.75" cy="39.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M572.7188,45.1406 Q572.1406,45.4375 571.5,45.5781 Q570.8594,45.7344 570.1563,45.7344 Q567.6563,45.7344 566.3281,44.0938 Q565.0156,42.4375 565.0156,39.3125 Q565.0156,36.1875 566.3281,34.5313 Q567.6563,32.875 570.1563,32.875 Q570.8594,32.875 571.5,33.0313 Q572.1563,33.1875 572.7188,33.4844 L572.7188,36.2031 Q572.0938,35.625 571.5,35.3594 Q570.9063,35.0781 570.2813,35.0781 Q568.9375,35.0781 568.25,36.1563 Q567.5625,37.2188 567.5625,39.3125 Q567.5625,41.4063 568.25,42.4844 Q568.9375,43.5469 570.2813,43.5469 Q570.9063,43.5469 571.5,43.2813 Q572.0938,43 572.7188,42.4219 L572.7188,45.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="590.25" y="43.6543">D</text>
@@ -115,31 +115,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="466" y="69.7104">D&lt;Items...&gt;(std::tuple&lt;Items...&gt; *) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="447" x2="710" y1="76.3047" y2="76.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="82.3047"/>
       <ellipse cx="457" cy="87.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="466" y="90.5151">add(int i) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="710" y1="97.1094" y2="97.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="103.1094"/>
       <ellipse cx="457" cy="108.1094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="466" y="111.3198">ints : B&lt;int,Vector&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="823.5" y="338.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqf2rxvb0rnoq)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="823.5" y="338.5"/>
       <ellipse cx="838.5" cy="354.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.4688,360.1406 Q840.8906,360.4375 840.25,360.5781 Q839.6094,360.7344 838.9063,360.7344 Q836.4063,360.7344 835.0781,359.0938 Q833.7656,357.4375 833.7656,354.3125 Q833.7656,351.1875 835.0781,349.5313 Q836.4063,347.875 838.9063,347.875 Q839.6094,347.875 840.25,348.0313 Q840.9063,348.1875 841.4688,348.4844 L841.4688,351.2031 Q840.8438,350.625 840.25,350.3594 Q839.6563,350.0781 839.0313,350.0781 Q837.6875,350.0781 837,351.1563 Q836.3125,352.2188 836.3125,354.3125 Q836.3125,356.4063 837,357.4844 Q837.6875,358.5469 839.0313,358.5469 Q839.6563,358.5469 840.25,358.2813 Q840.8438,358 841.4688,357.4219 L841.4688,360.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="852.5" y="358.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="370.5" y2="370.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="378.5" y2="378.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="852" y="210"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqf2rxvb0rnoq)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="852" y="210"/>
       <ellipse cx="867" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M869.9688,231.6406 Q869.3906,231.9375 868.75,232.0781 Q868.1094,232.2344 867.4063,232.2344 Q864.9063,232.2344 863.5781,230.5938 Q862.2656,228.9375 862.2656,225.8125 Q862.2656,222.6875 863.5781,221.0313 Q864.9063,219.375 867.4063,219.375 Q868.1094,219.375 868.75,219.5313 Q869.4063,219.6875 869.9688,219.9844 L869.9688,222.7031 Q869.3438,222.125 868.75,221.8594 Q868.1563,221.5781 867.5313,221.5781 Q866.1875,221.5781 865.5,222.6563 Q864.8125,223.7188 864.8125,225.8125 Q864.8125,227.9063 865.5,228.9844 Q866.1875,230.0469 867.5313,230.0469 Q868.1563,230.0469 868.75,229.7813 Q869.3438,229.5 869.9688,228.9219 L869.9688,231.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="881" y="230.1543">E::nested_template</text>
@@ -147,16 +147,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="15" x="1012" y="219.1387">ET</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="242" y2="242"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="858" y="248"/>
       <ellipse cx="863" cy="253" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="98" x="872" y="256.2104">get(ET * d) : DT *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="262.8047" y2="262.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqjohe2et0vne)" height="60.8047" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="746.5" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqf2rxvb0rnoq)" height="60.8047" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="746.5" y="40"/>
       <ellipse cx="765.1" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M768.0688,61.6406 Q767.4906,61.9375 766.85,62.0781 Q766.2094,62.2344 765.5063,62.2344 Q763.0063,62.2344 761.6781,60.5938 Q760.3656,58.9375 760.3656,55.8125 Q760.3656,52.6875 761.6781,51.0313 Q763.0063,49.375 765.5063,49.375 Q766.2094,49.375 766.85,49.5313 Q767.5063,49.6875 768.0688,49.9844 L768.0688,52.7031 Q767.4438,52.125 766.85,51.8594 Q766.2563,51.5781 765.6313,51.5781 Q764.2875,51.5781 763.6,52.6563 Q762.9125,53.7188 762.9125,55.8125 Q762.9125,57.9063 763.6,58.9844 Q764.2875,60.0469 765.6313,60.0469 Q766.2563,60.0469 766.85,59.7813 Q767.4438,59.5 768.0688,58.9219 L768.0688,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="779.9" y="60.1543">E::nested_template</text>
@@ -164,11 +164,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="914.5" y="49.1387">char</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="72" y2="72"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="752.5" y="78"/>
       <ellipse cx="757.5" cy="83" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="168" x="766.5" y="86.2104">getDecl(char * c) : DeclType *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="92.8047" y2="92.8047"/>
diff --git a/docs/test_cases/t00008_class_mermaid.svg b/docs/test_cases/t00008_class_mermaid.svg
index 8ac8aafc..3c4131e0 100644
--- a/docs/test_cases/t00008_class_mermaid.svg
+++ b/docs/test_cases/t00008_class_mermaid.svg
@@ -114,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L9">
+        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L9">
           <g title="A" id="classId-C_0002293517130897538130-0" class="node default clickable">
             <rect height="189" width="242.171875" y="-94.5" x="-121.0859375" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="121.0859375" x1="-121.0859375" class="divider"/>
@@ -163,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L20">
+        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L20">
           <g title="Vector" id="classId-C_0001677407014842680311-1" class="node default clickable">
             <rect height="79" width="186.203125" y="-39.5" x="-93.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="93.1015625" x1="-93.1015625" class="divider"/>
@@ -187,7 +187,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24">
+        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001968575752686868237-2" class="node default clickable">
             <rect height="79" width="209.328125" y="-39.5" x="-104.6640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="104.6640625" x1="-104.6640625" class="divider"/>
@@ -211,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L24">
+        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001449136415707203971-3" class="node default clickable">
             <rect height="57" width="118.15625" y="-28.5" x="-59.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.078125" x1="-59.078125" class="divider"/>
@@ -230,7 +230,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L28">
+        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L28">
           <g title="D" id="classId-C_0001562396858816419857-4" class="node default clickable">
             <rect height="123" width="164.84375" y="-61.5" x="-82.421875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="82.421875" x1="-82.421875" class="divider"/>
@@ -264,7 +264,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L36">
+        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L36">
           <g title="E" id="classId-C_0001787658457052431115-5" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -283,7 +283,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L37">
+        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L37">
           <g title="E##nested_template" id="classId-C_0001549419203490064906-6" class="node default clickable">
             <rect height="79" width="201.734375" y="-39.5" x="-100.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="100.8671875" x1="-100.8671875" class="divider"/>
@@ -307,7 +307,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00008/t00008.cc#L44">
+        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00008/t00008.cc#L44">
           <g title="E##nested_template" id="classId-C_0000033637089897037832-7" class="node default clickable">
             <rect height="79" width="234.203125" y="-39.5" x="-117.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="117.1015625" x1="-117.1015625" class="divider"/>
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index c8124296..41be461e 100644
--- a/docs/test_cases/t00009_class.svg
+++ b/docs/test_cases/t00009_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="351px" preserveAspectRatio="none" style="width:448px;height:351px;" version="1.1" viewBox="0 0 448 351" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fe3xriptox7v2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpvhhclle8byw" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvhhclle8byw)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
       <ellipse cx="142.3" cy="296" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.2688,301.6406 Q144.6906,301.9375 144.05,302.0781 Q143.4094,302.2344 142.7063,302.2344 Q140.2063,302.2344 138.8781,300.5938 Q137.5656,298.9375 137.5656,295.8125 Q137.5656,292.6875 138.8781,291.0313 Q140.2063,289.375 142.7063,289.375 Q143.4094,289.375 144.05,289.5313 Q144.7063,289.6875 145.2688,289.9844 L145.2688,292.7031 Q144.6438,292.125 144.05,291.8594 Q143.4563,291.5781 142.8313,291.5781 Q141.4875,291.5781 140.8,292.6563 Q140.1125,293.7188 140.1125,295.8125 Q140.1125,297.9063 140.8,298.9844 Q141.4875,300.0469 142.8313,300.0469 Q143.4563,300.0469 144.05,299.7813 Q144.6438,299.5 145.2688,298.9219 L145.2688,301.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="158.7" y="300.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="312" y2="312"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="320" y2="320"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122.5" y="326"/>
       <ellipse cx="127.5" cy="331" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="136.5" y="334.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvhhclle8byw)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
@@ -36,8 +36,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvhhclle8byw)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
       <ellipse cx="116" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M118.9688,192.6406 Q118.3906,192.9375 117.75,193.0781 Q117.1094,193.2344 116.4063,193.2344 Q113.9063,193.2344 112.5781,191.5938 Q111.2656,189.9375 111.2656,186.8125 Q111.2656,183.6875 112.5781,182.0313 Q113.9063,180.375 116.4063,180.375 Q117.1094,180.375 117.75,180.5313 Q118.4063,180.6875 118.9688,180.9844 L118.9688,183.7031 Q118.3438,183.125 117.75,182.8594 Q117.1563,182.5781 116.5313,182.5781 Q115.1875,182.5781 114.5,183.6563 Q113.8125,184.7188 113.8125,186.8125 Q113.8125,188.9063 114.5,189.9844 Q115.1875,191.0469 116.5313,191.0469 Q117.1563,191.0469 117.75,190.7813 Q118.3438,190.5 118.9688,189.9219 L118.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="130" y="191.1543">A</text>
@@ -46,8 +46,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvhhclle8byw)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
       <ellipse cx="257" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.9688,192.6406 Q259.3906,192.9375 258.75,193.0781 Q258.1094,193.2344 257.4063,193.2344 Q254.9063,193.2344 253.5781,191.5938 Q252.2656,189.9375 252.2656,186.8125 Q252.2656,183.6875 253.5781,182.0313 Q254.9063,180.375 257.4063,180.375 Q258.1094,180.375 258.75,180.5313 Q259.4063,180.6875 259.9688,180.9844 L259.9688,183.7031 Q259.3438,183.125 258.75,182.8594 Q258.1563,182.5781 257.5313,182.5781 Q256.1875,182.5781 255.5,183.6563 Q254.8125,184.7188 254.8125,186.8125 Q254.8125,188.9063 255.5,189.9844 Q256.1875,191.0469 257.5313,191.0469 Q258.1563,191.0469 258.75,190.7813 Q259.3438,190.5 259.9688,189.9219 L259.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="191.1543">A</text>
@@ -56,33 +56,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3xriptox7v2)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvhhclle8byw)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
       <ellipse cx="145.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.7188,29.6406 Q148.1406,29.9375 147.5,30.0781 Q146.8594,30.2344 146.1563,30.2344 Q143.6563,30.2344 142.3281,28.5938 Q141.0156,26.9375 141.0156,23.8125 Q141.0156,20.6875 142.3281,19.0313 Q143.6563,17.375 146.1563,17.375 Q146.8594,17.375 147.5,17.5313 Q148.1563,17.6875 148.7188,17.9844 L148.7188,20.7031 Q148.0938,20.125 147.5,19.8594 Q146.9063,19.5781 146.2813,19.5781 Q144.9375,19.5781 144.25,20.6563 Q143.5625,21.7188 143.5625,23.8125 Q143.5625,25.9063 144.25,26.9844 Q144.9375,28.0469 146.2813,28.0469 Q146.9063,28.0469 147.5,27.7813 Q148.0938,27.5 148.7188,26.9219 L148.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.25" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="54"/>
       <ellipse cx="36.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="45.5" y="62.2104">aint : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="66.8047"/>
       <ellipse cx="36.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="45.5" y="75.0151">astring : A&lt;std::string&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="79.6094"/>
       <ellipse cx="36.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="231" x="45.5" y="87.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
     </a>
     <path d="M60.16,219.24 C74.1,232.65 92.08,249.94 108.57,265.8 " fill="none" id="C_0000001894387438043499-&gt;C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00009_class_mermaid.svg b/docs/test_cases/t00009_class_mermaid.svg
index 1a4eb5d8..51b960ac 100644
--- a/docs/test_cases/t00009_class_mermaid.svg
+++ b/docs/test_cases/t00009_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000412228989111660105-0" class="node default clickable">
             <rect height="79" width="85.421875" y="-39.5" x="-42.7109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.7109375" x1="-42.7109375" class="divider"/>
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7">
+        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000001894387438043499-1" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -169,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001340793233843139195-2" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L7">
+        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001370808797762248850-3" class="node default clickable">
             <rect height="57" width="225.71875" y="-28.5" x="-112.859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.859375" x1="-112.859375" class="divider"/>
@@ -207,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00009/t00009.cc#L12">
+        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00009/t00009.cc#L12">
           <g title="B" id="classId-C_0000176239714450247310-4" class="node default clickable">
             <rect height="123" width="295.59375" y="-61.5" x="-147.796875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="147.796875" x1="-147.796875" class="divider"/>
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index 385fde7e..01cefb17 100644
--- a/docs/test_cases/t00010_class.svg
+++ b/docs/test_cases/t00010_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="586px" preserveAspectRatio="none" style="width:193px;height:586px;" version="1.1" viewBox="0 0 193 586" width="193px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1azx6hcbi5gzm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1i6sid1ymerh8" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i6sid1ymerh8)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
       <ellipse cx="75.3" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M78.2688,523.6406 Q77.6906,523.9375 77.05,524.0781 Q76.4094,524.2344 75.7063,524.2344 Q73.2063,524.2344 71.8781,522.5938 Q70.5656,520.9375 70.5656,517.8125 Q70.5656,514.6875 71.8781,513.0313 Q73.2063,511.375 75.7063,511.375 Q76.4094,511.375 77.05,511.5313 Q77.7063,511.6875 78.2688,511.9844 L78.2688,514.7031 Q77.6438,514.125 77.05,513.8594 Q76.4563,513.5781 75.8313,513.5781 Q74.4875,513.5781 73.8,514.6563 Q73.1125,515.7188 73.1125,517.8125 Q73.1125,519.9063 73.8,520.9844 Q74.4875,522.0469 75.8313,522.0469 Q76.4563,522.0469 77.05,521.7813 Q77.6438,521.5 78.2688,520.9219 L78.2688,523.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.7" y="522.1543">A</text>
@@ -19,22 +19,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="534" y2="534"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="542" y2="542"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="548"/>
       <ellipse cx="60.5" cy="553" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="69.5" y="556.2104">first : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="560.8047"/>
       <ellipse cx="60.5" cy="565.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="69.5" y="569.0151">second : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i6sid1ymerh8)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
       <ellipse cx="49" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M51.9688,414.6406 Q51.3906,414.9375 50.75,415.0781 Q50.1094,415.2344 49.4063,415.2344 Q46.9063,415.2344 45.5781,413.5938 Q44.2656,411.9375 44.2656,408.8125 Q44.2656,405.6875 45.5781,404.0313 Q46.9063,402.375 49.4063,402.375 Q50.1094,402.375 50.75,402.5313 Q51.4063,402.6875 51.9688,402.9844 L51.9688,405.7031 Q51.3438,405.125 50.75,404.8594 Q50.1563,404.5781 49.5313,404.5781 Q48.1875,404.5781 47.5,405.6563 Q46.8125,406.7188 46.8125,408.8125 Q46.8125,410.9063 47.5,411.9844 Q48.1875,413.0469 49.5313,413.0469 Q50.1563,413.0469 50.75,412.7813 Q51.3438,412.5 51.9688,411.9219 L51.9688,414.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="63" y="413.1543">A</text>
@@ -43,8 +43,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="425" y2="425"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="433" y2="433"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i6sid1ymerh8)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
       <ellipse cx="78.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.7188,276.6406 Q81.1406,276.9375 80.5,277.0781 Q79.8594,277.2344 79.1563,277.2344 Q76.6563,277.2344 75.3281,275.5938 Q74.0156,273.9375 74.0156,270.8125 Q74.0156,267.6875 75.3281,266.0313 Q76.6563,264.375 79.1563,264.375 Q79.8594,264.375 80.5,264.5313 Q81.1563,264.6875 81.7188,264.9844 L81.7188,267.7031 Q81.0938,267.125 80.5,266.8594 Q79.9063,266.5781 79.2813,266.5781 Q77.9375,266.5781 77.25,267.6563 Q76.5625,268.7188 76.5625,270.8125 Q76.5625,272.9063 77.25,273.9844 Q77.9375,275.0469 79.2813,275.0469 Q79.9063,275.0469 80.5,274.7813 Q81.0938,274.5 81.7188,273.9219 L81.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="99.25" y="275.1543">B</text>
@@ -53,15 +53,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="301"/>
       <ellipse cx="17" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="26" y="309.2104">astring : A&lt;T,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i6sid1ymerh8)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
       <ellipse cx="77.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M80.4688,167.6406 Q79.8906,167.9375 79.25,168.0781 Q78.6094,168.2344 77.9063,168.2344 Q75.4063,168.2344 74.0781,166.5938 Q72.7656,164.9375 72.7656,161.8125 Q72.7656,158.6875 74.0781,157.0313 Q75.4063,155.375 77.9063,155.375 Q78.6094,155.375 79.25,155.5313 Q79.9063,155.6875 80.4688,155.9844 L80.4688,158.7031 Q79.8438,158.125 79.25,157.8594 Q78.6563,157.5781 78.0313,157.5781 Q76.6875,157.5781 76,158.6563 Q75.3125,159.7188 75.3125,161.8125 Q75.3125,163.9063 76,164.9844 Q76.6875,166.0469 78.0313,166.0469 Q78.6563,166.0469 79.25,165.7813 Q79.8438,165.5 80.4688,164.9219 L80.4688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.5" y="166.1543">B</text>
@@ -70,19 +70,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1azx6hcbi5gzm)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i6sid1ymerh8)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
       <ellipse cx="84.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M87.2188,29.6406 Q86.6406,29.9375 86,30.0781 Q85.3594,30.2344 84.6563,30.2344 Q82.1563,30.2344 80.8281,28.5938 Q79.5156,26.9375 79.5156,23.8125 Q79.5156,20.6875 80.8281,19.0313 Q82.1563,17.375 84.6563,17.375 Q85.3594,17.375 86,17.5313 Q86.6563,17.6875 87.2188,17.9844 L87.2188,20.7031 Q86.5938,20.125 86,19.8594 Q85.4063,19.5781 84.7813,19.5781 Q83.4375,19.5781 82.75,20.6563 Q82.0625,21.7188 82.0625,23.8125 Q82.0625,25.9063 82.75,26.9844 Q83.4375,28.0469 84.7813,28.0469 Q85.4063,28.0469 86,27.7813 Q86.5938,27.5 87.2188,26.9219 L87.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="104.75" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="32.5" y="54"/>
       <ellipse cx="37.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="46.5" y="62.2104">aintstring : B&lt;int&gt;</text>
     </a>
     <path d="M92.5,441.14 C92.5,452.67 92.5,467.17 92.5,481.41 " fill="none" id="C_0001861520693741915300-&gt;C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00010_class_mermaid.svg b/docs/test_cases/t00010_class_mermaid.svg
index 85ea2f92..32c876bf 100644
--- a/docs/test_cases/t00010_class_mermaid.svg
+++ b/docs/test_cases/t00010_class_mermaid.svg
@@ -102,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0002222216618904514099-0" class="node default clickable">
             <rect height="101" width="99.953125" y="-50.5" x="-49.9765625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9765625" x1="-49.9765625" class="divider"/>
@@ -131,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0001861520693741915300-1" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0002303611426082708583-2" class="node default clickable">
             <rect height="79" width="195.984375" y="-39.5" x="-97.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.9921875" x1="-97.9921875" class="divider"/>
@@ -174,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0001498376939480949099-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00010/t00010.cc#L18">
+        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00010/t00010.cc#L18">
           <g title="C" id="classId-C_0001880966578968892571-4" class="node default clickable">
             <rect height="79" width="148.859375" y="-39.5" x="-74.4296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.4296875" x1="-74.4296875" class="divider"/>
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index 8c8c4d1d..f206038a 100644
--- a/docs/test_cases/t00011_class.svg
+++ b/docs/test_cases/t00011_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:226px;height:230px;" version="1.1" viewBox="0 0 226 230" width="226px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fsnescz82vglh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f110hn68drh5b1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsnescz82vglh)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f110hn68drh5b1)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
       <ellipse cx="31.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.3188,29.6406 Q33.7406,29.9375 33.1,30.0781 Q32.4594,30.2344 31.7563,30.2344 Q29.2563,30.2344 27.9281,28.5938 Q26.6156,26.9375 26.6156,23.8125 Q26.6156,20.6875 27.9281,19.0313 Q29.2563,17.375 31.7563,17.375 Q32.4594,17.375 33.1,17.5313 Q33.7563,17.6875 34.3188,17.9844 L34.3188,20.7031 Q33.6938,20.125 33.1,19.8594 Q32.5063,19.5781 31.8813,19.5781 Q30.5375,19.5781 29.85,20.6563 Q29.1625,21.7188 29.1625,23.8125 Q29.1625,25.9063 29.85,26.9844 Q30.5375,28.0469 31.8813,28.0469 Q32.5063,28.0469 33.1,27.7813 Q33.6938,27.5 34.3188,26.9219 L34.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="47.65" y="28.1543">D</text>
@@ -19,48 +19,48 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="62.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsnescz82vglh)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f110hn68drh5b1)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
       <ellipse cx="152.15" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,29.6406 Q154.5406,29.9375 153.9,30.0781 Q153.2594,30.2344 152.5563,30.2344 Q150.0563,30.2344 148.7281,28.5938 Q147.4156,26.9375 147.4156,23.8125 Q147.4156,20.6875 148.7281,19.0313 Q150.0563,17.375 152.5563,17.375 Q153.2594,17.375 153.9,17.5313 Q154.5563,17.6875 155.1188,17.9844 L155.1188,20.7031 Q154.4938,20.125 153.9,19.8594 Q153.3063,19.5781 152.6813,19.5781 Q151.3375,19.5781 150.65,20.6563 Q149.9625,21.7188 149.9625,23.8125 Q149.9625,25.9063 150.65,26.9844 Q151.3375,28.0469 152.6813,28.0469 Q153.3063,28.0469 153.9,27.7813 Q154.4938,27.5 155.1188,26.9219 L155.1188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="46"/>
       <ellipse cx="127" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="54.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsnescz82vglh)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f110hn68drh5b1)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
       <ellipse cx="152.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,167.6406 Q154.5406,167.9375 153.9,168.0781 Q153.2594,168.2344 152.5563,168.2344 Q150.0563,168.2344 148.7281,166.5938 Q147.4156,164.9375 147.4156,161.8125 Q147.4156,158.6875 148.7281,157.0313 Q150.0563,155.375 152.5563,155.375 Q153.2594,155.375 153.9,155.5313 Q154.5563,155.6875 155.1188,155.9844 L155.1188,158.7031 Q154.4938,158.125 153.9,157.8594 Q153.3063,157.5781 152.6813,157.5781 Q151.3375,157.5781 150.65,158.6563 Q149.9625,159.7188 149.9625,161.8125 Q149.9625,163.9063 150.65,164.9844 Q151.3375,166.0469 152.6813,166.0469 Q153.3063,166.0469 153.9,165.7813 Q154.4938,165.5 155.1188,164.9219 L155.1188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="166.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="184"/>
       <ellipse cx="127" cy="189" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="192.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="204.8047"/>
       <ellipse cx="127" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="136" y="213.0151">m_a : A *</text>
     </a>
     <path d="M116.04,73.01 C105.09,85.59 97.85,100.6 103.5,116 C107.44,126.72 113.97,136.89 121.21,145.9 " fill="none" id="C_0001420516952857803719&lt;-C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00011_class_mermaid.svg b/docs/test_cases/t00011_class_mermaid.svg
index 0131f95e..2998a19a 100644
--- a/docs/test_cases/t00011_class_mermaid.svg
+++ b/docs/test_cases/t00011_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L10">
+        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L10">
           <g title="D" id="classId-C_0001150639902748052276-0" class="node default clickable">
             <rect height="79" width="81.40625" y="-39.5" x="-40.703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.703125" x1="-40.703125" class="divider"/>
@@ -102,7 +102,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L14">
+        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L14">
           <g title="A" id="classId-C_0001420516952857803719-1" class="node default clickable">
             <rect height="79" width="99.9375" y="-39.5" x="-49.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -126,7 +126,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00011/t00011.cc#L26">
+        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00011/t00011.cc#L26">
           <g title="B" id="classId-C_0001687427603952049829-2" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index 7370ba01..32a3961e 100644
--- a/docs/test_cases/t00012_class.svg
+++ b/docs/test_cases/t00012_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:1362px;height:390px;" version="1.1" viewBox="0 0 1362 390" width="1362px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hwvc3mblsfi7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f112ce93dg7o3j" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
       <ellipse cx="885.75" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M888.7188,327.6406 Q888.1406,327.9375 887.5,328.0781 Q886.8594,328.2344 886.1563,328.2344 Q883.6563,328.2344 882.3281,326.5938 Q881.0156,324.9375 881.0156,321.8125 Q881.0156,318.6875 882.3281,317.0313 Q883.6563,315.375 886.1563,315.375 Q886.8594,315.375 887.5,315.5313 Q888.1563,315.6875 888.7188,315.9844 L888.7188,318.7031 Q888.0938,318.125 887.5,317.8594 Q886.9063,317.5781 886.2813,317.5781 Q884.9375,317.5781 884.25,318.6563 Q883.5625,319.7188 883.5625,321.8125 Q883.5625,323.9063 884.25,324.9844 Q884.9375,326.0469 886.2813,326.0469 Q886.9063,326.0469 887.5,325.7813 Q888.0938,325.5 888.7188,324.9219 L888.7188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="906.25" y="326.1543">A</text>
@@ -19,22 +19,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="352"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="842" y="360.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="364.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="366.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="842" y="373.0151">values : std::variant&lt;Ts...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
       <ellipse cx="1209.75" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1212.7188,334.1406 Q1212.1406,334.4375 1211.5,334.5781 Q1210.8594,334.7344 1210.1563,334.7344 Q1207.6563,334.7344 1206.3281,333.0938 Q1205.0156,331.4375 1205.0156,328.3125 Q1205.0156,325.1875 1206.3281,323.5313 Q1207.6563,321.875 1210.1563,321.875 Q1210.8594,321.875 1211.5,322.0313 Q1212.1563,322.1875 1212.7188,322.4844 L1212.7188,325.2031 Q1212.0938,324.625 1211.5,324.3594 Q1210.9063,324.0781 1210.2813,324.0781 Q1208.9375,324.0781 1208.25,325.1563 Q1207.5625,326.2188 1207.5625,328.3125 Q1207.5625,330.4063 1208.25,331.4844 Q1208.9375,332.5469 1210.2813,332.5469 Q1210.9063,332.5469 1211.5,332.2813 Q1212.0938,332 1212.7188,331.4219 L1212.7188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1230.25" y="332.6543">B</text>
@@ -43,15 +43,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1140" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="1154" y="366.7104">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
       <ellipse cx="216.25" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M219.2188,334.1406 Q218.6406,334.4375 218,334.5781 Q217.3594,334.7344 216.6563,334.7344 Q214.1563,334.7344 212.8281,333.0938 Q211.5156,331.4375 211.5156,328.3125 Q211.5156,325.1875 212.8281,323.5313 Q214.1563,321.875 216.6563,321.875 Q217.3594,321.875 218,322.0313 Q218.6563,322.1875 219.2188,322.4844 L219.2188,325.2031 Q218.5938,324.625 218,324.3594 Q217.4063,324.0781 216.7813,324.0781 Q215.4375,324.0781 214.75,325.1563 Q214.0625,326.2188 214.0625,328.3125 Q214.0625,330.4063 214.75,331.4844 Q215.4375,332.5469 216.7813,332.5469 Q217.4063,332.5469 218,332.2813 Q218.5938,332 219.2188,331.4219 L219.2188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="236.75" y="332.6543">C</text>
@@ -60,15 +60,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="155.5" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="169.5" y="366.7104">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
       <ellipse cx="773" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M775.9688,218.6406 Q775.3906,218.9375 774.75,219.0781 Q774.1094,219.2344 773.4063,219.2344 Q770.9063,219.2344 769.5781,217.5938 Q768.2656,215.9375 768.2656,212.8125 Q768.2656,209.6875 769.5781,208.0313 Q770.9063,206.375 773.4063,206.375 Q774.1094,206.375 774.75,206.5313 Q775.4063,206.6875 775.9688,206.9844 L775.9688,209.7031 Q775.3438,209.125 774.75,208.8594 Q774.1563,208.5781 773.5313,208.5781 Q772.1875,208.5781 771.5,209.6563 Q770.8125,210.7188 770.8125,212.8125 Q770.8125,214.9063 771.5,215.9844 Q772.1875,217.0469 773.5313,217.0469 Q774.1563,217.0469 774.75,216.7813 Q775.3438,216.5 775.9688,215.9219 L775.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="787" y="217.1543">A</text>
@@ -77,8 +77,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
       <ellipse cx="966.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M969.4688,218.6406 Q968.8906,218.9375 968.25,219.0781 Q967.6094,219.2344 966.9063,219.2344 Q964.4063,219.2344 963.0781,217.5938 Q961.7656,215.9375 961.7656,212.8125 Q961.7656,209.6875 963.0781,208.0313 Q964.4063,206.375 966.9063,206.375 Q967.6094,206.375 968.25,206.5313 Q968.9063,206.6875 969.4688,206.9844 L969.4688,209.7031 Q968.8438,209.125 968.25,208.8594 Q967.6563,208.5781 967.0313,208.5781 Q965.6875,208.5781 965,209.6563 Q964.3125,210.7188 964.3125,212.8125 Q964.3125,214.9063 965,215.9844 Q965.6875,217.0469 967.0313,217.0469 Q967.6563,217.0469 968.25,216.7813 Q968.8438,216.5 969.4688,215.9219 L969.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="980.5" y="217.1543">A</text>
@@ -87,8 +87,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
       <ellipse cx="1159" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1161.9688,218.6406 Q1161.3906,218.9375 1160.75,219.0781 Q1160.1094,219.2344 1159.4063,219.2344 Q1156.9063,219.2344 1155.5781,217.5938 Q1154.2656,215.9375 1154.2656,212.8125 Q1154.2656,209.6875 1155.5781,208.0313 Q1156.9063,206.375 1159.4063,206.375 Q1160.1094,206.375 1160.75,206.5313 Q1161.4063,206.6875 1161.9688,206.9844 L1161.9688,209.7031 Q1161.3438,209.125 1160.75,208.8594 Q1160.1563,208.5781 1159.5313,208.5781 Q1158.1875,208.5781 1157.5,209.6563 Q1156.8125,210.7188 1156.8125,212.8125 Q1156.8125,214.9063 1157.5,215.9844 Q1158.1875,217.0469 1159.5313,217.0469 Q1160.1563,217.0469 1160.75,216.7813 Q1161.3438,216.5 1161.9688,215.9219 L1161.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1173" y="217.1543">B</text>
@@ -97,8 +97,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
       <ellipse cx="1270" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1272.9688,218.6406 Q1272.3906,218.9375 1271.75,219.0781 Q1271.1094,219.2344 1270.4063,219.2344 Q1267.9063,219.2344 1266.5781,217.5938 Q1265.2656,215.9375 1265.2656,212.8125 Q1265.2656,209.6875 1266.5781,208.0313 Q1267.9063,206.375 1270.4063,206.375 Q1271.1094,206.375 1271.75,206.5313 Q1272.4063,206.6875 1272.9688,206.9844 L1272.9688,209.7031 Q1272.3438,209.125 1271.75,208.8594 Q1271.1563,208.5781 1270.5313,208.5781 Q1269.1875,208.5781 1268.5,209.6563 Q1267.8125,210.7188 1267.8125,212.8125 Q1267.8125,214.9063 1268.5,215.9844 Q1269.1875,217.0469 1270.5313,217.0469 Q1271.1563,217.0469 1271.75,216.7813 Q1272.3438,216.5 1272.9688,215.9219 L1272.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1284" y="217.1543">B</text>
@@ -107,8 +107,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">C</text>
@@ -117,50 +117,50 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwvc3mblsfi7)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f112ce93dg7o3j)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
       <ellipse cx="1021.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1024.7188,29.6406 Q1024.1406,29.9375 1023.5,30.0781 Q1022.8594,30.2344 1022.1563,30.2344 Q1019.6563,30.2344 1018.3281,28.5938 Q1017.0156,26.9375 1017.0156,23.8125 Q1017.0156,20.6875 1018.3281,19.0313 Q1019.6563,17.375 1022.1563,17.375 Q1022.8594,17.375 1023.5,17.5313 Q1024.1563,17.6875 1024.7188,17.9844 L1024.7188,20.7031 Q1024.0938,20.125 1023.5,19.8594 Q1022.9063,19.5781 1022.2813,19.5781 Q1020.9375,19.5781 1020.25,20.6563 Q1019.5625,21.7188 1019.5625,23.8125 Q1019.5625,25.9063 1020.25,26.9844 Q1020.9375,28.0469 1022.2813,28.0469 Q1022.9063,28.0469 1023.5,27.7813 Q1024.0938,27.5 1024.7188,26.9219 L1024.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1042.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="62.2104">a1 : A&lt;int,std::string,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="75.0151">a2 : A&lt;int,std::string,bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="87.8198">b1 : B&lt;3,2,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="100.6245">b2 : B&lt;1,1,1,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="113.4292">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
     </a>
-    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f1hwvc3mblsfi7)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f112ce93dg7o3j)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M712.5,208.5 L712.5,218.5 L722.5,218.5 L712.5,208.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="166" x="541.5" y="225.5669">Long template annotation</text>
     <path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000286972398942005457-&gt;C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00012_class_mermaid.svg b/docs/test_cases/t00012_class_mermaid.svg
index fa787783..5723a64a 100644
--- a/docs/test_cases/t00012_class_mermaid.svg
+++ b/docs/test_cases/t00012_class_mermaid.svg
@@ -174,7 +174,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11">
+        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0001773299890023132282-0" class="node default clickable">
             <rect height="101" width="206.203125" y="-50.5" x="-103.1015625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="103.1015625" x1="-103.1015625" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16">
+        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0002061171077567279746-1" class="node default clickable">
             <rect height="79" width="243.515625" y="-39.5" x="-121.7578125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.7578125" x1="-121.7578125" class="divider"/>
@@ -227,7 +227,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0000627809578407650629-2" class="node default clickable">
             <rect height="79" width="234.625" y="-39.5" x="-117.3125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="117.3125" x1="-117.3125" class="divider"/>
@@ -251,7 +251,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11">
+        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000286972398942005457-3" class="node default clickable">
             <rect height="57" width="186.5625" y="-28.5" x="-93.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.28125" x1="-93.28125" class="divider"/>
@@ -270,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L11">
+        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000299466181098300963-4" class="node default clickable">
             <rect height="57" width="186.546875" y="-28.5" x="-93.2734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.2734375" x1="-93.2734375" class="divider"/>
@@ -289,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16">
+        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000489063277971613593-5" class="node default clickable">
             <rect height="57" width="80.828125" y="-28.5" x="-40.4140625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="40.4140625" x1="-40.4140625" class="divider"/>
@@ -308,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L16">
+        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000014232362483200599-6" class="node default clickable">
             <rect height="57" width="94.171875" y="-28.5" x="-47.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0859375" x1="-47.0859375" class="divider"/>
@@ -327,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0001478239414632239754-7" class="node default clickable">
             <rect height="57" width="578.71875" y="-28.5" x="-289.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="289.359375" x1="-289.359375" class="divider"/>
@@ -346,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00012/t00012.cc#L24">
+        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00012/t00012.cc#L24">
           <g title="R" id="classId-C_0000559263385732885469-8" class="node default clickable">
             <rect height="167" width="569.0625" y="-83.5" x="-284.53125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="284.53125" x1="-284.53125" class="divider"/>
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index 9e01ec4e..bca0a240 100644
--- a/docs/test_cases/t00013_class.svg
+++ b/docs/test_cases/t00013_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="518px" preserveAspectRatio="none" style="width:1138px;height:518px;" version="1.1" viewBox="0 0 1138 518" width="1138px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnkll5h6sumim" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f54gbguaxg29u" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
       <ellipse cx="176" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,462.1406 Q178.3906,462.4375 177.75,462.5781 Q177.1094,462.7344 176.4063,462.7344 Q173.9063,462.7344 172.5781,461.0938 Q171.2656,459.4375 171.2656,456.3125 Q171.2656,453.1875 172.5781,451.5313 Q173.9063,449.875 176.4063,449.875 Q177.1094,449.875 177.75,450.0313 Q178.4063,450.1875 178.9688,450.4844 L178.9688,453.2031 Q178.3438,452.625 177.75,452.3594 Q177.1563,452.0781 176.5313,452.0781 Q175.1875,452.0781 174.5,453.1563 Q173.8125,454.2188 173.8125,456.3125 Q173.8125,458.4063 174.5,459.4844 Q175.1875,460.5469 176.5313,460.5469 Q177.1563,460.5469 177.75,460.2813 Q178.3438,460 178.9688,459.4219 L178.9688,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="190" y="460.6543">ABCD::F</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="472.5" y2="472.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="480.5" y2="480.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167" y="486.5"/>
       <ellipse cx="172" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="181" y="494.7104">f : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
       <ellipse cx="248.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M251.4688,333.6406 Q250.8906,333.9375 250.25,334.0781 Q249.6094,334.2344 248.9063,334.2344 Q246.4063,334.2344 245.0781,332.5938 Q243.7656,330.9375 243.7656,327.8125 Q243.7656,324.6875 245.0781,323.0313 Q246.4063,321.375 248.9063,321.375 Q249.6094,321.375 250.25,321.5313 Q250.9063,321.6875 251.4688,321.9844 L251.4688,324.7031 Q250.8438,324.125 250.25,323.8594 Q249.6563,323.5781 249.0313,323.5781 Q247.6875,323.5781 247,324.6563 Q246.3125,325.7188 246.3125,327.8125 Q246.3125,329.9063 247,330.9844 Q247.6875,332.0469 249.0313,332.0469 Q249.6563,332.0469 250.25,331.7813 Q250.8438,331.5 251.4688,330.9219 L251.4688,333.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="262.5" y="332.1543">ABCD::F</text>
@@ -36,75 +36,75 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="344" y2="344"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
       <ellipse cx="392.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.5188,327.1406 Q394.9406,327.4375 394.3,327.5781 Q393.6594,327.7344 392.9563,327.7344 Q390.4563,327.7344 389.1281,326.0938 Q387.8156,324.4375 387.8156,321.3125 Q387.8156,318.1875 389.1281,316.5313 Q390.4563,314.875 392.9563,314.875 Q393.6594,314.875 394.3,315.0313 Q394.9563,315.1875 395.5188,315.4844 L395.5188,318.2031 Q394.8938,317.625 394.3,317.3594 Q393.7063,317.0781 393.0813,317.0781 Q391.7375,317.0781 391.05,318.1563 Q390.3625,319.2188 390.3625,321.3125 Q390.3625,323.4063 391.05,324.4844 Q391.7375,325.5469 393.0813,325.5469 Q393.7063,325.5469 394.3,325.2813 Q394.8938,325 395.5188,324.4219 L395.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="408.45" y="325.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="337.5" y2="337.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="375" y="351.5"/>
       <ellipse cx="380" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="389" y="359.7104">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
       <ellipse cx="486.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M489.5188,327.1406 Q488.9406,327.4375 488.3,327.5781 Q487.6594,327.7344 486.9563,327.7344 Q484.4563,327.7344 483.1281,326.0938 Q481.8156,324.4375 481.8156,321.3125 Q481.8156,318.1875 483.1281,316.5313 Q484.4563,314.875 486.9563,314.875 Q487.6594,314.875 488.3,315.0313 Q488.9563,315.1875 489.5188,315.4844 L489.5188,318.2031 Q488.8938,317.625 488.3,317.3594 Q487.7063,317.0781 487.0813,317.0781 Q485.7375,317.0781 485.05,318.1563 Q484.3625,319.2188 484.3625,321.3125 Q484.3625,323.4063 485.05,324.4844 Q485.7375,325.5469 487.0813,325.5469 Q487.7063,325.5469 488.3,325.2813 Q488.8938,325 489.5188,324.4219 L489.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.45" y="325.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="337.5" y2="337.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="469" y="351.5"/>
       <ellipse cx="474" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="483" y="359.7104">b : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
       <ellipse cx="580.6" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M583.5688,327.1406 Q582.9906,327.4375 582.35,327.5781 Q581.7094,327.7344 581.0063,327.7344 Q578.5063,327.7344 577.1781,326.0938 Q575.8656,324.4375 575.8656,321.3125 Q575.8656,318.1875 577.1781,316.5313 Q578.5063,314.875 581.0063,314.875 Q581.7094,314.875 582.35,315.0313 Q583.0063,315.1875 583.5688,315.4844 L583.5688,318.2031 Q582.9438,317.625 582.35,317.3594 Q581.7563,317.0781 581.1313,317.0781 Q579.7875,317.0781 579.1,318.1563 Q578.4125,319.2188 578.4125,321.3125 Q578.4125,323.4063 579.1,324.4844 Q579.7875,325.5469 581.1313,325.5469 Q581.7563,325.5469 582.35,325.2813 Q582.9438,325 583.5688,324.4219 L583.5688,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="596.4" y="325.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="337.5" y2="337.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="563.5" y="351.5"/>
       <ellipse cx="568.5" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="577.5" y="359.7104">c : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
       <ellipse cx="57.75" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7188,320.6406 Q60.1406,320.9375 59.5,321.0781 Q58.8594,321.2344 58.1563,321.2344 Q55.6563,321.2344 54.3281,319.5938 Q53.0156,317.9375 53.0156,314.8125 Q53.0156,311.6875 54.3281,310.0313 Q55.6563,308.375 58.1563,308.375 Q58.8594,308.375 59.5,308.5313 Q60.1563,308.6875 60.7188,308.9844 L60.7188,311.7031 Q60.0938,311.125 59.5,310.8594 Q58.9063,310.5781 58.2813,310.5781 Q56.9375,310.5781 56.25,311.6563 Q55.5625,312.7188 55.5625,314.8125 Q55.5625,316.9063 56.25,317.9844 Q56.9375,319.0469 58.2813,319.0469 Q58.9063,319.0469 59.5,318.7813 Q60.0938,318.5 60.7188,317.9219 L60.7188,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="78.25" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="331" y2="331"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="337"/>
       <ellipse cx="17" cy="342" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="95" x="26" y="345.2104">print(R * r) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="351.8047" y2="351.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="357.8047"/>
       <ellipse cx="17" cy="362.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="366.0151">d : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
       <ellipse cx="810.95" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M813.9188,462.1406 Q813.3406,462.4375 812.7,462.5781 Q812.0594,462.7344 811.3563,462.7344 Q808.8563,462.7344 807.5281,461.0938 Q806.2156,459.4375 806.2156,456.3125 Q806.2156,453.1875 807.5281,451.5313 Q808.8563,449.875 811.3563,449.875 Q812.0594,449.875 812.7,450.0313 Q813.3563,450.1875 813.9188,450.4844 L813.9188,453.2031 Q813.2938,452.625 812.7,452.3594 Q812.1063,452.0781 811.4813,452.0781 Q810.1375,452.0781 809.45,453.1563 Q808.7625,454.2188 808.7625,456.3125 Q808.7625,458.4063 809.45,459.4844 Q810.1375,460.5469 811.4813,460.5469 Q812.1063,460.5469 812.7,460.2813 Q813.2938,460 813.9188,459.4219 L813.9188,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.05" y="460.6543">E</text>
@@ -113,15 +113,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="472.5" y2="472.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="480.5" y2="480.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="486.5"/>
       <ellipse cx="806.5" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="815.5" y="494.7104">e : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
       <ellipse cx="1001.75" cy="450" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1004.7188,455.6406 Q1004.1406,455.9375 1003.5,456.0781 Q1002.8594,456.2344 1002.1563,456.2344 Q999.6563,456.2344 998.3281,454.5938 Q997.0156,452.9375 997.0156,449.8125 Q997.0156,446.6875 998.3281,445.0313 Q999.6563,443.375 1002.1563,443.375 Q1002.8594,443.375 1003.5,443.5313 Q1004.1563,443.6875 1004.7188,443.9844 L1004.7188,446.7031 Q1004.0938,446.125 1003.5,445.8594 Q1002.9063,445.5781 1002.2813,445.5781 Q1000.9375,445.5781 1000.25,446.6563 Q999.5625,447.7188 999.5625,449.8125 Q999.5625,451.9063 1000.25,452.9844 Q1000.9375,454.0469 1002.2813,454.0469 Q1002.9063,454.0469 1003.5,453.7813 Q1004.0938,453.5 1004.7188,452.9219 L1004.7188,455.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1022.25" y="454.1543">G</text>
@@ -130,22 +130,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="466" y2="466"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="474" y2="474"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="480"/>
       <ellipse cx="961.5" cy="485" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="970.5" y="488.2104">args : std::tuple&lt;Args...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="492.8047"/>
       <ellipse cx="961.5" cy="497.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="970.5" y="501.0151">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
       <ellipse cx="806.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M809.4688,333.6406 Q808.8906,333.9375 808.25,334.0781 Q807.6094,334.2344 806.9063,334.2344 Q804.4063,334.2344 803.0781,332.5938 Q801.7656,330.9375 801.7656,327.8125 Q801.7656,324.6875 803.0781,323.0313 Q804.4063,321.375 806.9063,321.375 Q807.6094,321.375 808.25,321.5313 Q808.9063,321.6875 809.4688,321.9844 L809.4688,324.7031 Q808.8438,324.125 808.25,323.8594 Q807.6563,323.5781 807.0313,323.5781 Q805.6875,323.5781 805,324.6563 Q804.3125,325.7188 804.3125,327.8125 Q804.3125,329.9063 805,330.9844 Q805.6875,332.0469 807.0313,332.0469 Q807.6563,332.0469 808.25,331.7813 Q808.8438,331.5 809.4688,330.9219 L809.4688,333.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="332.1543">E</text>
@@ -154,8 +154,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="344" y2="344"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
       <ellipse cx="973" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M975.9688,333.6406 Q975.3906,333.9375 974.75,334.0781 Q974.1094,334.2344 973.4063,334.2344 Q970.9063,334.2344 969.5781,332.5938 Q968.2656,330.9375 968.2656,327.8125 Q968.2656,324.6875 969.5781,323.0313 Q970.9063,321.375 973.4063,321.375 Q974.1094,321.375 974.75,321.5313 Q975.4063,321.6875 975.9688,321.9844 L975.9688,324.7031 Q975.3438,324.125 974.75,323.8594 Q974.1563,323.5781 973.5313,323.5781 Q972.1875,323.5781 971.5,324.6563 Q970.8125,325.7188 970.8125,327.8125 Q970.8125,329.9063 971.5,330.9844 Q972.1875,332.0469 973.5313,332.0469 Q974.1563,332.0469 974.75,331.7813 Q975.3438,331.5 975.9688,330.9219 L975.9688,333.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="987" y="332.1543">G</text>
@@ -164,8 +164,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="344" y2="344"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
       <ellipse cx="665.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M668.4688,333.6406 Q667.8906,333.9375 667.25,334.0781 Q666.6094,334.2344 665.9063,334.2344 Q663.4063,334.2344 662.0781,332.5938 Q660.7656,330.9375 660.7656,327.8125 Q660.7656,324.6875 662.0781,323.0313 Q663.4063,321.375 665.9063,321.375 Q666.6094,321.375 667.25,321.5313 Q667.9063,321.6875 668.4688,321.9844 L668.4688,324.7031 Q667.8438,324.125 667.25,323.8594 Q666.6563,323.5781 666.0313,323.5781 Q664.6875,323.5781 664,324.6563 Q663.3125,325.7188 663.3125,327.8125 Q663.3125,329.9063 664,330.9844 Q664.6875,332.0469 666.0313,332.0469 Q666.6563,332.0469 667.25,331.7813 Q667.8438,331.5 668.4688,330.9219 L668.4688,333.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="679.5" y="332.1543">E</text>
@@ -174,93 +174,93 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="344" y2="344"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="352" y2="352"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnkll5h6sumim)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f54gbguaxg29u)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
       <ellipse cx="484.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M487.2188,29.6406 Q486.6406,29.9375 486,30.0781 Q485.3594,30.2344 484.6563,30.2344 Q482.1563,30.2344 480.8281,28.5938 Q479.5156,26.9375 479.5156,23.8125 Q479.5156,20.6875 480.8281,19.0313 Q482.1563,17.375 484.6563,17.375 Q485.3594,17.375 486,17.5313 Q486.6563,17.6875 487.2188,17.9844 L487.2188,20.7031 Q486.5938,20.125 486,19.8594 Q485.4063,19.5781 484.7813,19.5781 Q483.4375,19.5781 482.75,20.6563 Q482.0625,21.7188 482.0625,23.8125 Q482.0625,25.9063 482.75,26.9844 Q483.4375,28.0469 484.7813,28.0469 Q485.4063,28.0469 486,27.7813 Q486.5938,27.5 487.2188,26.9219 L487.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="504.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="46"/>
       <ellipse cx="382.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="391.5" y="54.2104">get_a(A * a) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="58.8047"/>
       <ellipse cx="382.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="391.5" y="67.0151">get_b(B &amp; b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="71.6094"/>
       <ellipse cx="382.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="391.5" y="79.8198">get_c(C c) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="84.4141"/>
       <ellipse cx="382.5" cy="89.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="391.5" y="92.6245">get_const_b(const B &amp; b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="97.2188"/>
       <ellipse cx="382.5" cy="102.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="391.5" y="105.4292">get_d(D &amp;&amp; d) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="110.0234"/>
       <ellipse cx="382.5" cy="115.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="391.5" y="118.2339">get_d2(D &amp;&amp; d) : int</text>
     </a>
     <ellipse cx="382.5" cy="127.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="391.5" y="131.0386">get_e&lt;T&gt;(E&lt;T&gt; e) : T</text>
     <ellipse cx="382.5" cy="140.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="168" x="391.5" y="143.8433">get_f&lt;T&gt;(const F&lt;T&gt; &amp; f) : T</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="148.4375"/>
       <ellipse cx="382.5" cy="153.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="184" x="391.5" y="156.6479">get_int_e(const E&lt;int&gt; &amp; e) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="161.2422"/>
       <ellipse cx="382.5" cy="166.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="391.5" y="169.4526">get_int_e2(E&lt;int&gt; &amp; e) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="174.0469"/>
       <ellipse cx="382.5" cy="179.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="391.5" y="182.2573">get_int_f(const ABCD::F&lt;int&gt; &amp; f) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="188.8516" y2="188.8516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="194.8516"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="379.5" y="196.8516"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="391.5" y="203.062">estring : E&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="207.6563"/>
       <ellipse cx="382.5" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="391.5" y="215.8667">gintstring : G&lt;int,float,std::string&gt;</text>
     </a>
     <path d="M270.09,360.17 C260.11,377.41 246.14,401.53 233.84,422.78 " fill="none" id="C_0002304215469403389354-&gt;C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00013_class_mermaid.svg b/docs/test_cases/t00013_class_mermaid.svg
index cba04955..b07bf1a1 100644
--- a/docs/test_cases/t00013_class_mermaid.svg
+++ b/docs/test_cases/t00013_class_mermaid.svg
@@ -234,7 +234,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7">
+        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0000952770730316239752-0" class="node default clickable">
             <rect height="79" width="110.109375" y="-39.5" x="-55.0546875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
@@ -258,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L7">
+        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0002304215469403389354-1" class="node default clickable">
             <rect height="57" width="119.890625" y="-28.5" x="-59.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.9453125" x1="-59.9453125" class="divider"/>
@@ -277,7 +277,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L14">
+        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L14">
           <g title="A" id="classId-C_0000519995486237427479-2" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -301,7 +301,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L18">
+        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L18">
           <g title="B" id="classId-C_0001177487653597650440-3" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -325,7 +325,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L22">
+        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L22">
           <g title="C" id="classId-C_0001028245818073128358-4" class="node default clickable">
             <rect height="79" width="62.578125" y="-39.5" x="-31.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.2890625" x1="-31.2890625" class="divider"/>
@@ -349,7 +349,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L28">
+        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L28">
           <g title="D" id="classId-C_0000409373870621931875-5" class="node default clickable">
             <rect height="101" width="140.8125" y="-50.5" x="-70.40625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="70.40625" x1="-70.40625" class="divider"/>
@@ -378,7 +378,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000864055993755439230-6" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -402,7 +402,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0000205927019127027617-7" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -431,7 +431,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33">
+        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0001977486318799565722-8" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -450,7 +450,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0001526733274613822014-9" class="node default clickable">
             <rect height="57" width="187.453125" y="-28.5" x="-93.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.7265625" x1="-93.7265625" class="divider"/>
@@ -469,7 +469,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000531523220915557686-10" class="node default clickable">
             <rect height="57" width="123.46875" y="-28.5" x="-61.734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.734375" x1="-61.734375" class="divider"/>
@@ -488,7 +488,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00013/t00013.cc#L43">
+        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00013/t00013.cc#L43">
           <g title="R" id="classId-C_0002198686676355573844-11" class="node default clickable">
             <rect height="343" width="259.125" y="-171.5" x="-129.5625" class="outer title-state"/>
             <line y2="-141.5" y1="-141.5" x2="129.5625" x1="-129.5625" class="divider"/>
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index 8dbf31b8..57cd9936 100644
--- a/docs/test_cases/t00014_class.svg
+++ b/docs/test_cases/t00014_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1143px" preserveAspectRatio="none" style="width:1085px;height:1143px;" version="1.1" viewBox="0 0 1085 1143" width="1085px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f3vsg35wjon5m" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fdda2epwmif2s" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1009" y="589"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1009" y="589"/>
       <ellipse cx="1024" cy="605" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1026.9688,610.6406 Q1026.3906,610.9375 1025.75,611.0781 Q1025.1094,611.2344 1024.4063,611.2344 Q1021.9063,611.2344 1020.5781,609.5938 Q1019.2656,607.9375 1019.2656,604.8125 Q1019.2656,601.6875 1020.5781,600.0313 Q1021.9063,598.375 1024.4063,598.375 Q1025.1094,598.375 1025.75,598.5313 Q1026.4063,598.6875 1026.9688,598.9844 L1026.9688,601.7031 Q1026.3438,601.125 1025.75,600.8594 Q1025.1563,600.5781 1024.5313,600.5781 Q1023.1875,600.5781 1022.5,601.6563 Q1021.8125,602.7188 1021.8125,604.8125 Q1021.8125,606.9063 1022.5,607.9844 Q1023.1875,609.0469 1024.5313,609.0469 Q1025.1563,609.0469 1025.75,608.7813 Q1026.3438,608.5 1026.9688,607.9219 L1026.9688,610.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1038" y="609.1543">A</text>
@@ -19,37 +19,37 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="621" y2="621"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="629" y2="629"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1015" y="635"/>
       <ellipse cx="1020" cy="640" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="1029" y="643.2104">p : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1015" y="647.8047"/>
       <ellipse cx="1020" cy="652.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="1029" y="656.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="466.5" y="51.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="466.5" y="51.5"/>
       <ellipse cx="521.75" cy="67.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M524.7188,73.1406 Q524.1406,73.4375 523.5,73.5781 Q522.8594,73.7344 522.1563,73.7344 Q519.6563,73.7344 518.3281,72.0938 Q517.0156,70.4375 517.0156,67.3125 Q517.0156,64.1875 518.3281,62.5313 Q519.6563,60.875 522.1563,60.875 Q522.8594,60.875 523.5,61.0313 Q524.1563,61.1875 524.7188,61.4844 L524.7188,64.2031 Q524.0938,63.625 523.5,63.3594 Q522.9063,63.0781 522.2813,63.0781 Q520.9375,63.0781 520.25,64.1563 Q519.5625,65.2188 519.5625,67.3125 Q519.5625,69.4063 520.25,70.4844 Q520.9375,71.5469 522.2813,71.5469 Q522.9063,71.5469 523.5,71.2813 Q524.0938,71 524.7188,70.4219 L524.7188,73.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.25" y="71.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="83.5" y2="83.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="91.5" y2="91.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="472.5" y="97.5"/>
       <ellipse cx="477.5" cy="102.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="486.5" y="105.7104">value : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="774" y="870"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="774" y="870"/>
       <ellipse cx="789" cy="886" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M791.9688,891.6406 Q791.3906,891.9375 790.75,892.0781 Q790.1094,892.2344 789.4063,892.2344 Q786.9063,892.2344 785.5781,890.5938 Q784.2656,888.9375 784.2656,885.8125 Q784.2656,882.6875 785.5781,881.0313 Q786.9063,879.375 789.4063,879.375 Q790.1094,879.375 790.75,879.5313 Q791.4063,879.6875 791.9688,879.9844 L791.9688,882.7031 Q791.3438,882.125 790.75,881.8594 Q790.1563,881.5781 789.5313,881.5781 Q788.1875,881.5781 787.5,882.6563 Q786.8125,883.7188 786.8125,885.8125 Q786.8125,887.9063 787.5,888.9844 Q788.1875,890.0469 789.5313,890.0469 Q790.1563,890.0469 790.75,889.7813 Q791.3438,889.5 791.9688,888.9219 L791.9688,891.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="803" y="890.1543">A</text>
@@ -58,8 +58,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="902" y2="902"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="910" y2="910"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="717" y="653"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="717" y="653"/>
       <ellipse cx="732" cy="669" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M734.9688,674.6406 Q734.3906,674.9375 733.75,675.0781 Q733.1094,675.2344 732.4063,675.2344 Q729.9063,675.2344 728.5781,673.5938 Q727.2656,671.9375 727.2656,668.8125 Q727.2656,665.6875 728.5781,664.0313 Q729.9063,662.375 732.4063,662.375 Q733.1094,662.375 733.75,662.5313 Q734.4063,662.6875 734.9688,662.9844 L734.9688,665.7031 Q734.3438,665.125 733.75,664.8594 Q733.1563,664.5781 732.5313,664.5781 Q731.1875,664.5781 730.5,665.6563 Q729.8125,666.7188 729.8125,668.8125 Q729.8125,670.9063 730.5,671.9844 Q731.1875,673.0469 732.5313,673.0469 Q733.1563,673.0469 733.75,672.7813 Q734.3438,672.5 734.9688,671.9219 L734.9688,674.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="746" y="673.1543">A</text>
@@ -68,8 +68,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="685" y2="685"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="693" y2="693"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="791.5" y="529"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="791.5" y="529"/>
       <ellipse cx="806.5" cy="545" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M809.4688,550.6406 Q808.8906,550.9375 808.25,551.0781 Q807.6094,551.2344 806.9063,551.2344 Q804.4063,551.2344 803.0781,549.5938 Q801.7656,547.9375 801.7656,544.8125 Q801.7656,541.6875 803.0781,540.0313 Q804.4063,538.375 806.9063,538.375 Q807.6094,538.375 808.25,538.5313 Q808.9063,538.6875 809.4688,538.9844 L809.4688,541.7031 Q808.8438,541.125 808.25,540.8594 Q807.6563,540.5781 807.0313,540.5781 Q805.6875,540.5781 805,541.6563 Q804.3125,542.7188 804.3125,544.8125 Q804.3125,546.9063 805,547.9844 Q805.6875,549.0469 807.0313,549.0469 Q807.6563,549.0469 808.25,548.7813 Q808.8438,548.5 809.4688,547.9219 L809.4688,550.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="549.1543">A</text>
@@ -78,8 +78,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="561" y2="561"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="569" y2="569"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="783.5" y="295"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="783.5" y="295"/>
       <ellipse cx="798.5" cy="311" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M801.4688,316.6406 Q800.8906,316.9375 800.25,317.0781 Q799.6094,317.2344 798.9063,317.2344 Q796.4063,317.2344 795.0781,315.5938 Q793.7656,313.9375 793.7656,310.8125 Q793.7656,307.6875 795.0781,306.0313 Q796.4063,304.375 798.9063,304.375 Q799.6094,304.375 800.25,304.5313 Q800.9063,304.6875 801.4688,304.9844 L801.4688,307.7031 Q800.8438,307.125 800.25,306.8594 Q799.6563,306.5781 799.0313,306.5781 Q797.6875,306.5781 797,307.6563 Q796.3125,308.7188 796.3125,310.8125 Q796.3125,312.9063 797,313.9844 Q797.6875,315.0469 799.0313,315.0469 Q799.6563,315.0469 800.25,314.7813 Q800.8438,314.5 801.4688,313.9219 L801.4688,316.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.5" y="315.1543">A</text>
@@ -88,8 +88,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="327" y2="327"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="335" y2="335"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="488" y="585"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="488" y="585"/>
       <ellipse cx="503" cy="601" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M505.9688,606.6406 Q505.3906,606.9375 504.75,607.0781 Q504.1094,607.2344 503.4063,607.2344 Q500.9063,607.2344 499.5781,605.5938 Q498.2656,603.9375 498.2656,600.8125 Q498.2656,597.6875 499.5781,596.0313 Q500.9063,594.375 503.4063,594.375 Q504.1094,594.375 504.75,594.5313 Q505.4063,594.6875 505.9688,594.9844 L505.9688,597.7031 Q505.3438,597.125 504.75,596.8594 Q504.1563,596.5781 503.5313,596.5781 Q502.1875,596.5781 501.5,597.6563 Q500.8125,598.7188 500.8125,600.8125 Q500.8125,602.9063 501.5,603.9844 Q502.1875,605.0469 503.5313,605.0469 Q504.1563,605.0469 504.75,604.7813 Q505.3438,604.5 505.9688,603.9219 L505.9688,606.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="517" y="605.1543">A</text>
@@ -98,8 +98,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="617" y2="617"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="625" y2="625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="479" y="502"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="479" y="502"/>
       <ellipse cx="494" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M496.9688,523.6406 Q496.3906,523.9375 495.75,524.0781 Q495.1094,524.2344 494.4063,524.2344 Q491.9063,524.2344 490.5781,522.5938 Q489.2656,520.9375 489.2656,517.8125 Q489.2656,514.6875 490.5781,513.0313 Q491.9063,511.375 494.4063,511.375 Q495.1094,511.375 495.75,511.5313 Q496.4063,511.6875 496.9688,511.9844 L496.9688,514.7031 Q496.3438,514.125 495.75,513.8594 Q495.1563,513.5781 494.5313,513.5781 Q493.1875,513.5781 492.5,514.6563 Q491.8125,515.7188 491.8125,517.8125 Q491.8125,519.9063 492.5,520.9844 Q493.1875,522.0469 494.5313,522.0469 Q495.1563,522.0469 495.75,521.7813 Q496.3438,521.5 496.9688,520.9219 L496.9688,523.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508" y="522.1543">A</text>
@@ -108,8 +108,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="534" y2="534"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="542" y2="542"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="471" y="253"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="471" y="253"/>
       <ellipse cx="486" cy="269" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M488.9688,274.6406 Q488.3906,274.9375 487.75,275.0781 Q487.1094,275.2344 486.4063,275.2344 Q483.9063,275.2344 482.5781,273.5938 Q481.2656,271.9375 481.2656,268.8125 Q481.2656,265.6875 482.5781,264.0313 Q483.9063,262.375 486.4063,262.375 Q487.1094,262.375 487.75,262.5313 Q488.4063,262.6875 488.9688,262.9844 L488.9688,265.7031 Q488.3438,265.125 487.75,264.8594 Q487.1563,264.5781 486.5313,264.5781 Q485.1875,264.5781 484.5,265.6563 Q483.8125,266.7188 483.8125,268.8125 Q483.8125,270.9063 484.5,271.9844 Q485.1875,273.0469 486.5313,273.0469 Q487.1563,273.0469 487.75,272.7813 Q488.3438,272.5 488.9688,271.9219 L488.9688,274.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="500" y="273.1543">A</text>
@@ -118,8 +118,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="285" y2="285"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="293" y2="293"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="478.5" y="419"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="478.5" y="419"/>
       <ellipse cx="493.5" cy="435" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M496.4688,440.6406 Q495.8906,440.9375 495.25,441.0781 Q494.6094,441.2344 493.9063,441.2344 Q491.4063,441.2344 490.0781,439.5938 Q488.7656,437.9375 488.7656,434.8125 Q488.7656,431.6875 490.0781,430.0313 Q491.4063,428.375 493.9063,428.375 Q494.6094,428.375 495.25,428.5313 Q495.9063,428.6875 496.4688,428.9844 L496.4688,431.7031 Q495.8438,431.125 495.25,430.8594 Q494.6563,430.5781 494.0313,430.5781 Q492.6875,430.5781 492,431.6563 Q491.3125,432.7188 491.3125,434.8125 Q491.3125,436.9063 492,437.9844 Q492.6875,439.0469 494.0313,439.0469 Q494.6563,439.0469 495.25,438.7813 Q495.8438,438.5 496.4688,437.9219 L496.4688,440.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="507.5" y="439.1543">A</text>
@@ -128,8 +128,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="451" y2="451"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="459" y2="459"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="470.5" y="336"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="470.5" y="336"/>
       <ellipse cx="485.5" cy="352" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M488.4688,357.6406 Q487.8906,357.9375 487.25,358.0781 Q486.6094,358.2344 485.9063,358.2344 Q483.4063,358.2344 482.0781,356.5938 Q480.7656,354.9375 480.7656,351.8125 Q480.7656,348.6875 482.0781,347.0313 Q483.4063,345.375 485.9063,345.375 Q486.6094,345.375 487.25,345.5313 Q487.9063,345.6875 488.4688,345.9844 L488.4688,348.7031 Q487.8438,348.125 487.25,347.8594 Q486.6563,347.5781 486.0313,347.5781 Q484.6875,347.5781 484,348.6563 Q483.3125,349.7188 483.3125,351.8125 Q483.3125,353.9063 484,354.9844 Q484.6875,356.0469 486.0313,356.0469 Q486.6563,356.0469 487.25,355.7813 Q487.8438,355.5 488.4688,354.9219 L488.4688,357.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="499.5" y="356.1543">A</text>
@@ -138,8 +138,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="368" y2="368"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="376" y2="376"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="461.5" y="751"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="461.5" y="751"/>
       <ellipse cx="476.5" cy="767" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M479.4688,772.6406 Q478.8906,772.9375 478.25,773.0781 Q477.6094,773.2344 476.9063,773.2344 Q474.4063,773.2344 473.0781,771.5938 Q471.7656,769.9375 471.7656,766.8125 Q471.7656,763.6875 473.0781,762.0313 Q474.4063,760.375 476.9063,760.375 Q477.6094,760.375 478.25,760.5313 Q478.9063,760.6875 479.4688,760.9844 L479.4688,763.7031 Q478.8438,763.125 478.25,762.8594 Q477.6563,762.5781 477.0313,762.5781 Q475.6875,762.5781 475,763.6563 Q474.3125,764.7188 474.3125,766.8125 Q474.3125,768.9063 475,769.9844 Q475.6875,771.0469 477.0313,771.0469 Q477.6563,771.0469 478.25,770.7813 Q478.8438,770.5 479.4688,769.9219 L479.4688,772.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490.5" y="771.1543">A</text>
@@ -148,8 +148,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="783" y2="783"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="791" y2="791"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="404" y="668"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="404" y="668"/>
       <ellipse cx="419" cy="684" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M421.9688,689.6406 Q421.3906,689.9375 420.75,690.0781 Q420.1094,690.2344 419.4063,690.2344 Q416.9063,690.2344 415.5781,688.5938 Q414.2656,686.9375 414.2656,683.8125 Q414.2656,680.6875 415.5781,679.0313 Q416.9063,677.375 419.4063,677.375 Q420.1094,677.375 420.75,677.5313 Q421.4063,677.6875 421.9688,677.9844 L421.9688,680.7031 Q421.3438,680.125 420.75,679.8594 Q420.1563,679.5781 419.5313,679.5781 Q418.1875,679.5781 417.5,680.6563 Q416.8125,681.7188 416.8125,683.8125 Q416.8125,685.9063 417.5,686.9844 Q418.1875,688.0469 419.5313,688.0469 Q420.1563,688.0469 420.75,687.7813 Q421.3438,687.5 421.9688,686.9219 L421.9688,689.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="433" y="688.1543">A</text>
@@ -158,8 +158,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="700" y2="700"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="708" y2="708"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="467" y="917"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="467" y="917"/>
       <ellipse cx="482" cy="933" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M484.9688,938.6406 Q484.3906,938.9375 483.75,939.0781 Q483.1094,939.2344 482.4063,939.2344 Q479.9063,939.2344 478.5781,937.5938 Q477.2656,935.9375 477.2656,932.8125 Q477.2656,929.6875 478.5781,928.0313 Q479.9063,926.375 482.4063,926.375 Q483.1094,926.375 483.75,926.5313 Q484.4063,926.6875 484.9688,926.9844 L484.9688,929.7031 Q484.3438,929.125 483.75,928.8594 Q483.1563,928.5781 482.5313,928.5781 Q481.1875,928.5781 480.5,929.6563 Q479.8125,930.7188 479.8125,932.8125 Q479.8125,934.9063 480.5,935.9844 Q481.1875,937.0469 482.5313,937.0469 Q483.1563,937.0469 483.75,936.7813 Q484.3438,936.5 484.9688,935.9219 L484.9688,938.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="496" y="937.1543">A</text>
@@ -168,8 +168,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="949" y2="949"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="957" y2="957"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="444" y="1000"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="444" y="1000"/>
       <ellipse cx="459" cy="1016" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M461.9688,1021.6406 Q461.3906,1021.9375 460.75,1022.0781 Q460.1094,1022.2344 459.4063,1022.2344 Q456.9063,1022.2344 455.5781,1020.5938 Q454.2656,1018.9375 454.2656,1015.8125 Q454.2656,1012.6875 455.5781,1011.0313 Q456.9063,1009.375 459.4063,1009.375 Q460.1094,1009.375 460.75,1009.5313 Q461.4063,1009.6875 461.9688,1009.9844 L461.9688,1012.7031 Q461.3438,1012.125 460.75,1011.8594 Q460.1563,1011.5781 459.5313,1011.5781 Q458.1875,1011.5781 457.5,1012.6563 Q456.8125,1013.7188 456.8125,1015.8125 Q456.8125,1017.9063 457.5,1018.9844 Q458.1875,1020.0469 459.5313,1020.0469 Q460.1563,1020.0469 460.75,1019.7813 Q461.3438,1019.5 461.9688,1018.9219 L461.9688,1021.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="473" y="1020.1543">A</text>
@@ -178,7 +178,7 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1032" y2="1032"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1040" y2="1040"/>
     </a>
-    <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1083"/>
+    <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1083"/>
     <ellipse cx="476" cy="1099" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M478.9688,1104.6406 Q478.3906,1104.9375 477.75,1105.0781 Q477.1094,1105.2344 476.4063,1105.2344 Q473.9063,1105.2344 472.5781,1103.5938 Q471.2656,1101.9375 471.2656,1098.8125 Q471.2656,1095.6875 472.5781,1094.0313 Q473.9063,1092.375 476.4063,1092.375 Q477.1094,1092.375 477.75,1092.5313 Q478.4063,1092.6875 478.9688,1092.9844 L478.9688,1095.7031 Q478.3438,1095.125 477.75,1094.8594 Q477.1563,1094.5781 476.5313,1094.5781 Q475.1875,1094.5781 474.5,1095.6563 Q473.8125,1096.7188 473.8125,1098.8125 Q473.8125,1100.9063 474.5,1101.9844 Q475.1875,1103.0469 476.5313,1103.0469 Q477.1563,1103.0469 477.75,1102.7813 Q478.3438,1102.5 478.9688,1101.9219 L478.9688,1104.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490" y="1103.1543">A</text>
@@ -186,7 +186,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="94" x="507" y="1092.1387">char,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1115" y2="1115"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1123" y2="1123"/>
-    <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="834"/>
+    <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="834"/>
     <ellipse cx="465.5" cy="850" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M468.4688,855.6406 Q467.8906,855.9375 467.25,856.0781 Q466.6094,856.2344 465.9063,856.2344 Q463.4063,856.2344 462.0781,854.5938 Q460.7656,852.9375 460.7656,849.8125 Q460.7656,846.6875 462.0781,845.0313 Q463.4063,843.375 465.9063,843.375 Q466.6094,843.375 467.25,843.5313 Q467.9063,843.6875 468.4688,843.9844 L468.4688,846.7031 Q467.8438,846.125 467.25,845.8594 Q466.6563,845.5781 466.0313,845.5781 Q464.6875,845.5781 464,846.6563 Q463.3125,847.7188 463.3125,849.8125 Q463.3125,851.9063 464,852.9844 Q464.6875,854.0469 466.0313,854.0469 Q466.6563,854.0469 467.25,853.7813 Q467.8438,853.5 468.4688,852.9219 L468.4688,855.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479.5" y="854.1543">A</text>
@@ -194,8 +194,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="115" x="496.5" y="843.1387">wchar_t,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="866" y2="866"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="874" y2="874"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vsg35wjon5m)" height="252.875" id="C_0001758213171584933144" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="6" y="407.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdda2epwmif2s)" height="252.875" id="C_0001758213171584933144" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="6" y="407.5"/>
       <ellipse cx="114.25" cy="423.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.2188,429.1406 Q116.6406,429.4375 116,429.5781 Q115.3594,429.7344 114.6563,429.7344 Q112.1563,429.7344 110.8281,428.0938 Q109.5156,426.4375 109.5156,423.3125 Q109.5156,420.1875 110.8281,418.5313 Q112.1563,416.875 114.6563,416.875 Q115.3594,416.875 116,417.0313 Q116.6563,417.1875 117.2188,417.4844 L117.2188,420.2031 Q116.5938,419.625 116,419.3594 Q115.4063,419.0781 114.7813,419.0781 Q113.4375,419.0781 112.75,420.1563 Q112.0625,421.2188 112.0625,423.3125 Q112.0625,425.4063 112.75,426.4844 Q113.4375,427.5469 114.7813,427.5469 Q115.4063,427.5469 116,427.2813 Q116.5938,427 117.2188,426.4219 L117.2188,429.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="134.75" y="427.6543">R</text>
@@ -204,116 +204,116 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="439.5" y2="439.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="447.5" y2="447.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="453.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="455.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="26" y="461.7104">abool : APtr&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="466.3047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="468.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="474.5151">aboolfloat : AAPtr&lt;bool,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="479.1094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="481.1094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="26" y="487.3198">afloat : ASharedPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="491.9141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="493.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="132" x="26" y="500.1245">atfloat : AAPtr&lt;T,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="504.7188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="506.7188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="26" y="512.9292">bapair : PairPairBA&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="517.5234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="519.5234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="26" y="525.7339">boolstring : A&lt;bool,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="530.3281"/>
       <polygon fill="none" points="17,530.3281,21,534.3281,17,538.3281,13,534.3281" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="26" y="538.5386">bs : BVector</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="543.1328"/>
       <ellipse cx="17" cy="548.1328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="84" x="26" y="551.3433">bs2 : BVector2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="555.9375"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="557.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="26" y="564.1479">bstringstring : BStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="568.7422"/>
       <ellipse cx="17" cy="573.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="576.9526">cb : SimpleCallback&lt;ACharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="581.5469"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="583.5469"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="589.7573">floatstring : AStringPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="594.3516"/>
       <ellipse cx="17" cy="599.3516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="26" y="602.562">gcb : GenericCallback&lt;AWCharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="607.1563"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="609.1563"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="26" y="615.3667">intstring : AIntString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="619.9609"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="621.9609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="26" y="628.1714">stringstring : AStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="632.7656"/>
       <ellipse cx="17" cy="637.7656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="640.9761">vcb : VoidCallback</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="645.5703"/>
       <ellipse cx="17" cy="650.5703" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="26" y="653.7808">vps : VectorPtr&lt;B&gt;</text>
     </a>
     <path d="M852.1,869.74 C884.92,826.94 953.84,737.07 998.19,679.23 " fill="none" id="C_0002186387853087008570-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00014_class_mermaid.svg b/docs/test_cases/t00014_class_mermaid.svg
index 4bcc9089..d72a732b 100644
--- a/docs/test_cases/t00014_class_mermaid.svg
+++ b/docs/test_cases/t00014_class_mermaid.svg
@@ -474,7 +474,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21">
+        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000765890579167335652-0" class="node default clickable">
             <rect height="101" width="68.359375" y="-50.5" x="-34.1796875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.1796875" x1="-34.1796875" class="divider"/>
@@ -503,7 +503,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L26">
+        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L26">
           <g title="B" id="classId-C_0000934136012292043506-1" class="node default clickable">
             <rect height="79" width="145.296875" y="-39.5" x="-72.6484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="72.6484375" x1="-72.6484375" class="divider"/>
@@ -527,7 +527,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30">
+        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0002186387853087008570-2" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -546,7 +546,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31">
+        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L31">
           <g title="A" id="classId-C_0000947292733740993297-3" class="node default clickable">
             <rect height="57" width="272.796875" y="-28.5" x="-136.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="136.3984375" x1="-136.3984375" class="divider"/>
@@ -565,7 +565,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34">
+        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L34">
           <g title="A" id="classId-C_0001700006390494465667-4" class="node default clickable">
             <rect height="57" width="93.234375" y="-28.5" x="-46.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="46.6171875" x1="-46.6171875" class="divider"/>
@@ -584,7 +584,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37">
+        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L37">
           <g title="A" id="classId-C_0002017665567517853203-5" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
@@ -603,7 +603,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41">
+        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L41">
           <g title="A" id="classId-C_0000906557320263235873-6" class="node default clickable">
             <rect height="57" width="95.015625" y="-28.5" x="-47.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.5078125" x1="-47.5078125" class="divider"/>
@@ -622,7 +622,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L34">
+        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L34">
           <g title="A" id="classId-C_0000378898020828430636-7" class="node default clickable">
             <rect height="57" width="117.21875" y="-28.5" x="-58.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.609375" x1="-58.609375" class="divider"/>
@@ -641,7 +641,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L37">
+        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L37">
           <g title="A" id="classId-C_0002082013375525130414-8" class="node default clickable">
             <rect height="57" width="135.890625" y="-28.5" x="-67.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.9453125" x1="-67.9453125" class="divider"/>
@@ -660,7 +660,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L41">
+        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L41">
           <g title="A" id="classId-C_0000051978493292659230-9" class="node default clickable">
             <rect height="57" width="117.234375" y="-28.5" x="-58.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -679,7 +679,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L38">
+        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L38">
           <g title="A" id="classId-C_0000197769253782961588-10" class="node default clickable">
             <rect height="57" width="135.90625" y="-28.5" x="-67.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.953125" x1="-67.953125" class="divider"/>
@@ -698,7 +698,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L21">
+        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000895940711566401184-11" class="node default clickable">
             <rect height="57" width="162.5625" y="-28.5" x="-81.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.28125" x1="-81.28125" class="divider"/>
@@ -717,7 +717,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L31">
+        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L31">
           <g title="A" id="classId-C_0001751732625010742161-12" class="node default clickable">
             <rect height="57" width="298.578125" y="-28.5" x="-149.2890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.2890625" x1="-149.2890625" class="divider"/>
@@ -736,7 +736,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30">
+        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0000887121441210847583-13" class="node default clickable">
             <rect height="57" width="148.34375" y="-28.5" x="-74.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.171875" x1="-74.171875" class="divider"/>
@@ -755,7 +755,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L30">
+        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0001119452495635561975-14" class="node default clickable">
             <rect height="57" width="207.890625" y="-28.5" x="-103.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="103.9453125" x1="-103.9453125" class="divider"/>
@@ -774,7 +774,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L111">
+        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/#L111">
           <g title="A" id="classId-C_0000340562099063642390-15" class="node default clickable">
             <rect height="57" width="161.703125" y="-28.5" x="-80.8515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="80.8515625" x1="-80.8515625" class="divider"/>
@@ -793,7 +793,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L111">
+        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/#L111">
           <g title="A" id="classId-C_0001388877149159894665-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -812,7 +812,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00014/t00014.cc#L56">
+        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00014/t00014.cc#L56">
           <g title="R" id="classId-C_0001758213171584933144-17" class="node default clickable">
             <rect height="409" width="301.203125" y="-204.5" x="-150.6015625" class="outer title-state"/>
             <line y2="-174.5" y1="-174.5" x2="150.6015625" x1="-150.6015625" class="divider"/>
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index 073d3408..8f5bc888 100644
--- a/docs/test_cases/t00015_class.svg
+++ b/docs/test_cases/t00015_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:365px;height:283px;" version="1.1" viewBox="0 0 365 283" width="365px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f14y5f2nw2sqyw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhuovqqjwg1nu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhuovqqjwg1nu)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
       <ellipse cx="113" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,29.6406 Q115.3906,29.9375 114.75,30.0781 Q114.1094,30.2344 113.4063,30.2344 Q110.9063,30.2344 109.5781,28.5938 Q108.2656,26.9375 108.2656,23.8125 Q108.2656,20.6875 109.5781,19.0313 Q110.9063,17.375 113.4063,17.375 Q114.1094,17.375 114.75,17.5313 Q115.4063,17.6875 115.9688,17.9844 L115.9688,20.7031 Q115.3438,20.125 114.75,19.8594 Q114.1563,19.5781 113.5313,19.5781 Q112.1875,19.5781 111.5,20.6563 Q110.8125,21.7188 110.8125,23.8125 Q110.8125,25.9063 111.5,26.9844 Q112.1875,28.0469 113.5313,28.0469 Q114.1563,28.0469 114.75,27.7813 Q115.3438,27.5 115.9688,26.9219 L115.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="127" y="28.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhuovqqjwg1nu)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
       <ellipse cx="219.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.4688,29.6406 Q221.8906,29.9375 221.25,30.0781 Q220.6094,30.2344 219.9063,30.2344 Q217.4063,30.2344 216.0781,28.5938 Q214.7656,26.9375 214.7656,23.8125 Q214.7656,20.6875 216.0781,19.0313 Q217.4063,17.375 219.9063,17.375 Q220.6094,17.375 221.25,17.5313 Q221.9063,17.6875 222.4688,17.9844 L222.4688,20.7031 Q221.8438,20.125 221.25,19.8594 Q220.6563,19.5781 220.0313,19.5781 Q218.6875,19.5781 218,20.6563 Q217.3125,21.7188 217.3125,23.8125 Q217.3125,25.9063 218,26.9844 Q218.6875,28.0469 220.0313,28.0469 Q220.6563,28.0469 221.25,27.7813 Q221.8438,27.5 222.4688,26.9219 L222.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="233.5" y="28.1543">ns1::ns2_v0_9_0::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhuovqqjwg1nu)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="35" y="136.1543">ns1::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhuovqqjwg1nu)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
       <ellipse cx="151" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M153.9688,137.6406 Q153.3906,137.9375 152.75,138.0781 Q152.1094,138.2344 151.4063,138.2344 Q148.9063,138.2344 147.5781,136.5938 Q146.2656,134.9375 146.2656,131.8125 Q146.2656,128.6875 147.5781,127.0313 Q148.9063,125.375 151.4063,125.375 Q152.1094,125.375 152.75,125.5313 Q153.4063,125.6875 153.9688,125.9844 L153.9688,128.7031 Q153.3438,128.125 152.75,127.8594 Q152.1563,127.5781 151.5313,127.5781 Q150.1875,127.5781 149.5,128.6563 Q148.8125,129.7188 148.8125,131.8125 Q148.8125,133.9063 149.5,134.9844 Q150.1875,136.0469 151.5313,136.0469 Q152.1563,136.0469 152.75,135.7813 Q153.3438,135.5 153.9688,134.9219 L153.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="125" x="165" y="136.1543">ns3::ns1::ns2::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14y5f2nw2sqyw)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhuovqqjwg1nu)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
       <ellipse cx="194" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,245.6406 Q196.3906,245.9375 195.75,246.0781 Q195.1094,246.2344 194.4063,246.2344 Q191.9063,246.2344 190.5781,244.5938 Q189.2656,242.9375 189.2656,239.8125 Q189.2656,236.6875 190.5781,235.0313 Q191.9063,233.375 194.4063,233.375 Q195.1094,233.375 195.75,233.5313 Q196.4063,233.6875 196.9688,233.9844 L196.9688,236.7031 Q196.3438,236.125 195.75,235.8594 Q195.1563,235.5781 194.5313,235.5781 Q193.1875,235.5781 192.5,236.6563 Q191.8125,237.7188 191.8125,239.8125 Q191.8125,241.9063 192.5,242.9844 Q193.1875,244.0469 194.5313,244.0469 Q195.1563,244.0469 195.75,243.7813 Q196.3438,243.5 196.9688,242.9219 L196.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="208" y="244.1543">ns3::B</text>
diff --git a/docs/test_cases/t00015_class_mermaid.svg b/docs/test_cases/t00015_class_mermaid.svg
index 94093f80..fcffa272 100644
--- a/docs/test_cases/t00015_class_mermaid.svg
+++ b/docs/test_cases/t00015_class_mermaid.svg
@@ -84,7 +84,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L6">
+        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L6">
           <g title="A" id="classId-C_0001410694888805149453-0" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -103,7 +103,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L10">
+        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L10">
           <g title="A" id="classId-C_0000485552648049088863-1" class="node default clickable">
             <rect height="57" width="165.296875" y="-28.5" x="-82.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.6484375" x1="-82.6484375" class="divider"/>
@@ -122,7 +122,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L14">
+        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L14">
           <g title="Anon" id="classId-C_0001060731132374575329-2" class="node default clickable">
             <rect height="57" width="94.109375" y="-28.5" x="-47.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0546875" x1="-47.0546875" class="divider"/>
@@ -141,7 +141,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L21">
+        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L21">
           <g title="Anon" id="classId-C_0001797521288354158629-3" class="node default clickable">
             <rect height="57" width="170.5625" y="-28.5" x="-85.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.28125" x1="-85.28125" class="divider"/>
@@ -160,7 +160,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00015/t00015.cc#L24">
+        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00015/t00015.cc#L24">
           <g title="B" id="classId-C_0000870882387819356092-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index f049ef76..889b0cbb 100644
--- a/docs/test_cases/t00016_class.svg
+++ b/docs/test_cases/t00016_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:847px;height:200px;" version="1.1" viewBox="0 0 847 200" width="847px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnxs8fx9fwrnu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ogvi7lanev5i" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="343.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ogvi7lanev5i)" height="60.8047" id="C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="343.5" y="129"/>
       <ellipse cx="358.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.4688,150.6406 Q360.8906,150.9375 360.25,151.0781 Q359.6094,151.2344 358.9063,151.2344 Q356.4063,151.2344 355.0781,149.5938 Q353.7656,147.9375 353.7656,144.8125 Q353.7656,141.6875 355.0781,140.0313 Q356.4063,138.375 358.9063,138.375 Q359.6094,138.375 360.25,138.5313 Q360.9063,138.6875 361.4688,138.9844 L361.4688,141.7031 Q360.8438,141.125 360.25,140.8594 Q359.6563,140.5781 359.0313,140.5781 Q357.6875,140.5781 357,141.6563 Q356.3125,142.7188 356.3125,144.8125 Q356.3125,146.9063 357,147.9844 Q357.6875,149.0469 359.0313,149.0469 Q359.6563,149.0469 360.25,148.7813 Q360.8438,148.5 361.4688,147.9219 L361.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="372.5" y="149.1543">is_numeric</text>
@@ -21,8 +21,8 @@
       <ellipse cx="354.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="363.5" y="183.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ogvi7lanev5i)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="35" y="28.1543">is_numeric</text>
@@ -33,8 +33,8 @@
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="26" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ogvi7lanev5i)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
       <ellipse cx="186" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.9688,29.6406 Q188.3906,29.9375 187.75,30.0781 Q187.1094,30.2344 186.4063,30.2344 Q183.9063,30.2344 182.5781,28.5938 Q181.2656,26.9375 181.2656,23.8125 Q181.2656,20.6875 182.5781,19.0313 Q183.9063,17.375 186.4063,17.375 Q187.1094,17.375 187.75,17.5313 Q188.4063,17.6875 188.9688,17.9844 L188.9688,20.7031 Q188.3438,20.125 187.75,19.8594 Q187.1563,19.5781 186.5313,19.5781 Q185.1875,19.5781 184.5,20.6563 Q183.8125,21.7188 183.8125,23.8125 Q183.8125,25.9063 184.5,26.9844 Q185.1875,28.0469 186.5313,28.0469 Q187.1563,28.0469 187.75,27.7813 Q188.3438,27.5 188.9688,26.9219 L188.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="28.1543">is_numeric</text>
@@ -45,8 +45,8 @@
       <ellipse cx="182" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="191" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ogvi7lanev5i)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
       <ellipse cx="351.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M354.4688,29.6406 Q353.8906,29.9375 353.25,30.0781 Q352.6094,30.2344 351.9063,30.2344 Q349.4063,30.2344 348.0781,28.5938 Q346.7656,26.9375 346.7656,23.8125 Q346.7656,20.6875 348.0781,19.0313 Q349.4063,17.375 351.9063,17.375 Q352.6094,17.375 353.25,17.5313 Q353.9063,17.6875 354.4688,17.9844 L354.4688,20.7031 Q353.8438,20.125 353.25,19.8594 Q352.6563,19.5781 352.0313,19.5781 Q350.6875,19.5781 350,20.6563 Q349.3125,21.7188 349.3125,23.8125 Q349.3125,25.9063 350,26.9844 Q350.6875,28.0469 352.0313,28.0469 Q352.6563,28.0469 353.25,27.7813 Q353.8438,27.5 354.4688,26.9219 L354.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="365.5" y="28.1543">is_numeric</text>
@@ -57,8 +57,8 @@
       <ellipse cx="347.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="356.5" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ogvi7lanev5i)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
       <ellipse cx="566" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M568.9688,29.6406 Q568.3906,29.9375 567.75,30.0781 Q567.1094,30.2344 566.4063,30.2344 Q563.9063,30.2344 562.5781,28.5938 Q561.2656,26.9375 561.2656,23.8125 Q561.2656,20.6875 562.5781,19.0313 Q563.9063,17.375 566.4063,17.375 Q567.1094,17.375 567.75,17.5313 Q568.4063,17.6875 568.9688,17.9844 L568.9688,20.7031 Q568.3438,20.125 567.75,19.8594 Q567.1563,19.5781 566.5313,19.5781 Q565.1875,19.5781 564.5,20.6563 Q563.8125,21.7188 563.8125,23.8125 Q563.8125,25.9063 564.5,26.9844 Q565.1875,28.0469 566.5313,28.0469 Q567.1563,28.0469 567.75,27.7813 Q568.3438,27.5 568.9688,26.9219 L568.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580" y="28.1543">is_numeric</text>
@@ -69,8 +69,8 @@
       <ellipse cx="562" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="571" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxs8fx9fwrnu)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ogvi7lanev5i)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
       <ellipse cx="719.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M722.4688,29.6406 Q721.8906,29.9375 721.25,30.0781 Q720.6094,30.2344 719.9063,30.2344 Q717.4063,30.2344 716.0781,28.5938 Q714.7656,26.9375 714.7656,23.8125 Q714.7656,20.6875 716.0781,19.0313 Q717.4063,17.375 719.9063,17.375 Q720.6094,17.375 721.25,17.5313 Q721.9063,17.6875 722.4688,17.9844 L722.4688,20.7031 Q721.8438,20.125 721.25,19.8594 Q720.6563,19.5781 720.0313,19.5781 Q718.6875,19.5781 718,20.6563 Q717.3125,21.7188 717.3125,23.8125 Q717.3125,25.9063 718,26.9844 Q718.6875,28.0469 720.0313,28.0469 Q720.6563,28.0469 721.25,27.7813 Q721.8438,27.5 722.4688,26.9219 L722.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="733.5" y="28.1543">is_numeric</text>
diff --git a/docs/test_cases/t00016_class_mermaid.svg b/docs/test_cases/t00016_class_mermaid.svg
index 5301198e..e31fb698 100644
--- a/docs/test_cases/t00016_class_mermaid.svg
+++ b/docs/test_cases/t00016_class_mermaid.svg
@@ -114,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L4">
+        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L4">
           <g title="is_numeric" id="classId-C_0000932856332558460389-0" class="node default clickable">
             <rect height="79" width="192.875" y="-39.5" x="-96.4375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="96.4375" x1="-96.4375" class="divider"/>
@@ -138,7 +138,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L8">
+        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L8">
           <g title="is_numeric" id="classId-C_0000095618295648274199-1" class="node default clickable">
             <rect height="79" width="151.953125" y="-39.5" x="-75.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.9765625" x1="-75.9765625" class="divider"/>
@@ -162,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L12">
+        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L12">
           <g title="is_numeric" id="classId-C_0000979129381790761728-2" class="node default clickable">
             <rect height="79" width="151.96875" y="-39.5" x="-75.984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.984375" x1="-75.984375" class="divider"/>
@@ -186,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L16">
+        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L16">
           <g title="is_numeric" id="classId-C_0002090787690027341836-3" class="node default clickable">
             <rect height="79" width="213.28125" y="-39.5" x="-106.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="106.640625" x1="-106.640625" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L20">
+        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L20">
           <g title="is_numeric" id="classId-C_0000500603075237446075-4" class="node default clickable">
             <rect height="79" width="137.71875" y="-39.5" x="-68.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.859375" x1="-68.859375" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00016/t00016.cc#L24">
+        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00016/t00016.cc#L24">
           <g title="is_numeric" id="classId-C_0002111316837513419920-5" class="node default clickable">
             <rect height="79" width="151.9375" y="-39.5" x="-75.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.96875" x1="-75.96875" class="divider"/>
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index 4b59c1d3..343b40b2 100644
--- a/docs/test_cases/t00017_class.svg
+++ b/docs/test_cases/t00017_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:799px;height:256px;" version="1.1" viewBox="0 0 799 256" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fzgundkcoqnlf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1s7krcrkevi3f" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,135 +9,135 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
       <ellipse cx="96" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,218.6406 Q98.3906,218.9375 97.75,219.0781 Q97.1094,219.2344 96.4063,219.2344 Q93.9063,219.2344 92.5781,217.5938 Q91.2656,215.9375 91.2656,212.8125 Q91.2656,209.6875 92.5781,208.0313 Q93.9063,206.375 96.4063,206.375 Q97.1094,206.375 97.75,206.5313 Q98.4063,206.6875 98.9688,206.9844 L98.9688,209.7031 Q98.3438,209.125 97.75,208.8594 Q97.1563,208.5781 96.5313,208.5781 Q95.1875,208.5781 94.5,209.6563 Q93.8125,210.7188 93.8125,212.8125 Q93.8125,214.9063 94.5,215.9844 Q95.1875,217.0469 96.5313,217.0469 Q97.1563,217.0469 97.75,216.7813 Q98.3438,216.5 98.9688,215.9219 L98.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
       <ellipse cx="171" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,218.6406 Q173.3906,218.9375 172.75,219.0781 Q172.1094,219.2344 171.4063,219.2344 Q168.9063,219.2344 167.5781,217.5938 Q166.2656,215.9375 166.2656,212.8125 Q166.2656,209.6875 167.5781,208.0313 Q168.9063,206.375 171.4063,206.375 Q172.1094,206.375 172.75,206.5313 Q173.4063,206.6875 173.9688,206.9844 L173.9688,209.7031 Q173.3438,209.125 172.75,208.8594 Q172.1563,208.5781 171.5313,208.5781 Q170.1875,208.5781 169.5,209.6563 Q168.8125,210.7188 168.8125,212.8125 Q168.8125,214.9063 169.5,215.9844 Q170.1875,217.0469 171.5313,217.0469 Q172.1563,217.0469 172.75,216.7813 Q173.3438,216.5 173.9688,215.9219 L173.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
       <ellipse cx="246.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,218.6406 Q248.8906,218.9375 248.25,219.0781 Q247.6094,219.2344 246.9063,219.2344 Q244.4063,219.2344 243.0781,217.5938 Q241.7656,215.9375 241.7656,212.8125 Q241.7656,209.6875 243.0781,208.0313 Q244.4063,206.375 246.9063,206.375 Q247.6094,206.375 248.25,206.5313 Q248.9063,206.6875 249.4688,206.9844 L249.4688,209.7031 Q248.8438,209.125 248.25,208.8594 Q247.6563,208.5781 247.0313,208.5781 Q245.6875,208.5781 245,209.6563 Q244.3125,210.7188 244.3125,212.8125 Q244.3125,214.9063 245,215.9844 Q245.6875,217.0469 247.0313,217.0469 Q247.6563,217.0469 248.25,216.7813 Q248.8438,216.5 249.4688,215.9219 L249.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
       <ellipse cx="323" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,218.6406 Q325.3906,218.9375 324.75,219.0781 Q324.1094,219.2344 323.4063,219.2344 Q320.9063,219.2344 319.5781,217.5938 Q318.2656,215.9375 318.2656,212.8125 Q318.2656,209.6875 319.5781,208.0313 Q320.9063,206.375 323.4063,206.375 Q324.1094,206.375 324.75,206.5313 Q325.4063,206.6875 325.9688,206.9844 L325.9688,209.7031 Q325.3438,209.125 324.75,208.8594 Q324.1563,208.5781 323.5313,208.5781 Q322.1875,208.5781 321.5,209.6563 Q320.8125,210.7188 320.8125,212.8125 Q320.8125,214.9063 321.5,215.9844 Q322.1875,217.0469 323.5313,217.0469 Q324.1563,217.0469 324.75,216.7813 Q325.3438,216.5 325.9688,215.9219 L325.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
       <ellipse cx="398.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,218.6406 Q400.8906,218.9375 400.25,219.0781 Q399.6094,219.2344 398.9063,219.2344 Q396.4063,219.2344 395.0781,217.5938 Q393.7656,215.9375 393.7656,212.8125 Q393.7656,209.6875 395.0781,208.0313 Q396.4063,206.375 398.9063,206.375 Q399.6094,206.375 400.25,206.5313 Q400.9063,206.6875 401.4688,206.9844 L401.4688,209.7031 Q400.8438,209.125 400.25,208.8594 Q399.6563,208.5781 399.0313,208.5781 Q397.6875,208.5781 397,209.6563 Q396.3125,210.7188 396.3125,212.8125 Q396.3125,214.9063 397,215.9844 Q397.6875,217.0469 399.0313,217.0469 Q399.6563,217.0469 400.25,216.7813 Q400.8438,216.5 401.4688,215.9219 L401.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="217.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
       <ellipse cx="472.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,218.6406 Q474.8906,218.9375 474.25,219.0781 Q473.6094,219.2344 472.9063,219.2344 Q470.4063,219.2344 469.0781,217.5938 Q467.7656,215.9375 467.7656,212.8125 Q467.7656,209.6875 469.0781,208.0313 Q470.4063,206.375 472.9063,206.375 Q473.6094,206.375 474.25,206.5313 Q474.9063,206.6875 475.4688,206.9844 L475.4688,209.7031 Q474.8438,209.125 474.25,208.8594 Q473.6563,208.5781 473.0313,208.5781 Q471.6875,208.5781 471,209.6563 Q470.3125,210.7188 470.3125,212.8125 Q470.3125,214.9063 471,215.9844 Q471.6875,217.0469 473.0313,217.0469 Q473.6563,217.0469 474.25,216.7813 Q474.8438,216.5 475.4688,215.9219 L475.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="217.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
       <ellipse cx="548.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,218.6406 Q550.8906,218.9375 550.25,219.0781 Q549.6094,219.2344 548.9063,219.2344 Q546.4063,219.2344 545.0781,217.5938 Q543.7656,215.9375 543.7656,212.8125 Q543.7656,209.6875 545.0781,208.0313 Q546.4063,206.375 548.9063,206.375 Q549.6094,206.375 550.25,206.5313 Q550.9063,206.6875 551.4688,206.9844 L551.4688,209.7031 Q550.8438,209.125 550.25,208.8594 Q549.6563,208.5781 549.0313,208.5781 Q547.6875,208.5781 547,209.6563 Q546.3125,210.7188 546.3125,212.8125 Q546.3125,214.9063 547,215.9844 Q547.6875,217.0469 549.0313,217.0469 Q549.6563,217.0469 550.25,216.7813 Q550.8438,216.5 551.4688,215.9219 L551.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="217.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
       <ellipse cx="624.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,218.6406 Q626.8906,218.9375 626.25,219.0781 Q625.6094,219.2344 624.9063,219.2344 Q622.4063,219.2344 621.0781,217.5938 Q619.7656,215.9375 619.7656,212.8125 Q619.7656,209.6875 621.0781,208.0313 Q622.4063,206.375 624.9063,206.375 Q625.6094,206.375 626.25,206.5313 Q626.9063,206.6875 627.4688,206.9844 L627.4688,209.7031 Q626.8438,209.125 626.25,208.8594 Q625.6563,208.5781 625.0313,208.5781 Q623.6875,208.5781 623,209.6563 Q622.3125,210.7188 622.3125,212.8125 Q622.3125,214.9063 623,215.9844 Q623.6875,217.0469 625.0313,217.0469 Q625.6563,217.0469 626.25,216.7813 Q626.8438,216.5 627.4688,215.9219 L627.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="217.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
       <ellipse cx="694.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,218.6406 Q696.8906,218.9375 696.25,219.0781 Q695.6094,219.2344 694.9063,219.2344 Q692.4063,219.2344 691.0781,217.5938 Q689.7656,215.9375 689.7656,212.8125 Q689.7656,209.6875 691.0781,208.0313 Q692.4063,206.375 694.9063,206.375 Q695.6094,206.375 696.25,206.5313 Q696.9063,206.6875 697.4688,206.9844 L697.4688,209.7031 Q696.8438,209.125 696.25,208.8594 Q695.6563,208.5781 695.0313,208.5781 Q693.6875,208.5781 693,209.6563 Q692.3125,210.7188 692.3125,212.8125 Q692.3125,214.9063 693,215.9844 Q693.6875,217.0469 695.0313,217.0469 Q695.6563,217.0469 696.25,216.7813 Q696.8438,216.5 697.4688,215.9219 L697.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="217.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
       <ellipse cx="764.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,218.6406 Q766.8906,218.9375 766.25,219.0781 Q765.6094,219.2344 764.9063,219.2344 Q762.4063,219.2344 761.0781,217.5938 Q759.7656,215.9375 759.7656,212.8125 Q759.7656,209.6875 761.0781,208.0313 Q762.4063,206.375 764.9063,206.375 Q765.6094,206.375 766.25,206.5313 Q766.9063,206.6875 767.4688,206.9844 L767.4688,209.7031 Q766.8438,209.125 766.25,208.8594 Q765.6563,208.5781 765.0313,208.5781 Q763.6875,208.5781 763,209.6563 Q762.3125,210.7188 762.3125,212.8125 Q762.3125,214.9063 763,215.9844 Q763.6875,217.0469 765.0313,217.0469 Q765.6563,217.0469 766.25,216.7813 Q766.8438,216.5 767.4688,215.9219 L767.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="217.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzgundkcoqnlf)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="213.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s7krcrkevi3f)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="213.5" y="8"/>
       <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="46"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="353" x="233.5" y="54.2104">R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="233.5" y="75.0151">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="233.5" y="87.8198">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="233.5" y="100.6245">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="233.5" y="113.4292">some_int_reference : int &amp;</text>
     </a>
     <path d="M227.33,124.78 C173.51,145.32 114.85,170.01 63,197 C57.36,199.93 51.44,203.42 46.03,206.78 " fill="none" id="C_0000287495916564113342&lt;-C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00017_class_mermaid.svg b/docs/test_cases/t00017_class_mermaid.svg
index 312c0448..5028b787 100644
--- a/docs/test_cases/t00017_class_mermaid.svg
+++ b/docs/test_cases/t00017_class_mermaid.svg
@@ -186,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L5">
+        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L5">
           <g title="A" id="classId-C_0000121332093434690887-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L7">
+        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L7">
           <g title="B" id="classId-C_0001424864837456200487-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L9">
+        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L9">
           <g title="C" id="classId-C_0002151170391844743478-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L11">
+        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L11">
           <g title="D" id="classId-C_0001378112127131766972-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L13">
+        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L13">
           <g title="E" id="classId-C_0001535300935831802489-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L15">
+        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L15">
           <g title="F" id="classId-C_0001803800465279710134-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,7 +300,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L17">
+        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L17">
           <g title="G" id="classId-C_0001135797791892670246-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L19">
+        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L19">
           <g title="H" id="classId-C_0001243547836571712317-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,7 +338,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L21">
+        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L21">
           <g title="I" id="classId-C_0000387733199705628658-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L23">
+        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L23">
           <g title="J" id="classId-C_0000747991828672433537-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L25">
+        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L25">
           <g title="K" id="classId-C_0001783571342994833467-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,7 +395,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00017/t00017.cc#L27">
+        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00017/t00017.cc#L27">
           <g title="R" id="classId-C_0000287495916564113342-11" class="node default clickable">
             <rect height="167" width="445.96875" y="-83.5" x="-222.984375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="222.984375" x1="-222.984375" class="divider"/>
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index e057e753..888ceb8d 100644
--- a/docs/test_cases/t00018_class.svg
+++ b/docs/test_cases/t00018_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="395px" preserveAspectRatio="none" style="width:317px;height:395px;" version="1.1" viewBox="0 0 317 395" width="317px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10awcl9lcodyh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f137onr27zqppl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,121 +9,121 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10awcl9lcodyh)" height="107.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="40.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137onr27zqppl)" height="107.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="40.5" y="8"/>
       <ellipse cx="114.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.7188,29.6406 Q117.1406,29.9375 116.5,30.0781 Q115.8594,30.2344 115.1563,30.2344 Q112.6563,30.2344 111.3281,28.5938 Q110.0156,26.9375 110.0156,23.8125 Q110.0156,20.6875 111.3281,19.0313 Q112.6563,17.375 115.1563,17.375 Q115.8594,17.375 116.5,17.5313 Q117.1563,17.6875 117.7188,17.9844 L117.7188,20.7031 Q117.0938,20.125 116.5,19.8594 Q115.9063,19.5781 115.2813,19.5781 Q113.9375,19.5781 113.25,20.6563 Q112.5625,21.7188 112.5625,23.8125 Q112.5625,25.9063 113.25,26.9844 Q113.9375,28.0469 115.2813,28.0469 Q115.9063,28.0469 116.5,27.7813 Q117.0938,27.5 117.7188,26.9219 L117.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="135.25" y="28.1543">impl::widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="46"/>
       <ellipse cx="51.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="60.5" y="54.2104">widget(int n) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="41.5" x2="270.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="66.8047"/>
       <ellipse cx="51.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="205" x="60.5" y="75.0151">draw(const widget &amp; w) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="79.6094"/>
       <ellipse cx="51.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="60.5" y="87.8198">draw(const widget &amp; w) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="94.4141" y2="94.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="100.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="102.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="60.5" y="108.6245">n : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10awcl9lcodyh)" height="192.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="6" y="192"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137onr27zqppl)" height="192.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="6" y="192"/>
       <ellipse cx="131.25" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M134.2188,213.6406 Q133.6406,213.9375 133,214.0781 Q132.3594,214.2344 131.6563,214.2344 Q129.1563,214.2344 127.8281,212.5938 Q126.5156,210.9375 126.5156,207.8125 Q126.5156,204.6875 127.8281,203.0313 Q129.1563,201.375 131.6563,201.375 Q132.3594,201.375 133,201.5313 Q133.6563,201.6875 134.2188,201.9844 L134.2188,204.7031 Q133.5938,204.125 133,203.8594 Q132.4063,203.5781 131.7813,203.5781 Q130.4375,203.5781 129.75,204.6563 Q129.0625,205.7188 129.0625,207.8125 Q129.0625,209.9063 129.75,210.9844 Q130.4375,212.0469 131.7813,212.0469 Q132.4063,212.0469 133,211.7813 Q133.5938,211.5 134.2188,210.9219 L134.2188,213.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="151.75" y="212.1543">widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="224" y2="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="230"/>
       <ellipse cx="17" cy="235" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="238.2104">widget(int) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="242.8047"/>
       <ellipse cx="17" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="26" y="251.0151">widget(widget &amp;&amp;) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="255.6094"/>
       <ellipse cx="17" cy="260.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="26" y="263.8198">widget(const widget &amp;) = deleted : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="268.4141"/>
       <ellipse cx="17" cy="273.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="26" y="276.6245">~widget() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="283.2188" y2="283.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="289.2188"/>
       <ellipse cx="17" cy="294.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="26" y="297.4292">operator=(widget &amp;&amp;) : widget &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="302.0234"/>
       <ellipse cx="17" cy="307.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="274" x="26" y="310.2339">operator=(const widget &amp;) = deleted : widget &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="316.8281" y2="316.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.8281"/>
       <ellipse cx="17" cy="327.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="331.0386">draw() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.6328"/>
       <ellipse cx="17" cy="340.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="26" y="343.8433">draw() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="348.4375"/>
       <ellipse cx="17" cy="353.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="26" y="356.6479">shown() const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="363.2422" y2="363.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="369.2422"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="371.2422"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="377.4526">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
     </a>
     <path d="M150.85,115.27 C150.08,125.14 149.41,135.38 149,145 C148.43,158.51 148.42,172.74 148.76,186.76 " fill="none" id="C_0000130502639682787993-&gt;C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00018_class_mermaid.svg b/docs/test_cases/t00018_class_mermaid.svg
index 5a941d07..54ae6f58 100644
--- a/docs/test_cases/t00018_class_mermaid.svg
+++ b/docs/test_cases/t00018_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018_impl.h#L9">
+        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018_impl.h#L9">
           <g title="widget" id="classId-C_0000130502639682787993-0" class="node default clickable">
             <rect height="145" width="284" y="-72.5" x="-142" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="142" x1="-142" class="divider"/>
@@ -117,7 +117,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00018/t00018.h#L17">
+        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00018/t00018.h#L17">
           <g title="widget" id="classId-C_0001005661284373854088-1" class="node default clickable">
             <rect height="277" width="282.703125" y="-138.5" x="-141.3515625" class="outer title-state"/>
             <line y2="-108.5" y1="-108.5" x2="141.3515625" x1="-141.3515625" class="divider"/>
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index 973774db..c32862db 100644
--- a/docs/test_cases/t00019_class.svg
+++ b/docs/test_cases/t00019_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="693px" preserveAspectRatio="none" style="width:797px;height:693px;" version="1.1" viewBox="0 0 797 693" width="797px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fzwb2c6j0fdad" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f193ugdht9ka3b" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,45 +9,45 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="107.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f193ugdht9ka3b)" height="107.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="6" y="8"/>
       <ellipse cx="97.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M100.7188,29.6406 Q100.1406,29.9375 99.5,30.0781 Q98.8594,30.2344 98.1563,30.2344 Q95.6563,30.2344 94.3281,28.5938 Q93.0156,26.9375 93.0156,23.8125 Q93.0156,20.6875 94.3281,19.0313 Q95.6563,17.375 98.1563,17.375 Q98.8594,17.375 99.5,17.5313 Q100.1563,17.6875 100.7188,17.9844 L100.7188,20.7031 Q100.0938,20.125 99.5,19.8594 Q98.9063,19.5781 98.2813,19.5781 Q96.9375,19.5781 96.25,20.6563 Q95.5625,21.7188 95.5625,23.8125 Q95.5625,25.9063 96.25,26.9844 Q96.9375,28.0469 98.2813,28.0469 Q98.9063,28.0469 99.5,27.7813 Q100.0938,27.5 100.7188,26.9219 L100.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="118.25" y="28.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="228" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="128" x="26" y="54.2104">Base() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="67.0151">~Base() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="228" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="79.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="87.8198">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="92.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="100.6245">m2() : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="228" y1="107.2188" y2="107.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="491.5" y="609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f193ugdht9ka3b)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="491.5" y="609"/>
       <ellipse cx="506.5" cy="625" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M509.4688,630.6406 Q508.8906,630.9375 508.25,631.0781 Q507.6094,631.2344 506.9063,631.2344 Q504.4063,631.2344 503.0781,629.5938 Q501.7656,627.9375 501.7656,624.8125 Q501.7656,621.6875 503.0781,620.0313 Q504.4063,618.375 506.9063,618.375 Q507.6094,618.375 508.25,618.5313 Q508.9063,618.6875 509.4688,618.9844 L509.4688,621.7031 Q508.8438,621.125 508.25,620.8594 Q507.6563,620.5781 507.0313,620.5781 Q505.6875,620.5781 505,621.6563 Q504.3125,622.7188 504.3125,624.8125 Q504.3125,626.9063 505,627.9844 Q505.6875,629.0469 507.0313,629.0469 Q507.6563,629.0469 508.25,628.7813 Q508.8438,628.5 509.4688,627.9219 L509.4688,630.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="520.5" y="629.1543">Layer1</text>
@@ -55,23 +55,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="570.5" y="618.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="640.5" y1="641" y2="641"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="497.5" y="647"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="499.5" y="649"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="511.5" y="655.2104">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="497.5" y="659.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="499.5" y="661.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="511.5" y="668.0151">m2() : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="492.5" x2="640.5" y1="674.6094" y2="674.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="204" y="487"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f193ugdht9ka3b)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="204" y="487"/>
       <ellipse cx="231.15" cy="503" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M234.1188,508.6406 Q233.5406,508.9375 232.9,509.0781 Q232.2594,509.2344 231.5563,509.2344 Q229.0563,509.2344 227.7281,507.5938 Q226.4156,505.9375 226.4156,502.8125 Q226.4156,499.6875 227.7281,498.0313 Q229.0563,496.375 231.5563,496.375 Q232.2594,496.375 232.9,496.5313 Q233.5563,496.6875 234.1188,496.9844 L234.1188,499.7031 Q233.4938,499.125 232.9,498.8594 Q232.3063,498.5781 231.6813,498.5781 Q230.3375,498.5781 229.65,499.6563 Q228.9625,500.7188 228.9625,502.8125 Q228.9625,504.9063 229.65,505.9844 Q230.3375,507.0469 231.6813,507.0469 Q232.3063,507.0469 232.9,506.7813 Q233.4938,506.5 234.1188,505.9219 L234.1188,508.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="247.85" y="507.1543">Layer2</text>
@@ -79,16 +79,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="310" y="496.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="380" y1="519" y2="519"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="210" y="525"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="212" y="527"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="533.2104">all_calls_count() const : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="380" y1="539.8047" y2="539.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="22.5" y="285"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f193ugdht9ka3b)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="22.5" y="285"/>
       <ellipse cx="37.5" cy="301" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M40.4688,306.6406 Q39.8906,306.9375 39.25,307.0781 Q38.6094,307.2344 37.9063,307.2344 Q35.4063,307.2344 34.0781,305.5938 Q32.7656,303.9375 32.7656,300.8125 Q32.7656,297.6875 34.0781,296.0313 Q35.4063,294.375 37.9063,294.375 Q38.6094,294.375 39.25,294.5313 Q39.9063,294.6875 40.4688,294.9844 L40.4688,297.7031 Q39.8438,297.125 39.25,296.8594 Q38.6563,296.5781 38.0313,296.5781 Q36.6875,296.5781 36,297.6563 Q35.3125,298.7188 35.3125,300.8125 Q35.3125,302.9063 36,303.9844 Q36.6875,305.0469 38.0313,305.0469 Q38.6563,305.0469 39.25,304.7813 Q39.8438,304.5 40.4688,303.9219 L40.4688,306.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="51.5" y="305.1543">Layer3</text>
@@ -96,50 +96,50 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="101.5" y="294.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.5" x2="171.5" y1="317" y2="317"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="323"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="325"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="42.5" y="331.2104">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="335.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="337.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="42.5" y="344.0151">m1_calls() const : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="348.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="350.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="42.5" y="356.8198">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="361.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="363.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="42.5" y="369.6245">m2_calls() const : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.5" x2="171.5" y1="376.2188" y2="376.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="382.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="384.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="42.5" y="390.4292">m_m1_calls : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="28.5" y="395.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="30.5" y="397.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="42.5" y="403.2339">m_m2_calls : int</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="64" y="176"/>
+    <rect fill="#FEFECE" filter="url(#f193ugdht9ka3b)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="64" y="176"/>
     <ellipse cx="79" cy="192" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M81.9688,197.6406 Q81.3906,197.9375 80.75,198.0781 Q80.1094,198.2344 79.4063,198.2344 Q76.9063,198.2344 75.5781,196.5938 Q74.2656,194.9375 74.2656,191.8125 Q74.2656,188.6875 75.5781,187.0313 Q76.9063,185.375 79.4063,185.375 Q80.1094,185.375 80.75,185.5313 Q81.4063,185.6875 81.9688,185.9844 L81.9688,188.7031 Q81.3438,188.125 80.75,187.8594 Q80.1563,187.5781 79.5313,187.5781 Q78.1875,187.5781 77.5,188.6563 Q76.8125,189.7188 76.8125,191.8125 Q76.8125,193.9063 77.5,194.9844 Q78.1875,196.0469 79.5313,196.0469 Q80.1563,196.0469 80.75,195.7813 Q81.3438,195.5 81.9688,194.9219 L81.9688,197.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="93" y="196.1543">Layer3</text>
@@ -147,7 +147,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="143" y="185.1387">Base</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="65" x2="170" y1="208" y2="208"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="65" x2="170" y1="216" y2="216"/>
-    <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="207.5" y="323.5"/>
+    <rect fill="#FEFECE" filter="url(#f193ugdht9ka3b)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="207.5" y="323.5"/>
     <ellipse cx="222.5" cy="339.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M225.4688,345.1406 Q224.8906,345.4375 224.25,345.5781 Q223.6094,345.7344 222.9063,345.7344 Q220.4063,345.7344 219.0781,344.0938 Q217.7656,342.4375 217.7656,339.3125 Q217.7656,336.1875 219.0781,334.5313 Q220.4063,332.875 222.9063,332.875 Q223.6094,332.875 224.25,333.0313 Q224.9063,333.1875 225.4688,333.4844 L225.4688,336.2031 Q224.8438,335.625 224.25,335.3594 Q223.6563,335.0781 223.0313,335.0781 Q221.6875,335.0781 221,336.1563 Q220.3125,337.2188 220.3125,339.3125 Q220.3125,341.4063 221,342.4844 Q221.6875,343.5469 223.0313,343.5469 Q223.6563,343.5469 224.25,343.2813 Q224.8438,343 225.4688,342.4219 L225.4688,345.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="236.5" y="343.6543">Layer2</text>
@@ -155,7 +155,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="286.5" y="332.6387">Layer3&lt;Base&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="208.5" x2="376.5" y1="355.5" y2="355.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="208.5" x2="376.5" y1="363.5" y2="363.5"/>
-    <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="450" y="493.5"/>
+    <rect fill="#FEFECE" filter="url(#f193ugdht9ka3b)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="450" y="493.5"/>
     <ellipse cx="465" cy="509.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M467.9688,515.1406 Q467.3906,515.4375 466.75,515.5781 Q466.1094,515.7344 465.4063,515.7344 Q462.9063,515.7344 461.5781,514.0938 Q460.2656,512.4375 460.2656,509.3125 Q460.2656,506.1875 461.5781,504.5313 Q462.9063,502.875 465.4063,502.875 Q466.1094,502.875 466.75,503.0313 Q467.4063,503.1875 467.9688,503.4844 L467.9688,506.2031 Q467.3438,505.625 466.75,505.3594 Q466.1563,505.0781 465.5313,505.0781 Q464.1875,505.0781 463.5,506.1563 Q462.8125,507.2188 462.8125,509.3125 Q462.8125,511.4063 463.5,512.4844 Q464.1875,513.5469 465.5313,513.5469 Q466.1563,513.5469 466.75,513.2813 Q467.3438,513 467.9688,512.4219 L467.9688,515.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="479" y="513.6543">Layer1</text>
@@ -163,19 +163,19 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="529" y="502.6387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="682" y1="525.5" y2="525.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="682" y1="533.5" y2="533.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzwb2c6j0fdad)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="412.5" y="317"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f193ugdht9ka3b)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="412.5" y="317"/>
       <ellipse cx="591.25" cy="333" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M594.2188,338.6406 Q593.6406,338.9375 593,339.0781 Q592.3594,339.2344 591.6563,339.2344 Q589.1563,339.2344 587.8281,337.5938 Q586.5156,335.9375 586.5156,332.8125 Q586.5156,329.6875 587.8281,328.0313 Q589.1563,326.375 591.6563,326.375 Q592.3594,326.375 593,326.5313 Q593.6563,326.6875 594.2188,326.9844 L594.2188,329.7031 Q593.5938,329.125 593,328.8594 Q592.4063,328.5781 591.7813,328.5781 Q590.4375,328.5781 589.75,329.6563 Q589.0625,330.7188 589.0625,332.8125 Q589.0625,334.9063 589.75,335.9844 Q590.4375,337.0469 591.7813,337.0469 Q592.4063,337.0469 593,336.7813 Q593.5938,336.5 594.2188,335.9219 L594.2188,338.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="611.75" y="337.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="413.5" x2="785.5" y1="349" y2="349"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="413.5" x2="785.5" y1="357" y2="357"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="418.5" y="363"/>
       <ellipse cx="423.5" cy="368" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="348" x="432.5" y="371.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
     </a>
     <path d="M114.33,224.05 C112.76,235.48 110.76,250.03 108.69,265.08 " fill="none" id="C_0000972890420743280319-&gt;C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00019_class_mermaid.svg b/docs/test_cases/t00019_class_mermaid.svg
index ab2d4cc5..3dd64186 100644
--- a/docs/test_cases/t00019_class_mermaid.svg
+++ b/docs/test_cases/t00019_class_mermaid.svg
@@ -132,7 +132,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_base.h#L8">
+        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_base.h#L8">
           <g title="Base" id="classId-C_0000261668487476634123-0" class="node default clickable">
             <rect height="145" width="254.671875" y="-72.5" x="-127.3359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
@@ -171,7 +171,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer1.h#L9">
+        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer1.h#L9">
           <g title="Layer1" id="classId-C_0000902631298537519271-1" class="node default clickable">
             <rect height="101" width="175.09375" y="-50.5" x="-87.546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="87.546875" x1="-87.546875" class="divider"/>
@@ -200,7 +200,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer2.h#L6">
+        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer2.h#L6">
           <g title="Layer2" id="classId-C_0001115150925302580647-2" class="node default clickable">
             <rect height="79" width="217.75" y="-39.5" x="-108.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="108.875" x1="-108.875" class="divider"/>
@@ -224,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019_layer3.h#L8">
+        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019_layer3.h#L8">
           <g title="Layer3" id="classId-C_0001853410560073854945-3" class="node default clickable">
             <rect height="189" width="175.9375" y="-94.5" x="-87.96875" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="87.96875" x1="-87.96875" class="divider"/>
@@ -273,7 +273,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L269">
+        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/#L269">
           <g title="Layer3" id="classId-C_0000972890420743280319-4" class="node default clickable">
             <rect height="57" width="123.53125" y="-28.5" x="-61.765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.765625" x1="-61.765625" class="divider"/>
@@ -292,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L269">
+        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/#L269">
           <g title="Layer2" id="classId-C_0000129784999866998870-5" class="node default clickable">
             <rect height="57" width="193.8125" y="-28.5" x="-96.90625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="96.90625" x1="-96.90625" class="divider"/>
@@ -311,7 +311,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L269">
+        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/#L269">
           <g title="Layer1" id="classId-C_0000659076058325663708-6" class="node default clickable">
             <rect height="57" width="264.09375" y="-28.5" x="-132.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="132.046875" x1="-132.046875" class="divider"/>
@@ -330,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00019/t00019.cc#L11">
+        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00019/t00019.cc#L11">
           <g title="A" id="classId-C_0001015164998787089197-7" class="node default clickable">
             <rect height="79" width="444.203125" y="-39.5" x="-222.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="222.1015625" x1="-222.1015625" class="divider"/>
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 9a9567ae..8badb4d2 100644
--- a/docs/test_cases/t00020_class.svg
+++ b/docs/test_cases/t00020_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="886px" preserveAspectRatio="none" style="width:763px;height:886px;" version="1.1" viewBox="0 0 763 886" width="763px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnj1q0g58eo19" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f168z8ivrjh9dt" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,175 +9,175 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="81.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="280.5" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="81.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="280.5" y="142"/>
       <ellipse cx="370.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M370.3594,153.3438 L369.2031,158.4219 L371.5313,158.4219 L370.3594,153.3438 Z M368.875,151.1094 L371.8594,151.1094 L375.2188,163.5 L372.7656,163.5 L372,160.4375 L368.7188,160.4375 L367.9688,163.5 L365.5313,163.5 L368.875,151.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="390.75" y="162.1543">ProductA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="180"/>
       <ellipse cx="291.5" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="300.5" y="188.2104">~ProductA() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="281.5" x2="523.5" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="200.8047"/>
       <ellipse cx="291.5" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="300.5" y="209.0151">sell(int price) const = 0 : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="215.6094" y2="215.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="178" y="284"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="178" y="284"/>
       <ellipse cx="226.75" cy="300" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M229.7188,305.6406 Q229.1406,305.9375 228.5,306.0781 Q227.8594,306.2344 227.1563,306.2344 Q224.6563,306.2344 223.3281,304.5938 Q222.0156,302.9375 222.0156,299.8125 Q222.0156,296.6875 223.3281,295.0313 Q224.6563,293.375 227.1563,293.375 Q227.8594,293.375 228.5,293.5313 Q229.1563,293.6875 229.7188,293.9844 L229.7188,296.7031 Q229.0938,296.125 228.5,295.8594 Q227.9063,295.5781 227.2813,295.5781 Q225.9375,295.5781 225.25,296.6563 Q224.5625,297.7188 224.5625,299.8125 Q224.5625,301.9063 225.25,302.9844 Q225.9375,304.0469 227.2813,304.0469 Q227.9063,304.0469 228.5,303.7813 Q229.0938,303.5 229.7188,302.9219 L229.7188,305.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="247.25" y="304.1543">ProductA1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="316" y2="316"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="184" y="322"/>
       <ellipse cx="189" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="198" y="330.2104">sell(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="336.8047" y2="336.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="527" y="411.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="527" y="411.5"/>
       <ellipse cx="575.75" cy="427.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M578.7188,433.1406 Q578.1406,433.4375 577.5,433.5781 Q576.8594,433.7344 576.1563,433.7344 Q573.6563,433.7344 572.3281,432.0938 Q571.0156,430.4375 571.0156,427.3125 Q571.0156,424.1875 572.3281,422.5313 Q573.6563,420.875 576.1563,420.875 Q576.8594,420.875 577.5,421.0313 Q578.1563,421.1875 578.7188,421.4844 L578.7188,424.2031 Q578.0938,423.625 577.5,423.3594 Q576.9063,423.0781 576.2813,423.0781 Q574.9375,423.0781 574.25,424.1563 Q573.5625,425.2188 573.5625,427.3125 Q573.5625,429.4063 574.25,430.4844 Q574.9375,431.5469 576.2813,431.5469 Q576.9063,431.5469 577.5,431.2813 Q578.0938,431 578.7188,430.4219 L578.7188,433.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="596.25" y="431.6543">ProductA2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="443.5" y2="443.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="533" y="449.5"/>
       <ellipse cx="538" cy="454.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="547" y="457.7104">sell(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="464.3047" y2="464.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="81.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="539"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="81.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="539"/>
       <ellipse cx="96.25" cy="555" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M96.3594,550.3438 L95.2031,555.4219 L97.5313,555.4219 L96.3594,550.3438 Z M94.875,548.1094 L97.8594,548.1094 L101.2188,560.5 L98.7656,560.5 L98,557.4375 L94.7188,557.4375 L93.9688,560.5 L91.5313,560.5 L94.875,548.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="116.75" y="559.1543">ProductB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="571" y2="571"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="577"/>
       <ellipse cx="17" cy="582" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="26" y="585.2104">~ProductB() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="250" y1="591.8047" y2="591.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="597.8047"/>
       <ellipse cx="17" cy="602.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="606.0151">buy(int price) const = 0 : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="612.6094" y2="612.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="249" y="681"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="249" y="681"/>
       <ellipse cx="297.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M300.7188,702.6406 Q300.1406,702.9375 299.5,703.0781 Q298.8594,703.2344 298.1563,703.2344 Q295.6563,703.2344 294.3281,701.5938 Q293.0156,699.9375 293.0156,696.8125 Q293.0156,693.6875 294.3281,692.0313 Q295.6563,690.375 298.1563,690.375 Q298.8594,690.375 299.5,690.5313 Q300.1563,690.6875 300.7188,690.9844 L300.7188,693.7031 Q300.0938,693.125 299.5,692.8594 Q298.9063,692.5781 298.2813,692.5781 Q296.9375,692.5781 296.25,693.6563 Q295.5625,694.7188 295.5625,696.8125 Q295.5625,698.9063 296.25,699.9844 Q296.9375,701.0469 298.2813,701.0469 Q298.9063,701.0469 299.5,700.7813 Q300.0938,700.5 300.7188,699.9219 L300.7188,702.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="318.25" y="701.1543">ProductB1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="713" y2="713"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="255" y="719"/>
       <ellipse cx="260" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="269" y="727.2104">buy(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="733.8047" y2="733.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="43" y="681"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="43" y="681"/>
       <ellipse cx="91.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M94.7188,702.6406 Q94.1406,702.9375 93.5,703.0781 Q92.8594,703.2344 92.1563,703.2344 Q89.6563,703.2344 88.3281,701.5938 Q87.0156,699.9375 87.0156,696.8125 Q87.0156,693.6875 88.3281,692.0313 Q89.6563,690.375 92.1563,690.375 Q92.8594,690.375 93.5,690.5313 Q94.1563,690.6875 94.7188,690.9844 L94.7188,693.7031 Q94.0938,693.125 93.5,692.8594 Q92.9063,692.5781 92.2813,692.5781 Q90.9375,692.5781 90.25,693.6563 Q89.5625,694.7188 89.5625,696.8125 Q89.5625,698.9063 90.25,699.9844 Q90.9375,701.0469 92.2813,701.0469 Q92.9063,701.0469 93.5,700.7813 Q94.0938,700.5 94.7188,699.9219 L94.7188,702.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="112.25" y="701.1543">ProductB2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="713" y2="713"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="719"/>
       <ellipse cx="54" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="63" y="727.2104">buy(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="733.8047" y2="733.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="112.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="112.5" y="8"/>
       <ellipse cx="209.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M209.8594,19.3438 L208.7031,24.4219 L211.0313,24.4219 L209.8594,19.3438 Z M208.375,17.1094 L211.3594,17.1094 L214.7188,29.5 L212.2656,29.5 L211.5,26.4375 L208.2188,26.4375 L207.4688,29.5 L205.0313,29.5 L208.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="230.25" y="28.1543">AbstractFactory</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="46"/>
       <ellipse cx="123.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="54.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="58.8047"/>
       <ellipse cx="123.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="67.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="123.5" y="405"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="123.5" y="405"/>
       <ellipse cx="232.25" cy="421" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.2188,426.6406 Q234.6406,426.9375 234,427.0781 Q233.3594,427.2344 232.6563,427.2344 Q230.1563,427.2344 228.8281,425.5938 Q227.5156,423.9375 227.5156,420.8125 Q227.5156,417.6875 228.8281,416.0313 Q230.1563,414.375 232.6563,414.375 Q233.3594,414.375 234,414.5313 Q234.6563,414.6875 235.2188,414.9844 L235.2188,417.7031 Q234.5938,417.125 234,416.8594 Q233.4063,416.5781 232.7813,416.5781 Q231.4375,416.5781 230.75,417.6563 Q230.0625,418.7188 230.0625,420.8125 Q230.0625,422.9063 230.75,423.9844 Q231.4375,425.0469 232.7813,425.0469 Q233.4063,425.0469 234,424.7813 Q234.5938,424.5 235.2188,423.9219 L235.2188,426.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="252.75" y="425.1543">Factory1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="437" y2="437"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="443"/>
       <ellipse cx="134.5" cy="448" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="143.5" y="451.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="455.8047"/>
       <ellipse cx="134.5" cy="460.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="143.5" y="464.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="470.6094" y2="470.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1q0g58eo19)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="333.5" y="802"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f168z8ivrjh9dt)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="333.5" y="802"/>
       <ellipse cx="442.25" cy="818" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M445.2188,823.6406 Q444.6406,823.9375 444,824.0781 Q443.3594,824.2344 442.6563,824.2344 Q440.1563,824.2344 438.8281,822.5938 Q437.5156,820.9375 437.5156,817.8125 Q437.5156,814.6875 438.8281,813.0313 Q440.1563,811.375 442.6563,811.375 Q443.3594,811.375 444,811.5313 Q444.6563,811.6875 445.2188,811.9844 L445.2188,814.7031 Q444.5938,814.125 444,813.8594 Q443.4063,813.5781 442.7813,813.5781 Q441.4375,813.5781 440.75,814.6563 Q440.0625,815.7188 440.0625,817.8125 Q440.0625,819.9063 440.75,820.9844 Q441.4375,822.0469 442.7813,822.0469 Q443.4063,822.0469 444,821.7813 Q444.5938,821.5 445.2188,820.9219 L445.2188,823.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="462.75" y="822.1543">Factory2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="834" y2="834"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="840"/>
       <ellipse cx="344.5" cy="845" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="353.5" y="848.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="852.8047"/>
       <ellipse cx="344.5" cy="857.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="353.5" y="861.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="867.6094" y2="867.6094"/>
diff --git a/docs/test_cases/t00020_class_mermaid.svg b/docs/test_cases/t00020_class_mermaid.svg
index c7cc3dad..92003c4d 100644
--- a/docs/test_cases/t00020_class_mermaid.svg
+++ b/docs/test_cases/t00020_class_mermaid.svg
@@ -186,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(337.5, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L6">
+        <a transform="translate(337.5, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L6">
           <g title="ProductA" id="classId-C_0000425267229659464944-0" class="node default clickable">
             <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
@@ -215,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(113.1015625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L12">
+        <a transform="translate(113.1015625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L12">
           <g title="ProductA1" id="classId-C_0001756496029797864207-1" class="node default clickable">
             <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
@@ -239,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(373.3046875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L17">
+        <a transform="translate(373.3046875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L17">
           <g title="ProductA2" id="classId-C_0001531708592885216981-2" class="node default clickable">
             <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(859.6875, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L22">
+        <a transform="translate(859.6875, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L22">
           <g title="ProductB" id="classId-C_0002235759006374865842-3" class="node default clickable">
             <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
@@ -292,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(634.3984375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L28">
+        <a transform="translate(634.3984375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L28">
           <g title="ProductB1" id="classId-C_0001465493024233223845-4" class="node default clickable">
             <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
@@ -316,7 +316,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(896.3828125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L33">
+        <a transform="translate(896.3828125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L33">
           <g title="ProductB2" id="classId-C_0002154665562370057871-5" class="node default clickable">
             <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
@@ -340,7 +340,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(493.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L38">
+        <a transform="translate(493.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L38">
           <g title="AbstractFactory" id="classId-C_0001705546469218961425-6" class="node default clickable">
             <rect height="123" width="347.1875" y="-61.5" x="-173.59375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="173.59375" x1="-173.59375" class="divider"/>
@@ -369,7 +369,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(353.3046875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L44">
+        <a transform="translate(353.3046875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L44">
           <g title="Factory1" id="classId-C_0000692346848484854107-7" class="node default clickable">
             <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
@@ -398,7 +398,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(879.6875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00020/t00020.cc#L57">
+        <a transform="translate(879.6875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00020/t00020.cc#L57">
           <g title="Factory2" id="classId-C_0001566325870805013023-8" class="node default clickable">
             <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index f70b1f1f..7e3bb5ce 100644
--- a/docs/test_cases/t00021_class.svg
+++ b/docs/test_cases/t00021_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="509px" preserveAspectRatio="none" style="width:990px;height:509px;" version="1.1" viewBox="0 0 990 509" width="990px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fb6xyuqzhdrh3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fl1pr2lawsf51" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,152 +9,152 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="94.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="150"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1pr2lawsf51)" height="94.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="150"/>
       <ellipse cx="469.25" cy="166" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.3594,161.3438 L468.2031,166.4219 L470.5313,166.4219 L469.3594,161.3438 Z M467.875,159.1094 L470.8594,159.1094 L474.2188,171.5 L471.7656,171.5 L471,168.4375 L467.7188,168.4375 L466.9688,171.5 L464.5313,171.5 L467.875,159.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="489.75" y="170.1543">Visitor</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="188"/>
       <ellipse cx="379" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="388" y="196.2104">~Visitor() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="369" x2="616" y1="202.8047" y2="202.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="208.8047"/>
       <ellipse cx="379" cy="213.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="217.0151">visit_A(const A &amp; item) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="221.6094"/>
       <ellipse cx="379" cy="226.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="229.8198">visit_B(const B &amp; item) const = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="236.4141" y2="236.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1pr2lawsf51)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="304"/>
       <ellipse cx="202.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M205.7188,325.6406 Q205.1406,325.9375 204.5,326.0781 Q203.8594,326.2344 203.1563,326.2344 Q200.6563,326.2344 199.3281,324.5938 Q198.0156,322.9375 198.0156,319.8125 Q198.0156,316.6875 199.3281,315.0313 Q200.6563,313.375 203.1563,313.375 Q203.8594,313.375 204.5,313.5313 Q205.1563,313.6875 205.7188,313.9844 L205.7188,316.7031 Q205.0938,316.125 204.5,315.8594 Q203.9063,315.5781 203.2813,315.5781 Q201.9375,315.5781 201.25,316.6563 Q200.5625,317.7188 200.5625,319.8125 Q200.5625,321.9063 201.25,322.9844 Q201.9375,324.0469 203.2813,324.0469 Q203.9063,324.0469 204.5,323.7813 Q205.0938,323.5 205.7188,322.9219 L205.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="223.25" y="324.1543">Visitor1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="342"/>
       <ellipse cx="128" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="137" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="354.8047"/>
       <ellipse cx="128" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="137" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1pr2lawsf51)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="304"/>
       <ellipse cx="464.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M467.7188,325.6406 Q467.1406,325.9375 466.5,326.0781 Q465.8594,326.2344 465.1563,326.2344 Q462.6563,326.2344 461.3281,324.5938 Q460.0156,322.9375 460.0156,319.8125 Q460.0156,316.6875 461.3281,315.0313 Q462.6563,313.375 465.1563,313.375 Q465.8594,313.375 466.5,313.5313 Q467.1563,313.6875 467.7188,313.9844 L467.7188,316.7031 Q467.0938,316.125 466.5,315.8594 Q465.9063,315.5781 465.2813,315.5781 Q463.9375,315.5781 463.25,316.6563 Q462.5625,317.7188 462.5625,319.8125 Q462.5625,321.9063 463.25,322.9844 Q463.9375,324.0469 465.2813,324.0469 Q465.9063,324.0469 466.5,323.7813 Q467.0938,323.5 467.7188,322.9219 L467.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="485.25" y="324.1543">Visitor2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="342"/>
       <ellipse cx="390" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="399" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="354.8047"/>
       <ellipse cx="390" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="399" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1pr2lawsf51)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="304"/>
       <ellipse cx="726.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M729.7188,325.6406 Q729.1406,325.9375 728.5,326.0781 Q727.8594,326.2344 727.1563,326.2344 Q724.6563,326.2344 723.3281,324.5938 Q722.0156,322.9375 722.0156,319.8125 Q722.0156,316.6875 723.3281,315.0313 Q724.6563,313.375 727.1563,313.375 Q727.8594,313.375 728.5,313.5313 Q729.1563,313.6875 729.7188,313.9844 L729.7188,316.7031 Q729.0938,316.125 728.5,315.8594 Q727.9063,315.5781 727.2813,315.5781 Q725.9375,315.5781 725.25,316.6563 Q724.5625,317.7188 724.5625,319.8125 Q724.5625,321.9063 725.25,322.9844 Q725.9375,324.0469 727.2813,324.0469 Q727.9063,324.0469 728.5,323.7813 Q729.0938,323.5 729.7188,322.9219 L729.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="747.25" y="324.1543">Visitor3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="342"/>
       <ellipse cx="652" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="661" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="354.8047"/>
       <ellipse cx="652" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="661" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="81.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1pr2lawsf51)" height="81.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
       <ellipse cx="474.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M474.3594,19.3438 L473.2031,24.4219 L475.5313,24.4219 L474.3594,19.3438 Z M472.875,17.1094 L475.8594,17.1094 L479.2188,29.5 L476.7656,29.5 L476,26.4375 L472.7188,26.4375 L471.9688,29.5 L469.5313,29.5 L472.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="494.75" y="28.1543">Item</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="46"/>
       <ellipse cx="360" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="193" x="369" y="54.2104">~Item() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="350" x2="635" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="66.8047"/>
       <ellipse cx="360" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="261" x="369" y="75.0151">accept(const Visitor &amp; visitor) const = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="438"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1pr2lawsf51)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="438"/>
       <ellipse cx="130.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M133.2188,459.6406 Q132.6406,459.9375 132,460.0781 Q131.3594,460.2344 130.6563,460.2344 Q128.1563,460.2344 126.8281,458.5938 Q125.5156,456.9375 125.5156,453.8125 Q125.5156,450.6875 126.8281,449.0313 Q128.1563,447.375 130.6563,447.375 Q131.3594,447.375 132,447.5313 Q132.6563,447.6875 133.2188,447.9844 L133.2188,450.7031 Q132.5938,450.125 132,449.8594 Q131.4063,449.5781 130.7813,449.5781 Q129.4375,449.5781 128.75,450.6563 Q128.0625,451.7188 128.0625,453.8125 Q128.0625,455.9063 128.75,456.9844 Q129.4375,458.0469 130.7813,458.0469 Q131.4063,458.0469 132,457.7813 Q132.5938,457.5 133.2188,456.9219 L133.2188,459.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="150.75" y="458.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="470" y2="470"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="476"/>
       <ellipse cx="17" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="26" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="490.8047" y2="490.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fb6xyuqzhdrh3)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="438"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1pr2lawsf51)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="438"/>
       <ellipse cx="838.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.2188,459.6406 Q840.6406,459.9375 840,460.0781 Q839.3594,460.2344 838.6563,460.2344 Q836.1563,460.2344 834.8281,458.5938 Q833.5156,456.9375 833.5156,453.8125 Q833.5156,450.6875 834.8281,449.0313 Q836.1563,447.375 838.6563,447.375 Q839.3594,447.375 840,447.5313 Q840.6563,447.6875 841.2188,447.9844 L841.2188,450.7031 Q840.5938,450.125 840,449.8594 Q839.4063,449.5781 838.7813,449.5781 Q837.4375,449.5781 836.75,450.6563 Q836.0625,451.7188 836.0625,453.8125 Q836.0625,455.9063 836.75,456.9844 Q837.4375,458.0469 838.7813,458.0469 Q839.4063,458.0469 840,457.7813 Q840.5938,457.5 841.2188,456.9219 L841.2188,459.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="858.75" y="458.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="470" y2="470"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="720" y="476"/>
       <ellipse cx="725" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="734" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="490.8047" y2="490.8047"/>
diff --git a/docs/test_cases/t00021_class_mermaid.svg b/docs/test_cases/t00021_class_mermaid.svg
index 40c75c43..77dd2160 100644
--- a/docs/test_cases/t00021_class_mermaid.svg
+++ b/docs/test_cases/t00021_class_mermaid.svg
@@ -236,7 +236,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L9">
+        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L9">
           <g title="Visitor" id="classId-C_0001668671110672744395-0" class="node default clickable">
             <rect height="145" width="279.546875" y="-72.5" x="-139.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -270,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L16">
+        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L16">
           <g title="Visitor1" id="classId-C_0001028369219400401946-1" class="node default clickable">
             <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -299,7 +299,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L22">
+        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L22">
           <g title="Visitor2" id="classId-C_0001710373315476287130-2" class="node default clickable">
             <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -328,7 +328,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L28">
+        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L28">
           <g title="Visitor3" id="classId-C_0001399026228179178025-3" class="node default clickable">
             <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -357,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L34">
+        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L34">
           <g title="Item" id="classId-C_0001491568826758947722-4" class="node default clickable">
             <rect height="123" width="324.609375" y="-61.5" x="-162.3046875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
@@ -386,7 +386,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L40">
+        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L40">
           <g title="A" id="classId-C_0001494142745564026823-5" class="node default clickable">
             <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
@@ -410,7 +410,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00021/t00021.cc#L45">
+        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00021/t00021.cc#L45">
           <g title="B" id="classId-C_0001452948650450999568-6" class="node default clickable">
             <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index 0ae05e6a..3328d458 100644
--- a/docs/test_cases/t00022_class.svg
+++ b/docs/test_cases/t00022_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="238px" preserveAspectRatio="none" style="width:290px;height:238px;" version="1.1" viewBox="0 0 290 238" width="290px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fjptq3s84e4hr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fw9yiczkqw3d5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,76 +9,76 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjptq3s84e4hr)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9yiczkqw3d5)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
       <ellipse cx="134.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M134.3594,19.3438 L133.2031,24.4219 L135.5313,24.4219 L134.3594,19.3438 Z M132.875,17.1094 L135.8594,17.1094 L139.2188,29.5 L136.7656,29.5 L136,26.4375 L132.7188,26.4375 L131.9688,29.5 L129.5313,29.5 L132.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="154.75" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="46"/>
       <polygon fill="#FFFF44" points="69.5,46,73.5,50,69.5,54,65.5,50" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="54.2104">method1() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="58.8047"/>
       <polygon fill="#FFFF44" points="69.5,58.8047,73.5,62.8047,69.5,66.8047,65.5,62.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="67.0151">method2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="71.6094"/>
       <ellipse cx="69.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="78.5" y="79.8198">template_method() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="86.4141" y2="86.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjptq3s84e4hr)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9yiczkqw3d5)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
       <ellipse cx="53.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M56.2188,175.6406 Q55.6406,175.9375 55,176.0781 Q54.3594,176.2344 53.6563,176.2344 Q51.1563,176.2344 49.8281,174.5938 Q48.5156,172.9375 48.5156,169.8125 Q48.5156,166.6875 49.8281,165.0313 Q51.1563,163.375 53.6563,163.375 Q54.3594,163.375 55,163.5313 Q55.6563,163.6875 56.2188,163.9844 L56.2188,166.7031 Q55.5938,166.125 55,165.8594 Q54.4063,165.5781 53.7813,165.5781 Q52.4375,165.5781 51.75,166.6563 Q51.0625,167.7188 51.0625,169.8125 Q51.0625,171.9063 51.75,172.9844 Q52.4375,174.0469 53.7813,174.0469 Q54.4063,174.0469 55,173.7813 Q55.5938,173.5 56.2188,172.9219 L56.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="73.75" y="174.1543">A1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="192"/>
       <polygon fill="#FFFF44" points="17,192,21,196,17,200,13,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="200.2104">method1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="204.8047"/>
       <polygon fill="#FFFF44" points="17,204.8047,21,208.8047,17,212.8047,13,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="213.0151">method2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="219.6094" y2="219.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjptq3s84e4hr)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9yiczkqw3d5)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
       <ellipse cx="207.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M210.2188,175.6406 Q209.6406,175.9375 209,176.0781 Q208.3594,176.2344 207.6563,176.2344 Q205.1563,176.2344 203.8281,174.5938 Q202.5156,172.9375 202.5156,169.8125 Q202.5156,166.6875 203.8281,165.0313 Q205.1563,163.375 207.6563,163.375 Q208.3594,163.375 209,163.5313 Q209.6563,163.6875 210.2188,163.9844 L210.2188,166.7031 Q209.5938,166.125 209,165.8594 Q208.4063,165.5781 207.7813,165.5781 Q206.4375,165.5781 205.75,166.6563 Q205.0625,167.7188 205.0625,169.8125 Q205.0625,171.9063 205.75,172.9844 Q206.4375,174.0469 207.7813,174.0469 Q208.4063,174.0469 209,173.7813 Q209.5938,173.5 210.2188,172.9219 L210.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="227.75" y="174.1543">A2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="192"/>
       <polygon fill="#FFFF44" points="171,192,175,196,171,200,167,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="200.2104">method1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="204.8047"/>
       <polygon fill="#FFFF44" points="171,204.8047,175,208.8047,171,212.8047,167,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="213.0151">method2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="219.6094" y2="219.6094"/>
diff --git a/docs/test_cases/t00022_class_mermaid.svg b/docs/test_cases/t00022_class_mermaid.svg
index 0d7761de..b6b302fd 100644
--- a/docs/test_cases/t00022_class_mermaid.svg
+++ b/docs/test_cases/t00022_class_mermaid.svg
@@ -74,7 +74,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L6">
+        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L6">
           <g title="A" id="classId-C_0002012435893382068755-0" class="node default clickable">
             <rect height="145" width="201.328125" y="-72.5" x="-100.6640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="100.6640625" x1="-100.6640625" class="divider"/>
@@ -108,7 +108,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L19">
+        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L19">
           <g title="A1" id="classId-C_0002282061426381077447-1" class="node default clickable">
             <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
@@ -137,7 +137,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00022/t00022.cc#L25">
+        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00022/t00022.cc#L25">
           <g title="A2" id="classId-C_0000158819862916671538-2" class="node default clickable">
             <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index e21c22a4..3dcfd92e 100644
--- a/docs/test_cases/t00023_class.svg
+++ b/docs/test_cases/t00023_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="393px" preserveAspectRatio="none" style="width:456px;height:393px;" version="1.1" viewBox="0 0 456 393" width="456px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1d6jg5w0zuo6i" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1b6md56wsu9qk" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,102 +9,102 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="81.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="104.5" y="179"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6md56wsu9qk)" height="81.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="104.5" y="179"/>
       <ellipse cx="194.25" cy="195" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.3594,190.3438 L193.2031,195.4219 L195.5313,195.4219 L194.3594,190.3438 Z M192.875,188.1094 L195.8594,188.1094 L199.2188,200.5 L196.7656,200.5 L196,197.4375 L192.7188,197.4375 L191.9688,200.5 L189.5313,200.5 L192.875,188.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.75" y="199.1543">Strategy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="217"/>
       <ellipse cx="115.5" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="124.5" y="225.2104">~Strategy() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="105.5" x2="345.5" y1="231.8047" y2="231.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="237.8047"/>
       <ellipse cx="115.5" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="124.5" y="246.0151">algorithm() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="252.6094" y2="252.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6md56wsu9qk)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="322"/>
       <ellipse cx="34.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M37.4688,343.6406 Q36.8906,343.9375 36.25,344.0781 Q35.6094,344.2344 34.9063,344.2344 Q32.4063,344.2344 31.0781,342.5938 Q29.7656,340.9375 29.7656,337.8125 Q29.7656,334.6875 31.0781,333.0313 Q32.4063,331.375 34.9063,331.375 Q35.6094,331.375 36.25,331.5313 Q36.9063,331.6875 37.4688,331.9844 L37.4688,334.7031 Q36.8438,334.125 36.25,333.8594 Q35.6563,333.5781 35.0313,333.5781 Q33.6875,333.5781 33,334.6563 Q32.3125,335.7188 32.3125,337.8125 Q32.3125,339.9063 33,340.9844 Q33.6875,342.0469 35.0313,342.0469 Q35.6563,342.0469 36.25,341.7813 Q36.8438,341.5 37.4688,340.9219 L37.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="342.1543">StrategyA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="360"/>
       <ellipse cx="17" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6md56wsu9qk)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="322"/>
       <ellipse cx="192.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.4688,343.6406 Q194.8906,343.9375 194.25,344.0781 Q193.6094,344.2344 192.9063,344.2344 Q190.4063,344.2344 189.0781,342.5938 Q187.7656,340.9375 187.7656,337.8125 Q187.7656,334.6875 189.0781,333.0313 Q190.4063,331.375 192.9063,331.375 Q193.6094,331.375 194.25,331.5313 Q194.9063,331.6875 195.4688,331.9844 L195.4688,334.7031 Q194.8438,334.125 194.25,333.8594 Q193.6563,333.5781 193.0313,333.5781 Q191.6875,333.5781 191,334.6563 Q190.3125,335.7188 190.3125,337.8125 Q190.3125,339.9063 191,340.9844 Q191.6875,342.0469 193.0313,342.0469 Q193.6563,342.0469 194.25,341.7813 Q194.8438,341.5 195.4688,340.9219 L195.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="342.1543">StrategyB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="170" y="360"/>
       <ellipse cx="175" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6md56wsu9qk)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="322"/>
       <ellipse cx="350.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M353.4688,343.6406 Q352.8906,343.9375 352.25,344.0781 Q351.6094,344.2344 350.9063,344.2344 Q348.4063,344.2344 347.0781,342.5938 Q345.7656,340.9375 345.7656,337.8125 Q345.7656,334.6875 347.0781,333.0313 Q348.4063,331.375 350.9063,331.375 Q351.6094,331.375 352.25,331.5313 Q352.9063,331.6875 353.4688,331.9844 L353.4688,334.7031 Q352.8438,334.125 352.25,333.8594 Q351.6563,333.5781 351.0313,333.5781 Q349.6875,333.5781 349,334.6563 Q348.3125,335.7188 348.3125,337.8125 Q348.3125,339.9063 349,340.9844 Q349.6875,342.0469 351.0313,342.0469 Q351.6563,342.0469 352.25,341.7813 Q352.8438,341.5 353.4688,340.9219 L353.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="342.1543">StrategyC</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="328" y="360"/>
       <ellipse cx="333" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="342" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d6jg5w0zuo6i)" height="94.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6md56wsu9qk)" height="94.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
       <ellipse cx="197.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.2188,29.6406 Q199.6406,29.9375 199,30.0781 Q198.3594,30.2344 197.6563,30.2344 Q195.1563,30.2344 193.8281,28.5938 Q192.5156,26.9375 192.5156,23.8125 Q192.5156,20.6875 193.8281,19.0313 Q195.1563,17.375 197.6563,17.375 Q198.3594,17.375 199,17.5313 Q199.6563,17.6875 200.2188,17.9844 L200.2188,20.7031 Q199.5938,20.125 199,19.8594 Q198.4063,19.5781 197.7813,19.5781 Q196.4375,19.5781 195.75,20.6563 Q195.0625,21.7188 195.0625,23.8125 Q195.0625,25.9063 195.75,26.9844 Q196.4375,28.0469 197.7813,28.0469 Q198.4063,28.0469 199,27.7813 Q199.5938,27.5 200.2188,26.9219 L200.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="217.75" y="28.1543">Context</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="46"/>
       <ellipse cx="79" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="289" x="88" y="54.2104">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="69" x2="382" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="66.8047"/>
       <ellipse cx="79" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="88" y="75.0151">apply() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="87.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="89.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="95.8198">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
     </a>
     <path d="M161.3,274.03 C141.49,290.39 120.4,307.81 103.24,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00023_class_mermaid.svg b/docs/test_cases/t00023_class_mermaid.svg
index d9ca6f01..f4a6bf11 100644
--- a/docs/test_cases/t00023_class_mermaid.svg
+++ b/docs/test_cases/t00023_class_mermaid.svg
@@ -96,7 +96,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L6">
+        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L6">
           <g title="Strategy" id="classId-C_0001469857696438841976-0" class="node default clickable">
             <rect height="123" width="281.8125" y="-61.5" x="-140.90625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="140.90625" x1="-140.90625" class="divider"/>
@@ -125,7 +125,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L12">
+        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L12">
           <g title="StrategyA" id="classId-C_0001245533075819635385-1" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -149,7 +149,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L17">
+        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L17">
           <g title="StrategyB" id="classId-C_0000000264986406899645-2" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L22">
+        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L22">
           <g title="StrategyC" id="classId-C_0000174795176193483089-3" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -197,7 +197,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00023/t00023.cc#L27">
+        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00023/t00023.cc#L27">
           <g title="Context" id="classId-C_0002038594012979479050-4" class="node default clickable">
             <rect height="123" width="300.046875" y="-61.5" x="-150.0234375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="150.0234375" x1="-150.0234375" class="divider"/>
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index e92b81cf..35bf6f75 100644
--- a/docs/test_cases/t00024_class.svg
+++ b/docs/test_cases/t00024_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="297px" preserveAspectRatio="none" style="width:542px;height:297px;" version="1.1" viewBox="0 0 542 297" width="542px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f19xr1msw7mglh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fdxdfki5557xr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,115 +9,115 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19xr1msw7mglh)" height="94.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="136.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdxdfki5557xr)" height="94.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="136.5" y="8"/>
       <ellipse cx="181.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M181.8594,19.3438 L180.7031,24.4219 L183.0313,24.4219 L181.8594,19.3438 Z M180.375,17.1094 L183.3594,17.1094 L186.7188,29.5 L184.2656,29.5 L183.5,26.4375 L180.2188,26.4375 L179.4688,29.5 L177.0313,29.5 L180.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="202.25" y="28.1543">Target</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="46"/>
       <ellipse cx="147.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="156.5" y="54.2104">~Target() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="137.5" x2="275.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="66.8047"/>
       <ellipse cx="147.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="75.0151">m1() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="79.6094"/>
       <ellipse cx="147.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="87.8198">m2() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="94.4141" y2="94.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19xr1msw7mglh)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="195.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdxdfki5557xr)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="195.5"/>
       <ellipse cx="23.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,217.1406 Q26.0906,217.4375 25.45,217.5781 Q24.8094,217.7344 24.1063,217.7344 Q21.6063,217.7344 20.2781,216.0938 Q18.9656,214.4375 18.9656,211.3125 Q18.9656,208.1875 20.2781,206.5313 Q21.6063,204.875 24.1063,204.875 Q24.8094,204.875 25.45,205.0313 Q26.1063,205.1875 26.6688,205.4844 L26.6688,208.2031 Q26.0438,207.625 25.45,207.3594 Q24.8563,207.0781 24.2313,207.0781 Q22.8875,207.0781 22.2,208.1563 Q21.5125,209.2188 21.5125,211.3125 Q21.5125,213.4063 22.2,214.4844 Q22.8875,215.5469 24.2313,215.5469 Q24.8563,215.5469 25.45,215.2813 Q26.0438,215 26.6688,214.4219 L26.6688,217.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="215.6543">Target1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="227.5" y2="227.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="233.5"/>
       <ellipse cx="17" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="241.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="246.3047"/>
       <ellipse cx="17" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="254.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="261.1094" y2="261.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19xr1msw7mglh)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="195.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdxdfki5557xr)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="195.5"/>
       <ellipse cx="145.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.6688,217.1406 Q148.0906,217.4375 147.45,217.5781 Q146.8094,217.7344 146.1063,217.7344 Q143.6063,217.7344 142.2781,216.0938 Q140.9656,214.4375 140.9656,211.3125 Q140.9656,208.1875 142.2781,206.5313 Q143.6063,204.875 146.1063,204.875 Q146.8094,204.875 147.45,205.0313 Q148.1063,205.1875 148.6688,205.4844 L148.6688,208.2031 Q148.0438,207.625 147.45,207.3594 Q146.8563,207.0781 146.2313,207.0781 Q144.8875,207.0781 144.2,208.1563 Q143.5125,209.2188 143.5125,211.3125 Q143.5125,213.4063 144.2,214.4844 Q144.8875,215.5469 146.2313,215.5469 Q146.8563,215.5469 147.45,215.2813 Q148.0438,215 148.6688,214.4219 L148.6688,217.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="215.6543">Target2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="227.5" y2="227.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="233.5"/>
       <ellipse cx="139" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="241.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="246.3047"/>
       <ellipse cx="139" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="254.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="261.1094" y2="261.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19xr1msw7mglh)" height="107.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="179"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdxdfki5557xr)" height="107.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="179"/>
       <ellipse cx="369.75" cy="195" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M372.7188,200.6406 Q372.1406,200.9375 371.5,201.0781 Q370.8594,201.2344 370.1563,201.2344 Q367.6563,201.2344 366.3281,199.5938 Q365.0156,197.9375 365.0156,194.8125 Q365.0156,191.6875 366.3281,190.0313 Q367.6563,188.375 370.1563,188.375 Q370.8594,188.375 371.5,188.5313 Q372.1563,188.6875 372.7188,188.9844 L372.7188,191.7031 Q372.0938,191.125 371.5,190.8594 Q370.9063,190.5781 370.2813,190.5781 Q368.9375,190.5781 368.25,191.6563 Q367.5625,192.7188 367.5625,194.8125 Q367.5625,196.9063 368.25,197.9844 Q368.9375,199.0469 370.2813,199.0469 Q370.9063,199.0469 371.5,198.7813 Q372.0938,198.5 372.7188,197.9219 L372.7188,200.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="199.1543">Proxy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="217"/>
       <ellipse cx="261" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="255" x="270" y="225.2104">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="251" x2="530" y1="231.8047" y2="231.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="237.8047"/>
       <ellipse cx="261" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="246.0151">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="250.6094"/>
       <ellipse cx="261" cy="255.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="258.8198">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="265.4141" y2="265.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="271.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="273.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="279.6245">m_target : std::shared_ptr&lt;Target&gt;</text>
     </a>
     <path d="M151.91,117.02 C128.52,143.17 102,172.81 81.81,195.39 " fill="none" id="C_0001116408959993110019&lt;-C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00024_class_mermaid.svg b/docs/test_cases/t00024_class_mermaid.svg
index 5fde8140..65a0e3ff 100644
--- a/docs/test_cases/t00024_class_mermaid.svg
+++ b/docs/test_cases/t00024_class_mermaid.svg
@@ -96,7 +96,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L6">
+        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L6">
           <g title="Target" id="classId-C_0001116408959993110019-0" class="node default clickable">
             <rect height="145" width="131.8125" y="-72.5" x="-65.90625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.90625" x1="-65.90625" class="divider"/>
@@ -130,7 +130,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L14">
+        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L14">
           <g title="Target1" id="classId-C_0000669517069151826610-1" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -159,7 +159,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L20">
+        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L20">
           <g title="Target2" id="classId-C_0001210513233906695933-2" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00024/t00024.cc#L26">
+        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00024/t00024.cc#L26">
           <g title="Proxy" id="classId-C_0000594707401639991215-3" class="node default clickable">
             <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index 5afc8ebd..87a02d59 100644
--- a/docs/test_cases/t00025_class.svg
+++ b/docs/test_cases/t00025_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="386px" preserveAspectRatio="none" style="width:512px;height:386px;" version="1.1" viewBox="0 0 512 386" width="512px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f8rzr3bnh81sz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4epjflyi3cd9" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,52 +9,52 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="284.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4epjflyi3cd9)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="284.5"/>
       <ellipse cx="23.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,306.1406 Q26.0906,306.4375 25.45,306.5781 Q24.8094,306.7344 24.1063,306.7344 Q21.6063,306.7344 20.2781,305.0938 Q18.9656,303.4375 18.9656,300.3125 Q18.9656,297.1875 20.2781,295.5313 Q21.6063,293.875 24.1063,293.875 Q24.8094,293.875 25.45,294.0313 Q26.1063,294.1875 26.6688,294.4844 L26.6688,297.2031 Q26.0438,296.625 25.45,296.3594 Q24.8563,296.0781 24.2313,296.0781 Q22.8875,296.0781 22.2,297.1563 Q21.5125,298.2188 21.5125,300.3125 Q21.5125,302.4063 22.2,303.4844 Q22.8875,304.5469 24.2313,304.5469 Q24.8563,304.5469 25.45,304.2813 Q26.0438,304 26.6688,303.4219 L26.6688,306.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="304.6543">Target1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="316.5" y2="316.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.5"/>
       <ellipse cx="17" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="330.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.3047"/>
       <ellipse cx="17" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="343.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="350.1094" y2="350.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="284.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4epjflyi3cd9)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="284.5"/>
       <ellipse cx="431.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M434.6688,306.1406 Q434.0906,306.4375 433.45,306.5781 Q432.8094,306.7344 432.1063,306.7344 Q429.6063,306.7344 428.2781,305.0938 Q426.9656,303.4375 426.9656,300.3125 Q426.9656,297.1875 428.2781,295.5313 Q429.6063,293.875 432.1063,293.875 Q432.8094,293.875 433.45,294.0313 Q434.1063,294.1875 434.6688,294.4844 L434.6688,297.2031 Q434.0438,296.625 433.45,296.3594 Q432.8563,296.0781 432.2313,296.0781 Q430.8875,296.0781 430.2,297.1563 Q429.5125,298.2188 429.5125,300.3125 Q429.5125,302.4063 430.2,303.4844 Q430.8875,304.5469 432.2313,304.5469 Q432.8563,304.5469 433.45,304.2813 Q434.0438,304 434.6688,303.4219 L434.6688,306.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="446.3" y="304.6543">Target2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="316.5" y2="316.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="322.5"/>
       <ellipse cx="425" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="330.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="335.3047"/>
       <ellipse cx="425" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="343.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="350.1094" y2="350.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="107.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="251" x="128" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4epjflyi3cd9)" height="107.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="251" x="128" y="268"/>
       <ellipse cx="227.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M230.2188,289.6406 Q229.6406,289.9375 229,290.0781 Q228.3594,290.2344 227.6563,290.2344 Q225.1563,290.2344 223.8281,288.5938 Q222.5156,286.9375 222.5156,283.8125 Q222.5156,280.6875 223.8281,279.0313 Q225.1563,277.375 227.6563,277.375 Q228.3594,277.375 229,277.5313 Q229.6563,277.6875 230.2188,277.9844 L230.2188,280.7031 Q229.5938,280.125 229,279.8594 Q228.4063,279.5781 227.7813,279.5781 Q226.4375,279.5781 225.75,280.6563 Q225.0625,281.7188 225.0625,283.8125 Q225.0625,285.9063 225.75,286.9844 Q226.4375,288.0469 227.7813,288.0469 Q228.4063,288.0469 229,287.7813 Q229.5938,287.5 230.2188,286.9219 L230.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="247.75" y="288.1543">Proxy</text>
@@ -62,38 +62,38 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="374" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="306"/>
       <ellipse cx="139" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="148" y="314.2104">Proxy(std::shared_ptr&lt;T&gt; target) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="129" x2="378" y1="320.8047" y2="320.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="326.8047"/>
       <ellipse cx="139" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="335.0151">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="339.6094"/>
       <ellipse cx="139" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="347.8198">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="354.4141" y2="354.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="360.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136" y="362.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148" y="368.6245">m_target : std::shared_ptr&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="90.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4epjflyi3cd9)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="90.5" y="159"/>
       <ellipse cx="105.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M108.4688,180.6406 Q107.8906,180.9375 107.25,181.0781 Q106.6094,181.2344 105.9063,181.2344 Q103.4063,181.2344 102.0781,179.5938 Q100.7656,177.9375 100.7656,174.8125 Q100.7656,171.6875 102.0781,170.0313 Q103.4063,168.375 105.9063,168.375 Q106.6094,168.375 107.25,168.5313 Q107.9063,168.6875 108.4688,168.9844 L108.4688,171.7031 Q107.8438,171.125 107.25,170.8594 Q106.6563,170.5781 106.0313,170.5781 Q104.6875,170.5781 104,171.6563 Q103.3125,172.7188 103.3125,174.8125 Q103.3125,176.9063 104,177.9844 Q104.6875,179.0469 106.0313,179.0469 Q106.6563,179.0469 107.25,178.7813 Q107.8438,178.5 108.4688,177.9219 L108.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="119.5" y="179.1543">Proxy</text>
@@ -102,8 +102,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91.5" x2="207.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91.5" x2="207.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="243.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4epjflyi3cd9)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="243.5" y="159"/>
       <ellipse cx="258.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M261.4688,180.6406 Q260.8906,180.9375 260.25,181.0781 Q259.6094,181.2344 258.9063,181.2344 Q256.4063,181.2344 255.0781,179.5938 Q253.7656,177.9375 253.7656,174.8125 Q253.7656,171.6875 255.0781,170.0313 Q256.4063,168.375 258.9063,168.375 Q259.6094,168.375 260.25,168.5313 Q260.9063,168.6875 261.4688,168.9844 L261.4688,171.7031 Q260.8438,171.125 260.25,170.8594 Q259.6563,170.5781 259.0313,170.5781 Q257.6875,170.5781 257,171.6563 Q256.3125,172.7188 256.3125,174.8125 Q256.3125,176.9063 257,177.9844 Q257.6875,179.0469 259.0313,179.0469 Q259.6563,179.0469 260.25,178.7813 Q260.8438,178.5 261.4688,177.9219 L261.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="272.5" y="179.1543">Proxy</text>
@@ -112,26 +112,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244.5" x2="360.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244.5" x2="360.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8rzr3bnh81sz)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="141" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4epjflyi3cd9)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="141" y="8"/>
       <ellipse cx="184.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M187.3188,29.6406 Q186.7406,29.9375 186.1,30.0781 Q185.4594,30.2344 184.7563,30.2344 Q182.2563,30.2344 180.9281,28.5938 Q179.6156,26.9375 179.6156,23.8125 Q179.6156,20.6875 180.9281,19.0313 Q182.2563,17.375 184.7563,17.375 Q185.4594,17.375 186.1,17.5313 Q186.7563,17.6875 187.3188,17.9844 L187.3188,20.7031 Q186.6938,20.125 186.1,19.8594 Q185.5063,19.5781 184.8813,19.5781 Q183.5375,19.5781 182.85,20.6563 Q182.1625,21.7188 182.1625,23.8125 Q182.1625,25.9063 182.85,26.9844 Q183.5375,28.0469 184.8813,28.0469 Q185.5063,28.0469 186.1,27.7813 Q186.6938,27.5 187.3188,26.9219 L187.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="204.65" y="28.1543">ProxyHolder</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="147" y="54"/>
       <ellipse cx="152" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="161" y="62.2104">proxy1 : Proxy&lt;Target1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="147" y="66.8047"/>
       <ellipse cx="152" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="161" y="75.0151">proxy2 : Proxy&lt;Target2&gt;</text>
     </a>
     <path d="M132.54,207.16 C117.89,227.14 96.41,256.47 78.96,280.29 " fill="none" id="C_0001644966842838139424-&gt;C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00025_class_mermaid.svg b/docs/test_cases/t00025_class_mermaid.svg
index 39f224bc..5b7d3843 100644
--- a/docs/test_cases/t00025_class_mermaid.svg
+++ b/docs/test_cases/t00025_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L6">
+        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L6">
           <g title="Target1" id="classId-C_0001573849034571194138-0" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -155,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L12">
+        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L12">
           <g title="Target2" id="classId-C_0000751896409461834669-1" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -184,7 +184,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18">
+        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001483353300536405088-2" class="node default clickable">
             <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18">
+        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001644966842838139424-3" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -242,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L18">
+        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001190103100236298763-4" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -261,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00025/t00025.cc#L31">
+        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00025/t00025.cc#L31">
           <g title="ProxyHolder" id="classId-C_0001906317303950647748-5" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index d20c58a1..74d0db81 100644
--- a/docs/test_cases/t00026_class.svg
+++ b/docs/test_cases/t00026_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="583px" preserveAspectRatio="none" style="width:690px;height:583px;" version="1.1" viewBox="0 0 690 583" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxe5ew2pzjmr5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1je5y6jj0sv3x" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="94.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="324" y="478"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1je5y6jj0sv3x)" height="94.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="324" y="478"/>
       <ellipse cx="366.45" cy="494" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M369.4188,499.6406 Q368.8406,499.9375 368.2,500.0781 Q367.5594,500.2344 366.8563,500.2344 Q364.3563,500.2344 363.0281,498.5938 Q361.7156,496.9375 361.7156,493.8125 Q361.7156,490.6875 363.0281,489.0313 Q364.3563,487.375 366.8563,487.375 Q367.5594,487.375 368.2,487.5313 Q368.8563,487.6875 369.4188,487.9844 L369.4188,490.7031 Q368.7938,490.125 368.2,489.8594 Q367.6063,489.5781 366.9813,489.5781 Q365.6375,489.5781 364.95,490.6563 Q364.2625,491.7188 364.2625,493.8125 Q364.2625,495.9063 364.95,496.9844 Q365.6375,498.0469 366.9813,498.0469 Q367.6063,498.0469 368.2,497.7813 Q368.7938,497.5 369.4188,496.9219 L369.4188,499.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="386.55" y="498.1543">Memento</text>
@@ -18,31 +18,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="481" y="487.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="510" y2="510"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="516"/>
       <ellipse cx="335" cy="521" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="344" y="524.2104">Memento(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="325" x2="485" y1="530.8047" y2="530.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="536.8047"/>
       <ellipse cx="335" cy="541.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="344" y="545.0151">value() const : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="551.6094" y2="551.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="557.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="332" y="559.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="344" y="565.8198">m_value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="132.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1je5y6jj0sv3x)" height="132.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
       <ellipse cx="513.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M516.2188,289.6406 Q515.6406,289.9375 515,290.0781 Q514.3594,290.2344 513.6563,290.2344 Q511.1563,290.2344 509.8281,288.5938 Q508.5156,286.9375 508.5156,283.8125 Q508.5156,280.6875 509.8281,279.0313 Q511.1563,277.375 513.6563,277.375 Q514.3594,277.375 515,277.5313 Q515.6563,277.6875 516.2188,277.9844 L516.2188,280.7031 Q515.5938,280.125 515,279.8594 Q514.4063,279.5781 513.7813,279.5781 Q512.4375,279.5781 511.75,280.6563 Q511.0625,281.7188 511.0625,283.8125 Q511.0625,285.9063 511.75,286.9844 Q512.4375,288.0469 513.7813,288.0469 Q514.4063,288.0469 515,287.7813 Q515.5938,287.5 516.2188,286.9219 L516.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="533.75" y="288.1543">Originator</text>
@@ -50,52 +50,52 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="671.5" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="306"/>
       <ellipse cx="442.5" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="451.5" y="314.2104">Originator(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="326.8047"/>
       <ellipse cx="442.5" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="451.5" y="335.0151">load(const Memento&lt;T&gt; &amp; m) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="339.6094"/>
       <ellipse cx="442.5" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="451.5" y="347.8198">memoize_value() const : Memento&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="352.4141"/>
       <ellipse cx="442.5" cy="357.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="104" x="451.5" y="360.6245">print() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="365.2188"/>
       <ellipse cx="442.5" cy="370.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="451.5" y="373.4292">set(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="380.0234" y2="380.0234"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="386.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="388.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="394.2339">m_value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="291.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1je5y6jj0sv3x)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="291.5"/>
       <ellipse cx="160.25" cy="307.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.2188,313.1406 Q162.6406,313.4375 162,313.5781 Q161.3594,313.7344 160.6563,313.7344 Q158.1563,313.7344 156.8281,312.0938 Q155.5156,310.4375 155.5156,307.3125 Q155.5156,304.1875 156.8281,302.5313 Q158.1563,300.875 160.6563,300.875 Q161.3594,300.875 162,301.0313 Q162.6563,301.1875 163.2188,301.4844 L163.2188,304.2031 Q162.5938,303.625 162,303.3594 Q161.4063,303.0781 160.7813,303.0781 Q159.4375,303.0781 158.75,304.1563 Q158.0625,305.2188 158.0625,307.3125 Q158.0625,309.4063 158.75,310.4844 Q159.4375,311.5469 160.7813,311.5469 Q161.4063,311.5469 162,311.2813 Q162.5938,311 163.2188,310.4219 L163.2188,313.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="311.6543">Caretaker</text>
@@ -103,30 +103,30 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="300.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="323.5" y2="323.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="329.5"/>
       <ellipse cx="17" cy="334.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="339" x="26" y="337.7104">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="342.3047"/>
       <ellipse cx="17" cy="347.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="259" x="26" y="350.5151">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="357.1094" y2="357.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="363.1094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="365.1094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="371.3198">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1je5y6jj0sv3x)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
       <ellipse cx="254" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M256.9688,180.6406 Q256.3906,180.9375 255.75,181.0781 Q255.1094,181.2344 254.4063,181.2344 Q251.9063,181.2344 250.5781,179.5938 Q249.2656,177.9375 249.2656,174.8125 Q249.2656,171.6875 250.5781,170.0313 Q251.9063,168.375 254.4063,168.375 Q255.1094,168.375 255.75,168.5313 Q256.4063,168.6875 256.9688,168.9844 L256.9688,171.7031 Q256.3438,171.125 255.75,170.8594 Q255.1563,170.5781 254.5313,170.5781 Q253.1875,170.5781 252.5,171.6563 Q251.8125,172.7188 251.8125,174.8125 Q251.8125,176.9063 252.5,177.9844 Q253.1875,179.0469 254.5313,179.0469 Q255.1563,179.0469 255.75,178.7813 Q256.3438,178.5 256.9688,177.9219 L256.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="268" y="179.1543">Caretaker</text>
@@ -135,8 +135,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1je5y6jj0sv3x)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
       <ellipse cx="469" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M471.9688,180.6406 Q471.3906,180.9375 470.75,181.0781 Q470.1094,181.2344 469.4063,181.2344 Q466.9063,181.2344 465.5781,179.5938 Q464.2656,177.9375 464.2656,174.8125 Q464.2656,171.6875 465.5781,170.0313 Q466.9063,168.375 469.4063,168.375 Q470.1094,168.375 470.75,168.5313 Q471.4063,168.6875 471.9688,168.9844 L471.9688,171.7031 Q471.3438,171.125 470.75,170.8594 Q470.1563,170.5781 469.5313,170.5781 Q468.1875,170.5781 467.5,171.6563 Q466.8125,172.7188 466.8125,174.8125 Q466.8125,176.9063 467.5,177.9844 Q468.1875,179.0469 469.5313,179.0469 Q470.1563,179.0469 470.75,178.7813 Q471.3438,178.5 471.9688,177.9219 L471.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="483" y="179.1543">Originator</text>
@@ -145,26 +145,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxe5ew2pzjmr5)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1je5y6jj0sv3x)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
       <ellipse cx="364.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M367.2188,29.6406 Q366.6406,29.9375 366,30.0781 Q365.3594,30.2344 364.6563,30.2344 Q362.1563,30.2344 360.8281,28.5938 Q359.5156,26.9375 359.5156,23.8125 Q359.5156,20.6875 360.8281,19.0313 Q362.1563,17.375 364.6563,17.375 Q365.3594,17.375 366,17.5313 Q366.6563,17.6875 367.2188,17.9844 L367.2188,20.7031 Q366.5938,20.125 366,19.8594 Q365.4063,19.5781 364.7813,19.5781 Q363.4375,19.5781 362.75,20.6563 Q362.0625,21.7188 362.0625,23.8125 Q362.0625,25.9063 362.75,26.9844 Q363.4375,28.0469 364.7813,28.0469 Q365.4063,28.0469 366,27.7813 Q366.5938,27.5 367.2188,26.9219 L367.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="384.75" y="28.1543">StringMemento</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="54"/>
       <ellipse cx="313.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="322.5" y="62.2104">caretaker : Caretaker&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="66.8047"/>
       <ellipse cx="313.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="322.5" y="75.0151">originator : Originator&lt;std::string&gt;</text>
     </a>
     <path d="M502.1,401.16 C483.28,424.97 462.34,451.46 444.73,473.73 " fill="none" id="C_0001324770803720816727-&gt;C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00026_class_mermaid.svg b/docs/test_cases/t00026_class_mermaid.svg
index 91fc675c..d8a96909 100644
--- a/docs/test_cases/t00026_class_mermaid.svg
+++ b/docs/test_cases/t00026_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L8">
+        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L8">
           <g title="Memento" id="classId-C_0001241204213727905390-0" class="node default clickable">
             <rect height="123" width="192.109375" y="-61.5" x="-96.0546875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="96.0546875" x1="-96.0546875" class="divider"/>
@@ -160,7 +160,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21">
+        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001324770803720816727-1" class="node default clickable">
             <rect height="189" width="307.125" y="-94.5" x="-153.5625" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="153.5625" x1="-153.5625" class="divider"/>
@@ -209,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40">
+        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0002032715387182792204-2" class="node default clickable">
             <rect height="123" width="461.4375" y="-61.5" x="-230.71875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="230.71875" x1="-230.71875" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L40">
+        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0001708482137721157489-3" class="node default clickable">
             <rect height="57" width="186.625" y="-28.5" x="-93.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.3125" x1="-93.3125" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L21">
+        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001014247960805363560-4" class="node default clickable">
             <rect height="57" width="190.125" y="-28.5" x="-95.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.0625" x1="-95.0625" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00026/t00026.cc#L53">
+        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00026/t00026.cc#L53">
           <g title="StringMemento" id="classId-C_0000851750942915129289-5" class="node default clickable">
             <rect height="101" width="262.6875" y="-50.5" x="-131.34375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="131.34375" x1="-131.34375" class="divider"/>
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index cc60c721..1810ab78 100644
--- a/docs/test_cases/t00027_class.svg
+++ b/docs/test_cases/t00027_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="398px" preserveAspectRatio="none" style="width:1289px;height:398px;" version="1.1" viewBox="0 0 1289 398" width="1289px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fg3j2j814kxbm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhukkzy6mkmnu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,39 +9,39 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="81.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="310.5" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="81.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="310.5" y="184"/>
       <ellipse cx="401.25" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.3594,195.3438 L400.2031,200.4219 L402.5313,200.4219 L401.3594,195.3438 Z M399.875,193.1094 L402.8594,193.1094 L406.2188,205.5 L403.7656,205.5 L403,202.4375 L399.7188,202.4375 L398.9688,205.5 L396.5313,205.5 L399.875,193.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="421.75" y="204.1543">Shape</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="216" y2="216"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="222"/>
       <ellipse cx="321.5" cy="227" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="330.5" y="230.2104">~Shape() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="311.5" x2="539.5" y1="236.8047" y2="236.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="242.8047"/>
       <ellipse cx="321.5" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="330.5" y="251.0151">display() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="257.6094" y2="257.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="764" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="764" y="33.5"/>
       <ellipse cx="779" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M781.9688,55.1406 Q781.3906,55.4375 780.75,55.5781 Q780.1094,55.7344 779.4063,55.7344 Q776.9063,55.7344 775.5781,54.0938 Q774.2656,52.4375 774.2656,49.3125 Q774.2656,46.1875 775.5781,44.5313 Q776.9063,42.875 779.4063,42.875 Q780.1094,42.875 780.75,43.0313 Q781.4063,43.1875 781.9688,43.4844 L781.9688,46.2031 Q781.3438,45.625 780.75,45.3594 Q780.1563,45.0781 779.5313,45.0781 Q778.1875,45.0781 777.5,46.1563 Q776.8125,47.2188 776.8125,49.3125 Q776.8125,51.4063 777.5,52.4844 Q778.1875,53.5469 779.5313,53.5469 Q780.1563,53.5469 780.75,53.2813 Q781.3438,53 781.9688,52.4219 L781.9688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="793" y="53.6543">Line</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="327"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="327"/>
       <ellipse cx="169.05" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M172.0188,348.6406 Q171.4406,348.9375 170.8,349.0781 Q170.1594,349.2344 169.4563,349.2344 Q166.9563,349.2344 165.6281,347.5938 Q164.3156,345.9375 164.3156,342.8125 Q164.3156,339.6875 165.6281,338.0313 Q166.9563,336.375 169.4563,336.375 Q170.1594,336.375 170.8,336.5313 Q171.4563,336.6875 172.0188,336.9844 L172.0188,339.7031 Q171.3938,339.125 170.8,338.8594 Q170.2063,338.5781 169.5813,338.5781 Q168.2375,338.5781 167.55,339.6563 Q166.8625,340.7188 166.8625,342.8125 Q166.8625,344.9063 167.55,345.9844 Q168.2375,347.0469 169.5813,347.0469 Q170.2063,347.0469 170.8,346.7813 Q171.3938,346.5 172.0188,345.9219 L172.0188,348.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="183.95" y="347.1543">Line</text>
@@ -49,24 +49,24 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="222" y="336.1387">T&lt;&gt;...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="359" y2="359"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="156" y="365"/>
       <ellipse cx="161" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="170" y="373.2104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="379.8047" y2="379.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="943.5" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="943.5" y="33.5"/>
       <ellipse cx="958.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M961.4688,55.1406 Q960.8906,55.4375 960.25,55.5781 Q959.6094,55.7344 958.9063,55.7344 Q956.4063,55.7344 955.0781,54.0938 Q953.7656,52.4375 953.7656,49.3125 Q953.7656,46.1875 955.0781,44.5313 Q956.4063,42.875 958.9063,42.875 Q959.6094,42.875 960.25,43.0313 Q960.9063,43.1875 961.4688,43.4844 L961.4688,46.2031 Q960.8438,45.625 960.25,45.3594 Q959.6563,45.0781 959.0313,45.0781 Q957.6875,45.0781 957,46.1563 Q956.3125,47.2188 956.3125,49.3125 Q956.3125,51.4063 957,52.4844 Q957.6875,53.5469 959.0313,53.5469 Q959.6563,53.5469 960.25,53.2813 Q960.8438,53 961.4688,52.4219 L961.4688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="972.5" y="53.6543">Text</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="592" y="327"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="592" y="327"/>
       <ellipse cx="610.6" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M613.5688,348.6406 Q612.9906,348.9375 612.35,349.0781 Q611.7094,349.2344 611.0063,349.2344 Q608.5063,349.2344 607.1781,347.5938 Q605.8656,345.9375 605.8656,342.8125 Q605.8656,339.6875 607.1781,338.0313 Q608.5063,336.375 611.0063,336.375 Q611.7094,336.375 612.35,336.5313 Q613.0063,336.6875 613.5688,336.9844 L613.5688,339.7031 Q612.9438,339.125 612.35,338.8594 Q611.7563,338.5781 611.1313,338.5781 Q609.7875,338.5781 609.1,339.6563 Q608.4125,340.7188 608.4125,342.8125 Q608.4125,344.9063 609.1,345.9844 Q609.7875,347.0469 611.1313,347.0469 Q611.7563,347.0469 612.35,346.7813 Q612.9438,346.5 613.5688,345.9219 L613.5688,348.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="625.4" y="347.1543">Text</text>
@@ -74,31 +74,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="664" y="336.1387">T&lt;&gt;...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="359" y2="359"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598" y="365"/>
       <ellipse cx="603" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="612" y="373.2104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="379.8047" y2="379.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1081" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1081" y="27"/>
       <ellipse cx="1096" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1096.1094,38.3438 L1094.9531,43.4219 L1097.2813,43.4219 L1096.1094,38.3438 Z M1094.625,36.1094 L1097.6094,36.1094 L1100.9688,48.5 L1098.5156,48.5 L1097.75,45.4375 L1094.4688,45.4375 L1093.7188,48.5 L1091.2813,48.5 L1094.625,36.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1110" y="47.1543">ShapeDecorator</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="59" y2="59"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1087" y="65"/>
       <ellipse cx="1092" cy="70" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="1101" y="73.2104">display() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="79.8047" y2="79.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1022" y="194.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1022" y="194.5"/>
       <ellipse cx="1052.3" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1055.2688,216.1406 Q1054.6906,216.4375 1054.05,216.5781 Q1053.4094,216.7344 1052.7063,216.7344 Q1050.2063,216.7344 1048.8781,215.0938 Q1047.5656,213.4375 1047.5656,210.3125 Q1047.5656,207.1875 1048.8781,205.5313 Q1050.2063,203.875 1052.7063,203.875 Q1053.4094,203.875 1054.05,204.0313 Q1054.7063,204.1875 1055.2688,204.4844 L1055.2688,207.2031 Q1054.6438,206.625 1054.05,206.3594 Q1053.4563,206.0781 1052.8313,206.0781 Q1051.4875,206.0781 1050.8,207.1563 Q1050.1125,208.2188 1050.1125,210.3125 Q1050.1125,212.4063 1050.8,213.4844 Q1051.4875,214.5469 1052.8313,214.5469 Q1053.4563,214.5469 1054.05,214.2813 Q1054.6438,214 1055.2688,213.4219 L1055.2688,216.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1069.7" y="214.6543">Color</text>
@@ -106,16 +106,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1126" y="203.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="226.5" y2="226.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1028" y="232.5"/>
       <ellipse cx="1033" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1042" y="240.7104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="247.3047" y2="247.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1166" y="194.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1166" y="194.5"/>
       <ellipse cx="1191.35" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1194.3188,216.1406 Q1193.7406,216.4375 1193.1,216.5781 Q1192.4594,216.7344 1191.7563,216.7344 Q1189.2563,216.7344 1187.9281,215.0938 Q1186.6156,213.4375 1186.6156,210.3125 Q1186.6156,207.1875 1187.9281,205.5313 Q1189.2563,203.875 1191.7563,203.875 Q1192.4594,203.875 1193.1,204.0313 Q1193.7563,204.1875 1194.3188,204.4844 L1194.3188,207.2031 Q1193.6938,206.625 1193.1,206.3594 Q1192.5063,206.0781 1191.8813,206.0781 Q1190.5375,206.0781 1189.85,207.1563 Q1189.1625,208.2188 1189.1625,210.3125 Q1189.1625,212.4063 1189.85,213.4844 Q1190.5375,214.5469 1191.8813,214.5469 Q1192.5063,214.5469 1193.1,214.2813 Q1193.6938,214 1194.3188,213.4219 L1194.3188,216.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1207.65" y="214.6543">Weight</text>
@@ -123,16 +123,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1270" y="203.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="226.5" y2="226.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1172" y="232.5"/>
       <ellipse cx="1177" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1186" y="240.7104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="247.3047" y2="247.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="201"/>
       <ellipse cx="149" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M151.9688,222.6406 Q151.3906,222.9375 150.75,223.0781 Q150.1094,223.2344 149.4063,223.2344 Q146.9063,223.2344 145.5781,221.5938 Q144.2656,219.9375 144.2656,216.8125 Q144.2656,213.6875 145.5781,212.0313 Q146.9063,210.375 149.4063,210.375 Q150.1094,210.375 150.75,210.5313 Q151.4063,210.6875 151.9688,210.9844 L151.9688,213.7031 Q151.3438,213.125 150.75,212.8594 Q150.1563,212.5781 149.5313,212.5781 Q148.1875,212.5781 147.5,213.6563 Q146.8125,214.7188 146.8125,216.8125 Q146.8125,218.9063 147.5,219.9844 Q148.1875,221.0469 149.5313,221.0469 Q150.1563,221.0469 150.75,220.7813 Q151.3438,220.5 151.9688,219.9219 L151.9688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="221.1543">Line</text>
@@ -141,8 +141,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="201"/>
       <ellipse cx="21" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,222.6406 Q23.3906,222.9375 22.75,223.0781 Q22.1094,223.2344 21.4063,223.2344 Q18.9063,223.2344 17.5781,221.5938 Q16.2656,219.9375 16.2656,216.8125 Q16.2656,213.6875 17.5781,212.0313 Q18.9063,210.375 21.4063,210.375 Q22.1094,210.375 22.75,210.5313 Q23.4063,210.6875 23.9688,210.9844 L23.9688,213.7031 Q23.3438,213.125 22.75,212.8594 Q22.1563,212.5781 21.5313,212.5781 Q20.1875,212.5781 19.5,213.6563 Q18.8125,214.7188 18.8125,216.8125 Q18.8125,218.9063 19.5,219.9844 Q20.1875,221.0469 21.5313,221.0469 Q22.1563,221.0469 22.75,220.7813 Q23.3438,220.5 23.9688,219.9219 L23.9688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="221.1543">Line</text>
@@ -151,8 +151,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="575.5" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="575.5" y="201"/>
       <ellipse cx="590.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M593.4688,222.6406 Q592.8906,222.9375 592.25,223.0781 Q591.6094,223.2344 590.9063,223.2344 Q588.4063,223.2344 587.0781,221.5938 Q585.7656,219.9375 585.7656,216.8125 Q585.7656,213.6875 587.0781,212.0313 Q588.4063,210.375 590.9063,210.375 Q591.6094,210.375 592.25,210.5313 Q592.9063,210.6875 593.4688,210.9844 L593.4688,213.7031 Q592.8438,213.125 592.25,212.8594 Q591.6563,212.5781 591.0313,212.5781 Q589.6875,212.5781 589,213.6563 Q588.3125,214.7188 588.3125,216.8125 Q588.3125,218.9063 589,219.9844 Q589.6875,221.0469 591.0313,221.0469 Q591.6563,221.0469 592.25,220.7813 Q592.8438,220.5 593.4688,219.9219 L593.4688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="604.5" y="221.1543">Text</text>
@@ -161,8 +161,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="752.5" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="752.5" y="201"/>
       <ellipse cx="767.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M770.4688,222.6406 Q769.8906,222.9375 769.25,223.0781 Q768.6094,223.2344 767.9063,223.2344 Q765.4063,223.2344 764.0781,221.5938 Q762.7656,219.9375 762.7656,216.8125 Q762.7656,213.6875 764.0781,212.0313 Q765.4063,210.375 767.9063,210.375 Q768.6094,210.375 769.25,210.5313 Q769.9063,210.6875 770.4688,210.9844 L770.4688,213.7031 Q769.8438,213.125 769.25,212.8594 Q768.6563,212.5781 768.0313,212.5781 Q766.6875,212.5781 766,213.6563 Q765.3125,214.7188 765.3125,216.8125 Q765.3125,218.9063 766,219.9844 Q766.6875,221.0469 768.0313,221.0469 Q768.6563,221.0469 769.25,220.7813 Q769.8438,220.5 770.4688,219.9219 L770.4688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="781.5" y="221.1543">Text</text>
@@ -171,40 +171,40 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg3j2j814kxbm)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="366.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhukkzy6mkmnu)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="366.5" y="8"/>
       <ellipse cx="432.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M435.7188,29.6406 Q435.1406,29.9375 434.5,30.0781 Q433.8594,30.2344 433.1563,30.2344 Q430.6563,30.2344 429.3281,28.5938 Q428.0156,26.9375 428.0156,23.8125 Q428.0156,20.6875 429.3281,19.0313 Q430.6563,17.375 433.1563,17.375 Q433.8594,17.375 434.5,17.5313 Q435.1563,17.6875 435.7188,17.9844 L435.7188,20.7031 Q435.0938,20.125 434.5,19.8594 Q433.9063,19.5781 433.2813,19.5781 Q431.9375,19.5781 431.25,20.6563 Q430.5625,21.7188 430.5625,23.8125 Q430.5625,25.9063 431.25,26.9844 Q431.9375,28.0469 433.2813,28.0469 Q433.9063,28.0469 434.5,27.7813 Q435.0938,27.5 435.7188,26.9219 L435.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="453.25" y="28.1543">Window</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="54"/>
       <ellipse cx="377.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="386.5" y="62.2104">border : Line&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="66.8047"/>
       <ellipse cx="377.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="386.5" y="75.0151">description : Text&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="79.6094"/>
       <ellipse cx="377.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="386.5" y="87.8198">divider : Line&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372.5" y="92.4141"/>
       <ellipse cx="377.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="386.5" y="100.6245">title : Text&lt;Color,Weight&gt;</text>
     </a>
     <path d="M340.09,276.44 C311.19,293.5 279.87,311.99 254.63,326.9 " fill="none" id="C_0001593092483959332221&lt;-C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00027_class_mermaid.svg b/docs/test_cases/t00027_class_mermaid.svg
index c6ff8433..ceb8f209 100644
--- a/docs/test_cases/t00027_class_mermaid.svg
+++ b/docs/test_cases/t00027_class_mermaid.svg
@@ -190,7 +190,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L8">
+        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L8">
           <g title="Shape" id="classId-C_0001593092483959332221-0" class="node default clickable">
             <rect height="123" width="268.484375" y="-61.5" x="-134.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
@@ -219,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15">
+        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0001568932879061562228-1" class="node default clickable">
             <rect height="57" width="47.890625" y="-28.5" x="-23.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.9453125" x1="-23.9453125" class="divider"/>
@@ -238,7 +238,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15">
+        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000142374082478337852-2" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25">
+        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001833467466291294724-3" class="node default clickable">
             <rect height="57" width="46.71875" y="-28.5" x="-23.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.359375" x1="-23.359375" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001114634647721878603-4" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -305,7 +305,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L34">
+        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L34">
           <g title="ShapeDecorator" id="classId-C_0002049188825706164566-5" class="node default clickable">
             <rect height="101" width="138.59375" y="-50.5" x="-69.296875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="69.296875" x1="-69.296875" class="divider"/>
@@ -329,7 +329,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L38">
+        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L38">
           <g title="Color" id="classId-C_0001473536569433029444-6" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -353,7 +353,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L43">
+        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L43">
           <g title="Weight" id="classId-C_0002049455532387561338-7" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -377,7 +377,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15">
+        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0002082936326417164202-8" class="node default clickable">
             <rect height="57" width="164.953125" y="-28.5" x="-82.4765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.4765625" x1="-82.4765625" class="divider"/>
@@ -396,7 +396,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L15">
+        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000675132943535054947-9" class="node default clickable">
             <rect height="57" width="108.359375" y="-28.5" x="-54.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="54.1796875" x1="-54.1796875" class="divider"/>
@@ -415,7 +415,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001678874302644303776-10" class="node default clickable">
             <rect height="57" width="163.765625" y="-28.5" x="-81.8828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.8828125" x1="-81.8828125" class="divider"/>
@@ -434,7 +434,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001887786688778664182-11" class="node default clickable">
             <rect height="57" width="107.171875" y="-28.5" x="-53.5859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="53.5859375" x1="-53.5859375" class="divider"/>
@@ -453,7 +453,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00027/t00027.cc#L48">
+        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00027/t00027.cc#L48">
           <g title="Window" id="classId-C_0001373544984027721472-12" class="node default clickable">
             <rect height="145" width="224.171875" y="-72.5" x="-112.0859375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="112.0859375" x1="-112.0859375" class="divider"/>
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index e7c750d5..bd726d1b 100644
--- a/docs/test_cases/t00028_class.svg
+++ b/docs/test_cases/t00028_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="410px" preserveAspectRatio="none" style="width:1066px;height:410px;" version="1.1" viewBox="0 0 1066 410" width="1066px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1oyr1thx0ty7l" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fm9jfw798xkv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,54 +9,54 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="63.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="63.5" y="226.5"/>
       <ellipse cx="78.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.4688,248.1406 Q80.8906,248.4375 80.25,248.5781 Q79.6094,248.7344 78.9063,248.7344 Q76.4063,248.7344 75.0781,247.0938 Q73.7656,245.4375 73.7656,242.3125 Q73.7656,239.1875 75.0781,237.5313 Q76.4063,235.875 78.9063,235.875 Q79.6094,235.875 80.25,236.0313 Q80.9063,236.1875 81.4688,236.4844 L81.4688,239.2031 Q80.8438,238.625 80.25,238.3594 Q79.6563,238.0781 79.0313,238.0781 Q77.6875,238.0781 77,239.1563 Q76.3125,240.2188 76.3125,242.3125 Q76.3125,244.4063 77,245.4844 Q77.6875,246.5469 79.0313,246.5469 Q79.6563,246.5469 80.25,246.2813 Q80.8438,246 81.4688,245.4219 L81.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="92.5" y="246.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L55.25,89.6328 L80,226.42 L63.25,89.6328 L109,89.6328 A0,0 0 0 0 109,89.6328 L109,74.5 L99,64.5 L6,64.5 A0,0 0 0 0 6,64.5 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L55.25,89.6328 L80,226.42 L63.25,89.6328 L109,89.6328 A0,0 0 0 0 109,89.6328 L109,74.5 L99,64.5 L6,64.5 A0,0 0 0 0 6,64.5 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M99,64.5 L99,74.5 L109,74.5 L99,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="12" y="81.5669">A class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="707.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="707.5" y="226.5"/>
       <ellipse cx="722.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M725.4688,248.1406 Q724.8906,248.4375 724.25,248.5781 Q723.6094,248.7344 722.9063,248.7344 Q720.4063,248.7344 719.0781,247.0938 Q717.7656,245.4375 717.7656,242.3125 Q717.7656,239.1875 719.0781,237.5313 Q720.4063,235.875 722.9063,235.875 Q723.6094,235.875 724.25,236.0313 Q724.9063,236.1875 725.4688,236.4844 L725.4688,239.2031 Q724.8438,238.625 724.25,238.3594 Q723.6563,238.0781 723.0313,238.0781 Q721.6875,238.0781 721,239.1563 Q720.3125,240.2188 720.3125,242.3125 Q720.3125,244.4063 721,245.4844 Q721.6875,246.5469 723.0313,246.5469 Q723.6563,246.5469 724.25,246.2813 Q724.8438,246 725.4688,245.4219 L725.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="736.5" y="246.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M569,238 L569,263.1328 A0,0 0 0 0 569,263.1328 L672,263.1328 A0,0 0 0 0 672,263.1328 L672,256 L707.24,250.5 L672,248 L672,248 L662,238 L569,238 A0,0 0 0 0 569,238 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M569,238 L569,263.1328 A0,0 0 0 0 569,263.1328 L672,263.1328 A0,0 0 0 0 672,263.1328 L672,256 L707.24,250.5 L672,248 L672,248 L662,238 L569,238 A0,0 0 0 0 569,238 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M662,238 L662,248 L672,248 L662,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="575" y="255.0669">B class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="269.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="269.5" y="226.5"/>
       <ellipse cx="284.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M287.4688,248.1406 Q286.8906,248.4375 286.25,248.5781 Q285.6094,248.7344 284.9063,248.7344 Q282.4063,248.7344 281.0781,247.0938 Q279.7656,245.4375 279.7656,242.3125 Q279.7656,239.1875 281.0781,237.5313 Q282.4063,235.875 284.9063,235.875 Q285.6094,235.875 286.25,236.0313 Q286.9063,236.1875 287.4688,236.4844 L287.4688,239.2031 Q286.8438,238.625 286.25,238.3594 Q285.6563,238.0781 285.0313,238.0781 Q283.6875,238.0781 283,239.1563 Q282.3125,240.2188 282.3125,242.3125 Q282.3125,244.4063 283,245.4844 Q283.6875,246.5469 285.0313,246.5469 Q285.6563,246.5469 286.25,246.2813 Q286.8438,246 287.4688,245.4219 L287.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="298.5" y="246.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M182,357 L182,382.1328 A0,0 0 0 0 182,382.1328 L285,382.1328 A0,0 0 0 0 285,382.1328 L285,367 L275,357 L243.08,357 L278.44,274.62 L235.08,357 L182,357 A0,0 0 0 0 182,357 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M182,357 L182,382.1328 A0,0 0 0 0 182,382.1328 L285,382.1328 A0,0 0 0 0 285,382.1328 L285,367 L275,357 L243.08,357 L278.44,274.62 L235.08,357 L182,357 A0,0 0 0 0 182,357 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M275,357 L275,367 L285,367 L275,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="188" y="374.0669">C class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="872" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="872" y="226.5"/>
       <ellipse cx="887" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M889.9688,248.1406 Q889.3906,248.4375 888.75,248.5781 Q888.1094,248.7344 887.4063,248.7344 Q884.9063,248.7344 883.5781,247.0938 Q882.2656,245.4375 882.2656,242.3125 Q882.2656,239.1875 883.5781,237.5313 Q884.9063,235.875 887.4063,235.875 Q888.1094,235.875 888.75,236.0313 Q889.4063,236.1875 889.9688,236.4844 L889.9688,239.2031 Q889.3438,238.625 888.75,238.3594 Q888.1563,238.0781 887.5313,238.0781 Q886.1875,238.0781 885.5,239.1563 Q884.8125,240.2188 884.8125,242.3125 Q884.8125,244.4063 885.5,245.4844 Q886.1875,246.5469 887.5313,246.5469 Q888.1563,246.5469 888.75,246.2813 Q889.3438,246 889.9688,245.4219 L889.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="901" y="246.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M782.5,223 L782.5,278.3984 A0,0 0 0 0 782.5,278.3984 L836.5,278.3984 A0,0 0 0 0 836.5,278.3984 L836.5,254.5 L871.59,250.5 L836.5,246.5 L836.5,233 L826.5,223 L782.5,223 A0,0 0 0 0 782.5,223 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M782.5,223 L782.5,278.3984 A0,0 0 0 0 782.5,278.3984 L836.5,278.3984 A0,0 0 0 0 836.5,278.3984 L836.5,254.5 L871.59,250.5 L836.5,246.5 L836.5,233 L826.5,223 L782.5,223 A0,0 0 0 0 782.5,223 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M826.5,223 L826.5,233 L836.5,233 L826.5,223 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="788.5" y="240.0669">D</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="788.5" y="255.1997">class</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="788.5" y="270.3325">note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="519.5" y="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="519.5" y="339"/>
       <ellipse cx="548.45" cy="355" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4188,360.6406 Q550.8406,360.9375 550.2,361.0781 Q549.5594,361.2344 548.8563,361.2344 Q546.3563,361.2344 545.0281,359.5938 Q543.7156,357.9375 543.7156,354.8125 Q543.7156,351.6875 545.0281,350.0313 Q546.3563,348.375 548.8563,348.375 Q549.5594,348.375 550.2,348.5313 Q550.8563,348.6875 551.4188,348.9844 L551.4188,351.7031 Q550.7938,351.125 550.2,350.8594 Q549.6063,350.5781 548.9813,350.5781 Q547.6375,350.5781 546.95,351.6563 Q546.2625,352.7188 546.2625,354.8125 Q546.2625,356.9063 546.95,357.9844 Q547.6375,359.0469 548.9813,359.0469 Q549.6063,359.0469 550.2,358.7813 Q550.7938,358.5 551.4188,357.9219 L551.4188,360.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="565.55" y="359.1543">E</text>
@@ -65,26 +65,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="371" y2="371"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="379" y2="379"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="525.5" y="385"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="527.5" y="387"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="539.5" y="393.2104">param : T</text>
     </a>
-    <path d="M320.5,357 L320.5,382.1328 A0,0 0 0 0 320.5,382.1328 L484.5,382.1328 A0,0 0 0 0 484.5,382.1328 L484.5,375 L519.28,369.5 L484.5,367 L484.5,367 L474.5,357 L320.5,357 A0,0 0 0 0 320.5,357 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M320.5,357 L320.5,382.1328 A0,0 0 0 0 320.5,382.1328 L484.5,382.1328 A0,0 0 0 0 484.5,382.1328 L484.5,375 L519.28,369.5 L484.5,367 L484.5,367 L474.5,357 L320.5,357 A0,0 0 0 0 320.5,357 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M474.5,357 L474.5,367 L484.5,367 L474.5,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="326.5" y="374.0669">E template class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="397" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="397" y="226.5"/>
       <ellipse cx="412" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M414.9688,248.1406 Q414.3906,248.4375 413.75,248.5781 Q413.1094,248.7344 412.4063,248.7344 Q409.9063,248.7344 408.5781,247.0938 Q407.2656,245.4375 407.2656,242.3125 Q407.2656,239.1875 408.5781,237.5313 Q409.9063,235.875 412.4063,235.875 Q413.1094,235.875 413.75,236.0313 Q414.4063,236.1875 414.9688,236.4844 L414.9688,239.2031 Q414.3438,238.625 413.75,238.3594 Q413.1563,238.0781 412.5313,238.0781 Q411.1875,238.0781 410.5,239.1563 Q409.8125,240.2188 409.8125,242.3125 Q409.8125,244.4063 410.5,245.4844 Q411.1875,246.5469 412.5313,246.5469 Q413.1563,246.5469 413.75,246.2813 Q414.3438,246 414.9688,245.4219 L414.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="426" y="246.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="980.5" y="34"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="980.5" y="34"/>
       <ellipse cx="996.85" cy="50" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1000.9594,56 L993.2406,56 L993.2406,43.6094 L1000.9594,43.6094 L1000.9594,45.7656 L995.6938,45.7656 L995.6938,48.4375 L1000.4594,48.4375 L1000.4594,50.5938 L995.6938,50.5938 L995.6938,53.8438 L1000.9594,53.8438 L1000.9594,56 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1011.15" y="54.1543">F</text>
@@ -94,11 +94,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="986.5" y="105.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="981.5" x2="1021.5" y1="112.4141" y2="112.4141"/>
     </a>
-    <path d="M948.5,238 L948.5,263.1328 A0,0 0 0 0 948.5,263.1328 L1054.5,263.1328 A0,0 0 0 0 1054.5,263.1328 L1054.5,248 L1044.5,238 L1005.5,238 L1001.5,120.39 L997.5,238 L948.5,238 A0,0 0 0 0 948.5,238 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M948.5,238 L948.5,263.1328 A0,0 0 0 0 948.5,263.1328 L1054.5,263.1328 A0,0 0 0 0 1054.5,263.1328 L1054.5,248 L1044.5,238 L1005.5,238 L1001.5,120.39 L997.5,238 L948.5,238 A0,0 0 0 0 948.5,238 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1044.5,238 L1044.5,248 L1054.5,248 L1044.5,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="954.5" y="255.0669">F enum note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="473.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="473.5" y="226.5"/>
       <ellipse cx="488.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M491.4688,248.1406 Q490.8906,248.4375 490.25,248.5781 Q489.6094,248.7344 488.9063,248.7344 Q486.4063,248.7344 485.0781,247.0938 Q483.7656,245.4375 483.7656,242.3125 Q483.7656,239.1875 485.0781,237.5313 Q486.4063,235.875 488.9063,235.875 Q489.6094,235.875 490.25,236.0313 Q490.9063,236.1875 491.4688,236.4844 L491.4688,239.2031 Q490.8438,238.625 490.25,238.3594 Q489.6563,238.0781 489.0313,238.0781 Q487.6875,238.0781 487,239.1563 Q486.3125,240.2188 486.3125,242.3125 Q486.3125,244.4063 487,245.4844 Q487.6875,246.5469 489.0313,246.5469 Q489.6563,246.5469 490.25,246.2813 Q490.8438,246 491.4688,245.4219 L491.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.5" y="246.6543">E</text>
@@ -107,70 +107,70 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1oyr1thx0ty7l)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="377.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fm9jfw798xkv)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="377.5" y="8"/>
       <ellipse cx="495.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M498.2188,29.6406 Q497.6406,29.9375 497,30.0781 Q496.3594,30.2344 495.6563,30.2344 Q493.1563,30.2344 491.8281,28.5938 Q490.5156,26.9375 490.5156,23.8125 Q490.5156,20.6875 491.8281,19.0313 Q493.1563,17.375 495.6563,17.375 Q496.3594,17.375 497,17.5313 Q497.6563,17.6875 498.2188,17.9844 L498.2188,20.7031 Q497.5938,20.125 497,19.8594 Q496.4063,19.5781 495.7813,19.5781 Q494.4375,19.5781 493.75,20.6563 Q493.0625,21.7188 493.0625,23.8125 Q493.0625,25.9063 493.75,26.9844 Q494.4375,28.0469 495.7813,28.0469 Q496.4063,28.0469 497,27.7813 Q497.5938,27.5 498.2188,26.9219 L498.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="515.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="46"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="397.5" y="54.2104">R(C &amp; c) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="397.5" y="75.0151">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="397.5" y="87.8198">bbb : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="397.5" y="100.6245">ccc : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="397.5" y="113.4292">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="118.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="120.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="397.5" y="126.2339">eee : E&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="130.8281"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="132.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="397.5" y="139.0386">ggg : G **</text>
     </a>
-    <path d="M664.5,64.5 L664.5,73 L629.79,77 L664.5,81 L664.5,89.6328 A0,0 0 0 0 664.5,89.6328 L766.5,89.6328 A0,0 0 0 0 766.5,89.6328 L766.5,74.5 L756.5,64.5 L664.5,64.5 A0,0 0 0 0 664.5,64.5 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M664.5,64.5 L664.5,73 L629.79,77 L664.5,81 L664.5,89.6328 A0,0 0 0 0 664.5,89.6328 L766.5,89.6328 A0,0 0 0 0 766.5,89.6328 L766.5,74.5 L756.5,64.5 L664.5,64.5 A0,0 0 0 0 664.5,64.5 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M756.5,64.5 L756.5,74.5 L766.5,74.5 L756.5,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="670.5" y="81.5669">R class note.</text>
-    <path d="M144.5,42 L144.5,67.1328 A0,0 0 0 0 144.5,67.1328 L342.5,67.1328 A0,0 0 0 0 342.5,67.1328 L342.5,60 L381.5,71.207 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M144.5,42 L144.5,67.1328 A0,0 0 0 0 144.5,67.1328 L342.5,67.1328 A0,0 0 0 0 342.5,67.1328 L342.5,60 L381.5,71.207 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M332.5,42 L332.5,52 L342.5,52 L332.5,42 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="177" x="150.5" y="59.0669">R contains an instance of A.</text>
-    <path d="M144.5,77.1328 L144.5,102.2656 A0,0 0 0 0 144.5,102.2656 L263.5,102.2656 A0,0 0 0 0 263.5,102.2656 L263.5,95.1328 L381.5,96.8164 L263.5,87.1328 L263.5,87.1328 L253.5,77.1328 L144.5,77.1328 A0,0 0 0 0 144.5,77.1328 " fill="#FBFB77" filter="url(#f1oyr1thx0ty7l)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M144.5,77.1328 L144.5,102.2656 A0,0 0 0 0 144.5,102.2656 L263.5,102.2656 A0,0 0 0 0 263.5,102.2656 L263.5,95.1328 L381.5,96.8164 L263.5,87.1328 L263.5,87.1328 L253.5,77.1328 L144.5,77.1328 A0,0 0 0 0 144.5,77.1328 " fill="#FBFB77" filter="url(#fm9jfw798xkv)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M253.5,77.1328 L253.5,87.1328 L263.5,87.1328 L253.5,77.1328 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="150.5" y="94.1997">Reference to C.</text>
     <path d="M514.76,274.62 C521.16,287.75 529.42,304.71 537.16,320.59 " fill="none" id="C_0001949673179441298667-&gt;C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00028_class_mermaid.svg b/docs/test_cases/t00028_class_mermaid.svg
index 0daf7d52..bf01c53f 100644
--- a/docs/test_cases/t00028_class_mermaid.svg
+++ b/docs/test_cases/t00028_class_mermaid.svg
@@ -218,7 +218,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L8">
+        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L8">
           <g title="A" id="classId-C_0001519850480962783588-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -237,7 +237,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L11">
+        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L11">
           <g title="B" id="classId-C_0001980597091567213070-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -256,7 +256,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L16">
+        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L16">
           <g title="C" id="classId-C_0000984577258575112753-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -275,7 +275,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L22">
+        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L22">
           <g title="D" id="classId-C_0001263778658518784070-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -294,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001014136565447389473-4" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -318,7 +318,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L30">
+        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L30">
           <g title="G" id="classId-C_0000764713728396057122-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -337,7 +337,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L33">
+        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L33">
           <g title="F" id="classId-C_0000589227897266388677-6" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -371,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001949673179441298667-7" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -390,7 +390,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00028/t00028.cc#L36">
+        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00028/t00028.cc#L36">
           <g title="R" id="classId-C_0001189142882239313116-8" class="node default clickable">
             <rect height="211" width="289.828125" y="-105.5" x="-144.9140625" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="144.9140625" x1="-144.9140625" class="divider"/>
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index e92ca254..85a7e9e7 100644
--- a/docs/test_cases/t00029_class.svg
+++ b/docs/test_cases/t00029_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="268px" preserveAspectRatio="none" style="width:501px;height:268px;" version="1.1" viewBox="0 0 501 268" width="501px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2kmotld7n70" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1v7pnm8kya80s" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="27"/>
       <ellipse cx="22" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M24.9688,48.6406 Q24.3906,48.9375 23.75,49.0781 Q23.1094,49.2344 22.4063,49.2344 Q19.9063,49.2344 18.5781,47.5938 Q17.2656,45.9375 17.2656,42.8125 Q17.2656,39.6875 18.5781,38.0313 Q19.9063,36.375 22.4063,36.375 Q23.1094,36.375 23.75,36.5313 Q24.4063,36.6875 24.9688,36.9844 L24.9688,39.7031 Q24.3438,39.125 23.75,38.8594 Q23.1563,38.5781 22.5313,38.5781 Q21.1875,38.5781 20.5,39.6563 Q19.8125,40.7188 19.8125,42.8125 Q19.8125,44.9063 20.5,45.9844 Q21.1875,47.0469 22.5313,47.0469 Q23.1563,47.0469 23.75,46.7813 Q24.3438,46.5 24.9688,45.9219 L24.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="47.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="82" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="82" y="20.5"/>
       <ellipse cx="110.95" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M113.9188,42.1406 Q113.3406,42.4375 112.7,42.5781 Q112.0594,42.7344 111.3563,42.7344 Q108.8563,42.7344 107.5281,41.0938 Q106.2156,39.4375 106.2156,36.3125 Q106.2156,33.1875 107.5281,31.5313 Q108.8563,29.875 111.3563,29.875 Q112.0594,29.875 112.7,30.0313 Q113.3563,30.1875 113.9188,30.4844 L113.9188,33.2031 Q113.2938,32.625 112.7,32.3594 Q112.1063,32.0781 111.4813,32.0781 Q110.1375,32.0781 109.45,33.1563 Q108.7625,34.2188 108.7625,36.3125 Q108.7625,38.4063 109.45,39.4844 Q110.1375,40.5469 111.4813,40.5469 Q112.1063,40.5469 112.7,40.2813 Q113.2938,40 113.9188,39.4219 L113.9188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="128.05" y="40.6543">C</text>
@@ -27,30 +27,30 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="83" x2="163" y1="52.5" y2="52.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="83" x2="163" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="88" y="66.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="90" y="68.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="102" y="74.7104">param : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="60.8047" id="C_0001496914969429483234" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="199" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="60.8047" id="C_0001496914969429483234" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="199" y="20.5"/>
       <ellipse cx="232.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.4188,42.1406 Q234.8406,42.4375 234.2,42.5781 Q233.5594,42.7344 232.8563,42.7344 Q230.3563,42.7344 229.0281,41.0938 Q227.7156,39.4375 227.7156,36.3125 Q227.7156,33.1875 229.0281,31.5313 Q230.3563,29.875 232.8563,29.875 Q233.5594,29.875 234.2,30.0313 Q234.8563,30.1875 235.4188,30.4844 L235.4188,33.2031 Q234.7938,32.625 234.2,32.3594 Q233.6063,32.0781 232.9813,32.0781 Q231.6375,32.0781 230.95,33.1563 Q230.2625,34.2188 230.2625,36.3125 Q230.2625,38.4063 230.95,39.4844 Q231.6375,40.5469 232.9813,40.5469 Q233.6063,40.5469 234.2,40.2813 Q234.7938,40 235.4188,39.4219 L235.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="250.55" y="40.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="200" x2="280" y1="52.5" y2="52.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="200" x2="280" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="205" y="66.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="207" y="68.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="219" y="74.7104">param : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="6" y="171"/>
       <ellipse cx="21.9" cy="187" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.0094,193 L18.2906,193 L18.2906,180.6094 L26.0094,180.6094 L26.0094,182.7656 L20.7438,182.7656 L20.7438,185.4375 L25.5094,185.4375 L25.5094,187.5938 L20.7438,187.5938 L20.7438,190.8438 L26.0094,190.8438 L26.0094,193 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36.1" y="191.1543">E</text>
@@ -60,65 +60,65 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="12" y="242.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="47" y1="249.4141" y2="249.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="336.5" y="190"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="336.5" y="190"/>
       <ellipse cx="351.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M354.4688,211.6406 Q353.8906,211.9375 353.25,212.0781 Q352.6094,212.2344 351.9063,212.2344 Q349.4063,212.2344 348.0781,210.5938 Q346.7656,208.9375 346.7656,205.8125 Q346.7656,202.6875 348.0781,201.0313 Q349.4063,199.375 351.9063,199.375 Q352.6094,199.375 353.25,199.5313 Q353.9063,199.6875 354.4688,199.9844 L354.4688,202.7031 Q353.8438,202.125 353.25,201.8594 Q352.6563,201.5781 352.0313,201.5781 Q350.6875,201.5781 350,202.6563 Q349.3125,203.7188 349.3125,205.8125 Q349.3125,207.9063 350,208.9844 Q350.6875,210.0469 352.0313,210.0469 Q352.6563,210.0469 353.25,209.7813 Q353.8438,209.5 354.4688,208.9219 L354.4688,211.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="365.5" y="210.1543">G1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="384.5" y1="222" y2="222"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="384.5" y1="230" y2="230"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="83.5" y="190"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="83.5" y="190"/>
       <ellipse cx="98.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.4688,211.6406 Q100.8906,211.9375 100.25,212.0781 Q99.6094,212.2344 98.9063,212.2344 Q96.4063,212.2344 95.0781,210.5938 Q93.7656,208.9375 93.7656,205.8125 Q93.7656,202.6875 95.0781,201.0313 Q96.4063,199.375 98.9063,199.375 Q99.6094,199.375 100.25,199.5313 Q100.9063,199.6875 101.4688,199.9844 L101.4688,202.7031 Q100.8438,202.125 100.25,201.8594 Q99.6563,201.5781 99.0313,201.5781 Q97.6875,201.5781 97,202.6563 Q96.3125,203.7188 96.3125,205.8125 Q96.3125,207.9063 97,208.9844 Q97.6875,210.0469 99.0313,210.0469 Q99.6563,210.0469 100.25,209.7813 Q100.8438,209.5 101.4688,208.9219 L101.4688,211.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="112.5" y="210.1543">G2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="84.5" x2="131.5" y1="222" y2="222"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="84.5" x2="131.5" y1="230" y2="230"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="167.5" y="190"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="167.5" y="190"/>
       <ellipse cx="182.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M185.4688,211.6406 Q184.8906,211.9375 184.25,212.0781 Q183.6094,212.2344 182.9063,212.2344 Q180.4063,212.2344 179.0781,210.5938 Q177.7656,208.9375 177.7656,205.8125 Q177.7656,202.6875 179.0781,201.0313 Q180.4063,199.375 182.9063,199.375 Q183.6094,199.375 184.25,199.5313 Q184.9063,199.6875 185.4688,199.9844 L185.4688,202.7031 Q184.8438,202.125 184.25,201.8594 Q183.6563,201.5781 183.0313,201.5781 Q181.6875,201.5781 181,202.6563 Q180.3125,203.7188 180.3125,205.8125 Q180.3125,207.9063 181,208.9844 Q181.6875,210.0469 183.0313,210.0469 Q183.6563,210.0469 184.25,209.7813 Q184.8438,209.5 185.4688,208.9219 L185.4688,211.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="196.5" y="210.1543">G3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="168.5" x2="215.5" y1="222" y2="222"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="168.5" x2="215.5" y1="230" y2="230"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="420.5" y="190"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="420.5" y="190"/>
       <ellipse cx="435.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M438.4688,211.6406 Q437.8906,211.9375 437.25,212.0781 Q436.6094,212.2344 435.9063,212.2344 Q433.4063,212.2344 432.0781,210.5938 Q430.7656,208.9375 430.7656,205.8125 Q430.7656,202.6875 432.0781,201.0313 Q433.4063,199.375 435.9063,199.375 Q436.6094,199.375 437.25,199.5313 Q437.9063,199.6875 438.4688,199.9844 L438.4688,202.7031 Q437.8438,202.125 437.25,201.8594 Q436.6563,201.5781 436.0313,201.5781 Q434.6875,201.5781 434,202.6563 Q433.3125,203.7188 433.3125,205.8125 Q433.3125,207.9063 434,208.9844 Q434.6875,210.0469 436.0313,210.0469 Q436.6563,210.0469 437.25,209.7813 Q437.8438,209.5 438.4688,208.9219 L438.4688,211.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="449.5" y="210.1543">G4</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="421.5" x2="468.5" y1="222" y2="222"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="421.5" x2="468.5" y1="230" y2="230"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2kmotld7n70)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="316" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v7pnm8kya80s)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="316" 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="317" x2="489" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="317" x2="489" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="54"/>
       <ellipse cx="327" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="336" y="62.2104">g1 : G1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="66.8047"/>
       <ellipse cx="327" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="336" y="75.0151">g3 : G3 &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="322" y="79.6094"/>
       <ellipse cx="327" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="336" y="87.8198">g4 : std::shared_ptr&lt;G4&gt;</text>
     </a>
     <path d="M377.56,106.71 C375.45,112.47 373.54,118.3 372,124 C366.05,145.94 363.31,171.8 362.05,189.98 " fill="none" id="C_0000348749731659902910&lt;-C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00029_class_mermaid.svg b/docs/test_cases/t00029_class_mermaid.svg
index 6687ad63..c42d14d5 100644
--- a/docs/test_cases/t00029_class_mermaid.svg
+++ b/docs/test_cases/t00029_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L7">
+        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L7">
           <g title="A" id="classId-C_0001970994826766369014-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -97,7 +97,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L12">
+        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L12">
           <g title="C" id="classId-C_0000543766389270348470-1" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -121,7 +121,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.3125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L17">
+        <a transform="translate(267.3125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L17">
           <g title="D" id="classId-C_0001496914969429483234-2" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -145,7 +145,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(422.4375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L21">
+        <a transform="translate(422.4375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L21">
           <g title="E" id="classId-C_0001936873082456592219-3" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -179,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L26">
+        <a transform="translate(763.9453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L26">
           <g title="G1" id="classId-C_0001980718063838190763-4" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -198,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(551.484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L28">
+        <a transform="translate(551.484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L28">
           <g title="G2" id="classId-C_0002204627213593766591-5" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -217,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(637.828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L30">
+        <a transform="translate(637.828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L30">
           <g title="G3" id="classId-C_0000767180516665070631-6" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -236,7 +236,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(850.2890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L32">
+        <a transform="translate(850.2890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L32">
           <g title="G4" id="classId-C_0000715074622924270214-7" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -255,7 +255,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(807.1171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00029/t00029.cc#L34">
+        <a transform="translate(807.1171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00029/t00029.cc#L34">
           <g title="R" id="classId-C_0000348749731659902910-8" class="node default clickable">
             <rect height="123" width="202.234375" y="-61.5" x="-101.1171875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="101.1171875" x1="-101.1171875" class="divider"/>
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index 6b46e951..05447bc2 100644
--- a/docs/test_cases/t00030_class.svg
+++ b/docs/test_cases/t00030_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:366px;height:256px;" version="1.1" viewBox="0 0 366 256" width="366px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fgi6faca77s8z" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1iqbcmth2se3l" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,87 +9,87 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1iqbcmth2se3l)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1iqbcmth2se3l)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
       <ellipse cx="99" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.9688,218.6406 Q101.3906,218.9375 100.75,219.0781 Q100.1094,219.2344 99.4063,219.2344 Q96.9063,219.2344 95.5781,217.5938 Q94.2656,215.9375 94.2656,212.8125 Q94.2656,209.6875 95.5781,208.0313 Q96.9063,206.375 99.4063,206.375 Q100.1094,206.375 100.75,206.5313 Q101.4063,206.6875 101.9688,206.9844 L101.9688,209.7031 Q101.3438,209.125 100.75,208.8594 Q100.1563,208.5781 99.5313,208.5781 Q98.1875,208.5781 97.5,209.6563 Q96.8125,210.7188 96.8125,212.8125 Q96.8125,214.9063 97.5,215.9844 Q98.1875,217.0469 99.5313,217.0469 Q100.1563,217.0469 100.75,216.7813 Q101.3438,216.5 101.9688,215.9219 L101.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1iqbcmth2se3l)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
       <ellipse cx="176" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,218.6406 Q178.3906,218.9375 177.75,219.0781 Q177.1094,219.2344 176.4063,219.2344 Q173.9063,219.2344 172.5781,217.5938 Q171.2656,215.9375 171.2656,212.8125 Q171.2656,209.6875 172.5781,208.0313 Q173.9063,206.375 176.4063,206.375 Q177.1094,206.375 177.75,206.5313 Q178.4063,206.6875 178.9688,206.9844 L178.9688,209.7031 Q178.3438,209.125 177.75,208.8594 Q177.1563,208.5781 176.5313,208.5781 Q175.1875,208.5781 174.5,209.6563 Q173.8125,210.7188 173.8125,212.8125 Q173.8125,214.9063 174.5,215.9844 Q175.1875,217.0469 176.5313,217.0469 Q177.1563,217.0469 177.75,216.7813 Q178.3438,216.5 178.9688,215.9219 L178.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1iqbcmth2se3l)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
       <ellipse cx="251.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M254.4688,218.6406 Q253.8906,218.9375 253.25,219.0781 Q252.6094,219.2344 251.9063,219.2344 Q249.4063,219.2344 248.0781,217.5938 Q246.7656,215.9375 246.7656,212.8125 Q246.7656,209.6875 248.0781,208.0313 Q249.4063,206.375 251.9063,206.375 Q252.6094,206.375 253.25,206.5313 Q253.9063,206.6875 254.4688,206.9844 L254.4688,209.7031 Q253.8438,209.125 253.25,208.8594 Q252.6563,208.5781 252.0313,208.5781 Q250.6875,208.5781 250,209.6563 Q249.3125,210.7188 249.3125,212.8125 Q249.3125,214.9063 250,215.9844 Q250.6875,217.0469 252.0313,217.0469 Q252.6563,217.0469 253.25,216.7813 Q253.8438,216.5 254.4688,215.9219 L254.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="265.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1iqbcmth2se3l)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
       <ellipse cx="330" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M332.9688,218.6406 Q332.3906,218.9375 331.75,219.0781 Q331.1094,219.2344 330.4063,219.2344 Q327.9063,219.2344 326.5781,217.5938 Q325.2656,215.9375 325.2656,212.8125 Q325.2656,209.6875 326.5781,208.0313 Q327.9063,206.375 330.4063,206.375 Q331.1094,206.375 331.75,206.5313 Q332.4063,206.6875 332.9688,206.9844 L332.9688,209.7031 Q332.3438,209.125 331.75,208.8594 Q331.1563,208.5781 330.5313,208.5781 Q329.1875,208.5781 328.5,209.6563 Q327.8125,210.7188 327.8125,212.8125 Q327.8125,214.9063 328.5,215.9844 Q329.1875,217.0469 330.5313,217.0469 Q331.1563,217.0469 331.75,216.7813 Q332.3438,216.5 332.9688,215.9219 L332.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="344" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgi6faca77s8z)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1iqbcmth2se3l)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
       <ellipse cx="173.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M176.7188,29.6406 Q176.1406,29.9375 175.5,30.0781 Q174.8594,30.2344 174.1563,30.2344 Q171.6563,30.2344 170.3281,28.5938 Q169.0156,26.9375 169.0156,23.8125 Q169.0156,20.6875 170.3281,19.0313 Q171.6563,17.375 174.1563,17.375 Q174.8594,17.375 175.5,17.5313 Q176.1563,17.6875 176.7188,17.9844 L176.7188,20.7031 Q176.0938,20.125 175.5,19.8594 Q174.9063,19.5781 174.2813,19.5781 Q172.9375,19.5781 172.25,20.6563 Q171.5625,21.7188 171.5625,23.8125 Q171.5625,25.9063 172.25,26.9844 Q172.9375,28.0469 174.2813,28.0469 Q174.9063,28.0469 175.5,27.7813 Q176.0938,27.5 176.7188,26.9219 L176.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="194.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="54"/>
       <ellipse cx="120" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="129" y="62.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="66.8047"/>
       <ellipse cx="120" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="129" y="75.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="79.6094"/>
       <ellipse cx="120" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="117" x="129" y="87.8198">ccc : std::vector&lt;C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="92.4141"/>
       <ellipse cx="120" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="129" y="100.6245">ddd : D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="105.2188"/>
       <ellipse cx="120" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="129" y="113.4292">eee : E *</text>
     </a>
     <path d="M111.59,120.19 C100.65,129.74 89.75,139.87 80,150 C67.26,163.23 54.64,179.38 44.8,192.83 " fill="none" id="C_0000263468735940481091-&gt;C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00030_class_mermaid.svg b/docs/test_cases/t00030_class_mermaid.svg
index 1e97b1d1..6a7535c7 100644
--- a/docs/test_cases/t00030_class_mermaid.svg
+++ b/docs/test_cases/t00030_class_mermaid.svg
@@ -164,7 +164,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L7">
+        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L7">
           <g title="A" id="classId-C_0000064769484767514424-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -183,7 +183,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L9">
+        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L9">
           <g title="B" id="classId-C_0000156923198106222307-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -202,7 +202,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L11">
+        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L11">
           <g title="C" id="classId-C_0001651557398557662399-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -221,7 +221,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L13">
+        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L13">
           <g title="D" id="classId-C_0001089781072752262158-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -240,7 +240,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L15">
+        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L15">
           <g title="E" id="classId-C_0000425964641881054607-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -259,7 +259,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00030/t00030.cc#L17">
+        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00030/t00030.cc#L17">
           <g title="R" id="classId-C_0000263468735940481091-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index 124465ef..45208e98 100644
--- a/docs/test_cases/t00031_class.svg
+++ b/docs/test_cases/t00031_class.svg
@@ -1,33 +1,33 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="415px" preserveAspectRatio="none" style="width:353px;height:415px;" version="1.1" viewBox="0 0 353 415" width="353px" zoomAndPan="magnify">
   <defs>
-    <linearGradient id="g1w9w99rpyeptj0" x1="0%" x2="100%" y1="50%" y2="50%">
+    <linearGradient id="g14f0acf9y66a50" 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="f1w9w99rpyeptj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f14f0acf9y66a5" 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="g1w9w99rpyeptj1" x1="0%" x2="100%" y1="0%" y2="100%">
+    <linearGradient id="g14f0acf9y66a51" x1="0%" x2="100%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#0000FF"/>
       <stop offset="100%" stop-color="#FF0000"/>
     </linearGradient>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="url(#g1w9w99rpyeptj0)" filter="url(#f1w9w99rpyeptj)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
-      <rect fill="url(#g1w9w99rpyeptj1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="url(#g14f0acf9y66a50)" filter="url(#f14f0acf9y66a5)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
+      <rect fill="url(#g14f0acf9y66a51)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
       <ellipse cx="21" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,237.6406 Q23.3906,237.9375 22.75,238.0781 Q22.1094,238.2344 21.4063,238.2344 Q18.9063,238.2344 17.5781,236.5938 Q16.2656,234.9375 16.2656,231.8125 Q16.2656,228.6875 17.5781,227.0313 Q18.9063,225.375 21.4063,225.375 Q22.1094,225.375 22.75,225.5313 Q23.4063,225.6875 23.9688,225.9844 L23.9688,228.7031 Q23.3438,228.125 22.75,227.8594 Q22.1563,227.5781 21.5313,227.5781 Q20.1875,227.5781 19.5,228.6563 Q18.8125,229.7188 18.8125,231.8125 Q18.8125,233.9063 19.5,234.9844 Q20.1875,236.0469 21.5313,236.0469 Q22.1563,236.0469 22.75,235.7813 Q23.3438,235.5 23.9688,234.9219 L23.9688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="236.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w9w99rpyeptj)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="103" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14f0acf9y66a5)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="103" y="197"/>
       <ellipse cx="118.9" cy="213" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M123.0094,219 L115.2906,219 L115.2906,206.6094 L123.0094,206.6094 L123.0094,208.7656 L117.7438,208.7656 L117.7438,211.4375 L122.5094,211.4375 L122.5094,213.5938 L117.7438,213.5938 L117.7438,216.8438 L123.0094,216.8438 L123.0094,219 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="133.1" y="217.1543">B</text>
@@ -37,8 +37,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="109" y="268.8198">three</text>
       <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="104" x2="144" y1="275.4141" y2="275.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FFC0CB" filter="url(#f1w9w99rpyeptj)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FFC0CB" filter="url(#f14f0acf9y66a5)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
       <rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
       <ellipse cx="298.2" cy="360" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/>
       <path d="M301.1688,365.6406 Q300.5906,365.9375 299.95,366.0781 Q299.3094,366.2344 298.6063,366.2344 Q296.1063,366.2344 294.7781,364.5938 Q293.4656,362.9375 293.4656,359.8125 Q293.4656,356.6875 294.7781,355.0313 Q296.1063,353.375 298.6063,353.375 Q299.3094,353.375 299.95,353.5313 Q300.6063,353.6875 301.1688,353.9844 L301.1688,356.7031 Q300.5438,356.125 299.95,355.8594 Q299.3563,355.5781 298.7313,355.5781 Q297.3875,355.5781 296.7,356.6563 Q296.0125,357.7188 296.0125,359.8125 Q296.0125,361.9063 296.7,362.9844 Q297.3875,364.0469 298.7313,364.0469 Q299.3563,364.0469 299.95,363.7813 Q300.5438,363.5 301.1688,362.9219 L301.1688,365.6406 Z "/>
@@ -48,23 +48,23 @@
       <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="376" y2="376"/>
       <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="384" y2="384"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <rect fill="#FFC0CB" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="390"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="288.5" y="392"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="300.5" y="398.2104">ttt : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w9w99rpyeptj)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="202.5" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14f0acf9y66a5)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="202.5" y="216"/>
       <ellipse cx="217.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M220.4688,237.6406 Q219.8906,237.9375 219.25,238.0781 Q218.6094,238.2344 217.9063,238.2344 Q215.4063,238.2344 214.0781,236.5938 Q212.7656,234.9375 212.7656,231.8125 Q212.7656,228.6875 214.0781,227.0313 Q215.4063,225.375 217.9063,225.375 Q218.6094,225.375 219.25,225.5313 Q219.9063,225.6875 220.4688,225.9844 L220.4688,228.7031 Q219.8438,228.125 219.25,227.8594 Q218.6563,227.5781 218.0313,227.5781 Q216.6875,227.5781 216,228.6563 Q215.3125,229.7188 215.3125,231.8125 Q215.3125,233.9063 216,234.9844 Q216.6875,236.0469 218.0313,236.0469 Q218.6563,236.0469 219.25,235.7813 Q219.8438,235.5 220.4688,234.9219 L220.4688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="231.5" y="236.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w9w99rpyeptj)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="279" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14f0acf9y66a5)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="279" y="216"/>
       <ellipse cx="294" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M296.9688,237.6406 Q296.3906,237.9375 295.75,238.0781 Q295.1094,238.2344 294.4063,238.2344 Q291.9063,238.2344 290.5781,236.5938 Q289.2656,234.9375 289.2656,231.8125 Q289.2656,228.6875 290.5781,227.0313 Q291.9063,225.375 294.4063,225.375 Q295.1094,225.375 295.75,225.5313 Q296.4063,225.6875 296.9688,225.9844 L296.9688,228.7031 Q296.3438,228.125 295.75,227.8594 Q295.1563,227.5781 294.5313,227.5781 Q293.1875,227.5781 292.5,228.6563 Q291.8125,229.7188 291.8125,231.8125 Q291.8125,233.9063 292.5,234.9844 Q293.1875,236.0469 294.5313,236.0469 Q295.1563,236.0469 295.75,235.7813 Q296.3438,235.5 296.9688,234.9219 L296.9688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="308" y="236.1543">C</text>
@@ -73,47 +73,47 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w9w99rpyeptj)" height="112.0234" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="72" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14f0acf9y66a5)" height="112.0234" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="72" y="8"/>
       <ellipse cx="136.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M139.7188,29.6406 Q139.1406,29.9375 138.5,30.0781 Q137.8594,30.2344 137.1563,30.2344 Q134.6563,30.2344 133.3281,28.5938 Q132.0156,26.9375 132.0156,23.8125 Q132.0156,20.6875 133.3281,19.0313 Q134.6563,17.375 137.1563,17.375 Q137.8594,17.375 138.5,17.5313 Q139.1563,17.6875 139.7188,17.9844 L139.7188,20.7031 Q139.0938,20.125 138.5,19.8594 Q137.9063,19.5781 137.2813,19.5781 Q135.9375,19.5781 135.25,20.6563 Q134.5625,21.7188 134.5625,23.8125 Q134.5625,25.9063 135.25,26.9844 Q135.9375,28.0469 137.2813,28.0469 Q137.9063,28.0469 138.5,27.7813 Q139.0938,27.5 139.7188,26.9219 L139.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="46"/>
       <ellipse cx="83" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="92" y="54.2104">add_b(B b) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="66.8047"/>
       <ellipse cx="83" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="92" y="75.0151">aaa : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="79.6094"/>
       <ellipse cx="83" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="92" y="87.8198">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="92.4141"/>
       <ellipse cx="83" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="92" y="100.6245">ccc : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="105.2188"/>
       <ellipse cx="83" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="92" y="113.4292">ddd : D *</text>
     </a>
     <path d="M309,264.08 C309,280.48 309,303.13 309,323.57 " fill="none" id="C_0000208700529175860645-&gt;C_0000116209144733282955" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00031_class_mermaid.svg b/docs/test_cases/t00031_class_mermaid.svg
index 8094d804..47698726 100644
--- a/docs/test_cases/t00031_class_mermaid.svg
+++ b/docs/test_cases/t00031_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L8">
+        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L8">
           <g title="A" id="classId-C_0000847775539502907247-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -145,7 +145,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L11">
+        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L11">
           <g title="B" id="classId-C_0001441796358326382179-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -179,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000116209144733282955-2" class="node default clickable">
             <rect height="79" width="56.484375" y="-39.5" x="-28.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.2421875" x1="-28.2421875" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L18">
+        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L18">
           <g title="D" id="classId-C_0002266534344475505157-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000208700529175860645-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00031/t00031.cc#L20">
+        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00031/t00031.cc#L20">
           <g title="R" id="classId-C_0000484712092364868032-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index 82e2a80d..98a845a5 100644
--- a/docs/test_cases/t00032_class.svg
+++ b/docs/test_cases/t00032_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="326px" preserveAspectRatio="none" style="width:850px;height:326px;" version="1.1" viewBox="0 0 850 326" width="850px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1fanmvv5y9fa4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ft82w9chgdham" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,69 +9,69 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="144.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft82w9chgdham)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="144.5" y="146"/>
       <ellipse cx="159.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M162.4688,167.6406 Q161.8906,167.9375 161.25,168.0781 Q160.6094,168.2344 159.9063,168.2344 Q157.4063,168.2344 156.0781,166.5938 Q154.7656,164.9375 154.7656,161.8125 Q154.7656,158.6875 156.0781,157.0313 Q157.4063,155.375 159.9063,155.375 Q160.6094,155.375 161.25,155.5313 Q161.9063,155.6875 162.4688,155.9844 L162.4688,158.7031 Q161.8438,158.125 161.25,157.8594 Q160.6563,157.5781 160.0313,157.5781 Q158.6875,157.5781 158,158.6563 Q157.3125,159.7188 157.3125,161.8125 Q157.3125,163.9063 158,164.9844 Q158.6875,166.0469 160.0313,166.0469 Q160.6563,166.0469 161.25,165.7813 Q161.8438,165.5 162.4688,164.9219 L162.4688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="173.5" y="166.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="6" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft82w9chgdham)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="6" y="14.5"/>
       <ellipse cx="21" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,36.1406 Q23.3906,36.4375 22.75,36.5781 Q22.1094,36.7344 21.4063,36.7344 Q18.9063,36.7344 17.5781,35.0938 Q16.2656,33.4375 16.2656,30.3125 Q16.2656,27.1875 17.5781,25.5313 Q18.9063,23.875 21.4063,23.875 Q22.1094,23.875 22.75,24.0313 Q23.4063,24.1875 23.9688,24.4844 L23.9688,27.2031 Q23.3438,26.625 22.75,26.3594 Q22.1563,26.0781 21.5313,26.0781 Q20.1875,26.0781 19.5,27.1563 Q18.8125,28.2188 18.8125,30.3125 Q18.8125,32.4063 19.5,33.4844 Q20.1875,34.5469 21.5313,34.5469 Q22.1563,34.5469 22.75,34.2813 Q23.3438,34 23.9688,33.4219 L23.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="35" y="34.6543">TBase</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="111" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft82w9chgdham)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="111" y="8"/>
       <ellipse cx="165.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M168.7188,29.6406 Q168.1406,29.9375 167.5,30.0781 Q166.8594,30.2344 166.1563,30.2344 Q163.6563,30.2344 162.3281,28.5938 Q161.0156,26.9375 161.0156,23.8125 Q161.0156,20.6875 162.3281,19.0313 Q163.6563,17.375 166.1563,17.375 Q166.8594,17.375 167.5,17.5313 Q168.1563,17.6875 168.7188,17.9844 L168.7188,20.7031 Q168.0938,20.125 167.5,19.8594 Q166.9063,19.5781 166.2813,19.5781 Q164.9375,19.5781 164.25,20.6563 Q163.5625,21.7188 163.5625,23.8125 Q163.5625,25.9063 164.25,26.9844 Q164.9375,28.0469 166.2813,28.0469 Q166.9063,28.0469 167.5,27.7813 Q168.0938,27.5 168.7188,26.9219 L168.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="186.25" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
       <ellipse cx="122" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="131" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="272" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft82w9chgdham)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="272" y="8"/>
       <ellipse cx="326.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M329.7188,29.6406 Q329.1406,29.9375 328.5,30.0781 Q327.8594,30.2344 327.1563,30.2344 Q324.6563,30.2344 323.3281,28.5938 Q322.0156,26.9375 322.0156,23.8125 Q322.0156,20.6875 323.3281,19.0313 Q324.6563,17.375 327.1563,17.375 Q327.8594,17.375 328.5,17.5313 Q329.1563,17.6875 329.7188,17.9844 L329.7188,20.7031 Q329.0938,20.125 328.5,19.8594 Q327.9063,19.5781 327.2813,19.5781 Q325.9375,19.5781 325.25,20.6563 Q324.5625,21.7188 324.5625,23.8125 Q324.5625,25.9063 325.25,26.9844 Q325.9375,28.0469 327.2813,28.0469 Q327.9063,28.0469 328.5,27.7813 Q329.0938,27.5 329.7188,26.9219 L329.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="347.25" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="278" y="46"/>
       <ellipse cx="283" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="292" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="433" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft82w9chgdham)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="433" y="8"/>
       <ellipse cx="487.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M490.7188,29.6406 Q490.1406,29.9375 489.5,30.0781 Q488.8594,30.2344 488.1563,30.2344 Q485.6563,30.2344 484.3281,28.5938 Q483.0156,26.9375 483.0156,23.8125 Q483.0156,20.6875 484.3281,19.0313 Q485.6563,17.375 488.1563,17.375 Q488.8594,17.375 489.5,17.5313 Q490.1563,17.6875 490.7188,17.9844 L490.7188,20.7031 Q490.0938,20.125 489.5,19.8594 Q488.9063,19.5781 488.2813,19.5781 Q486.9375,19.5781 486.25,20.6563 Q485.5625,21.7188 485.5625,23.8125 Q485.5625,25.9063 486.25,26.9844 Q486.9375,28.0469 488.2813,28.0469 Q488.9063,28.0469 489.5,27.7813 Q490.0938,27.5 490.7188,26.9219 L490.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508.25" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="439" y="46"/>
       <ellipse cx="444" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="453" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="127" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft82w9chgdham)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="127" y="255"/>
       <ellipse cx="142" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M144.9688,276.6406 Q144.3906,276.9375 143.75,277.0781 Q143.1094,277.2344 142.4063,277.2344 Q139.9063,277.2344 138.5781,275.5938 Q137.2656,273.9375 137.2656,270.8125 Q137.2656,267.6875 138.5781,266.0313 Q139.9063,264.375 142.4063,264.375 Q143.1094,264.375 143.75,264.5313 Q144.4063,264.6875 144.9688,264.9844 L144.9688,267.7031 Q144.3438,267.125 143.75,266.8594 Q143.1563,266.5781 142.5313,266.5781 Q141.1875,266.5781 140.5,267.6563 Q139.8125,268.7188 139.8125,270.8125 Q139.8125,272.9063 140.5,273.9844 Q141.1875,275.0469 142.5313,275.0469 Q143.1563,275.0469 143.75,274.7813 Q144.3438,274.5 144.9688,273.9219 L144.9688,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="156" y="275.1543">Overload</text>
@@ -80,15 +80,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133" y="301"/>
       <ellipse cx="138" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="147" y="309.2104">counter : L</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="243" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft82w9chgdham)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="243" y="146"/>
       <ellipse cx="258" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M260.9688,167.6406 Q260.3906,167.9375 259.75,168.0781 Q259.1094,168.2344 258.4063,168.2344 Q255.9063,168.2344 254.5781,166.5938 Q253.2656,164.9375 253.2656,161.8125 Q253.2656,158.6875 254.5781,157.0313 Q255.9063,155.375 258.4063,155.375 Q259.1094,155.375 259.75,155.5313 Q260.4063,155.6875 260.9688,155.9844 L260.9688,158.7031 Q260.3438,158.125 259.75,157.8594 Q259.1563,157.5781 258.5313,157.5781 Q257.1875,157.5781 256.5,158.6563 Q255.8125,159.7188 255.8125,161.8125 Q255.8125,163.9063 256.5,164.9844 Q257.1875,166.0469 258.5313,166.0469 Q259.1563,166.0469 259.75,165.7813 Q260.3438,165.5 260.9688,164.9219 L260.9688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="272" y="166.1543">Overload</text>
@@ -97,19 +97,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fanmvv5y9fa4)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="594.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft82w9chgdham)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="594.5" y="8"/>
       <ellipse cx="708.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M711.7188,29.6406 Q711.1406,29.9375 710.5,30.0781 Q709.8594,30.2344 709.1563,30.2344 Q706.6563,30.2344 705.3281,28.5938 Q704.0156,26.9375 704.0156,23.8125 Q704.0156,20.6875 705.3281,19.0313 Q706.6563,17.375 709.1563,17.375 Q709.8594,17.375 710.5,17.5313 Q711.1563,17.6875 711.7188,17.9844 L711.7188,20.7031 Q711.0938,20.125 710.5,19.8594 Q709.9063,19.5781 709.2813,19.5781 Q707.9375,19.5781 707.25,20.6563 Q706.5625,21.7188 706.5625,23.8125 Q706.5625,25.9063 707.25,26.9844 Q707.9375,28.0469 709.2813,28.0469 Q709.9063,28.0469 710.5,27.7813 Q711.0938,27.5 711.7188,26.9219 L711.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="729.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="600.5" y="54"/>
       <ellipse cx="605.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="614.5" y="62.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
     </a>
     <path d="M183.61,214.17 C186,227.73 188.58,242.4 190.77,254.81 " fill="none" id="C_0001619396229227632210&lt;-C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00032_class_mermaid.svg b/docs/test_cases/t00032_class_mermaid.svg
index 8a0f10f6..6f6fadc5 100644
--- a/docs/test_cases/t00032_class_mermaid.svg
+++ b/docs/test_cases/t00032_class_mermaid.svg
@@ -128,7 +128,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(216.8046875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L7">
+        <a transform="translate(216.8046875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L7">
           <g title="Base" id="classId-C_0001619396229227632210-0" class="node default clickable">
             <rect height="57" width="53.25" y="-28.5" x="-26.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="26.625" x1="-26.625" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L9">
+        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L9">
           <g title="TBase" id="classId-C_0000543776954602127752-1" class="node default clickable">
             <rect height="57" width="63.03125" y="-28.5" x="-31.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.515625" x1="-31.515625" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(199.0078125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L11">
+        <a transform="translate(199.0078125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L11">
           <g title="A" id="classId-C_0000687909853333071234-2" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -190,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(404.9609375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L15">
+        <a transform="translate(404.9609375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L15">
           <g title="B" id="classId-C_0000737235057776029746-3" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -214,7 +214,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(610.9140625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L19">
+        <a transform="translate(610.9140625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L19">
           <g title="C" id="classId-C_0001497964256865073382-4" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -238,7 +238,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(310.8828125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24">
+        <a transform="translate(310.8828125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001463422997970691679-5" class="node default clickable">
             <rect height="79" width="160.53125" y="-39.5" x="-80.265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="80.265625" x1="-80.265625" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(404.9609375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L24">
+        <a transform="translate(404.9609375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001706455047176879286-6" class="node default clickable">
             <rect height="57" width="223.0625" y="-28.5" x="-111.53125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.53125" x1="-111.53125" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(887.1328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00032/t00032.cc#L31">
+        <a transform="translate(887.1328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00032/t00032.cc#L31">
           <g title="R" id="classId-C_0000085539867332573320-7" class="node default clickable">
             <rect height="79" width="296.484375" y="-39.5" x="-148.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="148.2421875" x1="-148.2421875" class="divider"/>
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 2d23dde8..655ce973 100644
--- a/docs/test_cases/t00033_class.svg
+++ b/docs/test_cases/t00033_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="570px" preserveAspectRatio="none" style="width:435px;height:570px;" version="1.1" viewBox="0 0 435 570" width="435px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1k31tfnexxs8r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ezwhqytb2wh3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ezwhqytb2wh3)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
       <ellipse cx="98.25" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.2188,276.6406 Q100.6406,276.9375 100,277.0781 Q99.3594,277.2344 98.6563,277.2344 Q96.1563,277.2344 94.8281,275.5938 Q93.5156,273.9375 93.5156,270.8125 Q93.5156,267.6875 94.8281,266.0313 Q96.1563,264.375 98.6563,264.375 Q99.3594,264.375 100,264.5313 Q100.6563,264.6875 101.2188,264.9844 L101.2188,267.7031 Q100.5938,267.125 100,266.8594 Q99.4063,266.5781 98.7813,266.5781 Q97.4375,266.5781 96.75,267.6563 Q96.0625,268.7188 96.0625,270.8125 Q96.0625,272.9063 96.75,273.9844 Q97.4375,275.0469 98.7813,275.0469 Q99.4063,275.0469 100,274.7813 Q100.5938,274.5 101.2188,273.9219 L101.2188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.75" y="275.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="82.5" y="301"/>
       <ellipse cx="87.5" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="96.5" y="309.2104">aaa : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ezwhqytb2wh3)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
       <ellipse cx="230.25" cy="393" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M233.2188,398.6406 Q232.6406,398.9375 232,399.0781 Q231.3594,399.2344 230.6563,399.2344 Q228.1563,399.2344 226.8281,397.5938 Q225.5156,395.9375 225.5156,392.8125 Q225.5156,389.6875 226.8281,388.0313 Q228.1563,386.375 230.6563,386.375 Q231.3594,386.375 232,386.5313 Q232.6563,386.6875 233.2188,386.9844 L233.2188,389.7031 Q232.5938,389.125 232,388.8594 Q231.4063,388.5781 230.7813,388.5781 Q229.4375,388.5781 228.75,389.6563 Q228.0625,390.7188 228.0625,392.8125 Q228.0625,394.9063 228.75,395.9844 Q229.4375,397.0469 230.7813,397.0469 Q231.4063,397.0469 232,396.7813 Q232.5938,396.5 233.2188,395.9219 L233.2188,398.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="245.75" y="397.1543">B</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="409" y2="409"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="417" y2="417"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="214.5" y="423"/>
       <ellipse cx="219.5" cy="428" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="228.5" y="431.2104">bbb : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ezwhqytb2wh3)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
       <ellipse cx="273.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M276.3688,520.6406 Q275.7906,520.9375 275.15,521.0781 Q274.5094,521.2344 273.8063,521.2344 Q271.3063,521.2344 269.9781,519.5938 Q268.6656,517.9375 268.6656,514.8125 Q268.6656,511.6875 269.9781,510.0313 Q271.3063,508.375 273.8063,508.375 Q274.5094,508.375 275.15,508.5313 Q275.8063,508.6875 276.3688,508.9844 L276.3688,511.7031 Q275.7438,511.125 275.15,510.8594 Q274.5563,510.5781 273.9313,510.5781 Q272.5875,510.5781 271.9,511.6563 Q271.2125,512.7188 271.2125,514.8125 Q271.2125,516.9063 271.9,517.9844 Q272.5875,519.0469 273.9313,519.0469 Q274.5563,519.0469 275.15,518.7813 Q275.7438,518.5 276.3688,517.9219 L276.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="288.6" y="519.1543">C</text>
@@ -53,30 +53,30 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="531" y2="531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="539" y2="539"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="259" y="545"/>
       <ellipse cx="264" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="273" y="553.2104">ccc : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ezwhqytb2wh3)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
       <ellipse cx="380.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.3688,520.6406 Q382.7906,520.9375 382.15,521.0781 Q381.5094,521.2344 380.8063,521.2344 Q378.3063,521.2344 376.9781,519.5938 Q375.6656,517.9375 375.6656,514.8125 Q375.6656,511.6875 376.9781,510.0313 Q378.3063,508.375 380.8063,508.375 Q381.5094,508.375 382.15,508.5313 Q382.8063,508.6875 383.3688,508.9844 L383.3688,511.7031 Q382.7438,511.125 382.15,510.8594 Q381.5563,510.5781 380.9313,510.5781 Q379.5875,510.5781 378.9,511.6563 Q378.2125,512.7188 378.2125,514.8125 Q378.2125,516.9063 378.9,517.9844 Q379.5875,519.0469 380.9313,519.0469 Q381.5563,519.0469 382.15,518.7813 Q382.7438,518.5 383.3688,517.9219 L383.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="397.6" y="519.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="531" y2="531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="539" y2="539"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="357" y="545"/>
       <ellipse cx="362" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="371" y="553.2104">ddd : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ezwhqytb2wh3)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
       <ellipse cx="325" cy="399.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M327.9688,405.1406 Q327.3906,405.4375 326.75,405.5781 Q326.1094,405.7344 325.4063,405.7344 Q322.9063,405.7344 321.5781,404.0938 Q320.2656,402.4375 320.2656,399.3125 Q320.2656,396.1875 321.5781,394.5313 Q322.9063,392.875 325.4063,392.875 Q326.1094,392.875 326.75,393.0313 Q327.4063,393.1875 327.9688,393.4844 L327.9688,396.2031 Q327.3438,395.625 326.75,395.3594 Q326.1563,395.0781 325.5313,395.0781 Q324.1875,395.0781 323.5,396.1563 Q322.8125,397.2188 322.8125,399.3125 Q322.8125,401.4063 323.5,402.4844 Q324.1875,403.5469 325.5313,403.5469 Q326.1563,403.5469 326.75,403.2813 Q327.3438,403 327.9688,402.4219 L327.9688,405.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339" y="403.6543">C</text>
@@ -85,8 +85,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="415.5" y2="415.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="423.5" y2="423.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ezwhqytb2wh3)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
       <ellipse cx="193" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.9688,283.1406 Q195.3906,283.4375 194.75,283.5781 Q194.1094,283.7344 193.4063,283.7344 Q190.9063,283.7344 189.5781,282.0938 Q188.2656,280.4375 188.2656,277.3125 Q188.2656,274.1875 189.5781,272.5313 Q190.9063,270.875 193.4063,270.875 Q194.1094,270.875 194.75,271.0313 Q195.4063,271.1875 195.9688,271.4844 L195.9688,274.2031 Q195.3438,273.625 194.75,273.3594 Q194.1563,273.0781 193.5313,273.0781 Q192.1875,273.0781 191.5,274.1563 Q190.8125,275.2188 190.8125,277.3125 Q190.8125,279.4063 191.5,280.4844 Q192.1875,281.5469 193.5313,281.5469 Q194.1563,281.5469 194.75,281.2813 Q195.3438,281 195.9688,280.4219 L195.9688,283.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="281.6543">B</text>
@@ -95,8 +95,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="293.5" y2="293.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="301.5" y2="301.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ezwhqytb2wh3)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
       <ellipse cx="33" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M35.9688,167.6406 Q35.3906,167.9375 34.75,168.0781 Q34.1094,168.2344 33.4063,168.2344 Q30.9063,168.2344 29.5781,166.5938 Q28.2656,164.9375 28.2656,161.8125 Q28.2656,158.6875 29.5781,157.0313 Q30.9063,155.375 33.4063,155.375 Q34.1094,155.375 34.75,155.5313 Q35.4063,155.6875 35.9688,155.9844 L35.9688,158.7031 Q35.3438,158.125 34.75,157.8594 Q34.1563,157.5781 33.5313,157.5781 Q32.1875,157.5781 31.5,158.6563 Q30.8125,159.7188 30.8125,161.8125 Q30.8125,163.9063 31.5,164.9844 Q32.1875,166.0469 33.5313,166.0469 Q34.1563,166.0469 34.75,165.7813 Q35.3438,165.5 35.9688,164.9219 L35.9688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="166.1543">A</text>
@@ -105,19 +105,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k31tfnexxs8r)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ezwhqytb2wh3)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
       <ellipse cx="121.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.2188,29.6406 Q123.6406,29.9375 123,30.0781 Q122.3594,30.2344 121.6563,30.2344 Q119.1563,30.2344 117.8281,28.5938 Q116.5156,26.9375 116.5156,23.8125 Q116.5156,20.6875 117.8281,19.0313 Q119.1563,17.375 121.6563,17.375 Q122.3594,17.375 123,17.5313 Q123.6563,17.6875 124.2188,17.9844 L124.2188,20.7031 Q123.5938,20.125 123,19.8594 Q122.4063,19.5781 121.7813,19.5781 Q120.4375,19.5781 119.75,20.6563 Q119.0625,21.7188 119.0625,23.8125 Q119.0625,25.9063 119.75,26.9844 Q120.4375,28.0469 121.7813,28.0469 Q122.4063,28.0469 123,27.7813 Q123.5938,27.5 124.2188,26.9219 L124.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="141.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="221" x="26" y="62.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
     </a>
     <path d="M346.33,431.64 C353.84,449.29 364.29,473.9 372.79,493.89 " fill="none" id="C_0001609446044604054241-&gt;C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00033_class_mermaid.svg b/docs/test_cases/t00033_class_mermaid.svg
index 579c40ee..7bd2acb7 100644
--- a/docs/test_cases/t00033_class_mermaid.svg
+++ b/docs/test_cases/t00033_class_mermaid.svg
@@ -138,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7">
+        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0002036031998980633871-0" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -162,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L11">
+        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L11">
           <g title="B" id="classId-C_0000765515233845859023-1" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -186,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L15">
+        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L15">
           <g title="C" id="classId-C_0001436835384265552869-2" class="node default clickable">
             <rect height="79" width="71.171875" y="-39.5" x="-35.5859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.5859375" x1="-35.5859375" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L19">
+        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L19">
           <g title="D" id="classId-C_0002199581366769423637-3" class="node default clickable">
             <rect height="79" width="81.28125" y="-39.5" x="-40.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.640625" x1="-40.640625" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7">
+        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7">
           <g title="C" id="classId-C_0001609446044604054241-4" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -253,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7">
+        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7">
           <g title="B" id="classId-C_0000384927316081978893-5" class="node default clickable">
             <rect height="57" width="223.046875" y="-28.5" x="-111.5234375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.5234375" x1="-111.5234375" class="divider"/>
@@ -272,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L7">
+        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0001747493965420341251-6" class="node default clickable">
             <rect height="57" width="253.296875" y="-28.5" x="-126.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="126.6484375" x1="-126.6484375" class="divider"/>
@@ -291,7 +291,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00033/t00033.cc#L23">
+        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00033/t00033.cc#L23">
           <g title="R" id="classId-C_0001866392706312766470-7" class="node default clickable">
             <rect height="79" width="287.65625" y="-39.5" x="-143.828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="143.828125" x1="-143.828125" class="divider"/>
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index 48b023a4..49a48cfe 100644
--- a/docs/test_cases/t00034_class.svg
+++ b/docs/test_cases/t00034_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="243px" preserveAspectRatio="none" style="width:788px;height:243px;" version="1.1" viewBox="0 0 788 243" width="788px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f8r9vgp93mbit" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fao9ezof957av" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,30 +9,30 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="305" x="6" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fao9ezof957av)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="305" x="6" y="159"/>
       <ellipse cx="140.75" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M143.7188,180.6406 Q143.1406,180.9375 142.5,181.0781 Q141.8594,181.2344 141.1563,181.2344 Q138.6563,181.2344 137.3281,179.5938 Q136.0156,177.9375 136.0156,174.8125 Q136.0156,171.6875 137.3281,170.0313 Q138.6563,168.375 141.1563,168.375 Q141.8594,168.375 142.5,168.5313 Q143.1563,168.6875 143.7188,168.9844 L143.7188,171.7031 Q143.0938,171.125 142.5,170.8594 Q141.9063,170.5781 141.2813,170.5781 Q139.9375,170.5781 139.25,171.6563 Q138.5625,172.7188 138.5625,174.8125 Q138.5625,176.9063 139.25,177.9844 Q139.9375,179.0469 141.2813,179.0469 Q141.9063,179.0469 142.5,178.7813 Q143.0938,178.5 143.7188,177.9219 L143.7188,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="161.25" y="179.1543">Void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="191" y2="191"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="197"/>
       <ellipse cx="17" cy="202" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="273" x="26" y="205.2104">operator!=(const Void &amp;) constexpr const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="209.8047"/>
       <ellipse cx="17" cy="214.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="279" x="26" y="218.0151">operator==(const Void &amp;) constexpr const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="224.6094" y2="224.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="493" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fao9ezof957av)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="493" y="172"/>
       <ellipse cx="508" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M510.9688,193.6406 Q510.3906,193.9375 509.75,194.0781 Q509.1094,194.2344 508.4063,194.2344 Q505.9063,194.2344 504.5781,192.5938 Q503.2656,190.9375 503.2656,187.8125 Q503.2656,184.6875 504.5781,183.0313 Q505.9063,181.375 508.4063,181.375 Q509.1094,181.375 509.75,181.5313 Q510.4063,181.6875 510.9688,181.9844 L510.9688,184.7031 Q510.3438,184.125 509.75,183.8594 Q509.1563,183.5781 508.5313,183.5781 Q507.1875,183.5781 506.5,184.6563 Q505.8125,185.7188 505.8125,187.8125 Q505.8125,189.9063 506.5,190.9844 Q507.1875,192.0469 508.5313,192.0469 Q509.1563,192.0469 509.75,191.7813 Q510.3438,191.5 510.9688,190.9219 L510.9688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="522" y="192.1543">lift_void</text>
@@ -41,8 +41,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="484" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fao9ezof957av)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="484" y="21"/>
       <ellipse cx="499" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M501.9688,42.6406 Q501.3906,42.9375 500.75,43.0781 Q500.1094,43.2344 499.4063,43.2344 Q496.9063,43.2344 495.5781,41.5938 Q494.2656,39.9375 494.2656,36.8125 Q494.2656,33.6875 495.5781,32.0313 Q496.9063,30.375 499.4063,30.375 Q500.1094,30.375 500.75,30.5313 Q501.4063,30.6875 501.9688,30.9844 L501.9688,33.7031 Q501.3438,33.125 500.75,32.8594 Q500.1563,32.5781 499.5313,32.5781 Q498.1875,32.5781 497.5,33.6563 Q496.8125,34.7188 496.8125,36.8125 Q496.8125,38.9063 497.5,39.9844 Q498.1875,41.0469 499.5313,41.0469 Q500.1563,41.0469 500.75,40.7813 Q501.3438,40.5 501.9688,39.9219 L501.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="513" y="41.1543">lift_void</text>
@@ -51,8 +51,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="346" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fao9ezof957av)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="346" y="172"/>
       <ellipse cx="361" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M363.9688,193.6406 Q363.3906,193.9375 362.75,194.0781 Q362.1094,194.2344 361.4063,194.2344 Q358.9063,194.2344 357.5781,192.5938 Q356.2656,190.9375 356.2656,187.8125 Q356.2656,184.6875 357.5781,183.0313 Q358.9063,181.375 361.4063,181.375 Q362.1094,181.375 362.75,181.5313 Q363.4063,181.6875 363.9688,181.9844 L363.9688,184.7031 Q363.3438,184.125 362.75,183.8594 Q362.1563,183.5781 361.5313,183.5781 Q360.1875,183.5781 359.5,184.6563 Q358.8125,185.7188 358.8125,187.8125 Q358.8125,189.9063 359.5,190.9844 Q360.1875,192.0469 361.5313,192.0469 Q362.1563,192.0469 362.75,191.7813 Q363.3438,191.5 363.9688,190.9219 L363.9688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="375" y="192.1543">drop_void</text>
@@ -61,8 +61,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="212" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fao9ezof957av)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="212" y="21"/>
       <ellipse cx="227" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M229.9688,42.6406 Q229.3906,42.9375 228.75,43.0781 Q228.1094,43.2344 227.4063,43.2344 Q224.9063,43.2344 223.5781,41.5938 Q222.2656,39.9375 222.2656,36.8125 Q222.2656,33.6875 223.5781,32.0313 Q224.9063,30.375 227.4063,30.375 Q228.1094,30.375 228.75,30.5313 Q229.4063,30.6875 229.9688,30.9844 L229.9688,33.7031 Q229.3438,33.125 228.75,32.8594 Q228.1563,32.5781 227.5313,32.5781 Q226.1875,32.5781 225.5,33.6563 Q224.8125,34.7188 224.8125,36.8125 Q224.8125,38.9063 225.5,39.9844 Q226.1875,41.0469 227.5313,41.0469 Q228.1563,41.0469 228.75,40.7813 Q229.3438,40.5 229.9688,39.9219 L229.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="241" y="41.1543">drop_void</text>
@@ -71,34 +71,34 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="681.5" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fao9ezof957av)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="681.5" y="172"/>
       <ellipse cx="696.5" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M699.4688,193.6406 Q698.8906,193.9375 698.25,194.0781 Q697.6094,194.2344 696.9063,194.2344 Q694.4063,194.2344 693.0781,192.5938 Q691.7656,190.9375 691.7656,187.8125 Q691.7656,184.6875 693.0781,183.0313 Q694.4063,181.375 696.9063,181.375 Q697.6094,181.375 698.25,181.5313 Q698.9063,181.6875 699.4688,181.9844 L699.4688,184.7031 Q698.8438,184.125 698.25,183.8594 Q697.6563,183.5781 697.0313,183.5781 Q695.6875,183.5781 695,184.6563 Q694.3125,185.7188 694.3125,187.8125 Q694.3125,189.9063 695,190.9844 Q695.6875,192.0469 697.0313,192.0469 Q697.6563,192.0469 698.25,191.7813 Q698.8438,191.5 699.4688,190.9219 L699.4688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="710.5" y="192.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8r9vgp93mbit)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="626" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fao9ezof957av)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="626" y="8"/>
       <ellipse cx="693.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M696.2188,29.6406 Q695.6406,29.9375 695,30.0781 Q694.3594,30.2344 693.6563,30.2344 Q691.1563,30.2344 689.8281,28.5938 Q688.5156,26.9375 688.5156,23.8125 Q688.5156,20.6875 689.8281,19.0313 Q691.1563,17.375 693.6563,17.375 Q694.3594,17.375 695,17.5313 Q695.6563,17.6875 696.2188,17.9844 L696.2188,20.7031 Q695.5938,20.125 695,19.8594 Q694.4063,19.5781 693.7813,19.5781 Q692.4375,19.5781 691.75,20.6563 Q691.0625,21.7188 691.0625,23.8125 Q691.0625,25.9063 691.75,26.9844 Q692.4375,28.0469 693.7813,28.0469 Q694.4063,28.0469 695,27.7813 Q695.5938,27.5 696.2188,26.9219 L696.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="713.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="632" y="54"/>
       <ellipse cx="637" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="646" y="62.2104">la : lift_void_t&lt;A&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="632" y="66.8047"/>
       <ellipse cx="637" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="125" x="646" y="75.0151">lv : lift_void_t&lt;void&gt; *</text>
     </a>
     <path d="M537.5,69.28 C537.5,91.26 537.5,124.76 537.5,151.66 " fill="none" id="C_0000126450862226197239-&gt;C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00034_class_mermaid.svg b/docs/test_cases/t00034_class_mermaid.svg
index 01b5fbd4..2babeaa7 100644
--- a/docs/test_cases/t00034_class_mermaid.svg
+++ b/docs/test_cases/t00034_class_mermaid.svg
@@ -102,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(359.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L9">
+        <a transform="translate(359.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L9">
           <g title="Void" id="classId-C_0001704456490210873213-0" class="node default clickable">
             <rect height="101" width="371.203125" y="-50.5" x="-185.6015625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="185.6015625" x1="-185.6015625" class="divider"/>
@@ -131,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L16">
+        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L16">
           <g title="lift_void" id="classId-C_0000867472442996685316-1" class="node default clickable">
             <rect height="57" width="104.796875" y="-28.5" x="-52.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.3984375" x1="-52.3984375" class="divider"/>
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L20">
+        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L20">
           <g title="lift_void" id="classId-C_0000126450862226197239-2" class="node default clickable">
             <rect height="57" width="127.921875" y="-28.5" x="-63.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.9609375" x1="-63.9609375" class="divider"/>
@@ -169,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(655.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L33">
+        <a transform="translate(655.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L33">
           <g title="drop_void" id="classId-C_0001578745816100337706-3" class="node default clickable">
             <rect height="57" width="120.796875" y="-28.5" x="-60.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.3984375" x1="-60.3984375" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(507.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L37">
+        <a transform="translate(507.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L37">
           <g title="drop_void" id="classId-C_0001849836134504075115-4" class="node default clickable">
             <rect height="57" width="144.5" y="-28.5" x="-72.25" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.25" x1="-72.25" class="divider"/>
@@ -207,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(820.14453125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L43">
+        <a transform="translate(820.14453125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L43">
           <g title="A" id="classId-C_0001383912907884688827-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -226,7 +226,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(820.14453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00034/t00034.cc#L45">
+        <a transform="translate(820.14453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00034/t00034.cc#L45">
           <g title="R" id="classId-C_0001713991735741265309-6" class="node default clickable">
             <rect height="101" width="164.875" y="-50.5" x="-82.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="82.4375" x1="-82.4375" class="divider"/>
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index ca350e25..8afeb972 100644
--- a/docs/test_cases/t00035_class.svg
+++ b/docs/test_cases/t00035_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:280px;height:283px;" version="1.1" viewBox="0 0 280 283" width="280px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f9fe55hfb20gy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flnmvcx5kdeh0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flnmvcx5kdeh0)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
       <ellipse cx="121" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M123.9688,29.6406 Q123.3906,29.9375 122.75,30.0781 Q122.1094,30.2344 121.4063,30.2344 Q118.9063,30.2344 117.5781,28.5938 Q116.2656,26.9375 116.2656,23.8125 Q116.2656,20.6875 117.5781,19.0313 Q118.9063,17.375 121.4063,17.375 Q122.1094,17.375 122.75,17.5313 Q123.4063,17.6875 123.9688,17.9844 L123.9688,20.7031 Q123.3438,20.125 122.75,19.8594 Q122.1563,19.5781 121.5313,19.5781 Q120.1875,19.5781 119.5,20.6563 Q118.8125,21.7188 118.8125,23.8125 Q118.8125,25.9063 119.5,26.9844 Q120.1875,28.0469 121.5313,28.0469 Q122.1563,28.0469 122.75,27.7813 Q123.3438,27.5 123.9688,26.9219 L123.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="135" y="28.1543">Top</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flnmvcx5kdeh0)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="35" y="136.1543">Left</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flnmvcx5kdeh0)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
       <ellipse cx="111.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,137.6406 Q113.8906,137.9375 113.25,138.0781 Q112.6094,138.2344 111.9063,138.2344 Q109.4063,138.2344 108.0781,136.5938 Q106.7656,134.9375 106.7656,131.8125 Q106.7656,128.6875 108.0781,127.0313 Q109.4063,125.375 111.9063,125.375 Q112.6094,125.375 113.25,125.5313 Q113.9063,125.6875 114.4688,125.9844 L114.4688,128.7031 Q113.8438,128.125 113.25,127.8594 Q112.6563,127.5781 112.0313,127.5781 Q110.6875,127.5781 110,128.6563 Q109.3125,129.7188 109.3125,131.8125 Q109.3125,133.9063 110,134.9844 Q110.6875,136.0469 112.0313,136.0469 Q112.6563,136.0469 113.25,135.7813 Q113.8438,135.5 114.4688,134.9219 L114.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="125.5" y="136.1543">Center</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flnmvcx5kdeh0)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
       <ellipse cx="110" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M112.9688,245.6406 Q112.3906,245.9375 111.75,246.0781 Q111.1094,246.2344 110.4063,246.2344 Q107.9063,246.2344 106.5781,244.5938 Q105.2656,242.9375 105.2656,239.8125 Q105.2656,236.6875 106.5781,235.0313 Q107.9063,233.375 110.4063,233.375 Q111.1094,233.375 111.75,233.5313 Q112.4063,233.6875 112.9688,233.9844 L112.9688,236.7031 Q112.3438,236.125 111.75,235.8594 Q111.1563,235.5781 110.5313,235.5781 Q109.1875,235.5781 108.5,236.6563 Q107.8125,237.7188 107.8125,239.8125 Q107.8125,241.9063 108.5,242.9844 Q109.1875,244.0469 110.5313,244.0469 Q111.1563,244.0469 111.75,243.7813 Q112.3438,243.5 112.9688,242.9219 L112.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="124" y="244.1543">Bottom</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="256" y2="256"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9fe55hfb20gy)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flnmvcx5kdeh0)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
       <ellipse cx="220.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.4688,137.6406 Q222.8906,137.9375 222.25,138.0781 Q221.6094,138.2344 220.9063,138.2344 Q218.4063,138.2344 217.0781,136.5938 Q215.7656,134.9375 215.7656,131.8125 Q215.7656,128.6875 217.0781,127.0313 Q218.4063,125.375 220.9063,125.375 Q221.6094,125.375 222.25,125.5313 Q222.9063,125.6875 223.4688,125.9844 L223.4688,128.7031 Q222.8438,128.125 222.25,127.8594 Q221.6563,127.5781 221.0313,127.5781 Q219.6875,127.5781 219,128.6563 Q218.3125,129.7188 218.3125,131.8125 Q218.3125,133.9063 219,134.9844 Q219.6875,136.0469 221.0313,136.0469 Q221.6563,136.0469 222.25,135.7813 Q222.8438,135.5 223.4688,134.9219 L223.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="234.5" y="136.1543">Right</text>
diff --git a/docs/test_cases/t00035_class_mermaid.svg b/docs/test_cases/t00035_class_mermaid.svg
index 88b19390..f2f9c322 100644
--- a/docs/test_cases/t00035_class_mermaid.svg
+++ b/docs/test_cases/t00035_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L4">
+        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L4">
           <g title="Top" id="classId-C_0002241062883697294772-0" class="node default clickable">
             <rect height="57" width="43.140625" y="-28.5" x="-21.5703125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="21.5703125" x1="-21.5703125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L6">
+        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L6">
           <g title="Left" id="classId-C_0000242562856080127946-1" class="node default clickable">
             <rect height="57" width="44.328125" y="-28.5" x="-22.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="22.1640625" x1="-22.1640625" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L8">
+        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L8">
           <g title="Center" id="classId-C_0001933304541849408421-2" class="node default clickable">
             <rect height="57" width="65.6875" y="-28.5" x="-32.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.84375" x1="-32.84375" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L10">
+        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L10">
           <g title="Bottom" id="classId-C_0001646691079607377420-3" class="node default clickable">
             <rect height="57" width="70.984375" y="-28.5" x="-35.4921875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.4921875" x1="-35.4921875" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00035/t00035.cc#L12">
+        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00035/t00035.cc#L12">
           <g title="Right" id="classId-C_0000200121820090372322-4" class="node default clickable">
             <rect height="57" width="55.875" y="-28.5" x="-27.9375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.9375" x1="-27.9375" class="divider"/>
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index 9987d7a0..917fc5cb 100644
--- a/docs/test_cases/t00036_class.svg
+++ b/docs/test_cases/t00036_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="525px" preserveAspectRatio="none" style="width:476px;height:525px;" version="1.1" viewBox="0 0 476 525" width="476px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fakdfoqya7gsu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhtwn7rjyguvk" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhtwn7rjyguvk)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.7969" y2="46.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhtwn7rjyguvk)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="102" x2="154" y1="89.7969" y2="89.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="106" y="82.4951">ns11</text>
-    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhtwn7rjyguvk)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="126" x2="188" y1="132.7969" y2="132.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="130" y="125.4951">ns111</text>
-    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhtwn7rjyguvk)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="334" x2="376" y1="96.2969" y2="96.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="338" y="88.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#fakdfoqya7gsu)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhtwn7rjyguvk)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="358" x2="410" y1="139.2969" y2="139.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="362" y="131.9951">ns22</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhtwn7rjyguvk)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
       <ellipse cx="56.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7594,161 L53.0406,161 L53.0406,148.6094 L60.7594,148.6094 L60.7594,150.7656 L55.4938,150.7656 L55.4938,153.4375 L60.2594,153.4375 L60.2594,155.5938 L55.4938,155.5938 L55.4938,158.8438 L60.7594,158.8438 L60.7594,161 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="71.35" y="159.1543">E</text>
@@ -34,8 +34,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="44.5" y="198.0151">yellow</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="84.5" y1="204.6094" y2="204.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhtwn7rjyguvk)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
       <ellipse cx="183.45" cy="428" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.4188,433.6406 Q185.8406,433.9375 185.2,434.0781 Q184.5594,434.2344 183.8563,434.2344 Q181.3563,434.2344 180.0281,432.5938 Q178.7156,430.9375 178.7156,427.8125 Q178.7156,424.6875 180.0281,423.0313 Q181.3563,421.375 183.8563,421.375 Q184.5594,421.375 185.2,421.5313 Q185.8563,421.6875 186.4188,421.9844 L186.4188,424.7031 Q185.7938,424.125 185.2,423.8594 Q184.6063,423.5781 183.9813,423.5781 Q182.6375,423.5781 181.95,424.6563 Q181.2625,425.7188 181.2625,427.8125 Q181.2625,429.9063 181.95,430.9844 Q182.6375,432.0469 183.9813,432.0469 Q184.6063,432.0469 185.2,431.7813 Q185.7938,431.5 186.4188,430.9219 L186.4188,433.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="432.1543">A</text>
@@ -44,15 +44,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="444" y2="444"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="452" y2="452"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="174" y="458"/>
       <ellipse cx="179" cy="463" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="466.2104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhtwn7rjyguvk)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
       <ellipse cx="179" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M181.9688,324.6406 Q181.3906,324.9375 180.75,325.0781 Q180.1094,325.2344 179.4063,325.2344 Q176.9063,325.2344 175.5781,323.5938 Q174.2656,321.9375 174.2656,318.8125 Q174.2656,315.6875 175.5781,314.0313 Q176.9063,312.375 179.4063,312.375 Q180.1094,312.375 180.75,312.5313 Q181.4063,312.6875 181.9688,312.9844 L181.9688,315.7031 Q181.3438,315.125 180.75,314.8594 Q180.1563,314.5781 179.5313,314.5781 Q178.1875,314.5781 177.5,315.6563 Q176.8125,316.7188 176.8125,318.8125 Q176.8125,320.9063 177.5,321.9844 Q178.1875,323.0469 179.5313,323.0469 Q180.1563,323.0469 180.75,322.7813 Q181.3438,322.5 181.9688,321.9219 L181.9688,324.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="323.1543">A</text>
@@ -61,23 +61,23 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="335" y2="335"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="343" y2="343"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhtwn7rjyguvk)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
       <ellipse cx="185.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.7688,167.1406 Q188.1906,167.4375 187.55,167.5781 Q186.9094,167.7344 186.2063,167.7344 Q183.7063,167.7344 182.3781,166.0938 Q181.0656,164.4375 181.0656,161.3125 Q181.0656,158.1875 182.3781,156.5313 Q183.7063,154.875 186.2063,154.875 Q186.9094,154.875 187.55,155.0313 Q188.2063,155.1875 188.7688,155.4844 L188.7688,158.2031 Q188.1438,157.625 187.55,157.3594 Q186.9563,157.0781 186.3313,157.0781 Q184.9875,157.0781 184.3,158.1563 Q183.6125,159.2188 183.6125,161.3125 Q183.6125,163.4063 184.3,164.4844 Q184.9875,165.5469 186.3313,165.5469 Q186.9563,165.5469 187.55,165.2813 Q188.1438,165 188.7688,164.4219 L188.7688,167.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="206.2" y="165.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="177.5" y2="177.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="185.5" y2="185.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="148" y="191.5"/>
       <ellipse cx="153" cy="196.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="199.7104">a_int : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fakdfoqya7gsu)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhtwn7rjyguvk)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
       <ellipse cx="389" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M391.9688,173.6406 Q391.3906,173.9375 390.75,174.0781 Q390.1094,174.2344 389.4063,174.2344 Q386.9063,174.2344 385.5781,172.5938 Q384.2656,170.9375 384.2656,167.8125 Q384.2656,164.6875 385.5781,163.0313 Q386.9063,161.375 389.4063,161.375 Q390.1094,161.375 390.75,161.5313 Q391.4063,161.6875 391.9688,161.9844 L391.9688,164.7031 Q391.3438,164.125 390.75,163.8594 Q390.1563,163.5781 389.5313,163.5781 Q388.1875,163.5781 387.5,164.6563 Q386.8125,165.7188 386.8125,167.8125 Q386.8125,169.9063 387.5,170.9844 Q388.1875,172.0469 389.5313,172.0469 Q390.1563,172.0469 390.75,171.7813 Q391.3438,171.5 391.9688,170.9219 L391.9688,173.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="172.1543">C</text>
diff --git a/docs/test_cases/t00036_class_mermaid.svg b/docs/test_cases/t00036_class_mermaid.svg
index 6eb60a71..41437a01 100644
--- a/docs/test_cases/t00036_class_mermaid.svg
+++ b/docs/test_cases/t00036_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L6">
+        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L6">
           <g title="E" id="classId-C_0002144761953049158478-0" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -107,7 +107,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0000571573305652194946-1" class="node default clickable">
             <rect height="79" width="139.484375" y="-39.5" x="-69.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.7421875" x1="-69.7421875" class="divider"/>
@@ -131,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L16">
+        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L16">
           <g title="B" id="classId-C_0001964031933563607376-2" class="node default clickable">
             <rect height="79" width="165.28125" y="-39.5" x="-82.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="82.640625" x1="-82.640625" class="divider"/>
@@ -155,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0001832710427462319797-3" class="node default clickable">
             <rect height="57" width="149.265625" y="-28.5" x="-74.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6328125" x1="-74.6328125" class="divider"/>
@@ -174,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00036/t00036.cc#L28">
+        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00036/t00036.cc#L28">
           <g title="C" id="classId-C_0002038956882066165590-4" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg
index 4f965b6f..1b8b4cf7 100644
--- a/docs/test_cases/t00037_class.svg
+++ b/docs/test_cases/t00037_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="420px" preserveAspectRatio="none" style="width:284px;height:420px;" version="1.1" viewBox="0 0 284 420" width="284px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1x952iyx8fda8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1hjsxmz6s6zpc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,106 +9,106 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x952iyx8fda8)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hjsxmz6s6zpc)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
       <ellipse cx="137.25" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M140.2188,180.6406 Q139.6406,180.9375 139,181.0781 Q138.3594,181.2344 137.6563,181.2344 Q135.1563,181.2344 133.8281,179.5938 Q132.5156,177.9375 132.5156,174.8125 Q132.5156,171.6875 133.8281,170.0313 Q135.1563,168.375 137.6563,168.375 Q138.3594,168.375 139,168.5313 Q139.6563,168.6875 140.2188,168.9844 L140.2188,171.7031 Q139.5938,171.125 139,170.8594 Q138.4063,170.5781 137.7813,170.5781 Q136.4375,170.5781 135.75,171.6563 Q135.0625,172.7188 135.0625,174.8125 Q135.0625,176.9063 135.75,177.9844 Q136.4375,179.0469 137.7813,179.0469 Q138.4063,179.0469 139,178.7813 Q139.5938,178.5 140.2188,177.9219 L140.2188,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="15" x="157.75" y="179.1543">ST</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="205"/>
       <ellipse cx="46" cy="210" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="202" x="55" y="213.2104">dimensions : ST::(anonymous_662)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="217.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="43" y="219.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="164" x="55" y="226.0151">units : ST::(anonymous_792)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x952iyx8fda8)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hjsxmz6s6zpc)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
       <ellipse cx="21" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,331.6406 Q23.3906,331.9375 22.75,332.0781 Q22.1094,332.2344 21.4063,332.2344 Q18.9063,332.2344 17.5781,330.5938 Q16.2656,328.9375 16.2656,325.8125 Q16.2656,322.6875 17.5781,321.0313 Q18.9063,319.375 21.4063,319.375 Q22.1094,319.375 22.75,319.5313 Q23.4063,319.6875 23.9688,319.9844 L23.9688,322.7031 Q23.3438,322.125 22.75,321.8594 Q22.1563,321.5781 21.5313,321.5781 Q20.1875,321.5781 19.5,322.6563 Q18.8125,323.7188 18.8125,325.8125 Q18.8125,327.9063 19.5,328.9844 Q20.1875,330.0469 21.5313,330.0469 Q22.1563,330.0469 22.75,329.7813 Q23.3438,329.5 23.9688,328.9219 L23.9688,331.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="104" x="35" y="330.1543">ST::(dimensions)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="342" y2="342"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="350" y2="350"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="356"/>
       <ellipse cx="17" cy="361" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="26" y="364.2104">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="368.8047"/>
       <ellipse cx="17" cy="373.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="377.0151">x : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="381.6094"/>
       <ellipse cx="17" cy="386.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="389.8198">y : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="394.4141"/>
       <ellipse cx="17" cy="399.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="402.6245">z : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x952iyx8fda8)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hjsxmz6s6zpc)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
       <ellipse cx="192" cy="338.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.9688,344.1406 Q194.3906,344.4375 193.75,344.5781 Q193.1094,344.7344 192.4063,344.7344 Q189.9063,344.7344 188.5781,343.0938 Q187.2656,341.4375 187.2656,338.3125 Q187.2656,335.1875 188.5781,333.5313 Q189.9063,331.875 192.4063,331.875 Q193.1094,331.875 193.75,332.0313 Q194.4063,332.1875 194.9688,332.4844 L194.9688,335.2031 Q194.3438,334.625 193.75,334.3594 Q193.1563,334.0781 192.5313,334.0781 Q191.1875,334.0781 190.5,335.1563 Q189.8125,336.2188 189.8125,338.3125 Q189.8125,340.4063 190.5,341.4844 Q191.1875,342.5469 192.5313,342.5469 Q193.1563,342.5469 193.75,342.2813 Q194.3438,342 194.9688,341.4219 L194.9688,344.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="206" y="342.6543">ST::(units)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="354.5" y2="354.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="362.5" y2="362.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="368.5"/>
       <ellipse cx="188" cy="373.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="197" y="376.7104">c : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="381.3047"/>
       <ellipse cx="188" cy="386.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="197" y="389.5151">h : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x952iyx8fda8)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hjsxmz6s6zpc)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
       <ellipse cx="142.2" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.1688,29.6406 Q144.5906,29.9375 143.95,30.0781 Q143.3094,30.2344 142.6063,30.2344 Q140.1063,30.2344 138.7781,28.5938 Q137.4656,26.9375 137.4656,23.8125 Q137.4656,20.6875 138.7781,19.0313 Q140.1063,17.375 142.6063,17.375 Q143.3094,17.375 143.95,17.5313 Q144.6063,17.6875 145.1688,17.9844 L145.1688,20.7031 Q144.5438,20.125 143.95,19.8594 Q143.3563,19.5781 142.7313,19.5781 Q141.3875,19.5781 140.7,20.6563 Q140.0125,21.7188 140.0125,23.8125 Q140.0125,25.9063 140.7,26.9844 Q141.3875,28.0469 142.7313,28.0469 Q143.3563,28.0469 143.95,27.7813 Q144.5438,27.5 145.1688,26.9219 L145.1688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="159.8" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
       <ellipse cx="122" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="131" y="54.2104">A() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="66.8047"/>
       <ellipse cx="122" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="131" y="75.0151">st : ST</text>
     </a>
     <path d="M106.32,243.96 C102.05,250.09 98.15,256.5 95,263 C87.97,277.51 83.26,294.41 80.13,309.92 " fill="none" id="C_0000011203041379038775&lt;-C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00037_class_mermaid.svg b/docs/test_cases/t00037_class_mermaid.svg
index c50a3d86..88f3b1a4 100644
--- a/docs/test_cases/t00037_class_mermaid.svg
+++ b/docs/test_cases/t00037_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L4">
+        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L4">
           <g title="ST" id="classId-C_0000011203041379038775-0" class="node default clickable">
             <rect height="101" width="275.140625" y="-50.5" x="-137.5703125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="137.5703125" x1="-137.5703125" class="divider"/>
@@ -119,7 +119,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L6">
+        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L6">
           <g title="ST##(dimensions)" id="classId-C_0001980820317972901050-1" class="node default clickable">
             <rect height="145" width="143.890625" y="-72.5" x="-71.9453125" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="71.9453125" x1="-71.9453125" class="divider"/>
@@ -158,7 +158,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L14">
+        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L14">
           <g title="ST##(units)" id="classId-C_0001811145508890403377-2" class="node default clickable">
             <rect height="101" width="94.625" y="-50.5" x="-47.3125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="47.3125" x1="-47.3125" class="divider"/>
@@ -187,7 +187,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00037/t00037.cc#L20">
+        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00037/t00037.cc#L20">
           <g title="A" id="classId-C_0001322794181774144954-3" class="node default clickable">
             <rect height="101" width="88.359375" y="-50.5" x="-44.1796875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index 7de04c78..434ed92c 100644
--- a/docs/test_cases/t00038_class.svg
+++ b/docs/test_cases/t00038_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="321px" preserveAspectRatio="none" style="width:2230px;height:321px;" version="1.1" viewBox="0 0 2230 321" width="2230px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fo49fvw7zjreu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fv5171cld8k1c" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
       <ellipse cx="202" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M206.1094,246 L198.3906,246 L198.3906,233.6094 L206.1094,233.6094 L206.1094,235.7656 L200.8438,235.7656 L200.8438,238.4375 L205.6094,238.4375 L205.6094,240.5938 L200.8438,240.5938 L200.8438,243.8438 L206.1094,243.8438 L206.1094,246 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="142" x="216" y="244.1543">thirdparty::ns1::color_t</text>
@@ -20,16 +20,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="193" y="295.8198">blue</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="188" x2="360" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="204" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="204" y="8"/>
       <ellipse cx="219" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M221.9688,29.6406 Q221.3906,29.9375 220.75,30.0781 Q220.1094,30.2344 219.4063,30.2344 Q216.9063,30.2344 215.5781,28.5938 Q214.2656,26.9375 214.2656,23.8125 Q214.2656,20.6875 215.5781,19.0313 Q216.9063,17.375 219.4063,17.375 Q220.1094,17.375 220.75,17.5313 Q221.4063,17.6875 221.9688,17.9844 L221.9688,20.7031 Q221.3438,20.125 220.75,19.8594 Q220.1563,19.5781 219.5313,19.5781 Q218.1875,19.5781 217.5,20.6563 Q216.8125,21.7188 216.8125,23.8125 Q216.8125,25.9063 217.5,26.9844 Q218.1875,28.0469 219.5313,28.0469 Q220.1563,28.0469 220.75,27.7813 Q221.3438,27.5 221.9688,26.9219 L221.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="108" x="233" y="28.1543">thirdparty::ns1::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
       <ellipse cx="1266" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1270.1094,246 L1262.3906,246 L1262.3906,233.6094 L1270.1094,233.6094 L1270.1094,235.7656 L1264.8438,235.7656 L1264.8438,238.4375 L1269.6094,238.4375 L1269.6094,240.5938 L1264.8438,240.5938 L1264.8438,243.8438 L1270.1094,243.8438 L1270.1094,246 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="1280" y="244.1543">property_t</text>
@@ -39,47 +39,47 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="1257" y="295.8198">property_c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1252" x2="1346" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
       <ellipse cx="787" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M789.9688,29.6406 Q789.3906,29.9375 788.75,30.0781 Q788.1094,30.2344 787.4063,30.2344 Q784.9063,30.2344 783.5781,28.5938 Q782.2656,26.9375 782.2656,23.8125 Q782.2656,20.6875 783.5781,19.0313 Q784.9063,17.375 787.4063,17.375 Q788.1094,17.375 788.75,17.5313 Q789.4063,17.6875 789.9688,17.9844 L789.9688,20.7031 Q789.3438,20.125 788.75,19.8594 Q788.1563,19.5781 787.5313,19.5781 Q786.1875,19.5781 785.5,20.6563 Q784.8125,21.7188 784.8125,23.8125 Q784.8125,25.9063 785.5,26.9844 Q786.1875,28.0469 787.5313,28.0469 Q788.1563,28.0469 788.75,27.7813 Q789.3438,27.5 789.9688,26.9219 L789.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="801" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
       <ellipse cx="1294" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1296.9688,29.6406 Q1296.3906,29.9375 1295.75,30.0781 Q1295.1094,30.2344 1294.4063,30.2344 Q1291.9063,30.2344 1290.5781,28.5938 Q1289.2656,26.9375 1289.2656,23.8125 Q1289.2656,20.6875 1290.5781,19.0313 Q1291.9063,17.375 1294.4063,17.375 Q1295.1094,17.375 1295.75,17.5313 Q1296.4063,17.6875 1296.9688,17.9844 L1296.9688,20.7031 Q1296.3438,20.125 1295.75,19.8594 Q1295.1563,19.5781 1294.5313,19.5781 Q1293.1875,19.5781 1292.5,20.6563 Q1291.8125,21.7188 1291.8125,23.8125 Q1291.8125,25.9063 1292.5,26.9844 Q1293.1875,28.0469 1294.5313,28.0469 Q1295.1563,28.0469 1295.75,27.7813 Q1296.3438,27.5 1296.9688,26.9219 L1296.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1308" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
       <ellipse cx="1899" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1901.9688,29.6406 Q1901.3906,29.9375 1900.75,30.0781 Q1900.1094,30.2344 1899.4063,30.2344 Q1896.9063,30.2344 1895.5781,28.5938 Q1894.2656,26.9375 1894.2656,23.8125 Q1894.2656,20.6875 1895.5781,19.0313 Q1896.9063,17.375 1899.4063,17.375 Q1900.1094,17.375 1900.75,17.5313 Q1901.4063,17.6875 1901.9688,17.9844 L1901.9688,20.7031 Q1901.3438,20.125 1900.75,19.8594 Q1900.1563,19.5781 1899.5313,19.5781 Q1898.1875,19.5781 1897.5,20.6563 Q1896.8125,21.7188 1896.8125,23.8125 Q1896.8125,25.9063 1897.5,26.9844 Q1898.1875,28.0469 1899.5313,28.0469 Q1900.1563,28.0469 1900.75,27.7813 Q1901.3438,27.5 1901.9688,26.9219 L1901.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1913" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
       <ellipse cx="1884.4" cy="252.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1887.3688,258.1406 Q1886.7906,258.4375 1886.15,258.5781 Q1885.5094,258.7344 1884.8063,258.7344 Q1882.3063,258.7344 1880.9781,257.0938 Q1879.6656,255.4375 1879.6656,252.3125 Q1879.6656,249.1875 1880.9781,247.5313 Q1882.3063,245.875 1884.8063,245.875 Q1885.5094,245.875 1886.15,246.0313 Q1886.8063,246.1875 1887.3688,246.4844 L1887.3688,249.2031 Q1886.7438,248.625 1886.15,248.3594 Q1885.5563,248.0781 1884.9313,248.0781 Q1883.5875,248.0781 1882.9,249.1563 Q1882.2125,250.2188 1882.2125,252.3125 Q1882.2125,254.4063 1882.9,255.4844 Q1883.5875,256.5469 1884.9313,256.5469 Q1885.5563,256.5469 1886.15,256.2813 Q1886.7438,256 1887.3688,255.4219 L1887.3688,258.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1903.6" y="256.6543">key_t</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="268.5" y2="268.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="276.5" y2="276.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1852" y="282.5"/>
       <ellipse cx="1857" cy="287.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="1866" y="290.7104">key : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
       <ellipse cx="966" cy="259" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M968.9688,264.6406 Q968.3906,264.9375 967.75,265.0781 Q967.1094,265.2344 966.4063,265.2344 Q963.9063,265.2344 962.5781,263.5938 Q961.2656,261.9375 961.2656,258.8125 Q961.2656,255.6875 962.5781,254.0313 Q963.9063,252.375 966.4063,252.375 Q967.1094,252.375 967.75,252.5313 Q968.4063,252.6875 968.9688,252.9844 L968.9688,255.7031 Q968.3438,255.125 967.75,254.8594 Q967.1563,254.5781 966.5313,254.5781 Q965.1875,254.5781 964.5,255.6563 Q963.8125,256.7188 963.8125,258.8125 Q963.8125,260.9063 964.5,261.9844 Q965.1875,263.0469 966.5313,263.0469 Q967.1563,263.0469 967.75,262.7813 Q968.3438,262.5 968.9688,261.9219 L968.9688,264.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="980" y="263.1543">map</text>
@@ -88,8 +88,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="275" y2="275"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="283" y2="283"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="35" y="136.1543">map</text>
@@ -98,8 +98,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
       <ellipse cx="592.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M595.4688,137.6406 Q594.8906,137.9375 594.25,138.0781 Q593.6094,138.2344 592.9063,138.2344 Q590.4063,138.2344 589.0781,136.5938 Q587.7656,134.9375 587.7656,131.8125 Q587.7656,128.6875 589.0781,127.0313 Q590.4063,125.375 592.9063,125.375 Q593.6094,125.375 594.25,125.5313 Q594.9063,125.6875 595.4688,125.9844 L595.4688,128.7031 Q594.8438,128.125 594.25,127.8594 Q593.6563,127.5781 593.0313,127.5781 Q591.6875,127.5781 591,128.6563 Q590.3125,129.7188 590.3125,131.8125 Q590.3125,133.9063 591,134.9844 Q591.6875,136.0469 593.0313,136.0469 Q593.6563,136.0469 594.25,135.7813 Q594.8438,135.5 595.4688,134.9219 L595.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="606.5" y="136.1543">map</text>
@@ -108,8 +108,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
       <ellipse cx="1056.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1059.4688,137.6406 Q1058.8906,137.9375 1058.25,138.0781 Q1057.6094,138.2344 1056.9063,138.2344 Q1054.4063,138.2344 1053.0781,136.5938 Q1051.7656,134.9375 1051.7656,131.8125 Q1051.7656,128.6875 1053.0781,127.0313 Q1054.4063,125.375 1056.9063,125.375 Q1057.6094,125.375 1058.25,125.5313 Q1058.9063,125.6875 1059.4688,125.9844 L1059.4688,128.7031 Q1058.8438,128.125 1058.25,127.8594 Q1057.6563,127.5781 1057.0313,127.5781 Q1055.6875,127.5781 1055,128.6563 Q1054.3125,129.7188 1054.3125,131.8125 Q1054.3125,133.9063 1055,134.9844 Q1055.6875,136.0469 1057.0313,136.0469 Q1057.6563,136.0469 1058.25,135.7813 Q1058.8438,135.5 1059.4688,134.9219 L1059.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1070.5" y="136.1543">map</text>
@@ -118,8 +118,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo49fvw7zjreu)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv5171cld8k1c)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
       <ellipse cx="1606.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1609.4688,137.6406 Q1608.8906,137.9375 1608.25,138.0781 Q1607.6094,138.2344 1606.9063,138.2344 Q1604.4063,138.2344 1603.0781,136.5938 Q1601.7656,134.9375 1601.7656,131.8125 Q1601.7656,128.6875 1603.0781,127.0313 Q1604.4063,125.375 1606.9063,125.375 Q1607.6094,125.375 1608.25,125.5313 Q1608.9063,125.6875 1609.4688,125.9844 L1609.4688,128.7031 Q1608.8438,128.125 1608.25,127.8594 Q1607.6563,127.5781 1607.0313,127.5781 Q1605.6875,127.5781 1605,128.6563 Q1604.3125,129.7188 1604.3125,131.8125 Q1604.3125,133.9063 1605,134.9844 Q1605.6875,136.0469 1607.0313,136.0469 Q1607.6563,136.0469 1608.25,135.7813 Q1608.8438,135.5 1609.4688,134.9219 L1609.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1620.5" y="136.1543">map</text>
diff --git a/docs/test_cases/t00038_class_mermaid.svg b/docs/test_cases/t00038_class_mermaid.svg
index f3d43227..fe74e7b8 100644
--- a/docs/test_cases/t00038_class_mermaid.svg
+++ b/docs/test_cases/t00038_class_mermaid.svg
@@ -202,7 +202,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L8">
+        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L8">
           <g title="color_t" id="classId-C_0000566782399856868761-0" class="node default clickable">
             <rect height="145" width="191.90625" y="-72.5" x="-95.953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="95.953125" x1="-95.953125" class="divider"/>
@@ -236,7 +236,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L10">
+        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L10">
           <g title="E" id="classId-C_0001642222718760881014-1" class="node default clickable">
             <rect height="57" width="149.234375" y="-28.5" x="-74.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6171875" x1="-74.6171875" class="divider"/>
@@ -255,7 +255,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L20">
+        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L20">
           <g title="property_t" id="classId-C_0000007376951310260829-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -289,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L22">
+        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L22">
           <g title="A" id="classId-C_0000790040432414172612-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -308,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L23">
+        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L23">
           <g title="B" id="classId-C_0001295970068907562690-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -327,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L24">
+        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L24">
           <g title="C" id="classId-C_0000154510361779680983-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -346,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L26">
+        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L26">
           <g title="key_t" id="classId-C_0000137163683637529037-6" class="node default clickable">
             <rect height="79" width="131.9375" y="-39.5" x="-65.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.96875" x1="-65.96875" class="divider"/>
@@ -370,7 +370,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L30">
+        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L30">
           <g title="map" id="classId-C_0001917560728132448300-7" class="node default clickable">
             <rect height="57" width="76.359375" y="-28.5" x="-38.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.1796875" x1="-38.1796875" class="divider"/>
@@ -389,7 +389,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L34">
+        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L34">
           <g title="map" id="classId-C_0001664022047310891203-8" class="node default clickable">
             <rect height="57" width="647.09375" y="-28.5" x="-323.546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="323.546875" x1="-323.546875" class="divider"/>
@@ -408,7 +408,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L37">
+        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L37">
           <g title="map" id="classId-C_0000307700801045535833-9" class="node default clickable">
             <rect height="57" width="509.34375" y="-28.5" x="-254.671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="254.671875" x1="-254.671875" class="divider"/>
@@ -427,7 +427,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L41">
+        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L41">
           <g title="map" id="classId-C_0000548231528417484191-10" class="node default clickable">
             <rect height="57" width="611.578125" y="-28.5" x="-305.7890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="305.7890625" x1="-305.7890625" class="divider"/>
@@ -446,7 +446,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00038/t00038.cc#L46">
+        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00038/t00038.cc#L46">
           <g title="map" id="classId-C_0001510200402118706005-11" class="node default clickable">
             <rect height="57" width="742.3125" y="-28.5" x="-371.15625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="371.15625" x1="-371.15625" class="divider"/>
diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg
index 8717a5f5..3690d535 100644
--- a/docs/test_cases/t00039_class.svg
+++ b/docs/test_cases/t00039_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="430px" preserveAspectRatio="none" style="width:622px;height:430px;" version="1.1" viewBox="0 0 622 430" width="622px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f15xq95jsh0npr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f19ibfpx5i6l7p" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
       <ellipse cx="31.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.4688,36.1406 Q33.8906,36.4375 33.25,36.5781 Q32.6094,36.7344 31.9063,36.7344 Q29.4063,36.7344 28.0781,35.0938 Q26.7656,33.4375 26.7656,30.3125 Q26.7656,27.1875 28.0781,25.5313 Q29.4063,23.875 31.9063,23.875 Q32.6094,23.875 33.25,24.0313 Q33.9063,24.1875 34.4688,24.4844 L34.4688,27.2031 Q33.8438,26.625 33.25,26.3594 Q32.6563,26.0781 32.0313,26.0781 Q30.6875,26.0781 30,27.1563 Q29.3125,28.2188 29.3125,30.3125 Q29.3125,32.4063 30,33.4844 Q30.6875,34.5469 32.0313,34.5469 Q32.6563,34.5469 33.25,34.2813 Q33.8438,34 34.4688,33.4219 L34.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="45.5" y="34.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
       <ellipse cx="113" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,36.1406 Q115.3906,36.4375 114.75,36.5781 Q114.1094,36.7344 113.4063,36.7344 Q110.9063,36.7344 109.5781,35.0938 Q108.2656,33.4375 108.2656,30.3125 Q108.2656,27.1875 109.5781,25.5313 Q110.9063,23.875 113.4063,23.875 Q114.1094,23.875 114.75,24.0313 Q115.4063,24.1875 115.9688,24.4844 L115.9688,27.2031 Q115.3438,26.625 114.75,26.3594 Q114.1563,26.0781 113.5313,26.0781 Q112.1875,26.0781 111.5,27.1563 Q110.8125,28.2188 110.8125,30.3125 Q110.8125,32.4063 111.5,33.4844 Q112.1875,34.5469 113.5313,34.5469 Q114.1563,34.5469 114.75,34.2813 Q115.3438,34 115.9688,33.4219 L115.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="127" y="34.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
       <ellipse cx="195.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M198.4688,36.1406 Q197.8906,36.4375 197.25,36.5781 Q196.6094,36.7344 195.9063,36.7344 Q193.4063,36.7344 192.0781,35.0938 Q190.7656,33.4375 190.7656,30.3125 Q190.7656,27.1875 192.0781,25.5313 Q193.4063,23.875 195.9063,23.875 Q196.6094,23.875 197.25,24.0313 Q197.9063,24.1875 198.4688,24.4844 L198.4688,27.2031 Q197.8438,26.625 197.25,26.3594 Q196.6563,26.0781 196.0313,26.0781 Q194.6875,26.0781 194,27.1563 Q193.3125,28.2188 193.3125,30.3125 Q193.3125,32.4063 194,33.4844 Q194.6875,34.5469 196.0313,34.5469 Q196.6563,34.5469 197.25,34.2813 Q197.8438,34 198.4688,33.4219 L198.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="209.5" y="34.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
       <ellipse cx="21" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,157.1406 Q23.3906,157.4375 22.75,157.5781 Q22.1094,157.7344 21.4063,157.7344 Q18.9063,157.7344 17.5781,156.0938 Q16.2656,154.4375 16.2656,151.3125 Q16.2656,148.1875 17.5781,146.5313 Q18.9063,144.875 21.4063,144.875 Q22.1094,144.875 22.75,145.0313 Q23.4063,145.1875 23.9688,145.4844 L23.9688,148.2031 Q23.3438,147.625 22.75,147.3594 Q22.1563,147.0781 21.5313,147.0781 Q20.1875,147.0781 19.5,148.1563 Q18.8125,149.2188 18.8125,151.3125 Q18.8125,153.4063 19.5,154.4844 Q20.1875,155.5469 21.5313,155.5469 Q22.1563,155.5469 22.75,155.2813 Q23.3438,155 23.9688,154.4219 L23.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="155.6543">CD</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
       <ellipse cx="197" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M199.9688,157.1406 Q199.3906,157.4375 198.75,157.5781 Q198.1094,157.7344 197.4063,157.7344 Q194.9063,157.7344 193.5781,156.0938 Q192.2656,154.4375 192.2656,151.3125 Q192.2656,148.1875 193.5781,146.5313 Q194.9063,144.875 197.4063,144.875 Q198.1094,144.875 198.75,145.0313 Q199.4063,145.1875 199.9688,145.4844 L199.9688,148.2031 Q199.3438,147.625 198.75,147.3594 Q198.1563,147.0781 197.5313,147.0781 Q196.1875,147.0781 195.5,148.1563 Q194.8125,149.2188 194.8125,151.3125 Q194.8125,153.4063 195.5,154.4844 Q196.1875,155.5469 197.5313,155.5469 Q198.1563,155.5469 198.75,155.2813 Q199.3438,155 199.9688,154.4219 L199.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="211" y="155.6543">DE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
       <ellipse cx="105" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,157.1406 Q107.3906,157.4375 106.75,157.5781 Q106.1094,157.7344 105.4063,157.7344 Q102.9063,157.7344 101.5781,156.0938 Q100.2656,154.4375 100.2656,151.3125 Q100.2656,148.1875 101.5781,146.5313 Q102.9063,144.875 105.4063,144.875 Q106.1094,144.875 106.75,145.0313 Q107.4063,145.1875 107.9688,145.4844 L107.9688,148.2031 Q107.3438,147.625 106.75,147.3594 Q106.1563,147.0781 105.5313,147.0781 Q104.1875,147.0781 103.5,148.1563 Q102.8125,149.2188 102.8125,151.3125 Q102.8125,153.4063 103.5,154.4844 Q104.1875,155.5469 105.5313,155.5469 Q106.1563,155.5469 106.75,155.2813 Q107.3438,155 107.9688,154.4219 L107.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="119" y="155.6543">CDE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
       <ellipse cx="285.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M288.4688,36.1406 Q287.8906,36.4375 287.25,36.5781 Q286.6094,36.7344 285.9063,36.7344 Q283.4063,36.7344 282.0781,35.0938 Q280.7656,33.4375 280.7656,30.3125 Q280.7656,27.1875 282.0781,25.5313 Q283.4063,23.875 285.9063,23.875 Q286.6094,23.875 287.25,24.0313 Q287.9063,24.1875 288.4688,24.4844 L288.4688,27.2031 Q287.8438,26.625 287.25,26.3594 Q286.6563,26.0781 286.0313,26.0781 Q284.6875,26.0781 284,27.1563 Q283.3125,28.2188 283.3125,30.3125 Q283.3125,32.4063 284,33.4844 Q284.6875,34.5469 286.0313,34.5469 Q286.6563,34.5469 287.25,34.2813 Q287.8438,34 288.4688,33.4219 L288.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.5" y="34.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
       <ellipse cx="281.5" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M284.4688,157.1406 Q283.8906,157.4375 283.25,157.5781 Q282.6094,157.7344 281.9063,157.7344 Q279.4063,157.7344 278.0781,156.0938 Q276.7656,154.4375 276.7656,151.3125 Q276.7656,148.1875 278.0781,146.5313 Q279.4063,144.875 281.9063,144.875 Q282.6094,144.875 283.25,145.0313 Q283.9063,145.1875 284.4688,145.4844 L284.4688,148.2031 Q283.8438,147.625 283.25,147.3594 Q282.6563,147.0781 282.0313,147.0781 Q280.6875,147.0781 280,148.1563 Q279.3125,149.2188 279.3125,151.3125 Q279.3125,153.4063 280,154.4844 Q280.6875,155.5469 282.0313,155.5469 Q282.6563,155.5469 283.25,155.2813 Q283.8438,155 284.4688,154.4219 L284.4688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="295.5" y="155.6543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
       <ellipse cx="277.15" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M280.1188,271.6406 Q279.5406,271.9375 278.9,272.0781 Q278.2594,272.2344 277.5563,272.2344 Q275.0563,272.2344 273.7281,270.5938 Q272.4156,268.9375 272.4156,265.8125 Q272.4156,262.6875 273.7281,261.0313 Q275.0563,259.375 277.5563,259.375 Q278.2594,259.375 278.9,259.5313 Q279.5563,259.6875 280.1188,259.9844 L280.1188,262.7031 Q279.4938,262.125 278.9,261.8594 Q278.3063,261.5781 277.6813,261.5781 Q276.3375,261.5781 275.65,262.6563 Q274.9625,263.7188 274.9625,265.8125 Q274.9625,267.9063 275.65,268.9844 Q276.3375,270.0469 277.6813,270.0469 Q278.3063,270.0469 278.9,269.7813 Q279.4938,269.5 280.1188,268.9219 L280.1188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="291.85" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="282" y2="282"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="290" y2="290"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="265" y="296"/>
       <ellipse cx="270" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="279" y="304.2104">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
       <ellipse cx="258" cy="387" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M260.9688,392.6406 Q260.3906,392.9375 259.75,393.0781 Q259.1094,393.2344 258.4063,393.2344 Q255.9063,393.2344 254.5781,391.5938 Q253.2656,389.9375 253.2656,386.8125 Q253.2656,383.6875 254.5781,382.0313 Q255.9063,380.375 258.4063,380.375 Q259.1094,380.375 259.75,380.5313 Q260.4063,380.6875 260.9688,380.9844 L260.9688,383.7031 Q260.3438,383.125 259.75,382.8594 Q259.1563,382.5781 258.5313,382.5781 Q257.1875,382.5781 256.5,383.6563 Q255.8125,384.7188 255.8125,386.8125 Q255.8125,388.9063 256.5,389.9844 Q257.1875,391.0469 258.5313,391.0469 Q259.1563,391.0469 259.75,390.7813 Q260.3438,390.5 260.9688,389.9219 L260.9688,392.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="272" y="391.1543">ns2::AAAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="403" y2="403"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
       <ellipse cx="462" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M464.9688,29.6406 Q464.3906,29.9375 463.75,30.0781 Q463.1094,30.2344 462.4063,30.2344 Q459.9063,30.2344 458.5781,28.5938 Q457.2656,26.9375 457.2656,23.8125 Q457.2656,20.6875 458.5781,19.0313 Q459.9063,17.375 462.4063,17.375 Q463.1094,17.375 463.75,17.5313 Q464.4063,17.6875 464.9688,17.9844 L464.9688,20.7031 Q464.3438,20.125 463.75,19.8594 Q463.1563,19.5781 462.5313,19.5781 Q461.1875,19.5781 460.5,20.6563 Q459.8125,21.7188 459.8125,23.8125 Q459.8125,25.9063 460.5,26.9844 Q461.1875,28.0469 462.5313,28.0469 Q463.1563,28.0469 463.75,27.7813 Q464.3438,27.5 464.9688,26.9219 L464.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="476" y="28.1543">ns3::F</text>
@@ -106,15 +106,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="453" y="54"/>
       <ellipse cx="458" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="467" y="62.2104">t : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
       <ellipse cx="382.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M385.4688,150.6406 Q384.8906,150.9375 384.25,151.0781 Q383.6094,151.2344 382.9063,151.2344 Q380.4063,151.2344 379.0781,149.5938 Q377.7656,147.9375 377.7656,144.8125 Q377.7656,141.6875 379.0781,140.0313 Q380.4063,138.375 382.9063,138.375 Q383.6094,138.375 384.25,138.5313 Q384.9063,138.6875 385.4688,138.9844 L385.4688,141.7031 Q384.8438,141.125 384.25,140.8594 Q383.6563,140.5781 383.0313,140.5781 Q381.6875,140.5781 381,141.6563 Q380.3125,142.7188 380.3125,144.8125 Q380.3125,146.9063 381,147.9844 Q381.6875,149.0469 383.0313,149.0469 Q383.6563,149.0469 384.25,148.7813 Q384.8438,148.5 385.4688,147.9219 L385.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="396.5" y="149.1543">ns3::FF</text>
@@ -123,15 +123,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="161" y2="161"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="169" y2="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="373.5" y="175"/>
       <ellipse cx="378.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="387.5" y="183.2104">m : M *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
       <ellipse cx="520" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,150.6406 Q522.3906,150.9375 521.75,151.0781 Q521.1094,151.2344 520.4063,151.2344 Q517.9063,151.2344 516.5781,149.5938 Q515.2656,147.9375 515.2656,144.8125 Q515.2656,141.6875 516.5781,140.0313 Q517.9063,138.375 520.4063,138.375 Q521.1094,138.375 521.75,138.5313 Q522.4063,138.6875 522.9688,138.9844 L522.9688,141.7031 Q522.3438,141.125 521.75,140.8594 Q521.1563,140.5781 520.5313,140.5781 Q519.1875,140.5781 518.5,141.6563 Q517.8125,142.7188 517.8125,144.8125 Q517.8125,146.9063 518.5,147.9844 Q519.1875,149.0469 520.5313,149.0469 Q521.1563,149.0469 521.75,148.7813 Q522.3438,148.5 522.9688,147.9219 L522.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="534" y="149.1543">ns3::FE</text>
@@ -140,15 +140,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="161" y2="161"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="169" y2="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="511" y="175"/>
       <ellipse cx="516" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="525" y="183.2104">m : M *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15xq95jsh0npr)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19ibfpx5i6l7p)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
       <ellipse cx="372.5" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M375.4688,271.6406 Q374.8906,271.9375 374.25,272.0781 Q373.6094,272.2344 372.9063,272.2344 Q370.4063,272.2344 369.0781,270.5938 Q367.7656,268.9375 367.7656,265.8125 Q367.7656,262.6875 369.0781,261.0313 Q370.4063,259.375 372.9063,259.375 Q373.6094,259.375 374.25,259.5313 Q374.9063,259.6875 375.4688,259.9844 L375.4688,262.7031 Q374.8438,262.125 374.25,261.8594 Q373.6563,261.5781 373.0313,261.5781 Q371.6875,261.5781 371,262.6563 Q370.3125,263.7188 370.3125,265.8125 Q370.3125,267.9063 371,268.9844 Q371.6875,270.0469 373.0313,270.0469 Q373.6563,270.0469 374.25,269.7813 Q374.8438,269.5 375.4688,268.9219 L375.4688,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="386.5" y="270.1543">ns3::FFF</text>
@@ -157,11 +157,11 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="282" y2="282"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="290" y2="290"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="296"/>
       <ellipse cx="368.5" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="377.5" y="304.2104">n : N *</text>
     </a>
     <path d="M34.31,82.88 C33.42,100.62 32.42,120.44 31.67,135.33 " fill="none" id="C_0000241234977032861936&lt;-C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00039_class_mermaid.svg b/docs/test_cases/t00039_class_mermaid.svg
index 1ce167e2..435b1f53 100644
--- a/docs/test_cases/t00039_class_mermaid.svg
+++ b/docs/test_cases/t00039_class_mermaid.svg
@@ -184,7 +184,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L6">
+        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L6">
           <g title="C" id="classId-C_0000241234977032861936-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L8">
+        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L8">
           <g title="D" id="classId-C_0001975187139659616784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L10">
+        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L10">
           <g title="E" id="classId-C_0001959131184346890363-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L16">
+        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L16">
           <g title="CD" id="classId-C_0000850483622527996929-3" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -260,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L18">
+        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L18">
           <g title="DE" id="classId-C_0001316022308303681160-4" class="node default clickable">
             <rect height="57" width="37.234375" y="-28.5" x="-18.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.6171875" x1="-18.6171875" class="divider"/>
@@ -279,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L20">
+        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L20">
           <g title="CDE" id="classId-C_0001877487144594774465-5" class="node default clickable">
             <rect height="57" width="48.78125" y="-28.5" x="-24.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.390625" x1="-24.390625" class="divider"/>
@@ -298,7 +298,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L22">
+        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L22">
           <g title="A" id="classId-C_0001051171525946759825-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -317,7 +317,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L24">
+        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L24">
           <g title="AA" id="classId-C_0001761969273600680013-7" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -336,7 +336,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L26">
+        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L26">
           <g title="AAA" id="classId-C_0002158483243842147804-8" class="node default clickable">
             <rect height="79" width="57.25" y="-39.5" x="-28.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.625" x1="-28.625" class="divider"/>
@@ -360,7 +360,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L31">
+        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L31">
           <g title="AAAA" id="classId-C_0001857294881176816154-9" class="node default clickable">
             <rect height="57" width="99.453125" y="-28.5" x="-49.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="49.7265625" x1="-49.7265625" class="divider"/>
@@ -379,7 +379,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L39">
+        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L39">
           <g title="F" id="classId-C_0000955785395599769805-10" class="node default clickable">
             <rect height="79" width="91.46875" y="-39.5" x="-45.734375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="45.734375" x1="-45.734375" class="divider"/>
@@ -403,7 +403,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L43">
+        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L43">
           <g title="FF" id="classId-C_0001321996888067531304-11" class="node default clickable">
             <rect height="79" width="117.234375" y="-39.5" x="-58.6171875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -427,7 +427,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L47">
+        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L47">
           <g title="FE" id="classId-C_0002008055732881129924-12" class="node default clickable">
             <rect height="79" width="118.140625" y="-39.5" x="-59.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="59.0703125" x1="-59.0703125" class="divider"/>
@@ -451,7 +451,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00039/t00039.cc#L51">
+        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00039/t00039.cc#L51">
           <g title="FFF" id="classId-C_0001617455840736919039-13" class="node default clickable">
             <rect height="79" width="143.015625" y="-39.5" x="-71.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.5078125" x1="-71.5078125" class="divider"/>
diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg
index 485e74a9..1f59a480 100644
--- a/docs/test_cases/t00040_class.svg
+++ b/docs/test_cases/t00040_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="334px" preserveAspectRatio="none" style="width:265px;height:334px;" version="1.1" viewBox="0 0 265 334" width="265px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fh31adiujgey3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f72b3mekx8hot" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,70 +9,70 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh31adiujgey3)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72b3mekx8hot)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
       <ellipse cx="50.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M53.9188,29.6406 Q53.3406,29.9375 52.7,30.0781 Q52.0594,30.2344 51.3563,30.2344 Q48.8563,30.2344 47.5281,28.5938 Q46.2156,26.9375 46.2156,23.8125 Q46.2156,20.6875 47.5281,19.0313 Q48.8563,17.375 51.3563,17.375 Q52.0594,17.375 52.7,17.5313 Q53.3563,17.6875 53.9188,17.9844 L53.9188,20.7031 Q53.2938,20.125 52.7,19.8594 Q52.1063,19.5781 51.4813,19.5781 Q50.1375,19.5781 49.45,20.6563 Q48.7625,21.7188 48.7625,23.8125 Q48.7625,25.9063 49.45,26.9844 Q50.1375,28.0469 51.4813,28.0469 Q52.1063,28.0469 52.7,27.7813 Q53.2938,27.5 53.9188,26.9219 L53.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="70.05" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <ellipse cx="24" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="54.2104">get_a() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="66.8047"/>
       <polygon fill="none" points="24,66.8047,28,70.8047,24,74.8047,20,70.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="33" y="75.0151">ii_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh31adiujgey3)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72b3mekx8hot)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
       <ellipse cx="49.5" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M52.4688,163.6406 Q51.8906,163.9375 51.25,164.0781 Q50.6094,164.2344 49.9063,164.2344 Q47.4063,164.2344 46.0781,162.5938 Q44.7656,160.9375 44.7656,157.8125 Q44.7656,154.6875 46.0781,153.0313 Q47.4063,151.375 49.9063,151.375 Q50.6094,151.375 51.25,151.5313 Q51.9063,151.6875 52.4688,151.9844 L52.4688,154.7031 Q51.8438,154.125 51.25,153.8594 Q50.6563,153.5781 50.0313,153.5781 Q48.6875,153.5781 48,154.6563 Q47.3125,155.7188 47.3125,157.8125 Q47.3125,159.9063 48,160.9844 Q48.6875,162.0469 50.0313,162.0469 Q50.6563,162.0469 51.25,161.7813 Q51.8438,161.5 52.4688,160.9219 L52.4688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="63.5" y="162.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="174" y2="174"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh31adiujgey3)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72b3mekx8hot)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
       <ellipse cx="43.05" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M46.0188,271.6406 Q45.4406,271.9375 44.8,272.0781 Q44.1594,272.2344 43.4563,272.2344 Q40.9563,272.2344 39.6281,270.5938 Q38.3156,268.9375 38.3156,265.8125 Q38.3156,262.6875 39.6281,261.0313 Q40.9563,259.375 43.4563,259.375 Q44.1594,259.375 44.8,259.5313 Q45.4563,259.6875 46.0188,259.9844 L46.0188,262.7031 Q45.3938,262.125 44.8,261.8594 Q44.2063,261.5781 43.5813,261.5781 Q42.2375,261.5781 41.55,262.6563 Q40.8625,263.7188 40.8625,265.8125 Q40.8625,267.9063 41.55,268.9844 Q42.2375,270.0469 43.5813,270.0469 Q44.2063,270.0469 44.8,269.7813 Q45.3938,269.5 46.0188,268.9219 L46.0188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="61.95" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="288"/>
       <ellipse cx="17" cy="293" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="26" y="296.2104">get_aaa() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="302.8047" y2="302.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="308.8047"/>
       <ellipse cx="17" cy="313.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="26" y="317.0151">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh31adiujgey3)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72b3mekx8hot)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
       <ellipse cx="188.25" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M191.2188,36.1406 Q190.6406,36.4375 190,36.5781 Q189.3594,36.7344 188.6563,36.7344 Q186.1563,36.7344 184.8281,35.0938 Q183.5156,33.4375 183.5156,30.3125 Q183.5156,27.1875 184.8281,25.5313 Q186.1563,23.875 188.6563,23.875 Q189.3594,23.875 190,24.0313 Q190.6563,24.1875 191.2188,24.4844 L191.2188,27.2031 Q190.5938,26.625 190,26.3594 Q189.4063,26.0781 188.7813,26.0781 Q187.4375,26.0781 186.75,27.1563 Q186.0625,28.2188 186.0625,30.3125 Q186.0625,32.4063 186.75,33.4844 Q187.4375,34.5469 188.7813,34.5469 Q189.4063,34.5469 190,34.2813 Q190.5938,34 191.2188,33.4219 L191.2188,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="208.75" y="34.6543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="46.5" y2="46.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="145" y="52.5"/>
       <ellipse cx="150" cy="57.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="159" y="60.7104">foo(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="67.3047" y2="67.3047"/>
diff --git a/docs/test_cases/t00040_class_mermaid.svg b/docs/test_cases/t00040_class_mermaid.svg
index f73719bd..82e3afbc 100644
--- a/docs/test_cases/t00040_class_mermaid.svg
+++ b/docs/test_cases/t00040_class_mermaid.svg
@@ -74,7 +74,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(69.5390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L5">
+        <a transform="translate(69.5390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L5">
           <g title="A" id="classId-C_0000307580006083737677-0" class="node default clickable">
             <rect height="101" width="105.28125" y="-50.5" x="-52.640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="52.640625" x1="-52.640625" class="divider"/>
@@ -103,7 +103,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.5390625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L18">
+        <a transform="translate(69.5390625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L18">
           <g title="AA" id="classId-C_0000534115812779766127-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -122,7 +122,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.5390625, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L22">
+        <a transform="translate(69.5390625, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L22">
           <g title="AAA" id="classId-C_0000745371908432158369-2" class="node default clickable">
             <rect height="101" width="123.078125" y="-50.5" x="-61.5390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="61.5390625" x1="-61.5390625" class="divider"/>
@@ -151,7 +151,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(239.046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00040/t00040.cc#L31">
+        <a transform="translate(239.046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00040/t00040.cc#L31">
           <g title="R" id="classId-C_0001539035020975101539-3" class="node default clickable">
             <rect height="79" width="133.734375" y="-39.5" x="-66.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="66.8671875" x1="-66.8671875" class="divider"/>
diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg
index 4bb4b9dc..bc11a084 100644
--- a/docs/test_cases/t00041_class.svg
+++ b/docs/test_cases/t00041_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="381px" preserveAspectRatio="none" style="width:427px;height:381px;" version="1.1" viewBox="0 0 427 381" width="427px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f186i87xpii2j2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fyfapnf3ioe0e" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,107 +9,107 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="57" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="57" y="14.5"/>
       <ellipse cx="72" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M74.9688,36.1406 Q74.3906,36.4375 73.75,36.5781 Q73.1094,36.7344 72.4063,36.7344 Q69.9063,36.7344 68.5781,35.0938 Q67.2656,33.4375 67.2656,30.3125 Q67.2656,27.1875 68.5781,25.5313 Q69.9063,23.875 72.4063,23.875 Q73.1094,23.875 73.75,24.0313 Q74.4063,24.1875 74.9688,24.4844 L74.9688,27.2031 Q74.3438,26.625 73.75,26.3594 Q73.1563,26.0781 72.5313,26.0781 Q71.1875,26.0781 70.5,27.1563 Q69.8125,28.2188 69.8125,30.3125 Q69.8125,32.4063 70.5,33.4844 Q71.1875,34.5469 72.5313,34.5469 Q73.1563,34.5469 73.75,34.2813 Q74.3438,34 74.9688,33.4219 L74.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="86" y="34.6543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="132" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="132" y="8"/>
       <ellipse cx="160.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.9188,29.6406 Q163.3406,29.9375 162.7,30.0781 Q162.0594,30.2344 161.3563,30.2344 Q158.8563,30.2344 157.5281,28.5938 Q156.2156,26.9375 156.2156,23.8125 Q156.2156,20.6875 157.5281,19.0313 Q158.8563,17.375 161.3563,17.375 Q162.0594,17.375 162.7,17.5313 Q163.3563,17.6875 163.9188,17.9844 L163.9188,20.7031 Q163.2938,20.125 162.7,19.8594 Q162.1063,19.5781 161.4813,19.5781 Q160.1375,19.5781 159.45,20.6563 Q158.7625,21.7188 158.7625,23.8125 Q158.7625,25.9063 159.45,26.9844 Q160.1375,28.0469 161.4813,28.0469 Q162.1063,28.0469 162.7,27.7813 Q163.2938,27.5 163.9188,26.9219 L163.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="178.05" y="28.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="54"/>
       <ellipse cx="143" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="152" y="62.2104">rr : RR *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="322"/>
       <ellipse cx="21" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,343.6406 Q23.3906,343.9375 22.75,344.0781 Q22.1094,344.2344 21.4063,344.2344 Q18.9063,344.2344 17.5781,342.5938 Q16.2656,340.9375 16.2656,337.8125 Q16.2656,334.6875 17.5781,333.0313 Q18.9063,331.375 21.4063,331.375 Q22.1094,331.375 22.75,331.5313 Q23.4063,331.6875 23.9688,331.9844 L23.9688,334.7031 Q23.3438,334.125 22.75,333.8594 Q22.1563,333.5781 21.5313,333.5781 Q20.1875,333.5781 19.5,334.6563 Q18.8125,335.7188 18.8125,337.8125 Q18.8125,339.9063 19.5,340.9844 Q20.1875,342.0469 21.5313,342.0469 Q22.1563,342.0469 22.75,341.7813 Q23.3438,341.5 23.9688,340.9219 L23.9688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="342.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="322"/>
       <ellipse cx="96.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M99.4688,343.6406 Q98.8906,343.9375 98.25,344.0781 Q97.6094,344.2344 96.9063,344.2344 Q94.4063,344.2344 93.0781,342.5938 Q91.7656,340.9375 91.7656,337.8125 Q91.7656,334.6875 93.0781,333.0313 Q94.4063,331.375 96.9063,331.375 Q97.6094,331.375 98.25,331.5313 Q98.9063,331.6875 99.4688,331.9844 L99.4688,334.7031 Q98.8438,334.125 98.25,333.8594 Q97.6563,333.5781 97.0313,333.5781 Q95.6875,333.5781 95,334.6563 Q94.3125,335.7188 94.3125,337.8125 Q94.3125,339.9063 95,340.9844 Q95.6875,342.0469 97.0313,342.0469 Q97.6563,342.0469 98.25,341.7813 Q98.8438,341.5 99.4688,340.9219 L99.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="110.5" y="342.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="99.2188" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="43" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="99.2188" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="43" y="146"/>
       <ellipse cx="88.75" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M91.7188,167.6406 Q91.1406,167.9375 90.5,168.0781 Q89.8594,168.2344 89.1563,168.2344 Q86.6563,168.2344 85.3281,166.5938 Q84.0156,164.9375 84.0156,161.8125 Q84.0156,158.6875 85.3281,157.0313 Q86.6563,155.375 89.1563,155.375 Q89.8594,155.375 90.5,155.5313 Q91.1563,155.6875 91.7188,155.9844 L91.7188,158.7031 Q91.0938,158.125 90.5,157.8594 Q89.9063,157.5781 89.2813,157.5781 Q87.9375,157.5781 87.25,158.6563 Q86.5625,159.7188 86.5625,161.8125 Q86.5625,163.9063 87.25,164.9844 Q87.9375,166.0469 89.2813,166.0469 Q89.9063,166.0469 90.5,165.7813 Q91.0938,165.5 91.7188,164.9219 L91.7188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="109.25" y="166.1543">RR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="184"/>
       <ellipse cx="54" cy="189" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="63" y="192.2104">foo(H * h) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="198.8047" y2="198.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="204.8047"/>
       <ellipse cx="54" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="63" y="213.0151">e : E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="217.6094"/>
       <ellipse cx="54" cy="222.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="63" y="225.8198">f : F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="230.4141"/>
       <ellipse cx="54" cy="235.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="77" x="63" y="238.6245">g : detail::G *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="322"/>
       <ellipse cx="171" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,343.6406 Q173.3906,343.9375 172.75,344.0781 Q172.1094,344.2344 171.4063,344.2344 Q168.9063,344.2344 167.5781,342.5938 Q166.2656,340.9375 166.2656,337.8125 Q166.2656,334.6875 167.5781,333.0313 Q168.9063,331.375 171.4063,331.375 Q172.1094,331.375 172.75,331.5313 Q173.4063,331.6875 173.9688,331.9844 L173.9688,334.7031 Q173.3438,334.125 172.75,333.8594 Q172.1563,333.5781 171.5313,333.5781 Q170.1875,333.5781 169.5,334.6563 Q168.8125,335.7188 168.8125,337.8125 Q168.8125,339.9063 169.5,340.9844 Q170.1875,342.0469 171.5313,342.0469 Q172.1563,342.0469 172.75,341.7813 Q173.3438,341.5 173.9688,340.9219 L173.9688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="185" y="342.1543">RRR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="289" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="289" y="14.5"/>
       <ellipse cx="304" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M306.9688,36.1406 Q306.3906,36.4375 305.75,36.5781 Q305.1094,36.7344 304.4063,36.7344 Q301.9063,36.7344 300.5781,35.0938 Q299.2656,33.4375 299.2656,30.3125 Q299.2656,27.1875 300.5781,25.5313 Q301.9063,23.875 304.4063,23.875 Q305.1094,23.875 305.75,24.0313 Q306.4063,24.1875 306.9688,24.4844 L306.9688,27.2031 Q306.3438,26.625 305.75,26.3594 Q305.1563,26.0781 304.5313,26.0781 Q303.1875,26.0781 302.5,27.1563 Q301.8125,28.2188 301.8125,30.3125 Q301.8125,32.4063 302.5,33.4844 Q303.1875,34.5469 304.5313,34.5469 Q305.1563,34.5469 305.75,34.2813 Q306.3438,34 306.9688,33.4219 L306.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="40" x="318" y="34.6543">ns1::N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="217.5" y="171.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="217.5" y="171.5"/>
       <ellipse cx="232.5" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.4688,193.1406 Q234.8906,193.4375 234.25,193.5781 Q233.6094,193.7344 232.9063,193.7344 Q230.4063,193.7344 229.0781,192.0938 Q227.7656,190.4375 227.7656,187.3125 Q227.7656,184.1875 229.0781,182.5313 Q230.4063,180.875 232.9063,180.875 Q233.6094,180.875 234.25,181.0313 Q234.9063,181.1875 235.4688,181.4844 L235.4688,184.2031 Q234.8438,183.625 234.25,183.3594 Q233.6563,183.0781 233.0313,183.0781 Q231.6875,183.0781 231,184.1563 Q230.3125,185.2188 230.3125,187.3125 Q230.3125,189.4063 231,190.4844 Q231.6875,191.5469 233.0313,191.5469 Q233.6563,191.5469 234.25,191.2813 Q234.8438,191 235.4688,190.4219 L235.4688,193.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="246.5" y="191.6543">ns1::NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="203.5" y2="203.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="211.5" y2="211.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f186i87xpii2j2)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="334" y="171.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyfapnf3ioe0e)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="334" y="171.5"/>
       <ellipse cx="349" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.9688,193.1406 Q351.3906,193.4375 350.75,193.5781 Q350.1094,193.7344 349.4063,193.7344 Q346.9063,193.7344 345.5781,192.0938 Q344.2656,190.4375 344.2656,187.3125 Q344.2656,184.1875 345.5781,182.5313 Q346.9063,180.875 349.4063,180.875 Q350.1094,180.875 350.75,181.0313 Q351.4063,181.1875 351.9688,181.4844 L351.9688,184.2031 Q351.3438,183.625 350.75,183.3594 Q350.1563,183.0781 349.5313,183.0781 Q348.1875,183.0781 347.5,184.1563 Q346.8125,185.2188 346.8125,187.3125 Q346.8125,189.4063 347.5,190.4844 Q348.1875,191.5469 349.5313,191.5469 Q350.1563,191.5469 350.75,191.2813 Q351.3438,191 351.9688,190.4219 L351.9688,193.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="50" x="363" y="191.6543">ns1::NM</text>
diff --git a/docs/test_cases/t00041_class_mermaid.svg b/docs/test_cases/t00041_class_mermaid.svg
index a73afadb..09b55765 100644
--- a/docs/test_cases/t00041_class_mermaid.svg
+++ b/docs/test_cases/t00041_class_mermaid.svg
@@ -130,7 +130,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L9">
+        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L9">
           <g title="R" id="classId-C_0000775317088453163919-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -149,7 +149,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L13">
+        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L13">
           <g title="D" id="classId-C_0001798851434286108347-1" class="node default clickable">
             <rect height="79" width="71.453125" y="-39.5" x="-35.7265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.7265625" x1="-35.7265625" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L17">
+        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L17">
           <g title="E" id="classId-C_0002158730167547707264-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -192,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L19">
+        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L19">
           <g title="F" id="classId-C_0000430600213408545846-3" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -211,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(112.609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L27">
+        <a transform="translate(112.609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L27">
           <g title="RR" id="classId-C_0000175608867682236642-4" class="node default clickable">
             <rect height="145" width="135.5" y="-72.5" x="-67.75" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="67.75" x1="-67.75" class="divider"/>
@@ -250,7 +250,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L35">
+        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L35">
           <g title="RRR" id="classId-C_0000819254010294444715-5" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -269,7 +269,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(369.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L38">
+        <a transform="translate(369.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L38">
           <g title="N" id="classId-C_0000220253364661036147-6" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -288,7 +288,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.53125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L40">
+        <a transform="translate(268.53125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L40">
           <g title="NN" id="classId-C_0000618038667214398895-7" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -307,7 +307,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(395.7578125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00041/t00041.cc#L42">
+        <a transform="translate(395.7578125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00041/t00041.cc#L42">
           <g title="NM" id="classId-C_0001206750351408617127-8" class="node default clickable">
             <rect height="57" width="78.109375" y="-28.5" x="-39.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.0546875" x1="-39.0546875" class="divider"/>
diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg
index 1569025d..ea89bd86 100644
--- a/docs/test_cases/t00042_class.svg
+++ b/docs/test_cases/t00042_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:489px;height:213px;" version="1.1" viewBox="0 0 489 213" width="489px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkjygwz40ktem" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f8imli1vzrco6" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8imli1vzrco6)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
       <ellipse cx="152.45" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.4188,157.1406 Q154.8406,157.4375 154.2,157.5781 Q153.5594,157.7344 152.8563,157.7344 Q150.3563,157.7344 149.0281,156.0938 Q147.7156,154.4375 147.7156,151.3125 Q147.7156,148.1875 149.0281,146.5313 Q150.3563,144.875 152.8563,144.875 Q153.5594,144.875 154.2,145.0313 Q154.8563,145.1875 155.4188,145.4844 L155.4188,148.2031 Q154.7938,147.625 154.2,147.3594 Q153.6063,147.0781 152.9813,147.0781 Q151.6375,147.0781 150.95,148.1563 Q150.2625,149.2188 150.2625,151.3125 Q150.2625,153.4063 150.95,154.4844 Q151.6375,155.5469 152.9813,155.5469 Q153.6063,155.5469 154.2,155.2813 Q154.7938,155 155.4188,154.4219 L155.4188,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.55" y="155.6543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="181.5"/>
       <ellipse cx="148" cy="186.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="157" y="189.7104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8imli1vzrco6)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
       <ellipse cx="25.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M28.0188,29.6406 Q27.4406,29.9375 26.8,30.0781 Q26.1594,30.2344 25.4563,30.2344 Q22.9563,30.2344 21.6281,28.5938 Q20.3156,26.9375 20.3156,23.8125 Q20.3156,20.6875 21.6281,19.0313 Q22.9563,17.375 25.4563,17.375 Q26.1594,17.375 26.8,17.5313 Q27.4563,17.6875 28.0188,17.9844 L28.0188,20.7031 Q27.3938,20.125 26.8,19.8594 Q26.2063,19.5781 25.5813,19.5781 Q24.2375,19.5781 23.55,20.6563 Q22.8625,21.7188 22.8625,23.8125 Q22.8625,25.9063 23.55,26.9844 Q24.2375,28.0469 25.5813,28.0469 Q26.2063,28.0469 26.8,27.7813 Q27.3938,27.5 28.0188,26.9219 L28.0188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.95" y="28.1543">A</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="62.2104">a : void *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8imli1vzrco6)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
       <ellipse cx="412.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M415.4688,150.6406 Q414.8906,150.9375 414.25,151.0781 Q413.6094,151.2344 412.9063,151.2344 Q410.4063,151.2344 409.0781,149.5938 Q407.7656,147.9375 407.7656,144.8125 Q407.7656,141.6875 409.0781,140.0313 Q410.4063,138.375 412.9063,138.375 Q413.6094,138.375 414.25,138.5313 Q414.9063,138.6875 415.4688,138.9844 L415.4688,141.7031 Q414.8438,141.125 414.25,140.8594 Q413.6563,140.5781 413.0313,140.5781 Q411.6875,140.5781 411,141.6563 Q410.3125,142.7188 410.3125,144.8125 Q410.3125,146.9063 411,147.9844 Q411.6875,149.0469 413.0313,149.0469 Q413.6563,149.0469 414.25,148.7813 Q414.8438,148.5 415.4688,147.9219 L415.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="426.5" y="149.1543">B</text>
@@ -53,22 +53,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="161" y2="161"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="169" y2="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="175"/>
       <ellipse cx="408.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="417.5" y="183.2104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="187.8047"/>
       <ellipse cx="408.5" cy="192.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="417.5" y="196.0151">bb : K</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8imli1vzrco6)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
       <ellipse cx="134.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M137.4688,36.1406 Q136.8906,36.4375 136.25,36.5781 Q135.6094,36.7344 134.9063,36.7344 Q132.4063,36.7344 131.0781,35.0938 Q129.7656,33.4375 129.7656,30.3125 Q129.7656,27.1875 131.0781,25.5313 Q132.4063,23.875 134.9063,23.875 Q135.6094,23.875 136.25,24.0313 Q136.9063,24.1875 137.4688,24.4844 L137.4688,27.2031 Q136.8438,26.625 136.25,26.3594 Q135.6563,26.0781 135.0313,26.0781 Q133.6875,26.0781 133,27.1563 Q132.3125,28.2188 132.3125,30.3125 Q132.3125,32.4063 133,33.4844 Q133.6875,34.5469 135.0313,34.5469 Q135.6563,34.5469 136.25,34.2813 Q136.8438,34 137.4688,33.4219 L137.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="148.5" y="34.6543">A</text>
@@ -77,8 +77,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8imli1vzrco6)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
       <ellipse cx="257" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.9688,36.1406 Q259.3906,36.4375 258.75,36.5781 Q258.1094,36.7344 257.4063,36.7344 Q254.9063,36.7344 253.5781,35.0938 Q252.2656,33.4375 252.2656,30.3125 Q252.2656,27.1875 253.5781,25.5313 Q254.9063,23.875 257.4063,23.875 Q258.1094,23.875 258.75,24.0313 Q259.4063,24.1875 259.9688,24.4844 L259.9688,27.2031 Q259.3438,26.625 258.75,26.3594 Q258.1563,26.0781 257.5313,26.0781 Q256.1875,26.0781 255.5,27.1563 Q254.8125,28.2188 254.8125,30.3125 Q254.8125,32.4063 255.5,33.4844 Q256.1875,34.5469 257.5313,34.5469 Q258.1563,34.5469 258.75,34.2813 Q259.3438,34 259.9688,33.4219 L259.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="34.6543">A</text>
@@ -87,8 +87,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkjygwz40ktem)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8imli1vzrco6)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
       <ellipse cx="398" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M400.9688,36.1406 Q400.3906,36.4375 399.75,36.5781 Q399.1094,36.7344 398.4063,36.7344 Q395.9063,36.7344 394.5781,35.0938 Q393.2656,33.4375 393.2656,30.3125 Q393.2656,27.1875 394.5781,25.5313 Q395.9063,23.875 398.4063,23.875 Q399.1094,23.875 399.75,24.0313 Q400.4063,24.1875 400.9688,24.4844 L400.9688,27.2031 Q400.3438,26.625 399.75,26.3594 Q399.1563,26.0781 398.5313,26.0781 Q397.1875,26.0781 396.5,27.1563 Q395.8125,28.2188 395.8125,30.3125 Q395.8125,32.4063 396.5,33.4844 Q397.1875,34.5469 398.5313,34.5469 Q399.1563,34.5469 399.75,34.2813 Q400.3438,34 400.9688,33.4219 L400.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="412" y="34.6543">B</text>
diff --git a/docs/test_cases/t00042_class_mermaid.svg b/docs/test_cases/t00042_class_mermaid.svg
index c9b59370..6a685df8 100644
--- a/docs/test_cases/t00042_class_mermaid.svg
+++ b/docs/test_cases/t00042_class_mermaid.svg
@@ -102,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000462160951579835462-0" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -126,7 +126,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L9">
+        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L9">
           <g title="A" id="classId-C_0001422802342059669545-1" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001414456934388678010-2" class="node default clickable">
             <rect height="101" width="69.25" y="-50.5" x="-34.625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.625" x1="-34.625" class="divider"/>
@@ -179,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000364538479078826988-3" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -198,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L5">
+        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000496773262538580186-4" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -217,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001833471931530161359-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg
index 3c82ea0e..af1fb66f 100644
--- a/docs/test_cases/t00043_class.svg
+++ b/docs/test_cases/t00043_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="645px" preserveAspectRatio="none" style="width:512px;height:645px;" version="1.1" viewBox="0 0 512 645" width="512px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f197p1jzp6tkel" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhsy43741fzv5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,167 +9,167 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f197p1jzp6tkel)" points="22,24,122,24,129,46.2969,304,46.2969,304,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhsy43741fzv5)" points="22,24,122,24,129,46.2969,304,46.2969,304,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f197p1jzp6tkel)" points="328,24,446,24,453,46.2969,490,46.2969,490,518.5,328,518.5,328,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhsy43741fzv5)" points="328,24,446,24,453,46.2969,490,46.2969,490,518.5,328,518.5,328,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="328" x2="453" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="332" y="38.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="144" y="569"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="144" y="569"/>
       <ellipse cx="159" cy="585" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M161.9688,590.6406 Q161.3906,590.9375 160.75,591.0781 Q160.1094,591.2344 159.4063,591.2344 Q156.9063,591.2344 155.5781,589.5938 Q154.2656,587.9375 154.2656,584.8125 Q154.2656,581.6875 155.5781,580.0313 Q156.9063,578.375 159.4063,578.375 Q160.1094,578.375 160.75,578.5313 Q161.4063,578.6875 161.9688,578.9844 L161.9688,581.7031 Q161.3438,581.125 160.75,580.8594 Q160.1563,580.5781 159.5313,580.5781 Q158.1875,580.5781 157.5,581.6563 Q156.8125,582.7188 156.8125,584.8125 Q156.8125,586.9063 157.5,587.9844 Q158.1875,589.0469 159.5313,589.0469 Q160.1563,589.0469 160.75,588.7813 Q161.3438,588.5 161.9688,587.9219 L161.9688,590.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="173" y="589.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="601" y2="601"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="609" y2="609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="184" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="184" y="448"/>
       <ellipse cx="227.8" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M230.7688,469.6406 Q230.1906,469.9375 229.55,470.0781 Q228.9094,470.2344 228.2063,470.2344 Q225.7063,470.2344 224.3781,468.5938 Q223.0656,466.9375 223.0656,463.8125 Q223.0656,460.6875 224.3781,459.0313 Q225.7063,457.375 228.2063,457.375 Q228.9094,457.375 229.55,457.5313 Q230.2063,457.6875 230.7688,457.9844 L230.7688,460.7031 Q230.1438,460.125 229.55,459.8594 Q228.9563,459.5781 228.3313,459.5781 Q226.9875,459.5781 226.3,460.6563 Q225.6125,461.7188 225.6125,463.8125 Q225.6125,465.9063 226.3,466.9844 Q226.9875,468.0469 228.3313,468.0469 Q228.9563,468.0469 229.55,467.7813 Q230.1438,467.5 230.7688,466.9219 L230.7688,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="248.2" y="468.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="480" y2="480"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="190" y="486"/>
       <ellipse cx="195" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="204" y="494.2104">b(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="500.8047" y2="500.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="111" x="37.5" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="111" x="37.5" y="448"/>
       <ellipse cx="80.85" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M83.8188,469.6406 Q83.2406,469.9375 82.6,470.0781 Q81.9594,470.2344 81.2563,470.2344 Q78.7563,470.2344 77.4281,468.5938 Q76.1156,466.9375 76.1156,463.8125 Q76.1156,460.6875 77.4281,459.0313 Q78.7563,457.375 81.2563,457.375 Q81.9594,457.375 82.6,457.5313 Q83.2563,457.6875 83.8188,457.9844 L83.8188,460.7031 Q83.1938,460.125 82.6,459.8594 Q82.0063,459.5781 81.3813,459.5781 Q80.0375,459.5781 79.35,460.6563 Q78.6625,461.7188 78.6625,463.8125 Q78.6625,465.9063 79.35,466.9844 Q80.0375,468.0469 81.3813,468.0469 Q82.0063,468.0469 82.6,467.7813 Q83.1938,467.5 83.8188,466.9219 L83.8188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="101.15" y="468.1543">BB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="480" y2="480"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="43.5" y="486"/>
       <ellipse cx="48.5" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="57.5" y="494.2104">bb(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="500.8047" y2="500.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="170" y="320.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="170" y="320.5"/>
       <ellipse cx="213.8" cy="336.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M216.7688,342.1406 Q216.1906,342.4375 215.55,342.5781 Q214.9094,342.7344 214.2063,342.7344 Q211.7063,342.7344 210.3781,341.0938 Q209.0656,339.4375 209.0656,336.3125 Q209.0656,333.1875 210.3781,331.5313 Q211.7063,329.875 214.2063,329.875 Q214.9094,329.875 215.55,330.0313 Q216.2063,330.1875 216.7688,330.4844 L216.7688,333.2031 Q216.1438,332.625 215.55,332.3594 Q214.9563,332.0781 214.3313,332.0781 Q212.9875,332.0781 212.3,333.1563 Q211.6125,334.2188 211.6125,336.3125 Q211.6125,338.4063 212.3,339.4844 Q212.9875,340.5469 214.3313,340.5469 Q214.9563,340.5469 215.55,340.2813 Q216.1438,340 216.7688,339.4219 L216.7688,342.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="234.2" y="340.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="176" y="358.5"/>
       <ellipse cx="181" cy="363.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="190" y="366.7104">c(B * b) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="373.3047" y2="373.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="77.5" y="180"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="77.5" y="180"/>
       <ellipse cx="132.25" cy="196" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M135.2188,201.6406 Q134.6406,201.9375 134,202.0781 Q133.3594,202.2344 132.6563,202.2344 Q130.1563,202.2344 128.8281,200.5938 Q127.5156,198.9375 127.5156,195.8125 Q127.5156,192.6875 128.8281,191.0313 Q130.1563,189.375 132.6563,189.375 Q133.3594,189.375 134,189.5313 Q134.6563,189.6875 135.2188,189.9844 L135.2188,192.7031 Q134.5938,192.125 134,191.8594 Q133.4063,191.5781 132.7813,191.5781 Q131.4375,191.5781 130.75,192.6563 Q130.0625,193.7188 130.0625,195.8125 Q130.0625,197.9063 130.75,198.9844 Q131.4375,200.0469 132.7813,200.0469 Q133.4063,200.0469 134,199.7813 Q134.5938,199.5 135.2188,198.9219 L135.2188,201.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="152.75" y="200.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="218"/>
       <ellipse cx="88.5" cy="223" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="97.5" y="226.2104">d(C * c) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="230.8047"/>
       <ellipse cx="88.5" cy="235.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="97.5" y="239.0151">dd(BB * bb) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="245.6094" y2="245.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="88.5" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="88.5" y="59"/>
       <ellipse cx="132.75" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M135.7188,80.6406 Q135.1406,80.9375 134.5,81.0781 Q133.8594,81.2344 133.1563,81.2344 Q130.6563,81.2344 129.3281,79.5938 Q128.0156,77.9375 128.0156,74.8125 Q128.0156,71.6875 129.3281,70.0313 Q130.6563,68.375 133.1563,68.375 Q133.8594,68.375 134.5,68.5313 Q135.1563,68.6875 135.7188,68.9844 L135.7188,71.7031 Q135.0938,71.125 134.5,70.8594 Q133.9063,70.5781 133.2813,70.5781 Q131.9375,70.5781 131.25,71.6563 Q130.5625,72.7188 130.5625,74.8125 Q130.5625,76.9063 131.25,77.9844 Q131.9375,79.0469 133.2813,79.0469 Q133.9063,79.0469 134.5,78.7813 Q135.0938,78.5 135.7188,77.9219 L135.7188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="153.25" y="79.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="91" y2="91"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="94.5" y="97"/>
       <ellipse cx="99.5" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="108.5" y="105.2104">e(D * d) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="111.8047" y2="111.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="345.5" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="345.5" y="454.5"/>
       <ellipse cx="360.5" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M363.4688,476.1406 Q362.8906,476.4375 362.25,476.5781 Q361.6094,476.7344 360.9063,476.7344 Q358.4063,476.7344 357.0781,475.0938 Q355.7656,473.4375 355.7656,470.3125 Q355.7656,467.1875 357.0781,465.5313 Q358.4063,463.875 360.9063,463.875 Q361.6094,463.875 362.25,464.0313 Q362.9063,464.1875 363.4688,464.4844 L363.4688,467.2031 Q362.8438,466.625 362.25,466.3594 Q361.6563,466.0781 361.0313,466.0781 Q359.6875,466.0781 359,467.1563 Q358.3125,468.2188 358.3125,470.3125 Q358.3125,472.4063 359,473.4844 Q359.6875,474.5469 361.0313,474.5469 Q361.6563,474.5469 362.25,474.2813 Q362.8438,474 363.4688,473.4219 L363.4688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="374.5" y="474.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="422" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="422" y="454.5"/>
       <ellipse cx="437" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M439.9688,476.1406 Q439.3906,476.4375 438.75,476.5781 Q438.1094,476.7344 437.4063,476.7344 Q434.9063,476.7344 433.5781,475.0938 Q432.2656,473.4375 432.2656,470.3125 Q432.2656,467.1875 433.5781,465.5313 Q434.9063,463.875 437.4063,463.875 Q438.1094,463.875 438.75,464.0313 Q439.4063,464.1875 439.9688,464.4844 L439.9688,467.2031 Q439.3438,466.625 438.75,466.3594 Q438.1563,466.0781 437.5313,466.0781 Q436.1875,466.0781 435.5,467.1563 Q434.8125,468.2188 434.8125,470.3125 Q434.8125,472.4063 435.5,473.4844 Q436.1875,474.5469 437.5313,474.5469 Q438.1563,474.5469 438.75,474.2813 Q439.3438,474 439.9688,473.4219 L439.9688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="451" y="474.6543">GG</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="344.5" y="314"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="344.5" y="314"/>
       <ellipse cx="400.25" cy="330" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M403.2188,335.6406 Q402.6406,335.9375 402,336.0781 Q401.3594,336.2344 400.6563,336.2344 Q398.1563,336.2344 396.8281,334.5938 Q395.5156,332.9375 395.5156,329.8125 Q395.5156,326.6875 396.8281,325.0313 Q398.1563,323.375 400.6563,323.375 Q401.3594,323.375 402,323.5313 Q402.6563,323.6875 403.2188,323.9844 L403.2188,326.7031 Q402.5938,326.125 402,325.8594 Q401.4063,325.5781 400.7813,325.5781 Q399.4375,325.5781 398.75,326.6563 Q398.0625,327.7188 398.0625,329.8125 Q398.0625,331.9063 398.75,332.9844 Q399.4375,334.0469 400.7813,334.0469 Q401.4063,334.0469 402,333.7813 Q402.5938,333.5 403.2188,332.9219 L403.2188,335.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="420.75" y="334.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="352"/>
       <ellipse cx="355.5" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="80" x="364.5" y="360.2104">h(G * g) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="364.8047"/>
       <ellipse cx="355.5" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="364.5" y="373.0151">hh(GG * gg) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="379.6094" y2="379.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="358.5" y="186.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="358.5" y="186.5"/>
       <ellipse cx="403.25" cy="202.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M406.2188,208.1406 Q405.6406,208.4375 405,208.5781 Q404.3594,208.7344 403.6563,208.7344 Q401.1563,208.7344 399.8281,207.0938 Q398.5156,205.4375 398.5156,202.3125 Q398.5156,199.1875 399.8281,197.5313 Q401.1563,195.875 403.6563,195.875 Q404.3594,195.875 405,196.0313 Q405.6563,196.1875 406.2188,196.4844 L406.2188,199.2031 Q405.5938,198.625 405,198.3594 Q404.4063,198.0781 403.7813,198.0781 Q402.4375,198.0781 401.75,199.1563 Q401.0625,200.2188 401.0625,202.3125 Q401.0625,204.4063 401.75,205.4844 Q402.4375,206.5469 403.7813,206.5469 Q404.4063,206.5469 405,206.2813 Q405.5938,206 406.2188,205.4219 L406.2188,208.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.75" y="206.6543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="218.5" y2="218.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="364.5" y="224.5"/>
       <ellipse cx="369.5" cy="229.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="378.5" y="232.7104">i(H * h) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="239.3047" y2="239.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f197p1jzp6tkel)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="363" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhsy43741fzv5)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="363" y="59"/>
       <ellipse cx="403.65" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M406.6188,80.6406 Q406.0406,80.9375 405.4,81.0781 Q404.7594,81.2344 404.0563,81.2344 Q401.5563,81.2344 400.2281,79.5938 Q398.9156,77.9375 398.9156,74.8125 Q398.9156,71.6875 400.2281,70.0313 Q401.5563,68.375 404.0563,68.375 Q404.7594,68.375 405.4,68.5313 Q406.0563,68.6875 406.6188,68.9844 L406.6188,71.7031 Q405.9938,71.125 405.4,70.8594 Q404.8063,70.5781 404.1813,70.5781 Q402.8375,70.5781 402.15,71.6563 Q401.4625,72.7188 401.4625,74.8125 Q401.4625,76.9063 402.15,77.9844 Q402.8375,79.0469 404.1813,79.0469 Q404.8063,79.0469 405.4,78.7813 Q405.9938,78.5 406.6188,77.9219 L406.6188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.35" y="79.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="91" y2="91"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="369" y="97"/>
       <ellipse cx="374" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="383" y="105.2104">i(I * i) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="111.8047" y2="111.8047"/>
diff --git a/docs/test_cases/t00043_class_mermaid.svg b/docs/test_cases/t00043_class_mermaid.svg
index 3e6c6a45..bafa8736 100644
--- a/docs/test_cases/t00043_class_mermaid.svg
+++ b/docs/test_cases/t00043_class_mermaid.svg
@@ -174,7 +174,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(162.890625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L4">
+        <a transform="translate(162.890625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L4">
           <g title="A" id="classId-C_0001454679300998460550-0" class="node default clickable">
             <rect height="57" width="127" y="-28.5" x="-63.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.5, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L6">
+        <a transform="translate(71.5, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L6">
           <g title="B" id="classId-C_0001972977265990430931-1" class="node default clickable">
             <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -217,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(254.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L10">
+        <a transform="translate(254.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L10">
           <g title="BB" id="classId-C_0001906291555025945295-2" class="node default clickable">
             <rect height="79" width="138.5625" y="-39.5" x="-69.28125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.28125" x1="-69.28125" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.5, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L14">
+        <a transform="translate(71.5, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L14">
           <g title="C" id="classId-C_0000823759225351121534-3" class="node default clickable">
             <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -265,7 +265,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(162.890625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L18">
+        <a transform="translate(162.890625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L18">
           <g title="D" id="classId-C_0002277976215348279426-4" class="node default clickable">
             <rect height="101" width="149.75" y="-50.5" x="-74.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -294,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(162.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L23">
+        <a transform="translate(162.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L23">
           <g title="E" id="classId-C_0001694685540293810116-5" class="node default clickable">
             <rect height="79" width="126.125" y="-39.5" x="-63.0625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.0625" x1="-63.0625" class="divider"/>
@@ -318,7 +318,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(445.96875, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L32">
+        <a transform="translate(445.96875, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L32">
           <g title="G" id="classId-C_0000736400571183204899-6" class="node default clickable">
             <rect height="57" width="144.8125" y="-28.5" x="-72.40625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.40625" x1="-72.40625" class="divider"/>
@@ -337,7 +337,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(647, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L34">
+        <a transform="translate(647, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L34">
           <g title="GG" id="classId-C_0001522297681294871411-7" class="node default clickable">
             <rect height="57" width="157.25" y="-28.5" x="-78.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="78.625" x1="-78.625" class="divider"/>
@@ -356,7 +356,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L36">
+        <a transform="translate(546.484375, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L36">
           <g title="H" id="classId-C_0001534191494825314170-8" class="node default clickable">
             <rect height="101" width="153.296875" y="-50.5" x="-76.6484375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="76.6484375" x1="-76.6484375" class="divider"/>
@@ -385,7 +385,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L45">
+        <a transform="translate(546.484375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L45">
           <g title="I" id="classId-C_0000097422543769740359-9" class="node default clickable">
             <rect height="79" width="136.8125" y="-39.5" x="-68.40625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.40625" x1="-68.40625" class="divider"/>
@@ -409,7 +409,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00043/t00043.cc#L49">
+        <a transform="translate(546.484375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00043/t00043.cc#L49">
           <g title="J" id="classId-C_0001498530043106438011-10" class="node default clickable">
             <rect height="79" width="141.265625" y="-39.5" x="-70.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="70.6328125" x1="-70.6328125" class="divider"/>
diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg
index c4273877..67538079 100644
--- a/docs/test_cases/t00044_class.svg
+++ b/docs/test_cases/t00044_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="594px" preserveAspectRatio="none" style="width:517px;height:594px;" version="1.1" viewBox="0 0 517 594" width="517px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fr13fm281tlrt" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhx4ev0421vb1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="248" y="426"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L9" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhx4ev0421vb1)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="248" y="426"/>
       <ellipse cx="263" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M265.9688,447.6406 Q265.3906,447.9375 264.75,448.0781 Q264.1094,448.2344 263.4063,448.2344 Q260.9063,448.2344 259.5781,446.5938 Q258.2656,444.9375 258.2656,441.8125 Q258.2656,438.6875 259.5781,437.0313 Q260.9063,435.375 263.4063,435.375 Q264.1094,435.375 264.75,435.5313 Q265.4063,435.6875 265.9688,435.9844 L265.9688,438.7031 Q265.3438,438.125 264.75,437.8594 Q264.1563,437.5781 263.5313,437.5781 Q262.1875,437.5781 261.5,438.6563 Q260.8125,439.7188 260.8125,441.8125 Q260.8125,443.9063 261.5,444.9844 Q262.1875,446.0469 263.5313,446.0469 Q264.1563,446.0469 264.75,445.7813 Q265.3438,445.5 265.9688,444.9219 L265.9688,447.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="277" y="446.1543">signal_handler</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="458" y2="458"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="466" y2="466"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="94.4141" id="C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhx4ev0421vb1)" height="94.4141" id="C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="6" y="255"/>
       <ellipse cx="21" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,276.6406 Q23.3906,276.9375 22.75,277.0781 Q22.1094,277.2344 21.4063,277.2344 Q18.9063,277.2344 17.5781,275.5938 Q16.2656,273.9375 16.2656,270.8125 Q16.2656,267.6875 17.5781,266.0313 Q18.9063,264.375 21.4063,264.375 Q22.1094,264.375 22.75,264.5313 Q23.4063,264.6875 23.9688,264.9844 L23.9688,267.7031 Q23.3438,267.125 22.75,266.8594 Q22.1563,266.5781 21.5313,266.5781 Q20.1875,266.5781 19.5,267.6563 Q18.8125,268.7188 18.8125,270.8125 Q18.8125,272.9063 19.5,273.9844 Q20.1875,275.0469 21.5313,275.0469 Q22.1563,275.0469 22.75,274.7813 Q23.3438,274.5 23.9688,273.9219 L23.9688,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="275.1543">sink</text>
@@ -28,26 +28,26 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="192" x="69" y="264.1387">signal_handler&lt;Ret(Args...),A&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
       <ellipse cx="17" cy="298" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="26" y="301.2104">sink(signal_t &amp; sh) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="258" y1="307.8047" y2="307.8047"/>
     <ellipse cx="17" cy="318.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="26" y="322.0151">get_signal&lt;CastTo&gt;() : CastTo *</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="328.6094" y2="328.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="334.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="336.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="26" y="342.8198">signal : signal_t *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="294" y="278"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhx4ev0421vb1)" height="48" id="C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="294" y="278"/>
       <ellipse cx="309" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M311.9688,299.6406 Q311.3906,299.9375 310.75,300.0781 Q310.1094,300.2344 309.4063,300.2344 Q306.9063,300.2344 305.5781,298.5938 Q304.2656,296.9375 304.2656,293.8125 Q304.2656,290.6875 305.5781,289.0313 Q306.9063,287.375 309.4063,287.375 Q310.1094,287.375 310.75,287.5313 Q311.4063,287.6875 311.9688,287.9844 L311.9688,290.7031 Q311.3438,290.125 310.75,289.8594 Q310.1563,289.5781 309.5313,289.5781 Q308.1875,289.5781 307.5,290.6563 Q306.8125,291.7188 306.8125,293.8125 Q306.8125,295.9063 307.5,296.9844 Q308.1875,298.0469 309.5313,298.0469 Q310.1563,298.0469 310.75,297.7813 Q311.3438,297.5 311.9688,296.9219 L311.9688,299.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="323" y="298.1543">signal_handler</text>
@@ -56,8 +56,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="310" y2="310"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="138" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhx4ev0421vb1)" height="48" id="C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="138" y="146"/>
       <ellipse cx="153" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.9688,167.6406 Q155.3906,167.9375 154.75,168.0781 Q154.1094,168.2344 153.4063,168.2344 Q150.9063,168.2344 149.5781,166.5938 Q148.2656,164.9375 148.2656,161.8125 Q148.2656,158.6875 149.5781,157.0313 Q150.9063,155.375 153.4063,155.375 Q154.1094,155.375 154.75,155.5313 Q155.4063,155.6875 155.9688,155.9844 L155.9688,158.7031 Q155.3438,158.125 154.75,157.8594 Q154.1563,157.5781 153.5313,157.5781 Q152.1875,157.5781 151.5,158.6563 Q150.8125,159.7188 150.8125,161.8125 Q150.8125,163.9063 151.5,164.9844 Q152.1875,166.0469 153.5313,166.0469 Q154.1563,166.0469 154.75,165.7813 Q155.3438,165.5 155.9688,164.9219 L155.9688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="167" y="166.1543">sink</text>
@@ -66,23 +66,23 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="60.8047" id="C_0001644484569399365272" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="121" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhx4ev0421vb1)" height="60.8047" id="C_0001644484569399365272" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="121" y="8"/>
       <ellipse cx="256.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.2188,29.6406 Q258.6406,29.9375 258,30.0781 Q257.3594,30.2344 256.6563,30.2344 Q254.1563,30.2344 252.8281,28.5938 Q251.5156,26.9375 251.5156,23.8125 Q251.5156,20.6875 252.8281,19.0313 Q254.1563,17.375 256.6563,17.375 Q257.3594,17.375 258,17.5313 Q258.6563,17.6875 259.2188,17.9844 L259.2188,20.7031 Q258.5938,20.125 258,19.8594 Q257.4063,19.5781 256.7813,19.5781 Q255.4375,19.5781 254.75,20.6563 Q254.0625,21.7188 254.0625,23.8125 Q254.0625,25.9063 254.75,26.9844 Q255.4375,28.0469 256.7813,28.0469 Q257.4063,28.0469 258,27.7813 Q258.5938,27.5 259.2188,26.9219 L259.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="276.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="127" y="54"/>
       <ellipse cx="132" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="261" x="141" y="62.2104">sink1 : sink&lt;signal_handler&lt;void (int),bool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="279.5" y="535"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhx4ev0421vb1)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="279.5" y="535"/>
       <ellipse cx="294.5" cy="551" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M297.4688,556.6406 Q296.8906,556.9375 296.25,557.0781 Q295.6094,557.2344 294.9063,557.2344 Q292.4063,557.2344 291.0781,555.5938 Q289.7656,553.9375 289.7656,550.8125 Q289.7656,547.6875 291.0781,546.0313 Q292.4063,544.375 294.9063,544.375 Q295.6094,544.375 296.25,544.5313 Q296.9063,544.6875 297.4688,544.9844 L297.4688,547.7031 Q296.8438,547.125 296.25,546.8594 Q295.6563,546.5781 295.0313,546.5781 Q293.6875,546.5781 293,547.6563 Q292.3125,548.7188 292.3125,550.8125 Q292.3125,552.9063 293,553.9844 Q293.6875,555.0469 295.0313,555.0469 Q295.6563,555.0469 296.25,554.7813 Q296.8438,554.5 297.4688,553.9219 L297.4688,556.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="308.5" y="555.1543">signal_handler</text>
@@ -91,8 +91,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="567" y2="567"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="575" y2="575"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr13fm281tlrt)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="98.5" y="426"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhx4ev0421vb1)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="98.5" y="426"/>
       <ellipse cx="113.5" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M116.4688,447.6406 Q115.8906,447.9375 115.25,448.0781 Q114.6094,448.2344 113.9063,448.2344 Q111.4063,448.2344 110.0781,446.5938 Q108.7656,444.9375 108.7656,441.8125 Q108.7656,438.6875 110.0781,437.0313 Q111.4063,435.375 113.9063,435.375 Q114.6094,435.375 115.25,435.5313 Q115.9063,435.6875 116.4688,435.9844 L116.4688,438.7031 Q115.8438,438.125 115.25,437.8594 Q114.6563,437.5781 114.0313,437.5781 Q112.6875,437.5781 112,438.6563 Q111.3125,439.7188 111.3125,441.8125 Q111.3125,443.9063 112,444.9844 Q112.6875,446.0469 114.0313,446.0469 Q114.6563,446.0469 115.25,445.7813 Q115.8438,445.5 116.4688,444.9219 L116.4688,447.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="127.5" y="446.1543">sink</text>
diff --git a/docs/test_cases/t00044_class_mermaid.svg b/docs/test_cases/t00044_class_mermaid.svg
index 0edaa5eb..049ce887 100644
--- a/docs/test_cases/t00044_class_mermaid.svg
+++ b/docs/test_cases/t00044_class_mermaid.svg
@@ -138,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9">
+        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L9">
           <g title="signal_handler" id="classId-C_0001591729735727316875-0" class="node default clickable">
             <rect height="57" width="248.84375" y="-28.5" x="-124.421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="124.421875" x1="-124.421875" class="divider"/>
@@ -157,7 +157,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L9">
+        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L9">
           <g title="sink" id="classId-C_0000559574389062594251-1" class="node default clickable">
             <rect height="123" width="299.546875" y="-61.5" x="-149.7734375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="149.7734375" x1="-149.7734375" class="divider"/>
@@ -191,7 +191,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4">
+        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4">
           <g title="signal_handler" id="classId-C_0000103559998624864011-2" class="node default clickable">
             <rect height="57" width="247.921875" y="-28.5" x="-123.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="123.9609375" x1="-123.9609375" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4">
+        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001718007222067272862-3" class="node default clickable">
             <rect height="57" width="298.625" y="-28.5" x="-149.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.3125" x1="-149.3125" class="divider"/>
@@ -229,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L33">
+        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L33">
           <g title="R" id="classId-C_0001644484569399365272-4" class="node default clickable">
             <rect height="79" width="340.984375" y="-39.5" x="-170.4921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="170.4921875" x1="-170.4921875" class="divider"/>
@@ -253,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L6">
+        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L6">
           <g title="signal_handler" id="classId-C_0000276594465967577895-5" class="node default clickable">
             <rect height="57" width="170.609375" y="-28.5" x="-85.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.3046875" x1="-85.3046875" class="divider"/>
@@ -272,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00044/t00044.cc#L4">
+        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001759724482769288325-6" class="node default clickable">
             <rect height="57" width="75.484375" y="-28.5" x="-37.7421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="37.7421875" x1="-37.7421875" class="divider"/>
diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg
index 5be5be00..04eb02c3 100644
--- a/docs/test_cases/t00045_class.svg
+++ b/docs/test_cases/t00045_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="365px" preserveAspectRatio="none" style="width:670px;height:365px;" version="1.1" viewBox="0 0 670 365" width="670px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1dv2vlcayt093" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f17h73rdmnf3jl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,32 +9,32 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
       <ellipse cx="52" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M54.9688,218.6406 Q54.3906,218.9375 53.75,219.0781 Q53.1094,219.2344 52.4063,219.2344 Q49.9063,219.2344 48.5781,217.5938 Q47.2656,215.9375 47.2656,212.8125 Q47.2656,209.6875 48.5781,208.0313 Q49.9063,206.375 52.4063,206.375 Q53.1094,206.375 53.75,206.5313 Q54.4063,206.6875 54.9688,206.9844 L54.9688,209.7031 Q54.3438,209.125 53.75,208.8594 Q53.1563,208.5781 52.5313,208.5781 Q51.1875,208.5781 50.5,209.6563 Q49.8125,210.7188 49.8125,212.8125 Q49.8125,214.9063 50.5,215.9844 Q51.1875,217.0469 52.5313,217.0469 Q53.1563,217.0469 53.75,216.7813 Q54.3438,216.5 54.9688,215.9219 L54.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="66" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
       <ellipse cx="127" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M129.9688,218.6406 Q129.3906,218.9375 128.75,219.0781 Q128.1094,219.2344 127.4063,219.2344 Q124.9063,219.2344 123.5781,217.5938 Q122.2656,215.9375 122.2656,212.8125 Q122.2656,209.6875 123.5781,208.0313 Q124.9063,206.375 127.4063,206.375 Q128.1094,206.375 128.75,206.5313 Q129.4063,206.6875 129.9688,206.9844 L129.9688,209.7031 Q129.3438,209.125 128.75,208.8594 Q128.1563,208.5781 127.5313,208.5781 Q126.1875,208.5781 125.5,209.6563 Q124.8125,210.7188 124.8125,212.8125 Q124.8125,214.9063 125.5,215.9844 Q126.1875,217.0469 127.5313,217.0469 Q128.1563,217.0469 128.75,216.7813 Q129.3438,216.5 129.9688,215.9219 L129.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="141" y="217.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
       <ellipse cx="210" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M212.9688,218.6406 Q212.3906,218.9375 211.75,219.0781 Q211.1094,219.2344 210.4063,219.2344 Q207.9063,219.2344 206.5781,217.5938 Q205.2656,215.9375 205.2656,212.8125 Q205.2656,209.6875 206.5781,208.0313 Q207.9063,206.375 210.4063,206.375 Q211.1094,206.375 211.75,206.5313 Q212.4063,206.6875 212.9688,206.9844 L212.9688,209.7031 Q212.3438,209.125 211.75,208.8594 Q211.1563,208.5781 210.5313,208.5781 Q209.1875,208.5781 208.5,209.6563 Q207.8125,210.7188 207.8125,212.8125 Q207.8125,214.9063 208.5,215.9844 Q209.1875,217.0469 210.5313,217.0469 Q211.1563,217.0469 211.75,216.7813 Q212.3438,216.5 212.9688,215.9219 L212.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="224" y="217.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
       <ellipse cx="409.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M412.4688,55.1406 Q411.8906,55.4375 411.25,55.5781 Q410.6094,55.7344 409.9063,55.7344 Q407.4063,55.7344 406.0781,54.0938 Q404.7656,52.4375 404.7656,49.3125 Q404.7656,46.1875 406.0781,44.5313 Q407.4063,42.875 409.9063,42.875 Q410.6094,42.875 411.25,43.0313 Q411.9063,43.1875 412.4688,43.4844 L412.4688,46.2031 Q411.8438,45.625 411.25,45.3594 Q410.6563,45.0781 410.0313,45.0781 Q408.6875,45.0781 408,46.1563 Q407.3125,47.2188 407.3125,49.3125 Q407.3125,51.4063 408,52.4844 Q408.6875,53.5469 410.0313,53.5469 Q410.6563,53.5469 411.25,53.2813 Q411.8438,53 412.4688,52.4219 L412.4688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="423.5" y="53.6543">AAAA</text>
@@ -43,110 +43,110 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="79.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="402.5" y="81.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="414.5" y="87.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
       <ellipse cx="304.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M307.4688,218.6406 Q306.8906,218.9375 306.25,219.0781 Q305.6094,219.2344 304.9063,219.2344 Q302.4063,219.2344 301.0781,217.5938 Q299.7656,215.9375 299.7656,212.8125 Q299.7656,209.6875 301.0781,208.0313 Q302.4063,206.375 304.9063,206.375 Q305.6094,206.375 306.25,206.5313 Q306.9063,206.6875 307.4688,206.9844 L307.4688,209.7031 Q306.8438,209.125 306.25,208.8594 Q305.6563,208.5781 305.0313,208.5781 Q303.6875,208.5781 303,209.6563 Q302.3125,210.7188 302.3125,212.8125 Q302.3125,214.9063 303,215.9844 Q303.6875,217.0469 305.0313,217.0469 Q305.6563,217.0469 306.25,216.7813 Q306.8438,216.5 307.4688,215.9219 L307.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="318.5" y="217.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
       <ellipse cx="438" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M440.9688,218.6406 Q440.3906,218.9375 439.75,219.0781 Q439.1094,219.2344 438.4063,219.2344 Q435.9063,219.2344 434.5781,217.5938 Q433.2656,215.9375 433.2656,212.8125 Q433.2656,209.6875 434.5781,208.0313 Q435.9063,206.375 438.4063,206.375 Q439.1094,206.375 439.75,206.5313 Q440.4063,206.6875 440.9688,206.9844 L440.9688,209.7031 Q440.3438,209.125 439.75,208.8594 Q439.1563,208.5781 438.5313,208.5781 Q437.1875,208.5781 436.5,209.6563 Q435.8125,210.7188 435.8125,212.8125 Q435.8125,214.9063 436.5,215.9844 Q437.1875,217.0469 438.5313,217.0469 Q439.1563,217.0469 439.75,216.7813 Q440.3438,216.5 440.9688,215.9219 L440.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="452" y="217.1543">ns1::ns2::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
       <ellipse cx="434" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M436.9688,327.6406 Q436.3906,327.9375 435.75,328.0781 Q435.1094,328.2344 434.4063,328.2344 Q431.9063,328.2344 430.5781,326.5938 Q429.2656,324.9375 429.2656,321.8125 Q429.2656,318.6875 430.5781,317.0313 Q431.9063,315.375 434.4063,315.375 Q435.1094,315.375 435.75,315.5313 Q436.4063,315.6875 436.9688,315.9844 L436.9688,318.7031 Q436.3438,318.125 435.75,317.8594 Q435.1563,317.5781 434.5313,317.5781 Q433.1875,317.5781 432.5,318.6563 Q431.8125,319.7188 431.8125,321.8125 Q431.8125,323.9063 432.5,324.9844 Q433.1875,326.0469 434.5313,326.0469 Q435.1563,326.0469 435.75,325.7813 Q436.3438,325.5 436.9688,324.9219 L436.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="448" y="326.1543">ns1::ns2::B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
       <ellipse cx="289" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M291.9688,327.6406 Q291.3906,327.9375 290.75,328.0781 Q290.1094,328.2344 289.4063,328.2344 Q286.9063,328.2344 285.5781,326.5938 Q284.2656,324.9375 284.2656,321.8125 Q284.2656,318.6875 285.5781,317.0313 Q286.9063,315.375 289.4063,315.375 Q290.1094,315.375 290.75,315.5313 Q291.4063,315.6875 291.9688,315.9844 L291.9688,318.7031 Q291.3438,318.125 290.75,317.8594 Q290.1563,317.5781 289.5313,317.5781 Q288.1875,317.5781 287.5,318.6563 Q286.8125,319.7188 286.8125,321.8125 Q286.8125,323.9063 287.5,324.9844 Q288.1875,326.0469 289.5313,326.0469 Q290.1563,326.0469 290.75,325.7813 Q291.3438,325.5 291.9688,324.9219 L291.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="303" y="326.1543">ns1::ns2::C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
       <ellipse cx="571.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M574.4688,327.6406 Q573.8906,327.9375 573.25,328.0781 Q572.6094,328.2344 571.9063,328.2344 Q569.4063,328.2344 568.0781,326.5938 Q566.7656,324.9375 566.7656,321.8125 Q566.7656,318.6875 568.0781,317.0313 Q569.4063,315.375 571.9063,315.375 Q572.6094,315.375 573.25,315.5313 Q573.9063,315.6875 574.4688,315.9844 L574.4688,318.7031 Q573.8438,318.125 573.25,317.8594 Q572.6563,317.5781 572.0313,317.5781 Q570.6875,317.5781 570,318.6563 Q569.3125,319.7188 569.3125,321.8125 Q569.3125,323.9063 570,324.9844 Q570.6875,326.0469 572.0313,326.0469 Q572.6563,326.0469 573.25,325.7813 Q573.8438,325.5 574.4688,324.9219 L574.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="585.5" y="326.1543">ns1::ns2::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
       <ellipse cx="21" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,327.6406 Q23.3906,327.9375 22.75,328.0781 Q22.1094,328.2344 21.4063,328.2344 Q18.9063,328.2344 17.5781,326.5938 Q16.2656,324.9375 16.2656,321.8125 Q16.2656,318.6875 17.5781,317.0313 Q18.9063,315.375 21.4063,315.375 Q22.1094,315.375 22.75,315.5313 Q23.4063,315.6875 23.9688,315.9844 L23.9688,318.7031 Q23.3438,318.125 22.75,317.8594 Q22.1563,317.5781 21.5313,317.5781 Q20.1875,317.5781 19.5,318.6563 Q18.8125,319.7188 18.8125,321.8125 Q18.8125,323.9063 19.5,324.9844 Q20.1875,326.0469 21.5313,326.0469 Q22.1563,326.0469 22.75,325.7813 Q23.3438,325.5 23.9688,324.9219 L23.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="35" y="326.1543">ns1::ns2::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
       <ellipse cx="520" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,61.6406 Q522.3906,61.9375 521.75,62.0781 Q521.1094,62.2344 520.4063,62.2344 Q517.9063,62.2344 516.5781,60.5938 Q515.2656,58.9375 515.2656,55.8125 Q515.2656,52.6875 516.5781,51.0313 Q517.9063,49.375 520.4063,49.375 Q521.1094,49.375 521.75,49.5313 Q522.4063,49.6875 522.9688,49.9844 L522.9688,52.7031 Q522.3438,52.125 521.75,51.8594 Q521.1563,51.5781 520.5313,51.5781 Q519.1875,51.5781 518.5,52.6563 Q517.8125,53.7188 517.8125,55.8125 Q517.8125,57.9063 518.5,58.9844 Q519.1875,60.0469 520.5313,60.0469 Q521.1563,60.0469 521.75,59.7813 Q522.3438,59.5 522.9688,58.9219 L522.9688,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="534" y="60.1543">ns1::ns2::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="72" y2="72"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="80" y2="80"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dv2vlcayt093)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17h73rdmnf3jl)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
       <ellipse cx="232.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,29.6406 Q235.1406,29.9375 234.5,30.0781 Q233.8594,30.2344 233.1563,30.2344 Q230.6563,30.2344 229.3281,28.5938 Q228.0156,26.9375 228.0156,23.8125 Q228.0156,20.6875 229.3281,19.0313 Q230.6563,17.375 233.1563,17.375 Q233.8594,17.375 234.5,17.5313 Q235.1563,17.6875 235.7188,17.9844 L235.7188,20.7031 Q235.0938,20.125 234.5,19.8594 Q233.9063,19.5781 233.2813,19.5781 Q231.9375,19.5781 231.25,20.6563 Q230.5625,21.7188 230.5625,23.8125 Q230.5625,25.9063 231.25,26.9844 Q231.9375,28.0469 233.2813,28.0469 Q233.9063,28.0469 234.5,27.7813 Q235.0938,27.5 235.7188,26.9219 L235.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="253.25" y="28.1543">ns1::ns2::R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="46"/>
       <ellipse cx="196" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="205" y="54.2104">foo(AA &amp; aa) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="66.8047"/>
       <ellipse cx="196" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="205" y="75.0151">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="79.6094"/>
       <ellipse cx="196" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="205" y="87.8198">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="92.4141"/>
       <ellipse cx="196" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="205" y="100.6245">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="105.2188"/>
       <ellipse cx="196" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="205" y="113.4292">root_a : ::A *</text>
     </a>
     <path d="M472.37,265.58 C471.86,279.36 471.31,294.06 470.87,305.83 " fill="none" id="C_0002207007194029669343&lt;-C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00045_class_mermaid.svg b/docs/test_cases/t00045_class_mermaid.svg
index 32b5fb6f..d4b81a7a 100644
--- a/docs/test_cases/t00045_class_mermaid.svg
+++ b/docs/test_cases/t00045_class_mermaid.svg
@@ -166,7 +166,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L1">
+        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L1">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -185,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L3">
+        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L3">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -204,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L5">
+        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L5">
           <g title="AAA" id="classId-C_0000054164402597771463-2" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L7">
+        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L7">
           <g title="AAAA" id="classId-C_0000375905626569465019-3" class="node default clickable">
             <rect height="79" width="89.6875" y="-39.5" x="-44.84375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.84375" x1="-44.84375" class="divider"/>
@@ -247,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L13">
+        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L13">
           <g title="A" id="classId-C_0000619642232943663499-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -266,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L17">
+        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L17">
           <g title="A" id="classId-C_0002207007194029669343-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -285,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L19">
+        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L19">
           <g title="B" id="classId-C_0000204051985124373077-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -304,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L21">
+        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L21">
           <g title="C" id="classId-C_0001837009554564742531-7" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L23">
+        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L23">
           <g title="D" id="classId-C_0002029929560931799980-8" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -342,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L25">
+        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L25">
           <g title="E" id="classId-C_0002305358535757579772-9" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -361,7 +361,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L27">
+        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L27">
           <g title="AAA" id="classId-C_0001731264248793686366-10" class="node default clickable">
             <rect height="57" width="126.125" y="-28.5" x="-63.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.0625" x1="-63.0625" class="divider"/>
@@ -380,7 +380,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00045/t00045.cc#L29">
+        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00045/t00045.cc#L29">
           <g title="R" id="classId-C_0000974430595320588991-11" class="node default clickable">
             <rect height="167" width="196.015625" y="-83.5" x="-98.0078125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="98.0078125" x1="-98.0078125" class="divider"/>
diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg
index 22273711..85046385 100644
--- a/docs/test_cases/t00046_class.svg
+++ b/docs/test_cases/t00046_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="616px" preserveAspectRatio="none" style="width:586px;height:616px;" version="1.1" viewBox="0 0 586 616" width="586px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2b8isq445f1y" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1oum19zoi1wkg" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,120 +9,120 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f2b8isq445f1y)" points="22,24,57,24,64,46.2969,436,46.2969,436,604,22,604,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1oum19zoi1wkg)" points="22,24,57,24,64,46.2969,436,46.2969,436,604,22,604,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f2b8isq445f1y)" points="46,170,81,170,88,192.2969,412,192.2969,412,580,46,580,46,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1oum19zoi1wkg)" points="46,170,81,170,88,192.2969,412,192.2969,412,580,46,580,46,170" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="88" y1="192.2969" y2="192.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="50" y="184.9951">ns2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="108" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="108" y="59"/>
       <ellipse cx="123" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M125.9688,80.6406 Q125.3906,80.9375 124.75,81.0781 Q124.1094,81.2344 123.4063,81.2344 Q120.9063,81.2344 119.5781,79.5938 Q118.2656,77.9375 118.2656,74.8125 Q118.2656,71.6875 119.5781,70.0313 Q120.9063,68.375 123.4063,68.375 Q124.1094,68.375 124.75,68.5313 Q125.4063,68.6875 125.9688,68.9844 L125.9688,71.7031 Q125.3438,71.125 124.75,70.8594 Q124.1563,70.5781 123.5313,70.5781 Q122.1875,70.5781 121.5,71.6563 Q120.8125,72.7188 120.8125,74.8125 Q120.8125,76.9063 121.5,77.9844 Q122.1875,79.0469 123.5313,79.0469 Q124.1563,79.0469 124.75,78.7813 Q125.3438,78.5 125.9688,77.9219 L125.9688,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="137" y="79.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="91" y2="91"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="99" y2="99"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="208" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="208" y="407"/>
       <ellipse cx="223" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M225.9688,428.6406 Q225.3906,428.9375 224.75,429.0781 Q224.1094,429.2344 223.4063,429.2344 Q220.9063,429.2344 219.5781,427.5938 Q218.2656,425.9375 218.2656,422.8125 Q218.2656,419.6875 219.5781,418.0313 Q220.9063,416.375 223.4063,416.375 Q224.1094,416.375 224.75,416.5313 Q225.4063,416.6875 225.9688,416.9844 L225.9688,419.7031 Q225.3438,419.125 224.75,418.8594 Q224.1563,418.5781 223.5313,418.5781 Q222.1875,418.5781 221.5,419.6563 Q220.8125,420.7188 220.8125,422.8125 Q220.8125,424.9063 221.5,425.9844 Q222.1875,427.0469 223.5313,427.0469 Q224.1563,427.0469 224.75,426.7813 Q225.3438,426.5 225.9688,425.9219 L225.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="237" y="427.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="439" y2="439"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="447" y2="447"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="178" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="178" y="516"/>
       <ellipse cx="193" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.9688,537.6406 Q195.3906,537.9375 194.75,538.0781 Q194.1094,538.2344 193.4063,538.2344 Q190.9063,538.2344 189.5781,536.5938 Q188.2656,534.9375 188.2656,531.8125 Q188.2656,528.6875 189.5781,527.0313 Q190.9063,525.375 193.4063,525.375 Q194.1094,525.375 194.75,525.5313 Q195.4063,525.6875 195.9688,525.9844 L195.9688,528.7031 Q195.3438,528.125 194.75,527.8594 Q194.1563,527.5781 193.5313,527.5781 Q192.1875,527.5781 191.5,528.6563 Q190.8125,529.7188 190.8125,531.8125 Q190.8125,533.9063 191.5,534.9844 Q192.1875,536.0469 193.5313,536.0469 Q194.1563,536.0469 194.75,535.7813 Q195.3438,535.5 195.9688,534.9219 L195.9688,537.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="536.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="548" y2="548"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="556" y2="556"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="62" y="243.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="62" y="243.5"/>
       <ellipse cx="77" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M79.9688,265.1406 Q79.3906,265.4375 78.75,265.5781 Q78.1094,265.7344 77.4063,265.7344 Q74.9063,265.7344 73.5781,264.0938 Q72.2656,262.4375 72.2656,259.3125 Q72.2656,256.1875 73.5781,254.5313 Q74.9063,252.875 77.4063,252.875 Q78.1094,252.875 78.75,253.0313 Q79.4063,253.1875 79.9688,253.4844 L79.9688,256.2031 Q79.3438,255.625 78.75,255.3594 Q78.1563,255.0781 77.5313,255.0781 Q76.1875,255.0781 75.5,256.1563 Q74.8125,257.2188 74.8125,259.3125 Q74.8125,261.4063 75.5,262.4844 Q76.1875,263.5469 77.5313,263.5469 Q78.1563,263.5469 78.75,263.2813 Q79.3438,263 79.9688,262.4219 L79.9688,265.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91" y="263.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="275.5" y2="275.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="283.5" y2="283.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="253.5" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="253.5" y="516"/>
       <ellipse cx="268.5" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M271.4688,537.6406 Q270.8906,537.9375 270.25,538.0781 Q269.6094,538.2344 268.9063,538.2344 Q266.4063,538.2344 265.0781,536.5938 Q263.7656,534.9375 263.7656,531.8125 Q263.7656,528.6875 265.0781,527.0313 Q266.4063,525.375 268.9063,525.375 Q269.6094,525.375 270.25,525.5313 Q270.9063,525.6875 271.4688,525.9844 L271.4688,528.7031 Q270.8438,528.125 270.25,527.8594 Q269.6563,527.5781 269.0313,527.5781 Q267.6875,527.5781 267,528.6563 Q266.3125,529.7188 266.3125,531.8125 Q266.3125,533.9063 267,534.9844 Q267.6875,536.0469 269.0313,536.0469 Q269.6563,536.0469 270.25,535.7813 Q270.8438,535.5 271.4688,534.9219 L271.4688,537.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="282.5" y="536.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="548" y2="548"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="556" y2="556"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="356" y="243.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="356" y="243.5"/>
       <ellipse cx="371" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M373.9688,265.1406 Q373.3906,265.4375 372.75,265.5781 Q372.1094,265.7344 371.4063,265.7344 Q368.9063,265.7344 367.5781,264.0938 Q366.2656,262.4375 366.2656,259.3125 Q366.2656,256.1875 367.5781,254.5313 Q368.9063,252.875 371.4063,252.875 Q372.1094,252.875 372.75,253.0313 Q373.4063,253.1875 373.9688,253.4844 L373.9688,256.2031 Q373.3438,255.625 372.75,255.3594 Q372.1563,255.0781 371.5313,255.0781 Q370.1875,255.0781 369.5,256.1563 Q368.8125,257.2188 368.8125,259.3125 Q368.8125,261.4063 369.5,262.4844 Q370.1875,263.5469 371.5313,263.5469 Q372.1563,263.5469 372.75,263.2813 Q373.3438,263 373.9688,262.4219 L373.9688,265.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="385" y="263.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="275.5" y2="275.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="283.5" y2="283.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="137" y="205"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="137" y="205"/>
       <ellipse cx="220.75" cy="221" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.7188,226.6406 Q223.1406,226.9375 222.5,227.0781 Q221.8594,227.2344 221.1563,227.2344 Q218.6563,227.2344 217.3281,225.5938 Q216.0156,223.9375 216.0156,220.8125 Q216.0156,217.6875 217.3281,216.0313 Q218.6563,214.375 221.1563,214.375 Q221.8594,214.375 222.5,214.5313 Q223.1563,214.6875 223.7188,214.9844 L223.7188,217.7031 Q223.0938,217.125 222.5,216.8594 Q221.9063,216.5781 221.2813,216.5781 Q219.9375,216.5781 219.25,217.6563 Q218.5625,218.7188 218.5625,220.8125 Q218.5625,222.9063 219.25,223.9844 Q219.9375,225.0469 221.2813,225.0469 Q221.9063,225.0469 222.5,224.7813 Q223.0938,224.5 223.7188,223.9219 L223.7188,226.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="241.25" y="225.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="243"/>
       <ellipse cx="148" cy="248" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="157" y="251.2104">foo(AA &amp; aa) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="257.8047" y2="257.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="263.8047"/>
       <ellipse cx="148" cy="268.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="157" y="272.0151">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="276.6094"/>
       <ellipse cx="148" cy="281.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="157" y="284.8198">i : std::vector&lt;std::uint8_t&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="289.4141"/>
       <ellipse cx="148" cy="294.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="157" y="297.6245">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="302.2188"/>
       <ellipse cx="148" cy="307.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="157" y="310.4292">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="315.0234"/>
       <ellipse cx="148" cy="320.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="157" y="323.2339">root_a : ::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="535" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="535" y="407"/>
       <ellipse cx="550" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M552.9688,428.6406 Q552.3906,428.9375 551.75,429.0781 Q551.1094,429.2344 550.4063,429.2344 Q547.9063,429.2344 546.5781,427.5938 Q545.2656,425.9375 545.2656,422.8125 Q545.2656,419.6875 546.5781,418.0313 Q547.9063,416.375 550.4063,416.375 Q551.1094,416.375 551.75,416.5313 Q552.4063,416.6875 552.9688,416.9844 L552.9688,419.7031 Q552.3438,419.125 551.75,418.8594 Q551.1563,418.5781 550.5313,418.5781 Q549.1875,418.5781 548.5,419.6563 Q547.8125,420.7188 547.8125,422.8125 Q547.8125,424.9063 548.5,425.9844 Q549.1875,427.0469 550.5313,427.0469 Q551.1563,427.0469 551.75,426.7813 Q552.3438,426.5 552.9688,425.9219 L552.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="564" y="427.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="439" y2="439"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="447" y2="447"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2b8isq445f1y)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="452" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1oum19zoi1wkg)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="452" y="407"/>
       <ellipse cx="467" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.9688,428.6406 Q469.3906,428.9375 468.75,429.0781 Q468.1094,429.2344 467.4063,429.2344 Q464.9063,429.2344 463.5781,427.5938 Q462.2656,425.9375 462.2656,422.8125 Q462.2656,419.6875 463.5781,418.0313 Q464.9063,416.375 467.4063,416.375 Q468.1094,416.375 468.75,416.5313 Q469.4063,416.6875 469.9688,416.9844 L469.9688,419.7031 Q469.3438,419.125 468.75,418.8594 Q468.1563,418.5781 467.5313,418.5781 Q466.1875,418.5781 465.5,419.6563 Q464.8125,420.7188 464.8125,422.8125 Q464.8125,424.9063 465.5,425.9844 Q466.1875,427.0469 467.5313,427.0469 Q468.1563,427.0469 468.75,426.7813 Q469.3438,426.5 469.9688,425.9219 L469.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="481" y="427.1543">AA</text>
diff --git a/docs/test_cases/t00046_class_mermaid.svg b/docs/test_cases/t00046_class_mermaid.svg
index 448fcbdf..b63ebf3e 100644
--- a/docs/test_cases/t00046_class_mermaid.svg
+++ b/docs/test_cases/t00046_class_mermaid.svg
@@ -154,7 +154,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L4">
+        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L4">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L6">
+        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L6">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -192,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L10">
+        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L10">
           <g title="A" id="classId-C_0000619642232943663499-2" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -211,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L14">
+        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L14">
           <g title="A" id="classId-C_0002207007194029669343-3" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -230,7 +230,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L16">
+        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L16">
           <g title="B" id="classId-C_0000204051985124373077-4" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -249,7 +249,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L18">
+        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L18">
           <g title="C" id="classId-C_0001837009554564742531-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -268,7 +268,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L20">
+        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L20">
           <g title="D" id="classId-C_0002029929560931799980-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -287,7 +287,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L22">
+        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L22">
           <g title="E" id="classId-C_0002305358535757579772-7" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -306,7 +306,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00046/t00046.cc#L24">
+        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00046/t00046.cc#L24">
           <g title="R" id="classId-C_0000974430595320588991-8" class="node default clickable">
             <rect height="189" width="212" y="-94.5" x="-106" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="106" x1="-106" class="divider"/>
diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg
index 87c2d77e..db457d66 100644
--- a/docs/test_cases/t00047_class.svg
+++ b/docs/test_cases/t00047_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:799px;height:175px;" version="1.1" viewBox="0 0 799 175" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f151qeb8r3cme8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4w143b716h7o" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f151qeb8r3cme8)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4w143b716h7o)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="35" y="28.1543">conditional_t</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f151qeb8r3cme8)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4w143b716h7o)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="8"/>
       <ellipse cx="197.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.4688,29.6406 Q199.8906,29.9375 199.25,30.0781 Q198.6094,30.2344 197.9063,30.2344 Q195.4063,30.2344 194.0781,28.5938 Q192.7656,26.9375 192.7656,23.8125 Q192.7656,20.6875 194.0781,19.0313 Q195.4063,17.375 197.9063,17.375 Q198.6094,17.375 199.25,17.5313 Q199.9063,17.6875 200.4688,17.9844 L200.4688,20.7031 Q199.8438,20.125 199.25,19.8594 Q198.6563,19.5781 198.0313,19.5781 Q196.6875,19.5781 196,20.6563 Q195.3125,21.7188 195.3125,23.8125 Q195.3125,25.9063 196,26.9844 Q196.6875,28.0469 198.0313,28.0469 Q198.6563,28.0469 199.25,27.7813 Q199.8438,27.5 200.4688,26.9219 L200.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="211.5" y="28.1543">conditional_t</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f151qeb8r3cme8)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4w143b716h7o)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="8"/>
       <ellipse cx="515" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M517.9688,29.6406 Q517.3906,29.9375 516.75,30.0781 Q516.1094,30.2344 515.4063,30.2344 Q512.9063,30.2344 511.5781,28.5938 Q510.2656,26.9375 510.2656,23.8125 Q510.2656,20.6875 511.5781,19.0313 Q512.9063,17.375 515.4063,17.375 Q516.1094,17.375 516.75,17.5313 Q517.4063,17.6875 517.9688,17.9844 L517.9688,20.7031 Q517.3438,20.125 516.75,19.8594 Q516.1563,19.5781 515.5313,19.5781 Q514.1875,19.5781 513.5,20.6563 Q512.8125,21.7188 512.8125,23.8125 Q512.8125,25.9063 513.5,26.9844 Q514.1875,28.0469 515.5313,28.0469 Q516.1563,28.0469 516.75,27.7813 Q517.3438,27.5 517.9688,26.9219 L517.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="529" y="28.1543">conditional_t</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f151qeb8r3cme8)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4w143b716h7o)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="116"/>
       <ellipse cx="268" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M270.9688,137.6406 Q270.3906,137.9375 269.75,138.0781 Q269.1094,138.2344 268.4063,138.2344 Q265.9063,138.2344 264.5781,136.5938 Q263.2656,134.9375 263.2656,131.8125 Q263.2656,128.6875 264.5781,127.0313 Q265.9063,125.375 268.4063,125.375 Q269.1094,125.375 269.75,125.5313 Q270.4063,125.6875 270.9688,125.9844 L270.9688,128.7031 Q270.3438,128.125 269.75,127.8594 Q269.1563,127.5781 268.5313,127.5781 Q267.1875,127.5781 266.5,128.6563 Q265.8125,129.7188 265.8125,131.8125 Q265.8125,133.9063 266.5,134.9844 Q267.1875,136.0469 268.5313,136.0469 Q269.1563,136.0469 269.75,135.7813 Q270.3438,135.5 270.9688,134.9219 L270.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="282" y="136.1543">conditional_t</text>
diff --git a/docs/test_cases/t00047_class_mermaid.svg b/docs/test_cases/t00047_class_mermaid.svg
index 1207c7c4..6954c516 100644
--- a/docs/test_cases/t00047_class_mermaid.svg
+++ b/docs/test_cases/t00047_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L8">
+        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L8">
           <g title="conditional_t" id="classId-C_0000047394280824625133-0" class="node default clickable">
             <rect height="57" width="166.15625" y="-28.5" x="-83.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.078125" x1="-83.078125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L13">
+        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L13">
           <g title="conditional_t" id="classId-C_0000599782159389775809-1" class="node default clickable">
             <rect height="57" width="337.421875" y="-28.5" x="-168.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="168.7109375" x1="-168.7109375" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L18">
+        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L18">
           <g title="conditional_t" id="classId-C_0000824938194184364511-2" class="node default clickable">
             <rect height="57" width="343.671875" y="-28.5" x="-171.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="171.8359375" x1="-171.8359375" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00047/t00047.cc#L6">
+        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00047/t00047.cc#L6">
           <g title="conditional_t" id="classId-C_0001673692992642087414-3" class="node default clickable">
             <rect height="57" width="164.0625" y="-28.5" x="-82.03125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.03125" x1="-82.03125" class="divider"/>
diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg
index cde89a08..1e4d98ef 100644
--- a/docs/test_cases/t00048_class.svg
+++ b/docs/test_cases/t00048_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:529px;height:226px;" version="1.1" viewBox="0 0 529 226" width="529px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1091katpioaj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpvn69c179gld" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,30 +9,30 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvn69c179gld)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
       <ellipse cx="119" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M119.1094,19.3438 L117.9531,24.4219 L120.2813,24.4219 L119.1094,19.3438 Z M117.625,17.1094 L120.6094,17.1094 L123.9688,29.5 L121.5156,29.5 L120.75,26.4375 L117.4688,26.4375 L116.7188,29.5 L114.2813,29.5 L117.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="138" y="28.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="46"/>
       <ellipse cx="92.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="101.5" y="54.2104">foo() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="66.8047"/>
       <ellipse cx="92.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="101.5" y="75.0151">base : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvn69c179gld)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
       <ellipse cx="299" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M299.1094,19.3438 L297.9531,24.4219 L300.2813,24.4219 L299.1094,19.3438 Z M297.625,17.1094 L300.6094,17.1094 L303.9688,29.5 L301.5156,29.5 L300.75,26.4375 L297.4688,26.4375 L296.7188,29.5 L294.2813,29.5 L297.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="88" x="313" y="28.1543">BaseTemplate</text>
@@ -40,45 +40,45 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="410" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="46"/>
       <ellipse cx="295" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="304" y="54.2104">foo() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="66.8047"/>
       <ellipse cx="295" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304" y="75.0151">base : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvn69c179gld)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
       <ellipse cx="42.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M45.1188,163.6406 Q44.5406,163.9375 43.9,164.0781 Q43.2594,164.2344 42.5563,164.2344 Q40.0563,164.2344 38.7281,162.5938 Q37.4156,160.9375 37.4156,157.8125 Q37.4156,154.6875 38.7281,153.0313 Q40.0563,151.375 42.5563,151.375 Q43.2594,151.375 43.9,151.5313 Q44.5563,151.6875 45.1188,151.9844 L45.1188,154.7031 Q44.4938,154.125 43.9,153.8594 Q43.3063,153.5781 42.6813,153.5781 Q41.3375,153.5781 40.65,154.6563 Q39.9625,155.7188 39.9625,157.8125 Q39.9625,159.9063 40.65,160.9844 Q41.3375,162.0469 42.6813,162.0469 Q43.3063,162.0469 43.9,161.7813 Q44.4938,161.5 45.1188,160.9219 L45.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="60.85" y="162.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="180"/>
       <ellipse cx="17" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="200.8047"/>
       <ellipse cx="17" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="209.0151">b : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvn69c179gld)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
       <ellipse cx="277" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M279.9688,163.6406 Q279.3906,163.9375 278.75,164.0781 Q278.1094,164.2344 277.4063,164.2344 Q274.9063,164.2344 273.5781,162.5938 Q272.2656,160.9375 272.2656,157.8125 Q272.2656,154.6875 273.5781,153.0313 Q274.9063,151.375 277.4063,151.375 Q278.1094,151.375 278.75,151.5313 Q279.4063,151.6875 279.9688,151.9844 L279.9688,154.7031 Q279.3438,154.125 278.75,153.8594 Q278.1563,153.5781 277.5313,153.5781 Q276.1875,153.5781 275.5,154.6563 Q274.8125,155.7188 274.8125,157.8125 Q274.8125,159.9063 275.5,160.9844 Q276.1875,162.0469 277.5313,162.0469 Q278.1563,162.0469 278.75,161.7813 Q279.3438,161.5 279.9688,160.9219 L279.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="291" y="162.1543">BTemplate</text>
@@ -86,45 +86,45 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="366" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="180"/>
       <ellipse cx="273" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="282" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="200.8047"/>
       <ellipse cx="273" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="282" y="209.0151">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvn69c179gld)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
       <ellipse cx="164.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M167.1188,163.6406 Q166.5406,163.9375 165.9,164.0781 Q165.2594,164.2344 164.5563,164.2344 Q162.0563,164.2344 160.7281,162.5938 Q159.4156,160.9375 159.4156,157.8125 Q159.4156,154.6875 160.7281,153.0313 Q162.0563,151.375 164.5563,151.375 Q165.2594,151.375 165.9,151.5313 Q166.5563,151.6875 167.1188,151.9844 L167.1188,154.7031 Q166.4938,154.125 165.9,153.8594 Q165.3063,153.5781 164.6813,153.5781 Q163.3375,153.5781 162.65,154.6563 Q161.9625,155.7188 161.9625,157.8125 Q161.9625,159.9063 162.65,160.9844 Q163.3375,162.0469 164.6813,162.0469 Q165.3063,162.0469 165.9,161.7813 Q166.4938,161.5 167.1188,160.9219 L167.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="182.85" y="162.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="180"/>
       <ellipse cx="139" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="200.8047"/>
       <ellipse cx="139" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="148" y="209.0151">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1091katpioaj)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpvn69c179gld)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
       <ellipse cx="421" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M423.9688,163.6406 Q423.3906,163.9375 422.75,164.0781 Q422.1094,164.2344 421.4063,164.2344 Q418.9063,164.2344 417.5781,162.5938 Q416.2656,160.9375 416.2656,157.8125 Q416.2656,154.6875 417.5781,153.0313 Q418.9063,151.375 421.4063,151.375 Q422.1094,151.375 422.75,151.5313 Q423.4063,151.6875 423.9688,151.9844 L423.9688,154.7031 Q423.3438,154.125 422.75,153.8594 Q422.1563,153.5781 421.5313,153.5781 Q420.1875,153.5781 419.5,154.6563 Q418.8125,155.7188 418.8125,157.8125 Q418.8125,159.9063 419.5,160.9844 Q420.1875,162.0469 421.5313,162.0469 Q422.1563,162.0469 422.75,161.7813 Q423.3438,161.5 423.9688,160.9219 L423.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="435" y="162.1543">ATemplate</text>
@@ -132,19 +132,19 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="510" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="180"/>
       <ellipse cx="417" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="426" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="200.8047"/>
       <ellipse cx="417" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="426" y="209.0151">a : T</text>
     </a>
     <path d="M102.14,99.04 C92.53,113.46 82.34,128.74 73.52,141.97 " fill="none" id="C_0000010200626899013233&lt;-C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00048_class_mermaid.svg b/docs/test_cases/t00048_class_mermaid.svg
index 3a968ce3..c987436e 100644
--- a/docs/test_cases/t00048_class_mermaid.svg
+++ b/docs/test_cases/t00048_class_mermaid.svg
@@ -94,7 +94,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(132.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L6">
+        <a transform="translate(132.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L6">
           <g title="Base" id="classId-C_0000010200626899013233-0" class="node default clickable">
             <rect height="123" width="99.9375" y="-61.5" x="-49.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -123,7 +123,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.65625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/t00048.h#L12">
+        <a transform="translate(456.65625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/t00048.h#L12">
           <g title="BaseTemplate" id="classId-C_0000630197772543569536-1" class="node default clickable">
             <rect height="123" width="150.765625" y="-61.5" x="-75.3828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.3828125" x1="-75.3828125" class="divider"/>
@@ -152,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(57.96875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L8">
+        <a transform="translate(57.96875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L8">
           <g title="B" id="classId-C_0000059336049758992190-2" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -181,7 +181,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(369.9140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/b_t00048.h#L14">
+        <a transform="translate(369.9140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/b_t00048.h#L14">
           <g title="BTemplate" id="classId-C_0001635850649347735305-3" class="node default clickable">
             <rect height="101" width="124.078125" y="-50.5" x="-62.0390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="62.0390625" x1="-62.0390625" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(207.90625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L8">
+        <a transform="translate(207.90625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L8">
           <g title="A" id="classId-C_0000199333691834211223-4" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -239,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(543.3984375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00048/a_t00048.h#L14">
+        <a transform="translate(543.3984375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00048/a_t00048.h#L14">
           <g title="ATemplate" id="classId-C_0001025697108404463905-5" class="node default clickable">
             <rect height="101" width="122.890625" y="-50.5" x="-61.4453125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="61.4453125" x1="-61.4453125" class="divider"/>
diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg
index bce17cf5..2a95a451 100644
--- a/docs/test_cases/t00049_class.svg
+++ b/docs/test_cases/t00049_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:401px;height:390px;" version="1.1" viewBox="0 0 401 390" width="401px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pr5pkt5qb1a6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ffu43wwwfq33y" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="129.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffu43wwwfq33y)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="129.5" y="306"/>
       <ellipse cx="165.65" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M168.6188,327.6406 Q168.0406,327.9375 167.4,328.0781 Q166.7594,328.2344 166.0563,328.2344 Q163.5563,328.2344 162.2281,326.5938 Q160.9156,324.9375 160.9156,321.8125 Q160.9156,318.6875 162.2281,317.0313 Q163.5563,315.375 166.0563,315.375 Q166.7594,315.375 167.4,315.5313 Q168.0563,315.6875 168.6188,315.9844 L168.6188,318.7031 Q167.9938,318.125 167.4,317.8594 Q166.8063,317.5781 166.1813,317.5781 Q164.8375,317.5781 164.15,318.6563 Q163.4625,319.7188 163.4625,321.8125 Q163.4625,323.9063 164.15,324.9844 Q164.8375,326.0469 166.1813,326.0469 Q166.8063,326.0469 167.4,325.7813 Q167.9938,325.5 168.6188,324.9219 L168.6188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="184.35" y="326.1543">A</text>
@@ -18,23 +18,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="222.5" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="344"/>
       <ellipse cx="140.5" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="149.5" y="352.2104">get_a() : T &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="358.8047" y2="358.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="364.8047"/>
       <ellipse cx="140.5" cy="369.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="149.5" y="373.0151">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffu43wwwfq33y)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
@@ -43,8 +43,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="128.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffu43wwwfq33y)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="128.5" y="197"/>
       <ellipse cx="143.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M146.4688,218.6406 Q145.8906,218.9375 145.25,219.0781 Q144.6094,219.2344 143.9063,219.2344 Q141.4063,219.2344 140.0781,217.5938 Q138.7656,215.9375 138.7656,212.8125 Q138.7656,209.6875 140.0781,208.0313 Q141.4063,206.375 143.9063,206.375 Q144.6094,206.375 145.25,206.5313 Q145.9063,206.6875 146.4688,206.9844 L146.4688,209.7031 Q145.8438,209.125 145.25,208.8594 Q144.6563,208.5781 144.0313,208.5781 Q142.6875,208.5781 142,209.6563 Q141.3125,210.7188 141.3125,212.8125 Q141.3125,214.9063 142,215.9844 Q142.6875,217.0469 144.0313,217.0469 Q144.6563,217.0469 145.25,216.7813 Q145.8438,216.5 146.4688,215.9219 L146.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.5" y="217.1543">A</text>
@@ -53,8 +53,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="263.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffu43wwwfq33y)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="263.5" y="197"/>
       <ellipse cx="278.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M281.4688,218.6406 Q280.8906,218.9375 280.25,219.0781 Q279.6094,219.2344 278.9063,219.2344 Q276.4063,219.2344 275.0781,217.5938 Q273.7656,215.9375 273.7656,212.8125 Q273.7656,209.6875 275.0781,208.0313 Q276.4063,206.375 278.9063,206.375 Q279.6094,206.375 280.25,206.5313 Q280.9063,206.6875 281.4688,206.9844 L281.4688,209.7031 Q280.8438,209.125 280.25,208.8594 Q279.6563,208.5781 279.0313,208.5781 Q277.6875,208.5781 277,209.6563 Q276.3125,210.7188 276.3125,212.8125 Q276.3125,214.9063 277,215.9844 Q277.6875,217.0469 279.0313,217.0469 Q279.6563,217.0469 280.25,216.7813 Q280.8438,216.5 281.4688,215.9219 L281.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="292.5" y="217.1543">A</text>
@@ -63,47 +63,47 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pr5pkt5qb1a6)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="41" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffu43wwwfq33y)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="41" y="8"/>
       <ellipse cx="170.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.2188,29.6406 Q172.6406,29.9375 172,30.0781 Q171.3594,30.2344 170.6563,30.2344 Q168.1563,30.2344 166.8281,28.5938 Q165.5156,26.9375 165.5156,23.8125 Q165.5156,20.6875 166.8281,19.0313 Q168.1563,17.375 170.6563,17.375 Q171.3594,17.375 172,17.5313 Q172.6563,17.6875 173.2188,17.9844 L173.2188,20.7031 Q172.5938,20.125 172,19.8594 Q171.4063,19.5781 170.7813,19.5781 Q169.4375,19.5781 168.75,20.6563 Q168.0625,21.7188 168.0625,23.8125 Q168.0625,25.9063 168.75,26.9844 Q169.4375,28.0469 170.7813,28.0469 Q171.4063,28.0469 172,27.7813 Q172.5938,27.5 173.2188,26.9219 L173.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="46"/>
       <ellipse cx="52" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="61" y="54.2104">get_int_map() : A&lt;intmap&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="58.8047"/>
       <ellipse cx="52" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="61" y="67.0151">set_int_map(A&lt;intmap&gt; &amp;&amp; int_map) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="79.6094"/>
       <ellipse cx="52" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="61" y="87.8198">a_int_map : A&lt;intmap&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="92.4141"/>
       <ellipse cx="52" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="61" y="100.6245">a_string : A&lt;thestring&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="105.2188"/>
       <ellipse cx="52" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="198" x="61" y="113.4292">a_vector_string : A&lt;string_vector&gt;</text>
     </a>
     <path d="M74.37,245.14 C88.77,258.53 107.47,275.93 125.05,292.27 " fill="none" id="C_0000654829353386288443-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00049_class_mermaid.svg b/docs/test_cases/t00049_class_mermaid.svg
index 4c8b4646..5ae87ae2 100644
--- a/docs/test_cases/t00049_class_mermaid.svg
+++ b/docs/test_cases/t00049_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000372971769516871577-0" class="node default clickable">
             <rect height="101" width="112.6875" y="-50.5" x="-56.34375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="56.34375" x1="-56.34375" class="divider"/>
@@ -155,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7">
+        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000654829353386288443-1" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -174,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000973058255816844469-2" class="node default clickable">
             <rect height="57" width="113.6875" y="-28.5" x="-56.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.84375" x1="-56.84375" class="divider"/>
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L7">
+        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000562074851310302010-3" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -212,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00049/t00049.cc#L13">
+        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00049/t00049.cc#L13">
           <g title="R" id="classId-C_0002288024073053091226-4" class="node default clickable">
             <rect height="167" width="267.140625" y="-83.5" x="-133.5703125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="133.5703125" x1="-133.5703125" class="divider"/>
diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg
index 8d2df7c4..2de17019 100644
--- a/docs/test_cases/t00050_class.svg
+++ b/docs/test_cases/t00050_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="684px" preserveAspectRatio="none" style="width:2480px;height:684px;" version="1.1" viewBox="0 0 2480 684" width="2480px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4x1nh73sxgnc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpk2fxb155n44" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk2fxb155n44)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
       <ellipse cx="216" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M218.9688,71.1406 Q218.3906,71.4375 217.75,71.5781 Q217.1094,71.7344 216.4063,71.7344 Q213.9063,71.7344 212.5781,70.0938 Q211.2656,68.4375 211.2656,65.3125 Q211.2656,62.1875 212.5781,60.5313 Q213.9063,58.875 216.4063,58.875 Q217.1094,58.875 217.75,59.0313 Q218.4063,59.1875 218.9688,59.4844 L218.9688,62.2031 Q218.3438,61.625 217.75,61.3594 Q217.1563,61.0781 216.5313,61.0781 Q215.1875,61.0781 214.5,62.1563 Q213.8125,63.2188 213.8125,65.3125 Q213.8125,67.4063 214.5,68.4844 Q215.1875,69.5469 216.5313,69.5469 Q217.1563,69.5469 217.75,69.2813 Q218.3438,69 218.9688,68.4219 L218.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="230" y="69.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="89.5" y2="89.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk2fxb155n44)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
       <ellipse cx="1359" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1361.9688,390.6406 Q1361.3906,390.9375 1360.75,391.0781 Q1360.1094,391.2344 1359.4063,391.2344 Q1356.9063,391.2344 1355.5781,389.5938 Q1354.2656,387.9375 1354.2656,384.8125 Q1354.2656,381.6875 1355.5781,380.0313 Q1356.9063,378.375 1359.4063,378.375 Q1360.1094,378.375 1360.75,378.5313 Q1361.4063,378.6875 1361.9688,378.9844 L1361.9688,381.7031 Q1361.3438,381.125 1360.75,380.8594 Q1360.1563,380.5781 1359.5313,380.5781 Q1358.1875,380.5781 1357.5,381.6563 Q1356.8125,382.7188 1356.8125,384.8125 Q1356.8125,386.9063 1357.5,387.9844 Q1358.1875,389.0469 1359.5313,389.0469 Q1360.1563,389.0469 1360.75,388.7813 Q1361.3438,388.5 1361.9688,387.9219 L1361.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1373" y="389.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk2fxb155n44)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
       <ellipse cx="595" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.9688,390.6406 Q597.3906,390.9375 596.75,391.0781 Q596.1094,391.2344 595.4063,391.2344 Q592.9063,391.2344 591.5781,389.5938 Q590.2656,387.9375 590.2656,384.8125 Q590.2656,381.6875 591.5781,380.0313 Q592.9063,378.375 595.4063,378.375 Q596.1094,378.375 596.75,378.5313 Q597.4063,378.6875 597.9688,378.9844 L597.9688,381.7031 Q597.3438,381.125 596.75,380.8594 Q596.1563,380.5781 595.5313,380.5781 Q594.1875,380.5781 593.5,381.6563 Q592.8125,382.7188 592.8125,384.8125 Q592.8125,386.9063 593.5,387.9844 Q594.1875,389.0469 595.5313,389.0469 Q596.1563,389.0469 596.75,388.7813 Q597.3438,388.5 597.9688,387.9219 L597.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="609" y="389.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk2fxb155n44)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
       <ellipse cx="1721.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1724.4688,390.6406 Q1723.8906,390.9375 1723.25,391.0781 Q1722.6094,391.2344 1721.9063,391.2344 Q1719.4063,391.2344 1718.0781,389.5938 Q1716.7656,387.9375 1716.7656,384.8125 Q1716.7656,381.6875 1718.0781,380.0313 Q1719.4063,378.375 1721.9063,378.375 Q1722.6094,378.375 1723.25,378.5313 Q1723.9063,378.6875 1724.4688,378.9844 L1724.4688,381.7031 Q1723.8438,381.125 1723.25,380.8594 Q1722.6563,380.5781 1722.0313,380.5781 Q1720.6875,380.5781 1720,381.6563 Q1719.3125,382.7188 1719.3125,384.8125 Q1719.3125,386.9063 1720,387.9844 Q1720.6875,389.0469 1722.0313,389.0469 Q1722.6563,389.0469 1723.25,388.7813 Q1723.8438,388.5 1724.4688,387.9219 L1724.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1735.5" y="389.1543">utils::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk2fxb155n44)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
       <ellipse cx="1847" cy="46.5" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1851.1094,52.5 L1843.3906,52.5 L1843.3906,40.1094 L1851.1094,40.1094 L1851.1094,42.2656 L1845.8438,42.2656 L1845.8438,44.9375 L1850.6094,44.9375 L1850.6094,47.0938 L1845.8438,47.0938 L1845.8438,50.3438 L1851.1094,50.3438 L1851.1094,52.5 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1861" y="50.6543">E</text>
@@ -52,8 +52,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="102.3198">E3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="108.9141" y2="108.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk2fxb155n44)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
       <ellipse cx="2068.5" cy="372" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2071.4688,377.6406 Q2070.8906,377.9375 2070.25,378.0781 Q2069.6094,378.2344 2068.9063,378.2344 Q2066.4063,378.2344 2065.0781,376.5938 Q2063.7656,374.9375 2063.7656,371.8125 Q2063.7656,368.6875 2065.0781,367.0313 Q2066.4063,365.375 2068.9063,365.375 Q2069.6094,365.375 2070.25,365.5313 Q2070.9063,365.6875 2071.4688,365.9844 L2071.4688,368.7031 Q2070.8438,368.125 2070.25,367.8594 Q2069.6563,367.5781 2069.0313,367.5781 Q2067.6875,367.5781 2067,368.6563 Q2066.3125,369.7188 2066.3125,371.8125 Q2066.3125,373.9063 2067,374.9844 Q2067.6875,376.0469 2069.0313,376.0469 Q2069.6563,376.0469 2070.25,375.7813 Q2070.8438,375.5 2071.4688,374.9219 L2071.4688,377.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="2082.5" y="376.1543">F</text>
@@ -62,43 +62,43 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="388" y2="388"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="396" y2="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="402"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="404"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="2073.5" y="410.2104">t : T[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="414.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="416.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="2073.5" y="423.0151">v : V</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk2fxb155n44)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
       <ellipse cx="844.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M847.4688,390.6406 Q846.8906,390.9375 846.25,391.0781 Q845.6094,391.2344 844.9063,391.2344 Q842.4063,391.2344 841.0781,389.5938 Q839.7656,387.9375 839.7656,384.8125 Q839.7656,381.6875 841.0781,380.0313 Q842.4063,378.375 844.9063,378.375 Q845.6094,378.375 846.25,378.5313 Q846.9063,378.6875 847.4688,378.9844 L847.4688,381.7031 Q846.8438,381.125 846.25,380.8594 Q845.6563,380.5781 845.0313,380.5781 Q843.6875,380.5781 843,381.6563 Q842.3125,382.7188 842.3125,384.8125 Q842.3125,386.9063 843,387.9844 Q843.6875,389.0469 845.0313,389.0469 Q845.6563,389.0469 846.25,388.7813 Q846.8438,388.5 847.4688,387.9219 L847.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="858.5" y="389.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4x1nh73sxgnc)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk2fxb155n44)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
       <ellipse cx="2376" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2378.9688,71.1406 Q2378.3906,71.4375 2377.75,71.5781 Q2377.1094,71.7344 2376.4063,71.7344 Q2373.9063,71.7344 2372.5781,70.0938 Q2371.2656,68.4375 2371.2656,65.3125 Q2371.2656,62.1875 2372.5781,60.5313 Q2373.9063,58.875 2376.4063,58.875 Q2377.1094,58.875 2377.75,59.0313 Q2378.4063,59.1875 2378.9688,59.4844 L2378.9688,62.2031 Q2378.3438,61.625 2377.75,61.3594 Q2377.1563,61.0781 2376.5313,61.0781 Q2375.1875,61.0781 2374.5,62.1563 Q2373.8125,63.2188 2373.8125,65.3125 Q2373.8125,67.4063 2374.5,68.4844 Q2375.1875,69.5469 2376.5313,69.5469 Q2377.1563,69.5469 2377.75,69.2813 Q2378.3438,69 2378.9688,68.4219 L2378.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="2390" y="69.6543">NoComment</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="89.5" y2="89.5"/>
     </a>
-    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M156,61 L156,71 L166,71 L156,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="12" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M466,61 L466,71 L476,71 L466,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="282" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M534.5,199 L534.5,209 L544.5,209 L534.5,199 " fill="#AABBCC" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="484" x="33.5" y="216.0669">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="434" x="25.5" y="231.1997">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
@@ -125,50 +125,50 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="440" x="25.5" y="548.9888">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="453" x="25.5" y="564.1216">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="386" x="25.5" y="579.2544">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
-    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M966.5,61 L966.5,71 L976.5,71 L966.5,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="232" x="729.5" y="78.0669">This is a short description of class G.</text>
-    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1206,380.5 L1206,390.5 L1216,390.5 L1206,380.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="289" x="912" y="397.5669">This is an intermediate description of class G.</text>
-    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M963.5,647 L963.5,657 L973.5,657 L963.5,647 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="226" x="732.5" y="664.0669">This is a long description of class G.</text>
-    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1106.5,53.5 L1106.5,63.5 L1116.5,63.5 L1106.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1017.5" y="70.5669">Lorem ipsum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1021.5" y="85.6997"/>
-    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1356,38 L1356,48 L1366,48 L1356,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1158" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="1162" y="70.1997">1. Write meaningful comment</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="100.4653"/>
-    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1500.5,38 L1500.5,48 L1510.5,48 L1500.5,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1407.5" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1411.5" y="70.1997">2. Write tests</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="100.4653"/>
-    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1646,46 L1646,56 L1656,56 L1646,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1552" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1556" y="78.1997">3. Implement</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1556" y="93.3325"/>
-    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M678.5,53.5 L678.5,63.5 L688.5,63.5 L678.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="517.5" y="70.5669">Long comment example</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="521.5" y="85.6997"/>
-    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1787,46 L1787,56 L1797,56 L1787,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1697" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="1701" y="78.1997">Implement...</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1701" y="93.3325"/>
-    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2058.5,53.5 L2058.5,63.5 L2068.5,63.5 L2058.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="1913.5" y="70.5669">Simple array wrapper.</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1917.5" y="85.6997"/>
-    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#f4x1nh73sxgnc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#fpk2fxb155n44)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2316,8 L2316,18 L2326,18 L2316,8 " fill="#AAAAFF" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="160" x="2110" y="25.0669">Template parameters</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="40.1997"/>
diff --git a/docs/test_cases/t00050_class_mermaid.svg b/docs/test_cases/t00050_class_mermaid.svg
index f203bd3a..fc0b293b 100644
--- a/docs/test_cases/t00050_class_mermaid.svg
+++ b/docs/test_cases/t00050_class_mermaid.svg
@@ -184,7 +184,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L9">
+        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L9">
           <g title="A" id="classId-C_0001885563213397742674-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L24">
+        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L24">
           <g title="Lorem ipsum" id="classId-C_0000500262098409836244-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L53">
+        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L53">
           <g title="Long comment example" id="classId-C_0001663081653671078922-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L65">
+        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L65">
           <g title="D" id="classId-C_0001492514566602019299-3" class="node default clickable">
             <rect height="57" width="70.109375" y="-28.5" x="-35.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.0546875" x1="-35.0546875" class="divider"/>
@@ -260,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L70">
+        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L70">
           <g title="E" id="classId-C_0002027344031570117998-4" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -294,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L81">
+        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L81">
           <g title="Simple array wrapper." id="classId-C_0000793698410848959592-5" class="node default clickable">
             <rect height="101" width="105.109375" y="-50.5" x="-52.5546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="52.5546875" x1="-52.5546875" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L91">
+        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L91">
           <g title="G" id="classId-C_0000449485154531299941-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -342,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00050/t00050.cc#L93">
+        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00050/t00050.cc#L93">
           <g title="NoComment" id="classId-C_0001832693799357996932-7" class="node default clickable">
             <rect height="57" width="110.109375" y="-28.5" x="-55.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg
index f61cde19..4bbdc77c 100644
--- a/docs/test_cases/t00051_class.svg
+++ b/docs/test_cases/t00051_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="599px" preserveAspectRatio="none" style="width:789px;height:599px;" version="1.1" viewBox="0 0 789 599" width="789px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1giv8r3ootj0a" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fyn51c1h3x4ay" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="120.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="346" y="468"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyn51c1h3x4ay)" height="120.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="346" y="468"/>
       <ellipse cx="400.25" cy="484" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M403.2188,489.6406 Q402.6406,489.9375 402,490.0781 Q401.3594,490.2344 400.6563,490.2344 Q398.1563,490.2344 396.8281,488.5938 Q395.5156,486.9375 395.5156,483.8125 Q395.5156,480.6875 396.8281,479.0313 Q398.1563,477.375 400.6563,477.375 Q401.3594,477.375 402,477.5313 Q402.6563,477.6875 403.2188,477.9844 L403.2188,480.7031 Q402.5938,480.125 402,479.8594 Q401.4063,479.5781 400.7813,479.5781 Q399.4375,479.5781 398.75,480.6563 Q398.0625,481.7188 398.0625,483.8125 Q398.0625,485.9063 398.75,486.9844 Q399.4375,488.0469 400.7813,488.0469 Q401.4063,488.0469 402,487.7813 Q402.5938,487.5 403.2188,486.9219 L403.2188,489.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="420.75" y="488.1543">B</text>
@@ -18,45 +18,45 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="477" y="477.1387">F,FF=F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="516" y1="500" y2="500"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="506"/>
       <ellipse cx="357" cy="511" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="366" y="514.2104">B(F &amp;&amp; f, FF &amp;&amp; ff) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="347" x2="516" y1="520.8047" y2="520.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="526.8047"/>
       <ellipse cx="357" cy="531.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="366" y="535.0151">f() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="539.6094"/>
       <ellipse cx="357" cy="544.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="366" y="547.8198">ff() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="516" y1="554.4141" y2="554.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="560.4141"/>
       <ellipse cx="357" cy="565.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="366" y="568.6245">f_ : F</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="573.2188"/>
       <ellipse cx="357" cy="578.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="366" y="581.4292">ff_ : FF</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="120.0234" id="C_0001969502737237579476" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyn51c1h3x4ay)" height="120.0234" id="C_0001969502737237579476" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="288"/>
       <ellipse cx="239.25" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M242.2188,309.6406 Q241.6406,309.9375 241,310.0781 Q240.3594,310.2344 239.6563,310.2344 Q237.1563,310.2344 235.8281,308.5938 Q234.5156,306.9375 234.5156,303.8125 Q234.5156,300.6875 235.8281,299.0313 Q237.1563,297.375 239.6563,297.375 Q240.3594,297.375 241,297.5313 Q241.6563,297.6875 242.2188,297.9844 L242.2188,300.7031 Q241.5938,300.125 241,299.8594 Q240.4063,299.5781 239.7813,299.5781 Q238.4375,299.5781 237.75,300.6563 Q237.0625,301.7188 237.0625,303.8125 Q237.0625,305.9063 237.75,306.9844 Q238.4375,308.0469 239.7813,308.0469 Q240.4063,308.0469 241,307.7813 Q241.5938,307.5 242.2188,306.9219 L242.2188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="259.75" y="308.1543">B</text>
@@ -64,81 +64,81 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="364" x="306" y="297.1387">(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="320" y2="320"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="326"/>
       <ellipse cx="206" cy="331" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="447" x="215" y="334.2104">B((lambda at t00051.cc:43:18) &amp;&amp; f, (lambda at t00051.cc:43:27) &amp;&amp; ff) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="196" x2="667" y1="340.8047" y2="340.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="346.8047"/>
       <ellipse cx="206" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="215" y="355.0151">f() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="359.6094"/>
       <ellipse cx="206" cy="364.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="215" y="367.8198">ff() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="374.4141" y2="374.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="380.4141"/>
       <ellipse cx="206" cy="385.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="182" x="215" y="388.6245">f_ : (lambda at t00051.cc:43:18)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="393.2188"/>
       <ellipse cx="206" cy="398.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="215" y="401.4292">ff_ : (lambda at t00051.cc:43:27)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyn51c1h3x4ay)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="129"/>
       <ellipse cx="423.25" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M426.2188,150.6406 Q425.6406,150.9375 425,151.0781 Q424.3594,151.2344 423.6563,151.2344 Q421.1563,151.2344 419.8281,149.5938 Q418.5156,147.9375 418.5156,144.8125 Q418.5156,141.6875 419.8281,140.0313 Q421.1563,138.375 423.6563,138.375 Q424.3594,138.375 425,138.5313 Q425.6563,138.6875 426.2188,138.9844 L426.2188,141.7031 Q425.5938,141.125 425,140.8594 Q424.4063,140.5781 423.7813,140.5781 Q422.4375,140.5781 421.75,141.6563 Q421.0625,142.7188 421.0625,144.8125 Q421.0625,146.9063 421.75,147.9844 Q422.4375,149.0469 423.7813,149.0469 Q424.4063,149.0469 425,148.7813 Q425.5938,148.5 426.2188,147.9219 L426.2188,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="443.75" y="149.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="167"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="215" y="175.2104">get_function() : (lambda at t00051.cc:48:16)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="179.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="181.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="215" y="188.0151">start_thread1() : custom_thread1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="192.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="194.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="215" y="200.8198">start_thread2() : custom_thread2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="205.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="207.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="447" x="215" y="213.6245">start_thread3() : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="220.2188" y2="220.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="447" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyn51c1h3x4ay)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="447" x="6" y="8"/>
       <ellipse cx="166.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M169.2188,29.6406 Q168.6406,29.9375 168,30.0781 Q167.3594,30.2344 166.6563,30.2344 Q164.1563,30.2344 162.8281,28.5938 Q161.5156,26.9375 161.5156,23.8125 Q161.5156,20.6875 162.8281,19.0313 Q164.1563,17.375 166.6563,17.375 Q167.3594,17.375 168,17.5313 Q168.6563,17.6875 169.2188,17.9844 L169.2188,20.7031 Q168.5938,20.125 168,19.8594 Q167.4063,19.5781 166.7813,19.5781 Q165.4375,19.5781 164.75,20.6563 Q164.0625,21.7188 164.0625,23.8125 Q164.0625,25.9063 164.75,26.9844 Q165.4375,28.0469 166.7813,28.0469 Q167.4063,28.0469 168,27.7813 Q168.5938,27.5 169.2188,26.9219 L169.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="186.75" y="28.1543">A::custom_thread1</text>
@@ -147,18 +147,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="421" x="26" y="54.2104">custom_thread1&lt;Function,Args...&gt;(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="452" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1giv8r3ootj0a)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="290" x="488.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyn51c1h3x4ay)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="290" x="488.5" y="8"/>
       <ellipse cx="570.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M573.2188,29.6406 Q572.6406,29.9375 572,30.0781 Q571.3594,30.2344 570.6563,30.2344 Q568.1563,30.2344 566.8281,28.5938 Q565.5156,26.9375 565.5156,23.8125 Q565.5156,20.6875 566.8281,19.0313 Q568.1563,17.375 570.6563,17.375 Q571.3594,17.375 572,17.5313 Q572.6563,17.6875 573.2188,17.9844 L573.2188,20.7031 Q572.5938,20.125 572,19.8594 Q571.4063,19.5781 570.7813,19.5781 Q569.4375,19.5781 568.75,20.6563 Q568.0625,21.7188 568.0625,23.8125 Q568.0625,25.9063 568.75,26.9844 Q569.4375,28.0469 570.7813,28.0469 Q571.4063,28.0469 572,27.7813 Q572.5938,27.5 573.2188,26.9219 L573.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="590.75" y="28.1543">A::custom_thread2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="777.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="494.5" y="46"/>
       <ellipse cx="499.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="264" x="508.5" y="54.2104">thread((lambda at t00051.cc:59:27) &amp;&amp;) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="777.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00051_class_mermaid.svg b/docs/test_cases/t00051_class_mermaid.svg
index 2c398be7..dc4945c3 100644
--- a/docs/test_cases/t00051_class_mermaid.svg
+++ b/docs/test_cases/t00051_class_mermaid.svg
@@ -102,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(292.6171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6">
+        <a transform="translate(292.6171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0000486675674447050206-0" class="node default clickable">
             <rect height="167" width="200.09375" y="-83.5" x="-100.046875" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="100.046875" x1="-100.046875" class="divider"/>
@@ -146,7 +146,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(292.6171875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L6">
+        <a transform="translate(292.6171875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0001969502737237579476-1" class="node default clickable">
             <rect height="167" width="569.234375" y="-83.5" x="-284.6171875" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="284.6171875" x1="-284.6171875" class="divider"/>
@@ -190,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(829.2734375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L20">
+        <a transform="translate(829.2734375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L20">
           <g title="A" id="classId-C_0001064663612772326174-2" class="node default clickable">
             <rect height="145" width="570.875" y="-72.5" x="-285.4375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="285.4375" x1="-285.4375" class="divider"/>
@@ -229,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(829.2734375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L23">
+        <a transform="translate(829.2734375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L23">
           <g title="A##custom_thread1" id="classId-C_0000267762118222214764-3" class="node default clickable">
             <rect height="79" width="404.078125" y="-39.5" x="-202.0390625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="202.0390625" x1="-202.0390625" class="divider"/>
@@ -253,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1259.796875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00051/t00051.cc#L35">
+        <a transform="translate(1259.796875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00051/t00051.cc#L35">
           <g title="A##custom_thread2" id="classId-C_0000728501319748477470-4" class="node default clickable">
             <rect height="79" width="356.96875" y="-39.5" x="-178.484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="178.484375" x1="-178.484375" class="divider"/>
diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg
index bd321064..566225d4 100644
--- a/docs/test_cases/t00052_class.svg
+++ b/docs/test_cases/t00052_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:459px;height:390px;" version="1.1" viewBox="0 0 459 390" width="459px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1k1wijysn6zp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgu2x89a3n7u1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="73.6094" id="C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgu2x89a3n7u1)" height="73.6094" id="C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="6" y="171"/>
       <ellipse cx="90.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M93.7188,192.6406 Q93.1406,192.9375 92.5,193.0781 Q91.8594,193.2344 91.1563,193.2344 Q88.6563,193.2344 87.3281,191.5938 Q86.0156,189.9375 86.0156,186.8125 Q86.0156,183.6875 87.3281,182.0313 Q88.6563,180.375 91.1563,180.375 Q91.8594,180.375 92.5,180.5313 Q93.1563,180.6875 93.7188,180.9844 L93.7188,183.7031 Q93.0938,183.125 92.5,182.8594 Q91.9063,182.5781 91.2813,182.5781 Q89.9375,182.5781 89.25,183.6563 Q88.5625,184.7188 88.5625,186.8125 Q88.5625,188.9063 89.25,189.9844 Q89.9375,191.0469 91.2813,191.0469 Q91.9063,191.0469 92.5,190.7813 Q93.0938,190.5 93.7188,189.9219 L93.7188,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="111.25" y="191.1543">A</text>
@@ -21,8 +21,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="26" y="230.0151">aa&lt;F,Q&gt;(F &amp;&amp; f, Q q) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="191" y1="236.6094" y2="236.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="73.6094" id="C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="156" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgu2x89a3n7u1)" height="73.6094" id="C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="156" y="306"/>
       <ellipse cx="218.25" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M221.2188,327.6406 Q220.6406,327.9375 220,328.0781 Q219.3594,328.2344 218.6563,328.2344 Q216.1563,328.2344 214.8281,326.5938 Q213.5156,324.9375 213.5156,321.8125 Q213.5156,318.6875 214.8281,317.0313 Q216.1563,315.375 218.6563,315.375 Q219.3594,315.375 220,315.5313 Q220.6563,315.6875 221.2188,315.9844 L221.2188,318.7031 Q220.5938,318.125 220,317.8594 Q219.4063,317.5781 218.7813,317.5781 Q217.4375,317.5781 216.75,318.6563 Q216.0625,319.7188 216.0625,321.8125 Q216.0625,323.9063 216.75,324.9844 Q217.4375,326.0469 218.7813,326.0469 Q219.4063,326.0469 220,325.7813 Q220.5938,325.5 221.2188,324.9219 L221.2188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="238.75" y="326.1543">B</text>
@@ -30,18 +30,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="303" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="162" y="344"/>
       <ellipse cx="167" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="176" y="352.2104">b(T t) : T</text>
     </a>
     <ellipse cx="167" cy="361.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="176" y="365.0151">bb&lt;F&gt;(F &amp;&amp; f, T t) : T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="371.6094" y2="371.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="60.8047" id="C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="343" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgu2x89a3n7u1)" height="60.8047" id="C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="343" y="312.5"/>
       <ellipse cx="380.95" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.9188,334.1406 Q383.3406,334.4375 382.7,334.5781 Q382.0594,334.7344 381.3563,334.7344 Q378.8563,334.7344 377.5281,333.0938 Q376.2156,331.4375 376.2156,328.3125 Q376.2156,325.1875 377.5281,323.5313 Q378.8563,321.875 381.3563,321.875 Q382.0594,321.875 382.7,322.0313 Q383.3563,322.1875 383.9188,322.4844 L383.9188,325.2031 Q383.2938,324.625 382.7,324.3594 Q382.1063,324.0781 381.4813,324.0781 Q380.1375,324.0781 379.45,325.1563 Q378.7625,326.2188 378.7625,328.3125 Q378.7625,330.4063 379.45,331.4844 Q380.1375,332.5469 381.4813,332.5469 Q382.1063,332.5469 382.7,332.2813 Q383.2938,332 383.9188,331.4219 L383.9188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="400.05" y="332.6543">C</text>
@@ -52,8 +52,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="363" y="358.7104">c&lt;P&gt;(P p) : T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="344" x2="444" y1="365.3047" y2="365.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgu2x89a3n7u1)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
       <ellipse cx="242" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M244.9688,205.6406 Q244.3906,205.9375 243.75,206.0781 Q243.1094,206.2344 242.4063,206.2344 Q239.9063,206.2344 238.5781,204.5938 Q237.2656,202.9375 237.2656,199.8125 Q237.2656,196.6875 238.5781,195.0313 Q239.9063,193.375 242.4063,193.375 Q243.1094,193.375 243.75,193.5313 Q244.4063,193.6875 244.9688,193.9844 L244.9688,196.7031 Q244.3438,196.125 243.75,195.8594 Q243.1563,195.5781 242.5313,195.5781 Q241.1875,195.5781 240.5,196.6563 Q239.8125,197.7188 239.8125,199.8125 Q239.8125,201.9063 240.5,202.9844 Q241.1875,204.0469 242.5313,204.0469 Q243.1563,204.0469 243.75,203.7813 Q244.3438,203.5 244.9688,202.9219 L244.9688,205.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="256" y="204.1543">B</text>
@@ -62,8 +62,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="216" y2="216"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="224" y2="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgu2x89a3n7u1)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
       <ellipse cx="366" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M368.9688,205.6406 Q368.3906,205.9375 367.75,206.0781 Q367.1094,206.2344 366.4063,206.2344 Q363.9063,206.2344 362.5781,204.5938 Q361.2656,202.9375 361.2656,199.8125 Q361.2656,196.6875 362.5781,195.0313 Q363.9063,193.375 366.4063,193.375 Q367.1094,193.375 367.75,193.5313 Q368.4063,193.6875 368.9688,193.9844 L368.9688,196.7031 Q368.3438,196.125 367.75,195.8594 Q367.1563,195.5781 366.5313,195.5781 Q365.1875,195.5781 364.5,196.6563 Q363.8125,197.7188 363.8125,199.8125 Q363.8125,201.9063 364.5,202.9844 Q365.1875,204.0469 366.5313,204.0469 Q367.1563,204.0469 367.75,203.7813 Q368.3438,203.5 368.9688,202.9219 L368.9688,205.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="380" y="204.1543">C</text>
@@ -72,33 +72,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="216" y2="216"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="224" y2="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k1wijysn6zp)" height="86.4141" id="C_0001157978668683299226" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="214.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgu2x89a3n7u1)" height="86.4141" id="C_0001157978668683299226" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="214.5" y="8"/>
       <ellipse cx="249.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M252.7188,29.6406 Q252.1406,29.9375 251.5,30.0781 Q250.8594,30.2344 250.1563,30.2344 Q247.6563,30.2344 246.3281,28.5938 Q245.0156,26.9375 245.0156,23.8125 Q245.0156,20.6875 246.3281,19.0313 Q247.6563,17.375 250.1563,17.375 Q250.8594,17.375 251.5,17.5313 Q252.1563,17.6875 252.7188,17.9844 L252.7188,20.7031 Q252.0938,20.125 251.5,19.8594 Q250.9063,19.5781 250.2813,19.5781 Q248.9375,19.5781 248.25,20.6563 Q247.5625,21.7188 247.5625,23.8125 Q247.5625,25.9063 248.25,26.9844 Q248.9375,28.0469 250.2813,28.0469 Q250.9063,28.0469 251.5,27.7813 Q252.0938,27.5 252.7188,26.9219 L252.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="268.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="54"/>
       <ellipse cx="225.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="234.5" y="62.2104">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="66.8047"/>
       <ellipse cx="225.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="59" x="234.5" y="75.0151">b : B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="79.6094"/>
       <ellipse cx="225.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="234.5" y="87.8198">c : C&lt;int&gt;</text>
     </a>
     <path d="M252.65,232.17 C249.84,247.09 246.07,267.16 242.51,286.07 " fill="none" id="C_0001043027222809675776-&gt;C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00052_class_mermaid.svg b/docs/test_cases/t00052_class_mermaid.svg
index aba3084e..3e3cb624 100644
--- a/docs/test_cases/t00052_class_mermaid.svg
+++ b/docs/test_cases/t00052_class_mermaid.svg
@@ -114,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(95.3125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L6">
+        <a transform="translate(95.3125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L6">
           <g title="A" id="classId-C_0002200853067459698271-0" class="node default clickable">
             <rect height="101" width="174.625" y="-50.5" x="-87.3125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="87.3125" x1="-87.3125" class="divider"/>
@@ -143,7 +143,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13">
+        <a transform="translate(265.0234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001737293776724790064-1" class="node default clickable">
             <rect height="101" width="147.046875" y="-50.5" x="-73.5234375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="73.5234375" x1="-73.5234375" class="divider"/>
@@ -172,7 +172,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(461.125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20">
+        <a transform="translate(461.125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000687756639884832524-2" class="node default clickable">
             <rect height="79" width="145.15625" y="-39.5" x="-72.578125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="72.578125" x1="-72.578125" class="divider"/>
@@ -196,7 +196,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L13">
+        <a transform="translate(265.0234375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001043027222809675776-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -215,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(461.125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L20">
+        <a transform="translate(461.125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000492968837554438176-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00052/t00052.cc#L29">
+        <a transform="translate(265.0234375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00052/t00052.cc#L29">
           <g title="R" id="classId-C_0001157978668683299226-5" class="node default clickable">
             <rect height="123" width="92.84375" y="-61.5" x="-46.421875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="46.421875" x1="-46.421875" class="divider"/>
diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg
index 273c8eb8..78016ebc 100644
--- a/docs/test_cases/t00053_class.svg
+++ b/docs/test_cases/t00053_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="340px" preserveAspectRatio="none" style="width:698px;height:340px;" version="1.1" viewBox="0 0 698 340" width="698px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1irkunw8yx982" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lnxt88fcolbk" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,72 +9,72 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000322642841130459425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0000322642841130459425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="46.5"/>
       <ellipse cx="249" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M251.9688,68.1406 Q251.3906,68.4375 250.75,68.5781 Q250.1094,68.7344 249.4063,68.7344 Q246.9063,68.7344 245.5781,67.0938 Q244.2656,65.4375 244.2656,62.3125 Q244.2656,59.1875 245.5781,57.5313 Q246.9063,55.875 249.4063,55.875 Q250.1094,55.875 250.75,56.0313 Q251.4063,56.1875 251.9688,56.4844 L251.9688,59.2031 Q251.3438,58.625 250.75,58.3594 Q250.1563,58.0781 249.5313,58.0781 Q248.1875,58.0781 247.5,59.1563 Q246.8125,60.2188 246.8125,62.3125 Q246.8125,64.4063 247.5,65.4844 Q248.1875,66.5469 249.5313,66.5469 Q250.1563,66.5469 250.75,66.2813 Q251.3438,66 251.9688,65.4219 L251.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="66.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001248473990784124468" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0001248473990784124468" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309" y="46.5"/>
       <ellipse cx="324" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M326.9688,68.1406 Q326.3906,68.4375 325.75,68.5781 Q325.1094,68.7344 324.4063,68.7344 Q321.9063,68.7344 320.5781,67.0938 Q319.2656,65.4375 319.2656,62.3125 Q319.2656,59.1875 320.5781,57.5313 Q321.9063,55.875 324.4063,55.875 Q325.1094,55.875 325.75,56.0313 Q326.4063,56.1875 326.9688,56.4844 L326.9688,59.2031 Q326.3438,58.625 325.75,58.3594 Q325.1563,58.0781 324.5313,58.0781 Q323.1875,58.0781 322.5,59.1563 Q321.8125,60.2188 321.8125,62.3125 Q321.8125,64.4063 322.5,65.4844 Q323.1875,66.5469 324.5313,66.5469 Q325.1563,66.5469 325.75,66.2813 Q326.3438,66 326.9688,65.4219 L326.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338" y="66.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001038384764221361257" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0001038384764221361257" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="161"/>
       <ellipse cx="249" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M251.9688,182.6406 Q251.3906,182.9375 250.75,183.0781 Q250.1094,183.2344 249.4063,183.2344 Q246.9063,183.2344 245.5781,181.5938 Q244.2656,179.9375 244.2656,176.8125 Q244.2656,173.6875 245.5781,172.0313 Q246.9063,170.375 249.4063,170.375 Q250.1094,170.375 250.75,170.5313 Q251.4063,170.6875 251.9688,170.9844 L251.9688,173.7031 Q251.3438,173.125 250.75,172.8594 Q250.1563,172.5781 249.5313,172.5781 Q248.1875,172.5781 247.5,173.6563 Q246.8125,174.7188 246.8125,176.8125 Q246.8125,178.9063 247.5,179.9844 Q248.1875,181.0469 249.5313,181.0469 Q250.1563,181.0469 250.75,180.7813 Q251.3438,180.5 251.9688,179.9219 L251.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="181.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000530253748811039667" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="309.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0000530253748811039667" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="309.5" y="161"/>
       <ellipse cx="324.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M327.4688,182.6406 Q326.8906,182.9375 326.25,183.0781 Q325.6094,183.2344 324.9063,183.2344 Q322.4063,183.2344 321.0781,181.5938 Q319.7656,179.9375 319.7656,176.8125 Q319.7656,173.6875 321.0781,172.0313 Q322.4063,170.375 324.9063,170.375 Q325.6094,170.375 326.25,170.5313 Q326.9063,170.6875 327.4688,170.9844 L327.4688,173.7031 Q326.8438,173.125 326.25,172.8594 Q325.6563,172.5781 325.0313,172.5781 Q323.6875,172.5781 323,173.6563 Q322.3125,174.7188 322.3125,176.8125 Q322.3125,178.9063 323,179.9844 Q323.6875,181.0469 325.0313,181.0469 Q325.6563,181.0469 326.25,180.7813 Q326.8438,180.5 327.4688,179.9219 L327.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="338.5" y="181.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000347629837292519144" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0000347629837292519144" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="46.5"/>
       <ellipse cx="420" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M422.9688,68.1406 Q422.3906,68.4375 421.75,68.5781 Q421.1094,68.7344 420.4063,68.7344 Q417.9063,68.7344 416.5781,67.0938 Q415.2656,65.4375 415.2656,62.3125 Q415.2656,59.1875 416.5781,57.5313 Q417.9063,55.875 420.4063,55.875 Q421.1094,55.875 421.75,56.0313 Q422.4063,56.1875 422.9688,56.4844 L422.9688,59.2031 Q422.3438,58.625 421.75,58.3594 Q421.1563,58.0781 420.5313,58.0781 Q419.1875,58.0781 418.5,59.1563 Q417.8125,60.2188 417.8125,62.3125 Q417.8125,64.4063 418.5,65.4844 Q419.1875,66.5469 420.5313,66.5469 Q421.1563,66.5469 421.75,66.2813 Q422.3438,66 422.9688,65.4219 L422.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="66.6543">a</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000504463801094568803" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="480.5" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0000504463801094568803" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="480.5" y="46.5"/>
       <ellipse cx="495.5" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M498.4688,68.1406 Q497.8906,68.4375 497.25,68.5781 Q496.6094,68.7344 495.9063,68.7344 Q493.4063,68.7344 492.0781,67.0938 Q490.7656,65.4375 490.7656,62.3125 Q490.7656,59.1875 492.0781,57.5313 Q493.4063,55.875 495.9063,55.875 Q496.6094,55.875 497.25,56.0313 Q497.9063,56.1875 498.4688,56.4844 L498.4688,59.2031 Q497.8438,58.625 497.25,58.3594 Q496.6563,58.0781 496.0313,58.0781 Q494.6875,58.0781 494,59.1563 Q493.3125,60.2188 493.3125,62.3125 Q493.3125,64.4063 494,65.4844 Q494.6875,66.5469 496.0313,66.5469 Q496.6563,66.5469 497.25,66.2813 Q497.8438,66 498.4688,65.4219 L498.4688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="509.5" y="66.6543">c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000907921963776939609" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0000907921963776939609" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="161"/>
       <ellipse cx="420" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M422.9688,182.6406 Q422.3906,182.9375 421.75,183.0781 Q421.1094,183.2344 420.4063,183.2344 Q417.9063,183.2344 416.5781,181.5938 Q415.2656,179.9375 415.2656,176.8125 Q415.2656,173.6875 416.5781,172.0313 Q417.9063,170.375 420.4063,170.375 Q421.1094,170.375 421.75,170.5313 Q422.4063,170.6875 422.9688,170.9844 L422.9688,173.7031 Q422.3438,173.125 421.75,172.8594 Q421.1563,172.5781 420.5313,172.5781 Q419.1875,172.5781 418.5,173.6563 Q417.8125,174.7188 417.8125,176.8125 Q417.8125,178.9063 418.5,179.9844 Q419.1875,181.0469 420.5313,181.0469 Q421.1563,181.0469 421.75,180.7813 Q422.3438,180.5 422.9688,179.9219 L422.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="181.1543">e</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001421289128664274084" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="480" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0001421289128664274084" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="480" y="161"/>
       <ellipse cx="495" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M497.9688,182.6406 Q497.3906,182.9375 496.75,183.0781 Q496.1094,183.2344 495.4063,183.2344 Q492.9063,183.2344 491.5781,181.5938 Q490.2656,179.9375 490.2656,176.8125 Q490.2656,173.6875 491.5781,172.0313 Q492.9063,170.375 495.4063,170.375 Q496.1094,170.375 496.75,170.5313 Q497.4063,170.6875 497.9688,170.9844 L497.9688,173.7031 Q497.3438,173.125 496.75,172.8594 Q496.1563,172.5781 495.5313,172.5781 Q494.1875,172.5781 493.5,173.6563 Q492.8125,174.7188 492.8125,176.8125 Q492.8125,178.9063 493.5,179.9844 Q494.1875,181.0469 495.5313,181.0469 Q496.1563,181.0469 496.75,180.7813 Q497.3438,180.5 497.9688,179.9219 L497.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="509" y="181.1543">f</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="60.8047" id="C_0000190978367074032185" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="647" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="60.8047" id="C_0000190978367074032185" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="647" y="40"/>
       <ellipse cx="662" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M666.1094,62 L658.3906,62 L658.3906,49.6094 L666.1094,49.6094 L666.1094,51.7656 L660.8438,51.7656 L660.8438,54.4375 L665.6094,54.4375 L665.6094,56.5938 L660.8438,56.5938 L660.8438,59.8438 L666.1094,59.8438 L666.1094,62 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="676" y="60.1543">h</text>
@@ -82,8 +82,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="653" y="86.2104">hhh</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="648" x2="686" y1="92.8047" y2="92.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="60.8047" id="C_0000965083605473661435" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="576.5" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="60.8047" id="C_0000965083605473661435" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="576.5" y="40"/>
       <ellipse cx="591.5" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M595.6094,62 L587.8906,62 L587.8906,49.6094 L595.6094,49.6094 L595.6094,51.7656 L590.3438,51.7656 L590.3438,54.4375 L595.1094,54.4375 L595.1094,56.5938 L590.3438,56.5938 L590.3438,59.8438 L595.6094,59.8438 L595.6094,62 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="605.5" y="60.1543">j</text>
@@ -91,56 +91,56 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="582.5" y="86.2104">jjj</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="577.5" x2="610.5" y1="92.8047" y2="92.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001376344645244260547" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0001376344645244260547" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="46.5"/>
       <ellipse cx="21" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,68.1406 Q23.3906,68.4375 22.75,68.5781 Q22.1094,68.7344 21.4063,68.7344 Q18.9063,68.7344 17.5781,67.0938 Q16.2656,65.4375 16.2656,62.3125 Q16.2656,59.1875 17.5781,57.5313 Q18.9063,55.875 21.4063,55.875 Q22.1094,55.875 22.75,56.0313 Q23.4063,56.1875 23.9688,56.4844 L23.9688,59.2031 Q23.3438,58.625 22.75,58.3594 Q22.1563,58.0781 21.5313,58.0781 Q20.1875,58.0781 19.5,59.1563 Q18.8125,60.2188 18.8125,62.3125 Q18.8125,64.4063 19.5,65.4844 Q20.1875,66.5469 21.5313,66.5469 Q22.1563,66.5469 22.75,66.2813 Q23.3438,66 23.9688,65.4219 L23.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="66.6543">b</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001264455164862224089" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0001264455164862224089" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="46.5"/>
       <ellipse cx="96" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,68.1406 Q98.3906,68.4375 97.75,68.5781 Q97.1094,68.7344 96.4063,68.7344 Q93.9063,68.7344 92.5781,67.0938 Q91.2656,65.4375 91.2656,62.3125 Q91.2656,59.1875 92.5781,57.5313 Q93.9063,55.875 96.4063,55.875 Q97.1094,55.875 97.75,56.0313 Q98.4063,56.1875 98.9688,56.4844 L98.9688,59.2031 Q98.3438,58.625 97.75,58.3594 Q97.1563,58.0781 96.5313,58.0781 Q95.1875,58.0781 94.5,59.1563 Q93.8125,60.2188 93.8125,62.3125 Q93.8125,64.4063 94.5,65.4844 Q95.1875,66.5469 96.5313,66.5469 Q97.1563,66.5469 97.75,66.2813 Q98.3438,66 98.9688,65.4219 L98.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="66.6543">d</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000200227126708762001" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0000200227126708762001" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="46.5"/>
       <ellipse cx="171" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,68.1406 Q173.3906,68.4375 172.75,68.5781 Q172.1094,68.7344 171.4063,68.7344 Q168.9063,68.7344 167.5781,67.0938 Q166.2656,65.4375 166.2656,62.3125 Q166.2656,59.1875 167.5781,57.5313 Q168.9063,55.875 171.4063,55.875 Q172.1094,55.875 172.75,56.0313 Q173.4063,56.1875 173.9688,56.4844 L173.9688,59.2031 Q173.3438,58.625 172.75,58.3594 Q172.1563,58.0781 171.5313,58.0781 Q170.1875,58.0781 169.5,59.1563 Q168.8125,60.2188 168.8125,62.3125 Q168.8125,64.4063 169.5,65.4844 Q170.1875,66.5469 171.5313,66.5469 Q172.1563,66.5469 172.75,66.2813 Q173.3438,66 173.9688,65.4219 L173.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="66.6543">g</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000876623970071162908" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0000876623970071162908" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="161"/>
       <ellipse cx="21" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,182.6406 Q23.3906,182.9375 22.75,183.0781 Q22.1094,183.2344 21.4063,183.2344 Q18.9063,183.2344 17.5781,181.5938 Q16.2656,179.9375 16.2656,176.8125 Q16.2656,173.6875 17.5781,172.0313 Q18.9063,170.375 21.4063,170.375 Q22.1094,170.375 22.75,170.5313 Q23.4063,170.6875 23.9688,170.9844 L23.9688,173.7031 Q23.3438,173.125 22.75,172.8594 Q22.1563,172.5781 21.5313,172.5781 Q20.1875,172.5781 19.5,173.6563 Q18.8125,174.7188 18.8125,176.8125 Q18.8125,178.9063 19.5,179.9844 Q20.1875,181.0469 21.5313,181.0469 Q22.1563,181.0469 22.75,180.7813 Q23.3438,180.5 23.9688,179.9219 L23.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="181.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0000470228045297785394" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="81.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0000470228045297785394" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="81.5" y="161"/>
       <ellipse cx="96.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M99.4688,182.6406 Q98.8906,182.9375 98.25,183.0781 Q97.6094,183.2344 96.9063,183.2344 Q94.4063,183.2344 93.0781,181.5938 Q91.7656,179.9375 91.7656,176.8125 Q91.7656,173.6875 93.0781,172.0313 Q94.4063,170.375 96.9063,170.375 Q97.6094,170.375 98.25,170.5313 Q98.9063,170.6875 99.4688,170.9844 L99.4688,173.7031 Q98.8438,173.125 98.25,172.8594 Q97.6563,172.5781 97.0313,172.5781 Q95.6875,172.5781 95,173.6563 Q94.3125,174.7188 94.3125,176.8125 Q94.3125,178.9063 95,179.9844 Q95.6875,181.0469 97.0313,181.0469 Q97.6563,181.0469 98.25,180.7813 Q98.8438,180.5 99.4688,179.9219 L99.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="110.5" y="181.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="48" id="C_0001031614323468823578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="157.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="48" id="C_0001031614323468823578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="157.5" y="161"/>
       <ellipse cx="172.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M175.4688,182.6406 Q174.8906,182.9375 174.25,183.0781 Q173.6094,183.2344 172.9063,183.2344 Q170.4063,183.2344 169.0781,181.5938 Q167.7656,179.9375 167.7656,176.8125 Q167.7656,173.6875 169.0781,172.0313 Q170.4063,170.375 172.9063,170.375 Q173.6094,170.375 174.25,170.5313 Q174.9063,170.6875 175.4688,170.9844 L175.4688,173.7031 Q174.8438,173.125 174.25,172.8594 Q173.6563,172.5781 173.0313,172.5781 Q171.6875,172.5781 171,173.6563 Q170.3125,174.7188 170.3125,176.8125 Q170.3125,178.9063 171,179.9844 Q171.6875,181.0469 173.0313,181.0469 Q173.6563,181.0469 174.25,180.7813 Q174.8438,180.5 175.4688,179.9219 L175.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="181.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1irkunw8yx982)" height="60.8047" id="C_0001473214620883985930" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="8.5" y="269"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lnxt88fcolbk)" height="60.8047" id="C_0001473214620883985930" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="8.5" y="269"/>
       <ellipse cx="23.5" cy="285" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M27.6094,291 L19.8906,291 L19.8906,278.6094 L27.6094,278.6094 L27.6094,280.7656 L22.3438,280.7656 L22.3438,283.4375 L27.1094,283.4375 L27.1094,285.5938 L22.3438,285.5938 L22.3438,288.8438 L27.6094,288.8438 L27.6094,291 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="37.5" y="289.1543">i</text>
diff --git a/docs/test_cases/t00053_class_mermaid.svg b/docs/test_cases/t00053_class_mermaid.svg
index 8f8a528e..579e02d2 100644
--- a/docs/test_cases/t00053_class_mermaid.svg
+++ b/docs/test_cases/t00053_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L4">
           <g title="b" id="classId-C_0001376344645244260547-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L6">
+        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L6">
           <g title="d" id="classId-C_0001264455164862224089-1" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L9">
+        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L9">
           <g title="g" id="classId-C_0000200227126708762001-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L12">
+        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L12">
           <g title="B" id="classId-C_0000876623970071162908-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L14">
+        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L14">
           <g title="D" id="classId-C_0000470228045297785394-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L17">
+        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L17">
           <g title="G" id="classId-C_0001031614323468823578-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L20">
+        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L20">
           <g title="i" id="classId-C_0001473214620883985930-6" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -190,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L11">
+        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L11">
           <g title="A" id="classId-C_0000322642841130459425-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -209,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L13">
+        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L13">
           <g title="C" id="classId-C_0001248473990784124468-8" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -228,7 +228,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L15">
+        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L15">
           <g title="E" id="classId-C_0001038384764221361257-9" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -247,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L16">
+        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L16">
           <g title="F" id="classId-C_0000530253748811039667-10" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -266,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L3">
+        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L3">
           <g title="a" id="classId-C_0000347629837292519144-11" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -285,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L5">
+        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L5">
           <g title="c" id="classId-C_0000504463801094568803-12" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -304,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L7">
+        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L7">
           <g title="e" id="classId-C_0000907921963776939609-13" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L8">
+        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L8">
           <g title="f" id="classId-C_0001421289128664274084-14" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -342,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L19">
+        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L19">
           <g title="h" id="classId-C_0000190978367074032185-15" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -366,7 +366,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00053/t00053.cc#L21">
+        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00053/t00053.cc#L21">
           <g title="j" id="classId-C_0000965083605473661435-16" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg
index e78cf148..24bea75a 100644
--- a/docs/test_cases/t00054_class.svg
+++ b/docs/test_cases/t00054_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:1774px;height:380px;" version="1.1" viewBox="0 0 1774 380" width="1774px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fytq19m9zy2wv" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7thilcn3puq5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,28 +9,28 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fytq19m9zy2wv)" points="707,55,756,55,763,77.2969,1049,77.2969,1049,226,707,226,707,55" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f7thilcn3puq5)" points="707,55,756,55,763,77.2969,1049,77.2969,1049,226,707,226,707,55" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="707" x2="763" y1="77.2969" y2="77.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="43" x="711" y="69.9951">detail</text>
-    <polygon fill="#FFFFFF" filter="url(#fytq19m9zy2wv)" points="1073,24,1132,24,1139,46.2969,1752,46.2969,1752,238,1073,238,1073,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f7thilcn3puq5)" points="1073,24,1132,24,1139,46.2969,1752,46.2969,1752,238,1073,238,1073,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="1073" x2="1139" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1077" y="38.9951">detail2</text>
-    <polygon fill="#FFFFFF" filter="url(#fytq19m9zy2wv)" points="1531,67,1590,67,1597,89.2969,1728,89.2969,1728,214,1531,214,1531,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f7thilcn3puq5)" points="1531,67,1590,67,1597,89.2969,1728,89.2969,1728,214,1531,214,1531,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="1531" x2="1597" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1535" y="81.9951">detail3</text>
-    <polygon fill="#FFFFFF" filter="url(#fytq19m9zy2wv)" points="22,54,81,54,88,76.2969,377,76.2969,377,368,22,368,22,54" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f7thilcn3puq5)" points="22,54,81,54,88,76.2969,377,76.2969,377,368,22,368,22,54" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="88" y1="76.2969" y2="76.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="26" y="68.9951">detail4</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0001569559620782547158" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="723" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="48" id="C_0001569559620782547158" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="723" y="126"/>
       <ellipse cx="738" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M740.9688,147.6406 Q740.3906,147.9375 739.75,148.0781 Q739.1094,148.2344 738.4063,148.2344 Q735.9063,148.2344 734.5781,146.5938 Q733.2656,144.9375 733.2656,141.8125 Q733.2656,138.6875 734.5781,137.0313 Q735.9063,135.375 738.4063,135.375 Q739.1094,135.375 739.75,135.5313 Q740.4063,135.6875 740.9688,135.9844 L740.9688,138.7031 Q740.3438,138.125 739.75,137.8594 Q739.1563,137.5781 738.5313,137.5781 Q737.1875,137.5781 736.5,138.6563 Q735.8125,139.7188 735.8125,141.8125 Q735.8125,143.9063 736.5,144.9844 Q737.1875,146.0469 738.5313,146.0469 Q739.1563,146.0469 739.75,145.7813 Q740.3438,145.5 740.9688,144.9219 L740.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="752" y="146.1543">d</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="72" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="72" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="114"/>
       <ellipse cx="984" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M986.9688,135.6406 Q986.3906,135.9375 985.75,136.0781 Q985.1094,136.2344 984.4063,136.2344 Q981.9063,136.2344 980.5781,134.5938 Q979.2656,132.9375 979.2656,129.8125 Q979.2656,126.6875 980.5781,125.0313 Q981.9063,123.375 984.4063,123.375 Q985.1094,123.375 985.75,123.5313 Q986.4063,123.6875 986.9688,123.9844 L986.9688,126.7031 Q986.3438,126.125 985.75,125.8594 Q985.1563,125.5781 984.5313,125.5781 Q983.1875,125.5781 982.5,126.6563 Q981.8125,127.7188 981.8125,129.8125 Q981.8125,131.9063 982.5,132.9844 Q983.1875,134.0469 984.5313,134.0469 Q985.1563,134.0469 985.75,133.7813 Q986.3438,133.5 986.9688,132.9219 L986.9688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="998" y="134.1543">a</text>
@@ -40,8 +40,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="72" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="72" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="114"/>
       <ellipse cx="888.5" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M891.4688,135.6406 Q890.8906,135.9375 890.25,136.0781 Q889.6094,136.2344 888.9063,136.2344 Q886.4063,136.2344 885.0781,134.5938 Q883.7656,132.9375 883.7656,129.8125 Q883.7656,126.6875 885.0781,125.0313 Q886.4063,123.375 888.9063,123.375 Q889.6094,123.375 890.25,123.5313 Q890.9063,123.6875 891.4688,123.9844 L891.4688,126.7031 Q890.8438,126.125 890.25,125.8594 Q889.6563,125.5781 889.0313,125.5781 Q887.6875,125.5781 887,126.6563 Q886.3125,127.7188 886.3125,129.8125 Q886.3125,131.9063 887,132.9844 Q887.6875,134.0469 889.0313,134.0469 Q889.6563,134.0469 890.25,133.7813 Q890.8438,133.5 891.4688,132.9219 L891.4688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="902.5" y="134.1543">c</text>
@@ -51,8 +51,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="72" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="72" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="114"/>
       <ellipse cx="813" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M815.9688,135.6406 Q815.3906,135.9375 814.75,136.0781 Q814.1094,136.2344 813.4063,136.2344 Q810.9063,136.2344 809.5781,134.5938 Q808.2656,132.9375 808.2656,129.8125 Q808.2656,126.6875 809.5781,125.0313 Q810.9063,123.375 813.4063,123.375 Q814.1094,123.375 814.75,123.5313 Q815.4063,123.6875 815.9688,123.9844 L815.9688,126.7031 Q815.3438,126.125 814.75,125.8594 Q814.1563,125.5781 813.5313,125.5781 Q812.1875,125.5781 811.5,126.6563 Q810.8125,127.7188 810.8125,129.8125 Q810.8125,131.9063 811.5,132.9844 Q812.1875,134.0469 813.5313,134.0469 Q814.1563,134.0469 814.75,133.7813 Q815.3438,133.5 815.9688,132.9219 L815.9688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827" y="134.1543">e</text>
@@ -62,40 +62,40 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000540054955081677892" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1209" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="48" id="C_0000540054955081677892" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1209" y="126"/>
       <ellipse cx="1224" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1226.9688,147.6406 Q1226.3906,147.9375 1225.75,148.0781 Q1225.1094,148.2344 1224.4063,148.2344 Q1221.9063,148.2344 1220.5781,146.5938 Q1219.2656,144.9375 1219.2656,141.8125 Q1219.2656,138.6875 1220.5781,137.0313 Q1221.9063,135.375 1224.4063,135.375 Q1225.1094,135.375 1225.75,135.5313 Q1226.4063,135.6875 1226.9688,135.9844 L1226.9688,138.7031 Q1226.3438,138.125 1225.75,137.8594 Q1225.1563,137.5781 1224.5313,137.5781 Q1223.1875,137.5781 1222.5,138.6563 Q1221.8125,139.7188 1221.8125,141.8125 Q1221.8125,143.9063 1222.5,144.9844 Q1223.1875,146.0469 1224.5313,146.0469 Q1225.1563,146.0469 1225.75,145.7813 Q1226.3438,145.5 1226.9688,144.9219 L1226.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1238" y="146.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000446694692150903211" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="1134.5" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="48" id="C_0000446694692150903211" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="1134.5" y="126"/>
       <ellipse cx="1149.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1152.4688,147.6406 Q1151.8906,147.9375 1151.25,148.0781 Q1150.6094,148.2344 1149.9063,148.2344 Q1147.4063,148.2344 1146.0781,146.5938 Q1144.7656,144.9375 1144.7656,141.8125 Q1144.7656,138.6875 1146.0781,137.0313 Q1147.4063,135.375 1149.9063,135.375 Q1150.6094,135.375 1151.25,135.5313 Q1151.9063,135.6875 1152.4688,135.9844 L1152.4688,138.7031 Q1151.8438,138.125 1151.25,137.8594 Q1150.6563,137.5781 1150.0313,137.5781 Q1148.6875,137.5781 1148,138.6563 Q1147.3125,139.7188 1147.3125,141.8125 Q1147.3125,143.9063 1148,144.9844 Q1148.6875,146.0469 1150.0313,146.0469 Q1150.6563,146.0469 1151.25,145.7813 Q1151.8438,145.5 1152.4688,144.9219 L1152.4688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1163.5" y="146.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0001266390196945323478" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1646.5" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="48" id="C_0001266390196945323478" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1646.5" y="126"/>
       <ellipse cx="1661.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1664.4688,147.6406 Q1663.8906,147.9375 1663.25,148.0781 Q1662.6094,148.2344 1661.9063,148.2344 Q1659.4063,148.2344 1658.0781,146.5938 Q1656.7656,144.9375 1656.7656,141.8125 Q1656.7656,138.6875 1658.0781,137.0313 Q1659.4063,135.375 1661.9063,135.375 Q1662.6094,135.375 1663.25,135.5313 Q1663.9063,135.6875 1664.4688,135.9844 L1664.4688,138.7031 Q1663.8438,138.125 1663.25,137.8594 Q1662.6563,137.5781 1662.0313,137.5781 Q1660.6875,137.5781 1660,138.6563 Q1659.3125,139.7188 1659.3125,141.8125 Q1659.3125,143.9063 1660,144.9844 Q1660.6875,146.0469 1662.0313,146.0469 Q1662.6563,146.0469 1663.25,145.7813 Q1663.8438,145.5 1664.4688,144.9219 L1664.4688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1675.5" y="146.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000134928214982255105" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1571" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="48" id="C_0000134928214982255105" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1571" y="126"/>
       <ellipse cx="1586" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1588.9688,147.6406 Q1588.3906,147.9375 1587.75,148.0781 Q1587.1094,148.2344 1586.4063,148.2344 Q1583.9063,148.2344 1582.5781,146.5938 Q1581.2656,144.9375 1581.2656,141.8125 Q1581.2656,138.6875 1582.5781,137.0313 Q1583.9063,135.375 1586.4063,135.375 Q1587.1094,135.375 1587.75,135.5313 Q1588.4063,135.6875 1588.9688,135.9844 L1588.9688,138.7031 Q1588.3438,138.125 1587.75,137.8594 Q1587.1563,137.5781 1586.5313,137.5781 Q1585.1875,137.5781 1584.5,138.6563 Q1583.8125,139.7188 1583.8125,141.8125 Q1583.8125,143.9063 1584.5,144.9844 Q1585.1875,146.0469 1586.5313,146.0469 Q1587.1563,146.0469 1587.75,145.7813 Q1588.3438,145.5 1588.9688,144.9219 L1588.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1600" y="146.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="64" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="64" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="118"/>
       <ellipse cx="1466" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1468.9688,139.6406 Q1468.3906,139.9375 1467.75,140.0781 Q1467.1094,140.2344 1466.4063,140.2344 Q1463.9063,140.2344 1462.5781,138.5938 Q1461.2656,136.9375 1461.2656,133.8125 Q1461.2656,130.6875 1462.5781,129.0313 Q1463.9063,127.375 1466.4063,127.375 Q1467.1094,127.375 1467.75,127.5313 Q1468.4063,127.6875 1468.9688,127.9844 L1468.9688,130.7031 Q1468.3438,130.125 1467.75,129.8594 Q1467.1563,129.5781 1466.5313,129.5781 Q1465.1875,129.5781 1464.5,130.6563 Q1463.8125,131.7188 1463.8125,133.8125 Q1463.8125,135.9063 1464.5,136.9844 Q1465.1875,138.0469 1466.5313,138.0469 Q1467.1563,138.0469 1467.75,137.7813 Q1468.3438,137.5 1468.9688,136.9219 L1468.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1480" y="138.1543">A</text>
@@ -104,8 +104,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="64" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="64" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="118"/>
       <ellipse cx="1391" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1393.9688,139.6406 Q1393.3906,139.9375 1392.75,140.0781 Q1392.1094,140.2344 1391.4063,140.2344 Q1388.9063,140.2344 1387.5781,138.5938 Q1386.2656,136.9375 1386.2656,133.8125 Q1386.2656,130.6875 1387.5781,129.0313 Q1388.9063,127.375 1391.4063,127.375 Q1392.1094,127.375 1392.75,127.5313 Q1393.4063,127.6875 1393.9688,127.9844 L1393.9688,130.7031 Q1393.3438,130.125 1392.75,129.8594 Q1392.1563,129.5781 1391.5313,129.5781 Q1390.1875,129.5781 1389.5,130.6563 Q1388.8125,131.7188 1388.8125,133.8125 Q1388.8125,135.9063 1389.5,136.9844 Q1390.1875,138.0469 1391.5313,138.0469 Q1392.1563,138.0469 1392.75,137.7813 Q1393.3438,137.5 1393.9688,136.9219 L1393.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1405" y="138.1543">B</text>
@@ -114,8 +114,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="64" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="64" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="118"/>
       <ellipse cx="1299" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1301.9688,139.6406 Q1301.3906,139.9375 1300.75,140.0781 Q1300.1094,140.2344 1299.4063,140.2344 Q1296.9063,140.2344 1295.5781,138.5938 Q1294.2656,136.9375 1294.2656,133.8125 Q1294.2656,130.6875 1295.5781,129.0313 Q1296.9063,127.375 1299.4063,127.375 Q1300.1094,127.375 1300.75,127.5313 Q1301.4063,127.6875 1301.9688,127.9844 L1301.9688,130.7031 Q1301.3438,130.125 1300.75,129.8594 Q1300.1563,129.5781 1299.5313,129.5781 Q1298.1875,129.5781 1297.5,130.6563 Q1296.8125,131.7188 1296.8125,133.8125 Q1296.8125,135.9063 1297.5,136.9844 Q1298.1875,138.0469 1299.5313,138.0469 Q1300.1563,138.0469 1300.75,137.7813 Q1301.3438,137.5 1301.9688,136.9219 L1301.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="1313" y="138.1543">f</text>
@@ -124,8 +124,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="56" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="122"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="56" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="122"/>
       <ellipse cx="310.5" cy="138" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M313.4688,143.6406 Q312.8906,143.9375 312.25,144.0781 Q311.6094,144.2344 310.9063,144.2344 Q308.4063,144.2344 307.0781,142.5938 Q305.7656,140.9375 305.7656,137.8125 Q305.7656,134.6875 307.0781,133.0313 Q308.4063,131.375 310.9063,131.375 Q311.6094,131.375 312.25,131.5313 Q312.9063,131.6875 313.4688,131.9844 L313.4688,134.7031 Q312.8438,134.125 312.25,133.8594 Q311.6563,133.5781 311.0313,133.5781 Q309.6875,133.5781 309,134.6563 Q308.3125,135.7188 308.3125,137.8125 Q308.3125,139.9063 309,140.9844 Q309.6875,142.0469 311.0313,142.0469 Q311.6563,142.0469 312.25,141.7813 Q312.8438,141.5 313.4688,140.9219 L313.4688,143.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="324.5" y="142.1543">G</text>
@@ -133,8 +133,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="162" y2="162"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="170" y2="170"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="73.6094" id="C_0001592677999268391183" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="128" y="113"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="73.6094" id="C_0001592677999268391183" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="128" y="113"/>
       <ellipse cx="143" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M147.1094,135 L139.3906,135 L139.3906,122.6094 L147.1094,122.6094 L147.1094,124.7656 L141.8438,124.7656 L141.8438,127.4375 L146.6094,127.4375 L146.6094,129.5938 L141.8438,129.5938 L141.8438,132.8438 L147.1094,132.8438 L147.1094,135 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157" y="133.1543">h</text>
@@ -143,8 +143,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="134" y="172.0151">hhh</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="167" y1="178.6094" y2="178.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="73.6094" id="C_0000441521323390223397" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="203.5" y="113"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="73.6094" id="C_0000441521323390223397" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="203.5" y="113"/>
       <ellipse cx="218.5" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.6094,135 L214.8906,135 L214.8906,122.6094 L222.6094,122.6094 L222.6094,124.7656 L217.3438,124.7656 L217.3438,127.4375 L222.1094,127.4375 L222.1094,129.5938 L217.3438,129.5938 L217.3438,132.8438 L222.6094,132.8438 L222.6094,135 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="232.5" y="133.1543">i</text>
@@ -153,8 +153,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="172.0151">iii</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="237.5" y1="178.6094" y2="178.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="73.6094" id="C_0000499334434426587347" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="130.5" y="254"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="73.6094" id="C_0000499334434426587347" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="130.5" y="254"/>
       <ellipse cx="145.5" cy="270" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M149.6094,276 L141.8906,276 L141.8906,263.6094 L149.6094,263.6094 L149.6094,265.7656 L144.3438,265.7656 L144.3438,268.4375 L149.1094,268.4375 L149.1094,270.5938 L144.3438,270.5938 L144.3438,273.8438 L149.6094,273.8438 L149.6094,276 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="159.5" y="274.1543">j</text>
@@ -163,16 +163,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="136.5" y="313.0151">jjj</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="164.5" y1="319.6094" y2="319.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000252416999805673718" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="573" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="48" id="C_0000252416999805673718" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="573" y="126"/>
       <ellipse cx="588" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M590.9688,147.6406 Q590.3906,147.9375 589.75,148.0781 Q589.1094,148.2344 588.4063,148.2344 Q585.9063,148.2344 584.5781,146.5938 Q583.2656,144.9375 583.2656,141.8125 Q583.2656,138.6875 584.5781,137.0313 Q585.9063,135.375 588.4063,135.375 Q589.1094,135.375 589.75,135.5313 Q590.4063,135.6875 590.9688,135.9844 L590.9688,138.7031 Q590.3438,138.125 589.75,137.8594 Q589.1563,137.5781 588.5313,137.5781 Q587.1875,137.5781 586.5,138.6563 Q585.8125,139.7188 585.8125,141.8125 Q585.8125,143.9063 586.5,144.9844 Q587.1875,146.0469 588.5313,146.0469 Q589.1563,146.0469 589.75,145.7813 Q590.3438,145.5 590.9688,144.9219 L590.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="602" y="146.1543">b</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fytq19m9zy2wv)" height="48" id="C_0000595494794840378320" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="648" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7thilcn3puq5)" height="48" id="C_0000595494794840378320" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="648" y="126"/>
       <ellipse cx="663" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M665.9688,147.6406 Q665.3906,147.9375 664.75,148.0781 Q664.1094,148.2344 663.4063,148.2344 Q660.9063,148.2344 659.5781,146.5938 Q658.2656,144.9375 658.2656,141.8125 Q658.2656,138.6875 659.5781,137.0313 Q660.9063,135.375 663.4063,135.375 Q664.1094,135.375 664.75,135.5313 Q665.4063,135.6875 665.9688,135.9844 L665.9688,138.7031 Q665.3438,138.125 664.75,137.8594 Q664.1563,137.5781 663.5313,137.5781 Q662.1875,137.5781 661.5,138.6563 Q660.8125,139.7188 660.8125,141.8125 Q660.8125,143.9063 661.5,144.9844 Q662.1875,146.0469 663.5313,146.0469 Q664.1563,146.0469 664.75,145.7813 Q665.3438,145.5 665.9688,144.9219 L665.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="677" y="146.1543">g</text>
diff --git a/docs/test_cases/t00054_class_mermaid.svg b/docs/test_cases/t00054_class_mermaid.svg
index 39b3433e..1cfc22f0 100644
--- a/docs/test_cases/t00054_class_mermaid.svg
+++ b/docs/test_cases/t00054_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L4">
           <g title="b" id="classId-C_0000252416999805673718-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L8">
+        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L8">
           <g title="d" id="classId-C_0001569559620782547158-1" class="node default clickable">
             <rect height="57" width="77.21875" y="-28.5" x="-38.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.609375" x1="-38.609375" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L12">
+        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L12">
           <g title="g" id="classId-C_0000595494794840378320-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L18">
+        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L18">
           <g title="C" id="classId-C_0000540054955081677892-3" class="node default clickable">
             <rect height="57" width="87.90625" y="-28.5" x="-43.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.953125" x1="-43.953125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L23">
+        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L23">
           <g title="F" id="classId-C_0000446694692150903211-4" class="node default clickable">
             <rect height="57" width="86.125" y="-28.5" x="-43.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.0625" x1="-43.0625" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L14">
+        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L14">
           <g title="A" id="classId-C_0000917656824503504804-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L15">
+        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L15">
           <g title="B" id="classId-C_0001235773045370563004-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -185,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L25">
+        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L25">
           <g title="G" id="classId-C_0001365815261671395853-7" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -204,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L3">
+        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L3">
           <g title="a" id="classId-C_0001158868779503074564-8" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L11">
+        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L11">
           <g title="f" id="classId-C_0002123626454198320938-9" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -242,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L20">
+        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L20">
           <g title="D" id="classId-C_0001266390196945323478-10" class="node default clickable">
             <rect height="57" width="149.25" y="-28.5" x="-74.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.625" x1="-74.625" class="divider"/>
@@ -261,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L21">
+        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L21">
           <g title="E" id="classId-C_0000134928214982255105-11" class="node default clickable">
             <rect height="57" width="148.359375" y="-28.5" x="-74.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.1796875" x1="-74.1796875" class="divider"/>
@@ -280,7 +280,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L28">
+        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L28">
           <g title="h" id="classId-C_0001592677999268391183-12" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -304,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L29">
+        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L29">
           <g title="i" id="classId-C_0000441521323390223397-13" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -328,7 +328,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L30">
+        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L30">
           <g title="j" id="classId-C_0000499334434426587347-14" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -352,7 +352,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L7">
+        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L7">
           <g title="c" id="classId-C_0001168031834662719964-15" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -371,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00054/t00054.cc#L9">
+        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00054/t00054.cc#L9">
           <g title="e" id="classId-C_0002037550833462858827-16" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg
index 9047fa90..c733fb17 100644
--- a/docs/test_cases/t00055_class.svg
+++ b/docs/test_cases/t00055_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="499px" preserveAspectRatio="none" style="width:429px;height:499px;" version="1.1" viewBox="0 0 429 499" width="429px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f18d3h6krg0exx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1v9rkty2nvman" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,80 +9,80 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0001697191682863715554" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0001697191682863715554" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000188599859894721517" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="378" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0000188599859894721517" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="378" y="8"/>
       <ellipse cx="393" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.9688,29.6406 Q395.3906,29.9375 394.75,30.0781 Q394.1094,30.2344 393.4063,30.2344 Q390.9063,30.2344 389.5781,28.5938 Q388.2656,26.9375 388.2656,23.8125 Q388.2656,20.6875 389.5781,19.0313 Q390.9063,17.375 393.4063,17.375 Q394.1094,17.375 394.75,17.5313 Q395.4063,17.6875 395.9688,17.9844 L395.9688,20.7031 Q395.3438,20.125 394.75,19.8594 Q394.1563,19.5781 393.5313,19.5781 Q392.1875,19.5781 391.5,20.6563 Q390.8125,21.7188 390.8125,23.8125 Q390.8125,25.9063 391.5,26.9844 Q392.1875,28.0469 393.5313,28.0469 Q394.1563,28.0469 394.75,27.7813 Q395.3438,27.5 395.9688,26.9219 L395.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="407" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000625177137967392996" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0000625177137967392996" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="8"/>
       <ellipse cx="96" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,29.6406 Q98.3906,29.9375 97.75,30.0781 Q97.1094,30.2344 96.4063,30.2344 Q93.9063,30.2344 92.5781,28.5938 Q91.2656,26.9375 91.2656,23.8125 Q91.2656,20.6875 92.5781,19.0313 Q93.9063,17.375 96.4063,17.375 Q97.1094,17.375 97.75,17.5313 Q98.4063,17.6875 98.9688,17.9844 L98.9688,20.7031 Q98.3438,20.125 97.75,19.8594 Q97.1563,19.5781 96.5313,19.5781 Q95.1875,19.5781 94.5,20.6563 Q93.8125,21.7188 93.8125,23.8125 Q93.8125,25.9063 94.5,26.9844 Q95.1875,28.0469 96.5313,28.0469 Q97.1563,28.0469 97.75,27.7813 Q98.3438,27.5 98.9688,26.9219 L98.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0001046415640323289221" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0001046415640323289221" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="116"/>
       <ellipse cx="392.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.4688,137.6406 Q394.8906,137.9375 394.25,138.0781 Q393.6094,138.2344 392.9063,138.2344 Q390.4063,138.2344 389.0781,136.5938 Q387.7656,134.9375 387.7656,131.8125 Q387.7656,128.6875 389.0781,127.0313 Q390.4063,125.375 392.9063,125.375 Q393.6094,125.375 394.25,125.5313 Q394.9063,125.6875 395.4688,125.9844 L395.4688,128.7031 Q394.8438,128.125 394.25,127.8594 Q393.6563,127.5781 393.0313,127.5781 Q391.6875,127.5781 391,128.6563 Q390.3125,129.7188 390.3125,131.8125 Q390.3125,133.9063 391,134.9844 Q391.6875,136.0469 393.0313,136.0469 Q393.6563,136.0469 394.25,135.7813 Q394.8438,135.5 395.4688,134.9219 L395.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="136.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000702117239243796422" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0000702117239243796422" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="8"/>
       <ellipse cx="171" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,29.6406 Q173.3906,29.9375 172.75,30.0781 Q172.1094,30.2344 171.4063,30.2344 Q168.9063,30.2344 167.5781,28.5938 Q166.2656,26.9375 166.2656,23.8125 Q166.2656,20.6875 167.5781,19.0313 Q168.9063,17.375 171.4063,17.375 Q172.1094,17.375 172.75,17.5313 Q173.4063,17.6875 173.9688,17.9844 L173.9688,20.7031 Q173.3438,20.125 172.75,19.8594 Q172.1563,19.5781 171.5313,19.5781 Q170.1875,19.5781 169.5,20.6563 Q168.8125,21.7188 168.8125,23.8125 Q168.8125,25.9063 169.5,26.9844 Q170.1875,28.0469 171.5313,28.0469 Q172.1563,28.0469 172.75,27.7813 Q173.3438,27.5 173.9688,26.9219 L173.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="28.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0001511375015718046137" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="378.5" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0001511375015718046137" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="378.5" y="224"/>
       <ellipse cx="393.5" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M396.4688,245.6406 Q395.8906,245.9375 395.25,246.0781 Q394.6094,246.2344 393.9063,246.2344 Q391.4063,246.2344 390.0781,244.5938 Q388.7656,242.9375 388.7656,239.8125 Q388.7656,236.6875 390.0781,235.0313 Q391.4063,233.375 393.9063,233.375 Q394.6094,233.375 395.25,233.5313 Q395.9063,233.6875 396.4688,233.9844 L396.4688,236.7031 Q395.8438,236.125 395.25,235.8594 Q394.6563,235.5781 394.0313,235.5781 Q392.6875,235.5781 392,236.6563 Q391.3125,237.7188 391.3125,239.8125 Q391.3125,241.9063 392,242.9844 Q392.6875,244.0469 394.0313,244.0469 Q394.6563,244.0469 395.25,243.7813 Q395.8438,243.5 396.4688,242.9219 L396.4688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="407.5" y="244.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="256" y2="256"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000651600874645139639" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0000651600874645139639" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="8"/>
       <ellipse cx="246.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,29.6406 Q248.8906,29.9375 248.25,30.0781 Q247.6094,30.2344 246.9063,30.2344 Q244.4063,30.2344 243.0781,28.5938 Q241.7656,26.9375 241.7656,23.8125 Q241.7656,20.6875 243.0781,19.0313 Q244.4063,17.375 246.9063,17.375 Q247.6094,17.375 248.25,17.5313 Q248.9063,17.6875 249.4688,17.9844 L249.4688,20.7031 Q248.8438,20.125 248.25,19.8594 Q247.6563,19.5781 247.0313,19.5781 Q245.6875,19.5781 245,20.6563 Q244.3125,21.7188 244.3125,23.8125 Q244.3125,25.9063 245,26.9844 Q245.6875,28.0469 247.0313,28.0469 Q247.6563,28.0469 248.25,27.7813 Q248.8438,27.5 249.4688,26.9219 L249.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="28.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000374142601071476038" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="332"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0000374142601071476038" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="332"/>
       <ellipse cx="392.5" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.4688,353.6406 Q394.8906,353.9375 394.25,354.0781 Q393.6094,354.2344 392.9063,354.2344 Q390.4063,354.2344 389.0781,352.5938 Q387.7656,350.9375 387.7656,347.8125 Q387.7656,344.6875 389.0781,343.0313 Q390.4063,341.375 392.9063,341.375 Q393.6094,341.375 394.25,341.5313 Q394.9063,341.6875 395.4688,341.9844 L395.4688,344.7031 Q394.8438,344.125 394.25,343.8594 Q393.6563,343.5781 393.0313,343.5781 Q391.6875,343.5781 391,344.6563 Q390.3125,345.7188 390.3125,347.8125 Q390.3125,349.9063 391,350.9844 Q391.6875,352.0469 393.0313,352.0469 Q393.6563,352.0469 394.25,351.7813 Q394.8438,351.5 395.4688,350.9219 L395.4688,353.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="352.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="364" y2="364"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="372" y2="372"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000295372236079742697" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="307.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0000295372236079742697" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="307.5" y="8"/>
       <ellipse cx="322.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.4688,29.6406 Q324.8906,29.9375 324.25,30.0781 Q323.6094,30.2344 322.9063,30.2344 Q320.4063,30.2344 319.0781,28.5938 Q317.7656,26.9375 317.7656,23.8125 Q317.7656,20.6875 319.0781,19.0313 Q320.4063,17.375 322.9063,17.375 Q323.6094,17.375 324.25,17.5313 Q324.9063,17.6875 325.4688,17.9844 L325.4688,20.7031 Q324.8438,20.125 324.25,19.8594 Q323.6563,19.5781 323.0313,19.5781 Q321.6875,19.5781 321,20.6563 Q320.3125,21.7188 320.3125,23.8125 Q320.3125,25.9063 321,26.9844 Q321.6875,28.0469 323.0313,28.0469 Q323.6563,28.0469 324.25,27.7813 Q324.8438,27.5 325.4688,26.9219 L325.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="336.5" y="28.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18d3h6krg0exx)" height="48" id="C_0000769231292718551090" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="380.5" y="440"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1v9rkty2nvman)" height="48" id="C_0000769231292718551090" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="380.5" y="440"/>
       <ellipse cx="395.5" cy="456" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M398.4688,461.6406 Q397.8906,461.9375 397.25,462.0781 Q396.6094,462.2344 395.9063,462.2344 Q393.4063,462.2344 392.0781,460.5938 Q390.7656,458.9375 390.7656,455.8125 Q390.7656,452.6875 392.0781,451.0313 Q393.4063,449.375 395.9063,449.375 Q396.6094,449.375 397.25,449.5313 Q397.9063,449.6875 398.4688,449.9844 L398.4688,452.7031 Q397.8438,452.125 397.25,451.8594 Q396.6563,451.5781 396.0313,451.5781 Q394.6875,451.5781 394,452.6563 Q393.3125,453.7188 393.3125,455.8125 Q393.3125,457.9063 394,458.9844 Q394.6875,460.0469 396.0313,460.0469 Q396.6563,460.0469 397.25,459.7813 Q397.8438,459.5 398.4688,458.9219 L398.4688,461.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="409.5" y="460.1543">J</text>
diff --git a/docs/test_cases/t00055_class_mermaid.svg b/docs/test_cases/t00055_class_mermaid.svg
index 2549cb38..ac2b128c 100644
--- a/docs/test_cases/t00055_class_mermaid.svg
+++ b/docs/test_cases/t00055_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L3">
           <g title="A" id="classId-C_0001697191682863715554-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L4">
+        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L4">
           <g title="B" id="classId-C_0000188599859894721517-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L5">
+        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L5">
           <g title="C" id="classId-C_0000625177137967392996-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L6">
+        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L6">
           <g title="D" id="classId-C_0001046415640323289221-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L7">
+        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L7">
           <g title="E" id="classId-C_0000702117239243796422-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L8">
+        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L8">
           <g title="F" id="classId-C_0001511375015718046137-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L9">
+        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L9">
           <g title="G" id="classId-C_0000651600874645139639-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -185,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L10">
+        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L10">
           <g title="H" id="classId-C_0000374142601071476038-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -204,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L11">
+        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L11">
           <g title="I" id="classId-C_0000295372236079742697-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00055/t00055.cc#L12">
+        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00055/t00055.cc#L12">
           <g title="J" id="classId-C_0000769231292718551090-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg
index ef095842..02e702a6 100644
--- a/docs/test_cases/t00056_class.svg
+++ b/docs/test_cases/t00056_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="613px" preserveAspectRatio="none" style="width:1507px;height:613px;" version="1.1" viewBox="0 0 1507 613" width="1507px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1etijee47fp2t" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fvemwtu91kehj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="53.9375" id="C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="6" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="53.9375" id="C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="6" y="184"/>
       <ellipse cx="21" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,208.6094 Q23.3906,208.9063 22.75,209.0469 Q22.1094,209.2031 21.4063,209.2031 Q18.9063,209.2031 17.5781,207.5625 Q16.2656,205.9063 16.2656,202.7813 Q16.2656,199.6563 17.5781,198 Q18.9063,196.3438 21.4063,196.3438 Q22.1094,196.3438 22.75,196.5 Q23.4063,196.6563 23.9688,196.9531 L23.9688,199.6719 Q23.3438,199.0938 22.75,198.8281 Q22.1563,198.5469 21.5313,198.5469 Q20.1875,198.5469 19.5,199.625 Q18.8125,200.6875 18.8125,202.7813 Q18.8125,204.875 19.5,205.9531 Q20.1875,207.0156 21.5313,207.0156 Q22.1563,207.0156 22.75,206.75 Q23.3438,206.4688 23.9688,205.8906 L23.9688,208.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="66.5" y="200.1387">«concept»</text>
@@ -20,8 +20,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="221.9375" y2="221.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="229.9375" y2="229.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="79.5469" id="C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.5;" width="225" x="223.5" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="79.5469" id="C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.5;" width="225" x="223.5" y="171"/>
       <ellipse cx="238.5" cy="189.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M241.4688,195.6094 Q240.8906,195.9063 240.25,196.0469 Q239.6094,196.2031 238.9063,196.2031 Q236.4063,196.2031 235.0781,194.5625 Q233.7656,192.9063 233.7656,189.7813 Q233.7656,186.6563 235.0781,185 Q236.4063,183.3438 238.9063,183.3438 Q239.6094,183.3438 240.25,183.5 Q240.9063,183.6563 241.4688,183.9531 L241.4688,186.6719 Q240.8438,186.0938 240.25,185.8281 Q239.6563,185.5469 239.0313,185.5469 Q237.6875,185.5469 237,186.625 Q236.3125,187.6875 236.3125,189.7813 Q236.3125,191.875 237,192.9531 Q237.6875,194.0156 239.0313,194.0156 Q239.6563,194.0156 240.25,193.75 Q240.8438,193.4688 241.4688,192.8906 L241.4688,195.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="305.5" y="187.1387">«concept»</text>
@@ -33,8 +33,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="224.5" x2="447.5" y1="229.7422" y2="229.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="229.5" y="243.9526">sizeof (l) &gt; sizeof (r)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="53.9375" id="C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="843.5" y="529"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="53.9375" id="C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="843.5" y="529"/>
       <ellipse cx="858.5" cy="547.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M861.4688,553.6094 Q860.8906,553.9063 860.25,554.0469 Q859.6094,554.2031 858.9063,554.2031 Q856.4063,554.2031 855.0781,552.5625 Q853.7656,550.9063 853.7656,547.7813 Q853.7656,544.6563 855.0781,543 Q856.4063,541.3438 858.9063,541.3438 Q859.6094,541.3438 860.25,541.5 Q860.9063,541.6563 861.4688,541.9531 L861.4688,544.6719 Q860.8438,544.0938 860.25,543.8281 Q859.6563,543.5469 859.0313,543.5469 Q857.6875,543.5469 857,544.625 Q856.3125,545.6875 856.3125,547.7813 Q856.3125,549.875 857,550.9531 Q857.6875,552.0156 859.0313,552.0156 Q859.6563,552.0156 860.25,551.75 Q860.8438,551.4688 861.4688,550.8906 L861.4688,553.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="888" y="545.1387">«concept»</text>
@@ -44,8 +44,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="566.9375" y2="566.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="574.9375" y2="574.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="92.3516" id="C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="1147" y="510"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="92.3516" id="C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="1147" y="510"/>
       <ellipse cx="1163.8" cy="528.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1166.7688,534.6094 Q1166.1906,534.9063 1165.55,535.0469 Q1164.9094,535.2031 1164.2063,535.2031 Q1161.7063,535.2031 1160.3781,533.5625 Q1159.0656,531.9063 1159.0656,528.7813 Q1159.0656,525.6563 1160.3781,524 Q1161.7063,522.3438 1164.2063,522.3438 Q1164.9094,522.3438 1165.55,522.5 Q1166.2063,522.6563 1166.7688,522.9531 L1166.7688,525.6719 Q1166.1438,525.0938 1165.55,524.8281 Q1164.9563,524.5469 1164.3313,524.5469 Q1162.9875,524.5469 1162.3,525.625 Q1161.6125,526.6875 1161.6125,528.7813 Q1161.6125,530.875 1162.3,531.9531 Q1162.9875,533.0156 1164.3313,533.0156 Q1164.9563,533.0156 1165.55,532.75 Q1166.1438,532.4688 1166.7688,531.8906 L1166.7688,534.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1176.2" y="526.1387">«concept»</text>
@@ -58,8 +58,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="1153" y="582.9526">container.begin()</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="86" x="1153" y="595.7573">container.end()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="79.5469" id="C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="1322.5" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="79.5469" id="C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="1322.5" y="516"/>
       <ellipse cx="1341.55" cy="534.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1344.5188,540.6094 Q1343.9406,540.9063 1343.3,541.0469 Q1342.6594,541.2031 1341.9563,541.2031 Q1339.4563,541.2031 1338.1281,539.5625 Q1336.8156,537.9063 1336.8156,534.7813 Q1336.8156,531.6563 1338.1281,530 Q1339.4563,528.3438 1341.9563,528.3438 Q1342.6594,528.3438 1343.3,528.5 Q1343.9563,528.6563 1344.5188,528.9531 L1344.5188,531.6719 Q1343.8938,531.0938 1343.3,530.8281 Q1342.7063,530.5469 1342.0813,530.5469 Q1340.7375,530.5469 1340.05,531.625 Q1339.3625,532.6875 1339.3625,534.7813 Q1339.3625,536.875 1340.05,537.9531 Q1340.7375,539.0156 1342.0813,539.0156 Q1342.7063,539.0156 1343.3,538.75 Q1343.8938,538.4688 1344.5188,537.8906 L1344.5188,540.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371.45" y="532.1387">«concept»</text>
@@ -71,8 +71,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="1323.5" x2="1468.5" y1="574.7422" y2="574.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="1328.5" y="588.9526">typename T::value_type</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="105.1563" id="C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="429.5" y="328"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="105.1563" id="C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="429.5" y="328"/>
       <ellipse cx="501.25" cy="346.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M504.2188,352.6094 Q503.6406,352.9063 503,353.0469 Q502.3594,353.2031 501.6563,353.2031 Q499.1563,353.2031 497.8281,351.5625 Q496.5156,349.9063 496.5156,346.7813 Q496.5156,343.6563 497.8281,342 Q499.1563,340.3438 501.6563,340.3438 Q502.3594,340.3438 503,340.5 Q503.6563,340.6563 504.2188,340.9531 L504.2188,343.6719 Q503.5938,343.0938 503,342.8281 Q502.4063,342.5469 501.7813,342.5469 Q500.4375,342.5469 499.75,343.625 Q499.0625,344.6875 499.0625,346.7813 Q499.0625,348.875 499.75,349.9531 Q500.4375,351.0156 501.7813,351.0156 Q502.4063,351.0156 503,350.75 Q503.5938,350.4688 504.2188,349.8906 L504.2188,352.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="554.25" y="344.1387">«concept»</text>
@@ -86,8 +86,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="435.5" y="413.7573">{std::to_string(s)} noexcept</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="281" x="435.5" y="426.562">{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="53.9375" id="C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="1299" y="353.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="53.9375" id="C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="1299" y="353.5"/>
       <ellipse cx="1314" cy="372.4688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1316.9688,378.1094 Q1316.3906,378.4063 1315.75,378.5469 Q1315.1094,378.7031 1314.4063,378.7031 Q1311.9063,378.7031 1310.5781,377.0625 Q1309.2656,375.4063 1309.2656,372.2813 Q1309.2656,369.1563 1310.5781,367.5 Q1311.9063,365.8438 1314.4063,365.8438 Q1315.1094,365.8438 1315.75,366 Q1316.4063,366.1563 1316.9688,366.4531 L1316.9688,369.1719 Q1316.3438,368.5938 1315.75,368.3281 Q1315.1563,368.0469 1314.5313,368.0469 Q1313.1875,368.0469 1312.5,369.125 Q1311.8125,370.1875 1311.8125,372.2813 Q1311.8125,374.375 1312.5,375.4531 Q1313.1875,376.5156 1314.5313,376.5156 Q1315.1563,376.5156 1315.75,376.25 Q1316.3438,375.9688 1316.9688,375.3906 L1316.9688,378.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371" y="369.6387">«concept»</text>
@@ -97,8 +97,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="391.4375" y2="391.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="399.4375" y2="399.4375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="53.9375" id="C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.5;" width="220" x="858" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="53.9375" id="C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.5;" width="220" x="858" y="184"/>
       <ellipse cx="873" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M875.9688,208.6094 Q875.3906,208.9063 874.75,209.0469 Q874.1094,209.2031 873.4063,209.2031 Q870.9063,209.2031 869.5781,207.5625 Q868.2656,205.9063 868.2656,202.7813 Q868.2656,199.6563 869.5781,198 Q870.9063,196.3438 873.4063,196.3438 Q874.1094,196.3438 874.75,196.5 Q875.4063,196.6563 875.9688,196.9531 L875.9688,199.6719 Q875.3438,199.0938 874.75,198.8281 Q874.1563,198.5469 873.5313,198.5469 Q872.1875,198.5469 871.5,199.625 Q870.8125,200.6875 870.8125,202.7813 Q870.8125,204.875 871.5,205.9531 Q872.1875,207.0156 873.5313,207.0156 Q874.1563,207.0156 874.75,206.75 Q875.3438,206.4688 875.9688,205.8906 L875.9688,208.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="943" y="200.1387">«concept»</text>
@@ -108,8 +108,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="221.9375" y2="221.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="229.9375" y2="229.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="60.8047" id="C_0001418333499545421661" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="837" y="350"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="60.8047" id="C_0001418333499545421661" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="837" y="350"/>
       <ellipse cx="852" cy="366" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M854.9688,371.6406 Q854.3906,371.9375 853.75,372.0781 Q853.1094,372.2344 852.4063,372.2344 Q849.9063,372.2344 848.5781,370.5938 Q847.2656,368.9375 847.2656,365.8125 Q847.2656,362.6875 848.5781,361.0313 Q849.9063,359.375 852.4063,359.375 Q853.1094,359.375 853.75,359.5313 Q854.4063,359.6875 854.9688,359.9844 L854.9688,362.7031 Q854.3438,362.125 853.75,361.8594 Q853.1563,361.5781 852.5313,361.5781 Q851.1875,361.5781 850.5,362.6563 Q849.8125,363.7188 849.8125,365.8125 Q849.8125,367.9063 850.5,368.9844 Q851.1875,370.0469 852.5313,370.0469 Q853.1563,370.0469 853.75,369.7813 Q854.3438,369.5 854.9688,368.9219 L854.9688,371.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="866" y="370.1543">A</text>
@@ -118,15 +118,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="382" y2="382"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="390" y2="390"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="843" y="396"/>
       <ellipse cx="848" cy="401" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="857" y="404.2104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="60.8047" id="C_0001814355496814977880" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="942" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="60.8047" id="C_0001814355496814977880" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="942" y="20.5"/>
       <ellipse cx="957.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M960.4188,42.1406 Q959.8406,42.4375 959.2,42.5781 Q958.5594,42.7344 957.8563,42.7344 Q955.3563,42.7344 954.0281,41.0938 Q952.7156,39.4375 952.7156,36.3125 Q952.7156,33.1875 954.0281,31.5313 Q955.3563,29.875 957.8563,29.875 Q958.5594,29.875 959.2,30.0313 Q959.8563,30.1875 960.4188,30.4844 L960.4188,33.2031 Q959.7938,32.625 959.2,32.3594 Q958.6063,32.0781 957.9813,32.0781 Q956.6375,32.0781 955.95,33.1563 Q955.2625,34.2188 955.2625,36.3125 Q955.2625,38.4063 955.95,39.4844 Q956.6375,40.5469 957.9813,40.5469 Q958.6063,40.5469 959.2,40.2813 Q959.7938,40 960.4188,39.4219 L960.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="971.55" y="40.6543">B</text>
@@ -135,15 +135,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="52.5" y2="52.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="948" y="66.5"/>
       <ellipse cx="953" cy="71.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="962" y="74.7104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="60.8047" id="C_0001512618198241549089" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="484" y="180.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="60.8047" id="C_0001512618198241549089" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="484" y="180.5"/>
       <ellipse cx="499" cy="196.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M501.9688,202.1406 Q501.3906,202.4375 500.75,202.5781 Q500.1094,202.7344 499.4063,202.7344 Q496.9063,202.7344 495.5781,201.0938 Q494.2656,199.4375 494.2656,196.3125 Q494.2656,193.1875 495.5781,191.5313 Q496.9063,189.875 499.4063,189.875 Q500.1094,189.875 500.75,190.0313 Q501.4063,190.1875 501.9688,190.4844 L501.9688,193.2031 Q501.3438,192.625 500.75,192.3594 Q500.1563,192.0781 499.5313,192.0781 Q498.1875,192.0781 497.5,193.1563 Q496.8125,194.2188 496.8125,196.3125 Q496.8125,198.4063 497.5,199.4844 Q498.1875,200.5469 499.5313,200.5469 Q500.1563,200.5469 500.75,200.2813 Q501.3438,200 501.9688,199.4219 L501.9688,202.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="513" y="200.6543">C</text>
@@ -152,15 +152,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="212.5" y2="212.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="220.5" y2="220.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="490" y="226.5"/>
       <ellipse cx="495" cy="231.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="504" y="234.7104">c : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="48" id="C_0001635109601630198093" style="stroke: #A80036; stroke-width: 1.5;" width="240" x="1024" y="356.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="48" id="C_0001635109601630198093" style="stroke: #A80036; stroke-width: 1.5;" width="240" x="1024" y="356.5"/>
       <ellipse cx="1039" cy="372.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1041.9688,378.1406 Q1041.3906,378.4375 1040.75,378.5781 Q1040.1094,378.7344 1039.4063,378.7344 Q1036.9063,378.7344 1035.5781,377.0938 Q1034.2656,375.4375 1034.2656,372.3125 Q1034.2656,369.1875 1035.5781,367.5313 Q1036.9063,365.875 1039.4063,365.875 Q1040.1094,365.875 1040.75,366.0313 Q1041.4063,366.1875 1041.9688,366.4844 L1041.9688,369.2031 Q1041.3438,368.625 1040.75,368.3594 Q1040.1563,368.0781 1039.5313,368.0781 Q1038.1875,368.0781 1037.5,369.1563 Q1036.8125,370.2188 1036.8125,372.3125 Q1036.8125,374.4063 1037.5,375.4844 Q1038.1875,376.5469 1039.5313,376.5469 Q1040.1563,376.5469 1040.75,376.2813 Q1041.3438,376 1041.9688,375.4219 L1041.9688,378.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1053" y="376.6543">D</text>
@@ -169,8 +169,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="388.5" y2="388.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="396.5" y2="396.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="86.4141" id="C_0001429225801945621089" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="287.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="86.4141" id="C_0001429225801945621089" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="287.5" y="8"/>
       <ellipse cx="302.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M305.4688,29.6406 Q304.8906,29.9375 304.25,30.0781 Q303.6094,30.2344 302.9063,30.2344 Q300.4063,30.2344 299.0781,28.5938 Q297.7656,26.9375 297.7656,23.8125 Q297.7656,20.6875 299.0781,19.0313 Q300.4063,17.375 302.9063,17.375 Q303.6094,17.375 304.25,17.5313 Q304.9063,17.6875 305.4688,17.9844 L305.4688,20.7031 Q304.8438,20.125 304.25,19.8594 Q303.6563,19.5781 303.0313,19.5781 Q301.6875,19.5781 301,20.6563 Q300.3125,21.7188 300.3125,23.8125 Q300.3125,25.9063 301,26.9844 Q301.6875,28.0469 303.0313,28.0469 Q303.6563,28.0469 304.25,27.7813 Q304.8438,27.5 305.4688,26.9219 L305.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="316.5" y="28.1543">E</text>
@@ -179,29 +179,29 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="54"/>
       <ellipse cx="298.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="62.2104">e1 : T1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="66.8047"/>
       <ellipse cx="298.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="75.0151">e2 : T2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="79.6094"/>
       <ellipse cx="298.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="87.8198">e3 : T3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1etijee47fp2t)" height="86.4141" id="C_0000856301122972546034" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="49" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvemwtu91kehj)" height="86.4141" id="C_0000856301122972546034" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="49" y="8"/>
       <ellipse cx="64" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M66.9688,29.6406 Q66.3906,29.9375 65.75,30.0781 Q65.1094,30.2344 64.4063,30.2344 Q61.9063,30.2344 60.5781,28.5938 Q59.2656,26.9375 59.2656,23.8125 Q59.2656,20.6875 60.5781,19.0313 Q61.9063,17.375 64.4063,17.375 Q65.1094,17.375 65.75,17.5313 Q66.4063,17.6875 66.9688,17.9844 L66.9688,20.7031 Q66.3438,20.125 65.75,19.8594 Q65.1563,19.5781 64.5313,19.5781 Q63.1875,19.5781 62.5,20.6563 Q61.8125,21.7188 61.8125,23.8125 Q61.8125,25.9063 62.5,26.9844 Q63.1875,28.0469 64.5313,28.0469 Q65.1563,28.0469 65.75,27.7813 Q66.3438,27.5 66.9688,26.9219 L66.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="78" y="28.1543">F</text>
@@ -210,25 +210,25 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="54"/>
       <ellipse cx="60" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="62.2104">f1 : T1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="66.8047"/>
       <ellipse cx="60" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="75.0151">f2 : T2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="79.6094"/>
       <ellipse cx="60" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="87.8198">f3 : T3</text>
     </a>
     <path d="M669.56,433.19 C697.84,448.52 729.06,465.18 758,480 C789.06,495.91 824.03,512.91 852.89,526.69 " fill="none" id="C_0000137304962071054497-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00056_class_mermaid.svg b/docs/test_cases/t00056_class_mermaid.svg
index 8715edce..a57e180e 100644
--- a/docs/test_cases/t00056_class_mermaid.svg
+++ b/docs/test_cases/t00056_class_mermaid.svg
@@ -222,7 +222,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L8">
+        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L8">
           <g title="greater_than_simple" id="classId-C_0000902541696362244204-0" class="node default clickable">
             <rect height="79" width="212.421875" y="-39.5" x="-106.2109375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="106.2109375" x1="-106.2109375" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L11">
+        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L11">
           <g title="greater_than_with_requires" id="classId-C_0001830716585637735576-1" class="node default clickable">
             <rect height="123" width="266.65625" y="-61.5" x="-133.328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="133.328125" x1="-133.328125" class="divider"/>
@@ -270,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L16">
+        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L16">
           <g title="max_four_bytes" id="classId-C_0000385255522691733325-2" class="node default clickable">
             <rect height="79" width="166.1875" y="-39.5" x="-83.09375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="83.09375" x1="-83.09375" class="divider"/>
@@ -289,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L20">
+        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L20">
           <g title="iterable" id="classId-C_0000392540961352249242-3" class="node default clickable">
             <rect height="145" width="145.546875" y="-72.5" x="-72.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="72.7734375" x1="-72.7734375" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L27">
+        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L27">
           <g title="has_value_type" id="classId-C_0001850394311226276678-4" class="node default clickable">
             <rect height="123" width="195.0625" y="-61.5" x="-97.53125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.53125" x1="-97.53125" class="divider"/>
@@ -352,7 +352,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L30">
+        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L30">
           <g title="convertible_to_string" id="classId-C_0000137304962071054497-5" class="node default clickable">
             <rect height="167" width="354.078125" y="-83.5" x="-177.0390625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="177.0390625" x1="-177.0390625" class="divider"/>
@@ -391,7 +391,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L46">
+        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L46">
           <g title="iterable_with_value_type" id="classId-C_0001043398062146751019-6" class="node default clickable">
             <rect height="79" width="232.875" y="-39.5" x="-116.4375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="116.4375" x1="-116.4375" class="divider"/>
@@ -410,7 +410,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L49">
+        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L49">
           <g title="iterable_or_small_value_type" id="classId-C_0000866345615551223718-7" class="node default clickable">
             <rect height="79" width="266.703125" y="-39.5" x="-133.3515625" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="133.3515625" x1="-133.3515625" class="divider"/>
@@ -429,7 +429,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L53">
+        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L53">
           <g title="A" id="classId-C_0001418333499545421661-8" class="node default clickable">
             <rect height="79" width="182.1875" y="-39.5" x="-91.09375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="91.09375" x1="-91.09375" class="divider"/>
@@ -453,7 +453,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L60">
+        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L60">
           <g title="B" id="classId-C_0001814355496814977880-9" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -477,7 +477,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L70">
+        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L70">
           <g title="C" id="classId-C_0001512618198241549089-10" class="node default clickable">
             <rect height="79" width="222.171875" y="-39.5" x="-111.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="111.0859375" x1="-111.0859375" class="divider"/>
@@ -501,7 +501,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L76">
+        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L76">
           <g title="D" id="classId-C_0001635109601630198093-11" class="node default clickable">
             <rect height="57" width="279.109375" y="-28.5" x="-139.5546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="139.5546875" x1="-139.5546875" class="divider"/>
@@ -520,7 +520,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L80">
+        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L80">
           <g title="E" id="classId-C_0001429225801945621089-12" class="node default clickable">
             <rect height="123" width="109.265625" y="-61.5" x="-54.6328125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.6328125" x1="-54.6328125" class="divider"/>
@@ -554,7 +554,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00056/t00056.cc#L88">
+        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00056/t00056.cc#L88">
           <g title="F" id="classId-C_0000856301122972546034-13" class="node default clickable">
             <rect height="123" width="108.375" y="-61.5" x="-54.1875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.1875" x1="-54.1875" class="divider"/>
diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg
index 449df1f4..5f2e931d 100644
--- a/docs/test_cases/t00057_class.svg
+++ b/docs/test_cases/t00057_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="476px" preserveAspectRatio="none" style="width:1040px;height:476px;" version="1.1" viewBox="0 0 1040 476" width="1040px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1djt6fqlvsz3a" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f12k20xcdk6ms0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="235.5"/>
       <ellipse cx="21" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,257.1406 Q23.3906,257.4375 22.75,257.5781 Q22.1094,257.7344 21.4063,257.7344 Q18.9063,257.7344 17.5781,256.0938 Q16.2656,254.4375 16.2656,251.3125 Q16.2656,248.1875 17.5781,246.5313 Q18.9063,244.875 21.4063,244.875 Q22.1094,244.875 22.75,245.0313 Q23.4063,245.1875 23.9688,245.4844 L23.9688,248.2031 Q23.3438,247.625 22.75,247.3594 Q22.1563,247.0781 21.5313,247.0781 Q20.1875,247.0781 19.5,248.1563 Q18.8125,249.2188 18.8125,251.3125 Q18.8125,253.4063 19.5,254.4844 Q20.1875,255.5469 21.5313,255.5469 Q22.1563,255.5469 22.75,255.2813 Q23.3438,255 23.9688,254.4219 L23.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="35" y="255.6543">t00057_A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="281.5"/>
       <ellipse cx="17" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="26" y="289.7104">a1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="235.5"/>
       <ellipse cx="147" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M149.9688,257.1406 Q149.3906,257.4375 148.75,257.5781 Q148.1094,257.7344 147.4063,257.7344 Q144.9063,257.7344 143.5781,256.0938 Q142.2656,254.4375 142.2656,251.3125 Q142.2656,248.1875 143.5781,246.5313 Q144.9063,244.875 147.4063,244.875 Q148.1094,244.875 148.75,245.0313 Q149.4063,245.1875 149.9688,245.4844 L149.9688,248.2031 Q149.3438,247.625 148.75,247.3594 Q148.1563,247.0781 147.5313,247.0781 Q146.1875,247.0781 145.5,248.1563 Q144.8125,249.2188 144.8125,251.3125 Q144.8125,253.4063 145.5,254.4844 Q146.1875,255.5469 147.5313,255.5469 Q148.1563,255.5469 148.75,255.2813 Q149.3438,255 149.9688,254.4219 L149.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="161" y="255.6543">t00057_B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="281.5"/>
       <ellipse cx="143" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="152" y="289.7104">b1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="235.5"/>
       <ellipse cx="273" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M275.9688,257.1406 Q275.3906,257.4375 274.75,257.5781 Q274.1094,257.7344 273.4063,257.7344 Q270.9063,257.7344 269.5781,256.0938 Q268.2656,254.4375 268.2656,251.3125 Q268.2656,248.1875 269.5781,246.5313 Q270.9063,244.875 273.4063,244.875 Q274.1094,244.875 274.75,245.0313 Q275.4063,245.1875 275.9688,245.4844 L275.9688,248.2031 Q275.3438,247.625 274.75,247.3594 Q274.1563,247.0781 273.5313,247.0781 Q272.1875,247.0781 271.5,248.1563 Q270.8125,249.2188 270.8125,251.3125 Q270.8125,253.4063 271.5,254.4844 Q272.1875,255.5469 273.5313,255.5469 Q274.1563,255.5469 274.75,255.2813 Q275.3438,255 275.9688,254.4219 L275.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="287" y="255.6543">t00057_C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="264" y="281.5"/>
       <ellipse cx="269" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="278" y="289.7104">c1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="226"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="226"/>
       <ellipse cx="399.5" cy="244.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M402.4688,250.6094 Q401.8906,250.9063 401.25,251.0469 Q400.6094,251.2031 399.9063,251.2031 Q397.4063,251.2031 396.0781,249.5625 Q394.7656,247.9063 394.7656,244.7813 Q394.7656,241.6563 396.0781,240 Q397.4063,238.3438 399.9063,238.3438 Q400.6094,238.3438 401.25,238.5 Q401.9063,238.6563 402.4688,238.9531 L402.4688,241.6719 Q401.8438,241.0938 401.25,240.8281 Q400.6563,240.5469 400.0313,240.5469 Q398.6875,240.5469 398,241.625 Q397.3125,242.6875 397.3125,244.7813 Q397.3125,246.875 398,247.9531 Q398.6875,249.0156 400.0313,249.0156 Q400.6563,249.0156 401.25,248.75 Q401.8438,248.4688 402.4688,247.8906 L402.4688,250.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="419" y="242.1387">«union»</text>
@@ -63,73 +63,73 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="263.9375" y2="263.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="271.9375" y2="271.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="277.9375"/>
       <ellipse cx="395.5" cy="282.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="404.5" y="286.1479">d1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="290.7422"/>
       <ellipse cx="395.5" cy="295.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="404.5" y="298.9526">d2 : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="223"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="223"/>
       <ellipse cx="610.75" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M613.7188,244.6406 Q613.1406,244.9375 612.5,245.0781 Q611.8594,245.2344 611.1563,245.2344 Q608.6563,245.2344 607.3281,243.5938 Q606.0156,241.9375 606.0156,238.8125 Q606.0156,235.6875 607.3281,234.0313 Q608.6563,232.375 611.1563,232.375 Q611.8594,232.375 612.5,232.5313 Q613.1563,232.6875 613.7188,232.9844 L613.7188,235.7031 Q613.0938,235.125 612.5,234.8594 Q611.9063,234.5781 611.2813,234.5781 Q609.9375,234.5781 609.25,235.6563 Q608.5625,236.7188 608.5625,238.8125 Q608.5625,240.9063 609.25,241.9844 Q609.9375,243.0469 611.2813,243.0469 Q611.9063,243.0469 612.5,242.7813 Q613.0938,242.5 613.7188,241.9219 L613.7188,244.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="631.25" y="243.1543">t00057_E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="255" y2="255"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="263" y2="263"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="269"/>
       <ellipse cx="522.5" cy="274" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="240" x="531.5" y="277.2104">coordinates : t00057_E::(anonymous_739)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="281.8047"/>
       <ellipse cx="522.5" cy="286.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="531.5" y="290.0151">e : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="294.6094"/>
       <ellipse cx="522.5" cy="299.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="531.5" y="302.8198">height : t00057_E::(anonymous_807)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="389"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="389"/>
       <ellipse cx="466.5" cy="405" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.4688,410.6406 Q468.8906,410.9375 468.25,411.0781 Q467.6094,411.2344 466.9063,411.2344 Q464.4063,411.2344 463.0781,409.5938 Q461.7656,407.9375 461.7656,404.8125 Q461.7656,401.6875 463.0781,400.0313 Q464.4063,398.375 466.9063,398.375 Q467.6094,398.375 468.25,398.5313 Q468.9063,398.6875 469.4688,398.9844 L469.4688,401.7031 Q468.8438,401.125 468.25,400.8594 Q467.6563,400.5781 467.0313,400.5781 Q465.6875,400.5781 465,401.6563 Q464.3125,402.7188 464.3125,404.8125 Q464.3125,406.9063 465,407.9844 Q465.6875,409.0469 467.0313,409.0469 Q467.6563,409.0469 468.25,408.7813 Q468.8438,408.5 469.4688,407.9219 L469.4688,410.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="152" x="480.5" y="409.1543">t00057_E::(coordinates)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="421" y2="421"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="429" y2="429"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="435"/>
       <ellipse cx="462.5" cy="440" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="443.2104">x : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="447.8047"/>
       <ellipse cx="462.5" cy="452.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="456.0151">y : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="386"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="386"/>
       <ellipse cx="686" cy="404.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M688.9688,410.6094 Q688.3906,410.9063 687.75,411.0469 Q687.1094,411.2031 686.4063,411.2031 Q683.9063,411.2031 682.5781,409.5625 Q681.2656,407.9063 681.2656,404.7813 Q681.2656,401.6563 682.5781,400 Q683.9063,398.3438 686.4063,398.3438 Q687.1094,398.3438 687.75,398.5 Q688.4063,398.6563 688.9688,398.9531 L688.9688,401.6719 Q688.3438,401.0938 687.75,400.8281 Q687.1563,400.5469 686.5313,400.5469 Q685.1875,400.5469 684.5,401.625 Q683.8125,402.6875 683.8125,404.7813 Q683.8125,406.875 684.5,407.9531 Q685.1875,409.0156 686.5313,409.0156 Q687.1563,409.0156 687.75,408.75 Q688.3438,408.4688 688.9688,407.8906 L688.9688,410.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="734" y="402.1387">«union»</text>
@@ -137,105 +137,105 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="423.9375" y2="423.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="431.9375" y2="431.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="437.9375"/>
       <ellipse cx="682" cy="442.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="691" y="446.1479">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="450.7422"/>
       <ellipse cx="682" cy="455.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="691" y="458.9526">z : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="812.5" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="60.8047" id="C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="812.5" y="235.5"/>
       <ellipse cx="827.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M830.4688,257.1406 Q829.8906,257.4375 829.25,257.5781 Q828.6094,257.7344 827.9063,257.7344 Q825.4063,257.7344 824.0781,256.0938 Q822.7656,254.4375 822.7656,251.3125 Q822.7656,248.1875 824.0781,246.5313 Q825.4063,244.875 827.9063,244.875 Q828.6094,244.875 829.25,245.0313 Q829.9063,245.1875 830.4688,245.4844 L830.4688,248.2031 Q829.8438,247.625 829.25,247.3594 Q828.6563,247.0781 828.0313,247.0781 Q826.6875,247.0781 826,248.1563 Q825.3125,249.2188 825.3125,251.3125 Q825.3125,253.4063 826,254.4844 Q826.6875,255.5469 828.0313,255.5469 Q828.6563,255.5469 829.25,255.2813 Q829.8438,255 830.4688,254.4219 L830.4688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="841.5" y="255.6543">t00057_G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="818.5" y="281.5"/>
       <ellipse cx="823.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="832.5" y="289.7104">g1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="137.6328" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="357.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="137.6328" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="357.5" y="8"/>
       <ellipse cx="397.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M400.2188,29.6406 Q399.6406,29.9375 399,30.0781 Q398.3594,30.2344 397.6563,30.2344 Q395.1563,30.2344 393.8281,28.5938 Q392.5156,26.9375 392.5156,23.8125 Q392.5156,20.6875 393.8281,19.0313 Q395.1563,17.375 397.6563,17.375 Q398.3594,17.375 399,17.5313 Q399.6563,17.6875 400.2188,17.9844 L400.2188,20.7031 Q399.5938,20.125 399,19.8594 Q398.4063,19.5781 397.7813,19.5781 Q396.4375,19.5781 395.75,20.6563 Q395.0625,21.7188 395.0625,23.8125 Q395.0625,25.9063 395.75,26.9844 Q396.4375,28.0469 397.7813,28.0469 Q398.4063,28.0469 399,27.7813 Q399.5938,27.5 400.2188,26.9219 L400.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="416.75" y="28.1543">t00057_R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="54"/>
       <ellipse cx="368.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="377.5" y="62.2104">a : struct t00057_A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="66.8047"/>
       <ellipse cx="368.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="377.5" y="75.0151">b : t00057_B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="79.6094"/>
       <ellipse cx="368.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="87.8198">c : struct t00057_C *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="92.4141"/>
       <ellipse cx="368.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="377.5" y="100.6245">d : union t00057_D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="105.2188"/>
       <ellipse cx="368.5" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="113.4292">e : struct t00057_E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="118.0234"/>
       <ellipse cx="368.5" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="377.5" y="126.2339">f : struct t00057_F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="130.8281"/>
       <ellipse cx="368.5" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="377.5" y="139.0386">g : struct t00057_G *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1djt6fqlvsz3a)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="939.5" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12k20xcdk6ms0)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="939.5" y="235.5"/>
       <ellipse cx="954.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M957.4688,257.1406 Q956.8906,257.4375 956.25,257.5781 Q955.6094,257.7344 954.9063,257.7344 Q952.4063,257.7344 951.0781,256.0938 Q949.7656,254.4375 949.7656,251.3125 Q949.7656,248.1875 951.0781,246.5313 Q952.4063,244.875 954.9063,244.875 Q955.6094,244.875 956.25,245.0313 Q956.9063,245.1875 957.4688,245.4844 L957.4688,248.2031 Q956.8438,247.625 956.25,247.3594 Q955.6563,247.0781 955.0313,247.0781 Q953.6875,247.0781 953,248.1563 Q952.3125,249.2188 952.3125,251.3125 Q952.3125,253.4063 953,254.4844 Q953.6875,255.5469 955.0313,255.5469 Q955.6563,255.5469 956.25,255.2813 Q956.8438,255 957.4688,254.4219 L957.4688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="968.5" y="255.6543">t00057_F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="945.5" y="281.5"/>
       <ellipse cx="950.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="959.5" y="289.7104">f1 : int</text>
     </a>
     <path d="M610.32,320.47 C595.89,343.04 579.48,368.72 566.53,388.97 " fill="none" id="C_0000682873132844345324&lt;-C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00057_class_mermaid.svg b/docs/test_cases/t00057_class_mermaid.svg
index 842a088d..172bbbdf 100644
--- a/docs/test_cases/t00057_class_mermaid.svg
+++ b/docs/test_cases/t00057_class_mermaid.svg
@@ -162,7 +162,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L3">
+        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L3">
           <g title="t00057_A" id="classId-C_0000940295970488928395-0" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -186,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L7">
+        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L7">
           <g title="t00057_B" id="classId-C_0001030391494410415852-1" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L11">
+        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L11">
           <g title="t00057_C" id="classId-C_0000388213894542327772-2" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L15">
+        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L15">
           <g title="t00057_D" id="classId-C_0000784667124248020371-3" class="node default clickable">
             <rect height="123" width="85.71875" y="-61.5" x="-42.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.859375" x1="-42.859375" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L20">
+        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L20">
           <g title="t00057_E" id="classId-C_0000682873132844345324-4" class="node default clickable">
             <rect height="123" width="326.765625" y="-61.5" x="-163.3828125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="163.3828125" x1="-163.3828125" class="divider"/>
@@ -297,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L22">
+        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L22">
           <g title="t00057_E##(coordinates)" id="classId-C_0000161676142413826748-5" class="node default clickable">
             <rect height="101" width="196.390625" y="-50.5" x="-98.1953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="98.1953125" x1="-98.1953125" class="divider"/>
@@ -326,7 +326,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L26">
+        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L26">
           <g title="t00057_E##(height)" id="classId-C_0002265335931722752750-6" class="node default clickable">
             <rect height="123" width="153.703125" y="-61.5" x="-76.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.8515625" x1="-76.8515625" class="divider"/>
@@ -355,7 +355,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L32">
+        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L32">
           <g title="t00057_G" id="classId-C_0001592909736406415155-7" class="node default clickable">
             <rect height="79" width="86.171875" y="-39.5" x="-43.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="43.0859375" x1="-43.0859375" class="divider"/>
@@ -379,7 +379,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/t00057.c#L36">
+        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/t00057.c#L36">
           <g title="t00057_R" id="classId-C_0000370583978606928327-8" class="node default clickable">
             <rect height="211" width="160.421875" y="-105.5" x="-80.2109375" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="80.2109375" x1="-80.2109375" class="divider"/>
@@ -433,7 +433,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00057/include/t00057.h#L3">
+        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00057/include/t00057.h#L3">
           <g title="t00057_F" id="classId-C_0000085797106299568719-9" class="node default clickable">
             <rect height="79" width="83.5" y="-39.5" x="-41.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="41.75" x1="-41.75" class="divider"/>
diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg
index c8ce71f4..ea71cecc 100644
--- a/docs/test_cases/t00058_class.svg
+++ b/docs/test_cases/t00058_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="809px" preserveAspectRatio="none" style="width:437px;height:809px;" version="1.1" viewBox="0 0 437 809" width="437px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="flwrcg7gmf5w5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="frwea7845pi4t" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="48" id="C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="155.5" y="750"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frwea7845pi4t)" height="48" id="C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="155.5" y="750"/>
       <ellipse cx="170.5" cy="766" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.4688,771.6406 Q172.8906,771.9375 172.25,772.0781 Q171.6094,772.2344 170.9063,772.2344 Q168.4063,772.2344 167.0781,770.5938 Q165.7656,768.9375 165.7656,765.8125 Q165.7656,762.6875 167.0781,761.0313 Q168.4063,759.375 170.9063,759.375 Q171.6094,759.375 172.25,759.5313 Q172.9063,759.6875 173.4688,759.9844 L173.4688,762.7031 Q172.8438,762.125 172.25,761.8594 Q171.6563,761.5781 171.0313,761.5781 Q169.6875,761.5781 169,762.6563 Q168.3125,763.7188 168.3125,765.8125 Q168.3125,767.9063 169,768.9844 Q169.6875,770.0469 171.0313,770.0469 Q171.6563,770.0469 172.25,769.7813 Q172.8438,769.5 173.4688,768.9219 L173.4688,771.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="184.5" y="770.1543">first_type</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="782" y2="782"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="790" y2="790"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="53.9375" id="C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="125" y="635"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frwea7845pi4t)" height="53.9375" id="C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="125" y="635"/>
       <ellipse cx="140" cy="653.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M142.9688,659.6094 Q142.3906,659.9063 141.75,660.0469 Q141.1094,660.2031 140.4063,660.2031 Q137.9063,660.2031 136.5781,658.5625 Q135.2656,656.9063 135.2656,653.7813 Q135.2656,650.6563 136.5781,649 Q137.9063,647.3438 140.4063,647.3438 Q141.1094,647.3438 141.75,647.5 Q142.4063,647.6563 142.9688,647.9531 L142.9688,650.6719 Q142.3438,650.0938 141.75,649.8281 Q141.1563,649.5469 140.5313,649.5469 Q139.1875,649.5469 138.5,650.625 Q137.8125,651.6875 137.8125,653.7813 Q137.8125,655.875 138.5,656.9531 Q139.1875,658.0156 140.5313,658.0156 Q141.1563,658.0156 141.75,657.75 Q142.3438,657.4688 142.9688,656.8906 L142.9688,659.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="180.5" y="651.1387">«concept»</text>
@@ -30,8 +30,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="672.9375" y2="672.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="680.9375" y2="680.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="60.8047" id="C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="93.5" y="497"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frwea7845pi4t)" height="60.8047" id="C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="93.5" y="497"/>
       <ellipse cx="125.15" cy="513" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M128.1188,518.6406 Q127.5406,518.9375 126.9,519.0781 Q126.2594,519.2344 125.5563,519.2344 Q123.0563,519.2344 121.7281,517.5938 Q120.4156,515.9375 120.4156,512.8125 Q120.4156,509.6875 121.7281,508.0313 Q123.0563,506.375 125.5563,506.375 Q126.2594,506.375 126.9,506.5313 Q127.5563,506.6875 128.1188,506.9844 L128.1188,509.7031 Q127.4938,509.125 126.9,508.8594 Q126.3063,508.5781 125.6813,508.5781 Q124.3375,508.5781 123.65,509.6563 Q122.9625,510.7188 122.9625,512.8125 Q122.9625,514.9063 123.65,515.9844 Q124.3375,517.0469 125.6813,517.0469 Q126.3063,517.0469 126.9,516.7813 Q127.4938,516.5 128.1188,515.9219 L128.1188,518.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="142.85" y="517.1543">A</text>
@@ -40,15 +40,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="529" y2="529"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="537" y2="537"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="99.5" y="543"/>
       <ellipse cx="104.5" cy="548" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="113.5" y="551.2104">a : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="73.6094" id="C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="229.5" y="393"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frwea7845pi4t)" height="73.6094" id="C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="229.5" y="393"/>
       <ellipse cx="256.2" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.1688,414.6406 Q258.5906,414.9375 257.95,415.0781 Q257.3094,415.2344 256.6063,415.2344 Q254.1063,415.2344 252.7781,413.5938 Q251.4656,411.9375 251.4656,408.8125 Q251.4656,405.6875 252.7781,404.0313 Q254.1063,402.375 256.6063,402.375 Q257.3094,402.375 257.95,402.5313 Q258.6063,402.6875 259.1688,402.9844 L259.1688,405.7031 Q258.5438,405.125 257.95,404.8594 Q257.3563,404.5781 256.7313,404.5781 Q255.3875,404.5781 254.7,405.6563 Q254.0125,406.7188 254.0125,408.8125 Q254.0125,410.9063 254.7,411.9844 Q255.3875,413.0469 256.7313,413.0469 Q257.3563,413.0469 257.95,412.7813 Q258.5438,412.5 259.1688,411.9219 L259.1688,414.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="272.8" y="413.1543">B</text>
@@ -57,22 +57,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="425" y2="425"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="433" y2="433"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="439"/>
       <ellipse cx="240.5" cy="444" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="249.5" y="447.2104">b : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="451.8047"/>
       <ellipse cx="240.5" cy="456.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="249.5" y="460.0151">bb : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frwea7845pi4t)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
       <ellipse cx="27.5" cy="253" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M30.4688,258.6406 Q29.8906,258.9375 29.25,259.0781 Q28.6094,259.2344 27.9063,259.2344 Q25.4063,259.2344 24.0781,257.5938 Q22.7656,255.9375 22.7656,252.8125 Q22.7656,249.6875 24.0781,248.0313 Q25.4063,246.375 27.9063,246.375 Q28.6094,246.375 29.25,246.5313 Q29.9063,246.6875 30.4688,246.9844 L30.4688,249.7031 Q29.8438,249.125 29.25,248.8594 Q28.6563,248.5781 28.0313,248.5781 Q26.6875,248.5781 26,249.6563 Q25.3125,250.7188 25.3125,252.8125 Q25.3125,254.9063 26,255.9844 Q26.6875,257.0469 28.0313,257.0469 Q28.6563,257.0469 29.25,256.7813 Q29.8438,256.5 30.4688,255.9219 L30.4688,258.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="41.5" y="257.1543">A</text>
@@ -81,8 +81,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="269" y2="269"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="277" y2="277"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frwea7845pi4t)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
       <ellipse cx="177" cy="331" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M179.9688,336.6406 Q179.3906,336.9375 178.75,337.0781 Q178.1094,337.2344 177.4063,337.2344 Q174.9063,337.2344 173.5781,335.5938 Q172.2656,333.9375 172.2656,330.8125 Q172.2656,327.6875 173.5781,326.0313 Q174.9063,324.375 177.4063,324.375 Q178.1094,324.375 178.75,324.5313 Q179.4063,324.6875 179.9688,324.9844 L179.9688,327.7031 Q179.3438,327.125 178.75,326.8594 Q178.1563,326.5781 177.5313,326.5781 Q176.1875,326.5781 175.5,327.6563 Q174.8125,328.7188 174.8125,330.8125 Q174.8125,332.9063 175.5,333.9844 Q176.1875,335.0469 177.5313,335.0469 Q178.1563,335.0469 178.75,334.7813 Q179.3438,334.5 179.9688,333.9219 L179.9688,336.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191" y="335.1543">A</text>
@@ -91,8 +91,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="347" y2="347"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="355" y2="355"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frwea7845pi4t)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
       <ellipse cx="177.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M180.4688,180.6406 Q179.8906,180.9375 179.25,181.0781 Q178.6094,181.2344 177.9063,181.2344 Q175.4063,181.2344 174.0781,179.5938 Q172.7656,177.9375 172.7656,174.8125 Q172.7656,171.6875 174.0781,170.0313 Q175.4063,168.375 177.9063,168.375 Q178.6094,168.375 179.25,168.5313 Q179.9063,168.6875 180.4688,168.9844 L180.4688,171.7031 Q179.8438,171.125 179.25,170.8594 Q178.6563,170.5781 178.0313,170.5781 Q176.6875,170.5781 176,171.6563 Q175.3125,172.7188 175.3125,174.8125 Q175.3125,176.9063 176,177.9844 Q176.6875,179.0469 178.0313,179.0469 Q178.6563,179.0469 179.25,178.7813 Q179.8438,178.5 180.4688,177.9219 L180.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191.5" y="179.1543">B</text>
@@ -101,26 +101,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flwrcg7gmf5w5)" height="73.6094" id="C_0001015108159699260009" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frwea7845pi4t)" height="73.6094" id="C_0001015108159699260009" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="6" y="8"/>
       <ellipse cx="135.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M138.7188,29.6406 Q138.1406,29.9375 137.5,30.0781 Q136.8594,30.2344 136.1563,30.2344 Q133.6563,30.2344 132.3281,28.5938 Q131.0156,26.9375 131.0156,23.8125 Q131.0156,20.6875 132.3281,19.0313 Q133.6563,17.375 136.1563,17.375 Q136.8594,17.375 137.5,17.5313 Q138.1563,17.6875 138.7188,17.9844 L138.7188,20.7031 Q138.0938,20.125 137.5,19.8594 Q136.9063,19.5781 136.2813,19.5781 Q134.9375,19.5781 134.25,20.6563 Q133.5625,21.7188 133.5625,23.8125 Q133.5625,25.9063 134.25,26.9844 Q134.9375,28.0469 136.2813,28.0469 Q136.9063,28.0469 137.5,27.7813 Q138.0938,27.5 138.7188,26.9219 L138.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="26" y="62.2104">aa : A&lt;int,int,double,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
       <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="250" x="26" y="75.0151">bb : B&lt;int,std::string,int,double,A&lt;int,int&gt;&gt;</text>
     </a>
     <path d="M174.26,558.24 C185.3,579.75 200.17,608.73 211.31,630.43 " fill="none" id="C_0000798619347004821702-&gt;C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00058_class_mermaid.svg b/docs/test_cases/t00058_class_mermaid.svg
index 16288621..7a3b177d 100644
--- a/docs/test_cases/t00058_class_mermaid.svg
+++ b/docs/test_cases/t00058_class_mermaid.svg
@@ -150,7 +150,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L11">
+        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L11">
           <g title="first_type" id="classId-C_0000039461943261269692-0" class="node default clickable">
             <rect height="57" width="167.953125" y="-28.5" x="-83.9765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.9765625" x1="-83.9765625" class="divider"/>
@@ -169,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L22">
+        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L22">
           <g title="same_as_first_type" id="classId-C_0001725820236573641307-1" class="node default clickable">
             <rect height="79" width="244.46875" y="-39.5" x="-122.234375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="122.234375" x1="-122.234375" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27">
+        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0000798619347004821702-2" class="node default clickable">
             <rect height="79" width="148.84375" y="-39.5" x="-74.421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -212,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33">
+        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000420594889696591405-3" class="node default clickable">
             <rect height="101" width="148.84375" y="-50.5" x="-74.421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L27">
+        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0001724002183455178980-4" class="node default clickable">
             <rect height="57" width="229.21875" y="-28.5" x="-114.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="114.609375" x1="-114.609375" class="divider"/>
@@ -260,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33">
+        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33">
           <g title="A" id="classId-C_0001372381231906520278-5" class="node default clickable">
             <rect height="57" width="88.78125" y="-28.5" x="-44.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="44.390625" x1="-44.390625" class="divider"/>
@@ -279,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L33">
+        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000290383080560130133-6" class="node default clickable">
             <rect height="57" width="307.4375" y="-28.5" x="-153.71875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="153.71875" x1="-153.71875" class="divider"/>
@@ -298,7 +298,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00058/t00058.cc#L38">
+        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00058/t00058.cc#L38">
           <g title="R" id="classId-C_0001015108159699260009-7" class="node default clickable">
             <rect height="101" width="321.421875" y="-50.5" x="-160.7109375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="160.7109375" x1="-160.7109375" class="divider"/>
diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg
index adf14620..4639b2a1 100644
--- a/docs/test_cases/t00059_class.svg
+++ b/docs/test_cases/t00059_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="679px" preserveAspectRatio="none" style="width:1199px;height:679px;" version="1.1" viewBox="0 0 1199 679" width="1199px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1q1yptj5zybs5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1vxeatlcnr6r1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="534" y="576"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="534" y="576"/>
       <ellipse cx="549" cy="594.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.9688,600.6094 Q551.3906,600.9063 550.75,601.0469 Q550.1094,601.2031 549.4063,601.2031 Q546.9063,601.2031 545.5781,599.5625 Q544.2656,597.9063 544.2656,594.7813 Q544.2656,591.6563 545.5781,590 Q546.9063,588.3438 549.4063,588.3438 Q550.1094,588.3438 550.75,588.5 Q551.4063,588.6563 551.9688,588.9531 L551.9688,591.6719 Q551.3438,591.0938 550.75,590.8281 Q550.1563,590.5469 549.5313,590.5469 Q548.1875,590.5469 547.5,591.625 Q546.8125,592.6875 546.8125,594.7813 Q546.8125,596.875 547.5,597.9531 Q548.1875,599.0156 549.5313,599.0156 Q550.1563,599.0156 550.75,598.75 Q551.3438,598.4688 551.9688,597.8906 L551.9688,600.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="561" y="592.1387">«concept»</text>
@@ -23,8 +23,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="540" y="648.9526">T{}</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="540" y="661.7573">t.get_name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="456" y="419"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="456" y="419"/>
       <ellipse cx="475.5" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M478.4688,443.6094 Q477.8906,443.9063 477.25,444.0469 Q476.6094,444.2031 475.9063,444.2031 Q473.4063,444.2031 472.0781,442.5625 Q470.7656,440.9063 470.7656,437.7813 Q470.7656,434.6563 472.0781,433 Q473.4063,431.3438 475.9063,431.3438 Q476.6094,431.3438 477.25,431.5 Q477.9063,431.6563 478.4688,431.9531 L478.4688,434.6719 Q477.8438,434.0938 477.25,433.8281 Q476.6563,433.5469 476.0313,433.5469 Q474.6875,433.5469 474,434.625 Q473.3125,435.6875 473.3125,437.7813 Q473.3125,439.875 474,440.9531 Q474.6875,442.0156 476.0313,442.0156 Q476.6563,442.0156 477.25,441.75 Q477.8438,441.4688 478.4688,440.8906 L478.4688,443.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="488.5" y="435.1387">«concept»</text>
@@ -36,8 +36,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="457" x2="569" y1="477.7422" y2="477.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="462" y="491.9526">t.get_sweetness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="605" y="419"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="605" y="419"/>
       <ellipse cx="622.7" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M625.6688,443.6094 Q625.0906,443.9063 624.45,444.0469 Q623.8094,444.2031 623.1063,444.2031 Q620.6063,444.2031 619.2781,442.5625 Q617.9656,440.9063 617.9656,437.7813 Q617.9656,434.6563 619.2781,433 Q620.6063,431.3438 623.1063,431.3438 Q623.8094,431.3438 624.45,431.5 Q625.1063,431.6563 625.6688,431.9531 L625.6688,434.6719 Q625.0438,434.0938 624.45,433.8281 Q623.8563,433.5469 623.2313,433.5469 Q621.8875,433.5469 621.2,434.625 Q620.5125,435.6875 620.5125,437.7813 Q620.5125,439.875 621.2,440.9531 Q621.8875,442.0156 623.2313,442.0156 Q623.8563,442.0156 624.45,441.75 Q625.0438,441.4688 625.6688,440.8906 L625.6688,443.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="635.3" y="435.1387">«concept»</text>
@@ -49,96 +49,96 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="606" x2="714" y1="477.7422" y2="477.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="611" y="491.9526">t.get_bitterness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="268"/>
       <ellipse cx="65.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M68.7188,289.6406 Q68.1406,289.9375 67.5,290.0781 Q66.8594,290.2344 66.1563,290.2344 Q63.6563,290.2344 62.3281,288.5938 Q61.0156,286.9375 61.0156,283.8125 Q61.0156,280.6875 62.3281,279.0313 Q63.6563,277.375 66.1563,277.375 Q66.8594,277.375 67.5,277.5313 Q68.1563,277.6875 68.7188,277.9844 L68.7188,280.7031 Q68.0938,280.125 67.5,279.8594 Q66.9063,279.5781 66.2813,279.5781 Q64.9375,279.5781 64.25,280.6563 Q63.5625,281.7188 63.5625,283.8125 Q63.5625,285.9063 64.25,286.9844 Q64.9375,288.0469 66.2813,288.0469 Q66.9063,288.0469 67.5,287.7813 Q68.0938,287.5 68.7188,286.9219 L68.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="68" x="86.25" y="288.1543">gala_apple</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="306"/>
       <ellipse cx="17" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="314.2104">get_name() const : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="318.8047"/>
       <ellipse cx="17" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="26" y="327.0151">get_sweetness() const : float</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="268"/>
       <ellipse cx="812.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M815.7188,289.6406 Q815.1406,289.9375 814.5,290.0781 Q813.8594,290.2344 813.1563,290.2344 Q810.6563,290.2344 809.3281,288.5938 Q808.0156,286.9375 808.0156,283.8125 Q808.0156,280.6875 809.3281,279.0313 Q810.6563,277.375 813.1563,277.375 Q813.8594,277.375 814.5,277.5313 Q815.1563,277.6875 815.7188,277.9844 L815.7188,280.7031 Q815.0938,280.125 814.5,279.8594 Q813.9063,279.5781 813.2813,279.5781 Q811.9375,279.5781 811.25,280.6563 Q810.5625,281.7188 810.5625,283.8125 Q810.5625,285.9063 811.25,286.9844 Q811.9375,288.0469 813.2813,288.0469 Q813.9063,288.0469 814.5,287.7813 Q815.0938,287.5 815.7188,286.9219 L815.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="833.25" y="288.1543">empire_apple</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="306"/>
       <ellipse cx="772" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="781" y="314.2104">get_name() const : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="318.8047"/>
       <ellipse cx="772" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="781" y="327.0151">get_sweetness() const : float</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="268"/>
       <ellipse cx="1047.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1050.7188,289.6406 Q1050.1406,289.9375 1049.5,290.0781 Q1048.8594,290.2344 1048.1563,290.2344 Q1045.6563,290.2344 1044.3281,288.5938 Q1043.0156,286.9375 1043.0156,283.8125 Q1043.0156,280.6875 1044.3281,279.0313 Q1045.6563,277.375 1048.1563,277.375 Q1048.8594,277.375 1049.5,277.5313 Q1050.1563,277.6875 1050.7188,277.9844 L1050.7188,280.7031 Q1050.0938,280.125 1049.5,279.8594 Q1048.9063,279.5781 1048.2813,279.5781 Q1046.9375,279.5781 1046.25,280.6563 Q1045.5625,281.7188 1045.5625,283.8125 Q1045.5625,285.9063 1046.25,286.9844 Q1046.9375,288.0469 1048.2813,288.0469 Q1048.9063,288.0469 1049.5,287.7813 Q1050.0938,287.5 1050.7188,286.9219 L1050.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="1068.25" y="288.1543">lima_orange</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="306"/>
       <ellipse cx="1003" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="1012" y="314.2104">get_bitterness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="318.8047"/>
       <ellipse cx="1003" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="1012" y="327.0151">get_name() const : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="268"/>
       <ellipse cx="279.9" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M282.8688,289.6406 Q282.2906,289.9375 281.65,290.0781 Q281.0094,290.2344 280.3063,290.2344 Q277.8063,290.2344 276.4781,288.5938 Q275.1656,286.9375 275.1656,283.8125 Q275.1656,280.6875 276.4781,279.0313 Q277.8063,277.375 280.3063,277.375 Q281.0094,277.375 281.65,277.5313 Q282.3063,277.6875 282.8688,277.9844 L282.8688,280.7031 Q282.2438,280.125 281.65,279.8594 Q281.0563,279.5781 280.4313,279.5781 Q279.0875,279.5781 278.4,280.6563 Q277.7125,281.7188 277.7125,283.8125 Q277.7125,285.9063 278.4,286.9844 Q279.0875,288.0469 280.4313,288.0469 Q281.0563,288.0469 281.65,287.7813 Q282.2438,287.5 282.8688,286.9219 L282.8688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="102" x="300.1" y="288.1543">valencia_orange</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="306"/>
       <ellipse cx="248" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="257" y="314.2104">get_bitterness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="318.8047"/>
       <ellipse cx="248" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="257" y="327.0151">get_name() const : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="268"/>
       <ellipse cx="483" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M485.9688,289.6406 Q485.3906,289.9375 484.75,290.0781 Q484.1094,290.2344 483.4063,290.2344 Q480.9063,290.2344 479.5781,288.5938 Q478.2656,286.9375 478.2656,283.8125 Q478.2656,280.6875 479.5781,279.0313 Q480.9063,277.375 483.4063,277.375 Q484.1094,277.375 484.75,277.5313 Q485.4063,277.6875 485.9688,277.9844 L485.9688,280.7031 Q485.3438,280.125 484.75,279.8594 Q484.1563,279.5781 483.5313,279.5781 Q482.1875,279.5781 481.5,280.6563 Q480.8125,281.7188 480.8125,283.8125 Q480.8125,285.9063 481.5,286.9844 Q482.1875,288.0469 483.5313,288.0469 Q484.1563,288.0469 484.75,287.7813 Q485.3438,287.5 485.9688,286.9219 L485.9688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="497" y="288.1543">fruit_factory</text>
@@ -146,23 +146,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="580" y="277.1387">apple_c TA,orange_c TO</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="306"/>
       <ellipse cx="479" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="488" y="314.2104">create_apple() const : TA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="318.8047"/>
       <ellipse cx="479" cy="323.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="488" y="327.0151">create_orange() const : TO</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="333.6094" y2="333.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="257" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="257" y="159"/>
       <ellipse cx="272" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M274.9688,180.6406 Q274.3906,180.9375 273.75,181.0781 Q273.1094,181.2344 272.4063,181.2344 Q269.9063,181.2344 268.5781,179.5938 Q267.2656,177.9375 267.2656,174.8125 Q267.2656,171.6875 268.5781,170.0313 Q269.9063,168.375 272.4063,168.375 Q273.1094,168.375 273.75,168.5313 Q274.4063,168.6875 274.9688,168.9844 L274.9688,171.7031 Q274.3438,171.125 273.75,170.8594 Q273.1563,170.5781 272.5313,170.5781 Q271.1875,170.5781 270.5,171.6563 Q269.8125,172.7188 269.8125,174.8125 Q269.8125,176.9063 270.5,177.9844 Q271.1875,179.0469 272.5313,179.0469 Q273.1563,179.0469 273.75,178.7813 Q274.3438,178.5 274.9688,177.9219 L274.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="286" y="179.1543">fruit_factory</text>
@@ -171,8 +171,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="673" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="673" y="159"/>
       <ellipse cx="688" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M690.9688,180.6406 Q690.3906,180.9375 689.75,181.0781 Q689.1094,181.2344 688.4063,181.2344 Q685.9063,181.2344 684.5781,179.5938 Q683.2656,177.9375 683.2656,174.8125 Q683.2656,171.6875 684.5781,170.0313 Q685.9063,168.375 688.4063,168.375 Q689.1094,168.375 689.75,168.5313 Q690.4063,168.6875 690.9688,168.9844 L690.9688,171.7031 Q690.3438,171.125 689.75,170.8594 Q689.1563,170.5781 688.5313,170.5781 Q687.1875,170.5781 686.5,171.6563 Q685.8125,172.7188 685.8125,174.8125 Q685.8125,176.9063 686.5,177.9844 Q687.1875,179.0469 688.5313,179.0469 Q689.1563,179.0469 689.75,178.7813 Q690.3438,178.5 690.9688,177.9219 L690.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="702" y="179.1543">fruit_factory</text>
@@ -181,26 +181,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q1yptj5zybs5)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="469.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vxeatlcnr6r1)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="469.5" y="8"/>
       <ellipse cx="546.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M549.7188,29.6406 Q549.1406,29.9375 548.5,30.0781 Q547.8594,30.2344 547.1563,30.2344 Q544.6563,30.2344 543.3281,28.5938 Q542.0156,26.9375 542.0156,23.8125 Q542.0156,20.6875 543.3281,19.0313 Q544.6563,17.375 547.1563,17.375 Q547.8594,17.375 548.5,17.5313 Q549.1563,17.6875 549.7188,17.9844 L549.7188,20.7031 Q549.0938,20.125 548.5,19.8594 Q547.9063,19.5781 547.2813,19.5781 Q545.9375,19.5781 545.25,20.6563 Q544.5625,21.7188 544.5625,23.8125 Q544.5625,25.9063 545.25,26.9844 Q545.9375,28.0469 547.2813,28.0469 Q547.9063,28.0469 548.5,27.7813 Q549.0938,27.5 549.7188,26.9219 L549.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="567.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="54"/>
       <ellipse cx="480.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="62.2104">factory_1 : fruit_factory_1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="66.8047"/>
       <ellipse cx="480.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="75.0151">factory_2 : fruit_factory_2</text>
     </a>
     <path d="M530.86,499.39 C540.67,521.03 552.94,548.09 563.42,571.19 " fill="none" id="C_0001932582371736186409-&gt;C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00059_class_mermaid.svg b/docs/test_cases/t00059_class_mermaid.svg
index 2efef3a2..e5177b2e 100644
--- a/docs/test_cases/t00059_class_mermaid.svg
+++ b/docs/test_cases/t00059_class_mermaid.svg
@@ -198,7 +198,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1035.8984375, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L7">
+        <a transform="translate(1035.8984375, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L7">
           <g title="fruit_c" id="classId-C_0001926201868069460340-0" class="node default clickable">
             <rect height="145" width="117.078125" y="-72.5" x="-58.5390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.5390625" x1="-58.5390625" class="divider"/>
@@ -232,7 +232,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.1328125, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L13">
+        <a transform="translate(936.1328125, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L13">
           <g title="apple_c" id="classId-C_0001932582371736186409-1" class="node default clickable">
             <rect height="123" width="152.640625" y="-61.5" x="-76.3203125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.3203125" x1="-76.3203125" class="divider"/>
@@ -261,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1135.6640625, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L16">
+        <a transform="translate(1135.6640625, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L16">
           <g title="orange_c" id="classId-C_0001483904441065806133-2" class="node default clickable">
             <rect height="123" width="146.421875" y="-61.5" x="-73.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="73.2109375" x1="-73.2109375" class="divider"/>
@@ -290,7 +290,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(128.21875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L18">
+        <a transform="translate(128.21875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L18">
           <g title="gala_apple" id="classId-C_0000399997161214328320-3" class="node default clickable">
             <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
@@ -319,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(709.09375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L24">
+        <a transform="translate(709.09375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L24">
           <g title="empire_apple" id="classId-C_0000660406972347773654-4" class="node default clickable">
             <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
@@ -348,7 +348,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1362.703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L30">
+        <a transform="translate(1362.703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L30">
           <g title="lima_orange" id="classId-C_0001649295452510454080-5" class="node default clickable">
             <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
@@ -377,7 +377,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(418.65625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L36">
+        <a transform="translate(418.65625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L36">
           <g title="valencia_orange" id="classId-C_0000802727760415733923-6" class="node default clickable">
             <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
@@ -406,7 +406,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1035.8984375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1035.8984375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0002301786483822933456-7" class="node default clickable">
             <rect height="101" width="313.171875" y="-50.5" x="-156.5859375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="156.5859375" x1="-156.5859375" class="divider"/>
@@ -435,7 +435,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(418.65625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42">
+        <a transform="translate(418.65625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000551278102444647278-8" class="node default clickable">
             <rect height="57" width="339.59375" y="-28.5" x="-169.796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="169.796875" x1="-169.796875" class="divider"/>
@@ -454,7 +454,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1082.8046875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1082.8046875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000536390279563541226-9" class="node default clickable">
             <rect height="57" width="328.90625" y="-28.5" x="-164.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="164.453125" x1="-164.453125" class="divider"/>
@@ -473,7 +473,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(610.78125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00059/t00059.cc#L51">
+        <a transform="translate(610.78125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00059/t00059.cc#L51">
           <g title="R" id="classId-C_0001128300671453354325-10" class="node default clickable">
             <rect height="101" width="204.875" y="-50.5" x="-102.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="102.4375" x1="-102.4375" class="divider"/>
diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg
index 15110b0d..10504ff8 100644
--- a/docs/test_cases/t00060_class.svg
+++ b/docs/test_cases/t00060_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="340px" preserveAspectRatio="none" style="width:254px;height:340px;" version="1.1" viewBox="0 0 254 340" width="254px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1xr7hibwi5565" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f5lm9jpng8bwv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="48" id="C_0001373615549846303472" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="61" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5lm9jpng8bwv)" height="48" id="C_0001373615549846303472" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="61" y="14.5"/>
       <ellipse cx="76" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M78.9688,36.1406 Q78.3906,36.4375 77.75,36.5781 Q77.1094,36.7344 76.4063,36.7344 Q73.9063,36.7344 72.5781,35.0938 Q71.2656,33.4375 71.2656,30.3125 Q71.2656,27.1875 72.5781,25.5313 Q73.9063,23.875 76.4063,23.875 Q77.1094,23.875 77.75,24.0313 Q78.4063,24.1875 78.9688,24.4844 L78.9688,27.2031 Q78.3438,26.625 77.75,26.3594 Q77.1563,26.0781 76.5313,26.0781 Q75.1875,26.0781 74.5,27.1563 Q73.8125,28.2188 73.8125,30.3125 Q73.8125,32.4063 74.5,33.4844 Q75.1875,34.5469 76.5313,34.5469 Q77.1563,34.5469 77.75,34.2813 Q78.3438,34 78.9688,33.4219 L78.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="90" y="34.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="48" id="C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5lm9jpng8bwv)" height="48" id="C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="159"/>
       <ellipse cx="21" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,180.6406 Q23.3906,180.9375 22.75,181.0781 Q22.1094,181.2344 21.4063,181.2344 Q18.9063,181.2344 17.5781,179.5938 Q16.2656,177.9375 16.2656,174.8125 Q16.2656,171.6875 17.5781,170.0313 Q18.9063,168.375 21.4063,168.375 Q22.1094,168.375 22.75,168.5313 Q23.4063,168.6875 23.9688,168.9844 L23.9688,171.7031 Q23.3438,171.125 22.75,170.8594 Q22.1563,170.5781 21.5313,170.5781 Q20.1875,170.5781 19.5,171.6563 Q18.8125,172.7188 18.8125,174.8125 Q18.8125,176.9063 19.5,177.9844 Q20.1875,179.0469 21.5313,179.0469 Q22.1563,179.0469 22.75,178.7813 Q23.3438,178.5 23.9688,177.9219 L23.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="179.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="48" id="C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5lm9jpng8bwv)" height="48" id="C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="159"/>
       <ellipse cx="96" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,180.6406 Q98.3906,180.9375 97.75,181.0781 Q97.1094,181.2344 96.4063,181.2344 Q93.9063,181.2344 92.5781,179.5938 Q91.2656,177.9375 91.2656,174.8125 Q91.2656,171.6875 92.5781,170.0313 Q93.9063,168.375 96.4063,168.375 Q97.1094,168.375 97.75,168.5313 Q98.4063,168.6875 98.9688,168.9844 L98.9688,171.7031 Q98.3438,171.125 97.75,170.8594 Q97.1563,170.5781 96.5313,170.5781 Q95.1875,170.5781 94.5,171.6563 Q93.8125,172.7188 93.8125,174.8125 Q93.8125,176.9063 94.5,177.9844 Q95.1875,179.0469 96.5313,179.0469 Q97.1563,179.0469 97.75,178.7813 Q98.3438,178.5 98.9688,177.9219 L98.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="179.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="48" id="C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="42.5" y="281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5lm9jpng8bwv)" height="48" id="C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="42.5" y="281"/>
       <ellipse cx="57.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.4688,302.6406 Q59.8906,302.9375 59.25,303.0781 Q58.6094,303.2344 57.9063,303.2344 Q55.4063,303.2344 54.0781,301.5938 Q52.7656,299.9375 52.7656,296.8125 Q52.7656,293.6875 54.0781,292.0313 Q55.4063,290.375 57.9063,290.375 Q58.6094,290.375 59.25,290.5313 Q59.9063,290.6875 60.4688,290.9844 L60.4688,293.7031 Q59.8438,293.125 59.25,292.8594 Q58.6563,292.5781 58.0313,292.5781 Q56.6875,292.5781 56,293.6563 Q55.3125,294.7188 55.3125,296.8125 Q55.3125,298.9063 56,299.9844 Q56.6875,301.0469 58.0313,301.0469 Q58.6563,301.0469 59.25,300.7813 Q59.8438,300.5 60.4688,299.9219 L60.4688,302.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="71.5" y="301.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="313" y2="313"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="321" y2="321"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="60.8047" id="C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="136" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5lm9jpng8bwv)" height="60.8047" id="C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="136" y="8"/>
       <ellipse cx="151" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M153.9688,29.6406 Q153.3906,29.9375 152.75,30.0781 Q152.1094,30.2344 151.4063,30.2344 Q148.9063,30.2344 147.5781,28.5938 Q146.2656,26.9375 146.2656,23.8125 Q146.2656,20.6875 147.5781,19.0313 Q148.9063,17.375 151.4063,17.375 Q152.1094,17.375 152.75,17.5313 Q153.4063,17.6875 153.9688,17.9844 L153.9688,20.7031 Q153.3438,20.125 152.75,19.8594 Q152.1563,19.5781 151.5313,19.5781 Q150.1875,19.5781 149.5,20.6563 Q148.8125,21.7188 148.8125,23.8125 Q148.8125,25.9063 149.5,26.9844 Q150.1875,28.0469 151.5313,28.0469 Q152.1563,28.0469 152.75,27.7813 Q153.3438,27.5 153.9688,26.9219 L153.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="165" y="28.1543">G</text>
@@ -51,15 +51,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142" y="54"/>
       <ellipse cx="147" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="156" y="62.2104">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xr7hibwi5565)" height="73.6094" id="C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="161.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5lm9jpng8bwv)" height="73.6094" id="C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="161.5" y="146"/>
       <ellipse cx="183.7" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.6688,167.6406 Q186.0906,167.9375 185.45,168.0781 Q184.8094,168.2344 184.1063,168.2344 Q181.6063,168.2344 180.2781,166.5938 Q178.9656,164.9375 178.9656,161.8125 Q178.9656,158.6875 180.2781,157.0313 Q181.6063,155.375 184.1063,155.375 Q184.8094,155.375 185.45,155.5313 Q186.1063,155.6875 186.6688,155.9844 L186.6688,158.7031 Q186.0438,158.125 185.45,157.8594 Q184.8563,157.5781 184.2313,157.5781 Q182.8875,157.5781 182.2,158.6563 Q181.5125,159.7188 181.5125,161.8125 Q181.5125,163.9063 182.2,164.9844 Q182.8875,166.0469 184.2313,166.0469 Q184.8563,166.0469 185.45,165.7813 Q186.0438,165.5 186.6688,164.9219 L186.6688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="199.3" y="166.1543">H</text>
@@ -68,18 +68,18 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="192"/>
       <ellipse cx="172.5" cy="197" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="181.5" y="200.2104">h : G&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="204.8047"/>
       <ellipse cx="172.5" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="181.5" y="213.0151">hh : P</text>
     </a>
     <path d="M64.83,81.38 C55.08,106.65 43.02,137.89 34.96,158.8 " fill="none" id="C_0001373615549846303472&lt;-C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00060_class_mermaid.svg b/docs/test_cases/t00060_class_mermaid.svg
index 5fab1a5e..f661620e 100644
--- a/docs/test_cases/t00060_class_mermaid.svg
+++ b/docs/test_cases/t00060_class_mermaid.svg
@@ -116,7 +116,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L3">
+        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L3">
           <g title="A" id="classId-C_0001373615549846303472-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -135,7 +135,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L4">
+        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L4">
           <g title="B" id="classId-C_0000479650368930934571-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -154,7 +154,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L5">
+        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L5">
           <g title="C" id="classId-C_0001827660844127264787-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L6">
+        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L6">
           <g title="D" id="classId-C_0001629687372290281981-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -192,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L10">
+        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L10">
           <g title="G" id="classId-C_0001877304825033069517-4" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -216,7 +216,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00060/t00060.cc#L14">
+        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00060/t00060.cc#L14">
           <g title="H" id="classId-C_0001881610349123495638-5" class="node default clickable">
             <rect height="101" width="87.484375" y="-50.5" x="-43.7421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="43.7421875" x1="-43.7421875" class="divider"/>
diff --git a/docs/test_cases/t00061_class.svg b/docs/test_cases/t00061_class.svg
index 5ff2041e..92c304ae 100644
--- a/docs/test_cases/t00061_class.svg
+++ b/docs/test_cases/t00061_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fcw9fu40qz1dn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1h26zyty0hxur" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcw9fu40qz1dn)" height="48" id="C_0001010204727957329423" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h26zyty0hxur)" height="48" id="C_0001010204727957329423" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
       <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
diff --git a/docs/test_cases/t00061_class_mermaid.svg b/docs/test_cases/t00061_class_mermaid.svg
index 5a7ce2b6..dbc46f7e 100644
--- a/docs/test_cases/t00061_class_mermaid.svg
+++ b/docs/test_cases/t00061_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00061/include/t00061_a.h#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00061/include/t00061_a.h#L3">
           <g title="A" id="classId-C_0001010204727957329423-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00062_class.svg b/docs/test_cases/t00062_class.svg
index f14cca97..8ba68ed6 100644
--- a/docs/test_cases/t00062_class.svg
+++ b/docs/test_cases/t00062_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1285px" preserveAspectRatio="none" style="width:1087px;height:1285px;" version="1.1" viewBox="0 0 1087 1285" width="1087px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f187l88acoacxy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flel7qxkypnmc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.5;" width="67" x="813" y="1214"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.5;" width="67" x="813" y="1214"/>
       <ellipse cx="828.45" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M831.4188,1235.6406 Q830.8406,1235.9375 830.2,1236.0781 Q829.5594,1236.2344 828.8563,1236.2344 Q826.3563,1236.2344 825.0281,1234.5938 Q823.7156,1232.9375 823.7156,1229.8125 Q823.7156,1226.6875 825.0281,1225.0313 Q826.3563,1223.375 828.8563,1223.375 Q829.5594,1223.375 830.2,1223.5313 Q830.8563,1223.6875 831.4188,1223.9844 L831.4188,1226.7031 Q830.7938,1226.125 830.2,1225.8594 Q829.6063,1225.5781 828.9813,1225.5781 Q827.6375,1225.5781 826.95,1226.6563 Q826.2625,1227.7188 826.2625,1229.8125 Q826.2625,1231.9063 826.95,1232.9844 Q827.6375,1234.0469 828.9813,1234.0469 Q829.6063,1234.0469 830.2,1233.7813 Q830.7938,1233.5 831.4188,1232.9219 L831.4188,1235.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="842.55" y="1234.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1246" y2="1246"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1254" y2="1254"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="819" y="1260"/>
       <ellipse cx="824" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="833" y="1268.2104">u : U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="465" y="1214"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="465" y="1214"/>
       <ellipse cx="480" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M482.9688,1235.6406 Q482.3906,1235.9375 481.75,1236.0781 Q481.1094,1236.2344 480.4063,1236.2344 Q477.9063,1236.2344 476.5781,1234.5938 Q475.2656,1232.9375 475.2656,1229.8125 Q475.2656,1226.6875 476.5781,1225.0313 Q477.9063,1223.375 480.4063,1223.375 Q481.1094,1223.375 481.75,1223.5313 Q482.4063,1223.6875 482.9688,1223.9844 L482.9688,1226.7031 Q482.3438,1226.125 481.75,1225.8594 Q481.1563,1225.5781 480.5313,1225.5781 Q479.1875,1225.5781 478.5,1226.6563 Q477.8125,1227.7188 477.8125,1229.8125 Q477.8125,1231.9063 478.5,1232.9844 Q479.1875,1234.0469 480.5313,1234.0469 Q481.1563,1234.0469 481.75,1233.7813 Q482.3438,1233.5 482.9688,1232.9219 L482.9688,1235.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="494" y="1234.1543">A</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1246" y2="1246"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1254" y2="1254"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="471" y="1260"/>
       <ellipse cx="476" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="485" y="1268.2104">u : U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="48" id="C_0001239388209995793547" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="1220.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="48" id="C_0001239388209995793547" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="1220.5"/>
       <ellipse cx="21" cy="1236.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,1242.1406 Q23.3906,1242.4375 22.75,1242.5781 Q22.1094,1242.7344 21.4063,1242.7344 Q18.9063,1242.7344 17.5781,1241.0938 Q16.2656,1239.4375 16.2656,1236.3125 Q16.2656,1233.1875 17.5781,1231.5313 Q18.9063,1229.875 21.4063,1229.875 Q22.1094,1229.875 22.75,1230.0313 Q23.4063,1230.1875 23.9688,1230.4844 L23.9688,1233.2031 Q23.3438,1232.625 22.75,1232.3594 Q22.1563,1232.0781 21.5313,1232.0781 Q20.1875,1232.0781 19.5,1233.1563 Q18.8125,1234.2188 18.8125,1236.3125 Q18.8125,1238.4063 19.5,1239.4844 Q20.1875,1240.5469 21.5313,1240.5469 Q22.1563,1240.5469 22.75,1240.2813 Q23.3438,1240 23.9688,1239.4219 L23.9688,1242.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="1240.6543">A</text>
@@ -53,8 +53,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1252.5" y2="1252.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1260.5" y2="1260.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="810" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="810" y="8"/>
       <ellipse cx="825" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M827.9688,29.6406 Q827.3906,29.9375 826.75,30.0781 Q826.1094,30.2344 825.4063,30.2344 Q822.9063,30.2344 821.5781,28.5938 Q820.2656,26.9375 820.2656,23.8125 Q820.2656,20.6875 821.5781,19.0313 Q822.9063,17.375 825.4063,17.375 Q826.1094,17.375 826.75,17.5313 Q827.4063,17.6875 827.9688,17.9844 L827.9688,20.7031 Q827.3438,20.125 826.75,19.8594 Q826.1563,19.5781 825.5313,19.5781 Q824.1875,19.5781 823.5,20.6563 Q822.8125,21.7188 822.8125,23.8125 Q822.8125,25.9063 823.5,26.9844 Q824.1875,28.0469 825.5313,28.0469 Q826.1563,28.0469 826.75,27.7813 Q827.3438,27.5 827.9688,26.9219 L827.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="839" y="28.1543">A</text>
@@ -63,15 +63,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="816" y="54"/>
       <ellipse cx="821" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="830" y="62.2104">u : U **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001379193770802992785" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="509.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0001379193770802992785" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="509.5" y="8"/>
       <ellipse cx="524.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.4688,29.6406 Q526.8906,29.9375 526.25,30.0781 Q525.6094,30.2344 524.9063,30.2344 Q522.4063,30.2344 521.0781,28.5938 Q519.7656,26.9375 519.7656,23.8125 Q519.7656,20.6875 521.0781,19.0313 Q522.4063,17.375 524.9063,17.375 Q525.6094,17.375 526.25,17.5313 Q526.9063,17.6875 527.4688,17.9844 L527.4688,20.7031 Q526.8438,20.125 526.25,19.8594 Q525.6563,19.5781 525.0313,19.5781 Q523.6875,19.5781 523,20.6563 Q522.3125,21.7188 522.3125,23.8125 Q522.3125,25.9063 523,26.9844 Q523.6875,28.0469 525.0313,28.0469 Q525.6563,28.0469 526.25,27.7813 Q526.8438,27.5 527.4688,26.9219 L527.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="538.5" y="28.1543">A</text>
@@ -80,15 +80,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="515.5" y="54"/>
       <ellipse cx="520.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="529.5" y="62.2104">u : U ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001407865337446777280" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="731" y="104"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0001407865337446777280" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="731" y="104"/>
       <ellipse cx="746" cy="120" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M748.9688,125.6406 Q748.3906,125.9375 747.75,126.0781 Q747.1094,126.2344 746.4063,126.2344 Q743.9063,126.2344 742.5781,124.5938 Q741.2656,122.9375 741.2656,119.8125 Q741.2656,116.6875 742.5781,115.0313 Q743.9063,113.375 746.4063,113.375 Q747.1094,113.375 747.75,113.5313 Q748.4063,113.6875 748.9688,113.9844 L748.9688,116.7031 Q748.3438,116.125 747.75,115.8594 Q747.1563,115.5781 746.5313,115.5781 Q745.1875,115.5781 744.5,116.6563 Q743.8125,117.7188 743.8125,119.8125 Q743.8125,121.9063 744.5,122.9844 Q745.1875,124.0469 746.5313,124.0469 Q747.1563,124.0469 747.75,123.7813 Q748.3438,123.5 748.9688,122.9219 L748.9688,125.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="760" y="124.1543">A</text>
@@ -97,15 +97,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="136" y2="136"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="144" y2="144"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="737" y="150"/>
       <ellipse cx="742" cy="155" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="751" y="158.2104">u : U ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="808" y="200"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="808" y="200"/>
       <ellipse cx="823.9" cy="216" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.8688,221.6406 Q826.2906,221.9375 825.65,222.0781 Q825.0094,222.2344 824.3063,222.2344 Q821.8063,222.2344 820.4781,220.5938 Q819.1656,218.9375 819.1656,215.8125 Q819.1656,212.6875 820.4781,211.0313 Q821.8063,209.375 824.3063,209.375 Q825.0094,209.375 825.65,209.5313 Q826.3063,209.6875 826.8688,209.9844 L826.8688,212.7031 Q826.2438,212.125 825.65,211.8594 Q825.0563,211.5781 824.4313,211.5781 Q823.0875,211.5781 822.4,212.6563 Q821.7125,213.7188 821.7125,215.8125 Q821.7125,217.9063 822.4,218.9844 Q823.0875,220.0469 824.4313,220.0469 Q825.0563,220.0469 825.65,219.7813 Q826.2438,219.5 826.8688,218.9219 L826.8688,221.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838.1" y="220.1543">A</text>
@@ -114,15 +114,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="232" y2="232"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="240" y2="240"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="814" y="246"/>
       <ellipse cx="819" cy="251" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="828" y="254.2104">u : U &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000352457857519671117" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="795.5" y="296"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0000352457857519671117" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="795.5" y="296"/>
       <ellipse cx="811.4" cy="312" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M814.3688,317.6406 Q813.7906,317.9375 813.15,318.0781 Q812.5094,318.2344 811.8063,318.2344 Q809.3063,318.2344 807.9781,316.5938 Q806.6656,314.9375 806.6656,311.8125 Q806.6656,308.6875 807.9781,307.0313 Q809.3063,305.375 811.8063,305.375 Q812.5094,305.375 813.15,305.5313 Q813.8063,305.6875 814.3688,305.9844 L814.3688,308.7031 Q813.7438,308.125 813.15,307.8594 Q812.5563,307.5781 811.9313,307.5781 Q810.5875,307.5781 809.9,308.6563 Q809.2125,309.7188 809.2125,311.8125 Q809.2125,313.9063 809.9,314.9844 Q810.5875,316.0469 811.9313,316.0469 Q812.5563,316.0469 813.15,315.7813 Q813.7438,315.5 814.3688,314.9219 L814.3688,317.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.6" y="316.1543">A</text>
@@ -131,15 +131,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="328" y2="328"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="342"/>
       <ellipse cx="806.5" cy="347" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="815.5" y="350.2104">u : const U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000314708288320430272" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="804.5" y="392.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="73.6094" id="C_0000314708288320430272" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="804.5" y="392.5"/>
       <ellipse cx="821.3" cy="408.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M824.2688,414.1406 Q823.6906,414.4375 823.05,414.5781 Q822.4094,414.7344 821.7063,414.7344 Q819.2063,414.7344 817.8781,413.0938 Q816.5656,411.4375 816.5656,408.3125 Q816.5656,405.1875 817.8781,403.5313 Q819.2063,401.875 821.7063,401.875 Q822.4094,401.875 823.05,402.0313 Q823.7063,402.1875 824.2688,402.4844 L824.2688,405.2031 Q823.6438,404.625 823.05,404.3594 Q822.4563,404.0781 821.8313,404.0781 Q820.4875,404.0781 819.8,405.1563 Q819.1125,406.2188 819.1125,408.3125 Q819.1125,410.4063 819.8,411.4844 Q820.4875,412.5469 821.8313,412.5469 Q822.4563,412.5469 823.05,412.2813 Q823.6438,412 824.2688,411.4219 L824.2688,414.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="835.7" y="412.6543">A</text>
@@ -148,22 +148,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="424.5" y2="424.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="432.5" y2="432.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="438.5"/>
       <ellipse cx="815.5" cy="443.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="824.5" y="446.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="451.3047"/>
       <ellipse cx="815.5" cy="456.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="824.5" y="459.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000827753335392390402" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="517" y="149.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="73.6094" id="C_0000827753335392390402" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="517" y="149.5"/>
       <ellipse cx="532" cy="165.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M534.9688,171.1406 Q534.3906,171.4375 533.75,171.5781 Q533.1094,171.7344 532.4063,171.7344 Q529.9063,171.7344 528.5781,170.0938 Q527.2656,168.4375 527.2656,165.3125 Q527.2656,162.1875 528.5781,160.5313 Q529.9063,158.875 532.4063,158.875 Q533.1094,158.875 533.75,159.0313 Q534.4063,159.1875 534.9688,159.4844 L534.9688,162.2031 Q534.3438,161.625 533.75,161.3594 Q533.1563,161.0781 532.5313,161.0781 Q531.1875,161.0781 530.5,162.1563 Q529.8125,163.2188 529.8125,165.3125 Q529.8125,167.4063 530.5,168.4844 Q531.1875,169.5469 532.5313,169.5469 Q533.1563,169.5469 533.75,169.2813 Q534.3438,169 534.9688,168.4219 L534.9688,171.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="546" y="169.6543">A</text>
@@ -172,22 +172,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="181.5" y2="181.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="189.5" y2="189.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="195.5"/>
       <ellipse cx="528" cy="200.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="537" y="203.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="208.3047"/>
       <ellipse cx="528" cy="213.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="537" y="216.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="786" y="501.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="73.6094" id="C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="786" y="501.5"/>
       <ellipse cx="801" cy="517.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M803.9688,523.1406 Q803.3906,523.4375 802.75,523.5781 Q802.1094,523.7344 801.4063,523.7344 Q798.9063,523.7344 797.5781,522.0938 Q796.2656,520.4375 796.2656,517.3125 Q796.2656,514.1875 797.5781,512.5313 Q798.9063,510.875 801.4063,510.875 Q802.1094,510.875 802.75,511.0313 Q803.4063,511.1875 803.9688,511.4844 L803.9688,514.2031 Q803.3438,513.625 802.75,513.3594 Q802.1563,513.0781 801.5313,513.0781 Q800.1875,513.0781 799.5,514.1563 Q798.8125,515.2188 798.8125,517.3125 Q798.8125,519.4063 799.5,520.4844 Q800.1875,521.5469 801.5313,521.5469 Q802.1563,521.5469 802.75,521.2813 Q803.3438,521 803.9688,520.4219 L803.9688,523.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="815" y="521.6543">A</text>
@@ -196,22 +196,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="533.5" y2="533.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="541.5" y2="541.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="547.5"/>
       <ellipse cx="797" cy="552.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="806" y="555.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="560.3047"/>
       <ellipse cx="797" cy="565.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="806" y="568.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000476497055497873078" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="501.5" y="508"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0000476497055497873078" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="501.5" y="508"/>
       <ellipse cx="516.5" cy="524" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M519.4688,529.6406 Q518.8906,529.9375 518.25,530.0781 Q517.6094,530.2344 516.9063,530.2344 Q514.4063,530.2344 513.0781,528.5938 Q511.7656,526.9375 511.7656,523.8125 Q511.7656,520.6875 513.0781,519.0313 Q514.4063,517.375 516.9063,517.375 Q517.6094,517.375 518.25,517.5313 Q518.9063,517.6875 519.4688,517.9844 L519.4688,520.7031 Q518.8438,520.125 518.25,519.8594 Q517.6563,519.5781 517.0313,519.5781 Q515.6875,519.5781 515,520.6563 Q514.3125,521.7188 514.3125,523.8125 Q514.3125,525.9063 515,526.9844 Q515.6875,528.0469 517.0313,528.0469 Q517.6563,528.0469 518.25,527.7813 Q518.8438,527.5 519.4688,526.9219 L519.4688,529.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="530.5" y="528.1543">A</text>
@@ -220,15 +220,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="540" y2="540"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="548" y2="548"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="507.5" y="554"/>
       <ellipse cx="512.5" cy="559" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="521.5" y="562.2104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="496.5" y="258.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="73.6094" id="C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="496.5" y="258.5"/>
       <ellipse cx="511.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M514.4688,280.1406 Q513.8906,280.4375 513.25,280.5781 Q512.6094,280.7344 511.9063,280.7344 Q509.4063,280.7344 508.0781,279.0938 Q506.7656,277.4375 506.7656,274.3125 Q506.7656,271.1875 508.0781,269.5313 Q509.4063,267.875 511.9063,267.875 Q512.6094,267.875 513.25,268.0313 Q513.9063,268.1875 514.4688,268.4844 L514.4688,271.2031 Q513.8438,270.625 513.25,270.3594 Q512.6563,270.0781 512.0313,270.0781 Q510.6875,270.0781 510,271.1563 Q509.3125,272.2188 509.3125,274.3125 Q509.3125,276.4063 510,277.4844 Q510.6875,278.5469 512.0313,278.5469 Q512.6563,278.5469 513.25,278.2813 Q513.8438,278 514.4688,277.4219 L514.4688,280.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="525.5" y="278.6543">A</text>
@@ -237,22 +237,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="290.5" y2="290.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="298.5" y2="298.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="304.5"/>
       <ellipse cx="507.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="516.5" y="312.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="317.3047"/>
       <ellipse cx="507.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="516.5" y="325.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0001357746808315142717" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="127.5" y="258.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="73.6094" id="C_0001357746808315142717" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="127.5" y="258.5"/>
       <ellipse cx="142.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.4688,280.1406 Q144.8906,280.4375 144.25,280.5781 Q143.6094,280.7344 142.9063,280.7344 Q140.4063,280.7344 139.0781,279.0938 Q137.7656,277.4375 137.7656,274.3125 Q137.7656,271.1875 139.0781,269.5313 Q140.4063,267.875 142.9063,267.875 Q143.6094,267.875 144.25,268.0313 Q144.9063,268.1875 145.4688,268.4844 L145.4688,271.2031 Q144.8438,270.625 144.25,270.3594 Q143.6563,270.0781 143.0313,270.0781 Q141.6875,270.0781 141,271.1563 Q140.3125,272.2188 140.3125,274.3125 Q140.3125,276.4063 141,277.4844 Q141.6875,278.5469 143.0313,278.5469 Q143.6563,278.5469 144.25,278.2813 Q144.8438,278 145.4688,277.4219 L145.4688,280.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.5" y="278.6543">A</text>
@@ -261,22 +261,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="290.5" y2="290.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="298.5" y2="298.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="304.5"/>
       <ellipse cx="138.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="147.5" y="312.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="317.3047"/>
       <ellipse cx="138.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="147.5" y="325.5151">mf : float C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000544335779197078982" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="749" y="610.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="73.6094" id="C_0000544335779197078982" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="749" y="610.5"/>
       <ellipse cx="764" cy="626.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M766.9688,632.1406 Q766.3906,632.4375 765.75,632.5781 Q765.1094,632.7344 764.4063,632.7344 Q761.9063,632.7344 760.5781,631.0938 Q759.2656,629.4375 759.2656,626.3125 Q759.2656,623.1875 760.5781,621.5313 Q761.9063,619.875 764.4063,619.875 Q765.1094,619.875 765.75,620.0313 Q766.4063,620.1875 766.9688,620.4844 L766.9688,623.2031 Q766.3438,622.625 765.75,622.3594 Q765.1563,622.0781 764.5313,622.0781 Q763.1875,622.0781 762.5,623.1563 Q761.8125,624.2188 761.8125,626.3125 Q761.8125,628.4063 762.5,629.4844 Q763.1875,630.5469 764.5313,630.5469 Q765.1563,630.5469 765.75,630.2813 Q766.3438,630 766.9688,629.4219 L766.9688,632.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="778" y="630.6543">A</text>
@@ -285,22 +285,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="642.5" y2="642.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="650.5" y2="650.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="656.5"/>
       <ellipse cx="760" cy="661.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="769" y="664.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="669.3047"/>
       <ellipse cx="760" cy="674.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="769" y="677.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="801" y="720"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="801" y="720"/>
       <ellipse cx="816" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M818.9688,741.6406 Q818.3906,741.9375 817.75,742.0781 Q817.1094,742.2344 816.4063,742.2344 Q813.9063,742.2344 812.5781,740.5938 Q811.2656,738.9375 811.2656,735.8125 Q811.2656,732.6875 812.5781,731.0313 Q813.9063,729.375 816.4063,729.375 Q817.1094,729.375 817.75,729.5313 Q818.4063,729.6875 818.9688,729.9844 L818.9688,732.7031 Q818.3438,732.125 817.75,731.8594 Q817.1563,731.5781 816.5313,731.5781 Q815.1875,731.5781 814.5,732.6563 Q813.8125,733.7188 813.8125,735.8125 Q813.8125,737.9063 814.5,738.9844 Q815.1875,740.0469 816.5313,740.0469 Q817.1563,740.0469 817.75,739.7813 Q818.3438,739.5 818.9688,738.9219 L818.9688,741.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="830" y="740.1543">A</text>
@@ -309,15 +309,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="752" y2="752"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="760" y2="760"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="807" y="766"/>
       <ellipse cx="812" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="821" y="774.2104">n : char[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001318419672443856415" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="493.5" y="720"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0001318419672443856415" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="493.5" y="720"/>
       <ellipse cx="524.25" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.2188,741.6406 Q526.6406,741.9375 526,742.0781 Q525.3594,742.2344 524.6563,742.2344 Q522.1563,742.2344 520.8281,740.5938 Q519.5156,738.9375 519.5156,735.8125 Q519.5156,732.6875 520.8281,731.0313 Q522.1563,729.375 524.6563,729.375 Q525.3594,729.375 526,729.5313 Q526.6563,729.6875 527.2188,729.9844 L527.2188,732.7031 Q526.5938,732.125 526,731.8594 Q525.4063,731.5781 524.7813,731.5781 Q523.4375,731.5781 522.75,732.6563 Q522.0625,733.7188 522.0625,735.8125 Q522.0625,737.9063 522.75,738.9844 Q523.4375,740.0469 524.7813,740.0469 Q525.4063,740.0469 526,739.7813 Q526.5938,739.5 527.2188,738.9219 L527.2188,741.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="541.75" y="740.1543">A</text>
@@ -326,15 +326,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="752" y2="752"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="760" y2="760"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="499.5" y="766"/>
       <ellipse cx="504.5" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="513.5" y="774.2104">n : std::vector&lt;char&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000599593856979463652" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="782" y="816"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0000599593856979463652" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="782" y="816"/>
       <ellipse cx="797.9" cy="832" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M800.8688,837.6406 Q800.2906,837.9375 799.65,838.0781 Q799.0094,838.2344 798.3063,838.2344 Q795.8063,838.2344 794.4781,836.5938 Q793.1656,834.9375 793.1656,831.8125 Q793.1656,828.6875 794.4781,827.0313 Q795.8063,825.375 798.3063,825.375 Q799.0094,825.375 799.65,825.5313 Q800.3063,825.6875 800.8688,825.9844 L800.8688,828.7031 Q800.2438,828.125 799.65,827.8594 Q799.0563,827.5781 798.4313,827.5781 Q797.0875,827.5781 796.4,828.6563 Q795.7125,829.7188 795.7125,831.8125 Q795.7125,833.9063 796.4,834.9844 Q797.0875,836.0469 798.4313,836.0469 Q799.0563,836.0469 799.65,835.7813 Q800.2438,835.5 800.8688,834.9219 L800.8688,837.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.1" y="836.1543">A</text>
@@ -343,15 +343,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="848" y2="848"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="856" y2="856"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="788" y="862"/>
       <ellipse cx="793" cy="867" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="802" y="870.2104">klm : char[K][L][M]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0000015395295268000991" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="809" y="912"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0000015395295268000991" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="809" y="912"/>
       <ellipse cx="824" cy="928" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.9688,933.6406 Q826.3906,933.9375 825.75,934.0781 Q825.1094,934.2344 824.4063,934.2344 Q821.9063,934.2344 820.5781,932.5938 Q819.2656,930.9375 819.2656,927.8125 Q819.2656,924.6875 820.5781,923.0313 Q821.9063,921.375 824.4063,921.375 Q825.1094,921.375 825.75,921.5313 Q826.4063,921.6875 826.9688,921.9844 L826.9688,924.7031 Q826.3438,924.125 825.75,923.8594 Q825.1563,923.5781 824.5313,923.5781 Q823.1875,923.5781 822.5,924.6563 Q821.8125,925.7188 821.8125,927.8125 Q821.8125,929.9063 822.5,930.9844 Q823.1875,932.0469 824.5313,932.0469 Q825.1563,932.0469 825.75,931.7813 Q826.3438,931.5 826.9688,930.9219 L826.9688,933.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838" y="932.1543">A</text>
@@ -360,15 +360,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="944" y2="944"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="952" y2="952"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="815" y="958"/>
       <ellipse cx="820" cy="963" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="829" y="966.2104">u : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="60.8047" id="C_0001603321863498552207" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="807" y="1008"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="60.8047" id="C_0001603321863498552207" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="807" y="1008"/>
       <ellipse cx="822" cy="1024" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M824.9688,1029.6406 Q824.3906,1029.9375 823.75,1030.0781 Q823.1094,1030.2344 822.4063,1030.2344 Q819.9063,1030.2344 818.5781,1028.5938 Q817.2656,1026.9375 817.2656,1023.8125 Q817.2656,1020.6875 818.5781,1019.0313 Q819.9063,1017.375 822.4063,1017.375 Q823.1094,1017.375 823.75,1017.5313 Q824.4063,1017.6875 824.9688,1017.9844 L824.9688,1020.7031 Q824.3438,1020.125 823.75,1019.8594 Q823.1563,1019.5781 822.5313,1019.5781 Q821.1875,1019.5781 820.5,1020.6563 Q819.8125,1021.7188 819.8125,1023.8125 Q819.8125,1025.9063 820.5,1026.9844 Q821.1875,1028.0469 822.5313,1028.0469 Q823.1563,1028.0469 823.75,1027.7813 Q824.3438,1027.5 824.9688,1026.9219 L824.9688,1029.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="836" y="1028.1543">A</text>
@@ -377,15 +377,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1040" y2="1040"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1048" y2="1048"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="813" y="1054"/>
       <ellipse cx="818" cy="1059" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="827" y="1062.2104">c : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="73.6094" id="C_0000232518961342221670" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="759.5" y="1104.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="73.6094" id="C_0000232518961342221670" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="759.5" y="1104.5"/>
       <ellipse cx="797.9" cy="1120.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M800.8688,1126.1406 Q800.2906,1126.4375 799.65,1126.5781 Q799.0094,1126.7344 798.3063,1126.7344 Q795.8063,1126.7344 794.4781,1125.0938 Q793.1656,1123.4375 793.1656,1120.3125 Q793.1656,1117.1875 794.4781,1115.5313 Q795.8063,1113.875 798.3063,1113.875 Q799.0094,1113.875 799.65,1114.0313 Q800.3063,1114.1875 800.8688,1114.4844 L800.8688,1117.2031 Q800.2438,1116.625 799.65,1116.3594 Q799.0563,1116.0781 798.4313,1116.0781 Q797.0875,1116.0781 796.4,1117.1563 Q795.7125,1118.2188 795.7125,1120.3125 Q795.7125,1122.4063 796.4,1123.4844 Q797.0875,1124.5469 798.4313,1124.5469 Q799.0563,1124.5469 799.65,1124.2813 Q800.2438,1124 800.8688,1123.4219 L800.8688,1126.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="817.1" y="1124.6543">A</text>
@@ -394,22 +394,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1136.5" y2="1136.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1144.5" y2="1144.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1150.5"/>
       <ellipse cx="770.5" cy="1155.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="779.5" y="1158.7104">args : std::tuple&lt;Args...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1163.3047"/>
       <ellipse cx="770.5" cy="1168.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="779.5" y="1171.5151">c : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f187l88acoacxy)" height="48" id="C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.5;" width="51" x="1022" y="623.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flel7qxkypnmc)" height="48" id="C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.5;" width="51" x="1022" y="623.5"/>
       <ellipse cx="1037" cy="639.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1039.9688,645.1406 Q1039.3906,645.4375 1038.75,645.5781 Q1038.1094,645.7344 1037.4063,645.7344 Q1034.9063,645.7344 1033.5781,644.0938 Q1032.2656,642.4375 1032.2656,639.3125 Q1032.2656,636.1875 1033.5781,634.5313 Q1034.9063,632.875 1037.4063,632.875 Q1038.1094,632.875 1038.75,633.0313 Q1039.4063,633.1875 1039.9688,633.4844 L1039.9688,636.2031 Q1039.3438,635.625 1038.75,635.3594 Q1038.1563,635.0781 1037.5313,635.0781 Q1036.1875,635.0781 1035.5,636.1563 Q1034.8125,637.2188 1034.8125,639.3125 Q1034.8125,641.4063 1035.5,642.4844 Q1036.1875,643.5469 1037.5313,643.5469 Q1038.1563,643.5469 1038.75,643.2813 Q1039.3438,643 1039.9688,642.4219 L1039.9688,645.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1051" y="643.6543">A</text>
diff --git a/docs/test_cases/t00062_class_mermaid.svg b/docs/test_cases/t00062_class_mermaid.svg
index 21833aad..f0746d7b 100644
--- a/docs/test_cases/t00062_class_mermaid.svg
+++ b/docs/test_cases/t00062_class_mermaid.svg
@@ -306,7 +306,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L9">
+        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L9">
           <g title="A" id="classId-C_0001046827200300090710-0" class="node default clickable">
             <rect height="79" width="73.25" y="-39.5" x="-36.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.625" x1="-36.625" class="divider"/>
@@ -330,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L13">
+        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L13">
           <g title="A" id="classId-C_0001099548178945911245-1" class="node default clickable">
             <rect height="79" width="242.59375" y="-39.5" x="-121.296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.296875" x1="-121.296875" class="divider"/>
@@ -354,7 +354,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L18">
+        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L18">
           <g title="A" id="classId-C_0001239388209995793547-2" class="node default clickable">
             <rect height="57" width="479.921875" y="-28.5" x="-239.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="239.9609375" x1="-239.9609375" class="divider"/>
@@ -373,7 +373,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L20">
+        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L20">
           <g title="A" id="classId-C_0000045701897814162098-3" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -397,7 +397,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L24">
+        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L24">
           <g title="A" id="classId-C_0001379193770802992785-4" class="node default clickable">
             <rect height="79" width="131.484375" y="-39.5" x="-65.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.7421875" x1="-65.7421875" class="divider"/>
@@ -421,7 +421,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L28">
+        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L28">
           <g title="A" id="classId-C_0001407865337446777280-5" class="node default clickable">
             <rect height="79" width="276.421875" y="-39.5" x="-138.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="138.2109375" x1="-138.2109375" class="divider"/>
@@ -445,7 +445,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L32">
+        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L32">
           <g title="A" id="classId-C_0001034483227649400416-6" class="node default clickable">
             <rect height="79" width="84.359375" y="-39.5" x="-42.1796875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.1796875" x1="-42.1796875" class="divider"/>
@@ -469,7 +469,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L36">
+        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L36">
           <g title="A" id="classId-C_0000352457857519671117-7" class="node default clickable">
             <rect height="79" width="115.9375" y="-39.5" x="-57.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="57.96875" x1="-57.96875" class="divider"/>
@@ -493,7 +493,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L40">
+        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L40">
           <g title="A" id="classId-C_0000314708288320430272-8" class="node default clickable">
             <rect height="101" width="91.453125" y="-50.5" x="-45.7265625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="45.7265625" x1="-45.7265625" class="divider"/>
@@ -522,7 +522,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L45">
+        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L45">
           <g title="A" id="classId-C_0000827753335392390402-9" class="node default clickable">
             <rect height="101" width="119.015625" y="-50.5" x="-59.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.5078125" x1="-59.5078125" class="divider"/>
@@ -551,7 +551,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L50">
+        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L50">
           <g title="A" id="classId-C_0000395583480407686249-10" class="node default clickable">
             <rect height="101" width="140.328125" y="-50.5" x="-70.1640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="70.1640625" x1="-70.1640625" class="divider"/>
@@ -580,7 +580,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L55">
+        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L55">
           <g title="A" id="classId-C_0000476497055497873078-11" class="node default clickable">
             <rect height="79" width="152.75" y="-39.5" x="-76.375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.375" x1="-76.375" class="divider"/>
@@ -604,7 +604,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L59">
+        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L59">
           <g title="A" id="classId-C_0001619634759668095904-12" class="node default clickable">
             <rect height="101" width="167.875" y="-50.5" x="-83.9375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="83.9375" x1="-83.9375" class="divider"/>
@@ -633,7 +633,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L64">
+        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L64">
           <g title="A" id="classId-C_0001357746808315142717-13" class="node default clickable">
             <rect height="101" width="180.3125" y="-50.5" x="-90.15625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="90.15625" x1="-90.15625" class="divider"/>
@@ -662,7 +662,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L70">
+        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L70">
           <g title="A" id="classId-C_0000544335779197078982-14" class="node default clickable">
             <rect height="101" width="231.015625" y="-50.5" x="-115.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="115.5078125" x1="-115.5078125" class="divider"/>
@@ -691,7 +691,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L75">
+        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L75">
           <g title="A" id="classId-C_0000602066980416477930-15" class="node default clickable">
             <rect height="79" width="101.25" y="-39.5" x="-50.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="50.625" x1="-50.625" class="divider"/>
@@ -715,7 +715,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L79">
+        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L79">
           <g title="A" id="classId-C_0001318419672443856415-16" class="node default clickable">
             <rect height="79" width="170.203125" y="-39.5" x="-85.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="85.1015625" x1="-85.1015625" class="divider"/>
@@ -739,7 +739,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L83">
+        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L83">
           <g title="A" id="classId-C_0000599593856979463652-17" class="node default clickable">
             <rect height="79" width="153.265625" y="-39.5" x="-76.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.6328125" x1="-76.6328125" class="divider"/>
@@ -763,7 +763,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L85">
+        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L85">
           <g title="A" id="classId-C_0000015395295268000991-18" class="node default clickable">
             <rect height="79" width="80.796875" y="-39.5" x="-40.3984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.3984375" x1="-40.3984375" class="divider"/>
@@ -787,7 +787,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L89">
+        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L89">
           <g title="A" id="classId-C_0001603321863498552207-19" class="node default clickable">
             <rect height="79" width="85.703125" y="-39.5" x="-42.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.8515625" x1="-42.8515625" class="divider"/>
@@ -811,7 +811,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L95">
+        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L95">
           <g title="A" id="classId-C_0000232518961342221670-20" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -840,7 +840,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00062/t00062.cc#L7">
+        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00062/t00062.cc#L7">
           <g title="A" id="classId-C_0000121103565834936476-21" class="node default clickable">
             <rect height="57" width="55.015625" y="-28.5" x="-27.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
diff --git a/docs/test_cases/t00063_class.svg b/docs/test_cases/t00063_class.svg
index 2ecd60b4..1d919346 100644
--- a/docs/test_cases/t00063_class.svg
+++ b/docs/test_cases/t00063_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1uljthhlqc0pe" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fu24yewhbryr4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1uljthhlqc0pe)" height="48" id="C_0001518171774798799557" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu24yewhbryr4)" height="48" id="C_0001518171774798799557" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
       <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
diff --git a/docs/test_cases/t00063_class_mermaid.svg b/docs/test_cases/t00063_class_mermaid.svg
index a01d07bf..0a1c1f57 100644
--- a/docs/test_cases/t00063_class_mermaid.svg
+++ b/docs/test_cases/t00063_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00063/t00063.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00063/t00063.cc#L3">
           <g title="A" id="classId-C_0001518171774798799557-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00064_class.svg b/docs/test_cases/t00064_class.svg
index 43088e2e..3bcabf6e 100644
--- a/docs/test_cases/t00064_class.svg
+++ b/docs/test_cases/t00064_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1373px" preserveAspectRatio="none" style="width:2348px;height:1373px;" version="1.1" viewBox="0 0 2348 1373" width="2348px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1o82gcf7sez8z" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1nsapusmyab4v" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="2219.5" y="571.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="2219.5" y="571.2"/>
       <ellipse cx="2234.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2237.4688,592.8406 Q2236.8906,593.1375 2236.25,593.2781 Q2235.6094,593.4344 2234.9063,593.4344 Q2232.4063,593.4344 2231.0781,591.7938 Q2229.7656,590.1375 2229.7656,587.0125 Q2229.7656,583.8875 2231.0781,582.2313 Q2232.4063,580.575 2234.9063,580.575 Q2235.6094,580.575 2236.25,580.7313 Q2236.9063,580.8875 2237.4688,581.1844 L2237.4688,583.9031 Q2236.8438,583.325 2236.25,583.0594 Q2235.6563,582.7781 2235.0313,582.7781 Q2233.6875,582.7781 2233,583.8563 Q2232.3125,584.9188 2232.3125,587.0125 Q2232.3125,589.1063 2233,590.1844 Q2233.6875,591.2469 2235.0313,591.2469 Q2235.6563,591.2469 2236.25,590.9813 Q2236.8438,590.7 2237.4688,590.1219 L2237.4688,592.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="2248.5" y="591.3543">type_list</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="603.2" y2="603.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="611.2" y2="611.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001536403088019105838" style="stroke: #A80036; stroke-width: 1.5;" width="190" x="1773" y="245.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001536403088019105838" style="stroke: #A80036; stroke-width: 1.5;" width="190" x="1773" y="245.2"/>
       <ellipse cx="1788" cy="261.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1790.9688,266.8406 Q1790.3906,267.1375 1789.75,267.2781 Q1789.1094,267.4344 1788.4063,267.4344 Q1785.9063,267.4344 1784.5781,265.7938 Q1783.2656,264.1375 1783.2656,261.0125 Q1783.2656,257.8875 1784.5781,256.2313 Q1785.9063,254.575 1788.4063,254.575 Q1789.1094,254.575 1789.75,254.7313 Q1790.4063,254.8875 1790.9688,255.1844 L1790.9688,257.9031 Q1790.3438,257.325 1789.75,257.0594 Q1789.1563,256.7781 1788.5313,256.7781 Q1787.1875,256.7781 1786.5,257.8563 Q1785.8125,258.9188 1785.8125,261.0125 Q1785.8125,263.1063 1786.5,264.1844 Q1787.1875,265.2469 1788.5313,265.2469 Q1789.1563,265.2469 1789.75,264.9813 Q1790.3438,264.7 1790.9688,264.1219 L1790.9688,266.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1802" y="265.3543">type_list</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="277.2" y2="277.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="285.2" y2="285.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001613293628874851145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="1787.5" y="494.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001613293628874851145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="1787.5" y="494.2"/>
       <ellipse cx="1802.5" cy="510.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1805.4688,515.8406 Q1804.8906,516.1375 1804.25,516.2781 Q1803.6094,516.4344 1802.9063,516.4344 Q1800.4063,516.4344 1799.0781,514.7938 Q1797.7656,513.1375 1797.7656,510.0125 Q1797.7656,506.8875 1799.0781,505.2313 Q1800.4063,503.575 1802.9063,503.575 Q1803.6094,503.575 1804.25,503.7313 Q1804.9063,503.8875 1805.4688,504.1844 L1805.4688,506.9031 Q1804.8438,506.325 1804.25,506.0594 Q1803.6563,505.7781 1803.0313,505.7781 Q1801.6875,505.7781 1801,506.8563 Q1800.3125,507.9188 1800.3125,510.0125 Q1800.3125,512.1063 1801,513.1844 Q1801.6875,514.2469 1803.0313,514.2469 Q1803.6563,514.2469 1804.25,513.9813 Q1804.8438,513.7 1805.4688,513.1219 L1805.4688,515.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1816.5" y="514.3543">type_list</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="526.2" y2="526.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="534.2" y2="534.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="1789.5" y="91.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L17" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="1789.5" y="91.2"/>
       <ellipse cx="1804.5" cy="107.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1807.4688,112.8406 Q1806.8906,113.1375 1806.25,113.2781 Q1805.6094,113.4344 1804.9063,113.4344 Q1802.4063,113.4344 1801.0781,111.7938 Q1799.7656,110.1375 1799.7656,107.0125 Q1799.7656,103.8875 1801.0781,102.2313 Q1802.4063,100.575 1804.9063,100.575 Q1805.6094,100.575 1806.25,100.7313 Q1806.9063,100.8875 1807.4688,101.1844 L1807.4688,103.9031 Q1806.8438,103.325 1806.25,103.0594 Q1805.6563,102.7781 1805.0313,102.7781 Q1803.6875,102.7781 1803,103.8563 Q1802.3125,104.9188 1802.3125,107.0125 Q1802.3125,109.1063 1803,110.1844 Q1803.6875,111.2469 1805.0313,111.2469 Q1805.6563,111.2469 1806.25,110.9813 Q1806.8438,110.7 1807.4688,110.1219 L1807.4688,112.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1818.5" y="111.3543">type_list</text>
@@ -49,8 +49,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="123.2" y2="123.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="131.2" y2="131.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001342666740698875376" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1050.5" y="39.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001342666740698875376" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1050.5" y="39.2"/>
       <ellipse cx="1065.5" cy="55.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1068.4688,60.8406 Q1067.8906,61.1375 1067.25,61.2781 Q1066.6094,61.4344 1065.9063,61.4344 Q1063.4063,61.4344 1062.0781,59.7938 Q1060.7656,58.1375 1060.7656,55.0125 Q1060.7656,51.8875 1062.0781,50.2313 Q1063.4063,48.575 1065.9063,48.575 Q1066.6094,48.575 1067.25,48.7313 Q1067.9063,48.8875 1068.4688,49.1844 L1068.4688,51.9031 Q1067.8438,51.325 1067.25,51.0594 Q1066.6563,50.7781 1066.0313,50.7781 Q1064.6875,50.7781 1064,51.8563 Q1063.3125,52.9188 1063.3125,55.0125 Q1063.3125,57.1063 1064,58.1844 Q1064.6875,59.2469 1066.0313,59.2469 Q1066.6563,59.2469 1067.25,58.9813 Q1067.8438,58.7 1068.4688,58.1219 L1068.4688,60.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1079.5" y="59.3543">head</text>
@@ -59,8 +59,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="71.2" y2="71.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="79.2" y2="79.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L21" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L21" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000074655005329778311" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="1803.5" y="897.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L21" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L21" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0000074655005329778311" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="1803.5" y="897.2"/>
       <ellipse cx="1818.5" cy="913.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1821.4688,918.8406 Q1820.8906,919.1375 1820.25,919.2781 Q1819.6094,919.4344 1818.9063,919.4344 Q1816.4063,919.4344 1815.0781,917.7938 Q1813.7656,916.1375 1813.7656,913.0125 Q1813.7656,909.8875 1815.0781,908.2313 Q1816.4063,906.575 1818.9063,906.575 Q1819.6094,906.575 1820.25,906.7313 Q1820.9063,906.8875 1821.4688,907.1844 L1821.4688,909.9031 Q1820.8438,909.325 1820.25,909.0594 Q1819.6563,908.7781 1819.0313,908.7781 Q1817.6875,908.7781 1817,909.8563 Q1816.3125,910.9188 1816.3125,913.0125 Q1816.3125,915.1063 1817,916.1844 Q1817.6875,917.2469 1819.0313,917.2469 Q1819.6563,917.2469 1820.25,916.9813 Q1820.8438,916.7 1821.4688,916.1219 L1821.4688,918.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1832.5" y="917.3543">type_list</text>
@@ -69,8 +69,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="929.2" y2="929.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="937.2" y2="937.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="1805.5" y="980.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="1805.5" y="980.2"/>
       <ellipse cx="1820.5" cy="996.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1823.4688,1001.8406 Q1822.8906,1002.1375 1822.25,1002.2781 Q1821.6094,1002.4344 1820.9063,1002.4344 Q1818.4063,1002.4344 1817.0781,1000.7938 Q1815.7656,999.1375 1815.7656,996.0125 Q1815.7656,992.8875 1817.0781,991.2313 Q1818.4063,989.575 1820.9063,989.575 Q1821.6094,989.575 1822.25,989.7313 Q1822.9063,989.8875 1823.4688,990.1844 L1823.4688,992.9031 Q1822.8438,992.325 1822.25,992.0594 Q1821.6563,991.7781 1821.0313,991.7781 Q1819.6875,991.7781 1819,992.8563 Q1818.3125,993.9188 1818.3125,996.0125 Q1818.3125,998.1063 1819,999.1844 Q1819.6875,1000.2469 1821.0313,1000.2469 Q1821.6563,1000.2469 1822.25,999.9813 Q1822.8438,999.7 1823.4688,999.1219 L1823.4688,1001.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1834.5" y="1000.3543">type_list</text>
@@ -79,8 +79,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1012.2" y2="1012.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1020.2" y2="1020.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1795" y="814.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1795" y="814.2"/>
       <ellipse cx="1810" cy="830.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1812.9688,835.8406 Q1812.3906,836.1375 1811.75,836.2781 Q1811.1094,836.4344 1810.4063,836.4344 Q1807.9063,836.4344 1806.5781,834.7938 Q1805.2656,833.1375 1805.2656,830.0125 Q1805.2656,826.8875 1806.5781,825.2313 Q1807.9063,823.575 1810.4063,823.575 Q1811.1094,823.575 1811.75,823.7313 Q1812.4063,823.8875 1812.9688,824.1844 L1812.9688,826.9031 Q1812.3438,826.325 1811.75,826.0594 Q1811.1563,825.7781 1810.5313,825.7781 Q1809.1875,825.7781 1808.5,826.8563 Q1807.8125,827.9188 1807.8125,830.0125 Q1807.8125,832.1063 1808.5,833.1844 Q1809.1875,834.2469 1810.5313,834.2469 Q1811.1563,834.2469 1811.75,833.9813 Q1812.3438,833.7 1812.9688,833.1219 L1812.9688,835.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1824" y="834.3543">type_list</text>
@@ -89,8 +89,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="846.2" y2="846.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="854.2" y2="854.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="60.8047" id="C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="965.5" y="965.7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="60.8047" id="C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="965.5" y="965.7"/>
       <ellipse cx="980.5" cy="981.7" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M983.4688,987.3406 Q982.8906,987.6375 982.25,987.7781 Q981.6094,987.9344 980.9063,987.9344 Q978.4063,987.9344 977.0781,986.2938 Q975.7656,984.6375 975.7656,981.5125 Q975.7656,978.3875 977.0781,976.7313 Q978.4063,975.075 980.9063,975.075 Q981.6094,975.075 982.25,975.2313 Q982.9063,975.3875 983.4688,975.6844 L983.4688,978.4031 Q982.8438,977.825 982.25,977.5594 Q981.6563,977.2781 981.0313,977.2781 Q979.6875,977.2781 979,978.3563 Q978.3125,979.4188 978.3125,981.5125 Q978.3125,983.6063 979,984.6844 Q979.6875,985.7469 981.0313,985.7469 Q981.6563,985.7469 982.25,985.4813 Q982.8438,985.2 983.4688,984.6219 L983.4688,987.3406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="994.5" y="985.8543">type_group_pair</text>
@@ -99,15 +99,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="997.7" y2="997.7"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="1005.7" y2="1005.7"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="971.5" y="1011.7"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="973.5" y="1013.7"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="101" x="985.5" y="1019.9104">size : const size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="2217" y="1063.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="2217" y="1063.2"/>
       <ellipse cx="2232" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2234.9688,1084.8406 Q2234.3906,1085.1375 2233.75,1085.2781 Q2233.1094,1085.4344 2232.4063,1085.4344 Q2229.9063,1085.4344 2228.5781,1083.7938 Q2227.2656,1082.1375 2227.2656,1079.0125 Q2227.2656,1075.8875 2228.5781,1074.2313 Q2229.9063,1072.575 2232.4063,1072.575 Q2233.1094,1072.575 2233.75,1072.7313 Q2234.4063,1072.8875 2234.9688,1073.1844 L2234.9688,1075.9031 Q2234.3438,1075.325 2233.75,1075.0594 Q2233.1563,1074.7781 2232.5313,1074.7781 Q2231.1875,1074.7781 2230.5,1075.8563 Q2229.8125,1076.9188 2229.8125,1079.0125 Q2229.8125,1081.1063 2230.5,1082.1844 Q2231.1875,1083.2469 2232.5313,1083.2469 Q2233.1563,1083.2469 2233.75,1082.9813 Q2234.3438,1082.7 2234.9688,1082.1219 L2234.9688,1084.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="2246" y="1083.3543">optional_ref</text>
@@ -116,8 +116,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1095.2" y2="1095.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1103.2" y2="1103.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.5;" width="576" x="1580" y="1063.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.5;" width="576" x="1580" y="1063.2"/>
       <ellipse cx="1595" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1597.9688,1084.8406 Q1597.3906,1085.1375 1596.75,1085.2781 Q1596.1094,1085.4344 1595.4063,1085.4344 Q1592.9063,1085.4344 1591.5781,1083.7938 Q1590.2656,1082.1375 1590.2656,1079.0125 Q1590.2656,1075.8875 1591.5781,1074.2313 Q1592.9063,1072.575 1595.4063,1072.575 Q1596.1094,1072.575 1596.75,1072.7313 Q1597.4063,1072.8875 1597.9688,1073.1844 L1597.9688,1075.9031 Q1597.3438,1075.325 1596.75,1075.0594 Q1596.1563,1074.7781 1595.5313,1074.7781 Q1594.1875,1074.7781 1593.5,1075.8563 Q1592.8125,1076.9188 1592.8125,1079.0125 Q1592.8125,1081.1063 1593.5,1082.1844 Q1594.1875,1083.2469 1595.5313,1083.2469 Q1596.1563,1083.2469 1596.75,1082.9813 Q1597.3438,1082.7 1597.9688,1082.1219 L1597.9688,1084.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="1609" y="1083.3543">optional_ref</text>
@@ -126,8 +126,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1095.2" y2="1095.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1103.2" y2="1103.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="86.4141" id="C_0001024383802991748694" style="stroke: #A80036; stroke-width: 1.5;" width="406" x="952" y="816.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="86.4141" id="C_0001024383802991748694" style="stroke: #A80036; stroke-width: 1.5;" width="406" x="952" y="816.2"/>
       <ellipse cx="967" cy="832.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M969.9688,837.8406 Q969.3906,838.1375 968.75,838.2781 Q968.1094,838.4344 967.4063,838.4344 Q964.9063,838.4344 963.5781,836.7938 Q962.2656,835.1375 962.2656,832.0125 Q962.2656,828.8875 963.5781,827.2313 Q964.9063,825.575 967.4063,825.575 Q968.1094,825.575 968.75,825.7313 Q969.4063,825.8875 969.9688,826.1844 L969.9688,828.9031 Q969.3438,828.325 968.75,828.0594 Q968.1563,827.7781 967.5313,827.7781 Q966.1875,827.7781 965.5,828.8563 Q964.8125,829.9188 964.8125,832.0125 Q964.8125,834.1063 965.5,835.1844 Q966.1875,836.2469 967.5313,836.2469 Q968.1563,836.2469 968.75,835.9813 Q969.3438,835.7 969.9688,835.1219 L969.9688,837.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="981" y="836.3543">type_group_pair_it</text>
@@ -135,54 +135,54 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="256" x="1104" y="825.3387">It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="848.2" y2="848.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="854.2"/>
       <ellipse cx="963" cy="859.2" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="290" x="972" y="862.4104">find(const value_type &amp; v) constexpr : unsigned int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="867.0047"/>
       <ellipse cx="963" cy="872.0047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="972" y="875.2151">get(unsigned int i) : ref_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="879.8094"/>
       <ellipse cx="963" cy="884.8094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="227" x="972" y="888.0198">getp(unsigned int i) : const value_type *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="894.6141" y2="894.6141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="328.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="328.2"/>
       <ellipse cx="1863" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,349.8406 Q1865.3906,350.1375 1864.75,350.2781 Q1864.1094,350.4344 1863.4063,350.4344 Q1860.9063,350.4344 1859.5781,348.7938 Q1858.2656,347.1375 1858.2656,344.0125 Q1858.2656,340.8875 1859.5781,339.2313 Q1860.9063,337.575 1863.4063,337.575 Q1864.1094,337.575 1864.75,337.7313 Q1865.4063,337.8875 1865.9688,338.1844 L1865.9688,340.9031 Q1865.3438,340.325 1864.75,340.0594 Q1864.1563,339.7781 1863.5313,339.7781 Q1862.1875,339.7781 1861.5,340.8563 Q1860.8125,341.9188 1860.8125,344.0125 Q1860.8125,346.1063 1861.5,347.1844 Q1862.1875,348.2469 1863.5313,348.2469 Q1864.1563,348.2469 1864.75,347.9813 Q1865.3438,347.7 1865.9688,347.1219 L1865.9688,349.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="348.3543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="360.2" y2="360.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="368.2" y2="368.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="648.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="648.2"/>
       <ellipse cx="1863" cy="664.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,669.8406 Q1865.3906,670.1375 1864.75,670.2781 Q1864.1094,670.4344 1863.4063,670.4344 Q1860.9063,670.4344 1859.5781,668.7938 Q1858.2656,667.1375 1858.2656,664.0125 Q1858.2656,660.8875 1859.5781,659.2313 Q1860.9063,657.575 1863.4063,657.575 Q1864.1094,657.575 1864.75,657.7313 Q1865.4063,657.8875 1865.9688,658.1844 L1865.9688,660.9031 Q1865.3438,660.325 1864.75,660.0594 Q1864.1563,659.7781 1863.5313,659.7781 Q1862.1875,659.7781 1861.5,660.8563 Q1860.8125,661.9188 1860.8125,664.0125 Q1860.8125,666.1063 1861.5,667.1844 Q1862.1875,668.2469 1863.5313,668.2469 Q1864.1563,668.2469 1864.75,667.9813 Q1865.3438,667.7 1865.9688,667.1219 L1865.9688,669.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="668.3543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="680.2" y2="680.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="688.2" y2="688.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="411.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="411.2"/>
       <ellipse cx="1863" cy="427.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,432.8406 Q1865.3906,433.1375 1864.75,433.2781 Q1864.1094,433.4344 1863.4063,433.4344 Q1860.9063,433.4344 1859.5781,431.7938 Q1858.2656,430.1375 1858.2656,427.0125 Q1858.2656,423.8875 1859.5781,422.2313 Q1860.9063,420.575 1863.4063,420.575 Q1864.1094,420.575 1864.75,420.7313 Q1865.4063,420.8875 1865.9688,421.1844 L1865.9688,423.9031 Q1865.3438,423.325 1864.75,423.0594 Q1864.1563,422.7781 1863.5313,422.7781 Q1862.1875,422.7781 1861.5,423.8563 Q1860.8125,424.9188 1860.8125,427.0125 Q1860.8125,429.1063 1861.5,430.1844 Q1862.1875,431.2469 1863.5313,431.2469 Q1864.1563,431.2469 1864.75,430.9813 Q1865.3438,430.7 1865.9688,430.1219 L1865.9688,432.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="431.3543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="443.2" y2="443.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="451.2" y2="451.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1082" y="328.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1082" y="328.2"/>
       <ellipse cx="1097" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1099.9688,349.8406 Q1099.3906,350.1375 1098.75,350.2781 Q1098.1094,350.4344 1097.4063,350.4344 Q1094.9063,350.4344 1093.5781,348.7938 Q1092.2656,347.1375 1092.2656,344.0125 Q1092.2656,340.8875 1093.5781,339.2313 Q1094.9063,337.575 1097.4063,337.575 Q1098.1094,337.575 1098.75,337.7313 Q1099.4063,337.8875 1099.9688,338.1844 L1099.9688,340.9031 Q1099.3438,340.325 1098.75,340.0594 Q1098.1563,339.7781 1097.5313,339.7781 Q1096.1875,339.7781 1095.5,340.8563 Q1094.8125,341.9188 1094.8125,344.0125 Q1094.8125,346.1063 1095.5,347.1844 Q1096.1875,348.2469 1097.5313,348.2469 Q1098.1563,348.2469 1098.75,347.9813 Q1099.3438,347.7 1099.9688,347.1219 L1099.9688,349.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1111" y="348.3543">type_list</text>
@@ -191,8 +191,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="360.2" y2="360.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="368.2" y2="368.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="1388" y="1208.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="1388" y="1208.2"/>
       <ellipse cx="1403" cy="1224.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1405.9688,1229.8406 Q1405.3906,1230.1375 1404.75,1230.2781 Q1404.1094,1230.4344 1403.4063,1230.4344 Q1400.9063,1230.4344 1399.5781,1228.7938 Q1398.2656,1227.1375 1398.2656,1224.0125 Q1398.2656,1220.8875 1399.5781,1219.2313 Q1400.9063,1217.575 1403.4063,1217.575 Q1404.1094,1217.575 1404.75,1217.7313 Q1405.4063,1217.8875 1405.9688,1218.1844 L1405.9688,1220.9031 Q1405.3438,1220.325 1404.75,1220.0594 Q1404.1563,1219.7781 1403.5313,1219.7781 Q1402.1875,1219.7781 1401.5,1220.8563 Q1400.8125,1221.9188 1400.8125,1224.0125 Q1400.8125,1226.1063 1401.5,1227.1844 Q1402.1875,1228.2469 1403.5313,1228.2469 Q1404.1563,1228.2469 1404.75,1227.9813 Q1405.3438,1227.7 1405.9688,1227.1219 L1405.9688,1229.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1417" y="1228.3543">type_list</text>
@@ -201,8 +201,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1240.2" y2="1240.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1248.2" y2="1248.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="1095.5" y="571.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="1095.5" y="571.2"/>
       <ellipse cx="1110.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1113.4688,592.8406 Q1112.8906,593.1375 1112.25,593.2781 Q1111.6094,593.4344 1110.9063,593.4344 Q1108.4063,593.4344 1107.0781,591.7938 Q1105.7656,590.1375 1105.7656,587.0125 Q1105.7656,583.8875 1107.0781,582.2313 Q1108.4063,580.575 1110.9063,580.575 Q1111.6094,580.575 1112.25,580.7313 Q1112.9063,580.8875 1113.4688,581.1844 L1113.4688,583.9031 Q1112.8438,583.325 1112.25,583.0594 Q1111.6563,582.7781 1111.0313,582.7781 Q1109.6875,582.7781 1109,583.8563 Q1108.3125,584.9188 1108.3125,587.0125 Q1108.3125,589.1063 1109,590.1844 Q1109.6875,591.2469 1111.0313,591.2469 Q1111.6563,591.2469 1112.25,590.9813 Q1112.8438,590.7 1113.4688,590.1219 L1113.4688,592.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1124.5" y="591.3543">type_list</text>
@@ -211,8 +211,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="603.2" y2="603.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="611.2" y2="611.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.5;" width="389" x="502" y="748.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.5;" width="389" x="502" y="748.2"/>
       <ellipse cx="517" cy="764.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M519.9688,769.8406 Q519.3906,770.1375 518.75,770.2781 Q518.1094,770.4344 517.4063,770.4344 Q514.9063,770.4344 513.5781,768.7938 Q512.2656,767.1375 512.2656,764.0125 Q512.2656,760.8875 513.5781,759.2313 Q514.9063,757.575 517.4063,757.575 Q518.1094,757.575 518.75,757.7313 Q519.4063,757.8875 519.9688,758.1844 L519.9688,760.9031 Q519.3438,760.325 518.75,760.0594 Q518.1563,759.7781 517.5313,759.7781 Q516.1875,759.7781 515.5,760.8563 Q514.8125,761.9188 514.8125,764.0125 Q514.8125,766.1063 515.5,767.1844 Q516.1875,768.2469 517.5313,768.2469 Q518.1563,768.2469 518.75,767.9813 Q519.3438,767.7 519.9688,767.1219 L519.9688,769.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="531" y="768.3543">type_group_pair</text>
@@ -221,30 +221,30 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="780.2" y2="780.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="788.2" y2="788.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="73.6094" id="C_0002161425587790795236" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="586.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="73.6094" id="C_0002161425587790795236" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="586.2"/>
       <ellipse cx="197.25" cy="602.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.2188,607.8406 Q199.6406,608.1375 199,608.2781 Q198.3594,608.4344 197.6563,608.4344 Q195.1563,608.4344 193.8281,606.7938 Q192.5156,605.1375 192.5156,602.0125 Q192.5156,598.8875 193.8281,597.2313 Q195.1563,595.575 197.6563,595.575 Q198.3594,595.575 199,595.7313 Q199.6563,595.8875 200.2188,596.1844 L200.2188,598.9031 Q199.5938,598.325 199,598.0594 Q198.4063,597.7781 197.7813,597.7781 Q196.4375,597.7781 195.75,598.8563 Q195.0625,599.9188 195.0625,602.0125 Q195.0625,604.1063 195.75,605.1844 Q196.4375,606.2469 197.7813,606.2469 Q198.4063,606.2469 199,605.9813 Q199.5938,605.7 200.2188,605.1219 L200.2188,607.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="217.75" y="606.3543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="618.2" y2="618.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="626.2" y2="626.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="632.2"/>
       <ellipse cx="17" cy="637.2" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="373" x="26" y="640.4104">abc : type_group_pair&lt;type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="645.0047"/>
       <ellipse cx="17" cy="650.0047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="175" x="26" y="653.2151">aboolint : type_list&lt;A,bool,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="1735" y="1146.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="1735" y="1146.2"/>
       <ellipse cx="1750" cy="1162.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1752.9688,1167.8406 Q1752.3906,1168.1375 1751.75,1168.2781 Q1751.1094,1168.4344 1750.4063,1168.4344 Q1747.9063,1168.4344 1746.5781,1166.7938 Q1745.2656,1165.1375 1745.2656,1162.0125 Q1745.2656,1158.8875 1746.5781,1157.2313 Q1747.9063,1155.575 1750.4063,1155.575 Q1751.1094,1155.575 1751.75,1155.7313 Q1752.4063,1155.8875 1752.9688,1156.1844 L1752.9688,1158.9031 Q1752.3438,1158.325 1751.75,1158.0594 Q1751.1563,1157.7781 1750.5313,1157.7781 Q1749.1875,1157.7781 1748.5,1158.8563 Q1747.8125,1159.9188 1747.8125,1162.0125 Q1747.8125,1164.1063 1748.5,1165.1844 Q1749.1875,1166.2469 1750.5313,1166.2469 Q1751.1563,1166.2469 1751.75,1165.9813 Q1752.3438,1165.7 1752.9688,1165.1219 L1752.9688,1167.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="1764" y="1166.3543">type_group_pair</text>
@@ -253,8 +253,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1178.2" y2="1178.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1186.2" y2="1186.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.5;" width="347" x="1694.5" y="731.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.5;" width="347" x="1694.5" y="731.2"/>
       <ellipse cx="1709.5" cy="747.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1712.4688,752.8406 Q1711.8906,753.1375 1711.25,753.2781 Q1710.6094,753.4344 1709.9063,753.4344 Q1707.4063,753.4344 1706.0781,751.7938 Q1704.7656,750.1375 1704.7656,747.0125 Q1704.7656,743.8875 1706.0781,742.2313 Q1707.4063,740.575 1709.9063,740.575 Q1710.6094,740.575 1711.25,740.7313 Q1711.9063,740.8875 1712.4688,741.1844 L1712.4688,743.9031 Q1711.8438,743.325 1711.25,743.0594 Q1710.6563,742.7781 1710.0313,742.7781 Q1708.6875,742.7781 1708,743.8563 Q1707.3125,744.9188 1707.3125,747.0125 Q1707.3125,749.1063 1708,750.1844 Q1708.6875,751.2469 1710.0313,751.2469 Q1710.6563,751.2469 1711.25,750.9813 Q1711.8438,750.7 1712.4688,750.1219 L1712.4688,752.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="1723.5" y="751.3543">type_group_pair_it</text>
@@ -263,8 +263,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="763.2" y2="763.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="771.2" y2="771.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o82gcf7sez8z)" height="48" id="C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="1802.5" y="8.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nsapusmyab4v)" height="48" id="C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="1802.5" y="8.2"/>
       <ellipse cx="1817.5" cy="24.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1820.4688,29.8406 Q1819.8906,30.1375 1819.25,30.2781 Q1818.6094,30.4344 1817.9063,30.4344 Q1815.4063,30.4344 1814.0781,28.7938 Q1812.7656,27.1375 1812.7656,24.0125 Q1812.7656,20.8875 1814.0781,19.2313 Q1815.4063,17.575 1817.9063,17.575 Q1818.6094,17.575 1819.25,17.7313 Q1819.9063,17.8875 1820.4688,18.1844 L1820.4688,20.9031 Q1819.8438,20.325 1819.25,20.0594 Q1818.6563,19.7781 1818.0313,19.7781 Q1816.6875,19.7781 1816,20.8563 Q1815.3125,21.9188 1815.3125,24.0125 Q1815.3125,26.1063 1816,27.1844 Q1816.6875,28.2469 1818.0313,28.2469 Q1818.6563,28.2469 1819.25,27.9813 Q1819.8438,27.7 1820.4688,27.1219 L1820.4688,29.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1831.5" y="28.3543">head</text>
diff --git a/docs/test_cases/t00064_class_mermaid.svg b/docs/test_cases/t00064_class_mermaid.svg
index 9b87d280..36dea75d 100644
--- a/docs/test_cases/t00064_class_mermaid.svg
+++ b/docs/test_cases/t00064_class_mermaid.svg
@@ -390,7 +390,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8">
+        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0002055044356505752139-0" class="node default clickable">
             <rect height="57" width="129.421875" y="-28.5" x="-64.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="64.7109375" x1="-64.7109375" class="divider"/>
@@ -409,7 +409,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L11">
+        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L11">
           <g title="type_list" id="classId-C_0001536403088019105838-1" class="node default clickable">
             <rect height="57" width="225.421875" y="-28.5" x="-112.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.7109375" x1="-112.7109375" class="divider"/>
@@ -428,7 +428,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L13">
+        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L13">
           <g title="type_list" id="classId-C_0001613293628874851145-2" class="node default clickable">
             <rect height="57" width="190.765625" y="-28.5" x="-95.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.3828125" x1="-95.3828125" class="divider"/>
@@ -447,7 +447,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17">
+        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L17">
           <g title="type_list" id="classId-C_0000096201031647373215-3" class="node default clickable">
             <rect height="57" width="181.890625" y="-28.5" x="-90.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="90.9453125" x1="-90.9453125" class="divider"/>
@@ -466,7 +466,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L17">
+        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L17">
           <g title="head" id="classId-C_0001342666740698875376-4" class="node default clickable">
             <rect height="57" width="237.921875" y="-28.5" x="-118.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="118.9609375" x1="-118.9609375" class="divider"/>
@@ -485,7 +485,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L21">
+        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L21">
           <g title="type_list" id="classId-C_0000074655005329778311-5" class="node default clickable">
             <rect height="57" width="148.09375" y="-28.5" x="-74.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.046875" x1="-74.046875" class="divider"/>
@@ -504,7 +504,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27">
+        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27">
           <g title="type_list" id="classId-C_0001877705309010128195-6" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -523,7 +523,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27">
+        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27">
           <g title="type_list" id="classId-C_0001737554639587928188-7" class="node default clickable">
             <rect height="57" width="169.734375" y="-28.5" x="-84.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="84.8671875" x1="-84.8671875" class="divider"/>
@@ -542,7 +542,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L27">
+        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L27">
           <g title="type_group_pair" id="classId-C_0001313421318785708660-8" class="node default clickable">
             <rect height="79" width="449.828125" y="-39.5" x="-224.9140625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="224.9140625" x1="-224.9140625" class="divider"/>
@@ -566,7 +566,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0002110316024454672764-9" class="node default clickable">
             <rect height="57" width="135.03125" y="-28.5" x="-67.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.515625" x1="-67.515625" class="divider"/>
@@ -585,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0000476531044436856932-10" class="node default clickable">
             <rect height="57" width="686.34375" y="-28.5" x="-343.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="343.171875" x1="-343.171875" class="divider"/>
@@ -604,7 +604,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L35">
+        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L35">
           <g title="type_group_pair_it" id="classId-C_0001024383802991748694-11" class="node default clickable">
             <rect height="123" width="482.71875" y="-61.5" x="-241.359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="241.359375" x1="-241.359375" class="divider"/>
@@ -638,7 +638,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L51">
+        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L51">
           <g title="A" id="classId-C_0000586286676481245707-12" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -657,7 +657,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L52">
+        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L52">
           <g title="B" id="classId-C_0001353306307770366167-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -676,7 +676,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L53">
+        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L53">
           <g title="C" id="classId-C_0000598044391549147725-14" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -695,7 +695,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L8">
+        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0000425551452299939770-15" class="node default clickable">
             <rect height="57" width="172.359375" y="-28.5" x="-86.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="86.1796875" x1="-86.1796875" class="divider"/>
@@ -714,7 +714,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0000179850898515269194-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -733,7 +733,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0001070380438303872295-17" class="node default clickable">
             <rect height="57" width="142.15625" y="-28.5" x="-71.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="71.078125" x1="-71.078125" class="divider"/>
@@ -752,7 +752,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0001854055939974723413-18" class="node default clickable">
             <rect height="57" width="464.90625" y="-28.5" x="-232.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="232.453125" x1="-232.453125" class="divider"/>
@@ -771,7 +771,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L55">
+        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L55">
           <g title="R" id="classId-C_0002161425587790795236-19" class="node default clickable">
             <rect height="101" width="481.546875" y="-50.5" x="-240.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="240.7734375" x1="-240.7734375" class="divider"/>
@@ -800,7 +800,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L25">
+        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0000271990753639572557-20" class="node default clickable">
             <rect height="57" width="312.890625" y="-28.5" x="-156.4453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="156.4453125" x1="-156.4453125" class="divider"/>
@@ -819,7 +819,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L33">
+        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L33">
           <g title="type_group_pair_it" id="classId-C_0001057906395469156958-21" class="node default clickable">
             <rect height="57" width="410.703125" y="-28.5" x="-205.3515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="205.3515625" x1="-205.3515625" class="divider"/>
@@ -838,7 +838,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00064/t00064.cc#L15">
+        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00064/t00064.cc#L15">
           <g title="head" id="classId-C_0001317314479884183399-22" class="node default clickable">
             <rect height="57" width="145.734375" y="-28.5" x="-72.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.8671875" x1="-72.8671875" class="divider"/>
diff --git a/docs/test_cases/t00065_class.svg b/docs/test_cases/t00065_class.svg
index 803fdd91..2116e0ce 100644
--- a/docs/test_cases/t00065_class.svg
+++ b/docs/test_cases/t00065_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="792px" preserveAspectRatio="none" style="width:767px;height:792px;" version="1.1" viewBox="0 0 767 792" width="767px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="flqbg7k4w0m42" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1hgm7n7mqaxck" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,20 +9,20 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#flqbg7k4w0m42)" points="22,157,96,157,103,179.2969,368,179.2969,368,464,22,464,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1hgm7n7mqaxck)" points="22,157,96,157,103,179.2969,368,179.2969,368,464,22,464,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="103" y1="179.2969" y2="179.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="26" y="171.9951">module1</text>
-    <polygon fill="#FFFFFF" filter="url(#flqbg7k4w0m42)" points="204,341,316,341,323,363.2969,344,363.2969,344,440,204,440,204,341" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1hgm7n7mqaxck)" points="204,341,316,341,323,363.2969,344,363.2969,344,440,204,440,204,341" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="323" y1="363.2969" y2="363.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="106" x="208" y="355.9951">submodule1a</text>
-    <polygon fill="#FFFFFF" filter="url(#flqbg7k4w0m42)" points="392,176,466,176,473,198.2969,745,198.2969,745,780,392,780,392,176" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1hgm7n7mqaxck)" points="392,176,466,176,473,198.2969,745,198.2969,745,780,392,780,392,176" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="392" x2="473" y1="198.2969" y2="198.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="396" y="190.9951">module2</text>
-    <polygon fill="#FFFFFF" filter="url(#flqbg7k4w0m42)" points="486,513,565,513,572,535.2969,622,535.2969,622,656,486,656,486,513" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1hgm7n7mqaxck)" points="486,513,565,513,572,535.2969,622,535.2969,622,656,486,656,486,513" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="486" x2="572" y1="535.2969" y2="535.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="73" x="490" y="527.9951">concepts</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="86.4141" id="C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="129" y="357"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="86.4141" id="C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="129" y="357"/>
       <ellipse cx="144" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.1094,379 L140.3906,379 L140.3906,366.6094 L148.1094,366.6094 L148.1094,368.7656 L142.8438,368.7656 L142.8438,371.4375 L147.6094,371.4375 L147.6094,373.5938 L142.8438,373.5938 L142.8438,376.8438 L148.1094,376.8438 L148.1094,379 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="158" y="377.1543">ABC</text>
@@ -32,8 +32,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="135" y="428.8198">c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="130" x2="184" y1="435.4141" y2="435.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="86.4141" id="C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="38.5" y="357"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="86.4141" id="C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="38.5" y="357"/>
       <ellipse cx="53.5" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M57.6094,379 L49.8906,379 L49.8906,366.6094 L57.6094,366.6094 L57.6094,368.7656 L52.3438,368.7656 L52.3438,371.4375 L57.1094,371.4375 L57.1094,373.5938 L52.3438,373.5938 L52.3438,376.8438 L57.6094,376.8438 L57.6094,379 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="67.5" y="377.1543">XYZ</text>
@@ -43,68 +43,68 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="5" x="44.5" y="428.8198">z</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="92.5" y1="435.4141" y2="435.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="86.4141" id="C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="140.5" y="192"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="86.4141" id="C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="140.5" y="192"/>
       <ellipse cx="206.75" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M209.7188,213.6406 Q209.1406,213.9375 208.5,214.0781 Q207.8594,214.2344 207.1563,214.2344 Q204.6563,214.2344 203.3281,212.5938 Q202.0156,210.9375 202.0156,207.8125 Q202.0156,204.6875 203.3281,203.0313 Q204.6563,201.375 207.1563,201.375 Q207.8594,201.375 208.5,201.5313 Q209.1563,201.6875 209.7188,201.9844 L209.7188,204.7031 Q209.0938,204.125 208.5,203.8594 Q207.9063,203.5781 207.2813,203.5781 Q205.9375,203.5781 205.25,204.6563 Q204.5625,205.7188 204.5625,207.8125 Q204.5625,209.9063 205.25,210.9844 Q205.9375,212.0469 207.2813,212.0469 Q207.9063,212.0469 208.5,211.7813 Q209.0938,211.5 209.7188,210.9219 L209.7188,213.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="227.25" y="212.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="141.5" x2="288.5" y1="224" y2="224"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="141.5" x2="288.5" y1="232" y2="232"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="238"/>
       <ellipse cx="151.5" cy="243" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="160.5" y="246.2104">abc : ABC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="250.8047"/>
       <ellipse cx="151.5" cy="255.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="160.5" y="259.0151">pimpl : detail::AImpl *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="263.6094"/>
       <ellipse cx="151.5" cy="268.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="160.5" y="271.8198">xyz : XYZ</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="48" id="C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="220" y="376"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="48" id="C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="220" y="376"/>
       <ellipse cx="235" cy="392" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M237.9688,397.6406 Q237.3906,397.9375 236.75,398.0781 Q236.1094,398.2344 235.4063,398.2344 Q232.9063,398.2344 231.5781,396.5938 Q230.2656,394.9375 230.2656,391.8125 Q230.2656,388.6875 231.5781,387.0313 Q232.9063,385.375 235.4063,385.375 Q236.1094,385.375 236.75,385.5313 Q237.4063,385.6875 237.9688,385.9844 L237.9688,388.7031 Q237.3438,388.125 236.75,387.8594 Q236.1563,387.5781 235.5313,387.5781 Q234.1875,387.5781 233.5,388.6563 Q232.8125,389.7188 232.8125,391.8125 Q232.8125,393.9063 233.5,394.9844 Q234.1875,396.0469 235.5313,396.0469 Q236.1563,396.0469 236.75,395.7813 Q237.3438,395.5 237.9688,394.9219 L237.9688,397.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="249" y="396.1543">detail::AImpl</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="327" y1="408" y2="408"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="327" y1="416" y2="416"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="81.6094" id="C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="445.5" y="359"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="81.6094" id="C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="445.5" y="359"/>
       <ellipse cx="503.75" cy="375" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M506.7188,380.6406 Q506.1406,380.9375 505.5,381.0781 Q504.8594,381.2344 504.1563,381.2344 Q501.6563,381.2344 500.3281,379.5938 Q499.0156,377.9375 499.0156,374.8125 Q499.0156,371.6875 500.3281,370.0313 Q501.6563,368.375 504.1563,368.375 Q504.8594,368.375 505.5,368.5313 Q506.1563,368.6875 506.7188,368.9844 L506.7188,371.7031 Q506.0938,371.125 505.5,370.8594 Q504.9063,370.5781 504.2813,370.5781 Q502.9375,370.5781 502.25,371.6563 Q501.5625,372.7188 501.5625,374.8125 Q501.5625,376.9063 502.25,377.9844 Q502.9375,379.0469 504.2813,379.0469 Q504.9063,379.0469 505.5,378.7813 Q506.0938,378.5 506.7188,377.9219 L506.7188,380.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="524.25" y="379.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="446.5" x2="577.5" y1="391" y2="391"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="451.5" y="397"/>
       <ellipse cx="456.5" cy="402" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="465.5" y="405.2104">B() = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="446.5" x2="577.5" y1="411.8047" y2="411.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="451.5" y="417.8047"/>
       <ellipse cx="456.5" cy="422.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="465.5" y="426.0151">b() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="446.5" x2="577.5" y1="432.6094" y2="432.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="60.8047" id="C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="524.5" y="703"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="60.8047" id="C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="524.5" y="703"/>
       <ellipse cx="543.1" cy="719" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M546.0688,724.6406 Q545.4906,724.9375 544.85,725.0781 Q544.2094,725.2344 543.5063,725.2344 Q541.0063,725.2344 539.6781,723.5938 Q538.3656,721.9375 538.3656,718.8125 Q538.3656,715.6875 539.6781,714.0313 Q541.0063,712.375 543.5063,712.375 Q544.2094,712.375 544.85,712.5313 Q545.5063,712.6875 546.0688,712.9844 L546.0688,715.7031 Q545.4438,715.125 544.85,714.8594 Q544.2563,714.5781 543.6313,714.5781 Q542.2875,714.5781 541.6,715.6563 Q540.9125,716.7188 540.9125,718.8125 Q540.9125,720.9063 541.6,721.9844 Q542.2875,723.0469 543.6313,723.0469 Q544.2563,723.0469 544.85,722.7813 Q545.4438,722.5 546.0688,721.9219 L546.0688,724.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="557.9" y="723.1543">C</text>
@@ -113,15 +113,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="525.5" x2="582.5" y1="735" y2="735"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="525.5" x2="582.5" y1="743" y2="743"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="530.5" y="749"/>
       <ellipse cx="535.5" cy="754" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="544.5" y="757.2104">t : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="48" id="C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="641" y="570"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="48" id="C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="641" y="570"/>
       <ellipse cx="656" cy="586" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M658.9688,591.6406 Q658.3906,591.9375 657.75,592.0781 Q657.1094,592.2344 656.4063,592.2344 Q653.9063,592.2344 652.5781,590.5938 Q651.2656,588.9375 651.2656,585.8125 Q651.2656,582.6875 652.5781,581.0313 Q653.9063,579.375 656.4063,579.375 Q657.1094,579.375 657.75,579.5313 Q658.4063,579.6875 658.9688,579.9844 L658.9688,582.7031 Q658.3438,582.125 657.75,581.8594 Q657.1563,581.5781 656.5313,581.5781 Q655.1875,581.5781 654.5,582.6563 Q653.8125,583.7188 653.8125,585.8125 Q653.8125,587.9063 654.5,588.9844 Q655.1875,590.0469 656.5313,590.0469 Q657.1563,590.0469 657.75,589.7813 Q658.3438,589.5 658.9688,588.9219 L658.9688,591.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="670" y="590.1543">C</text>
@@ -130,8 +130,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="700" y1="602" y2="602"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="700" y1="610" y2="610"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="73.6094" id="C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="613.5" y="363"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="73.6094" id="C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="613.5" y="363"/>
       <ellipse cx="628.5" cy="379" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M631.4688,384.6406 Q630.8906,384.9375 630.25,385.0781 Q629.6094,385.2344 628.9063,385.2344 Q626.4063,385.2344 625.0781,383.5938 Q623.7656,381.9375 623.7656,378.8125 Q623.7656,375.6875 625.0781,374.0313 Q626.4063,372.375 628.9063,372.375 Q629.6094,372.375 630.25,372.5313 Q630.9063,372.6875 631.4688,372.9844 L631.4688,375.7031 Q630.8438,375.125 630.25,374.8594 Q629.6563,374.5781 629.0313,374.5781 Q627.6875,374.5781 627,375.6563 Q626.3125,376.7188 626.3125,378.8125 Q626.3125,380.9063 627,381.9844 Q627.6875,383.0469 629.0313,383.0469 Q629.6563,383.0469 630.25,382.7813 Q630.8438,382.5 631.4688,381.9219 L631.4688,384.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="642.5" y="383.1543">D</text>
@@ -140,22 +140,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="614.5" x2="727.5" y1="395" y2="395"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="614.5" x2="727.5" y1="403" y2="403"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="619.5" y="409"/>
       <ellipse cx="624.5" cy="414" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="633.5" y="417.2104">c : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="619.5" y="421.8047"/>
       <ellipse cx="624.5" cy="426.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="633.5" y="430.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="48" id="C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="408" y="211"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="48" id="C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="408" y="211"/>
       <ellipse cx="423" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M425.9688,232.6406 Q425.3906,232.9375 424.75,233.0781 Q424.1094,233.2344 423.4063,233.2344 Q420.9063,233.2344 419.5781,231.5938 Q418.2656,229.9375 418.2656,226.8125 Q418.2656,223.6875 419.5781,222.0313 Q420.9063,220.375 423.4063,220.375 Q424.1094,220.375 424.75,220.5313 Q425.4063,220.6875 425.9688,220.9844 L425.9688,223.7031 Q425.3438,223.125 424.75,222.8594 Q424.1563,222.5781 423.5313,222.5781 Q422.1875,222.5781 421.5,223.6563 Q420.8125,224.7188 420.8125,226.8125 Q420.8125,228.9063 421.5,229.9844 Q422.1875,231.0469 423.5313,231.0469 Q424.1563,231.0469 424.75,230.7813 Q425.3438,230.5 425.9688,229.9219 L425.9688,232.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="437" y="231.1543">C</text>
@@ -164,8 +164,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="409" x2="459" y1="243" y2="243"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="409" x2="459" y1="251" y2="251"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="48" id="C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="495.5" y="211"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="48" id="C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="495.5" y="211"/>
       <ellipse cx="510.5" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M513.4688,232.6406 Q512.8906,232.9375 512.25,233.0781 Q511.6094,233.2344 510.9063,233.2344 Q508.4063,233.2344 507.0781,231.5938 Q505.7656,229.9375 505.7656,226.8125 Q505.7656,223.6875 507.0781,222.0313 Q508.4063,220.375 510.9063,220.375 Q511.6094,220.375 512.25,220.5313 Q512.9063,220.6875 513.4688,220.9844 L513.4688,223.7031 Q512.8438,223.125 512.25,222.8594 Q511.6563,222.5781 511.0313,222.5781 Q509.6875,222.5781 509,223.6563 Q508.3125,224.7188 508.3125,226.8125 Q508.3125,228.9063 509,229.9844 Q509.6875,231.0469 511.0313,231.0469 Q511.6563,231.0469 512.25,230.7813 Q512.8438,230.5 513.4688,229.9219 L513.4688,232.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="524.5" y="231.1543">D</text>
@@ -174,8 +174,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="496.5" x2="547.5" y1="243" y2="243"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="496.5" x2="547.5" y1="251" y2="251"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="92.3516" id="C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="502" y="548"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="92.3516" id="C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="502" y="548"/>
       <ellipse cx="517" cy="566.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M519.9688,572.6094 Q519.3906,572.9063 518.75,573.0469 Q518.1094,573.2031 517.4063,573.2031 Q514.9063,573.2031 513.5781,571.5625 Q512.2656,569.9063 512.2656,566.7813 Q512.2656,563.6563 513.5781,562 Q514.9063,560.3438 517.4063,560.3438 Q518.1094,560.3438 518.75,560.5 Q519.4063,560.6563 519.9688,560.9531 L519.9688,563.6719 Q519.3438,563.0938 518.75,562.8281 Q518.1563,562.5469 517.5313,562.5469 Q516.1875,562.5469 515.5,563.625 Q514.8125,564.6875 514.8125,566.7813 Q514.8125,568.875 515.5,569.9531 Q516.1875,571.0156 517.5313,571.0156 Q518.1563,571.0156 518.75,570.75 Q519.3438,570.4688 519.9688,569.8906 L519.9688,572.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="529" y="564.1387">«concept»</text>
@@ -188,33 +188,33 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="508" y="620.9526">T{}</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="508" y="633.7573">t.b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flqbg7k4w0m42)" height="86.4141" id="C_0001082111961413727438" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="394.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hgm7n7mqaxck)" height="86.4141" id="C_0001082111961413727438" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="394.5" y="8"/>
       <ellipse cx="427.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M430.0188,29.6406 Q429.4406,29.9375 428.8,30.0781 Q428.1594,30.2344 427.4563,30.2344 Q424.9563,30.2344 423.6281,28.5938 Q422.3156,26.9375 422.3156,23.8125 Q422.3156,20.6875 423.6281,19.0313 Q424.9563,17.375 427.4563,17.375 Q428.1594,17.375 428.8,17.5313 Q429.4563,17.6875 430.0188,17.9844 L430.0188,20.7031 Q429.3938,20.125 428.8,19.8594 Q428.2063,19.5781 427.5813,19.5781 Q426.2375,19.5781 425.55,20.6563 Q424.8625,21.7188 424.8625,23.8125 Q424.8625,25.9063 425.55,26.9844 Q426.2375,28.0469 427.5813,28.0469 Q428.2063,28.0469 428.8,27.7813 Q429.3938,27.5 430.0188,26.9219 L430.0188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="444.95" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="472.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="472.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="54"/>
       <ellipse cx="405.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="414.5" y="62.2104">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="66.8047"/>
       <ellipse cx="405.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="414.5" y="75.0151">c : C&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="79.6094"/>
       <ellipse cx="405.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="414.5" y="87.8198">d : D&lt;B&gt;</text>
     </a>
     <path d="M190.81,290.32 C188.41,296.25 186.09,302.23 184,308 C178.28,323.8 172.83,341.46 168.34,356.98 " fill="none" id="C_0001178194542408300737&lt;-C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00065_class_mermaid.svg b/docs/test_cases/t00065_class_mermaid.svg
index 610f20b7..906fc069 100644
--- a/docs/test_cases/t00065_class_mermaid.svg
+++ b/docs/test_cases/t00065_class_mermaid.svg
@@ -210,7 +210,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/submodule1a/submodule1a.h#L6">
+        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/submodule1a/submodule1a.h#L6">
           <g title="AImpl" id="classId-C_0000674757414308736755-0" class="node default clickable">
             <rect height="57" width="111.890625" y="-28.5" x="-55.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.9453125" x1="-55.9453125" class="divider"/>
@@ -229,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L8">
+        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L8">
           <g title="ABC" id="classId-C_0002145362985538918973-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L10">
+        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L10">
           <g title="XYZ" id="classId-C_0001435940218810141944-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -297,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module1/module1.h#L12">
+        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module1/module1.h#L12">
           <g title="A" id="classId-C_0001178194542408300737-3" class="node default clickable">
             <rect height="123" width="163.953125" y="-61.5" x="-81.9765625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.9765625" x1="-81.9765625" class="divider"/>
@@ -331,7 +331,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(794.4140625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/concepts/concepts.h#L7">
+        <a transform="translate(794.4140625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/concepts/concepts.h#L7">
           <g title="bconcept" id="classId-C_0001325475407133721370-4" class="node default clickable">
             <rect height="145" width="114.578125" y="-72.5" x="-57.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="57.2890625" x1="-57.2890625" class="divider"/>
@@ -365,7 +365,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(588.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L7">
+        <a transform="translate(588.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L7">
           <g title="B" id="classId-C_0001651810571114530033-5" class="node default clickable">
             <rect height="101" width="149.734375" y="-50.5" x="-74.8671875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.8671875" x1="-74.8671875" class="divider"/>
@@ -394,7 +394,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(814.11328125, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(814.11328125, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001157378014768957235-6" class="node default clickable">
             <rect height="79" width="55.015625" y="-39.5" x="-27.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
@@ -418,7 +418,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(934.1015625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(934.1015625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0000580575003920044707-7" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -437,7 +437,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(864.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(864.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0001719752929087851944-8" class="node default clickable">
             <rect height="101" width="130.578125" y="-50.5" x="-65.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.2890625" x1="-65.2890625" class="divider"/>
@@ -466,7 +466,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(643.19140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(643.19140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001373403346245688670-9" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -485,7 +485,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(854.2578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(854.2578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0002024276012622729482-10" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -504,7 +504,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(643.19140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00065/t00065.cc#L6">
+        <a transform="translate(643.19140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00065/t00065.cc#L6">
           <g title="R" id="classId-C_0001082111961413727438-11" class="node default clickable">
             <rect height="123" width="87.5" y="-61.5" x="-43.75" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="43.75" x1="-43.75" class="divider"/>
diff --git a/docs/test_cases/t00066_class.svg b/docs/test_cases/t00066_class.svg
index 6322e651..f4386bbe 100644
--- a/docs/test_cases/t00066_class.svg
+++ b/docs/test_cases/t00066_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="450px" preserveAspectRatio="none" style="width:347px;height:450px;" version="1.1" viewBox="0 0 347 450" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fk1booxwm4w83" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1swofpfbl5jbb" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,222 +9,222 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk1booxwm4w83)" height="432.1406" id="C_0001899957281758233935" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1swofpfbl5jbb)" height="432.1406" id="C_0001899957281758233935" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="53.2104">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <polygon fill="none" points="18,57.8047,22,61.8047,18,65.8047,14,61.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="66.0151">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="72.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="78.8198">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="85.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="91.6245">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="98.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="104.4292">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="117.2339">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
       <ellipse cx="18" cy="126.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="130.0386">static_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
       <ellipse cx="18" cy="139.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="142.8433">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
       <ellipse cx="18" cy="152.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="155.6479">auto_member : const unsigned long</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="168.2422"/>
       <ellipse cx="18" cy="173.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="176.4526">A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="181.0469"/>
       <ellipse cx="18" cy="186.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="189.2573">A(int i) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="193.8516"/>
       <ellipse cx="18" cy="198.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="202.062">A(A &amp;&amp;) = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="206.6563"/>
       <ellipse cx="18" cy="211.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="214.8667">A(const A &amp;) = deleted : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="219.4609"/>
       <ellipse cx="18" cy="224.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="227.6714">~A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
       <ellipse cx="18" cy="237.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="240.4761">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
       <ellipse cx="18" cy="250.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="253.2808">static_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
       <ellipse cx="18" cy="262.875" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="266.0854">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
       <ellipse cx="18" cy="275.6797" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="278.8901">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
       <ellipse cx="18" cy="288.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="291.6948">operator++() : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
       <ellipse cx="18" cy="301.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="304.4995">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="309.0938"/>
       <ellipse cx="18" cy="314.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="317.3042">operator=(A &amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="321.8984"/>
       <ellipse cx="18" cy="326.8984" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="330.1089">size() const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="334.7031"/>
       <ellipse cx="18" cy="339.7031" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="342.9136">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="347.5078"/>
       <ellipse cx="18" cy="352.5078" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="355.7183">sum(const double a, const double b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="360.3125"/>
       <ellipse cx="18" cy="365.3125" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="368.5229">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="373.1172"/>
       <ellipse cx="18" cy="378.1172" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="381.3276">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="385.9219"/>
       <ellipse cx="18" cy="390.9219" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="394.1323">create_from_int(int i) : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="398.7266"/>
       <polygon fill="#FFFF44" points="18,398.7266,22,402.7266,18,406.7266,14,402.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="406.937">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="411.5313"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="413.5313"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="419.7417">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="424.3359"/>
       <polygon fill="#FFFF44" points="18,424.3359,22,428.3359,18,432.3359,14,428.3359" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="432.5464">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00066_class_mermaid.svg b/docs/test_cases/t00066_class_mermaid.svg
index 40546ea7..b51a7ec3 100644
--- a/docs/test_cases/t00066_class_mermaid.svg
+++ b/docs/test_cases/t00066_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00066/t00066.cc#L7">
+        <a transform="translate(200.375, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00066/t00066.cc#L7">
           <g title="A" id="classId-C_0001899957281758233935-0" class="node default clickable">
             <rect height="717" width="384.75" y="-358.5" x="-192.375" class="outer title-state"/>
             <line y2="-328.5" y1="-328.5" x2="192.375" x1="-192.375" class="divider"/>
diff --git a/docs/test_cases/t00067_class.svg b/docs/test_cases/t00067_class.svg
index 61c4fbbd..d9bf4e9f 100644
--- a/docs/test_cases/t00067_class.svg
+++ b/docs/test_cases/t00067_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="322px" preserveAspectRatio="none" style="width:347px;height:322px;" version="1.1" viewBox="0 0 347 322" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1577k0guxl5hh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fniore5y03ndh" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,152 +9,152 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1577k0guxl5hh)" height="304.0938" id="C_0000541140581420098839" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fniore5y03ndh)" height="304.0938" id="C_0000541140581420098839" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="53.2104">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="66.0151">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="78.8198">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="91.6245">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
       <ellipse cx="18" cy="101.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="104.4292">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="117.2339">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="123.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="130.0386">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
       <polygon fill="#FFFF44" points="18,134.6328,22,138.6328,18,142.6328,14,138.6328" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="142.8433">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
       <ellipse cx="18" cy="152.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="155.6479">size() const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="160.2422"/>
       <ellipse cx="18" cy="165.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="168.4526">sum(const double a, const double b) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="175.0469" y2="175.0469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="181.0469"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="183.0469"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="189.2573">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="193.8516"/>
       <ellipse cx="18" cy="198.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="202.062">auto_member : const unsigned long</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="206.6563"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="208.6563"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="214.8667">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="219.4609"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="221.4609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="227.6714">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
       <polygon fill="#FFFF44" points="18,232.2656,22,236.2656,18,240.2656,14,236.2656" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="240.4761">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="247.0703"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="253.2808">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
       <polygon fill="none" points="18,257.875,22,261.875,18,265.875,14,261.875" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="266.0854">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
       <ellipse cx="18" cy="275.6797" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="278.8901">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
       <ellipse cx="18" cy="288.4844" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="291.6948">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
       <ellipse cx="18" cy="301.2891" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="304.4995">static_int : int</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00067_class_mermaid.svg b/docs/test_cases/t00067_class_mermaid.svg
index 0c352cce..904952d0 100644
--- a/docs/test_cases/t00067_class_mermaid.svg
+++ b/docs/test_cases/t00067_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00067/t00067.cc#L6">
+        <a transform="translate(200.375, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00067/t00067.cc#L6">
           <g title="A" id="classId-C_0000541140581420098839-0" class="node default clickable">
             <rect height="497" width="384.75" y="-248.5" x="-192.375" class="outer title-state"/>
             <line y2="-218.5" y1="-218.5" x2="192.375" x1="-192.375" class="divider"/>
diff --git a/docs/test_cases/t00068_r0_class.svg b/docs/test_cases/t00068_r0_class.svg
index 1b511858..991b6804 100644
--- a/docs/test_cases/t00068_r0_class.svg
+++ b/docs/test_cases/t00068_r0_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="112px" preserveAspectRatio="none" style="width:222px;height:112px;" version="1.1" viewBox="0 0 222 112" width="222px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f11ewtfjqytom9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1u8zqoqo1aqdd" 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"/>
@@ -10,26 +10,26 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="2" y="16.708">AAA context of radius 0</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11ewtfjqytom9)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="56.5" y="27.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1u8zqoqo1aqdd)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="56.5" y="27.9531"/>
       <ellipse cx="90.85" cy="43.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M93.8188,49.5938 Q93.2406,49.8906 92.6,50.0313 Q91.9594,50.1875 91.2563,50.1875 Q88.7563,50.1875 87.4281,48.5469 Q86.1156,46.8906 86.1156,43.7656 Q86.1156,40.6406 87.4281,38.9844 Q88.7563,37.3281 91.2563,37.3281 Q91.9594,37.3281 92.6,37.4844 Q93.2563,37.6406 93.8188,37.9375 L93.8188,40.6563 Q93.1938,40.0781 92.6,39.8125 Q92.0063,39.5313 91.3813,39.5313 Q90.0375,39.5313 89.35,40.6094 Q88.6625,41.6719 88.6625,43.7656 Q88.6625,45.8594 89.35,46.9375 Q90.0375,48 91.3813,48 Q92.0063,48 92.6,47.7344 Q93.1938,47.4531 93.8188,46.875 L93.8188,49.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="109.15" y="48.1074">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="57.5" x2="154.5" y1="59.9531" y2="59.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="57.5" x2="154.5" y1="67.9531" y2="67.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="62.5" y="73.9531"/>
       <ellipse cx="67.5" cy="78.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="76.5" y="82.1636">akind : AKind</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="62.5" y="86.7578"/>
       <ellipse cx="67.5" cy="91.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="76.5" y="94.9683">bb : BB *</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00068_r0_class_mermaid.svg b/docs/test_cases/t00068_r0_class_mermaid.svg
index 504d9966..689f23d5 100644
--- a/docs/test_cases/t00068_r0_class_mermaid.svg
+++ b/docs/test_cases/t00068_r0_class_mermaid.svg
@@ -53,7 +53,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(66.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19">
+        <a transform="translate(66.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-0" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
diff --git a/docs/test_cases/t00068_r1_class.svg b/docs/test_cases/t00068_r1_class.svg
index 433e4630..7abfaadb 100644
--- a/docs/test_cases/t00068_r1_class.svg
+++ b/docs/test_cases/t00068_r1_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="415px" preserveAspectRatio="none" style="width:250px;height:415px;" version="1.1" viewBox="0 0 250 415" width="250px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fu0yqwj1wirvb" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fa7henozh211r" 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"/>
@@ -10,23 +10,23 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="24.5" y="16.708">AAA context of radius 1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="330.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7henozh211r)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="330.4531"/>
       <ellipse cx="59.75" cy="346.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M62.7188,352.0938 Q62.1406,352.3906 61.5,352.5313 Q60.8594,352.6875 60.1563,352.6875 Q57.6563,352.6875 56.3281,351.0469 Q55.0156,349.3906 55.0156,346.2656 Q55.0156,343.1406 56.3281,341.4844 Q57.6563,339.8281 60.1563,339.8281 Q60.8594,339.8281 61.5,339.9844 Q62.1563,340.1406 62.7188,340.4375 L62.7188,343.1563 Q62.0938,342.5781 61.5,342.3125 Q60.9063,342.0313 60.2813,342.0313 Q58.9375,342.0313 58.25,343.1094 Q57.5625,344.1719 57.5625,346.2656 Q57.5625,348.3594 58.25,349.4375 Q58.9375,350.5 60.2813,350.5 Q60.9063,350.5 61.5,350.2344 Q62.0938,349.9531 62.7188,349.375 L62.7188,352.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="80.25" y="350.6074">BB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="362.4531" y2="362.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="370.4531" y2="370.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="376.4531"/>
       <ellipse cx="17" cy="381.4531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="384.6636">b : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="317.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7henozh211r)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="317.9531"/>
       <ellipse cx="188" cy="333.9531" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.1094,339.9531 L184.3906,339.9531 L184.3906,327.5625 L192.1094,327.5625 L192.1094,329.7188 L186.8438,329.7188 L186.8438,332.3906 L191.6094,332.3906 L191.6094,334.5469 L186.8438,334.5469 L186.8438,337.7969 L192.1094,337.7969 L192.1094,339.9531 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="34" x="202" y="338.1074">AKind</text>
@@ -36,49 +36,49 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="179" y="389.7729">ThreeA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="396.3672" y2="396.3672"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="35.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7henozh211r)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="35.4531"/>
       <ellipse cx="78" cy="51.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M80.9688,57.0938 Q80.3906,57.3906 79.75,57.5313 Q79.1094,57.6875 78.4063,57.6875 Q75.9063,57.6875 74.5781,56.0469 Q73.2656,54.3906 73.2656,51.2656 Q73.2656,48.1406 74.5781,46.4844 Q75.9063,44.8281 78.4063,44.8281 Q79.1094,44.8281 79.75,44.9844 Q80.4063,45.1406 80.9688,45.4375 L80.9688,48.1563 Q80.3438,47.5781 79.75,47.3125 Q79.1563,47.0313 78.5313,47.0313 Q77.1875,47.0313 76.5,48.1094 Q75.8125,49.1719 75.8125,51.2656 Q75.8125,53.3594 76.5,54.4375 Q77.1875,55.5 78.5313,55.5 Q79.1563,55.5 79.75,55.2344 Q80.3438,54.9531 80.9688,54.375 L80.9688,57.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="92" y="55.6074">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="67.4531" y2="67.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="75.4531" y2="75.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="166.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7henozh211r)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="166.9531"/>
       <ellipse cx="123.85" cy="182.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M126.8188,188.5938 Q126.2406,188.8906 125.6,189.0313 Q124.9594,189.1875 124.2563,189.1875 Q121.7563,189.1875 120.4281,187.5469 Q119.1156,185.8906 119.1156,182.7656 Q119.1156,179.6406 120.4281,177.9844 Q121.7563,176.3281 124.2563,176.3281 Q124.9594,176.3281 125.6,176.4844 Q126.2563,176.6406 126.8188,176.9375 L126.8188,179.6563 Q126.1938,179.0781 125.6,178.8125 Q125.0063,178.5313 124.3813,178.5313 Q123.0375,178.5313 122.35,179.6094 Q121.6625,180.6719 121.6625,182.7656 Q121.6625,184.8594 122.35,185.9375 Q123.0375,187 124.3813,187 Q125.0063,187 125.6,186.7344 Q126.1938,186.4531 126.8188,185.875 L126.8188,188.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="142.15" y="187.1074">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="198.9531" y2="198.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="206.9531" y2="206.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="212.9531"/>
       <ellipse cx="100.5" cy="217.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="109.5" y="221.1636">akind : AKind</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="225.7578"/>
       <ellipse cx="100.5" cy="230.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="109.5" y="233.9683">bb : BB *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu0yqwj1wirvb)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="146" y="28.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa7henozh211r)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="146" y="28.9531"/>
       <ellipse cx="183.5" cy="44.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.4688,50.5938 Q185.8906,50.8906 185.25,51.0313 Q184.6094,51.1875 183.9063,51.1875 Q181.4063,51.1875 180.0781,49.5469 Q178.7656,47.8906 178.7656,44.7656 Q178.7656,41.6406 180.0781,39.9844 Q181.4063,38.3281 183.9063,38.3281 Q184.6094,38.3281 185.25,38.4844 Q185.9063,38.6406 186.4688,38.9375 L186.4688,41.6563 Q185.8438,41.0781 185.25,40.8125 Q184.6563,40.5313 184.0313,40.5313 Q182.6875,40.5313 182,41.6094 Q181.3125,42.6719 181.3125,44.7656 Q181.3125,46.8594 182,47.9375 Q182.6875,49 184.0313,49 Q184.6563,49 185.25,48.7344 Q185.8438,48.4531 186.4688,47.875 L186.4688,50.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="202.5" y="49.1074">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="147" x2="235" y1="60.9531" y2="60.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="147" x2="235" y1="68.9531" y2="68.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="152" y="74.9531"/>
       <ellipse cx="157" cy="79.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="64" x="166" y="83.1636">aaa : AAA *</text>
     </a>
     <path d="M123.29,241.2931 C112.3,266.7131 97.72,300.4531 86.91,325.4531 " fill="none" id="C_0001484819281509619918-&gt;C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00068_r1_class_mermaid.svg b/docs/test_cases/t00068_r1_class_mermaid.svg
index 8018a8ad..2d9b0f5a 100644
--- a/docs/test_cases/t00068_r1_class_mermaid.svg
+++ b/docs/test_cases/t00068_r1_class_mermaid.svg
@@ -101,7 +101,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9">
+        <a transform="translate(82.875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L9">
           <g title="BB" id="classId-C_0001427649116338755656-0" class="node default clickable">
             <rect height="79" width="149.75" y="-39.5" x="-74.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -125,7 +125,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.625, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13">
+        <a transform="translate(268.625, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L13">
           <g title="AKind" id="classId-C_0001888428536574868284-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -159,7 +159,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17">
+        <a transform="translate(117.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L17">
           <g title="AA" id="classId-C_0000577981285610429577-2" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -178,7 +178,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.75, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19">
+        <a transform="translate(175.75, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-3" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -207,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(234.2265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24">
+        <a transform="translate(234.2265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L24">
           <g title="R" id="classId-C_0000999621481464424961-4" class="node default clickable">
             <rect height="79" width="95.796875" y="-39.5" x="-47.8984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="47.8984375" x1="-47.8984375" class="divider"/>
diff --git a/docs/test_cases/t00068_r2_class.svg b/docs/test_cases/t00068_r2_class.svg
index 5ca2ba3c..0d361cca 100644
--- a/docs/test_cases/t00068_r2_class.svg
+++ b/docs/test_cases/t00068_r2_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="677px" preserveAspectRatio="none" style="width:301px;height:677px;" version="1.1" viewBox="0 0 301 677" width="301px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1a3k7smt3p4br" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fv1h2ssejutal" 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"/>
@@ -10,31 +10,31 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="50" y="16.708">AAA context of radius 2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="48" id="C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="52" y="618.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv1h2ssejutal)" height="48" id="C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="52" y="618.9531"/>
       <ellipse cx="67" cy="634.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M69.9688,640.5938 Q69.3906,640.8906 68.75,641.0313 Q68.1094,641.1875 67.4063,641.1875 Q64.9063,641.1875 63.5781,639.5469 Q62.2656,637.8906 62.2656,634.7656 Q62.2656,631.6406 63.5781,629.9844 Q64.9063,628.3281 67.4063,628.3281 Q68.1094,628.3281 68.75,628.4844 Q69.4063,628.6406 69.9688,628.9375 L69.9688,631.6563 Q69.3438,631.0781 68.75,630.8125 Q68.1563,630.5313 67.5313,630.5313 Q66.1875,630.5313 65.5,631.6094 Q64.8125,632.6719 64.8125,634.7656 Q64.8125,636.8594 65.5,637.9375 Q66.1875,639 67.5313,639 Q68.1563,639 68.75,638.7344 Q69.3438,638.4531 69.9688,637.875 L69.9688,640.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="81" y="639.1074">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="53" x2="91" y1="650.9531" y2="650.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="53" x2="91" y1="658.9531" y2="658.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="468.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv1h2ssejutal)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="468.4531"/>
       <ellipse cx="59.75" cy="484.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M62.7188,490.0938 Q62.1406,490.3906 61.5,490.5313 Q60.8594,490.6875 60.1563,490.6875 Q57.6563,490.6875 56.3281,489.0469 Q55.0156,487.3906 55.0156,484.2656 Q55.0156,481.1406 56.3281,479.4844 Q57.6563,477.8281 60.1563,477.8281 Q60.8594,477.8281 61.5,477.9844 Q62.1563,478.1406 62.7188,478.4375 L62.7188,481.1563 Q62.0938,480.5781 61.5,480.3125 Q60.9063,480.0313 60.2813,480.0313 Q58.9375,480.0313 58.25,481.1094 Q57.5625,482.1719 57.5625,484.2656 Q57.5625,486.3594 58.25,487.4375 Q58.9375,488.5 60.2813,488.5 Q60.9063,488.5 61.5,488.2344 Q62.0938,487.9531 62.7188,487.375 L62.7188,490.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="80.25" y="488.6074">BB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="500.4531" y2="500.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="508.4531" y2="508.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="514.4531"/>
       <ellipse cx="17" cy="519.4531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="522.6636">b : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="455.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv1h2ssejutal)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="455.9531"/>
       <ellipse cx="188" cy="471.9531" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.1094,477.9531 L184.3906,477.9531 L184.3906,465.5625 L192.1094,465.5625 L192.1094,467.7188 L186.8438,467.7188 L186.8438,470.3906 L191.6094,470.3906 L191.6094,472.5469 L186.8438,472.5469 L186.8438,475.7969 L192.1094,475.7969 L192.1094,477.9531 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="34" x="202" y="476.1074">AKind</text>
@@ -44,72 +44,72 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="179" y="527.7729">ThreeA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="534.3672" y2="534.3672"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="48" id="C_0001297439817144700057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="59" y="35.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv1h2ssejutal)" height="48" id="C_0001297439817144700057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="59" y="35.4531"/>
       <ellipse cx="74" cy="51.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M76.9688,57.0938 Q76.3906,57.3906 75.75,57.5313 Q75.1094,57.6875 74.4063,57.6875 Q71.9063,57.6875 70.5781,56.0469 Q69.2656,54.3906 69.2656,51.2656 Q69.2656,48.1406 70.5781,46.4844 Q71.9063,44.8281 74.4063,44.8281 Q75.1094,44.8281 75.75,44.9844 Q76.4063,45.1406 76.9688,45.4375 L76.9688,48.1563 Q76.3438,47.5781 75.75,47.3125 Q75.1563,47.0313 74.5313,47.0313 Q73.1875,47.0313 72.5,48.1094 Q71.8125,49.1719 71.8125,51.2656 Q71.8125,53.3594 72.5,54.4375 Q73.1875,55.5 74.5313,55.5 Q75.1563,55.5 75.75,55.2344 Q76.3438,54.9531 76.9688,54.375 L76.9688,57.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="88" y="55.6074">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="60" x2="98" y1="67.4531" y2="67.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="60" x2="98" y1="75.4531" y2="75.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="173.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv1h2ssejutal)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="173.4531"/>
       <ellipse cx="78" cy="189.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M80.9688,195.0938 Q80.3906,195.3906 79.75,195.5313 Q79.1094,195.6875 78.4063,195.6875 Q75.9063,195.6875 74.5781,194.0469 Q73.2656,192.3906 73.2656,189.2656 Q73.2656,186.1406 74.5781,184.4844 Q75.9063,182.8281 78.4063,182.8281 Q79.1094,182.8281 79.75,182.9844 Q80.4063,183.1406 80.9688,183.4375 L80.9688,186.1563 Q80.3438,185.5781 79.75,185.3125 Q79.1563,185.0313 78.5313,185.0313 Q77.1875,185.0313 76.5,186.1094 Q75.8125,187.1719 75.8125,189.2656 Q75.8125,191.3594 76.5,192.4375 Q77.1875,193.5 78.5313,193.5 Q79.1563,193.5 79.75,193.2344 Q80.3438,192.9531 80.9688,192.375 L80.9688,195.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="92" y="193.6074">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="205.4531" y2="205.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="213.4531" y2="213.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="304.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv1h2ssejutal)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="304.9531"/>
       <ellipse cx="123.85" cy="320.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M126.8188,326.5938 Q126.2406,326.8906 125.6,327.0313 Q124.9594,327.1875 124.2563,327.1875 Q121.7563,327.1875 120.4281,325.5469 Q119.1156,323.8906 119.1156,320.7656 Q119.1156,317.6406 120.4281,315.9844 Q121.7563,314.3281 124.2563,314.3281 Q124.9594,314.3281 125.6,314.4844 Q126.2563,314.6406 126.8188,314.9375 L126.8188,317.6563 Q126.1938,317.0781 125.6,316.8125 Q125.0063,316.5313 124.3813,316.5313 Q123.0375,316.5313 122.35,317.6094 Q121.6625,318.6719 121.6625,320.7656 Q121.6625,322.8594 122.35,323.9375 Q123.0375,325 124.3813,325 Q125.0063,325 125.6,324.7344 Q126.1938,324.4531 126.8188,323.875 L126.8188,326.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="142.15" y="325.1074">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="336.9531" y2="336.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="344.9531" y2="344.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="350.9531"/>
       <ellipse cx="100.5" cy="355.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="109.5" y="359.1636">akind : AKind</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="363.7578"/>
       <ellipse cx="100.5" cy="368.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="109.5" y="371.9683">bb : BB *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="160" y="166.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv1h2ssejutal)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="160" y="166.9531"/>
       <ellipse cx="197.5" cy="182.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.4688,188.5938 Q199.8906,188.8906 199.25,189.0313 Q198.6094,189.1875 197.9063,189.1875 Q195.4063,189.1875 194.0781,187.5469 Q192.7656,185.8906 192.7656,182.7656 Q192.7656,179.6406 194.0781,177.9844 Q195.4063,176.3281 197.9063,176.3281 Q198.6094,176.3281 199.25,176.4844 Q199.9063,176.6406 200.4688,176.9375 L200.4688,179.6563 Q199.8438,179.0781 199.25,178.8125 Q198.6563,178.5313 198.0313,178.5313 Q196.6875,178.5313 196,179.6094 Q195.3125,180.6719 195.3125,182.7656 Q195.3125,184.8594 196,185.9375 Q196.6875,187 198.0313,187 Q198.6563,187 199.25,186.7344 Q199.8438,186.4531 200.4688,185.875 L200.4688,188.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="216.5" y="187.1074">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="249" y1="198.9531" y2="198.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="249" y1="206.9531" y2="206.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="212.9531"/>
       <ellipse cx="171" cy="217.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="64" x="180" y="221.1636">aaa : AAA *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L28" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L28" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3k7smt3p4br)" height="60.8047" id="C_0001168375787542426694" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="134" y="28.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L28" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L28" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv1h2ssejutal)" height="60.8047" id="C_0001168375787542426694" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="134" y="28.9531"/>
       <ellipse cx="199.75" cy="44.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M202.7188,50.5938 Q202.1406,50.8906 201.5,51.0313 Q200.8594,51.1875 200.1563,51.1875 Q197.6563,51.1875 196.3281,49.5469 Q195.0156,47.8906 195.0156,44.7656 Q195.0156,41.6406 196.3281,39.9844 Q197.6563,38.3281 200.1563,38.3281 Q200.8594,38.3281 201.5,38.4844 Q202.1563,38.6406 202.7188,38.9375 L202.7188,41.6563 Q202.0938,41.0781 201.5,40.8125 Q200.9063,40.5313 200.2813,40.5313 Q198.9375,40.5313 198.25,41.6094 Q197.5625,42.6719 197.5625,44.7656 Q197.5625,46.8594 198.25,47.9375 Q198.9375,49 200.2813,49 Q200.9063,49 201.5,48.7344 Q202.0938,48.4531 202.7188,47.875 L202.7188,50.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="220.25" y="49.1074">RR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="289" y1="60.9531" y2="60.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="289" y1="68.9531" y2="68.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="140" y="74.9531"/>
       <ellipse cx="145" cy="79.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="154" y="83.1636">r : std::shared_ptr&lt;R&gt;</text>
     </a>
     <path d="M72,542.9131 C72,567.8431 72,598.2831 72,618.7731 " fill="none" id="C_0001427649116338755656&lt;-C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00068_r2_class_mermaid.svg b/docs/test_cases/t00068_r2_class_mermaid.svg
index ec5f8eb8..f1cc8267 100644
--- a/docs/test_cases/t00068_r2_class_mermaid.svg
+++ b/docs/test_cases/t00068_r2_class_mermaid.svg
@@ -135,7 +135,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.875, 712.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L7">
+        <a transform="translate(82.875, 712.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L7">
           <g title="B" id="classId-C_0000359183874441719256-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -154,7 +154,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(82.875, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L9">
+        <a transform="translate(82.875, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L9">
           <g title="BB" id="classId-C_0001427649116338755656-1" class="node default clickable">
             <rect height="79" width="149.75" y="-39.5" x="-74.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -178,7 +178,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.625, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L13">
+        <a transform="translate(268.625, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L13">
           <g title="AKind" id="classId-C_0001888428536574868284-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -212,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.11328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L15">
+        <a transform="translate(99.11328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L15">
           <g title="A" id="classId-C_0001297439817144700057-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -231,7 +231,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.11328125, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L17">
+        <a transform="translate(99.11328125, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L17">
           <g title="AA" id="classId-C_0000577981285610429577-4" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -250,7 +250,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.75, 352.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L19">
+        <a transform="translate(175.75, 352.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-5" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -279,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(252.38671875, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L24">
+        <a transform="translate(252.38671875, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L24">
           <g title="R" id="classId-C_0000999621481464424961-6" class="node default clickable">
             <rect height="79" width="95.796875" y="-39.5" x="-47.8984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="47.8984375" x1="-47.8984375" class="divider"/>
@@ -303,7 +303,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(252.38671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00068/t00068.cc#L28">
+        <a transform="translate(252.38671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00068/t00068.cc#L28">
           <g title="RR" id="classId-C_0001168375787542426694-7" class="node default clickable">
             <rect height="79" width="179.984375" y="-39.5" x="-89.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="89.9921875" x1="-89.9921875" class="divider"/>
diff --git a/docs/test_cases/t00069_class.svg b/docs/test_cases/t00069_class.svg
index c5fbb07a..de782f10 100644
--- a/docs/test_cases/t00069_class.svg
+++ b/docs/test_cases/t00069_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="474px" preserveAspectRatio="none" style="width:760px;height:474px;" version="1.1" viewBox="0 0 760 474" width="760px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f195ry649pk535" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f12ffnaf1dawwd" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f195ry649pk535)" height="99.2188" id="C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="319" y="364"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ffnaf1dawwd)" height="99.2188" id="C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="319" y="364"/>
       <ellipse cx="379.75" cy="380" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M382.7188,385.6406 Q382.1406,385.9375 381.5,386.0781 Q380.8594,386.2344 380.1563,386.2344 Q377.6563,386.2344 376.3281,384.5938 Q375.0156,382.9375 375.0156,379.8125 Q375.0156,376.6875 376.3281,375.0313 Q377.6563,373.375 380.1563,373.375 Q380.8594,373.375 381.5,373.5313 Q382.1563,373.6875 382.7188,373.9844 L382.7188,376.7031 Q382.0938,376.125 381.5,375.8594 Q380.9063,375.5781 380.2813,375.5781 Q378.9375,375.5781 378.25,376.6563 Q377.5625,377.7188 377.5625,379.8125 Q377.5625,381.9063 378.25,382.9844 Q378.9375,384.0469 380.2813,384.0469 Q380.9063,384.0469 381.5,383.7813 Q382.0938,383.5 382.7188,382.9219 L382.7188,385.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="400.25" y="384.1543">generator</text>
@@ -18,96 +18,96 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="518" y="373.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="320" x2="522" y1="396" y2="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="402"/>
       <ellipse cx="330" cy="407" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="178" x="339" y="410.2104">generator(handle_type h) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="414.8047"/>
       <ellipse cx="330" cy="419.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="339" y="423.0151">~generator() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="320" x2="522" y1="429.6094" y2="429.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="435.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="327" y="437.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="59" x="339" y="443.8198">full_ : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="448.4141"/>
       <ellipse cx="330" cy="453.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="339" y="456.6245">h_ : handle_type</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L18" target="_top" title="generator##promise_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L18" xlink:show="new" xlink:title="generator##promise_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f195ry649pk535)" height="150.4375" id="C_0000721812727497968117" style="stroke: #A80036; stroke-width: 1.5;" width="468" x="6" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L18" target="_top" title="generator##promise_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L18" xlink:show="new" xlink:title="generator##promise_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ffnaf1dawwd)" height="150.4375" id="C_0000721812727497968117" style="stroke: #A80036; stroke-width: 1.5;" width="468" x="6" y="154"/>
       <ellipse cx="158.75" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M161.7188,175.6406 Q161.1406,175.9375 160.5,176.0781 Q159.8594,176.2344 159.1563,176.2344 Q156.6563,176.2344 155.3281,174.5938 Q154.0156,172.9375 154.0156,169.8125 Q154.0156,166.6875 155.3281,165.0313 Q156.6563,163.375 159.1563,163.375 Q159.8594,163.375 160.5,163.5313 Q161.1563,163.6875 161.7188,163.9844 L161.7188,166.7031 Q161.0938,166.125 160.5,165.8594 Q159.9063,165.5781 159.2813,165.5781 Q157.9375,165.5781 157.25,166.6563 Q156.5625,167.7188 156.5625,169.8125 Q156.5625,171.9063 157.25,172.9844 Q157.9375,174.0469 159.2813,174.0469 Q159.9063,174.0469 160.5,173.7813 Q161.0938,173.5 161.7188,172.9219 L161.7188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="154" x="179.25" y="174.1543">generator::promise_type</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="473" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="192"/>
       <ellipse cx="17" cy="197" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="274" x="26" y="200.2104">final_suspend() noexcept : std::suspend_always</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="204.8047"/>
       <ellipse cx="17" cy="209.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="200" x="26" y="213.0151">get_return_object() : generator&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="217.6094"/>
       <ellipse cx="17" cy="222.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="26" y="225.8198">initial_suspend() : std::suspend_always</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="230.4141"/>
       <ellipse cx="17" cy="235.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="26" y="238.6245">return_void() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="243.2188"/>
       <ellipse cx="17" cy="248.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="26" y="251.4292">unhandled_exception() : void</text>
     </a>
     <ellipse cx="17" cy="261.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="442" x="26" y="264.2339">yield_value&lt;std::convertible_to From&gt;(From &amp;&amp; from) : std::suspend_always</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="473" y1="270.8281" y2="270.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="276.8281"/>
       <ellipse cx="17" cy="281.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="174" x="26" y="285.0386">exception_ : std::exception_ptr</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="289.6328"/>
       <ellipse cx="17" cy="294.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="297.8433">value_ : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f195ry649pk535)" height="48" id="C_0001604358347140526608" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="509.5" y="205"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ffnaf1dawwd)" height="48" id="C_0001604358347140526608" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="509.5" y="205"/>
       <ellipse cx="524.5" cy="221" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.4688,226.6406 Q526.8906,226.9375 526.25,227.0781 Q525.6094,227.2344 524.9063,227.2344 Q522.4063,227.2344 521.0781,225.5938 Q519.7656,223.9375 519.7656,220.8125 Q519.7656,217.6875 521.0781,216.0313 Q522.4063,214.375 524.9063,214.375 Q525.6094,214.375 526.25,214.5313 Q526.9063,214.6875 527.4688,214.9844 L527.4688,217.7031 Q526.8438,217.125 526.25,216.8594 Q525.6563,216.5781 525.0313,216.5781 Q523.6875,216.5781 523,217.6563 Q522.3125,218.7188 522.3125,220.8125 Q522.3125,222.9063 523,223.9844 Q523.6875,225.0469 525.0313,225.0469 Q525.6563,225.0469 526.25,224.7813 Q526.8438,224.5 527.4688,223.9219 L527.4688,226.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="538.5" y="225.1543">generator</text>
@@ -116,33 +116,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="695.5" y1="237" y2="237"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="695.5" y1="245" y2="245"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L48" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L48" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f195ry649pk535)" height="86.4141" id="C_0002160142503252767290" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="456.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L48" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L48" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ffnaf1dawwd)" height="86.4141" id="C_0002160142503252767290" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="456.5" y="8"/>
       <ellipse cx="594.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.7188,29.6406 Q597.1406,29.9375 596.5,30.0781 Q595.8594,30.2344 595.1563,30.2344 Q592.6563,30.2344 591.3281,28.5938 Q590.0156,26.9375 590.0156,23.8125 Q590.0156,20.6875 591.3281,19.0313 Q592.6563,17.375 595.1563,17.375 Q595.8594,17.375 596.5,17.5313 Q597.1563,17.6875 597.7188,17.9844 L597.7188,20.7031 Q597.0938,20.125 596.5,19.8594 Q595.9063,19.5781 595.2813,19.5781 Q593.9375,19.5781 593.25,20.6563 Q592.5625,21.7188 592.5625,23.8125 Q592.5625,25.9063 593.25,26.9844 Q593.9375,28.0469 595.2813,28.0469 Q595.9063,28.0469 596.5,27.7813 Q597.0938,27.5 597.7188,26.9219 L597.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="615.25" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="457.5" x2="748.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="46"/>
       <ellipse cx="467.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="260" x="476.5" y="54.2104">iota() [coroutine] : generator&lt;unsigned long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="58.8047"/>
       <ellipse cx="467.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="267" x="476.5" y="67.0151">seed() [coroutine] : generator&lt;unsigned long&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="457.5" x2="748.5" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="464.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="476.5" y="87.8198">counter_ : unsigned long</text>
     </a>
     <path d="M313.62,304.23 C329.69,320.43 346.49,337.37 361.9,352.91 " fill="none" id="C_0000721812727497968117-&gt;C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00069_class_mermaid.svg b/docs/test_cases/t00069_class_mermaid.svg
index adf70563..83412602 100644
--- a/docs/test_cases/t00069_class_mermaid.svg
+++ b/docs/test_cases/t00069_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(196.2421875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7">
+        <a transform="translate(196.2421875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L7">
           <g title="generator" id="classId-C_0002142496233889685657-0" class="node default clickable">
             <rect height="145" width="246.71875" y="-72.5" x="-123.359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="123.359375" x1="-123.359375" class="divider"/>
@@ -129,7 +129,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(196.2421875, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L18">
+        <a transform="translate(196.2421875, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L18">
           <g title="generator##promise_type" id="classId-C_0000721812727497968117-1" class="node default clickable">
             <rect height="233" width="376.484375" y="-116.5" x="-188.2421875" class="outer title-state"/>
             <line y2="-86.5" y1="-86.5" x2="188.2421875" x1="-188.2421875" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(196.2421875, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L7">
+        <a transform="translate(196.2421875, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L7">
           <g title="generator" id="classId-C_0001604358347140526608-2" class="node default clickable">
             <rect height="57" width="216.8125" y="-28.5" x="-108.40625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="108.40625" x1="-108.40625" class="divider"/>
@@ -207,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(196.2421875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00069/t00069.cc#L48">
+        <a transform="translate(196.2421875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00069/t00069.cc#L48">
           <g title="A" id="classId-C_0002160142503252767290-3" class="node default clickable">
             <rect height="123" width="349.015625" y="-61.5" x="-174.5078125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="174.5078125" x1="-174.5078125" class="divider"/>
diff --git a/docs/test_cases/t00070_class.svg b/docs/test_cases/t00070_class.svg
index e565509b..c85df48d 100644
--- a/docs/test_cases/t00070_class.svg
+++ b/docs/test_cases/t00070_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:186px;height:213px;" version="1.1" viewBox="0 0 186 213" width="186px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1xdj2zc8no9nj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fepun9dgmpwzr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xdj2zc8no9nj)" height="48" id="C_0001364261599035905834" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="14" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fepun9dgmpwzr)" height="48" id="C_0001364261599035905834" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="14" y="14.5"/>
       <ellipse cx="29" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M31.9688,36.1406 Q31.3906,36.4375 30.75,36.5781 Q30.1094,36.7344 29.4063,36.7344 Q26.9063,36.7344 25.5781,35.0938 Q24.2656,33.4375 24.2656,30.3125 Q24.2656,27.1875 25.5781,25.5313 Q26.9063,23.875 29.4063,23.875 Q30.1094,23.875 30.75,24.0313 Q31.4063,24.1875 31.9688,24.4844 L31.9688,27.2031 Q31.3438,26.625 30.75,26.3594 Q30.1563,26.0781 29.5313,26.0781 Q28.1875,26.0781 27.5,27.1563 Q26.8125,28.2188 26.8125,30.3125 Q26.8125,32.4063 27.5,33.4844 Q28.1875,34.5469 29.5313,34.5469 Q30.1563,34.5469 30.75,34.2813 Q31.3438,34 31.9688,33.4219 L31.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="43" y="34.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="53" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="53" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xdj2zc8no9nj)" height="60.8047" id="C_0001485755083045282660" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="89.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fepun9dgmpwzr)" height="60.8047" id="C_0001485755083045282660" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="89.5" y="8"/>
       <ellipse cx="104.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.4688,29.6406 Q106.8906,29.9375 106.25,30.0781 Q105.6094,30.2344 104.9063,30.2344 Q102.4063,30.2344 101.0781,28.5938 Q99.7656,26.9375 99.7656,23.8125 Q99.7656,20.6875 101.0781,19.0313 Q102.4063,17.375 104.9063,17.375 Q105.6094,17.375 106.25,17.5313 Q106.9063,17.6875 107.4688,17.9844 L107.4688,20.7031 Q106.8438,20.125 106.25,19.8594 Q105.6563,19.5781 105.0313,19.5781 Q103.6875,19.5781 103,20.6563 Q102.3125,21.7188 102.3125,23.8125 Q102.3125,25.9063 103,26.9844 Q103.6875,28.0469 105.0313,28.0469 Q105.6563,28.0469 106.25,27.7813 Q106.8438,27.5 107.4688,26.9219 L107.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="118.5" y="28.1543">BB</text>
@@ -27,15 +27,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="147.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="147.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="97.5" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="109.5" y="62.2104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L10" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L10" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xdj2zc8no9nj)" height="73.6094" id="C_0001734694076622541097" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="6" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L10" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L10" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fepun9dgmpwzr)" height="73.6094" id="C_0001734694076622541097" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="6" y="129"/>
       <ellipse cx="21" cy="145" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M25.1094,151 L17.3906,151 L17.3906,138.6094 L25.1094,138.6094 L25.1094,140.7656 L19.8438,140.7656 L19.8438,143.4375 L24.6094,143.4375 L24.6094,145.5938 L19.8438,145.5938 L19.8438,148.8438 L25.1094,148.8438 L25.1094,151 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="35" y="149.1543">BBB</text>
@@ -44,26 +44,26 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="12" y="188.0151">bbb2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="61" y1="194.6094" y2="194.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xdj2zc8no9nj)" height="73.6094" id="C_0000668221430913861424" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="97" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fepun9dgmpwzr)" height="73.6094" id="C_0000668221430913861424" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="97" y="129"/>
       <ellipse cx="129.1" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M132.0688,150.6406 Q131.4906,150.9375 130.85,151.0781 Q130.2094,151.2344 129.5063,151.2344 Q127.0063,151.2344 125.6781,149.5938 Q124.3656,147.9375 124.3656,144.8125 Q124.3656,141.6875 125.6781,140.0313 Q127.0063,138.375 129.5063,138.375 Q130.2094,138.375 130.85,138.5313 Q131.5063,138.6875 132.0688,138.9844 L132.0688,141.7031 Q131.4438,141.125 130.85,140.8594 Q130.2563,140.5781 129.6313,140.5781 Q128.2875,140.5781 127.6,141.6563 Q126.9125,142.7188 126.9125,144.8125 Q126.9125,146.9063 127.6,147.9844 Q128.2875,149.0469 129.6313,149.0469 Q130.2563,149.0469 130.85,148.7813 Q131.4438,148.5 132.0688,147.9219 L132.0688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="146.9" y="149.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="174" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="103" y="167"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="105" y="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="117" y="175.2104">get() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="174" y1="181.8047" y2="181.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="103" y="187.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="105" y="189.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="117" y="196.0151">a : int</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00070_class_mermaid.svg b/docs/test_cases/t00070_class_mermaid.svg
index 93b009ed..7b35254d 100644
--- a/docs/test_cases/t00070_class_mermaid.svg
+++ b/docs/test_cases/t00070_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L4">
+        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L4">
           <g title="B" id="classId-C_0001364261599035905834-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L6">
+        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L6">
           <g title="BB" id="classId-C_0001485755083045282660-1" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -95,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/lib1.cppm#L10">
+        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/lib1.cppm#L10">
           <g title="BBB" id="classId-C_0001734694076622541097-2" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -124,7 +124,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(414.625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00070/src/common.cppm#L6">
+        <a transform="translate(414.625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00070/src/common.cppm#L6">
           <g title="A" id="classId-C_0000668221430913861424-3" class="node default clickable">
             <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
diff --git a/docs/test_cases/t00071_class.svg b/docs/test_cases/t00071_class.svg
index 9437afb6..69fcdf67 100644
--- a/docs/test_cases/t00071_class.svg
+++ b/docs/test_cases/t00071_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1004px;height:402px;" version="1.1" viewBox="0 0 1004 402" width="1004px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1cavn93cid27x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1mzwan7qwo973" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="22,157,57,157,64,179.2969,982,179.2969,982,390,22,390,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1mzwan7qwo973)" points="22,157,57,157,64,179.2969,982,179.2969,982,390,22,390,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="179.2969" y2="179.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="171.9951">app</text>
-    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="135,200,169,200,176,222.2969,633,222.2969,633,366,135,366,135,200" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1mzwan7qwo973)" points="135,200,169,200,176,222.2969,633,222.2969,633,366,135,366,135,200" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="135" x2="176" y1="222.2969" y2="222.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="139" y="214.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="535,243,585,243,592,265.2969,609,265.2969,609,342,535,342,535,243" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1mzwan7qwo973)" points="535,243,585,243,592,265.2969,609,265.2969,609,342,535,342,535,243" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="535" x2="592" y1="265.2969" y2="265.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="539" y="257.9951">mod1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="439,243,489,243,496,265.2969,511,265.2969,511,342,439,342,439,243" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1mzwan7qwo973)" points="439,243,489,243,496,265.2969,511,265.2969,511,342,439,342,439,243" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="439" x2="496" y1="265.2969" y2="265.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="443" y="257.9951">mod2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1cavn93cid27x)" points="657,230,691,230,698,252.2969,958,252.2969,958,355,657,355,657,230" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1mzwan7qwo973)" points="657,230,691,230,698,252.2969,958,252.2969,958,355,657,355,657,230" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="657" x2="698" y1="252.2969" y2="252.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="661" y="244.9951">lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="73.6094" id="C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="73.6094" id="C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="265"/>
       <ellipse cx="70.1" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M73.0688,286.6406 Q72.4906,286.9375 71.85,287.0781 Q71.2094,287.2344 70.5063,287.2344 Q68.0063,287.2344 66.6781,285.5938 Q65.3656,283.9375 65.3656,280.8125 Q65.3656,277.6875 66.6781,276.0313 Q68.0063,274.375 70.5063,274.375 Q71.2094,274.375 71.85,274.5313 Q72.5063,274.6875 73.0688,274.9844 L73.0688,277.7031 Q72.4438,277.125 71.85,276.8594 Q71.2563,276.5781 70.6313,276.5781 Q69.2875,276.5781 68.6,277.6563 Q67.9125,278.7188 67.9125,280.8125 Q67.9125,282.9063 68.6,283.9844 Q69.2875,285.0469 70.6313,285.0469 Q71.2563,285.0469 71.85,284.7813 Q72.4438,284.5 73.0688,283.9219 L73.0688,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="87.9" y="285.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="303"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="58" y="311.2104">get() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="317.8047" y2="317.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="323.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="325.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="58" y="332.0151">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="48" id="C_0001319862510251967999" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="380" y="278"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="48" id="C_0001319862510251967999" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="380" y="278"/>
       <ellipse cx="395" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M397.9688,299.6406 Q397.3906,299.9375 396.75,300.0781 Q396.1094,300.2344 395.4063,300.2344 Q392.9063,300.2344 391.5781,298.5938 Q390.2656,296.9375 390.2656,293.8125 Q390.2656,290.6875 391.5781,289.0313 Q392.9063,287.375 395.4063,287.375 Q396.1094,287.375 396.75,287.5313 Q397.4063,287.6875 397.9688,287.9844 L397.9688,290.7031 Q397.3438,290.125 396.75,289.8594 Q396.1563,289.5781 395.5313,289.5781 Q394.1875,289.5781 393.5,290.6563 Q392.8125,291.7188 392.8125,293.8125 Q392.8125,295.9063 393.5,296.9844 Q394.1875,298.0469 395.5313,298.0469 Q396.1563,298.0469 396.75,297.7813 Q397.3438,297.5 397.9688,296.9219 L397.9688,299.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="409" y="298.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="381" x2="419" y1="310" y2="310"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="381" x2="419" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="60.8047" id="C_0000569632796637866961" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="285.5" y="271.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="60.8047" id="C_0000569632796637866961" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="285.5" y="271.5"/>
       <ellipse cx="300.5" cy="287.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M303.4688,293.1406 Q302.8906,293.4375 302.25,293.5781 Q301.6094,293.7344 300.9063,293.7344 Q298.4063,293.7344 297.0781,292.0938 Q295.7656,290.4375 295.7656,287.3125 Q295.7656,284.1875 297.0781,282.5313 Q298.4063,280.875 300.9063,280.875 Q301.6094,280.875 302.25,281.0313 Q302.9063,281.1875 303.4688,281.4844 L303.4688,284.2031 Q302.8438,283.625 302.25,283.3594 Q301.6563,283.0781 301.0313,283.0781 Q299.6875,283.0781 299,284.1563 Q298.3125,285.2188 298.3125,287.3125 Q298.3125,289.4063 299,290.4844 Q299.6875,291.5469 301.0313,291.5469 Q301.6563,291.5469 302.25,291.2813 Q302.8438,291 303.4688,290.4219 L303.4688,293.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="314.5" y="291.6543">BB</text>
@@ -64,15 +64,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="286.5" x2="343.5" y1="303.5" y2="303.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="286.5" x2="343.5" y1="311.5" y2="311.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="291.5" y="317.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="293.5" y="319.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="305.5" y="325.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="73.6094" id="C_0001625078061541942293" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="151.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="73.6094" id="C_0001625078061541942293" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="151.5" y="265"/>
       <ellipse cx="166.5" cy="281" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M170.6094,287 L162.8906,287 L162.8906,274.6094 L170.6094,274.6094 L170.6094,276.7656 L165.3438,276.7656 L165.3438,279.4375 L170.1094,279.4375 L170.1094,281.5938 L165.3438,281.5938 L165.3438,284.8438 L170.6094,284.8438 L170.6094,287 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="180.5" y="285.1543">detail::BBB</text>
@@ -81,32 +81,32 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="157.5" y="324.0151">bbb2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="330.6094" y2="330.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="48" id="C_0001168777064323042894" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="551.5" y="278"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="48" id="C_0001168777064323042894" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="551.5" y="278"/>
       <ellipse cx="566.5" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M569.4688,299.6406 Q568.8906,299.9375 568.25,300.0781 Q567.6094,300.2344 566.9063,300.2344 Q564.4063,300.2344 563.0781,298.5938 Q561.7656,296.9375 561.7656,293.8125 Q561.7656,290.6875 563.0781,289.0313 Q564.4063,287.375 566.9063,287.375 Q567.6094,287.375 568.25,287.5313 Q568.9063,287.6875 569.4688,287.9844 L569.4688,290.7031 Q568.8438,290.125 568.25,289.8594 Q567.6563,289.5781 567.0313,289.5781 Q565.6875,289.5781 565,290.6563 Q564.3125,291.7188 564.3125,293.8125 Q564.3125,295.9063 565,296.9844 Q565.6875,298.0469 567.0313,298.0469 Q567.6563,298.0469 568.25,297.7813 Q568.8438,297.5 569.4688,296.9219 L569.4688,299.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="580.5" y="298.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="591.5" y1="310" y2="310"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="591.5" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="48" id="C_0001302694761523535504" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="455" y="278"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="48" id="C_0001302694761523535504" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="455" y="278"/>
       <ellipse cx="470" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M472.9688,299.6406 Q472.3906,299.9375 471.75,300.0781 Q471.1094,300.2344 470.4063,300.2344 Q467.9063,300.2344 466.5781,298.5938 Q465.2656,296.9375 465.2656,293.8125 Q465.2656,290.6875 466.5781,289.0313 Q467.9063,287.375 470.4063,287.375 Q471.1094,287.375 471.75,287.5313 Q472.4063,287.6875 472.9688,287.9844 L472.9688,290.7031 Q472.3438,290.125 471.75,289.8594 Q471.1563,289.5781 470.5313,289.5781 Q469.1875,289.5781 468.5,290.6563 Q467.8125,291.7188 467.8125,293.8125 Q467.8125,295.9063 468.5,296.9844 Q469.1875,298.0469 470.5313,298.0469 Q471.1563,298.0469 471.75,297.7813 Q472.3438,297.5 472.9688,296.9219 L472.9688,299.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="484" y="298.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="456" x2="494" y1="310" y2="310"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="456" x2="494" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="48" id="C_0001697463991772603674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="902" y="278"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="48" id="C_0001697463991772603674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="902" y="278"/>
       <ellipse cx="917" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M919.9688,299.6406 Q919.3906,299.9375 918.75,300.0781 Q918.1094,300.2344 917.4063,300.2344 Q914.9063,300.2344 913.5781,298.5938 Q912.2656,296.9375 912.2656,293.8125 Q912.2656,290.6875 913.5781,289.0313 Q914.9063,287.375 917.4063,287.375 Q918.1094,287.375 918.75,287.5313 Q919.4063,287.6875 919.9688,287.9844 L919.9688,290.7031 Q919.3438,290.125 918.75,289.8594 Q918.1563,289.5781 917.5313,289.5781 Q916.1875,289.5781 915.5,290.6563 Q914.8125,291.7188 914.8125,293.8125 Q914.8125,295.9063 915.5,296.9844 Q916.1875,298.0469 917.5313,298.0469 Q918.1563,298.0469 918.75,297.7813 Q919.3438,297.5 919.9688,296.9219 L919.9688,299.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="931" y="298.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="903" x2="941" y1="310" y2="310"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="903" x2="941" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="60.8047" id="C_0001911193033649971391" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="807.5" y="271.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="60.8047" id="C_0001911193033649971391" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="807.5" y="271.5"/>
       <ellipse cx="822.5" cy="287.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M825.4688,293.1406 Q824.8906,293.4375 824.25,293.5781 Q823.6094,293.7344 822.9063,293.7344 Q820.4063,293.7344 819.0781,292.0938 Q817.7656,290.4375 817.7656,287.3125 Q817.7656,284.1875 819.0781,282.5313 Q820.4063,280.875 822.9063,280.875 Q823.6094,280.875 824.25,281.0313 Q824.9063,281.1875 825.4688,281.4844 L825.4688,284.2031 Q824.8438,283.625 824.25,283.3594 Q823.6563,283.0781 823.0313,283.0781 Q821.6875,283.0781 821,284.1563 Q820.3125,285.2188 820.3125,287.3125 Q820.3125,289.4063 821,290.4844 Q821.6875,291.5469 823.0313,291.5469 Q823.6563,291.5469 824.25,291.2813 Q824.8438,291 825.4688,290.4219 L825.4688,293.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="836.5" y="291.6543">CC</text>
@@ -115,15 +115,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808.5" x2="865.5" y1="303.5" y2="303.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808.5" x2="865.5" y1="311.5" y2="311.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="813.5" y="317.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="815.5" y="319.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="827.5" y="325.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="73.6094" id="C_0000931278702894205804" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="673.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="73.6094" id="C_0000931278702894205804" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="673.5" y="265"/>
       <ellipse cx="688.5" cy="281" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M692.6094,287 L684.8906,287 L684.8906,274.6094 L692.6094,274.6094 L692.6094,276.7656 L687.3438,276.7656 L687.3438,279.4375 L692.1094,279.4375 L692.1094,281.5938 L687.3438,281.5938 L687.3438,284.8438 L692.6094,284.8438 L692.6094,287 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="702.5" y="285.1543">detail::CCC</text>
@@ -132,33 +132,33 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="679.5" y="324.0151">ccc2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="771.5" y1="330.6094" y2="330.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cavn93cid27x)" height="86.4141" id="C_0001629943620359873327" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="368.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mzwan7qwo973)" height="86.4141" id="C_0001629943620359873327" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="368.5" y="8"/>
       <ellipse cx="393.85" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M396.8188,29.6406 Q396.2406,29.9375 395.6,30.0781 Q394.9594,30.2344 394.2563,30.2344 Q391.7563,30.2344 390.4281,28.5938 Q389.1156,26.9375 389.1156,23.8125 Q389.1156,20.6875 390.4281,19.0313 Q391.7563,17.375 394.2563,17.375 Q394.9594,17.375 395.6,17.5313 Q396.2563,17.6875 396.8188,17.9844 L396.8188,20.7031 Q396.1938,20.125 395.6,19.8594 Q395.0063,19.5781 394.3813,19.5781 Q393.0375,19.5781 392.35,20.6563 Q391.6625,21.7188 391.6625,23.8125 Q391.6625,25.9063 392.35,26.9844 Q393.0375,28.0469 394.3813,28.0469 Q395.0063,28.0469 395.6,27.7813 Q396.1938,27.5 396.8188,26.9219 L396.8188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="410.15" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="369.5" x2="430.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="369.5" x2="430.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="388.5" y="62.2104">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="388.5" y="75.0151">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="388.5" y="87.8198">c : C *</text>
     </a>
     <path d="M368.16,55.15 C313.35,62.21 200.75,84.15 135,149 C104.94,178.65 90.21,225.51 83.15,259.37 " fill="none" id="C_0001629943620359873327-&gt;C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00071_class_mermaid.svg b/docs/test_cases/t00071_class_mermaid.svg
index b93a0674..b7d1ff17 100644
--- a/docs/test_cases/t00071_class_mermaid.svg
+++ b/docs/test_cases/t00071_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(725.2265625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L4">
+        <a transform="translate(725.2265625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L4">
           <g title="B" id="classId-C_0001319862510251967999-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(41.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L6">
+        <a transform="translate(41.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L6">
           <g title="BB" id="classId-C_0000569632796637866961-1" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -133,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.453125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1.cppm#L11">
+        <a transform="translate(185.453125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1.cppm#L11">
           <g title="BBB" id="classId-C_0001625078061541942293-2" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -162,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(309.609375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod1.cppm#L4">
+        <a transform="translate(309.609375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1mod1.cppm#L4">
           <g title="D" id="classId-C_0001168777064323042894-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -181,7 +181,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(385.7265625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib1mod2.cppm#L4">
+        <a transform="translate(385.7265625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib1mod2.cppm#L4">
           <g title="E" id="classId-C_0001302694761523535504-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -200,7 +200,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.7890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L4">
+        <a transform="translate(801.7890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L4">
           <g title="C" id="classId-C_0001697463991772603674-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -219,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(481.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L6">
+        <a transform="translate(481.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L6">
           <g title="CC" id="classId-C_0001911193033649971391-6" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(626.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/lib2.cppm#L11">
+        <a transform="translate(626.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/lib2.cppm#L11">
           <g title="CCC" id="classId-C_0000931278702894205804-7" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -272,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(620.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/src/t00071_mod.cppm#L6">
+        <a transform="translate(620.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/src/t00071_mod.cppm#L6">
           <g title="A" id="classId-C_0002210005074053139118-8" class="node default clickable">
             <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
@@ -301,7 +301,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.5078125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00071/t00071.cc#L9">
+        <a transform="translate(763.5078125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00071/t00071.cc#L9">
           <g title="R" id="classId-C_0001629943620359873327-9" class="node default clickable">
             <rect height="123" width="53.234375" y="-61.5" x="-26.6171875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="26.6171875" x1="-26.6171875" class="divider"/>
diff --git a/docs/test_cases/t00072_class.svg b/docs/test_cases/t00072_class.svg
index 40154dc9..5bce9ae4 100644
--- a/docs/test_cases/t00072_class.svg
+++ b/docs/test_cases/t00072_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="392px" preserveAspectRatio="none" style="width:736px;height:392px;" version="1.1" viewBox="0 0 736 392" width="736px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ftd2fgpo1j0zm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fletn3oniv9pk" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="22,24,57,24,64,46.2969,714,46.2969,714,380,22,380,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fletn3oniv9pk)" points="22,24,57,24,64,46.2969,714,46.2969,714,380,22,380,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
-    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="326,67,366,67,373,89.2969,690,89.2969,690,356,326,356,326,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fletn3oniv9pk)" points="326,67,366,67,373,89.2969,690,89.2969,690,356,326,356,326,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="326" x2="373" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="330" y="81.9951">:lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="592,110,642,110,649,132.2969,666,132.2969,666,209,592,209,592,110" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fletn3oniv9pk)" points="592,110,642,110,649,132.2969,666,132.2969,666,209,592,209,592,110" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="592" x2="649" y1="132.2969" y2="132.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="596" y="124.9951">mod1</text>
-    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="496,110,546,110,553,132.2969,568,132.2969,568,209,496,209,496,110" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fletn3oniv9pk)" points="496,110,546,110,553,132.2969,568,132.2969,568,209,496,209,496,110" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="496" x2="553" y1="132.2969" y2="132.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="500" y="124.9951">mod2</text>
-    <polygon fill="#FFFFFF" filter="url(#ftd2fgpo1j0zm)" points="135,103.5,175,103.5,182,125.7969,302,125.7969,302,356,135,356,135,103.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fletn3oniv9pk)" points="135,103.5,175,103.5,182,125.7969,302,125.7969,302,356,135,356,135,103.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="135" x2="182" y1="125.7969" y2="125.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="139" y="118.4951">:lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="73.6094" id="C_0001552096180171121044" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="132"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="73.6094" id="C_0001552096180171121044" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="132"/>
       <ellipse cx="70.1" cy="148" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M73.0688,153.6406 Q72.4906,153.9375 71.85,154.0781 Q71.2094,154.2344 70.5063,154.2344 Q68.0063,154.2344 66.6781,152.5938 Q65.3656,150.9375 65.3656,147.8125 Q65.3656,144.6875 66.6781,143.0313 Q68.0063,141.375 70.5063,141.375 Q71.2094,141.375 71.85,141.5313 Q72.5063,141.6875 73.0688,141.9844 L73.0688,144.7031 Q72.4438,144.125 71.85,143.8594 Q71.2563,143.5781 70.6313,143.5781 Q69.2875,143.5781 68.6,144.6563 Q67.9125,145.7188 67.9125,147.8125 Q67.9125,149.9063 68.6,150.9844 Q69.2875,152.0469 70.6313,152.0469 Q71.2563,152.0469 71.85,151.7813 Q72.4438,151.5 73.0688,150.9219 L73.0688,153.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="87.9" y="152.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="164" y2="164"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="170"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="172"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="58" y="178.2104">get() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="184.8047" y2="184.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="190.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="192.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="58" y="199.0151">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="48" id="C_0001450150421445257774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="342" y="145"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="48" id="C_0001450150421445257774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="342" y="145"/>
       <ellipse cx="357" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M359.9688,166.6406 Q359.3906,166.9375 358.75,167.0781 Q358.1094,167.2344 357.4063,167.2344 Q354.9063,167.2344 353.5781,165.5938 Q352.2656,163.9375 352.2656,160.8125 Q352.2656,157.6875 353.5781,156.0313 Q354.9063,154.375 357.4063,154.375 Q358.1094,154.375 358.75,154.5313 Q359.4063,154.6875 359.9688,154.9844 L359.9688,157.7031 Q359.3438,157.125 358.75,156.8594 Q358.1563,156.5781 357.5313,156.5781 Q356.1875,156.5781 355.5,157.6563 Q354.8125,158.7188 354.8125,160.8125 Q354.8125,162.9063 355.5,163.9844 Q356.1875,165.0469 357.5313,165.0469 Q358.1563,165.0469 358.75,164.7813 Q359.3438,164.5 359.9688,163.9219 L359.9688,166.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="371" y="165.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="343" x2="381" y1="177" y2="177"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="343" x2="381" y1="185" y2="185"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="60.8047" id="C_0000744925471008373109" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="417.5" y="138.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="60.8047" id="C_0000744925471008373109" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="417.5" y="138.5"/>
       <ellipse cx="432.5" cy="154.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M435.4688,160.1406 Q434.8906,160.4375 434.25,160.5781 Q433.6094,160.7344 432.9063,160.7344 Q430.4063,160.7344 429.0781,159.0938 Q427.7656,157.4375 427.7656,154.3125 Q427.7656,151.1875 429.0781,149.5313 Q430.4063,147.875 432.9063,147.875 Q433.6094,147.875 434.25,148.0313 Q434.9063,148.1875 435.4688,148.4844 L435.4688,151.2031 Q434.8438,150.625 434.25,150.3594 Q433.6563,150.0781 433.0313,150.0781 Q431.6875,150.0781 431,151.1563 Q430.3125,152.2188 430.3125,154.3125 Q430.3125,156.4063 431,157.4844 Q431.6875,158.5469 433.0313,158.5469 Q433.6563,158.5469 434.25,158.2813 Q434.8438,158 435.4688,157.4219 L435.4688,160.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="446.5" y="158.6543">BB</text>
@@ -64,15 +64,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="418.5" x2="475.5" y1="170.5" y2="170.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="418.5" x2="475.5" y1="178.5" y2="178.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="423.5" y="184.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="425.5" y="186.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="437.5" y="192.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="73.6094" id="C_0000610293402618118513" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="342.5" y="266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="73.6094" id="C_0000610293402618118513" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="342.5" y="266"/>
       <ellipse cx="357.5" cy="282" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.6094,288 L353.8906,288 L353.8906,275.6094 L361.6094,275.6094 L361.6094,277.7656 L356.3438,277.7656 L356.3438,280.4375 L361.1094,280.4375 L361.1094,282.5938 L356.3438,282.5938 L356.3438,285.8438 L361.6094,285.8438 L361.6094,288 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="371.5" y="286.1543">detail::BBB</text>
@@ -81,32 +81,32 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="348.5" y="325.0151">bbb2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="343.5" x2="440.5" y1="331.6094" y2="331.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="48" id="C_0000516204432765266678" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="608.5" y="145"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="48" id="C_0000516204432765266678" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="608.5" y="145"/>
       <ellipse cx="623.5" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M626.4688,166.6406 Q625.8906,166.9375 625.25,167.0781 Q624.6094,167.2344 623.9063,167.2344 Q621.4063,167.2344 620.0781,165.5938 Q618.7656,163.9375 618.7656,160.8125 Q618.7656,157.6875 620.0781,156.0313 Q621.4063,154.375 623.9063,154.375 Q624.6094,154.375 625.25,154.5313 Q625.9063,154.6875 626.4688,154.9844 L626.4688,157.7031 Q625.8438,157.125 625.25,156.8594 Q624.6563,156.5781 624.0313,156.5781 Q622.6875,156.5781 622,157.6563 Q621.3125,158.7188 621.3125,160.8125 Q621.3125,162.9063 622,163.9844 Q622.6875,165.0469 624.0313,165.0469 Q624.6563,165.0469 625.25,164.7813 Q625.8438,164.5 626.4688,163.9219 L626.4688,166.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="637.5" y="165.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="609.5" x2="648.5" y1="177" y2="177"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="609.5" x2="648.5" y1="185" y2="185"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="48" id="C_0000347204883768272660" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="512" y="145"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="48" id="C_0000347204883768272660" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="512" y="145"/>
       <ellipse cx="527" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M529.9688,166.6406 Q529.3906,166.9375 528.75,167.0781 Q528.1094,167.2344 527.4063,167.2344 Q524.9063,167.2344 523.5781,165.5938 Q522.2656,163.9375 522.2656,160.8125 Q522.2656,157.6875 523.5781,156.0313 Q524.9063,154.375 527.4063,154.375 Q528.1094,154.375 528.75,154.5313 Q529.4063,154.6875 529.9688,154.9844 L529.9688,157.7031 Q529.3438,157.125 528.75,156.8594 Q528.1563,156.5781 527.5313,156.5781 Q526.1875,156.5781 525.5,157.6563 Q524.8125,158.7188 524.8125,160.8125 Q524.8125,162.9063 525.5,163.9844 Q526.1875,165.0469 527.5313,165.0469 Q528.1563,165.0469 528.75,164.7813 Q529.3438,164.5 529.9688,163.9219 L529.9688,166.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="541" y="165.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="513" x2="551" y1="177" y2="177"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="513" x2="551" y1="185" y2="185"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="48" id="C_0001144612141363797057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="151" y="145"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="48" id="C_0001144612141363797057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="151" y="145"/>
       <ellipse cx="166" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M168.9688,166.6406 Q168.3906,166.9375 167.75,167.0781 Q167.1094,167.2344 166.4063,167.2344 Q163.9063,167.2344 162.5781,165.5938 Q161.2656,163.9375 161.2656,160.8125 Q161.2656,157.6875 162.5781,156.0313 Q163.9063,154.375 166.4063,154.375 Q167.1094,154.375 167.75,154.5313 Q168.4063,154.6875 168.9688,154.9844 L168.9688,157.7031 Q168.3438,157.125 167.75,156.8594 Q167.1563,156.5781 166.5313,156.5781 Q165.1875,156.5781 164.5,157.6563 Q163.8125,158.7188 163.8125,160.8125 Q163.8125,162.9063 164.5,163.9844 Q165.1875,165.0469 166.5313,165.0469 Q167.1563,165.0469 167.75,164.7813 Q168.3438,164.5 168.9688,163.9219 L168.9688,166.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="180" y="165.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="190" y1="177" y2="177"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="190" y1="185" y2="185"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="60.8047" id="C_0001472938318775327089" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="226.5" y="138.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="60.8047" id="C_0001472938318775327089" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="226.5" y="138.5"/>
       <ellipse cx="241.5" cy="154.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M244.4688,160.1406 Q243.8906,160.4375 243.25,160.5781 Q242.6094,160.7344 241.9063,160.7344 Q239.4063,160.7344 238.0781,159.0938 Q236.7656,157.4375 236.7656,154.3125 Q236.7656,151.1875 238.0781,149.5313 Q239.4063,147.875 241.9063,147.875 Q242.6094,147.875 243.25,148.0313 Q243.9063,148.1875 244.4688,148.4844 L244.4688,151.2031 Q243.8438,150.625 243.25,150.3594 Q242.6563,150.0781 242.0313,150.0781 Q240.6875,150.0781 240,151.1563 Q239.3125,152.2188 239.3125,154.3125 Q239.3125,156.4063 240,157.4844 Q240.6875,158.5469 242.0313,158.5469 Q242.6563,158.5469 243.25,158.2813 Q243.8438,158 244.4688,157.4219 L244.4688,160.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="255.5" y="158.6543">CC</text>
@@ -115,15 +115,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="227.5" x2="284.5" y1="170.5" y2="170.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="227.5" x2="284.5" y1="178.5" y2="178.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="232.5" y="184.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="234.5" y="186.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="246.5" y="192.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftd2fgpo1j0zm)" height="73.6094" id="C_0000448885573685763285" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="151.5" y="266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fletn3oniv9pk)" height="73.6094" id="C_0000448885573685763285" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="151.5" y="266"/>
       <ellipse cx="166.5" cy="282" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M170.6094,288 L162.8906,288 L162.8906,275.6094 L170.6094,275.6094 L170.6094,277.7656 L165.3438,277.7656 L165.3438,280.4375 L170.1094,280.4375 L170.1094,282.5938 L165.3438,282.5938 L165.3438,285.8438 L170.6094,285.8438 L170.6094,288 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="180.5" y="286.1543">detail::CCC</text>
diff --git a/docs/test_cases/t00072_class_mermaid.svg b/docs/test_cases/t00072_class_mermaid.svg
index bf3d312e..b563d13c 100644
--- a/docs/test_cases/t00072_class_mermaid.svg
+++ b/docs/test_cases/t00072_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L4">
+        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L4">
           <g title="B" id="classId-C_0001450150421445257774-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L6">
+        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L6">
           <g title="BB" id="classId-C_0000744925471008373109-1" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -95,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1.cppm#L11">
+        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1.cppm#L11">
           <g title="BBB" id="classId-C_0000610293402618118513-2" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -124,7 +124,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.171875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod1.cppm#L4">
+        <a transform="translate(386.171875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1mod1.cppm#L4">
           <g title="D" id="classId-C_0000516204432765266678-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -143,7 +143,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(462.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib1mod2.cppm#L4">
+        <a transform="translate(462.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib1mod2.cppm#L4">
           <g title="E" id="classId-C_0000347204883768272660-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -162,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(538.40625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L4">
+        <a transform="translate(538.40625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L4">
           <g title="C" id="classId-C_0001144612141363797057-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -181,7 +181,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(634.9765625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L6">
+        <a transform="translate(634.9765625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L6">
           <g title="CC" id="classId-C_0001472938318775327089-6" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -205,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(779.140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/lib2.cppm#L11">
+        <a transform="translate(779.140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/lib2.cppm#L11">
           <g title="CCC" id="classId-C_0000448885573685763285-7" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(931.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t00072/src/t00072_mod.cppm#L8">
+        <a transform="translate(931.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t00072/src/t00072_mod.cppm#L8">
           <g title="A" id="classId-C_0001552096180171121044-8" class="node default clickable">
             <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg
index 2afc4173..27920143 100644
--- a/docs/test_cases/t20001_sequence.svg
+++ b/docs/test_cases/t20001_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="699px" preserveAspectRatio="none" style="width:341px;height:699px;" version="1.1" viewBox="0 0 341 699" width="341px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fegc0xa174elw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f17th6ctub8mh6" 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"/>
@@ -10,79 +10,79 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="293" x="24.5" y="26.708">Basic sequence diagram example</text>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="94" x2="94" y1="73.25" y2="658.7109"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="73.25" y2="658.7109"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="320" x2="320" y1="73.25" y2="658.7109"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="37.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17th6ctub8mh6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="37.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="68" y="57.9482">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="657.7109"/>
+      <rect fill="#FEFECE" filter="url(#f17th6ctub8mh6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="657.7109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="68" y="677.7061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="37.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17th6ctub8mh6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="37.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="57.9482">A</text>
-      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="657.7109"/>
+      <rect fill="#FEFECE" filter="url(#f17th6ctub8mh6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="657.7109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="677.7061">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="37.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17th6ctub8mh6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="37.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="313" y="57.9482">B</text>
-      <rect fill="#FEFECE" filter="url(#fegc0xa174elw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="657.7109"/>
+      <rect fill="#FEFECE" filter="url(#f17th6ctub8mh6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="657.7109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="313" y="677.7061">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
-    <rect fill="#FFFFFF" filter="url(#fegc0xa174elw)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f17th6ctub8mh6)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176,100.3828,186,104.3828,176,108.3828,180,104.3828" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="182" y1="104.3828" y2="104.3828"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="106" y="99.3169">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="303,159.5156,313,163.5156,303,167.5156,307,163.5156" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="309" y1="163.5156" y2="163.5156"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="106" y="158.4497">B(A &amp;)</text>
     </a>
-    <path d="M19,206.5156 L19,231.5156 L164,231.5156 L164,216.5156 L154,206.5156 L19,206.5156 " fill="#FBFB77" filter="url(#fegc0xa174elw)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M19,206.5156 L19,231.5156 L164,231.5156 L164,216.5156 L154,206.5156 L19,206.5156 " fill="#FBFB77" filter="url(#f17th6ctub8mh6)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M154,206.5156 L154,216.5156 L164,216.5156 L154,206.5156 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="124" x="25" y="223.5825">Just add 2 numbers</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176,257.7813,186,261.7813,176,265.7813,180,261.7813" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="182" y1="261.7813" y2="261.7813"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="106" y="256.7153">add(int,int)</text>
     </a>
     <polygon fill="#A80036" points="110,271.7813,100,275.7813,110,279.7813,106,275.7813" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="104" x2="192" y1="275.7813" y2="275.7813"/>
-    <path d="M8,288.7813 L8,313.7813 L177,313.7813 L177,298.7813 L167,288.7813 L8,288.7813 " fill="#FBFB77" filter="url(#fegc0xa174elw)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M8,288.7813 L8,313.7813 L177,313.7813 L177,298.7813 L167,288.7813 L8,288.7813 " fill="#FBFB77" filter="url(#f17th6ctub8mh6)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M167,288.7813 L167,298.7813 L177,298.7813 L167,288.7813 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="148" x="14" y="305.8481">And now add another 2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="303,340.0469,313,344.0469,303,348.0469,307,344.0469" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="309" y1="344.0469" y2="344.0469"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="106" y="338.981">wrap_add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209,369.1797,199,373.1797,209,377.1797,205,373.1797" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="314" y1="373.1797" y2="373.1797"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="215" y="368.1138">add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="198" x2="245" y1="397.3125" y2="397.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="245" y1="397.3125" y2="410.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204" x2="245" y1="410.3125" y2="410.3125"/>
@@ -93,7 +93,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="245" x2="245" y1="434.3125" y2="447.3125"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="198" x2="245" y1="447.3125" y2="447.3125"/>
     <polygon fill="#A80036" points="208,443.3125,198,447.3125,208,451.3125,204,447.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="245" y1="471.4453" y2="471.4453"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="245" y1="471.4453" y2="484.4453"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204" x2="245" y1="484.4453" y2="484.4453"/>
@@ -102,14 +102,14 @@
     </a>
     <polygon fill="#A80036" points="303,524.4453,313,528.4453,303,532.4453,307,528.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193" x2="309" y1="528.4453" y2="528.4453"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209,553.5781,199,557.5781,209,561.5781,205,557.5781" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="314" y1="557.5781" y2="557.5781"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="215" y="552.5122">log_result(int)</text>
     </a>
     <polygon fill="#A80036" points="105,597.5781,95,601.5781,105,605.5781,101,601.5781" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="99" x2="319" y1="601.5781" y2="601.5781"/>
-    <path d="M24,614.5781 L24,639.5781 L159,639.5781 L159,624.5781 L149,614.5781 L24,614.5781 " fill="#FBFB77" filter="url(#fegc0xa174elw)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M24,614.5781 L24,639.5781 L159,639.5781 L159,624.5781 L149,614.5781 L24,614.5781 " fill="#FBFB77" filter="url(#f17th6ctub8mh6)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M149,614.5781 L149,624.5781 L159,624.5781 L149,614.5781 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="30" y="631.645">Main test function</text>
   </g>
diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg
index 8d8ea9ab..9f418e6b 100644
--- a/docs/test_cases/t20002_sequence.svg
+++ b/docs/test_cases/t20002_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:245px;height:170px;" version="1.1" viewBox="0 0 245 170" width="245px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13li9123nhsut" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1rijm3x13d96j" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rijm3x13d96j)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rijm3x13d96j)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rijm3x13d96j)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rijm3x13d96j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="33" x2="33" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="93" x2="93" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="153" x2="153" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="213" x2="213" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rijm3x13d96j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="22.9951">m1()</text>
-      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1rijm3x13d96j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="149.292">m1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rijm3x13d96j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="22.9951">m2()</text>
-      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1rijm3x13d96j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="149.292">m2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rijm3x13d96j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="22.9951">m3()</text>
-      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1rijm3x13d96j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="149.292">m3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rijm3x13d96j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="22.9951">m4()</text>
-      <rect fill="#FEFECE" filter="url(#f13li9123nhsut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1rijm3x13d96j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="149.292">m4()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f13li9123nhsut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1rijm3x13d96j)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rijm3x13d96j)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rijm3x13d96j)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rijm3x13d96j)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="76,50.2969,86,54.2969,76,58.2969,80,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="82" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="136,64.2969,146,68.2969,136,72.2969,140,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="98" x2="142" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="196,78.2969,206,82.2969,196,86.2969,200,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="158" x2="202" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg
index 0ac9f853..140ece2a 100644
--- a/docs/test_cases/t20003_sequence.svg
+++ b/docs/test_cases/t20003_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:413px;height:170px;" version="1.1" viewBox="0 0 413 170" width="413px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fx3fhns3wg80c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15oogusutk2lq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15oogusutk2lq)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15oogusutk2lq)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15oogusutk2lq)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15oogusutk2lq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="54" x2="54" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="156" x2="156" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="258" x2="258" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="360" x2="360" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15oogusutk2lq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="22.9951">m1&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f15oogusutk2lq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="149.292">m1&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15oogusutk2lq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="22.9951">m2&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f15oogusutk2lq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="149.292">m2&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15oogusutk2lq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="22.9951">m3&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f15oogusutk2lq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="149.292">m3&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15oogusutk2lq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="22.9951">m4&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#fx3fhns3wg80c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f15oogusutk2lq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="149.292">m4&lt;T&gt;(T)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fx3fhns3wg80c)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f15oogusutk2lq)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15oogusutk2lq)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15oogusutk2lq)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f15oogusutk2lq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="139,50.2969,149,54.2969,139,58.2969,143,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="59" x2="145" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="241,64.2969,251,68.2969,241,72.2969,245,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="247" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="343,78.2969,353,82.2969,343,86.2969,347,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="263" x2="349" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg
index f43c2ef4..033f3952 100644
--- a/docs/test_cases/t20004_sequence.svg
+++ b/docs/test_cases/t20004_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="350px" preserveAspectRatio="none" style="width:1706px;height:350px;" version="1.1" viewBox="0 0 1706 350" width="1706px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7dg1s7t3ugty" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7za50dq9u7sg" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="38" x2="38" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="145" x2="145" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="357" x2="357" y1="38.2969" y2="310.2969"/>
@@ -29,87 +29,87 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1409" x2="1409" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1527" x2="1527" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1645" x2="1645" y1="38.2969" y2="310.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="22.9951">main()</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="329.292">main()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="22.9951">m1&lt;float&gt;(float)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="329.292">m1&lt;float&gt;(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="22.9951">m1&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="329.292">m1&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="22.9951">m4&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="329.292">m4&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="22.9951">m1&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="329.292">m1&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="22.9951">m2&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="329.292">m2&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="22.9951">m1&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="329.292">m1&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="22.9951">m2&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="329.292">m2&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="22.9951">m3&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="329.292">m3&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="22.9951">m4&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f7dg1s7t3ugty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f7za50dq9u7sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="329.292">m4&lt;int&gt;(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7dg1s7t3ugty)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7za50dq9u7sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="128,50.2969,138,54.2969,128,58.2969,132,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="134" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="54.5,64.2969,44.5,68.2969,54.5,72.2969,50.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="144" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="340,78.2969,350,82.2969,340,86.2969,344,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="346" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="622,92.2969,632,96.2969,622,100.2969,626,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="362" x2="628" y1="96.2969" y2="96.2969"/>
     </a>
@@ -117,11 +117,11 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="367" x2="638" y1="110.2969" y2="110.2969"/>
     <polygon fill="#A80036" points="54.5,120.2969,44.5,124.2969,54.5,128.2969,50.5,124.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="356" y1="124.2969" y2="124.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="876,134.2969,886,138.2969,876,142.2969,880,138.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="882" y1="138.2969" y2="138.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1102,148.2969,1112,152.2969,1102,156.2969,1106,152.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="898" x2="1108" y1="152.2969" y2="152.2969"/>
     </a>
@@ -129,19 +129,19 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="903" x2="1118" y1="166.2969" y2="166.2969"/>
     <polygon fill="#A80036" points="54.5,176.2969,44.5,180.2969,54.5,184.2969,50.5,180.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="892" y1="180.2969" y2="180.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1274,190.2969,1284,194.2969,1274,198.2969,1278,194.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="1280" y1="194.2969" y2="194.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1392,204.2969,1402,208.2969,1392,212.2969,1396,208.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1296" x2="1398" y1="208.2969" y2="208.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1510,218.2969,1520,222.2969,1510,226.2969,1514,222.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1414" x2="1516" y1="222.2969" y2="222.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1628,232.2969,1638,236.2969,1628,240.2969,1632,236.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1532" x2="1634" y1="236.2969" y2="236.2969"/>
     </a>
diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg
index 89a435f3..a4f6829b 100644
--- a/docs/test_cases/t20005_sequence.svg
+++ b/docs/test_cases/t20005_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:229px;height:227px;" version="1.1" viewBox="0 0 229 227" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hwsv1mlulyhx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1dq0l92j7xguf" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1dq0l92j7xguf)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1dq0l92j7xguf)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1dq0l92j7xguf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="50.5" x2="50.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="121.5" x2="121.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dq0l92j7xguf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="22.9951">C&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1dq0l92j7xguf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="206.6904">C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dq0l92j7xguf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="22.9951">B&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1dq0l92j7xguf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="206.6904">B&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dq0l92j7xguf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="22.9951">A&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1hwsv1mlulyhx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1dq0l92j7xguf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="206.6904">A&lt;T&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1hwsv1mlulyhx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1dq0l92j7xguf)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1dq0l92j7xguf)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1dq0l92j7xguf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <polygon fill="#A80036" points="34,65.4297,44,69.4297,34,73.4297,38,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="40" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="10" y="64.3638">c(T)</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="105,94.5625,115,98.5625,105,102.5625,109,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="56" x2="111" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="63" y="93.4966">b(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175.5,123.6953,185.5,127.6953,175.5,131.6953,179.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="127" x2="181.5" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="134" y="122.6294">a(T)</text>
diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg
index 7c688f8f..012ee3f4 100644
--- a/docs/test_cases/t20006_sequence.svg
+++ b/docs/test_cases/t20006_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="872px" preserveAspectRatio="none" style="width:986px;height:872px;" version="1.1" viewBox="0 0 986 872" width="986px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1i1sk01hz21d1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1wpzov32sk8k3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,24 +9,24 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="832.5547"/>
@@ -36,84 +36,84 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="842" x2="842" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="940" x2="940" y1="38.2969" y2="832.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="851.5498">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="851.5498">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="851.5498">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="851.5498">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="851.5498">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="22.9951">BB&lt;int,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="851.5498">BB&lt;int,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="22.9951">BB&lt;int,float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="851.5498">BB&lt;int,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="22.9951">BB&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="851.5498">BB&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="22.9951">AA&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1i1sk01hz21d1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1wpzov32sk8k3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="851.5498">AA&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1i1sk01hz21d1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1wpzov32sk8k3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
@@ -122,12 +122,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="128.5" x2="196" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="117.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="285.5,151.6953,295.5,155.6953,285.5,159.6953,289.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="291.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="150.6294">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="418,180.8281,428,184.8281,418,188.8281,422,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="307.5" x2="424" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="314.5" y="179.7622">a2(std::string)</text>
@@ -136,69 +136,69 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="312.5" x2="434" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="301.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,237.9609,576,241.9609,566,245.9609,570,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="53" y="236.895">BB(AA&lt;int&gt; *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,297.0938,719,301.0938,709,305.0938,713,301.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="301.0938" y2="301.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="99" x="53" y="296.0278">BB(AA&lt;int&gt; &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="825,356.2266,835,360.2266,825,364.2266,829,360.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="360.2266" y2="360.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="355.1606">bb1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,385.3594,933.5,389.3594,923.5,393.3594,927.5,389.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="389.3594" y2="389.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="384.2935">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="825,444.4922,835,448.4922,825,452.4922,829,448.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="448.4922" y2="448.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="443.4263">bb2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,473.625,933.5,477.625,923.5,481.625,927.5,477.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="477.625" y2="477.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="472.5591">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,532.7578,576,536.7578,566,540.7578,570,536.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="536.7578" y2="536.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="531.6919">bb1(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,561.8906,933.5,565.8906,923.5,569.8906,927.5,565.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="565.8906" y2="565.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="560.8247">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,621.0234,576,625.0234,566,629.0234,570,625.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="625.0234" y2="625.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="619.9575">bb2(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,650.1563,933.5,654.1563,923.5,658.1563,927.5,654.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="654.1563" y2="654.1563"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="649.0903">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,709.2891,719,713.2891,709,717.2891,713,713.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="713.2891" y2="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="708.2231">bb1(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="731" x2="778" y1="737.4219" y2="737.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="778" x2="778" y1="737.4219" y2="750.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="737" x2="778" y1="750.4219" y2="750.4219"/>
       <polygon fill="#A80036" points="747,746.4219,737,750.4219,747,754.4219,743,750.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="743" y="732.356">bb2(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,780.5547,933.5,784.5547,923.5,788.5547,927.5,784.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="736" x2="929.5" y1="784.5547" y2="784.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="743" y="779.4888">aa2(int)</text>
diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg
index ac92f4dc..01ed1389 100644
--- a/docs/test_cases/t20007_sequence.svg
+++ b/docs/test_cases/t20007_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:768px;height:227px;" version="1.1" viewBox="0 0 768 227" width="768px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="foo45pt7fkqc7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1fqdnl5hfh2a3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,57 +9,57 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1fqdnl5hfh2a3)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1fqdnl5hfh2a3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1fqdnl5hfh2a3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1fqdnl5hfh2a3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191.5" x2="191.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="354.5" x2="354.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="609.5" x2="609.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fqdnl5hfh2a3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1fqdnl5hfh2a3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="206.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fqdnl5hfh2a3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="22.9951">Adder&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1fqdnl5hfh2a3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="206.6904">Adder&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fqdnl5hfh2a3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="22.9951">Adder&lt;int,float,double&gt;</text>
-      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1fqdnl5hfh2a3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="206.6904">Adder&lt;int,float,double&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fqdnl5hfh2a3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="22.9951">Adder&lt;std::string,std::string,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#foo45pt7fkqc7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1fqdnl5hfh2a3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="206.6904">Adder&lt;std::string,std::string,std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#foo45pt7fkqc7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1fqdnl5hfh2a3)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1fqdnl5hfh2a3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1fqdnl5hfh2a3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1fqdnl5hfh2a3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175,65.4297,185,69.4297,175,73.4297,179,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="181" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="53" y="64.3638">add(int &amp;&amp;,int &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="191" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="338,108.5625,348,112.5625,338,116.5625,342,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="344" y1="112.5625" y2="112.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="207" x="53" y="107.4966">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="354" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="592.5,151.6953,602.5,155.6953,592.5,159.6953,596.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="598.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="312" x="53" y="150.6294">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg
index 361541c7..1035c52b 100644
--- a/docs/test_cases/t20008_sequence.svg
+++ b/docs/test_cases/t20008_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:794px;height:363px;" version="1.1" viewBox="0 0 794 363" width="794px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnupw1sa9px5v" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fmzt2dy3h24aj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="454" x2="454" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="593" x2="593" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="22.9951">B&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="342.0889">B&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="22.9951">A&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="342.0889">A&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fnupw1sa9px5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fmzt2dy3h24aj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fnupw1sa9px5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fmzt2dy3h24aj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="292,153.6953,302,157.6953,292,161.6953,296,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="298" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="53" y="152.6294">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="437.5,182.8281,447.5,186.8281,437.5,190.8281,441.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="314" x2="443.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="321" y="181.7622">a2(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="576.5,241.9609,586.5,245.9609,576.5,249.9609,580.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="582.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="240.895">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,271.0938,719,275.0938,709,279.0938,713,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="598.5" x2="715" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="605.5" y="270.0278">a3(std::string)</text>
diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg
index 11a27c1c..63f63801 100644
--- a/docs/test_cases/t20009_sequence.svg
+++ b/docs/test_cases/t20009_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:690px;height:363px;" version="1.1" viewBox="0 0 690 363" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2f24llcwbacg" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fvdcwc71yj8am" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="284.5" x2="284.5" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="468.5" x2="468.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="552.5" x2="552.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="643.5" x2="643.5" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="22.9951">B&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="342.0889">B&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="22.9951">A&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f2f24llcwbacg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fvdcwc71yj8am)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="342.0889">A&lt;float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f2f24llcwbacg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fvdcwc71yj8am)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="135,65.4297,145,69.4297,135,73.4297,139,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="141" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="64.3638">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="267.5,94.5625,277.5,98.5625,267.5,102.5625,271.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="273.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164" y="93.4966">a(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="373,153.6953,383,157.6953,373,161.6953,377,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="379" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="152.6294">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="451.5,182.8281,461.5,186.8281,451.5,190.8281,455.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="395" x2="457.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="402" y="181.7622">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="536,241.9609,546,245.9609,536,249.9609,540,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="542" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="53" y="240.895">b(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="626.5,271.0938,636.5,275.0938,626.5,279.0938,630.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558" x2="632.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="565" y="270.0278">a(float)</text>
diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg
index 43dee0b8..3978e5c1 100644
--- a/docs/test_cases/t20010_sequence.svg
+++ b/docs/test_cases/t20010_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:197px;height:451px;" version="1.1" viewBox="0 0 197 451" width="197px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fjz4xx6uc632a" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fanm3aqe3hiqk" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,81 +9,81 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="176" x2="176" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fanm3aqe3hiqk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fanm3aqe3hiqk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fanm3aqe3hiqk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fanm3aqe3hiqk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="430.3545">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fanm3aqe3hiqk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fjz4xx6uc632a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fanm3aqe3hiqk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="430.3545">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fjz4xx6uc632a)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fanm3aqe3hiqk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="64.3638">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,94.5625,169.5,98.5625,159.5,102.5625,163.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="93.4966">a1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,153.6953,111.5,157.6953,101.5,161.6953,105.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="152.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,182.8281,169.5,186.8281,159.5,190.8281,163.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="181.7622">a2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,241.9609,111.5,245.9609,101.5,249.9609,105.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="240.895">b3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,271.0938,169.5,275.0938,159.5,279.0938,163.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="270.0278">a3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,330.2266,111.5,334.2266,101.5,338.2266,105.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="329.1606">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,359.3594,169.5,363.3594,159.5,367.3594,163.5,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="358.2935">a4()</text>
diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg
index 4119da5a..f349baef 100644
--- a/docs/test_cases/t20011_sequence.svg
+++ b/docs/test_cases/t20011_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="593px" preserveAspectRatio="none" style="width:203px;height:593px;" version="1.1" viewBox="0 0 203 593" width="203px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1t3rvwjo71yys" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1rws0hp581uno" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="552.7578"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="103.5" x2="103.5" y1="38.2969" y2="552.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1t3rvwjo71yys)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rws0hp581uno)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1t3rvwjo71yys)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#f1rws0hp581uno)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="571.7529">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1t3rvwjo71yys)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rws0hp581uno)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1t3rvwjo71yys)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#f1rws0hp581uno)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="571.7529">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1t3rvwjo71yys)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1rws0hp581uno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,65.4297,97,69.4297,87,73.4297,91,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">a(int)</text>
@@ -52,26 +52,26 @@
     <path d="M80.5,84.4297 L144.5,84.4297 L144.5,91.4297 L134.5,101.4297 L80.5,101.4297 L80.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="97.4966">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="156" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="125,131.6953,115,135.6953,125,139.6953,121,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="121" y="117.6294">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,197.8281,97,201.8281,87,205.8281,91,201.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="201.8281" y2="201.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="196.7622">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="109" x2="156" y1="225.9609" y2="225.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="225.9609" y2="238.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="238.9609" y2="238.9609"/>
       <polygon fill="#A80036" points="125,234.9609,115,238.9609,125,242.9609,121,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="121" y="220.895">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="161" y1="268.0938" y2="268.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="161" y1="268.0938" y2="281.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="120" x2="161" y1="281.0938" y2="281.0938"/>
@@ -81,14 +81,14 @@
     <path d="M70.5,301.0938 L134.5,301.0938 L134.5,308.0938 L124.5,318.0938 L70.5,318.0938 L70.5,301.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85.5" y="314.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="124" x2="166" y1="339.3594" y2="339.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="339.3594" y2="352.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="352.3594" y2="352.3594"/>
       <polygon fill="#A80036" points="135,348.3594,125,352.3594,135,356.3594,131,352.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="334.2935">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="119" x2="166" y1="406.4922" y2="406.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="406.4922" y2="419.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="419.4922" y2="419.4922"/>
@@ -98,7 +98,7 @@
     <path d="M80.5,439.4922 L144.5,439.4922 L144.5,446.4922 L134.5,456.4922 L80.5,456.4922 L80.5,439.4922 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="452.5591">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="129" x2="171" y1="477.7578" y2="477.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="171" x2="171" y1="477.7578" y2="490.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="171" y1="490.7578" y2="490.7578"/>
diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg
index 82308366..c046a262 100644
--- a/docs/test_cases/t20012_sequence.svg
+++ b/docs/test_cases/t20012_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1219px" preserveAspectRatio="none" style="width:1261px;height:1219px;" version="1.1" viewBox="0 0 1261 1219" width="1261px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1x9f2kbp8g77b" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f72xpb7nzseff" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,31 +9,31 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="1033.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1070.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1112.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="974.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1126" y="1004.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="1033.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1070.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1112.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="974.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1126" y="1004.0859"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1179.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="212" x2="212" y1="38.2969" y2="1179.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="363" x2="363" y1="38.2969" y2="1179.4844"/>
@@ -42,116 +42,116 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="730.5" x2="730.5" y1="38.2969" y2="1179.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="875.5" x2="875.5" y1="38.2969" y2="1179.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1130.5" x2="1130.5" y1="38.2969" y2="1179.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1198.4795">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:67:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:67:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="91" y="22.9951">tmain()::(lambda t20012.cc:67:20)</text>
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="91" y="1198.4795">tmain()::(lambda t20012.cc:67:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="357" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="357" y="1198.4795">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="419.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="419.5" y="1198.4795">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:80:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:80:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="457.5" y="22.9951">tmain()::(lambda t20012.cc:80:20)</text>
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="457.5" y="1198.4795">tmain()::(lambda t20012.cc:80:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="723.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="723.5" y="1198.4795">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="239" x="754.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="239" x="754.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="225" x="761.5" y="22.9951">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="239" x="754.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="239" x="754.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="225" x="761.5" y="1198.4795">R&lt;R::(lambda t20012.cc:86:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:86:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1007.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:86:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1007.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1014.5" y="22.9951">tmain()::(lambda t20012.cc:86:9)</text>
-      <rect fill="#FEFECE" filter="url(#f1x9f2kbp8g77b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1007.5" y="1178.4844"/>
+      <rect fill="#FEFECE" filter="url(#f72xpb7nzseff)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1007.5" y="1178.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1014.5" y="1198.4795">tmain()::(lambda t20012.cc:86:9)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="1033.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1070.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1112.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="974.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1x9f2kbp8g77b)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1126" y="1004.0859"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="1113.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="1033.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1070.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1112.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="871" y="974.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f72xpb7nzseff)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1126" y="1004.0859"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="195,65.4297,205,69.4297,195,73.4297,199,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="201" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="64.3638">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="346.5,94.5625,356.5,98.5625,346.5,102.5625,350.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="352.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="93.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="368.5" x2="415.5" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="415.5" x2="415.5" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="374.5" x2="415.5" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="384.5,131.6953,374.5,135.6953,384.5,139.6953,380.5,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="380.5" y="117.6294">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="378.5" x2="420.5" y1="169.8281" y2="169.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="420.5" x2="420.5" y1="169.8281" y2="182.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="379.5" x2="420.5" y1="182.8281" y2="182.8281"/>
       <polygon fill="#A80036" points="389.5,178.8281,379.5,182.8281,389.5,186.8281,385.5,182.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="385.5" y="164.7622">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="409.5,237.9609,419.5,241.9609,409.5,245.9609,413.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="415.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="236.895">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="431.5" x2="478.5" y1="266.0938" y2="266.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="478.5" x2="478.5" y1="266.0938" y2="279.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="437.5" x2="478.5" y1="279.0938" y2="279.0938"/>
       <polygon fill="#A80036" points="447.5,275.0938,437.5,279.0938,447.5,283.0938,443.5,279.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="443.5" y="261.0278">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="441.5" x2="483.5" y1="313.2266" y2="313.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="483.5" x2="483.5" y1="313.2266" y2="326.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="442.5" x2="483.5" y1="326.2266" y2="326.2266"/>
@@ -160,67 +160,67 @@
     </a>
     <polygon fill="#A80036" points="57,366.2266,47,370.2266,57,374.2266,53,370.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="211" y1="370.2266" y2="370.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="561.5,395.3594,571.5,399.3594,561.5,403.3594,565.5,399.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="567.5" y1="399.3594" y2="399.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="394.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="713.5,424.4922,723.5,428.4922,713.5,432.4922,717.5,428.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="583.5" x2="719.5" y1="428.4922" y2="428.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="590.5" y="423.4263">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="735.5" x2="782.5" y1="452.625" y2="452.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="782.5" x2="782.5" y1="452.625" y2="465.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="741.5" x2="782.5" y1="465.625" y2="465.625"/>
       <polygon fill="#A80036" points="751.5,461.625,741.5,465.625,751.5,469.625,747.5,465.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="747.5" y="447.5591">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="745.5" x2="787.5" y1="499.7578" y2="499.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="787.5" x2="787.5" y1="499.7578" y2="512.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="746.5" x2="787.5" y1="512.7578" y2="512.7578"/>
       <polygon fill="#A80036" points="756.5,508.7578,746.5,512.7578,756.5,516.7578,752.5,512.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="752.5" y="494.6919">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="228,567.8906,218,571.8906,228,575.8906,224,571.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="572.5" y1="571.8906" y2="571.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="234" y="566.8247">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="346.5,597.0234,356.5,601.0234,346.5,605.0234,350.5,601.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="352.5" y1="601.0234" y2="601.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="595.9575">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="368.5" x2="415.5" y1="625.1563" y2="625.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="415.5" x2="415.5" y1="625.1563" y2="638.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="374.5" x2="415.5" y1="638.1563" y2="638.1563"/>
       <polygon fill="#A80036" points="384.5,634.1563,374.5,638.1563,384.5,642.1563,380.5,638.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="380.5" y="620.0903">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="378.5" x2="420.5" y1="672.2891" y2="672.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="420.5" x2="420.5" y1="672.2891" y2="685.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="379.5" x2="420.5" y1="685.2891" y2="685.2891"/>
       <polygon fill="#A80036" points="389.5,681.2891,379.5,685.2891,389.5,689.2891,385.5,685.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="385.5" y="667.2231">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="409.5,740.4219,419.5,744.4219,409.5,748.4219,413.5,744.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="415.5" y1="744.4219" y2="744.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="739.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="431.5" x2="478.5" y1="768.5547" y2="768.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="478.5" x2="478.5" y1="768.5547" y2="781.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="437.5" x2="478.5" y1="781.5547" y2="781.5547"/>
       <polygon fill="#A80036" points="447.5,777.5547,437.5,781.5547,447.5,785.5547,443.5,781.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="443.5" y="763.4888">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="441.5" x2="483.5" y1="815.6875" y2="815.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="483.5" x2="483.5" y1="815.6875" y2="828.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="442.5" x2="483.5" y1="828.6875" y2="828.6875"/>
@@ -231,34 +231,34 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="212" x2="567.5" y1="872.6875" y2="872.6875"/>
     <polygon fill="#A80036" points="57,882.6875,47,886.6875,57,890.6875,53,886.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="577.5" y1="886.6875" y2="886.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="859,911.8203,869,915.8203,859,919.8203,863,915.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="865" y1="915.8203" y2="915.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="498" x="53" y="910.7544">R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="859,970.9531,869,974.9531,859,978.9531,863,974.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="865" y1="974.9531" y2="974.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="969.8872">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1114,1000.0859,1124,1004.0859,1114,1008.0859,1118,1004.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="881" x2="1120" y1="1004.0859" y2="1004.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="888" y="999.02">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="746.5,1029.2188,736.5,1033.2188,746.5,1037.2188,742.5,1033.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="740.5" x2="1125" y1="1033.2188" y2="1033.2188"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="752.5" y="1028.1528">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="735.5" x2="782.5" y1="1057.3516" y2="1057.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="782.5" x2="782.5" y1="1057.3516" y2="1070.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="741.5" x2="782.5" y1="1070.3516" y2="1070.3516"/>
       <polygon fill="#A80036" points="751.5,1066.3516,741.5,1070.3516,751.5,1074.3516,747.5,1070.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="747.5" y="1052.2856">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="745.5" x2="787.5" y1="1104.4844" y2="1104.4844"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="787.5" x2="787.5" y1="1104.4844" y2="1117.4844"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="746.5" x2="787.5" y1="1117.4844" y2="1117.4844"/>
diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg
index f1f6fb96..268c163e 100644
--- a/docs/test_cases/t20013_sequence.svg
+++ b/docs/test_cases/t20013_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:354px;height:357px;" version="1.1" viewBox="0 0 354 357" width="354px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1kfxeomkwypop" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1btoqi8zg923z" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="317.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1btoqi8zg923z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1btoqi8zg923z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="336.0889">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1btoqi8zg923z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1btoqi8zg923z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="336.0889">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1btoqi8zg923z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1kfxeomkwypop)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1btoqi8zg923z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="336.0889">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1kfxeomkwypop)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1btoqi8zg923z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
@@ -58,12 +58,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="91.5,122.5625,81.5,126.5625,91.5,130.5625,87.5,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,151.6953,193.5,155.6953,183.5,159.6953,187.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="150.6294">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,180.8281,326.5,184.8281,316.5,188.8281,320.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="179.7622">a2(double)</text>
@@ -72,12 +72,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="91.5,208.8281,81.5,212.8281,91.5,216.8281,87.5,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,237.9609,193.5,241.9609,183.5,245.9609,187.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="236.895">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,267.0938,326.5,271.0938,316.5,275.0938,320.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="266.0278">a3(const char *)</text>
diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg
index 64f1274c..840b7f9a 100644
--- a/docs/test_cases/t20014_sequence.svg
+++ b/docs/test_cases/t20014_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="400px" preserveAspectRatio="none" style="width:336px;height:400px;" version="1.1" viewBox="0 0 336 400" width="336px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ul9jjl8lonc3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fewfzgwti4ttr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,56 +9,56 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="222.5" x2="222.5" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287.5" x2="287.5" y1="38.2969" y2="360.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fewfzgwti4ttr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#fewfzgwti4ttr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="379.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fewfzgwti4ttr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#fewfzgwti4ttr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="379.2217">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fewfzgwti4ttr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#fewfzgwti4ttr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="379.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fewfzgwti4ttr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="22.9951">C&lt;B,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ul9jjl8lonc3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#fewfzgwti4ttr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="379.2217">C&lt;B,int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1ul9jjl8lonc3)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fewfzgwti4ttr)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,65.4297,125,69.4297,115,73.4297,119,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="64.3638">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,94.5625,216,98.5625,206,102.5625,210,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="93.4966">a1(int,int)</text>
@@ -67,12 +67,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,151.6953,125,155.6953,115,159.6953,119,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="150.6294">b2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,180.8281,216,184.8281,206,188.8281,210,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="179.7622">a2(int,int)</text>
@@ -81,17 +81,17 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="271,237.9609,281,241.9609,271,245.9609,275,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="277" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="53" y="236.895">c1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="148,267.0938,138,271.0938,148,275.0938,144,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="142" x2="282" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="154" y="266.0278">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,296.2266,216,300.2266,206,304.2266,210,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="300.2266" y2="300.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="295.1606">a1(int,int)</text>
diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg
index 73dee18e..f4495b80 100644
--- a/docs/test_cases/t20015_sequence.svg
+++ b/docs/test_cases/t20015_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:338px;height:157px;" version="1.1" viewBox="0 0 338 157" width="338px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pxnzo1ly20py" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fl69yeuxgicp8" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1pxnzo1ly20py)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1pxnzo1ly20py)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fl69yeuxgicp8)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fl69yeuxgicp8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="317" x2="317" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pxnzo1ly20py)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl69yeuxgicp8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1pxnzo1ly20py)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#fl69yeuxgicp8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pxnzo1ly20py)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl69yeuxgicp8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1pxnzo1ly20py)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#fl69yeuxgicp8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="136.4248">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1pxnzo1ly20py)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1pxnzo1ly20py)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fl69yeuxgicp8)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fl69yeuxgicp8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="300,65.4297,310,69.4297,300,73.4297,304,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="306" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="53" y="64.3638">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg
index 1c99303d..5f867671 100644
--- a/docs/test_cases/t20016_sequence.svg
+++ b/docs/test_cases/t20016_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="273px" preserveAspectRatio="none" style="width:281px;height:273px;" version="1.1" viewBox="0 0 281 273" width="281px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fu07mihkvsjh4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13zv7qdf4zmnq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="125" x2="125" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="260.5" x2="260.5" y1="38.2969" y2="232.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13zv7qdf4zmnq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f13zv7qdf4zmnq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="251.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13zv7qdf4zmnq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="22.9951">B&lt;long&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f13zv7qdf4zmnq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="251.8232">B&lt;long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13zv7qdf4zmnq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fu07mihkvsjh4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f13zv7qdf4zmnq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="251.8232">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fu07mihkvsjh4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13zv7qdf4zmnq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,65.4297,118,69.4297,108,73.4297,112,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="64.3638">b1(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,94.5625,254,98.5625,244,102.5625,248,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="137" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,153.6953,118,157.6953,108,161.6953,112,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="152.6294">b2(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,182.8281,254,186.8281,244,190.8281,248,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="107" x="137" y="181.7622">a2(const long &amp;)</text>
diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg
index ede48086..abee61a4 100644
--- a/docs/test_cases/t20017_sequence.svg
+++ b/docs/test_cases/t20017_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:448px;height:357px;" version="1.1" viewBox="0 0 448 357" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f14005pc6mzhdq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fu7duadvskof4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,65 +9,65 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="74" x2="74" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="203" x2="203" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="317.0938"/>
-    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fu7duadvskof4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="22.9951">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fu7duadvskof4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="336.0889">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fu7duadvskof4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="22.9951">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fu7duadvskof4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="336.0889">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fu7duadvskof4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="22.9951">include/t20017_b.h</text>
-    <rect fill="#FEFECE" filter="url(#f14005pc6mzhdq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fu7duadvskof4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="336.0889">include/t20017_b.h</text>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f14005pc6mzhdq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fu7duadvskof4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <polygon fill="#A80036" points="57,65.4297,67,69.4297,57,73.4297,61,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="63" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="10" y="64.3638">tmain()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,94.5625,196.5,98.5625,186.5,102.5625,190.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="93.4966">a3(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,108.5625,80,112.5625,90,116.5625,86,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="112.5625" y2="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,137.6953,358,141.6953,348,145.6953,352,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="136.6294">b1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,151.6953,80,155.6953,90,159.6953,86,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="155.6953" y2="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,180.8281,196.5,184.8281,186.5,188.8281,190.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="179.7622">a2(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,194.8281,80,198.8281,90,202.8281,86,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="198.8281" y2="198.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,223.9609,196.5,227.9609,186.5,231.9609,190.5,227.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="227.9609" y2="227.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="222.895">a1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,237.9609,80,241.9609,90,245.9609,86,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="241.9609" y2="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,267.0938,358,271.0938,348,275.0938,352,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="86" y="266.0278">b2&lt;int&gt;(int,int)</text>
diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg
index 148bd602..81837bdd 100644
--- a/docs/test_cases/t20018_sequence.svg
+++ b/docs/test_cases/t20018_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="332px" preserveAspectRatio="none" style="width:1013px;height:332px;" version="1.1" viewBox="0 0 1013 332" width="1013px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1x77mssqdcili" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fp6igzw9qdcuk" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,14 +9,14 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191" x2="191" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="362" x2="362" y1="38.2969" y2="292.2266"/>
@@ -25,93 +25,93 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="716" x2="716" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="834" x2="834" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="952" x2="952" y1="38.2969" y2="292.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="311.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="22.9951">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="311.2217">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="22.9951">Factorial&lt;5&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="311.2217">Factorial&lt;5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="22.9951">Factorial&lt;4&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="311.2217">Factorial&lt;4&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="22.9951">Factorial&lt;3&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="311.2217">Factorial&lt;3&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="22.9951">Factorial&lt;2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="311.2217">Factorial&lt;2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="22.9951">Factorial&lt;1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="311.2217">Factorial&lt;1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="22.9951">Factorial&lt;0&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1x77mssqdcili)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fp6igzw9qdcuk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="311.2217">Factorial&lt;0&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1x77mssqdcili)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fp6igzw9qdcuk)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="174,65.4297,184,69.4297,174,73.4297,178,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="180" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="39" x="53" y="64.3638">print()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="345,94.5625,355,98.5625,345,102.5625,349,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="196" x2="351" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="203" y="93.4966">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="463,123.6953,473,127.6953,463,131.6953,467,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="367" x2="469" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="374" y="122.6294">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="581,152.8281,591,156.8281,581,160.8281,585,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="485" x2="587" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="492" y="151.7622">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="699,181.9609,709,185.9609,699,189.9609,703,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="603" x2="705" y1="185.9609" y2="185.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="610" y="180.895">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="817,211.0938,827,215.0938,817,219.0938,821,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="721" x2="823" y1="215.0938" y2="215.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="728" y="210.0278">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="935,240.2266,945,244.2266,935,248.2266,939,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="839" x2="941" y1="244.2266" y2="244.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="846" y="239.1606">print(int)</text>
diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg
index ee0323af..d1f0545d 100644
--- a/docs/test_cases/t20019_sequence.svg
+++ b/docs/test_cases/t20019_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:391px;height:451px;" version="1.1" viewBox="0 0 391 451" width="391px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fh3ww13dt8b5k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ki6efiumwnqm" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="210" x2="210" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287" x2="287" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="22.9951">Base&lt;D1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="430.3545">Base&lt;D1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="22.9951">D1</text>
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="430.3545">D1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="22.9951">Base&lt;D2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="430.3545">Base&lt;D2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="22.9951">D2</text>
-      <rect fill="#FEFECE" filter="url(#fh3ww13dt8b5k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1ki6efiumwnqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="430.3545">D2</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fh3ww13dt8b5k)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki6efiumwnqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,65.4297,125.5,69.4297,115.5,73.4297,119.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="64.3638">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,94.5625,203,98.5625,193,102.5625,197,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="93.4966">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,153.6953,280.5,157.6953,270.5,161.6953,274.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="152.6294">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,182.8281,358,186.8281,348,190.8281,352,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="181.7622">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,241.9609,125.5,245.9609,115.5,249.9609,119.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="240.895">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,271.0938,203,275.0938,193,279.0938,197,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="270.0278">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,330.2266,280.5,334.2266,270.5,338.2266,274.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="329.1606">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,359.3594,358,363.3594,348,367.3594,352,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="358.2935">impl()</text>
diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg
index 105d3614..599aed74 100644
--- a/docs/test_cases/t20020_sequence.svg
+++ b/docs/test_cases/t20020_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="879px" preserveAspectRatio="none" style="width:385px;height:879px;" version="1.1" viewBox="0 0 385 879" width="385px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1mt6zsdpqz6v4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lw2iu39nugu0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,82 +9,82 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="115.5625"/>
     <rect fill="#FFFFFF" height="250.7969" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="160.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
     <rect fill="#FFFFFF" height="88.2656" style="stroke: none; stroke-width: 1.0;" width="271.5" x="23" y="316.2266"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="411.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132.5" x2="132.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="170.5" x2="170.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="329.5" x2="329.5" y1="38.2969" y2="839.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="858.6826">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="858.6826">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="858.6826">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="858.6826">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="22.9951">D&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1mt6zsdpqz6v4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1lw2iu39nugu0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="858.6826">D&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1mt6zsdpqz6v4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1lw2iu39nugu0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,89.5625,126,93.5625,116,97.5625,120,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="88.4966">a1()</text>
@@ -92,7 +92,7 @@
     <polygon fill="#A80036" points="82,103.5625,72,107.5625,82,111.5625,78,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="107.5625" y2="107.5625"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="116.5625" y2="116.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,134.6953,126,138.6953,116,142.6953,120,138.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="138.6953" y2="138.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="133.6294">a5()</text>
@@ -103,7 +103,7 @@
     <path d="M23,169.6953 L87,169.6953 L87,176.6953 L77,186.6953 L23,186.6953 L23,169.6953 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="182.7622">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,203.9609,126,207.9609,116,211.9609,120,207.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="207.9609" y2="207.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="202.895">[</text>
@@ -112,7 +112,7 @@
     </a>
     <polygon fill="#A80036" points="82,217.9609,72,221.9609,82,225.9609,78,221.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="221.9609" y2="221.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,247.0938,163.5,251.0938,153.5,255.0938,157.5,251.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="251.0938" y2="251.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="246.0278">[</text>
@@ -121,7 +121,7 @@
     </a>
     <polygon fill="#A80036" points="82,261.0938,72,265.0938,82,269.0938,78,265.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="169.5" y1="265.0938" y2="265.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,290.2266,263.5,294.2266,253.5,298.2266,257.5,294.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="294.2266" y2="294.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="289.1606">b1()</text>
@@ -129,7 +129,7 @@
     <polygon fill="#A80036" points="82,304.2266,72,308.2266,82,312.2266,78,308.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="269.5" y1="308.2266" y2="308.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="23" x2="294.5" y1="317.2266" y2="317.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,335.3594,126,339.3594,116,343.3594,120,339.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="339.3594" y2="339.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="334.2935">[</text>
@@ -138,7 +138,7 @@
     </a>
     <polygon fill="#A80036" points="82,349.3594,72,353.3594,82,357.3594,78,353.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="353.3594" y2="353.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,378.4922,263.5,382.4922,253.5,386.4922,257.5,382.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="382.4922" y2="382.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="377.4263">b2()</text>
@@ -146,14 +146,14 @@
     <polygon fill="#A80036" points="82,392.4922,72,396.4922,82,400.4922,78,396.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="269.5" y1="396.4922" y2="396.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="412.4922" y2="412.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,430.625,126,434.625,116,438.625,120,434.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="434.625" y2="434.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="429.5591">a4()</text>
     </a>
     <polygon fill="#A80036" points="82,444.625,72,448.625,82,452.625,78,448.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="448.625" y2="448.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,480.7578,263.5,484.7578,253.5,488.7578,257.5,484.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="484.7578" y2="484.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="29" x="78" y="479.6919">log()</text>
@@ -161,7 +161,7 @@
     <path d="M23,529.7578 L87,529.7578 L87,536.7578 L77,546.7578 L23,546.7578 L23,529.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="542.8247">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,564.0234,163.5,568.0234,153.5,572.0234,157.5,568.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="568.0234" y2="568.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="78" y="562.9575">c1() const</text>
@@ -169,7 +169,7 @@
     <path d="M146.5,583.0234 L210.5,583.0234 L210.5,590.0234 L200.5,600.0234 L146.5,600.0234 L146.5,583.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="161.5" y="596.0903">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="222.5" y1="616.2891" y2="616.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="616.2891" y2="629.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="629.2891" y2="629.2891"/>
@@ -182,7 +182,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222.5" x2="222.5" y1="653.2891" y2="666.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175.5" x2="222.5" y1="666.2891" y2="666.2891"/>
     <polygon fill="#A80036" points="185.5,662.2891,175.5,666.2891,185.5,670.2891,181.5,666.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="180.5" x2="222.5" y1="690.4219" y2="690.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="690.4219" y2="703.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="703.4219" y2="703.4219"/>
@@ -192,7 +192,7 @@
     <path d="M23,762.4219 L87,762.4219 L87,769.4219 L77,779.4219 L23,779.4219 L23,762.4219 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="775.4888">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="312.5,796.6875,322.5,800.6875,312.5,804.6875,316.5,800.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="318.5" y1="800.6875" y2="800.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="78" y="795.6216">d1(int,int)</text>
diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg
index 420f0175..a004c93c 100644
--- a/docs/test_cases/t20021_sequence.svg
+++ b/docs/test_cases/t20021_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:315px;height:754px;" version="1.1" viewBox="0 0 315 754" width="315px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fpyfi1s0f808c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1hpo6e16mig3i" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,74 +9,74 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="76" x2="76" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="183" x2="183" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="242.5" x2="242.5" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="280.5" x2="280.5" y1="38.2969" y2="714.4219"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hpo6e16mig3i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1hpo6e16mig3i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="733.417">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hpo6e16mig3i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1hpo6e16mig3i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="733.417">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hpo6e16mig3i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1hpo6e16mig3i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="733.417">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hpo6e16mig3i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fpyfi1s0f808c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1hpo6e16mig3i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="733.417">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fpyfi1s0f808c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1hpo6e16mig3i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
     <path d="M13,55.2969 L90,55.2969 L90,62.2969 L80,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="68.3638">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,89.5625,176,93.5625,166,97.5625,170,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="88.4966">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="88.4966">c4()</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="88.4966">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="235" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="235" x2="235" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="235" y1="130.6953" y2="130.6953"/>
@@ -89,7 +89,7 @@
     <polygon fill="#A80036" points="198,163.6953,188,167.6953,198,171.6953,194,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="92,172.6953,82,176.6953,92,180.6953,88,176.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="176.6953" y2="176.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,201.8281,236,205.8281,226,209.8281,230,205.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="205.8281" y2="205.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="200.7622">a3()</text>
@@ -102,7 +102,7 @@
     <path d="M33,258.9609 L110,258.9609 L110,265.9609 L100,275.9609 L33,275.9609 L33,258.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="272.0278">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,293.2266,236,297.2266,226,301.2266,230,297.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="297.2266" y2="297.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="292.1606">[</text>
@@ -111,7 +111,7 @@
     </a>
     <polygon fill="#A80036" points="92,307.2266,82,311.2266,92,315.2266,88,311.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="311.2266" y2="311.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,336.3594,176,340.3594,166,344.3594,170,340.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="340.3594" y2="340.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="335.2935">[</text>
@@ -120,7 +120,7 @@
     </a>
     <polygon fill="#A80036" points="92,350.3594,82,354.3594,92,358.3594,88,354.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="354.3594" y2="354.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,379.4922,176,383.4922,166,387.4922,170,383.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="383.4922" y2="383.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="378.4263">[</text>
@@ -129,14 +129,14 @@
     </a>
     <polygon fill="#A80036" points="92,393.4922,82,397.4922,92,401.4922,88,397.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="397.4922" y2="397.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,422.625,236,426.625,226,430.625,230,426.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="426.625" y2="426.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="421.5591">a1()</text>
     </a>
     <polygon fill="#A80036" points="92,436.625,82,440.625,92,444.625,88,440.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="440.625" y2="440.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,472.7578,176,476.7578,166,480.7578,170,476.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="476.7578" y2="476.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="471.6919">[</text>
@@ -148,7 +148,7 @@
     <path d="M33,519.7578 L110,519.7578 L110,526.7578 L100,536.7578 L33,536.7578 L33,519.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="532.8247">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,554.0234,273.5,558.0234,263.5,562.0234,267.5,558.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="558.0234" y2="558.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="88" y="552.9575">b2() const</text>
@@ -158,7 +158,7 @@
     <path d="M33,594.0234 L110,594.0234 L110,601.0234 L100,611.0234 L33,611.0234 L33,594.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="607.0903">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,628.2891,176,632.2891,166,636.2891,170,632.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="632.2891" y2="632.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="627.2231">[</text>
@@ -167,7 +167,7 @@
     </a>
     <polygon fill="#A80036" points="92,642.2891,82,646.2891,92,650.2891,88,646.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="646.2891" y2="646.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,678.4219,273.5,682.4219,263.5,686.4219,267.5,682.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="682.4219" y2="682.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="88" y="677.356">b2() const</text>
diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg
index 49ddfb09..97dc7a3c 100644
--- a/docs/test_cases/t20022_sequence.svg
+++ b/docs/test_cases/t20022_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="245px" preserveAspectRatio="none" style="width:254px;height:245px;" version="1.1" viewBox="0 0 254 245" width="254px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1cvmzka6scnf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f137nzayfb54xh" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f137nzayfb54xh)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f137nzayfb54xh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f137nzayfb54xh)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f137nzayfb54xh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="205.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="185.5" x2="185.5" y1="38.2969" y2="205.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="233" x2="233" y1="38.2969" y2="205.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137nzayfb54xh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#f137nzayfb54xh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="224.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137nzayfb54xh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#f137nzayfb54xh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="224.6904">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137nzayfb54xh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1cvmzka6scnf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#f137nzayfb54xh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="224.6904">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1cvmzka6scnf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f137nzayfb54xh)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f137nzayfb54xh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f137nzayfb54xh)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f137nzayfb54xh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="169,65.4297,179,69.4297,169,73.4297,173,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="53" y="64.3638">A(std::unique_ptr</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="163" y="64.3638">)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="169,124.5625,179,128.5625,169,132.5625,173,128.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="128.5625" y2="128.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="123.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="216,153.6953,226,157.6953,216,161.6953,220,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="191" x2="222" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="198" y="152.6294">b()</text>
diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg
index e2aa8b90..9f18b116 100644
--- a/docs/test_cases/t20023_sequence.svg
+++ b/docs/test_cases/t20023_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:229px;height:493px;" version="1.1" viewBox="0 0 229 493" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f5zygmput0888" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1x3jjcw6mg9ce" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,37 +9,37 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="170.6953"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="254.6328"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="338.5703"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="453.5078"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="453.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5zygmput0888)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x3jjcw6mg9ce)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f5zygmput0888)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#f1x3jjcw6mg9ce)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="472.5029">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5zygmput0888)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1x3jjcw6mg9ce)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f5zygmput0888)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#f1x3jjcw6mg9ce)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="472.5029">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f5zygmput0888)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1x3jjcw6mg9ce)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
@@ -47,7 +47,7 @@
     <path d="M74,84.4297 L139,84.4297 L139,91.4297 L129,101.4297 L74,101.4297 L74,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="97.4966">try</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="130.6953" y2="130.6953"/>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="112.5,163.6953,102.5,167.6953,112.5,171.6953,108.5,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="171.6953" y2="171.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="79" y="181.9058">[std::runtime_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="201.6328" y2="201.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="201.6328" y2="214.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="214.6328" y2="214.6328"/>
@@ -73,7 +73,7 @@
     <polygon fill="#A80036" points="112.5,247.6328,102.5,251.6328,112.5,255.6328,108.5,251.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="255.6328" y2="255.6328"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="120" x="79" y="265.8433">[std::logic_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="285.5703" y2="285.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="285.5703" y2="298.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="298.5703" y2="298.5703"/>
@@ -86,7 +86,7 @@
     <polygon fill="#A80036" points="112.5,331.5703,102.5,335.5703,112.5,339.5703,108.5,335.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="339.5703" y2="339.5703"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="79" y="349.7808">[...]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="369.5078" y2="369.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="369.5078" y2="382.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="382.5078" y2="382.5078"/>
diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg
index 7d41ac6e..ee65f3a4 100644
--- a/docs/test_cases/t20024_sequence.svg
+++ b/docs/test_cases/t20024_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="916px" preserveAspectRatio="none" style="width:364px;height:916px;" version="1.1" viewBox="0 0 364 916" width="364px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f19omyprinzh9e" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbkwrbt84q340" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="101.5625"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="185.5"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="269.4375"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="353.375"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="511.5781"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="598.5156"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="685.4531"/>
@@ -33,36 +33,36 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="169.5" x2="169.5" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="230" x2="230" y1="38.2969" y2="876.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbkwrbt84q340)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#fbkwrbt84q340)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="895.3232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbkwrbt84q340)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#fbkwrbt84q340)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="895.3232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbkwrbt84q340)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f19omyprinzh9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#fbkwrbt84q340)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="895.3232">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f19omyprinzh9e)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#fbkwrbt84q340)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153,65.4297,163,69.4297,153,73.4297,157,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="159" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="53" y="64.3638">select(enum_a)</text>
@@ -72,7 +72,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="161.5" y="97.4966">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="102.5625" y2="102.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="38" x="151.5" y="112.7729">[zero]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="132.5" y2="132.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="132.5" y2="145.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="145.5" y2="145.5"/>
@@ -85,7 +85,7 @@
     <polygon fill="#A80036" points="185,178.5,175,182.5,185,186.5,181,182.5" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="186.5" y2="186.5"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="196.7104">[one]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="216.4375" y2="216.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="216.4375" y2="229.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="229.4375" y2="229.4375"/>
@@ -98,7 +98,7 @@
     <polygon fill="#A80036" points="185,262.4375,175,266.4375,185,270.4375,181,266.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="270.4375" y2="270.4375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="280.6479">[two]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="300.375" y2="300.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="300.375" y2="313.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="313.375" y2="313.375"/>
@@ -111,7 +111,7 @@
     <polygon fill="#A80036" points="185,346.375,175,350.375,185,354.375,181,350.375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="354.375" y2="354.375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="151.5" y="364.5854">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="384.3125" y2="384.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="384.3125" y2="397.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="397.3125" y2="397.3125"/>
@@ -124,7 +124,7 @@
     <polygon fill="#A80036" points="185,430.3125,175,434.3125,185,438.3125,181,434.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="57,446.3125,47,450.3125,57,454.3125,53,450.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="169" y1="450.3125" y2="450.3125"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="213,475.4453,223,479.4453,213,483.4453,217,479.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="219" y1="479.4453" y2="479.4453"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="86" x="53" y="474.3794">select(colors)</text>
@@ -134,7 +134,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="221" y="507.5122">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="512.5781" y2="512.5781"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="117" x="211" y="522.7886">[enum colors::red]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="547.5156" y2="547.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="547.5156" y2="560.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="560.5156" y2="560.5156"/>
@@ -143,7 +143,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="599.5156" y2="599.5156"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="211" y="609.7261">[enum colors::orange]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="634.4531" y2="634.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="634.4531" y2="647.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="647.4531" y2="647.4531"/>
@@ -152,7 +152,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="686.4531" y2="686.4531"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="133" x="211" y="696.6636">[enum colors::green]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="721.3906" y2="721.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="721.3906" y2="734.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="734.3906" y2="734.3906"/>
@@ -161,7 +161,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="773.3906" y2="773.3906"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="211" y="783.6011">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="808.3281" y2="808.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="808.3281" y2="821.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="821.3281" y2="821.3281"/>
diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg
index 8db3b07b..218e3874 100644
--- a/docs/test_cases/t20025_sequence.svg
+++ b/docs/test_cases/t20025_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="169px" preserveAspectRatio="none" style="width:220px;height:169px;" version="1.1" viewBox="0 0 220 169" width="220px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f24pa7ezc9t8u" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1tsj70okrzm9g" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,41 +9,41 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1tsj70okrzm9g)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1tsj70okrzm9g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1tsj70okrzm9g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="129.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="129.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="167" x2="167" y1="38.2969" y2="129.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tsj70okrzm9g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="128.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1tsj70okrzm9g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="128.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="148.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tsj70okrzm9g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="128.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1tsj70okrzm9g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="128.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="148.4248">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tsj70okrzm9g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="22.9951">add(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f24pa7ezc9t8u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="128.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1tsj70okrzm9g)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="128.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="148.4248">add(int,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f24pa7ezc9t8u)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1tsj70okrzm9g)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1tsj70okrzm9g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1tsj70okrzm9g)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
     <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="96.5" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="150,93.4297,160,97.4297,150,101.4297,154,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="156" y1="97.4297" y2="97.4297"/>
     </a>
diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg
index fe9ada8c..10fd7f6c 100644
--- a/docs/test_cases/t20026_sequence.svg
+++ b/docs/test_cases/t20026_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1dzwjsnkezj9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1g2rm9w46lynt" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1dzwjsnkezj9)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzwjsnkezj9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1g2rm9w46lynt)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1g2rm9w46lynt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dzwjsnkezj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g2rm9w46lynt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1dzwjsnkezj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1g2rm9w46lynt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dzwjsnkezj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g2rm9w46lynt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1dzwjsnkezj9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1g2rm9w46lynt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1dzwjsnkezj9)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dzwjsnkezj9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1g2rm9w46lynt)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1g2rm9w46lynt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg
index 873a91ec..d2e2cf4e 100644
--- a/docs/test_cases/t20027_sequence.svg
+++ b/docs/test_cases/t20027_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f168qgf7r1ntn0" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18fw1s5nc3oye" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f168qgf7r1ntn0)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f168qgf7r1ntn0)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f18fw1s5nc3oye)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18fw1s5nc3oye)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f168qgf7r1ntn0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fw1s5nc3oye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f168qgf7r1ntn0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f18fw1s5nc3oye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f168qgf7r1ntn0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fw1s5nc3oye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f168qgf7r1ntn0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f18fw1s5nc3oye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f168qgf7r1ntn0)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f168qgf7r1ntn0)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f18fw1s5nc3oye)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18fw1s5nc3oye)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg
index 60928af7..27b01ed1 100644
--- a/docs/test_cases/t20028_sequence.svg
+++ b/docs/test_cases/t20028_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:150px;height:304px;" version="1.1" viewBox="0 0 150 304" width="150px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jbb3bp5yd1ut" width="300%" x="-1" y="-1">
+    <filter height="300%" id="foewan7maey59" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,36 +9,36 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="125.5" x="13" y="201.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="263.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="114.5" x2="114.5" y1="38.2969" y2="263.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jbb3bp5yd1ut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foewan7maey59)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1jbb3bp5yd1ut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#foewan7maey59)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="282.9561">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jbb3bp5yd1ut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#foewan7maey59)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1jbb3bp5yd1ut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#foewan7maey59)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="282.9561">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1jbb3bp5yd1ut)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#foewan7maey59)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,89.5625,108,93.5625,98,97.5625,102,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="88.4966">[</text>
@@ -47,14 +47,14 @@
     </a>
     <polygon fill="#A80036" points="72,103.5625,62,107.5625,72,111.5625,68,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="107.5625" y2="107.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,132.6953,108,136.6953,98,140.6953,102,136.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="136.6953" y2="136.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="131.6294">b()</text>
     </a>
     <polygon fill="#A80036" points="72,146.6953,62,150.6953,72,154.6953,68,150.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="150.6953" y2="150.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,175.8281,108,179.8281,98,183.8281,102,179.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="179.8281" y2="179.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="68" y="174.7622">c()</text>
@@ -62,7 +62,7 @@
     <polygon fill="#A80036" points="72,189.8281,62,193.8281,72,197.8281,68,193.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="114" y1="193.8281" y2="193.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="138.5" y1="202.8281" y2="202.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,220.9609,108,224.9609,98,228.9609,102,224.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="224.9609" y2="224.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="219.895">d()</text>
diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg
index e106d422..d50b9a10 100644
--- a/docs/test_cases/t20029_sequence.svg
+++ b/docs/test_cases/t20029_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="740px" preserveAspectRatio="none" style="width:1064px;height:740px;" version="1.1" viewBox="0 0 1064 740" width="1064px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f404tswkdv0mx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1610o8hmbj0x5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,69 +9,69 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="460.7266" style="stroke: #000000; stroke-width: 2.0;" width="993" x="60" y="222.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="426" y="550.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="460.7266" style="stroke: #000000; stroke-width: 2.0;" width="993" x="60" y="222.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="426" y="550.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="113" x2="113" y1="38.2969" y2="700.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="296" x2="296" y1="38.2969" y2="700.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="545" x2="545" y1="38.2969" y2="700.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="745" x2="745" y1="38.2969" y2="700.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="926" x2="926" y1="38.2969" y2="700.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="87" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="87" y="719.6826">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="163" y="22.9951">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="163" y="719.6826">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L25" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L25" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L25" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L25" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="453" y="22.9951">Retrier&lt;ConnectionPool&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="453" y="719.6826">Retrier&lt;ConnectionPool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L43" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L43" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L43" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L43" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="688" y="22.9951">ConnectionPool</text>
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="688" y="719.6826">ConnectionPool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="826" y="22.9951">encode_b64(std::string &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f404tswkdv0mx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1610o8hmbj0x5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="826" y="719.6826">encode_b64(std::string &amp;&amp;)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f404tswkdv0mx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
-    <path d="M8,53.2969 L8,93.2969 L215,93.2969 L215,63.2969 L205,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f404tswkdv0mx)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1610o8hmbj0x5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
+    <path d="M8,53.2969 L8,93.2969 L215,93.2969 L215,63.2969 L205,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f1610o8hmbj0x5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M205,53.2969 L205,63.2969 L215,63.2969 L205,53.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="173" x="14" y="70.3638">Establish connection to the</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="186" x="14" y="85.4966">remote server synchronously</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="728,119.6953,738,123.6953,728,127.6953,732,123.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="118" x2="734" y1="123.6953" y2="123.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="125" y="118.6294">connect()</text>
     </a>
-    <path d="M17,166.6953 L17,206.6953 L205,206.6953 L205,176.6953 L195,166.6953 L17,166.6953 " fill="#FBFB77" filter="url(#f404tswkdv0mx)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M17,166.6953 L17,206.6953 L205,206.6953 L205,176.6953 L195,166.6953 L17,166.6953 " fill="#FBFB77" filter="url(#f1610o8hmbj0x5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M195,166.6953 L195,176.6953 L205,176.6953 L195,166.6953 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="167" x="23" y="183.7622">Repeat for each line in the</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="23" y="198.895">input stream</text>
@@ -81,26 +81,26 @@
     <path d="M70,247.0938 L134,247.0938 L134,254.0938 L124,264.0938 L70,264.0938 L70,247.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85" y="260.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="279,281.3594,289,285.3594,279,289.3594,283,285.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="118" x2="285" y1="285.3594" y2="285.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="125" y="280.2935">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="131" y="280.2935">send(std::string &amp;&amp;)</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="262" y="280.2935">]</text>
     </a>
-    <path d="M197,298.3594 L197,353.3594 L391,353.3594 L391,308.3594 L381,298.3594 L197,298.3594 " fill="#FBFB77" filter="url(#f404tswkdv0mx)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M197,298.3594 L197,353.3594 L391,353.3594 L391,308.3594 L381,298.3594 L197,298.3594 " fill="#FBFB77" filter="url(#f1610o8hmbj0x5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M381,298.3594 L381,308.3594 L391,308.3594 L381,298.3594 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="173" x="203" y="315.4263">Encode the message using</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="172" x="203" y="330.5591">Base64 encoding and pass</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="117" x="203" y="345.6919">it to the next layer</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="348" y1="378.8906" y2="378.8906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="348" x2="348" y1="378.8906" y2="391.8906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="307" x2="348" y1="391.8906" y2="391.8906"/>
       <polygon fill="#A80036" points="317,387.8906,307,391.8906,317,395.8906,313,391.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="147" x="313" y="373.8247">encode(std::string &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="909,406.8906,919,410.8906,909,414.8906,913,410.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="306" x2="915" y1="410.8906" y2="410.8906"/>
     </a>
@@ -110,12 +110,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="348" x2="348" y1="443.8906" y2="456.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="301" x2="348" y1="456.8906" y2="456.8906"/>
     <polygon fill="#A80036" points="311,452.8906,301,456.8906,311,460.8906,307,456.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="528,477.0234,538,481.0234,528,485.0234,532,481.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="534" y1="481.0234" y2="481.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="308" y="475.9575">send(std::string &amp;&amp;)</text>
     </a>
-    <path d="M440,494.0234 L440,534.0234 L646,534.0234 L646,504.0234 L636,494.0234 L440,494.0234 " fill="#FBFB77" filter="url(#f404tswkdv0mx)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M440,494.0234 L440,534.0234 L646,534.0234 L646,504.0234 L636,494.0234 L440,494.0234 " fill="#FBFB77" filter="url(#f1610o8hmbj0x5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M636,494.0234 L636,504.0234 L646,504.0234 L636,494.0234 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="446" y="511.0903">Repeat until send() succeeds</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="167" x="446" y="526.2231">or retry count is exceeded</text>
@@ -125,7 +125,7 @@
     <path d="M436,574.4219 L500,574.4219 L500,581.4219 L490,591.4219 L436,591.4219 L436,574.4219 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="451" y="587.4888">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20029/t20029.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20029/t20029.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="728,608.6875,738,612.6875,728,616.6875,732,612.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="550" x2="734" y1="612.6875" y2="612.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="557" y="607.6216">[</text>
diff --git a/docs/test_cases/t20030_sequence.svg b/docs/test_cases/t20030_sequence.svg
index 9bb0ff87..c4dbd9cc 100644
--- a/docs/test_cases/t20030_sequence.svg
+++ b/docs/test_cases/t20030_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="777px" preserveAspectRatio="none" style="width:427px;height:777px;" version="1.1" viewBox="0 0 427 777" width="427px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fqdkzjffhj3sa" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1wm75yhny33ew" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,81 +9,81 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="193" x2="193" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="361" x2="361" y1="38.2969" y2="736.8906"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wm75yhny33ew)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
-      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1wm75yhny33ew)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="755.8857">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wm75yhny33ew)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
-      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1wm75yhny33ew)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="755.8857">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wm75yhny33ew)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1wm75yhny33ew)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="755.8857">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wm75yhny33ew)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="22.9951">tmain(bool,int)</text>
-      <rect fill="#FEFECE" filter="url(#fqdkzjffhj3sa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1wm75yhny33ew)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="755.8857">tmain(bool,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fqdkzjffhj3sa)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1wm75yhny33ew)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="65.5,64.2969,55.5,68.2969,65.5,72.2969,61.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="59.5" x2="134.5" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176.5,93.4297,186.5,97.4297,176.5,101.4297,180.5,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="97.4297" y2="97.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="61.5" y="92.3638">A(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176.5,152.5625,186.5,156.5625,176.5,160.5625,180.5,156.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="156.5625" y2="156.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="61.5" y="151.4966">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="185.6953" y2="185.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="185.6953" y2="198.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="198.6953" y2="198.6953"/>
@@ -92,36 +92,36 @@
     </a>
     <polygon fill="#A80036" points="60.5,238.6953,50.5,242.6953,60.5,246.6953,56.5,242.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="192.5" y1="242.6953" y2="242.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,267.8281,199.5,271.8281,209.5,275.8281,205.5,271.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="271.8281" y2="271.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="266.7622">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="300.9609" y2="300.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="300.9609" y2="313.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="313.9609" y2="313.9609"/>
       <polygon fill="#A80036" points="214.5,309.9609,204.5,313.9609,214.5,317.9609,210.5,313.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="295.895">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,369.0938,199.5,373.0938,209.5,377.0938,205.5,373.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="373.0938" y2="373.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="368.0278">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="402.2266" y2="402.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="402.2266" y2="415.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="415.2266" y2="415.2266"/>
       <polygon fill="#A80036" points="214.5,411.2266,204.5,415.2266,214.5,419.2266,210.5,415.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="397.1606">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,470.3594,199.5,474.3594,209.5,478.3594,205.5,474.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="474.3594" y2="474.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="215.5" y="469.2935">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="503.4922" y2="503.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="503.4922" y2="516.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="516.4922" y2="516.4922"/>
@@ -130,12 +130,12 @@
     </a>
     <polygon fill="#A80036" points="344.5,556.4922,354.5,560.4922,344.5,564.4922,348.5,560.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="560.4922" y2="560.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,585.625,199.5,589.625,209.5,593.625,205.5,589.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="589.625" y2="589.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="215.5" y="584.5591">operator=(const A &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="618.7578" y2="618.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="618.7578" y2="631.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="631.7578" y2="631.7578"/>
@@ -144,7 +144,7 @@
     </a>
     <polygon fill="#A80036" points="344.5,671.7578,354.5,675.7578,344.5,679.7578,348.5,675.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="675.7578" y2="675.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,700.8906,199.5,704.8906,209.5,708.8906,205.5,704.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="704.8906" y2="704.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="215.5" y="699.8247">value() const</text>
diff --git a/docs/test_cases/t20031_sequence.svg b/docs/test_cases/t20031_sequence.svg
index 6b4f7e6a..dd2bcea7 100644
--- a/docs/test_cases/t20031_sequence.svg
+++ b/docs/test_cases/t20031_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="197px" preserveAspectRatio="none" style="width:578px;height:197px;" version="1.1" viewBox="0 0 578 197" width="578px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1i7r8jfvxr6f8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1nlt75nns0gn8" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,64 +9,64 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="238" x2="238" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="420" x2="420" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="557" x2="557" y1="38.2969" y2="157.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="176.4248">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="176.4248">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="22.9951">tmain(bool,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="176.4248">tmain(bool,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="22.9951">execute(std::function&lt;int ()&gt;)</text>
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="176.4248">execute(std::function&lt;int ()&gt;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1i7r8jfvxr6f8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1nlt75nns0gn8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="176.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1i7r8jfvxr6f8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nlt75nns0gn8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="60.5,64.2969,50.5,68.2969,60.5,72.2969,56.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="134.5" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="403.5,78.2969,413.5,82.2969,403.5,86.2969,407.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="409.5" y1="82.2969" y2="82.2969"/>
     </a>
     <polygon fill="#A80036" points="254.5,92.2969,244.5,96.2969,254.5,100.2969,250.5,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="248.5" x2="419.5" y1="96.2969" y2="96.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="540.5,121.4297,550.5,125.4297,540.5,129.4297,544.5,125.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="546.5" y1="125.4297" y2="125.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="250.5" y="120.3638">value() const</text>
diff --git a/docs/test_cases/t20032_sequence.svg b/docs/test_cases/t20032_sequence.svg
index c39fd82c..9809ffc4 100644
--- a/docs/test_cases/t20032_sequence.svg
+++ b/docs/test_cases/t20032_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="448px" preserveAspectRatio="none" style="width:354px;height:448px;" version="1.1" viewBox="0 0 354 448" width="354px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f9ppgu0zeko6a" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1i2rig14kme4k" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="407.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="407.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="407.8906"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i2rig14kme4k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1i2rig14kme4k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="426.8857">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i2rig14kme4k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1i2rig14kme4k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="426.8857">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1i2rig14kme4k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f9ppgu0zeko6a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#f1i2rig14kme4k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="426.8857">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f9ppgu0zeko6a)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1i2rig14kme4k)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
@@ -60,12 +60,12 @@
     <polygon fill="#A80036" points="91.5,152.8281,81.5,156.8281,91.5,160.8281,87.5,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="156.8281" y2="156.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="97.5" y="151.7622">int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,181.9609,193.5,185.9609,183.5,189.9609,187.5,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="185.9609" y2="185.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="180.895">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,211.0938,326.5,215.0938,316.5,219.0938,320.5,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="215.0938" y2="215.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="210.0278">a2(double)</text>
@@ -76,12 +76,12 @@
     <polygon fill="#A80036" points="91.5,269.3594,81.5,273.3594,91.5,277.3594,87.5,273.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="273.3594" y2="273.3594"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="97.5" y="268.2935">double</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,298.4922,193.5,302.4922,183.5,306.4922,187.5,302.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="302.4922" y2="302.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="297.4263">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,327.625,326.5,331.625,316.5,335.625,320.5,331.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="331.625" y2="331.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="326.5591">a3(const char *)</text>
diff --git a/docs/test_cases/t20033_sequence.svg b/docs/test_cases/t20033_sequence.svg
index 27567f15..e0d58075 100644
--- a/docs/test_cases/t20033_sequence.svg
+++ b/docs/test_cases/t20033_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1055px" preserveAspectRatio="none" style="width:340px;height:1055px;" version="1.1" viewBox="0 0 340 1055" width="340px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1em8sckz8zr6m" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1nuam617hobi" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,73 +9,73 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="72.4297"/>
     <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="130.3672"/>
     <rect fill="#FFFFFF" height="144.2031" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="188.3047"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="332.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
     <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="159" x="13" y="921.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="1014.7656"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="122.5" x2="122.5" y1="38.2969" y2="1014.7656"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1em8sckz8zr6m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nuam617hobi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1em8sckz8zr6m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="1013.7656"/>
+      <rect fill="#FEFECE" filter="url(#f1nuam617hobi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="1013.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="1033.7607">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1em8sckz8zr6m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nuam617hobi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1em8sckz8zr6m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="1013.7656"/>
+      <rect fill="#FEFECE" filter="url(#f1nuam617hobi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="1013.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="1033.7607">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1em8sckz8zr6m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1nuam617hobi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="42" x="92" y="67.5073">[false]</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="73.4297" y2="73.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="310" x="18" y="83.6401">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 100 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,104.3672,116,108.3672,106,112.3672,110,108.3672" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="108.3672" y2="108.3672"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="103.3013">a1()</text>
@@ -84,7 +84,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="122.3672" y2="122.3672"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="131.3672" y2="131.3672"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="302" x="18" y="141.5776">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 64 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,162.3047,116,166.3047,106,170.3047,110,166.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="166.3047" y2="166.3047"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="161.2388">a2()</text>
@@ -93,7 +93,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="180.3047" y2="180.3047"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="189.3047" y2="189.3047"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="182" x="18" y="199.5151">[a.a2() == 2 &amp;&amp; a.a3() == 3]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,220.2422,116,224.2422,106,228.2422,110,224.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="224.2422" y2="224.2422"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="219.1763">[</text>
@@ -102,7 +102,7 @@
     </a>
     <polygon fill="#A80036" points="72,234.2422,62,238.2422,72,242.2422,68,238.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="238.2422" y2="238.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,263.375,116,267.375,106,271.375,110,267.375" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="267.375" y2="267.375"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="262.3091">[</text>
@@ -111,7 +111,7 @@
     </a>
     <polygon fill="#A80036" points="72,277.375,62,281.375,72,285.375,68,281.375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="281.375" y2="281.375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,306.5078,116,310.5078,106,314.5078,110,310.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="310.5078" y2="310.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="305.4419">a3()</text>
@@ -119,7 +119,7 @@
     <polygon fill="#A80036" points="72,320.5078,62,324.5078,72,328.5078,68,324.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="324.5078" y2="324.5078"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="333.5078" y2="333.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,351.6406,116,355.6406,106,359.6406,110,355.6406" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="355.6406" y2="355.6406"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="350.5747">a4()</text>
@@ -130,7 +130,7 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="404.7075">alt</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="132" x="92" y="403.8511">[int i = a.a2(); i != 2]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,425.9063,116,429.9063,106,433.9063,110,429.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="429.9063" y2="429.9063"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="424.8403">[</text>
@@ -139,7 +139,7 @@
     </a>
     <polygon fill="#A80036" points="72,439.9063,62,443.9063,72,447.9063,68,443.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="443.9063" y2="443.9063"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,469.0391,116,473.0391,106,477.0391,110,473.0391" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="473.0391" y2="473.0391"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="467.9731">a3()</text>
@@ -150,7 +150,7 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="522.106">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="157" x="105" y="521.2495">[int i = 0; i &lt; a.a2(); i++]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,543.3047,116,547.3047,106,551.3047,110,547.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="547.3047" y2="547.3047"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="542.2388">[</text>
@@ -159,14 +159,14 @@
     </a>
     <polygon fill="#A80036" points="72,557.3047,62,561.3047,72,565.3047,68,561.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="561.3047" y2="561.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,586.4375,116,590.4375,106,594.4375,110,590.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="590.4375" y2="590.4375"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="585.3716">a3()</text>
     </a>
     <polygon fill="#A80036" points="72,600.4375,62,604.4375,72,608.4375,68,604.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="604.4375" y2="604.4375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,636.5703,116,640.5703,106,644.5703,110,640.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="640.5703" y2="640.5703"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="635.5044">a3()</text>
@@ -177,7 +177,7 @@
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="682.6372">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="92" x="105" y="681.7808">[retry_count--]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,703.8359,116,707.8359,106,711.8359,110,707.8359" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="707.8359" y2="707.8359"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="702.77">a2()</text>
@@ -188,14 +188,14 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="756.9028">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="155" x="105" y="756.0464">[retry_count++ &lt; a.a3()]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,778.1016,116,782.1016,106,786.1016,110,782.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="782.1016" y2="782.1016"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="777.0356">a4()</text>
     </a>
     <polygon fill="#A80036" points="72,792.1016,62,796.1016,72,800.1016,68,796.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="796.1016" y2="796.1016"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,821.2344,116,825.2344,106,829.2344,110,825.2344" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="825.2344" y2="825.2344"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="820.1685">[</text>
@@ -208,7 +208,7 @@
     <rect fill="none" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="874.3013">alt</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="75" x="92" y="873.4448">[a.a4() % 6]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,895.5,116,899.5,106,903.5,110,899.5" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="899.5" y2="899.5"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="894.4341">[</text>
@@ -222,7 +222,7 @@
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="950.5669">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="105" y="949.7104">[ints]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,971.7656,116,975.7656,106,979.7656,110,975.7656" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="975.7656" y2="975.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="970.6997">a4()</text>
diff --git a/docs/test_cases/t20034_sequence.svg b/docs/test_cases/t20034_sequence.svg
index e640f39c..30062dc1 100644
--- a/docs/test_cases/t20034_sequence.svg
+++ b/docs/test_cases/t20034_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="934px" preserveAspectRatio="none" style="width:499px;height:934px;" version="1.1" viewBox="0 0 499 934" width="499px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2zg8zg1z3czu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kxfee3vfi27q" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -14,154 +14,154 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="152" x2="152" y1="38.2969" y2="894.3516"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="894.3516"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="353.5" x2="353.5" y1="38.2969" y2="894.3516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="913.3467">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="913.3467">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="913.3467">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="913.3467">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda t20034.cc:56:18)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda t20034.cc:56:18)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="239" x="232.5" y="22.9951">D::d2()::(lambda t20034.cc:56:18)</text>
-      <rect fill="#FEFECE" filter="url(#f2zg8zg1z3czu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#f1kxfee3vfi27q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="239" x="232.5" y="913.3467">D::d2()::(lambda t20034.cc:56:18)</text>
     </a>
     <polygon fill="#A80036" points="41,65.4297,51,69.4297,41,73.4297,45,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="64.3638">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="93.4966">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,152.8281,200,156.8281,190,160.8281,194,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="151.7622">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="177.8281"/>
+    <rect fill="#EEEEEE" filter="url(#f1kxfee3vfi27q)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="177.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="177.8281" y2="177.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="180.8281" y2="180.8281"/>
     <polygon fill="#A80036" points="41,209.9609,51,213.9609,41,217.9609,45,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="213.9609" y2="213.9609"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="208.895">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,239.0938,200,243.0938,190,247.0938,194,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="196" y1="243.0938" y2="243.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="60" y="238.0278">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="264.0938"/>
+    <rect fill="#EEEEEE" filter="url(#f1kxfee3vfi27q)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="264.0938"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="264.0938" y2="264.0938"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="267.0938" y2="267.0938"/>
     <polygon fill="#A80036" points="41,296.2266,51,300.2266,41,304.2266,45,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="300.2266" y2="300.2266"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="295.1606">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="342,325.3594,352,329.3594,342,333.3594,346,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="348" y1="329.3594" y2="329.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="60" y="324.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="213,354.4922,203,358.4922,213,362.4922,209,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="207" x2="353" y1="358.4922" y2="358.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="219" y="353.4263">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="379.4922"/>
+    <rect fill="#EEEEEE" filter="url(#f1kxfee3vfi27q)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="379.4922" y2="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="382.4922" y2="382.4922"/>
     <polygon fill="#A80036" points="41,411.625,51,415.625,41,419.625,45,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="415.625" y2="415.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="410.5591">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="444.7578" y2="444.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="439.6919">c4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="194" y1="503.0234" y2="503.0234"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="194" y1="503.0234" y2="516.0234"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="153" x2="194" y1="516.0234" y2="516.0234"/>
       <polygon fill="#A80036" points="163,512.0234,153,516.0234,163,520.0234,159,516.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="497.9575">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,541.1563,200,545.1563,190,549.1563,194,545.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="545.1563" y2="545.1563"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="540.0903">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="566.1563"/>
+    <rect fill="#EEEEEE" filter="url(#f1kxfee3vfi27q)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="566.1563"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="566.1563" y2="566.1563"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="569.1563" y2="569.1563"/>
     <polygon fill="#A80036" points="41,598.2891,51,602.2891,41,606.2891,45,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="602.2891" y2="602.2891"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="597.2231">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,627.4219,100,631.4219,90,635.4219,94,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="631.4219" y2="631.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="626.356">c1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,656.5547,150,660.5547,140,664.5547,144,660.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="660.5547" y2="660.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="655.4888">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,685.6875,200,689.6875,190,693.6875,194,689.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="689.6875" y2="689.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="684.6216">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f2zg8zg1z3czu)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="710.6875"/>
+    <rect fill="#EEEEEE" filter="url(#f1kxfee3vfi27q)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="710.6875"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="710.6875" y2="710.6875"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="713.6875" y2="713.6875"/>
     <polygon fill="#A80036" points="41,742.8203,51,746.8203,41,750.8203,45,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="746.8203" y2="746.8203"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="741.7544">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,771.9531,100,775.9531,90,779.9531,94,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="775.9531" y2="775.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="770.8872">c3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="144" y1="805.0859" y2="805.0859"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="144" x2="144" y1="805.0859" y2="818.0859"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="103" x2="144" y1="818.0859" y2="818.0859"/>
       <polygon fill="#A80036" points="113,814.0859,103,818.0859,113,822.0859,109,818.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="109" y="800.02">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,843.2188,150,847.2188,140,851.2188,144,847.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="847.2188" y2="847.2188"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="842.1528">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,872.3516,200,876.3516,190,880.3516,194,876.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="876.3516" y2="876.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="871.2856">a2()</text>
diff --git a/docs/test_cases/t20035_sequence.svg b/docs/test_cases/t20035_sequence.svg
index 524d34bc..c05bd25e 100644
--- a/docs/test_cases/t20035_sequence.svg
+++ b/docs/test_cases/t20035_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="140px" preserveAspectRatio="none" style="width:349px;height:140px;" version="1.1" viewBox="0 0 349 140" width="349px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2qpfz35b7j78" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f17458lmj2bsye" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -13,39 +13,39 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="179" x2="179" y1="38.2969" y2="100.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="247" x2="247" y1="38.2969" y2="100.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="315" x2="315" y1="38.2969" y2="100.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17458lmj2bsye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#f17458lmj2bsye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="119.292">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17458lmj2bsye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="22.9951">a(int)</text>
-      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#f17458lmj2bsye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="119.292">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17458lmj2bsye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="22.9951">b1(int)</text>
-      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#f17458lmj2bsye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="119.292">b1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17458lmj2bsye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="22.9951">c(int)</text>
-      <rect fill="#FEFECE" filter="url(#f2qpfz35b7j78)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#f17458lmj2bsye)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="119.292">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="167.5,50.2969,177.5,54.2969,167.5,58.2969,171.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="75.5" x2="173.5" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="235.5,64.2969,245.5,68.2969,235.5,72.2969,239.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="179.5" x2="241.5" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="303.5,78.2969,313.5,82.2969,303.5,86.2969,307.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="247.5" x2="309.5" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20036_sequence.svg b/docs/test_cases/t20036_sequence.svg
index 25f29695..2872b901 100644
--- a/docs/test_cases/t20036_sequence.svg
+++ b/docs/test_cases/t20036_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="834px" preserveAspectRatio="none" style="width:233px;height:834px;" version="1.1" viewBox="0 0 233 834" width="233px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f96e9ixcc1epj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1b5jen55cprpx" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -13,131 +13,131 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="102" x2="102" y1="38.2969" y2="793.9531"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="793.9531"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="793.9531"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5jen55cprpx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#f1b5jen55cprpx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="812.9482">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5jen55cprpx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#f1b5jen55cprpx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="812.9482">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5jen55cprpx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#f1b5jen55cprpx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="812.9482">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b5jen55cprpx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f96e9ixcc1epj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#f1b5jen55cprpx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="812.9482">D</text>
     </a>
     <polygon fill="#A80036" points="40,65.4297,50,69.4297,40,73.4297,44,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="64.3638">c1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="93.4966">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="148.6953"/>
+    <rect fill="#EEEEEE" filter="url(#f1b5jen55cprpx)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="148.6953"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="148.6953" y2="148.6953"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="151.6953" y2="151.6953"/>
     <polygon fill="#A80036" points="190,180.8281,200,184.8281,190,188.8281,194,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="184.8281" y2="184.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="179.7622">d1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="63,209.9609,53,213.9609,63,217.9609,59,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="213.9609" y2="213.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="208.895">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,239.0938,100,243.0938,90,247.0938,94,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="243.0938" y2="243.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="238.0278">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,268.2266,150,272.2266,140,276.2266,144,272.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="272.2266" y2="272.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="267.1606">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="293.2266"/>
+    <rect fill="#EEEEEE" filter="url(#f1b5jen55cprpx)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="293.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="293.2266" y2="293.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="296.2266" y2="296.2266"/>
     <polygon fill="#A80036" points="190,325.3594,200,329.3594,190,333.3594,194,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="329.3594" y2="329.3594"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="324.2935">d3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="163,354.4922,153,358.4922,163,362.4922,159,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="201" y1="358.4922" y2="358.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="169" y="353.4263">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="379.4922"/>
+    <rect fill="#EEEEEE" filter="url(#f1b5jen55cprpx)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="379.4922" y2="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="382.4922" y2="382.4922"/>
     <polygon fill="#A80036" points="40,411.625,50,415.625,40,419.625,44,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="415.625" y2="415.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="410.5591">c4()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="444.7578" y2="444.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="439.6919">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="494.8906"/>
+    <rect fill="#EEEEEE" filter="url(#f1b5jen55cprpx)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="494.8906"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="494.8906" y2="494.8906"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="497.8906" y2="497.8906"/>
     <polygon fill="#A80036" points="40,527.0234,50,531.0234,40,535.0234,44,531.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="531.0234" y2="531.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="525.9575">c3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="94" y1="560.1563" y2="560.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="94" x2="94" y1="560.1563" y2="573.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="94" y1="573.1563" y2="573.1563"/>
       <polygon fill="#A80036" points="63,569.1563,53,573.1563,63,577.1563,59,573.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="59" y="555.0903">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,598.2891,100,602.2891,90,606.2891,94,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="602.2891" y2="602.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="597.2231">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,627.4219,150,631.4219,140,635.4219,144,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="631.4219" y2="631.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="626.356">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f96e9ixcc1epj)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="652.4219"/>
+    <rect fill="#EEEEEE" filter="url(#f1b5jen55cprpx)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="652.4219"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="652.4219" y2="652.4219"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="655.4219" y2="655.4219"/>
     <polygon fill="#A80036" points="190,684.5547,200,688.5547,190,692.5547,194,688.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="688.5547" y2="688.5547"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="683.4888">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="63,713.6875,53,717.6875,63,721.6875,59,717.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="717.6875" y2="717.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="712.6216">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,742.8203,100,746.8203,90,750.8203,94,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="746.8203" y2="746.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="741.7544">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,771.9531,150,775.9531,140,779.9531,144,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="775.9531" y2="775.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="770.8872">a2()</text>
diff --git a/docs/test_cases/t20037_sequence.svg b/docs/test_cases/t20037_sequence.svg
index fcece6cb..c4639fd4 100644
--- a/docs/test_cases/t20037_sequence.svg
+++ b/docs/test_cases/t20037_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="483px" preserveAspectRatio="none" style="width:390px;height:483px;" version="1.1" viewBox="0 0 390 483" width="390px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6ykgh2epvef1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fppfzqyrbqdd5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="171" x2="171" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="218.5" x2="218.5" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="323.5" x2="323.5" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365.5" x2="365.5" y1="38.2969" y2="442.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="461.8232">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L23" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L23" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L23" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L23" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="160" y="22.9951">a()</text>
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="160" y="461.8232">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="212.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="212.5" y="461.8232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L19" target="_top" title="initb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L19" xlink:show="new" xlink:title="initb" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L19" target="_top" title="initb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L19" xlink:show="new" xlink:title="initb" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="249.5" y="22.9951">initb()</text>
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="249.5" y="461.8232">initb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="316.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="316.5" y="461.8232">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L21" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L21" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L21" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L21" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="354.5" y="22.9951">c()</text>
-      <rect fill="#FEFECE" filter="url(#f6ykgh2epvef1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fppfzqyrbqdd5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="354.5" y="461.8232">c()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f6ykgh2epvef1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fppfzqyrbqdd5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="154,50.2969,164,54.2969,154,58.2969,158,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="202,79.4297,212,83.4297,202,87.4297,206,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="208" y1="83.4297" y2="83.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="183" y="78.3638">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="254,123.4297,264,127.4297,254,131.4297,258,127.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="260" y1="127.4297" y2="127.4297"/>
     </a>
     <polygon fill="#A80036" points="187,137.4297,177,141.4297,187,145.4297,183,141.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="270" y1="141.4297" y2="141.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="306.5,166.5625,316.5,170.5625,306.5,174.5625,310.5,170.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="170.5625" y2="170.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="165.4966">get()</text>
     </a>
     <polygon fill="#A80036" points="187,180.5625,177,184.5625,187,188.5625,183,184.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="184.5625" y2="184.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348.5,194.5625,358.5,198.5625,348.5,202.5625,352.5,198.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="198.5625" y2="198.5625"/>
     </a>
@@ -105,18 +105,18 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="212.5625" y2="212.5625"/>
     <polygon fill="#A80036" points="91.5,222.5625,81.5,226.5625,91.5,230.5625,87.5,226.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="170" y1="226.5625" y2="226.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="154,236.5625,164,240.5625,154,244.5625,158,240.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="240.5625" y2="240.5625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="306.5,265.6953,316.5,269.6953,306.5,273.6953,310.5,269.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="269.6953" y2="269.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="264.6294">get()</text>
     </a>
     <polygon fill="#A80036" points="187,279.6953,177,283.6953,187,287.6953,183,283.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="283.6953" y2="283.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348.5,293.6953,358.5,297.6953,348.5,301.6953,352.5,297.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="297.6953" y2="297.6953"/>
     </a>
@@ -124,18 +124,18 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="311.6953" y2="311.6953"/>
     <polygon fill="#A80036" points="91.5,321.6953,81.5,325.6953,91.5,329.6953,87.5,325.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="170" y1="325.6953" y2="325.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="154,335.6953,164,339.6953,154,343.6953,158,339.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="339.6953" y2="339.6953"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="306.5,364.8281,316.5,368.8281,306.5,372.8281,310.5,368.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="368.8281" y2="368.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="363.7622">get()</text>
     </a>
     <polygon fill="#A80036" points="187,378.8281,177,382.8281,187,386.8281,183,382.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="382.8281" y2="382.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348.5,392.8281,358.5,396.8281,348.5,400.8281,352.5,396.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="396.8281" y2="396.8281"/>
     </a>
diff --git a/docs/test_cases/t20038_sequence.svg b/docs/test_cases/t20038_sequence.svg
index 51bd9f06..c606ec70 100644
--- a/docs/test_cases/t20038_sequence.svg
+++ b/docs/test_cases/t20038_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1430px" preserveAspectRatio="none" style="width:917px;height:1430px;" version="1.1" viewBox="0 0 917 1430" width="917px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bulyusnguzdk" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fw9qadn7cahrg" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,29 +9,29 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="1331.9141" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="912.0156"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1061.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1306.0781"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1090.5469"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1335.2109"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1104.5469"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="772.6172"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1157.6797"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="979.1484"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="1331.9141" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="912.0156"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1061.4141"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1306.0781"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1090.5469"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1335.2109"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1104.5469"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="772.6172"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1157.6797"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="979.1484"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
     <rect fill="#FFFFFF" height="127.3984" style="stroke: none; stroke-width: 1.0;" width="266.5" x="72" y="434.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="105.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="1267.8125"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="105.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="1267.8125"/>
     <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="222.5" x="106" y="1371.2109"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="149" x2="149" y1="38.2969" y2="1390.2109"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="234" x2="234" y1="38.2969" y2="1390.2109"/>
@@ -39,62 +39,62 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="394.5" x2="394.5" y1="38.2969" y2="1390.2109"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="555.5" x2="555.5" y1="38.2969" y2="1390.2109"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="779.5" x2="779.5" y1="38.2969" y2="1390.2109"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L44" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L44" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L44" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L44" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="123" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="1389.2109"/>
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="1389.2109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="123" y="1409.2061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="227" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="1389.2109"/>
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="1389.2109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="227" y="1409.2061">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="298.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="1389.2109"/>
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="1389.2109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="298.5" y="1409.2061">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L8" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L8" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L8" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L8" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="335.5" y="22.9951">add&lt;int&gt;(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="1389.2109"/>
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="1389.2109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="335.5" y="1409.2061">add&lt;int&gt;(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="150" x="478.5" y="22.9951">add_impl&lt;int&gt;(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="1389.2109"/>
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="1389.2109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="150" x="478.5" y="1409.2061">add_impl&lt;int&gt;(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="243" x="656.5" y="22.9951">add_impl&lt;double&gt;(double,double)</text>
-      <rect fill="#FEFECE" filter="url(#f1bulyusnguzdk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="1389.2109"/>
+      <rect fill="#FEFECE" filter="url(#fw9qadn7cahrg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="1389.2109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="243" x="656.5" y="1409.2061">add_impl&lt;double&gt;(double,double)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="1331.9141" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="912.0156"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1061.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1306.0781"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1090.5469"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1335.2109"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1104.5469"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="772.6172"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1157.6797"/>
-    <rect fill="#FFFFFF" filter="url(#f1bulyusnguzdk)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="979.1484"/>
-    <path d="M8,53.2969 L8,244.2969 L286,244.2969 L286,63.2969 L276,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="1331.9141" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="912.0156"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="152.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1061.4141"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1306.0781"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="109.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1090.5469"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1335.2109"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="81.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1104.5469"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="772.6172"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1157.6797"/>
+    <rect fill="#FFFFFF" filter="url(#fw9qadn7cahrg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="979.1484"/>
+    <path d="M8,53.2969 L8,244.2969 L286,244.2969 L286,63.2969 L276,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M276,53.2969 L276,63.2969 L286,63.2969 L276,53.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="253" x="14" y="70.3638">Nisl purus in mollis nunc sed id semper.</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="220" x="14" y="85.4966">Varius vel pharetra vel turpis. Arcu</text>
@@ -111,18 +111,18 @@
     <path d="M72,260.8906 L136,260.8906 L136,267.8906 L126,277.8906 L72,277.8906 L72,260.8906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="87" y="273.9575">alt</text>
-    <path d="M82,283.0234 L82,308.0234 L212,308.0234 L212,293.0234 L202,283.0234 L82,283.0234 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M82,283.0234 L82,308.0234 L212,308.0234 L212,293.0234 L202,283.0234 L82,283.0234 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M202,283.0234 L202,293.0234 L212,293.0234 L202,283.0234 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="109" x="88" y="300.0903">Repeat 5 times...</text>
     <path d="M106,324.1563 L183,324.1563 L183,331.1563 L173,341.1563 L106,341.1563 L106,324.1563 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="121" y="337.2231">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,358.4219,227,362.4219,217,366.4219,221,362.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="362.4219" y2="362.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="161" y="357.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,387.5547,298,391.5547,288,395.5547,292,391.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="391.5547" y2="391.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="246" y="386.4888">a()</text>
@@ -132,15 +132,15 @@
     <polygon fill="#A80036" points="165,415.5547,155,419.5547,165,423.5547,161,419.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="419.5547" y2="419.5547"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="72" x2="338.5" y1="435.5547" y2="435.5547"/>
-    <path d="M91,441.5547 L91,466.5547 L203,466.5547 L203,451.5547 L193,441.5547 L91,441.5547 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M91,441.5547 L91,466.5547 L203,466.5547 L203,451.5547 L193,441.5547 L91,441.5547 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M193,441.5547 L193,451.5547 L203,451.5547 L193,441.5547 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="91" x="97" y="458.6216">... or just once</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,492.8203,227,496.8203,217,500.8203,221,496.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="496.8203" y2="496.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="161" y="491.7544">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,521.9531,298,525.9531,288,529.9531,292,525.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="525.9531" y2="525.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="246" y="520.8872">a()</text>
@@ -149,12 +149,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="539.9531" y2="539.9531"/>
     <polygon fill="#A80036" points="165,549.9531,155,553.9531,165,557.9531,161,553.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="553.9531" y2="553.9531"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,586.0859,227,590.0859,217,594.0859,221,590.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="590.0859" y2="590.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="161" y="585.02">bbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,615.2188,298,619.2188,288,623.2188,292,619.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="619.2188" y2="619.2188"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="246" y="614.1528">aaa()</text>
@@ -163,24 +163,24 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="633.2188" y2="633.2188"/>
     <polygon fill="#A80036" points="165,643.2188,155,647.2188,165,651.2188,161,647.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="647.2188" y2="647.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,672.3516,227,676.3516,217,680.3516,221,676.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="676.3516" y2="676.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="161" y="671.2856">bbbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,701.4844,298,705.4844,288,709.4844,292,705.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="705.4844" y2="705.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="246" y="700.4185">aaaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="378,715.4844,388,719.4844,378,723.4844,382,719.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="310" x2="384" y1="719.4844" y2="719.4844"/>
     </a>
-    <path d="M292,732.4844 L292,757.4844 L493,757.4844 L493,742.4844 L483,732.4844 L292,732.4844 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M292,732.4844 L292,757.4844 L493,757.4844 L493,742.4844 L483,732.4844 L292,732.4844 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M483,732.4844 L483,742.4844 L493,742.4844 L483,732.4844 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="180" x="298" y="749.5513">Invoke 'add' implementation</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="538.5,768.6172,548.5,772.6172,538.5,776.6172,542.5,772.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="544.5" y1="772.6172" y2="772.6172"/>
     </a>
@@ -192,47 +192,47 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="814.6172" y2="814.6172"/>
     <polygon fill="#A80036" points="165,824.6172,155,828.6172,165,832.6172,161,828.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="828.6172" y2="828.6172"/>
-    <path d="M12,841.6172 L12,881.6172 L282,881.6172 L282,851.6172 L272,841.6172 L12,841.6172 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M12,841.6172 L12,881.6172 L282,881.6172 L282,851.6172 L272,841.6172 L12,841.6172 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M272,841.6172 L272,851.6172 L282,851.6172 L272,841.6172 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="249" x="18" y="858.6841">This comment should be rendered only</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="18" y="873.8169">once</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,908.0156,227,912.0156,217,916.0156,221,912.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="912.0156" y2="912.0156"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="56" x="161" y="906.9497">wrap(int)</text>
     </a>
     <polygon fill="#A80036" points="165,922.0156,155,926.0156,165,930.0156,161,926.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="926.0156" y2="926.0156"/>
-    <path d="M90,939.0156 L90,964.0156 L203,964.0156 L203,949.0156 L193,939.0156 L90,939.0156 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M90,939.0156 L90,964.0156 L203,964.0156 L203,949.0156 L193,939.0156 L90,939.0156 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M193,939.0156 L193,949.0156 L203,949.0156 L193,939.0156 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="92" x="96" y="956.0825">What is 2 + 2?</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L79" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L79" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L79" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L79" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="763,975.1484,773,979.1484,763,983.1484,767,979.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="769" y1="979.1484" y2="979.1484"/>
     </a>
     <polygon fill="#A80036" points="165,989.1484,155,993.1484,165,997.1484,161,993.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="779" y1="993.1484" y2="993.1484"/>
-    <path d="M80,1006.1484 L80,1031.1484 L214,1031.1484 L214,1016.1484 L204,1006.1484 L80,1006.1484 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M80,1006.1484 L80,1031.1484 L214,1031.1484 L214,1016.1484 L204,1006.1484 L80,1006.1484 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M204,1006.1484 L204,1016.1484 L214,1016.1484 L204,1006.1484 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="113" x="86" y="1023.2153">Calling B::bbbbb()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,1057.4141,227,1061.4141,217,1065.4141,221,1061.4141" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="1061.4141" y2="1061.4141"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="161" y="1056.3481">bbbbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,1086.5469,298,1090.5469,288,1094.5469,292,1090.5469" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="1090.5469" y2="1090.5469"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="246" y="1085.481">aaaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="378,1100.5469,388,1104.5469,378,1108.5469,382,1104.5469" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="310" x2="384" y1="1104.5469" y2="1104.5469"/>
     </a>
-    <path d="M292,1117.5469 L292,1142.5469 L493,1142.5469 L493,1127.5469 L483,1117.5469 L292,1117.5469 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M292,1117.5469 L292,1142.5469 L493,1142.5469 L493,1127.5469 L483,1117.5469 L292,1117.5469 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M483,1117.5469 L483,1127.5469 L493,1127.5469 L483,1117.5469 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="180" x="298" y="1134.6138">Invoke 'add' implementation</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="538.5,1153.6797,548.5,1157.6797,538.5,1161.6797,542.5,1157.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="544.5" y1="1157.6797" y2="1157.6797"/>
     </a>
@@ -244,20 +244,20 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="1199.6797" y2="1199.6797"/>
     <polygon fill="#A80036" points="165,1209.6797,155,1213.6797,165,1217.6797,161,1213.6797" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="1213.6797" y2="1213.6797"/>
-    <path d="M45,1226.6797 L45,1251.6797 L249,1251.6797 L249,1236.6797 L239,1226.6797 L45,1226.6797 " fill="#FBFB77" filter="url(#f1bulyusnguzdk)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M45,1226.6797 L45,1251.6797 L249,1251.6797 L249,1236.6797 L239,1226.6797 L45,1226.6797 " fill="#FBFB77" filter="url(#fw9qadn7cahrg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M239,1226.6797 L239,1236.6797 L249,1236.6797 L239,1226.6797 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="183" x="51" y="1243.7466">This is a conditional operator</text>
     <path d="M106,1267.8125 L170,1267.8125 L170,1274.8125 L160,1284.8125 L106,1284.8125 L106,1267.8125 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="105.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="1267.8125"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="121" y="1280.8794">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,1302.0781,227,1306.0781,217,1310.0781,221,1306.0781" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="1306.0781" y2="1306.0781"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="161" y="1301.0122">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="167" y="1301.0122">bbb()</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="201" y="1301.0122">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,1331.2109,298,1335.2109,288,1339.2109,292,1335.2109" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="1335.2109" y2="1335.2109"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="246" y="1330.145">aaa()</text>
diff --git a/docs/test_cases/t20039.md b/docs/test_cases/t20039.md
new file mode 100644
index 00000000..12a4d2a1
--- /dev/null
+++ b/docs/test_cases/t20039.md
@@ -0,0 +1,285 @@
+# t20039 - Test case for type aliases config option in sequence diagrams
+## Config
+```yaml
+diagrams:
+  t20039_sequence:
+    type: sequence
+    glob:
+      - t20039.cc
+    include:
+      namespaces:
+        - clanguml::t20039
+    using_namespace: clanguml::t20039
+    type_aliases:
+      "std::vector<int>": int_vec_t
+      "std::map<int,int>": int_map_t
+    from:
+      - function: "clanguml::t20039::tmain()"
+```
+## Source code
+File `tests/t20039/t20039.cc`
+```cpp
+#include <map>
+#include <string>
+#include <vector>
+
+namespace clanguml {
+namespace t20039 {
+
+template <typename T> struct A {
+    std::vector<std::vector<T>> a(T p) { return {}; }
+};
+
+struct R {
+    A<int> a_int;
+    A<std::vector<int>> a_intvec;
+    A<std::map<int, int>> a_intmap;
+
+    void run()
+    {
+        a_int.a({});
+        a_intvec.a({});
+        a_intmap.a({});
+    }
+};
+
+int tmain()
+{
+    R r;
+
+    r.run();
+
+    return 0;
+}
+}
+}
+```
+## Generated PlantUML diagrams
+![t20039_sequence](./t20039_sequence.svg "Test case for type aliases config option in sequence diagrams")
+## Generated Mermaid diagrams
+![t20039_sequence](./t20039_sequence_mermaid.svg "Test case for type aliases config option in sequence diagrams")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20039_sequence",
+  "participants": [
+    {
+      "display_name": "tmain()",
+      "id": "2148451609276010605",
+      "name": "tmain",
+      "namespace": "clanguml::t20039",
+      "source_location": {
+        "column": 5,
+        "file": "t20039.cc",
+        "line": 25,
+        "translation_unit": "t20039.cc"
+      },
+      "type": "function"
+    },
+    {
+      "activities": [
+        {
+          "display_name": "run()",
+          "id": "743095879760855186",
+          "name": "run",
+          "namespace": "",
+          "source_location": {
+            "column": 10,
+            "file": "t20039.cc",
+            "line": 17,
+            "translation_unit": "t20039.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "R",
+      "id": "911510236910860394",
+      "name": "R",
+      "namespace": "clanguml::t20039",
+      "source_location": {
+        "column": 8,
+        "file": "t20039.cc",
+        "line": 12,
+        "translation_unit": "t20039.cc"
+      },
+      "type": "class"
+    },
+    {
+      "activities": [
+        {
+          "display_name": "a(int)",
+          "id": "1669283381205253105",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 33,
+            "file": "t20039.cc",
+            "line": 9,
+            "translation_unit": "t20039.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<int>",
+      "id": "1909240382008619079",
+      "name": "A",
+      "namespace": "clanguml::t20039",
+      "source_location": {
+        "column": 30,
+        "file": "t20039.cc",
+        "line": 8,
+        "translation_unit": "t20039.cc"
+      },
+      "type": "class"
+    },
+    {
+      "activities": [
+        {
+          "display_name": "a(int_vec_t)",
+          "id": "102043386959871430",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 33,
+            "file": "t20039.cc",
+            "line": 9,
+            "translation_unit": "t20039.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<int_vec_t>",
+      "id": "2044714081517303079",
+      "name": "A",
+      "namespace": "clanguml::t20039",
+      "source_location": {
+        "column": 30,
+        "file": "t20039.cc",
+        "line": 8,
+        "translation_unit": "t20039.cc"
+      },
+      "type": "class"
+    },
+    {
+      "activities": [
+        {
+          "display_name": "a(int_map_t)",
+          "id": "720393008985738554",
+          "name": "a",
+          "namespace": "",
+          "source_location": {
+            "column": 33,
+            "file": "t20039.cc",
+            "line": 9,
+            "translation_unit": "t20039.cc"
+          },
+          "type": "method"
+        }
+      ],
+      "display_name": "A<int_map_t>",
+      "id": "1577435969137543418",
+      "name": "A",
+      "namespace": "clanguml::t20039",
+      "source_location": {
+        "column": 30,
+        "file": "t20039.cc",
+        "line": 8,
+        "translation_unit": "t20039.cc"
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "2148451609276010605",
+            "participant_id": "2148451609276010605"
+          },
+          "name": "run()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 5,
+            "file": "t20039.cc",
+            "line": 29,
+            "translation_unit": "t20039.cc"
+          },
+          "to": {
+            "activity_id": "743095879760855186",
+            "participant_id": "911510236910860394"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "743095879760855186",
+            "participant_id": "911510236910860394"
+          },
+          "name": "a(int)",
+          "return_type": "std::vector<std::vector<int>>",
+          "scope": "normal",
+          "source_location": {
+            "column": 9,
+            "file": "t20039.cc",
+            "line": 19,
+            "translation_unit": "t20039.cc"
+          },
+          "to": {
+            "activity_id": "1669283381205253105",
+            "participant_id": "1909240382008619079"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "743095879760855186",
+            "participant_id": "911510236910860394"
+          },
+          "name": "a(int_vec_t)",
+          "return_type": "std::vector<std::vector<vector<int,allocator<int>>>>",
+          "scope": "normal",
+          "source_location": {
+            "column": 9,
+            "file": "t20039.cc",
+            "line": 20,
+            "translation_unit": "t20039.cc"
+          },
+          "to": {
+            "activity_id": "102043386959871430",
+            "participant_id": "2044714081517303079"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "743095879760855186",
+            "participant_id": "911510236910860394"
+          },
+          "name": "a(int_map_t)",
+          "return_type": "std::vector<std::vector<map<int,int,less<int>,allocator<pair<const int,int>>>>>",
+          "scope": "normal",
+          "source_location": {
+            "column": 9,
+            "file": "t20039.cc",
+            "line": 21,
+            "translation_unit": "t20039.cc"
+          },
+          "to": {
+            "activity_id": "720393008985738554",
+            "participant_id": "1577435969137543418"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 2148451609276010605,
+        "location": "clanguml::t20039::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20039"
+}
+```
diff --git a/docs/test_cases/t20039_sequence.svg b/docs/test_cases/t20039_sequence.svg
new file mode 100644
index 00000000..afe69f1a
--- /dev/null
+++ b/docs/test_cases/t20039_sequence.svg
@@ -0,0 +1,84 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="257px" preserveAspectRatio="none" style="width:453px;height:257px;" version="1.1" viewBox="0 0 453 257" width="453px" zoomAndPan="magnify">
+  <defs>
+    <filter height="300%" id="frcrubha2ju9e" 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>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="150.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="129.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="96" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="159" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="258.5" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="382.5" y="184.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="216.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="101" x2="101" y1="38.2969" y2="216.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="164" x2="164" y1="38.2969" y2="216.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="263" x2="263" y1="38.2969" y2="216.8281"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="387" x2="387" y1="38.2969" y2="216.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="215.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="235.8232">tmain()</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L12" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L12" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="87" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="94" y="22.9951">R</text>
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="87" y="215.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="94" y="235.8232">R</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="130" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="137" y="22.9951">A&lt;int&gt;</text>
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="130" y="215.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="137" y="235.8232">A&lt;int&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="208" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="93" x="215" y="22.9951">A&lt;int_vec_t&gt;</text>
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="208" y="215.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="93" x="215" y="235.8232">A&lt;int_vec_t&gt;</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="329" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="336" y="22.9951">A&lt;int_map_t&gt;</text>
+      <rect fill="#FEFECE" filter="url(#frcrubha2ju9e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="329" y="215.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="336" y="235.8232">A&lt;int_map_t&gt;</text>
+    </a>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="150.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="129.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="96" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="159" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="258.5" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#frcrubha2ju9e)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="382.5" y="184.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="84,65.4297,94,69.4297,84,73.4297,88,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="90" y1="69.4297" y2="69.4297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="53" y="64.3638">run()</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="147,94.5625,157,98.5625,147,102.5625,151,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="106" x2="153" y1="98.5625" y2="98.5625"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="113" y="93.4966">a(int)</text>
+    </a>
+    <polygon fill="#A80036" points="117,108.5625,107,112.5625,117,116.5625,113,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="111" x2="163" y1="112.5625" y2="112.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="246.5,137.6953,256.5,141.6953,246.5,145.6953,250.5,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="106" x2="252.5" y1="141.6953" y2="141.6953"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="113" y="136.6294">a(int_vec_t)</text>
+    </a>
+    <polygon fill="#A80036" points="117,151.6953,107,155.6953,117,159.6953,113,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="111" x2="262.5" y1="155.6953" y2="155.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t20039/t20039.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="370.5,180.8281,380.5,184.8281,370.5,188.8281,374.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="106" x2="376.5" y1="184.8281" y2="184.8281"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="113" y="179.7622">a(int_map_t)</text>
+    </a>
+    <polygon fill="#A80036" points="112,194.8281,102,198.8281,112,202.8281,108,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="106" x2="386.5" y1="198.8281" y2="198.8281"/>
+  </g>
+</svg>
diff --git a/docs/test_cases/t20039_sequence_mermaid.svg b/docs/test_cases/t20039_sequence_mermaid.svg
new file mode 100644
index 00000000..22f712ae
--- /dev/null
+++ b/docs/test_cases/t20039_sequence_mermaid.svg
@@ -0,0 +1,144 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1050 385" style="max-width: 1050px; background-color: white;" width="1050" id="my-svg">
+  <g>
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="299" x="800"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="331.5" x="875">
+      <tspan dy="0" x="875">A&lt;int_map_t&gt;</tspan>
+    </text>
+  </g>
+  <g>
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="299" x="600"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="331.5" x="675">
+      <tspan dy="0" x="675">A&lt;int_vec_t&gt;</tspan>
+    </text>
+  </g>
+  <g>
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="299" x="400"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="331.5" x="475">
+      <tspan dy="0" x="475">A&lt;int&gt;</tspan>
+    </text>
+  </g>
+  <g>
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="299" x="200"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="331.5" x="275">
+      <tspan dy="0" x="275">R</tspan>
+    </text>
+  </g>
+  <g>
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="299" x="0"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="331.5" x="75">
+      <tspan dy="0" x="75">tmain()</tspan>
+    </text>
+  </g>
+  <g>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="299" x2="875" y1="5" x1="875" id="actor4"/>
+    <g id="root-4">
+      <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="800"/>
+      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="875">
+        <tspan dy="0" x="875">A&lt;int_map_t&gt;</tspan>
+      </text>
+    </g>
+  </g>
+  <g>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="299" x2="675" y1="5" x1="675" id="actor3"/>
+    <g id="root-3">
+      <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="600"/>
+      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="675">
+        <tspan dy="0" x="675">A&lt;int_vec_t&gt;</tspan>
+      </text>
+    </g>
+  </g>
+  <g>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="299" x2="475" y1="5" x1="475" id="actor2"/>
+    <g id="root-2">
+      <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="400"/>
+      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="475">
+        <tspan dy="0" x="475">A&lt;int&gt;</tspan>
+      </text>
+    </g>
+  </g>
+  <g>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="299" x2="275" y1="5" x1="275" id="actor1"/>
+    <g id="root-1">
+      <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="200"/>
+      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="275">
+        <tspan dy="0" x="275">R</tspan>
+      </text>
+    </g>
+  </g>
+  <g>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="299" x2="75" y1="5" x1="75" id="actor0"/>
+    <g id="root-0">
+      <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="0"/>
+      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="75">
+        <tspan dy="0" x="75">tmain()</tspan>
+      </text>
+    </g>
+  </g>
+  <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .actor{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#my-svg text.actor&gt;tspan{fill:black;stroke:none;}#my-svg .actor-line{stroke:grey;}#my-svg .messageLine0{stroke-width:1.5;stroke-dasharray:none;stroke:#333;}#my-svg .messageLine1{stroke-width:1.5;stroke-dasharray:2,2;stroke:#333;}#my-svg #arrowhead path{fill:#333;stroke:#333;}#my-svg .sequenceNumber{fill:white;}#my-svg #sequencenumber{fill:#333;}#my-svg #crosshead path{fill:#333;stroke:#333;}#my-svg .messageText{fill:#333;stroke:none;}#my-svg .labelBox{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#my-svg .labelText,#my-svg .labelText&gt;tspan{fill:black;stroke:none;}#my-svg .loopText,#my-svg .loopText&gt;tspan{fill:black;stroke:none;}#my-svg .loopLine{stroke-width:2px;stroke-dasharray:2,2;stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);}#my-svg .note{stroke:#aaaa33;fill:#fff5ad;}#my-svg .noteText,#my-svg .noteText&gt;tspan{fill:black;stroke:none;}#my-svg .activation0{fill:#f4f4f4;stroke:#666;}#my-svg .activation1{fill:#f4f4f4;stroke:#666;}#my-svg .activation2{fill:#f4f4f4;stroke:#666;}#my-svg .actorPopupMenu{position:absolute;}#my-svg .actorPopupMenuPanel{position:absolute;fill:#ECECFF;box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);filter:drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4));}#my-svg .actor-man line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#my-svg .actor-man circle,#my-svg line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;stroke-width:2px;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
+  <g/>
+  <defs>
+    <symbol height="24" width="24" id="computer">
+      <path d="M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z" transform="scale(.5)"/>
+    </symbol>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <defs>
+    <symbol clip-rule="evenodd" fill-rule="evenodd" id="database">
+      <path d="M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z" transform="scale(.5)"/>
+    </symbol>
+  </defs>
+  <defs>
+    <symbol height="24" width="24" id="clock">
+      <path d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z" transform="scale(.5)"/>
+    </symbol>
+  </defs>
+  <defs>
+    <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead">
+      <path d="M 0 0 L 10 5 L 0 10 z"/>
+    </marker>
+  </defs>
+  <defs>
+    <marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead">
+      <path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/>
+    </marker>
+  </defs>
+  <defs>
+    <marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head">
+      <path d="M 18,7 L9,13 L14,7 L9,1 Z"/>
+    </marker>
+  </defs>
+  <defs>
+    <marker orient="auto" markerHeight="40" markerWidth="60" refY="15" refX="15" id="sequencenumber">
+      <circle r="6" cy="15" cx="15"/>
+    </marker>
+  </defs>
+  <g>
+    <rect class="activation0" ry="0" rx="0" height="214" width="10" stroke="#666" fill="#EDF2AE" y="65" x="70"/>
+  </g>
+  <g>
+    <rect class="activation0" ry="0" rx="0" height="166" width="10" stroke="#666" fill="#EDF2AE" y="113" x="270"/>
+  </g>
+  <g>
+    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="161" x="470"/>
+  </g>
+  <g>
+    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="217" x="670"/>
+  </g>
+  <g>
+    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="273" x="870"/>
+  </g>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="178">run()</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="275" y1="111" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="378">a(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="475" y1="157" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="375">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="167" x2="280" y1="167" x1="470"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="182" x="478">a(int_vec_t)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="213" x2="675" y1="213" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="228" x="475">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="223" x2="280" y1="223" x1="670"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="238" x="578">a(int_map_t)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="269" x2="875" y1="269" x1="280"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="284" x="575">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="279" x2="280" y1="279" x1="870"/>
+</svg>
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 36e8b100..d3e71fd9 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="284px" preserveAspectRatio="none" style="width:854px;height:284px;" version="1.1" viewBox="0 0 854 284" width="854px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1gwq2me517zi4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f50ql98bh001k" 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"/>
@@ -10,63 +10,63 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="282" x="292" y="16.708">Basic package diagram example</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="49,69.9531,66,69.9531,73,92.25,370,92.25,370,272.9531,49,272.9531,49,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="49,69.9531,66,69.9531,73,92.25,370,92.25,370,272.9531,49,272.9531,49,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="49" x2="73" y1="92.25" y2="92.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="53" y="84.9482">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="132,120.9531,160,120.9531,167,143.25,338,143.25,338,240.9531,132,240.9531,132,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="132,120.9531,160,120.9531,167,143.25,338,143.25,338,240.9531,132,240.9531,132,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="132" x2="167" y1="143.25" y2="143.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="136" y="135.9482">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="511,69.9531,527,69.9531,534,92.25,832,92.25,832,272.9531,511,272.9531,511,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="511,69.9531,527,69.9531,534,92.25,832,92.25,832,272.9531,511,272.9531,511,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="511" x2="534" y1="92.25" y2="92.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="515" y="84.9482">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="594,120.9531,622,120.9531,629,143.25,800,143.25,800,240.9531,594,240.9531,594,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="594,120.9531,622,120.9531,629,143.25,800,143.25,800,240.9531,594,240.9531,594,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="594" x2="629" y1="143.25" y2="143.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="598" y="135.9482">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="260.5,163.9531,299.5,163.9531,306.5,186.25,313.5,186.25,313.5,216.5469,260.5,216.5469,260.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="260.5,163.9531,299.5,163.9531,306.5,186.25,313.5,186.25,313.5,216.5469,260.5,216.5469,260.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="260.5" x2="306.5" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="264.5" y="178.9482">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="175,163.9531,211,163.9531,218,186.25,225,186.25,225,216.5469,175,216.5469,175,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="175,163.9531,211,163.9531,218,186.25,225,186.25,225,216.5469,175,216.5469,175,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="218" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="178.9482">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="65,163.9531,91,163.9531,98,186.25,105,186.25,105,216.5469,65,216.5469,65,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="65,163.9531,91,163.9531,98,186.25,105,186.25,105,216.5469,65,216.5469,65,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="98" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="69" y="178.9482">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="722.5,163.9531,761.5,163.9531,768.5,186.25,775.5,186.25,775.5,216.5469,722.5,216.5469,722.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="722.5,163.9531,761.5,163.9531,768.5,186.25,775.5,186.25,775.5,216.5469,722.5,216.5469,722.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="722.5" x2="768.5" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="726.5" y="178.9482">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="637,163.9531,673,163.9531,680,186.25,687,186.25,687,216.5469,637,216.5469,637,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="637,163.9531,673,163.9531,680,186.25,687,186.25,687,216.5469,637,216.5469,637,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="637" x2="680" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="641" y="178.9482">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gwq2me517zi4)" points="527,163.9531,553,163.9531,560,186.25,567,186.25,567,216.5469,527,216.5469,527,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f50ql98bh001k)" points="527,163.9531,553,163.9531,560,186.25,567,186.25,567,216.5469,527,216.5469,527,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="527" x2="560" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="531" y="178.9482">BB</text>
     </a>
-    <path d="M386,177.9531 L386,203.0859 L492,203.0859 L492,187.9531 L482,177.9531 L386,177.9531 " fill="#FBFB77" filter="url(#f1gwq2me517zi4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M386,177.9531 L386,203.0859 L492,203.0859 L492,187.9531 L482,177.9531 L386,177.9531 " fill="#FBFB77" filter="url(#f50ql98bh001k)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M482,177.9531 L482,187.9531 L492,187.9531 L482,177.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="392" y="195.02">A AAA note...</text>
-    <path d="M6,28.9531 L6,54.0859 L274,54.0859 L274,38.9531 L264,28.9531 L6,28.9531 " fill="#FBFB77" filter="url(#f1gwq2me517zi4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,28.9531 L6,54.0859 L274,54.0859 L274,38.9531 L264,28.9531 L6,28.9531 " fill="#FBFB77" filter="url(#f50ql98bh001k)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M264,28.9531 L264,38.9531 L274,38.9531 L264,28.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="12" y="46.02">This is namespace AA in namespace A</text>
-    <path d="M468,28.9531 L468,54.0859 L736,54.0859 L736,38.9531 L726,28.9531 L468,28.9531 " fill="#FBFB77" filter="url(#f1gwq2me517zi4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M468,28.9531 L468,54.0859 L736,54.0859 L736,38.9531 L726,28.9531 L468,28.9531 " fill="#FBFB77" filter="url(#f50ql98bh001k)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M726,28.9531 L726,38.9531 L736,38.9531 L726,28.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="474" y="46.02">This is namespace AA in namespace B</text>
     <path d="M313.72,190.4531 C337.7,190.4531 361.68,190.4531 385.66,190.4531 " fill="none" id="C_0000274638237740249424-GMN1274" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index abcb8eb2..4869506a 100644
--- a/docs/test_cases/t30002_package.svg
+++ b/docs/test_cases/t30002_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1548px;height:402px;" version="1.1" viewBox="0 0 1548 402" width="1548px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10kidrnllwcwz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1iydibpudwuh5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,118 +9,118 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="22,219,39,219,46,241.2969,1526,241.2969,1526,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="22,219,39,219,46,241.2969,1526,241.2969,1526,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="241.2969" y2="241.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="46,262,74,262,81,284.2969,1502,284.2969,1502,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="46,262,74,262,81,284.2969,1502,284.2969,1502,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="81" y1="284.2969" y2="284.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="50" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="751,24,767,24,774,46.2969,881,46.2969,881,195,751,195,751,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="751,24,767,24,774,46.2969,881,46.2969,881,195,751,195,751,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="751" x2="774" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="755" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="775,67,801,67,808,89.2969,857,89.2969,857,171,775,171,775,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="775,67,801,67,808,89.2969,857,89.2969,857,171,775,171,775,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="775" x2="808" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="779" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1444.5,297,1471.5,297,1478.5,319.2969,1485.5,319.2969,1485.5,349.5938,1444.5,349.5938,1444.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="1444.5,297,1471.5,297,1478.5,319.2969,1485.5,319.2969,1485.5,349.5938,1444.5,349.5938,1444.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1444.5" x2="1478.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1448.5" y="311.9951">A1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1368.5,297,1395.5,297,1402.5,319.2969,1409.5,319.2969,1409.5,349.5938,1368.5,349.5938,1368.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="1368.5,297,1395.5,297,1402.5,319.2969,1409.5,319.2969,1409.5,349.5938,1368.5,349.5938,1368.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1368.5" x2="1402.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1372.5" y="311.9951">A2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1292.5,297,1319.5,297,1326.5,319.2969,1333.5,319.2969,1333.5,349.5938,1292.5,349.5938,1292.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="1292.5,297,1319.5,297,1326.5,319.2969,1333.5,319.2969,1333.5,349.5938,1292.5,349.5938,1292.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1292.5" x2="1326.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1296.5" y="311.9951">A3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1216.5,297,1243.5,297,1250.5,319.2969,1257.5,319.2969,1257.5,349.5938,1216.5,349.5938,1216.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="1216.5,297,1243.5,297,1250.5,319.2969,1257.5,319.2969,1257.5,349.5938,1216.5,349.5938,1216.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1216.5" x2="1250.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1220.5" y="311.9951">A4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1140.5,297,1167.5,297,1174.5,319.2969,1181.5,319.2969,1181.5,349.5938,1140.5,349.5938,1140.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="1140.5,297,1167.5,297,1174.5,319.2969,1181.5,319.2969,1181.5,349.5938,1140.5,349.5938,1140.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1140.5" x2="1174.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1144.5" y="311.9951">A5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="1064.5,297,1091.5,297,1098.5,319.2969,1105.5,319.2969,1105.5,349.5938,1064.5,349.5938,1064.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="1064.5,297,1091.5,297,1098.5,319.2969,1105.5,319.2969,1105.5,349.5938,1064.5,349.5938,1064.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1064.5" x2="1098.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1068.5" y="311.9951">A6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="988.5,297,1015.5,297,1022.5,319.2969,1029.5,319.2969,1029.5,349.5938,988.5,349.5938,988.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="988.5,297,1015.5,297,1022.5,319.2969,1029.5,319.2969,1029.5,349.5938,988.5,349.5938,988.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="988.5" x2="1022.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="992.5" y="311.9951">A7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="912.5,297,939.5,297,946.5,319.2969,953.5,319.2969,953.5,349.5938,912.5,349.5938,912.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="912.5,297,939.5,297,946.5,319.2969,953.5,319.2969,953.5,349.5938,912.5,349.5938,912.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="912.5" x2="946.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="916.5" y="311.9951">A8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="836.5,297,863.5,297,870.5,319.2969,877.5,319.2969,877.5,349.5938,836.5,349.5938,836.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="836.5,297,863.5,297,870.5,319.2969,877.5,319.2969,877.5,349.5938,836.5,349.5938,836.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="836.5" x2="870.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="840.5" y="311.9951">A9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="750.5,297,787.5,297,794.5,319.2969,801.5,319.2969,801.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="750.5,297,787.5,297,794.5,319.2969,801.5,319.2969,801.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="750.5" x2="794.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="754.5" y="311.9951">A10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="664.5" x2="708.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="668.5" y="311.9951">A11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="578.5" x2="622.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="582.5" y="311.9951">A12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="492.5" x2="536.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="496.5" y="311.9951">A13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="450.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="410.5" y="311.9951">A14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kidrnllwcwz)" points="791,102,827,102,834,124.2969,841,124.2969,841,154.5938,791,154.5938,791,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1iydibpudwuh5)" points="791,102,827,102,834,124.2969,841,124.2969,841,154.5938,791,154.5938,791,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="791" x2="834" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="795" y="116.9951">BBB</text>
     </a>
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index 6c6fbe95..a4840cd2 100644
--- a/docs/test_cases/t30003_package.svg
+++ b/docs/test_cases/t30003_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="351px" preserveAspectRatio="none" style="width:341px;height:351px;" version="1.1" viewBox="0 0 341 351" width="341px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13mpkvaocj8qz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f3tt32jp2490x" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,35 +9,35 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" points="22,235,57,235,64,257.2969,319,257.2969,319,339,22,339,22,235" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3tt32jp2490x)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" points="183,24,218,24,225,46.2969,313,46.2969,313,211,183,211,183,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3tt32jp2490x)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" points="207,83,242,83,249,105.2969,289,105.2969,289,187,207,187,207,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3tt32jp2490x)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3tt32jp2490x)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3tt32jp2490x)" 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>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f13mpkvaocj8qz)" 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;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3tt32jp2490x)" 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>
     </a>
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index b4898de0..749e335c 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="253px" preserveAspectRatio="none" style="width:614px;height:253px;" version="1.1" viewBox="0 0 614 253" width="614px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1oistctiv1t7j" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fm9q5h261c2nz" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#008000" filter="url(#f1oistctiv1t7j)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#008000" filter="url(#fm9q5h261c2nz)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text>
     </a>
-    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1oistctiv1t7j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#fm9q5h261c2nz)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M325,186 L325,196 L335,196 L325,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="231" y="203.0669">Package AAA.</text>
-    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1oistctiv1t7j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#fm9q5h261c2nz)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M566,73 L566,83 L576,83 L566,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="472" y="90.0669">Package BBB.</text>
-    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1oistctiv1t7j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#fm9q5h261c2nz)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M180,186 L180,196 L190,196 L180,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="44" y="203.0669">CCCC package note.</text>
-    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1oistctiv1t7j)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#fm9q5h261c2nz)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M335.5,73 L335.5,83 L345.5,83 L335.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="220.5" y="90.0669">We skipped DDD.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1oistctiv1t7j)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fm9q5h261c2nz)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="126.5" x2="172.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="130.5" y="73.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1oistctiv1t7j)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fm9q5h261c2nz)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="381" x2="424" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="385" y="73.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1oistctiv1t7j)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fm9q5h261c2nz)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">CCC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
-      <polygon fill="#FFC0CB" filter="url(#f1oistctiv1t7j)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
+      <polygon fill="#FFC0CB" filter="url(#fm9q5h261c2nz)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="370.5" x2="410.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="374.5" y="186.9951">EEE</text>
     </a>
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index 45299bae..6d4942bf 100644
--- a/docs/test_cases/t30005_package.svg
+++ b/docs/test_cases/t30005_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:332px;height:402px;" version="1.1" viewBox="0 0 332 402" width="332px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fpbe7d6ns1bze" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f33a9n43fisw4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,48 +9,48 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="98" x2="122" y1="241.2969" y2="241.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="102" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="122" x2="157" y1="284.2969" y2="284.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="126" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="45" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="26" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="79" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="50" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="176" x2="200" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="180" y="38.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpbe7d6ns1bze)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f33a9n43fisw4)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="216.5" x2="262.5" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="220.5" y="116.9951">CCC</text>
     </a>
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index c7957dbd..717e1645 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:124px;height:270px;" version="1.1" viewBox="0 0 124 270" width="124px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="few2cqx8xbx6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fqvxs5uf02q0o" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#few2cqx8xbx6)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fqvxs5uf02q0o)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#few2cqx8xbx6)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fqvxs5uf02q0o)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="115.2969" y2="115.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="107.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#few2cqx8xbx6)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fqvxs5uf02q0o)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text>
     </a>
-    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#few2cqx8xbx6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#fqvxs5uf02q0o)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M91,8 L91,18 L101,18 L91,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="13" y="25.0669">Top A note.</text>
     <path d="M54,33.01 C54,47.66 54,73.41 54,92.83 " fill="none" id="GMN1396-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 72cbcfcb..8993318f 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:234px;height:277px;" version="1.1" viewBox="0 0 234 277" width="234px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fs7zudhnzg3cc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ft8o7rq5pxwd0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,27 +9,27 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fs7zudhnzg3cc)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ft8o7rq5pxwd0)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="100.5" x2="124.5" y1="79.2969" y2="79.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="104.5" y="71.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fs7zudhnzg3cc)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ft8o7rq5pxwd0)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="182.5" x2="205.5" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="186.5" y="227.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fs7zudhnzg3cc)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ft8o7rq5pxwd0)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="143.5" x2="178.5" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="147.5" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fs7zudhnzg3cc)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ft8o7rq5pxwd0)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="116" x2="140" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="120" y="227.9951">C</text>
     </a>
-    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#fs7zudhnzg3cc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#ft8o7rq5pxwd0)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M201,8 L201,18 L211,18 L201,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="12" y="25.0669">Compare layout with t30006.</text>
     <path d="M108.5,33.03 C108.5,36.3613 108.5,40.2728 108.5,44.5714 C108.5,46.7207 108.5,48.9668 108.5,51.2855 C108.5,52.4448 108.5,53.6223 108.5,54.8149 C108.5,55.4112 108.5,56.0113 108.5,56.6148 " fill="none" id="GMN1408-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg
index 8649cdb3..6f95b1d2 100644
--- a/docs/test_cases/t30008_package.svg
+++ b/docs/test_cases/t30008_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="366px" preserveAspectRatio="none" style="width:306px;height:366px;" version="1.1" viewBox="0 0 306 366" width="306px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f3usm3uo9lzx2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f125ai4u6f2spq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f125ai4u6f2spq)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f125ai4u6f2spq)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="156" x2="281" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="160" y="38.9951">dependencies</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f125ai4u6f2spq)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="299.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f125ai4u6f2spq)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="85" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="66" y="186.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f125ai4u6f2spq)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="73.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f125ai4u6f2spq)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204.5" x2="228.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="208.5" y="299.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f125ai4u6f2spq)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="186.9951">E</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f3usm3uo9lzx2)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f125ai4u6f2spq)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="73.9951">F</text>
     </a>
diff --git a/docs/test_cases/t30009_package.svg b/docs/test_cases/t30009_package.svg
index 339e3526..dcf4ae6f 100644
--- a/docs/test_cases/t30009_package.svg
+++ b/docs/test_cases/t30009_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:639px;height:188px;" version="1.1" viewBox="0 0 639 188" width="639px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fpxogudnib74o" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ffc6kf6f9atjw" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="22,24,60,24,67,46.2969,308,46.2969,308,176,22,176,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="22,24,60,24,67,46.2969,308,46.2969,308,176,22,176,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="67" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="26" y="38.9951">One</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="332,24,372,24,379,46.2969,617,46.2969,617,176,332,176,332,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="332,24,372,24,379,46.2969,617,46.2969,617,176,332,176,332,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="332" x2="379" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="336" y="38.9951">Two</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="105,83,121,83,128,105.2969,135,105.2969,135,135.5938,105,135.5938,105,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="105,83,121,83,128,105.2969,135,105.2969,135,135.5938,105,135.5938,105,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="128" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="109" y="97.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="38.5,83,55.5,83,62.5,105.2969,69.5,105.2969,69.5,135.5938,38.5,135.5938,38.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="38.5,83,55.5,83,62.5,105.2969,69.5,105.2969,69.5,135.5938,38.5,135.5938,38.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="97.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="236.5,83,253.5,83,260.5,105.2969,267.5,105.2969,267.5,135.5938,236.5,135.5938,236.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="236.5,83,253.5,83,260.5,105.2969,267.5,105.2969,267.5,135.5938,236.5,135.5938,236.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="236.5" x2="260.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="240.5" y="97.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="170.5,83,187.5,83,194.5,105.2969,201.5,105.2969,201.5,135.5938,170.5,135.5938,170.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="170.5,83,187.5,83,194.5,105.2969,201.5,105.2969,201.5,135.5938,170.5,135.5938,170.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="170.5" x2="194.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="174.5" y="97.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="348.5,83,365.5,83,372.5,105.2969,379.5,105.2969,379.5,135.5938,348.5,135.5938,348.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="348.5,83,365.5,83,372.5,105.2969,379.5,105.2969,379.5,135.5938,348.5,135.5938,348.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="348.5" x2="372.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="352.5" y="97.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="547,83,563,83,570,105.2969,577,105.2969,577,135.5938,547,135.5938,547,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="547,83,563,83,570,105.2969,577,105.2969,577,135.5938,547,135.5938,547,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="547" x2="570" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="551" y="97.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="480.5,83,497.5,83,504.5,105.2969,511.5,105.2969,511.5,135.5938,480.5,135.5938,480.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="480.5,83,497.5,83,504.5,105.2969,511.5,105.2969,511.5,135.5938,480.5,135.5938,480.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="480.5" x2="504.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="484.5" y="97.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fpxogudnib74o)" points="414.5,83,431.5,83,438.5,105.2969,445.5,105.2969,445.5,135.5938,414.5,135.5938,414.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#ffc6kf6f9atjw)" points="414.5,83,431.5,83,438.5,105.2969,445.5,105.2969,445.5,135.5938,414.5,135.5938,414.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="414.5" x2="438.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="418.5" y="97.9951">D</text>
     </a>
diff --git a/docs/test_cases/t30010_package.svg b/docs/test_cases/t30010_package.svg
index 659cb5bd..ec5d993d 100644
--- a/docs/test_cases/t30010_package.svg
+++ b/docs/test_cases/t30010_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="202px" preserveAspectRatio="none" style="width:373px;height:202px;" version="1.1" viewBox="0 0 373 202" width="373px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f17dnoc1lbmb9g" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f12mcotlysc996" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,31 +9,31 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f12mcotlysc996)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="99" y1="108.2969" y2="108.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="26" y="100.9951">libraries</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib1/lib1.h#L7" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib1/lib1.h#L7" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/libraries/lib1/lib1.h#L7" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/libraries/lib1/lib1.h#L7" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f12mcotlysc996)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="287" x2="328" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="291" y="135.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib2/lib2.h#L7" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib2/lib2.h#L7" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/libraries/lib2/lib2.h#L7" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/libraries/lib2/lib2.h#L7" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f12mcotlysc996)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="245" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="208" y="135.9951">lib2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib3/lib3.h#L7" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib3/lib3.h#L7" xlink:show="new" xlink:title="lib3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/libraries/lib3/lib3.h#L7" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/libraries/lib3/lib3.h#L7" xlink:show="new" xlink:title="lib3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f12mcotlysc996)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="162" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="125" y="135.9951">lib3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib4/lib4.h#L7" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/libraries/lib4/lib4.h#L7" xlink:show="new" xlink:title="lib4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/libraries/lib4/lib4.h#L7" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/libraries/lib4/lib4.h#L7" xlink:show="new" xlink:title="lib4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f12mcotlysc996)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="135.9951">lib4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/app/app.h#L11" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30010/app/app.h#L11" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f17dnoc1lbmb9g)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/app/app.h#L11" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30010/app/app.h#L11" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f12mcotlysc996)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="161.5" x2="203.5" y1="30.2969" y2="30.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="165.5" y="22.9951">app</text>
     </a>
diff --git a/docs/test_cases/t30011_package.svg b/docs/test_cases/t30011_package.svg
index 3cde2fcb..12c18634 100644
--- a/docs/test_cases/t30011_package.svg
+++ b/docs/test_cases/t30011_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="202px" preserveAspectRatio="none" style="width:373px;height:202px;" version="1.1" viewBox="0 0 373 202" width="373px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbnsh20s89p3x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhc9ir2fh2kzl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,31 +9,31 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhc9ir2fh2kzl)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="99" y1="108.2969" y2="108.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="26" y="100.9951">libraries</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib1/lib1.h#L3" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib1/lib1.h#L3" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/libraries/lib1/lib1.h#L3" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/libraries/lib1/lib1.h#L3" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fhc9ir2fh2kzl)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="287" x2="328" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="291" y="135.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib2/lib2.h#L3" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib2/lib2.h#L3" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/libraries/lib2/lib2.h#L3" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/libraries/lib2/lib2.h#L3" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fhc9ir2fh2kzl)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="245" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="208" y="135.9951">lib2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib3/lib3.h#L3" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib3/lib3.h#L3" xlink:show="new" xlink:title="lib3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/libraries/lib3/lib3.h#L3" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/libraries/lib3/lib3.h#L3" xlink:show="new" xlink:title="lib3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fhc9ir2fh2kzl)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="162" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="125" y="135.9951">lib3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib4/lib4.h#L3" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/libraries/lib4/lib4.h#L3" xlink:show="new" xlink:title="lib4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/libraries/lib4/lib4.h#L3" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/libraries/lib4/lib4.h#L3" xlink:show="new" xlink:title="lib4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fhc9ir2fh2kzl)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="135.9951">lib4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/app/app.h#L8" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30011/app/app.h#L8" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fbnsh20s89p3x)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/app/app.h#L8" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30011/app/app.h#L8" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fhc9ir2fh2kzl)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="161.5" x2="203.5" y1="30.2969" y2="30.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="165.5" y="22.9951">app</text>
     </a>
diff --git a/docs/test_cases/t30012_package.svg b/docs/test_cases/t30012_package.svg
index 94271210..7239c608 100644
--- a/docs/test_cases/t30012_package.svg
+++ b/docs/test_cases/t30012_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:346px;height:207px;" version="1.1" viewBox="0 0 346 207" width="346px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1axvf5xu1laap" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fjnxdc4ynlgm9" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,26 +9,26 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="22,24,57,24,64,46.2969,324,46.2969,324,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fjnxdc4ynlgm9)" points="22,24,57,24,64,46.2969,324,46.2969,324,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1.cppm#L4" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1.cppm#L4" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="105,67,139,67,146,89.2969,300,89.2969,300,171,105,171,105,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30012/src/lib1.cppm#L4" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30012/src/lib1.cppm#L4" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fjnxdc4ynlgm9)" points="105,67,139,67,146,89.2969,300,89.2969,300,171,105,171,105,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="146" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="109" y="81.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="220,102,270,102,277,124.2969,284,124.2969,284,154.5938,220,154.5938,220,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30012/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30012/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fjnxdc4ynlgm9)" points="220,102,270,102,277,124.2969,284,124.2969,284,154.5938,220,154.5938,220,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="220" x2="277" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="224" y="116.9951">mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="121,102,171,102,178,124.2969,185,124.2969,185,154.5938,121,154.5938,121,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30012/src/lib1mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30012/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fjnxdc4ynlgm9)" points="121,102,171,102,178,124.2969,185,124.2969,185,154.5938,121,154.5938,121,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="178" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="125" y="116.9951">mod2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib2.cppm#L4" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30012/src/lib2.cppm#L4" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1axvf5xu1laap)" points="38,102,72,102,79,124.2969,86,124.2969,86,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30012/src/lib2.cppm#L4" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30012/src/lib2.cppm#L4" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fjnxdc4ynlgm9)" points="38,102,72,102,79,124.2969,86,124.2969,86,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="79" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="116.9951">lib2</text>
     </a>
diff --git a/docs/test_cases/t30013_package.svg b/docs/test_cases/t30013_package.svg
index 8ce4750f..bb9152a3 100644
--- a/docs/test_cases/t30013_package.svg
+++ b/docs/test_cases/t30013_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="185px" preserveAspectRatio="none" style="width:1865px;height:185px;" version="1.1" viewBox="0 0 1865 185" width="1865px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1dvgilhbgsogz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1wmcugrq1apjn" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,98 +9,98 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="6,121,56,121,63,143.2969,70,143.2969,70,173.5938,6,173.5938,6,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="6,121,56,121,63,143.2969,70,143.2969,70,173.5938,6,173.5938,6,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="63" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="10" y="135.9951">mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="105,121,155,121,162,143.2969,169,143.2969,169,173.5938,105,173.5938,105,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="105,121,155,121,162,143.2969,169,143.2969,169,173.5938,105,173.5938,105,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="162" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="109" y="135.9951">mod2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod3.cppm#L4" target="_top" title="mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod3.cppm#L4" xlink:show="new" xlink:title="mod3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="204,121,254,121,261,143.2969,268,143.2969,268,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod3.cppm#L4" target="_top" title="mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod3.cppm#L4" xlink:show="new" xlink:title="mod3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="204,121,254,121,261,143.2969,268,143.2969,268,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="261" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="208" y="135.9951">mod3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod4.cppm#L4" target="_top" title="mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod4.cppm#L4" xlink:show="new" xlink:title="mod4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="303,121,353,121,360,143.2969,367,143.2969,367,173.5938,303,173.5938,303,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod4.cppm#L4" target="_top" title="mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod4.cppm#L4" xlink:show="new" xlink:title="mod4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="303,121,353,121,360,143.2969,367,143.2969,367,173.5938,303,173.5938,303,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="303" x2="360" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="307" y="135.9951">mod4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod5.cppm#L4" target="_top" title="mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod5.cppm#L4" xlink:show="new" xlink:title="mod5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="402,121,452,121,459,143.2969,466,143.2969,466,173.5938,402,173.5938,402,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod5.cppm#L4" target="_top" title="mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod5.cppm#L4" xlink:show="new" xlink:title="mod5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="402,121,452,121,459,143.2969,466,143.2969,466,173.5938,402,173.5938,402,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="402" x2="459" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="406" y="135.9951">mod5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod6.cppm#L4" target="_top" title="mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod6.cppm#L4" xlink:show="new" xlink:title="mod6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="501,121,551,121,558,143.2969,565,143.2969,565,173.5938,501,173.5938,501,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod6.cppm#L4" target="_top" title="mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod6.cppm#L4" xlink:show="new" xlink:title="mod6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="501,121,551,121,558,143.2969,565,143.2969,565,173.5938,501,173.5938,501,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="501" x2="558" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="505" y="135.9951">mod6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod7.cppm#L4" target="_top" title="mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod7.cppm#L4" xlink:show="new" xlink:title="mod7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="600,121,650,121,657,143.2969,664,143.2969,664,173.5938,600,173.5938,600,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod7.cppm#L4" target="_top" title="mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod7.cppm#L4" xlink:show="new" xlink:title="mod7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="600,121,650,121,657,143.2969,664,143.2969,664,173.5938,600,173.5938,600,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="600" x2="657" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="604" y="135.9951">mod7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod8.cppm#L4" target="_top" title="mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod8.cppm#L4" xlink:show="new" xlink:title="mod8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="699,121,749,121,756,143.2969,763,143.2969,763,173.5938,699,173.5938,699,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod8.cppm#L4" target="_top" title="mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod8.cppm#L4" xlink:show="new" xlink:title="mod8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="699,121,749,121,756,143.2969,763,143.2969,763,173.5938,699,173.5938,699,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="699" x2="756" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="703" y="135.9951">mod8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod9.cppm#L4" target="_top" title="mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod9.cppm#L4" xlink:show="new" xlink:title="mod9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="798,121,848,121,855,143.2969,862,143.2969,862,173.5938,798,173.5938,798,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod9.cppm#L4" target="_top" title="mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod9.cppm#L4" xlink:show="new" xlink:title="mod9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="798,121,848,121,855,143.2969,862,143.2969,862,173.5938,798,173.5938,798,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="798" x2="855" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="802" y="135.9951">mod9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod10.cppm#L4" target="_top" title="mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod10.cppm#L4" xlink:show="new" xlink:title="mod10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="897,121,957,121,964,143.2969,971,143.2969,971,173.5938,897,173.5938,897,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod10.cppm#L4" target="_top" title="mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod10.cppm#L4" xlink:show="new" xlink:title="mod10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="897,121,957,121,964,143.2969,971,143.2969,971,173.5938,897,173.5938,897,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="897" x2="964" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="901" y="135.9951">mod10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod11.cppm#L4" target="_top" title="mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod11.cppm#L4" xlink:show="new" xlink:title="mod11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1006,121,1066,121,1073,143.2969,1080,143.2969,1080,173.5938,1006,173.5938,1006,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod11.cppm#L4" target="_top" title="mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod11.cppm#L4" xlink:show="new" xlink:title="mod11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="1006,121,1066,121,1073,143.2969,1080,143.2969,1080,173.5938,1006,173.5938,1006,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1006" x2="1073" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1010" y="135.9951">mod11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod12.cppm#L4" target="_top" title="mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod12.cppm#L4" xlink:show="new" xlink:title="mod12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1115,121,1175,121,1182,143.2969,1189,143.2969,1189,173.5938,1115,173.5938,1115,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod12.cppm#L4" target="_top" title="mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod12.cppm#L4" xlink:show="new" xlink:title="mod12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="1115,121,1175,121,1182,143.2969,1189,143.2969,1189,173.5938,1115,173.5938,1115,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1115" x2="1182" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1119" y="135.9951">mod12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod13.cppm#L4" target="_top" title="mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod13.cppm#L4" xlink:show="new" xlink:title="mod13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1224,121,1284,121,1291,143.2969,1298,143.2969,1298,173.5938,1224,173.5938,1224,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod13.cppm#L4" target="_top" title="mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod13.cppm#L4" xlink:show="new" xlink:title="mod13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="1224,121,1284,121,1291,143.2969,1298,143.2969,1298,173.5938,1224,173.5938,1224,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1224" x2="1291" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1228" y="135.9951">mod13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod14.cppm#L4" target="_top" title="mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod14.cppm#L4" xlink:show="new" xlink:title="mod14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1333,121,1393,121,1400,143.2969,1407,143.2969,1407,173.5938,1333,173.5938,1333,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod14.cppm#L4" target="_top" title="mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod14.cppm#L4" xlink:show="new" xlink:title="mod14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="1333,121,1393,121,1400,143.2969,1407,143.2969,1407,173.5938,1333,173.5938,1333,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1333" x2="1400" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1337" y="135.9951">mod14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod15.cppm#L4" target="_top" title="mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod15.cppm#L4" xlink:show="new" xlink:title="mod15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1442,121,1502,121,1509,143.2969,1516,143.2969,1516,173.5938,1442,173.5938,1442,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod15.cppm#L4" target="_top" title="mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod15.cppm#L4" xlink:show="new" xlink:title="mod15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="1442,121,1502,121,1509,143.2969,1516,143.2969,1516,173.5938,1442,173.5938,1442,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1442" x2="1509" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1446" y="135.9951">mod15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod16.cppm#L4" target="_top" title="mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod16.cppm#L4" xlink:show="new" xlink:title="mod16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1551,121,1611,121,1618,143.2969,1625,143.2969,1625,173.5938,1551,173.5938,1551,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod16.cppm#L4" target="_top" title="mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod16.cppm#L4" xlink:show="new" xlink:title="mod16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="1551,121,1611,121,1618,143.2969,1625,143.2969,1625,173.5938,1551,173.5938,1551,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1551" x2="1618" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1555" y="135.9951">mod16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod17.cppm#L4" target="_top" title="mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod17.cppm#L4" xlink:show="new" xlink:title="mod17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1660,121,1720,121,1727,143.2969,1734,143.2969,1734,173.5938,1660,173.5938,1660,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod17.cppm#L4" target="_top" title="mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod17.cppm#L4" xlink:show="new" xlink:title="mod17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="1660,121,1720,121,1727,143.2969,1734,143.2969,1734,173.5938,1660,173.5938,1660,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1660" x2="1727" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1664" y="135.9951">mod17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod18.cppm#L4" target="_top" title="mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/mod18.cppm#L4" xlink:show="new" xlink:title="mod18" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="1769,121,1829,121,1836,143.2969,1843,143.2969,1843,173.5938,1769,173.5938,1769,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod18.cppm#L4" target="_top" title="mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/mod18.cppm#L4" xlink:show="new" xlink:title="mod18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="1769,121,1829,121,1836,143.2969,1843,143.2969,1843,173.5938,1769,173.5938,1769,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1769" x2="1836" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1773" y="135.9951">mod18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/app.cppm#L32" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30013/src/app.cppm#L32" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dvgilhbgsogz)" points="857.5,8,892.5,8,899.5,30.2969,906.5,30.2969,906.5,60.5938,857.5,60.5938,857.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/app.cppm#L32" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30013/src/app.cppm#L32" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wmcugrq1apjn)" points="857.5,8,892.5,8,899.5,30.2969,906.5,30.2969,906.5,60.5938,857.5,60.5938,857.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="857.5" x2="899.5" y1="30.2969" y2="30.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="861.5" y="22.9951">app</text>
     </a>
diff --git a/docs/test_cases/t30014_package.svg b/docs/test_cases/t30014_package.svg
index fb04c4fc..6d60e594 100644
--- a/docs/test_cases/t30014_package.svg
+++ b/docs/test_cases/t30014_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:253px;height:207px;" version="1.1" viewBox="0 0 253 207" width="253px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hzk3rstcv3l1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f29zpz7ylm2tj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,21 +9,21 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1hzk3rstcv3l1)" points="22,24,57,24,64,46.2969,231,46.2969,231,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f29zpz7ylm2tj)" points="22,24,57,24,64,46.2969,231,46.2969,231,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib1.cppm#L4" target="_top" title=":lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib1.cppm#L4" xlink:show="new" xlink:title=":lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1hzk3rstcv3l1)" points="111,67,151,67,158,89.2969,207,89.2969,207,171,111,171,111,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30014/src/lib1.cppm#L4" target="_top" title=":lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30014/src/lib1.cppm#L4" xlink:show="new" xlink:title=":lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f29zpz7ylm2tj)" points="111,67,151,67,158,89.2969,207,89.2969,207,171,111,171,111,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="111" x2="158" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="115" y="81.9951">:lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1hzk3rstcv3l1)" points="127,102,177,102,184,124.2969,191,124.2969,191,154.5938,127,154.5938,127,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30014/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30014/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f29zpz7ylm2tj)" points="127,102,177,102,184,124.2969,191,124.2969,191,154.5938,127,154.5938,127,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="127" x2="184" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="131" y="116.9951">mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib2.cppm#L4" target="_top" title=":lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30014/src/lib2.cppm#L4" xlink:show="new" xlink:title=":lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1hzk3rstcv3l1)" points="38,102,78,102,85,124.2969,92,124.2969,92,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30014/src/lib2.cppm#L4" target="_top" title=":lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30014/src/lib2.cppm#L4" xlink:show="new" xlink:title=":lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f29zpz7ylm2tj)" points="38,102,78,102,85,124.2969,92,124.2969,92,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="85" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="42" y="116.9951">:lib2</text>
     </a>
diff --git a/docs/test_cases/t30015_package.svg b/docs/test_cases/t30015_package.svg
index 77606193..ba96f0e1 100644
--- a/docs/test_cases/t30015_package.svg
+++ b/docs/test_cases/t30015_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="202px" preserveAspectRatio="none" style="width:2021px;height:202px;" version="1.1" viewBox="0 0 2021 202" width="2021px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1euomjq08fspe" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1p17hhhgdu9r0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,101 +9,101 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="22,86,56,86,63,108.2969,1999,108.2969,1999,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="22,86,56,86,63,108.2969,1999,108.2969,1999,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="63" y1="108.2969" y2="108.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="26" y="100.9951">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod1.cppm#L4" target="_top" title=":mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod1.cppm#L4" xlink:show="new" xlink:title=":mod1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1913,121,1969,121,1976,143.2969,1983,143.2969,1983,173.5938,1913,173.5938,1913,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod1.cppm#L4" target="_top" title=":mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod1.cppm#L4" xlink:show="new" xlink:title=":mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1913,121,1969,121,1976,143.2969,1983,143.2969,1983,173.5938,1913,173.5938,1913,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1913" x2="1976" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1917" y="135.9951">:mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod2.cppm#L4" target="_top" title=":mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod2.cppm#L4" xlink:show="new" xlink:title=":mod2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1808,121,1864,121,1871,143.2969,1878,143.2969,1878,173.5938,1808,173.5938,1808,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod2.cppm#L4" target="_top" title=":mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod2.cppm#L4" xlink:show="new" xlink:title=":mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1808,121,1864,121,1871,143.2969,1878,143.2969,1878,173.5938,1808,173.5938,1808,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1808" x2="1871" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1812" y="135.9951">:mod2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod3.cppm#L4" target="_top" title=":mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod3.cppm#L4" xlink:show="new" xlink:title=":mod3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1703,121,1759,121,1766,143.2969,1773,143.2969,1773,173.5938,1703,173.5938,1703,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod3.cppm#L4" target="_top" title=":mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod3.cppm#L4" xlink:show="new" xlink:title=":mod3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1703,121,1759,121,1766,143.2969,1773,143.2969,1773,173.5938,1703,173.5938,1703,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1703" x2="1766" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1707" y="135.9951">:mod3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod4.cppm#L4" target="_top" title=":mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod4.cppm#L4" xlink:show="new" xlink:title=":mod4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1598,121,1654,121,1661,143.2969,1668,143.2969,1668,173.5938,1598,173.5938,1598,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod4.cppm#L4" target="_top" title=":mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod4.cppm#L4" xlink:show="new" xlink:title=":mod4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1598,121,1654,121,1661,143.2969,1668,143.2969,1668,173.5938,1598,173.5938,1598,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1598" x2="1661" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1602" y="135.9951">:mod4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod5.cppm#L4" target="_top" title=":mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod5.cppm#L4" xlink:show="new" xlink:title=":mod5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1493,121,1549,121,1556,143.2969,1563,143.2969,1563,173.5938,1493,173.5938,1493,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod5.cppm#L4" target="_top" title=":mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod5.cppm#L4" xlink:show="new" xlink:title=":mod5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1493,121,1549,121,1556,143.2969,1563,143.2969,1563,173.5938,1493,173.5938,1493,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1493" x2="1556" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1497" y="135.9951">:mod5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod6.cppm#L4" target="_top" title=":mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod6.cppm#L4" xlink:show="new" xlink:title=":mod6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1388,121,1444,121,1451,143.2969,1458,143.2969,1458,173.5938,1388,173.5938,1388,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod6.cppm#L4" target="_top" title=":mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod6.cppm#L4" xlink:show="new" xlink:title=":mod6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1388,121,1444,121,1451,143.2969,1458,143.2969,1458,173.5938,1388,173.5938,1388,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1388" x2="1451" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1392" y="135.9951">:mod6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod7.cppm#L4" target="_top" title=":mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod7.cppm#L4" xlink:show="new" xlink:title=":mod7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1283,121,1339,121,1346,143.2969,1353,143.2969,1353,173.5938,1283,173.5938,1283,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod7.cppm#L4" target="_top" title=":mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod7.cppm#L4" xlink:show="new" xlink:title=":mod7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1283,121,1339,121,1346,143.2969,1353,143.2969,1353,173.5938,1283,173.5938,1283,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1283" x2="1346" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1287" y="135.9951">:mod7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod8.cppm#L4" target="_top" title=":mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod8.cppm#L4" xlink:show="new" xlink:title=":mod8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1178,121,1234,121,1241,143.2969,1248,143.2969,1248,173.5938,1178,173.5938,1178,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod8.cppm#L4" target="_top" title=":mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod8.cppm#L4" xlink:show="new" xlink:title=":mod8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1178,121,1234,121,1241,143.2969,1248,143.2969,1248,173.5938,1178,173.5938,1178,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1178" x2="1241" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1182" y="135.9951">:mod8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod9.cppm#L4" target="_top" title=":mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod9.cppm#L4" xlink:show="new" xlink:title=":mod9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1073,121,1129,121,1136,143.2969,1143,143.2969,1143,173.5938,1073,173.5938,1073,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod9.cppm#L4" target="_top" title=":mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod9.cppm#L4" xlink:show="new" xlink:title=":mod9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1073,121,1129,121,1136,143.2969,1143,143.2969,1143,173.5938,1073,173.5938,1073,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1073" x2="1136" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1077" y="135.9951">:mod9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod10.cppm#L4" target="_top" title=":mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod10.cppm#L4" xlink:show="new" xlink:title=":mod10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="958,121,1024,121,1031,143.2969,1038,143.2969,1038,173.5938,958,173.5938,958,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod10.cppm#L4" target="_top" title=":mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod10.cppm#L4" xlink:show="new" xlink:title=":mod10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="958,121,1024,121,1031,143.2969,1038,143.2969,1038,173.5938,958,173.5938,958,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="958" x2="1031" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="962" y="135.9951">:mod10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod11.cppm#L4" target="_top" title=":mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod11.cppm#L4" xlink:show="new" xlink:title=":mod11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="843,121,909,121,916,143.2969,923,143.2969,923,173.5938,843,173.5938,843,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod11.cppm#L4" target="_top" title=":mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod11.cppm#L4" xlink:show="new" xlink:title=":mod11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="843,121,909,121,916,143.2969,923,143.2969,923,173.5938,843,173.5938,843,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="843" x2="916" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="847" y="135.9951">:mod11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod12.cppm#L4" target="_top" title=":mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod12.cppm#L4" xlink:show="new" xlink:title=":mod12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="728,121,794,121,801,143.2969,808,143.2969,808,173.5938,728,173.5938,728,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod12.cppm#L4" target="_top" title=":mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod12.cppm#L4" xlink:show="new" xlink:title=":mod12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="728,121,794,121,801,143.2969,808,143.2969,808,173.5938,728,173.5938,728,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="728" x2="801" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="732" y="135.9951">:mod12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod13.cppm#L4" target="_top" title=":mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod13.cppm#L4" xlink:show="new" xlink:title=":mod13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="613,121,679,121,686,143.2969,693,143.2969,693,173.5938,613,173.5938,613,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod13.cppm#L4" target="_top" title=":mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod13.cppm#L4" xlink:show="new" xlink:title=":mod13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="613,121,679,121,686,143.2969,693,143.2969,693,173.5938,613,173.5938,613,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="613" x2="686" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="617" y="135.9951">:mod13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod14.cppm#L4" target="_top" title=":mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod14.cppm#L4" xlink:show="new" xlink:title=":mod14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="498,121,564,121,571,143.2969,578,143.2969,578,173.5938,498,173.5938,498,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod14.cppm#L4" target="_top" title=":mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod14.cppm#L4" xlink:show="new" xlink:title=":mod14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="498,121,564,121,571,143.2969,578,143.2969,578,173.5938,498,173.5938,498,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="498" x2="571" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="502" y="135.9951">:mod14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod15.cppm#L4" target="_top" title=":mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod15.cppm#L4" xlink:show="new" xlink:title=":mod15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="383,121,449,121,456,143.2969,463,143.2969,463,173.5938,383,173.5938,383,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod15.cppm#L4" target="_top" title=":mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod15.cppm#L4" xlink:show="new" xlink:title=":mod15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="383,121,449,121,456,143.2969,463,143.2969,463,173.5938,383,173.5938,383,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="383" x2="456" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="387" y="135.9951">:mod15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod16.cppm#L4" target="_top" title=":mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod16.cppm#L4" xlink:show="new" xlink:title=":mod16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="268,121,334,121,341,143.2969,348,143.2969,348,173.5938,268,173.5938,268,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod16.cppm#L4" target="_top" title=":mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod16.cppm#L4" xlink:show="new" xlink:title=":mod16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="268,121,334,121,341,143.2969,348,143.2969,348,173.5938,268,173.5938,268,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="268" x2="341" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="272" y="135.9951">:mod16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod17.cppm#L4" target="_top" title=":mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod17.cppm#L4" xlink:show="new" xlink:title=":mod17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="153,121,219,121,226,143.2969,233,143.2969,233,173.5938,153,173.5938,153,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod17.cppm#L4" target="_top" title=":mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod17.cppm#L4" xlink:show="new" xlink:title=":mod17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="153,121,219,121,226,143.2969,233,143.2969,233,173.5938,153,173.5938,153,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="153" x2="226" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="157" y="135.9951">:mod17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod18.cppm#L4" target="_top" title=":mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/mod18.cppm#L4" xlink:show="new" xlink:title=":mod18" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="38,121,104,121,111,143.2969,118,143.2969,118,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod18.cppm#L4" target="_top" title=":mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/mod18.cppm#L4" xlink:show="new" xlink:title=":mod18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="38,121,104,121,111,143.2969,118,143.2969,118,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="111" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="42" y="135.9951">:mod18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/app.cppm#L33" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t30015/src/app.cppm#L33" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1euomjq08fspe)" points="1028.5,8,1063.5,8,1070.5,30.2969,1077.5,30.2969,1077.5,60.5938,1028.5,60.5938,1028.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/app.cppm#L33" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t30015/src/app.cppm#L33" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1p17hhhgdu9r0)" points="1028.5,8,1063.5,8,1070.5,30.2969,1077.5,30.2969,1077.5,60.5938,1028.5,60.5938,1028.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1028.5" x2="1070.5" y1="30.2969" y2="30.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="1032.5" y="22.9951">app</text>
     </a>
diff --git a/docs/test_cases/t40001.md b/docs/test_cases/t40001.md
index 93175bae..7edffec9 100644
--- a/docs/test_cases/t40001.md
+++ b/docs/test_cases/t40001.md
@@ -98,6 +98,7 @@ int foo2() { return 0; }
       "display_name": "string",
       "file_kind": "header",
       "id": "1687197357150905926",
+      "is_system": true,
       "name": "string",
       "type": "file"
     },
@@ -105,6 +106,7 @@ int foo2() { return 0; }
       "display_name": "vector",
       "file_kind": "header",
       "id": "405203884025072971",
+      "is_system": true,
       "name": "vector",
       "type": "file"
     },
@@ -115,6 +117,7 @@ int foo2() { return 0; }
           "display_name": "include/t40001_include1.h",
           "file_kind": "header",
           "id": "1926692816440595520",
+          "is_system": false,
           "name": "t40001_include1.h",
           "type": "file"
         },
@@ -125,6 +128,7 @@ int foo2() { return 0; }
               "display_name": "include/lib1/lib1.h",
               "file_kind": "header",
               "id": "2193549214042244690",
+              "is_system": false,
               "name": "lib1.h",
               "type": "file"
             }
@@ -142,6 +146,7 @@ int foo2() { return 0; }
       "display_name": "yaml-cpp/yaml.h",
       "file_kind": "header",
       "id": "1659736894483045485",
+      "is_system": true,
       "name": "yaml-cpp/yaml.h",
       "type": "file"
     }
diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg
index d815c4e5..90355077 100644
--- a/docs/test_cases/t40001_include.svg
+++ b/docs/test_cases/t40001_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="397px" preserveAspectRatio="none" style="width:676px;height:397px;" version="1.1" viewBox="0 0 676 397" width="676px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f14d3jxuziq22z" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fo7vwpa04oc35" 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"/>
@@ -10,41 +10,41 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="273" x="204.5" y="16.708">Basic include diagram example</text>
-    <polygon fill="#FFFFFF" filter="url(#f14d3jxuziq22z)" points="187,44.9531,218,44.9531,225,67.25,309,67.25,309,131.9531,187,131.9531,187,44.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fo7vwpa04oc35)" points="187,44.9531,218,44.9531,225,67.25,309,67.25,309,131.9531,187,131.9531,187,44.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="225" y1="67.25" y2="67.25"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="191" y="59.9482">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f14d3jxuziq22z)" points="22,155.9531,85,155.9531,92,178.25,211,178.25,211,385.9531,22,385.9531,22,155.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fo7vwpa04oc35)" points="22,155.9531,85,155.9531,92,178.25,211,178.25,211,385.9531,22,385.9531,22,155.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="92" y1="178.25" y2="178.25"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="26" y="170.9482">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f14d3jxuziq22z)" points="54,250.9531,88,250.9531,95,273.25,179,273.25,179,353.9531,54,353.9531,54,250.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fo7vwpa04oc35)" points="54,250.9531,88,250.9531,95,273.25,179,273.25,179,353.9531,54,353.9531,54,250.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="54" x2="95" y1="273.25" y2="273.25"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="58" y="265.9482">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="203,79.9531,203,116.25,293,116.25,293,89.9531,283,79.9531,203,79.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fo7vwpa04oc35)" points="203,79.9531,203,116.25,293,116.25,293,89.9531,283,79.9531,203,79.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M283,79.9531 L283,89.9531 L293,89.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="213" y="102.9482">t40001.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="46.5,190.9531,46.5,227.25,195.5,227.25,195.5,200.9531,185.5,190.9531,46.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fo7vwpa04oc35)" points="46.5,190.9531,46.5,227.25,195.5,227.25,195.5,200.9531,185.5,190.9531,46.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M185.5,190.9531 L185.5,200.9531 L195.5,200.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="129" x="56.5" y="213.9482">t40001_include1.h</text>
     </a>
-    <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="97.5,293.9531,97.5,330.25,154.5,330.25,154.5,303.9531,144.5,293.9531,97.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fo7vwpa04oc35)" points="97.5,293.9531,97.5,330.25,154.5,330.25,154.5,303.9531,144.5,293.9531,97.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M144.5,293.9531 L144.5,303.9531 L154.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="107.5" y="316.9482">lib1.h</text>
-    <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="393.5,293.9531,393.5,330.25,452.5,330.25,452.5,303.9531,442.5,293.9531,393.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fo7vwpa04oc35)" points="393.5,293.9531,393.5,330.25,452.5,330.25,452.5,303.9531,442.5,293.9531,393.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M442.5,293.9531 L442.5,303.9531 L452.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="403.5" y="316.9482">string</text>
-    <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="301.5,190.9531,301.5,227.25,364.5,227.25,364.5,200.9531,354.5,190.9531,301.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fo7vwpa04oc35)" points="301.5,190.9531,301.5,227.25,364.5,227.25,364.5,200.9531,354.5,190.9531,301.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M354.5,190.9531 L354.5,200.9531 L364.5,200.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="311.5" y="213.9482">vector</text>
-    <polygon fill="#FEFECE" filter="url(#f14d3jxuziq22z)" points="227.5,293.9531,227.5,330.25,358.5,330.25,358.5,303.9531,348.5,293.9531,227.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fo7vwpa04oc35)" points="227.5,293.9531,227.5,330.25,358.5,330.25,358.5,303.9531,348.5,293.9531,227.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M348.5,293.9531 L348.5,303.9531 L358.5,303.9531 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="111" x="237.5" y="316.9482">yaml-cpp/yaml.h</text>
-    <path d="M487.5,299.4531 L487.5,324.5859 L654.5,324.5859 L654.5,309.4531 L644.5,299.4531 L487.5,299.4531 " fill="#FBFB77" filter="url(#f14d3jxuziq22z)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M487.5,299.4531 L487.5,324.5859 L654.5,324.5859 L654.5,309.4531 L644.5,299.4531 L487.5,299.4531 " fill="#FBFB77" filter="url(#fo7vwpa04oc35)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M644.5,299.4531 L644.5,309.4531 L654.5,309.4531 L644.5,299.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="146" x="493.5" y="316.52">This is a lib1 include dir</text>
-    <path d="M400,196.4531 L400,221.5859 L664,221.5859 L664,206.4531 L654,196.4531 L400,196.4531 " fill="#FBFB77" filter="url(#f14d3jxuziq22z)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M400,196.4531 L400,221.5859 L664,221.5859 L664,206.4531 L654,196.4531 L400,196.4531 " fill="#FBFB77" filter="url(#fo7vwpa04oc35)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M654,196.4531 L654,206.4531 L664,206.4531 L654,196.4531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="406" y="213.52">This is a t40001_include1.h include file</text>
     <path d="M247.19,116.2831 C246.91,144.4031 250.93,199.5631 284,226.9531 C299.81,240.0431 358.52,224.1931 376,234.9531 C395.8,247.1431 408.53,271.1231 415.68,288.8931 " fill="none" id="C_0001755015016680017839-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t40001_include_mermaid.svg b/docs/test_cases/t40001_include_mermaid.svg
index 24b9afec..0af13e6f 100644
--- a/docs/test_cases/t40001_include_mermaid.svg
+++ b/docs/test_cases/t40001_include_mermaid.svg
@@ -138,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/include/t40001_include1.h#L0">
+        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40001/include/t40001_include1.h#L0">
           <g title="t40001_include1.h" id="flowchart-C_0001926692816440595520-3" class="node default clickable flowchart-label">
             <rect height="33" width="145.78125" y="-16.5" x="-72.890625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-65.390625, -9)" style="" class="label">
@@ -151,7 +151,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L0">
+        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/#L0">
           <g title="lib1.h" id="flowchart-C_0002193549214042244690-4" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -164,7 +164,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40001/src/t40001.cc#L0">
+        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40001/src/t40001.cc#L0">
           <g title="t40001.cc" id="flowchart-C_0001755015016680017839-0" class="node default clickable flowchart-label">
             <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-34.6953125, -9)" style="" class="label">
diff --git a/docs/test_cases/t40002.md b/docs/test_cases/t40002.md
index 231dba9c..37c1c398 100644
--- a/docs/test_cases/t40002.md
+++ b/docs/test_cases/t40002.md
@@ -175,6 +175,7 @@ int foo();
               "display_name": "include/lib1/lib1.h",
               "file_kind": "header",
               "id": "2193549214042244690",
+              "is_system": false,
               "name": "lib1.h",
               "type": "file"
             }
@@ -190,6 +191,7 @@ int foo();
               "display_name": "include/lib2/lib2.h",
               "file_kind": "header",
               "id": "1969674835696841438",
+              "is_system": false,
               "name": "lib2.h",
               "type": "file"
             }
diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg
index ea6052a0..5ad5cdd6 100644
--- a/docs/test_cases/t40002_include.svg
+++ b/docs/test_cases/t40002_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:412px;height:479px;" version="1.1" viewBox="0 0 412 479" width="412px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10aeee663psf6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ds8ch5ytzg04" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,46 +9,46 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1ds8ch5ytzg04)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1ds8ch5ytzg04)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="87" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="50" y="81.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1ds8ch5ytzg04)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="270" x2="311" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="274" y="81.9951">lib2</text>
-    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1ds8ch5ytzg04)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="135" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="69" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1ds8ch5ytzg04)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="259.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f10aeee663psf6)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1ds8ch5ytzg04)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="378.2969" y2="378.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="370.9951">lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1ds8ch5ytzg04)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241,102 L241,112 L251,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="171" y="124.9951">t40002.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1ds8ch5ytzg04)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="72" y="124.9951">lib1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1ds8ch5ytzg04)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M340,102 L340,112 L350,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="296" y="124.9951">lib2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1ds8ch5ytzg04)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,280 L152.5,290 L162.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="302.9951">lib1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f10aeee663psf6)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1ds8ch5ytzg04)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,391 L152.5,401 L162.5,401 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="413.9951">lib2.h</text>
     </a>
diff --git a/docs/test_cases/t40002_include_mermaid.svg b/docs/test_cases/t40002_include_mermaid.svg
index 2b698312..d41801d9 100644
--- a/docs/test_cases/t40002_include_mermaid.svg
+++ b/docs/test_cases/t40002_include_mermaid.svg
@@ -137,7 +137,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib2/lib2.h#L0">
+        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/include/lib2/lib2.h#L0">
           <g title="lib2.h" id="flowchart-C_0001969674835696841438-4" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/include/lib1/lib1.h#L0">
+        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/include/lib1/lib1.h#L0">
           <g title="lib1.h" id="flowchart-C_0002193549214042244690-3" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -163,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/t40002.cc#L0">
+        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/t40002.cc#L0">
           <g title="t40002.cc" id="flowchart-C_0001489450289909741706-0" class="node default clickable flowchart-label">
             <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-34.6953125, -9)" style="" class="label">
@@ -176,7 +176,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib2/lib2.cc#L0">
+        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/lib2/lib2.cc#L0">
           <g title="lib2.cc" id="flowchart-C_0001761875020766116446-2" class="node default clickable flowchart-label">
             <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-22.6796875, -9)" style="" class="label">
@@ -189,7 +189,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40002/src/lib1/lib1.cc#L0">
+        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40002/src/lib1/lib1.cc#L0">
           <g title="lib1.cc" id="flowchart-C_0001493913207373215402-1" class="node default clickable flowchart-label">
             <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-22.6796875, -9)" style="" class="label">
diff --git a/docs/test_cases/t40003.md b/docs/test_cases/t40003.md
index a8deffce..5b1423ad 100644
--- a/docs/test_cases/t40003.md
+++ b/docs/test_cases/t40003.md
@@ -189,6 +189,7 @@ void t2() { t1(); }
               "display_name": "include/dependants/t3.h",
               "file_kind": "header",
               "id": "60001020671836182",
+              "is_system": false,
               "name": "t3.h",
               "type": "file"
             },
@@ -196,6 +197,7 @@ void t2() { t1(); }
               "display_name": "include/dependants/t2.h",
               "file_kind": "header",
               "id": "1921842892192045013",
+              "is_system": false,
               "name": "t2.h",
               "type": "file"
             },
@@ -203,6 +205,7 @@ void t2() { t1(); }
               "display_name": "include/dependants/t1.h",
               "file_kind": "header",
               "id": "2295271780650013565",
+              "is_system": false,
               "name": "t1.h",
               "type": "file"
             }
@@ -218,6 +221,7 @@ void t2() { t1(); }
               "display_name": "include/dependencies/t3.h",
               "file_kind": "header",
               "id": "1226843223635488673",
+              "is_system": false,
               "name": "t3.h",
               "type": "file"
             },
@@ -225,6 +229,7 @@ void t2() { t1(); }
               "display_name": "include/dependencies/t2.h",
               "file_kind": "header",
               "id": "1849348825646635129",
+              "is_system": false,
               "name": "t2.h",
               "type": "file"
             },
@@ -232,6 +237,7 @@ void t2() { t1(); }
               "display_name": "include/dependencies/t1.h",
               "file_kind": "header",
               "id": "1120257488305564427",
+              "is_system": false,
               "name": "t1.h",
               "type": "file"
             },
@@ -239,6 +245,7 @@ void t2() { t1(); }
               "display_name": "include/dependencies/t5.h",
               "file_kind": "header",
               "id": "2106129159239499468",
+              "is_system": false,
               "name": "t5.h",
               "type": "file"
             }
diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg
index acfdecd5..61cd20a5 100644
--- a/docs/test_cases/t40003_include.svg
+++ b/docs/test_cases/t40003_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="560px" preserveAspectRatio="none" style="width:395px;height:560px;" version="1.1" viewBox="0 0 395 560" width="395px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jx3ms78lgc71" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1d6c00az0f6hj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,62 +9,62 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1d6c00az0f6hj)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1d6c00az0f6hj)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="153" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="50" y="81.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1d6c00az0f6hj)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="180" x2="305" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="184" y="81.9951">dependencies</text>
-    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1d6c00az0f6hj)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="29" x2="99" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="33" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1d6c00az0f6hj)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="53" x2="160" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="57" y="259.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f1jx3ms78lgc71)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1d6c00az0f6hj)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="312" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="191" y="259.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="82" y="124.9951">t1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M266,102 L266,112 L276,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="232" y="124.9951">t2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,280 L112.5,290 L122.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,376 L112.5,386 L122.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="398.9951">t2.h</text>
     </a>
-    <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M112.5,472 L112.5,482 L122.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="494.9951">t1.h</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241.5,280 L241.5,290 L251.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="214.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M240.5,376 L240.5,386 L250.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="213.5" y="398.9951">t2.h</text>
     </a>
-    <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M281.5,472 L281.5,482 L291.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="254.5" y="494.9951">t1.h</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1jx3ms78lgc71)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1d6c00az0f6hj)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M322.5,376 L322.5,386 L332.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="295.5" y="398.9951">t5.h</text>
     </a>
diff --git a/docs/test_cases/t40003_include_mermaid.svg b/docs/test_cases/t40003_include_mermaid.svg
index b013f46b..980dacbf 100644
--- a/docs/test_cases/t40003_include_mermaid.svg
+++ b/docs/test_cases/t40003_include_mermaid.svg
@@ -167,7 +167,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t3.h#L0">
+        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t3.h#L0">
           <g title="t3.h" id="flowchart-C_0001226843223635488673-5" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -180,7 +180,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t2.h#L0">
+        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t2.h#L0">
           <g title="t2.h" id="flowchart-C_0001849348825646635129-6" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L0">
+        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/#L0">
           <g title="t1.h" id="flowchart-C_0001120257488305564427-7" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -206,7 +206,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependencies/t5.h#L0">
+        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependencies/t5.h#L0">
           <g title="t5.h" id="flowchart-C_0002106129159239499468-8" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -219,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t3.h#L0">
+        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependants/t3.h#L0">
           <g title="t3.h" id="flowchart-C_0000060001020671836182-2" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -232,7 +232,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/include/dependants/t2.h#L0">
+        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/include/dependants/t2.h#L0">
           <g title="t2.h" id="flowchart-C_0001921842892192045013-3" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -245,7 +245,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/#L0">
+        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/#L0">
           <g title="t1.h" id="flowchart-C_0002295271780650013565-4" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -258,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependencies/t2.cc#L0">
+        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/src/dependencies/t2.cc#L0">
           <g title="t2.cc" id="flowchart-C_0002215849176605856058-1" class="node default clickable flowchart-label">
             <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-16.8984375, -9)" style="" class="label">
@@ -271,7 +271,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/9d73c9e3ff3d22cd86e3a77128baf6d1e7ce0716/tests/t40003/src/dependants/t1.cc#L0">
+        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/3fcb00e8eb38e5b9b76eaf306048df16b2727330/tests/t40003/src/dependants/t1.cc#L0">
           <g title="t1.cc" id="flowchart-C_0001215324434184692437-0" class="node default clickable flowchart-label">
             <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-16.8984375, -9)" style="" class="label">

From 555d0da4f62f0bc739434f0980644da0b456c937 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Thu, 11 Jan 2024 15:22:09 +0100
Subject: [PATCH 23/24] Fixed building on macos

---
 src/config/option.h  | 2 ++
 tests/CMakeLists.txt | 9 +++++++++
 tests/test_cases.cc  | 4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/config/option.h b/src/config/option.h
index 699e3e59..8e6e9076 100644
--- a/src/config/option.h
+++ b/src/config/option.h
@@ -17,8 +17,10 @@
  */
 #pragma once
 
+#include <map>
 #include <string>
 #include <utility>
+#include <vector>
 
 namespace clanguml {
 namespace config {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 594857ad..2e71d867 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -39,6 +39,8 @@ endif(MSVC)
 
 list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_std_20 SUPPORTS_CXX_STD_20)
 
+message(STATUS "Enabling C++20 test cases")
+
 # Remove test cases which require C++20 if they are not supported here
 if(SUPPORTS_CXX_STD_20 EQUAL -1
         OR ${LLVM_PACKAGE_VERSION} VERSION_LESS "14.0")
@@ -55,6 +57,13 @@ else()
     set(ENABLE_CXX_STD_20_TEST_CASES 1)
 endif()
 
+if(APPLE)
+    # On Apple Clang <coroutine> header is not available
+    list(FILTER TEST_CASE_SOURCES
+            EXCLUDE
+            REGEX ".*t00069.*")
+endif(APPLE)
+
 set(TEST_NAMES
         test_util
         test_model
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 260730d5..93a02baa 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -405,8 +405,10 @@ using namespace clanguml::test::matchers;
 #include "t00067/test_case.h"
 #include "t00068/test_case.h"
 #if defined(ENABLE_CXX_STD_20_TEST_CASES)
+#if __has_include(<coroutine>)
 #include "t00069/test_case.h"
 #endif
+#endif
 #if defined(ENABLE_CXX_MODULES_TEST_CASES)
 #include "t00070/test_case.h"
 #include "t00071/test_case.h"
@@ -523,4 +525,4 @@ int main(int argc, char *argv[])
     clih.handle_options(argvv.size(), argvv.data());
 
     return session.run();
-}
\ No newline at end of file
+}

From 2006d62d4d969c1ed4304a57314bdc421e4ee705 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Thu, 11 Jan 2024 16:32:03 +0100
Subject: [PATCH 24/24] Fixed building on MSVC

---
 build.ps1            |  2 +-
 src/CMakeLists.txt   |  4 ++--
 tests/CMakeLists.txt |  2 +-
 tests/test_model.cc  | 12 ++++++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.ps1 b/build.ps1
index f43bc470..e13a4212 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,6 +1,6 @@
 param ($Prefix="C:\clang-uml", $BuildType="Release")
 
-cmake -S . -B $BuildType -DCMAKE_PREFIX_PATH="$Prefix" -Thost=x64
+cmake -S . -B $BuildType -DCMAKE_PREFIX_PATH="$Prefix" -DENABLE_CXX_MODULES_TEST_CASES=OFF -Thost=x64
 cmake --build $BuildType --config $BuildType
 
 # Create compile commands in Visual Studio
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e052d584..015fba87 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,7 @@ target_compile_options(clang-umllib PRIVATE
         $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
         -Werror -Wall -Wextra -Wno-unused-parameter
         -Wno-deprecated-declarations ${CUSTOM_COMPILE_OPTIONS}>
-        $<$<CXX_COMPILER_ID:MSVC>:/MP /W1 /bigobj /wd4291 /wd4624 /wd4244>)
+        $<$<CXX_COMPILER_ID:MSVC>:/MP /MD /W1 /bigobj /wd4291 /wd4624 /wd4244>)
 target_compile_definitions(clang-umllib PRIVATE
         $<$<CXX_COMPILER_ID:MSVC>:
         -DLLVM_FORCE_USE_OLD_TOOLCHAIN
@@ -44,7 +44,7 @@ target_compile_options(clang-uml PRIVATE
         $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
         -Werror -Wall -Wextra -Wno-unused-parameter
         -Wno-deprecated-declarations ${CUSTOM_COMPILE_OPTIONS}>
-        $<$<CXX_COMPILER_ID:MSVC>:/MP /W1 /bigobj /wd4291 /wd4624 /wd4244>)
+        $<$<CXX_COMPILER_ID:MSVC>:/MP /MD /W1 /bigobj /wd4291 /wd4624 /wd4244>)
 target_compile_definitions(clang-uml PRIVATE
         ${ENABLE_BACKWARD_CPP})
 target_link_libraries(clang-uml
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2e71d867..ffc38e33 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -100,7 +100,7 @@ foreach(TEST_NAME ${TEST_NAMES})
             -Wno-unused-parameter -Wno-unused-variable
             -Wno-attributes -Wno-nonnull -Wno-deprecated-enum-enum-conversion
             ${CUSTOM_COMPILE_OPTIONS}>
-            $<$<CXX_COMPILER_ID:MSVC>:/W1 /bigobj /wd4624>>)
+            $<$<CXX_COMPILER_ID:MSVC>:/MP /MD /W1 /bigobj /wd4624>>)
     target_link_libraries(${TEST_NAME} PRIVATE ${CLANG_UML_TEST_LIBRARIES})
 endforeach()
 
diff --git a/tests/test_model.cc b/tests/test_model.cc
index 3b925a6c..e9fc4cf9 100644
--- a/tests/test_model.cc
+++ b/tests/test_model.cc
@@ -428,6 +428,7 @@ TEST_CASE("Test common::model::package full_name", "[unit-test]")
             "namespaceA_1_1B_1_1C_1_1D_1_1E_1_1F_1_1G.html");
     }
 
+#if !defined(_MSC_VER)
     {
         auto using_namespace = path{"/A/B/C", path_type::kFilesystem};
         auto pkg = package(using_namespace, path_type::kFilesystem);
@@ -437,6 +438,17 @@ TEST_CASE("Test common::model::package full_name", "[unit-test]")
         CHECK(pkg.full_name(false) == "A/B/C/D/E/F/G");
         CHECK(pkg.full_name(true) == "D/E/F/G");
     }
+#else
+    {
+        auto using_namespace = path{"A\\B\\C", path_type::kFilesystem};
+        auto pkg = package(using_namespace, path_type::kFilesystem);
+        pkg.set_name("G");
+        pkg.set_namespace(path{"A\\B\\C\\D\\E\\F", path_type::kFilesystem});
+
+        CHECK(pkg.full_name(false) == "A\\B\\C\\D\\E\\F\\G");
+        CHECK(pkg.full_name(true) == "D\\E\\F\\G");
+    }
+#endif
 
     {
         auto using_namespace = path{"A.B.C", path_type::kModule};